@nudojs/cli 0.2.1 → 0.3.0

package/src/narrowing.ts

@@ -9,7 +9,9 @@ import {
   typeValueEquals,
   isSubtypeOf,
   createRange,
+  v as termVar,
 } from "@nudojs/core";
+import { attachTerm } from "./term-registry.ts";
 
 /**
  * Given a test expression and the current environment, produce two
@@ -452,6 +454,11 @@ function narrowByComparison(
     : op === "<=" ? createRange({ min: value + 1 })
     : createRange({ min: value });
 
+  // 保留项身份：range 界经 toAbsWithTerms 编码为 Pred，代数继续传播
+  const term = termVar(varName);
+  attachTerm(trueRange, term);
+  attachTerm(falseRange, term);
+
   trueEnv.bind(varName, trueRange);
   falseEnv.bind(varName, falseRange);
   return [trueEnv, falseEnv];

package/src/phi-from-test.ts

@@ -0,0 +1,42 @@
+/**
+ * 从 Babel 测试表达式提取代数 Φ 约束。
+ * 支持 `x > n` / `x >= n` / `x < n` / `x <= n`（Identifier × NumericLiteral）。
+ * false 分支用对偶比较（`>` ↔ `≤`），使 else 路径也能携带约束。
+ */
+
+import type { Node } from "@babel/types";
+import type { Phi } from "@nudojs/core";
+import { pTrue, and as phiAnd, gt, ge, lt, le, v as termVar, lit } from "@nudojs/core";
+
+export function phiFromTest(test: Node): { whenTrue: Phi; whenFalse: Phi } {
+  if (test.type !== "BinaryExpression") {
+    return { whenTrue: pTrue, whenFalse: pTrue };
+  }
+  const op = test.operator;
+  const left = test.left;
+  const right = test.right;
+
+  // x ≷ n
+  if (
+    left.type === "Identifier" &&
+    right.type === "NumericLiteral" &&
+    (op === ">" || op === ">=" || op === "<" || op === "<=")
+  ) {
+    const t = termVar(left.name);
+    const n = lit(right.value);
+    const pred =
+      op === ">" ? gt(t, n) : op === ">=" ? ge(t, n) : op === "<" ? lt(t, n) : le(t, n);
+    // 对偶：¬(a≷b) = a≲b（数值全序）
+    const dual =
+      op === ">" ? le(t, n) : op === ">=" ? lt(t, n) : op === "<" ? ge(t, n) : gt(t, n);
+    return { whenTrue: pred, whenFalse: dual };
+  }
+
+  return { whenTrue: pTrue, whenFalse: pTrue };
+}
+
+export function combinePhi(base: Phi, extra: Phi): Phi {
+  if (extra.op === "true") return base;
+  if (base.op === "true") return extra;
+  return phiAnd(base, extra);
+}

package/src/run-test.ts

@@ -0,0 +1,92 @@
+/**
+ * nudo test — @nudo:case 即测试。
+ *
+ * directive case 带 `=> expected` 时，用 isSubtypeOf 校验推断结果；
+ * 失败记 FAIL，进程退出码 1。无期望的 directive case 记 unchecked。
+ */
+
+import { isSubtypeOf, typeValueToString, type TypeValue } from "@nudojs/core";
+import type { AnalysisResult } from "@nudojs/service";
+
+export type CaseTestOutcome = {
+  fn: string;
+  caseName: string;
+  ok: boolean;
+  unchecked: boolean;
+  expected?: string;
+  actual: string;
+};
+
+export type TestReport = {
+  file: string;
+  passed: number;
+  failed: number;
+  unchecked: number;
+  outcomes: CaseTestOutcome[];
+};
+
+export function buildTestReport(file: string, result: AnalysisResult): TestReport {
+  const outcomes: CaseTestOutcome[] = [];
+  for (const fn of result.functions) {
+    for (const c of fn.cases) {
+      if (c.source !== "directive") continue;
+      const actual = typeValueToString(c.result);
+      if (!c.expected) {
+        outcomes.push({
+          fn: fn.name,
+          caseName: c.name,
+          ok: true,
+          unchecked: true,
+          actual,
+        });
+        continue;
+      }
+      const expected = typeValueToString(c.expected as TypeValue);
+      let ok = false;
+      try {
+        ok = isSubtypeOf(c.result, c.expected as TypeValue);
+      } catch {
+        ok = false;
+      }
+      outcomes.push({
+        fn: fn.name,
+        caseName: c.name,
+        ok,
+        unchecked: false,
+        expected,
+        actual,
+      });
+    }
+  }
+  return {
+    file,
+    passed: outcomes.filter((o) => o.ok && !o.unchecked).length,
+    failed: outcomes.filter((o) => !o.ok).length,
+    unchecked: outcomes.filter((o) => o.unchecked).length,
+    outcomes,
+  };
+}
+
+export function formatTestReport(r: TestReport): string {
+  const lines: string[] = [];
+  lines.push(`nudo test  ${r.file}`);
+  if (r.passed + r.failed + r.unchecked === 0) {
+    lines.push("No @nudo:case directives found.");
+    return lines.join("\n");
+  }
+  lines.push(r.failed === 0 ? "PASS" : "FAILED");
+  lines.push(`  ${r.passed} passed · ${r.failed} failed · ${r.unchecked} unchecked`);
+  lines.push("");
+  for (const o of r.outcomes) {
+    if (o.unchecked) {
+      lines.push(`  [unchecked] ${o.fn}  case "${o.caseName}" → ${o.actual}`);
+    } else if (o.ok) {
+      lines.push(`  [ok]   ${o.fn}  case "${o.caseName}" → ${o.actual}`);
+    } else {
+      lines.push(`  [FAIL] ${o.fn}  case "${o.caseName}"`);
+      lines.push(`         expected: ${o.expected}`);
+      lines.push(`         actual:   ${o.actual}`);
+    }
+  }
+  return lines.join("\n");
+}

