diff options
Diffstat (limited to 'cli/tests')
-rw-r--r-- | cli/tests/022_info_flag_script.out | 21 | ||||
-rw-r--r-- | cli/tests/031_info_no_check.out | 5 | ||||
-rw-r--r-- | cli/tests/049_info_flag_script_jsx.out | 21 | ||||
-rw-r--r-- | cli/tests/054_info_local_imports.out | 11 | ||||
-rw-r--r-- | cli/tests/055_info_file_json.out | 43 | ||||
-rw-r--r-- | cli/tests/cafile_info.ts.out | 21 | ||||
-rw-r--r-- | cli/tests/info_recursive_imports_test.out | 11 | ||||
-rw-r--r-- | cli/tests/info_recursive_imports_test.ts | 5 | ||||
-rw-r--r-- | cli/tests/info_type_import.out | 8 | ||||
-rw-r--r-- | cli/tests/integration_tests.rs | 38 | ||||
-rw-r--r-- | cli/tests/recursive_imports/A.ts | 7 | ||||
-rw-r--r-- | cli/tests/recursive_imports/B.ts | 7 | ||||
-rw-r--r-- | cli/tests/recursive_imports/C.ts | 8 | ||||
-rw-r--r-- | cli/tests/recursive_imports/common.ts | 2 |
14 files changed, 144 insertions, 64 deletions
diff --git a/cli/tests/022_info_flag_script.out b/cli/tests/022_info_flag_script.out index d17f31d77..e84c253e9 100644 --- a/cli/tests/022_info_flag_script.out +++ b/cli/tests/022_info_flag_script.out @@ -1,14 +1,13 @@ [WILDCARD] local: [WILDCARD]http[WILDCARD]127.0.0.1_PORT4545[WILDCARD] type: TypeScript -compiled: [WILDCARD].js -deps: -http://127.0.0.1:4545/cli/tests/019_media_types.ts - ├── http://localhost:4545/cli/tests/subdir/mt_text_typescript.t1.ts - ├── http://localhost:4545/cli/tests/subdir/mt_video_vdn.t2.ts - ├── http://localhost:4545/cli/tests/subdir/mt_video_mp2t.t3.ts - ├── http://localhost:4545/cli/tests/subdir/mt_application_x_typescript.t4.ts - ├── http://localhost:4545/cli/tests/subdir/mt_text_javascript.j1.js - ├── http://localhost:4545/cli/tests/subdir/mt_application_ecmascript.j2.js - ├── http://localhost:4545/cli/tests/subdir/mt_text_ecmascript.j3.js - └── http://localhost:4545/cli/tests/subdir/mt_application_x_javascript.j4.js +deps: 8 unique (total [WILDCARD]) +http://127.0.0.1:4545/cli/tests/019_media_types.ts ([WILDCARD]) +├── http://localhost:4545/cli/tests/subdir/mt_text_typescript.t1.ts ([WILDCARD]) +├── http://localhost:4545/cli/tests/subdir/mt_video_vdn.t2.ts ([WILDCARD]) +├── http://localhost:4545/cli/tests/subdir/mt_video_mp2t.t3.ts ([WILDCARD]) +├── http://localhost:4545/cli/tests/subdir/mt_application_x_typescript.t4.ts ([WILDCARD]) +├── http://localhost:4545/cli/tests/subdir/mt_text_javascript.j1.js ([WILDCARD]) +├── http://localhost:4545/cli/tests/subdir/mt_application_ecmascript.j2.js ([WILDCARD]) +├── http://localhost:4545/cli/tests/subdir/mt_text_ecmascript.j3.js ([WILDCARD]) +└── http://localhost:4545/cli/tests/subdir/mt_application_x_javascript.j4.js ([WILDCARD]) diff --git a/cli/tests/031_info_no_check.out b/cli/tests/031_info_no_check.out index 5b67e3f2f..601490055 100644 --- a/cli/tests/031_info_no_check.out +++ b/cli/tests/031_info_no_check.out @@ -1,6 +1,5 @@ [WILDCARD] local: [WILDCARD]031_info_no_check.ts type: TypeScript -compiled: [WILDCARD].js -deps: -[WILDCARD]031_info_no_check.ts +deps: 0 unique (total [WILDCARD]) +[WILDCARD]031_info_no_check.ts ([WILDCARD]) diff --git a/cli/tests/049_info_flag_script_jsx.out b/cli/tests/049_info_flag_script_jsx.out index fd5b511dc..b5fdd980a 100644 --- a/cli/tests/049_info_flag_script_jsx.out +++ b/cli/tests/049_info_flag_script_jsx.out @@ -1,14 +1,13 @@ [WILDCARD] local: [WILDCARD]http[WILDCARD]127.0.0.1_PORT4545[WILDCARD] type: TypeScript -compiled: [WILDCARD].js -deps: -http://127.0.0.1:4545/cli/tests/048_media_types_jsx.ts - ├── http://localhost:4545/cli/tests/subdir/mt_text_typescript_tsx.t1.tsx - ├── http://localhost:4545/cli/tests/subdir/mt_video_vdn_tsx.t2.tsx - ├── http://localhost:4545/cli/tests/subdir/mt_video_mp2t_tsx.t3.tsx - ├── http://localhost:4545/cli/tests/subdir/mt_application_x_typescript_tsx.t4.tsx - ├── http://localhost:4545/cli/tests/subdir/mt_text_javascript_jsx.j1.jsx - ├── http://localhost:4545/cli/tests/subdir/mt_application_ecmascript_jsx.j2.jsx - ├── http://localhost:4545/cli/tests/subdir/mt_text_ecmascript_jsx.j3.jsx - └── http://localhost:4545/cli/tests/subdir/mt_application_x_javascript_jsx.j4.jsx +deps: 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_text_typescript_tsx.t1.tsx ([WILDCARD]) +├── http://localhost:4545/cli/tests/subdir/mt_video_vdn_tsx.t2.tsx ([WILDCARD]) +├── http://localhost:4545/cli/tests/subdir/mt_video_mp2t_tsx.t3.tsx ([WILDCARD]) +├── http://localhost:4545/cli/tests/subdir/mt_application_x_typescript_tsx.t4.tsx ([WILDCARD]) +├── http://localhost:4545/cli/tests/subdir/mt_text_javascript_jsx.j1.jsx ([WILDCARD]) +├── http://localhost:4545/cli/tests/subdir/mt_application_ecmascript_jsx.j2.jsx ([WILDCARD]) +├── http://localhost:4545/cli/tests/subdir/mt_text_ecmascript_jsx.j3.jsx ([WILDCARD]) +└── http://localhost:4545/cli/tests/subdir/mt_application_x_javascript_jsx.j4.jsx ([WILDCARD]) diff --git a/cli/tests/054_info_local_imports.out b/cli/tests/054_info_local_imports.out index fdf2f44a6..d199dccb3 100644 --- a/cli/tests/054_info_local_imports.out +++ b/cli/tests/054_info_local_imports.out @@ -1,8 +1,7 @@ local: [WILDCARD]005_more_imports.ts type: TypeScript -compiled: [WILDCARD].js -deps: -file://[WILDCARD]/005_more_imports.ts - └─┬ file://[WILDCARD]/subdir/mod1.ts - └─┬ file://[WILDCARD]/subdir/subdir2/mod2.ts - └── file://[WILDCARD]/subdir/print_hello.ts +deps: 3 unique (total [WILDCARD]) +file://[WILDCARD]/005_more_imports.ts ([WILDCARD]) +└─┬ file://[WILDCARD]/subdir/mod1.ts ([WILDCARD]) + └─┬ file://[WILDCARD]/subdir/subdir2/mod2.ts ([WILDCARD]) + └── file://[WILDCARD]/subdir/print_hello.ts ([WILDCARD]) diff --git a/cli/tests/055_info_file_json.out b/cli/tests/055_info_file_json.out index 08dc73790..5c5da8836 100644 --- a/cli/tests/055_info_file_json.out +++ b/cli/tests/055_info_file_json.out @@ -1,25 +1,34 @@ { "local": "[WILDCARD]005_more_imports.ts", "fileType": "TypeScript", - "compiled": "[WILDCARD].js", + "compiled": null, "map": null, - "deps": [ - "file://[WILDCARD]/005_more_imports.ts", - [ - [ - "file://[WILDCARD]/subdir/mod1.ts", - [ - [ - "file://[WILDCARD]/subdir/subdir2/mod2.ts", - [ - [ - "file://[WILDCARD]/subdir/print_hello.ts", - [] - ] + "depCount": 3, + "deps": { + "name": "file://[WILDCARD]/005_more_imports.ts", + "size": 211, + "totalSize": 757, + "deps": [ + { + "name": "file://[WILDCARD]/subdir/mod1.ts", + "size": 320, + "totalSize": 546, + "deps": [ + { + "name": "file://[WILDCARD]/subdir/subdir2/mod2.ts", + "size": 163, + "totalSize": 226, + "deps": [ + { + "name": "file://[WILDCARD]/subdir/print_hello.ts", + "size": 63, + "totalSize": 63, + "deps": [] + } ] - ] + } ] - ] + } ] - ] + } }
\ No newline at end of file diff --git a/cli/tests/cafile_info.ts.out b/cli/tests/cafile_info.ts.out index f39f381d7..98b82df38 100644 --- a/cli/tests/cafile_info.ts.out +++ b/cli/tests/cafile_info.ts.out @@ -1,13 +1,12 @@ local: [WILDCARD]https[WILDCARD]localhost_PORT5545[WILDCARD] type: TypeScript -compiled: [WILDCARD].js -deps: -https://localhost:5545/cli/tests/cafile_info.ts - ├── https://localhost:5545/cli/tests/subdir/mt_text_typescript.t1.ts - ├── https://localhost:5545/cli/tests/subdir/mt_video_vdn.t2.ts - ├── https://localhost:5545/cli/tests/subdir/mt_video_mp2t.t3.ts - ├── https://localhost:5545/cli/tests/subdir/mt_application_x_typescript.t4.ts - ├── https://localhost:5545/cli/tests/subdir/mt_text_javascript.j1.js - ├── https://localhost:5545/cli/tests/subdir/mt_application_ecmascript.j2.js - ├── https://localhost:5545/cli/tests/subdir/mt_text_ecmascript.j3.js - └── https://localhost:5545/cli/tests/subdir/mt_application_x_javascript.j4.js +deps: 8 unique (total [WILDCARD]) +https://localhost:5545/cli/tests/cafile_info.ts ([WILDCARD]) +├── https://localhost:5545/cli/tests/subdir/mt_text_typescript.t1.ts ([WILDCARD]) +├── https://localhost:5545/cli/tests/subdir/mt_video_vdn.t2.ts ([WILDCARD]) +├── https://localhost:5545/cli/tests/subdir/mt_video_mp2t.t3.ts ([WILDCARD]) +├── https://localhost:5545/cli/tests/subdir/mt_application_x_typescript.t4.ts ([WILDCARD]) +├── https://localhost:5545/cli/tests/subdir/mt_text_javascript.j1.js ([WILDCARD]) +├── https://localhost:5545/cli/tests/subdir/mt_application_ecmascript.j2.js ([WILDCARD]) +├── https://localhost:5545/cli/tests/subdir/mt_text_ecmascript.j3.js ([WILDCARD]) +└── https://localhost:5545/cli/tests/subdir/mt_application_x_javascript.j4.js ([WILDCARD]) diff --git a/cli/tests/info_recursive_imports_test.out b/cli/tests/info_recursive_imports_test.out new file mode 100644 index 000000000..12fb0e7d3 --- /dev/null +++ b/cli/tests/info_recursive_imports_test.out @@ -0,0 +1,11 @@ +local: [WILDCARD]info_recursive_imports_test.ts +type: TypeScript +deps: 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 * + └── file://[WILDCARD]cli/tests/recursive_imports/common.ts * diff --git a/cli/tests/info_recursive_imports_test.ts b/cli/tests/info_recursive_imports_test.ts new file mode 100644 index 000000000..0937bf4a5 --- /dev/null +++ b/cli/tests/info_recursive_imports_test.ts @@ -0,0 +1,5 @@ +import { A } from "./recursive_imports/A.ts"; + +export function test(): void { + A(); +} diff --git a/cli/tests/info_type_import.out b/cli/tests/info_type_import.out index 4096090b3..dc2a3dfe8 100644 --- a/cli/tests/info_type_import.out +++ b/cli/tests/info_type_import.out @@ -1,7 +1,5 @@ -Check [WILDCARD]info_type_import.ts local: [WILDCARD]info_type_import.ts type: TypeScript -compiled: [WILDCARD] -deps: -[WILDCARD]info_type_import.ts - └── [WILDCARD]type_and_code.ts +deps: 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 94d410dcc..4b1b67f7f 100644 --- a/cli/tests/integration_tests.rs +++ b/cli/tests/integration_tests.rs @@ -950,6 +950,38 @@ fn bundle_import_map() { } #[test] +fn info_with_compiled_source() { + let _g = util::http_server(); + let module_path = "http://127.0.0.1:4545/cli/tests/048_media_types_jsx.ts"; + let t = TempDir::new().expect("tempdir fail"); + + let mut deno = util::deno_cmd() + .env("DENO_DIR", t.path()) + .current_dir(util::root_path()) + .arg("cache") + .arg(&module_path) + .spawn() + .expect("failed to spawn script"); + let status = deno.wait().expect("failed to wait for the child process"); + assert!(status.success()); + + let output = util::deno_cmd() + .env("DENO_DIR", t.path()) + .env("NO_COLOR", "1") + .current_dir(util::root_path()) + .arg("info") + .arg(&module_path) + .output() + .expect("failed to spawn script"); + + 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_eq!(output.stderr, b""); +} + +#[test] fn repl_test_console_log() { let (out, err) = util::run_and_collect_output( true, @@ -2289,6 +2321,12 @@ itest!(import_file_with_colon { http_server: true, }); +itest!(info_recursive_modules { + args: "info --quiet info_recursive_imports_test.ts", + output: "info_recursive_imports_test.out", + exit_code: 0, +}); + itest!(info_type_import { args: "info info_type_import.ts", output: "info_type_import.out", diff --git a/cli/tests/recursive_imports/A.ts b/cli/tests/recursive_imports/A.ts new file mode 100644 index 000000000..04ef61581 --- /dev/null +++ b/cli/tests/recursive_imports/A.ts @@ -0,0 +1,7 @@ +import { B } from "./B.ts"; +import { thing } from "./common.ts"; + +export function A(): void { + thing(); + B(); +} diff --git a/cli/tests/recursive_imports/B.ts b/cli/tests/recursive_imports/B.ts new file mode 100644 index 000000000..a6e6917fd --- /dev/null +++ b/cli/tests/recursive_imports/B.ts @@ -0,0 +1,7 @@ +import { C } from "./C.ts"; +import { thing } from "./common.ts"; + +export function B(): void { + thing(); + C(); +} diff --git a/cli/tests/recursive_imports/C.ts b/cli/tests/recursive_imports/C.ts new file mode 100644 index 000000000..be6ef9240 --- /dev/null +++ b/cli/tests/recursive_imports/C.ts @@ -0,0 +1,8 @@ +import { A } from "./A.ts"; +import { thing } from "./common.ts"; + +export function C(): void { + if (A != null) { + thing(); + } +} diff --git a/cli/tests/recursive_imports/common.ts b/cli/tests/recursive_imports/common.ts new file mode 100644 index 000000000..d0f41395d --- /dev/null +++ b/cli/tests/recursive_imports/common.ts @@ -0,0 +1,2 @@ +export function thing(): void { +} |