babel-plugin-react-compiler 19.0.0-beta-df7b47d-20241124 → 19.0.0-beta-37ed2a7-20241206

package/dist/index.js

@@ -136800,6 +136800,10 @@ const testComplexConfigDefaults = {
       },
       numRequiredArgs: 2,
     },
+    {
+      function: {source: 'useEffectWrapper', importSpecifierName: 'default'},
+      numRequiredArgs: 1,
+    },
   ],
 };
 function parseConfigPragmaForTests(pragma) {
@@ -137376,6 +137380,7 @@ function tryParseExternalFunction(maybeExternalFunction) {
     suggestions: null,
   });
 }
+const DEFAULT_EXPORT = 'default';
 var _MergedBlocks_map;
 function mergeConsecutiveBlocks(fn) {
   const merged = new MergedBlocks();
@@ -139817,7 +139822,15 @@ function addMemoCacheFunctionImportDeclaration(program, moduleName, localName) {
   );
 }
 z.enum(['all_errors', 'critical_errors', 'none']);
-const CompilerReactTargetSchema = z.enum(['17', '18', '19']);
+const CompilerReactTargetSchema = z.union([
+  z.literal('17'),
+  z.literal('18'),
+  z.literal('19'),
+  z.object({
+    kind: z.literal('donotuse_meta_internal'),
+    runtimeModule: z.string().default('react'),
+  }),
+]);
 z.enum(['infer', 'syntax', 'annotation', 'all']);
 const defaultOptions = {
   compilationMode: 'infer',
@@ -151524,6 +151537,7 @@ function inferEffectDependencies(fn) {
   }
   const autodepFnLoads = new Map();
   const scopeInfos = new Map();
+  const loadGlobals = new Set();
   const reactiveIds = inferReactiveIdentifiers(fn);
   for (const [, block] of fn.body.blocks) {
     if (
@@ -151545,15 +151559,22 @@ function inferEffectDependencies(fn) {
       const {value: value, lvalue: lvalue} = instr;
       if (value.kind === 'FunctionExpression') {
         fnExpressions.set(lvalue.identifier.id, instr);
-      } else if (
-        value.kind === 'LoadGlobal' &&
-        value.binding.kind === 'ImportSpecifier'
-      ) {
-        const moduleTargets = autodepFnConfigs.get(value.binding.module);
-        if (moduleTargets != null) {
-          const numRequiredArgs = moduleTargets.get(value.binding.imported);
-          if (numRequiredArgs != null) {
-            autodepFnLoads.set(lvalue.identifier.id, numRequiredArgs);
+      } else if (value.kind === 'LoadGlobal') {
+        loadGlobals.add(lvalue.identifier.id);
+        if (
+          value.binding.kind === 'ImportSpecifier' ||
+          value.binding.kind === 'ImportDefault'
+        ) {
+          const moduleTargets = autodepFnConfigs.get(value.binding.module);
+          if (moduleTargets != null) {
+            const importSpecifierName =
+              value.binding.kind === 'ImportSpecifier'
+                ? value.binding.imported
+                : DEFAULT_EXPORT;
+            const numRequiredArgs = moduleTargets.get(importSpecifierName);
+            if (numRequiredArgs != null) {
+              autodepFnLoads.set(lvalue.identifier.id, numRequiredArgs);
+            }
           }
         }
       } else if (
@@ -151561,6 +151582,15 @@ function inferEffectDependencies(fn) {
         autodepFnLoads.get(value.callee.identifier.id) === value.args.length &&
         value.args[0].kind === 'Identifier'
       ) {
+        const effectDeps = [];
+        const newInstructions = [];
+        const deps = {
+          kind: 'ArrayExpression',
+          elements: effectDeps,
+          loc: GeneratedSource,
+        };
+        const depsPlace = createTemporaryPlace(fn.env, GeneratedSource);
+        depsPlace.effect = exports.Effect.Read;
         const fnExpr = fnExpressions.get(value.args[0].identifier.id);
         if (fnExpr != null) {
           const scopeInfo =
@@ -151578,8 +151608,6 @@ function inferEffectDependencies(fn) {
               loc: fnExpr.loc,
             });
           }
-          const effectDeps = [];
-          const newInstructions = [];
           for (const dep of scopeInfo.deps) {
             const {place: place, instructions: instructions} =
               writeDependencyToInstructions(
@@ -151591,13 +151619,21 @@ function inferEffectDependencies(fn) {
             newInstructions.push(...instructions);
             effectDeps.push(place);
           }
-          const deps = {
-            kind: 'ArrayExpression',
-            elements: effectDeps,
+          newInstructions.push({
+            id: makeInstructionId(0),
             loc: GeneratedSource,
-          };
-          const depsPlace = createTemporaryPlace(fn.env, GeneratedSource);
-          depsPlace.effect = exports.Effect.Read;
+            lvalue: Object.assign(Object.assign({}, depsPlace), {
+              effect: exports.Effect.Mutate,
+            }),
+            value: deps,
+          });
+          value.args.push(
+            Object.assign(Object.assign({}, depsPlace), {
+              effect: exports.Effect.Freeze,
+            })
+          );
+          rewriteInstrs.set(instr.id, newInstructions);
+        } else if (loadGlobals.has(value.args[0].identifier.id)) {
           newInstructions.push({
             id: makeInstructionId(0),
             loc: GeneratedSource,
@@ -151660,6 +151696,9 @@ function writeDependencyToInstructions(dep, reactive, env, loc) {
     if (path.optional) {
       break;
     }
+    if (path.property === 'current') {
+      break;
+    }
     const nextValue = createTemporaryPlace(env, GeneratedSource);
     nextValue.reactive = reactive;
     instructions.push({
@@ -158495,26 +158534,24 @@ function checkFunctionReferencedBeforeDeclarationAtTopLevel(program, fns) {
   return errors.details.length > 0 ? errors : null;
 }
 function getReactCompilerRuntimeModule(opts) {
-  let moduleName = null;
-  switch (opts.target) {
-    case '17':
-    case '18': {
-      moduleName = 'react-compiler-runtime';
-      break;
-    }
-    case '19': {
-      moduleName = 'react/compiler-runtime';
-      break;
-    }
-    default:
-      CompilerError.invariant(moduleName != null, {
+  if (opts.target === '19') {
+    return 'react/compiler-runtime';
+  } else if (opts.target === '17' || opts.target === '18') {
+    return 'react-compiler-runtime';
+  } else {
+    CompilerError.invariant(
+      opts.target != null &&
+        opts.target.kind === 'donotuse_meta_internal' &&
+        typeof opts.target.runtimeModule === 'string',
+      {
         reason: 'Expected target to already be validated',
         description: null,
         loc: null,
         suggestions: null,
-      });
+      }
+    );
+    return opts.target.runtimeModule;
   }
-  return moduleName;
 }
 function hasModule(name) {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-react-compiler",
-  "version": "19.0.0-beta-df7b47d-20241124",
+  "version": "19.0.0-beta-37ed2a7-20241206",
   "description": "Babel plugin for React Compiler.",
   "main": "dist/index.js",
   "license": "MIT",