babel-plugin-react-compiler 0.0.0-experimental-702922b-20241115 → 0.0.0-experimental-ce0575a-20241118

package/dist/index.js

@@ -132806,7 +132806,7 @@ function lowerJsxElementName(builder, exprPath) {
   }
 }
 function lowerJsxMemberExpression(builder, exprPath) {
-  var _a, _b;
+  var _a, _b, _c;
   const loc =
     (_a = exprPath.node.loc) !== null && _a !== void 0 ? _a : GeneratedSource;
   const object = exprPath.get('object');
@@ -132820,7 +132820,15 @@ function lowerJsxMemberExpression(builder, exprPath) {
       loc: (_b = object.node.loc) !== null && _b !== void 0 ? _b : null,
       suggestions: null,
     });
-    objectPlace = lowerIdentifier(builder, object);
+    const kind = getLoadKind(builder, object);
+    objectPlace = lowerValueToTemporary(builder, {
+      kind: kind,
+      place: lowerIdentifier(builder, object),
+      loc:
+        (_c = exprPath.node.loc) !== null && _c !== void 0
+          ? _c
+          : GeneratedSource,
+    });
   }
   const property = exprPath.get('property').node.name;
   return lowerValueToTemporary(builder, {
@@ -136664,6 +136672,7 @@ const EnvironmentConfigSchema = z.object({
   enablePreserveExistingManualUseMemo: z.boolean().default(false),
   enableForest: z.boolean().default(false),
   enableUseTypeAnnotations: z.boolean().default(false),
+  enableFunctionDependencyRewrite: z.boolean().default(true),
   inlineJsxTransform: ReactElementSymbolSchema.nullable().default(null),
   validateHooksUsage: z.boolean().default(true),
   validateRefAccessDuringRender: z.boolean().default(true),
@@ -140883,6 +140892,9 @@ function deadCodeElimination(fn) {
       }
     }
   }
+  retainWhere(fn.context, contextVar =>
+    state.isIdOrNameUsed(contextVar.identifier)
+  );
 }
 let State$2 = class State {
   constructor() {
@@ -141644,28 +141656,41 @@ function createPropsProperties(
   propAttributes.forEach(prop => {
     switch (prop.kind) {
       case 'JsxAttribute': {
-        if (prop.name === 'ref') {
-          refProperty = {
-            kind: 'ObjectProperty',
-            key: {name: 'ref', kind: 'string'},
-            type: 'property',
-            place: Object.assign({}, prop.place),
-          };
-        } else if (prop.name === 'key') {
-          keyProperty = {
-            kind: 'ObjectProperty',
-            key: {name: 'key', kind: 'string'},
-            type: 'property',
-            place: Object.assign({}, prop.place),
-          };
-        } else {
-          const attributeProperty = {
-            kind: 'ObjectProperty',
-            key: {name: prop.name, kind: 'string'},
-            type: 'property',
-            place: Object.assign({}, prop.place),
-          };
-          props.push(attributeProperty);
+        switch (prop.name) {
+          case 'key': {
+            keyProperty = {
+              kind: 'ObjectProperty',
+              key: {name: 'key', kind: 'string'},
+              type: 'property',
+              place: Object.assign({}, prop.place),
+            };
+            break;
+          }
+          case 'ref': {
+            refProperty = {
+              kind: 'ObjectProperty',
+              key: {name: 'ref', kind: 'string'},
+              type: 'property',
+              place: Object.assign({}, prop.place),
+            };
+            const refPropProperty = {
+              kind: 'ObjectProperty',
+              key: {name: 'ref', kind: 'string'},
+              type: 'property',
+              place: Object.assign({}, prop.place),
+            };
+            props.push(refPropProperty);
+            break;
+          }
+          default: {
+            const attributeProperty = {
+              kind: 'ObjectProperty',
+              key: {name: prop.name, kind: 'string'},
+              type: 'property',
+              place: Object.assign({}, prop.place),
+            };
+            props.push(attributeProperty);
+          }
         }
         break;
       }
@@ -149872,12 +149897,18 @@ let Visitor$7 = class Visitor extends ReactiveFunctionVisitor {
   visitPrunedScope(scopeBlock, state) {
     this.traversePrunedScope(scopeBlock, state);
     for (const [id, decl] of scopeBlock.scope.declarations) {
-      if (!isPrimitiveType(decl.identifier)) {
+      if (
+        !isPrimitiveType(decl.identifier) &&
+        !isStableRefType(decl.identifier, state)
+      ) {
         state.add(id);
       }
     }
   }
 };
+function isStableRefType(identifier, reactiveIdentifiers) {
+  return isUseRefType(identifier) && !reactiveIdentifiers.has(identifier.id);
+}
 function collectReactiveIdentifiers(fn) {
   const visitor = new Visitor$7();
   const state = new Set();
@@ -156337,6 +156368,7 @@ class Context {
     this.visitDependency(nextDependency);
   }
   visitDependency(maybeDependency) {
+    var _a;
     const originalDeclaration = __classPrivateFieldGet(
       this,
       _Context_declarations,
@@ -156368,6 +156400,14 @@ class Context {
         }
       });
     }
+    if (
+      isUseRefType(maybeDependency.identifier) &&
+      ((_a = maybeDependency.path.at(0)) === null || _a === void 0
+        ? void 0
+        : _a.property) === 'current'
+    ) {
+      maybeDependency = {identifier: maybeDependency.identifier, path: []};
+    }
     if (
       __classPrivateFieldGet(
         this,
@@ -156411,15 +156451,7 @@ class Context {
   (_Context_checkValidDependency = function _Context_checkValidDependency(
     maybeDependency
   ) {
-    var _a, _b;
-    if (
-      isUseRefType(maybeDependency.identifier) &&
-      ((_a = maybeDependency.path.at(0)) === null || _a === void 0
-        ? void 0
-        : _a.property) === 'current'
-    ) {
-      return false;
-    }
+    var _a;
     if (isRefValueType(maybeDependency.identifier)) {
       return false;
     }
@@ -156428,10 +156460,10 @@ class Context {
     }
     const identifier = maybeDependency.identifier;
     const currentDeclaration =
-      (_b = __classPrivateFieldGet(this, _Context_reassignments, 'f').get(
+      (_a = __classPrivateFieldGet(this, _Context_reassignments, 'f').get(
         identifier
-      )) !== null && _b !== void 0
-        ? _b
+      )) !== null && _a !== void 0
+        ? _a
         : __classPrivateFieldGet(this, _Context_declarations, 'f').get(
             identifier.declarationId
           );
@@ -156514,46 +156546,57 @@ function collectDependencies(
     }
   }
   const scopeTraversal = new ScopeBlockTraversal();
-  for (const [blockId, block] of fn.body.blocks) {
-    scopeTraversal.recordScopes(block);
-    const scopeBlockInfo = scopeTraversal.blockInfos.get(blockId);
-    if (
-      (scopeBlockInfo === null || scopeBlockInfo === void 0
-        ? void 0
-        : scopeBlockInfo.kind) === 'begin'
-    ) {
-      context.enterScope(scopeBlockInfo.scope);
-    } else if (
-      (scopeBlockInfo === null || scopeBlockInfo === void 0
-        ? void 0
-        : scopeBlockInfo.kind) === 'end'
-    ) {
-      context.exitScope(
-        scopeBlockInfo.scope,
-        scopeBlockInfo === null || scopeBlockInfo === void 0
+  const handleFunction = fn => {
+    for (const [blockId, block] of fn.body.blocks) {
+      scopeTraversal.recordScopes(block);
+      const scopeBlockInfo = scopeTraversal.blockInfos.get(blockId);
+      if (
+        (scopeBlockInfo === null || scopeBlockInfo === void 0
           ? void 0
-          : scopeBlockInfo.pruned
-      );
-    }
-    for (const phi of block.phis) {
-      for (const operand of phi.operands) {
-        const maybeOptionalChain = temporaries.get(operand[1].identifier.id);
-        if (maybeOptionalChain) {
-          context.visitDependency(maybeOptionalChain);
+          : scopeBlockInfo.kind) === 'begin'
+      ) {
+        context.enterScope(scopeBlockInfo.scope);
+      } else if (
+        (scopeBlockInfo === null || scopeBlockInfo === void 0
+          ? void 0
+          : scopeBlockInfo.kind) === 'end'
+      ) {
+        context.exitScope(scopeBlockInfo.scope, scopeBlockInfo.pruned);
+      }
+      for (const phi of block.phis) {
+        for (const operand of phi.operands) {
+          const maybeOptionalChain = temporaries.get(operand[1].identifier.id);
+          if (maybeOptionalChain) {
+            context.visitDependency(maybeOptionalChain);
+          }
         }
       }
-    }
-    for (const instr of block.instructions) {
-      if (!processedInstrsInOptional.has(instr)) {
-        handleInstruction(instr, context);
+      for (const instr of block.instructions) {
+        if (
+          fn.env.config.enableFunctionDependencyRewrite &&
+          (instr.value.kind === 'FunctionExpression' ||
+            instr.value.kind === 'ObjectMethod')
+        ) {
+          context.declare(instr.lvalue.identifier, {
+            id: instr.id,
+            scope: context.currentScope,
+          });
+          const wasInInnerFn = context.inInnerFn;
+          context.inInnerFn = true;
+          handleFunction(instr.value.loweredFunc.func);
+          context.inInnerFn = wasInInnerFn;
+        } else if (!processedInstrsInOptional.has(instr)) {
+          handleInstruction(instr, context);
+        }
       }
-    }
-    if (!processedInstrsInOptional.has(block.terminal)) {
-      for (const place of eachTerminalOperand(block.terminal)) {
-        context.visitOperand(place);
+      if (!processedInstrsInOptional.has(block.terminal)) {
+        for (const place of eachTerminalOperand(block.terminal)) {
+          context.visitOperand(place);
+        }
       }
     }
-  }
+  };
+  handleFunction(fn);
   return context.deps;
 }
 function outlineJSX(fn) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-react-compiler",
-  "version": "0.0.0-experimental-702922b-20241115",
+  "version": "0.0.0-experimental-ce0575a-20241118",
   "description": "Babel plugin for React Compiler.",
   "main": "dist/index.js",
   "license": "MIT",