babel-plugin-react-compiler 0.0.0-experimental-03b7aef-20240827 → 0.0.0-experimental-4e0eccf-20240830

package/dist/index.js

@@ -139692,6 +139692,15 @@ function isMutableEffect(effect, location) {
     }
   }
 }
+function areEqualPaths(a, b) {
+  return (
+    a.length === b.length &&
+    a.every(
+      (item, ix) =>
+        item.property === b[ix].property && item.optional === b[ix].optional
+    )
+  );
+}
 function makeBlockId(id) {
   CompilerError.invariant(id >= 0 && Number.isInteger(id), {
     reason: 'Expected block id to be a non-negative integer',
@@ -139933,7 +139942,7 @@ function printDependency(dependency) {
   const identifier =
     printIdentifier(dependency.identifier) +
     printType(dependency.identifier.type);
-  return `${identifier}${dependency.path.map(prop => `.${prop}`).join('')}`;
+  return `${identifier}${dependency.path.map(token => `${token.optional ? '?.' : '.'}${token.property}`).join('')}`;
 }
 function writeReactiveInstructions(writer, instructions) {
   writer.indented(() => {
@@ -140400,7 +140409,7 @@ function printTerminal(terminal) {
       break;
     }
     case 'branch': {
-      value = `[${terminal.id}] Branch (${printPlace(terminal.test)}) then:bb${terminal.consequent} else:bb${terminal.alternate}`;
+      value = `[${terminal.id}] Branch (${printPlace(terminal.test)}) then:bb${terminal.consequent} else:bb${terminal.alternate} fallthrough:bb${terminal.fallthrough}`;
       break;
     }
     case 'logical': {
@@ -140949,7 +140958,7 @@ function printManualMemoDependency(val, nameOnly) {
       ? val.root.value.identifier.name.value
       : printIdentifier(val.root.value.identifier);
   }
-  return `${rootStr}${val.path.length > 0 ? '.' : ''}${val.path.join('.')}`;
+  return `${rootStr}${val.path.map(v => `${v.optional ? '?.' : '.'}${v.property}`).join('')}`;
 }
 function printType(type) {
   if (type.kind === 'Type') return '';
@@ -141570,11 +141579,13 @@ function mapTerminalSuccessors(terminal, fn) {
     case 'branch': {
       const consequent = fn(terminal.consequent);
       const alternate = fn(terminal.alternate);
+      const fallthrough = fn(terminal.fallthrough);
       return {
         kind: 'branch',
         test: terminal.test,
         consequent: consequent,
         alternate: alternate,
+        fallthrough: fallthrough,
         id: makeInstructionId(0),
         loc: terminal.loc,
       };
@@ -141786,7 +141797,6 @@ function mapTerminalSuccessors(terminal, fn) {
 function terminalHasFallthrough(terminal) {
   switch (terminal.kind) {
     case 'maybe-throw':
-    case 'branch':
     case 'goto':
     case 'return':
     case 'throw':
@@ -141795,6 +141805,7 @@ function terminalHasFallthrough(terminal) {
       terminal.fallthrough;
       return false;
     }
+    case 'branch':
     case 'try':
     case 'do-while':
     case 'for-of':
@@ -144119,6 +144130,7 @@ function lowerStatement(builder, stmtPath, label = null) {
             test: lowerExpressionToTemporary(builder, test),
             consequent: bodyBlock,
             alternate: continuationBlock.id,
+            fallthrough: continuationBlock.id,
             id: makeInstructionId(0),
             loc:
               (_u = stmt.node.loc) !== null && _u !== void 0
@@ -144170,6 +144182,7 @@ function lowerStatement(builder, stmtPath, label = null) {
         test: test,
         consequent: loopBlock,
         alternate: continuationBlock.id,
+        fallthrough: conditionalBlock.id,
         id: makeInstructionId(0),
         loc:
           (_w = stmt.node.loc) !== null && _w !== void 0 ? _w : GeneratedSource,
@@ -144453,6 +144466,7 @@ function lowerStatement(builder, stmtPath, label = null) {
         test: test,
         consequent: loopBlock,
         alternate: continuationBlock.id,
+        fallthrough: conditionalBlock.id,
         id: makeInstructionId(0),
         loc: loc,
       };
@@ -144601,6 +144615,7 @@ function lowerStatement(builder, stmtPath, label = null) {
             (_17 = stmt.node.loc) !== null && _17 !== void 0
               ? _17
               : GeneratedSource,
+          fallthrough: continuationBlock.id,
         },
         continuationBlock
       );
@@ -144688,6 +144703,7 @@ function lowerStatement(builder, stmtPath, label = null) {
           test: test,
           consequent: loopBlock,
           alternate: continuationBlock.id,
+          fallthrough: continuationBlock.id,
           loc:
             (_22 = stmt.node.loc) !== null && _22 !== void 0
               ? _22
@@ -145303,6 +145319,7 @@ function lowerExpression(builder, exprPath) {
           test: Object.assign({}, testPlace),
           consequent: consequentBlock,
           alternate: alternateBlock,
+          fallthrough: continuationBlock.id,
           id: makeInstructionId(0),
           loc: exprLoc,
         },
@@ -145386,6 +145403,7 @@ function lowerExpression(builder, exprPath) {
           test: Object.assign({}, leftPlace),
           consequent: consequent,
           alternate: alternate,
+          fallthrough: continuationBlock.id,
           id: makeInstructionId(0),
           loc: exprLoc,
         },
@@ -146144,6 +146162,7 @@ function lowerOptionalMemberExpression(builder, expr, parentAlternate) {
       test: Object.assign({}, object),
       consequent: consequent.id,
       alternate: alternate,
+      fallthrough: continuationBlock.id,
       id: makeInstructionId(0),
       loc: loc,
     };
@@ -146255,6 +146274,7 @@ function lowerOptionalCallExpression(builder, expr, parentAlternate) {
       test: Object.assign({}, testPlace),
       consequent: consequent.id,
       alternate: alternate,
+      fallthrough: continuationBlock.id,
       id: makeInstructionId(0),
       loc: loc,
     };
@@ -147389,6 +147409,7 @@ function lowerAssignment(
           test: Object.assign({}, test),
           consequent: consequent,
           alternate: alternate,
+          fallthrough: continuationBlock.id,
           id: makeInstructionId(0),
           loc: loc,
         },
@@ -150414,6 +150435,7 @@ const EnvironmentConfigSchema = z.object({
   enableForest: z.boolean().default(false),
   enableUseTypeAnnotations: z.boolean().default(false),
   enableReactiveScopesInHIR: z.boolean().default(true),
+  enableOptionalDependencies: z.boolean().default(true),
   validateHooksUsage: z.boolean().default(true),
   validateRefAccessDuringRender: z.boolean().default(true),
   validateNoSetStateInRender: z.boolean().default(true),
@@ -158557,7 +158579,7 @@ function printDependencyComment(dependency) {
   let name = identifier.name;
   if (dependency.path !== null) {
     for (const path of dependency.path) {
-      name += `.${path}`;
+      name += `.${path.property}`;
     }
   }
   return name;
@@ -158583,12 +158605,22 @@ function printDelimitedCommentList(items, finalCompletion) {
 }
 function codegenDependency(cx, dependency) {
   let object = convertIdentifier(dependency.identifier);
-  if (dependency.path !== null) {
+  if (dependency.path.length !== 0) {
+    const hasOptional = dependency.path.some(path => path.optional);
     for (const path of dependency.path) {
-      object = t__namespace.memberExpression(
-        object,
-        t__namespace.identifier(path)
-      );
+      if (hasOptional) {
+        object = t__namespace.optionalMemberExpression(
+          object,
+          t__namespace.identifier(path.property),
+          false,
+          path.optional
+        );
+      } else {
+        object = t__namespace.memberExpression(
+          object,
+          t__namespace.identifier(path.property)
+        );
+      }
     }
   }
   return object;
@@ -160202,9 +160234,6 @@ function areEqualDependencies(a, b) {
   }
   return true;
 }
-function areEqualPaths(a, b) {
-  return a.length === b.length && a.every((item, ix) => item === b[ix]);
-}
 function scopeIsEligibleForMerging(scopeBlock) {
   if (scopeBlock.scope.dependencies.size === 0) {
     return true;
@@ -160871,47 +160900,37 @@ class Empty {
 const EMPTY = new Empty();
 var _ReactiveScopeDependencyTree_instances,
   _ReactiveScopeDependencyTree_roots,
-  _ReactiveScopeDependencyTree_getOrCreateRoot;
+  _ReactiveScopeDependencyTree_getOrCreateRoot,
+  _ReactiveScopeDependencyTree_debugImpl;
 class ReactiveScopeDependencyTree {
   constructor() {
     _ReactiveScopeDependencyTree_instances.add(this);
     _ReactiveScopeDependencyTree_roots.set(this, new Map());
   }
   add(dep, inConditional) {
-    const {path: path, optionalPath: optionalPath} = dep;
+    const {path: path} = dep;
     let currNode = __classPrivateFieldGet(
       this,
       _ReactiveScopeDependencyTree_instances,
       'm',
       _ReactiveScopeDependencyTree_getOrCreateRoot
     ).call(this, dep.identifier);
-    const accessType = inConditional
-      ? PropertyAccessType.ConditionalAccess
-      : PropertyAccessType.UnconditionalAccess;
-    for (const property of path) {
-      let currChild = getOrMakeProperty(currNode, property);
+    for (const item of path) {
+      let currChild = getOrMakeProperty(currNode, item.property);
+      const accessType = inConditional
+        ? PropertyAccessType.ConditionalAccess
+        : item.optional
+          ? PropertyAccessType.OptionalAccess
+          : PropertyAccessType.UnconditionalAccess;
       currChild.accessType = merge(currChild.accessType, accessType);
       currNode = currChild;
     }
-    if (optionalPath.length === 0) {
-      const depType = inConditional
-        ? PropertyAccessType.ConditionalDependency
+    const depType = inConditional
+      ? PropertyAccessType.ConditionalDependency
+      : isOptional(currNode.accessType)
+        ? PropertyAccessType.OptionalDependency
         : PropertyAccessType.UnconditionalDependency;
-      currNode.accessType = merge(currNode.accessType, depType);
-    } else {
-      for (const property of optionalPath) {
-        let currChild = getOrMakeProperty(currNode, property);
-        currChild.accessType = merge(
-          currChild.accessType,
-          PropertyAccessType.ConditionalAccess
-        );
-        currNode = currChild;
-      }
-      currNode.accessType = merge(
-        currNode.accessType,
-        PropertyAccessType.ConditionalDependency
-      );
-    }
+    currNode.accessType = merge(currNode.accessType, depType);
   }
   deriveMinimalDependencies() {
     const results = new Set();
@@ -160920,10 +160939,12 @@ class ReactiveScopeDependencyTree {
       _ReactiveScopeDependencyTree_roots,
       'f'
     ).entries()) {
-      const deps = deriveMinimalDependenciesInSubtree(rootNode);
+      const deps = deriveMinimalDependenciesInSubtree(rootNode, null);
       CompilerError.invariant(
         deps.every(
-          dep => dep.accessType === PropertyAccessType.UnconditionalDependency
+          dep =>
+            dep.accessType === PropertyAccessType.UnconditionalDependency ||
+            dep.accessType == PropertyAccessType.OptionalDependency
         ),
         {
           reason:
@@ -161012,6 +161033,24 @@ class ReactiveScopeDependencyTree {
     }
     return res.flat().join('\n');
   }
+  debug() {
+    const buf = [`tree() [`];
+    for (const [rootId, rootNode] of __classPrivateFieldGet(
+      this,
+      _ReactiveScopeDependencyTree_roots,
+      'f'
+    )) {
+      buf.push(`${printIdentifier(rootId)} (${rootNode.accessType}):`);
+      __classPrivateFieldGet(
+        this,
+        _ReactiveScopeDependencyTree_instances,
+        'm',
+        _ReactiveScopeDependencyTree_debugImpl
+      ).call(this, buf, rootNode, 1);
+    }
+    buf.push(']');
+    return buf.length > 2 ? buf.join('\n') : buf.join('');
+  }
 }
 (_ReactiveScopeDependencyTree_roots = new WeakMap()),
   (_ReactiveScopeDependencyTree_instances = new WeakSet()),
@@ -161034,12 +161073,28 @@ class ReactiveScopeDependencyTree {
         ).set(identifier, rootNode);
       }
       return rootNode;
+    }),
+  (_ReactiveScopeDependencyTree_debugImpl =
+    function _ReactiveScopeDependencyTree_debugImpl(buf, node, depth = 0) {
+      for (const [property, childNode] of node.properties) {
+        buf.push(
+          `${'  '.repeat(depth)}.${property} (${childNode.accessType}):`
+        );
+        __classPrivateFieldGet(
+          this,
+          _ReactiveScopeDependencyTree_instances,
+          'm',
+          _ReactiveScopeDependencyTree_debugImpl
+        ).call(this, buf, childNode, depth + 1);
+      }
     });
 var PropertyAccessType;
 (function (PropertyAccessType) {
   PropertyAccessType['ConditionalAccess'] = 'ConditionalAccess';
+  PropertyAccessType['OptionalAccess'] = 'OptionalAccess';
   PropertyAccessType['UnconditionalAccess'] = 'UnconditionalAccess';
   PropertyAccessType['ConditionalDependency'] = 'ConditionalDependency';
+  PropertyAccessType['OptionalDependency'] = 'OptionalDependency';
   PropertyAccessType['UnconditionalDependency'] = 'UnconditionalDependency';
 })(PropertyAccessType || (PropertyAccessType = {}));
 const MIN_ACCESS_TYPE = PropertyAccessType.ConditionalAccess;
@@ -161052,19 +161107,33 @@ function isUnconditional(access) {
 function isDependency(access) {
   return (
     access === PropertyAccessType.ConditionalDependency ||
+    access === PropertyAccessType.OptionalDependency ||
     access === PropertyAccessType.UnconditionalDependency
   );
 }
+function isOptional(access) {
+  return (
+    access === PropertyAccessType.OptionalAccess ||
+    access === PropertyAccessType.OptionalDependency
+  );
+}
 function merge(access1, access2) {
   const resultIsUnconditional =
     isUnconditional(access1) || isUnconditional(access2);
   const resultIsDependency = isDependency(access1) || isDependency(access2);
+  const resultIsOptional = isOptional(access1) || isOptional(access2);
   if (resultIsUnconditional) {
     if (resultIsDependency) {
       return PropertyAccessType.UnconditionalDependency;
     } else {
       return PropertyAccessType.UnconditionalAccess;
     }
+  } else if (resultIsOptional) {
+    if (resultIsDependency) {
+      return PropertyAccessType.OptionalDependency;
+    } else {
+      return PropertyAccessType.OptionalAccess;
+    }
   } else {
     if (resultIsDependency) {
       return PropertyAccessType.ConditionalDependency;
@@ -161073,37 +161142,80 @@ function merge(access1, access2) {
     }
   }
 }
-const promoteUncondResult = [
-  {relativePath: [], accessType: PropertyAccessType.UnconditionalDependency},
-];
-const promoteCondResult = [
-  {relativePath: [], accessType: PropertyAccessType.ConditionalDependency},
-];
-function deriveMinimalDependenciesInSubtree(dep) {
+function promoteResult(accessType, path) {
+  const result = {relativePath: [], accessType: accessType};
+  if (path !== null) {
+    result.relativePath.push(path);
+  }
+  return [result];
+}
+function prependPath(results, path) {
+  if (path === null) {
+    return results;
+  }
+  return results.map(result => ({
+    accessType: result.accessType,
+    relativePath: [path, ...result.relativePath],
+  }));
+}
+function deriveMinimalDependenciesInSubtree(dep, property) {
   const results = [];
   for (const [childName, childNode] of dep.properties) {
-    const childResult = deriveMinimalDependenciesInSubtree(childNode).map(
-      ({relativePath: relativePath, accessType: accessType}) => ({
-        relativePath: [childName, ...relativePath],
-        accessType: accessType,
-      })
+    const childResult = deriveMinimalDependenciesInSubtree(
+      childNode,
+      childName
     );
     results.push(...childResult);
   }
   switch (dep.accessType) {
     case PropertyAccessType.UnconditionalDependency: {
-      return promoteUncondResult;
+      return promoteResult(
+        PropertyAccessType.UnconditionalDependency,
+        property !== null ? {property: property, optional: false} : null
+      );
     }
     case PropertyAccessType.UnconditionalAccess: {
       if (
         results.every(
           ({accessType: accessType}) =>
-            accessType === PropertyAccessType.UnconditionalDependency
+            accessType === PropertyAccessType.UnconditionalDependency ||
+            accessType === PropertyAccessType.OptionalDependency
         )
       ) {
-        return results;
+        return prependPath(
+          results,
+          property !== null ? {property: property, optional: false} : null
+        );
       } else {
-        return promoteUncondResult;
+        return promoteResult(
+          PropertyAccessType.UnconditionalDependency,
+          property !== null ? {property: property, optional: false} : null
+        );
+      }
+    }
+    case PropertyAccessType.OptionalDependency: {
+      return promoteResult(
+        PropertyAccessType.OptionalDependency,
+        property !== null ? {property: property, optional: true} : null
+      );
+    }
+    case PropertyAccessType.OptionalAccess: {
+      if (
+        results.every(
+          ({accessType: accessType}) =>
+            accessType === PropertyAccessType.UnconditionalDependency ||
+            accessType === PropertyAccessType.OptionalDependency
+        )
+      ) {
+        return prependPath(
+          results,
+          property !== null ? {property: property, optional: true} : null
+        );
+      } else {
+        return promoteResult(
+          PropertyAccessType.OptionalDependency,
+          property !== null ? {property: property, optional: true} : null
+        );
       }
     }
     case PropertyAccessType.ConditionalAccess:
@@ -161114,9 +161226,15 @@ function deriveMinimalDependenciesInSubtree(dep) {
             accessType === PropertyAccessType.ConditionalDependency
         )
       ) {
-        return promoteCondResult;
+        return promoteResult(
+          PropertyAccessType.ConditionalDependency,
+          property !== null ? {property: property, optional: true} : null
+        );
       } else {
-        return promoteUncondResult;
+        return promoteResult(
+          PropertyAccessType.UnconditionalDependency,
+          property !== null ? {property: property, optional: true} : null
+        );
       }
     }
     default: {
@@ -161261,11 +161379,7 @@ function propagateScopeDependencies(fn) {
       });
     }
   }
-  visitReactiveFunction(
-    fn,
-    new PropagationVisitor(fn.env.config.enableTreatFunctionDepsAsConditional),
-    context
-  );
+  visitReactiveFunction(fn, new PropagationVisitor(fn.env), context);
 }
 class FindPromotedTemporaries extends ReactiveFunctionVisitor {
   constructor() {
@@ -161634,13 +161748,13 @@ class Context {
       ? _a
       : place;
   }
-  declareProperty(lvalue, object, property) {
+  declareProperty(lvalue, object, property, optional) {
     const nextDependency = __classPrivateFieldGet(
       this,
       _Context_instances,
       'm',
       _Context_getProperty
-    ).call(this, object, property, false);
+    ).call(this, object, property, optional);
     __classPrivateFieldGet(this, _Context_properties, 'f').set(
       lvalue.identifier,
       nextDependency
@@ -161654,11 +161768,7 @@ class Context {
   }
   visitOperand(place) {
     const resolved = this.resolveTemporary(place);
-    let dependency = {
-      identifier: resolved.identifier,
-      path: [],
-      optionalPath: [],
-    };
+    let dependency = {identifier: resolved.identifier, path: []};
     if (resolved.identifier.name === null) {
       const propertyDependency = __classPrivateFieldGet(
         this,
@@ -161671,13 +161781,13 @@ class Context {
     }
     this.visitDependency(dependency);
   }
-  visitProperty(object, property) {
+  visitProperty(object, property, optional) {
     const nextDependency = __classPrivateFieldGet(
       this,
       _Context_instances,
       'm',
       _Context_getProperty
-    ).call(this, object, property, false);
+    ).call(this, object, property, optional);
     this.visitDependency(nextDependency);
   }
   visitDependency(maybeDependency) {
@@ -161795,7 +161905,7 @@ class Context {
   (_Context_getProperty = function _Context_getProperty(
     object,
     property,
-    isConditional
+    optional
   ) {
     const resolvedObject = this.resolveTemporary(object);
     const resolvedDependency = __classPrivateFieldGet(
@@ -161805,34 +161915,25 @@ class Context {
     ).get(resolvedObject.identifier);
     let objectDependency;
     if (resolvedDependency === undefined) {
-      objectDependency = {
-        identifier: resolvedObject.identifier,
-        path: [],
-        optionalPath: [],
-      };
+      objectDependency = {identifier: resolvedObject.identifier, path: []};
     } else {
       objectDependency = {
         identifier: resolvedDependency.identifier,
         path: [...resolvedDependency.path],
-        optionalPath: [...resolvedDependency.optionalPath],
       };
     }
-    if (objectDependency.optionalPath.length > 0) {
-      objectDependency.optionalPath.push(property);
-    } else if (isConditional) {
-      objectDependency.optionalPath.push(property);
-    } else {
-      objectDependency.path.push(property);
-    }
+    objectDependency.path.push({property: property, optional: optional});
     return objectDependency;
   }),
   (_Context_checkValidDependency = function _Context_checkValidDependency(
     maybeDependency
   ) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (
       isUseRefType(maybeDependency.identifier) &&
-      maybeDependency.path.at(0) === 'current'
+      ((_a = maybeDependency.path.at(0)) === null || _a === void 0
+        ? void 0
+        : _a.property) === 'current'
     ) {
       return false;
     }
@@ -161844,25 +161945,25 @@ class Context {
     }
     const identifier = maybeDependency.identifier;
     const currentDeclaration =
-      (_a = __classPrivateFieldGet(this, _Context_reassignments, 'f').get(
+      (_b = __classPrivateFieldGet(this, _Context_reassignments, 'f').get(
         identifier
-      )) !== null && _a !== void 0
-        ? _a
+      )) !== null && _b !== void 0
+        ? _b
         : __classPrivateFieldGet(this, _Context_declarations, 'f').get(
             identifier.declarationId
           );
     const currentScope =
-      (_b = this.currentScope.value) === null || _b === void 0
+      (_c = this.currentScope.value) === null || _c === void 0
         ? void 0
-        : _b.value;
+        : _c.value;
     return (
       currentScope != null &&
       currentDeclaration !== undefined &&
       currentDeclaration.id < currentScope.range.start &&
       (currentDeclaration.scope == null ||
-        ((_c = currentDeclaration.scope.value) === null || _c === void 0
+        ((_d = currentDeclaration.scope.value) === null || _d === void 0
           ? void 0
-          : _c.value) !== currentScope)
+          : _d.value) !== currentScope)
     );
   }),
   (_Context_isScopeActive = function _Context_isScopeActive(scope) {
@@ -161874,11 +161975,9 @@ class Context {
     );
   });
 class PropagationVisitor extends ReactiveFunctionVisitor {
-  constructor(enableTreatFunctionDepsAsConditional) {
+  constructor(env) {
     super();
-    this.enableTreatFunctionDepsAsConditional = false;
-    this.enableTreatFunctionDepsAsConditional =
-      enableTreatFunctionDepsAsConditional;
+    this.env = env;
   }
   visitScope(scope, context) {
     const scopeDependencies = context.enter(scope.scope, () => {
@@ -161911,39 +162010,177 @@ class PropagationVisitor extends ReactiveFunctionVisitor {
     }
     context.declare(lvalue.identifier, {id: id, scope: context.currentScope});
   }
-  visitReactiveValue(context, id, value) {
+  extractOptionalProperty(context, optionalValue, lvalue) {
+    const sequence = optionalValue.value;
+    CompilerError.invariant(sequence.kind === 'SequenceExpression', {
+      reason: 'Expected OptionalExpression value to be a SequenceExpression',
+      description: `Found a \`${sequence.kind}\``,
+      loc: sequence.loc,
+    });
+    if (
+      sequence.instructions.length === 1 &&
+      sequence.instructions[0].lvalue !== null &&
+      sequence.instructions[0].value.kind === 'LoadLocal' &&
+      sequence.instructions[0].value.place.identifier.name !== null &&
+      !context.isUsedOutsideDeclaringScope(sequence.instructions[0].lvalue) &&
+      sequence.value.kind === 'SequenceExpression' &&
+      sequence.value.instructions.length === 1 &&
+      sequence.value.instructions[0].value.kind === 'PropertyLoad' &&
+      sequence.value.instructions[0].value.object.identifier.id ===
+        sequence.instructions[0].lvalue.identifier.id &&
+      sequence.value.instructions[0].lvalue !== null &&
+      sequence.value.value.kind === 'LoadLocal' &&
+      sequence.value.value.place.identifier.id ===
+        sequence.value.instructions[0].lvalue.identifier.id
+    ) {
+      context.declareTemporary(
+        sequence.instructions[0].lvalue,
+        sequence.instructions[0].value.place
+      );
+      const propertyLoad = sequence.value.instructions[0].value;
+      return {
+        lvalue: lvalue,
+        object: propertyLoad.object,
+        property: propertyLoad.property,
+        optional: optionalValue.optional,
+      };
+    }
+    if (
+      sequence.instructions.length === 1 &&
+      sequence.instructions[0].lvalue !== null &&
+      sequence.instructions[0].value.kind === 'SequenceExpression' &&
+      sequence.instructions[0].value.instructions.length === 1 &&
+      sequence.instructions[0].value.instructions[0].lvalue !== null &&
+      sequence.instructions[0].value.instructions[0].value.kind ===
+        'LoadLocal' &&
+      sequence.instructions[0].value.instructions[0].value.place.identifier
+        .name !== null &&
+      !context.isUsedOutsideDeclaringScope(
+        sequence.instructions[0].value.instructions[0].lvalue
+      ) &&
+      sequence.instructions[0].value.value.kind === 'PropertyLoad' &&
+      sequence.instructions[0].value.value.object.identifier.id ===
+        sequence.instructions[0].value.instructions[0].lvalue.identifier.id &&
+      sequence.value.kind === 'SequenceExpression' &&
+      sequence.value.instructions.length === 1 &&
+      sequence.value.instructions[0].lvalue !== null &&
+      sequence.value.instructions[0].value.kind === 'PropertyLoad' &&
+      sequence.value.instructions[0].value.object.identifier.id ===
+        sequence.instructions[0].lvalue.identifier.id &&
+      sequence.value.value.kind === 'LoadLocal' &&
+      sequence.value.value.place.identifier.id ===
+        sequence.value.instructions[0].lvalue.identifier.id
+    ) {
+      context.declareTemporary(
+        sequence.instructions[0].value.instructions[0].lvalue,
+        sequence.instructions[0].value.instructions[0].value.place
+      );
+      context.declareProperty(
+        sequence.instructions[0].lvalue,
+        sequence.instructions[0].value.value.object,
+        sequence.instructions[0].value.value.property,
+        false
+      );
+      const propertyLoad = sequence.value.instructions[0].value;
+      return {
+        lvalue: lvalue,
+        object: propertyLoad.object,
+        property: propertyLoad.property,
+        optional: optionalValue.optional,
+      };
+    }
+    if (
+      sequence.instructions.length === 1 &&
+      sequence.instructions[0].value.kind === 'SequenceExpression' &&
+      sequence.instructions[0].value.instructions.length === 1 &&
+      sequence.instructions[0].value.instructions[0].lvalue !== null &&
+      sequence.instructions[0].value.instructions[0].value.kind ===
+        'OptionalExpression' &&
+      sequence.instructions[0].value.value.kind === 'LoadLocal' &&
+      sequence.instructions[0].value.value.place.identifier.id ===
+        sequence.instructions[0].value.instructions[0].lvalue.identifier.id &&
+      sequence.value.kind === 'SequenceExpression' &&
+      sequence.value.instructions.length === 1 &&
+      sequence.value.instructions[0].lvalue !== null &&
+      sequence.value.instructions[0].value.kind === 'PropertyLoad' &&
+      sequence.value.instructions[0].value.object.identifier.id ===
+        sequence.instructions[0].value.value.place.identifier.id &&
+      sequence.value.value.kind === 'LoadLocal' &&
+      sequence.value.value.place.identifier.id ===
+        sequence.value.instructions[0].lvalue.identifier.id
+    ) {
+      const {lvalue: innerLvalue, value: innerOptional} =
+        sequence.instructions[0].value.instructions[0];
+      const innerProperty = this.extractOptionalProperty(
+        context,
+        innerOptional,
+        innerLvalue
+      );
+      if (innerProperty === null) {
+        return null;
+      }
+      context.declareProperty(
+        innerProperty.lvalue,
+        innerProperty.object,
+        innerProperty.property,
+        innerProperty.optional
+      );
+      const propertyLoad = sequence.value.instructions[0].value;
+      return {
+        lvalue: lvalue,
+        object: propertyLoad.object,
+        property: propertyLoad.property,
+        optional: optionalValue.optional,
+      };
+    }
+    return null;
+  }
+  visitOptionalExpression(context, id, value, lvalue) {
+    if (
+      lvalue !== null &&
+      value.optional &&
+      this.env.config.enableOptionalDependencies
+    ) {
+      const inner = this.extractOptionalProperty(context, value, lvalue);
+      if (inner !== null) {
+        context.visitProperty(inner.object, inner.property, inner.optional);
+        return;
+      }
+    }
+    const inner = value.value;
+    CompilerError.invariant(inner.kind === 'SequenceExpression', {
+      reason: 'Expected OptionalExpression value to be a SequenceExpression',
+      description: `Found a \`${value.kind}\``,
+      loc: value.loc,
+      suggestions: null,
+    });
+    for (const instr of inner.instructions) {
+      this.visitInstruction(instr, context);
+    }
+    context.enterConditional(() => {
+      this.visitReactiveValue(context, id, inner.value, null);
+    });
+  }
+  visitReactiveValue(context, id, value, lvalue) {
     switch (value.kind) {
       case 'OptionalExpression': {
-        const inner = value.value;
-        CompilerError.invariant(inner.kind === 'SequenceExpression', {
-          reason:
-            'Expected OptionalExpression value to be a SequenceExpression',
-          description: `Found a \`${value.kind}\``,
-          loc: value.loc,
-          suggestions: null,
-        });
-        for (const instr of inner.instructions) {
-          this.visitInstruction(instr, context);
-        }
-        context.enterConditional(() => {
-          this.visitReactiveValue(context, id, inner.value);
-        });
+        this.visitOptionalExpression(context, id, value, lvalue);
         break;
       }
       case 'LogicalExpression': {
-        this.visitReactiveValue(context, id, value.left);
+        this.visitReactiveValue(context, id, value.left, null);
         context.enterConditional(() => {
-          this.visitReactiveValue(context, id, value.right);
+          this.visitReactiveValue(context, id, value.right, null);
         });
         break;
       }
       case 'ConditionalExpression': {
-        this.visitReactiveValue(context, id, value.test);
+        this.visitReactiveValue(context, id, value.test, null);
         const consequentDeps = context.enterConditional(() => {
-          this.visitReactiveValue(context, id, value.consequent);
+          this.visitReactiveValue(context, id, value.consequent, null);
         });
         const alternateDeps = context.enterConditional(() => {
-          this.visitReactiveValue(context, id, value.alternate);
+          this.visitReactiveValue(context, id, value.alternate, null);
         });
         context.promoteDepsFromExhaustiveConditionals([
           consequentDeps,
@@ -161959,7 +162196,7 @@ class PropagationVisitor extends ReactiveFunctionVisitor {
         break;
       }
       case 'FunctionExpression': {
-        if (this.enableTreatFunctionDepsAsConditional) {
+        if (this.env.config.enableTreatFunctionDepsAsConditional) {
           context.enterConditional(() => {
             for (const operand of eachInstructionValueOperand(value)) {
               context.visitOperand(operand);
@@ -162000,9 +162237,9 @@ class PropagationVisitor extends ReactiveFunctionVisitor {
       }
     } else if (value.kind === 'PropertyLoad') {
       if (lvalue !== null && !context.isUsedOutsideDeclaringScope(lvalue)) {
-        context.declareProperty(lvalue, value.object, value.property);
+        context.declareProperty(lvalue, value.object, value.property, false);
       } else {
-        context.visitProperty(value.object, value.property);
+        context.visitProperty(value.object, value.property, false);
       }
     } else if (value.kind === 'StoreLocal') {
       context.visitOperand(value.value);
@@ -162033,7 +162270,7 @@ class PropagationVisitor extends ReactiveFunctionVisitor {
         });
       }
     } else {
-      this.visitReactiveValue(context, id, value);
+      this.visitReactiveValue(context, id, value, lvalue);
     }
   }
   enterTerminal(stmt, context) {
@@ -162079,25 +162316,30 @@ class PropagationVisitor extends ReactiveFunctionVisitor {
         break;
       }
       case 'for': {
-        this.visitReactiveValue(context, terminal.id, terminal.init);
-        this.visitReactiveValue(context, terminal.id, terminal.test);
+        this.visitReactiveValue(context, terminal.id, terminal.init, null);
+        this.visitReactiveValue(context, terminal.id, terminal.test, null);
         context.enterConditional(() => {
           this.visitBlock(terminal.loop, context);
           if (terminal.update !== null) {
-            this.visitReactiveValue(context, terminal.id, terminal.update);
+            this.visitReactiveValue(
+              context,
+              terminal.id,
+              terminal.update,
+              null
+            );
           }
         });
         break;
       }
       case 'for-of': {
-        this.visitReactiveValue(context, terminal.id, terminal.init);
+        this.visitReactiveValue(context, terminal.id, terminal.init, null);
         context.enterConditional(() => {
           this.visitBlock(terminal.loop, context);
         });
         break;
       }
       case 'for-in': {
-        this.visitReactiveValue(context, terminal.id, terminal.init);
+        this.visitReactiveValue(context, terminal.id, terminal.init, null);
         context.enterConditional(() => {
           this.visitBlock(terminal.loop, context);
         });
@@ -162106,12 +162348,12 @@ class PropagationVisitor extends ReactiveFunctionVisitor {
       case 'do-while': {
         this.visitBlock(terminal.loop, context);
         context.enterConditional(() => {
-          this.visitReactiveValue(context, terminal.id, terminal.test);
+          this.visitReactiveValue(context, terminal.id, terminal.test, null);
         });
         break;
       }
       case 'while': {
-        this.visitReactiveValue(context, terminal.id, terminal.test);
+        this.visitReactiveValue(context, terminal.id, terminal.test, null);
         context.enterConditional(() => {
           this.visitBlock(terminal.loop, context);
         });
@@ -165510,7 +165752,7 @@ function infer(loweredFunc, state, context) {
 function isMutatedOrReassigned(id) {
   return id.mutableRange.end > id.mutableRange.start;
 }
-function collectMaybeMemoDependencies(value, maybeDeps) {
+function collectMaybeMemoDependencies(value, maybeDeps, optional) {
   var _a;
   switch (value.kind) {
     case 'LoadGlobal': {
@@ -165522,7 +165764,13 @@ function collectMaybeMemoDependencies(value, maybeDeps) {
     case 'PropertyLoad': {
       const object = maybeDeps.get(value.object.identifier.id);
       if (object != null) {
-        return {root: object.root, path: [...object.path, value.property]};
+        return {
+          root: object.root,
+          path: [
+            ...object.path,
+            {property: value.property, optional: optional},
+          ],
+        };
       }
       break;
     }
@@ -165595,7 +165843,11 @@ function collectTemporaries(instr, env, sidemap) {
       break;
     }
   }
-  const maybeDep = collectMaybeMemoDependencies(value, sidemap.maybeDeps);
+  const maybeDep = collectMaybeMemoDependencies(
+    value,
+    sidemap.maybeDeps,
+    sidemap.optionals.has(lvalue.identifier.id)
+  );
   if (maybeDep != null) {
     sidemap.maybeDeps.set(lvalue.identifier.id, maybeDep);
   }
@@ -165701,12 +165953,14 @@ function dropManualMemoization(func) {
     func.env.config.validatePreserveExistingMemoizationGuarantees ||
     func.env.config.validateNoSetStateInRender ||
     func.env.config.enablePreserveExistingMemoizationGuarantees;
+  const optionals = findOptionalPlaces(func);
   const sidemap = {
     functions: new Map(),
     manualMemos: new Map(),
     react: new Set(),
     maybeDeps: new Map(),
     maybeDepsLists: new Map(),
+    optionals: optionals,
   };
   let nextManualMemoId = 0;
   const queuedInserts = new Map();
@@ -165792,6 +166046,47 @@ function dropManualMemoization(func) {
     }
   }
 }
+function findOptionalPlaces(fn) {
+  const optionals = new Set();
+  for (const [, block] of fn.body.blocks) {
+    if (block.terminal.kind === 'optional' && block.terminal.optional) {
+      const optionalTerminal = block.terminal;
+      let testBlock = fn.body.blocks.get(block.terminal.test);
+      loop: while (true) {
+        const terminal = testBlock.terminal;
+        switch (terminal.kind) {
+          case 'branch': {
+            if (terminal.fallthrough === optionalTerminal.fallthrough) {
+              const consequent = fn.body.blocks.get(terminal.consequent);
+              const last = consequent.instructions.at(-1);
+              if (last !== undefined && last.value.kind === 'StoreLocal') {
+                optionals.add(last.value.value.identifier.id);
+              }
+              break loop;
+            } else {
+              testBlock = fn.body.blocks.get(terminal.fallthrough);
+            }
+            break;
+          }
+          case 'optional':
+          case 'logical':
+          case 'sequence':
+          case 'ternary': {
+            testBlock = fn.body.blocks.get(terminal.fallthrough);
+            break;
+          }
+          default: {
+            CompilerError.invariant(false, {
+              reason: `Unexpected terminal in optional`,
+              loc: terminal.loc,
+            });
+          }
+        }
+      }
+    }
+  }
+  return optionals;
+}
 function inferReactivePlaces(fn) {
   var _a;
   const reactiveIdentifiers = new ReactivityMap(findDisjointMutableValues(fn));
@@ -166549,7 +166844,7 @@ function alignReactiveScopesToBlockScopesHIR(fn) {
       recordPlace(terminal.id, operand, node);
     }
     const fallthrough = terminalFallthrough(terminal);
-    if (fallthrough !== null) {
+    if (fallthrough !== null && terminal.kind !== 'branch') {
       const fallthroughBlock = fn.body.blocks.get(fallthrough);
       const nextId =
         (_e =
@@ -166937,13 +167232,13 @@ let Visitor$2 = class Visitor extends ReactiveFunctionVisitor {
         (_a = this.aliases.find(ident.identifier.id)) !== null && _a !== void 0
           ? _a
           : ident.identifier.id;
-      ident.path.forEach(key => {
+      ident.path.forEach(token => {
         var _a;
         target &&
           (target =
             (_a = this.paths.get(target)) === null || _a === void 0
               ? void 0
-              : _a.get(key));
+              : _a.get(token.property));
       });
       if (target && this.map.get(target) === 'Create') {
         scope.scope.dependencies.delete(ident);
@@ -168598,23 +168893,25 @@ function compareDeps(inferred, source) {
   }
   let isSubpath = true;
   for (let i = 0; i < Math.min(inferred.path.length, source.path.length); i++) {
-    if (inferred.path[i] !== source.path[i]) {
+    if (inferred.path[i].property !== source.path[i].property) {
       isSubpath = false;
       break;
+    } else if (inferred.path[i].optional !== source.path[i].optional) {
+      return CompareDependencyResult.PathDifference;
     }
   }
   if (
     isSubpath &&
     (source.path.length === inferred.path.length ||
       (inferred.path.length >= source.path.length &&
-        !inferred.path.includes('current')))
+        !inferred.path.some(token => token.property === 'current')))
   ) {
     return CompareDependencyResult.Ok;
   } else {
     if (isSubpath) {
       if (
-        source.path.includes('current') ||
-        inferred.path.includes('current')
+        source.path.some(token => token.property === 'current') ||
+        inferred.path.some(token => token.property === 'current')
       ) {
         return CompareDependencyResult.RefAccessDifference;
       } else {
@@ -168729,7 +169026,11 @@ class Visitor extends ReactiveFunctionVisitor {
         return null;
       }
       default: {
-        const dep = collectMaybeMemoDependencies(value, this.temporaries);
+        const dep = collectMaybeMemoDependencies(
+          value,
+          this.temporaries,
+          false
+        );
         if (value.kind === 'StoreLocal' || value.kind === 'StoreContext') {
           const storeTarget = value.lvalue.place;
           (_a = state.manualMemoState) === null || _a === void 0
@@ -170036,9 +170337,10 @@ function findProgramSuppressions(programComments, ruleNames, flowSuppressions) {
 }
 function suppressionsToCompilerError(suppressionRanges) {
   var _a;
-  if (suppressionRanges.length === 0) {
-    return null;
-  }
+  CompilerError.invariant(suppressionRanges.length !== 0, {
+    reason: `Expected at least suppression comment source range`,
+    loc: GeneratedSource,
+  });
   const error = new CompilerError();
   for (const suppressionRange of suppressionRanges) {
     if (
@@ -170289,8 +170591,6 @@ function compileProgram(program, pass) {
       : DEFAULT_ESLINT_SUPPRESSIONS,
     pass.opts.flowSuppressions
   );
-  const lintError = suppressionsToCompilerError(suppressions);
-  let hasCriticalError = lintError != null;
   const queue = [];
   const compiledFns = [];
   const traverseFunction = (fn, pass) => {
@@ -170333,12 +170633,14 @@ function compileProgram(program, pass) {
         fn.node.body.directives
       );
     }
-    if (lintError != null) {
+    let compiledFn;
+    try {
       const suppressionsInFunction = filterSuppressionsThatAffectFunction(
         suppressions,
         fn
       );
       if (suppressionsInFunction.length > 0) {
+        const lintError = suppressionsToCompilerError(suppressionsInFunction);
         if (optOutDirectives.length > 0) {
           logError(
             lintError,
@@ -170352,10 +170654,8 @@ function compileProgram(program, pass) {
             (_b = fn.node.loc) !== null && _b !== void 0 ? _b : null
           );
         }
+        return null;
       }
-    }
-    let compiledFn;
-    try {
       compiledFn = compileFn(
         fn,
         environment,
@@ -170394,7 +170694,6 @@ function compileProgram(program, pass) {
           return null;
         }
       }
-      hasCriticalError || (hasCriticalError = isCriticalError(err));
       handleError(
         err,
         pass,
@@ -170421,7 +170720,7 @@ function compileProgram(program, pass) {
       }
       return null;
     }
-    if (!pass.opts.noEmit && !hasCriticalError) {
+    if (!pass.opts.noEmit) {
       return compiledFn;
     }
     return null;