diff options
author | Kitson Kelly <me@kitsonkelly.com> | 2021-03-01 22:49:58 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-01 22:49:58 +1100 |
commit | 6dae6277497c0b083f25ead2ab020482dcd5c45f (patch) | |
tree | 277ea88704a6476d8f2848adecb29f6cc47afef5 /cli/tests | |
parent | 0dc89c0a793fa80b4c3ef89128fc674ec62b72a3 (diff) |
feat(cli): represent type dependencies in info (#9630)
Fixes #7927
Diffstat (limited to 'cli/tests')
-rw-r--r-- | cli/tests/017_import_redirect_info.out | 4 | ||||
-rw-r--r-- | cli/tests/022_info_flag_script.out | 2 | ||||
-rw-r--r-- | cli/tests/031_info_ts_error.out | 2 | ||||
-rw-r--r-- | cli/tests/049_info_flag_script_jsx.out | 2 | ||||
-rw-r--r-- | cli/tests/054_info_local_imports.out | 2 | ||||
-rw-r--r-- | cli/tests/055_info_file_json.out | 71 | ||||
-rw-r--r-- | cli/tests/065_import_map_info.out | 2 | ||||
-rw-r--r-- | cli/tests/076_info_json_deps_order.out | 103 | ||||
-rw-r--r-- | cli/tests/info_missing_module.out | 8 | ||||
-rw-r--r-- | cli/tests/info_recursive_imports_test.out | 8 | ||||
-rw-r--r-- | cli/tests/info_type_import.out | 2 | ||||
-rw-r--r-- | cli/tests/integration_tests.rs | 3 |
12 files changed, 141 insertions, 68 deletions
diff --git a/cli/tests/017_import_redirect_info.out b/cli/tests/017_import_redirect_info.out index ff23915a9..662b237a4 100644 --- a/cli/tests/017_import_redirect_info.out +++ b/cli/tests/017_import_redirect_info.out @@ -1,6 +1,6 @@ local: [WILDCARD]017_import_redirect.ts type: TypeScript -deps: 1 unique (total [WILDCARD]B) +dependencies: 1 unique (total 278B) file:///[WILDCARD]cli/tests/017_import_redirect.ts ([WILDCARD]) -└── http://gist.githubusercontent.com/ry/f12b2aa3409e6b52645bc346a9e22929/raw/79318f239f51d764384a8bded8d7c6a833610dde/print_hello.ts ([WILDCARD]) +└── https://gist.githubusercontent.com/ry/f12b2aa3409e6b52645bc346a9e22929/raw/79318f239f51d764384a8bded8d7c6a833610dde/print_hello.ts ([WILDCARD]) diff --git a/cli/tests/022_info_flag_script.out b/cli/tests/022_info_flag_script.out index 83425f09f..878b0fa08 100644 --- a/cli/tests/022_info_flag_script.out +++ b/cli/tests/022_info_flag_script.out @@ -1,7 +1,7 @@ [WILDCARD] local: [WILDCARD]http[WILDCARD]127.0.0.1_PORT4545[WILDCARD] type: TypeScript -deps: 8 unique (total [WILDCARD]) +dependencies: 8 unique (total [WILDCARD]) http://127.0.0.1:4545/cli/tests/019_media_types.ts ([WILDCARD]) ├── http://localhost:4545/cli/tests/subdir/mt_application_ecmascript.j2.js ([WILDCARD]) diff --git a/cli/tests/031_info_ts_error.out b/cli/tests/031_info_ts_error.out index 8c3064cdf..2dc7bb4e8 100644 --- a/cli/tests/031_info_ts_error.out +++ b/cli/tests/031_info_ts_error.out @@ -1,5 +1,5 @@ [WILDCARD] local: [WILDCARD]031_info_ts_error.ts type: TypeScript -deps: 0 unique (total [WILDCARD]) +dependencies: 0 unique (total [WILDCARD]) [WILDCARD]031_info_ts_error.ts ([WILDCARD]) diff --git a/cli/tests/049_info_flag_script_jsx.out b/cli/tests/049_info_flag_script_jsx.out index 9260e8f67..0ad6608d4 100644 --- a/cli/tests/049_info_flag_script_jsx.out +++ b/cli/tests/049_info_flag_script_jsx.out @@ -1,7 +1,7 @@ [WILDCARD] local: [WILDCARD]http[WILDCARD]127.0.0.1_PORT4545[WILDCARD] type: TypeScript -deps: 8 unique (total [WILDCARD]) +dependencies: 8 unique (total [WILDCARD]) http://127.0.0.1:4545/cli/tests/048_media_types_jsx.ts ([WILDCARD]) ├── http://localhost:4545/cli/tests/subdir/mt_application_ecmascript_jsx.j2.jsx ([WILDCARD]) diff --git a/cli/tests/054_info_local_imports.out b/cli/tests/054_info_local_imports.out index 1933a0c9c..cde5ff3ab 100644 --- a/cli/tests/054_info_local_imports.out +++ b/cli/tests/054_info_local_imports.out @@ -1,6 +1,6 @@ local: [WILDCARD]005_more_imports.ts type: TypeScript -deps: 3 unique (total [WILDCARD]) +dependencies: 3 unique (total [WILDCARD]) file://[WILDCARD]/005_more_imports.ts ([WILDCARD]) └─┬ file://[WILDCARD]/subdir/mod1.ts ([WILDCARD]) diff --git a/cli/tests/055_info_file_json.out b/cli/tests/055_info_file_json.out index d0274b0b8..602c48b32 100644 --- a/cli/tests/055_info_file_json.out +++ b/cli/tests/055_info_file_json.out @@ -1,33 +1,56 @@ { - "compiled": null, - "depCount": 3, - "fileType": "TypeScript", - "files": { - "file:///[WILDCARD]/cli/tests/005_more_imports.ts": { - "deps": [ - "file:///[WILDCARD]/cli/tests/subdir/mod1.ts" + "root": "file://[WILDCARD]/cli/tests/005_more_imports.ts", + "modules": [ + { + "specifier": "file://[WILDCARD]/cli/tests/005_more_imports.ts", + "dependencies": [ + { + "specifier": "./subdir/mod1.ts", + "isDynamic": false, + "code": "file://[WILDCARD]/cli/tests/subdir/mod1.ts" + } ], - "size": 211 + "size": 211, + "mediaType": "TypeScript", + "local": "[WILDCARD]005_more_imports.ts", + [WILDCARD] }, - "file:///[WILDCARD]/cli/tests/subdir/mod1.ts": { - "deps": [ - "file:///[WILDCARD]/cli/tests/subdir/subdir2/mod2.ts" + { + "specifier": "file://[WILDCARD]/cli/tests/subdir/mod1.ts", + "dependencies": [ + { + "specifier": "./subdir2/mod2.ts", + "isDynamic": false, + "code": "file://[WILDCARD]/cli/tests/subdir/subdir2/mod2.ts" + } ], - "size": 320 + "size": 320, + "mediaType": "TypeScript", + "local": "[WILDCARD]mod1.ts", + [WILDCARD] }, - "file:///[WILDCARD]/cli/tests/subdir/print_hello.ts": { - "deps": [], - "size": 63 + { + "specifier": "file://[WILDCARD]/cli/tests/subdir/print_hello.ts", + "dependencies": [], + "size": 63, + "mediaType": "TypeScript", + "local": "[WILDCARD]print_hello.ts", + [WILDCARD] }, - "file:///[WILDCARD]/cli/tests/subdir/subdir2/mod2.ts": { - "deps": [ - "file:///[WILDCARD]/cli/tests/subdir/print_hello.ts" + { + "specifier": "file://[WILDCARD]/cli/tests/subdir/subdir2/mod2.ts", + "dependencies": [ + { + "specifier": "../print_hello.ts", + "isDynamic": false, + "code": "file://[WILDCARD]/cli/tests/subdir/print_hello.ts" + } ], - "size": 163 + "size": 163, + "mediaType": "TypeScript", + "local": "[WILDCARD]mod2.ts", + [WILDCARD] } - }, - "local": "[WILDCARD]005_more_imports.ts", - "map": null, - "module": "file:///[WILDCARD]/cli/tests/005_more_imports.ts", - "totalSize": 757 + ], + "size": 757 }
\ No newline at end of file diff --git a/cli/tests/065_import_map_info.out b/cli/tests/065_import_map_info.out index 5407b7d80..8771d0594 100644 --- a/cli/tests/065_import_map_info.out +++ b/cli/tests/065_import_map_info.out @@ -1,5 +1,5 @@ [WILDCARD] local: [WILDCARD]test.ts type: TypeScript -deps: 7 unique (total [WILDCARD]) +dependencies: 7 unique (total [WILDCARD]) [WILDCARD] diff --git a/cli/tests/076_info_json_deps_order.out b/cli/tests/076_info_json_deps_order.out index 0c125122f..615732e67 100644 --- a/cli/tests/076_info_json_deps_order.out +++ b/cli/tests/076_info_json_deps_order.out @@ -1,38 +1,85 @@ { - "compiled": null, - "depCount": 4, - "fileType": "TypeScript", - "files": { - "[WILDCARD]cli/tests/076_info_json_deps_order.ts": { - "deps": [ - "[WILDCARD]cli/tests/recursive_imports/A.ts" + "root": "file://[WILDCARD]/cli/tests/076_info_json_deps_order.ts", + "modules": [ + { + "specifier": "file://[WILDCARD]/cli/tests/076_info_json_deps_order.ts", + "dependencies": [ + { + "specifier": "./recursive_imports/A.ts", + "isDynamic": false, + "code": "file://[WILDCARD]/cli/tests/recursive_imports/A.ts" + } ], - "size": [WILDCARD] + "size": 46, + "mediaType": "TypeScript", + "local": "[WILDCARD]076_info_json_deps_order.ts", + "checksum": "88b144f362d31ac42263648aadef727dd36d039d3b8ac0248fdaff25d4de415a" }, - "[WILDCARD]cli/tests/recursive_imports/A.ts": { - "deps": [ - "[WILDCARD]cli/tests/recursive_imports/B.ts", - "[WILDCARD]cli/tests/recursive_imports/common.ts" + { + "specifier": "file://[WILDCARD]/cli/tests/recursive_imports/A.ts", + "dependencies": [ + { + "specifier": "./B.ts", + "isDynamic": false, + "code": "file://[WILDCARD]/cli/tests/recursive_imports/B.ts" + }, + { + "specifier": "./common.ts", + "isDynamic": false, + "code": "file://[WILDCARD]/cli/tests/recursive_imports/common.ts" + } ], - "size": [WILDCARD] + "size": 114, + "mediaType": "TypeScript", + "local": "[WILDCARD]A.ts", + "checksum": "da204c16d3114763810864083af8891a887d65fbe34e4c8b5bf985dbc8f0b01f" }, - "[WILDCARD]cli/tests/recursive_imports/B.ts": { - "deps": [ - "[WILDCARD]cli/tests/recursive_imports/C.ts", - "[WILDCARD]cli/tests/recursive_imports/common.ts" + { + "specifier": "file://[WILDCARD]/cli/tests/recursive_imports/B.ts", + "dependencies": [ + { + "specifier": "./C.ts", + "isDynamic": false, + "code": "file://[WILDCARD]/cli/tests/recursive_imports/C.ts" + }, + { + "specifier": "./common.ts", + "isDynamic": false, + "code": "file://[WILDCARD]/cli/tests/recursive_imports/common.ts" + } ], - "size": [WILDCARD] + "size": 114, + "mediaType": "TypeScript", + "local": "[WILDCARD]B.ts", + "checksum": "060ef62435d7e3a3276e8894307b19cf17772210a20dd091d24a670fadec6b83" }, - "[WILDCARD]cli/tests/recursive_imports/C.ts": { - "deps": [ - "[WILDCARD]cli/tests/recursive_imports/A.ts", - "[WILDCARD]cli/tests/recursive_imports/common.ts" + { + "specifier": "file://[WILDCARD]/cli/tests/recursive_imports/C.ts", + "dependencies": [ + { + "specifier": "./A.ts", + "isDynamic": false, + "code": "file://[WILDCARD]/cli/tests/recursive_imports/A.ts" + }, + { + "specifier": "./common.ts", + "isDynamic": false, + "code": "file://[WILDCARD]/cli/tests/recursive_imports/common.ts" + } ], - "size": [WILDCARD] + "size": 132, + "mediaType": "TypeScript", + "local": "[WILDCARD]C.ts", + "checksum": "5190563583617a69f190f1cc76e6552df878df278cfaa5d5e30ebe0938cf5e0b" }, - "[WILDCARD]cli/tests/recursive_imports/common.ts": { - "deps": [], - "size": [WILDCARD] + { + "specifier": "file://[WILDCARD]/cli/tests/recursive_imports/common.ts", + "dependencies": [], + "size": 34, + "mediaType": "TypeScript", + "local": "[WILDCARD]common.ts", + "checksum": "01b595d69514bfd001ba2cf421feabeaef559513f10697bf1a22781f8a8ed7f0" } - }, -[WILDCARD] + ], + "size": 440 +}
\ No newline at end of file diff --git a/cli/tests/info_missing_module.out b/cli/tests/info_missing_module.out index fd9b9b763..e01cd098e 100644 --- a/cli/tests/info_missing_module.out +++ b/cli/tests/info_missing_module.out @@ -1,2 +1,6 @@ -error: Cannot resolve module "file://[WILDCARD]/bad-module.js" from "file://[WILDCARD]/error_009_missing_js_module.js". - at file://[WILDCARD]/error_009_missing_js_module.js:1:0 +local: [WILDCARD]error_009_missing_js_module.js +type: JavaScript +dependencies: 1 unique (total 26B) + +file://[WILDCARD]/cli/tests/error_009_missing_js_module.js (26B) +└── file://[WILDCARD]/cli/tests/bad-module.js (error) diff --git a/cli/tests/info_recursive_imports_test.out b/cli/tests/info_recursive_imports_test.out index 4afd00544..7b53ed89b 100644 --- a/cli/tests/info_recursive_imports_test.out +++ b/cli/tests/info_recursive_imports_test.out @@ -1,12 +1,12 @@ local: [WILDCARD]info_recursive_imports_test.ts type: TypeScript -deps: 4 unique (total [WILDCARD]) +dependencies: 4 unique (total [WILDCARD]) file://[WILDCARD]cli/tests/info_recursive_imports_test.ts ([WILDCARD]) └─┬ file://[WILDCARD]cli/tests/recursive_imports/A.ts ([WILDCARD]) ├─┬ file://[WILDCARD]cli/tests/recursive_imports/B.ts ([WILDCARD]) │ ├─┬ file://[WILDCARD]cli/tests/recursive_imports/C.ts ([WILDCARD]) │ │ ├── file://[WILDCARD]cli/tests/recursive_imports/A.ts * - │ │ └── file://[WILDCARD]cli/tests/recursive_imports/common.ts [WILDCARD] - │ └── file://[WILDCARD]cli/tests/recursive_imports/common.ts [WILDCARD] - └── file://[WILDCARD]cli/tests/recursive_imports/common.ts [WILDCARD] + │ │ └── file://[WILDCARD]cli/tests/recursive_imports/common.ts ([WILDCARD]) + │ └── file://[WILDCARD]cli/tests/recursive_imports/common.ts * + └── file://[WILDCARD]cli/tests/recursive_imports/common.ts * diff --git a/cli/tests/info_type_import.out b/cli/tests/info_type_import.out index dc2a3dfe8..6b9869f1f 100644 --- a/cli/tests/info_type_import.out +++ b/cli/tests/info_type_import.out @@ -1,5 +1,5 @@ local: [WILDCARD]info_type_import.ts type: TypeScript -deps: 1 unique (total [WILDCARD]) +dependencies: 1 unique (total [WILDCARD]) [WILDCARD]info_type_import.ts ([WILDCARD]) └── [WILDCARD]type_and_code.ts ([WILDCARD]) diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs index c59bee2ce..0d076f180 100644 --- a/cli/tests/integration_tests.rs +++ b/cli/tests/integration_tests.rs @@ -1732,7 +1732,7 @@ mod integration { let str_output = std::str::from_utf8(&output.stdout).unwrap().trim(); eprintln!("{}", str_output); // check the output of the test.ts program. - assert!(str_output.contains("compiled: ")); + assert!(str_output.contains("emit: ")); assert_eq!(output.stderr, b""); } @@ -3720,7 +3720,6 @@ console.log("finish"); itest!(info_missing_module { args: "info error_009_missing_js_module.js", output: "info_missing_module.out", - exit_code: 1, }); itest!(info_recursive_modules { |