@vesk/compiler 0.2.27 → 0.2.28

package/dist/ir-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ir-generator.d.ts","sourceRoot":"","sources":["../src/ir-generator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EAsBP,MAAM,uBAAuB,CAAC;AA8N/B,wBAAgB,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,GAAG,CAAC;IAAC,cAAc,CAAC,EAAE,GAAG,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC,GAAG,SAAS,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkCnL;AA07BD,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAoR9E"}
+{"version":3,"file":"ir-generator.d.ts","sourceRoot":"","sources":["../src/ir-generator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EAsBP,MAAM,uBAAuB,CAAC;AA0S/B,wBAAgB,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,GAAG,CAAC;IAAC,cAAc,CAAC,EAAE,GAAG,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC,GAAG,SAAS,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkCnL;AA07BD,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAwN9E"}

package/dist/ir-generator.js

@@ -5,7 +5,7 @@ import { skipWhitespace, findBalancedEnd, splitTopLevel, startsWithIdentifier, s
 import { stripCodeTypes } from '@vesk/compiler/src/strip-ts';
 import { stripTypeImport } from '@vesk/compiler/src/vsk-imports';
 import { importBindingPairs } from '@vesk/compiler/src/module-imports';
-import { collectCalledIdentifiers, extractImportNames, importModuleTarget } from '@vesk/compiler/src/tokens';
+import { extractImportNames, importModuleTarget } from '@vesk/compiler/src/tokens';
 let __vskAnnotations = [];
 /**
  * Prop names of the component currently being processed that are declared as
@@ -168,6 +168,92 @@ function estreeCallsFetch(ast) {
     }
     return false;
 }
+/**
+ * The simple identifier a member chain *ends* in (`a.b.c` → `c`), or null when
+ * the object doesn't end in a bare name token — mirrors the tokenizer's "name
+ * two tokens before the call paren" rule so `a.b(` and `a?.b(` surface `a`,
+ * `a.b.c(` surfaces `b`, while `this.b(`, `a[0].b(` and `a(x).b(` surface
+ * nothing.
+ */
+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;
+}
+/**
+ * Single-pass ESTree walk collecting every simple call target in `ast` —
+ * identifiers invoked directly (`fn(` / `fn<T>(`, constructor calls included)
+ * and the receiver name of a bare member call (`a.b(` → `a`, `a.b?.c(` → `b`)
+ * — plus every JSX element tag name. Mirrors the semantics of
+ * `collectCalledIdentifiers` over the equivalent text, so one walk of the
+ * already-parsed tree replaces re-tokenizing each IR raw fragment.
+ */
+function collectCallAndJsxTargets(ast) {
+    const targets = 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) {
@@ -1470,83 +1556,17 @@ export function generateIR(ast, source, filename) {
         'createResource', 'getAction', 'validateActionInput', 'issuesToFieldMap', 'isFormAction',
         'Show', 'For', 'Switch', 'Match',
     ];
+    // One walk of the already-parsed tree finds every auto-importable call
+    // target and JSX element name. Every IR raw the old per-fragment scan
+    // re-tokenized ("addUsedFrom" over ~15 text slices) is a subtree of this
+    // very same `ast` — nothing is lost, but the acorn tokenizer is invoked once
+    // per file instead of once per fragment.
+    const called = collectCallAndJsxTargets(ast);
     const usedFunctions = 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 = new Set();
         for (const imp of imports) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/compiler",
-  "version": "0.2.27",
+  "version": "0.2.28",
   "type": "module",
   "description": "Vesk compiler — lexer, parser, semantic analysis, IR, codegen",
   "main": "./dist/index.js",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@sveltejs/acorn-typescript": "^1.0.0",
-    "@vesk/types": "^0.2.27",
+    "@vesk/types": "^0.2.28",
     "acorn": "^8.15.0",
     "esrap": "^2.3.0",
     "is-reference": "^3.0.0",