@reckona/mreact-compiler 0.0.97 → 0.0.99

package/dist/emit-server.js

@@ -189,30 +189,43 @@ function collectHtmlStatements(node, outVar, escapeHelperName, escapeBatchHelper
         return [`${outVar} += ${escapeHelperName}(${node.code});`];
     }
     if (node.kind === "conditional") {
+        const conditionCode = node.conditionValueName ?? node.conditionCode;
         const whenTrueStatements = node.whenTrue.flatMap((child) => collectHtmlStatements(child, outVar, escapeHelperName, escapeBatchHelperName, asyncComponentNames, dynamicAttributes, contextProviderHelperName, contextConsumerHelperName, reactNodeRenderHelperName));
         const whenFalseStatements = node.whenFalse.flatMap((child) => collectHtmlStatements(child, outVar, escapeHelperName, escapeBatchHelperName, asyncComponentNames, dynamicAttributes, contextProviderHelperName, contextConsumerHelperName, reactNodeRenderHelperName));
         if (whenTrueStatements.length === 0 && whenFalseStatements.length === 0) {
             return [];
         }
+        let statements;
         if (whenFalseStatements.length === 0) {
-            return [
-                `if (${node.conditionCode}) {`,
+            statements = [
+                `if (${conditionCode}) {`,
                 ...whenTrueStatements.map((statement) => `  ${statement}`),
                 `}`,
             ];
         }
-        if (whenTrueStatements.length === 0) {
-            return [
-                `if (!(${node.conditionCode})) {`,
+        else if (whenTrueStatements.length === 0) {
+            statements = [
+                `if (!(${conditionCode})) {`,
                 ...whenFalseStatements.map((statement) => `  ${statement}`),
                 `}`,
             ];
         }
+        else {
+            statements = [
+                `if (${conditionCode}) {`,
+                ...whenTrueStatements.map((statement) => `  ${statement}`),
+                `} else {`,
+                ...whenFalseStatements.map((statement) => `  ${statement}`),
+                `}`,
+            ];
+        }
+        if (node.conditionValueName === undefined) {
+            return statements;
+        }
         return [
-            `if (${node.conditionCode}) {`,
-            ...whenTrueStatements.map((statement) => `  ${statement}`),
-            `} else {`,
-            ...whenFalseStatements.map((statement) => `  ${statement}`),
+            `{`,
+            `  const ${node.conditionValueName} = (${node.conditionCode});`,
+            ...statements.map((statement) => `  ${statement}`),
             `}`,
         ];
     }
@@ -356,8 +369,12 @@ function collectHtmlParts(node, escapeHelperName, escapeBatchHelperName, asyncCo
         return [`${escapeHelperName}(${node.code})`];
     }
     if (node.kind === "conditional") {
+        const whenTrue = emitHtmlExpressionFromChildren(node.whenTrue, escapeHelperName, escapeBatchHelperName, asyncComponentNames, dynamicAttributes, contextProviderHelperName, contextConsumerHelperName, reactNodeRenderHelperName);
+        const whenFalse = emitHtmlExpressionFromChildren(node.whenFalse, escapeHelperName, escapeBatchHelperName, asyncComponentNames, dynamicAttributes, contextProviderHelperName, contextConsumerHelperName, reactNodeRenderHelperName);
         return [
-            `((${node.conditionCode}) ? ${emitHtmlExpressionFromChildren(node.whenTrue, escapeHelperName, escapeBatchHelperName, asyncComponentNames, dynamicAttributes, contextProviderHelperName, contextConsumerHelperName, reactNodeRenderHelperName)} : ${emitHtmlExpressionFromChildren(node.whenFalse, escapeHelperName, escapeBatchHelperName, asyncComponentNames, dynamicAttributes, contextProviderHelperName, contextConsumerHelperName, reactNodeRenderHelperName)})`,
+            node.conditionValueName === undefined
+                ? `((${node.conditionCode}) ? ${whenTrue} : ${whenFalse})`
+                : `(() => { const ${node.conditionValueName} = (${node.conditionCode}); return ${node.conditionValueName} ? ${whenTrue} : ${whenFalse}; })()`,
         ];
     }
     if (node.kind === "list") {
@@ -505,6 +522,9 @@ function collectHtmlAttributeParts(tagName, attr, escapeHelperName, escapeBatchH
     return [emitDynamicAttributeExpression(htmlName, attr.code, escapeHelperName)];
 }
 function collectElementAttributeParts(tagName, attrs, escapeHelperName, escapeBatchHelperName, dynamicAttributes, attributeScan = scanElementAttributes(tagName, attrs)) {
+    if (dynamicAttributes === "emit" && attrs.some((attr) => attr.kind === "spread-attr")) {
+        return [emitMergedSpreadAttributeExpression(tagName, attrs, attributeScan)];
+    }
     return attrs.flatMap((attr) => attr.kind !== "spread-attr" &&
         ((tagName === "input" &&
             ((attr.name === "defaultValue" && attributeScan.hasExplicitInputValue) ||
@@ -514,6 +534,27 @@ function collectElementAttributeParts(tagName, attrs, escapeHelperName, escapeBa
         ? []
         : collectHtmlAttributeParts(tagName, attr, escapeHelperName, escapeBatchHelperName, 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;