From cb08b4683fc3a8feadc4a7590dc2db922ca3a6ed Mon Sep 17 00:00:00 2001 From: David Sherret Date: Mon, 31 Oct 2022 10:25:46 -0400 Subject: feat(unstable/npm): `deno info --json` support for npm specifiers (#16472) --- .../testdata/info/076_info_json_deps_order.out | 3 +- cli/tests/testdata/info/json_output/main.out | 3 +- cli/tests/testdata/npm/cjs_with_deps/main.info.out | 22 ---- cli/tests/testdata/npm/cjs_with_deps/main_info.out | 22 ++++ .../testdata/npm/cjs_with_deps/main_info_json.out | 146 +++++++++++++++++++++ cli/tests/testdata/npm/deno_info_chalk.out | 10 -- cli/tests/testdata/npm/info/chalk.out | 10 ++ cli/tests/testdata/npm/info/chalk_json.out | 54 ++++++++ 8 files changed, 236 insertions(+), 34 deletions(-) delete mode 100644 cli/tests/testdata/npm/cjs_with_deps/main.info.out create mode 100644 cli/tests/testdata/npm/cjs_with_deps/main_info.out create mode 100644 cli/tests/testdata/npm/cjs_with_deps/main_info_json.out delete mode 100644 cli/tests/testdata/npm/deno_info_chalk.out create mode 100644 cli/tests/testdata/npm/info/chalk.out create mode 100644 cli/tests/testdata/npm/info/chalk_json.out (limited to 'cli/tests/testdata') diff --git a/cli/tests/testdata/info/076_info_json_deps_order.out b/cli/tests/testdata/info/076_info_json_deps_order.out index db890ef02..98b5d5d50 100644 --- a/cli/tests/testdata/info/076_info_json_deps_order.out +++ b/cli/tests/testdata/info/076_info_json_deps_order.out @@ -159,5 +159,6 @@ "specifier": "file://[WILDCARD]/recursive_imports/common.ts" } ], - "redirects": {} + "redirects": {}, + "npmPackages": {} } diff --git a/cli/tests/testdata/info/json_output/main.out b/cli/tests/testdata/info/json_output/main.out index 124fc7351..aaef028c0 100644 --- a/cli/tests/testdata/info/json_output/main.out +++ b/cli/tests/testdata/info/json_output/main.out @@ -86,5 +86,6 @@ "specifier": "file://[WILDCARD]/subdir/subdir2/mod2.ts" } ], - "redirects": {} + "redirects": {}, + "npmPackages": {} } diff --git a/cli/tests/testdata/npm/cjs_with_deps/main.info.out b/cli/tests/testdata/npm/cjs_with_deps/main.info.out deleted file mode 100644 index 345583a90..000000000 --- a/cli/tests/testdata/npm/cjs_with_deps/main.info.out +++ /dev/null @@ -1,22 +0,0 @@ -local: [WILDCARD]main.js -type: JavaScript -dependencies: 14 unique -size: [WILDCARD] - -file:///[WILDCARD]/npm/cjs_with_deps/main.js ([WILDCARD]) -├─┬ npm:chai@4.3 - 4.3.6 ([WILDCARD]) -│ ├── npm:assertion-error@1.1.0 ([WILDCARD]) -│ ├── npm:check-error@1.0.2 ([WILDCARD]) -│ ├─┬ npm:deep-eql@3.0.1 ([WILDCARD]) -│ │ └── npm:type-detect@4.0.8 ([WILDCARD]) -│ ├── npm:get-func-name@2.0.0 ([WILDCARD]) -│ ├─┬ npm:loupe@2.3.4 ([WILDCARD]) -│ │ └── npm:get-func-name@2.0.0 ([WILDCARD]) -│ ├── npm:pathval@1.1.1 ([WILDCARD]) -│ └── npm:type-detect@4.0.8 ([WILDCARD]) -└─┬ npm:chalk@4 - 4.1.2 ([WILDCARD]) - ├─┬ npm:ansi-styles@4.3.0 ([WILDCARD]) - │ └─┬ npm:color-convert@2.0.1 ([WILDCARD]) - │ └── npm:color-name@1.1.4 ([WILDCARD]) - └─┬ npm:supports-color@7.2.0 ([WILDCARD]) - └── npm:has-flag@4.0.0 ([WILDCARD]) diff --git a/cli/tests/testdata/npm/cjs_with_deps/main_info.out b/cli/tests/testdata/npm/cjs_with_deps/main_info.out new file mode 100644 index 000000000..345583a90 --- /dev/null +++ b/cli/tests/testdata/npm/cjs_with_deps/main_info.out @@ -0,0 +1,22 @@ +local: [WILDCARD]main.js +type: JavaScript +dependencies: 14 unique +size: [WILDCARD] + +file:///[WILDCARD]/npm/cjs_with_deps/main.js ([WILDCARD]) +├─┬ npm:chai@4.3 - 4.3.6 ([WILDCARD]) +│ ├── npm:assertion-error@1.1.0 ([WILDCARD]) +│ ├── npm:check-error@1.0.2 ([WILDCARD]) +│ ├─┬ npm:deep-eql@3.0.1 ([WILDCARD]) +│ │ └── npm:type-detect@4.0.8 ([WILDCARD]) +│ ├── npm:get-func-name@2.0.0 ([WILDCARD]) +│ ├─┬ npm:loupe@2.3.4 ([WILDCARD]) +│ │ └── npm:get-func-name@2.0.0 ([WILDCARD]) +│ ├── npm:pathval@1.1.1 ([WILDCARD]) +│ └── npm:type-detect@4.0.8 ([WILDCARD]) +└─┬ npm:chalk@4 - 4.1.2 ([WILDCARD]) + ├─┬ npm:ansi-styles@4.3.0 ([WILDCARD]) + │ └─┬ npm:color-convert@2.0.1 ([WILDCARD]) + │ └── npm:color-name@1.1.4 ([WILDCARD]) + └─┬ npm:supports-color@7.2.0 ([WILDCARD]) + └── npm:has-flag@4.0.0 ([WILDCARD]) diff --git a/cli/tests/testdata/npm/cjs_with_deps/main_info_json.out b/cli/tests/testdata/npm/cjs_with_deps/main_info_json.out new file mode 100644 index 000000000..bc7b9e162 --- /dev/null +++ b/cli/tests/testdata/npm/cjs_with_deps/main_info_json.out @@ -0,0 +1,146 @@ +{ + "roots": [ + "file://[WILDCARD]/main.js" + ], + "modules": [ + { + "dependencies": [ + { + "specifier": "npm:chai@4.3", + "code": { + "specifier": "npm:chai@4.3", + "span": { + "start": { + "line": 1, + "character": 23 + }, + "end": { + "line": 1, + "character": 37 + } + } + }, + "npmPackage": "chai@4.3.6" + }, + { + "specifier": "npm:chalk@4", + "code": { + "specifier": "npm:chalk@4", + "span": { + "start": { + "line": 0, + "character": 18 + }, + "end": { + "line": 0, + "character": 31 + } + } + }, + "npmPackage": "chalk@4.1.2" + } + ], + "kind": "esm", + "local": "[WILDCARD]main.js", + "emit": null, + "map": null, + "size": 325, + "mediaType": "JavaScript", + "specifier": "[WILDCARD]/main.js" + } + ], + "redirects": {}, + "npmPackages": { + "ansi-styles@4.3.0": { + "name": "ansi-styles", + "version": "4.3.0", + "dependencies": [ + "color-convert@2.0.1" + ] + }, + "assertion-error@1.1.0": { + "name": "assertion-error", + "version": "1.1.0", + "dependencies": [] + }, + "chai@4.3.6": { + "name": "chai", + "version": "4.3.6", + "dependencies": [ + "assertion-error@1.1.0", + "check-error@1.0.2", + "deep-eql@3.0.1", + "get-func-name@2.0.0", + "loupe@2.3.4", + "pathval@1.1.1", + "type-detect@4.0.8" + ] + }, + "chalk@4.1.2": { + "name": "chalk", + "version": "4.1.2", + "dependencies": [ + "ansi-styles@4.3.0", + "supports-color@7.2.0" + ] + }, + "check-error@1.0.2": { + "name": "check-error", + "version": "1.0.2", + "dependencies": [] + }, + "color-convert@2.0.1": { + "name": "color-convert", + "version": "2.0.1", + "dependencies": [ + "color-name@1.1.4" + ] + }, + "color-name@1.1.4": { + "name": "color-name", + "version": "1.1.4", + "dependencies": [] + }, + "deep-eql@3.0.1": { + "name": "deep-eql", + "version": "3.0.1", + "dependencies": [ + "type-detect@4.0.8" + ] + }, + "get-func-name@2.0.0": { + "name": "get-func-name", + "version": "2.0.0", + "dependencies": [] + }, + "has-flag@4.0.0": { + "name": "has-flag", + "version": "4.0.0", + "dependencies": [] + }, + "loupe@2.3.4": { + "name": "loupe", + "version": "2.3.4", + "dependencies": [ + "get-func-name@2.0.0" + ] + }, + "pathval@1.1.1": { + "name": "pathval", + "version": "1.1.1", + "dependencies": [] + }, + "supports-color@7.2.0": { + "name": "supports-color", + "version": "7.2.0", + "dependencies": [ + "has-flag@4.0.0" + ] + }, + "type-detect@4.0.8": { + "name": "type-detect", + "version": "4.0.8", + "dependencies": [] + } + } +} diff --git a/cli/tests/testdata/npm/deno_info_chalk.out b/cli/tests/testdata/npm/deno_info_chalk.out deleted file mode 100644 index 89ea05e71..000000000 --- a/cli/tests/testdata/npm/deno_info_chalk.out +++ /dev/null @@ -1,10 +0,0 @@ -type: Unknown -dependencies: 5 unique -size: [WILDCARD] - -npm:chalk@4 - 4.1.2 ([WILDCARD]) -├─┬ npm:ansi-styles@4.3.0 ([WILDCARD]) -│ └─┬ npm:color-convert@2.0.1 ([WILDCARD]) -│ └── npm:color-name@1.1.4 ([WILDCARD]) -└─┬ npm:supports-color@7.2.0 ([WILDCARD]) - └── npm:has-flag@4.0.0 ([WILDCARD]) diff --git a/cli/tests/testdata/npm/info/chalk.out b/cli/tests/testdata/npm/info/chalk.out new file mode 100644 index 000000000..89ea05e71 --- /dev/null +++ b/cli/tests/testdata/npm/info/chalk.out @@ -0,0 +1,10 @@ +type: Unknown +dependencies: 5 unique +size: [WILDCARD] + +npm:chalk@4 - 4.1.2 ([WILDCARD]) +├─┬ npm:ansi-styles@4.3.0 ([WILDCARD]) +│ └─┬ npm:color-convert@2.0.1 ([WILDCARD]) +│ └── npm:color-name@1.1.4 ([WILDCARD]) +└─┬ npm:supports-color@7.2.0 ([WILDCARD]) + └── npm:has-flag@4.0.0 ([WILDCARD]) diff --git a/cli/tests/testdata/npm/info/chalk_json.out b/cli/tests/testdata/npm/info/chalk_json.out new file mode 100644 index 000000000..f6673d032 --- /dev/null +++ b/cli/tests/testdata/npm/info/chalk_json.out @@ -0,0 +1,54 @@ +{ + "roots": [ + "npm:chalk@4" + ], + "modules": [ + { + "kind": "npm", + "specifier": "npm:chalk@4", + "npmPackage": "chalk@4.1.2" + } + ], + "redirects": {}, + "npmPackages": { + "ansi-styles@4.3.0": { + "name": "ansi-styles", + "version": "4.3.0", + "dependencies": [ + "color-convert@2.0.1" + ] + }, + "chalk@4.1.2": { + "name": "chalk", + "version": "4.1.2", + "dependencies": [ + "ansi-styles@4.3.0", + "supports-color@7.2.0" + ] + }, + "color-convert@2.0.1": { + "name": "color-convert", + "version": "2.0.1", + "dependencies": [ + "color-name@1.1.4" + ] + }, + "color-name@1.1.4": { + "name": "color-name", + "version": "1.1.4", + "dependencies": [] + }, + "has-flag@4.0.0": { + "name": "has-flag", + "version": "4.0.0", + "dependencies": [] + }, + "supports-color@7.2.0": { + "name": "supports-color", + "version": "7.2.0", + "dependencies": [ + "has-flag@4.0.0" + ] + } + } +} -- cgit v1.2.3