@tsonic/emitter 0.0.62 → 0.0.63

package/dist/statements/blocks.d.ts

@@ -1,24 +1,32 @@
 /**
  * Block and simple statement emitters
+ *
+ * Returns CSharpStatementAst nodes. Multi-statement lowerings (e.g., void-return
+ * splitting into `expr; return;`) return arrays of statements that the parent
+ * block flattens into its own statements array.
  */
 import { IrStatement, IrExpression } from "@tsonic/frontend";
 import { EmitterContext } from "../types.js";
+import type { CSharpStatementAst, CSharpBlockStatementAst } from "../core/format/backend-ast/types.js";
 /**
- * Emit a block statement
+ * Emit a block statement as AST
  */
-export declare const emitBlockStatement: (stmt: Extract<IrStatement, {
+export declare const emitBlockStatementAst: (stmt: Extract<IrStatement, {
     kind: "blockStatement";
-}>, context: EmitterContext) => [string, EmitterContext];
+}>, context: EmitterContext) => [CSharpBlockStatementAst, EmitterContext];
 /**
- * Emit a return statement
+ * Emit a return statement as AST.
  * Uses context.returnType to pass expectedType for null → default conversion in generic contexts.
+ *
+ * Returns an array because void-return lowering may produce multiple statements
+ * (e.g., `expr; return;` for side-effectful expressions in void-returning functions).
  */
-export declare const emitReturnStatement: (stmt: Extract<IrStatement, {
+export declare const emitReturnStatementAst: (stmt: Extract<IrStatement, {
     kind: "returnStatement";
-}>, context: EmitterContext) => [string, EmitterContext];
+}>, context: EmitterContext) => [readonly CSharpStatementAst[], EmitterContext];
 /**
  * Emit yield expression as C# yield return with exchange object pattern
- * (Legacy handler for IrYieldExpression - used for unidirectional generators)
+ * (Handler for IrYieldExpression in unidirectional generators)
  *
  * TypeScript: yield value
  * C#:
@@ -30,9 +38,9 @@ export declare const emitReturnStatement: (stmt: Extract<IrStatement, {
  *   foreach (var item in OtherGenerator())
  *     yield return item;
  */
-export declare const emitYieldExpression: (expr: Extract<IrExpression, {
+export declare const emitYieldExpressionAst: (expr: Extract<IrExpression, {
     kind: "yield";
-}>, context: EmitterContext) => [string, EmitterContext];
+}>, context: EmitterContext) => [readonly CSharpStatementAst[], EmitterContext];
 /**
  * Emit IrYieldStatement (lowered form from yield-lowering pass)
  * Handles bidirectional communication: const x = yield value;
@@ -48,15 +56,15 @@ export declare const emitYieldExpression: (expr: Extract<IrExpression, {
  *   exchange.Output = value;
  *   yield return exchange;
  */
-export declare const emitYieldStatement: (stmt: Extract<IrStatement, {
+export declare const emitYieldStatementAst: (stmt: Extract<IrStatement, {
     kind: "yieldStatement";
-}>, context: EmitterContext) => [string, EmitterContext];
+}>, context: EmitterContext) => [readonly CSharpStatementAst[], EmitterContext];
 /**
- * Emit an expression statement
+ * Emit an expression statement as AST
  */
-export declare const emitExpressionStatement: (stmt: Extract<IrStatement, {
+export declare const emitExpressionStatementAst: (stmt: Extract<IrStatement, {
     kind: "expressionStatement";
-}>, context: EmitterContext) => [string, EmitterContext];
+}>, context: EmitterContext) => [readonly CSharpStatementAst[], EmitterContext];
 /**
  * Emit IrGeneratorReturnStatement (lowered form from yield-lowering pass)
  * Handles return statements in generators with TReturn.
@@ -73,7 +81,7 @@ export declare const emitExpressionStatement: (stmt: Extract<IrStatement, {
  * The __returnValue variable is declared in the enclosing function emission.
  * The wrapper's _getReturnValue closure captures this value when iteration completes.
  */
