@vesk/vesk-cli 0.2.27 → 0.2.28

package/dist/cli.js

@@ -17843,32 +17843,6 @@ function tokenizeCode(code) {
     return null;
   }
 }
-function collectCalledIdentifiers(code) {
-  const tokens = tokenizeCode(code);
-  if (tokens !== null) {
-    const result = /* @__PURE__ */ new Set();
-    for (let i = 0; i < tokens.length; i++) {
-      const t = tokens[i];
-      if (t.label !== "name") continue;
-      const prev = i > 0 ? tokens[i - 1] : null;
-      if (prev && (prev.label === "." || prev.label === "?.")) {
-        const obj = i >= 2 ? tokens[i - 2] : null;
-        const next2 = tokens[i + 1];
-        if (obj && obj.label === "name" && next2) {
-          const nextCh2 = code[next2.start];
-          if (nextCh2 === "(" || nextCh2 === "<") result.add(obj.value);
-        }
-        continue;
-      }
-      const next = tokens[i + 1];
-      if (!next) continue;
-      const nextCh = code[next.start];
-      if (nextCh === "(" || nextCh === "<") result.add(t.value);
-    }
-    return result;
-  }
-  return manualCollectCalledIdentifiers(code);
-}
 function containsIdentifier(code, name) {
   const tokens = tokenizeCode(code);
   if (tokens !== null) {
@@ -17944,44 +17918,6 @@ function importModuleTarget(importText) {
   }
   return null;
 }
-function manualCollectCalledIdentifiers(code) {
-  const result = /* @__PURE__ */ new Set();
-  let i = 0;
-  let prevIdent = null;
-  while (i < code.length) {
-    const c = code[i];
-    if (c === '"' || c === "'" || c === "`") {
-      i = skipString(code, i);
-      continue;
-    }
-    if (c === "/" && (code[i + 1] === "/" || code[i + 1] === "*")) {
-      i = skipComment(code, i);
-      continue;
-    }
-    if (isIdentStart(c)) {
-      let j = i + 1;
-      while (j < code.length && isIdentChar(code[j])) j++;
-      const before = i === 0 ? "" : code[i - 1];
-      if (before !== "." && !isIdentChar(before)) {
-        let k = skipWhitespace(code, j);
-        if (code[k] === "<") k = skipTrackGeneric(code, k);
-        if (code[k] === "(") result.add(code.slice(i, j));
-      } else if (before === "." && prevIdent) {
-        let p = i - 1;
-        while (p > prevIdent[1] && (code[p] === "." || code[p] === "?" || code[p] === "\n" || code[p] === "	" || code[p] === " ")) p--;
-        if (p === prevIdent[1]) {
-          let k = skipWhitespace(code, j);
-          if (code[k] === "(") result.add(code.slice(prevIdent[0], prevIdent[1]));
-        }
-      }
-      prevIdent = [i, j];
-      i = j;
-      continue;
-    }
-    i++;
-  }
-  return result;
-}
 function manualContainsIdentifier(code, name) {
   let i = 0;
   while (i < code.length) {
@@ -19216,6 +19152,65 @@ function estreeCallsFetch(ast) {
   }
   return false;
 }
+function memberReceiverName(obj) {
+  if (!obj || typeof obj !== "object") return null;
+  const rec = obj;
+  if (rec.type === "Identifier" && typeof rec.name === "string") return rec.name;
+  const prop = rec.type === "MemberExpression" && !rec.computed ? rec.property : null;
+  if (prop && typeof prop === "object" && prop.type === "Identifier") {
+    const propName = prop.name;
+    if (typeof propName === "string") return propName;
+  }
+  return null;
+}
+function collectCallAndJsxTargets(ast) {
+  const targets = /* @__PURE__ */ new Set();
+  const stack = [ast];
+  while (stack.length > 0) {
+    const candidate = stack.pop();
+    if (!candidate || typeof candidate !== "object") continue;
+    const node = candidate;
+    if (typeof node.type === "string") {
+      if (node.type === "CallExpression" || node.type === "NewExpression") {
+        const callee = node.callee;
+        if (callee && typeof callee === "object") {
+          const c = callee;
+          if (c.type === "Identifier" && typeof c.name === "string" && node.optional !== true) {
+            targets.add(c.name);
+          } else if (c.type === "MemberExpression" && !c.computed && node.optional !== true) {
+            const receiverName = memberReceiverName(c.object);
+            if (receiverName) targets.add(receiverName);
+          }
+        }
+      } else if (node.type === "JSXElement") {
+        const opening = node.openingElement;
+        const tag = opening && typeof opening === "object" ? opening.name : null;
+        if (tag && typeof tag === "object") {
+          const t = tag;
+          if (t.type === "JSXIdentifier" && typeof t.name === "string") {
+            targets.add(t.name);
+          } else if (t.type === "JSXMemberExpression") {
+            const prop = t.property;
+            if (prop && typeof prop === "object" && prop.type === "JSXIdentifier") {
+              const propName = prop.name;
+              if (typeof propName === "string") targets.add(propName);
+            }
+          }
+        }
+      }
+      for (const key of Object.keys(node)) {
+        if (key === "parent" || key === "loc" || key === "start" || key === "end" || key === "range") continue;
+        const value = node[key];
+        if (Array.isArray(value)) {
+          for (const item of value) stack.push(item);
+        } else {
+          stack.push(value);
+        }
+      }
+    }
+  }
+  return targets;
+}
 function componentUsesFetch(nodes) {
   for (const node of nodes) {
     if (node instanceof ServerBlock || node instanceof ClientBlock) {
@@ -20207,9 +20202,9 @@ function generateIR(ast, source, filename) {
   const asyncNames = new Set(components.filter((c) => c.isAsync || c.ssrAwait).map((c) => c.name));
   for (const comp of components) {
     if (asyncNames.has(comp.name)) continue;
-    const called = /* @__PURE__ */ new Map();
-    collectComponentCalls(comp.body, called);
-    for (const [childName, start] of called) {
+    const called2 = /* @__PURE__ */ new Map();
+    collectComponentCalls(comp.body, called2);
+    for (const [childName, start] of called2) {
       if (!asyncNames.has(childName)) continue;
       const { line, column } = offsetToLineCol2(source, start >= 0 ? start : 0);
       throw VeskError.asyncChildInSyncParent(comp.name, childName, { file, line, column, code: codeFrame(source, line, column) });
@@ -20270,74 +20265,11 @@ function generateIR(ast, source, filename) {
     "Switch",
     "Match"
   ];
+  const called = collectCallAndJsxTargets(ast);
   const usedFunctions = /* @__PURE__ */ new Set();
-  const addUsedFrom = (code) => {
-    const called = collectCalledIdentifiers(code);
-    for (const fn of autoImportable) {
-      if (called.has(fn)) usedFunctions.add(fn);
-    }
-  };
-  for (const code of topLevelCode) addUsedFrom(code);
-  for (const code of [loadFn, staticProps]) {
-    if (code) addUsedFrom(code);
-  }
-  function scanForAutoImport(nodes) {
-    for (const node of nodes) {
-      if (node instanceof RuntimeStatement && node.raw) {
-        addUsedFrom(node.raw);
-      }
-      if (node instanceof TrackDecl && node.init) {
-        addUsedFrom(node.init);
-      }
-      if (node instanceof ForLoop) {
-        if (node.init) addUsedFrom(node.init);
-        if (node.update) addUsedFrom(node.update);
-        if (node.condition && node.condition.raw) addUsedFrom(node.condition.raw);
-        scanForAutoImport(node.bodyTemplate);
-      }
-      if (node instanceof WhileLoop) {
-        if (node.condition && node.condition.raw) addUsedFrom(node.condition.raw);
-        scanForAutoImport(node.bodyTemplate);
-      }
-      if (node instanceof SwitchBlock) {
-        if (node.discriminant && node.discriminant.raw) addUsedFrom(node.discriminant.raw);
-        for (const c of node.cases) {
-          if (c.test && c.test.raw) addUsedFrom(c.test.raw);
-          scanForAutoImport(c.body);
-        }
-      }
-      if (node instanceof TryCatch) {
-        scanForAutoImport(node.bodyTemplate);
-        scanForAutoImport(node.catchBody);
-      }
-      if (node instanceof ComponentCall) {
-        if (autoImportable.includes(node.componentName)) {
-          usedFunctions.add(node.componentName);
-        }
-        for (const prop of node.props) {
-          if (prop.value && prop.value.raw) {
-            addUsedFrom(prop.value.raw);
-          }
-        }
-        scanForAutoImport(node.children);
-      }
-      if (node instanceof MapRegion) {
-        scanForAutoImport(node.bodyTemplate);
-        scanForAutoImport(node.alternateNodes);
-      }
-      if (node instanceof OpaqueDynamicRegion) {
-        scanForAutoImport(node.consequentNodes);
-        scanForAutoImport(node.alternateNodes);
-      }
-      if (node instanceof DynamicBinding && node.expression && node.expression.raw) {
-        addUsedFrom(node.expression.raw);
-      }
-      if (node instanceof StaticNode || node instanceof ServerBlock || node instanceof ClientBlock || node instanceof HeadBlock) {
-        scanForAutoImport(node.children);
-      }
-    }
+  for (const fn of autoImportable) {
+    if (called.has(fn)) usedFunctions.add(fn);
   }
-  scanForAutoImport(components.flatMap((c) => c.body));
   if (usedFunctions.size > 0) {
     const existing = /* @__PURE__ */ new Set();
     for (const imp of imports) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/vesk-cli",
-  "version": "0.2.27",
+  "version": "0.2.28",
   "type": "module",
   "description": "Vesk — compiler-first framework for the post-VDOM web. vesk dev, vesk build.",
   "bin": {
@@ -8,10 +8,10 @@
   },
   "main": "./dist/cli.js",
   "dependencies": {
-    "@vesk/adapter": "^0.2.27",
-    "@vesk/compiler": "^0.2.27",
-    "@vesk/plugin-tailwind": "^0.2.27",
-    "@vesk/runtime": "^0.2.27",
+    "@vesk/adapter": "^0.2.28",
+    "@vesk/compiler": "^0.2.28",
+    "@vesk/plugin-tailwind": "^0.2.28",
+    "@vesk/runtime": "^0.2.28",
     "esrap": "^2.3.0",
     "typescript": "^5.8.0",
     "ws": "^8.18.0",