@tsonic/emitter 0.0.72 → 0.0.74

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.
Files changed (207) hide show
  1. package/dist/.tsbuildinfo +1 -1
  2. package/dist/adapter-generator.d.ts.map +1 -1
  3. package/dist/adapter-generator.js +2 -1
  4. package/dist/adapter-generator.js.map +1 -1
  5. package/dist/constants.d.ts +3 -2
  6. package/dist/constants.d.ts.map +1 -1
  7. package/dist/constants.js +15 -6
  8. package/dist/constants.js.map +1 -1
  9. package/dist/core/format/attributes.d.ts.map +1 -1
  10. package/dist/core/format/attributes.js +5 -56
  11. package/dist/core/format/attributes.js.map +1 -1
  12. package/dist/core/format/attributes.test.js +1 -1
  13. package/dist/core/format/attributes.test.js.map +1 -1
  14. package/dist/core/format/backend-ast/builders.d.ts +13 -0
  15. package/dist/core/format/backend-ast/builders.d.ts.map +1 -0
  16. package/dist/core/format/backend-ast/builders.js +169 -0
  17. package/dist/core/format/backend-ast/builders.js.map +1 -0
  18. package/dist/core/format/backend-ast/builders.test.d.ts +2 -0
  19. package/dist/core/format/backend-ast/builders.test.d.ts.map +1 -0
  20. package/dist/core/format/backend-ast/builders.test.js +258 -0
  21. package/dist/core/format/backend-ast/builders.test.js.map +1 -0
  22. package/dist/core/format/backend-ast/index.d.ts +3 -2
  23. package/dist/core/format/backend-ast/index.d.ts.map +1 -1
  24. package/dist/core/format/backend-ast/index.js +2 -1
  25. package/dist/core/format/backend-ast/index.js.map +1 -1
  26. package/dist/core/format/backend-ast/invariants.test.d.ts +2 -0
  27. package/dist/core/format/backend-ast/invariants.test.d.ts.map +1 -0
  28. package/dist/core/format/backend-ast/invariants.test.js +72 -0
  29. package/dist/core/format/backend-ast/invariants.test.js.map +1 -0
  30. package/dist/core/format/backend-ast/printer.d.ts +1 -1
  31. package/dist/core/format/backend-ast/printer.d.ts.map +1 -1
  32. package/dist/core/format/backend-ast/printer.js +362 -119
  33. package/dist/core/format/backend-ast/printer.js.map +1 -1
  34. package/dist/core/format/backend-ast/printer.test.d.ts +2 -0
  35. package/dist/core/format/backend-ast/printer.test.d.ts.map +1 -0
  36. package/dist/core/format/backend-ast/printer.test.js +796 -0
  37. package/dist/core/format/backend-ast/printer.test.js.map +1 -0
  38. package/dist/core/format/backend-ast/types.d.ts +66 -14
  39. package/dist/core/format/backend-ast/types.d.ts.map +1 -1
  40. package/dist/core/format/backend-ast/utils.d.ts +12 -8
  41. package/dist/core/format/backend-ast/utils.d.ts.map +1 -1
  42. package/dist/core/format/backend-ast/utils.js +222 -19
  43. package/dist/core/format/backend-ast/utils.js.map +1 -1
  44. package/dist/core/format/backend-ast/utils.test.d.ts +2 -0
  45. package/dist/core/format/backend-ast/utils.test.d.ts.map +1 -0
  46. package/dist/core/format/backend-ast/utils.test.js +142 -0
  47. package/dist/core/format/backend-ast/utils.test.js.map +1 -0
  48. package/dist/core/format/module-emitter/assembly.d.ts +2 -2
  49. package/dist/core/format/module-emitter/assembly.d.ts.map +1 -1
  50. package/dist/core/format/module-emitter/assembly.js +7 -3
  51. package/dist/core/format/module-emitter/assembly.js.map +1 -1
  52. package/dist/core/format/module-emitter/header.d.ts +2 -1
  53. package/dist/core/format/module-emitter/header.d.ts.map +1 -1
  54. package/dist/core/format/module-emitter/header.js +2 -2
  55. package/dist/core/format/module-emitter/header.js.map +1 -1
  56. package/dist/core/format/module-emitter/orchestrator.js +1 -1
  57. package/dist/core/format/module-emitter/orchestrator.js.map +1 -1
  58. package/dist/core/format/module-emitter/static-container.d.ts.map +1 -1
  59. package/dist/core/format/module-emitter/static-container.js +3 -5
  60. package/dist/core/format/module-emitter/static-container.js.map +1 -1
  61. package/dist/core/module-emitter.test.js +1 -0
  62. package/dist/core/module-emitter.test.js.map +1 -1
  63. package/dist/core/semantic/boolean-context.d.ts.map +1 -1
  64. package/dist/core/semantic/boolean-context.js +45 -49
  65. package/dist/core/semantic/boolean-context.js.map +1 -1
  66. package/dist/core/semantic/imports.d.ts.map +1 -1
  67. package/dist/core/semantic/imports.js +25 -15
  68. package/dist/core/semantic/imports.js.map +1 -1
  69. package/dist/core/semantic/imports.test.js +43 -0
  70. package/dist/core/semantic/imports.test.js.map +1 -1
  71. package/dist/core/semantic/type-resolution.d.ts +1 -0
  72. package/dist/core/semantic/type-resolution.d.ts.map +1 -1
  73. package/dist/core/semantic/type-resolution.js +166 -5
  74. package/dist/core/semantic/type-resolution.js.map +1 -1
  75. package/dist/core/semantic/type-resolution.test.js +35 -0
  76. package/dist/core/semantic/type-resolution.test.js.map +1 -1
  77. package/dist/emitter-types/core.d.ts +24 -10
  78. package/dist/emitter-types/core.d.ts.map +1 -1
  79. package/dist/emitter.d.ts.map +1 -1
  80. package/dist/emitter.js +124 -44
  81. package/dist/emitter.js.map +1 -1
  82. package/dist/expression-emitter.d.ts.map +1 -1
  83. package/dist/expression-emitter.js +797 -17
  84. package/dist/expression-emitter.js.map +1 -1
  85. package/dist/expressions/access.d.ts.map +1 -1
  86. package/dist/expressions/access.js +65 -25
  87. package/dist/expressions/access.js.map +1 -1
  88. package/dist/expressions/calls/call-analysis.d.ts +0 -10
  89. package/dist/expressions/calls/call-analysis.d.ts.map +1 -1
  90. package/dist/expressions/calls/call-analysis.js +3 -62
  91. package/dist/expressions/calls/call-analysis.js.map +1 -1
  92. package/dist/expressions/calls/call-emitter.d.ts.map +1 -1
  93. package/dist/expressions/calls/call-emitter.js +97 -196
  94. package/dist/expressions/calls/call-emitter.js.map +1 -1
  95. package/dist/expressions/calls/new-emitter.d.ts.map +1 -1
  96. package/dist/expressions/calls/new-emitter.js +36 -69
  97. package/dist/expressions/calls/new-emitter.js.map +1 -1
  98. package/dist/expressions/collections.d.ts +3 -0
  99. package/dist/expressions/collections.d.ts.map +1 -1
  100. package/dist/expressions/collections.js +238 -57
  101. package/dist/expressions/collections.js.map +1 -1
  102. package/dist/expressions/functions.d.ts.map +1 -1
  103. package/dist/expressions/functions.js +1 -7
  104. package/dist/expressions/functions.js.map +1 -1
  105. package/dist/expressions/identifiers.d.ts.map +1 -1
  106. package/dist/expressions/identifiers.js +24 -38
  107. package/dist/expressions/identifiers.js.map +1 -1
  108. package/dist/expressions/index.test.js +245 -0
  109. package/dist/expressions/index.test.js.map +1 -1
  110. package/dist/expressions/literals.d.ts.map +1 -1
  111. package/dist/expressions/literals.js +9 -41
  112. package/dist/expressions/literals.js.map +1 -1
  113. package/dist/expressions/operators/assignment-emitter.d.ts.map +1 -1
  114. package/dist/expressions/operators/assignment-emitter.js +2 -6
  115. package/dist/expressions/operators/assignment-emitter.js.map +1 -1
  116. package/dist/expressions/operators/binary-emitter.d.ts.map +1 -1
  117. package/dist/expressions/operators/binary-emitter.js +102 -77
  118. package/dist/expressions/operators/binary-emitter.js.map +1 -1
  119. package/dist/expressions/operators/logical-emitter.d.ts.map +1 -1
  120. package/dist/expressions/operators/logical-emitter.js +1 -3
  121. package/dist/expressions/operators/logical-emitter.js.map +1 -1
  122. package/dist/expressions/operators/unary-emitter.d.ts.map +1 -1
  123. package/dist/expressions/operators/unary-emitter.js +9 -20
  124. package/dist/expressions/operators/unary-emitter.js.map +1 -1
  125. package/dist/expressions/other.d.ts.map +1 -1
  126. package/dist/expressions/other.js +57 -4
  127. package/dist/expressions/other.js.map +1 -1
  128. package/dist/generator-exchange.d.ts.map +1 -1
  129. package/dist/generator-exchange.js +3 -2
  130. package/dist/generator-exchange.js.map +1 -1
  131. package/dist/generator-wrapper.d.ts.map +1 -1
  132. package/dist/generator-wrapper.js +27 -56
  133. package/dist/generator-wrapper.js.map +1 -1
  134. package/dist/integration.test.js +393 -5
  135. package/dist/integration.test.js.map +1 -1
  136. package/dist/json-aot-generic.test.js +3 -0
  137. package/dist/json-aot-generic.test.js.map +1 -1
  138. package/dist/patterns.d.ts.map +1 -1
  139. package/dist/patterns.js +19 -40
  140. package/dist/patterns.js.map +1 -1
  141. package/dist/specialization/type-aliases.test.js +8 -0
  142. package/dist/specialization/type-aliases.test.js.map +1 -1
  143. package/dist/statements/classes/members/methods.d.ts.map +1 -1
  144. package/dist/statements/classes/members/methods.js +5 -22
  145. package/dist/statements/classes/members/methods.js.map +1 -1
  146. package/dist/statements/classes/parameters.d.ts.map +1 -1
  147. package/dist/statements/classes/parameters.js +2 -1
  148. package/dist/statements/classes/parameters.js.map +1 -1
  149. package/dist/statements/classes/properties.d.ts.map +1 -1
  150. package/dist/statements/classes/properties.js +5 -16
  151. package/dist/statements/classes/properties.js.map +1 -1
  152. package/dist/statements/control/conditionals/guard-analysis.d.ts +44 -1
  153. package/dist/statements/control/conditionals/guard-analysis.d.ts.map +1 -1
  154. package/dist/statements/control/conditionals/guard-analysis.js +301 -125
  155. package/dist/statements/control/conditionals/guard-analysis.js.map +1 -1
  156. package/dist/statements/control/conditionals/if-emitter.d.ts.map +1 -1
  157. package/dist/statements/control/conditionals/if-emitter.js +182 -53
  158. package/dist/statements/control/conditionals/if-emitter.js.map +1 -1
  159. package/dist/statements/control/exceptions.d.ts.map +1 -1
  160. package/dist/statements/control/exceptions.js +2 -4
  161. package/dist/statements/control/exceptions.js.map +1 -1
  162. package/dist/statements/control/loops.d.ts.map +1 -1
  163. package/dist/statements/control/loops.js +3 -5
  164. package/dist/statements/control/loops.js.map +1 -1
  165. package/dist/statements/declarations/classes.d.ts.map +1 -1
  166. package/dist/statements/declarations/classes.js +2 -4
  167. package/dist/statements/declarations/classes.js.map +1 -1
  168. package/dist/statements/declarations/functions.d.ts.map +1 -1
  169. package/dist/statements/declarations/functions.js +38 -79
  170. package/dist/statements/declarations/functions.js.map +1 -1
  171. package/dist/statements/declarations/interfaces-mutable-storage.test.js +10 -2
  172. package/dist/statements/declarations/interfaces-mutable-storage.test.js.map +1 -1
  173. package/dist/statements/declarations/interfaces.d.ts.map +1 -1
  174. package/dist/statements/declarations/interfaces.js +4 -12
  175. package/dist/statements/declarations/interfaces.js.map +1 -1
  176. package/dist/statements/declarations/type-aliases.d.ts.map +1 -1
  177. package/dist/statements/declarations/type-aliases.js +5 -9
  178. package/dist/statements/declarations/type-aliases.js.map +1 -1
  179. package/dist/statements/declarations/variables.d.ts.map +1 -1
  180. package/dist/statements/declarations/variables.js +55 -51
  181. package/dist/statements/declarations/variables.js.map +1 -1
  182. package/dist/statements/index.test.js +1026 -0
  183. package/dist/statements/index.test.js.map +1 -1
  184. package/dist/types/dictionaries.d.ts.map +1 -1
  185. package/dist/types/dictionaries.js +5 -5
  186. package/dist/types/dictionaries.js.map +1 -1
  187. package/dist/types/functions.d.ts.map +1 -1
  188. package/dist/types/functions.js +5 -25
  189. package/dist/types/functions.js.map +1 -1
  190. package/dist/types/primitives.d.ts.map +1 -1
  191. package/dist/types/primitives.js.map +1 -1
  192. package/dist/types/references.d.ts.map +1 -1
  193. package/dist/types/references.js +65 -128
  194. package/dist/types/references.js.map +1 -1
  195. package/dist/types/references.test.js +170 -46
  196. package/dist/types/references.test.js.map +1 -1
  197. package/dist/types/tuples.d.ts.map +1 -1
  198. package/dist/types/tuples.js +7 -17
  199. package/dist/types/tuples.js.map +1 -1
  200. package/dist/types/unions.d.ts.map +1 -1
  201. package/dist/types/unions.js +2 -5
  202. package/dist/types/unions.js.map +1 -1
  203. package/package.json +2 -2
  204. package/dist/expressions/parentheses.d.ts +0 -4
  205. package/dist/expressions/parentheses.d.ts.map +0 -1
  206. package/dist/expressions/parentheses.js +0 -91
  207. package/dist/expressions/parentheses.js.map +0 -1
