@fictjs/compiler 0.10.0 → 0.12.0

package/dist/index.cjs

@@ -16719,10 +16719,12 @@ function convertJSXMemberExpr(node) {
   };
 }
 
-// src/fine-grained-dom.ts
+// src/ir/dependency-key.ts
 function normalizeDependencyKey(name) {
-  return name.split(".").map((part) => part.replace(/_\d+$/, "")).join(".");
+  return name.split(".").map((part) => getSSABaseName(part)).join(".");
 }
+
+// src/fine-grained-dom.ts
 function applyRegionMetadata(state, options) {
   if (!options.region) return;
   const region = options.region;
@@ -24215,7 +24217,7 @@ function extractKeyFromMapCallback(callback) {
 
 // src/ir/codegen-overrides.ts
 function normalizeDependencyKey2(name) {
-  return name.split(".").map((part) => deSSAVarName(part)).join(".");
+  return normalizeDependencyKey(name);
 }
 function getDependencyPathFromNode(node, t4) {
   if (t4.isIdentifier(node)) {
@@ -33839,9 +33841,18 @@ function isInsideLoop(path2) {
   );
 }
 function isInsideConditional(path2) {
-  return !!path2.findParent(
-    (p) => p.isIfStatement?.() || p.isConditionalExpression?.() || p.isSwitchCase?.()
-  );
+  let current = path2;
+  while (current?.parentPath) {
+    const parent = current.parentPath;
+    if (parent.isIfStatement?.() || parent.isConditionalExpression?.() || parent.isSwitchCase?.()) {
+      return true;
+    }
+    if (parent.isLogicalExpression?.() && current.key === "right") {
+      return true;
+    }
+    current = parent;
+  }
+  return false;
 }
 function isInsideJSX(path2) {
   return !!path2.findParent((p) => p.isJSXElement?.() || p.isJSXFragment?.());
@@ -34085,6 +34096,15 @@ function runWarningPass(programPath, stateBindingIds, stateRootBindingIds, react
     "catch",
     "finally"
   ]);
+  const NON_ESCAPING_CALLBACK_FUNCTION_IMPORTS = /* @__PURE__ */ new Set([
+    "untrack",
+    "batch",
+    "startTransition",
+    "createEffect",
+    "createMemo",
+    "createRenderEffect",
+    "runInScope"
+  ]);
   const capturedClosureByBinding = /* @__PURE__ */ new Map();
   const shouldIgnoreIdentifierReference = (idPath) => {
     if (idPath.parentPath.isMemberExpression({ property: idPath.node }) && !idPath.parent.computed) {
@@ -34152,7 +34172,19 @@ function runWarningPass(programPath, stateBindingIds, stateRootBindingIds, react
     const captured = capturedClosureByBinding.get(binding.identifier);
     return captured && captured.size > 0 ? captured : null;
   };
-  const isNonEscapingCallbackHost = (callee) => {
+  const isNonEscapingCallbackHost = (callPath, callee) => {
+    if (t4.isIdentifier(callee)) {
+      const binding = callPath.scope.getBinding(callee.name);
+      const bindingPath = binding?.path;
+      if (bindingPath?.isImportSpecifier()) {
+        const imported = bindingPath.node.imported;
+        const importedName = t4.isIdentifier(imported) ? imported.name : imported.value;
+        const source = bindingPath.parentPath.node;
+        if (source.type === "ImportDeclaration" && (source.source.value === "fict" || source.source.value === "fict/advanced" || source.source.value === "@fictjs/runtime" || source.source.value === "@fictjs/runtime/advanced") && NON_ESCAPING_CALLBACK_FUNCTION_IMPORTS.has(importedName)) {
+          return true;
+        }
+      }
+    }
     const member = t4.isMemberExpression(callee) || t4.isOptionalMemberExpression(callee) ? callee : null;
     if (!member || member.computed || !t4.isIdentifier(member.property)) return false;
     return NON_ESCAPING_CALLBACK_METHODS.has(member.property.name);
@@ -34323,7 +34355,8 @@ function runWarningPass(programPath, stateBindingIds, stateRootBindingIds, react
       const isSafe = calleeName && SAFE_FUNCTIONS.has(calleeName);
       if (isSafe) return;
       const argPaths = path2.get("arguments");
-      const nonEscapingCallbackHost = isNonEscapingCallbackHost(callee);
+      const nonEscapingCallbackHost = isNonEscapingCallbackHost(path2, callee);
+      if (nonEscapingCallbackHost) return;
       for (const argPath of argPaths) {
         if (argPath.isIdentifier() && hasTrackedBinding(argPath, argPath.node.name, stateBindingIds)) {
           continue;
@@ -34339,7 +34372,6 @@ function runWarningPass(programPath, stateBindingIds, stateRootBindingIds, react
           break;
         }
       }
-      if (nonEscapingCallbackHost) return;
       for (const argPath of argPaths) {
         const captured = collectCapturedForArgument(argPath);
         if (!captured) continue;

package/dist/index.js

@@ -16704,10 +16704,12 @@ function convertJSXMemberExpr(node) {
   };
 }
 
-// src/fine-grained-dom.ts
+// src/ir/dependency-key.ts
 function normalizeDependencyKey(name) {
-  return name.split(".").map((part) => part.replace(/_\d+$/, "")).join(".");
+  return name.split(".").map((part) => getSSABaseName(part)).join(".");
 }
+
+// src/fine-grained-dom.ts
 function applyRegionMetadata(state, options) {
   if (!options.region) return;
   const region = options.region;
@@ -24200,7 +24202,7 @@ function extractKeyFromMapCallback(callback) {
 
 // src/ir/codegen-overrides.ts
 function normalizeDependencyKey2(name) {
-  return name.split(".").map((part) => deSSAVarName(part)).join(".");
+  return normalizeDependencyKey(name);
 }
 function getDependencyPathFromNode(node, t4) {
   if (t4.isIdentifier(node)) {
@@ -33824,9 +33826,18 @@ function isInsideLoop(path2) {
   );
 }
 function isInsideConditional(path2) {
-  return !!path2.findParent(
-    (p) => p.isIfStatement?.() || p.isConditionalExpression?.() || p.isSwitchCase?.()
-  );
+  let current = path2;
+  while (current?.parentPath) {
+    const parent = current.parentPath;
+    if (parent.isIfStatement?.() || parent.isConditionalExpression?.() || parent.isSwitchCase?.()) {
+      return true;
+    }
+    if (parent.isLogicalExpression?.() && current.key === "right") {
+      return true;
+    }
+    current = parent;
+  }
+  return false;
 }
 function isInsideJSX(path2) {
   return !!path2.findParent((p) => p.isJSXElement?.() || p.isJSXFragment?.());
@@ -34070,6 +34081,15 @@ function runWarningPass(programPath, stateBindingIds, stateRootBindingIds, react
     "catch",
     "finally"
   ]);
+  const NON_ESCAPING_CALLBACK_FUNCTION_IMPORTS = /* @__PURE__ */ new Set([
+    "untrack",
+    "batch",
+    "startTransition",
+    "createEffect",
+    "createMemo",
+    "createRenderEffect",
+    "runInScope"
+  ]);
   const capturedClosureByBinding = /* @__PURE__ */ new Map();
   const shouldIgnoreIdentifierReference = (idPath) => {
     if (idPath.parentPath.isMemberExpression({ property: idPath.node }) && !idPath.parent.computed) {
@@ -34137,7 +34157,19 @@ function runWarningPass(programPath, stateBindingIds, stateRootBindingIds, react
     const captured = capturedClosureByBinding.get(binding.identifier);
     return captured && captured.size > 0 ? captured : null;
   };
-  const isNonEscapingCallbackHost = (callee) => {
+  const isNonEscapingCallbackHost = (callPath, callee) => {
+    if (t4.isIdentifier(callee)) {
+      const binding = callPath.scope.getBinding(callee.name);
+      const bindingPath = binding?.path;
+      if (bindingPath?.isImportSpecifier()) {
+        const imported = bindingPath.node.imported;
+        const importedName = t4.isIdentifier(imported) ? imported.name : imported.value;
+        const source = bindingPath.parentPath.node;
+        if (source.type === "ImportDeclaration" && (source.source.value === "fict" || source.source.value === "fict/advanced" || source.source.value === "@fictjs/runtime" || source.source.value === "@fictjs/runtime/advanced") && NON_ESCAPING_CALLBACK_FUNCTION_IMPORTS.has(importedName)) {
+          return true;
+        }
+      }
+    }
     const member = t4.isMemberExpression(callee) || t4.isOptionalMemberExpression(callee) ? callee : null;
     if (!member || member.computed || !t4.isIdentifier(member.property)) return false;
     return NON_ESCAPING_CALLBACK_METHODS.has(member.property.name);
@@ -34308,7 +34340,8 @@ function runWarningPass(programPath, stateBindingIds, stateRootBindingIds, react
       const isSafe = calleeName && SAFE_FUNCTIONS.has(calleeName);
       if (isSafe) return;
       const argPaths = path2.get("arguments");
-      const nonEscapingCallbackHost = isNonEscapingCallbackHost(callee);
+      const nonEscapingCallbackHost = isNonEscapingCallbackHost(path2, callee);
+      if (nonEscapingCallbackHost) return;
       for (const argPath of argPaths) {
         if (argPath.isIdentifier() && hasTrackedBinding(argPath, argPath.node.name, stateBindingIds)) {
           continue;
@@ -34324,7 +34357,6 @@ function runWarningPass(programPath, stateBindingIds, stateRootBindingIds, react
           break;
         }
       }
-      if (nonEscapingCallbackHost) return;
       for (const argPath of argPaths) {
         const captured = collectCapturedForArgument(argPath);
         if (!captured) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fictjs/compiler",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "description": "Babel plugin for Fict Compiler",
   "publishConfig": {
     "access": "public",
@@ -48,7 +48,7 @@
     "@types/babel__helper-plugin-utils": "^7.10.3",
     "@types/babel__traverse": "^7.28.0",
     "tsup": "^8.5.1",
-    "@fictjs/runtime": "0.10.0"
+    "@fictjs/runtime": "0.12.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format cjs,esm --dts",