-export declare const emitGeneratorReturnStatement: (stmt: Extract<IrStatement, {
+export declare const emitGeneratorReturnStatementAst: (stmt: Extract<IrStatement, {
     kind: "generatorReturnStatement";
-}>, context: EmitterContext) => [string, EmitterContext];
+}>, context: EmitterContext) => [readonly CSharpStatementAst[], EmitterContext];
 //# sourceMappingURL=blocks.d.ts.map

package/dist/statements/blocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blocks.d.ts","sourceRoot":"","sources":["../../src/statements/blocks.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAa,MAAM,aAAa,CAAC;AAMxD;;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,CAqBzB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAC9B,MAAM,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,iBAAiB,CAAA;CAAE,CAAC,EACvD,SAAS,cAAc,KACtB,CAAC,MAAM,EAAE,cAAc,CAsDzB,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,mBAAmB,GAC9B,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,EAC9C,SAAS,cAAc,KACtB,CAAC,MAAM,EAAE,cAAc,CA2CzB,CAAC;AAEF;;;;;;;;;;;;;;GAcG;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,CAqDzB,CAAC;AAEF;;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,CAoCzB,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,4BAA4B,GACvC,MAAM,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,0BAA0B,CAAA;CAAE,CAAC,EAChE,SAAS,cAAc,KACtB,CAAC,MAAM,EAAE,cAAc,CAoBzB,CAAC"}
+{"version":3,"file":"blocks.d.ts","sourceRoot":"","sources":["../../src/statements/blocks.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAK7C,OAAO,KAAK,EACV,kBAAkB,EAClB,uBAAuB,EAExB,MAAM,qCAAqC,CAAC;AAE7C;;GAEG;AACH,eAAO,MAAM,qBAAqB,GAChC,MAAM,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,EACtD,SAAS,cAAc,KACtB,CAAC,uBAAuB,EAAE,cAAc,CAmB1C,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,GACjC,MAAM,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,iBAAiB,CAAA;CAAE,CAAC,EACvD,SAAS,cAAc,KACtB,CAAC,SAAS,kBAAkB,EAAE,EAAE,cAAc,CAsEhD,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,sBAAsB,GACjC,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,EAC9C,SAAS,cAAc,KACtB,CAAC,SAAS,kBAAkB,EAAE,EAAE,cAAc,CA+EhD,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,qBAAqB,GAChC,MAAM,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,EACtD,SAAS,cAAc,KACtB,CAAC,SAAS,kBAAkB,EAAE,EAAE,cAAc,CAoGhD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,0BAA0B,GACrC,MAAM,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,qBAAqB,CAAA;CAAE,CAAC,EAC3D,SAAS,cAAc,KACtB,CAAC,SAAS,kBAAkB,EAAE,EAAE,cAAc,CA8ChD,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,+BAA+B,GAC1C,MAAM,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,0BAA0B,CAAA;CAAE,CAAC,EAChE,SAAS,cAAc,KACtB,CAAC,SAAS,kBAAkB,EAAE,EAAE,cAAc,CA2BhD,CAAC"}

package/dist/statements/blocks.js

@@ -1,16 +1,18 @@
 /**
  * Block and simple statement emitters
+ *
+ * Returns CSharpStatementAst nodes. Multi-statement lowerings (e.g., void-return
+ * splitting into `expr; return;`) return arrays of statements that the parent
+ * block flattens into its own statements array.
  */
-import { getIndent } from "../types.js";
-import { emitExpression } from "../expression-emitter.js";
-import { emitStatement } from "../statement-emitter.js";
-import { lowerPattern } from "../patterns.js";
-import { allocateLocalName } from "../core/local-names.js";
+import { emitExpressionAst } from "../expression-emitter.js";
+import { emitStatementAst } from "../statement-emitter.js";
+import { lowerPatternAst } from "../patterns.js";
+import { allocateLocalName } from "../core/format/local-names.js";
 /**
- * Emit a block statement
+ * Emit a block statement as AST
  */
-export const emitBlockStatement = (stmt, context) => {
-    const ind = getIndent(context);
+export const emitBlockStatementAst = (stmt, context) => {
     const outerNameMap = context.localNameMap;
     // New lexical scope for locals (prevents C# CS0136 shadowing errors).
     let currentContext = {
@@ -19,22 +21,23 @@ export const emitBlockStatement = (stmt, context) => {
     };
     const statements = [];
     for (const s of stmt.statements) {
-        const [code, newContext] = emitStatement(s, currentContext);
-        statements.push(code);
+        const [stmts, newContext] = emitStatementAst(s, currentContext);
+        statements.push(...stmts);
         currentContext = newContext;
     }
-    const bodyCode = statements.join("\n");
     return [
-        `${ind}{\n${bodyCode}\n${ind}}`,
+        { kind: "blockStatement", statements },
         { ...currentContext, localNameMap: outerNameMap },
     ];
 };
 /**
- * Emit a return statement
+ * Emit a return statement as AST.
  * Uses context.returnType to pass expectedType for null → default conversion in generic contexts.
+ *
+ * Returns an array because void-return lowering may produce multiple statements
+ * (e.g., `expr; return;` for side-effectful expressions in void-returning functions).
  */
-export const emitReturnStatement = (stmt, context) => {
-    const ind = getIndent(context);
+export const emitReturnStatementAst = (stmt, context) => {
     if (stmt.expression) {
         // In TypeScript, `return expr;` is permitted in a `void`-returning function and
         // simply returns `undefined` after evaluating `expr` for side effects.
@@ -51,28 +54,45 @@ export const emitReturnStatement = (stmt, context) => {
                 (expr.value === undefined || expr.value === null)) ||
                 (expr.kind === "identifier" &&
                     (expr.name === "undefined" || expr.name === "null"));
-            const [exprFrag, newContext] = emitExpression(expr, context);
+            const [exprAst, newContext] = emitExpressionAst(expr, context);
             if (isNoopExpr) {
-                return [`${ind}return;`, newContext];
+                return [[{ kind: "returnStatement" }], newContext];
             }
+            const returnStmt = { kind: "returnStatement" };
             if (expr.kind === "call" ||
                 expr.kind === "new" ||
                 expr.kind === "assignment" ||
                 expr.kind === "update" ||
                 expr.kind === "await") {
-                return [`${ind}${exprFrag.text};\n${ind}return;`, newContext];
+                return [
+                    [{ kind: "expressionStatement", expression: exprAst }, returnStmt],
+                    newContext,
+                ];
             }
-            return [`${ind}_ = ${exprFrag.text};\n${ind}return;`, newContext];
+            // Use discard assignment for expressions that aren't valid C# statement-expressions
+            const discardAssign = {
+                kind: "assignmentExpression",
+                operatorToken: "=",
+                left: { kind: "identifierExpression", identifier: "_" },
+                right: exprAst,
+            };
+            return [
+                [
+                    { kind: "expressionStatement", expression: discardAssign },
+                    returnStmt,
+                ],
+                newContext,
+            ];
         }
         // Pass returnType as expectedType for null → default conversion in generic contexts
-        const [exprFrag, newContext] = emitExpression(stmt.expression, context, context.returnType);
-        return [`${ind}return ${exprFrag.text};`, newContext];
+        const [exprAst, newContext] = emitExpressionAst(stmt.expression, context, context.returnType);
+        return [[{ kind: "returnStatement", expression: exprAst }], newContext];
     }
-    return [`${ind}return;`, context];
+    return [[{ kind: "returnStatement" }], context];
 };
 /**
  * Emit yield expression as C# yield return with exchange object pattern
- * (Legacy handler for IrYieldExpression - used for unidirectional generators)
+ * (Handler for IrYieldExpression in unidirectional generators)
  *
  * TypeScript: yield value
  * C#:
@@ -84,41 +104,79 @@ export const emitReturnStatement = (stmt, context) => {
  *   foreach (var item in OtherGenerator())
  *     yield return item;
  */
-export const emitYieldExpression = (expr, context) => {
-    const ind = getIndent(context);
+export const emitYieldExpressionAst = (expr, context) => {
     let currentContext = context;
     const parts = [];
     if (expr.delegate) {
         // yield* delegation
         if (expr.expression) {
-            const [delegateFrag, newContext] = emitExpression(expr.expression, currentContext);
+            const [delegateAst, newContext] = emitExpressionAst(expr.expression, currentContext);
             currentContext = newContext;
             // Use await foreach for async generators, foreach for sync
-            const foreachKeyword = currentContext.isAsync
-                ? "await foreach"
-                : "foreach";
             const itemAlloc = allocateLocalName("item", currentContext);
             currentContext = itemAlloc.context;
-            parts.push(`${ind}${foreachKeyword} (var ${itemAlloc.emittedName} in ${delegateFrag.text})`);
-            parts.push(`${ind}    yield return ${itemAlloc.emittedName};`);
+            parts.push({
+                kind: "foreachStatement",
+                isAwait: currentContext.isAsync,
+                type: { kind: "varType" },
+                identifier: itemAlloc.emittedName,
+                expression: delegateAst,
+                body: {
+                    kind: "yieldStatement",
+                    isBreak: false,
+                    expression: {
+                        kind: "identifierExpression",
+                        identifier: itemAlloc.emittedName,
+                    },
+                },
+            });
         }
     }
     else {
         // Regular yield
         if (expr.expression) {
-            const [valueFrag, newContext] = emitExpression(expr.expression, currentContext);
+            const [valueAst, newContext] = emitExpressionAst(expr.expression, currentContext);
             currentContext = newContext;
             const exchangeVar = currentContext.generatorExchangeVar ?? "exchange";
-            parts.push(`${ind}${exchangeVar}.Output = ${valueFrag.text};`);
-            parts.push(`${ind}yield return ${exchangeVar};`);
+            parts.push({
+                kind: "expressionStatement",
+                expression: {
+                    kind: "assignmentExpression",
+                    operatorToken: "=",
+                    left: {
+                        kind: "memberAccessExpression",
+                        expression: {
+                            kind: "identifierExpression",
+                            identifier: exchangeVar,
+                        },
+                        memberName: "Output",
+                    },
+                    right: valueAst,
+                },
+            });
+            parts.push({
+                kind: "yieldStatement",
+                isBreak: false,
+                expression: {
+                    kind: "identifierExpression",
+                    identifier: exchangeVar,
+                },
+            });
         }
         else {
             // Bare yield (no value)
             const exchangeVar = currentContext.generatorExchangeVar ?? "exchange";
-            parts.push(`${ind}yield return ${exchangeVar};`);
+            parts.push({
+                kind: "yieldStatement",
+                isBreak: false,
+                expression: {
+                    kind: "identifierExpression",
+                    identifier: exchangeVar,
+                },
+            });
         }
     }
-    return [parts.join("\n"), currentContext];
+    return [parts, currentContext];
 };
 /**
  * Emit IrYieldStatement (lowered form from yield-lowering pass)
@@ -135,54 +193,103 @@ export const emitYieldExpression = (expr, context) => {
  *   exchange.Output = value;
  *   yield return exchange;
  */
-export const emitYieldStatement = (stmt, context) => {
-    const ind = getIndent(context);
+export const emitYieldStatementAst = (stmt, context) => {
     let currentContext = context;
     const parts = [];
     if (stmt.delegate) {
         // yield* delegation - emit foreach pattern
         if (stmt.output) {
-            const [delegateFrag, newContext] = emitExpression(stmt.output, currentContext);
+            const [delegateAst, newContext] = emitExpressionAst(stmt.output, currentContext);
             currentContext = newContext;
             // Use await foreach for async generators, foreach for sync
-            const foreachKeyword = currentContext.isAsync
-                ? "await foreach"
-                : "foreach";
             const itemAlloc = allocateLocalName("item", currentContext);
             currentContext = itemAlloc.context;
-            parts.push(`${ind}${foreachKeyword} (var ${itemAlloc.emittedName} in ${delegateFrag.text})`);
-            parts.push(`${ind}    yield return ${itemAlloc.emittedName};`);
+            parts.push({
+                kind: "foreachStatement",
+                isAwait: currentContext.isAsync,
+                type: { kind: "varType" },
+                identifier: itemAlloc.emittedName,
+                expression: delegateAst,
+                body: {
+                    kind: "yieldStatement",
+                    isBreak: false,
+                    expression: {
+                        kind: "identifierExpression",
+                        identifier: itemAlloc.emittedName,
+                    },
+                },
+            });
         }
     }
     else {
         // Regular yield with optional bidirectional support
         if (stmt.output) {
-            const [valueFrag, newContext] = emitExpression(stmt.output, currentContext);
+            const [valueAst, newContext] = emitExpressionAst(stmt.output, currentContext);
             currentContext = newContext;
             const exchangeVar = currentContext.generatorExchangeVar ?? "exchange";
-            parts.push(`${ind}${exchangeVar}.Output = ${valueFrag.text};`);
+            parts.push({
+                kind: "expressionStatement",
+                expression: {
+                    kind: "assignmentExpression",
+                    operatorToken: "=",
+                    left: {
+                        kind: "memberAccessExpression",
+                        expression: {
+                            kind: "identifierExpression",
+                            identifier: exchangeVar,
+                        },
+                        memberName: "Output",
+                    },
+                    right: valueAst,
+                },
+            });
         }
         const exchangeVar = currentContext.generatorExchangeVar ?? "exchange";
-        parts.push(`${ind}yield return ${exchangeVar};`);
+        parts.push({
+            kind: "yieldStatement",
+            isBreak: false,
+            expression: {
+                kind: "identifierExpression",
+                identifier: exchangeVar,
+            },
+        });
         // Handle receiveTarget for bidirectional communication
         if (stmt.receiveTarget) {
-            const lowered = lowerPattern(stmt.receiveTarget, `(${exchangeVar}.Input ?? default!)`, stmt.receivedType, ind, currentContext);
+            const inputExpr = {
+                kind: "parenthesizedExpression",
+                expression: {
+                    kind: "binaryExpression",
+                    operatorToken: "??",
+                    left: {
+                        kind: "memberAccessExpression",
+                        expression: {
+                            kind: "identifierExpression",
+                            identifier: exchangeVar,
+                        },
+                        memberName: "Input",
+                    },
+                    right: {
+                        kind: "suppressNullableWarningExpression",
+                        expression: { kind: "defaultExpression" },
+                    },
+                },
+            };
+            const lowered = lowerPatternAst(stmt.receiveTarget, inputExpr, stmt.receivedType, currentContext);
             parts.push(...lowered.statements);
             currentContext = lowered.context;
         }
     }
-    return [parts.join("\n"), currentContext];
+    return [parts, currentContext];
 };
 /**
- * Emit an expression statement
+ * Emit an expression statement as AST
  */
-export const emitExpressionStatement = (stmt, context) => {
-    const ind = getIndent(context);
+export const emitExpressionStatementAst = (stmt, context) => {
     // Special handling for yield expressions in generators
     // Note: After yield-lowering pass, generators will have IrYieldStatement nodes instead
-    // This is kept for backward compatibility with unprocessed IR
+    // Handles unprocessed IR (before yield-lowering pass)
     if (stmt.expression.kind === "yield") {
-        return emitYieldExpression(stmt.expression, context);
+        return emitYieldExpressionAst(stmt.expression, context);
     }
     // TypeScript `void expr;` evaluates `expr` and discards the result.
     //
@@ -191,7 +298,7 @@ export const emitExpressionStatement = (stmt, context) => {
     // without introducing runtime helpers.
     if (stmt.expression.kind === "unary" && stmt.expression.operator === "void") {
         const operand = stmt.expression.expression;
-        const [operandFrag, newContext] = emitExpression(operand, context);
+        const [operandAst, newContext] = emitExpressionAst(operand, context);
         // If the operand is already a valid statement-expression (call/new/assignment/
         // update/await), emit it directly. Otherwise, use a discard assignment.
         if (operand.kind === "call" ||
@@ -199,12 +306,24 @@ export const emitExpressionStatement = (stmt, context) => {
             operand.kind === "assignment" ||
             operand.kind === "update" ||
             operand.kind === "await") {
-            return [`${ind}${operandFrag.text};`, newContext];
+            return [
+                [{ kind: "expressionStatement", expression: operandAst }],
+                newContext,
+            ];
         }
-        return [`${ind}_ = ${operandFrag.text};`, newContext];
+        const discardAssign = {
+            kind: "assignmentExpression",
+            operatorToken: "=",
+            left: { kind: "identifierExpression", identifier: "_" },
+            right: operandAst,
+        };
+        return [
+            [{ kind: "expressionStatement", expression: discardAssign }],
+            newContext,
+        ];
     }
-    const [exprFrag, newContext] = emitExpression(stmt.expression, context);
-    return [`${ind}${exprFrag.text};`, newContext];
+    const [exprAst, newContext] = emitExpressionAst(stmt.expression, context);
+    return [[{ kind: "expressionStatement", expression: exprAst }], newContext];
 };
 /**
  * Emit IrGeneratorReturnStatement (lowered form from yield-lowering pass)
@@ -222,19 +341,26 @@ export const emitExpressionStatement = (stmt, context) => {
  * The __returnValue variable is declared in the enclosing function emission.
  * The wrapper's _getReturnValue closure captures this value when iteration completes.
  */
-export const emitGeneratorReturnStatement = (stmt, context) => {
-    const ind = getIndent(context);
+export const emitGeneratorReturnStatementAst = (stmt, context) => {
     let currentContext = context;
     const returnVar = currentContext.generatorReturnValueVar ?? "__returnValue";
     const parts = [];
     if (stmt.expression) {
         // Capture the return value in __returnValue before terminating
-        const [valueFrag, newContext] = emitExpression(stmt.expression, currentContext);
+        const [valueAst, newContext] = emitExpressionAst(stmt.expression, currentContext);
         currentContext = newContext;
-        parts.push(`${ind}${returnVar} = ${valueFrag.text};`);
+        parts.push({
+            kind: "expressionStatement",
+            expression: {
+                kind: "assignmentExpression",
+                operatorToken: "=",
+                left: { kind: "identifierExpression", identifier: returnVar },
+                right: valueAst,
+            },
+        });
     }
     // Terminate the iterator
-    parts.push(`${ind}yield break;`);
-    return [parts.join("\n"), currentContext];
+    parts.push({ kind: "yieldStatement", isBreak: true });
+    return [parts, currentContext];
 };
 //# sourceMappingURL=blocks.js.map

package/dist/statements/blocks.js.map

@@ -1 +1 @@
-{"version":3,"file":"blocks.js","sourceRoot":"","sources":["../../src/statements/blocks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"blocks.js","sourceRoot":"","sources":["../../src/statements/blocks.ts"],"names":[],"mappings":"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"}

package/dist/statements/classes/index.d.ts

@@ -2,7 +2,7 @@
  * Class-related helpers - Public API
  */
 export { capitalize } from "./helpers.js";
-export { emitParameters, emitParametersWithDestructuring, generateParameterDestructuring, type ParameterEmissionResult, } from "./parameters.js";
+export { emitParameters, emitParametersWithDestructuring, generateParameterDestructuringAst, type ParameterEmissionResult, } from "./parameters.js";
 export { emitClassMember } from "./members.js";
 export { emitInterfaceMemberAsProperty } from "./properties.js";
 export { extractInlineObjectTypes, emitExtractedType, type ExtractedType, } from "./inline-types.js";

package/dist/statements/classes/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/statements/classes/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EACL,cAAc,EACd,+BAA+B,EAC/B,8BAA8B,EAC9B,KAAK,uBAAuB,GAC7B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,KAAK,aAAa,GACnB,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/statements/classes/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EACL,cAAc,EACd,+BAA+B,EAC/B,iCAAiC,EACjC,KAAK,uBAAuB,GAC7B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,KAAK,aAAa,GACnB,MAAM,mBAAmB,CAAC"}

package/dist/statements/classes/index.js

@@ -2,7 +2,7 @@
  * Class-related helpers - Public API
  */
 export { capitalize } from "./helpers.js";
-export { emitParameters, emitParametersWithDestructuring, generateParameterDestructuring, } from "./parameters.js";
+export { emitParameters, emitParametersWithDestructuring, generateParameterDestructuringAst, } from "./parameters.js";
 export { emitClassMember } from "./members.js";
 export { emitInterfaceMemberAsProperty } from "./properties.js";
 export { extractInlineObjectTypes, emitExtractedType, } from "./inline-types.js";

package/dist/statements/classes/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/statements/classes/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EACL,cAAc,EACd,+BAA+B,EAC/B,8BAA8B,GAE/B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EACL,wBAAwB,EACxB,iBAAiB,GAElB,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/statements/classes/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EACL,cAAc,EACd,+BAA+B,EAC/B,iCAAiC,GAElC,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EACL,wBAAwB,EACxB,iBAAiB,GAElB,MAAM,mBAAmB,CAAC"}

package/dist/statements/classes/inline-types.d.ts

@@ -1,8 +1,9 @@
 /**
- * Inline object type extraction and emission
+ * Inline object type extraction and emission — returns CSharpTypeDeclarationAst
  */
 import { IrInterfaceMember } from "@tsonic/frontend";
 import { EmitterContext } from "../../types.js";
+import type { CSharpTypeDeclarationAst } from "../../core/format/backend-ast/types.js";
 /**
  * Extracted inline object type
  */
@@ -15,7 +16,7 @@ export type ExtractedType = {
  */
 export declare const extractInlineObjectTypes: (members: readonly IrInterfaceMember[], context: EmitterContext) => readonly ExtractedType[];
 /**
- * Emit an extracted inline object type as a class
+ * Emit an extracted inline object type as CSharpClassDeclarationAst
  */
-export declare const emitExtractedType: (extracted: ExtractedType, context: EmitterContext) => [string, EmitterContext];
+export declare const emitExtractedType: (extracted: ExtractedType, context: EmitterContext) => [CSharpTypeDeclarationAst, EmitterContext];
 //# sourceMappingURL=inline-types.d.ts.map

package/dist/statements/classes/inline-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inline-types.d.ts","sourceRoot":"","sources":["../../../src/statements/classes/inline-types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAqB,MAAM,gBAAgB,CAAC;AAMnE;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,SAAS,iBAAiB,EAAE,CAAC;CAChD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,wBAAwB,GACnC,SAAS,SAAS,iBAAiB,EAAE,EACrC,SAAS,cAAc,KACtB,SAAS,aAAa,EAkBxB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAC5B,WAAW,aAAa,EACxB,SAAS,cAAc,KACtB,CAAC,MAAM,EAAE,cAAc,CA2CzB,CAAC"}
+{"version":3,"file":"inline-types.d.ts","sourceRoot":"","sources":["../../../src/statements/classes/inline-types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAKhD,OAAO,KAAK,EACV,wBAAwB,EAEzB,MAAM,wCAAwC,CAAC;AAEhD;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,SAAS,iBAAiB,EAAE,CAAC;CAChD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,wBAAwB,GACnC,SAAS,SAAS,iBAAiB,EAAE,EACrC,SAAS,cAAc,KACtB,SAAS,aAAa,EAkBxB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAC5B,WAAW,aAAa,EACxB,SAAS,cAAc,KACtB,CAAC,wBAAwB,EAAE,cAAc,CAwC3C,CAAC"}