package/src/term-registry.ts

@@ -0,0 +1,96 @@
+/**
+ * TypeValue 项（term）身份旁路。
+ *
+ * core 的 TypeValue 无 term 字段；用 WeakMap 旁路挂载，零侵入。
+ * 纪律：
+ * - 禁止给共享单例（T.number 等）挂 term——必须先 clone 再 attach
+ * - typeValueToAbs 优先读旁路；无旁路时按 kind 推导
+ */
+
+import type { TypeValue } from "@nudojs/core";
+import { T } from "@nudojs/core";
+import type { Term } from "@nudojs/core";
+import { v as termVar, lit } from "@nudojs/core";
+import type { Pred } from "@nudojs/core";
+
+const termByTv = new WeakMap<object, Term>();
+const predByTv = new WeakMap<object, Pred>();
+
+export function attachTerm(tv: TypeValue, term: Term): void {
+  if (tv && typeof tv === "object") termByTv.set(tv as object, term);
+}
+
+export function getTerm(tv: TypeValue): Term | undefined {
+  if (tv && typeof tv === "object") return termByTv.get(tv as object);
+  return undefined;
+}
+
+export function attachPred(tv: TypeValue, pred: Pred): void {
+  if (tv && typeof tv === "object") predByTv.set(tv as object, pred);
+}
+
+export function getPred(tv: TypeValue): Pred | undefined {
+  if (tv && typeof tv === "object") return predByTv.get(tv as object);
+  return undefined;
+}
+
+/**
+ * 为参数绑定克隆 TypeValue 并挂 term。
+ * - primitive number → clone + var(name)
+ * - literal number → clone + lit(value)（与 kind 推导一致，但显式）
+ * - refined → clone + 尽量挂 base term + pred
+ */
+export function tagParamArg(arg: TypeValue, paramName: string): TypeValue {
+  if (!paramName || paramName.startsWith("...")) return arg;
+  // 函数/实例不 clone：浅拷贝会丢 _signature / 原型表（Promise executor 等）
+  if (arg.kind === "function" || arg.kind === "instance") return arg;
+  const cloned = cloneTypeValue(arg);
+  if (cloned.kind === "primitive" && cloned.type === "number") {
+    attachTerm(cloned, termVar(paramName));
+  } else if (cloned.kind === "literal" && typeof cloned.value === "number") {
+    attachTerm(cloned, lit(cloned.value));
+  } else if (cloned.kind === "refined") {
+    attachTerm(cloned, termVar(paramName));
+  }
+  return cloned;
+}
+
+function cloneTypeValue(tv: TypeValue): TypeValue {
+  switch (tv.kind) {
+    case "literal":
+      return { kind: "literal", value: tv.value };
+    case "primitive":
+      return { kind: "primitive", type: tv.type };
+    case "refined":
+      return { kind: "refined", base: tv.base, refinement: tv.refinement };
+    case "object":
+      return { kind: "object", properties: tv.properties, id: tv.id };
+    case "array":
+      return { kind: "array", element: tv.element };
+    case "tuple":
+      return { kind: "tuple", elements: tv.elements };
+    case "function":
+      return {
+        kind: "function",
+        params: tv.params,
+        body: tv.body,
+        closure: tv.closure,
+      };
+    case "promise":
+      return { kind: "promise", value: tv.value };
+    case "instance":
+      return {
+        kind: "instance",
+        className: tv.className,
+        properties: tv.properties,
+      };
+    case "union":
+      return { kind: "union", members: tv.members };
+    case "never":
+      return { kind: "never" };
+    case "unknown":
+      return { kind: "unknown" };
+    default:
+      return tv;
+  }
+}

package/CHANGELOG.md

@@ -1,41 +0,0 @@
-# nudo
-
-## 0.2.1
-
-### Patch Changes
-
-- 0fd0718: Merge the three environment packages into one: `@nudojs/env-es`, `@nudojs/env-web`, `@nudojs/env-node` are replaced by a single `@nudojs/env` package with subpath exports `@nudojs/env/es`, `@nudojs/env/web`, `@nudojs/env/node`.
-
-  Move agent-facing tools from the standalone MCP server into the language server: `@nudojs/mcp` is removed. `@nudojs/lsp` now exposes `nudo.whatIf`, `nudo.suggestCase`, `nudo.trace`, `nudo.selectCase`, and `nudo.getActiveCases` via `workspace/executeCommand` (custom-request aliases `nudo/whatIf` etc. included), adds pull-mode diagnostics, and works on files that are not open in the editor (disk fallback). `nudo.whatIf` now actually applies the given type bindings — previously they were ignored. AI agents connect through any LSP↔MCP bridge (cclsp, mcpls, agent-lsp) or a native LSP client; an installable agent skill ships at `packages/lsp/agent-skill/SKILL.md`.
-
-- Updated dependencies [0fd0718]
-  - @nudojs/env@0.2.0
-  - @nudojs/service@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/core@0.2.0
-  - @nudojs/parser@0.2.0
-
-## 0.1.0
-
-### Minor Changes
-
-- Conceptual design and basic implementation.
-
-### Patch Changes
-
-- Updated dependencies
-  - @nudojs/core@0.1.0
-  - @nudojs/parser@0.1.0