@nudojs/parser 1.3.1 → 2.0.0

package/dist/index.d.ts

@@ -174,36 +174,49 @@ type DirectiveDiag = {
     code: string;
     message: string;
 };
-declare function setDirectiveDiagCollector(fn: ((d: DirectiveDiag) => void) | null): void;
-/** 当前诊断累计序号（since 锚：消费方只排干自身 extract 产生的增量） */
-declare function directiveDiagCount(): number;
-/** 取走已收集的诊断（全量排干 + 清空 seen）——CLI/测试整批消费 */
-declare function takeDirectiveDiags(): DirectiveDiag[];
 /**
- * 只取走 seq > since 的诊断（清空仅限增量）——对齐 takeInterfaceDiagsSince。
- * LSP 长驻进程里 analyze/check/lens 用它排干**自身 extract** 产生的诊断，
- * 不窃取在途其他消费方待收的指令文法诊断（全量 take 曾在 await 窗口偷走跨文件诊断）。
+ * 在指定诊断数组上执行 fn：fn 内所有指令文法诊断（含不传 diags 的 extract
+ * 与再解析路径，如 @nudo:mock 表达式的 parseCaseArgExpr 复解析）落袋并共用
+ * 同一去重域——用于「extract + 复解析」必须共享 seen 的窗口（nudojs check
+ * 的 D1 段）。fn 内显式传 diags 的 extract 自成新去重域。
  */
-declare function takeDirectiveDiagsSince(since: number): DirectiveDiag[];
+declare function runWithDirectiveDiags<T>(diags: DirectiveDiag[], fn: () => T): T;
 /**
  * case 实参 / 指令类型表达式唯一文法：约束构建器优先，其余为具体字面量、
  * 结构字面量与箭头函数。`T.*` 文法已物理删除。
  * depth 按包含关系逐层 +1 线程化传递（兄弟共享父深度，不用共享可变计数器）。
  */
 declare function parseCaseArgExpr(expr: string, depth?: number): Abs;
+/**
+ * extractDirectives 显式诊断通道 opts。
+ *
+ * `diags`：调用方自备的诊断累积数组——本次 extract 产生的指令文法诊断
+ * 全部同步落袋，单次调用内同文案去重。不传时为纯查询形态：诊断丢弃
+ * （等价 extractDirectivesQuiet）；若外层有 runWithDirectiveDiags 活动域，
+ * 则落入该域并与其共享去重。
+ */
+type ExtractDirectivesOpts = {
+    diags?: DirectiveDiag[];
+};
 /**
  * D6=G2：指令绑定 AST 最近 Function（含 nested function、class method）。
  * 作用域清单与 refine 的 @nudo:contract 同源（core directive-scan），
  * case 与 contract 对同一函数集合同时可见。
  */
-declare function extractDirectives(ast: Node): FunctionWithDirectives[];
+declare function extractDirectives(ast: Node, opts?: ExtractDirectivesOpts): FunctionWithDirectives[];
 /**
- * 纯查询 extract：排干自身产生的指令文法诊断增量并丢弃——
- * hover/completion/collectSkipReturns 等探测路径不得把诊断留在全局 buffer
- * 供在途 validate/check 误窃，也不得自己背走别人的在途诊断。
+ * 纯查询 extract：诊断丢弃——hover/completion/collectSkipReturns 等探测
+ * 路径不产诊断（不污染消费方待收的诊断，也不背走别人的在途诊断）。
+ * 需要诊断的调用方用 extractDirectives(ast, { diags })。
  */
 declare function extractDirectivesQuiet(ast: Node): FunctionWithDirectives[];
-declare function extractInlineDirectives(node: Node): InlineDirective[];
+/**
+ * 行内指令（@nudo:as / @nudo:replace）抽取，源为节点的 leadingComments。
+ * 诊断通道与 extractDirectives 同形：传 opts.diags 落调用方数组（单次调用
+ * 内同文案去重，语句级调用各自独立去重）；不传则落外层
+ * runWithDirectiveDiags 域（无则丢弃，纯查询形态）。
+ */
+declare function extractInlineDirectives(node: Node, opts?: ExtractDirectivesOpts): InlineDirective[];
 declare function extractFileDirectives(ast: Node): FileDirective[];
 
