@jalvin/compiler 2.0.50 → 2.0.52

package/dist/codegen.d.ts

@@ -119,6 +119,10 @@ export declare class CodeGenerator {
     private resolveLocalComponentImports;
     private isConstructorCall;
     private emitComponentCall;
+    private isComplexBuilderStmt;
+    private emitBuilderStmt;
+    private emitBuilderIf;
+    private emitBuilderWhen;
     private emitLambdaBodyAsDomChildren;
     private emitLambdaExpr;
     private emitIfExpr;

package/dist/codegen.d.ts.map

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

package/dist/codegen.js

@@ -1730,8 +1730,15 @@ class CodeGenerator {
             }
             props.push(propName === val ? propName : `${propName}: ${val}`);
         }
+        const lastParamName = paramNames && paramNames.length > 0 ? paramNames[paramNames.length - 1] : undefined;
+        const isUserComponent = tagName !== null && this.userComponentNames.has(tagName);
+        const isTrailingLambdaMappedToProps = expr.trailingLambda && isUserComponent && lastParamName && lastParamName !== "children";
+        if (isTrailingLambdaMappedToProps) {
+            const lambdaStr = this.emitLambdaExpr(expr.trailingLambda);
+            props.push(`${lastParamName}: ${lambdaStr}`);
+        }
         const propsStr = props.length > 0 ? `{ ${props.join(", ")} }` : "{}";
