@nudojs/service 0.3.0 → 0.3.1

package/dist/index.d.ts

@@ -206,6 +206,11 @@ type HoverInfo = {
 /**
  * LSP hover：优先无损 Abs（类型即计算本体），TypeValue 仅作外延对照。
  * 节点表也是 Abs（collectAbsNodeTypes），不经 bridge。
+ *
+ * 函数名/调用 callee 位置（design-hof-relations §7）：
+ * intension 一律走 generalize/formatPoly（HOF fnRels 在这里）；
+ * typeText 仍落 B-path / TypeValue（调用点显示结果类型，不是函数签名）。
+ * 禁止用 B-path 的 arity-only fn Abs 冒充权威关系源。
  */
 declare function getHoverAtPosition(filePath: string, source: string, line: number, column: number, activeCases?: Map<string, number>): HoverInfo | null;
 declare function getCompletionsAtPosition(filePath: string, source: string, line: number, column: number): CompletionItem[];
@@ -491,7 +496,16 @@ declare function tryRunBPath(source: string, filePath: string, opts?: {
     /** @nudo:mock → Abs，注入为全局绑定（防止顶层调用真 fetch 等） */
     mocks?: Record<string, Abs>;
 }): BPathRunResult | undefined;
-/** B 路径求值具名导出（结果 + throws）；opts.collectCalls 时附带调用点记录 */
+/**
+ * B 路径求值具名导出（结果 + throws）；opts.collectCalls 时附带调用点记录。
+ *
+ * `calls` 只含**本次具名调用期间**（callTranspiledExportFull 内）发生的
+ * 调用点——不含模块级顶层调用（run.calls）。模块级记录由主分析流程
+ * 另行收集（analyzer 的 bTopCallRecords / absCallRecords）；在此重复返回
+ * 会把 B 路径结果（常为 unknown）当第二组记录推给 analyzer，dedupe 因
+ * 结果形态不同而保留，污染被调函数的 case 列表（多余 call@L 重复 +
+ * call@symbolic 聚合 case，见 analyzer directive-case 分支）。
+ */
 declare function tryBPathCallFull(source: string, filePath: string, fnName: string, args: Abs[], opts?: {
     collectCalls?: boolean;
     collectMemberDiags?: boolean;
@@ -531,8 +545,9 @@ declare function clearAnalysisSessionCaches(): void;
 declare function resetAllAnalysisCaches(): void;
 
 /**
- * env TypeValue → Abs：保留 fnSig impl，使 Promise.resolve / URL 等
- * 在 B 路径也能产出精确字面量。
+ * env TypeValue → Abs：
+ * - fnSig 带 impl（Promise.resolve / URL / path.join…）→ apply 路径，保留精确字面量
+ * - fnSig 仅有声明（readFileSync…）→ relationFn，调用产出声明返回类型而非 unknown
  */
 
 declare function envValueToAbs(tv: TypeValue): Abs;

package/dist/index.js

@@ -29,7 +29,7 @@ import {
   stableAnalyzeKeySource as stableAnalyzeKeySource2,
   fnFingerprints
 } from "@nudojs/core";
-import { parse as parse5, extractDirectives, extractFileDirectives, parseTypeValueExpr } from "@nudojs/parser";
+import { parse as parse5, extractDirectives, extractFileDirectives, parseTypeValueExpr as parseTypeValueExpr2 } from "@nudojs/parser";
 import {
   evaluate,
   evaluateFunction,
@@ -62,6 +62,7 @@ import {
 } from "@nudojs/cli/evaluator";
 
 // src/mock-abs.ts
+import { parseTypeValueExpr } from "@nudojs/parser";
 import {
   absFunction,
   emptyEnv,
@@ -255,6 +256,12 @@ function mockDirectivesToAbsSeeds(functions) {
         seedVars[d.name] = markMockConf(absFromMockHelper(d.nudoMock));
       } else if (d.sinonExpr) {
         seedVars[d.name] = markMockConf(absFromSinon(d.sinonExpr));
+      } else if (d.expression) {
+        try {
+          seedVars[d.name] = typeValueToAbs(parseTypeValueExpr(d.expression));
+        } catch {
+          seedVars[d.name] = absUnknown;
+        }
       }
     }
   }
@@ -995,32 +1002,40 @@ import {
   absToTypeValue,
   getFnSig as getFnSig2,
   absFunction as absFunction4,
+  relationFn,
   objOf
 } from "@nudojs/core";
 function envValueToAbs(tv) {
   if (!tv) return typeValueToAbs3({ kind: "unknown" });
   if (tv.kind === "function") {
     const sig = getFnSig2(tv);
-    if (sig?.impl) {
-      const params = tv.kind === "function" && tv.params?.length ? tv.params : sig.paramTypes.map((_, i) => `_arg${i}`);
-      const dummyBody = {
-        type: "BlockStatement",
-        body: [],
-        directives: []
-      };
-      const impl = sig.impl;
-      return absFunction4(params, {
-        body: dummyBody,
-        apply: (args) => {
-          const tvArgs = args.map((a) => absToTypeValue(a));
-          try {
-            const r = impl(tvArgs);
-            if (!r) return typeValueToAbs3(sig.returnType);
-            return envValueToAbs(r);
-          } catch {
-            return typeValueToAbs3(sig.returnType);
+    if (sig) {
+      const paramTypes = sig.paramTypes.map(typeValueToAbs3);
+      const returnType = typeValueToAbs3(sig.returnType);
+      if (sig.impl) {
+        const params = tv.params?.length ? tv.params : sig.paramTypes.map((_, i) => `_arg${i}`);
+        const dummyBody = {
+          type: "BlockStatement",
+          body: [],
+          directives: []
+        };
+        const impl = sig.impl;
+        return absFunction4(params, {
+          body: dummyBody,
+          apply: (args) => {
+            const tvArgs = args.map((a) => absToTypeValue(a));
+            try {
+              const r = impl(tvArgs);
+              if (!r) return returnType;
+              return envValueToAbs(r);
+            } catch {
+              return returnType;
+            }
           }
-        }
+        });
+      }
+      return relationFn(paramTypes, returnType, {
+        params: tv.params?.length ? tv.params : void 0
       });
     }
   }
@@ -1322,7 +1337,7 @@ function tryBPathCallFull(source, filePath, fnName, args, opts = {}) {
   const run = tryRunBPath(source, filePath, { envNames: opts.envNames, mocks: opts.mocks });
   if (!run) return void 0;
   if (!(fnName in run.exports)) return void 0;
-  const collected = [...run.calls ?? []];
+  const collected = [];
   const memberDiags = [];
   if (opts.collectCalls) {
     setBCallCollector((r) => collected.push(r));
@@ -1335,7 +1350,7 @@ function tryBPathCallFull(source, filePath, fnName, args, opts = {}) {
     const all = [...run.memberDiags ?? [], ...memberDiags];
     return {
       ...full,
-      calls: opts.collectCalls || run.calls?.length ? collected : void 0,
+      calls: opts.collectCalls ? collected : void 0,
       memberDiags: all.length ? all : void 0,
       moduleIssues: run.moduleIssues,
       truncatedFns: run.truncatedFns
@@ -1740,7 +1755,7 @@ function applyMocks(directives, env, filePath, diagnostics) {
           ]
         });
       }
-      env.bind(d.name, parseTypeValueExpr(d.expression));
+      env.bind(d.name, parseTypeValueExpr2(d.expression));
     } else if (d.fromPath) {
       const mockPath = resolve4(dirname5(filePath), d.fromPath);
       const mockSource = readFileSync4(mockPath, "utf-8");
@@ -2426,7 +2441,7 @@ function analyzeFileUncached(filePath, source, activeCases, externalCallRecords)
         seedVars: seeds.seedVars,
         seedFns: seeds.seedFns
       });
-      absGraphModules = g.modules;
+      absGraphModules = { ...collectEnvModules(envNames), ...g.modules };
       pushBModuleIssues(g.issues);
     } catch {
     }
@@ -2477,7 +2492,7 @@ function analyzeFileUncached(filePath, source, activeCases, externalCallRecords)
   if (selfContained || canAbsModules) {
     setAbsTruncationCollector2((label) => bTruncatedFns.add(label));
     try {
-      absCallRecords = collectAbsCallRecords(source, seeds, filePath, absGraphModules);
+      absCallRecords = collectAbsCallRecords(source, seeds, filePath, absGraphModules, envNames);
     } finally {
       setAbsTruncationCollector2(null);
     }
@@ -3172,6 +3187,34 @@ function getHoverAtPosition(filePath, source, line, column, activeCases) {
     file = void 0;
   }
   const envNames = collectEnvNames(filePath, source, false);
+  const fnName = findFunctionNameAtPosition(source, line, column, file);
+  let gDisplay;
+  let gAbs;
+  let gMulti;
+  if (fnName) {
+    try {
+      const g = generalizeFromAst2(fnName, source, file ? { file } : {});
+      if (g) {
+        gDisplay = g.display;
+        gAbs = formatAbs3(g.symbolic);
+        gMulti = formatAbsMultiline(g.symbolic, fnName);
+      }
+    } catch {
+    }
+  }
+  const attachIntension = (info2) => {
+    if (!gDisplay) return info2;
+    if (!info2) {
+      return { typeText: gDisplay, intension: gDisplay, abs: gAbs, absMultiline: gMulti };
+    }
+    return {
+      ...info2,
+      intension: gDisplay,
+      // 外延侧已有更准 Abs 时保留；否则用 symbolic 兜底
+      abs: info2.abs ?? gAbs,
+      absMultiline: info2.absMultiline ?? gMulti
+    };
+  };
   if (isBPathCapable(source, envNames)) {
     try {
       const seeds = mockDirectivesToAbsSeeds(extractDirectives(file ?? parse5(source)));
@@ -3183,7 +3226,7 @@ function getHoverAtPosition(filePath, source, line, column, activeCases) {
       });
       const absAt = findAbsAtPosition(absNodes, line, column);
       const ident2 = findIdentNameAtPosition(source, line, column, file);
-      if (ident2 && !findFunctionNameAtPosition(source, line, column, file)) {
+      if (ident2 && !fnName) {
         const binds = collectAbsBindingsFromGraph(source, filePath, {
           seedVars: seeds.seedVars,
           seedFns: seeds.seedFns
@@ -3192,40 +3235,19 @@ function getHoverAtPosition(filePath, source, line, column, activeCases) {
         if (bound) {
           const absLine = formatAbs3(bound);
           const absMulti = formatAbsMultiline(bound, ident2);
-          return { typeText: absLine, abs: absLine, absMultiline: absMulti };
+          return attachIntension({ typeText: absLine, abs: absLine, absMultiline: absMulti });
         }
       }
       if (absAt) {
         const absLine = formatAbs3(absAt);
         const absMulti = formatAbsMultiline(absAt, void 0);
-        return { typeText: absLine, abs: absLine, absMultiline: absMulti };
+        return attachIntension({ typeText: absLine, abs: absLine, absMultiline: absMulti });
       }
     } catch {
     }
   }
   const tv = getTypeAtPosition(filePath, source, line, column, activeCases);
   const info = tv ? { typeText: typeValueToString3(tv) } : null;
-  const fnName = findFunctionNameAtPosition(source, line, column, file);
-  if (fnName) {
-    try {
-      const g = generalizeFromAst2(fnName, source, file ? { file } : {});
-      if (g) {
-        if (info) {
-          info.intension = g.display;
-          info.abs = formatAbs3(g.symbolic);
-          info.absMultiline = formatAbsMultiline(g.symbolic, fnName);
-        } else {
-          return {
-            typeText: g.display,
-            intension: g.display,
-            abs: formatAbs3(g.symbolic),
-            absMultiline: formatAbsMultiline(g.symbolic, fnName)
-          };
-        }
-      }
-    } catch {
-    }
-  }
   const ident = findIdentNameAtPosition(source, line, column, file);
   if (ident && !fnName) {
     try {
@@ -3242,9 +3264,9 @@ function getHoverAtPosition(filePath, source, line, column, activeCases) {
           if (info) {
             info.abs = absLine;
             info.absMultiline = absMulti;
-            return info;
+            return attachIntension(info);
           }
-          return { typeText: absLine, abs: absLine, absMultiline: absMulti };
+          return attachIntension({ typeText: absLine, abs: absLine, absMultiline: absMulti });
         }
       }
     } catch {
@@ -3269,13 +3291,13 @@ function getHoverAtPosition(filePath, source, line, column, activeCases) {
           info.abs = absLine;
           info.absMultiline = absMulti;
         } else {
-          return { typeText: absLine, abs: absLine, absMultiline: absMulti };
+          return attachIntension({ typeText: absLine, abs: absLine, absMultiline: absMulti });
         }
       }
     }
   } catch {
   }
-  return info;
+  return attachIntension(info);
 }
 function findIdentNameAtPosition(source, line, column, fileAst) {
   try {
@@ -3565,11 +3587,11 @@ function absModulesOk(source, envNames) {
   void envNames;
   return true;
 }
-function collectAbsCallRecords(source, seeds, filePath, precomputedModules) {
+function collectAbsCallRecords(source, seeds, filePath, precomputedModules, envNames = []) {
   const absCalls = [];
   let modules = precomputedModules;
   let importLocals = /* @__PURE__ */ new Map();
-  if (filePath && absModulesOk(source, [])) {
+  if (filePath && absModulesOk(source, envNames)) {
     if (!modules) {
       try {
         const graph = evalAbsModuleGraph(source, filePath, {
@@ -3581,6 +3603,9 @@ function collectAbsCallRecords(source, seeds, filePath, precomputedModules) {
         modules = void 0;
       }
     }
+    if (envNames.length > 0) {
+      modules = { ...collectEnvModules(envNames), ...modules ?? {} };
+    }
     try {
       importLocals = buildAbsImportLocalMap(source, filePath);
     } catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nudojs/service",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Shared inference service for Nudo IDE integrations — file analysis, completions, and .d.ts generation",
   "type": "module",
   "license": "MIT",
@@ -12,7 +12,17 @@
     "dts-generation",
     "analysis"
   ],
-  "main": "src/index.ts",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
+  "files": [
+    "dist"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nudojs/nudo.git",
@@ -28,10 +38,10 @@
   "dependencies": {
     "@babel/traverse": "^7.29.0",
     "@babel/types": "^7.29.0",
-    "@nudojs/core": "0.3.0",
-    "@nudojs/parser": "0.3.0",
-    "@nudojs/cli": "0.3.0",
-    "@nudojs/harvester": "0.2.0"
+    "@nudojs/core": "0.3.1",
+    "@nudojs/parser": "0.3.1",
+    "@nudojs/cli": "0.3.1",
+    "@nudojs/harvester": "0.2.1"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm --dts"

package/CHANGELOG.md

@@ -1,68 +0,0 @@
-# @nudojs/service
-
-## 0.3.0
-
-### Minor Changes
-
-- 5786fa5: Promote the B-path (transpile + in-process Abs runtime) to the primary evaluation path for capable sources.
-
-  - Module graph now supports relative imports, bare-package harvest, default/namespace imports, re-exports, `export *`, require, cycle/depth/missing guards, and env modules (`path` / `node:path` etc.).
-  - Diagnostics, `@nudo:env` / mock injection, `call@` / `entry@` provenance, method-missing, unknown-recv, generators, classes, async/await, optional chaining, and destructuring run through B.
-  - When B hosts a file, `evaluateProgram` is skipped so TypeValue no longer double-reports.
-  - CLI `check` / `types` / `test` accept directories; check uses an Abs-only gate.
-  - LSP hover / `getTypeAtPosition` on capable files read the Abs node table; `*.nudo.js` edits evict L0 and recheck open parents.
-  - Public core surface now re-exports the algebra API (`Abs`, check, generalize, exec, bridge, `parseSource`, `stripTypes`).
-
-- 5786fa5: Speed up repeated analysis with layered memos and tighter cache contracts.
-
-  - Shared parse/AST LRU, `generalizeFromAst` L0–L3 (instantiate, α-equivalence, dep fingerprint + LRU), Abs module cache, and session-wide memos with an incremental after-edit path.
-  - Host cache-eviction contract, AST/function-fingerprint memory caps, conservative call-scan depth cap, and fail-open truncated dependency fingerprints.
-  - Fix session-memo staleness and identity holes so after-edit results stay correct.
-
-### Patch Changes
-
-- Updated dependencies [5786fa5]
-- Updated dependencies [5786fa5]
-- Updated dependencies [5786fa5]
-- Updated dependencies [5786fa5]
-  - @nudojs/core@0.3.0
-  - @nudojs/cli@0.3.0
-  - @nudojs/harvester@0.2.0
-  - @nudojs/parser@0.3.0
-
-## 0.2.1
-
-### Patch Changes
-
-- Updated dependencies [0fd0718]
-  - @nudojs/cli@0.2.1
-
-## 0.2.0
-
-### Minor Changes
-
-- 6c38283: docs and ci
-- 9f7f819: fix pkg info
-- c175f71: version
-
-### Patch Changes
-
-- Updated dependencies [6c38283]
-- Updated dependencies [9f7f819]
-- Updated dependencies [c175f71]
-  - @nudojs/cli@0.2.0
-  - @nudojs/core@0.2.0
-  - @nudojs/parser@0.2.0
-
-## 0.1.0
-
-### Minor Changes
-
-- Conceptual design and basic implementation.
-
-### Patch Changes
-
-- Updated dependencies
-  - nudo@0.1.0
-  - @nudojs/core@0.1.0
-  - @nudojs/parser@0.1.0

package/src/__tests__/abs-bindings.test.ts

@@ -1,53 +0,0 @@
-import { describe, it, expect, afterAll } from "vitest";
-import { mkdtempSync, writeFileSync, rmSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { collectAbsBindingsFromGraph, analyzeFile, getHoverAtPosition } from "@nudojs/service";
-import { formatAbs, absToString } from "@nudojs/core";
-
-const dirs: string[] = [];
-afterAll(() => {
-  for (const d of dirs) rmSync(d, { recursive: true, force: true });
-});
-
-describe("Abs bindings from module graph", () => {
-  it("includes local functions and imported names", () => {
-    const dir = mkdtempSync(join(tmpdir(), "nudo-abs-bind-"));
-    dirs.push(dir);
-    writeFileSync(join(dir, "math.js"), `export function double(x) { return x * 2; }\n`);
-    const main = `import { double } from "./math.js";
-export function run(n) { return double(n); }
-const k = 1;
-`;
-    const mainPath = join(dir, "main.js");
-    writeFileSync(mainPath, main, "utf-8");
-    const binds = collectAbsBindingsFromGraph(main, mainPath);
-    expect(binds.has("run")).toBe(true);
-    expect(binds.has("double")).toBe(true);
-    expect(binds.has("k")).toBe(true);
-    expect(formatAbs(binds.get("k")!)).toContain("1");
-  });
-
-  it("analyzeFile bindings prefer Abs projection for capable files", () => {
-    const dir = mkdtempSync(join(tmpdir(), "nudo-abs-bind2-"));
-    dirs.push(dir);
-    writeFileSync(join(dir, "math.js"), `export function double(x) { return x * 2; }\n`);
-    const main = `import { double } from "./math.js";
-export function run(n) { return double(n); }
-`;
-    const mainPath = join(dir, "main.js");
-    writeFileSync(mainPath, main, "utf-8");
-    const result = analyzeFile(mainPath, main);
-    expect(result.bindings.has("run")).toBe(true);
-    // imported binding should exist
-    expect(result.bindings.has("double")).toBe(true);
-  });
-
-  it("hover on local function returns abs", () => {
-    const src = `export function add(a, b) { return a + b; }
-`;
-    const h = getHoverAtPosition("/tmp/hover-abs.js", src, 1, 16);
-    // 不要求精确命中，但不应抛错
-    expect(h === null || typeof h.typeText === "string").toBe(true);
-  });
-});

package/src/__tests__/abs-call-records.test.ts

@@ -1,33 +0,0 @@
-import { describe, it, expect, afterAll } from "vitest";
-import { mkdtempSync, writeFileSync, rmSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join, resolve } from "node:path";
-import { analyzeFile } from "@nudojs/service";
-import { typeValueToString } from "@nudojs/core";
-
-const dirs: string[] = [];
-afterAll(() => {
-  for (const d of dirs) rmSync(d, { recursive: true, force: true });
-});
-
-describe("Abs call records with relative import", () => {
-  it("tags imported calls with targetModule and feeds externalFunctions", () => {
-    const dir = mkdtempSync(join(tmpdir(), "nudo-abs-call-"));
-    dirs.push(dir);
-    const bSrc = `export function triple(x) { return x * 3; }\n`;
-    const aSrc = `import { triple } from "./b.js";\nfunction caller(n) { return triple(n); }\nconst r = caller(4);\n`;
-    writeFileSync(join(dir, "b.js"), bSrc);
-    const aPath = resolve(dir, "a.js");
-    writeFileSync(aPath, aSrc);
-
-    const result = analyzeFile(aPath, aSrc);
-
-    expect(result.externalFunctions).toBeDefined();
-    expect(result.externalFunctions).toHaveLength(1);
-    const triple = result.externalFunctions![0];
-    expect(triple.name).toBe("triple");
-    expect(triple.fromModule).toContain("b.js");
-    expect(triple.cases).toHaveLength(1);
-    expect(typeValueToString(triple.cases[0].result)).toBe("12");
-  });
-});

package/src/__tests__/abs-calls.test.ts

@@ -1,59 +0,0 @@
-import { describe, it, expect } from "vitest";
-import { analyzeFile } from "../analyzer.ts";
-import { typeValueToString } from "@nudojs/core";
-
-describe("self-contained Abs call records", () => {
-  it("collects call sites from Abs program eval", () => {
-    const source = `
-      function add(a, b) { return a + b; }
-      const r = add(2, 3);
-    `;
-    const result = analyzeFile("/t/abs-call.js", source);
-    const add = result.functions.find((f) => f.name === "add");
-    expect(add).toBeDefined();
-    expect(add!.cases.length).toBeGreaterThan(0);
-    expect(add!.cases[0]!.source).toBe("callsite");
-    expect(typeValueToString(add!.cases[0]!.result)).toBe("5");
-  });
-
-  it("self-contained entry still works", () => {
-    const source = `function scale(x) { return x + 1; }`;
-    const result = analyzeFile("/t/abs-entry.js", source);
-    const scale = result.functions.find((f) => f.name === "scale");
-    expect(scale!.entryOnly).toBe(true);
-    expect(scale!.cases[0]!.intension).toBeDefined();
-  });
-
-  it("mock seeds feed Abs path (call@ stays exact)", () => {
-    const source = `
-      // @nudo:mock parse = stub().returns(42)
-      function run() {
-        return parse();
-      }
-      const r = run();
-    `;
-    const result = analyzeFile("/t/abs-mock.js", source);
-    const run = result.functions.find((f) => f.name === "run");
-    expect(run).toBeDefined();
-    const call = run!.cases.find((c) => c.source === "callsite");
-    expect(call).toBeDefined();
-    expect(typeValueToString(call!.result)).toBe("42");
-  });
-
-  it("directive expected is carried on CaseResult", () => {
-    const source = `
-      /**
-       * @nudo:case "ok" (1) => T.number
-       * @nudo:case "bad" (1) => T.string
-       */
-      function id(x) { return x; }
-    `;
-    const result = analyzeFile("/t/abs-expected.js", source);
-    const id = result.functions.find((f) => f.name === "id");
-    const ok = id!.cases.find((c) => c.name === "ok");
-    const bad = id!.cases.find((c) => c.name === "bad");
-    expect(ok!.expected).toBeDefined();
-    expect(bad!.expected).toBeDefined();
-    expect(result.diagnostics.some((d) => d.code === "nudo:case-expected")).toBe(true);
-  });
-});