-export { type AsDirective, type CaseDirective, type Directive, type DirectiveDiag, type EnvDirective, type FileDirective, type FunctionWithDirectives, type InlineDirective, type InstanceMethod, type MockDirective, type MockModuleDirective, type PureDirective, type ReplaceDirective, type SampleDirective, type SinonExpression, type SkipDirective, asAssignmentExpression, asExpression, asIdentifier, asMemberExpression, asProgram, classIdName, classInstanceMethods, classMemberKey, classMemberKeyName, directiveDiagCount, exportSpecifierExportedName, exportSpecifierLocalName, extractDirectives, extractDirectivesQuiet, extractFileDirectives, extractInlineDirectives, fnOrClassIdLoc, fnOrClassIdName, getClassMembers, getDeclarations, getDeclaratorId, getDeclaratorInit, getExportDeclaration, getExportSpecifiers, getExpressionStatementExpression, getFirstDeclaratorId, identifierName, isModuleExportsMember, memberObjectName, memberPropertyKey, memberPropertyName, methodFunctionNode, nameOrStringValue, paramDisplayName, paramName, parse, parseCaseArgExpr, programBody, setDirectiveDiagCollector, takeDirectiveDiags, takeDirectiveDiagsSince, unwrapDefaultExport, unwrapExport };
+export { type AsDirective, type CaseDirective, type Directive, type DirectiveDiag, type EnvDirective, type ExtractDirectivesOpts, type FileDirective, type FunctionWithDirectives, type InlineDirective, type InstanceMethod, type MockDirective, type MockModuleDirective, type PureDirective, type ReplaceDirective, type SampleDirective, type SinonExpression, type SkipDirective, asAssignmentExpression, asExpression, asIdentifier, asMemberExpression, asProgram, classIdName, classInstanceMethods, classMemberKey, classMemberKeyName, exportSpecifierExportedName, exportSpecifierLocalName, extractDirectives, extractDirectivesQuiet, extractFileDirectives, extractInlineDirectives, fnOrClassIdLoc, fnOrClassIdName, getClassMembers, getDeclarations, getDeclaratorId, getDeclaratorInit, getExportDeclaration, getExportSpecifiers, getExpressionStatementExpression, getFirstDeclaratorId, identifierName, isModuleExportsMember, memberObjectName, memberPropertyKey, memberPropertyName, methodFunctionNode, nameOrStringValue, paramDisplayName, paramName, parse, parseCaseArgExpr, programBody, runWithDirectiveDiags, unwrapDefaultExport, unwrapExport };

package/dist/index.js

