@reckona/mreact-compiler 0.0.119 → 0.0.121

package/src/oxc-component-references.ts

@@ -20,6 +20,7 @@ interface ClientReferenceAliasState {
 export function collectOxcClientBoundaryImportComponents(
   program: unknown,
   inferredBoundaryImports: ReadonlySet<string>,
+  fallbackBoundaryImports: ReadonlySet<string> = new Set(),
 ): Map<string, ClientReferenceIr> {
   const names = new Map<string, ClientReferenceIr>();
 
@@ -45,21 +46,21 @@ export function collectOxcClientBoundaryImportComponents(
       }
 
       if (specifierObject.type === "ImportDefaultSpecifier") {
-        names.set(localName, { moduleId, exportName: "default" });
+        names.set(localName, clientReference(moduleId, "default", fallbackBoundaryImports));
         continue;
       }
 
       if (specifierObject.type === "ImportNamespaceSpecifier") {
-        names.set(localName, { moduleId, exportName: "*" });
+        names.set(localName, clientReference(moduleId, "*", fallbackBoundaryImports));
         continue;
       }
 
       if (specifierObject.type === "ImportSpecifier" && specifierObject.importKind !== "type") {
         const imported = readObject(specifierObject.imported);
-        names.set(localName, {
-          moduleId,
-          exportName: String(imported.name ?? localName),
-        });
+        names.set(
+          localName,
+          clientReference(moduleId, String(imported.name ?? localName), fallbackBoundaryImports),
+        );
       }
     }
   }
@@ -68,6 +69,18 @@ export function collectOxcClientBoundaryImportComponents(
   return names;
 }
 
