@tsonic/emitter 0.0.6 → 0.0.12

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 (168) hide show
  1. package/dist/.tsbuildinfo +1 -1
  2. package/dist/array.test.js +6 -6
  3. package/dist/array.test.js.map +1 -1
  4. package/dist/core/imports.test.js +6 -3
  5. package/dist/core/imports.test.js.map +1 -1
  6. package/dist/core/index.d.ts +1 -0
  7. package/dist/core/index.d.ts.map +1 -1
  8. package/dist/core/index.js +1 -0
  9. package/dist/core/index.js.map +1 -1
  10. package/dist/core/type-compatibility.d.ts +26 -0
  11. package/dist/core/type-compatibility.d.ts.map +1 -0
  12. package/dist/core/type-compatibility.js +109 -0
  13. package/dist/core/type-compatibility.js.map +1 -0
  14. package/dist/core/type-resolution.d.ts +81 -1
  15. package/dist/core/type-resolution.d.ts.map +1 -1
  16. package/dist/core/type-resolution.js +258 -0
  17. package/dist/core/type-resolution.js.map +1 -1
  18. package/dist/core/type-resolution.test.js +110 -1
  19. package/dist/core/type-resolution.test.js.map +1 -1
  20. package/dist/emitter-types/context.d.ts.map +1 -1
  21. package/dist/emitter-types/context.js +21 -1
  22. package/dist/emitter-types/context.js.map +1 -1
  23. package/dist/emitter-types/core.d.ts +26 -0
  24. package/dist/emitter-types/core.d.ts.map +1 -1
  25. package/dist/emitter-types/identifiers.d.ts.map +1 -1
  26. package/dist/emitter-types/identifiers.js +4 -43
  27. package/dist/emitter-types/identifiers.js.map +1 -1
  28. package/dist/emitter-types/index.d.ts +1 -1
  29. package/dist/emitter-types/index.d.ts.map +1 -1
  30. package/dist/emitter-types/index.js.map +1 -1
  31. package/dist/expression-emitter.d.ts.map +1 -1
  32. package/dist/expression-emitter.js +48 -0
  33. package/dist/expression-emitter.js.map +1 -1
  34. package/dist/expressions/access.d.ts.map +1 -1
  35. package/dist/expressions/access.js +97 -13
  36. package/dist/expressions/access.js.map +1 -1
  37. package/dist/expressions/calls.d.ts.map +1 -1
  38. package/dist/expressions/calls.js +5 -1
  39. package/dist/expressions/calls.js.map +1 -1
  40. package/dist/expressions/collections.d.ts +3 -2
  41. package/dist/expressions/collections.d.ts.map +1 -1
  42. package/dist/expressions/collections.js +214 -24
  43. package/dist/expressions/collections.js.map +1 -1
  44. package/dist/expressions/functions.d.ts +2 -2
  45. package/dist/expressions/functions.d.ts.map +1 -1
  46. package/dist/expressions/functions.js +81 -38
  47. package/dist/expressions/functions.js.map +1 -1
  48. package/dist/expressions/identifiers.d.ts.map +1 -1
  49. package/dist/expressions/identifiers.js +27 -7
  50. package/dist/expressions/identifiers.js.map +1 -1
  51. package/dist/expressions/index.test.js +189 -4
  52. package/dist/expressions/index.test.js.map +1 -1
  53. package/dist/expressions/literals.d.ts +4 -6
  54. package/dist/expressions/literals.d.ts.map +1 -1
  55. package/dist/expressions/literals.js +41 -17
  56. package/dist/expressions/literals.js.map +1 -1
  57. package/dist/expressions/literals.test.js +41 -0
  58. package/dist/expressions/literals.test.js.map +1 -1
  59. package/dist/expressions/operators.d.ts +4 -0
  60. package/dist/expressions/operators.d.ts.map +1 -1
  61. package/dist/expressions/operators.js +145 -12
  62. package/dist/expressions/operators.js.map +1 -1
  63. package/dist/expressions/other.d.ts.map +1 -1
  64. package/dist/expressions/other.js +9 -2
  65. package/dist/expressions/other.js.map +1 -1
  66. package/dist/generator-exchange.d.ts +1 -1
  67. package/dist/generator-exchange.d.ts.map +1 -1
  68. package/dist/generator-exchange.js +15 -4
  69. package/dist/generator-exchange.js.map +1 -1
  70. package/dist/generator-wrapper.d.ts +84 -0
  71. package/dist/generator-wrapper.d.ts.map +1 -0
  72. package/dist/generator-wrapper.js +312 -0
  73. package/dist/generator-wrapper.js.map +1 -0
  74. package/dist/generator-wrapper.test.d.ts +12 -0
  75. package/dist/generator-wrapper.test.d.ts.map +1 -0
  76. package/dist/generator-wrapper.test.js +179 -0
  77. package/dist/generator-wrapper.test.js.map +1 -0
  78. package/dist/generator.test.js +596 -6
  79. package/dist/generator.test.js.map +1 -1
  80. package/dist/golden-tests/config-parser.d.ts.map +1 -1
  81. package/dist/golden-tests/config-parser.js +81 -11
  82. package/dist/golden-tests/config-parser.js.map +1 -1
  83. package/dist/golden-tests/discovery.d.ts.map +1 -1
  84. package/dist/golden-tests/discovery.js +15 -5
  85. package/dist/golden-tests/discovery.js.map +1 -1
  86. package/dist/golden-tests/runner.d.ts.map +1 -1
  87. package/dist/golden-tests/runner.js +62 -7
  88. package/dist/golden-tests/runner.js.map +1 -1
  89. package/dist/golden-tests/types.d.ts +11 -1
  90. package/dist/golden-tests/types.d.ts.map +1 -1
  91. package/dist/hierarchical-bindings.test.js +2 -2
  92. package/dist/hierarchical-bindings.test.js.map +1 -1
  93. package/dist/integration.test.js +49 -2
  94. package/dist/integration.test.js.map +1 -1
  95. package/dist/invariants/emitter-globals-subset.test.d.ts +15 -0
  96. package/dist/invariants/emitter-globals-subset.test.d.ts.map +1 -0
  97. package/dist/invariants/emitter-globals-subset.test.js +137 -0
  98. package/dist/invariants/emitter-globals-subset.test.js.map +1 -0
  99. package/dist/invariants/numeric-proof-contract.test.d.ts +19 -0
  100. package/dist/invariants/numeric-proof-contract.test.d.ts.map +1 -0
  101. package/dist/invariants/numeric-proof-contract.test.js +560 -0
  102. package/dist/invariants/numeric-proof-contract.test.js.map +1 -0
  103. package/dist/specialization/generic-functions.test.js +10 -0
  104. package/dist/specialization/generic-functions.test.js.map +1 -1
  105. package/dist/specialization/substitution.d.ts.map +1 -1
  106. package/dist/specialization/substitution.js +7 -0
  107. package/dist/specialization/substitution.js.map +1 -1
  108. package/dist/statement-emitter.d.ts.map +1 -1
  109. package/dist/statement-emitter.js +5 -1
  110. package/dist/statement-emitter.js.map +1 -1
  111. package/dist/statements/blocks.d.ts +39 -1
  112. package/dist/statements/blocks.d.ts.map +1 -1
  113. package/dist/statements/blocks.js +129 -3
  114. package/dist/statements/blocks.js.map +1 -1
  115. package/dist/statements/classes/members/methods.d.ts.map +1 -1
  116. package/dist/statements/classes/members/methods.js +3 -1
  117. package/dist/statements/classes/members/methods.js.map +1 -1
  118. package/dist/statements/control/conditionals.d.ts.map +1 -1
  119. package/dist/statements/control/conditionals.js +215 -1
  120. package/dist/statements/control/conditionals.js.map +1 -1
  121. package/dist/statements/control/loops.d.ts +6 -0
  122. package/dist/statements/control/loops.d.ts.map +1 -1
  123. package/dist/statements/control/loops.js +9 -2
  124. package/dist/statements/control/loops.js.map +1 -1
  125. package/dist/statements/declarations/classes.d.ts.map +1 -1
  126. package/dist/statements/declarations/classes.js +13 -5
  127. package/dist/statements/declarations/classes.js.map +1 -1
  128. package/dist/statements/declarations/functions.d.ts.map +1 -1
  129. package/dist/statements/declarations/functions.js +91 -25
  130. package/dist/statements/declarations/functions.js.map +1 -1
  131. package/dist/statements/declarations/interfaces.d.ts.map +1 -1
  132. package/dist/statements/declarations/interfaces.js +11 -1
  133. package/dist/statements/declarations/interfaces.js.map +1 -1
  134. package/dist/statements/declarations/type-aliases.d.ts.map +1 -1
  135. package/dist/statements/declarations/type-aliases.js +11 -1
  136. package/dist/statements/declarations/type-aliases.js.map +1 -1
  137. package/dist/statements/index.test.js +165 -3
  138. package/dist/statements/index.test.js.map +1 -1
  139. package/dist/types/arrays.d.ts +10 -1
  140. package/dist/types/arrays.d.ts.map +1 -1
  141. package/dist/types/arrays.js +16 -1
  142. package/dist/types/arrays.js.map +1 -1
  143. package/dist/types/dictionaries.d.ts +3 -2
  144. package/dist/types/dictionaries.d.ts.map +1 -1
  145. package/dist/types/dictionaries.js +14 -8
  146. package/dist/types/dictionaries.js.map +1 -1
  147. package/dist/types/emitter.d.ts.map +1 -1
  148. package/dist/types/emitter.js +3 -0
  149. package/dist/types/emitter.js.map +1 -1
  150. package/dist/types/index.test.js +5 -2
  151. package/dist/types/index.test.js.map +1 -1
  152. package/dist/types/references.d.ts.map +1 -1
  153. package/dist/types/references.js +128 -29
  154. package/dist/types/references.js.map +1 -1
  155. package/dist/types/references.test.d.ts +11 -0
  156. package/dist/types/references.test.d.ts.map +1 -0
  157. package/dist/types/references.test.js +384 -0
  158. package/dist/types/references.test.js.map +1 -0
  159. package/dist/types/tuples.d.ts +23 -0
  160. package/dist/types/tuples.d.ts.map +1 -0
  161. package/dist/types/tuples.js +54 -0
  162. package/dist/types/tuples.js.map +1 -0
  163. package/dist/types/unions.test.js +62 -15
  164. package/dist/types/unions.test.js.map +1 -1
  165. package/dist/types.d.ts +1 -1
  166. package/dist/types.d.ts.map +1 -1
  167. package/dist/types.js.map +1 -1
  168. package/package.json +3 -2
