@reckona/mreact-compiler 0.0.152 → 0.0.154

package/src/oxc-render-values.ts

@@ -818,6 +818,10 @@ function analyzeOxcReactiveAliasExpression(
 }
 
 function containsAssignmentTo(node: Record<string, unknown>, name: string): boolean {
+  if (isOxcFunctionNode(node) && oxcFunctionShadowsName(node, name)) {
+    return false;
+  }
+
   if (node.type === "AssignmentExpression") {
     const left = readObject(node.left);
     if (left.type === "Identifier" && left.name === name) return true;
@@ -844,6 +848,12 @@ function containsAssignmentTo(node: Record<string, unknown>, name: string): bool
   return false;
 }
 
+function oxcFunctionShadowsName(functionNode: Record<string, unknown>, name: string): boolean {
+  const localBindings = new Set<string>();
+  collectOxcFunctionLocalBindings(functionNode, localBindings);
+  return localBindings.has(name);
+}
+
 function collectOxcPushJsxBindingNames(statements: readonly unknown[], names: Set<string>): void {
   for (const statement of statements) {
     const object = readObject(statement);

package/src/oxc-runtime-emit.ts

@@ -45,7 +45,12 @@ function emitOxcServerStringNode(node: JsxNodeIr): string {
 
   if (node.kind === "list") {
     const parameters = emitOxcListParameters(node);
-    return `(${node.itemsCode}).map((${parameters}) => ${emitOxcServerStringChildren(node.children)}).join("")`;
+    const valueExpression = emitOxcServerStringChildren(node.children);
+    if (node.bodyStatements === undefined || node.bodyStatements.length === 0) {
+      return `(${node.itemsCode}).map((${parameters}) => ${valueExpression}).join("")`;
+    }
+
+    return `(${node.itemsCode}).map((${parameters}) => {\n${node.bodyStatements.map((statement) => `  ${statement}`).join("\n")}\n  return ${valueExpression};\n}).join("")`;
   }
 
   if (node.kind === "fragment") {

package/src/oxc-transform.ts

@@ -44,12 +44,18 @@ function rememberStrippedTypeScript(source: string, stripped: string): void {
 }
 
 function needsTypeScriptStripping(source: string): boolean {
+  // This is intentionally an over-approximation: false positives cost an oxc
+  // pass, but false negatives leak TypeScript syntax into emitted JavaScript.
   return (
     /\bimport\s+type\b/.test(source) ||
+    /\bexport\s+type\b/.test(source) ||
     /\btype\s+[A-Za-z_$][\w$]*\b/.test(source) ||
     /\binterface\s+[A-Za-z_$][\w$]*\b/.test(source) ||
+    /<[^>\n]+\bextends\b[^>\n]*>\s*\(/.test(source) ||
     /\b[A-Za-z_$][\w$.]*\s*<[^>\n]+>\s*\(/.test(source) ||
     /\bas\s+(?:const|[A-Za-z_$][\w$]*)\b/.test(source) ||
+    /\bsatisfies\s+[A-Za-z_$][\w$<>,\s|&.[\]?]*/.test(source) ||
+    /[A-Za-z_$)\]}]\s*!\s*(?=[,.;)\]}])/.test(source) ||
     /:\s*[A-Za-z_$][\w$<>,\s|&.[\]?]*(?=[,)=;{])/.test(source)
   );
 }

package/src/oxc.ts

@@ -70,6 +70,12 @@ import {
   analyzeOxcJsxNode,
   type OxcChildAnalysisContext,
 } from "./oxc-child-analysis.js";
+import {
+  analyzeCompatCreateElementRoot,
+  collectCompatCreateElementNames,
+  collectFunctionShadowedNames,
+  hasLowerableCompatCreateElementReturn,
+} from "./oxc-compat-create-element.js";
 import { lowerOxcDomNodeExpression } from "./oxc-dom-lowering.js";
 import {
   lowerOxcCompatObjectExpression,
@@ -239,6 +245,12 @@ function analyzeOxcToIr(
       : undefined;
   const localJsxReturnFunctionNames =
     target === "server" ? collectOxcLocalJsxReturnFunctionNames(program) : new Set<string>();
+  // Stream emit keeps interpreting compat trees for now; only the string
+  // pipeline lowers createElement calls.
+  const compatCreateElementNames =
+    target === "server" && options?.serverOutput !== "stream"
+      ? collectCompatCreateElementNames(program)
+      : new Set<string>();
   const localJsxHelperHtmlParameters =
     target === "server"
       ? collectLocalJsxHelperHtmlParameters(program, localJsxReturnFunctionNames)
@@ -265,6 +277,7 @@ function analyzeOxcToIr(
 
     if (
       isOxcJsxComponentStatement(statement, localJsxReturnFunctionNames) ||
+      isCompatCreateElementComponentStatement(code, statement, compatCreateElementNames) ||
       (options?.compatReactNodeReturn === true && isOxcExportedFunctionLike(statement))
     ) {
       const declaration = readObject(readObject(statement).declaration);
@@ -328,6 +341,7 @@ function analyzeOxcToIr(
       target,
       diagnostics,
       options?.bodyStatementJsx ?? "dom-node",
+      compatCreateElementNames,
       moduleRenderValueBindings,
       options?.compatReactNodeReturn === true,
       options?.serverOutput,
@@ -476,6 +490,97 @@ function collectOxcReturnExpressions(
   return [];
 }
 
+interface CompatCreateElementComponent {
+  name: string;
+  initializer: Record<string, unknown>;
+}
+
+function readCompatCreateElementFunctionLike(
+  code: string,
+  expression: Record<string, unknown>,
+  names: ReadonlySet<string>,
+): Record<string, unknown> | undefined {
+  const functionLike = unwrapOxcComponentFunctionLikeInitializer(expression);
+
+  return functionLike !== undefined &&
+    hasLowerableCompatCreateElementReturn(code, functionLike, names)
+    ? functionLike
+    : undefined;
+}
+
+function readCompatCreateElementPlainComponent(
+  code: string,
+  statement: unknown,
+  names: ReadonlySet<string>,
+): CompatCreateElementComponent | undefined {
+  if (names.size === 0) {
+    return undefined;
+  }
+
+  const object = readObject(statement);
+
+  if (
+    object.type === "FunctionDeclaration" &&
+    hasLowerableCompatCreateElementReturn(code, object, names)
+  ) {
+    const id = readObject(object.id);
+    return typeof id.name === "string" ? { name: id.name, initializer: object } : undefined;
+  }
+
+  if (object.type !== "VariableDeclaration") {
+    return undefined;
+  }
+
+  for (const declarator of readArray(object.declarations)) {
+    const declaratorObject = readObject(declarator);
+    const id = readObject(declaratorObject.id);
+
+    if (typeof id.name !== "string" || !/^[A-Z]/.test(id.name)) {
+      continue;
+    }
+
+    const initializer = readCompatCreateElementFunctionLike(
+      code,
+      readObject(declaratorObject.init),
+      names,
+    );
+
+    if (initializer !== undefined) {
+      return { name: id.name, initializer };
+    }
+  }
+
+  return undefined;
+}
+
+function isCompatCreateElementComponentStatement(
+  code: string,
+  statement: unknown,
+  names: ReadonlySet<string>,
+): boolean {
+  if (names.size === 0) {
+    return false;
+  }
+
+  const object = readObject(statement);
+
+  if (object.type === "ExportDefaultDeclaration") {
+    return readCompatCreateElementFunctionLike(code, readObject(object.declaration), names) !== undefined;
+  }
+
+  if (object.type === "ExportNamedDeclaration") {
+    const declaration = readObject(object.declaration);
+
+    if (declaration.type === "FunctionDeclaration") {
+      return hasLowerableCompatCreateElementReturn(code, declaration, names);
+    }
+
+    return readCompatCreateElementPlainComponent(code, declaration, names) !== undefined;
+  }
+
+  return readCompatCreateElementPlainComponent(code, statement, names) !== undefined;
+}
+
 function analyzeOxcComponent(
   code: string,
   statement: unknown,
@@ -483,6 +588,7 @@ function analyzeOxcComponent(
   target: CompileTarget,
   diagnostics: Diagnostic[],
   bodyStatementJsx: OxcBodyStatementJsxMode,
+  compatCreateElementNames: ReadonlySet<string>,
   moduleRenderValueBindings: Set<string>,
   compatReactNodeReturn: boolean,
   serverOutput: AnalyzeModuleOptions["serverOutput"],
@@ -497,7 +603,11 @@ function analyzeOxcComponent(
   if (object.type === "ExportDefaultDeclaration") {
     const declaration = unwrapOxcComponentFunctionLikeInitializer(readObject(object.declaration));
 
-    if (declaration === undefined || !hasOxcFunctionLikeComponentReturn(declaration)) {
+    if (
+      declaration === undefined ||
+      (!hasOxcFunctionLikeComponentReturn(declaration) &&
+        !hasLowerableCompatCreateElementReturn(code, declaration, compatCreateElementNames))
+    ) {
       return [];
     }
     const id = readObject(declaration.id);
@@ -513,6 +623,7 @@ function analyzeOxcComponent(
         target,
         diagnostics,
         bodyStatementJsx,
+        compatCreateElementNames,
         moduleRenderValueBindings,
         compatReactNodeReturn,
         serverOutput,
@@ -527,7 +638,9 @@ function analyzeOxcComponent(
   }
 
   if (object.type !== "ExportNamedDeclaration") {
-    const plainComponent = readOxcPlainComponent(statement);
+    const plainComponent =
+      readOxcPlainComponent(statement) ??
+      readCompatCreateElementPlainComponent(code, statement, compatCreateElementNames);
 
     if (plainComponent === undefined) {
       return [];
@@ -544,6 +657,7 @@ function analyzeOxcComponent(
           target,
           diagnostics,
           bodyStatementJsx,
+          compatCreateElementNames,
           moduleRenderValueBindings,
           compatReactNodeReturn,
           serverOutput,
@@ -561,7 +675,9 @@ function analyzeOxcComponent(
   const declaration = readObject(object.declaration);
 
   if (declaration.type === "VariableDeclaration") {
-    const variableComponent = readOxcVariableComponentDeclaration(declaration);
+    const variableComponent =
+      readOxcVariableComponentDeclaration(declaration) ??
+      readCompatCreateElementPlainComponent(code, declaration, compatCreateElementNames);
 
     if (variableComponent === undefined) {
       return [];
@@ -577,6 +693,7 @@ function analyzeOxcComponent(
         target,
         diagnostics,
         bodyStatementJsx,
+        compatCreateElementNames,
         moduleRenderValueBindings,
         compatReactNodeReturn,
         serverOutput,
@@ -593,7 +710,8 @@ function analyzeOxcComponent(
     declaration.type !== "FunctionDeclaration" ||
     (!compatReactNodeReturn &&
       !hasComponentReturn(declaration.body) &&
-      !hasLocalJsxHelperCallReturn(declaration.body, localJsxReturnFunctionNames))
+      !hasLocalJsxHelperCallReturn(declaration.body, localJsxReturnFunctionNames) &&
+      !hasLowerableCompatCreateElementReturn(code, declaration, compatCreateElementNames))
   ) {
     return [];
   }
@@ -614,6 +732,7 @@ function analyzeOxcComponent(
       target,
       diagnostics,
       bodyStatementJsx,
+      compatCreateElementNames,
       moduleRenderValueBindings,
       compatReactNodeReturn,
       serverOutput,
@@ -663,6 +782,7 @@ function analyzeOxcFunctionLikeComponent(
   target: CompileTarget,
   diagnostics: Diagnostic[],
   bodyStatementJsx: OxcBodyStatementJsxMode,
+  compatCreateElementNames: ReadonlySet<string>,
   moduleRenderValueBindings: Set<string>,
   compatReactNodeReturn: boolean,
   serverOutput: AnalyzeModuleOptions["serverOutput"],
@@ -743,6 +863,12 @@ function analyzeOxcFunctionLikeComponent(
   const root =
     analyzeOxcEarlyIfRootReturn(code, earlyIfRootReturn, childAnalysisContext, bodyStatementJsx) ??
     analyzeOxcSwitchRootReturn(code, rootStatement, childAnalysisContext, bodyStatementJsx) ??
+    (compatCreateElementNames.size === 0
+      ? undefined
+      : analyzeCompatCreateElementRoot(code, returnExpression, {
+          names: compatCreateElementNames,
+          shadowed: collectFunctionShadowedNames(functionLike, compatCreateElementNames),
+        })) ??
     (isJsxRoot(returnExpression.type) || returnExpression.type === "JSXFragment"
       ? analyzeOxcJsxNode(code, returnExpression, childAnalysisContext)
       : isOxcComponentCallExpression(returnExpression)

package/src/transform.ts

@@ -162,6 +162,10 @@ function transformWithAnalyzer(
       metadata.serverHydration = true;
     }
 
+    if (input.serverAwaitHydration === true) {
+      metadata.serverAwaitHydration = true;
+    }
+
     if (input.reactSuspenseRevealScriptSrc !== undefined) {
       metadata.reactSuspenseRevealScriptSrc = input.reactSuspenseRevealScriptSrc;
     }
@@ -518,16 +522,16 @@ function dedupeAndSortSegments(segments: readonly SourceMapSegment[]): SourceMap
 
 const sourceMapBase64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
-function encodeVlq(value: number): string {
-  let vlq = value < 0 ? (-value << 1) + 1 : value << 1;
+export function encodeVlq(value: number): string {
+  let vlq = value < 0 ? -value * 2 + 1 : value * 2;
   let encoded = "";
 
   do {
-    let digit = vlq & 31;
-    vlq >>>= 5;
+    let digit = vlq % 32;
+    vlq = Math.floor(vlq / 32);
 
     if (vlq > 0) {
-      digit |= 32;
+      digit += 32;
     }
 
     encoded += sourceMapBase64[digit] ?? "";