ts-axi 0.1.7 → 0.1.8

package/dist/src/commands/impact.js

@@ -242,16 +242,16 @@ export function textualMatches(opened, semantic, names, known, skipLines, change
     const rows = [];
     for (const abs of files) {
         const text = opened.index.text(abs);
-        if (text === undefined || !names.some((n) => text.includes(n)))
+        if (text === undefined || !names.some((n) => text.includes(n.text)))
             continue;
         const rel = opened.index.rel(abs);
         // A Declaration of another Symbol with the same name is provably not a use.
         const declared = new Set(projectSet.has(abs) ? opened.index.declarations(abs).map((d) => d.nameLine) : []);
         const lines = new Set();
-        for (const name of names) {
+        for (const { text: name, token } of names) {
             if (localTo.has(name) && localTo.get(name) !== abs)
                 continue;
-            for (const m of wordMatches(text, name)) {
+            for (const m of wordMatches(text, name, token)) {
                 if (known.has(`${rel}:${m.line}`) || skipLines.has(`${rel}:${m.line}`) || declared.has(m.line) || inRanges(changeSet.get(rel), m.line))
                     continue;
                 if (lines.has(m.line))
@@ -263,12 +263,30 @@ export function textualMatches(opened, semantic, names, known, skipLines, change
     }
     return rows.sort((a, b) => a.file.localeCompare(b.file) || a.line - b.line);
 }
+/** Whether a whole-word count of the name says anything: not for router-called or by-name-injected members (`injected`). */
+export function isTextualCandidate(decl) {
+    return decl?.injected !== true;
+}
 /**
- * The checker may miss uses: JS declaring file, a string-registered name, or no tsconfig at all.
- * A state's hooks (`onEnter`, inline `controller`) are called by the router, never by name: no textual count.
+ * The textual needle of a Symbol: a state's full name without the `states.`/`routes.` prefix (a token, so
+ * `ui-sref="a.b"` counts and `a.b.c` does not match `a.b`; none when it still holds `*`), else the last
+ * segment of the qualified name.
  */
+export function textualNeedle(subject, kind) {
+    const symbol = typeof subject === "string" ? subject : subject.qualifiedName;
+    if ((kind ?? (typeof subject === "string" ? undefined : subject.kind)) === "state") {
+        const name = symbol.replace(/^(states|routes)\./, "");
+        return name.includes("*") || name === "" ? undefined : { text: name, token: true };
+    }
+    return { text: symbol.split(".").pop(), token: false };
+}
+/** Whether `any`-typed property accesses of the name can be uses of the Symbol: same rule as `isTextualCandidate`. */
+export function isBlindSpotCandidate(decl) {
+    return decl?.injected !== true;
+}
+/** The checker may miss uses: JS declaring file, a string-registered name, or no tsconfig at all. */
 export function isUntyped(opened, decl, file) {
-    if (decl?.parentName !== undefined && /^(states|routes)\./.test(decl.parentName) && !decl.parentName.endsWith(".resolve"))
+    if (!isTextualCandidate(decl))
         return false;
     return decl?.nameless === true || opened.index.project.implicit || (file !== undefined && /\.[mc]?jsx?$/.test(file));
 }
@@ -280,16 +298,22 @@ export function isPlainLocal(decl) {
  * Whole-word occurrences of `name` in Project files outside `changeSet`; lines declaring a `name` excluded.
  * With `onlyFile` (absolute), that file alone.
  */
-export function textualCount(opened, name, changeSet = new Map(), onlyFile) {
+export function textualCount(opened, needle, changeSet = new Map(), onlyFile) {
+    const { text: name, token } = needle;
     let matches = 0;
     let files = 0;
-    for (const abs of onlyFile !== undefined ? [onlyFile] : opened.index.files) {
+    const project = new Set(opened.index.files);
+    // State names are also written in templates (`ui-sref`), which the Project does not list.
+    const candidates = onlyFile !== undefined ? [onlyFile] : [...project];
+    if (token && onlyFile === undefined)
+        walkExtra(opened.root, candidates);
+    for (const abs of new Set(candidates)) {
         const text = opened.index.text(abs);
         if (text === undefined || !text.includes(name))
             continue;
         const rel = opened.index.rel(abs);
-        const declared = new Set(opened.index.declarations(abs).filter((d) => d.name === name).map((d) => d.nameLine));
-        const n = wordMatches(text, name).filter((m) => !declared.has(m.line) && !inRanges(changeSet.get(rel), m.line)).length;
+        const declared = new Set(project.has(abs) ? opened.index.declarations(abs).filter((d) => d.name === name).map((d) => d.nameLine) : []);
+        const n = wordMatches(text, name, token).filter((m) => !declared.has(m.line) && !inRanges(changeSet.get(rel), m.line)).length;
         matches += n;
         if (n > 0)
             files++;
@@ -542,9 +566,12 @@ export async function impactCommand(args, ctx) {
         if (!row.live || !isUntyped(opened, row.live, row.live.file))
             continue;
         const localTo = isPlainLocal(row.live) ? new Map([[row.live.name, opened.index.abs(row.live.file)]]) : undefined;
-        row.textual = textualCount(opened, row.live.name, changeSet, localTo?.get(row.live.name));
+        const needle = textualNeedle(row.live);
+        if (!needle)
+            continue;
+        row.textual = textualCount(opened, needle, changeSet, localTo?.get(row.live.name));
         if (row.textual.matches > 0)
-            row.unresolved = textualMatches(opened, semantic, [row.live.name], known, new Set(), changeSet, localTo).length;
+            row.unresolved = textualMatches(opened, semantic, [needle], known, new Set(), changeSet, localTo).length;
     }
     // Template usages: directives, components, bindings, controllers and filters named in .html and friends.
     let templateFiles;
@@ -598,14 +625,20 @@ export async function impactCommand(args, ctx) {
     };
     // --- Blind spots, textual matches, deeper callers ---
     const names = new Map();
+    const textNames = new Map();
     // A name is file-scoped only when every changed Declaration carrying it is a plain local of one file.
     const localTo = new Map();
     const wide = new Set();
     for (const r of rows) {
         const decl = r.change.after ?? r.change.before;
         const name = decl.name;
-        if (!names.has(name))
+        if (isBlindSpotCandidate(decl) && !names.has(name))
             names.set(name, r.symbol);
+        const needle = isTextualCandidate(decl) ? textualNeedle(decl) : undefined;
+        if (!needle)
+            continue;
+        if (!textNames.has(needle.text))
+            textNames.set(needle.text, needle);
         const abs = opened.index.abs(decl.file);
         if (!isPlainLocal(decl) || (localTo.has(name) && localTo.get(name) !== abs))
             wide.add(name);
@@ -616,7 +649,7 @@ export async function impactCommand(args, ctx) {
         localTo.delete(name);
     const spots = blindSpots(semantic, names, changeSet);
     const textRows = grep
-        ? textualMatches(opened, semantic, [...names.keys()], known, new Set(spots.map((s) => `${s.file}:${s.line}`)), changeSet, localTo)
+        ? textualMatches(opened, semantic, [...textNames.values()], known, new Set(spots.map((s) => `${s.file}:${s.line}`)), changeSet, localTo)
         : [];
     const unresolved = grep ? withTemplateRows(textRows, rows, templateFiles ?? []) : [];
     const touched = [...new Set([...analysed.filter((f) => f.status !== "deleted").map((f) => f.path), ...listed.flatMap((r) => r.outside.map((e) => e.file))])];

package/dist/src/commands/refs.js

@@ -1,7 +1,7 @@
 import { relative, sep } from "node:path";
 import { bool, expectPositionals, flag, intFlag, parseArgs } from "../args.js";
 import { importerClosure } from "../importers.js";
-import { isPlainLocal, isUntyped, textualCount, textualHint, textualLine, textualMatches } from "./impact.js";
+import { isPlainLocal, isTextualCandidate, isUntyped, textualCount, textualNeedle, textualHint, textualLine, textualMatches } from "./impact.js";
 import { findOutsideProject, nearestTsconfig } from "../project.js";
 import { viaLine } from "../references.js";
 import { block, helpBlock, out } from "../render.js";
@@ -23,7 +23,7 @@ const VIA_DOC = `via_interface: n (Iface.member) = References through an interfa
   refs_total: 0 under -P in a workspace lists found_outside_project[n]{file,line} = importers outside that Project
   scope = in a monorepo without -P the program is the declaring file + its importers (scope_partial: true when the importer scan was capped)
   tsconfig: x (n referenced configs) = a references-only tsconfig expanded to the configs it references
-  textual: n matches in m files = whole-word count of the name in Project files (JavaScript declarations and implicit projects); 'n matches in this file' for a non-exported local; above refs_total = uses the checker cannot resolve - see refs --grep
+  textual: n matches in m files = whole-word count of the name in Project files (JavaScript declarations and implicit projects; a state counts its full dotted name as a whole token, templates included; not for a state's resolve keys and hooks - injected by name, not imported); 'n matches in this file' for a non-exported local; above refs_total = uses the checker cannot resolve - see refs --grep
   templates: n usages in m files = template uses (.html .htm .ejs .hbs .njk .pug) of a directive or component (<wap-select / wap-select / data-wap-select), its bindings (fallback-display-property= on that tag), a controller (ng-controller) or a filter (| money); refs --grep lists them in unresolved`;
 export const REFS_HELP = `usage: ts-axi refs <name | Class.member | path:line[:col]> [flags]
 flags[12]:
@@ -151,10 +151,11 @@ async function run(args, ctx, invoked) {
     const explicit = Boolean(project || opened.settings.project);
     const declaredFile = decl?.file ?? (def && def.line > 0 ? def.file : undefined);
     const localFile = isPlainLocal(decl) ? opened.index.abs(decl.file) : undefined;
-    const textual = declaredFile !== undefined && isUntyped(opened, decl, declaredFile) ? textualCount(opened, symbol.split(".").pop(), new Map(), localFile) : undefined;
+    const needle = textualNeedle(decl ?? symbol, kind);
+    const textual = declaredFile !== undefined && needle && isUntyped(opened, decl, declaredFile) ? textualCount(opened, needle, new Map(), localFile) : undefined;
     const tplTarget = decl ? templateTarget(decl, opened.index.declarations(opened.index.abs(decl.file))) : undefined;
     const templates = tplTarget ? templateRows(loadTemplates(opened.root), tplTarget) : undefined;
-    const o = { started, symbol, declaredAt, show, scope, explicit, label, name, absFile: resolved.absFile, ...(decl ? { decl } : {}), ...(textual ? { textual } : {}), ...(templates ? { templates } : {}) };
+    const o = { started, symbol, kind, declaredAt, show, scope, explicit, label, name, absFile: resolved.absFile, ...(decl ? { decl } : {}), ...(textual ? { textual } : {}), ...(templates ? { templates } : {}) };
     return mode === "calls"
         ? renderCallers(semantic, opened, resolved, header, { ...o, limit, depth })
         : renderRefs(semantic, opened, resolved, header, { ...o, limit, kind });
@@ -197,7 +198,9 @@ function outsideImporters(opened, o) {
     const inProject = new Set(opened.index.files);
     const barrels = new Set(closure.barrels);
     const targets = [o.absFile, ...closure.barrels];
-    const needle = o.symbol.split(".").pop();
+    const needle = textualNeedle(o.symbol, o.kind)?.text;
+    if (!needle)
+        return { fields: {}, help: [] };
     const rows = closure.importers
         .filter((f) => !inProject.has(f) && !barrels.has(f) && (opened.index.text(f) ?? "").includes(needle))
         .map((f) => {
@@ -242,7 +245,10 @@ function viaFields(via, bases) {
 }
 /** Whole-word matches of the name on lines that hold no known position (what `--grep` lists). */
 function unresolvedOf(opened, semantic, o, known) {
-    return textualMatches(opened, semantic, [o.symbol.split(".").pop()], new Set(known.map((r) => `${r.file}:${r.line}`)), new Set(o.decl ? [`${o.decl.file}:${o.decl.line}`, `${o.decl.file}:${o.decl.nameLine}`] : []), new Map(), isPlainLocal(o.decl) ? new Map([[o.decl.name, opened.index.abs(o.decl.file)]]) : new Map());
+    const needle = isTextualCandidate(o.decl) ? textualNeedle(o.decl ?? o.symbol, o.kind) : undefined;
+    if (!needle)
+        return [];
+    return textualMatches(opened, semantic, [needle], new Set(known.map((r) => `${r.file}:${r.line}`)), new Set(o.decl ? [`${o.decl.file}:${o.decl.line}`, `${o.decl.file}:${o.decl.nameLine}`] : []), new Map(), isPlainLocal(o.decl) ? new Map([[o.decl.name, opened.index.abs(o.decl.file)]]) : new Map());
 }
 /**
  * `textual` field and, when the name occurs more often than refs_total and some matches sit on no
@@ -282,7 +288,7 @@ function renderRefs(semantic, opened, resolved, header, o) {
         help.push(`Run \`ts-axi refs ${o.declaredAt} --implementations\` to list the ${impls.length} implementations`);
     const outside = rows.length === 0 ? outsideImporters(opened, o) : { fields: {}, help: [] };
     help.unshift(...outside.help);
-    const word = o.symbol.split(".").pop();
+    const word = textualNeedle(o.symbol, o.kind)?.text ?? "";
     const unresolved = o.show.grep || o.textual || o.templates ? unresolvedOf(opened, semantic, o, [...rows, ...via, ...impls]) : [];
     const grepRows = withTemplates(unresolved, o.templates);
     // The --grep hint counts what --grep lists: textual and template rows together.
@@ -290,7 +296,7 @@ function renderRefs(semantic, opened, resolved, header, o) {
     const tpl = templateFields(o, o.show.grep || text.help.length > 0);
     if (text.help.length > 0)
         help.unshift(...text.help);
-    else if (o.decl?.nameless && !o.show.grep && tpl.help.length === 0)
+    else if (o.decl?.nameless && word && !o.show.grep && tpl.help.length === 0)
         help.unshift(`Run \`ts-axi refs ${o.declaredAt} --grep\` for textual matches of '${word}'`);
     help.unshift(...tpl.help);
     if (isFunctionLike(o.kind))

package/dist/src/impact.js

@@ -222,10 +222,14 @@ export function localOnlyLine(entries, max = 10) {
     const rest = entries.length - shown.length;
     return `${entries.length} (${[...shown, ...(rest > 0 ? [`+${rest}`] : [])].join("; ")})`;
 }
-/** Whole-word occurrences of `name` in `text`: 1-based line and column. */
-export function wordMatches(text, name) {
-    const escaped = name.replace(/[$]/g, "\\$");
-    const re = new RegExp(`(?<![\\w$])${escaped}(?![\\w$])`, "g");
+/**
+ * Whole-word occurrences of `name` in `text`: 1-based line and column. With `token`, `name` is a dotted
+ * path (a state name): escaped literally, and neither `.` nor an identifier character may touch it.
+ */
+export function wordMatches(text, name, token = false) {
+    const re = token
+        ? new RegExp(`(?<![\\w$.])${name.replace(/[.*+?^${}()|[\]\\/]/g, "\\$&")}(?![\\w$.])`, "g")
+        : new RegExp(`(?<![\\w$])${name.replace(/[$]/g, "\\$")}(?![\\w$])`, "g");
     const result = [];
     const lines = text.split("\n");
     lines.forEach((lineText, i) => {

package/dist/src/symbols.js

@@ -450,13 +450,13 @@ export function collectDeclarations(sf, file) {
             if (!name || !prop.name)
                 continue;
             if (ts.isMethodDeclaration(prop)) {
-                nested({ start: prop.getStart(sf), end: prop.end, kind: "method", name, parentName: holder, exported: true, signature: fullSignatureOf(prop, sf), namePos: prop.name.getStart(sf) });
+                nested({ start: prop.getStart(sf), end: prop.end, kind: "method", name, parentName: holder, exported: true, signature: fullSignatureOf(prop, sf), namePos: prop.name.getStart(sf), injected: true });
             }
             else if (ts.isPropertyAssignment(prop)) {
                 const value = unwrap(prop.initializer);
                 const fn = registeredFunction(value);
                 if (fn)
-                    nested({ start: prop.getStart(sf), end: prop.end, kind: "method", name, parentName: holder, exported: true, signature: `${name}${paramsText(fn, sf)}`, namePos: prop.name.getStart(sf) });
+                    nested({ start: prop.getStart(sf), end: prop.end, kind: "method", name, parentName: holder, exported: true, signature: `${name}${paramsText(fn, sf)}`, namePos: prop.name.getStart(sf), injected: true });
                 else if (ts.isObjectLiteralExpression(value) && depth < 3)
                     stateMembers(value, `${holder}.${name}`, depth + 1);
             }
@@ -808,6 +808,7 @@ export function collectDeclarations(sf, file) {
             hasBody: r.hasBody,
             fullSignature: full,
             ...(r.nameless ? { nameless: true } : {}),
+            ...(r.injected ? { injected: true } : {}),
         };
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-axi",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "AXI-compliant TypeScript symbol CLI for agents - definitions, references, callers, file outlines and change impact (blast radius) with token-efficient TOON output",
   "type": "module",
   "keywords": [