+function clientReference(
+  moduleId: string,
+  exportName: string,
+  fallbackBoundaryImports: ReadonlySet<string>,
+): ClientReferenceIr {
+  return {
+    moduleId,
+    exportName,
+    ...(fallbackBoundaryImports.has(moduleId) ? { ssrFallback: true } : {}),
+  };
+}
+
 export function collectOxcCompatRuntimeImportComponents(
   program: unknown,
 ): Map<string, ClientReferenceIr> {
@@ -207,7 +220,9 @@ function isOxcClientBoundaryImport(
   inferredBoundaryImports: ReadonlySet<string>,
 ): boolean {
   const moduleId = String(readObject(statement.source).value ?? "");
-  return inferredBoundaryImports.has(moduleId) || /\.(?:client|compat)\.[cm]?[jt]sx?$/.test(moduleId);
+  return (
+    inferredBoundaryImports.has(moduleId) || /\.(?:client|compat)\.[cm]?[jt]sx?$/.test(moduleId)
+  );
 }
 
 function findOxcClientReference(
@@ -295,9 +310,7 @@ function collectOxcCompatReactNodeClassReferences(
   }
 }
 
-function readOxcClassComponentName(
-  node: Record<string, unknown> | undefined,
-): string | undefined {
+function readOxcClassComponentName(node: Record<string, unknown> | undefined): string | undefined {
   if (node?.type === "ClassDeclaration" || node?.type === "ClassExpression") {
     const id = readOptionalObject(node.id);
     const name = typeof id?.name === "string" ? id.name : undefined;
@@ -451,7 +464,11 @@ function collectOxcObjectLiteralClientReferenceAliases(
       continue;
     }
 
-    const keyName = propertyName(readOptionalObject(property.key), property.computed === true, state);
+    const keyName = propertyName(
+      readOptionalObject(property.key),
+      property.computed === true,
+      state,
+    );
     const value = readOptionalObject(property.value);
     if (keyName !== undefined) {
       addObjectMemberKey(state, objectName, keyName);
@@ -561,9 +578,12 @@ function expressionClientReference(
 
   if (node.type === "MemberExpression") {
     const objectName = expressionObjectName(readOptionalObject(node.object), state);
-    const memberName = propertyName(readOptionalObject(node.property), node.computed === true, state);
-    const objectReference =
-      objectName === undefined ? undefined : state.references.get(objectName);
+    const memberName = propertyName(
+      readOptionalObject(node.property),
+      node.computed === true,
+      state,
+    );
+    const objectReference = objectName === undefined ? undefined : state.references.get(objectName);
 
     if (objectName !== undefined && memberName !== undefined) {
       const objectMember = state.objectMembers.get(objectName)?.get(memberName);
@@ -587,15 +607,19 @@ function expressionClientReference(
 
     if (objectName !== undefined && memberName === undefined) {
       return selectClientReference(
-        [...objectMemberReferences(state, objectName), ...dynamicObjectMemberReferences(state, objectName)],
+        [
+          ...objectMemberReferences(state, objectName),
+          ...dynamicObjectMemberReferences(state, objectName),
+        ],
         state.allowAmbiguousAliases,
       );
     }
 
     if (objectName === undefined && memberName !== undefined) {
       const references = [
-        ...expressionObjectNameCandidates(readOptionalObject(node.object), state)
-          .map((candidate) => state.objectMembers.get(candidate)?.get(memberName)),
+        ...expressionObjectNameCandidates(readOptionalObject(node.object), state).map((candidate) =>
+          state.objectMembers.get(candidate)?.get(memberName),
+        ),
         ...expressionDynamicObjectNestedMemberReferences(
           readOptionalObject(node.object),
           memberName,
@@ -643,12 +667,17 @@ function objectEntryMemberReference(
     return undefined;
   }
 
-  if (state.allowAmbiguousAliases && state.globModuleMaps.has(sourceName) && memberName === "default") {
+  if (
+    state.allowAmbiguousAliases &&
+    state.globModuleMaps.has(sourceName) &&
+    memberName === "default"
+  ) {
     return unknownCompatReference;
   }
 
-  const references = Array.from(state.objectMemberKeys.get(sourceName) ?? [])
-    .map((key) => state.objectMembers.get(`${sourceName}.${key}`)?.get(memberName));
+  const references = Array.from(state.objectMemberKeys.get(sourceName) ?? []).map((key) =>
+    state.objectMembers.get(`${sourceName}.${key}`)?.get(memberName),
+  );
   return selectClientReference(references, state.allowAmbiguousAliases);
 }
 
@@ -693,7 +722,11 @@ function expressionObjectName(
 
   if (node?.type === "MemberExpression") {
     const objectName = expressionObjectName(readOptionalObject(node.object), state);
-    const memberName = propertyName(readOptionalObject(node.property), node.computed === true, state);
+    const memberName = propertyName(
+      readOptionalObject(node.property),
+      node.computed === true,
+      state,
+    );
 
     return objectName !== undefined && memberName !== undefined
       ? `${objectName}.${memberName}`
@@ -791,7 +824,11 @@ function collectDynamicObjectNestedMemberReferences(
       continue;
     }
 
-    const keyName = propertyName(readOptionalObject(property.key), property.computed === true, state);
+    const keyName = propertyName(
+      readOptionalObject(property.key),
+      property.computed === true,
+      state,
+    );
     const reference = expressionClientReference(readOptionalObject(property.value), state);
     if (keyName !== undefined && reference !== undefined) {
       addDynamicObjectNestedMemberReference(state, objectName, keyName, reference);
@@ -805,7 +842,8 @@ function addDynamicObjectNestedMemberReference(
   memberName: string,
   reference: ClientReferenceIr,
 ): void {
-  const members = state.dynamicObjectNestedMembers.get(objectName) ?? new Map<string, ClientReferenceIr[]>();
+  const members =
+    state.dynamicObjectNestedMembers.get(objectName) ?? new Map<string, ClientReferenceIr[]>();
   const references = members.get(memberName) ?? [];
   references.push(reference);
   members.set(memberName, references);
@@ -830,8 +868,12 @@ function isObjectAssignCall(node: Record<string, unknown>): boolean {
 
   const object = readOptionalObject(callee.object);
   const property = readOptionalObject(callee.property);
-  return object?.type === "Identifier" && object.name === "Object" &&
-    property?.type === "Identifier" && property.name === "assign";
+  return (
+    object?.type === "Identifier" &&
+    object.name === "Object" &&
+    property?.type === "Identifier" &&
+    property.name === "assign"
+  );
 }
 
 function isObjectEntriesCall(node: Record<string, unknown> | undefined): boolean {
@@ -842,8 +884,12 @@ function isObjectEntriesCall(node: Record<string, unknown> | undefined): boolean
 
   const object = readOptionalObject(callee.object);
   const property = readOptionalObject(callee.property);
-  return object?.type === "Identifier" && object.name === "Object" &&
-    property?.type === "Identifier" && property.name === "entries";
+  return (
+    object?.type === "Identifier" &&
+    object.name === "Object" &&
+    property?.type === "Identifier" &&
+    property.name === "entries"
+  );
 }
 
 function isImportMetaGlobEagerCall(node: Record<string, unknown> | undefined): boolean {
@@ -861,8 +907,13 @@ function isImportMetaGlobEagerCall(node: Record<string, unknown> | undefined): b
   const meta = readOptionalObject(metaProperty?.meta);
   const metaName = meta?.type === "Identifier" ? meta.name : undefined;
   const propertyName = readOptionalObject(metaProperty?.property);
-  const importMetaPropertyName = propertyName?.type === "Identifier" ? propertyName.name : undefined;
-  if (metaProperty?.type !== "MetaProperty" || metaName !== "import" || importMetaPropertyName !== "meta") {
+  const importMetaPropertyName =
+    propertyName?.type === "Identifier" ? propertyName.name : undefined;
+  if (
+    metaProperty?.type !== "MetaProperty" ||
+    metaName !== "import" ||
+    importMetaPropertyName !== "meta"
+  ) {
     return false;
   }
 
@@ -875,12 +926,14 @@ function isImportMetaGlobEagerCall(node: Record<string, unknown> | undefined): b
     const property = readOptionalObject(propertyValue);
     const key = readOptionalObject(property?.key);
     const value = readOptionalObject(property?.value);
-    return property?.type === "Property" &&
+    return (
+      property?.type === "Property" &&
       property.computed !== true &&
       key?.type === "Identifier" &&
       key.name === "eager" &&
       value?.type === "Literal" &&
-      value.value === true;
+      value.value === true
+    );
   });
 }
 
@@ -972,9 +1025,8 @@ function forOfObjectEntriesValueBindingName(
     node?.type === "VariableDeclaration"
       ? readOptionalObject(readArray(node.declarations)[0])
       : undefined;
-  const pattern = declaration?.type === "VariableDeclarator"
-    ? readOptionalObject(declaration.id)
-    : node;
+  const pattern =
+    declaration?.type === "VariableDeclarator" ? readOptionalObject(declaration.id) : node;
 
   if (pattern?.type !== "ArrayPattern") {
     return undefined;

package/src/oxc.ts

@@ -1,9 +1,6 @@
 import { parseSync } from "oxc-parser";
 import { unsupportedTopLevelJsxInitializerDiagnostic } from "./diagnostics.js";
-import {
-  type AnalyzeToIrInput,
-  type AnalyzeToIrOutput,
-} from "./internal.js";
+import { type AnalyzeToIrInput, type AnalyzeToIrOutput } from "./internal.js";
 import {
   createCompilerModuleContextWithOxc,
   type CompilerModuleContext,
@@ -80,10 +77,7 @@ import {
   lowerOxcNestedJsxExpression,
   lowerOxcServerStringExpression,
 } from "./oxc-nested-lowering.js";
-import {
-  isOxcJsxBranch,
-  readOxcReturnExpressionFromStatement,
-} from "./oxc-expression-utils.js";
+import { isOxcJsxBranch, readOxcReturnExpressionFromStatement } from "./oxc-expression-utils.js";
 import {
   collectOxcBodyJsxBindingNames,
   collectOxcReactiveDerivedFunctionNames,
@@ -183,13 +177,10 @@ export function analyzeOxcParity(input: AnalyzeToIrInput): OxcParityResult {
 }
 
 export function analyzeWithOxc(input: AnalyzeToIrInput): AnalyzeToIrOutput {
-  return analyzeCompilerModuleContextWithOxc(
-    createCompilerModuleContextWithOxc(input),
-    {
-      target: input.target,
-      ...(input.options === undefined ? {} : { options: input.options }),
-    },
-  );
+  return analyzeCompilerModuleContextWithOxc(createCompilerModuleContextWithOxc(input), {
+    target: input.target,
+    ...(input.options === undefined ? {} : { options: input.options }),
+  });
 }
 
 export function analyzeCompilerModuleContextWithOxc(
@@ -239,6 +230,7 @@ function analyzeOxcToIr(
   const clientBoundaryImports = collectOxcClientBoundaryImportComponents(
     program,
     new Set(options?.clientBoundaryImports ?? []),
+    new Set(options?.clientBoundaryFallbackImports ?? []),
   );
   const compatRuntimeImports = collectOxcCompatRuntimeImportComponents(program);
   const compatReactNodeReferences =
@@ -376,7 +368,9 @@ function analyzeOxcToIr(
 }
 
 function isCssImportSource(source: unknown): boolean {
-  return typeof source === "string" && /\.(?:css|pcss|postcss|scss|sass|less|styl|stylus)$/u.test(source);
+  return (
+    typeof source === "string" && /\.(?:css|pcss|postcss|scss|sass|less|styl|stylus)$/u.test(source)
+  );
 }
 
 function componentNamesFromProgram(
@@ -451,7 +445,9 @@ function collectLocalJsxHelperHtmlParameters(
   return parameters;
 }
 
-function collectOxcReturnExpressions(statement: Record<string, unknown>): Record<string, unknown>[] {
+function collectOxcReturnExpressions(
+  statement: Record<string, unknown>,
+): Record<string, unknown>[] {
   if (statement.type === "ReturnStatement") {
     return [unwrapOxcParentheses(readObject(statement.argument))];
   }
@@ -745,18 +741,8 @@ function analyzeOxcFunctionLikeComponent(
     bodyLowerers,
   );
   const root =
-    analyzeOxcEarlyIfRootReturn(
-      code,
-      earlyIfRootReturn,
-      childAnalysisContext,
-      bodyStatementJsx,
-    ) ??
-    analyzeOxcSwitchRootReturn(
-      code,
-      rootStatement,
-      childAnalysisContext,
-      bodyStatementJsx,
-    ) ??
+    analyzeOxcEarlyIfRootReturn(code, earlyIfRootReturn, childAnalysisContext, bodyStatementJsx) ??
+    analyzeOxcSwitchRootReturn(code, rootStatement, childAnalysisContext, bodyStatementJsx) ??
     (isJsxRoot(returnExpression.type) || returnExpression.type === "JSXFragment"
       ? analyzeOxcJsxNode(code, returnExpression, childAnalysisContext)
       : isOxcComponentCallExpression(returnExpression)
@@ -778,30 +764,29 @@ function analyzeOxcFunctionLikeComponent(
               ),
               renderMode: "html" as const,
             }
-        : analyzeOxcDynamicRootReturn(
-            code,
-            returnExpression,
-            childAnalysisContext,
-            bodyStatementJsx,
-          ) ??
-          {
-            kind: "expr" as const,
-            code: normalizeOxcExpressionCode(
-              compatReactNodeReturn
-                ? (lowerOxcCompatReactNodeExpression(
-                    code,
-                    returnExpression,
-                    componentNames,
-                    target,
-                    diagnostics,
-                  ) ??
-                    stripOxcGeneratedImports(
-                      transformJsxToCreateElementWithOxc(readSource(code, returnExpression)),
-                    ))
-                : readSource(code, returnExpression),
-            ),
-            ...(compatReactNodeReturn ? { renderMode: "react-node" as const } : {}),
-          });
+          : (analyzeOxcDynamicRootReturn(
+              code,
+              returnExpression,
+              childAnalysisContext,
+              bodyStatementJsx,
+            ) ?? {
+              kind: "expr" as const,
+              code: normalizeOxcExpressionCode(
+                compatReactNodeReturn
+                  ? (lowerOxcCompatReactNodeExpression(
+                      code,
+                      returnExpression,
+                      componentNames,
+                      target,
+                      diagnostics,
+                    ) ??
+                      stripOxcGeneratedImports(
+                        transformJsxToCreateElementWithOxc(readSource(code, returnExpression)),
+                      ))
+                  : readSource(code, returnExpression),
+              ),
+              ...(compatReactNodeReturn ? { renderMode: "react-node" as const } : {}),
+            }));
   markOxcRenderValueExpressions(
     [root],
     new Set([
@@ -946,10 +931,7 @@ function isOxcRootReturnExpression(expression: Record<string, unknown>): boolean
 }
 
 function isOxcEmptyRootReturn(expression: Record<string, unknown>): boolean {
-  return (
-    expression.type === "Literal" &&
-    (expression.value === null || expression.value === false)
-  );
+  return expression.type === "Literal" && (expression.value === null || expression.value === false);
 }
 
 function isOxcRenderableRootReturn(expression: Record<string, unknown>): boolean {
@@ -966,10 +948,7 @@ function analyzeOxcDynamicRootReturnShape(expression: Record<string, unknown>):
     return true;
   }
 
-  return (
-    expression.type === "LogicalExpression" &&
-    isOxcJsxBranch(readObject(expression.right))
-  );
+  return expression.type === "LogicalExpression" && isOxcJsxBranch(readObject(expression.right));
 }
 
 function findOxcRootStatement(body: readonly unknown[]): unknown | undefined {
@@ -1091,12 +1070,7 @@ function analyzeOxcEarlyIfRootReturn(
       {
         kind: "conditional",
         conditionCode: readOxcReactiveRootConditionCode(code, branch.test, context),
-        whenTrue: analyzeOxcDynamicRootBranch(
-          code,
-          branch.consequent,
-          context,
-          bodyStatementJsx,
-        ),
+        whenTrue: analyzeOxcDynamicRootBranch(code, branch.consequent, context, bodyStatementJsx),
         whenFalse: fallback,
       },
     ];

package/src/transform.ts

@@ -28,9 +28,7 @@ export function transform(input: TransformInput): TransformOutput {
 export function transformCompilerModuleContext(
   input: TransformInput & { moduleContext: CompilerModuleContext },
 ): TransformOutput {
-  if (
-    (input.moduleContext.code !== input.code || input.moduleContext.filename !== input.filename)
-  ) {
+  if (input.moduleContext.code !== input.code || input.moduleContext.filename !== input.filename) {
     throw new Error("Transform input moduleContext must match the input code and filename.");
   }
 
@@ -44,10 +42,7 @@ export function transformCompilerModuleContext(
 
 function transformWithAnalyzer(
   input: TransformInput,
-  analyze: (
-    target: AnalyzeToIrInput["target"],
-    options: AnalyzeModuleOptions,
-  ) => AnalyzeToIrOutput,
+  analyze: (target: AnalyzeToIrInput["target"], options: AnalyzeModuleOptions) => AnalyzeToIrOutput,
 ): TransformOutput {
   const mode = input.mode ?? "reactive";
   const serverOutput = input.serverOutput ?? "string";
@@ -71,6 +66,7 @@ function transformWithAnalyzer(
     awaitCompatComponents:
       input.target === "server" && serverOutput === "stream" ? "lower" : "diagnostic",
     clientBoundaryImports: input.clientBoundaryImports ?? [],
+    clientBoundaryFallbackImports: input.clientBoundaryFallbackImports ?? [],
     compatReactNodeReturn: mode === "compat",
     ...(mode === "compat" && input.target === "server"
       ? { compatReactNodeReturnRenderMode: "react-node" as const }
@@ -83,36 +79,30 @@ function transformWithAnalyzer(
       ? emitCompat(analyzed.ir, { dev: input.dev })
       : input.target === "server"
         ? serverOutput === "stream"
-          ? emitServerStream(
-              analyzed.ir,
-              {
-                ...createServerOptions(
-                  serverBootstrap,
-                  input.serverBootstrapNonce,
-                  input.serverBootstrapSrc,
-                  input.serverHydration,
-                  input.reactSuspenseRevealScriptSrc,
-                ),
-                ...(input.serverAwaitHydration === true
-                  ? { serverAwaitHydration: true as const }
-                  : {}),
-                dynamicAttributes: mode === "compat" ? "drop" : "emit",
-                escape: input.serverEscape,
-              },
-            )
-          : emitServer(
-              analyzed.ir,
-              {
-                ...createServerOptions(
-                  serverBootstrap,
-                  input.serverBootstrapNonce,
-                  input.serverBootstrapSrc,
-                  input.serverHydration,
-                ),
-                dynamicAttributes: mode === "compat" ? "drop" : "emit",
-                escape: input.serverEscape,
-              },
-            )
+          ? emitServerStream(analyzed.ir, {
+              ...createServerOptions(
+                serverBootstrap,
+                input.serverBootstrapNonce,
+                input.serverBootstrapSrc,
+                input.serverHydration,
+                input.reactSuspenseRevealScriptSrc,
+              ),
+              ...(input.serverAwaitHydration === true
+                ? { serverAwaitHydration: true as const }
+                : {}),
+              dynamicAttributes: mode === "compat" ? "drop" : "emit",
+              escape: input.serverEscape,
+            })
+          : emitServer(analyzed.ir, {
+              ...createServerOptions(
+                serverBootstrap,
+                input.serverBootstrapNonce,
+                input.serverBootstrapSrc,
+                input.serverHydration,
+              ),
+              dynamicAttributes: mode === "compat" ? "drop" : "emit",
+              escape: input.serverEscape,
+            })
         : emitClient(analyzed.ir);
 
   const metadata: ModuleMetadata = {
@@ -321,8 +311,16 @@ function collectSourceMapSegments(
     const sourceLocation =
       bindPropAttribute === undefined
         ? undefined
-        : (findSourceLocation(sourceLines, `${bindPropAttribute}={${dynamicExpression}}`, searchState) ??
-          findSourceLocation(sourceLines, `${bindPropAttribute}="${dynamicExpression}"`, searchState));
+        : (findSourceLocation(
+            sourceLines,
+            `${bindPropAttribute}={${dynamicExpression}}`,
+            searchState,
+          ) ??
+          findSourceLocation(
+            sourceLines,
+            `${bindPropAttribute}="${dynamicExpression}"`,
+            searchState,
+          ));
     const fallbackSourceLocation =
       findSourceLocation(sourceLines, `{${dynamicExpression}}`, searchState) ??
       findJsxExpressionTokenLocation(sourceLines, dynamicExpression) ??
@@ -561,11 +559,14 @@ function collectClientReferenceManifestFromNode(
   references: Map<string, ClientReferenceMetadata>,
 ): void {
   if (node.kind === "component" && node.clientReference !== undefined) {
-    references.set(`${node.name}:${node.clientReference.moduleId}:${node.clientReference.exportName}`, {
-      name: node.name,
-      moduleId: node.clientReference.moduleId,
-      exportName: node.clientReference.exportName,
-    });
+    references.set(
+      `${node.name}:${node.clientReference.moduleId}:${node.clientReference.exportName}`,
+      {
+        name: node.name,
+        moduleId: node.clientReference.moduleId,
+        exportName: node.clientReference.exportName,
+      },
+    );
   }
 
   for (const child of getNodeChildren(node)) {
@@ -583,11 +584,12 @@ function collectClientReferenceManifestFromNode(
   }
 }
 
-function collectClientReferencesFromNode(
-  node: JsxNodeIr,
-  references: Set<string>,
-): void {
-  if (node.kind === "component" && node.runtime === "compat" && node.clientReference !== undefined) {
+function collectClientReferencesFromNode(node: JsxNodeIr, references: Set<string>): void {
+  if (
+    node.kind === "component" &&
+    node.runtime === "compat" &&
+    node.clientReference !== undefined
+  ) {
     references.add(node.name);
   }
 

package/src/types.ts

@@ -29,6 +29,7 @@ export interface AnalyzeModuleOptions {
   serverOutput?: ServerOutputMode;
   awaitCompatComponents?: "diagnostic" | "lower";
   clientBoundaryImports?: readonly string[];
+  clientBoundaryFallbackImports?: readonly string[];
   compatReactNodeReturn?: boolean;
   compatReactNodeReturnRenderMode?: "react-node";
 }
@@ -48,6 +49,7 @@ export interface TransformInput {
   serverHydration?: boolean;
   serverAwaitHydration?: boolean;
   clientBoundaryImports?: readonly string[];
+  clientBoundaryFallbackImports?: readonly string[];
   serverEscape?: ServerEscapeOptions;
   reactSuspenseRevealScriptSrc?: string;
 }