@@ -181,7 +181,6 @@ import {
   spy,
   mock,
   abs as makeAbs,
-  lit as termLit,
   numLit,
   strLit,
   boolLit,
@@ -200,70 +199,34 @@ import {
   scanCaseTags,
   extractBalancedParens
 } from "@nudojs/core";
+import { absLit } from "@nudojs/core/internal";
 function absExact(shape) {
   return makeAbs(shape, void 0, void 0, "exact");
 }
 function absUnknown() {
   return makeAbs({ k: "unknown" }, void 0, void 0, "partial");
 }
-function absNullLit() {
-  return makeAbs({ k: "unknown" }, termLit(null), void 0, "exact");
-}
-function absUndefLit() {
-  return makeAbs({ k: "unknown" }, termLit(void 0), void 0, "exact");
-}
-function absLit(v) {
-  if (typeof v === "number") return numLit(v);
-  if (typeof v === "string") return strLit(v);
-  if (typeof v === "boolean") return boolLit(v);
-  if (v === null) return absNullLit();
-  return absUndefLit();
-}
-var directiveDiagCollector = null;
-var directiveDiagSeq = 0;
-var directiveDiags = [];
-var MAX_DIRECTIVE_DIAGS = 1024;
-var directiveDiagSeen = /* @__PURE__ */ new Set();
-function setDirectiveDiagCollector(fn) {
-  directiveDiagCollector = fn;
-}
-function directiveDiagCount() {
-  return directiveDiagSeq;
-}
-function takeDirectiveDiags() {
-  const out = directiveDiags.map((e) => e.d);
-  directiveDiags.length = 0;
-  directiveDiagSeen.clear();
-  return out;
-}
-function takeDirectiveDiagsSince(since) {
-  const out = [];
-  let kept = 0;
-  for (const e of directiveDiags) {
-    if (e.seq > since) out.push(e.d);
-    else directiveDiags[kept++] = e;
+var activeDiagSink = null;
+function runWithDirectiveDiags(diags, fn) {
+  const prev = activeDiagSink;
+  activeDiagSink = { list: diags, seen: /* @__PURE__ */ new Set() };
+  try {
+    return fn();
+  } finally {
+    activeDiagSink = prev;
   }
-  directiveDiags.length = kept;
-  return out;
 }
 function emitDirectiveDiag(d) {
+  if (!activeDiagSink) return;
   const key = `${d.code}\0${d.message}`;
-  if (directiveDiagSeen.has(key)) return;
-  directiveDiagSeen.add(key);
-  if (directiveDiags.length >= MAX_DIRECTIVE_DIAGS) {
-    directiveDiags.shift();
-    directiveDiagSeen.clear();
-  }
-  directiveDiags.push({ seq: ++directiveDiagSeq, d });
-  directiveDiagCollector?.(d);
-}
-function resetDirectiveDiagSeen() {
-  directiveDiagSeen.clear();
+  if (activeDiagSink.seen.has(key)) return;
+  activeDiagSink.seen.add(key);
+  activeDiagSink.list.push(d);
 }
 var CASE_TAG_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*|\/[ \t]*)?@nudo:case\b[ \t]*([^\n]*)/g;
 var JS_IDENT_RE = /^[\p{L}$_][\p{L}\p{N}$_]*$/u;
 var MOCK_INLINE_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*|\/[ \t]*)?@nudo:mock\b[ \t]+([^\s=]+)[ \t]*=[ \t]*(.+)/g;
-var MOCK_FROM_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*|\/[ \t]*)?@nudo:mock\b[ \t]+([^\s]+)[ \t]+from[ \t]+"([^"\n]+)"/g;
+var MOCK_FROM_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*|\/[ \t]*)?@nudo:mock\b[ \t]+([^\s]+)[ \t]+from[ \t]+(?:"([^"\n]+)"|'([^'\n]+)')/g;
 var MOCK_TAG_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*|\/[ \t]*)?@nudo:mock\b[ \t]*([^\n]*)/g;
 var PURE_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*|\/[ \t]*)?@nudo:pure\b/g;
 var SKIP_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*|\/[ \t]*)?@nudo:skip\b(?:[ \t]+(\S[^\n]*))?/g;
@@ -397,8 +360,8 @@ function constraintToCaseArgAbs(c, depth) {
     if (typeof lv === "number" && !Number.isNaN(lv)) return numLit(lv);
     if (typeof lv === "string") return strLit(lv);
     if (typeof lv === "boolean") return boolLit(lv);
-    if (lv === null) return absNullLit();
-    return absUndefLit();
+    if (lv === null) return absLit(null);
+    return absLit(void 0);
   }
   if (c.element) {
     return absExact({ k: "arr", element: constraintToCaseArgAbs(c.element, depth + 1) });
@@ -845,7 +808,7 @@ function parseDirectivesFromCommentTexts(comments) {
       directives.push({
         kind: "mock",
         name,
-        fromPath: mockFromMatch[2]
+        fromPath: mockFromMatch[2] ?? mockFromMatch[3]
       });
       mockFromRanges.push([mockFromMatch.index, mockFromMatch.index + mockFromMatch[0].length]);
     }
@@ -974,7 +937,7 @@ function scanMalformedMockNames(text, caseArgSpans) {
     if (!nameMatch) {
       emitDirectiveDiag({
         code: "nudo:directive-syntax",
-        message: `Malformed @nudo:mock: cannot parse name (expected @nudo:mock <ident> = <expr> or @nudo:mock <ident> from "path") \u2014 got: ${rest.slice(0, 60)}`
+        message: `Malformed @nudo:mock: cannot parse name (expected @nudo:mock <ident> = <expr> or @nudo:mock <ident> from "path" / 'path') \u2014 got: ${rest.slice(0, 60)}`
       });
       continue;
     }
@@ -987,16 +950,25 @@ function scanMalformedMockNames(text, caseArgSpans) {
       continue;
     }
     const afterName = rest.slice(name.length);
-    if (/^[ \t]+from[ \t]+"[^"\n]*$/.test(afterName)) {
+    if (/^[ \t]+from[ \t]+(?:"[^"\n]*|'[^'\n]*)$/.test(afterName)) {
       emitDirectiveDiag({
         code: "nudo:directive-syntax",
-        message: `Malformed @nudo:mock from: unclosed quote in path (expected @nudo:mock ${name} from "path") \u2014 got: @nudo:mock ${rest.slice(0, 60)}`
+        message: `Malformed @nudo:mock from: unclosed quote in path (expected @nudo:mock ${name} from "path" / 'path') \u2014 got: @nudo:mock ${rest.slice(0, 60)}`
       });
     }
   }
 }
