From 48daf2dc88c2ec340af37a176fd9351010b38929 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Mon, 29 Apr 2024 14:09:58 -0400 Subject: [PATCH] chore: add tests for moduleGraph2 (#23603) Also did some renames from underscores to hyphens --- cli/cache/mod.rs | 1 + tests/integration/jsr_tests.rs | 14 ++++++------ tests/integration/run_tests.rs | 22 +++++++++---------- tests/specs/jsr/deps/main.out | 14 ++++++------ tests/specs/jsr/deps/main_info.out | 20 ++++++++--------- tests/specs/jsr/module_graph/__test__.jsonc | 2 +- tests/specs/jsr/module_graph/main.out | 10 ++++----- tests/specs/jsr/module_graph/main.ts | 2 +- tests/specs/jsr/module_graph/main_info.out | 12 +++++----- tests/specs/jsr/module_graph2/__test__.jsonc | 10 +++++++++ tests/specs/jsr/module_graph2/main.out | 5 +++++ tests/specs/jsr/module_graph2/main.ts | 3 +++ tests/specs/jsr/module_graph2/main_info.out | 14 ++++++++++++ tests/specs/jsr/no_module_graph/main.out | 8 +++---- tests/specs/jsr/no_module_graph/main.ts | 2 +- tests/specs/jsr/no_module_graph/main_info.out | 12 +++++----- tests/specs/jsr/no_module_graph/multiple.ts | 4 ++-- .../jsr/registry/@denotest/deps/1.0.0/mod.ts | 4 ++-- .../registry/@denotest/deps/1.0.0_meta.json | 4 ++-- .../1.4.0/mod.ts | 0 .../1.4.0/other.ts | 0 .../1.4.0_meta.json | 0 .../{module_graph => module-graph}/meta.json | 0 .../@denotest/module-graph2/1.4.0/mod.ts | 5 +++++ .../@denotest/module-graph2/1.4.0/other.ts | 2 ++ .../@denotest/module-graph2/1.4.0_meta.json | 17 ++++++++++++++ .../@denotest/module-graph2/meta.json | 6 +++++ .../0.1.0/TestClass.ts | 0 .../0.1.0/mod.ts | 0 .../0.1.0_meta.json | 0 .../0.1.1/TestClass.ts | 0 .../0.1.1/mod.ts | 0 .../0.1.1_meta.json | 0 .../0.2.0/TestClass.ts | 0 .../0.2.0/mod.ts | 0 .../0.2.0_meta.json | 0 .../meta.json | 0 37 files changed, 127 insertions(+), 66 deletions(-) create mode 100644 tests/specs/jsr/module_graph2/__test__.jsonc create mode 100644 tests/specs/jsr/module_graph2/main.out create mode 100644 tests/specs/jsr/module_graph2/main.ts create mode 100644 tests/specs/jsr/module_graph2/main_info.out rename tests/testdata/jsr/registry/@denotest/{module_graph => module-graph}/1.4.0/mod.ts (100%) rename tests/testdata/jsr/registry/@denotest/{module_graph => module-graph}/1.4.0/other.ts (100%) rename tests/testdata/jsr/registry/@denotest/{module_graph => module-graph}/1.4.0_meta.json (100%) rename tests/testdata/jsr/registry/@denotest/{module_graph => module-graph}/meta.json (100%) create mode 100644 tests/testdata/jsr/registry/@denotest/module-graph2/1.4.0/mod.ts create mode 100644 tests/testdata/jsr/registry/@denotest/module-graph2/1.4.0/other.ts create mode 100644 tests/testdata/jsr/registry/@denotest/module-graph2/1.4.0_meta.json create mode 100644 tests/testdata/jsr/registry/@denotest/module-graph2/meta.json rename tests/testdata/jsr/registry/@denotest/{no_module_graph => no-module-graph}/0.1.0/TestClass.ts (100%) rename tests/testdata/jsr/registry/@denotest/{no_module_graph => no-module-graph}/0.1.0/mod.ts (100%) rename tests/testdata/jsr/registry/@denotest/{no_module_graph => no-module-graph}/0.1.0_meta.json (100%) rename tests/testdata/jsr/registry/@denotest/{no_module_graph => no-module-graph}/0.1.1/TestClass.ts (100%) rename tests/testdata/jsr/registry/@denotest/{no_module_graph => no-module-graph}/0.1.1/mod.ts (100%) rename tests/testdata/jsr/registry/@denotest/{no_module_graph => no-module-graph}/0.1.1_meta.json (100%) rename tests/testdata/jsr/registry/@denotest/{no_module_graph => no-module-graph}/0.2.0/TestClass.ts (100%) rename tests/testdata/jsr/registry/@denotest/{no_module_graph => no-module-graph}/0.2.0/mod.ts (100%) rename tests/testdata/jsr/registry/@denotest/{no_module_graph => no-module-graph}/0.2.0_meta.json (100%) rename tests/testdata/jsr/registry/@denotest/{no_module_graph => no-module-graph}/meta.json (100%) diff --git a/cli/cache/mod.rs b/cli/cache/mod.rs index 6ddeced9a6..cee93bac55 100644 --- a/cli/cache/mod.rs +++ b/cli/cache/mod.rs @@ -296,6 +296,7 @@ impl Loader for FetchCacher { source: &Arc<[u8]>, module_info: &deno_graph::ModuleInfo, ) { + log::debug!("Caching module info for {}", specifier); let source_hash = ModuleInfoCacheSourceHash::from_source(source); let result = self.module_info_cache.set_module_info( specifier, diff --git a/tests/integration/jsr_tests.rs b/tests/integration/jsr_tests.rs index 307398fc54..83d696093d 100644 --- a/tests/integration/jsr_tests.rs +++ b/tests/integration/jsr_tests.rs @@ -128,7 +128,7 @@ fn specifiers_in_lockfile() { temp_dir.write( "main.ts", - r#"import version from "jsr:@denotest/no_module_graph@0.1"; + r#"import version from "jsr:@denotest/no-module-graph@0.1"; console.log(version);"#, ); @@ -146,8 +146,8 @@ console.log(version);"#, .content .packages .specifiers - .get_mut("jsr:@denotest/no_module_graph@0.1") - .unwrap() = "jsr:@denotest/no_module_graph@0.1.0".to_string(); + .get_mut("jsr:@denotest/no-module-graph@0.1") + .unwrap() = "jsr:@denotest/no-module-graph@0.1.0".to_string(); lockfile_path.write(lockfile.as_json_string()); test_context @@ -238,7 +238,7 @@ fn lockfile_bad_package_integrity() { temp_dir.write( "main.ts", - r#"import version from "jsr:@denotest/no_module_graph@0.1"; + r#"import version from "jsr:@denotest/no-module-graph@0.1"; console.log(version);"#, ); @@ -252,14 +252,14 @@ console.log(version);"#, let lockfile_path = temp_dir.path().join("deno.lock"); let mut lockfile = Lockfile::new(lockfile_path.to_path_buf(), false).unwrap(); - let pkg_name = "@denotest/no_module_graph@0.1.1"; + let pkg_name = "@denotest/no-module-graph@0.1.1"; let original_integrity = get_lockfile_pkg_integrity(&lockfile, pkg_name); set_lockfile_pkg_integrity(&mut lockfile, pkg_name, "bad_integrity"); lockfile_path.write(lockfile.as_json_string()); let actual_integrity = - test_context.get_jsr_package_integrity("@denotest/no_module_graph/0.1.1"); - let integrity_check_failed_msg = format!("error: Integrity check failed for http://127.0.0.1:4250/@denotest/no_module_graph/0.1.1_meta.json + test_context.get_jsr_package_integrity("@denotest/no-module-graph/0.1.1"); + let integrity_check_failed_msg = format!("error: Integrity check failed for http://127.0.0.1:4250/@denotest/no-module-graph/0.1.1_meta.json Actual: {} Expected: bad_integrity diff --git a/tests/integration/run_tests.rs b/tests/integration/run_tests.rs index 4d91162680..e28251b23d 100644 --- a/tests/integration/run_tests.rs +++ b/tests/integration/run_tests.rs @@ -1018,7 +1018,7 @@ fn lock_deno_json_package_json_deps() { deno_json.write_json(&json!({ "imports": { "esm-basic": "npm:@denotest/esm-basic", - "module_graph": "jsr:@denotest/module_graph@1.4", + "module_graph": "jsr:@denotest/module-graph@1.4", } })); let main_ts = temp_dir.join("main.ts"); @@ -1035,11 +1035,11 @@ fn lock_deno_json_package_json_deps() { "version": "3", "packages": { "specifiers": { - "jsr:@denotest/module_graph@1.4": "jsr:@denotest/module_graph@1.4.0", + "jsr:@denotest/module-graph@1.4": "jsr:@denotest/module-graph@1.4.0", "npm:@denotest/esm-basic": "npm:@denotest/esm-basic@1.0.0" }, "jsr": { - "@denotest/module_graph@1.4.0": { + "@denotest/module-graph@1.4.0": { "integrity": "32de0973c5fa55772326fcd504a757f386d2b010db3e13e78f3bcf851e69473d" } }, @@ -1053,7 +1053,7 @@ fn lock_deno_json_package_json_deps() { "remote": {}, "workspace": { "dependencies": [ - "jsr:@denotest/module_graph@1.4", + "jsr:@denotest/module-graph@1.4", "npm:@denotest/esm-basic" ] } @@ -1063,7 +1063,7 @@ fn lock_deno_json_package_json_deps() { // it to a package.json that uses an alias deno_json.write_json(&json!({ "imports": { - "module_graph": "jsr:@denotest/module_graph@1.4", + "module_graph": "jsr:@denotest/module-graph@1.4", } })); package_json.write_json(&json!({ @@ -1087,11 +1087,11 @@ fn lock_deno_json_package_json_deps() { "version": "3", "packages": { "specifiers": { - "jsr:@denotest/module_graph@1.4": "jsr:@denotest/module_graph@1.4.0", + "jsr:@denotest/module-graph@1.4": "jsr:@denotest/module-graph@1.4.0", "npm:@denotest/esm-basic": "npm:@denotest/esm-basic@1.0.0" }, "jsr": { - "@denotest/module_graph@1.4.0": { + "@denotest/module-graph@1.4.0": { "integrity": "32de0973c5fa55772326fcd504a757f386d2b010db3e13e78f3bcf851e69473d" } }, @@ -1105,7 +1105,7 @@ fn lock_deno_json_package_json_deps() { "remote": {}, "workspace": { "dependencies": [ - "jsr:@denotest/module_graph@1.4" + "jsr:@denotest/module-graph@1.4" ], "packageJson": { "dependencies": [ @@ -1128,10 +1128,10 @@ fn lock_deno_json_package_json_deps() { "version": "3", "packages": { "specifiers": { - "jsr:@denotest/module_graph@1.4": "jsr:@denotest/module_graph@1.4.0", + "jsr:@denotest/module-graph@1.4": "jsr:@denotest/module-graph@1.4.0", }, "jsr": { - "@denotest/module_graph@1.4.0": { + "@denotest/module-graph@1.4.0": { "integrity": "32de0973c5fa55772326fcd504a757f386d2b010db3e13e78f3bcf851e69473d" } } @@ -1139,7 +1139,7 @@ fn lock_deno_json_package_json_deps() { "remote": {}, "workspace": { "dependencies": [ - "jsr:@denotest/module_graph@1.4" + "jsr:@denotest/module-graph@1.4" ] } })); diff --git a/tests/specs/jsr/deps/main.out b/tests/specs/jsr/deps/main.out index 621703c4ba..48f75c0819 100644 --- a/tests/specs/jsr/deps/main.out +++ b/tests/specs/jsr/deps/main.out @@ -1,13 +1,13 @@ Download http://127.0.0.1:4250/@denotest/deps/meta.json Download http://127.0.0.1:4250/@denotest/deps/1.0.0_meta.json -Download http://127.0.0.1:4250/@denotest/module_graph/meta.json -Download http://127.0.0.1:4250/@denotest/no_module_graph/meta.json -Download http://127.0.0.1:4250/@denotest/module_graph/1.4.0_meta.json -Download http://127.0.0.1:4250/@denotest/no_module_graph/0.1.1_meta.json +Download http://127.0.0.1:4250/@denotest/module-graph/meta.json +Download http://127.0.0.1:4250/@denotest/no-module-graph/meta.json +Download http://127.0.0.1:4250/@denotest/module-graph/1.4.0_meta.json +Download http://127.0.0.1:4250/@denotest/no-module-graph/0.1.1_meta.json [UNORDERED_START] Download http://127.0.0.1:4250/@denotest/deps/1.0.0/mod.ts -Download http://127.0.0.1:4250/@denotest/module_graph/1.4.0/other.ts -Download http://127.0.0.1:4250/@denotest/no_module_graph/0.1.1/mod.ts -Download http://127.0.0.1:4250/@denotest/no_module_graph/0.1.1/TestClass.ts +Download http://127.0.0.1:4250/@denotest/module-graph/1.4.0/other.ts +Download http://127.0.0.1:4250/@denotest/no-module-graph/0.1.1/mod.ts +Download http://127.0.0.1:4250/@denotest/no-module-graph/0.1.1/TestClass.ts [UNORDERED_END] { version: "0.1.1", other: Other {} } diff --git a/tests/specs/jsr/deps/main_info.out b/tests/specs/jsr/deps/main_info.out index c4d412707d..0abdfa9401 100644 --- a/tests/specs/jsr/deps/main_info.out +++ b/tests/specs/jsr/deps/main_info.out @@ -1,14 +1,14 @@ Download http://127.0.0.1:4250/@denotest/deps/meta.json Download http://127.0.0.1:4250/@denotest/deps/1.0.0_meta.json -Download http://127.0.0.1:4250/@denotest/module_graph/meta.json -Download http://127.0.0.1:4250/@denotest/no_module_graph/meta.json -Download http://127.0.0.1:4250/@denotest/module_graph/1.4.0_meta.json -Download http://127.0.0.1:4250/@denotest/no_module_graph/0.1.1_meta.json +Download http://127.0.0.1:4250/@denotest/module-graph/meta.json +Download http://127.0.0.1:4250/@denotest/no-module-graph/meta.json +Download http://127.0.0.1:4250/@denotest/module-graph/1.4.0_meta.json +Download http://127.0.0.1:4250/@denotest/no-module-graph/0.1.1_meta.json [UNORDERED_START] Download http://127.0.0.1:4250/@denotest/deps/1.0.0/mod.ts -Download http://127.0.0.1:4250/@denotest/module_graph/1.4.0/other.ts -Download http://127.0.0.1:4250/@denotest/no_module_graph/0.1.1/mod.ts -Download http://127.0.0.1:4250/@denotest/no_module_graph/0.1.1/TestClass.ts +Download http://127.0.0.1:4250/@denotest/module-graph/1.4.0/other.ts +Download http://127.0.0.1:4250/@denotest/no-module-graph/0.1.1/mod.ts +Download http://127.0.0.1:4250/@denotest/no-module-graph/0.1.1/TestClass.ts [UNORDERED_END] local: [WILDCARD]main.ts type: TypeScript @@ -17,6 +17,6 @@ size: [WILDCARD] file:///[WILDCARD]main.ts ([WILDCARD]) └─┬ http://127.0.0.1:4250/@denotest/deps/1.0.0/mod.ts ([WILDCARD]) - ├── http://127.0.0.1:4250/@denotest/module_graph/1.4.0/other.ts ([WILDCARD]) - └─┬ http://127.0.0.1:4250/@denotest/no_module_graph/0.1.1/mod.ts ([WILDCARD]) - └── http://127.0.0.1:4250/@denotest/no_module_graph/0.1.1/TestClass.ts ([WILDCARD]) + ├── http://127.0.0.1:4250/@denotest/module-graph/1.4.0/other.ts ([WILDCARD]) + └─┬ http://127.0.0.1:4250/@denotest/no-module-graph/0.1.1/mod.ts ([WILDCARD]) + └── http://127.0.0.1:4250/@denotest/no-module-graph/0.1.1/TestClass.ts ([WILDCARD]) diff --git a/tests/specs/jsr/module_graph/__test__.jsonc b/tests/specs/jsr/module_graph/__test__.jsonc index a8837a8b53..16b086e8bc 100644 --- a/tests/specs/jsr/module_graph/__test__.jsonc +++ b/tests/specs/jsr/module_graph/__test__.jsonc @@ -1,6 +1,6 @@ { "steps": [{ - "args": "run main.ts", + "args": "run --log-level=debug main.ts", "output": "main.out" }, { "cleanDenoDir": true, diff --git a/tests/specs/jsr/module_graph/main.out b/tests/specs/jsr/module_graph/main.out index 1cd0115b9b..0bc19aeba2 100644 --- a/tests/specs/jsr/module_graph/main.out +++ b/tests/specs/jsr/module_graph/main.out @@ -1,7 +1,5 @@ -Download http://127.0.0.1:4250/@denotest/module_graph/meta.json -Download http://127.0.0.1:4250/@denotest/module_graph/1.4.0_meta.json -[UNORDERED_START] -Download http://127.0.0.1:4250/@denotest/module_graph/1.4.0/other.ts -Download http://127.0.0.1:4250/@denotest/module_graph/1.4.0/mod.ts -[UNORDERED_END] +[WILDCARD]Caching module info for http://[WILDLINE]/@denotest/module-graph/1.4.0/mod.ts +[WILDCARD]Caching module info for http://[WILDLINE]/@denotest/module-graph/1.4.0/other.ts +[WILDCARD] Test { other: Other {} } +[WILDCARD] diff --git a/tests/specs/jsr/module_graph/main.ts b/tests/specs/jsr/module_graph/main.ts index c92823cc2f..3f95747c50 100644 --- a/tests/specs/jsr/module_graph/main.ts +++ b/tests/specs/jsr/module_graph/main.ts @@ -1,3 +1,3 @@ -import { Test } from "jsr:@denotest/module_graph"; +import { Test } from "jsr:@denotest/module-graph"; console.log(new Test()); diff --git a/tests/specs/jsr/module_graph/main_info.out b/tests/specs/jsr/module_graph/main_info.out index c35cca5b4e..5e9e851632 100644 --- a/tests/specs/jsr/module_graph/main_info.out +++ b/tests/specs/jsr/module_graph/main_info.out @@ -1,8 +1,8 @@ -Download http://127.0.0.1:4250/@denotest/module_graph/meta.json -Download http://127.0.0.1:4250/@denotest/module_graph/1.4.0_meta.json +Download http://127.0.0.1:4250/@denotest/module-graph/meta.json +Download http://127.0.0.1:4250/@denotest/module-graph/1.4.0_meta.json [UNORDERED_START] -Download http://127.0.0.1:4250/@denotest/module_graph/1.4.0/mod.ts -Download http://127.0.0.1:4250/@denotest/module_graph/1.4.0/other.ts +Download http://127.0.0.1:4250/@denotest/module-graph/1.4.0/mod.ts +Download http://127.0.0.1:4250/@denotest/module-graph/1.4.0/other.ts [UNORDERED_END] local: [WILDCARD]main.ts type: TypeScript @@ -10,5 +10,5 @@ dependencies: 2 unique size: [WILDCARD] file:///[WILDCARD]/module_graph/main.ts ([WILDCARD]) -└─┬ http://127.0.0.1:4250/@denotest/module_graph/1.4.0/mod.ts ([WILDCARD]) - └── http://127.0.0.1:4250/@denotest/module_graph/1.4.0/other.ts ([WILDCARD]) +└─┬ http://127.0.0.1:4250/@denotest/module-graph/1.4.0/mod.ts ([WILDCARD]) + └── http://127.0.0.1:4250/@denotest/module-graph/1.4.0/other.ts ([WILDCARD]) diff --git a/tests/specs/jsr/module_graph2/__test__.jsonc b/tests/specs/jsr/module_graph2/__test__.jsonc new file mode 100644 index 0000000000..16b086e8bc --- /dev/null +++ b/tests/specs/jsr/module_graph2/__test__.jsonc @@ -0,0 +1,10 @@ +{ + "steps": [{ + "args": "run --log-level=debug main.ts", + "output": "main.out" + }, { + "cleanDenoDir": true, + "args": "info main.ts", + "output": "main_info.out" + }] +} diff --git a/tests/specs/jsr/module_graph2/main.out b/tests/specs/jsr/module_graph2/main.out new file mode 100644 index 0000000000..9f37a0382c --- /dev/null +++ b/tests/specs/jsr/module_graph2/main.out @@ -0,0 +1,5 @@ +[WILDCARD]Caching module info for http://[WILDLINE]/@denotest/module-graph2/1.4.0/mod.ts +[WILDCARD]Caching module info for http://[WILDLINE]/@denotest/module-graph2/1.4.0/other.ts +[WILDCARD] +Test { other: Other {} } +[WILDCARD] diff --git a/tests/specs/jsr/module_graph2/main.ts b/tests/specs/jsr/module_graph2/main.ts new file mode 100644 index 0000000000..150bfef24a --- /dev/null +++ b/tests/specs/jsr/module_graph2/main.ts @@ -0,0 +1,3 @@ +import { Test } from "jsr:@denotest/module-graph2"; + +console.log(new Test()); diff --git a/tests/specs/jsr/module_graph2/main_info.out b/tests/specs/jsr/module_graph2/main_info.out new file mode 100644 index 0000000000..266ee6d968 --- /dev/null +++ b/tests/specs/jsr/module_graph2/main_info.out @@ -0,0 +1,14 @@ +Download http://127.0.0.1:4250/@denotest/module-graph2/meta.json +Download http://127.0.0.1:4250/@denotest/module-graph2/1.4.0_meta.json +[UNORDERED_START] +Download http://127.0.0.1:4250/@denotest/module-graph2/1.4.0/mod.ts +Download http://127.0.0.1:4250/@denotest/module-graph2/1.4.0/other.ts +[UNORDERED_END] +local: [WILDCARD]main.ts +type: TypeScript +dependencies: 2 unique +size: [WILDCARD] + +file:///[WILDCARD]/module_graph2/main.ts ([WILDCARD]) +└─┬ http://127.0.0.1:4250/@denotest/module-graph2/1.4.0/mod.ts ([WILDCARD]) + └── http://127.0.0.1:4250/@denotest/module-graph2/1.4.0/other.ts ([WILDCARD]) diff --git a/tests/specs/jsr/no_module_graph/main.out b/tests/specs/jsr/no_module_graph/main.out index da9b67e11b..1837c5c1ca 100644 --- a/tests/specs/jsr/no_module_graph/main.out +++ b/tests/specs/jsr/no_module_graph/main.out @@ -1,6 +1,6 @@ -Download http://127.0.0.1:4250/@denotest/no_module_graph/meta.json -Download http://127.0.0.1:4250/@denotest/no_module_graph/0.1.0_meta.json -Download http://127.0.0.1:4250/@denotest/no_module_graph/0.1.0/mod.ts -Download http://127.0.0.1:4250/@denotest/no_module_graph/0.1.0/TestClass.ts +Download http://127.0.0.1:4250/@denotest/no-module-graph/meta.json +Download http://127.0.0.1:4250/@denotest/no-module-graph/0.1.0_meta.json +Download http://127.0.0.1:4250/@denotest/no-module-graph/0.1.0/mod.ts +Download http://127.0.0.1:4250/@denotest/no-module-graph/0.1.0/TestClass.ts 0.1.0 TestClass {} diff --git a/tests/specs/jsr/no_module_graph/main.ts b/tests/specs/jsr/no_module_graph/main.ts index 6ea030c59f..9d50eaab81 100644 --- a/tests/specs/jsr/no_module_graph/main.ts +++ b/tests/specs/jsr/no_module_graph/main.ts @@ -1,4 +1,4 @@ -import version, { TestClass } from "jsr:@denotest/no_module_graph@0.1.0"; +import version, { TestClass } from "jsr:@denotest/no-module-graph@0.1.0"; console.log(version); console.log(new TestClass()); diff --git a/tests/specs/jsr/no_module_graph/main_info.out b/tests/specs/jsr/no_module_graph/main_info.out index 0293e41203..45c97f77e4 100644 --- a/tests/specs/jsr/no_module_graph/main_info.out +++ b/tests/specs/jsr/no_module_graph/main_info.out @@ -1,12 +1,12 @@ -Download http://127.0.0.1:4250/@denotest/no_module_graph/meta.json -Download http://127.0.0.1:4250/@denotest/no_module_graph/0.1.0_meta.json -Download http://127.0.0.1:4250/@denotest/no_module_graph/0.1.0/mod.ts -Download http://127.0.0.1:4250/@denotest/no_module_graph/0.1.0/TestClass.ts +Download http://127.0.0.1:4250/@denotest/no-module-graph/meta.json +Download http://127.0.0.1:4250/@denotest/no-module-graph/0.1.0_meta.json +Download http://127.0.0.1:4250/@denotest/no-module-graph/0.1.0/mod.ts +Download http://127.0.0.1:4250/@denotest/no-module-graph/0.1.0/TestClass.ts local: [WILDCARD]main.ts type: TypeScript dependencies: 2 unique size: [WILDCARD] file:///[WILDCARD]/jsr/no_module_graph/main.ts ([WILDCARD]) -└─┬ http://127.0.0.1:4250/@denotest/no_module_graph/0.1.0/mod.ts ([WILDCARD]) - └── http://127.0.0.1:4250/@denotest/no_module_graph/0.1.0/TestClass.ts ([WILDCARD]) +└─┬ http://127.0.0.1:4250/@denotest/no-module-graph/0.1.0/mod.ts ([WILDCARD]) + └── http://127.0.0.1:4250/@denotest/no-module-graph/0.1.0/TestClass.ts ([WILDCARD]) diff --git a/tests/specs/jsr/no_module_graph/multiple.ts b/tests/specs/jsr/no_module_graph/multiple.ts index 660ed8be6b..9c7474a2cf 100644 --- a/tests/specs/jsr/no_module_graph/multiple.ts +++ b/tests/specs/jsr/no_module_graph/multiple.ts @@ -1,5 +1,5 @@ -import version1 from "jsr:@denotest/no_module_graph@0.1.0"; -import version2 from "jsr:@denotest/no_module_graph@^0.2"; +import version1 from "jsr:@denotest/no-module-graph@0.1.0"; +import version2 from "jsr:@denotest/no-module-graph@^0.2"; console.log(version1); console.log(version2); diff --git a/tests/testdata/jsr/registry/@denotest/deps/1.0.0/mod.ts b/tests/testdata/jsr/registry/@denotest/deps/1.0.0/mod.ts index 4ba0d8aaf0..2751698acc 100644 --- a/tests/testdata/jsr/registry/@denotest/deps/1.0.0/mod.ts +++ b/tests/testdata/jsr/registry/@denotest/deps/1.0.0/mod.ts @@ -1,5 +1,5 @@ -import { Other } from "jsr:@denotest/module_graph@1/other"; -import version from "jsr:@denotest/no_module_graph@^0.1"; +import { Other } from "jsr:@denotest/module-graph@1/other"; +import version from "jsr:@denotest/no-module-graph@^0.1"; export default { version, diff --git a/tests/testdata/jsr/registry/@denotest/deps/1.0.0_meta.json b/tests/testdata/jsr/registry/@denotest/deps/1.0.0_meta.json index 914e4bd73c..814099af06 100644 --- a/tests/testdata/jsr/registry/@denotest/deps/1.0.0_meta.json +++ b/tests/testdata/jsr/registry/@denotest/deps/1.0.0_meta.json @@ -8,13 +8,13 @@ "type": "static", "kind": "import", "range": [[0, 0], [0, 59]], - "specifier": "jsr:@denotest/module_graph@1/other", + "specifier": "jsr:@denotest/module-graph@1/other", "specifierRange": [[0, 22], [0, 58]] }, { "type": "static", "kind": "import", "range": [[1, 0], [1, 57]], - "specifier": "jsr:@denotest/no_module_graph@^0.1", + "specifier": "jsr:@denotest/no-module-graph@^0.1", "specifierRange": [[1, 20], [1, 56]] }] } diff --git a/tests/testdata/jsr/registry/@denotest/module_graph/1.4.0/mod.ts b/tests/testdata/jsr/registry/@denotest/module-graph/1.4.0/mod.ts similarity index 100% rename from tests/testdata/jsr/registry/@denotest/module_graph/1.4.0/mod.ts rename to tests/testdata/jsr/registry/@denotest/module-graph/1.4.0/mod.ts diff --git a/tests/testdata/jsr/registry/@denotest/module_graph/1.4.0/other.ts b/tests/testdata/jsr/registry/@denotest/module-graph/1.4.0/other.ts similarity index 100% rename from tests/testdata/jsr/registry/@denotest/module_graph/1.4.0/other.ts rename to tests/testdata/jsr/registry/@denotest/module-graph/1.4.0/other.ts diff --git a/tests/testdata/jsr/registry/@denotest/module_graph/1.4.0_meta.json b/tests/testdata/jsr/registry/@denotest/module-graph/1.4.0_meta.json similarity index 100% rename from tests/testdata/jsr/registry/@denotest/module_graph/1.4.0_meta.json rename to tests/testdata/jsr/registry/@denotest/module-graph/1.4.0_meta.json diff --git a/tests/testdata/jsr/registry/@denotest/module_graph/meta.json b/tests/testdata/jsr/registry/@denotest/module-graph/meta.json similarity index 100% rename from tests/testdata/jsr/registry/@denotest/module_graph/meta.json rename to tests/testdata/jsr/registry/@denotest/module-graph/meta.json diff --git a/tests/testdata/jsr/registry/@denotest/module-graph2/1.4.0/mod.ts b/tests/testdata/jsr/registry/@denotest/module-graph2/1.4.0/mod.ts new file mode 100644 index 0000000000..cb3c4a5e02 --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/module-graph2/1.4.0/mod.ts @@ -0,0 +1,5 @@ +import { Other } from "./other.ts"; + +export class Test { + other = new Other(); +} diff --git a/tests/testdata/jsr/registry/@denotest/module-graph2/1.4.0/other.ts b/tests/testdata/jsr/registry/@denotest/module-graph2/1.4.0/other.ts new file mode 100644 index 0000000000..57e436cf88 --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/module-graph2/1.4.0/other.ts @@ -0,0 +1,2 @@ +export class Other { +} diff --git a/tests/testdata/jsr/registry/@denotest/module-graph2/1.4.0_meta.json b/tests/testdata/jsr/registry/@denotest/module-graph2/1.4.0_meta.json new file mode 100644 index 0000000000..ce1d3782d2 --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/module-graph2/1.4.0_meta.json @@ -0,0 +1,17 @@ +{ + "exports": { + ".": "./mod.ts", + "./other": "./other.ts" + }, + "moduleGraph2": { + "/mod.ts": { + "dependencies": [{ + "kind": "import", + "type": "static", + "specifier": "./other.ts", + "specifierRange": [[0, 22], [0, 34]] + }] + }, + "/other.ts": {} + } +} diff --git a/tests/testdata/jsr/registry/@denotest/module-graph2/meta.json b/tests/testdata/jsr/registry/@denotest/module-graph2/meta.json new file mode 100644 index 0000000000..9a450c08b4 --- /dev/null +++ b/tests/testdata/jsr/registry/@denotest/module-graph2/meta.json @@ -0,0 +1,6 @@ +{ + "versions": { + "1.0.0": {}, + "1.4.0": {} + } +} diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.0/TestClass.ts b/tests/testdata/jsr/registry/@denotest/no-module-graph/0.1.0/TestClass.ts similarity index 100% rename from tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.0/TestClass.ts rename to tests/testdata/jsr/registry/@denotest/no-module-graph/0.1.0/TestClass.ts diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.0/mod.ts b/tests/testdata/jsr/registry/@denotest/no-module-graph/0.1.0/mod.ts similarity index 100% rename from tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.0/mod.ts rename to tests/testdata/jsr/registry/@denotest/no-module-graph/0.1.0/mod.ts diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.0_meta.json b/tests/testdata/jsr/registry/@denotest/no-module-graph/0.1.0_meta.json similarity index 100% rename from tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.0_meta.json rename to tests/testdata/jsr/registry/@denotest/no-module-graph/0.1.0_meta.json diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.1/TestClass.ts b/tests/testdata/jsr/registry/@denotest/no-module-graph/0.1.1/TestClass.ts similarity index 100% rename from tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.1/TestClass.ts rename to tests/testdata/jsr/registry/@denotest/no-module-graph/0.1.1/TestClass.ts diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.1/mod.ts b/tests/testdata/jsr/registry/@denotest/no-module-graph/0.1.1/mod.ts similarity index 100% rename from tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.1/mod.ts rename to tests/testdata/jsr/registry/@denotest/no-module-graph/0.1.1/mod.ts diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.1_meta.json b/tests/testdata/jsr/registry/@denotest/no-module-graph/0.1.1_meta.json similarity index 100% rename from tests/testdata/jsr/registry/@denotest/no_module_graph/0.1.1_meta.json rename to tests/testdata/jsr/registry/@denotest/no-module-graph/0.1.1_meta.json diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/0.2.0/TestClass.ts b/tests/testdata/jsr/registry/@denotest/no-module-graph/0.2.0/TestClass.ts similarity index 100% rename from tests/testdata/jsr/registry/@denotest/no_module_graph/0.2.0/TestClass.ts rename to tests/testdata/jsr/registry/@denotest/no-module-graph/0.2.0/TestClass.ts diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/0.2.0/mod.ts b/tests/testdata/jsr/registry/@denotest/no-module-graph/0.2.0/mod.ts similarity index 100% rename from tests/testdata/jsr/registry/@denotest/no_module_graph/0.2.0/mod.ts rename to tests/testdata/jsr/registry/@denotest/no-module-graph/0.2.0/mod.ts diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/0.2.0_meta.json b/tests/testdata/jsr/registry/@denotest/no-module-graph/0.2.0_meta.json similarity index 100% rename from tests/testdata/jsr/registry/@denotest/no_module_graph/0.2.0_meta.json rename to tests/testdata/jsr/registry/@denotest/no-module-graph/0.2.0_meta.json diff --git a/tests/testdata/jsr/registry/@denotest/no_module_graph/meta.json b/tests/testdata/jsr/registry/@denotest/no-module-graph/meta.json similarity index 100% rename from tests/testdata/jsr/registry/@denotest/no_module_graph/meta.json rename to tests/testdata/jsr/registry/@denotest/no-module-graph/meta.json