Skip to content

Commit

Permalink
chore: add tests for moduleGraph2 (#23603)
Browse files Browse the repository at this point in the history 
Also did some renames from underscores to hyphens
  • Loading branch information
@dsherret
dsherret committed Apr 29, 2024
1 parent 67d00fb commit 48daf2d
Show file tree
Hide file tree
Showing 37 changed files with 127 additions and 66 deletions.
1 change: 1 addition & 0 deletions cli/cache/mod.rs
View file
Expand Up @@ -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,
Expand Down
14 changes: 7 additions & 7 deletions tests/integration/jsr_tests.rs
View file
Expand Up @@ -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);"#,
);
Expand All @@ -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
Expand Down Expand Up @@ -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);"#,
);
Expand All @@ -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
Expand Down
22 changes: 11 additions & 11 deletions tests/integration/run_tests.rs
View file
Expand Up @@ -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");
Expand All @@ -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"
}
},
Expand All @@ -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"
]
}
Expand All @@ -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!({
Expand All @@ -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"
}
},
Expand All @@ -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": [
Expand All @@ -1128,18 +1128,18 @@ 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"
}
}
},
"remote": {},
"workspace": {
"dependencies": [
"jsr:@denotest/module_graph@1.4"
"jsr:@denotest/module-graph@1.4"
]
}
}));
Expand Down
14 changes: 7 additions & 7 deletions tests/specs/jsr/deps/main.out
View file
@@ -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 {} }
20 changes: 10 additions & 10 deletions tests/specs/jsr/deps/main_info.out
View file
@@ -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
Expand All @@ -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])
2 changes: 1 addition & 1 deletion tests/specs/jsr/module_graph/__test__.jsonc
View file
@@ -1,6 +1,6 @@
{
"steps": [{
"args": "run main.ts",
"args": "run --log-level=debug main.ts",
"output": "main.out"
}, {
"cleanDenoDir": true,
Expand Down
10 changes: 4 additions & 6 deletions tests/specs/jsr/module_graph/main.out
View file
@@ -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]
2 changes: 1 addition & 1 deletion tests/specs/jsr/module_graph/main.ts
View file
@@ -1,3 +1,3 @@
import { Test } from "jsr:@denotest/module_graph";
import { Test } from "jsr:@denotest/module-graph";

console.log(new Test());
12 changes: 6 additions & 6 deletions tests/specs/jsr/module_graph/main_info.out
View file
@@ -1,14 +1,14 @@
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
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])
10 changes: 10 additions & 0 deletions tests/specs/jsr/module_graph2/__test__.jsonc
View file
@@ -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"
}]
}
5 changes: 5 additions & 0 deletions tests/specs/jsr/module_graph2/main.out
View file
@@ -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]
3 changes: 3 additions & 0 deletions tests/specs/jsr/module_graph2/main.ts
View file
@@ -0,0 +1,3 @@
import { Test } from "jsr:@denotest/module-graph2";

console.log(new Test());
14 changes: 14 additions & 0 deletions tests/specs/jsr/module_graph2/main_info.out
View file
@@ -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])
8 changes: 4 additions & 4 deletions tests/specs/jsr/no_module_graph/main.out
View file
@@ -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 {}
2 changes: 1 addition & 1 deletion tests/specs/jsr/no_module_graph/main.ts
View file
@@ -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());
12 changes: 6 additions & 6 deletions tests/specs/jsr/no_module_graph/main_info.out
View file
@@ -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])
4 changes: 2 additions & 2 deletions tests/specs/jsr/no_module_graph/multiple.ts
View file
@@ -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);
4 changes: 2 additions & 2 deletions tests/testdata/jsr/registry/@denotest/deps/1.0.0/mod.ts
View file
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions tests/testdata/jsr/registry/@denotest/deps/1.0.0_meta.json
View file
Expand Up @@ -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]]
}]
}
Expand Down
0 ...istry/@denotest/module_graph/1.4.0/mod.ts → ...istry/@denotest/module-graph/1.4.0/mod.ts
View file
File renamed without changes.
0 ...try/@denotest/module_graph/1.4.0/other.ts → ...try/@denotest/module-graph/1.4.0/other.ts
View file
File renamed without changes.
0 ...ry/@denotest/module_graph/1.4.0_meta.json → ...ry/@denotest/module-graph/1.4.0_meta.json
View file
File renamed without changes.
0 ...registry/@denotest/module_graph/meta.json → ...registry/@denotest/module-graph/meta.json
View file
File renamed without changes.
5 changes: 5 additions & 0 deletions tests/testdata/jsr/registry/@denotest/module-graph2/1.4.0/mod.ts
View file
@@ -0,0 +1,5 @@
import { Other } from "./other.ts";

export class Test {
other = new Other();
}
2 changes: 2 additions & 0 deletions tests/testdata/jsr/registry/@denotest/module-graph2/1.4.0/other.ts
View file
@@ -0,0 +1,2 @@
export class Other {
}
17 changes: 17 additions & 0 deletions tests/testdata/jsr/registry/@denotest/module-graph2/1.4.0_meta.json
View file
@@ -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": {}
}
}
6 changes: 6 additions & 0 deletions tests/testdata/jsr/registry/@denotest/module-graph2/meta.json
View file
@@ -0,0 +1,6 @@
{
"versions": {
"1.0.0": {},
"1.4.0": {}
}
}
0 ...notest/no_module_graph/0.1.0/TestClass.ts → ...notest/no-module-graph/0.1.0/TestClass.ts
View file
File renamed without changes.
0 ...ry/@denotest/no_module_graph/0.1.0/mod.ts → ...ry/@denotest/no-module-graph/0.1.0/mod.ts
View file
File renamed without changes.
0 ...@denotest/no_module_graph/0.1.0_meta.json → ...@denotest/no-module-graph/0.1.0_meta.json
View file
File renamed without changes.
0 ...notest/no_module_graph/0.1.1/TestClass.ts → ...notest/no-module-graph/0.1.1/TestClass.ts
View file
File renamed without changes.
0 ...ry/@denotest/no_module_graph/0.1.1/mod.ts → ...ry/@denotest/no-module-graph/0.1.1/mod.ts
View file
File renamed without changes.
0 ...@denotest/no_module_graph/0.1.1_meta.json → ...@denotest/no-module-graph/0.1.1_meta.json
View file
File renamed without changes.
0 ...notest/no_module_graph/0.2.0/TestClass.ts → ...notest/no-module-graph/0.2.0/TestClass.ts
View file
File renamed without changes.
0 ...ry/@denotest/no_module_graph/0.2.0/mod.ts → ...ry/@denotest/no-module-graph/0.2.0/mod.ts
View file
File renamed without changes.
0 ...@denotest/no_module_graph/0.2.0_meta.json → ...@denotest/no-module-graph/0.2.0_meta.json
View file
File renamed without changes.
0 ...istry/@denotest/no_module_graph/meta.json → ...istry/@denotest/no-module-graph/meta.json
View file
File renamed without changes.

0 comments on commit 48daf2d

Please sign in to comment.