@reckona/mreact-compiler 0.0.97 → 0.0.98

package/dist/emit-server-stream.js

@@ -348,10 +348,23 @@ function emitAppendStatements(node, sinkName, escapeHelperName, asyncBoundaryHel
         if (whenTrue.length === 0 && whenFalse.length === 0) {
             return [];
         }
+        const conditionCode = node.conditionValueName ?? node.conditionCode;
+        let statements;
         if (whenFalse.length === 0) {
-            return [`  if (${node.conditionCode}) {`, ...whenTrue, `  }`];
+            statements = [`  if (${conditionCode}) {`, ...whenTrue, `  }`];
         }
-        return [`  if (${node.conditionCode}) {`, ...whenTrue, `  } else {`, ...whenFalse, `  }`];
+        else {
+            statements = [`  if (${conditionCode}) {`, ...whenTrue, `  } else {`, ...whenFalse, `  }`];
+        }
+        if (node.conditionValueName === undefined) {
+            return statements;
+        }
+        return [
+            `  {`,
+            `    const ${node.conditionValueName} = (${node.conditionCode});`,
+            ...statements.map((statement) => `  ${statement}`),
+            `  }`,
+        ];
     }
     const collectState = {
         dynamicAttributes,
@@ -577,6 +590,9 @@ function tryEmitPartAsStringExpression(part, compatRenderToStringHelperName) {
         }
         return `${stringLiteral(`<!--mreact-h:start:${encodeURIComponent(part.hydrationId)}-->`)} + ${rendered} + ${stringLiteral(`<!--mreact-h:end:${encodeURIComponent(part.hydrationId)}-->`)}`;
     }
+    if (part.kind === "component" && part.hydrationId === undefined) {
+        return `${part.name}(${emitPropsObject(part.props, part.children, part.escapeHelperName)})`;
+    }
     // Non-compat component parts require `await sink-write`; lists with
     // sink-needing children also can't collapse. Signal fallback.
     return undefined;
@@ -672,10 +688,14 @@ function collectHtmlParts(node, escapeHelperName, asyncBoundaryHelperName, outOf
         return [{ kind: "dynamic", code: node.code, escapeHelperName }];
     }
     if (node.kind === "conditional") {
+        const whenTrue = emitHtmlExpressionFromChildren(node.whenTrue, escapeHelperName);
+        const whenFalse = emitHtmlExpressionFromChildren(node.whenFalse, escapeHelperName);
         return [
             {
                 kind: "raw-dynamic",
-                code: `((${node.conditionCode}) ? ${emitHtmlExpressionFromChildren(node.whenTrue, escapeHelperName)} : ${emitHtmlExpressionFromChildren(node.whenFalse, escapeHelperName)})`,
+                code: node.conditionValueName === undefined
+                    ? `((${node.conditionCode}) ? ${whenTrue} : ${whenFalse})`
+                    : `(() => { const ${node.conditionValueName} = (${node.conditionCode}); return ${node.conditionValueName} ? ${whenTrue} : ${whenFalse}; })()`,
             },
         ];
     }
@@ -945,6 +965,14 @@ function collectHtmlAttributeParts(tagName, attr, escapeHelperName, escapeBatchH
 }
 function collectElementAttributeParts(tagName, attrs, escapeHelperName, state, attributeScan = scanElementAttributes(tagName, attrs)) {
     const escapeBatchHelperName = state.escapeBatchHelperName;
+    if (state.dynamicAttributes === "emit" && attrs.some((attr) => attr.kind === "spread-attr")) {
+        return [
+            {
+                kind: "raw-dynamic",
+                code: emitMergedSpreadAttributeExpression(tagName, attrs, attributeScan),
+            },
+        ];
+    }
     return attrs.flatMap((attr) => attr.kind !== "spread-attr" &&
         ((tagName === "input" &&
             ((attr.name === "defaultValue" && attributeScan.hasExplicitInputValue) ||
@@ -954,6 +982,27 @@ function collectElementAttributeParts(tagName, attrs, escapeHelperName, state, a
         ? []
         : collectHtmlAttributeParts(tagName, attr, escapeHelperName, escapeBatchHelperName, state.dynamicAttributes));
 }
+function emitMergedSpreadAttributeExpression(tagName, attrs, attributeScan) {
+    const statements = attrs.flatMap((attr) => {
+        if (attr.kind !== "spread-attr" &&
+            ((tagName === "input" &&
+                ((attr.name === "defaultValue" && attributeScan.hasExplicitInputValue) ||
+                    (attr.name === "defaultChecked" && attributeScan.hasExplicitInputChecked))) ||
+                ((tagName === "textarea" || tagName === "select") &&
+                    (attr.name === "value" || attr.name === "defaultValue")))) {
+            return [];
+        }
+        if (attr.kind === "spread-attr") {
+            return [`Object.assign(_props, (${attr.code}) ?? {});`];
+        }
+        if (attr.kind === "event" || attr.name === "key" || attr.name === "dangerouslySetInnerHTML") {
+            return [];
+        }
+        const valueCode = attr.kind === "static-attr" ? stringLiteral(attr.value) : `(${attr.code})`;
+        return [`_props[${stringLiteral(attr.name)}] = ${valueCode};`];
+    });
+    return `(() => { const _props = {}; ${statements.join(" ")} return ${currentSpreadAttributesHelperName}(${stringLiteral(tagName)}, _props); })()`;
+}
 function scanElementAttributes(tagName, attrs) {
     let hasExplicitInputValue = false;
     let hasExplicitInputChecked = false;