@@ -22,6 +22,12 @@ export declare const emitForStatement: (stmt: Extract<IrStatement, {
22
22
  }>, context: EmitterContext) => [string, EmitterContext];
23
23
  /**
24
24
  * Emit a for-of statement
25
+ *
26
+ * TypeScript: for (const x of items) { ... }
27
+ * C#: foreach (var x in items) { ... }
28
+ *
29
+ * TypeScript: for await (const x of asyncItems) { ... }
30
+ * C#: await foreach (var x in asyncItems) { ... }
25
31
  */
26
32
  export declare const emitForOfStatement: (stmt: Extract<IrStatement, {
27
33
  kind: "forOfStatement";
@@ -1 +1 @@
1
- {"version":3,"file":"loops.d.ts","sourceRoot":"","sources":["../../../src/statements/control/loops.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAgB,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,cAAc,EAA6B,MAAM,gBAAgB,CAAC;AA6H3E;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,EACtD,SAAS,cAAc,KACtB,CAAC,MAAM,EAAE,cAAc,CAQzB,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,GAC3B,MAAM,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC,EACpD,SAAS,cAAc,KACtB,CAAC,MAAM,EAAE,cAAc,CA0EzB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,EACtD,SAAS,cAAc,KACtB,CAAC,MAAM,EAAE,cAAc,CAazB,CAAC"}
1
+ {"version":3,"file":"loops.d.ts","sourceRoot":"","sources":["../../../src/statements/control/loops.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAgB,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,cAAc,EAA6B,MAAM,gBAAgB,CAAC;AA6H3E;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,EACtD,SAAS,cAAc,KACtB,CAAC,MAAM,EAAE,cAAc,CAQzB,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,GAC3B,MAAM,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC,EACpD,SAAS,cAAc,KACtB,CAAC,MAAM,EAAE,cAAc,CA0EzB,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,EACtD,SAAS,cAAc,KACtB,CAAC,MAAM,EAAE,cAAc,CAczB,CAAC"}
@@ -174,16 +174,23 @@ export const emitForStatement = (stmt, context) => {
174
174
  };
175
175
  /**
176
176
  * Emit a for-of statement
177
+ *
178
+ * TypeScript: for (const x of items) { ... }
179
+ * C#: foreach (var x in items) { ... }
180
+ *
181
+ * TypeScript: for await (const x of asyncItems) { ... }
182
+ * C#: await foreach (var x in asyncItems) { ... }
177
183
  */
178
184
  export const emitForOfStatement = (stmt, context) => {
179
185
  const ind = getIndent(context);
180
186
  const [exprFrag, exprContext] = emitExpression(stmt.expression, context);
181
187
  const [bodyCode, bodyContext] = emitStatement(stmt.body, indent(exprContext));
182
- // Use foreach in C#
188
+ // Use foreach in C#, with await prefix for async iteration
183
189
  const varName = stmt.variable.kind === "identifierPattern"
184
190
  ? escapeCSharpIdentifier(stmt.variable.name)
185
191
  : "item";
186
- const code = `${ind}foreach (var ${varName} in ${exprFrag.text})\n${bodyCode}`;
192
+ const foreachKeyword = stmt.isAwait ? "await foreach" : "foreach";
193
+ const code = `${ind}${foreachKeyword} (var ${varName} in ${exprFrag.text})\n${bodyCode}`;
187
194
  return [code, dedent(bodyContext)];
188
195
  };
189
196
  //# sourceMappingURL=loops.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"loops.js","sourceRoot":"","sources":["../../../src/statements/control/loops.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"loops.js","sourceRoot":"","sources":["../../../src/statements/control/loops.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"classes.d.ts","sourceRoot":"","sources":["../../../src/statements/declarations/classes.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,cAAc,EAIf,MAAM,gBAAgB,CAAC;AAMxB;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAC/B,MAAM,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,kBAAkB,CAAA;CAAE,CAAC,EACxD,SAAS,cAAc,KACtB,CAAC,MAAM,EAAE,cAAc,CA6EzB,CAAC"}
1
+ {"version":3,"file":"classes.d.ts","sourceRoot":"","sources":["../../../src/statements/declarations/classes.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,cAAc,EAIf,MAAM,gBAAgB,CAAC;AAMxB;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAC/B,MAAM,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,kBAAkB,CAAA;CAAE,CAAC,EACxD,SAAS,cAAc,KACtB,CAAC,MAAM,EAAE,cAAc,CAoFzB,CAAC"}
@@ -11,8 +11,18 @@ import { escapeCSharpIdentifier } from "../../emitter-types/index.js";
11
11
  */
12
12
  export const emitClassDeclaration = (stmt, context) => {
13
13
  const ind = getIndent(context);
14
- let currentContext = context;
15
14
  const parts = [];
15
+ // Build type parameter names set FIRST - needed when emitting superclass, implements, and members
16
+ // Type parameters must be in scope before we emit types that reference them
17
+ const classTypeParams = new Set([
18
+ ...(context.typeParameters ?? []),
19
+ ...(stmt.typeParameters?.map((tp) => tp.name) ?? []),
20
+ ]);
21
+ // Create context with type parameters in scope
22
+ let currentContext = {
23
+ ...context,
24
+ typeParameters: classTypeParams,
25
+ };
16
26
  // Access modifiers
17
27
  const accessibility = stmt.isExported ? "public" : "internal";
18
28
  parts.push(accessibility);
@@ -45,14 +55,12 @@ export const emitClassDeclaration = (stmt, context) => {
45
55
  : "";
46
56
  // Class body (use escaped class name)
47
57
  const baseContext = withClassName(indent(currentContext), escapedClassName);
48
- // Build type parameter names set for this class
49
- const classTypeParams = new Set(stmt.typeParameters?.map((tp) => tp.name) ?? []);
50
58
  // Only set hasSuperClass flag if there's actually a superclass (for inheritance)
51
- // Also set typeParameters for nested expressions (method bodies, property initializers)
59
+ // classTypeParams was already built at the start of this function and is already in currentContext
52
60
  const bodyContext = {
53
61
  ...baseContext,
54
62
  hasSuperClass: stmt.superClass ? true : undefined,
55
- typeParameters: classTypeParams,
63
+ // typeParameters is inherited from currentContext via baseContext
56
64
  };
57
65
  const members = [];
58
66
  for (const member of stmt.members) {
@@ -1 +1 @@
1
- {"version":3,"file":"classes.js","sourceRoot":"","sources":["../../../src/statements/declarations/classes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"classes.js","sourceRoot":"","sources":["../../../src/statements/declarations/classes.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../../../src/statements/declarations/functions.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,cAAc,EAMf,MAAM,gBAAgB,CAAC;AAMxB;;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,CA+IzB,CAAC"}
1
+ {"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../../../src/statements/declarations/functions.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,cAAc,EAMf,MAAM,gBAAgB,CAAC;AAWxB;;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,CA+NzB,CAAC"}
@@ -6,13 +6,24 @@ import { emitType, emitTypeParameters } from "../../type-emitter.js";
6
6
  import { emitBlockStatement } from "../blocks.js";
7
7
  import { emitParameters } from "../classes.js";
8
8
  import { escapeCSharpIdentifier } from "../../emitter-types/index.js";
9
+ import { needsBidirectionalSupport, hasGeneratorReturnType, extractGeneratorTypeArgs, } from "../../generator-wrapper.js";
9
10
  /**
10
11
  * Emit a function declaration
11
12
  */
12
13
  export const emitFunctionDeclaration = (stmt, context) => {
13
14
  const ind = getIndent(context);
14
- let currentContext = context;
15
15
  const parts = [];
16
+ // Build type parameter names set FIRST - needed when emitting return type and parameters
17
+ // Type parameters must be in scope before we emit types that reference them
18
+ const funcTypeParams = new Set([
19
+ ...(context.typeParameters ?? []),
20
+ ...(stmt.typeParameters?.map((tp) => tp.name) ?? []),
21
+ ]);
22
+ // Create context with type parameters in scope for return type and parameter emission
23
+ let currentContext = {
24
+ ...context,
25
+ typeParameters: funcTypeParams,
26
+ };
16
27
  // Access modifiers
17
28
  const accessibility = stmt.isExported ? "public" : "private";
18
29
  parts.push(accessibility);
@@ -22,15 +33,24 @@ export const emitFunctionDeclaration = (stmt, context) => {
22
33
  if (stmt.isAsync && !stmt.isGenerator) {
23
34
  parts.push("async");
24
35
  }
36
+ // Check if this is a bidirectional generator (has TNext type)
37
+ const isBidirectional = needsBidirectionalSupport(stmt);
25
38
  // Return type
26
39
  if (stmt.isGenerator) {
27
- // Generator functions return IEnumerable<exchange> or IAsyncEnumerable<exchange>
28
- const exchangeName = `${stmt.name}_exchange`;
29
- if (stmt.isAsync) {
30
- parts.push(`async global::System.Collections.Generic.IAsyncEnumerable<${exchangeName}>`);
40
+ if (isBidirectional) {
41
+ // Bidirectional generators return the wrapper class
42
+ const wrapperName = `${stmt.name}_Generator`;
43
+ parts.push(wrapperName);
31
44
  }
32
45
  else {
33
- parts.push(`global::System.Collections.Generic.IEnumerable<${exchangeName}>`);
46
+ // Unidirectional generators return IEnumerable<exchange> or IAsyncEnumerable<exchange>
47
+ const exchangeName = `${stmt.name}_exchange`;
48
+ if (stmt.isAsync) {
49
+ parts.push(`async global::System.Collections.Generic.IAsyncEnumerable<${exchangeName}>`);
50
+ }
51
+ else {
52
+ parts.push(`global::System.Collections.Generic.IEnumerable<${exchangeName}>`);
53
+ }
34
54
  }
35
55
  }
36
56
  else if (stmt.returnType) {
@@ -63,12 +83,8 @@ export const emitFunctionDeclaration = (stmt, context) => {
63
83
  // Function body (not a static context - local variables)
64
84
  // Use withScoped to set typeParameters and returnType for nested expressions
65
85
  const baseBodyContext = withAsync(withStatic(indent(currentContext), false), stmt.isAsync);
66
- // Build type parameter names set for this function
67
- const funcTypeParams = new Set([
68
- ...(currentContext.typeParameters ?? []),
69
- ...(stmt.typeParameters?.map((tp) => tp.name) ?? []),
70
- ]);
71
86
  // Emit body with scoped typeParameters and returnType
87
+ // funcTypeParams was already built at the start of this function
72
88
  const [bodyCode] = withScoped(baseBodyContext, {
73
89
  typeParameters: funcTypeParams,
74
90
  returnType: stmt.returnType,
@@ -94,23 +110,73 @@ export const emitFunctionDeclaration = (stmt, context) => {
94
110
  let finalBodyCode = bodyCode;
95
111
  const bodyInd = getIndent(baseBodyContext);
96
112
  const injectLines = [];
97
- // Add generator exchange initialization
98
- if (stmt.isGenerator) {
113
+ // Handle bidirectional generators specially
114
+ if (stmt.isGenerator && isBidirectional) {
99
115
  const exchangeName = `${stmt.name}_exchange`;
100
- injectLines.push(`${bodyInd}var exchange = new ${exchangeName}();`);
101
- }
102
- // Add out parameter initializations
103
- if (outParams.length > 0) {
104
- for (const outParam of outParams) {
105
- injectLines.push(`${bodyInd}${outParam.name} = default;`);
116
+ const wrapperName = `${stmt.name}_Generator`;
117
+ const enumerableType = stmt.isAsync
118
+ ? `global::System.Collections.Generic.IAsyncEnumerable<${exchangeName}>`
119
+ : `global::System.Collections.Generic.IEnumerable<${exchangeName}>`;
120
+ const asyncModifier = stmt.isAsync ? "async " : "";
121
+ // Check if generator has a return type (TReturn is not void/undefined)
122
+ const hasReturnType = hasGeneratorReturnType(stmt);
123
+ // Extract return type for __returnValue variable
124
+ let returnTypeStr = "object";
125
+ if (hasReturnType) {
126
+ const { returnType: extractedReturnType, newContext: typeExtractContext, } = extractGeneratorTypeArgs(stmt.returnType, currentContext);
127
+ currentContext = typeExtractContext;
128
+ returnTypeStr = extractedReturnType;
129
+ }
130
+ // Build the body with local iterator function
131
+ const iteratorBody = bodyCode
132
+ .split("\n")
133
+ .slice(1, -1) // Remove opening and closing braces
134
+ .map((line) => ` ${line}`) // Add extra indent
135
+ .join("\n");
136
+ // Construct the bidirectional generator body
137
+ const bodyLines = [
138
+ `${ind}{`,
139
+ `${bodyInd}var exchange = new ${exchangeName}();`,
140
+ ];
141
+ // Add __returnValue capture if TReturn is not void
142
+ if (hasReturnType) {
143
+ bodyLines.push(`${bodyInd}${returnTypeStr} __returnValue = default!;`);
144
+ }
145
+ bodyLines.push(``);
146
+ bodyLines.push(`${bodyInd}${asyncModifier}${enumerableType} __iterator()`);
147
+ bodyLines.push(`${bodyInd}{`);
148
+ bodyLines.push(iteratorBody);
149
+ bodyLines.push(`${bodyInd}}`);
150
+ bodyLines.push(``);
151
+ // Wrapper constructor call - pass return value getter if needed
152
+ if (hasReturnType) {
153
+ bodyLines.push(`${bodyInd}return new ${wrapperName}(__iterator(), exchange, () => __returnValue);`);
154
+ }
155
+ else {
156
+ bodyLines.push(`${bodyInd}return new ${wrapperName}(__iterator(), exchange);`);
106
157
  }
158
+ bodyLines.push(`${ind}}`);
159
+ finalBodyCode = bodyLines.join("\n");
107
160
  }
108
- // Inject lines after opening brace
109
- if (injectLines.length > 0) {
110
- const lines = bodyCode.split("\n");
111
- if (lines.length > 1) {
112
- lines.splice(1, 0, ...injectLines, "");
113
- finalBodyCode = lines.join("\n");
161
+ else {
162
+ // Add generator exchange initialization for unidirectional generators
163
+ if (stmt.isGenerator) {
164
+ const exchangeName = `${stmt.name}_exchange`;
165
+ injectLines.push(`${bodyInd}var exchange = new ${exchangeName}();`);
166
+ }
167
+ // Add out parameter initializations
168
+ if (outParams.length > 0) {
169
+ for (const outParam of outParams) {
170
+ injectLines.push(`${bodyInd}${outParam.name} = default;`);
171
+ }
172
+ }
173
+ // Inject lines after opening brace
174
+ if (injectLines.length > 0) {
175
+ const lines = bodyCode.split("\n");
176
+ if (lines.length > 1) {
177
+ lines.splice(1, 0, ...injectLines, "");
178
+ finalBodyCode = lines.join("\n");
179
+ }
114
180
  }
115
181
  }
116
182
  const signature = parts.join(" ");
@@ -1 +1 @@
1
- {"version":3,"file":"functions.js","sourceRoot":"","sources":["../../../src/statements/declarations/functions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"functions.js","sourceRoot":"","sources":["../../../src/statements/declarations/functions.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/statements/declarations/interfaces.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAqB,MAAM,gBAAgB,CAAC;AASnE;;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,CAgGzB,CAAC"}
1
+ {"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/statements/declarations/interfaces.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAqB,MAAM,gBAAgB,CAAC;AASnE;;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,CA4GzB,CAAC"}
@@ -13,7 +13,17 @@ export const emitInterfaceDeclaration = (stmt, context) => {
13
13
  // TypeScript interfaces map to C# classes (not C# interfaces)
14
14
  // because TS interfaces are structural and we need nominal types in C#
15
15
  const ind = getIndent(context);
16
- let currentContext = context;
16
+ // Build type parameter names set FIRST - needed when emitting member types
17
+ // Type parameters must be in scope before we emit types that reference them
18
+ const ifaceTypeParams = new Set([
19
+ ...(context.typeParameters ?? []),
20
+ ...(stmt.typeParameters?.map((tp) => tp.name) ?? []),
21
+ ]);
22
+ // Create context with type parameters in scope for member emission
23
+ let currentContext = {
24
+ ...context,
25
+ typeParameters: ifaceTypeParams,
26
+ };
17
27
  // Extract inline object types and emit them as separate classes
18
28
  const extractedTypes = extractInlineObjectTypes(stmt.members);
19
29
  const extractedClassCodes = [];
@@ -1 +1 @@
1
- {"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/statements/declarations/interfaces.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/statements/declarations/interfaces.ts"],"names":[],"mappings":"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"}
@@ -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;AAInE;;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,CAyFzB,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;AAInE;;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,CAqGzB,CAAC"}
@@ -12,7 +12,17 @@ export const emitTypeAliasDeclaration = (stmt, context) => {
12
12
  // - Structural type aliases generate C# classes with __Alias suffix
13
13
  // - Simple aliases (primitives, references) emit as comments or using aliases
14
14
  const ind = getIndent(context);
15
- let currentContext = context;
15
+ // Build type parameter names set FIRST - needed when emitting member types
16
+ // Type parameters must be in scope before we emit types that reference them
17
+ const aliasTypeParams = new Set([
18
+ ...(context.typeParameters ?? []),
19
+ ...(stmt.typeParameters?.map((tp) => tp.name) ?? []),
20
+ ]);
21
+ // Create context with type parameters in scope for member emission
22
+ let currentContext = {
23
+ ...context,
24
+ typeParameters: aliasTypeParams,
25
+ };
16
26
  // Check if this is a structural (object) type alias
17
27
  if (stmt.type.kind === "objectType") {
18
28
  // Generate a sealed class (or struct) for structural type alias
@@ -1 +1 @@
1
- {"version":3,"file":"type-aliases.js","sourceRoot":"","sources":["../../../src/statements/declarations/type-aliases.ts"],"names":[],"mappings":"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"}
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;AAEtE;;GAEG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,IAA4D,EAC5D,OAAuB,EACG,EAAE;IAC5B,0CAA0C;IAC1C,oEAAoE;IACpE,8EAA8E;IAE9E,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAE/B,2EAA2E;IAC3E,4EAA4E;IAC5E,MAAM,eAAe,GAAG,IAAI,GAAG,CAAS;QACtC,GAAG,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE,CAAC;QACjC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;KACrD,CAAC,CAAC;IAEH,mEAAmE;IACnE,IAAI,cAAc,GAAmB;QACnC,GAAG,OAAO;QACV,cAAc,EAAE,eAAe;KAChC,CAAC;IAEF,oDAAoD;IACpD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QACpC,gEAAgE;QAChE,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC;QAC9D,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC1B,qDAAqD;QACrD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrB,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,GAAG,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,mCAAmC;QAE9F,2BAA2B;QAC3B,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1D,MAAM,CAAC,aAAa,EAAE,YAAY,EAAE,gBAAgB,CAAC,GACnD,kBAAkB,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;YAC1D,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC1B,cAAc,GAAG,gBAAgB,CAAC;YAElC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC5B,KAAK,CAAC,IAAI,CACR,IAAI,GAAG,GAAG,GAAG,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,MAAM,CAAC,CAC7D,CAAC;YACJ,CAAC;QACH,CAAC;QAED,+CAA+C;QAC/C,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;QAC3C,MAAM,UAAU,GAAa,EAAE,CAAC;QAEhC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YACpC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACvC,IAAI,MAAM,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;oBACxC,MAAM,SAAS,GAAa,EAAE,CAAC;oBAC/B,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAEzB,gBAAgB;oBAChB,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;wBAChB,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,GAAG,QAAQ,CACrC,MAAM,CAAC,IAAI,EACX,cAAc,CACf,CAAC;wBACF,cAAc,GAAG,UAAU,CAAC;wBAC5B,mCAAmC;wBACnC,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;wBAC9D,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBAC1B,CAAC;yBAAM,CAAC;wBACN,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;oBAC3D,CAAC;oBAED,SAAS,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;oBAEpD,4BAA4B;oBAC5B,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU;wBACjC,CAAC,CAAC,uBAAuB;wBACzB,CAAC,CAAC,eAAe,CAAC;oBACpB,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBAE1B,sBAAsB;oBACtB,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;oBAE9B,UAAU,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACrE,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,GAAG,GAAG,GAAG,SAAS,KAAK,GAAG,MAAM,SAAS,KAAK,GAAG,GAAG,CAAC;QAElE,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAChC,CAAC;IAED,6EAA6E;IAC7E,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5D,MAAM,IAAI,GAAG,GAAG,GAAG,WAAW,IAAI,CAAC,IAAI,MAAM,QAAQ,EAAE,CAAC;IACxD,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAC5B,CAAC,CAAC"}
@@ -99,6 +99,7 @@ describe("Statement Emission", () => {
99
99
  type: {
100
100
  kind: "referenceType",
101
101
  name: "List",
102
+ resolvedClrType: "global::System.Collections.Generic.List",
102
103
  typeArguments: [{ kind: "primitiveType", name: "number" }],
103
104
  },
104
105
  isOptional: false,
@@ -160,7 +161,16 @@ describe("Statement Emission", () => {
160
161
  {
161
162
  kind: "memberAccess",
162
163
  object: { kind: "identifier", name: "items" },
163
- property: { kind: "identifier", name: "i" },
164
+ property: {
165
+ kind: "identifier",
166
+ name: "i",
167
+ // Proof marker: loop counter is Int32
168
+ inferredType: {
169
+ kind: "primitiveType",
170
+ name: "number",
171
+ numericIntent: "Int32",
172
+ },
173
+ },
164
174
  isComputed: true,
165
175
  isOptional: false,
166
176
  },
@@ -229,6 +239,7 @@ describe("Statement Emission", () => {
229
239
  },
230
240
  ],
231
241
  },
242
+ isAwait: false,
232
243
  },
233
244
  ],
234
245
  },
@@ -241,8 +252,159 @@ describe("Statement Emission", () => {
241
252
  };
242
253
  const result = emitModule(module);
243
254
  expect(result).to.include("foreach (var item in items)");
244
- expect(result).to.include("Tsonic.JSRuntime.console.log(item)");
245
- expect(result).to.include("using Tsonic.JSRuntime");
255
+ // Uses fully-qualified name with global:: prefix
256
+ expect(result).to.include("global::Tsonic.JSRuntime.console.log(item)");
257
+ // Should NOT include using directives - uses global:: FQN
258
+ expect(result).to.not.include("using Tsonic.JSRuntime");
259
+ });
260
+ it("should emit 'await foreach' when isAwait=true", () => {
261
+ const module = {
262
+ kind: "module",
263
+ filePath: "/src/test.ts",
264
+ namespace: "MyApp",
265
+ className: "test",
266
+ isStaticContainer: true,
267
+ imports: [],
268
+ body: [
269
+ {
270
+ kind: "functionDeclaration",
271
+ name: "processAsync",
272
+ parameters: [
273
+ {
274
+ kind: "parameter",
275
+ pattern: { kind: "identifierPattern", name: "items" },
276
+ type: {
277
+ kind: "referenceType",
278
+ name: "IAsyncEnumerable",
279
+ resolvedClrType: "System.Collections.Generic.IAsyncEnumerable",
280
+ typeArguments: [{ kind: "primitiveType", name: "string" }],
281
+ },
282
+ isOptional: false,
283
+ isRest: false,
284
+ passing: "value",
285
+ },
286
+ ],
287
+ returnType: {
288
+ kind: "referenceType",
289
+ name: "Task",
290
+ resolvedClrType: "System.Threading.Tasks.Task",
291
+ typeArguments: [],
292
+ },
293
+ body: {
294
+ kind: "blockStatement",
295
+ statements: [
296
+ {
297
+ kind: "forOfStatement",
298
+ variable: { kind: "identifierPattern", name: "item" },
299
+ expression: { kind: "identifier", name: "items" },
300
+ body: {
301
+ kind: "blockStatement",
302
+ statements: [
303
+ {
304
+ kind: "expressionStatement",
305
+ expression: {
306
+ kind: "call",
307
+ callee: {
308
+ kind: "memberAccess",
309
+ object: { kind: "identifier", name: "console" },
310
+ property: "log",
311
+ isComputed: false,
312
+ isOptional: false,
313
+ },
314
+ arguments: [{ kind: "identifier", name: "item" }],
315
+ isOptional: false,
316
+ },
317
+ },
318
+ ],
319
+ },
320
+ isAwait: true,
321
+ },
322
+ ],
323
+ },
324
+ isExported: true,
325
+ isAsync: true,
326
+ isGenerator: false,
327
+ },
328
+ ],
329
+ exports: [],
330
+ };
331
+ const result = emitModule(module);
332
+ // Should emit 'await foreach' for async iteration
333
+ expect(result).to.include("await foreach (var item in items)");
334
+ // Should NOT include regular 'foreach' (without await)
335
+ expect(result).to.not.match(/[^t]\sforeach\s/);
336
+ });
337
+ it("should emit regular 'foreach' when isAwait=false", () => {
338
+ const module = {
339
+ kind: "module",
340
+ filePath: "/src/test.ts",
341
+ namespace: "MyApp",
342
+ className: "test",
343
+ isStaticContainer: true,
344
+ imports: [],
345
+ body: [
346
+ {
347
+ kind: "functionDeclaration",
348
+ name: "processSync",
349
+ parameters: [
350
+ {
351
+ kind: "parameter",
352
+ pattern: { kind: "identifierPattern", name: "items" },
353
+ type: {
354
+ kind: "referenceType",
355
+ name: "IEnumerable",
356
+ resolvedClrType: "System.Collections.Generic.IEnumerable",
357
+ typeArguments: [{ kind: "primitiveType", name: "string" }],
358
+ },
359
+ isOptional: false,
360
+ isRest: false,
361
+ passing: "value",
362
+ },
363
+ ],
364
+ returnType: { kind: "voidType" },
365
+ body: {
366
+ kind: "blockStatement",
367
+ statements: [
368
+ {
369
+ kind: "forOfStatement",
370
+ variable: { kind: "identifierPattern", name: "item" },
371
+ expression: { kind: "identifier", name: "items" },
372
+ body: {
373
+ kind: "blockStatement",
374
+ statements: [
375
+ {
376
+ kind: "expressionStatement",
377
+ expression: {
378
+ kind: "call",
379
+ callee: {
380
+ kind: "memberAccess",
381
+ object: { kind: "identifier", name: "console" },
382
+ property: "log",
383
+ isComputed: false,
384
+ isOptional: false,
385
+ },
386
+ arguments: [{ kind: "identifier", name: "item" }],
387
+ isOptional: false,
388
+ },
389
+ },
390
+ ],
391
+ },
392
+ isAwait: false,
393
+ },
394
+ ],
395
+ },
396
+ isExported: true,
397
+ isAsync: false,
398
+ isGenerator: false,
399
+ },
400
+ ],
401
+ exports: [],
402
+ };
403
+ const result = emitModule(module);
404
+ // Should emit regular 'foreach' for sync iteration
405
+ expect(result).to.include("foreach (var item in items)");
406
+ // Should NOT include 'await foreach'
407
+ expect(result).to.not.include("await foreach");
246
408
  });
247
409
  });
248
410
  //# sourceMappingURL=index.test.js.map