@tsonic/frontend 0.0.11 → 0.0.13
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/ir/converters/expressions/access.d.ts.map +1 -1
- package/dist/ir/converters/expressions/access.js +61 -1
- package/dist/ir/converters/expressions/access.js.map +1 -1
- package/dist/ir/converters/expressions/calls.d.ts.map +1 -1
- package/dist/ir/converters/expressions/calls.js +293 -24
- package/dist/ir/converters/expressions/calls.js.map +1 -1
- package/dist/ir/converters/expressions/helpers.js +4 -4
- package/dist/ir/converters/expressions/helpers.js.map +1 -1
- package/dist/ir/converters/expressions/literals.d.ts +14 -0
- package/dist/ir/converters/expressions/literals.d.ts.map +1 -1
- package/dist/ir/converters/expressions/literals.js +22 -2
- package/dist/ir/converters/expressions/literals.js.map +1 -1
- package/dist/ir/converters/expressions/numeric-recovery.test.js +3 -2
- package/dist/ir/converters/expressions/numeric-recovery.test.js.map +1 -1
- package/dist/ir/converters/statements/helpers.d.ts.map +1 -1
- package/dist/ir/converters/statements/helpers.js +10 -4
- package/dist/ir/converters/statements/helpers.js.map +1 -1
- package/dist/ir/expression-converter.d.ts.map +1 -1
- package/dist/ir/expression-converter.js +38 -5
- package/dist/ir/expression-converter.js.map +1 -1
- package/dist/ir/index.d.ts +1 -1
- package/dist/ir/index.d.ts.map +1 -1
- package/dist/ir/index.js +1 -1
- package/dist/ir/index.js.map +1 -1
- package/dist/ir/statement-converter.d.ts.map +1 -1
- package/dist/ir/statement-converter.js +12 -0
- package/dist/ir/statement-converter.js.map +1 -1
- package/dist/ir/type-converter/inference.d.ts.map +1 -1
- package/dist/ir/type-converter/inference.js +50 -7
- package/dist/ir/type-converter/inference.js.map +1 -1
- package/dist/ir/type-converter/primitives.d.ts +26 -4
- package/dist/ir/type-converter/primitives.d.ts.map +1 -1
- package/dist/ir/type-converter/primitives.js +36 -2
- package/dist/ir/type-converter/primitives.js.map +1 -1
- package/dist/ir/type-converter/references.d.ts.map +1 -1
- package/dist/ir/type-converter/references.js +324 -11
- package/dist/ir/type-converter/references.js.map +1 -1
- package/dist/ir/type-converter/utility-types.d.ts +93 -0
- package/dist/ir/type-converter/utility-types.d.ts.map +1 -0
- package/dist/ir/type-converter/utility-types.js +528 -0
- package/dist/ir/type-converter/utility-types.js.map +1 -0
- package/dist/ir/type-converter/utility-types.test.d.ts +10 -0
- package/dist/ir/type-converter/utility-types.test.d.ts.map +1 -0
- package/dist/ir/type-converter/utility-types.test.js +1030 -0
- package/dist/ir/type-converter/utility-types.test.js.map +1 -0
- package/dist/ir/types/expressions.d.ts +40 -2
- package/dist/ir/types/expressions.d.ts.map +1 -1
- package/dist/ir/types/helpers.d.ts +3 -1
- package/dist/ir/types/helpers.d.ts.map +1 -1
- package/dist/ir/types/index.d.ts +2 -1
- package/dist/ir/types/index.d.ts.map +1 -1
- package/dist/ir/types/index.js +2 -0
- package/dist/ir/types/index.js.map +1 -1
- package/dist/ir/types/ir-types.d.ts +69 -11
- package/dist/ir/types/ir-types.d.ts.map +1 -1
- package/dist/ir/types/numeric-helpers.d.ts +46 -0
- package/dist/ir/types/numeric-helpers.d.ts.map +1 -0
- package/dist/ir/types/numeric-helpers.js +105 -0
- package/dist/ir/types/numeric-helpers.js.map +1 -0
- package/dist/ir/types/statements.d.ts +11 -1
- package/dist/ir/types/statements.d.ts.map +1 -1
- package/dist/ir/types.d.ts +2 -2
- package/dist/ir/types.d.ts.map +1 -1
- package/dist/ir/types.js +3 -1
- package/dist/ir/types.js.map +1 -1
- package/dist/ir/validation/anonymous-type-lowering-pass.d.ts +32 -0
- package/dist/ir/validation/anonymous-type-lowering-pass.d.ts.map +1 -0
- package/dist/ir/validation/anonymous-type-lowering-pass.js +854 -0
- package/dist/ir/validation/anonymous-type-lowering-pass.js.map +1 -0
- package/dist/ir/validation/attribute-collection-pass.d.ts +37 -0
- package/dist/ir/validation/attribute-collection-pass.d.ts.map +1 -0
- package/dist/ir/validation/attribute-collection-pass.js +282 -0
- package/dist/ir/validation/attribute-collection-pass.js.map +1 -0
- package/dist/ir/validation/attribute-collection-pass.test.d.ts +5 -0
- package/dist/ir/validation/attribute-collection-pass.test.d.ts.map +1 -0
- package/dist/ir/validation/attribute-collection-pass.test.js +215 -0
- package/dist/ir/validation/attribute-collection-pass.test.js.map +1 -0
- package/dist/ir/validation/index.d.ts +3 -0
- package/dist/ir/validation/index.d.ts.map +1 -1
- package/dist/ir/validation/index.js +3 -0
- package/dist/ir/validation/index.js.map +1 -1
- package/dist/ir/validation/numeric-coercion-pass.d.ts +77 -0
- package/dist/ir/validation/numeric-coercion-pass.d.ts.map +1 -0
- package/dist/ir/validation/numeric-coercion-pass.js +686 -0
- package/dist/ir/validation/numeric-coercion-pass.js.map +1 -0
- package/dist/ir/validation/numeric-invariants.test.js +130 -14
- 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 +68 -108
- 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 +23 -12
- package/dist/ir/validation/soundness-gate.js.map +1 -1
- package/dist/ir/validation/yield-lowering-pass.test.js +21 -12
- package/dist/ir/validation/yield-lowering-pass.test.js.map +1 -1
- package/dist/program/bindings.d.ts +20 -9
- package/dist/program/bindings.d.ts.map +1 -1
- package/dist/program/bindings.js +98 -36
- package/dist/program/bindings.js.map +1 -1
- package/dist/program/bindings.test.js +3 -3
- package/dist/program/dependency-graph.d.ts.map +1 -1
- package/dist/program/dependency-graph.js +31 -5
- package/dist/program/dependency-graph.js.map +1 -1
- package/dist/resolver/import-resolution.d.ts +4 -0
- package/dist/resolver/import-resolution.d.ts.map +1 -1
- package/dist/resolver/import-resolution.js +18 -7
- package/dist/resolver/import-resolution.js.map +1 -1
- package/dist/resolver.test.js +2 -2
- package/dist/resolver.test.js.map +1 -1
- package/dist/types/diagnostic.d.ts +1 -1
- package/dist/types/diagnostic.d.ts.map +1 -1
- package/dist/types/diagnostic.js.map +1 -1
- package/dist/validation/generics.d.ts.map +1 -1
- package/dist/validation/generics.js +133 -1
- package/dist/validation/generics.js.map +1 -1
- package/dist/validation/static-safety.js +13 -0
- package/dist/validation/static-safety.js.map +1 -1
- package/dist/validation/unsupported-utility-types.d.ts +10 -8
- package/dist/validation/unsupported-utility-types.d.ts.map +1 -1
- package/dist/validation/unsupported-utility-types.js +12 -19
- package/dist/validation/unsupported-utility-types.js.map +1 -1
- package/dist/validator.test.js +133 -28
- package/dist/validator.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -2,6 +2,14 @@
|
|
|
2
2
|
* Binding manifest loading - maps JS/TS names to CLR types/members
|
|
3
3
|
* See spec/bindings.md for full manifest format
|
|
4
4
|
*/
|
|
5
|
+
/**
|
|
6
|
+
* Parameter modifier for ref/out/in parameters
|
|
7
|
+
* Matches the format from tsbindgen: { index: number, modifier: "ref" | "out" | "in" }
|
|
8
|
+
*/
|
|
9
|
+
export type ParameterModifier = {
|
|
10
|
+
readonly index: number;
|
|
11
|
+
readonly modifier: "ref" | "out" | "in";
|
|
12
|
+
};
|
|
5
13
|
/**
|
|
6
14
|
* Member binding (method/property level)
|
|
7
15
|
*/
|
|
@@ -15,6 +23,7 @@ export type MemberBinding = {
|
|
|
15
23
|
readonly type: string;
|
|
16
24
|
readonly member: string;
|
|
17
25
|
};
|
|
26
|
+
readonly parameterModifiers?: readonly ParameterModifier[];
|
|
18
27
|
};
|
|
19
28
|
/**
|
|
20
29
|
* Type binding (class/interface/struct/enum level)
|
|
@@ -41,8 +50,8 @@ export type FullBindingManifest = {
|
|
|
41
50
|
readonly namespaces: readonly NamespaceBinding[];
|
|
42
51
|
};
|
|
43
52
|
/**
|
|
44
|
-
* Simple binding entry
|
|
45
|
-
* Maps
|
|
53
|
+
* Simple binding entry for global/module identifiers
|
|
54
|
+
* Maps identifiers like `console`, `Math`, `fs` to CLR types
|
|
46
55
|
*/
|
|
47
56
|
export type SimpleBindingDescriptor = {
|
|
48
57
|
readonly kind: "global" | "module";
|
|
@@ -51,9 +60,9 @@ export type SimpleBindingDescriptor = {
|
|
|
51
60
|
readonly csharpName?: string;
|
|
52
61
|
};
|
|
53
62
|
/**
|
|
54
|
-
*
|
|
63
|
+
* Simple binding file structure for global/module bindings
|
|
55
64
|
*/
|
|
56
|
-
export type
|
|
65
|
+
export type SimpleBindingFile = {
|
|
57
66
|
readonly bindings: Readonly<Record<string, SimpleBindingDescriptor>>;
|
|
58
67
|
};
|
|
59
68
|
/**
|
|
@@ -65,6 +74,7 @@ export type TsbindgenMethod = {
|
|
|
65
74
|
readonly tsEmitName: string;
|
|
66
75
|
readonly declaringClrType: string;
|
|
67
76
|
readonly declaringAssemblyName: string;
|
|
77
|
+
readonly parameterModifiers?: readonly ParameterModifier[];
|
|
68
78
|
};
|
|
69
79
|
export type TsbindgenProperty = {
|
|
70
80
|
readonly clrName: string;
|
|
@@ -93,10 +103,10 @@ export type TsbindgenBindingFile = {
|
|
|
93
103
|
/**
|
|
94
104
|
* Union type for all binding formats
|
|
95
105
|
*/
|
|
96
|
-
export type BindingFile = FullBindingManifest |
|
|
106
|
+
export type BindingFile = FullBindingManifest | SimpleBindingFile | TsbindgenBindingFile;
|
|
97
107
|
/**
|
|
98
108
|
* Registry of all loaded bindings
|
|
99
|
-
* Supports
|
|
109
|
+
* Supports simple (global/module) and hierarchical (namespace/type/member) formats
|
|
100
110
|
*/
|
|
101
111
|
export declare class BindingRegistry {
|
|
102
112
|
private readonly simpleBindings;
|
|
@@ -105,11 +115,11 @@ export declare class BindingRegistry {
|
|
|
105
115
|
private readonly members;
|
|
106
116
|
/**
|
|
107
117
|
* Load a binding manifest file and add its bindings to the registry
|
|
108
|
-
* Supports
|
|
118
|
+
* Supports simple, full, and tsbindgen formats
|
|
109
119
|
*/
|
|
110
120
|
addBindings(_filePath: string, manifest: BindingFile): void;
|
|
111
121
|
/**
|
|
112
|
-
* Look up a simple global/module binding
|
|
122
|
+
* Look up a simple global/module binding
|
|
113
123
|
*/
|
|
114
124
|
getBinding(name: string): SimpleBindingDescriptor | undefined;
|
|
115
125
|
/**
|
|
@@ -125,7 +135,7 @@ export declare class BindingRegistry {
|
|
|
125
135
|
*/
|
|
126
136
|
getMember(typeAlias: string, memberAlias: string): MemberBinding | undefined;
|
|
127
137
|
/**
|
|
128
|
-
* Get all loaded simple bindings
|
|
138
|
+
* Get all loaded simple bindings
|
|
129
139
|
*/
|
|
130
140
|
getAllBindings(): readonly [string, SimpleBindingDescriptor][];
|
|
131
141
|
/**
|
|
@@ -145,6 +155,7 @@ export declare class BindingRegistry {
|
|
|
145
155
|
/**
|
|
146
156
|
* Load binding manifests from configured type roots
|
|
147
157
|
* Looks for *.bindings.json files alongside .d.ts files OR directly in typeRoot
|
|
158
|
+
* Also recursively loads bindings from @tsonic/* dependencies of typeRoot packages
|
|
148
159
|
*/
|
|
149
160
|
export declare const loadBindings: (typeRoots: readonly string[]) => BindingRegistry;
|
|
150
161
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bindings.d.ts","sourceRoot":"","sources":["../../src/program/bindings.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,UAAU,CAAC;IACrC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE;QAChB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;KACzB,CAAC;
|
|
1
|
+
{"version":3,"file":"bindings.d.ts","sourceRoot":"","sources":["../../src/program/bindings.ts"],"names":[],"mappings":"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"}
|
package/dist/program/bindings.js
CHANGED
|
@@ -47,31 +47,31 @@ const validateBindingFile = (obj, filePath) => {
|
|
|
47
47
|
}
|
|
48
48
|
return undefined; // Valid full format
|
|
49
49
|
}
|
|
50
|
-
// Check for
|
|
50
|
+
// Check for simple format (global/module bindings)
|
|
51
51
|
if ("bindings" in manifest) {
|
|
52
52
|
if (typeof manifest.bindings !== "object" || manifest.bindings === null) {
|
|
53
53
|
return `${filePath}: 'bindings' must be an object`;
|
|
54
54
|
}
|
|
55
|
-
return undefined; // Valid
|
|
55
|
+
return undefined; // Valid simple format
|
|
56
56
|
}
|
|
57
|
-
return `${filePath}: Unrecognized binding file format. Expected tsbindgen (namespace+types), full (assembly+namespaces), or
|
|
57
|
+
return `${filePath}: Unrecognized binding file format. Expected tsbindgen (namespace+types), full (assembly+namespaces), or simple (bindings) format.`;
|
|
58
58
|
};
|
|
59
59
|
/**
|
|
60
60
|
* Registry of all loaded bindings
|
|
61
|
-
* Supports
|
|
61
|
+
* Supports simple (global/module) and hierarchical (namespace/type/member) formats
|
|
62
62
|
*/
|
|
63
63
|
export class BindingRegistry {
|
|
64
64
|
constructor() {
|
|
65
|
-
//
|
|
65
|
+
// Simple format: global/module bindings for identifiers like console, Math, fs
|
|
66
66
|
this.simpleBindings = new Map();
|
|
67
|
-
//
|
|
67
|
+
// Hierarchical format: namespace/type/member bindings
|
|
68
68
|
this.namespaces = new Map();
|
|
69
69
|
this.types = new Map(); // Flat lookup by TS name
|
|
70
70
|
this.members = new Map(); // Flat lookup by "type.member"
|
|
71
71
|
}
|
|
72
72
|
/**
|
|
73
73
|
* Load a binding manifest file and add its bindings to the registry
|
|
74
|
-
* Supports
|
|
74
|
+
* Supports simple, full, and tsbindgen formats
|
|
75
75
|
*/
|
|
76
76
|
addBindings(_filePath, manifest) {
|
|
77
77
|
if (isFullBindingManifest(manifest)) {
|
|
@@ -109,6 +109,8 @@ export class BindingRegistry {
|
|
|
109
109
|
// member = clrName (what C# emits, e.g., "Add")
|
|
110
110
|
member: method.clrName,
|
|
111
111
|
},
|
|
112
|
+
// Include parameter modifiers for ref/out/in parameters
|
|
113
|
+
parameterModifiers: method.parameterModifiers,
|
|
112
114
|
});
|
|
113
115
|
}
|
|
114
116
|
for (const prop of tsbType.properties) {
|
|
@@ -180,14 +182,14 @@ export class BindingRegistry {
|
|
|
180
182
|
}
|
|
181
183
|
}
|
|
182
184
|
else {
|
|
183
|
-
//
|
|
185
|
+
// Simple format: global/module bindings
|
|
184
186
|
for (const [name, descriptor] of Object.entries(manifest.bindings)) {
|
|
185
187
|
this.simpleBindings.set(name, descriptor);
|
|
186
188
|
}
|
|
187
189
|
}
|
|
188
190
|
}
|
|
189
191
|
/**
|
|
190
|
-
* Look up a simple global/module binding
|
|
192
|
+
* Look up a simple global/module binding
|
|
191
193
|
*/
|
|
192
194
|
getBinding(name) {
|
|
193
195
|
return this.simpleBindings.get(name);
|
|
@@ -212,7 +214,7 @@ export class BindingRegistry {
|
|
|
212
214
|
return this.members.get(key);
|
|
213
215
|
}
|
|
214
216
|
/**
|
|
215
|
-
* Get all loaded simple bindings
|
|
217
|
+
* Get all loaded simple bindings
|
|
216
218
|
*/
|
|
217
219
|
getAllBindings() {
|
|
218
220
|
return Array.from(this.simpleBindings.entries());
|
|
@@ -261,39 +263,99 @@ const scanForDeclarationFiles = (dir) => {
|
|
|
261
263
|
}
|
|
262
264
|
return results;
|
|
263
265
|
};
|
|
266
|
+
/**
|
|
267
|
+
* Load bindings from a package directory and recursively from its @tsonic/* dependencies.
|
|
268
|
+
* This ensures that when @tsonic/globals depends on @tsonic/dotnet, the bindings from
|
|
269
|
+
* @tsonic/dotnet are also loaded.
|
|
270
|
+
*
|
|
271
|
+
* Supports two package structures:
|
|
272
|
+
* 1. globals/globals-pure: Only has index.d.ts, depends on dotnet/dotnet-pure
|
|
273
|
+
* 2. dotnet/dotnet-pure: Has facade pattern with Namespace.d.ts + Namespace/bindings.json
|
|
274
|
+
*/
|
|
275
|
+
const loadBindingsFromPackage = (registry, packageRoot, visited) => {
|
|
276
|
+
// Avoid cycles
|
|
277
|
+
const absoluteRoot = path.resolve(packageRoot);
|
|
278
|
+
if (visited.has(absoluteRoot)) {
|
|
279
|
+
return;
|
|
280
|
+
}
|
|
281
|
+
visited.add(absoluteRoot);
|
|
282
|
+
// Skip if directory doesn't exist
|
|
283
|
+
if (!fs.existsSync(absoluteRoot)) {
|
|
284
|
+
return;
|
|
285
|
+
}
|
|
286
|
+
// Strategy 1: Look for *.bindings.json manifest files in the package root
|
|
287
|
+
const rootEntries = fs.readdirSync(absoluteRoot, { withFileTypes: true });
|
|
288
|
+
const rootManifests = rootEntries
|
|
289
|
+
.filter((e) => e.isFile() && e.name.endsWith(".bindings.json"))
|
|
290
|
+
.map((e) => path.join(absoluteRoot, e.name));
|
|
291
|
+
for (const manifestPath of rootManifests) {
|
|
292
|
+
loadBindingsFromPath(registry, manifestPath);
|
|
293
|
+
}
|
|
294
|
+
// Strategy 2: Look for Namespace/bindings.json for each Namespace.d.ts facade
|
|
295
|
+
// This supports @tsonic/dotnet structure: System.d.ts facade + System/bindings.json
|
|
296
|
+
const facadeFiles = rootEntries
|
|
297
|
+
.filter((e) => e.isFile() && e.name.endsWith(".d.ts"))
|
|
298
|
+
.map((e) => e.name);
|
|
299
|
+
for (const facadeFile of facadeFiles) {
|
|
300
|
+
// e.g., "System.d.ts" → "System"
|
|
301
|
+
const namespaceName = facadeFile.slice(0, -".d.ts".length);
|
|
302
|
+
const namespaceDir = path.join(absoluteRoot, namespaceName);
|
|
303
|
+
const bindingsPath = path.join(namespaceDir, "bindings.json");
|
|
304
|
+
if (fs.existsSync(bindingsPath)) {
|
|
305
|
+
loadBindingsFromPath(registry, bindingsPath);
|
|
306
|
+
}
|
|
307
|
+
}
|
|
308
|
+
// Strategy 3: Look for *.bindings.json next to each .d.ts file (recursive)
|
|
309
|
+
const declFiles = scanForDeclarationFiles(absoluteRoot);
|
|
310
|
+
for (const declPath of declFiles) {
|
|
311
|
+
const manifestPath = declPath.replace(/\.d\.ts$/, ".bindings.json");
|
|
312
|
+
loadBindingsFromPath(registry, manifestPath);
|
|
313
|
+
// Strategy 4: Look for bindings.json in same directory as index.d.ts
|
|
314
|
+
if (path.basename(declPath) === "index.d.ts") {
|
|
315
|
+
const dirBindings = path.join(path.dirname(declPath), "bindings.json");
|
|
316
|
+
loadBindingsFromPath(registry, dirBindings);
|
|
317
|
+
}
|
|
318
|
+
}
|
|
319
|
+
// Strategy 5: Recursively load bindings from @tsonic/* dependencies
|
|
320
|
+
// This is crucial for packages like @tsonic/globals that depend on @tsonic/dotnet
|
|
321
|
+
// and @tsonic/globals-pure that depends on @tsonic/dotnet-pure
|
|
322
|
+
const packageJsonPath = path.join(absoluteRoot, "package.json");
|
|
323
|
+
if (fs.existsSync(packageJsonPath)) {
|
|
324
|
+
try {
|
|
325
|
+
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
|
|
326
|
+
const deps = packageJson.dependencies || {};
|
|
327
|
+
for (const depName of Object.keys(deps)) {
|
|
328
|
+
// Only follow @tsonic/* dependencies to load their bindings
|
|
329
|
+
if (depName.startsWith("@tsonic/")) {
|
|
330
|
+
// Find the dependency in node_modules
|
|
331
|
+
// Try sibling node_modules first (hoisted), then nested
|
|
332
|
+
const nodeModulesDir = path.dirname(path.dirname(absoluteRoot));
|
|
333
|
+
const hoistedPath = path.join(nodeModulesDir, depName);
|
|
334
|
+
const nestedPath = path.join(absoluteRoot, "node_modules", depName);
|
|
335
|
+
if (fs.existsSync(hoistedPath)) {
|
|
336
|
+
loadBindingsFromPackage(registry, hoistedPath, visited);
|
|
337
|
+
}
|
|
338
|
+
else if (fs.existsSync(nestedPath)) {
|
|
339
|
+
loadBindingsFromPackage(registry, nestedPath, visited);
|
|
340
|
+
}
|
|
341
|
+
}
|
|
342
|
+
}
|
|
343
|
+
}
|
|
344
|
+
catch {
|
|
345
|
+
// Ignore JSON parse errors in package.json
|
|
346
|
+
}
|
|
347
|
+
}
|
|
348
|
+
};
|
|
264
349
|
/**
|
|
265
350
|
* Load binding manifests from configured type roots
|
|
266
351
|
* Looks for *.bindings.json files alongside .d.ts files OR directly in typeRoot
|
|
352
|
+
* Also recursively loads bindings from @tsonic/* dependencies of typeRoot packages
|
|
267
353
|
*/
|
|
268
354
|
export const loadBindings = (typeRoots) => {
|
|
269
355
|
const registry = new BindingRegistry();
|
|
356
|
+
const visited = new Set();
|
|
270
357
|
for (const typeRoot of typeRoots) {
|
|
271
|
-
|
|
272
|
-
// Skip if directory doesn't exist
|
|
273
|
-
if (!fs.existsSync(absoluteRoot)) {
|
|
274
|
-
continue;
|
|
275
|
-
}
|
|
276
|
-
// Strategy 1: Look for manifest in the typeRoot itself
|
|
277
|
-
const rootManifests = fs
|
|
278
|
-
.readdirSync(absoluteRoot)
|
|
279
|
-
.filter((f) => f.endsWith(".bindings.json"))
|
|
280
|
-
.map((f) => path.join(absoluteRoot, f));
|
|
281
|
-
for (const manifestPath of rootManifests) {
|
|
282
|
-
loadBindingsFromPath(registry, manifestPath);
|
|
283
|
-
}
|
|
284
|
-
// Strategy 2: Look for *.bindings.json next to each .d.ts file
|
|
285
|
-
const declFiles = scanForDeclarationFiles(absoluteRoot);
|
|
286
|
-
for (const declPath of declFiles) {
|
|
287
|
-
const manifestPath = declPath.replace(/\.d\.ts$/, ".bindings.json");
|
|
288
|
-
loadBindingsFromPath(registry, manifestPath);
|
|
289
|
-
// Strategy 3: Look for bindings.json in same directory as index.d.ts
|
|
290
|
-
// This supports @tsonic/dotnet package structure where bindings.json
|
|
291
|
-
// lives alongside index.d.ts in each namespace directory
|
|
292
|
-
if (path.basename(declPath) === "index.d.ts") {
|
|
293
|
-
const dirBindings = path.join(path.dirname(declPath), "bindings.json");
|
|
294
|
-
loadBindingsFromPath(registry, dirBindings);
|
|
295
|
-
}
|
|
296
|
-
}
|
|
358
|
+
loadBindingsFromPackage(registry, typeRoot, visited);
|
|
297
359
|
}
|
|
298
360
|
return registry;
|
|
299
361
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bindings.js","sourceRoot":"","sources":["../../src/program/bindings.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"bindings.js","sourceRoot":"","sources":["../../src/program/bindings.ts"],"names":[],"mappings":"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"}
|
|
@@ -335,10 +335,10 @@ describe("Binding System", () => {
|
|
|
335
335
|
expect(registry.getNamespace("ns2")).to.not.equal(undefined);
|
|
336
336
|
expect(registry.getAllNamespaces()).to.have.lengthOf(2);
|
|
337
337
|
});
|
|
338
|
-
it("should support both
|
|
338
|
+
it("should support both simple and hierarchical manifests", () => {
|
|
339
339
|
const registry = new BindingRegistry();
|
|
340
|
-
// Add
|
|
341
|
-
registry.addBindings("/test/
|
|
340
|
+
// Add simple manifest
|
|
341
|
+
registry.addBindings("/test/simple.json", {
|
|
342
342
|
bindings: {
|
|
343
343
|
console: {
|
|
344
344
|
kind: "global",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependency-graph.d.ts","sourceRoot":"","sources":["../../src/program/dependency-graph.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,MAAM,EAAa,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAoB,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAAE,eAAe,EAAiB,MAAM,YAAY,CAAC;AAC5D,OAAO,EAA6B,WAAW,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"dependency-graph.d.ts","sourceRoot":"","sources":["../../src/program/dependency-graph.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,MAAM,EAAa,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAoB,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAAE,eAAe,EAAiB,MAAM,YAAY,CAAC;AAC5D,OAAO,EAA6B,WAAW,EAAE,MAAM,eAAe,CAAC;AASvE,MAAM,MAAM,2BAA2B,GAAG;IACxC,QAAQ,CAAC,OAAO,EAAE,SAAS,QAAQ,EAAE,CAAC;IACtC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC;IAC/B,4EAA4E;IAC5E,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;CACrD,CAAC;AAwFF;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,GACrC,WAAW,MAAM,EACjB,SAAS,eAAe,KACvB,MAAM,CAAC,2BAA2B,EAAE,SAAS,UAAU,EAAE,CAoQ3D,CAAC"}
|
|
@@ -11,7 +11,11 @@ import { createProgram, createCompilerOptions } from "./creation.js";
|
|
|
11
11
|
import { loadAllDiscoveredBindings } from "./bindings.js";
|
|
12
12
|
import { validateIrSoundness } from "../ir/validation/soundness-gate.js";
|
|
13
13
|
import { runNumericProofPass } from "../ir/validation/numeric-proof-pass.js";
|
|
14
|
+
import { runNumericCoercionPass } from "../ir/validation/numeric-coercion-pass.js";
|
|
14
15
|
import { runYieldLoweringPass } from "../ir/validation/yield-lowering-pass.js";
|
|
16
|
+
import { runAttributeCollectionPass } from "../ir/validation/attribute-collection-pass.js";
|
|
17
|
+
import { runAnonymousTypeLoweringPass } from "../ir/validation/anonymous-type-lowering-pass.js";
|
|
18
|
+
import { validateProgram } from "../validation/orchestrator.js";
|
|
15
19
|
/**
|
|
16
20
|
* Scan all source files for import statements and discover CLR bindings.
|
|
17
21
|
* This must be called BEFORE IR building to ensure bindings are loaded.
|
|
@@ -186,6 +190,11 @@ export const buildModuleDependencyGraph = (entryFile, options) => {
|
|
|
186
190
|
// Load CLR bindings before IR building
|
|
187
191
|
// This scans all imports and loads their bindings upfront
|
|
188
192
|
discoverAndLoadClrBindings(tsonicProgram, options.verbose);
|
|
193
|
+
// Run source-level validation (imports, exports, unsupported features, generics)
|
|
194
|
+
const validationCollector = validateProgram(tsonicProgram);
|
|
195
|
+
if (validationCollector.diagnostics.length > 0) {
|
|
196
|
+
return error(validationCollector.diagnostics);
|
|
197
|
+
}
|
|
189
198
|
// Third pass: Build IR for all discovered modules
|
|
190
199
|
const modules = [];
|
|
191
200
|
for (const filePath of allDiscoveredFiles) {
|
|
@@ -208,26 +217,43 @@ export const buildModuleDependencyGraph = (entryFile, options) => {
|
|
|
208
217
|
if (diagnostics.length > 0) {
|
|
209
218
|
return error(diagnostics);
|
|
210
219
|
}
|
|
220
|
+
// Run anonymous type lowering pass - transforms objectType to generated named types
|
|
221
|
+
// This must run before soundness validation so the emitter never sees objectType
|
|
222
|
+
const anonTypeResult = runAnonymousTypeLoweringPass(modules);
|
|
223
|
+
// Note: This pass always succeeds (no diagnostics), but we use the lowered modules
|
|
224
|
+
const loweredModules = anonTypeResult.modules;
|
|
211
225
|
// Run IR soundness gate - validates no anyType leaked through
|
|
212
226
|
// This is the final validation before emitter can run
|
|
213
|
-
const soundnessResult = validateIrSoundness(
|
|
227
|
+
const soundnessResult = validateIrSoundness(loweredModules);
|
|
214
228
|
if (!soundnessResult.ok) {
|
|
215
229
|
return error(soundnessResult.diagnostics);
|
|
216
230
|
}
|
|
217
231
|
// Run numeric proof pass - validates all numeric narrowings are provable
|
|
218
232
|
// and attaches proofs to expressions for the emitter
|
|
219
|
-
const numericResult = runNumericProofPass(
|
|
233
|
+
const numericResult = runNumericProofPass(loweredModules);
|
|
220
234
|
if (!numericResult.ok) {
|
|
221
235
|
return error(numericResult.diagnostics);
|
|
222
236
|
}
|
|
237
|
+
// Run numeric coercion pass - validates no implicit int→double conversions
|
|
238
|
+
// This enforces the strict contract: integer literals require explicit widening
|
|
239
|
+
const coercionResult = runNumericCoercionPass(numericResult.modules);
|
|
240
|
+
if (!coercionResult.ok) {
|
|
241
|
+
return error(coercionResult.diagnostics);
|
|
242
|
+
}
|
|
223
243
|
// Run yield lowering pass - transforms yield expressions in generators
|
|
224
244
|
// into IrYieldStatement nodes for the emitter
|
|
225
|
-
const yieldResult = runYieldLoweringPass(
|
|
245
|
+
const yieldResult = runYieldLoweringPass(coercionResult.modules);
|
|
226
246
|
if (!yieldResult.ok) {
|
|
227
247
|
return error(yieldResult.diagnostics);
|
|
228
248
|
}
|
|
229
|
-
//
|
|
230
|
-
|
|
249
|
+
// Run attribute collection pass - extracts A.on(X).type(Y) marker calls
|
|
250
|
+
// and attaches them as attributes to declarations
|
|
251
|
+
const attributeResult = runAttributeCollectionPass(yieldResult.modules);
|
|
252
|
+
if (!attributeResult.ok) {
|
|
253
|
+
return error(attributeResult.diagnostics);
|
|
254
|
+
}
|
|
255
|
+
// Use the processed modules with proofs, lowered yields, and attributes
|
|
256
|
+
const processedModules = [...attributeResult.modules];
|
|
231
257
|
// Sort modules by relative path for deterministic output
|
|
232
258
|
processedModules.sort((a, b) => a.filePath.localeCompare(b.filePath));
|
|
233
259
|
// Entry module is the first one (after sorting, it should be the entry file)
|
|
@@ -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,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAErE,OAAO,EAAE,yBAAyB,EAAe,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"dependency-graph.js","sourceRoot":"","sources":["../../src/program/dependency-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,10 @@ import { ClrBindingsResolver } from "./clr-bindings-resolver.js";
|
|
|
11
11
|
export declare const resolveImport: (importSpecifier: string, containingFile: string, sourceRoot: string, clrResolver?: ClrBindingsResolver) => Result<ResolvedModule, Diagnostic>;
|
|
12
12
|
/**
|
|
13
13
|
* Resolve local import with ESM rules
|
|
14
|
+
*
|
|
15
|
+
* Accepts both .js and .ts extensions:
|
|
16
|
+
* - .js is the ESM-compliant extension (resolves to .ts source file)
|
|
17
|
+
* - .ts is also accepted for convenience
|
|
14
18
|
*/
|
|
15
19
|
export declare const resolveLocalImport: (importSpecifier: string, containingFile: string, sourceRoot: string) => Result<ResolvedModule, Diagnostic>;
|
|
16
20
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import-resolution.d.ts","sourceRoot":"","sources":["../../src/resolver/import-resolution.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,MAAM,EAAa,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAoB,MAAM,wBAAwB,CAAC;AAEtE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE;;GAEG;AACH,eAAO,MAAM,aAAa,GACxB,iBAAiB,MAAM,EACvB,gBAAgB,MAAM,EACtB,YAAY,MAAM,EAClB,cAAc,mBAAmB,KAChC,MAAM,CAAC,cAAc,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"import-resolution.d.ts","sourceRoot":"","sources":["../../src/resolver/import-resolution.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,MAAM,EAAa,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAoB,MAAM,wBAAwB,CAAC;AAEtE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE;;GAEG;AACH,eAAO,MAAM,aAAa,GACxB,iBAAiB,MAAM,EACvB,gBAAgB,MAAM,EACtB,YAAY,MAAM,EAClB,cAAc,mBAAmB,KAChC,MAAM,CAAC,cAAc,EAAE,UAAU,CAwDnC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,GAC7B,iBAAiB,MAAM,EACvB,gBAAgB,MAAM,EACtB,YAAY,MAAM,KACjB,MAAM,CAAC,cAAc,EAAE,UAAU,CAuEnC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAC3B,iBAAiB,MAAM,KACtB,MAAM,CAAC,cAAc,EAAE,UAAU,CAuBnC,CAAC"}
|
|
@@ -39,8 +39,9 @@ export const resolveImport = (importSpecifier, containingFile, sourceRoot, clrRe
|
|
|
39
39
|
resolvedAssembly: binding.assembly,
|
|
40
40
|
});
|
|
41
41
|
}
|
|
42
|
-
// @tsonic/
|
|
43
|
-
if (importSpecifier === "@tsonic/types"
|
|
42
|
+
// @tsonic/core packages are type-only (phantom types, attributes) - no runtime code
|
|
43
|
+
if (importSpecifier === "@tsonic/core/types.js" ||
|
|
44
|
+
importSpecifier === "@tsonic/core/attributes.js") {
|
|
44
45
|
return ok({
|
|
45
46
|
resolvedPath: "", // No file path for type-only packages
|
|
46
47
|
isLocal: false,
|
|
@@ -50,18 +51,28 @@ export const resolveImport = (importSpecifier, containingFile, sourceRoot, clrRe
|
|
|
50
51
|
resolvedAssembly: undefined,
|
|
51
52
|
});
|
|
52
53
|
}
|
|
53
|
-
return error(createDiagnostic("TSN1004", "error", `Unsupported module import: "${importSpecifier}"`, undefined, "Tsonic only supports local imports (with .ts), .NET imports, and registered module bindings"));
|
|
54
|
+
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"));
|
|
54
55
|
};
|
|
55
56
|
/**
|
|
56
57
|
* Resolve local import with ESM rules
|
|
58
|
+
*
|
|
59
|
+
* Accepts both .js and .ts extensions:
|
|
60
|
+
* - .js is the ESM-compliant extension (resolves to .ts source file)
|
|
61
|
+
* - .ts is also accepted for convenience
|
|
57
62
|
*/
|
|
58
63
|
export const resolveLocalImport = (importSpecifier, containingFile, sourceRoot) => {
|
|
59
|
-
// Check for .ts extension
|
|
60
|
-
|
|
61
|
-
|
|
64
|
+
// Check for .js or .ts extension
|
|
65
|
+
const hasJsExtension = importSpecifier.endsWith(".js");
|
|
66
|
+
const hasTsExtension = importSpecifier.endsWith(".ts");
|
|
67
|
+
if (!hasJsExtension && !hasTsExtension) {
|
|
68
|
+
return error(createDiagnostic("TSN1001", "error", `Local import must have .js or .ts extension: "${importSpecifier}"`, undefined, `Change to: "${importSpecifier}.js" (ESM) or "${importSpecifier}.ts"`));
|
|
62
69
|
}
|
|
63
70
|
const containingDir = path.dirname(containingFile);
|
|
64
|
-
|
|
71
|
+
// If .js extension, resolve to .ts source file
|
|
72
|
+
const tsSpecifier = hasJsExtension
|
|
73
|
+
? importSpecifier.slice(0, -3) + ".ts"
|
|
74
|
+
: importSpecifier;
|
|
75
|
+
const resolvedPath = path.resolve(containingDir, tsSpecifier);
|
|
65
76
|
// Check if file exists
|
|
66
77
|
if (!fs.existsSync(resolvedPath)) {
|
|
67
78
|
return error(createDiagnostic("TSN1004", "error", `Cannot find module: "${importSpecifier}"`, undefined, `File not found: ${resolvedPath}`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import-resolution.js","sourceRoot":"","sources":["../../src/resolver/import-resolution.ts"],"names":[],"mappings":"AAAA;;GAEG;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;AAEnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAG1F;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,eAAuB,EACvB,cAAsB,EACtB,UAAkB,EAClB,WAAiC,EACG,EAAE;IACtC,IAAI,aAAa,CAAC,eAAe,CAAC,EAAE,CAAC;QACnC,OAAO,kBAAkB,CAAC,eAAe,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;IACzE,CAAC;IAED,sEAAsE;IACtE,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3D,IAAI,aAAa,CAAC,KAAK,EAAE,CAAC;YACxB,OAAO,EAAE,CAAC;gBACR,YAAY,EAAE,EAAE,EAAE,+BAA+B;gBACjD,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,IAAI;gBACX,iBAAiB,EAAE,eAAe;gBAClC,iBAAiB,EAAE,aAAa,CAAC,iBAAiB;aACnD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,wDAAwD;IACxD,MAAM,OAAO,GAAG,kBAAkB,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IACjE,IAAI,OAAO,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACzC,OAAO,EAAE,CAAC;YACR,YAAY,EAAE,EAAE,EAAE,iCAAiC;YACnD,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,KAAK;YACZ,iBAAiB,EAAE,eAAe;YAClC,eAAe,EAAE,OAAO,CAAC,IAAI;YAC7B,gBAAgB,EAAE,OAAO,CAAC,QAAQ;SACnC,CAAC,CAAC;IACL,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"import-resolution.js","sourceRoot":"","sources":["../../src/resolver/import-resolution.ts"],"names":[],"mappings":"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"}
|
package/dist/resolver.test.js
CHANGED
|
@@ -30,12 +30,12 @@ describe("Module Resolver", () => {
|
|
|
30
30
|
expect(result.value.resolvedPath).to.equal(path.join(tempDir, "src", "models", "User.ts"));
|
|
31
31
|
}
|
|
32
32
|
});
|
|
33
|
-
it("should error on local imports without .ts extension", () => {
|
|
33
|
+
it("should error on local imports without .js or .ts extension", () => {
|
|
34
34
|
const result = resolveImport("./models/User", path.join(tempDir, "src", "index.ts"), sourceRoot);
|
|
35
35
|
expect(result.ok).to.equal(false);
|
|
36
36
|
if (!result.ok) {
|
|
37
37
|
expect(result.error.code).to.equal("TSN1001");
|
|
38
|
-
expect(result.error.message).to.include("must have .ts extension");
|
|
38
|
+
expect(result.error.message).to.include("must have .js or .ts extension");
|
|
39
39
|
}
|
|
40
40
|
});
|
|
41
41
|
it("should not detect bare imports as .NET without resolver with bindings", () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.test.js","sourceRoot":"","sources":["../src/resolver.test.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,eAAe,CAAC;AAEvB,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,OAAO,CAAC;QAE3B,MAAM,CAAC,GAAG,EAAE;YACV,kCAAkC;YAClC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACvE,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,EAC9C,sBAAsB,CACvB,CAAC;YACF,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,GAAG,EAAE;YACT,WAAW;YACX,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;YACzD,MAAM,MAAM,GAAG,aAAa,CAC1B,kBAAkB,EAClB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,EACrC,UAAU,CACX,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;gBACd,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC5C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC3C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,KAAK,CACxC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,CAC/C,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"resolver.test.js","sourceRoot":"","sources":["../src/resolver.test.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,eAAe,CAAC;AAEvB,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,OAAO,CAAC;QAE3B,MAAM,CAAC,GAAG,EAAE;YACV,kCAAkC;YAClC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACvE,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,EAC9C,sBAAsB,CACvB,CAAC;YACF,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,GAAG,EAAE;YACT,WAAW;YACX,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;YACzD,MAAM,MAAM,GAAG,aAAa,CAC1B,kBAAkB,EAClB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,EACrC,UAAU,CACX,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;gBACd,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC5C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC3C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,KAAK,CACxC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,CAC/C,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;YACpE,MAAM,MAAM,GAAG,aAAa,CAC1B,eAAe,EACf,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,EACrC,UAAU,CACX,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBACf,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBAC9C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,OAAO,CACrC,gCAAgC,CACjC,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;YAC/E,oFAAoF;YACpF,qFAAqF;YACrF,uFAAuF;YACvF,MAAM,MAAM,GAAG,aAAa,CAC1B,WAAW,EACX,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,EACrC,UAAU;YACV,2BAA2B;aAC5B,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBACf,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBAC9C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;YACvE,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;YAC5C,MAAM,MAAM,GAAG,aAAa,CAC1B,SAAS,EACT,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,EACrC,UAAU,CACX,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBACf,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBAC9C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;YACvE,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;YAClD,MAAM,MAAM,GAAG,aAAa,CAC1B,kBAAkB,EAClB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,EACrC,UAAU,CACX,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBACf,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBAC9C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;YAChE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;QACpC,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;YAC5D,MAAM,SAAS,GAAG,oBAAoB,CACpC,kCAAkC,EAClC,cAAc,EACd,OAAO,CACR,CAAC;YAEF,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;YAC5D,MAAM,SAAS,GAAG,oBAAoB,CACpC,uBAAuB,EACvB,cAAc,EACd,OAAO,CACR,CAAC;YAEF,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;YACjD,MAAM,SAAS,GAAG,oBAAoB,CACpC,kCAAkC,EAClC,cAAc,EACd,OAAO,CACR,CAAC;YAEF,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;QACpC,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;YAClD,MAAM,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC9D,MAAM,CAAC,oBAAoB,CAAC,4BAA4B,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CACjE,aAAa,CACd,CAAC;YACF,MAAM,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|