@@ -7,9 +7,40 @@
7
7
  * - Binary ops: int op int = int, double op anything = double (C# semantics)
8
8
  */
9
9
  import { emitExpressionAst } from "../../expression-emitter.js";
10
- import { resolveTypeAlias, stripNullish, getAllPropertySignatures, isDefinitelyValueType, } from "../../core/semantic/type-resolution.js";
11
- import { isCharTyped, isStringTyped, getSingleCharLiteral, escapeCharLiteral, isNullishLiteral, } from "./helpers.js";
10
+ import { resolveTypeAlias, stripNullish, hasDeterministicPropertyMembership, isDefinitelyValueType, } from "../../core/semantic/type-resolution.js";
11
+ import { isCharTyped, isStringTyped, getSingleCharLiteral, isNullishLiteral, } from "./helpers.js";
12
+ import { booleanLiteral, charLiteral, decimalIntegerLiteral, identifierExpression, identifierType, nullLiteral, } from "../../core/format/backend-ast/builders.js";
12
13
  import { extractCalleeNameFromAst } from "../../core/format/backend-ast/utils.js";
14
+ const getNarrowingTargetKey = (expr) => {
15
+ switch (expr.kind) {
16
+ case "identifier":
17
+ return expr.name;
18
+ case "memberAccess": {
19
+ if (expr.isComputed || typeof expr.property !== "string") {
20
+ return undefined;
21
+ }
22
+ const parentKey = getNarrowingTargetKey(expr.object);
23
+ return parentKey ? `${parentKey}.${expr.property}` : undefined;
24
+ }
25
+ default:
26
+ return undefined;
27
+ }
28
+ };
29
+ const buildNullishComparisonContext = (expr, context) => {
30
+ const targetKey = getNarrowingTargetKey(expr);
31
+ if (!targetKey)
32
+ return context;
33
+ const narrowed = context.narrowedBindings?.get(targetKey);
34
+ if (!narrowed || narrowed.kind !== "expr") {
35
+ return context;
36
+ }
37
+ const next = new Map(context.narrowedBindings);
38
+ next.delete(targetKey);
39
+ return {
40
+ ...context,
41
+ narrowedBindings: next,
42
+ };
43
+ };
13
44
  /**
14
45
  * Emit a binary operator expression as CSharpExpressionAst
15
46
  *
@@ -55,67 +86,26 @@ export const emitBinary = (expr, context, _expectedType) => {
55
86
  if (resolvedRhs.kind === "unionType") {
56
87
  const propName = expr.left.value;
57
88
  const matchingMembers = [];
89
+ const unresolvedMembers = [];
58
90
  for (let i = 0; i < resolvedRhs.types.length; i++) {
59
91
  const member = resolvedRhs.types[i];
60
- if (!member || member.kind !== "referenceType")
61
- continue;
62
- const localInfo = rhsCtx.localTypes?.get(member.name);
63
- if (localInfo?.kind === "interface") {
64
- const props = getAllPropertySignatures(member, rhsCtx);
65
- if (props?.some((p) => p.name === propName)) {
66
- matchingMembers.push(i + 1);
67
- }
92
+ if (!member)
68
93
  continue;
69
- }
70
- if (localInfo?.kind === "class") {
71
- if (localInfo.members.some((m) => (m.kind === "propertyDeclaration" ||
72
- m.kind === "methodDeclaration") &&
73
- m.name === propName)) {
74
- matchingMembers.push(i + 1);
75
- }
94
+ const hasMember = hasDeterministicPropertyMembership(member, propName, rhsCtx);
95
+ if (hasMember === true) {
96
+ matchingMembers.push(i + 1);
76
97
  continue;
77
98
  }
78
- // Cross-module union members: consult the batch type-member index.
79
- const candidates = [];
80
- const stripGlobalPrefix = (name) => name.startsWith("global::") ? name.slice("global::".length) : name;
81
- if (member.resolvedClrType) {
82
- candidates.push(stripGlobalPrefix(member.resolvedClrType));
83
- }
84
- if (member.name.includes(".")) {
85
- candidates.push(member.name);
86
- }
87
- if (!member.name.includes(".") && rhsCtx.options.typeMemberIndex) {
88
- const matches = [];
89
- for (const fqn of rhsCtx.options.typeMemberIndex.keys()) {
90
- if (fqn.endsWith(`.${member.name}`) ||
91
- fqn.endsWith(`.${member.name}__Alias`)) {
92
- matches.push(fqn);
93
- }
94
- }
95
- if (matches.length === 1) {
96
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
97
- candidates.push(matches[0]);
98
- }
99
- else if (matches.length > 1) {
100
- const list = matches.sort().join(", ");
101
- throw new Error(`ICE: Ambiguous union member type '${member.name}' for \`in\` narrowing. Candidates: ${list}`);
102
- }
103
- }
104
- // Single-file fallback (no batch indexes): assume same namespace.
105
- if (rhsCtx.moduleNamespace) {
106
- candidates.push(`${rhsCtx.moduleNamespace}.${member.name}`);
107
- candidates.push(`${rhsCtx.moduleNamespace}.${member.name}__Alias`);
108
- }
109
- const hasMember = candidates.some((fqn) => {
110
- const perType = rhsCtx.options.typeMemberIndex?.get(fqn);
111
- return perType?.has(propName) ?? false;
112
- });
113
- if (hasMember) {
114
- matchingMembers.push(i + 1);
99
+ if (hasMember === undefined) {
100
+ unresolvedMembers.push(JSON.stringify(member));
115
101
  }
116
102
  }
103
+ if (unresolvedMembers.length > 0) {
104
+ throw new Error("ICE: Unable to deterministically resolve `in`-operator membership for one or more union members. " +
105
+ `Property: '${propName}'. Members: ${unresolvedMembers.join(", ")}`);
106
+ }
117
107
  if (matchingMembers.length === 0) {
118
- return [{ kind: "literalExpression", text: "false" }, rhsCtx];
108
+ return [booleanLiteral(false), rhsCtx];
119
109
  }
120
110
  // Build IsN() call ASTs and chain with ||
121
111
  const checkAsts = matchingMembers.map((n) => ({
@@ -160,6 +150,10 @@ export const emitBinary = (expr, context, _expectedType) => {
160
150
  };
161
151
  return [containsKeyAst, keyCtx];
162
152
  }
153
+ const deterministicMembership = hasDeterministicPropertyMembership(rhsType, expr.left.value, rhsCtx);
154
+ if (deterministicMembership !== undefined) {
155
+ return [booleanLiteral(deterministicMembership), rhsCtx];
156
+ }
163
157
  throw new Error("ICE: Unsupported `in` operator. Only union shape guards and Dictionary<string, T> membership are supported.");
164
158
  }
165
159
  // Handle instanceof operator specially
@@ -173,7 +167,7 @@ export const emitBinary = (expr, context, _expectedType) => {
173
167
  expression: leftAst,
174
168
  pattern: {
175
169
  kind: "typePattern",
176
- type: { kind: "identifierType", name: rightText },
170
+ type: identifierType(rightText),
177
171
  },
178
172
  };
179
173
  return [isExpr, rightContext];
@@ -196,10 +190,7 @@ export const emitBinary = (expr, context, _expectedType) => {
196
190
  // Case 1: left is char-typed, right is single-char literal → emit right as char
197
191
  if (leftIsChar && rightSingleChar !== undefined) {
198
192
  const [leftAst, leftContext] = emitExpressionAst(expr.left, context);
199
- const charLiteralAst = {
200
- kind: "literalExpression",
201
- text: `'${escapeCharLiteral(rightSingleChar)}'`,
202
- };
193
+ const charLiteralAst = charLiteral(rightSingleChar);
203
194
  return [
204
195
  {
205
196
  kind: "binaryExpression",
@@ -213,10 +204,7 @@ export const emitBinary = (expr, context, _expectedType) => {
213
204
  // Case 2: right is char-typed, left is single-char literal → emit left as char
214
205
  if (rightIsChar && leftSingleChar !== undefined) {
215
206
  const [rightAst, rightContext] = emitExpressionAst(expr.right, context);
216
- const charLiteralAst = {
217
- kind: "literalExpression",
218
- text: `'${escapeCharLiteral(leftSingleChar)}'`,
219
- };
207
+ const charLiteralAst = charLiteral(leftSingleChar);
220
208
  return [
221
209
  {
222
210
  kind: "binaryExpression",
@@ -239,8 +227,7 @@ export const emitBinary = (expr, context, _expectedType) => {
239
227
  const compareAst = {
240
228
  kind: "invocationExpression",
241
229
  expression: {
242
- kind: "identifierExpression",
243
- identifier: "global::System.String.CompareOrdinal",
230
+ ...identifierExpression("global::System.String.CompareOrdinal"),
244
231
  },
245
232
  arguments: [leftAst, rightAst],
246
233
  };
@@ -249,7 +236,7 @@ export const emitBinary = (expr, context, _expectedType) => {
249
236
  kind: "binaryExpression",
250
237
  operatorToken: op,
251
238
  left: compareAst,
252
- right: { kind: "literalExpression", text: "0" },
239
+ right: decimalIntegerLiteral(0),
253
240
  },
254
241
  rightContext,
255
242
  ];
@@ -274,7 +261,9 @@ export const emitBinary = (expr, context, _expectedType) => {
274
261
  (leftIsNullish || rightIsNullish);
275
262
  if (isNullishComparison) {
276
263
  // One side is null/undefined literal, emit the other side as a C# null check.
277
- // Clear narrowedBindings so we emit the raw identifier (not .Value)
264
+ // Suppress only direct nullable unwrapping for the comparison target
265
+ // (e.g. `id.Value == null` should stay `id == null`) while preserving
266
+ // unrelated narrowing such as renamed union members.
278
267
  const nonNullishExpr = leftIsNullish ? expr.right : expr.left;
279
268
  const nullishExpr = leftIsNullish ? expr.left : expr.right;
280
269
  const isUndefinedLiteral = (nullishExpr.kind === "literal" && nullishExpr.value === undefined) ||
@@ -290,7 +279,7 @@ export const emitBinary = (expr, context, _expectedType) => {
290
279
  typeof nonNullishExpr.property !== "string" &&
291
280
  (nonNullishExpr.accessKind === "dictionary" ||
292
281
  nonNullishExpr.object.inferredType?.kind === "dictionaryType")) {
293
- const nonNullishContext = { ...context, narrowedBindings: undefined };
282
+ const nonNullishContext = buildNullishComparisonContext(nonNullishExpr, context);
294
283
  const [dictAst, dictContext] = emitExpressionAst(nonNullishExpr.object, nonNullishContext);
295
284
  const [keyAst, keyContext] = emitExpressionAst(nonNullishExpr.property, dictContext);
296
285
  const containsAst = {
@@ -314,7 +303,7 @@ export const emitBinary = (expr, context, _expectedType) => {
314
303
  : containsAst;
315
304
  return [resultAst, keyContext];
316
305
  }
317
- const nonNullishContext = { ...context, narrowedBindings: undefined };
306
+ const nonNullishContext = buildNullishComparisonContext(nonNullishExpr, context);
318
307
  const [nonNullishAst, resultContext] = emitExpressionAst(nonNullishExpr, nonNullishContext);
319
308
  const inferred = nonNullishExpr.inferredType;
320
309
  const base = inferred ? stripNullish(inferred) : undefined;
@@ -341,16 +330,13 @@ export const emitBinary = (expr, context, _expectedType) => {
341
330
  (typeParamConstraint === "unconstrained" ||
342
331
  typeParamConstraint === "struct");
343
332
  const needsObjectCastForValueType = isDefiniteNonUnionValueType;
344
- const nullLiteral = {
345
- kind: "literalExpression",
346
- text: "null",
347
- };
333
+ const nullLiteralAst = nullLiteral();
348
334
  const nullOp = op === "==" ? "==" : "!=";
349
335
  if (needsObjectCastForTypeParam || needsObjectCastForValueType) {
350
336
  // ((global::System.Object)(expr)) == null
351
337
  const castExpr = {
352
338
  kind: "castExpression",
353
- type: { kind: "identifierType", name: "global::System.Object" },
339
+ type: identifierType("global::System.Object"),
354
340
  expression: {
355
341
  kind: "parenthesizedExpression",
356
342
  expression: nonNullishAst,
@@ -364,7 +350,7 @@ export const emitBinary = (expr, context, _expectedType) => {
364
350
  kind: "parenthesizedExpression",
365
351
  expression: castExpr,
366
352
  },
367
- right: nullLiteral,
353
+ right: nullLiteralAst,
368
354
  },
369
355
  resultContext,
370
356
  ];
@@ -374,11 +360,50 @@ export const emitBinary = (expr, context, _expectedType) => {
374
360
  kind: "binaryExpression",
375
361
  operatorToken: nullOp,
376
362
  left: nonNullishAst,
377
- right: nullLiteral,
363
+ right: nullLiteralAst,
378
364
  },
379
365
  resultContext,
380
366
  ];
381
367
  }
368
+ const leftResolved = expr.left.inferredType
369
+ ? resolveTypeAlias(stripNullish(expr.left.inferredType), context)
370
+ : undefined;
371
+ const rightResolved = expr.right.inferredType
372
+ ? resolveTypeAlias(stripNullish(expr.right.inferredType), context)
373
+ : undefined;
374
+ const needsRuntimeEquality = (op === "==" || op === "!=") &&
375
+ (leftResolved?.kind === "unknownType" ||
376
+ rightResolved?.kind === "unknownType" ||
377
+ (leftResolved?.kind === "referenceType" &&
378
+ leftResolved.name === "object") ||
379
+ (rightResolved?.kind === "referenceType" &&
380
+ rightResolved.name === "object"));
381
+ if (needsRuntimeEquality) {
382
+ const [leftAst, leftContext] = emitExpressionAst(expr.left, context);
383
+ const [rightAst, rightContext] = emitExpressionAst(expr.right, leftContext);
384
+ const equalsAst = {
385
+ kind: "invocationExpression",
386
+ expression: {
387
+ kind: "memberAccessExpression",
388
+ expression: {
389
+ ...identifierExpression("global::System.Object"),
390
+ },
391
+ memberName: "Equals",
392
+ },
393
+ arguments: [leftAst, rightAst],
394
+ };
395
+ if (op === "==") {
396
+ return [equalsAst, rightContext];
397
+ }
398
+ return [
399
+ {
400
+ kind: "prefixUnaryExpression",
401
+ operatorToken: "!",
402
+ operand: equalsAst,
403
+ },
404
+ rightContext,
405
+ ];
406
+ }
382
407
  // Standard emission path
383
408
  // Emit operands without contextual type propagation
384
409
  // Literals will emit using their raw lexeme (42 vs 42.0)
@@ -1 +1 @@
1
- {"version":3,"file":"binary-emitter.js","sourceRoot":"","sources":["../../../src/expressions/operators/binary-emitter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"binary-emitter.js","sourceRoot":"","sources":["../../../src/expressions/operators/binary-emitter.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"logical-emitter.d.ts","sourceRoot":"","sources":["../../../src/expressions/operators/logical-emitter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIhD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AA0BlF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,WAAW,GACtB,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC,EAChD,SAAS,cAAc,KACtB,CAAC,mBAAmB,EAAE,cAAc,CAoCtC,CAAC"}
1
+ {"version":3,"file":"logical-emitter.d.ts","sourceRoot":"","sources":["../../../src/expressions/operators/logical-emitter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIhD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAwBlF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,WAAW,GACtB,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC,EAChD,SAAS,cAAc,KACtB,CAAC,mBAAmB,EAAE,cAAc,CAoCtC,CAAC"}
@@ -11,6 +11,7 @@ import { isBooleanType } from "./helpers.js";
11
11
  const containsConditionalAccess = (ast) => {
12
12
  switch (ast.kind) {
13
13
  case "conditionalMemberAccessExpression":
14
+ case "conditionalElementAccessExpression":
14
15
  return true;
15
16
  case "memberAccessExpression":
16
17
  return containsConditionalAccess(ast.expression);
@@ -20,9 +21,6 @@ const containsConditionalAccess = (ast) => {
20
21
  return containsConditionalAccess(ast.expression);
21
22
  case "parenthesizedExpression":
22
23
  return containsConditionalAccess(ast.expression);
23
- case "identifierExpression":
24
- // Pre-rendered text may contain ?. or ?[ patterns
25
- return ast.identifier.includes("?.") || ast.identifier.includes("?[");
26
24
  default:
27
25
  return false;
28
26
  }
@@ -1 +1 @@
1
- {"version":3,"file":"logical-emitter.js","sourceRoot":"","sources":["../../../src/expressions/operators/logical-emitter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C;;;GAGG;AACH,MAAM,yBAAyB,GAAG,CAAC,GAAwB,EAAW,EAAE;IACtE,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,mCAAmC;YACtC,OAAO,IAAI,CAAC;QACd,KAAK,wBAAwB;YAC3B,OAAO,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACnD,KAAK,sBAAsB;YACzB,OAAO,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACnD,KAAK,yBAAyB;YAC5B,OAAO,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACnD,KAAK,yBAAyB;YAC5B,OAAO,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACnD,KAAK,sBAAsB;YACzB,kDAAkD;YAClD,OAAO,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxE;YACE,OAAO,KAAK,CAAC;IACjB,CAAC;AACH,CAAC,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,IAAgD,EAChD,OAAuB,EACgB,EAAE;IACzC,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAErE,qFAAqF;IACrF,MAAM,QAAQ,GACZ,IAAI,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;QAC9D,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;IAEpB,kFAAkF;IAClF,uDAAuD;IACvD,IACE,QAAQ,KAAK,IAAI;QACjB,IAAI,CAAC,IAAI,CAAC,YAAY;QACtB,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,KAAK,WAAW;QAC3C,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,EAC7C,CAAC;QACD,qFAAqF;QACrF,4EAA4E;QAC5E,uEAAuE;QACvE,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC;YACxC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAE5E,OAAO;QACL;YACE,IAAI,EAAE,kBAAkB;YACxB,aAAa,EAAE,QAAQ;YACvB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,QAAQ;SAChB;QACD,YAAY;KACb,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"logical-emitter.js","sourceRoot":"","sources":["../../../src/expressions/operators/logical-emitter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C;;;GAGG;AACH,MAAM,yBAAyB,GAAG,CAAC,GAAwB,EAAW,EAAE;IACtE,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,mCAAmC,CAAC;QACzC,KAAK,oCAAoC;YACvC,OAAO,IAAI,CAAC;QACd,KAAK,wBAAwB;YAC3B,OAAO,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACnD,KAAK,sBAAsB;YACzB,OAAO,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACnD,KAAK,yBAAyB;YAC5B,OAAO,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACnD,KAAK,yBAAyB;YAC5B,OAAO,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACnD;YACE,OAAO,KAAK,CAAC;IACjB,CAAC;AACH,CAAC,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,IAAgD,EAChD,OAAuB,EACgB,EAAE;IACzC,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAErE,qFAAqF;IACrF,MAAM,QAAQ,GACZ,IAAI,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;QAC9D,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;IAEpB,kFAAkF;IAClF,uDAAuD;IACvD,IACE,QAAQ,KAAK,IAAI;QACjB,IAAI,CAAC,IAAI,CAAC,YAAY;QACtB,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,KAAK,WAAW;QAC3C,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,EAC7C,CAAC;QACD,qFAAqF;QACrF,4EAA4E;QAC5E,uEAAuE;QACvE,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC;YACxC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAE5E,OAAO;QACL;YACE,IAAI,EAAE,kBAAkB;YACxB,aAAa,EAAE,QAAQ;YACvB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,QAAQ;SAChB;QACD,YAAY;KACb,CAAC;AACJ,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"unary-emitter.d.ts","sourceRoot":"","sources":["../../../src/expressions/operators/unary-emitter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAKhD,OAAO,KAAK,EACV,mBAAmB,EAGpB,MAAM,wCAAwC,CAAC;AAEhD;;;;;;;;;GASG;AACH,eAAO,MAAM,SAAS,GACpB,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,EAC9C,SAAS,cAAc,EACvB,eAAe,MAAM,KACpB,CAAC,mBAAmB,EAAE,cAAc,CA+NtC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,GACrB,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,EAC/C,SAAS,cAAc,KACtB,CAAC,mBAAmB,EAAE,cAAc,CAsCtC,CAAC"}
1
+ {"version":3,"file":"unary-emitter.d.ts","sourceRoot":"","sources":["../../../src/expressions/operators/unary-emitter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAShD,OAAO,KAAK,EACV,mBAAmB,EAGpB,MAAM,wCAAwC,CAAC;AAEhD;;;;;;;;;GASG;AACH,eAAO,MAAM,SAAS,GACpB,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,EAC9C,SAAS,cAAc,EACvB,eAAe,MAAM,KACpB,CAAC,mBAAmB,EAAE,cAAc,CAwNtC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,GACrB,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,EAC/C,SAAS,cAAc,KACtB,CAAC,mBAAmB,EAAE,cAAc,CAsCtC,CAAC"}
@@ -8,6 +8,7 @@
8
8
  import { emitExpressionAst } from "../../expression-emitter.js";
9
9
  import { emitTypeAst } from "../../type-emitter.js";
10
10
  import { emitBooleanConditionAst } from "../../core/semantic/boolean-context.js";
11
+ import { identifierExpression, identifierType, } from "../../core/format/backend-ast/builders.js";
11
12
  import { extractCalleeNameFromAst } from "../../core/format/backend-ast/utils.js";
12
13
  /**
13
14
  * Emit a unary operator expression as CSharpExpressionAst (-, +, !, ~, typeof, void, delete)
@@ -57,15 +58,10 @@ export const emitUnary = (expr, context, expectedType) => {
57
58
  keyContext,
58
59
  ];
59
60
  }
60
- const [targetAst, newContext] = emitExpressionAst(target, context);
61
+ const [targetAst] = emitExpressionAst(target, context);
61
62
  const targetText = extractCalleeNameFromAst(targetAst);
62
- return [
63
- {
64
- kind: "identifierExpression",
65
- identifier: `/* delete ${targetText} */`,
66
- },
67
- newContext,
68
- ];
63
+ throw new Error(`ICE: Unsupported delete target reached emitter: delete ${targetText}. ` +
64
+ `Only dictionary/index-signature deletes should survive validation.`);
69
65
  }
70
66
  const [operandAst, newContext] = emitExpressionAst(expr.expression, context);
71
67
  if (expr.operator === "typeof") {
@@ -74,8 +70,7 @@ export const emitUnary = (expr, context, expectedType) => {
74
70
  {
75
71
  kind: "invocationExpression",
76
72
  expression: {
77
- kind: "identifierExpression",
78
- identifier: "global::Tsonic.Runtime.Operators.@typeof",
73
+ ...identifierExpression("global::Tsonic.Runtime.Operators.@typeof"),
79
74
  },
80
75
  arguments: [operandAst],
81
76
  },
@@ -152,11 +147,9 @@ export const emitUnary = (expr, context, expectedType) => {
152
147
  { kind: "returnStatement", expression: defaultExpr },
153
148
  ],
154
149
  };
155
- const funcTypeAst = {
156
- kind: "identifierType",
157
- name: "global::System.Func",
158
- typeArguments: [funcReturnTypeAst],
159
- };
150
+ const funcTypeAst = identifierType("global::System.Func", [
151
+ funcReturnTypeAst,
152
+ ]);
160
153
  const lambdaAst = {
161
154
  kind: "lambdaExpression",
162
155
  isAsync,
@@ -184,11 +177,7 @@ export const emitUnary = (expr, context, expectedType) => {
184
177
  if (!currentContext.isAsync) {
185
178
  throw new Error("ICE: `void await <expr>` reached emitter in a non-async context.");
186
179
  }
187
- const taskTypeAst = {
188
- kind: "identifierType",
189
- name: "global::System.Threading.Tasks.Task",
190
- typeArguments: [returnTypeAst],
191
- };
180
+ const taskTypeAst = identifierType("global::System.Threading.Tasks.Task", [returnTypeAst]);
192
181
  const iifeAst = buildIife(true, taskTypeAst);
193
182
  return [{ kind: "awaitExpression", expression: iifeAst }, currentContext];
194
183
  }
@@ -1 +1 @@
1
- {"version":3,"file":"unary-emitter.js","sourceRoot":"","sources":["../../../src/expressions/operators/unary-emitter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"unary-emitter.js","sourceRoot":"","sources":["../../../src/expressions/operators/unary-emitter.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"other.d.ts","sourceRoot":"","sources":["../../src/expressions/other.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAU,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,KAAK,EACV,mBAAmB,EAEpB,MAAM,qCAAqC,CAAC;AA2D7C;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,GAC9B,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,iBAAiB,CAAA;CAAE,CAAC,EACxD,SAAS,cAAc,KACtB,CAAC,mBAAmB,EAAE,cAAc,CA+BtC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,GACrB,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,EAC/C,SAAS,cAAc,KACtB,CAAC,mBAAmB,EAAE,cAAc,CAOtC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,GACpB,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,EAC9C,SAAS,cAAc,KACtB,CAAC,mBAAmB,EAAE,cAAc,CAGtC,CAAC"}
1
+ {"version":3,"file":"other.d.ts","sourceRoot":"","sources":["../../src/expressions/other.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAoB,YAAY,EAAU,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAO7C,OAAO,KAAK,EACV,mBAAmB,EAGpB,MAAM,qCAAqC,CAAC;AAoG7C;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,GAC9B,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,iBAAiB,CAAA;CAAE,CAAC,EACxD,SAAS,cAAc,KACtB,CAAC,mBAAmB,EAAE,cAAc,CA+BtC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,GACrB,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,EAC/C,SAAS,cAAc,KACtB,CAAC,mBAAmB,EAAE,cAAc,CAOtC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,GACpB,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,EAC9C,SAAS,cAAc,KACtB,CAAC,mBAAmB,EAAE,cAAc,CAgCtC,CAAC"}
@@ -1,7 +1,10 @@
1
1
  /**
2
2
  * Miscellaneous expression emitters (template literals, spread, await)
3
3
  */
4
+ import { getAwaitedIrType } from "@tsonic/frontend";
4
5
  import { emitExpressionAst } from "../expression-emitter.js";
6
+ import { emitTypeAst } from "../types/emitter.js";
7
+ import { identifierExpression, stringLiteral, } from "../core/format/backend-ast/builders.js";
5
8
  const typeMayBeNullish = (type) => {
6
9
  if (!type)
7
10
  return false;
@@ -42,13 +45,42 @@ const buildNullishSafeExpr = (exprAst) => ({
42
45
  left: {
43
46
  kind: "invocationExpression",
44
47
  expression: {
45
- kind: "identifierExpression",
46
- identifier: "global::System.Convert.ToString",
48
+ ...identifierExpression("global::System.Convert.ToString"),
47
49
  },
48
50
  arguments: [exprAst],
49
51
  },
50
- right: { kind: "literalExpression", text: '"undefined"' },
52
+ right: stringLiteral("undefined"),
51
53
  });
54
+ const classifyAwaitability = (type) => {
55
+ if (!type)
56
+ return "awaitable";
57
+ if (getAwaitedIrType(type))
58
+ return "awaitable";
59
+ if (type.kind !== "unionType")
60
+ return "nonAwaitable";
61
+ const memberKinds = new Set(type.types.map((member) => classifyAwaitability(member)));
62
+ if (memberKinds.size === 1) {
63
+ const [onlyKind] = [...memberKinds];
64
+ return onlyKind ?? "nonAwaitable";
65
+ }
66
+ return "mixed";
67
+ };
68
+ const buildTaskFromResultExpression = (exprAst, resultTypeAst) => ({
69
+ kind: "invocationExpression",
70
+ expression: {
71
+ kind: "memberAccessExpression",
72
+ expression: {
73
+ ...identifierExpression("global::System.Threading.Tasks.Task"),
74
+ },
75
+ memberName: "FromResult",
76
+ },
77
+ typeArguments: resultTypeAst ? [resultTypeAst] : undefined,
78
+ arguments: [exprAst],
79
+ });
80
+ const requiresExplicitTaskFromResultType = (exprAst) => {
81
+ return (exprAst.kind === "nullLiteralExpression" ||
82
+ exprAst.kind === "defaultExpression");
83
+ };
52
84
  /**
53
85
  * Emit a template literal as CSharpExpressionAst (interpolatedStringExpression)
54
86
  *
@@ -102,6 +134,27 @@ export const emitSpread = (expr, context) => {
102
134
  */
103
135
  export const emitAwait = (expr, context) => {
104
136
  const [exprAst, newContext] = emitExpressionAst(expr.expression, context);
105
- return [{ kind: "awaitExpression", expression: exprAst }, newContext];
137
+ const awaitability = classifyAwaitability(expr.expression.inferredType);
138
+ if (awaitability === "awaitable") {
139
+ return [{ kind: "awaitExpression", expression: exprAst }, newContext];
140
+ }
141
+ if (awaitability === "mixed") {
142
+ throw new Error("ICE: Mixed awaitable/non-awaitable union types in `await` are not yet supported deterministically.");
143
+ }
144
+ const resultType = expr.inferredType ?? expr.expression.inferredType;
145
+ if (!resultType || resultType.kind === "voidType") {
146
+ throw new Error("ICE: Non-awaitable `await` requires a value result type for deterministic lowering.");
147
+ }
148
+ const needsExplicitResultType = requiresExplicitTaskFromResultType(exprAst);
149
+ const [resultTypeAst, resultTypeContext] = needsExplicitResultType
150
+ ? emitTypeAst(resultType, newContext)
151
+ : [undefined, newContext];
152
+ return [
153
+ {
154
+ kind: "awaitExpression",
155
+ expression: buildTaskFromResultExpression(exprAst, resultTypeAst),
156
+ },
157
+ resultTypeContext,
158
+ ];
106
159
  };
107
160
  //# sourceMappingURL=other.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"other.js","sourceRoot":"","sources":["../../src/expressions/other.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"other.js","sourceRoot":"","sources":["../../src/expressions/other.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"generator-exchange.d.ts","sourceRoot":"","sources":["../src/generator-exchange.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAO5C,OAAO,KAAK,EACV,wBAAwB,EAGzB,MAAM,oCAAoC,CAAC;AAiB5C;;GAEG;AACH,eAAO,MAAM,wBAAwB,GACnC,MAAM,qBAAqB,EAC3B,SAAS,cAAc,KACtB,CAAC,wBAAwB,EAAE,cAAc,CAiE3C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,0BAA0B,GACrC,QAAQ,QAAQ,EAChB,SAAS,cAAc,KACtB,CAAC,SAAS,wBAAwB,EAAE,EAAE,cAAc,CA+BtD,CAAC"}
1
+ {"version":3,"file":"generator-exchange.d.ts","sourceRoot":"","sources":["../src/generator-exchange.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAQ5C,OAAO,KAAK,EACV,wBAAwB,EAGzB,MAAM,oCAAoC,CAAC;AAiB5C;;GAEG;AACH,eAAO,MAAM,wBAAwB,GACnC,MAAM,qBAAqB,EAC3B,SAAS,cAAc,KACtB,CAAC,wBAAwB,EAAE,cAAc,CAiE3C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,0BAA0B,GACrC,QAAQ,QAAQ,EAChB,SAAS,cAAc,KACtB,CAAC,SAAS,wBAAwB,EAAE,EAAE,cAAc,CA+BtD,CAAC"}
@@ -5,6 +5,7 @@
5
5
  * Exchange and wrapper classes are built as typed CSharpTypeDeclarationAst.
6
6
  */
7
7
  import { emitTypeAst } from "./type-emitter.js";
8
+ import { identifierType } from "./core/format/backend-ast/builders.js";
8
9
  import { needsBidirectionalSupport, generateWrapperClass, } from "./generator-wrapper.js";
9
10
  import { getCSharpName } from "./naming-policy.js";
10
11
  /**
@@ -27,8 +28,8 @@ export const generateExchangeClassAst = (func, context) => {
27
28
  const csharpBaseName = getCSharpName(func.name, "methods", context);
28
29
  const exchangeName = `${csharpBaseName}_exchange`;
29
30
  // Determine output/input types from return type
30
- let outputTypeAst = { kind: "identifierType", name: "object" };
31
- let inputTypeAst = { kind: "identifierType", name: "object" };
31
+ let outputTypeAst = identifierType("object");
32
+ let inputTypeAst = identifierType("object");
32
33
  if (func.returnType && func.returnType.kind === "referenceType") {
33
34
  const typeRef = func.returnType;
34
35
  if (typeRef.typeArguments && typeRef.typeArguments.length > 0) {