-        if (expr.trailingLambda) {
+        if (expr.trailingLambda && !isTrailingLambdaMappedToProps) {
             if (expr.trailingLambda.params.length > 0) {
                 // Lambda with explicit params (e.g. builder-style): emit as a function, not DOM children
                 return `${callee}(${propsStr}, [${this.emitLambdaExpr(expr.trailingLambda)}])`;
@@ -1741,36 +1748,188 @@ class CodeGenerator {
         }
         return `${callee}(${propsStr})`;
     }
-    emitLambdaBodyAsDomChildren(lambda) {
-        const parts = [];
-        for (const stmt of lambda.body) {
-            if (stmt.kind === "ExprStmt") {
-                parts.push(this.emitExpr(stmt.expr));
-            }
-            else if (stmt.kind === "IfStmt") {
-                const s = stmt;
-                const cond = this.emitExpr(s.condition);
-                const thenExprs = s.then.statements.filter((st) => st.kind === "ExprStmt").map((st) => this.emitExpr(st.expr));
-                const elseExprs = s.else && s.else.kind === "Block" ? s.else.statements.filter((st) => st.kind === "ExprStmt").map((st) => this.emitExpr(st.expr)) : [];
-                const thenStr = thenExprs.length > 0 ? `...(${cond} ? [${thenExprs.join(", ")}] : [])` : "";
-                const elseStr = elseExprs.length > 0 ? `...(!(${cond}) ? [${elseExprs.join(", ")}] : [])` : "";
-                if (thenStr)
-                    parts.push(thenStr);
-                if (elseStr)
-                    parts.push(elseStr);
-            }
-            else if (stmt.kind === "ForStmt") {
+    isComplexBuilderStmt(stmt) {
+        if (stmt.kind !== "ExprStmt") {
+            return true;
+        }
+        const expr = stmt.expr;
+        if (expr.kind === "AssignExpr" || expr.kind === "CompoundAssignExpr") {
+            return true;
+        }
+        return false;
+    }
+    emitBuilderStmt(stmt, arrayName) {
+        switch (stmt.kind) {
+            case "Block":
+                for (const s of stmt.statements) {
+                    this.emitBuilderStmt(s, arrayName);
+                }
+                break;
+            case "PropertyDecl":
+                this.emitPropertyDecl(stmt, false, true);
+                break;
+            case "DestructuringDecl":
+                this.emitDestructuringDecl(stmt, false);
+                break;
+            case "ExprStmt":
+                if (stmt.expr.kind === "AssignExpr" || stmt.expr.kind === "CompoundAssignExpr") {
+                    this.w.writeIndentedLine(`${this.emitExpr(stmt.expr)};`);
+                }
+                else {
+                    this.w.writeIndentedLine(`${arrayName}.push(${this.emitExpr(stmt.expr)});`);
+                }
+                break;
+            case "IfStmt":
+                this.emitBuilderIf(stmt, arrayName);
+                break;
+            case "WhenStmt":
+                this.emitBuilderWhen(stmt, arrayName);
+                break;
+            case "ForStmt": {
                 const s = stmt;
                 const iter = this.emitExpr(s.iterable);
                 let bindingStr = typeof s.binding === "string" ? `const ${s.binding}` : s.binding.kind === "TupleDestructure" ? `const [${s.binding.names.map((n) => n ?? "_").join(", ")}]` : `const [${s.binding.key}, ${s.binding.value}]`;
-                const innerExprs = s.body.statements.filter((inner) => inner.kind === "ExprStmt").map((inner) => this.emitExpr(inner.expr));
-                if (innerExprs.length > 0) {
-                    const pushes = innerExprs.map((e) => `__c.push(${e});`).join(" ");
-                    parts.push(`...(() => { const __c: any[] = []; for (${bindingStr} of ${iter}) { ${pushes} } return __c; })()`);
+                this.w.writeIndentedLine(`for (${bindingStr} of ${iter}) {`);
+                this.w.pushIndent();
+                this.emitBuilderStmt(s.body, arrayName);
+                this.w.popIndent();
+                this.w.writeIndentedLine("}");
+                break;
+            }
+            case "WhileStmt": {
+                const s = stmt;
+                this.w.writeIndentedLine(`while (${this.emitExpr(s.condition)}) {`);
+                this.w.pushIndent();
+                this.emitBuilderStmt(s.body, arrayName);
+                this.w.popIndent();
+                this.w.writeIndentedLine("}");
+                break;
+            }
+            case "DoWhileStmt": {
+                const s = stmt;
+                this.w.writeIndentedLine(`do {`);
+                this.w.pushIndent();
+                this.emitBuilderStmt(s.body, arrayName);
+                this.w.popIndent();
+                this.w.writeIndentedLine(`} while (${this.emitExpr(s.condition)});`);
+                break;
+            }
+            case "TryCatchStmt": {
+                const s = stmt;
+                this.w.writeIndentedLine(`try {`);
+                this.w.pushIndent();
+                this.emitBuilderStmt(s.body, arrayName);
+                this.w.popIndent();
+                for (const c of s.catches) {
+                    this.w.writeIndentedLine(`} catch (${c.name}) {`);
+                    this.w.pushIndent();
+                    this.emitBuilderStmt(c.body, arrayName);
+                    this.w.popIndent();
+                }
+                if (s.finally) {
+                    this.w.writeIndentedLine(`} finally {`);
+                    this.w.pushIndent();
+                    this.emitBuilderStmt(s.finally, arrayName);
+                    this.w.popIndent();
+                }
+                this.w.writeIndentedLine(`}`);
+                break;
+            }
+            default:
+                this.emitStmt(stmt);
+                break;
+        }
+    }
+    emitBuilderIf(stmt, arrayName, isElseIf = false) {
+        const cond = this.emitExpr(stmt.condition);
+        if (isElseIf) {
+            this.w.write(`if (${cond}) {\n`);
+        }
+        else {
+            this.w.writeIndentedLine(`if (${cond}) {`);
+        }
+        this.w.pushIndent();
+        this.emitBuilderStmt(stmt.then, arrayName);
+        this.w.popIndent();
+        if (stmt.else) {
+            if (stmt.else.kind === "IfStmt") {
+                this.w.writeIndented("} else ");
+                this.emitBuilderIf(stmt.else, arrayName, true);
+            }
+            else {
+                this.w.writeIndentedLine("} else {");
+                this.w.pushIndent();
+                this.emitBuilderStmt(stmt.else, arrayName);
+                this.w.popIndent();
+                this.w.writeIndentedLine("}");
+            }
+        }
+        else {
+            this.w.writeIndentedLine("}");
+        }
+    }
+    emitBuilderWhen(stmt, arrayName) {
+        const subjectVar = stmt.subject ? "__when_subject__" : null;
+        if (stmt.subject) {
+            const binding = stmt.subject.binding ?? subjectVar;
+            this.w.writeIndentedLine(`const ${binding} = ${this.emitExpr(stmt.subject.expr)};`);
+        }
+        let first = true;
+        for (const branch of stmt.branches) {
+            if (branch.isElse) {
+                this.w.writeIndentedLine(first ? `{` : `} else {`);
+            }
+            else {
+                const cond = branch.conditions.map((c) => this.emitWhenCondition(c, subjectVar ?? "")).join(" || ");
+                this.w.writeIndentedLine(first ? `if (${cond}) {` : `} else if (${cond}) {`);
+            }
+            first = false;
+            this.w.pushIndent();
+            if (branch.body.kind === "Block") {
+                this.emitBuilderStmt(branch.body, arrayName);
+            }
+            else {
+                if (branch.body.kind === "AssignExpr" || branch.body.kind === "CompoundAssignExpr") {
+                    this.w.writeIndentedLine(`${this.emitExpr(branch.body)};`);
+                }
+                else {
+                    this.w.writeIndentedLine(`${arrayName}.push(${this.emitExpr(branch.body)});`);
+                }
+            }
+            this.w.popIndent();
+        }
+        this.w.writeIndentedLine(`}`);
+    }
+    emitLambdaBodyAsDomChildren(lambda) {
+        const hasComplex = lambda.body.some((s) => this.isComplexBuilderStmt(s));
+        if (!hasComplex) {
+            const parts = [];
+            for (const stmt of lambda.body) {
+                if (stmt.kind === "ExprStmt") {
+                    parts.push(this.emitExpr(stmt.expr));
                 }
             }
+            return parts.join(", ");
+        }
+        const saved = this.w;
+        const tmp = new Writer();
+        tmp.indent = saved.indent;
+        this.w = tmp;
+        try {
+            this.w.writeLine("(() => {");
+            this.w.pushIndent();
+            this.w.writeIndentedLine("const __c: any[] = [];");
+            for (const stmt of lambda.body) {
+                this.emitBuilderStmt(stmt, "__c");
+            }
+            this.w.writeIndentedLine("return __c;");
+            this.w.popIndent();
+            this.w.writeIndented("})()");
+        }
+        finally {
+            this.w = saved;
         }
-        return parts.join(", ");
+        return `...${tmp.output.trim()}`;
     }
     emitLambdaExpr(expr) {
         const params = expr.params.length === 0 ? "it" : expr.params.map((p) => p.name ?? "_").join(", ");