@reckona/mreact-compiler 0.0.72 → 0.0.74

package/src/internal.ts

@@ -76,6 +76,14 @@ export interface FormActionReference {
   start: number;
 }
 
+export interface FormActionExpressionReference {
+  end: number;
+  expression: string;
+  expressionEnd: number;
+  expressionStart: number;
+  start: number;
+}
+
 interface ComponentAliasState {
   aliases: Map<string, string>;
   stringConstants: Map<string, string>;
@@ -226,6 +234,21 @@ export function collectFormActionReferences(input: {
   );
 }
 
+export function collectFormActionExpressionReferences(input: {
+  code: string;
+  filename?: string | undefined;
+}): FormActionExpressionReference[] {
+  const parsed = parseModule(input.code, input.filename);
+  const references: FormActionExpressionReference[] = [];
+
+  collectFormActionExpressionReferencesFromNode(input.code, parsed.program, references);
+  return references.sort((left, right) =>
+    left.start === right.start
+      ? left.expression.localeCompare(right.expression)
+      : left.start - right.start,
+  );
+}
+
 export function collectTopLevelValueExportNames(input: {
   code: string;
   filename?: string | undefined;
@@ -1708,6 +1731,78 @@ function collectFormActionReferencesFromNode(
   }
 }
 
+function collectFormActionExpressionReferencesFromNode(
+  code: string,
+  node: unknown,
+  references: FormActionExpressionReference[],
+): void {
+  if (Array.isArray(node)) {
+    for (const child of node) {
+      collectFormActionExpressionReferencesFromNode(code, child, references);
+    }
+    return;
+  }
+
+  const object = readOptionalObject(node);
+  if (object === undefined) {
+    return;
+  }
+
+  if (typeof object.type === "string" && object.type.startsWith("TS")) {
+    return;
+  }
+
+  if (object.type === "ImportDeclaration") {
+    return;
+  }
+
+  if (
+    object.type === "JSXOpeningElement" &&
+    jsxTagName(readOptionalObject(object.name)) === "form"
+  ) {
+    const attributes = Array.isArray(object.attributes) ? object.attributes : [];
+
+    for (const attribute of attributes) {
+      const attr = readObject(attribute);
+
+      if (attr.type !== "JSXAttribute" || readObject(attr.name).name !== "action") {
+        continue;
+      }
+
+      const value = readObject(attr.value);
+      const expression = readObject(value.expression);
+      const start = typeof object.start === "number" ? object.start : undefined;
+      const end = typeof object.end === "number" ? object.end : undefined;
+      const expressionStart = typeof expression.start === "number" ? expression.start : undefined;
+      const expressionEnd = typeof expression.end === "number" ? expression.end : undefined;
+
+      if (
+        value.type === "JSXExpressionContainer" &&
+        start !== undefined &&
+        end !== undefined &&
+        expressionStart !== undefined &&
+        expressionEnd !== undefined
+      ) {
+        references.push({
+          end,
+          expression: code.slice(expressionStart, expressionEnd).trim(),
+          expressionEnd,
+          expressionStart,
+          start,
+        });
+      }
+    }
+  }
+
+  for (const [key, value] of Object.entries(object)) {
+    if (key === "type" || key === "start" || key === "end" || key === "loc") {
+      continue;
+    }
+
+    collectFormActionExpressionReferencesFromNode(code, value, references);
+  }
+}
+
 function jsxTagName(node: Record<string, unknown> | undefined): string {
   if (node === undefined) {
     return "";

package/src/oxc-child-analysis.ts

@@ -24,7 +24,6 @@ import {
 import { normalizeOxcExpressionCode, stripOxcGeneratedImports } from "./oxc-code-utils.js";
 import {
   findOxcKeyCodeInChildren,
-  isOxcJsxBranch,
   readOxcReturnExpressionFromStatement,
 } from "./oxc-expression-utils.js";
 import {
@@ -389,7 +388,7 @@ export function analyzeOxcExpressionChild(
 
   if (
     unwrappedExpression.type === "LogicalExpression" &&
-    isOxcJsxBranch(readObject(unwrappedExpression.right))
+    containsOxcJsxSyntax(readObject(unwrappedExpression.right))
   ) {
     const rightBranch = analyzeOxcDynamicBranch(
       code,
@@ -463,37 +462,44 @@ export function analyzeOxcExpressionChild(
   const sameModuleComponentCall =
     sameModuleComponentStreamCall !== undefined ||
     isOxcSameModuleComponentCallExpression(expression, componentCallNamesForRenderMode);
+  const containsNestedJsx = containsOxcJsxSyntax(unwrappedExpression);
+  const loweredNestedJsx = containsNestedJsx
+    ? context.lowerNestedJsxExpression(
+        code,
+        expression,
+        context.componentNames,
+        context.target,
+        context.diagnostics,
+        bodyStatementJsx,
+      )
+    : undefined;
+  const isKnownRenderValue = isOxcRenderValueExpression(expression) || sameModuleComponentCall;
+  const renderMode = sameModuleComponentStreamCall !== undefined
+    ? ("stream-node" as const)
+    : isKnownRenderValue
+      ? bodyStatementJsx === "server-string"
+        ? ("html" as const)
+        : ("dynamic" as const)
+    : loweredNestedJsx !== undefined && bodyStatementJsx === "server-string"
+      ? ("html" as const)
+      : loweredNestedJsx !== undefined && bodyStatementJsx === "dom-node"
+        ? ("dynamic" as const)
+        : undefined;
 
   return [
     {
       kind: "expr",
       code:
         sameModuleComponentStreamCall ??
-        (containsOxcJsxSyntax(unwrappedExpression)
+        (containsNestedJsx
           ? normalizeOxcExpressionCode(
-              context.lowerNestedJsxExpression(
-                code,
-                expression,
-                context.componentNames,
-                context.target,
-                context.diagnostics,
-                bodyStatementJsx,
-              ) ??
+              loweredNestedJsx ??
                 (bodyStatementJsx === "compat-object"
                   ? stripOxcGeneratedImports(transformJsxWithOxc(readSource(code, expression)))
                   : readOxcReactiveExpressionCode(code, expression, context)),
             )
           : readOxcReactiveExpressionCode(code, expression, context)),
-      ...(isOxcRenderValueExpression(expression) || sameModuleComponentCall
-        ? {
-            renderMode:
-              sameModuleComponentStreamCall !== undefined
-                ? ("stream-node" as const)
-                : bodyStatementJsx === "server-string"
-                  ? ("html" as const)
-                  : ("dynamic" as const),
-          }
-        : {}),
+      ...(renderMode === undefined ? {} : { renderMode }),
     },
   ];
 }

package/src/oxc-dom-lowering.ts

@@ -17,6 +17,28 @@ export function lowerOxcDomNodeExpression(
     }
   }
 
+  if (unwrapped.type === "LogicalExpression") {
+    const right = lowerOxcDomNodeExpression(code, readObject(unwrapped.right));
+
+    if (right !== undefined && unwrapped.operator === "&&") {
+      return `((${readSource(code, readObject(unwrapped.left))}) ? ${right} : false)`;
+    }
+
+    if (right !== undefined && unwrapped.operator === "||") {
+      const left = readSource(code, readObject(unwrapped.left));
+      return `((${left}) ? ${left} : ${right})`;
+    }
+  }
+
+  if (unwrapped.type === "ArrayExpression") {
+    return `[${readArray(unwrapped.elements).map((element) => {
+      const object = readObject(element);
+      return Object.keys(object).length === 0
+        ? "undefined"
+        : (lowerOxcDomNodeExpression(code, object) ?? readSource(code, object));
+    }).join(", ")}]`;
+  }
+
   if (unwrapped.type === "Literal" && (unwrapped.value === null || unwrapped.value === false)) {
     return 'document.createTextNode("")';
   }

package/src/oxc-render-values.ts

@@ -561,7 +561,13 @@ function isJsxLikeInitializer(node: Record<string, unknown>): boolean {
       isJsxLikeInitializer(readObject(node.left)) || isJsxLikeInitializer(readObject(node.right))
     );
   }
-  if (node.type === "ArrayExpression" || node.type === "ObjectExpression") {
+  if (node.type === "ArrayExpression") {
+    return readArray(node.elements).some((element) => {
+      const object = readObject(element);
+      return Object.keys(object).length > 0 && isJsxLikeInitializer(object);
+    });
+  }
+  if (node.type === "ObjectExpression") {
     return false;
   }
   return containsOxcJsxSyntax(node);