@tsonic/frontend 0.0.67 → 0.0.69
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/.tsbuildinfo +1 -1
- package/dist/generic-function-values.d.ts.map +1 -1
- package/dist/generic-function-values.js +4 -2
- package/dist/generic-function-values.js.map +1 -1
- package/dist/graph/extraction/imports.d.ts.map +1 -1
- package/dist/graph/extraction/imports.js +5 -1
- package/dist/graph/extraction/imports.js.map +1 -1
- package/dist/ir/binding/binding-factory.d.ts.map +1 -1
- package/dist/ir/binding/binding-factory.js +239 -26
- package/dist/ir/binding/binding-factory.js.map +1 -1
- package/dist/ir/binding/binding-types.d.ts +1 -0
- package/dist/ir/binding/binding-types.d.ts.map +1 -1
- package/dist/ir/binding-resolution.test.js +171 -0
- package/dist/ir/binding-resolution.test.js.map +1 -1
- package/dist/ir/builder/imports.d.ts.map +1 -1
- package/dist/ir/builder/imports.js +13 -1
- package/dist/ir/builder/imports.js.map +1 -1
- package/dist/ir/builder.test.js +1347 -4
- package/dist/ir/builder.test.js.map +1 -1
- package/dist/ir/converters/anonymous-synthesis.d.ts +3 -2
- package/dist/ir/converters/anonymous-synthesis.d.ts.map +1 -1
- package/dist/ir/converters/anonymous-synthesis.js +88 -67
- package/dist/ir/converters/anonymous-synthesis.js.map +1 -1
- package/dist/ir/converters/expressions/access/access-converter.d.ts.map +1 -1
- package/dist/ir/converters/expressions/access/access-converter.js +44 -36
- package/dist/ir/converters/expressions/access/access-converter.js.map +1 -1
- package/dist/ir/converters/expressions/access/binding-resolution.d.ts.map +1 -1
- package/dist/ir/converters/expressions/access/binding-resolution.js.map +1 -1
- package/dist/ir/converters/expressions/access/member-resolution.d.ts.map +1 -1
- package/dist/ir/converters/expressions/access/member-resolution.js +15 -3
- package/dist/ir/converters/expressions/access/member-resolution.js.map +1 -1
- package/dist/ir/converters/expressions/calls/call-converter.d.ts +2 -2
- package/dist/ir/converters/expressions/calls/call-converter.d.ts.map +1 -1
- package/dist/ir/converters/expressions/calls/call-converter.js +108 -4
- package/dist/ir/converters/expressions/calls/call-converter.js.map +1 -1
- package/dist/ir/converters/expressions/calls/new-converter.d.ts +2 -1
- package/dist/ir/converters/expressions/calls/new-converter.d.ts.map +1 -1
- package/dist/ir/converters/expressions/calls/new-converter.js +4 -1
- package/dist/ir/converters/expressions/calls/new-converter.js.map +1 -1
- package/dist/ir/converters/expressions/collections.d.ts.map +1 -1
- package/dist/ir/converters/expressions/collections.js +425 -121
- package/dist/ir/converters/expressions/collections.js.map +1 -1
- package/dist/ir/converters/expressions/dynamic-import.d.ts +6 -0
- package/dist/ir/converters/expressions/dynamic-import.d.ts.map +1 -0
- package/dist/ir/converters/expressions/dynamic-import.js +121 -0
- package/dist/ir/converters/expressions/dynamic-import.js.map +1 -0
- package/dist/ir/converters/expressions/functions.d.ts.map +1 -1
- package/dist/ir/converters/expressions/functions.js +28 -13
- package/dist/ir/converters/expressions/functions.js.map +1 -1
- package/dist/ir/converters/expressions/import-meta.d.ts +9 -0
- package/dist/ir/converters/expressions/import-meta.d.ts.map +1 -0
- package/dist/ir/converters/expressions/import-meta.js +93 -0
- package/dist/ir/converters/expressions/import-meta.js.map +1 -0
- package/dist/ir/converters/expressions/literals.d.ts +2 -1
- package/dist/ir/converters/expressions/literals.d.ts.map +1 -1
- package/dist/ir/converters/expressions/literals.js +73 -0
- package/dist/ir/converters/expressions/literals.js.map +1 -1
- package/dist/ir/converters/flow-narrowing.d.ts.map +1 -1
- package/dist/ir/converters/flow-narrowing.js +100 -0
- package/dist/ir/converters/flow-narrowing.js.map +1 -1
- package/dist/ir/converters/statements/control/loops.d.ts.map +1 -1
- package/dist/ir/converters/statements/control/loops.js +72 -8
- package/dist/ir/converters/statements/control/loops.js.map +1 -1
- package/dist/ir/converters/statements/declarations/variables.d.ts.map +1 -1
- package/dist/ir/converters/statements/declarations/variables.js +22 -6
- package/dist/ir/converters/statements/declarations/variables.js.map +1 -1
- package/dist/ir/expression-converter.d.ts.map +1 -1
- package/dist/ir/expression-converter.js +13 -4
- package/dist/ir/expression-converter.js.map +1 -1
- package/dist/ir/program-context.d.ts +27 -0
- package/dist/ir/program-context.d.ts.map +1 -1
- package/dist/ir/program-context.js +12 -0
- package/dist/ir/program-context.js.map +1 -1
- package/dist/ir/type-system/internal/handle-types.d.ts +1 -0
- package/dist/ir/type-system/internal/handle-types.d.ts.map +1 -1
- package/dist/ir/type-system/internal/type-converter/references.d.ts.map +1 -1
- package/dist/ir/type-system/internal/type-converter/references.js +37 -1
- package/dist/ir/type-system/internal/type-converter/references.js.map +1 -1
- package/dist/ir/type-system/type-system-call-resolution.d.ts +1 -1
- package/dist/ir/type-system/type-system-call-resolution.d.ts.map +1 -1
- package/dist/ir/type-system/type-system-call-resolution.js +158 -26
- package/dist/ir/type-system/type-system-call-resolution.js.map +1 -1
- package/dist/ir/type-system/type-system-inference.d.ts +1 -1
- package/dist/ir/type-system/type-system-inference.d.ts.map +1 -1
- package/dist/ir/type-system/type-system-inference.js +189 -31
- package/dist/ir/type-system/type-system-inference.js.map +1 -1
- package/dist/ir/type-system/type-system-state.d.ts +14 -0
- package/dist/ir/type-system/type-system-state.d.ts.map +1 -1
- package/dist/ir/type-system/type-system-state.js +1 -0
- package/dist/ir/type-system/type-system-state.js.map +1 -1
- package/dist/ir/type-system/type-system.d.ts +5 -1
- package/dist/ir/type-system/type-system.d.ts.map +1 -1
- package/dist/ir/type-system/type-system.js +5 -2
- package/dist/ir/type-system/type-system.js.map +1 -1
- package/dist/ir/types/expressions.d.ts +55 -1
- package/dist/ir/types/expressions.d.ts.map +1 -1
- package/dist/ir/types/index.d.ts +1 -1
- package/dist/ir/types/index.d.ts.map +1 -1
- package/dist/ir/types/index.js.map +1 -1
- package/dist/ir/types/module.d.ts +2 -0
- package/dist/ir/types/module.d.ts.map +1 -1
- package/dist/ir/types/type-ops.d.ts.map +1 -1
- package/dist/ir/types/type-ops.js +1 -0
- package/dist/ir/types/type-ops.js.map +1 -1
- package/dist/ir/types.d.ts +1 -1
- package/dist/ir/types.d.ts.map +1 -1
- package/dist/ir/types.js.map +1 -1
- package/dist/ir/validation/anonymous-type-lowering-pass.d.ts.map +1 -1
- package/dist/ir/validation/anonymous-type-lowering-pass.js +97 -9
- package/dist/ir/validation/anonymous-type-lowering-pass.js.map +1 -1
- package/dist/ir/validation/arrow-return-finalization-pass.js +3 -0
- package/dist/ir/validation/arrow-return-finalization-pass.js.map +1 -1
- package/dist/ir/validation/char-validation-pass.d.ts.map +1 -1
- package/dist/ir/validation/char-validation-pass.js +10 -0
- package/dist/ir/validation/char-validation-pass.js.map +1 -1
- package/dist/ir/validation/numeric-coercion-pass.d.ts.map +1 -1
- package/dist/ir/validation/numeric-coercion-pass.js +6 -0
- package/dist/ir/validation/numeric-coercion-pass.js.map +1 -1
- package/dist/ir/validation/numeric-invariants.test.js +180 -0
- package/dist/ir/validation/numeric-invariants.test.js.map +1 -1
- package/dist/ir/validation/numeric-proof-pass.d.ts.map +1 -1
- package/dist/ir/validation/numeric-proof-pass.js +188 -2
- package/dist/ir/validation/numeric-proof-pass.js.map +1 -1
- package/dist/ir/validation/soundness-gate.d.ts.map +1 -1
- package/dist/ir/validation/soundness-gate.js +29 -10
- package/dist/ir/validation/soundness-gate.js.map +1 -1
- package/dist/ir/validation/soundness-gate.test.js +127 -4
- package/dist/ir/validation/soundness-gate.test.js.map +1 -1
- package/dist/ir/validation/yield-lowering-pass.d.ts.map +1 -1
- package/dist/ir/validation/yield-lowering-pass.js +26 -2
- package/dist/ir/validation/yield-lowering-pass.js.map +1 -1
- package/dist/object-literal-method-runtime.d.ts +15 -0
- package/dist/object-literal-method-runtime.d.ts.map +1 -0
- package/dist/object-literal-method-runtime.js +279 -0
- package/dist/object-literal-method-runtime.js.map +1 -0
- package/dist/program/bindings.test.js +44 -0
- package/dist/program/bindings.test.js.map +1 -1
- package/dist/program/creation.d.ts.map +1 -1
- package/dist/program/creation.js +141 -18
- package/dist/program/creation.js.map +1 -1
- package/dist/program/creation.test.js +312 -2
- package/dist/program/creation.test.js.map +1 -1
- package/dist/program/dependency-graph.d.ts.map +1 -1
- package/dist/program/dependency-graph.js +49 -22
- package/dist/program/dependency-graph.js.map +1 -1
- package/dist/program/dependency-graph.test.d.ts +2 -0
- package/dist/program/dependency-graph.test.d.ts.map +1 -0
- package/dist/program/dependency-graph.test.js +118 -0
- package/dist/program/dependency-graph.test.js.map +1 -0
- package/dist/resolver/dynamic-import.d.ts +33 -0
- package/dist/resolver/dynamic-import.d.ts.map +1 -0
- package/dist/resolver/dynamic-import.js +142 -0
- package/dist/resolver/dynamic-import.js.map +1 -0
- package/dist/resolver/dynamic-import.test.d.ts +2 -0
- package/dist/resolver/dynamic-import.test.d.ts.map +1 -0
- package/dist/resolver/dynamic-import.test.js +150 -0
- package/dist/resolver/dynamic-import.test.js.map +1 -0
- package/dist/resolver/import-resolution.d.ts +2 -0
- package/dist/resolver/import-resolution.d.ts.map +1 -1
- package/dist/resolver/import-resolution.js +20 -3
- package/dist/resolver/import-resolution.js.map +1 -1
- package/dist/resolver/source-package-resolution.d.ts +11 -0
- package/dist/resolver/source-package-resolution.d.ts.map +1 -0
- package/dist/resolver/source-package-resolution.js +188 -0
- package/dist/resolver/source-package-resolution.js.map +1 -0
- package/dist/resolver/source-package-resolution.test.d.ts +2 -0
- package/dist/resolver/source-package-resolution.test.d.ts.map +1 -0
- package/dist/resolver/source-package-resolution.test.js +77 -0
- package/dist/resolver/source-package-resolution.test.js.map +1 -0
- package/dist/resolver/types.d.ts +1 -0
- package/dist/resolver/types.d.ts.map +1 -1
- package/dist/resolver.test.js +83 -0
- package/dist/resolver.test.js.map +1 -1
- package/dist/surface/profiles.d.ts +1 -0
- package/dist/surface/profiles.d.ts.map +1 -1
- package/dist/surface/profiles.js +4 -2
- package/dist/surface/profiles.js.map +1 -1
- package/dist/surface/profiles.test.js +10 -0
- package/dist/surface/profiles.test.js.map +1 -1
- package/dist/types/module.d.ts +1 -1
- package/dist/types/module.d.ts.map +1 -1
- package/dist/validation/features.d.ts +1 -1
- package/dist/validation/features.d.ts.map +1 -1
- package/dist/validation/features.js +37 -6
- package/dist/validation/features.js.map +1 -1
- package/dist/validation/features.test.js +137 -23
- package/dist/validation/features.test.js.map +1 -1
- package/dist/validation/imports.d.ts.map +1 -1
- package/dist/validation/imports.js +2 -8
- package/dist/validation/imports.js.map +1 -1
- package/dist/validation/imports.test.js +6 -9
- package/dist/validation/imports.test.js.map +1 -1
- package/dist/validation/static-safety.d.ts.map +1 -1
- package/dist/validation/static-safety.js +118 -67
- package/dist/validation/static-safety.js.map +1 -1
- package/dist/validator.maximus.test.js +225 -33
- package/dist/validator.maximus.test.js.map +1 -1
- package/dist/validator.test.js +87 -6
- package/dist/validator.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependency-graph.js","sourceRoot":"","sources":["../../src/program/dependency-graph.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACzC,OAAO,EAAU,EAAE,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAc,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAEtE,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAGrE,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,8BAA8B,EAAE,MAAM,oDAAoD,CAAC;AACpG,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AACnF,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,0BAA0B,EAAE,MAAM,+CAA+C,CAAC;AAC3F,OAAO,EAAE,4BAA4B,EAAE,MAAM,kDAAkD,CAAC;AAChG,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"dependency-graph.js","sourceRoot":"","sources":["../../src/program/dependency-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dependency-graph.test.d.ts","sourceRoot":"","sources":["../../src/program/dependency-graph.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
import { describe, it } from "mocha";
|
|
2
|
+
import { expect } from "chai";
|
|
3
|
+
import * as fs from "node:fs";
|
|
4
|
+
import * as os from "node:os";
|
|
5
|
+
import * as path from "node:path";
|
|
6
|
+
import { buildModuleDependencyGraph } from "./dependency-graph.js";
|
|
7
|
+
describe("Dependency Graph", () => {
|
|
8
|
+
it("should traverse imports from installed tsonic source packages", () => {
|
|
9
|
+
const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "tsonic-dependency-graph-source-package-"));
|
|
10
|
+
try {
|
|
11
|
+
fs.writeFileSync(path.join(tempDir, "package.json"), JSON.stringify({ name: "app", version: "1.0.0", type: "module" }, null, 2));
|
|
12
|
+
const srcDir = path.join(tempDir, "src");
|
|
13
|
+
fs.mkdirSync(srcDir, { recursive: true });
|
|
14
|
+
const entryPath = path.join(srcDir, "index.ts");
|
|
15
|
+
fs.writeFileSync(entryPath, 'import { clamp } from "@acme/math";\nexport const value = clamp(10, 0, 5);\n');
|
|
16
|
+
const packageRoot = path.join(tempDir, "node_modules", "@acme", "math");
|
|
17
|
+
fs.mkdirSync(path.join(packageRoot, "tsonic"), { recursive: true });
|
|
18
|
+
fs.mkdirSync(path.join(packageRoot, "src"), { recursive: true });
|
|
19
|
+
fs.writeFileSync(path.join(packageRoot, "package.json"), JSON.stringify({ name: "@acme/math", version: "1.0.0", type: "module" }, null, 2));
|
|
20
|
+
fs.writeFileSync(path.join(packageRoot, "tsonic", "package-manifest.json"), JSON.stringify({
|
|
21
|
+
schemaVersion: 1,
|
|
22
|
+
kind: "tsonic-source-package",
|
|
23
|
+
surfaces: ["@tsonic/js"],
|
|
24
|
+
source: {
|
|
25
|
+
exports: {
|
|
26
|
+
".": "./src/index.ts",
|
|
27
|
+
},
|
|
28
|
+
},
|
|
29
|
+
}, null, 2));
|
|
30
|
+
const packageHelper = path.join(packageRoot, "src", "helpers.ts");
|
|
31
|
+
fs.writeFileSync(packageHelper, "export const clampMin = (x: number, min: number): number => x < min ? min : x;\n");
|
|
32
|
+
const packageEntry = path.join(packageRoot, "src", "index.ts");
|
|
33
|
+
fs.writeFileSync(packageEntry, [
|
|
34
|
+
'import { clampMin } from "./helpers.ts";',
|
|
35
|
+
"export function clamp(x: number, min: number, max: number): number {",
|
|
36
|
+
" const lower = clampMin(x, min);",
|
|
37
|
+
" return lower > max ? max : lower;",
|
|
38
|
+
"}",
|
|
39
|
+
].join("\n"));
|
|
40
|
+
const result = buildModuleDependencyGraph(entryPath, {
|
|
41
|
+
projectRoot: tempDir,
|
|
42
|
+
sourceRoot: srcDir,
|
|
43
|
+
rootNamespace: "Test",
|
|
44
|
+
surface: "@tsonic/js",
|
|
45
|
+
});
|
|
46
|
+
expect(result.ok).to.equal(true);
|
|
47
|
+
if (!result.ok)
|
|
48
|
+
return;
|
|
49
|
+
expect(result.value.modules.some((module) => module.filePath ===
|
|
50
|
+
path.relative(srcDir, path.resolve(packageEntry)))).to.equal(true);
|
|
51
|
+
expect(result.value.modules.some((module) => module.filePath ===
|
|
52
|
+
path.relative(srcDir, path.resolve(packageHelper)))).to.equal(true);
|
|
53
|
+
}
|
|
54
|
+
finally {
|
|
55
|
+
fs.rmSync(tempDir, { recursive: true, force: true });
|
|
56
|
+
}
|
|
57
|
+
});
|
|
58
|
+
it("should traverse awaited relative dynamic-import side effects", () => {
|
|
59
|
+
const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "tsonic-dependency-graph-dynamic-import-"));
|
|
60
|
+
try {
|
|
61
|
+
const srcDir = path.join(tempDir, "src");
|
|
62
|
+
fs.mkdirSync(path.join(srcDir, "nested"), { recursive: true });
|
|
63
|
+
const entryPath = path.join(srcDir, "index.ts");
|
|
64
|
+
const importedPath = path.join(srcDir, "nested", "module.ts");
|
|
65
|
+
fs.writeFileSync(entryPath, [
|
|
66
|
+
"async function load(): Promise<void> {",
|
|
67
|
+
' await import("./nested/module.js");',
|
|
68
|
+
"}",
|
|
69
|
+
"void load();",
|
|
70
|
+
].join("\n"));
|
|
71
|
+
fs.writeFileSync(importedPath, "export const loaded = true;\n");
|
|
72
|
+
const result = buildModuleDependencyGraph(entryPath, {
|
|
73
|
+
projectRoot: tempDir,
|
|
74
|
+
sourceRoot: srcDir,
|
|
75
|
+
rootNamespace: "Test",
|
|
76
|
+
});
|
|
77
|
+
expect(result.ok).to.equal(true);
|
|
78
|
+
if (!result.ok)
|
|
79
|
+
return;
|
|
80
|
+
expect(result.value.modules.some((module) => module.filePath ===
|
|
81
|
+
path.relative(srcDir, path.resolve(importedPath)))).to.equal(true);
|
|
82
|
+
}
|
|
83
|
+
finally {
|
|
84
|
+
fs.rmSync(tempDir, { recursive: true, force: true });
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
it("should traverse value-consuming closed-world dynamic imports", () => {
|
|
88
|
+
const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "tsonic-dependency-graph-dynamic-import-value-"));
|
|
89
|
+
try {
|
|
90
|
+
const srcDir = path.join(tempDir, "src");
|
|
91
|
+
fs.mkdirSync(path.join(srcDir, "nested"), { recursive: true });
|
|
92
|
+
const entryPath = path.join(srcDir, "index.ts");
|
|
93
|
+
const importedPath = path.join(srcDir, "nested", "module.ts");
|
|
94
|
+
fs.writeFileSync(entryPath, [
|
|
95
|
+
"async function load(): Promise<number> {",
|
|
96
|
+
' const module = await import("./nested/module.js");',
|
|
97
|
+
" return module.value;",
|
|
98
|
+
"}",
|
|
99
|
+
"void load();",
|
|
100
|
+
].join("\n"));
|
|
101
|
+
fs.writeFileSync(importedPath, "export const value = 42;\n");
|
|
102
|
+
const result = buildModuleDependencyGraph(entryPath, {
|
|
103
|
+
projectRoot: tempDir,
|
|
104
|
+
sourceRoot: srcDir,
|
|
105
|
+
rootNamespace: "Test",
|
|
106
|
+
});
|
|
107
|
+
expect(result.ok).to.equal(true);
|
|
108
|
+
if (!result.ok)
|
|
109
|
+
return;
|
|
110
|
+
expect(result.value.modules.some((module) => module.filePath ===
|
|
111
|
+
path.relative(srcDir, path.resolve(importedPath)))).to.equal(true);
|
|
112
|
+
}
|
|
113
|
+
finally {
|
|
114
|
+
fs.rmSync(tempDir, { recursive: true, force: true });
|
|
115
|
+
}
|
|
116
|
+
});
|
|
117
|
+
});
|
|
118
|
+
//# sourceMappingURL=dependency-graph.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dependency-graph.test.js","sourceRoot":"","sources":["../../src/program/dependency-graph.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import * as ts from "typescript";
|
|
2
|
+
export declare const getDynamicImportLiteralSpecifier: (node: ts.CallExpression) => string | undefined;
|
|
3
|
+
export declare const isClosedWorldDynamicImportSpecifier: (specifier: string) => boolean;
|
|
4
|
+
export declare const isSideEffectOnlyDynamicImport: (node: ts.CallExpression) => boolean;
|
|
5
|
+
export type DynamicImportSite = {
|
|
6
|
+
readonly node: ts.CallExpression;
|
|
7
|
+
readonly specifier: string;
|
|
8
|
+
};
|
|
9
|
+
export type DynamicImportNamespaceEntry = {
|
|
10
|
+
readonly exportName: string;
|
|
11
|
+
readonly ownerFilePath: string;
|
|
12
|
+
readonly memberName: string;
|
|
13
|
+
readonly memberKind: "function" | "variable";
|
|
14
|
+
readonly declarationName: ts.Identifier;
|
|
15
|
+
};
|
|
16
|
+
export type DynamicImportNamespaceResolution = {
|
|
17
|
+
readonly ok: true;
|
|
18
|
+
readonly specifier: string;
|
|
19
|
+
readonly resolvedFilePath: string;
|
|
20
|
+
readonly entries: readonly DynamicImportNamespaceEntry[];
|
|
21
|
+
} | {
|
|
22
|
+
readonly ok: false;
|
|
23
|
+
readonly reason: string;
|
|
24
|
+
};
|
|
25
|
+
type DynamicImportModuleContext = {
|
|
26
|
+
readonly checker: ts.TypeChecker;
|
|
27
|
+
readonly compilerOptions: ts.CompilerOptions;
|
|
28
|
+
readonly sourceFilesByPath: ReadonlyMap<string, ts.SourceFile>;
|
|
29
|
+
};
|
|
30
|
+
export declare const resolveDynamicImportNamespace: (node: ts.CallExpression, containingFile: string, ctx: DynamicImportModuleContext) => DynamicImportNamespaceResolution;
|
|
31
|
+
export declare const collectClosedWorldDynamicImportSites: (sourceFile: ts.SourceFile) => readonly DynamicImportSite[];
|
|
32
|
+
export {};
|
|
33
|
+
//# sourceMappingURL=dynamic-import.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dynamic-import.d.ts","sourceRoot":"","sources":["../../src/resolver/dynamic-import.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAKjC,eAAO,MAAM,gCAAgC,GAC3C,MAAM,EAAE,CAAC,cAAc,KACtB,MAAM,GAAG,SAKX,CAAC;AAEF,eAAO,MAAM,mCAAmC,GAC9C,WAAW,MAAM,KAChB,OAAoE,CAAC;AAExE,eAAO,MAAM,6BAA6B,GACxC,MAAM,EAAE,CAAC,cAAc,KACtB,OAOF,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC;IACjC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,UAAU,CAAC;IAC7C,QAAQ,CAAC,eAAe,EAAE,EAAE,CAAC,UAAU,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,gCAAgC,GACxC;IACE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAClB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,SAAS,2BAA2B,EAAE,CAAC;CAC1D,GACD;IACE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;AAEN,KAAK,0BAA0B,GAAG;IAChC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,CAAC;IACjC,QAAQ,CAAC,eAAe,EAAE,EAAE,CAAC,eAAe,CAAC;IAC7C,QAAQ,CAAC,iBAAiB,EAAE,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC;CAChE,CAAC;AA4FF,eAAO,MAAM,6BAA6B,GACxC,MAAM,EAAE,CAAC,cAAc,EACvB,gBAAgB,MAAM,EACtB,KAAK,0BAA0B,KAC9B,gCA6EF,CAAC;AAEF,eAAO,MAAM,oCAAoC,GAC/C,YAAY,EAAE,CAAC,UAAU,KACxB,SAAS,iBAAiB,EAe5B,CAAC"}
|
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
import * as ts from "typescript";
|
|
2
|
+
const isDynamicImportCall = (node) => node.expression.kind === ts.SyntaxKind.ImportKeyword;
|
|
3
|
+
export const getDynamicImportLiteralSpecifier = (node) => {
|
|
4
|
+
if (!isDynamicImportCall(node))
|
|
5
|
+
return undefined;
|
|
6
|
+
if (node.arguments.length !== 1)
|
|
7
|
+
return undefined;
|
|
8
|
+
const [arg] = node.arguments;
|
|
9
|
+
return arg && ts.isStringLiteral(arg) ? arg.text : undefined;
|
|
10
|
+
};
|
|
11
|
+
export const isClosedWorldDynamicImportSpecifier = (specifier) => specifier.startsWith("./") || specifier.startsWith("../");
|
|
12
|
+
export const isSideEffectOnlyDynamicImport = (node) => {
|
|
13
|
+
const parent = node.parent;
|
|
14
|
+
return (ts.isAwaitExpression(parent) &&
|
|
15
|
+
parent.expression === node &&
|
|
16
|
+
ts.isExpressionStatement(parent.parent));
|
|
17
|
+
};
|
|
18
|
+
const normalizeFilePath = (filePath) => filePath.replace(/\\/g, "/");
|
|
19
|
+
const resolveDynamicImportTargetPath = (node, containingFile, compilerOptions) => {
|
|
20
|
+
const specifier = getDynamicImportLiteralSpecifier(node);
|
|
21
|
+
if (!specifier || !isClosedWorldDynamicImportSpecifier(specifier)) {
|
|
22
|
+
return undefined;
|
|
23
|
+
}
|
|
24
|
+
const resolved = ts.resolveModuleName(specifier, containingFile, compilerOptions, ts.sys);
|
|
25
|
+
const targetPath = resolved.resolvedModule?.resolvedFileName;
|
|
26
|
+
if (!targetPath || targetPath.endsWith(".d.ts")) {
|
|
27
|
+
return undefined;
|
|
28
|
+
}
|
|
29
|
+
return normalizeFilePath(targetPath);
|
|
30
|
+
};
|
|
31
|
+
const getModuleSymbol = (sourceFile, checker) => {
|
|
32
|
+
const direct = checker.getSymbolAtLocation(sourceFile);
|
|
33
|
+
if (direct)
|
|
34
|
+
return direct;
|
|
35
|
+
const withSymbol = sourceFile;
|
|
36
|
+
return withSymbol.symbol;
|
|
37
|
+
};
|
|
38
|
+
const getSupportedValueExportDeclaration = (exportSymbol, checker, sourceFilesByPath) => {
|
|
39
|
+
const actualSymbol = exportSymbol.flags & ts.SymbolFlags.Alias
|
|
40
|
+
? checker.getAliasedSymbol(exportSymbol)
|
|
41
|
+
: exportSymbol;
|
|
42
|
+
if ((actualSymbol.flags & ts.SymbolFlags.Value) === 0) {
|
|
43
|
+
return null;
|
|
44
|
+
}
|
|
45
|
+
for (const declaration of actualSymbol.getDeclarations() ?? []) {
|
|
46
|
+
if (ts.isFunctionDeclaration(declaration) &&
|
|
47
|
+
declaration.name &&
|
|
48
|
+
sourceFilesByPath.has(normalizeFilePath(declaration.getSourceFile().fileName))) {
|
|
49
|
+
return {
|
|
50
|
+
exportName: exportSymbol.getName(),
|
|
51
|
+
ownerFilePath: normalizeFilePath(declaration.getSourceFile().fileName),
|
|
52
|
+
memberName: declaration.name.text,
|
|
53
|
+
memberKind: "function",
|
|
54
|
+
declarationName: declaration.name,
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
if (ts.isVariableDeclaration(declaration) &&
|
|
58
|
+
ts.isIdentifier(declaration.name) &&
|
|
59
|
+
sourceFilesByPath.has(normalizeFilePath(declaration.getSourceFile().fileName))) {
|
|
60
|
+
return {
|
|
61
|
+
exportName: exportSymbol.getName(),
|
|
62
|
+
ownerFilePath: normalizeFilePath(declaration.getSourceFile().fileName),
|
|
63
|
+
memberName: declaration.name.text,
|
|
64
|
+
memberKind: "variable",
|
|
65
|
+
declarationName: declaration.name,
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return undefined;
|
|
70
|
+
};
|
|
71
|
+
export const resolveDynamicImportNamespace = (node, containingFile, ctx) => {
|
|
72
|
+
const specifier = getDynamicImportLiteralSpecifier(node);
|
|
73
|
+
if (!specifier) {
|
|
74
|
+
return {
|
|
75
|
+
ok: false,
|
|
76
|
+
reason: "Dynamic import specifier must be a string literal.",
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
if (!isClosedWorldDynamicImportSpecifier(specifier)) {
|
|
80
|
+
return {
|
|
81
|
+
ok: false,
|
|
82
|
+
reason: "Dynamic import is only supported for closed-world local specifiers ('./' or '../').",
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
const resolvedFilePath = resolveDynamicImportTargetPath(node, containingFile, ctx.compilerOptions);
|
|
86
|
+
if (!resolvedFilePath) {
|
|
87
|
+
return {
|
|
88
|
+
ok: false,
|
|
89
|
+
reason: "Dynamic import target could not be resolved to a local TypeScript source file.",
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
const targetSourceFile = ctx.sourceFilesByPath.get(resolvedFilePath);
|
|
93
|
+
if (!targetSourceFile) {
|
|
94
|
+
return {
|
|
95
|
+
ok: false,
|
|
96
|
+
reason: "Dynamic import target is not part of the current closed-world source graph.",
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
const moduleSymbol = getModuleSymbol(targetSourceFile, ctx.checker);
|
|
100
|
+
if (!moduleSymbol) {
|
|
101
|
+
return {
|
|
102
|
+
ok: false,
|
|
103
|
+
reason: "Dynamic import target does not expose a module symbol for deterministic export analysis.",
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
const exportSymbols = [...ctx.checker.getExportsOfModule(moduleSymbol)].sort((left, right) => left.getName().localeCompare(right.getName()));
|
|
107
|
+
const entries = [];
|
|
108
|
+
for (const exportSymbol of exportSymbols) {
|
|
109
|
+
const entry = getSupportedValueExportDeclaration(exportSymbol, ctx.checker, ctx.sourceFilesByPath);
|
|
110
|
+
if (entry === null) {
|
|
111
|
+
continue;
|
|
112
|
+
}
|
|
113
|
+
if (entry === undefined) {
|
|
114
|
+
return {
|
|
115
|
+
ok: false,
|
|
116
|
+
reason: `Dynamic import namespace for '${specifier}' requires runtime exports to lower to named function/variable members. Unsupported export: '${exportSymbol.getName()}'.`,
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
entries.push(entry);
|
|
120
|
+
}
|
|
121
|
+
return {
|
|
122
|
+
ok: true,
|
|
123
|
+
specifier,
|
|
124
|
+
resolvedFilePath,
|
|
125
|
+
entries,
|
|
126
|
+
};
|
|
127
|
+
};
|
|
128
|
+
export const collectClosedWorldDynamicImportSites = (sourceFile) => {
|
|
129
|
+
const sites = [];
|
|
130
|
+
const visit = (node) => {
|
|
131
|
+
if (ts.isCallExpression(node)) {
|
|
132
|
+
const specifier = getDynamicImportLiteralSpecifier(node);
|
|
133
|
+
if (specifier && isClosedWorldDynamicImportSpecifier(specifier)) {
|
|
134
|
+
sites.push({ node, specifier });
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
ts.forEachChild(node, visit);
|
|
138
|
+
};
|
|
139
|
+
visit(sourceFile);
|
|
140
|
+
return sites;
|
|
141
|
+
};
|
|
142
|
+
//# sourceMappingURL=dynamic-import.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dynamic-import.js","sourceRoot":"","sources":["../../src/resolver/dynamic-import.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dynamic-import.test.d.ts","sourceRoot":"","sources":["../../src/resolver/dynamic-import.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,150 @@
|
|
|
1
|
+
import { describe, it } from "mocha";
|
|
2
|
+
import { expect } from "chai";
|
|
3
|
+
import * as fs from "node:fs";
|
|
4
|
+
import * as os from "node:os";
|
|
5
|
+
import * as path from "node:path";
|
|
6
|
+
import * as ts from "typescript";
|
|
7
|
+
import { collectClosedWorldDynamicImportSites, resolveDynamicImportNamespace, } from "./dynamic-import.js";
|
|
8
|
+
describe("dynamic import resolver", () => {
|
|
9
|
+
it("resolves deterministic closed-world namespace imports", () => {
|
|
10
|
+
const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "tsonic-dynamic-import-success-"));
|
|
11
|
+
try {
|
|
12
|
+
const files = {
|
|
13
|
+
"src/index.ts": 'export async function load() { return import("./module.js"); }\n',
|
|
14
|
+
"src/module.ts": "export const value = 42;\nexport function twice(x: number): number { return x * 2; }\n",
|
|
15
|
+
};
|
|
16
|
+
for (const [relativePath, content] of Object.entries(files)) {
|
|
17
|
+
const fullPath = path.join(tempDir, relativePath);
|
|
18
|
+
fs.mkdirSync(path.dirname(fullPath), { recursive: true });
|
|
19
|
+
fs.writeFileSync(fullPath, content);
|
|
20
|
+
}
|
|
21
|
+
const entryPath = path.join(tempDir, "src", "index.ts");
|
|
22
|
+
const modulePath = path.join(tempDir, "src", "module.ts");
|
|
23
|
+
const program = ts.createProgram([entryPath, modulePath], {
|
|
24
|
+
target: ts.ScriptTarget.ES2022,
|
|
25
|
+
module: ts.ModuleKind.NodeNext,
|
|
26
|
+
moduleResolution: ts.ModuleResolutionKind.NodeNext,
|
|
27
|
+
strict: true,
|
|
28
|
+
noEmit: true,
|
|
29
|
+
skipLibCheck: true,
|
|
30
|
+
});
|
|
31
|
+
const entrySourceFile = program.getSourceFile(entryPath);
|
|
32
|
+
if (!entrySourceFile)
|
|
33
|
+
throw new Error("Missing entry source file.");
|
|
34
|
+
const checker = program.getTypeChecker();
|
|
35
|
+
const sourceFilesByPath = new Map([
|
|
36
|
+
[entryPath.replace(/\\/g, "/"), entrySourceFile],
|
|
37
|
+
[modulePath.replace(/\\/g, "/"), program.getSourceFile(modulePath)],
|
|
38
|
+
]);
|
|
39
|
+
const importCall = entrySourceFile.statements
|
|
40
|
+
.flatMap((statement) => ts.isFunctionDeclaration(statement) && statement.body
|
|
41
|
+
? statement.body.statements
|
|
42
|
+
: [])
|
|
43
|
+
.flatMap((statement) => ts.isReturnStatement(statement) && statement.expression
|
|
44
|
+
? [statement.expression]
|
|
45
|
+
: [])
|
|
46
|
+
.find(ts.isCallExpression);
|
|
47
|
+
expect(importCall).to.not.equal(undefined);
|
|
48
|
+
if (!importCall)
|
|
49
|
+
return;
|
|
50
|
+
const resolution = resolveDynamicImportNamespace(importCall, entryPath.replace(/\\/g, "/"), {
|
|
51
|
+
checker,
|
|
52
|
+
compilerOptions: program.getCompilerOptions(),
|
|
53
|
+
sourceFilesByPath,
|
|
54
|
+
});
|
|
55
|
+
expect(resolution.ok).to.equal(true);
|
|
56
|
+
if (!resolution.ok)
|
|
57
|
+
return;
|
|
58
|
+
expect(resolution.resolvedFilePath).to.equal(modulePath.replace(/\\/g, "/"));
|
|
59
|
+
expect(resolution.entries.map((entry) => entry.exportName)).to.deep.equal(["twice", "value"]);
|
|
60
|
+
}
|
|
61
|
+
finally {
|
|
62
|
+
fs.rmSync(tempDir, { recursive: true, force: true });
|
|
63
|
+
}
|
|
64
|
+
});
|
|
65
|
+
it("rejects runtime namespace exports that do not lower to named function/variable members", () => {
|
|
66
|
+
const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "tsonic-dynamic-import-unsupported-"));
|
|
67
|
+
try {
|
|
68
|
+
const entryPath = path.join(tempDir, "src", "index.ts");
|
|
69
|
+
const modulePath = path.join(tempDir, "src", "module.ts");
|
|
70
|
+
fs.mkdirSync(path.dirname(entryPath), { recursive: true });
|
|
71
|
+
fs.writeFileSync(entryPath, 'export async function load() { const mod = await import("./module.js"); return mod.Box; }\n');
|
|
72
|
+
fs.writeFileSync(modulePath, "export class Box {}\n");
|
|
73
|
+
const program = ts.createProgram([entryPath, modulePath], {
|
|
74
|
+
target: ts.ScriptTarget.ES2022,
|
|
75
|
+
module: ts.ModuleKind.NodeNext,
|
|
76
|
+
moduleResolution: ts.ModuleResolutionKind.NodeNext,
|
|
77
|
+
strict: true,
|
|
78
|
+
noEmit: true,
|
|
79
|
+
skipLibCheck: true,
|
|
80
|
+
});
|
|
81
|
+
const entrySourceFile = program.getSourceFile(entryPath);
|
|
82
|
+
if (!entrySourceFile)
|
|
83
|
+
throw new Error("Missing entry source file.");
|
|
84
|
+
const checker = program.getTypeChecker();
|
|
85
|
+
const sites = collectClosedWorldDynamicImportSites(entrySourceFile);
|
|
86
|
+
expect(sites).to.have.length(1);
|
|
87
|
+
const resolution = resolveDynamicImportNamespace(sites[0].node, entryPath.replace(/\\/g, "/"), {
|
|
88
|
+
checker,
|
|
89
|
+
compilerOptions: program.getCompilerOptions(),
|
|
90
|
+
sourceFilesByPath: new Map([
|
|
91
|
+
[entryPath.replace(/\\/g, "/"), entrySourceFile],
|
|
92
|
+
[
|
|
93
|
+
modulePath.replace(/\\/g, "/"),
|
|
94
|
+
program.getSourceFile(modulePath),
|
|
95
|
+
],
|
|
96
|
+
]),
|
|
97
|
+
});
|
|
98
|
+
expect(resolution.ok).to.equal(false);
|
|
99
|
+
if (resolution.ok)
|
|
100
|
+
return;
|
|
101
|
+
expect(resolution.reason).to.include("Unsupported export: 'Box'");
|
|
102
|
+
}
|
|
103
|
+
finally {
|
|
104
|
+
fs.rmSync(tempDir, { recursive: true, force: true });
|
|
105
|
+
}
|
|
106
|
+
});
|
|
107
|
+
it("allows closed-world dynamic imports of modules with no runtime exports", () => {
|
|
108
|
+
const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "tsonic-dynamic-import-empty-"));
|
|
109
|
+
try {
|
|
110
|
+
const entryPath = path.join(tempDir, "src", "index.ts");
|
|
111
|
+
const modulePath = path.join(tempDir, "src", "module.ts");
|
|
112
|
+
fs.mkdirSync(path.dirname(entryPath), { recursive: true });
|
|
113
|
+
fs.writeFileSync(entryPath, 'export async function load() { return import("./module.js"); }\n');
|
|
114
|
+
fs.writeFileSync(modulePath, "export type Value = { readonly ok: true };\n");
|
|
115
|
+
const program = ts.createProgram([entryPath, modulePath], {
|
|
116
|
+
target: ts.ScriptTarget.ES2022,
|
|
117
|
+
module: ts.ModuleKind.NodeNext,
|
|
118
|
+
moduleResolution: ts.ModuleResolutionKind.NodeNext,
|
|
119
|
+
strict: true,
|
|
120
|
+
noEmit: true,
|
|
121
|
+
skipLibCheck: true,
|
|
122
|
+
});
|
|
123
|
+
const entrySourceFile = program.getSourceFile(entryPath);
|
|
124
|
+
if (!entrySourceFile)
|
|
125
|
+
throw new Error("Missing entry source file.");
|
|
126
|
+
const checker = program.getTypeChecker();
|
|
127
|
+
const sites = collectClosedWorldDynamicImportSites(entrySourceFile);
|
|
128
|
+
expect(sites).to.have.length(1);
|
|
129
|
+
const resolution = resolveDynamicImportNamespace(sites[0].node, entryPath.replace(/\\/g, "/"), {
|
|
130
|
+
checker,
|
|
131
|
+
compilerOptions: program.getCompilerOptions(),
|
|
132
|
+
sourceFilesByPath: new Map([
|
|
133
|
+
[entryPath.replace(/\\/g, "/"), entrySourceFile],
|
|
134
|
+
[
|
|
135
|
+
modulePath.replace(/\\/g, "/"),
|
|
136
|
+
program.getSourceFile(modulePath),
|
|
137
|
+
],
|
|
138
|
+
]),
|
|
139
|
+
});
|
|
140
|
+
expect(resolution.ok).to.equal(true);
|
|
141
|
+
if (!resolution.ok)
|
|
142
|
+
return;
|
|
143
|
+
expect(resolution.entries).to.deep.equal([]);
|
|
144
|
+
}
|
|
145
|
+
finally {
|
|
146
|
+
fs.rmSync(tempDir, { recursive: true, force: true });
|
|
147
|
+
}
|
|
148
|
+
});
|
|
149
|
+
});
|
|
150
|
+
//# sourceMappingURL=dynamic-import.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dynamic-import.test.js","sourceRoot":"","sources":["../../src/resolver/dynamic-import.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EACL,oCAAoC,EACpC,6BAA6B,GAC9B,MAAM,qBAAqB,CAAC;AAE7B,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC/D,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAC5B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,gCAAgC,CAAC,CACzD,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,KAAK,GAAG;gBACZ,cAAc,EACZ,kEAAkE;gBACpE,eAAe,EACb,wFAAwF;aAC3F,CAAC;YACF,KAAK,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC5D,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;gBAClD,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC1D,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YACtC,CAAC;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;YACxD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;YAC1D,MAAM,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE;gBACxD,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM;gBAC9B,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ;gBAC9B,gBAAgB,EAAE,EAAE,CAAC,oBAAoB,CAAC,QAAQ;gBAClD,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;YACH,MAAM,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YACzD,IAAI,CAAC,eAAe;gBAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;YACpE,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;YACzC,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAwB;gBACvD,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,eAAe,CAAC;gBAChD,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,UAAU,CAAE,CAAC;aACrE,CAAC,CAAC;YACH,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU;iBAC1C,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CACrB,EAAE,CAAC,qBAAqB,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI;gBACnD,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU;gBAC3B,CAAC,CAAC,EAAE,CACP;iBACA,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CACrB,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,UAAU;gBACrD,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC;gBACxB,CAAC,CAAC,EAAE,CACP;iBACA,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC;YAE7B,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAC3C,IAAI,CAAC,UAAU;gBAAE,OAAO;YAExB,MAAM,UAAU,GAAG,6BAA6B,CAC9C,UAAU,EACV,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAC7B;gBACE,OAAO;gBACP,eAAe,EAAE,OAAO,CAAC,kBAAkB,EAAE;gBAC7C,iBAAiB;aAClB,CACF,CAAC;YAEF,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,CAAC,UAAU,CAAC,EAAE;gBAAE,OAAO;YAE3B,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,KAAK,CAC1C,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAC/B,CAAC;YACF,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CACvE,CAAC,OAAO,EAAE,OAAO,CAAC,CACnB,CAAC;QACJ,CAAC;gBAAS,CAAC;YACT,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wFAAwF,EAAE,GAAG,EAAE;QAChG,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAC5B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,oCAAoC,CAAC,CAC7D,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;YACxD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;YAC1D,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,EAAE,CAAC,aAAa,CACd,SAAS,EACT,6FAA6F,CAC9F,CAAC;YACF,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,uBAAuB,CAAC,CAAC;YAEtD,MAAM,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE;gBACxD,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM;gBAC9B,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ;gBAC9B,gBAAgB,EAAE,EAAE,CAAC,oBAAoB,CAAC,QAAQ;gBAClD,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;YACH,MAAM,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YACzD,IAAI,CAAC,eAAe;gBAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;YACpE,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;YACzC,MAAM,KAAK,GAAG,oCAAoC,CAAC,eAAe,CAAC,CAAC;YAEpE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAChC,MAAM,UAAU,GAAG,6BAA6B,CAC9C,KAAK,CAAC,CAAC,CAAE,CAAC,IAAI,EACd,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAC7B;gBACE,OAAO;gBACP,eAAe,EAAE,OAAO,CAAC,kBAAkB,EAAE;gBAC7C,iBAAiB,EAAE,IAAI,GAAG,CAAwB;oBAChD,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,eAAe,CAAC;oBAChD;wBACE,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;wBAC9B,OAAO,CAAC,aAAa,CAAC,UAAU,CAAE;qBACnC;iBACF,CAAC;aACH,CACF,CAAC;YAEF,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtC,IAAI,UAAU,CAAC,EAAE;gBAAE,OAAO;YAE1B,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;QACpE,CAAC;gBAAS,CAAC;YACT,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wEAAwE,EAAE,GAAG,EAAE;QAChF,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAC5B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,8BAA8B,CAAC,CACvD,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;YACxD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;YAC1D,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,EAAE,CAAC,aAAa,CACd,SAAS,EACT,kEAAkE,CACnE,CAAC;YACF,EAAE,CAAC,aAAa,CACd,UAAU,EACV,8CAA8C,CAC/C,CAAC;YAEF,MAAM,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE;gBACxD,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM;gBAC9B,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ;gBAC9B,gBAAgB,EAAE,EAAE,CAAC,oBAAoB,CAAC,QAAQ;gBAClD,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;YACH,MAAM,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YACzD,IAAI,CAAC,eAAe;gBAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;YACpE,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;YACzC,MAAM,KAAK,GAAG,oCAAoC,CAAC,eAAe,CAAC,CAAC;YAEpE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAChC,MAAM,UAAU,GAAG,6BAA6B,CAC9C,KAAK,CAAC,CAAC,CAAE,CAAC,IAAI,EACd,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAC7B;gBACE,OAAO;gBACP,eAAe,EAAE,OAAO,CAAC,kBAAkB,EAAE;gBAC7C,iBAAiB,EAAE,IAAI,GAAG,CAAwB;oBAChD,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,eAAe,CAAC;oBAChD;wBACE,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;wBAC9B,OAAO,CAAC,aAAa,CAAC,UAAU,CAAE;qBACnC;iBACF,CAAC;aACH,CACF,CAAC;YAEF,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,CAAC,UAAU,CAAC,EAAE;gBAAE,OAAO;YAE3B,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC/C,CAAC;gBAAS,CAAC;YACT,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -14,6 +14,8 @@ import type { BindingRegistry } from "../program/bindings.js";
|
|
|
14
14
|
export type ResolveImportOptions = {
|
|
15
15
|
readonly clrResolver?: ClrBindingsResolver;
|
|
16
16
|
readonly bindings?: BindingRegistry;
|
|
17
|
+
readonly projectRoot?: string;
|
|
18
|
+
readonly surface?: string;
|
|
17
19
|
};
|
|
18
20
|
/**
|
|
19
21
|
* Resolve import specifier to module
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import-resolution.d.ts","sourceRoot":"","sources":["../../src/resolver/import-resolution.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,MAAM,EAAa,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAoB,MAAM,wBAAwB,CAAC;AAEtE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"import-resolution.d.ts","sourceRoot":"","sources":["../../src/resolver/import-resolution.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,MAAM,EAAa,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAoB,MAAM,wBAAwB,CAAC;AAEtE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAK5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,CAAC,WAAW,CAAC,EAAE,mBAAmB,CAAC;IAC3C,QAAQ,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC;IACpC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,GACxB,iBAAiB,MAAM,EACvB,gBAAgB,MAAM,EACtB,YAAY,MAAM,EAClB,OAAO,oBAAoB,KAC1B,MAAM,CAAC,cAAc,EAAE,UAAU,CAuFnC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,GAC7B,iBAAiB,MAAM,EACvB,gBAAgB,MAAM,EACtB,YAAY,MAAM,KACjB,MAAM,CAAC,cAAc,EAAE,UAAU,CA0EnC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAC3B,iBAAiB,MAAM,KACtB,MAAM,CAAC,cAAc,EAAE,UAAU,CAuBnC,CAAC"}
|
|
@@ -8,6 +8,7 @@ import * as fs from "node:fs";
|
|
|
8
8
|
import { ok, error } from "../types/result.js";
|
|
9
9
|
import { createDiagnostic } from "../types/diagnostic.js";
|
|
10
10
|
import { isLocalImport } from "../types/module.js";
|
|
11
|
+
import { getLocalResolutionBoundary, resolveSourcePackageImport, } from "./source-package-resolution.js";
|
|
11
12
|
/**
|
|
12
13
|
* Resolve import specifier to module
|
|
13
14
|
*
|
|
@@ -63,6 +64,20 @@ export const resolveImport = (importSpecifier, containingFile, sourceRoot, opts)
|
|
|
63
64
|
resolvedAssembly: undefined,
|
|
64
65
|
});
|
|
65
66
|
}
|
|
67
|
+
if (opts?.projectRoot) {
|
|
68
|
+
const sourcePackage = resolveSourcePackageImport(canonicalImportSpecifier, containingFile, opts.surface, opts.projectRoot);
|
|
69
|
+
if (!sourcePackage.ok)
|
|
70
|
+
return sourcePackage;
|
|
71
|
+
if (sourcePackage.value) {
|
|
72
|
+
return ok({
|
|
73
|
+
resolvedPath: sourcePackage.value.resolvedPath,
|
|
74
|
+
isLocal: true,
|
|
75
|
+
isSourcePackage: true,
|
|
76
|
+
isClr: false,
|
|
77
|
+
originalSpecifier: importSpecifier,
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
}
|
|
66
81
|
return error(createDiagnostic("TSN1004", "error", `Unsupported module import: "${importSpecifier}"`, undefined, "Tsonic only supports local imports (with .js or .ts), .NET imports, and registered module bindings"));
|
|
67
82
|
};
|
|
68
83
|
/**
|
|
@@ -94,9 +109,11 @@ export const resolveLocalImport = (importSpecifier, containingFile, sourceRoot)
|
|
|
94
109
|
if (realPath !== resolvedPath && process.platform !== "win32") {
|
|
95
110
|
return error(createDiagnostic("TSN1003", "error", `Case mismatch in import path: "${importSpecifier}"`, undefined, `File exists as: ${realPath}`));
|
|
96
111
|
}
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
112
|
+
const localBoundary = getLocalResolutionBoundary(containingFile, sourceRoot);
|
|
113
|
+
// Ensure it's within the current module boundary (workspace source root or
|
|
114
|
+
// installed source-package root).
|
|
115
|
+
if (!resolvedPath.startsWith(localBoundary)) {
|
|
116
|
+
return error(createDiagnostic("TSN1004", "error", `Import outside allowed module root: "${importSpecifier}"`, undefined, `Allowed root: ${localBoundary}`));
|
|
100
117
|
}
|
|
101
118
|
return ok({
|
|
102
119
|
resolvedPath,
|