@tsonic/frontend 0.0.15 → 0.0.16
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/graph/extraction/orchestrator.d.ts.map +1 -1
- package/dist/graph/extraction/orchestrator.js +3 -2
- package/dist/graph/extraction/orchestrator.js.map +1 -1
- package/dist/ir/binding/index.d.ts +21 -0
- package/dist/ir/binding/index.d.ts.map +1 -1
- package/dist/ir/binding/index.js +316 -6
- package/dist/ir/binding/index.js.map +1 -1
- package/dist/ir/bindings-disambiguation.test.d.ts +11 -0
- package/dist/ir/bindings-disambiguation.test.d.ts.map +1 -0
- package/dist/ir/bindings-disambiguation.test.js +416 -0
- package/dist/ir/bindings-disambiguation.test.js.map +1 -0
- package/dist/ir/builder/orchestrator.d.ts.map +1 -1
- package/dist/ir/builder/orchestrator.js +8 -2
- package/dist/ir/builder/orchestrator.js.map +1 -1
- package/dist/ir/builder/types.d.ts +2 -3
- package/dist/ir/builder/types.d.ts.map +1 -1
- package/dist/ir/builder.test.js +1 -1
- package/dist/ir/converters/context.d.ts.map +1 -1
- package/dist/ir/converters/context.js +1 -0
- package/dist/ir/converters/context.js.map +1 -1
- package/dist/ir/converters/expressions/access.d.ts.map +1 -1
- package/dist/ir/converters/expressions/access.js +161 -39
- 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 +256 -19
- package/dist/ir/converters/expressions/calls.js.map +1 -1
- package/dist/ir/converters/expressions/functions.d.ts.map +1 -1
- package/dist/ir/converters/expressions/functions.js +30 -12
- package/dist/ir/converters/expressions/functions.js.map +1 -1
- package/dist/ir/converters/expressions/operators.d.ts.map +1 -1
- package/dist/ir/converters/expressions/operators.js +5 -1
- package/dist/ir/converters/expressions/operators.js.map +1 -1
- package/dist/ir/converters/flow-narrowing.d.ts +27 -0
- package/dist/ir/converters/flow-narrowing.d.ts.map +1 -0
- package/dist/ir/converters/flow-narrowing.js +73 -0
- package/dist/ir/converters/flow-narrowing.js.map +1 -0
- package/dist/ir/converters/statements/control/conditionals.d.ts.map +1 -1
- package/dist/ir/converters/statements/control/conditionals.js +19 -2
- package/dist/ir/converters/statements/control/conditionals.js.map +1 -1
- package/dist/ir/expression-converter.d.ts.map +1 -1
- package/dist/ir/expression-converter.js +11 -4
- package/dist/ir/expression-converter.js.map +1 -1
- package/dist/ir/program-context.d.ts +17 -4
- package/dist/ir/program-context.d.ts.map +1 -1
- package/dist/ir/program-context.js +3 -0
- package/dist/ir/program-context.js.map +1 -1
- package/dist/ir/thisarg-inference.test.js +18 -18
- package/dist/ir/thisarg-inference.test.js.map +1 -1
- package/dist/ir/type-system/internal/handle-types.d.ts +7 -0
- package/dist/ir/type-system/internal/handle-types.d.ts.map +1 -1
- package/dist/ir/type-system/internal/type-converter/primitives.d.ts +3 -3
- package/dist/ir/type-system/internal/type-converter/primitives.d.ts.map +1 -1
- package/dist/ir/type-system/internal/type-converter/primitives.js +2 -2
- package/dist/ir/type-system/internal/type-converter/primitives.js.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 +5 -11
- package/dist/ir/type-system/internal/type-converter/references.js.map +1 -1
- package/dist/ir/type-system/internal/type-registry.d.ts +6 -1
- package/dist/ir/type-system/internal/type-registry.d.ts.map +1 -1
- package/dist/ir/type-system/internal/type-registry.js +11 -10
- package/dist/ir/type-system/internal/type-registry.js.map +1 -1
- package/dist/ir/type-system/internal/universe/clr-catalog.d.ts.map +1 -1
- package/dist/ir/type-system/internal/universe/clr-catalog.js +20 -4
- package/dist/ir/type-system/internal/universe/clr-catalog.js.map +1 -1
- package/dist/ir/type-system/internal/universe/source-catalog.d.ts +2 -0
- package/dist/ir/type-system/internal/universe/source-catalog.d.ts.map +1 -1
- package/dist/ir/type-system/internal/universe/source-catalog.js +8 -3
- package/dist/ir/type-system/internal/universe/source-catalog.js.map +1 -1
- package/dist/ir/type-system/internal/universe/types.d.ts +1 -1
- package/dist/ir/type-system/type-system.d.ts.map +1 -1
- package/dist/ir/type-system/type-system.js +192 -33
- package/dist/ir/type-system/type-system.js.map +1 -1
- package/dist/ir/types/expressions.d.ts +2 -0
- package/dist/ir/types/expressions.d.ts.map +1 -1
- package/dist/ir/types/ir-types.d.ts +1 -1
- package/dist/ir/types/statements.d.ts +9 -0
- package/dist/ir/types/statements.d.ts.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 +1 -0
- package/dist/ir/validation/anonymous-type-lowering-pass.js.map +1 -1
- package/dist/ir/validation/char-validation-pass.d.ts +26 -0
- package/dist/ir/validation/char-validation-pass.d.ts.map +1 -0
- package/dist/ir/validation/char-validation-pass.js +495 -0
- package/dist/ir/validation/char-validation-pass.js.map +1 -0
- package/dist/program/bindings.d.ts +16 -0
- package/dist/program/bindings.d.ts.map +1 -1
- package/dist/program/bindings.js +44 -0
- package/dist/program/bindings.js.map +1 -1
- package/dist/program/creation.d.ts.map +1 -1
- package/dist/program/creation.js +11 -104
- package/dist/program/creation.js.map +1 -1
- package/dist/program/dependency-graph.d.ts.map +1 -1
- package/dist/program/dependency-graph.js +8 -1
- package/dist/program/dependency-graph.js.map +1 -1
- package/dist/program/diagnostics.d.ts.map +1 -1
- package/dist/program/diagnostics.js +0 -6
- package/dist/program/diagnostics.js.map +1 -1
- package/dist/program/types.d.ts +2 -3
- package/dist/program/types.d.ts.map +1 -1
- package/dist/resolver/clr-bindings-resolver.d.ts +5 -0
- package/dist/resolver/clr-bindings-resolver.d.ts.map +1 -1
- package/dist/resolver/clr-bindings-resolver.js +121 -31
- package/dist/resolver/clr-bindings-resolver.js.map +1 -1
- package/dist/resolver/clr-bindings-resolver.test.d.ts +2 -0
- package/dist/resolver/clr-bindings-resolver.test.d.ts.map +1 -0
- package/dist/resolver/clr-bindings-resolver.test.js +161 -0
- package/dist/resolver/clr-bindings-resolver.test.js.map +1 -0
- package/dist/resolver/namespace.d.ts +2 -1
- package/dist/resolver/namespace.d.ts.map +1 -1
- package/dist/resolver/namespace.js +5 -2
- package/dist/resolver/namespace.js.map +1 -1
- package/dist/resolver/namespace.test.js +6 -6
- package/dist/resolver/naming-policy.d.ts +20 -0
- package/dist/resolver/naming-policy.d.ts.map +1 -0
- package/dist/resolver/naming-policy.js +40 -0
- package/dist/resolver/naming-policy.js.map +1 -0
- package/dist/resolver/naming.d.ts +2 -5
- package/dist/resolver/naming.d.ts.map +1 -1
- package/dist/resolver/naming.js +2 -30
- package/dist/resolver/naming.js.map +1 -1
- package/dist/resolver.d.ts +2 -0
- package/dist/resolver.d.ts.map +1 -1
- package/dist/resolver.js +1 -0
- package/dist/resolver.js.map +1 -1
- package/dist/resolver.test.js +7 -6
- 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/core-intrinsics.d.ts +18 -0
- package/dist/validation/core-intrinsics.d.ts.map +1 -0
- package/dist/validation/core-intrinsics.js +186 -0
- package/dist/validation/core-intrinsics.js.map +1 -0
- package/dist/validation/index.d.ts +1 -0
- package/dist/validation/index.d.ts.map +1 -1
- package/dist/validation/index.js +1 -0
- package/dist/validation/index.js.map +1 -1
- package/dist/validation/orchestrator.d.ts.map +1 -1
- package/dist/validation/orchestrator.js +2 -0
- package/dist/validation/orchestrator.js.map +1 -1
- package/dist/validator.test.js +52 -6
- package/dist/validator.test.js.map +1 -1
- package/package.json +1 -1
- package/dist/ir/clr-type-mappings.d.ts +0 -42
- package/dist/ir/clr-type-mappings.d.ts.map +0 -1
- package/dist/ir/clr-type-mappings.js +0 -139
- package/dist/ir/clr-type-mappings.js.map +0 -1
- package/dist/ir/type-converter.d.ts +0 -9
- package/dist/ir/type-converter.d.ts.map +0 -1
- package/dist/ir/type-converter.js +0 -9
- package/dist/ir/type-converter.js.map +0 -1
- package/dist/ir/type-system/core.d.ts +0 -29
- package/dist/ir/type-system/core.d.ts.map +0 -1
- package/dist/ir/type-system/core.js +0 -456
- package/dist/ir/type-system/core.js.map +0 -1
- package/dist/ir/type-system/internal/type-converter/patterns.d.ts +0 -12
- package/dist/ir/type-system/internal/type-converter/patterns.d.ts.map +0 -1
- package/dist/ir/type-system/internal/type-converter/patterns.js +0 -82
- package/dist/ir/type-system/internal/type-converter/patterns.js.map +0 -1
- package/dist/ir/type-universe/assembly-catalog.d.ts +0 -44
- package/dist/ir/type-universe/assembly-catalog.d.ts.map +0 -1
- package/dist/ir/type-universe/assembly-catalog.js +0 -532
- package/dist/ir/type-universe/assembly-catalog.js.map +0 -1
- package/dist/ir/type-universe/assembly-catalog.test.d.ts +0 -7
- package/dist/ir/type-universe/assembly-catalog.test.d.ts.map +0 -1
- package/dist/ir/type-universe/assembly-catalog.test.js +0 -105
- package/dist/ir/type-universe/assembly-catalog.test.js.map +0 -1
- package/dist/ir/type-universe/index.d.ts +0 -19
- package/dist/ir/type-universe/index.d.ts.map +0 -1
- package/dist/ir/type-universe/index.js +0 -21
- package/dist/ir/type-universe/index.js.map +0 -1
- package/dist/ir/type-universe/types.d.ts +0 -436
- package/dist/ir/type-universe/types.d.ts.map +0 -1
- package/dist/ir/type-universe/types.js +0 -69
- package/dist/ir/type-universe/types.js.map +0 -1
- package/dist/ir/type-universe/unified-catalog.d.ts +0 -70
- package/dist/ir/type-universe/unified-catalog.d.ts.map +0 -1
- package/dist/ir/type-universe/unified-catalog.js +0 -319
- package/dist/ir/type-universe/unified-catalog.js.map +0 -1
- package/dist/ir/type-universe/unified-catalog.test.d.ts +0 -7
- package/dist/ir/type-universe/unified-catalog.test.d.ts.map +0 -1
- package/dist/ir/type-universe/unified-catalog.test.js +0 -135
- package/dist/ir/type-universe/unified-catalog.test.js.map +0 -1
|
@@ -0,0 +1,416 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Regression tests for CLR member binding disambiguation.
|
|
3
|
+
*
|
|
4
|
+
* Critical case: multiple tsbindgen namespaces can export the same TS type alias
|
|
5
|
+
* (e.g., `Server`), but with different CLR declaring types and member casing.
|
|
6
|
+
*
|
|
7
|
+
* Tsonic must not guess CLR member names via naming policy in these cases.
|
|
8
|
+
* It must use the correct tsbindgen bindings determined by the TS declaration source.
|
|
9
|
+
*/
|
|
10
|
+
import { describe, it } from "mocha";
|
|
11
|
+
import { expect } from "chai";
|
|
12
|
+
import * as ts from "typescript";
|
|
13
|
+
import * as fs from "node:fs";
|
|
14
|
+
import * as os from "node:os";
|
|
15
|
+
import * as path from "node:path";
|
|
16
|
+
import { buildIr, buildIrModule } from "./builder.js";
|
|
17
|
+
import { createProgramContext } from "./program-context.js";
|
|
18
|
+
import { DotnetMetadataRegistry } from "../dotnet-metadata.js";
|
|
19
|
+
import { BindingRegistry } from "../program/bindings.js";
|
|
20
|
+
import { createClrBindingsResolver } from "../resolver/clr-bindings-resolver.js";
|
|
21
|
+
import { createBinding } from "./binding/index.js";
|
|
22
|
+
describe("CLR member binding disambiguation", () => {
|
|
23
|
+
it("should disambiguate collisions by nearest bindings.json (Server.listen)", () => {
|
|
24
|
+
const tmpRoot = fs.mkdtempSync(path.join(os.tmpdir(), "tsonic-bindings-disambiguation-"));
|
|
25
|
+
const dtsDir = path.join(tmpRoot, "nodejs.Http", "internal");
|
|
26
|
+
fs.mkdirSync(dtsDir, { recursive: true });
|
|
27
|
+
const bindingsJsonPath = path.join(tmpRoot, "nodejs.Http", "bindings.json");
|
|
28
|
+
fs.writeFileSync(bindingsJsonPath, JSON.stringify({
|
|
29
|
+
namespace: "nodejs.Http",
|
|
30
|
+
types: [
|
|
31
|
+
{
|
|
32
|
+
tsEmitName: "Server",
|
|
33
|
+
clrName: "nodejs.Http.Server",
|
|
34
|
+
},
|
|
35
|
+
],
|
|
36
|
+
}, null, 2), "utf8");
|
|
37
|
+
const dtsFileName = path.join(dtsDir, "index.d.ts");
|
|
38
|
+
const dtsSource = `
|
|
39
|
+
declare interface Server$instance {
|
|
40
|
+
listen(port: number, callback: () => void): void;
|
|
41
|
+
}
|
|
42
|
+
declare type Server = Server$instance;
|
|
43
|
+
`;
|
|
44
|
+
const fileName = path.join(tmpRoot, "sample.ts");
|
|
45
|
+
const source = `
|
|
46
|
+
export function test(server: Server): void {
|
|
47
|
+
server.listen(3000, () => {});
|
|
48
|
+
}
|
|
49
|
+
`;
|
|
50
|
+
const libFileName = path.join(tmpRoot, "lib.d.ts");
|
|
51
|
+
const libSource = `
|
|
52
|
+
interface Function {}
|
|
53
|
+
interface Object {}
|
|
54
|
+
interface String {}
|
|
55
|
+
interface Boolean {}
|
|
56
|
+
interface Number {}
|
|
57
|
+
interface IArguments {}
|
|
58
|
+
type PropertyKey = string | number | symbol;
|
|
59
|
+
`;
|
|
60
|
+
const sourceFile = ts.createSourceFile(fileName, source, ts.ScriptTarget.ES2022, true, ts.ScriptKind.TS);
|
|
61
|
+
const dtsFile = ts.createSourceFile(dtsFileName, dtsSource, ts.ScriptTarget.ES2022, true, ts.ScriptKind.TS);
|
|
62
|
+
const libFile = ts.createSourceFile(libFileName, libSource, ts.ScriptTarget.ES2022, true, ts.ScriptKind.TS);
|
|
63
|
+
const fileMap = new Map([
|
|
64
|
+
[fileName, sourceFile],
|
|
65
|
+
[dtsFileName, dtsFile],
|
|
66
|
+
[libFileName, libFile],
|
|
67
|
+
]);
|
|
68
|
+
const program = ts.createProgram([fileName, dtsFileName], {
|
|
69
|
+
target: ts.ScriptTarget.ES2022,
|
|
70
|
+
module: ts.ModuleKind.ES2022,
|
|
71
|
+
}, {
|
|
72
|
+
getSourceFile: (name) => fileMap.get(name),
|
|
73
|
+
writeFile: () => { },
|
|
74
|
+
getCurrentDirectory: () => tmpRoot,
|
|
75
|
+
getDirectories: () => [],
|
|
76
|
+
fileExists: (name) => fileMap.has(name),
|
|
77
|
+
readFile: (name) => fileMap.get(name)?.text,
|
|
78
|
+
getCanonicalFileName: (f) => f,
|
|
79
|
+
useCaseSensitiveFileNames: () => true,
|
|
80
|
+
getNewLine: () => "\n",
|
|
81
|
+
getDefaultLibFileName: () => libFileName,
|
|
82
|
+
});
|
|
83
|
+
const checker = program.getTypeChecker();
|
|
84
|
+
const bindings = new BindingRegistry();
|
|
85
|
+
bindings.addBindings("/test/nodejs-http.json", {
|
|
86
|
+
namespace: "nodejs.Http",
|
|
87
|
+
types: [
|
|
88
|
+
{
|
|
89
|
+
clrName: "nodejs.Http.Server",
|
|
90
|
+
tsEmitName: "Server",
|
|
91
|
+
assemblyName: "nodejs",
|
|
92
|
+
methods: [
|
|
93
|
+
{
|
|
94
|
+
clrName: "listen",
|
|
95
|
+
tsEmitName: "listen",
|
|
96
|
+
normalizedSignature: "listen|(System.Int32,System.Action):nodejs.Http.Server|static=false",
|
|
97
|
+
parameterCount: 2,
|
|
98
|
+
declaringClrType: "nodejs.Http.Server",
|
|
99
|
+
declaringAssemblyName: "nodejs",
|
|
100
|
+
},
|
|
101
|
+
],
|
|
102
|
+
properties: [],
|
|
103
|
+
fields: [],
|
|
104
|
+
},
|
|
105
|
+
],
|
|
106
|
+
});
|
|
107
|
+
// Collision: another namespace also exports a `Server.listen`, but the CLR member
|
|
108
|
+
// name casing differs (Listen vs listen). Tsonic must select the correct one
|
|
109
|
+
// using the declaration source file's nearest bindings.json.
|
|
110
|
+
bindings.addBindings("/test/nodejs.json", {
|
|
111
|
+
namespace: "nodejs",
|
|
112
|
+
types: [
|
|
113
|
+
{
|
|
114
|
+
clrName: "nodejs.Server",
|
|
115
|
+
tsEmitName: "Server",
|
|
116
|
+
assemblyName: "nodejs",
|
|
117
|
+
methods: [
|
|
118
|
+
{
|
|
119
|
+
clrName: "Listen",
|
|
120
|
+
tsEmitName: "listen",
|
|
121
|
+
normalizedSignature: "Listen|(System.Int32,System.Action):nodejs.Server|static=false",
|
|
122
|
+
parameterCount: 2,
|
|
123
|
+
declaringClrType: "nodejs.Server",
|
|
124
|
+
declaringAssemblyName: "nodejs",
|
|
125
|
+
},
|
|
126
|
+
],
|
|
127
|
+
properties: [],
|
|
128
|
+
fields: [],
|
|
129
|
+
},
|
|
130
|
+
],
|
|
131
|
+
});
|
|
132
|
+
const testProgram = {
|
|
133
|
+
program,
|
|
134
|
+
checker,
|
|
135
|
+
options: {
|
|
136
|
+
projectRoot: tmpRoot,
|
|
137
|
+
sourceRoot: tmpRoot,
|
|
138
|
+
rootNamespace: "TestApp",
|
|
139
|
+
strict: true,
|
|
140
|
+
},
|
|
141
|
+
sourceFiles: [sourceFile],
|
|
142
|
+
declarationSourceFiles: [dtsFile],
|
|
143
|
+
metadata: new DotnetMetadataRegistry(),
|
|
144
|
+
bindings,
|
|
145
|
+
clrResolver: createClrBindingsResolver(tmpRoot),
|
|
146
|
+
binding: createBinding(checker),
|
|
147
|
+
};
|
|
148
|
+
const ctx = createProgramContext(testProgram, {
|
|
149
|
+
sourceRoot: tmpRoot,
|
|
150
|
+
rootNamespace: "TestApp",
|
|
151
|
+
});
|
|
152
|
+
const irResult = buildIrModule(sourceFile, testProgram, testProgram.options, ctx);
|
|
153
|
+
if (!irResult.ok) {
|
|
154
|
+
console.error("IR build failed:", irResult.error);
|
|
155
|
+
throw new Error(`IR build MUST succeed for disambiguation test, got: ${JSON.stringify(irResult.error)}`);
|
|
156
|
+
}
|
|
157
|
+
const overloads = bindings.getMemberOverloads("Server", "listen");
|
|
158
|
+
expect(overloads?.length).to.equal(2, "Test setup must have two Server.listen overload targets");
|
|
159
|
+
const funcDecl = irResult.value.body[0];
|
|
160
|
+
if (funcDecl?.kind !== "functionDeclaration") {
|
|
161
|
+
throw new Error("Expected function declaration");
|
|
162
|
+
}
|
|
163
|
+
const exprStmt = funcDecl.body.statements[0];
|
|
164
|
+
if (exprStmt?.kind !== "expressionStatement") {
|
|
165
|
+
throw new Error("Expected expression statement");
|
|
166
|
+
}
|
|
167
|
+
const callExpr = exprStmt.expression;
|
|
168
|
+
if (callExpr.kind !== "call") {
|
|
169
|
+
throw new Error("Expected call expression");
|
|
170
|
+
}
|
|
171
|
+
const callee = callExpr.callee;
|
|
172
|
+
if (callee.kind !== "memberAccess") {
|
|
173
|
+
throw new Error("Expected member access callee");
|
|
174
|
+
}
|
|
175
|
+
expect(callee.memberBinding, "Member binding must be resolved").to.not.equal(undefined);
|
|
176
|
+
expect(callee.memberBinding?.type).to.equal("nodejs.Http.Server");
|
|
177
|
+
expect(callee.memberBinding?.member).to.equal("listen");
|
|
178
|
+
});
|
|
179
|
+
it("should fail compilation when collisions cannot be disambiguated (airplane-grade)", () => {
|
|
180
|
+
const tmpRoot = fs.mkdtempSync(path.join(os.tmpdir(), "tsonic-bindings-disambiguation-"));
|
|
181
|
+
const dtsDir = path.join(tmpRoot, "nodejs.Http", "internal");
|
|
182
|
+
fs.mkdirSync(dtsDir, { recursive: true });
|
|
183
|
+
// Intentionally incorrect bindings.json: the declaring type ("Server") is missing.
|
|
184
|
+
// This makes overload disambiguation impossible.
|
|
185
|
+
const bindingsJsonPath = path.join(tmpRoot, "nodejs.Http", "bindings.json");
|
|
186
|
+
fs.writeFileSync(bindingsJsonPath, JSON.stringify({
|
|
187
|
+
namespace: "nodejs.Http",
|
|
188
|
+
types: [
|
|
189
|
+
{
|
|
190
|
+
tsEmitName: "NotServer",
|
|
191
|
+
clrName: "nodejs.Http.NotServer",
|
|
192
|
+
},
|
|
193
|
+
],
|
|
194
|
+
}, null, 2), "utf8");
|
|
195
|
+
const dtsFileName = path.join(dtsDir, "index.d.ts");
|
|
196
|
+
const dtsSource = `
|
|
197
|
+
declare interface Server$instance {
|
|
198
|
+
listen(port: number, callback: () => void): void;
|
|
199
|
+
}
|
|
200
|
+
declare type Server = Server$instance;
|
|
201
|
+
`;
|
|
202
|
+
const fileName = path.join(tmpRoot, "sample.ts");
|
|
203
|
+
const source = `
|
|
204
|
+
export function test(server: Server): void {
|
|
205
|
+
server.listen(3000, () => {});
|
|
206
|
+
}
|
|
207
|
+
`;
|
|
208
|
+
const libFileName = path.join(tmpRoot, "lib.d.ts");
|
|
209
|
+
const libSource = `
|
|
210
|
+
interface Function {}
|
|
211
|
+
interface Object {}
|
|
212
|
+
interface String {}
|
|
213
|
+
interface Boolean {}
|
|
214
|
+
interface Number {}
|
|
215
|
+
interface IArguments {}
|
|
216
|
+
type PropertyKey = string | number | symbol;
|
|
217
|
+
`;
|
|
218
|
+
const sourceFile = ts.createSourceFile(fileName, source, ts.ScriptTarget.ES2022, true, ts.ScriptKind.TS);
|
|
219
|
+
const dtsFile = ts.createSourceFile(dtsFileName, dtsSource, ts.ScriptTarget.ES2022, true, ts.ScriptKind.TS);
|
|
220
|
+
const libFile = ts.createSourceFile(libFileName, libSource, ts.ScriptTarget.ES2022, true, ts.ScriptKind.TS);
|
|
221
|
+
const fileMap = new Map([
|
|
222
|
+
[fileName, sourceFile],
|
|
223
|
+
[dtsFileName, dtsFile],
|
|
224
|
+
[libFileName, libFile],
|
|
225
|
+
]);
|
|
226
|
+
const program = ts.createProgram([fileName, dtsFileName], {
|
|
227
|
+
target: ts.ScriptTarget.ES2022,
|
|
228
|
+
module: ts.ModuleKind.ES2022,
|
|
229
|
+
}, {
|
|
230
|
+
getSourceFile: (name) => fileMap.get(name),
|
|
231
|
+
writeFile: () => { },
|
|
232
|
+
getCurrentDirectory: () => tmpRoot,
|
|
233
|
+
getDirectories: () => [],
|
|
234
|
+
fileExists: (name) => fileMap.has(name),
|
|
235
|
+
readFile: (name) => fileMap.get(name)?.text,
|
|
236
|
+
getCanonicalFileName: (f) => f,
|
|
237
|
+
useCaseSensitiveFileNames: () => true,
|
|
238
|
+
getNewLine: () => "\n",
|
|
239
|
+
getDefaultLibFileName: () => libFileName,
|
|
240
|
+
});
|
|
241
|
+
const checker = program.getTypeChecker();
|
|
242
|
+
const bindings = new BindingRegistry();
|
|
243
|
+
bindings.addBindings("/test/nodejs-http.json", {
|
|
244
|
+
namespace: "nodejs.Http",
|
|
245
|
+
types: [
|
|
246
|
+
{
|
|
247
|
+
clrName: "nodejs.Http.Server",
|
|
248
|
+
tsEmitName: "Server",
|
|
249
|
+
assemblyName: "nodejs",
|
|
250
|
+
methods: [
|
|
251
|
+
{
|
|
252
|
+
clrName: "listen",
|
|
253
|
+
tsEmitName: "listen",
|
|
254
|
+
normalizedSignature: "listen|(System.Int32,System.Action):nodejs.Http.Server|static=false",
|
|
255
|
+
parameterCount: 2,
|
|
256
|
+
declaringClrType: "nodejs.Http.Server",
|
|
257
|
+
declaringAssemblyName: "nodejs",
|
|
258
|
+
},
|
|
259
|
+
],
|
|
260
|
+
properties: [],
|
|
261
|
+
fields: [],
|
|
262
|
+
},
|
|
263
|
+
],
|
|
264
|
+
});
|
|
265
|
+
bindings.addBindings("/test/nodejs.json", {
|
|
266
|
+
namespace: "nodejs",
|
|
267
|
+
types: [
|
|
268
|
+
{
|
|
269
|
+
clrName: "nodejs.Server",
|
|
270
|
+
tsEmitName: "Server",
|
|
271
|
+
assemblyName: "nodejs",
|
|
272
|
+
methods: [
|
|
273
|
+
{
|
|
274
|
+
clrName: "Listen",
|
|
275
|
+
tsEmitName: "listen",
|
|
276
|
+
normalizedSignature: "Listen|(System.Int32,System.Action):nodejs.Server|static=false",
|
|
277
|
+
parameterCount: 2,
|
|
278
|
+
declaringClrType: "nodejs.Server",
|
|
279
|
+
declaringAssemblyName: "nodejs",
|
|
280
|
+
},
|
|
281
|
+
],
|
|
282
|
+
properties: [],
|
|
283
|
+
fields: [],
|
|
284
|
+
},
|
|
285
|
+
],
|
|
286
|
+
});
|
|
287
|
+
const testProgram = {
|
|
288
|
+
program,
|
|
289
|
+
checker,
|
|
290
|
+
options: {
|
|
291
|
+
projectRoot: tmpRoot,
|
|
292
|
+
sourceRoot: tmpRoot,
|
|
293
|
+
rootNamespace: "TestApp",
|
|
294
|
+
strict: true,
|
|
295
|
+
},
|
|
296
|
+
sourceFiles: [sourceFile],
|
|
297
|
+
declarationSourceFiles: [dtsFile],
|
|
298
|
+
metadata: new DotnetMetadataRegistry(),
|
|
299
|
+
bindings,
|
|
300
|
+
clrResolver: createClrBindingsResolver(tmpRoot),
|
|
301
|
+
binding: createBinding(checker),
|
|
302
|
+
};
|
|
303
|
+
const irResult = buildIr(testProgram, {
|
|
304
|
+
sourceRoot: tmpRoot,
|
|
305
|
+
rootNamespace: "TestApp",
|
|
306
|
+
});
|
|
307
|
+
expect(irResult.ok, "IR build must fail on ambiguous CLR bindings").to.equal(false);
|
|
308
|
+
if (irResult.ok)
|
|
309
|
+
return;
|
|
310
|
+
const codes = irResult.error.map((d) => d.code);
|
|
311
|
+
expect(codes).to.include("TSN4003");
|
|
312
|
+
});
|
|
313
|
+
it("should fail compilation when a CLR-declared member has no binding (airplane-grade)", () => {
|
|
314
|
+
const tmpRoot = fs.mkdtempSync(path.join(os.tmpdir(), "tsonic-bindings-disambiguation-"));
|
|
315
|
+
const dtsDir = path.join(tmpRoot, "nodejs.Http", "internal");
|
|
316
|
+
fs.mkdirSync(dtsDir, { recursive: true });
|
|
317
|
+
const bindingsJsonPath = path.join(tmpRoot, "nodejs.Http", "bindings.json");
|
|
318
|
+
fs.writeFileSync(bindingsJsonPath, JSON.stringify({
|
|
319
|
+
namespace: "nodejs.Http",
|
|
320
|
+
types: [
|
|
321
|
+
{
|
|
322
|
+
tsEmitName: "Server",
|
|
323
|
+
clrName: "nodejs.Http.Server",
|
|
324
|
+
},
|
|
325
|
+
],
|
|
326
|
+
}, null, 2), "utf8");
|
|
327
|
+
const dtsFileName = path.join(dtsDir, "index.d.ts");
|
|
328
|
+
const dtsSource = `
|
|
329
|
+
declare interface Server$instance {
|
|
330
|
+
listen(port: number, callback: () => void): void;
|
|
331
|
+
}
|
|
332
|
+
declare type Server = Server$instance;
|
|
333
|
+
`;
|
|
334
|
+
const fileName = path.join(tmpRoot, "sample.ts");
|
|
335
|
+
const source = `
|
|
336
|
+
export function test(server: Server): void {
|
|
337
|
+
server.listen(3000, () => {});
|
|
338
|
+
}
|
|
339
|
+
`;
|
|
340
|
+
const libFileName = path.join(tmpRoot, "lib.d.ts");
|
|
341
|
+
const libSource = `
|
|
342
|
+
interface Function {}
|
|
343
|
+
interface Object {}
|
|
344
|
+
interface String {}
|
|
345
|
+
interface Boolean {}
|
|
346
|
+
interface Number {}
|
|
347
|
+
interface IArguments {}
|
|
348
|
+
type PropertyKey = string | number | symbol;
|
|
349
|
+
`;
|
|
350
|
+
const sourceFile = ts.createSourceFile(fileName, source, ts.ScriptTarget.ES2022, true, ts.ScriptKind.TS);
|
|
351
|
+
const dtsFile = ts.createSourceFile(dtsFileName, dtsSource, ts.ScriptTarget.ES2022, true, ts.ScriptKind.TS);
|
|
352
|
+
const libFile = ts.createSourceFile(libFileName, libSource, ts.ScriptTarget.ES2022, true, ts.ScriptKind.TS);
|
|
353
|
+
const fileMap = new Map([
|
|
354
|
+
[fileName, sourceFile],
|
|
355
|
+
[dtsFileName, dtsFile],
|
|
356
|
+
[libFileName, libFile],
|
|
357
|
+
]);
|
|
358
|
+
const program = ts.createProgram([fileName, dtsFileName], {
|
|
359
|
+
target: ts.ScriptTarget.ES2022,
|
|
360
|
+
module: ts.ModuleKind.ES2022,
|
|
361
|
+
}, {
|
|
362
|
+
getSourceFile: (name) => fileMap.get(name),
|
|
363
|
+
writeFile: () => { },
|
|
364
|
+
getCurrentDirectory: () => tmpRoot,
|
|
365
|
+
getDirectories: () => [],
|
|
366
|
+
fileExists: (name) => fileMap.has(name),
|
|
367
|
+
readFile: (name) => fileMap.get(name)?.text,
|
|
368
|
+
getCanonicalFileName: (f) => f,
|
|
369
|
+
useCaseSensitiveFileNames: () => true,
|
|
370
|
+
getNewLine: () => "\n",
|
|
371
|
+
getDefaultLibFileName: () => libFileName,
|
|
372
|
+
});
|
|
373
|
+
const checker = program.getTypeChecker();
|
|
374
|
+
const bindings = new BindingRegistry();
|
|
375
|
+
// NOTE: Intentionally omit the `listen` member from bindings to simulate missing bindings.
|
|
376
|
+
bindings.addBindings("/test/nodejs-http.json", {
|
|
377
|
+
namespace: "nodejs.Http",
|
|
378
|
+
types: [
|
|
379
|
+
{
|
|
380
|
+
clrName: "nodejs.Http.Server",
|
|
381
|
+
tsEmitName: "Server",
|
|
382
|
+
assemblyName: "nodejs",
|
|
383
|
+
methods: [],
|
|
384
|
+
properties: [],
|
|
385
|
+
fields: [],
|
|
386
|
+
},
|
|
387
|
+
],
|
|
388
|
+
});
|
|
389
|
+
const testProgram = {
|
|
390
|
+
program,
|
|
391
|
+
checker,
|
|
392
|
+
options: {
|
|
393
|
+
projectRoot: tmpRoot,
|
|
394
|
+
sourceRoot: tmpRoot,
|
|
395
|
+
rootNamespace: "TestApp",
|
|
396
|
+
strict: true,
|
|
397
|
+
},
|
|
398
|
+
sourceFiles: [sourceFile],
|
|
399
|
+
declarationSourceFiles: [dtsFile],
|
|
400
|
+
metadata: new DotnetMetadataRegistry(),
|
|
401
|
+
bindings,
|
|
402
|
+
clrResolver: createClrBindingsResolver(tmpRoot),
|
|
403
|
+
binding: createBinding(checker),
|
|
404
|
+
};
|
|
405
|
+
const irResult = buildIr(testProgram, {
|
|
406
|
+
sourceRoot: tmpRoot,
|
|
407
|
+
rootNamespace: "TestApp",
|
|
408
|
+
});
|
|
409
|
+
expect(irResult.ok, "IR build must fail on missing CLR bindings").to.equal(false);
|
|
410
|
+
if (irResult.ok)
|
|
411
|
+
return;
|
|
412
|
+
const codes = irResult.error.map((d) => d.code);
|
|
413
|
+
expect(codes).to.include("TSN4004");
|
|
414
|
+
});
|
|
415
|
+
});
|
|
416
|
+
//# sourceMappingURL=bindings-disambiguation.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bindings-disambiguation.test.js","sourceRoot":"","sources":["../../src/ir/bindings-disambiguation.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../../src/ir/builder/orchestrator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../../src/ir/builder/orchestrator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,MAAM,EAAa,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EACL,UAAU,EAGX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAEL,KAAK,cAAc,EACpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAM5C;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa,GACxB,YAAY,EAAE,CAAC,UAAU,EACzB,UAAU,aAAa,EACvB,SAAS,cAAc,EACvB,KAAK,cAAc,KAClB,MAAM,CAAC,QAAQ,EAAE,UAAU,CAkH7B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO,GAClB,SAAS,aAAa,EACtB,SAAS,cAAc,KACtB,MAAM,CAAC,SAAS,QAAQ,EAAE,EAAE,SAAS,UAAU,EAAE,CAgCnD,CAAC"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { relative } from "path";
|
|
7
7
|
import { getNamespaceFromPath, getClassNameFromPath } from "../../resolver.js";
|
|
8
|
+
import { resolveNamingPolicy } from "../../resolver/naming-policy.js";
|
|
8
9
|
import { ok, error } from "../../types/result.js";
|
|
9
10
|
import { createDiagnostic, isFatal, } from "../../types/diagnostic.js";
|
|
10
11
|
import { createProgramContext, } from "../program-context.js";
|
|
@@ -23,8 +24,8 @@ import { validateClassImplements } from "./validation.js";
|
|
|
23
24
|
*/
|
|
24
25
|
export const buildIrModule = (sourceFile, _program, options, ctx) => {
|
|
25
26
|
try {
|
|
26
|
-
const namespace = getNamespaceFromPath(sourceFile.fileName, options.sourceRoot, options.rootNamespace);
|
|
27
|
-
const className = getClassNameFromPath(sourceFile.fileName, options.namingPolicy
|
|
27
|
+
const namespace = getNamespaceFromPath(sourceFile.fileName, options.sourceRoot, options.rootNamespace, resolveNamingPolicy(options.namingPolicy, "namespaces"));
|
|
28
|
+
const className = getClassNameFromPath(sourceFile.fileName, resolveNamingPolicy(options.namingPolicy, "classes"));
|
|
28
29
|
const imports = extractImports(sourceFile, ctx);
|
|
29
30
|
const exports = extractExportsWithContext(sourceFile, ctx);
|
|
30
31
|
const statements = extractStatements(sourceFile, ctx);
|
|
@@ -124,6 +125,11 @@ export const buildIr = (program, options) => {
|
|
|
124
125
|
}
|
|
125
126
|
}
|
|
126
127
|
}
|
|
128
|
+
// Merge any diagnostics emitted during IR conversion (from converters).
|
|
129
|
+
// These are deterministic failures where emitting code would require guessing.
|
|
130
|
+
if (ctx.diagnostics.length > 0) {
|
|
131
|
+
diagnostics.push(...ctx.diagnostics);
|
|
132
|
+
}
|
|
127
133
|
if (diagnostics.length > 0) {
|
|
128
134
|
return error(diagnostics);
|
|
129
135
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../../src/ir/builder/orchestrator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAGhC,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EAAU,EAAE,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAEL,gBAAgB,EAChB,OAAO,GACR,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,oBAAoB,GAErB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE1D;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,UAAyB,EACzB,QAAuB,EACvB,OAAuB,EACvB,GAAmB,EACW,EAAE;IAChC,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,oBAAoB,CACpC,UAAU,CAAC,QAAQ,EACnB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../../src/ir/builder/orchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* IR Builder types
|
|
3
3
|
*/
|
|
4
|
+
import type { NamingPolicyConfig } from "../../resolver/naming-policy.js";
|
|
4
5
|
export type IrBuildOptions = {
|
|
5
6
|
readonly sourceRoot: string;
|
|
6
7
|
readonly rootNamespace: string;
|
|
7
|
-
readonly namingPolicy?:
|
|
8
|
-
readonly classes?: "PascalCase";
|
|
9
|
-
};
|
|
8
|
+
readonly namingPolicy?: NamingPolicyConfig;
|
|
10
9
|
};
|
|
11
10
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/ir/builder/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,YAAY,CAAC,EAAE
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/ir/builder/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,YAAY,CAAC,EAAE,kBAAkB,CAAC;CAC5C,CAAC"}
|
package/dist/ir/builder.test.js
CHANGED
|
@@ -67,7 +67,7 @@ describe("IR Builder", () => {
|
|
|
67
67
|
const module = result.value;
|
|
68
68
|
expect(module.kind).to.equal("module");
|
|
69
69
|
expect(module.namespace).to.equal("TestApp");
|
|
70
|
-
expect(module.className).to.equal("
|
|
70
|
+
expect(module.className).to.equal("Test");
|
|
71
71
|
expect(module.isStaticContainer).to.equal(true);
|
|
72
72
|
}
|
|
73
73
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/ir/converters/context.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAEnF;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG,cAAc,CAAC;AAE9C;;GAEG;AACH,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D;;GAEG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,GAAI,QAAQ;IAC7C,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,aAAa,CAAC;IAC1B,QAAQ,EAAE,sBAAsB,CAAC;IACjC,QAAQ,EAAE,eAAe,CAAC;IAC1B,WAAW,EAAE,mBAAmB,CAAC;CAClC,KAAG,
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/ir/converters/context.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAEnF;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG,cAAc,CAAC;AAE9C;;GAEG;AACH,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D;;GAEG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,GAAI,QAAQ;IAC7C,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,aAAa,CAAC;IAC1B,QAAQ,EAAE,sBAAsB,CAAC;IACjC,QAAQ,EAAE,eAAe,CAAC;IAC1B,WAAW,EAAE,mBAAmB,CAAC;CAClC,KAAG,gBAOF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/ir/converters/context.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAqBH;;GAEG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D;;;;GAIG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,MAMtC,EAAoB,EAAE,CAAC,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC,OAAO;IACvB,UAAU,EAAE,MAAM,CAAC,UAAU;IAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ;IACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;IACzB,WAAW,EAAE,MAAM,CAAC,WAAW;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/ir/converters/context.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAqBH;;GAEG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D;;;;GAIG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,MAMtC,EAAoB,EAAE,CAAC,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC,OAAO;IACvB,UAAU,EAAE,MAAM,CAAC,UAAU;IAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ;IACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;IACzB,WAAW,EAAE,MAAM,CAAC,WAAW;IAC/B,WAAW,EAAE,EAAE;CAChB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access.d.ts","sourceRoot":"","sources":["../../../../src/ir/converters/expressions/access.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"access.d.ts","sourceRoot":"","sources":["../../../../src/ir/converters/expressions/access.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAGjC,OAAO,EAAE,kBAAkB,EAA8B,MAAM,gBAAgB,CAAC;AAGhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAspB/D;;GAEG;AACH,eAAO,MAAM,uBAAuB,GAClC,MAAM,EAAE,CAAC,wBAAwB,GAAG,EAAE,CAAC,uBAAuB,EAC9D,KAAK,cAAc,KAClB,kBAwFF,CAAC"}
|