-function extractDirectives(ast) {
-  resetDirectiveDiagSeen();
+function extractDirectives(ast, opts) {
+  if (!opts?.diags) return collectFnDirectives(ast);
+  const prev = activeDiagSink;
+  activeDiagSink = { list: opts.diags, seen: /* @__PURE__ */ new Set() };
+  try {
+    return collectFnDirectives(ast);
+  } finally {
+    activeDiagSink = prev;
+  }
+}
+function collectFnDirectives(ast) {
   const results = [];
   if (ast.type !== "File") return results;
   const scopes = listFnDirectiveScopes(ast);
@@ -1013,10 +985,7 @@ function extractDirectives(ast) {
   return results;
 }
 function extractDirectivesQuiet(ast) {
-  const since = directiveDiagCount();
-  const out = extractDirectives(ast);
-  takeDirectiveDiagsSince(since);
-  return out;
+  return extractDirectives(ast, { diags: [] });
 }
 function stripInlineCommentPrefix(line, kind) {
   const s = kind === "block" ? line.replace(/^\s*\*\s?/, "") : line.replace(/^\//, "");
@@ -1044,10 +1013,19 @@ function findTrailingCommentStart(expr) {
   }
   return -1;
 }
-function extractInlineDirectives(node) {
-  resetDirectiveDiagSeen();
+function extractInlineDirectives(node, opts) {
   const comments = node.leadingComments;
   if (!comments) return [];
+  if (!opts?.diags) return collectInlineDirectivesFromComments(comments);
+  const prev = activeDiagSink;
+  activeDiagSink = { list: opts.diags, seen: /* @__PURE__ */ new Set() };
+  try {
+    return collectInlineDirectivesFromComments(comments);
+  } finally {
+    activeDiagSink = prev;
+  }
+}
+function collectInlineDirectivesFromComments(comments) {
   const results = [];
   for (const comment of comments) {
     if (comment.type !== "CommentLine" && comment.type !== "CommentBlock") continue;
@@ -1194,7 +1172,6 @@ export {
   classInstanceMethods,
   classMemberKey,
   classMemberKeyName,
-  directiveDiagCount,
   exportSpecifierExportedName,
   exportSpecifierLocalName,
   extractDirectives,
@@ -1232,14 +1209,12 @@ export {
   parseMockModulePayload2 as parseMockModulePayload,
   parseNudoImportPayload,
   programBody,
+  runWithDirectiveDiags,
   scanBudgetDecl,
   scanCaseTags2 as scanCaseTags,
   scanContractSegments,
   scanThrowsDecl,
-  setDirectiveDiagCollector,
   stripTypes,
-  takeDirectiveDiags,
-  takeDirectiveDiagsSince,
   unwrapDefaultExport,
   unwrapExport
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nudojs/parser",
-  "version": "1.3.1",
+  "version": "2.0.0",
   "engines": {
     "node": ">=20"
   },
@@ -39,7 +39,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@nudojs/core": "1.7.0",
+    "@nudojs/core": "1.7.2",
     "@babel/types": "^8.0.6"
   },
   "scripts": {