@tsonic/emitter 0.0.14 → 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/adapter-generator.js +3 -3
- package/dist/adapter-generator.js.map +1 -1
- package/dist/array.test.d.ts +1 -1
- package/dist/array.test.js +18 -17
- package/dist/array.test.js.map +1 -1
- package/dist/core/attributes.test.js +2 -2
- package/dist/core/attributes.test.js.map +1 -1
- package/dist/core/imports.d.ts.map +1 -1
- package/dist/core/imports.js +7 -12
- package/dist/core/imports.js.map +1 -1
- package/dist/core/local-types.d.ts.map +1 -1
- package/dist/core/local-types.js +12 -0
- package/dist/core/local-types.js.map +1 -1
- package/dist/core/module-emitter/orchestrator.d.ts.map +1 -1
- package/dist/core/module-emitter/orchestrator.js +15 -2
- package/dist/core/module-emitter/orchestrator.js.map +1 -1
- package/dist/core/module-emitter/static-container.d.ts.map +1 -1
- package/dist/core/module-emitter/static-container.js +30 -4
- package/dist/core/module-emitter/static-container.js.map +1 -1
- package/dist/core/module-emitter.test.js +6 -6
- package/dist/core/module-map.d.ts.map +1 -1
- package/dist/core/module-map.js +42 -0
- package/dist/core/module-map.js.map +1 -1
- package/dist/core/naming-collisions.d.ts +4 -0
- package/dist/core/naming-collisions.d.ts.map +1 -0
- package/dist/core/naming-collisions.js +191 -0
- package/dist/core/naming-collisions.js.map +1 -0
- package/dist/core/type-member-index.d.ts +4 -0
- package/dist/core/type-member-index.d.ts.map +1 -0
- package/dist/core/type-member-index.js +62 -0
- package/dist/core/type-member-index.js.map +1 -0
- package/dist/core/unsafe.d.ts +11 -0
- package/dist/core/unsafe.d.ts.map +1 -0
- package/dist/core/unsafe.js +264 -0
- package/dist/core/unsafe.js.map +1 -0
- package/dist/emitter-types/context.d.ts +1 -1
- package/dist/emitter-types/context.d.ts.map +1 -1
- package/dist/emitter-types/context.js +5 -3
- package/dist/emitter-types/context.js.map +1 -1
- package/dist/emitter-types/core.d.ts +45 -2
- package/dist/emitter-types/core.d.ts.map +1 -1
- package/dist/emitter-types/fqn.d.ts +0 -7
- package/dist/emitter-types/fqn.d.ts.map +1 -1
- package/dist/emitter-types/fqn.js +0 -8
- package/dist/emitter-types/fqn.js.map +1 -1
- package/dist/emitter-types/index.d.ts +1 -1
- package/dist/emitter-types/index.d.ts.map +1 -1
- package/dist/emitter-types/index.js.map +1 -1
- package/dist/emitter.d.ts.map +1 -1
- package/dist/emitter.js +12 -1
- package/dist/emitter.js.map +1 -1
- package/dist/expression-emitter.d.ts.map +1 -1
- package/dist/expression-emitter.js +255 -73
- package/dist/expression-emitter.js.map +1 -1
- package/dist/expressions/access.d.ts +3 -1
- package/dist/expressions/access.d.ts.map +1 -1
- package/dist/expressions/access.js +144 -50
- package/dist/expressions/access.js.map +1 -1
- package/dist/expressions/calls.d.ts.map +1 -1
- package/dist/expressions/calls.js +266 -88
- package/dist/expressions/calls.js.map +1 -1
- package/dist/expressions/collections.d.ts.map +1 -1
- package/dist/expressions/collections.js +169 -57
- package/dist/expressions/collections.js.map +1 -1
- package/dist/expressions/functions.d.ts.map +1 -1
- package/dist/expressions/functions.js +30 -10
- package/dist/expressions/functions.js.map +1 -1
- package/dist/expressions/identifiers.d.ts.map +1 -1
- package/dist/expressions/identifiers.js +11 -30
- package/dist/expressions/identifiers.js.map +1 -1
- package/dist/expressions/index.test.js +89 -200
- package/dist/expressions/index.test.js.map +1 -1
- package/dist/expressions/literals.d.ts +4 -5
- package/dist/expressions/literals.d.ts.map +1 -1
- package/dist/expressions/literals.js +94 -15
- package/dist/expressions/literals.js.map +1 -1
- package/dist/expressions/operators.d.ts +0 -4
- package/dist/expressions/operators.d.ts.map +1 -1
- package/dist/expressions/operators.js +84 -24
- package/dist/expressions/operators.js.map +1 -1
- package/dist/expressions/other.d.ts.map +1 -1
- package/dist/expressions/other.js +21 -3
- package/dist/expressions/other.js.map +1 -1
- package/dist/expressions/parentheses.d.ts +4 -0
- package/dist/expressions/parentheses.d.ts.map +1 -0
- package/dist/expressions/parentheses.js +83 -0
- package/dist/expressions/parentheses.js.map +1 -0
- package/dist/extension-methods.test.d.ts +5 -0
- package/dist/extension-methods.test.d.ts.map +1 -0
- package/dist/extension-methods.test.js +110 -0
- package/dist/extension-methods.test.js.map +1 -0
- package/dist/generator-exchange.d.ts.map +1 -1
- package/dist/generator-exchange.js +5 -2
- package/dist/generator-exchange.js.map +1 -1
- package/dist/generator-wrapper.d.ts.map +1 -1
- package/dist/generator-wrapper.js +13 -7
- package/dist/generator-wrapper.js.map +1 -1
- package/dist/generator-wrapper.test.js +12 -12
- package/dist/generator-wrapper.test.js.map +1 -1
- package/dist/generator.test.js +42 -42
- package/dist/generator.test.js.map +1 -1
- package/dist/golden-tests/discovery.d.ts +6 -11
- package/dist/golden-tests/discovery.d.ts.map +1 -1
- package/dist/golden-tests/discovery.js +14 -79
- package/dist/golden-tests/discovery.js.map +1 -1
- package/dist/golden-tests/index.d.ts +1 -1
- package/dist/golden-tests/index.d.ts.map +1 -1
- package/dist/golden-tests/index.js.map +1 -1
- package/dist/golden-tests/runner.d.ts.map +1 -1
- package/dist/golden-tests/runner.js +6 -7
- package/dist/golden-tests/runner.js.map +1 -1
- package/dist/golden-tests/types.d.ts +0 -7
- package/dist/golden-tests/types.d.ts.map +1 -1
- package/dist/golden.test.d.ts +3 -10
- package/dist/golden.test.d.ts.map +1 -1
- package/dist/golden.test.js +8 -24
- package/dist/golden.test.js.map +1 -1
- package/dist/hierarchical-bindings.test.js +18 -12
- package/dist/hierarchical-bindings.test.js.map +1 -1
- package/dist/integration.test.js +76 -35
- package/dist/integration.test.js.map +1 -1
- package/dist/invariants/emitter-globals-subset.test.d.ts +1 -1
- package/dist/invariants/emitter-globals-subset.test.js +34 -74
- package/dist/invariants/emitter-globals-subset.test.js.map +1 -1
- package/dist/invariants/numeric-proof-contract.test.js +3 -3
- package/dist/invariants/numeric-proof-contract.test.js.map +1 -1
- package/dist/naming-policy.d.ts +5 -0
- package/dist/naming-policy.d.ts.map +1 -0
- package/dist/naming-policy.js +10 -0
- package/dist/naming-policy.js.map +1 -0
- package/dist/patterns.d.ts +98 -0
- package/dist/patterns.d.ts.map +1 -0
- package/dist/patterns.js +366 -0
- package/dist/patterns.js.map +1 -0
- package/dist/patterns.test.d.ts +15 -0
- package/dist/patterns.test.d.ts.map +1 -0
- package/dist/patterns.test.js +1262 -0
- package/dist/patterns.test.js.map +1 -0
- package/dist/specialization/generation.d.ts.map +1 -1
- package/dist/specialization/generation.js +2 -2
- package/dist/specialization/generation.js.map +1 -1
- package/dist/specialization/generic-classes.test.js +1 -1
- package/dist/specialization/generic-functions.test.js +6 -6
- package/dist/specialization/interfaces.test.js +5 -5
- package/dist/specialization/substitution.d.ts.map +1 -1
- package/dist/specialization/substitution.js +4 -0
- package/dist/specialization/substitution.js.map +1 -1
- package/dist/specialization/type-aliases.test.js +6 -6
- package/dist/specialization/type-aliases.test.js.map +1 -1
- package/dist/statement-emitter.d.ts.map +1 -1
- package/dist/statement-emitter.js +1 -1
- package/dist/statement-emitter.js.map +1 -1
- package/dist/statements/blocks.d.ts.map +1 -1
- package/dist/statements/blocks.js +14 -45
- package/dist/statements/blocks.js.map +1 -1
- package/dist/statements/classes/index.d.ts +1 -1
- package/dist/statements/classes/index.d.ts.map +1 -1
- package/dist/statements/classes/index.js +1 -1
- package/dist/statements/classes/index.js.map +1 -1
- package/dist/statements/classes/inline-types.d.ts +1 -1
- package/dist/statements/classes/inline-types.d.ts.map +1 -1
- package/dist/statements/classes/inline-types.js +15 -5
- package/dist/statements/classes/inline-types.js.map +1 -1
- package/dist/statements/classes/members/constructors.d.ts.map +1 -1
- package/dist/statements/classes/members/constructors.js +40 -14
- package/dist/statements/classes/members/constructors.js.map +1 -1
- package/dist/statements/classes/members/methods.d.ts.map +1 -1
- package/dist/statements/classes/members/methods.js +62 -25
- package/dist/statements/classes/members/methods.js.map +1 -1
- package/dist/statements/classes/members/orchestrator.d.ts.map +1 -1
- package/dist/statements/classes/members/orchestrator.js +1 -3
- package/dist/statements/classes/members/orchestrator.js.map +1 -1
- package/dist/statements/classes/members/properties.d.ts.map +1 -1
- package/dist/statements/classes/members/properties.js +70 -10
- package/dist/statements/classes/members/properties.js.map +1 -1
- package/dist/statements/classes/parameters.d.ts +43 -1
- package/dist/statements/classes/parameters.d.ts.map +1 -1
- package/dist/statements/classes/parameters.js +73 -13
- package/dist/statements/classes/parameters.js.map +1 -1
- package/dist/statements/classes/properties.d.ts.map +1 -1
- package/dist/statements/classes/properties.js +6 -7
- package/dist/statements/classes/properties.js.map +1 -1
- package/dist/statements/classes.d.ts +1 -1
- package/dist/statements/classes.d.ts.map +1 -1
- package/dist/statements/classes.js +1 -1
- package/dist/statements/classes.js.map +1 -1
- package/dist/statements/control/conditionals.d.ts.map +1 -1
- package/dist/statements/control/conditionals.js +193 -23
- package/dist/statements/control/conditionals.js.map +1 -1
- package/dist/statements/control/loops.d.ts.map +1 -1
- package/dist/statements/control/loops.js +25 -5
- package/dist/statements/control/loops.js.map +1 -1
- package/dist/statements/declarations/classes.d.ts.map +1 -1
- package/dist/statements/declarations/classes.js +150 -12
- package/dist/statements/declarations/classes.js.map +1 -1
- package/dist/statements/declarations/enums.d.ts.map +1 -1
- package/dist/statements/declarations/enums.js +2 -1
- package/dist/statements/declarations/enums.js.map +1 -1
- package/dist/statements/declarations/functions.d.ts.map +1 -1
- package/dist/statements/declarations/functions.js +44 -19
- package/dist/statements/declarations/functions.js.map +1 -1
- package/dist/statements/declarations/interfaces.d.ts.map +1 -1
- package/dist/statements/declarations/interfaces.js +71 -10
- package/dist/statements/declarations/interfaces.js.map +1 -1
- package/dist/statements/declarations/structs.test.js +5 -5
- package/dist/statements/declarations/type-aliases.d.ts.map +1 -1
- package/dist/statements/declarations/type-aliases.js +24 -5
- package/dist/statements/declarations/type-aliases.js.map +1 -1
- package/dist/statements/declarations/variables.d.ts.map +1 -1
- package/dist/statements/declarations/variables.js +194 -37
- package/dist/statements/declarations/variables.js.map +1 -1
- package/dist/statements/index.test.js +7 -5
- package/dist/statements/index.test.js.map +1 -1
- package/dist/type-assertion.test.js +1 -1
- package/dist/types/arrays.d.ts +3 -9
- package/dist/types/arrays.d.ts.map +1 -1
- package/dist/types/arrays.js +5 -19
- package/dist/types/arrays.js.map +1 -1
- package/dist/types/emitter.d.ts.map +1 -1
- package/dist/types/emitter.js +3 -2
- package/dist/types/emitter.js.map +1 -1
- package/dist/types/index.test.js +3 -3
- package/dist/types/parameters.d.ts +1 -1
- package/dist/types/parameters.d.ts.map +1 -1
- package/dist/types/parameters.js +77 -8
- package/dist/types/parameters.js.map +1 -1
- package/dist/types/parameters.test.js +1 -1
- package/dist/types/parameters.test.js.map +1 -1
- package/dist/types/references.d.ts.map +1 -1
- package/dist/types/references.js +126 -55
- package/dist/types/references.js.map +1 -1
- package/dist/types/references.test.js +46 -106
- package/dist/types/references.test.js.map +1 -1
- package/dist/types/unions.d.ts.map +1 -1
- package/dist/types/unions.js +20 -0
- package/dist/types/unions.js.map +1 -1
- package/dist/types/unions.test.js +9 -9
- package/dist/types.d.ts +1 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/package.json +3 -3
|
@@ -5,14 +5,25 @@ import { getIndent, indent } from "../../types.js";
|
|
|
5
5
|
import { emitType, emitTypeParameters } from "../../type-emitter.js";
|
|
6
6
|
import { extractInlineObjectTypes, emitExtractedType, emitInterfaceMemberAsProperty, } from "../classes.js";
|
|
7
7
|
import { escapeCSharpIdentifier } from "../../emitter-types/index.js";
|
|
8
|
+
import { statementUsesPointer } from "../../core/unsafe.js";
|
|
9
|
+
import { emitCSharpName } from "../../naming-policy.js";
|
|
8
10
|
/**
|
|
9
11
|
* Emit an interface declaration (as C# class)
|
|
10
12
|
*/
|
|
11
13
|
export const emitInterfaceDeclaration = (stmt, context) => {
|
|
14
|
+
const savedScoped = {
|
|
15
|
+
typeParameters: context.typeParameters,
|
|
16
|
+
typeParamConstraints: context.typeParamConstraints,
|
|
17
|
+
typeParameterNameMap: context.typeParameterNameMap,
|
|
18
|
+
returnType: context.returnType,
|
|
19
|
+
localNameMap: context.localNameMap,
|
|
20
|
+
};
|
|
12
21
|
// Per spec/16-types-and-interfaces.md §2.1:
|
|
13
|
-
//
|
|
14
|
-
//
|
|
22
|
+
// - Property-only TS interfaces map to C# classes (instantiable for object literals).
|
|
23
|
+
// - Interfaces with method signatures map to C# interfaces so classes can implement
|
|
24
|
+
// multiple constraints/implements safely in C# (and so generic constraints can be expressed).
|
|
15
25
|
const ind = getIndent(context);
|
|
26
|
+
const hasMethodSignatures = stmt.members.some((m) => m.kind === "methodSignature");
|
|
16
27
|
// Build type parameter names set FIRST - needed when emitting member types
|
|
17
28
|
// Type parameters must be in scope before we emit types that reference them
|
|
18
29
|
const ifaceTypeParams = new Set([
|
|
@@ -25,7 +36,7 @@ export const emitInterfaceDeclaration = (stmt, context) => {
|
|
|
25
36
|
typeParameters: ifaceTypeParams,
|
|
26
37
|
};
|
|
27
38
|
// Extract inline object types and emit them as separate classes
|
|
28
|
-
const extractedTypes = extractInlineObjectTypes(stmt.members);
|
|
39
|
+
const extractedTypes = extractInlineObjectTypes(stmt.members, currentContext);
|
|
29
40
|
const extractedClassCodes = [];
|
|
30
41
|
for (const extracted of extractedTypes) {
|
|
31
42
|
const [classCode, newContext] = emitExtractedType(extracted, currentContext);
|
|
@@ -33,15 +44,28 @@ export const emitInterfaceDeclaration = (stmt, context) => {
|
|
|
33
44
|
currentContext = newContext;
|
|
34
45
|
}
|
|
35
46
|
const parts = [];
|
|
47
|
+
const needsUnsafe = statementUsesPointer(stmt);
|
|
36
48
|
// Access modifier
|
|
37
49
|
const accessibility = stmt.isExported ? "public" : "internal";
|
|
38
50
|
parts.push(accessibility);
|
|
39
|
-
|
|
40
|
-
|
|
51
|
+
if (needsUnsafe)
|
|
52
|
+
parts.push("unsafe");
|
|
53
|
+
// Emit as C# interface when methods exist; otherwise keep class/struct for object literals.
|
|
54
|
+
parts.push(hasMethodSignatures ? "interface" : stmt.isStruct ? "struct" : "class");
|
|
41
55
|
parts.push(escapeCSharpIdentifier(stmt.name));
|
|
42
56
|
// Type parameters (if any)
|
|
43
57
|
if (stmt.typeParameters && stmt.typeParameters.length > 0) {
|
|
44
|
-
const
|
|
58
|
+
const reservedTypeParamNames = new Set();
|
|
59
|
+
for (const member of stmt.members) {
|
|
60
|
+
if (member.kind === "methodSignature") {
|
|
61
|
+
reservedTypeParamNames.add(emitCSharpName(member.name, "methods", context));
|
|
62
|
+
continue;
|
|
63
|
+
}
|
|
64
|
+
if (member.kind === "propertySignature") {
|
|
65
|
+
reservedTypeParamNames.add(emitCSharpName(member.name, "properties", context));
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
const [typeParamsStr, whereClauses, typeParamContext] = emitTypeParameters(stmt.typeParameters, currentContext, reservedTypeParamNames);
|
|
45
69
|
parts.push(typeParamsStr);
|
|
46
70
|
currentContext = typeParamContext;
|
|
47
71
|
// Extended interfaces/classes
|
|
@@ -77,9 +101,46 @@ export const emitInterfaceDeclaration = (stmt, context) => {
|
|
|
77
101
|
const bodyContext = indent(currentContext);
|
|
78
102
|
const members = [];
|
|
79
103
|
for (const member of stmt.members) {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
104
|
+
if (!hasMethodSignatures) {
|
|
105
|
+
const [memberCode, newContext] = emitInterfaceMemberAsProperty(member, bodyContext);
|
|
106
|
+
members.push(memberCode);
|
|
107
|
+
currentContext = newContext;
|
|
108
|
+
continue;
|
|
109
|
+
}
|
|
110
|
+
// C# interface member emission
|
|
111
|
+
if (member.kind === "propertySignature") {
|
|
112
|
+
const [typeName, newContext] = emitType(member.type, currentContext);
|
|
113
|
+
currentContext = newContext;
|
|
114
|
+
const typeStr = member.isOptional ? `${typeName}?` : typeName;
|
|
115
|
+
const accessors = member.isReadonly ? "{ get; }" : "{ get; set; }";
|
|
116
|
+
members.push(`${getIndent(bodyContext)}${typeStr} ${emitCSharpName(member.name, "properties", context)} ${accessors}`);
|
|
117
|
+
continue;
|
|
118
|
+
}
|
|
119
|
+
if (member.kind === "methodSignature") {
|
|
120
|
+
const returnType = member.returnType
|
|
121
|
+
? (() => {
|
|
122
|
+
const [rt, newContext] = emitType(member.returnType, currentContext);
|
|
123
|
+
currentContext = newContext;
|
|
124
|
+
return rt;
|
|
125
|
+
})()
|
|
126
|
+
: "void";
|
|
127
|
+
// NOTE: methodSignature.typeParameters are not supported in emitter yet (rare in TS interface surface).
|
|
128
|
+
// If needed, they should be lowered to a generic method on the interface.
|
|
129
|
+
const params = member.parameters
|
|
130
|
+
.map((p) => {
|
|
131
|
+
const paramName = p.pattern.kind === "identifierPattern"
|
|
132
|
+
? escapeCSharpIdentifier(p.pattern.name)
|
|
133
|
+
: "param";
|
|
134
|
+
if (!p.type)
|
|
135
|
+
return `object ${paramName}`;
|
|
136
|
+
const [pt, newContext] = emitType(p.type, currentContext);
|
|
137
|
+
currentContext = newContext;
|
|
138
|
+
return `${pt} ${paramName}`;
|
|
139
|
+
})
|
|
140
|
+
.join(", ");
|
|
141
|
+
members.push(`${getIndent(bodyContext)}${returnType} ${emitCSharpName(member.name, "methods", context)}(${params});`);
|
|
142
|
+
continue;
|
|
143
|
+
}
|
|
83
144
|
}
|
|
84
145
|
const signature = parts.join(" ");
|
|
85
146
|
const memberCode = members.join("\n\n");
|
|
@@ -91,6 +152,6 @@ export const emitInterfaceDeclaration = (stmt, context) => {
|
|
|
91
152
|
allParts.push(...extractedClassCodes);
|
|
92
153
|
}
|
|
93
154
|
const code = allParts.join("\n");
|
|
94
|
-
return [code, currentContext];
|
|
155
|
+
return [code, { ...currentContext, ...savedScoped }];
|
|
95
156
|
};
|
|
96
157
|
//# sourceMappingURL=interfaces.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/statements/declarations/interfaces.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAkB,SAAS,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,6BAA6B,GAC9B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/statements/declarations/interfaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,8 +45,8 @@ describe("Struct Emission", () => {
|
|
|
45
45
|
};
|
|
46
46
|
const result = emitCSharpFile(module);
|
|
47
47
|
expect(result).to.include("public struct Point");
|
|
48
|
-
expect(result).to.include("public required double
|
|
49
|
-
expect(result).to.include("public required double
|
|
48
|
+
expect(result).to.include("public required double X");
|
|
49
|
+
expect(result).to.include("public required double Y");
|
|
50
50
|
expect(result).not.to.include("class Point");
|
|
51
51
|
});
|
|
52
52
|
it("should emit class for class without isStruct flag", () => {
|
|
@@ -124,9 +124,9 @@ describe("Struct Emission", () => {
|
|
|
124
124
|
};
|
|
125
125
|
const result = emitCSharpFile(module);
|
|
126
126
|
expect(result).to.include("public struct Vector3D");
|
|
127
|
-
expect(result).to.include("public required double
|
|
128
|
-
expect(result).to.include("public required double
|
|
129
|
-
expect(result).to.include("public required double
|
|
127
|
+
expect(result).to.include("public required double X");
|
|
128
|
+
expect(result).to.include("public required double Y");
|
|
129
|
+
expect(result).to.include("public required double Z");
|
|
130
130
|
expect(result).not.to.include("class Vector3D");
|
|
131
131
|
});
|
|
132
132
|
it("should not emit __brand property for struct", () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-aliases.d.ts","sourceRoot":"","sources":["../../../src/statements/declarations/type-aliases.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAqB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"type-aliases.d.ts","sourceRoot":"","sources":["../../../src/statements/declarations/type-aliases.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAqB,MAAM,gBAAgB,CAAC;AAMnE;;GAEG;AACH,eAAO,MAAM,wBAAwB,GACnC,MAAM,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,sBAAsB,CAAA;CAAE,CAAC,EAC5D,SAAS,cAAc,KACtB,CAAC,MAAM,EAAE,cAAc,CAsHzB,CAAC"}
|
|
@@ -4,10 +4,19 @@
|
|
|
4
4
|
import { getIndent, indent } from "../../types.js";
|
|
5
5
|
import { emitType, emitTypeParameters } from "../../type-emitter.js";
|
|
6
6
|
import { escapeCSharpIdentifier } from "../../emitter-types/index.js";
|
|
7
|
+
import { typeUsesPointer } from "../../core/unsafe.js";
|
|
8
|
+
import { emitCSharpName } from "../../naming-policy.js";
|
|
7
9
|
/**
|
|
8
10
|
* Emit a type alias declaration
|
|
9
11
|
*/
|
|
10
12
|
export const emitTypeAliasDeclaration = (stmt, context) => {
|
|
13
|
+
const savedScoped = {
|
|
14
|
+
typeParameters: context.typeParameters,
|
|
15
|
+
typeParamConstraints: context.typeParamConstraints,
|
|
16
|
+
typeParameterNameMap: context.typeParameterNameMap,
|
|
17
|
+
returnType: context.returnType,
|
|
18
|
+
localNameMap: context.localNameMap,
|
|
19
|
+
};
|
|
11
20
|
// Per spec/16-types-and-interfaces.md §3:
|
|
12
21
|
// - Structural type aliases generate C# classes with __Alias suffix
|
|
13
22
|
// - Simple aliases (primitives, references) emit as comments or using aliases
|
|
@@ -27,8 +36,11 @@ export const emitTypeAliasDeclaration = (stmt, context) => {
|
|
|
27
36
|
if (stmt.type.kind === "objectType") {
|
|
28
37
|
// Generate a sealed class (or struct) for structural type alias
|
|
29
38
|
const parts = [];
|
|
39
|
+
const needsUnsafe = typeUsesPointer(stmt.type);
|
|
30
40
|
const accessibility = stmt.isExported ? "public" : "internal";
|
|
31
41
|
parts.push(accessibility);
|
|
42
|
+
if (needsUnsafe)
|
|
43
|
+
parts.push("unsafe");
|
|
32
44
|
// Emit struct or sealed class based on isStruct flag
|
|
33
45
|
if (stmt.isStruct) {
|
|
34
46
|
parts.push("struct");
|
|
@@ -40,7 +52,13 @@ export const emitTypeAliasDeclaration = (stmt, context) => {
|
|
|
40
52
|
parts.push(`${escapeCSharpIdentifier(stmt.name)}__Alias`); // Add __Alias suffix per spec §3.4
|
|
41
53
|
// Type parameters (if any)
|
|
42
54
|
if (stmt.typeParameters && stmt.typeParameters.length > 0) {
|
|
43
|
-
const
|
|
55
|
+
const reservedTypeParamNames = new Set();
|
|
56
|
+
for (const member of stmt.type.members) {
|
|
57
|
+
if (member.kind !== "propertySignature")
|
|
58
|
+
continue;
|
|
59
|
+
reservedTypeParamNames.add(emitCSharpName(member.name, "properties", context));
|
|
60
|
+
}
|
|
61
|
+
const [typeParamsStr, whereClauses, typeParamContext] = emitTypeParameters(stmt.typeParameters, currentContext, reservedTypeParamNames);
|
|
44
62
|
parts.push(typeParamsStr);
|
|
45
63
|
currentContext = typeParamContext;
|
|
46
64
|
if (whereClauses.length > 0) {
|
|
@@ -70,7 +88,7 @@ export const emitTypeAliasDeclaration = (stmt, context) => {
|
|
|
70
88
|
else {
|
|
71
89
|
propParts.push(member.isOptional ? "object?" : "object");
|
|
72
90
|
}
|
|
73
|
-
propParts.push(
|
|
91
|
+
propParts.push(emitCSharpName(member.name, "properties", context));
|
|
74
92
|
// Readonly uses get-only, writable uses get; set;
|
|
75
93
|
const accessors = member.isReadonly ? "{ get; }" : "{ get; set; }";
|
|
76
94
|
properties.push(`${getIndent(bodyContext)}${propParts.join(" ")} ${accessors}`);
|
|
@@ -80,11 +98,12 @@ export const emitTypeAliasDeclaration = (stmt, context) => {
|
|
|
80
98
|
const signature = parts.join(" ");
|
|
81
99
|
const propsCode = properties.join("\n");
|
|
82
100
|
const code = `${ind}${signature}\n${ind}{\n${propsCode}\n${ind}}`;
|
|
83
|
-
return [code, currentContext];
|
|
101
|
+
return [code, { ...currentContext, ...savedScoped }];
|
|
84
102
|
}
|
|
85
103
|
// For non-structural aliases, emit as comment (C# using aliases are limited)
|
|
86
|
-
|
|
104
|
+
// Use currentContext which has type parameters in scope
|
|
105
|
+
const [typeName, newContext] = emitType(stmt.type, currentContext);
|
|
87
106
|
const code = `${ind}// type ${stmt.name} = ${typeName}`;
|
|
88
|
-
return [code, newContext];
|
|
107
|
+
return [code, { ...newContext, ...savedScoped }];
|
|
89
108
|
};
|
|
90
109
|
//# sourceMappingURL=type-aliases.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-aliases.js","sourceRoot":"","sources":["../../../src/statements/declarations/type-aliases.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAkB,SAAS,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"type-aliases.js","sourceRoot":"","sources":["../../../src/statements/declarations/type-aliases.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../../../src/statements/declarations/variables.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../../../src/statements/declarations/variables.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAkC,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAa,MAAM,gBAAgB,CAAC;AA+G3D;;GAEG;AACH,eAAO,MAAM,uBAAuB,GAClC,MAAM,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,qBAAqB,CAAA;CAAE,CAAC,EAC3D,SAAS,cAAc,KACtB,CAAC,MAAM,EAAE,cAAc,CA6SzB,CAAC"}
|
|
@@ -1,11 +1,91 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Variable declaration emission
|
|
3
3
|
*/
|
|
4
|
-
import { NUMERIC_KIND_TO_CSHARP
|
|
4
|
+
import { NUMERIC_KIND_TO_CSHARP } from "@tsonic/frontend";
|
|
5
5
|
import { getIndent } from "../../types.js";
|
|
6
6
|
import { emitExpression } from "../../expression-emitter.js";
|
|
7
7
|
import { emitType } from "../../type-emitter.js";
|
|
8
8
|
import { escapeCSharpIdentifier } from "../../emitter-types/index.js";
|
|
9
|
+
import { lowerPattern } from "../../patterns.js";
|
|
10
|
+
import { resolveTypeAlias, stripNullish } from "../../core/type-resolution.js";
|
|
11
|
+
import { emitCSharpName } from "../../naming-policy.js";
|
|
12
|
+
const computeLocalName = (originalName, context) => {
|
|
13
|
+
const alreadyDeclared = context.localNameMap?.has(originalName) ?? false;
|
|
14
|
+
if (!alreadyDeclared) {
|
|
15
|
+
return { emittedName: escapeCSharpIdentifier(originalName), updatedContext: context };
|
|
16
|
+
}
|
|
17
|
+
const nextId = (context.tempVarId ?? 0) + 1;
|
|
18
|
+
const renamed = `${originalName}__${nextId}`;
|
|
19
|
+
return {
|
|
20
|
+
emittedName: escapeCSharpIdentifier(renamed),
|
|
21
|
+
updatedContext: { ...context, tempVarId: nextId },
|
|
22
|
+
};
|
|
23
|
+
};
|
|
24
|
+
const registerLocalName = (originalName, emittedName, context) => {
|
|
25
|
+
const nextMap = new Map(context.localNameMap ?? []);
|
|
26
|
+
nextMap.set(originalName, emittedName);
|
|
27
|
+
return { ...context, localNameMap: nextMap };
|
|
28
|
+
};
|
|
29
|
+
/**
|
|
30
|
+
* Types that require explicit LHS type because C# has no literal suffix for them.
|
|
31
|
+
* For these types, `var x = 200;` would infer `int`, not the intended type.
|
|
32
|
+
*/
|
|
33
|
+
const TYPES_NEEDING_EXPLICIT_DECL = new Set([
|
|
34
|
+
"byte",
|
|
35
|
+
"sbyte",
|
|
36
|
+
"short",
|
|
37
|
+
"ushort",
|
|
38
|
+
]);
|
|
39
|
+
/**
|
|
40
|
+
* Check if a type can be explicitly emitted as a C# type.
|
|
41
|
+
* Returns false for types that cannot be named in C# (any, unknown, anonymous).
|
|
42
|
+
*/
|
|
43
|
+
const canEmitTypeExplicitly = (type) => {
|
|
44
|
+
// Reject any/unknown (these are separate type kinds, not primitive names)
|
|
45
|
+
if (type.kind === "anyType" || type.kind === "unknownType") {
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
48
|
+
// Accept primitives
|
|
49
|
+
if (type.kind === "primitiveType") {
|
|
50
|
+
return true;
|
|
51
|
+
}
|
|
52
|
+
// Accept arrays, functions, references, tuples, dictionaries
|
|
53
|
+
if (type.kind === "arrayType" ||
|
|
54
|
+
type.kind === "functionType" ||
|
|
55
|
+
type.kind === "referenceType" ||
|
|
56
|
+
type.kind === "tupleType" ||
|
|
57
|
+
type.kind === "dictionaryType") {
|
|
58
|
+
return true;
|
|
59
|
+
}
|
|
60
|
+
// Reject anonymous object types (no CLR backing)
|
|
61
|
+
if (type.kind === "objectType") {
|
|
62
|
+
return false;
|
|
63
|
+
}
|
|
64
|
+
// Reject unions containing any/unknown
|
|
65
|
+
if (type.kind === "unionType") {
|
|
66
|
+
return type.types.every(canEmitTypeExplicitly);
|
|
67
|
+
}
|
|
68
|
+
return false;
|
|
69
|
+
};
|
|
70
|
+
/**
|
|
71
|
+
* Check if a type requires explicit local variable declaration.
|
|
72
|
+
* Returns true for types like byte, sbyte, short, ushort that have no C# suffix.
|
|
73
|
+
* Resolves type aliases to get the underlying type.
|
|
74
|
+
*/
|
|
75
|
+
const needsExplicitLocalType = (type, context) => {
|
|
76
|
+
// Resolve aliases (e.g., local type aliases)
|
|
77
|
+
const resolved = resolveTypeAlias(stripNullish(type), context);
|
|
78
|
+
// Check primitive types
|
|
79
|
+
if (resolved.kind === "primitiveType") {
|
|
80
|
+
return TYPES_NEEDING_EXPLICIT_DECL.has(resolved.name);
|
|
81
|
+
}
|
|
82
|
+
// Check reference types - these may be CLR types from @tsonic/core
|
|
83
|
+
// (byte, sbyte, short, ushort are imported as reference types, not primitives)
|
|
84
|
+
if (resolved.kind === "referenceType") {
|
|
85
|
+
return TYPES_NEEDING_EXPLICIT_DECL.has(resolved.name);
|
|
86
|
+
}
|
|
87
|
+
return false;
|
|
88
|
+
};
|
|
9
89
|
/**
|
|
10
90
|
* Emit a variable declaration
|
|
11
91
|
*/
|
|
@@ -14,6 +94,27 @@ export const emitVariableDeclaration = (stmt, context) => {
|
|
|
14
94
|
let currentContext = context;
|
|
15
95
|
const declarations = [];
|
|
16
96
|
for (const decl of stmt.declarations) {
|
|
97
|
+
// Handle destructuring patterns EARLY - they use lowerPattern which generates `var` declarations
|
|
98
|
+
// Skip all the type inference logic for these
|
|
99
|
+
if (decl.name.kind === "arrayPattern" ||
|
|
100
|
+
decl.name.kind === "objectPattern") {
|
|
101
|
+
if (!decl.initializer) {
|
|
102
|
+
// Destructuring requires an initializer
|
|
103
|
+
declarations.push(`${ind}/* destructuring without initializer - error */`);
|
|
104
|
+
continue;
|
|
105
|
+
}
|
|
106
|
+
// Emit the RHS expression
|
|
107
|
+
const [initFrag, newContext] = emitExpression(decl.initializer, currentContext, decl.type);
|
|
108
|
+
currentContext = newContext;
|
|
109
|
+
// Use explicit type annotation if present, otherwise use initializer's inferred type
|
|
110
|
+
const patternType = decl.type ?? decl.initializer.inferredType;
|
|
111
|
+
// Lower the pattern to C# statements
|
|
112
|
+
const result = lowerPattern(decl.name, initFrag.text, patternType, ind, currentContext);
|
|
113
|
+
// Add all generated statements
|
|
114
|
+
declarations.push(...result.statements);
|
|
115
|
+
currentContext = result.context;
|
|
116
|
+
continue;
|
|
117
|
+
}
|
|
17
118
|
let varDecl = "";
|
|
18
119
|
// In static contexts, variable declarations become fields with modifiers
|
|
19
120
|
if (context.isStatic) {
|
|
@@ -43,11 +144,8 @@ export const emitVariableDeclaration = (stmt, context) => {
|
|
|
43
144
|
currentContext = newContext;
|
|
44
145
|
varDecl += `${typeName} `;
|
|
45
146
|
}
|
|
46
|
-
else if (decl.type
|
|
47
|
-
|
|
48
|
-
// Emit explicit type UNLESS it's a function type in a non-static context
|
|
49
|
-
// (let C# infer lambda types in local contexts)
|
|
50
|
-
// Note: For module-level exports, type is always set (from annotation or inference)
|
|
147
|
+
else if (context.isStatic && decl.type) {
|
|
148
|
+
// Static fields: emit explicit type (required - can't use 'var' for fields)
|
|
51
149
|
const [typeName, newContext] = emitType(decl.type, currentContext);
|
|
52
150
|
currentContext = newContext;
|
|
53
151
|
varDecl += `${typeName} `;
|
|
@@ -133,17 +231,98 @@ export const emitVariableDeclaration = (stmt, context) => {
|
|
|
133
231
|
varDecl += "object ";
|
|
134
232
|
}
|
|
135
233
|
}
|
|
234
|
+
else if (decl.initializer?.inferredType &&
|
|
235
|
+
canEmitTypeExplicitly(decl.initializer.inferredType)) {
|
|
236
|
+
// Use initializer's inferred type (function return types, etc.)
|
|
237
|
+
const [typeName, newContext] = emitType(decl.initializer.inferredType, currentContext);
|
|
238
|
+
currentContext = newContext;
|
|
239
|
+
varDecl += `${typeName} `;
|
|
240
|
+
}
|
|
136
241
|
else {
|
|
137
242
|
varDecl += "object ";
|
|
138
243
|
}
|
|
139
244
|
}
|
|
245
|
+
else if (!context.isStatic &&
|
|
246
|
+
decl.type &&
|
|
247
|
+
canEmitTypeExplicitly(decl.type)) {
|
|
248
|
+
// Local variables with an explicit TypeScript annotation must preserve that type in C#.
|
|
249
|
+
// Using `var` would re-infer from the initializer and can break semantics (e.g. base-typed
|
|
250
|
+
// variables that are reassigned to different derived instances).
|
|
251
|
+
const [typeName, newContext] = emitType(decl.type, currentContext);
|
|
252
|
+
currentContext = newContext;
|
|
253
|
+
varDecl += `${typeName} `;
|
|
254
|
+
}
|
|
255
|
+
else if (!context.isStatic &&
|
|
256
|
+
decl.type &&
|
|
257
|
+
decl.initializer &&
|
|
258
|
+
((decl.initializer.kind === "literal" &&
|
|
259
|
+
(decl.initializer.value === undefined ||
|
|
260
|
+
decl.initializer.value === null)) ||
|
|
261
|
+
(decl.initializer.kind === "identifier" &&
|
|
262
|
+
(decl.initializer.name === "undefined" ||
|
|
263
|
+
decl.initializer.name === "null")))) {
|
|
264
|
+
// `var x = default;` / `var x = null;` is invalid because there is no target type.
|
|
265
|
+
// When the TypeScript source has an explicit type annotation, emit the explicit C# type.
|
|
266
|
+
const [typeName, newContext] = emitType(decl.type, currentContext);
|
|
267
|
+
currentContext = newContext;
|
|
268
|
+
varDecl += `${typeName} `;
|
|
269
|
+
}
|
|
270
|
+
else if (!context.isStatic &&
|
|
271
|
+
!decl.type &&
|
|
272
|
+
decl.initializer &&
|
|
273
|
+
((decl.initializer.kind === "literal" &&
|
|
274
|
+
(decl.initializer.value === undefined ||
|
|
275
|
+
decl.initializer.value === null)) ||
|
|
276
|
+
(decl.initializer.kind === "identifier" &&
|
|
277
|
+
(decl.initializer.name === "undefined" ||
|
|
278
|
+
decl.initializer.name === "null")))) {
|
|
279
|
+
// Nullish initializer without an explicit annotation cannot be emitted with `var`.
|
|
280
|
+
// Prefer the initializer's inferred type if it is explicitly nameable in C#,
|
|
281
|
+
// otherwise fall back to object? to keep emission valid.
|
|
282
|
+
const fallbackType = decl.initializer.inferredType;
|
|
283
|
+
if (fallbackType && canEmitTypeExplicitly(fallbackType)) {
|
|
284
|
+
const [typeName, newContext] = emitType(fallbackType, currentContext);
|
|
285
|
+
currentContext = newContext;
|
|
286
|
+
varDecl += `${typeName} `;
|
|
287
|
+
}
|
|
288
|
+
else {
|
|
289
|
+
varDecl += "object? ";
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
else if (!context.isStatic &&
|
|
293
|
+
decl.type &&
|
|
294
|
+
decl.initializer?.kind !== "stackalloc" &&
|
|
295
|
+
needsExplicitLocalType(decl.type, currentContext)) {
|
|
296
|
+
// Local variable with type that has no C# literal suffix (byte, sbyte, short, ushort)
|
|
297
|
+
// Must emit explicit type since `var x = 200;` would infer `int`
|
|
298
|
+
const [typeName, newContext] = emitType(decl.type, currentContext);
|
|
299
|
+
currentContext = newContext;
|
|
300
|
+
varDecl += `${typeName} `;
|
|
301
|
+
}
|
|
302
|
+
else if (!context.isStatic && decl.initializer?.kind === "stackalloc") {
|
|
303
|
+
// stackalloc expressions must be target-typed to produce Span<T> (otherwise they become T* and require unsafe).
|
|
304
|
+
const targetType = decl.type ?? decl.initializer.inferredType;
|
|
305
|
+
if (!targetType) {
|
|
306
|
+
throw new Error("ICE: stackalloc initializer missing target type (no decl.type and no inferredType)");
|
|
307
|
+
}
|
|
308
|
+
const [typeName, newContext] = emitType(targetType, currentContext);
|
|
309
|
+
currentContext = newContext;
|
|
310
|
+
varDecl += `${typeName} `;
|
|
311
|
+
}
|
|
140
312
|
else {
|
|
313
|
+
// Local variables use `var` - idiomatic C# when RHS is self-documenting
|
|
141
314
|
varDecl += "var ";
|
|
142
315
|
}
|
|
143
316
|
// Handle different pattern types
|
|
144
317
|
if (decl.name.kind === "identifierPattern") {
|
|
145
318
|
// Simple identifier pattern (escape C# keywords)
|
|
146
|
-
|
|
319
|
+
const originalName = decl.name.name;
|
|
320
|
+
const localNameInfo = context.isStatic
|
|
321
|
+
? { emittedName: emitCSharpName(originalName, "fields", context), updatedContext: currentContext }
|
|
322
|
+
: computeLocalName(originalName, currentContext);
|
|
323
|
+
const localName = localNameInfo.emittedName;
|
|
324
|
+
currentContext = localNameInfo.updatedContext;
|
|
325
|
+
varDecl += localName;
|
|
147
326
|
// Add initializer if present
|
|
148
327
|
if (decl.initializer) {
|
|
149
328
|
const [initFrag, newContext] = emitExpression(decl.initializer, currentContext, decl.type // Pass expected type for contextual typing (e.g., array literals)
|
|
@@ -151,39 +330,17 @@ export const emitVariableDeclaration = (stmt, context) => {
|
|
|
151
330
|
currentContext = newContext;
|
|
152
331
|
varDecl += ` = ${initFrag.text}`;
|
|
153
332
|
}
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
if (!decl.initializer) {
|
|
159
|
-
// Array destructuring requires an initializer
|
|
160
|
-
declarations.push(`${ind}${varDecl}/* array destructuring without initializer */;`);
|
|
161
|
-
continue;
|
|
162
|
-
}
|
|
163
|
-
const [initFrag, newContext] = emitExpression(decl.initializer, currentContext, decl.type);
|
|
164
|
-
currentContext = newContext;
|
|
165
|
-
const arrayPattern = decl.name;
|
|
166
|
-
// Use global:: prefix for Tsonic.JSRuntime.Array static helpers
|
|
167
|
-
for (let i = 0; i < arrayPattern.elements.length; i++) {
|
|
168
|
-
const element = arrayPattern.elements[i];
|
|
169
|
-
if (element && element.kind === "identifierPattern") {
|
|
170
|
-
// Escape C# keywords and use integer index
|
|
171
|
-
const escapedName = escapeCSharpIdentifier(element.name);
|
|
172
|
-
const elementVarDecl = `${varDecl}${escapedName} = global::Tsonic.JSRuntime.Array.get(${initFrag.text}, ${i});`;
|
|
173
|
-
declarations.push(`${ind}${elementVarDecl}`);
|
|
174
|
-
}
|
|
175
|
-
// Skip undefined elements (holes in array pattern)
|
|
333
|
+
// Register local names after emitting the initializer (C# scoping rules).
|
|
334
|
+
// Static fields are not locals and must not participate in shadowing logic.
|
|
335
|
+
if (!context.isStatic) {
|
|
336
|
+
currentContext = registerLocalName(originalName, localName, currentContext);
|
|
176
337
|
}
|
|
338
|
+
declarations.push(`${ind}${varDecl};`);
|
|
177
339
|
}
|
|
178
340
|
else {
|
|
179
|
-
//
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
if (decl.initializer) {
|
|
183
|
-
const [initFrag, newContext] = emitExpression(decl.initializer, currentContext, decl.type);
|
|
184
|
-
currentContext = newContext;
|
|
185
|
-
varDecl += ` = ${initFrag.text}`;
|
|
186
|
-
}
|
|
341
|
+
// Unknown pattern kind - emit placeholder
|
|
342
|
+
// (arrayPattern and objectPattern are handled early with continue)
|
|
343
|
+
varDecl += "/* unsupported pattern */";
|
|
187
344
|
declarations.push(`${ind}${varDecl};`);
|
|
188
345
|
}
|
|
189
346
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variables.js","sourceRoot":"","sources":["../../../src/statements/declarations/variables.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"variables.js","sourceRoot":"","sources":["../../../src/statements/declarations/variables.ts"],"names":[],"mappings":"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"}
|
|
@@ -227,8 +227,12 @@ describe("Statement Emission", () => {
|
|
|
227
227
|
kind: "call",
|
|
228
228
|
callee: {
|
|
229
229
|
kind: "memberAccess",
|
|
230
|
-
object: {
|
|
231
|
-
|
|
230
|
+
object: {
|
|
231
|
+
kind: "identifier",
|
|
232
|
+
name: "Console",
|
|
233
|
+
resolvedClrType: "System.Console",
|
|
234
|
+
},
|
|
235
|
+
property: "WriteLine",
|
|
232
236
|
isComputed: false,
|
|
233
237
|
isOptional: false,
|
|
234
238
|
},
|
|
@@ -252,9 +256,7 @@ describe("Statement Emission", () => {
|
|
|
252
256
|
const result = emitModule(module);
|
|
253
257
|
expect(result).to.include("foreach (var item in items)");
|
|
254
258
|
// Uses fully-qualified name with global:: prefix
|
|
255
|
-
expect(result).to.include("global::
|
|
256
|
-
// Should NOT include using directives - uses global:: FQN
|
|
257
|
-
expect(result).to.not.include("using Tsonic.JSRuntime");
|
|
259
|
+
expect(result).to.include("global::System.Console.WriteLine(item)");
|
|
258
260
|
});
|
|
259
261
|
it("should emit 'await foreach' when isAwait=true", () => {
|
|
260
262
|
const module = {
|