@tsonic/frontend 0.0.66 → 0.0.68
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 +172 -1
- 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 +1350 -7
- 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 +239 -50
- package/dist/program/creation.js.map +1 -1
- package/dist/program/creation.test.js +485 -18
- 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 +2 -0
- package/dist/surface/profiles.d.ts.map +1 -1
- package/dist/surface/profiles.js +15 -9
- package/dist/surface/profiles.js.map +1 -1
- package/dist/surface/profiles.test.js +63 -26
- 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 +13 -16
- 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
|
@@ -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,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import-resolution.js","sourceRoot":"","sources":["../../src/resolver/import-resolution.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAU,EAAE,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAc,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"import-resolution.js","sourceRoot":"","sources":["../../src/resolver/import-resolution.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { SurfaceMode } from "../program/types.js";
|
|
2
|
+
import { type Diagnostic } from "../types/diagnostic.js";
|
|
3
|
+
import { type Result } from "../types/result.js";
|
|
4
|
+
export type ResolvedSourcePackageImport = {
|
|
5
|
+
readonly packageName: string;
|
|
6
|
+
readonly packageRoot: string;
|
|
7
|
+
readonly resolvedPath: string;
|
|
8
|
+
};
|
|
9
|
+
export declare const getLocalResolutionBoundary: (containingFile: string, defaultSourceRoot: string) => string;
|
|
10
|
+
export declare const resolveSourcePackageImport: (importSpecifier: string, containingFile: string, activeSurface: SurfaceMode | undefined, projectRoot: string) => Result<ResolvedSourcePackageImport | null, Diagnostic>;
|
|
11
|
+
//# sourceMappingURL=source-package-resolution.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"source-package-resolution.d.ts","sourceRoot":"","sources":["../../src/resolver/source-package-resolution.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAoB,KAAK,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAE3E,OAAO,EAAa,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAa5D,MAAM,MAAM,2BAA2B,GAAG;IACxC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC/B,CAAC;AAqDF,eAAO,MAAM,0BAA0B,GACrC,gBAAgB,MAAM,EACtB,mBAAmB,MAAM,KACxB,MAOF,CAAC;AAgPF,eAAO,MAAM,0BAA0B,GACrC,iBAAiB,MAAM,EACvB,gBAAgB,MAAM,EACtB,eAAe,WAAW,GAAG,SAAS,EACtC,aAAa,MAAM,KAClB,MAAM,CAAC,2BAA2B,GAAG,IAAI,EAAE,UAAU,CAoFvD,CAAC"}
|
|
@@ -0,0 +1,188 @@
|
|
|
1
|
+
import * as fs from "node:fs";
|
|
2
|
+
import * as path from "node:path";
|
|
3
|
+
import { createDiagnostic } from "../types/diagnostic.js";
|
|
4
|
+
import { resolveSurfaceCapabilities } from "../surface/profiles.js";
|
|
5
|
+
import { error, ok } from "../types/result.js";
|
|
6
|
+
const splitPackageNameSegments = (packageName) => packageName.startsWith("@") ? packageName.split("/") : [packageName];
|
|
7
|
+
const findInstalledPackageRoot = (packageName, containingFile) => {
|
|
8
|
+
const packageSegments = splitPackageNameSegments(packageName);
|
|
9
|
+
let currentDir = path.dirname(path.resolve(containingFile));
|
|
10
|
+
for (;;) {
|
|
11
|
+
const candidate = path.join(currentDir, "node_modules", ...packageSegments);
|
|
12
|
+
if (fs.existsSync(path.join(candidate, "package.json"))) {
|
|
13
|
+
return candidate;
|
|
14
|
+
}
|
|
15
|
+
const parentDir = path.dirname(currentDir);
|
|
16
|
+
if (parentDir === currentDir) {
|
|
17
|
+
return undefined;
|
|
18
|
+
}
|
|
19
|
+
currentDir = parentDir;
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
const findContainingSourcePackageRoot = (filePath) => {
|
|
23
|
+
let currentDir = path.dirname(filePath);
|
|
24
|
+
for (;;) {
|
|
25
|
+
const manifestPath = path.join(currentDir, "tsonic", "package-manifest.json");
|
|
26
|
+
const packageJsonPath = path.join(currentDir, "package.json");
|
|
27
|
+
if (fs.existsSync(manifestPath) && fs.existsSync(packageJsonPath)) {
|
|
28
|
+
const manifestResult = readManifest(manifestPath);
|
|
29
|
+
if (manifestResult.ok &&
|
|
30
|
+
manifestResult.value?.kind === "tsonic-source-package") {
|
|
31
|
+
return currentDir;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
const parentDir = path.dirname(currentDir);
|
|
35
|
+
if (parentDir === currentDir)
|
|
36
|
+
return undefined;
|
|
37
|
+
currentDir = parentDir;
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
export const getLocalResolutionBoundary = (containingFile, defaultSourceRoot) => {
|
|
41
|
+
if (path.resolve(containingFile).startsWith(path.resolve(defaultSourceRoot))) {
|
|
42
|
+
return defaultSourceRoot;
|
|
43
|
+
}
|
|
44
|
+
return findContainingSourcePackageRoot(containingFile) ?? defaultSourceRoot;
|
|
45
|
+
};
|
|
46
|
+
const parsePackageSpecifier = (importSpecifier) => {
|
|
47
|
+
if (importSpecifier.startsWith(".") || importSpecifier.startsWith("/")) {
|
|
48
|
+
return undefined;
|
|
49
|
+
}
|
|
50
|
+
if (importSpecifier.startsWith("@")) {
|
|
51
|
+
const match = importSpecifier.match(/^(@[^/]+\/[^/]+)(?:\/(.+))?$/);
|
|
52
|
+
if (!match?.[1])
|
|
53
|
+
return undefined;
|
|
54
|
+
return {
|
|
55
|
+
packageName: match[1],
|
|
56
|
+
subpath: match[2],
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
const match = importSpecifier.match(/^([^/]+)(?:\/(.+))?$/);
|
|
60
|
+
if (!match?.[1])
|
|
61
|
+
return undefined;
|
|
62
|
+
return {
|
|
63
|
+
packageName: match[1],
|
|
64
|
+
subpath: match[2],
|
|
65
|
+
};
|
|
66
|
+
};
|
|
67
|
+
const readManifest = (manifestPath) => {
|
|
68
|
+
if (!fs.existsSync(manifestPath))
|
|
69
|
+
return ok(null);
|
|
70
|
+
try {
|
|
71
|
+
const parsed = JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
|
|
72
|
+
if (parsed === null ||
|
|
73
|
+
typeof parsed !== "object" ||
|
|
74
|
+
Array.isArray(parsed)) {
|
|
75
|
+
return error(createDiagnostic("TSN1004", "error", `Invalid source package manifest: ${manifestPath}`, undefined, "Expected a JSON object."));
|
|
76
|
+
}
|
|
77
|
+
return ok(parsed);
|
|
78
|
+
}
|
|
79
|
+
catch (err) {
|
|
80
|
+
return error(createDiagnostic("TSN1004", "error", `Failed to parse source package manifest: ${manifestPath}`, undefined, err instanceof Error ? err.message : String(err)));
|
|
81
|
+
}
|
|
82
|
+
};
|
|
83
|
+
const parseSurfaces = (value, manifestPath) => {
|
|
84
|
+
if (!Array.isArray(value) || value.length === 0) {
|
|
85
|
+
return error(createDiagnostic("TSN1004", "error", `Invalid source package manifest: ${manifestPath}`, undefined, "`surfaces` must be a non-empty string array."));
|
|
86
|
+
}
|
|
87
|
+
const surfaces = value
|
|
88
|
+
.filter((entry) => typeof entry === "string")
|
|
89
|
+
.map((entry) => entry.trim())
|
|
90
|
+
.filter((entry) => entry.length > 0);
|
|
91
|
+
if (surfaces.length !== value.length) {
|
|
92
|
+
return error(createDiagnostic("TSN1004", "error", `Invalid source package manifest: ${manifestPath}`, undefined, "`surfaces` entries must all be non-empty strings."));
|
|
93
|
+
}
|
|
94
|
+
return ok(surfaces);
|
|
95
|
+
};
|
|
96
|
+
const parseSourceSection = (value, manifestPath) => {
|
|
97
|
+
if (value === null || typeof value !== "object" || Array.isArray(value)) {
|
|
98
|
+
return error(createDiagnostic("TSN1004", "error", `Invalid source package manifest: ${manifestPath}`, undefined, "`source` must be an object."));
|
|
99
|
+
}
|
|
100
|
+
const exportsRaw = value.exports;
|
|
101
|
+
if (exportsRaw === null ||
|
|
102
|
+
typeof exportsRaw !== "object" ||
|
|
103
|
+
Array.isArray(exportsRaw)) {
|
|
104
|
+
return error(createDiagnostic("TSN1004", "error", `Invalid source package manifest: ${manifestPath}`, undefined, "`source.exports` must be an object."));
|
|
105
|
+
}
|
|
106
|
+
const entries = {};
|
|
107
|
+
for (const [key, target] of Object.entries(exportsRaw)) {
|
|
108
|
+
if (!key.trim()) {
|
|
109
|
+
return error(createDiagnostic("TSN1004", "error", `Invalid source package manifest: ${manifestPath}`, undefined, "`source.exports` keys must be non-empty strings."));
|
|
110
|
+
}
|
|
111
|
+
if (typeof target !== "string" || !target.trim()) {
|
|
112
|
+
return error(createDiagnostic("TSN1004", "error", `Invalid source package manifest: ${manifestPath}`, undefined, "`source.exports` values must be non-empty strings."));
|
|
113
|
+
}
|
|
114
|
+
entries[key] = target.trim();
|
|
115
|
+
}
|
|
116
|
+
if (Object.keys(entries).length === 0) {
|
|
117
|
+
return error(createDiagnostic("TSN1004", "error", `Invalid source package manifest: ${manifestPath}`, undefined, "`source.exports` must declare at least one export."));
|
|
118
|
+
}
|
|
119
|
+
return ok({ exports: entries });
|
|
120
|
+
};
|
|
121
|
+
const resolveExportTarget = (packageRoot, target) => {
|
|
122
|
+
if (path.isAbsolute(target)) {
|
|
123
|
+
return error(createDiagnostic("TSN1004", "error", `Invalid source package export target: ${target}`, undefined, "Export targets must be package-relative paths."));
|
|
124
|
+
}
|
|
125
|
+
const absolute = path.resolve(packageRoot, target);
|
|
126
|
+
const relativeToRoot = path.relative(packageRoot, absolute);
|
|
127
|
+
if (relativeToRoot.startsWith("..") || path.isAbsolute(relativeToRoot)) {
|
|
128
|
+
return error(createDiagnostic("TSN1004", "error", `Invalid source package export target: ${target}`, undefined, "Export targets must stay within the package root."));
|
|
129
|
+
}
|
|
130
|
+
if (!absolute.endsWith(".ts") &&
|
|
131
|
+
!absolute.endsWith(".mts") &&
|
|
132
|
+
!absolute.endsWith(".cts")) {
|
|
133
|
+
return error(createDiagnostic("TSN1004", "error", `Invalid source package export target: ${target}`, undefined, "Export targets must point to TypeScript source files."));
|
|
134
|
+
}
|
|
135
|
+
if (!fs.existsSync(absolute)) {
|
|
136
|
+
return error(createDiagnostic("TSN1004", "error", `Cannot find source package export target: ${target}`, undefined, `Expected file at ${absolute}`));
|
|
137
|
+
}
|
|
138
|
+
return ok(absolute);
|
|
139
|
+
};
|
|
140
|
+
export const resolveSourcePackageImport = (importSpecifier, containingFile, activeSurface, projectRoot) => {
|
|
141
|
+
const parsedSpecifier = parsePackageSpecifier(importSpecifier);
|
|
142
|
+
if (!parsedSpecifier)
|
|
143
|
+
return ok(null);
|
|
144
|
+
const packageRoot = findInstalledPackageRoot(parsedSpecifier.packageName, containingFile);
|
|
145
|
+
if (!packageRoot)
|
|
146
|
+
return ok(null);
|
|
147
|
+
const manifestPath = path.join(packageRoot, "tsonic", "package-manifest.json");
|
|
148
|
+
const manifestResult = readManifest(manifestPath);
|
|
149
|
+
if (!manifestResult.ok)
|
|
150
|
+
return manifestResult;
|
|
151
|
+
const manifest = manifestResult.value;
|
|
152
|
+
if (!manifest)
|
|
153
|
+
return ok(null);
|
|
154
|
+
if (manifest.schemaVersion !== 1) {
|
|
155
|
+
return error(createDiagnostic("TSN1004", "error", `Invalid source package manifest: ${manifestPath}`, undefined, "schemaVersion must be 1."));
|
|
156
|
+
}
|
|
157
|
+
if (manifest.kind !== "tsonic-source-package") {
|
|
158
|
+
return ok(null);
|
|
159
|
+
}
|
|
160
|
+
const surfaces = parseSurfaces(manifest.surfaces, manifestPath);
|
|
161
|
+
if (!surfaces.ok)
|
|
162
|
+
return surfaces;
|
|
163
|
+
const activeModes = new Set(resolveSurfaceCapabilities(activeSurface ?? "clr", {
|
|
164
|
+
projectRoot,
|
|
165
|
+
}).resolvedModes);
|
|
166
|
+
if (!surfaces.value.some((surface) => activeModes.has(surface))) {
|
|
167
|
+
return error(createDiagnostic("TSN1004", "error", `Source package '${parsedSpecifier.packageName}' is not compatible with surface '${activeSurface ?? "clr"}'`, undefined, `Supported surfaces: ${surfaces.value.join(", ")}`));
|
|
168
|
+
}
|
|
169
|
+
const source = parseSourceSection(manifest.source, manifestPath);
|
|
170
|
+
if (!source.ok)
|
|
171
|
+
return source;
|
|
172
|
+
const exportKey = parsedSpecifier.subpath && parsedSpecifier.subpath.length > 0
|
|
173
|
+
? `./${parsedSpecifier.subpath}`
|
|
174
|
+
: ".";
|
|
175
|
+
const target = source.value.exports[exportKey];
|
|
176
|
+
if (!target) {
|
|
177
|
+
return error(createDiagnostic("TSN1004", "error", `Source package export '${exportKey}' not found in '${parsedSpecifier.packageName}'`, undefined, `Declare it in ${path.relative(packageRoot, manifestPath)} under source.exports.`));
|
|
178
|
+
}
|
|
179
|
+
const resolvedTarget = resolveExportTarget(packageRoot, target);
|
|
180
|
+
if (!resolvedTarget.ok)
|
|
181
|
+
return resolvedTarget;
|
|
182
|
+
return ok({
|
|
183
|
+
packageName: parsedSpecifier.packageName,
|
|
184
|
+
packageRoot,
|
|
185
|
+
resolvedPath: resolvedTarget.value,
|
|
186
|
+
});
|
|
187
|
+
};
|
|
188
|
+
//# sourceMappingURL=source-package-resolution.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"source-package-resolution.js","sourceRoot":"","sources":["../../src/resolver/source-package-resolution.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"source-package-resolution.test.d.ts","sourceRoot":"","sources":["../../src/resolver/source-package-resolution.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,77 @@
|
|
|
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 { getLocalResolutionBoundary, resolveSourcePackageImport, } from "./source-package-resolution.js";
|
|
7
|
+
describe("Source Package Resolution", () => {
|
|
8
|
+
it("should resolve installed source packages without relying on package.json exports", () => {
|
|
9
|
+
const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "tsonic-source-package-resolution-"));
|
|
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";\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({
|
|
20
|
+
name: "@acme/math",
|
|
21
|
+
version: "1.0.0",
|
|
22
|
+
type: "module",
|
|
23
|
+
exports: {
|
|
24
|
+
".": "./dist/index.js",
|
|
25
|
+
},
|
|
26
|
+
}, null, 2));
|
|
27
|
+
fs.writeFileSync(path.join(packageRoot, "tsonic", "package-manifest.json"), JSON.stringify({
|
|
28
|
+
schemaVersion: 1,
|
|
29
|
+
kind: "tsonic-source-package",
|
|
30
|
+
surfaces: ["@tsonic/js"],
|
|
31
|
+
source: {
|
|
32
|
+
exports: {
|
|
33
|
+
".": "./src/index.ts",
|
|
34
|
+
},
|
|
35
|
+
},
|
|
36
|
+
}, null, 2));
|
|
37
|
+
fs.writeFileSync(path.join(packageRoot, "src", "index.ts"), "export const clamp = (x: number): number => x;\n");
|
|
38
|
+
const result = resolveSourcePackageImport("@acme/math", entryPath, "@tsonic/js", tempDir);
|
|
39
|
+
expect(result.ok).to.equal(true);
|
|
40
|
+
if (!result.ok || !result.value)
|
|
41
|
+
return;
|
|
42
|
+
expect(result.value.packageRoot).to.equal(packageRoot);
|
|
43
|
+
expect(result.value.resolvedPath).to.equal(path.join(packageRoot, "src", "index.ts"));
|
|
44
|
+
}
|
|
45
|
+
finally {
|
|
46
|
+
fs.rmSync(tempDir, { recursive: true, force: true });
|
|
47
|
+
}
|
|
48
|
+
});
|
|
49
|
+
it("should use the source package root as the local resolution boundary", () => {
|
|
50
|
+
const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "tsonic-source-package-boundary-"));
|
|
51
|
+
try {
|
|
52
|
+
const sourceRoot = path.join(tempDir, "src");
|
|
53
|
+
fs.mkdirSync(sourceRoot, { recursive: true });
|
|
54
|
+
const packageRoot = path.join(tempDir, "node_modules", "@acme", "math");
|
|
55
|
+
const packageEntry = path.join(packageRoot, "src", "index.ts");
|
|
56
|
+
fs.mkdirSync(path.dirname(packageEntry), { recursive: true });
|
|
57
|
+
fs.mkdirSync(path.join(packageRoot, "tsonic"), { recursive: true });
|
|
58
|
+
fs.writeFileSync(path.join(packageRoot, "package.json"), JSON.stringify({ name: "@acme/math", version: "1.0.0", type: "module" }, null, 2));
|
|
59
|
+
fs.writeFileSync(path.join(packageRoot, "tsonic", "package-manifest.json"), JSON.stringify({
|
|
60
|
+
schemaVersion: 1,
|
|
61
|
+
kind: "tsonic-source-package",
|
|
62
|
+
surfaces: ["@tsonic/js"],
|
|
63
|
+
source: {
|
|
64
|
+
exports: {
|
|
65
|
+
".": "./src/index.ts",
|
|
66
|
+
},
|
|
67
|
+
},
|
|
68
|
+
}, null, 2));
|
|
69
|
+
fs.writeFileSync(packageEntry, "export const clamp = 1;\n");
|
|
70
|
+
expect(getLocalResolutionBoundary(packageEntry, sourceRoot)).to.equal(packageRoot);
|
|
71
|
+
}
|
|
72
|
+
finally {
|
|
73
|
+
fs.rmSync(tempDir, { recursive: true, force: true });
|
|
74
|
+
}
|
|
75
|
+
});
|
|
76
|
+
});
|
|
77
|
+
//# sourceMappingURL=source-package-resolution.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"source-package-resolution.test.js","sourceRoot":"","sources":["../../src/resolver/source-package-resolution.test.ts"],"names":[],"mappings":"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"}
|
package/dist/resolver/types.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/resolver/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IAEnC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAEpC,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CACpC,CAAC"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/resolver/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IAEnC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAEpC,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CACpC,CAAC"}
|