@nudojs/parser 1.1.8 → 1.2.1

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { File, Node, AssignmentExpression, Expression, Identifier, MemberExpression, Program, ClassBody, VariableDeclarator, ExportSpecifier, ExportDefaultSpecifier, ExportNamespaceSpecifier, Statement } from '@babel/types';
 import { Abs, MockHelper } from '@nudojs/core';
-export { stripTypes } from '@nudojs/core';
+export { CaseTag, FnDirectiveScope, MockModuleRecord, NudoImportRecord, extractFileEnvNames, extractMockModuleRecords, extractNudoImportRecords, findFnDirectiveScope, fnDirectiveCommentLines, listFnDirectiveScopes, parseEnvPayload, parseMockModulePayload, parseNudoImportPayload, scanBudgetDecl, scanCaseTags, scanContractSegments, scanThrowsDecl, stripTypes } from '@nudojs/core';
 
 /**
  * 所有权：Babel 解析与 TS 剥除的**实现**在 `@nudojs/core`
@@ -170,13 +170,39 @@ type FunctionWithDirectives = {
     name: string;
     directives: Directive[];
 };
+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 窗口偷走跨文件诊断）。
+ */
+declare function takeDirectiveDiagsSince(since: number): DirectiveDiag[];
 /**
  * case 实参 / 指令类型表达式唯一文法：约束构建器优先，其余为具体字面量、
  * 结构字面量与箭头函数。`T.*` 文法已物理删除。
  */
 declare function parseCaseArgExpr(expr: string): Abs;
+/**
+ * D6=G2：指令绑定 AST 最近 Function（含 nested function、class method）。
+ * 作用域清单与 refine 的 @nudo:contract 同源（core directive-scan），
+ * case 与 contract 对同一函数集合同时可见。
+ */
 declare function extractDirectives(ast: Node): FunctionWithDirectives[];
+/**
+ * 纯查询 extract：排干自身产生的指令文法诊断增量并丢弃——
+ * hover/completion/collectSkipReturns 等探测路径不得把诊断留在全局 buffer
+ * 供在途 validate/check 误窃，也不得自己背走别人的在途诊断。
+ */
+declare function extractDirectivesQuiet(ast: Node): FunctionWithDirectives[];
 declare function extractInlineDirectives(node: Node): InlineDirective[];
 declare function extractFileDirectives(ast: Node): FileDirective[];
 
-export { type AsDirective, type CaseDirective, type Directive, 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, exportSpecifierExportedName, exportSpecifierLocalName, extractDirectives, extractFileDirectives, extractInlineDirectives, fnOrClassIdLoc, fnOrClassIdName, getClassMembers, getDeclarations, getDeclaratorId, getDeclaratorInit, getExportDeclaration, getExportSpecifiers, getExpressionStatementExpression, getFirstDeclaratorId, identifierName, isModuleExportsMember, memberObjectName, memberPropertyKey, memberPropertyName, methodFunctionNode, nameOrStringValue, paramDisplayName, paramName, parse, parseCaseArgExpr, programBody, unwrapDefaultExport, unwrapExport };
+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 };

package/dist/index.js

@@ -189,7 +189,14 @@ import {
   execNudoModule,
   isNudoConstraint,
   constraintToEntryAbs,
-  SELF
+  CONSTRAINT_EXPR_RE,
+  SELF,
+  listFnDirectiveScopes,
+  parseEnvPayload,
+  parseMockModulePayload,
+  scanCaseArgSpans,
+  scanCaseTags,
+  extractBalancedParens
 } from "@nudojs/core";
 function absExact(shape) {
   return makeAbs(shape, void 0, void 0, "exact");
@@ -210,13 +217,56 @@ function absLit(v) {
   if (v === null) return absNullLit();
   return absUndefLit();
 }
-var CASE_NAME_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*)?@nudo:case\s+"([^"]+)"\s*\(/g;
-var MOCK_INLINE_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*)?@nudo:mock\s+(\w+)\s*=\s*(.+)/g;
-var MOCK_FROM_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*)?@nudo:mock\s+(\w+)\s+from\s+"([^"]+)"/g;
+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;
+  }
+  directiveDiags.length = kept;
+  return out;
+}
+function emitDirectiveDiag(d) {
+  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();
+}
+var CASE_TAG_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*)?@nudo:case\s+([^\n]+)/g;
+var JS_IDENT_RE = /^[\p{L}$_][\p{L}\p{N}$_]*$/u;
+var MOCK_INLINE_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*)?@nudo:mock\s+([^\s=]+)\s*=\s*(.+)/g;
+var MOCK_FROM_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*)?@nudo:mock\s+([^\s]+)\s+from\s+"([^"]+)"/g;
+var MOCK_TAG_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*)?@nudo:mock\s+([^\n]+)/g;
 var PURE_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*)?@nudo:pure\b/g;
 var SKIP_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*)?@nudo:skip\b(?:[ \t]+(\S[^\n]*))?/g;
-var SAMPLE_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*)?@nudo:sample[ \t]+(\d+)/g;
-var CONSTRAINT_EXPR_RE = /^(number|string|boolean|any|array|shape|lit|union|fn|partial|pick|omit|record|required|readonly|nonNullable|and)\s*\(/;
+var SAMPLE_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*)?@nudo:sample\b(?:[ \t]+(\S+))?/g;
+var SAMPLE_NUM_RE = /^[+-]?(?:\d+\.?\d*|\.\d+)(?:[eE][+-]?\d+)?$/;
 function tryParseConstraint(expr) {
   const s = expr.trim();
   if (!CONSTRAINT_EXPR_RE.test(s)) return void 0;
@@ -438,26 +488,6 @@ function findTopLevelArrow(s) {
   }
   return -1;
 }
-function extractBalancedParens(text, startIdx) {
-  if (text[startIdx] !== "(") return null;
-  let depth = 0;
-  let inString = null;
-  for (let i = startIdx; i < text.length; i++) {
-    const ch = text[i];
-    if (inString) {
-      if (ch === inString) inString = null;
-      continue;
-    }
-    if (ch === '"' || ch === "'") {
-      inString = ch;
-      continue;
-    }
-    if (ch === "(") depth++;
-    if (ch === ")") depth--;
-    if (depth === 0) return text.slice(startIdx + 1, i);
-  }
-  return null;
-}
 function parseArrowFunctionExpr(expr) {
   try {
     const wrapped = `const __mock = ${expr};`;
@@ -488,9 +518,46 @@ function parseArrowFunctionExpr(expr) {
     return null;
   }
 }
+function isExplicitUnknownExpr(expr) {
+  const s = expr.trim();
+  return s === "unknown" || s === "any" || s === "any()";
+}
 function parseAbsExpr(expr) {
   return parseCaseArgExpr(expr);
 }
+function parseAbsExprDiag(expr, context) {
+  const abs = parseCaseArgExpr(expr);
+  if (abs.shape.k === "unknown" && !abs.term && !isExplicitUnknownExpr(expr)) {
+    emitDirectiveDiag({
+      code: "nudo:directive-syntax",
+      message: `Unrecognized type expression in ${context}: ${expr.trim()} (use constraint builders, literals, or structure syntax)`
+    });
+  }
+  return abs;
+}
+function parseSkipReturnsExpr(rest) {
+  if (rest === void 0) return void 0;
+  const s = rest.trim();
+  if (s === "") return void 0;
+  if (s.startsWith("=>")) {
+    const expr = s.slice(2).trim();
+    if (expr === "") {
+      emitDirectiveDiag({
+        code: "nudo:directive-syntax",
+        message: `@nudo:skip => requires a type expression (e.g. @nudo:skip => number())`
+      });
+      return void 0;
+    }
+    return parseAbsExprDiag(expr, "@nudo:skip =>");
+  }
+  if (s.startsWith("(")) {
+    const inner = extractBalancedParens(s, 0);
+    if (inner !== null && s.slice(inner.length + 2).trim() === "") {
+      return parseAbsExprDiag(inner, "@nudo:skip (...)");
+    }
+  }
+  return void 0;
+}
 function parseSinonExpr(expr) {
   const s = expr.trim();
   const stubReturnsMatch = s.match(/^sinon\.stub\(\)\.returns\((.+)\)$/);
@@ -657,17 +724,24 @@ function parseNudoMockExpr(expr) {
   }
   return null;
 }
-function parseDirectivesFromComments(comments) {
+function parseDirectivesFromCommentTexts(comments) {
   const directives = [];
-  for (const comment of comments) {
-    const text = comment.value;
+  for (const { text, startLine: commentStartLine } of comments) {
+    const caseArgSpans = scanCaseArgSpans(text);
+    const caseTags = scanCaseTags(text);
+    scanMalformedCaseNames(text, caseArgSpans);
+    const inCaseArgs = (idx) => caseArgSpans.some(([s, e]) => idx >= s && idx < e);
+    scanMalformedMockNames(text, caseArgSpans);
     MOCK_FROM_REGEX.lastIndex = 0;
     let mockFromMatch;
     const mockFromRanges = [];
     while ((mockFromMatch = MOCK_FROM_REGEX.exec(text)) !== null) {
+      if (inCaseArgs(mockFromMatch.index)) continue;
+      const name = mockFromMatch[1];
+      if (!JS_IDENT_RE.test(name)) continue;
       directives.push({
         kind: "mock",
-        name: mockFromMatch[1],
+        name,
         fromPath: mockFromMatch[2]
       });
       mockFromRanges.push([mockFromMatch.index, mockFromMatch.index + mockFromMatch[0].length]);
@@ -678,7 +752,9 @@ function parseDirectivesFromComments(comments) {
       const inFromRange = mockFromRanges.some(
         ([s, e]) => mockMatch.index >= s && mockMatch.index < e
       );
-      if (inFromRange) continue;
+      if (inFromRange || inCaseArgs(mockMatch.index)) continue;
+      const mockName = mockMatch[1];
+      if (!JS_IDENT_RE.test(mockName)) continue;
       const expr = mockMatch[2].trim();
       let arrowFn = parseArrowFunctionExpr(expr);
       const sinonExpr = parseSinonExpr(expr);
@@ -691,29 +767,20 @@ function parseDirectivesFromComments(comments) {
       }
       directives.push({
         kind: "mock",
-        name: mockMatch[1],
+        name: mockName,
         expression: expr,
         arrowFn: arrowFn ?? void 0,
         sinonExpr: sinonExpr ?? void 0,
         nudoMock: nudoMock ?? void 0
       });
     }
-    CASE_NAME_REGEX.lastIndex = 0;
-    let match;
-    const commentStartLine = comment.loc?.start.line ?? 0;
-    while ((match = CASE_NAME_REGEX.exec(text)) !== null) {
-      const name = match[1];
-      const parenStart = match.index + match[0].length - 1;
-      const argsStr = extractBalancedParens(text, parenStart);
-      if (argsStr === null) continue;
-      const cleaned = argsStr.split("\n").map((line) => line.replace(/^\s*\*\s?/, "")).join("\n");
-      const argsAbs = splitTopLevelArgs(cleaned).map(parseCaseArgExpr);
-      const afterParen = parenStart + argsStr.length + 2;
-      const restLine = text.slice(afterParen).split("\n")[0].trim();
-      const arrowMatch = restLine.match(/^=>\s*(.+)/);
-      const expected = arrowMatch ? parseCaseArgExpr(arrowMatch[1].trim()) : void 0;
-      const tagOffset = match.index + match[0].indexOf("@nudo:case");
-      const linesBeforeMatch = text.slice(0, tagOffset).split("\n").length - 1;
+    for (const tag of caseTags) {
+      const name = tag.name;
+      const cleaned = tag.argsText.split("\n").map((line) => line.replace(/^\s*\*\s?/, "")).join("\n");
+      const rawArgs = splitTopLevelArgs(cleaned);
+      const argsAbs = rawArgs.map((a) => parseAbsExprDiag(a, `@nudo:case "${name}" argument`));
+      const expected = tag.expectedText !== void 0 ? parseAbsExprDiag(tag.expectedText, `@nudo:case "${name}" => expected`) : void 0;
+      const linesBeforeMatch = text.slice(0, tag.tagOffset).split("\n").length - 1;
       const commentLine = commentStartLine + linesBeforeMatch;
       directives.push({
         kind: "case",
@@ -724,66 +791,138 @@ function parseDirectivesFromComments(comments) {
       });
     }
     PURE_REGEX.lastIndex = 0;
-    if (PURE_REGEX.test(text)) {
+    let pureMatch;
+    while ((pureMatch = PURE_REGEX.exec(text)) !== null) {
+      if (inCaseArgs(pureMatch.index)) continue;
       directives.push({ kind: "pure" });
+      break;
     }
     SKIP_REGEX.lastIndex = 0;
     let skipMatch;
     while ((skipMatch = SKIP_REGEX.exec(text)) !== null) {
-      const returnsExpr = skipMatch[1]?.trim();
+      if (inCaseArgs(skipMatch.index)) continue;
+      const returns = parseSkipReturnsExpr(skipMatch[1]);
       directives.push({
         kind: "skip",
-        returns: returnsExpr ? parseAbsExpr(returnsExpr) : void 0
+        returns
       });
     }
     SAMPLE_REGEX.lastIndex = 0;
     let sampleMatch;
     while ((sampleMatch = SAMPLE_REGEX.exec(text)) !== null) {
-      directives.push({ kind: "sample", count: Number(sampleMatch[1]) });
+      if (inCaseArgs(sampleMatch.index)) continue;
+      const raw = sampleMatch[1];
+      if (raw === void 0 || !SAMPLE_NUM_RE.test(raw)) {
+        emitDirectiveDiag({
+          code: "nudo:directive-syntax",
+          message: `Malformed @nudo:sample: expected a numeric count (integer, decimal, or negative) \u2014 got: @nudo:sample ${raw ?? "(missing count)"}`
+        });
+        continue;
+      }
+      directives.push({ kind: "sample", count: Number(raw) });
     }
   }
   return directives;
 }
-function getFunctionName(node) {
-  if (node.type === "FunctionDeclaration" && node.id) return node.id.name;
-  if (node.type === "ExportNamedDeclaration") {
-    return node.declaration ? getFunctionName(node.declaration) : "<anonymous>";
-  }
-  if (node.type === "ExportDefaultDeclaration" && node.declaration.type === "FunctionDeclaration" && node.declaration.id) {
-    return node.declaration.id.name;
+function scanMalformedCaseNames(text, caseArgSpans) {
+  const inCaseArgs = (idx) => caseArgSpans.some(([s, e]) => idx >= s && idx < e);
+  CASE_TAG_REGEX.lastIndex = 0;
+  let m;
+  while ((m = CASE_TAG_REGEX.exec(text)) !== null) {
+    if (inCaseArgs(m.index)) continue;
+    const rest = m[1].trim();
+    if (/^"[^"]+"\s*\(/.test(rest)) continue;
+    if (/^"[^"]+"\s*\(/.test(rest)) continue;
+    let reason;
+    if (rest.startsWith("'")) {
+      reason = `single-quoted name (use double quotes: @nudo:case "name" (\u2026))`;
+    } else if (rest.startsWith('""')) {
+      reason = `empty name (name must be non-empty)`;
+    } else if (/^"[^"]*\\/.test(rest)) {
+      reason = `escaped quote in name (avoid embedded double quotes)`;
+    } else if (rest.startsWith('"')) {
+      reason = `malformed name or missing argument list (expected @nudo:case "name" (\u2026))`;
+    } else {
+      reason = `missing quoted name (expected @nudo:case "name" (\u2026))`;
+    }
+    emitDirectiveDiag({
+      code: "nudo:directive-syntax",
+      message: `Malformed @nudo:case: ${reason} \u2014 got: @nudo:case ${rest.slice(0, 60)}`
+    });
   }
-  if (node.type === "VariableDeclaration") {
-    const decl = node.declarations[0];
-    if (decl.id.type === "Identifier") return decl.id.name;
+}
+function scanMalformedMockNames(text, caseArgSpans) {
+  const inCaseArgs = (idx) => caseArgSpans.some(([s, e]) => idx >= s && idx < e);
+  MOCK_TAG_REGEX.lastIndex = 0;
+  let m;
+  while ((m = MOCK_TAG_REGEX.exec(text)) !== null) {
+    if (inCaseArgs(m.index)) continue;
+    const rest = m[1].trim();
+    const nameMatch = rest.match(/^([^\s=]+)(?:\s*=|\s+from\b)/);
+    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)}`
+      });
+      continue;
+    }
+    const name = nameMatch[1];
+    if (!JS_IDENT_RE.test(name)) {
+      emitDirectiveDiag({
+        code: "nudo:directive-syntax",
+        message: `Malformed @nudo:mock name '${name}': not a valid identifier (use letters, digits, _, $; Unicode letters allowed)`
+      });
+    }
   }
-  return "<anonymous>";
 }
 function extractDirectives(ast) {
+  resetDirectiveDiagSeen();
   const results = [];
   if (ast.type !== "File") return results;
-  const body = ast.program.body;
-  for (const stmt of body) {
-    const leadingComments = stmt.leadingComments;
-    if (!leadingComments || leadingComments.length === 0) continue;
-    const directives = parseDirectivesFromComments(leadingComments);
+  const scopes = listFnDirectiveScopes(ast);
+  for (const scope of scopes) {
+    const directives = parseDirectivesFromCommentTexts(
+      scope.commentTexts.map((text, i) => ({
+        text,
+        startLine: scope.commentStartLines[i] ?? 0
+      }))
+    );
     if (directives.length === 0) continue;
-    const name = getFunctionName(stmt);
-    results.push({ node: stmt, name, directives });
+    results.push({ node: scope.node, name: scope.name, directives });
   }
   return results;
 }
+function extractDirectivesQuiet(ast) {
+  const since = directiveDiagCount();
+  const out = extractDirectives(ast);
+  takeDirectiveDiagsSince(since);
+  return out;
+}
 var AS_REGEX = /^\s*@nudo:as\s+(.+)/;
 var REPLACE_REGEX = /^\s*@nudo:replace\s+(.+)/;
+var AS_TRAILING_COMMENT_RE = /\s+(?:\/\/|\/\*)/;
 function extractInlineDirectives(node) {
+  resetDirectiveDiagSeen();
   const comments = node.leadingComments;
   if (!comments) return [];
   const results = [];
   for (const comment of comments) {
-    if (comment.type !== "CommentLine") continue;
+    if (comment.type !== "CommentLine" && comment.type !== "CommentBlock") continue;
     const text = comment.value;
     const asMatch = text.match(AS_REGEX);
     if (asMatch) {
-      results.push({ kind: "as", typeAbs: parseAbsExpr(asMatch[1].trim()) });
+      const rawExpr = asMatch[1].trim();
+      const trailing = rawExpr.match(AS_TRAILING_COMMENT_RE);
+      if (trailing) {
+        const typePart = rawExpr.slice(0, trailing.index).trim();
+        emitDirectiveDiag({
+          code: "nudo:directive-syntax",
+          message: `Trailing comment in @nudo:as type expression: '${rawExpr}' (remove the comment; the type must be a clean expression)`
+        });
+        results.push({ kind: "as", typeAbs: typePart ? parseAbsExprDiag(typePart, "@nudo:as") : absUnknown() });
+        continue;
+      }
+      results.push({ kind: "as", typeAbs: parseAbsExprDiag(rawExpr, "@nudo:as") });
       continue;
     }
     const replaceMatch = text.match(REPLACE_REGEX);
@@ -796,7 +935,12 @@ function extractInlineDirectives(node) {
         results.push({
           kind: "replace",
           targetSource,
-          typeAbs: parseAbsExpr(typeExprStr)
+          typeAbs: parseAbsExprDiag(typeExprStr, "@nudo:replace")
+        });
+      } else {
+        emitDirectiveDiag({
+          code: "nudo:directive-syntax",
+          message: `Malformed @nudo:replace: cannot separate target from type (expected @nudo:replace <target> <typeExpr>) \u2014 got: ${raw.slice(0, 60)}`
         });
       }
     }
@@ -833,9 +977,8 @@ function findReplaceSeparator(raw) {
   }
   return -1;
 }
-var ENV_REGEX = /^\/\s*@nudo:env\s+(.+)/;
-var MOCK_MODULE_REGEX = /^\/\s*@nudo:mock-module\s+"([^"]+)"\s+from\s+"([^"]+)"/;
-var MOCK_MODULE_PARTIAL_REGEX = /^\/\s*@nudo:mock-module\s+"([^"]+)"\s*\{([^}]+)\}\s*from\s+"([^"]+)"/;
+var ENV_REGEX = /^\/?\s*@nudo:env\s+(.+)/;
+var MOCK_MODULE_REGEX = /^\/?\s*@nudo:mock-module\s+(.+)/;
 function extractFileDirectives(ast) {
   const results = [];
   if (ast.type !== "File") return results;
@@ -843,34 +986,44 @@ function extractFileDirectives(ast) {
   for (const comment of comments) {
     if (comment.type !== "CommentLine") continue;
     const text = comment.value;
-    const partialMatch = text.match(MOCK_MODULE_PARTIAL_REGEX);
-    if (partialMatch) {
-      const names = partialMatch[2].split(",").map((n) => n.trim()).filter(Boolean);
-      results.push({
-        kind: "mock-module",
-        source: partialMatch[1],
-        names,
-        fromPath: partialMatch[3]
-      });
-      continue;
-    }
     const mockModuleMatch = text.match(MOCK_MODULE_REGEX);
     if (mockModuleMatch) {
-      results.push({
-        kind: "mock-module",
-        source: mockModuleMatch[1],
-        fromPath: mockModuleMatch[2]
-      });
-      continue;
+      const rec = parseMockModulePayload(mockModuleMatch[1]);
+      if (rec) {
+        results.push({
+          kind: "mock-module",
+          source: rec.source,
+          ...rec.names ? { names: rec.names } : {},
+          fromPath: rec.fromPath
+        });
+        continue;
+      }
     }
     const envMatch = text.match(ENV_REGEX);
     if (envMatch) {
-      const envs = envMatch[1].split(",").map((e) => e.trim()).filter(Boolean);
-      results.push({ kind: "env", envs });
+      const envs = parseEnvPayload(envMatch[1]);
+      if (envs.length > 0) results.push({ kind: "env", envs });
     }
   }
   return results;
 }
+
+// src/index.ts
+import {
+  extractFileEnvNames,
+  extractMockModuleRecords,
+  extractNudoImportRecords,
+  findFnDirectiveScope,
+  fnDirectiveCommentLines,
+  listFnDirectiveScopes as listFnDirectiveScopes2,
+  parseEnvPayload as parseEnvPayload2,
+  parseMockModulePayload as parseMockModulePayload2,
+  parseNudoImportPayload,
+  scanBudgetDecl,
+  scanCaseTags as scanCaseTags2,
+  scanContractSegments,
+  scanThrowsDecl
+} from "@nudojs/core";
 export {
   asAssignmentExpression,
   asExpression,
@@ -881,11 +1034,18 @@ export {
   classInstanceMethods,
   classMemberKey,
   classMemberKeyName,
+  directiveDiagCount,
   exportSpecifierExportedName,
   exportSpecifierLocalName,
   extractDirectives,
+  extractDirectivesQuiet,
   extractFileDirectives,
+  extractFileEnvNames,
   extractInlineDirectives,
+  extractMockModuleRecords,
+  extractNudoImportRecords,
+  findFnDirectiveScope,
+  fnDirectiveCommentLines,
   fnOrClassIdLoc,
   fnOrClassIdName,
   getClassMembers,
@@ -898,6 +1058,7 @@ export {
   getFirstDeclaratorId,
   identifierName,
   isModuleExportsMember,
+  listFnDirectiveScopes2 as listFnDirectiveScopes,
   memberObjectName,
   memberPropertyKey,
   memberPropertyName,
@@ -907,8 +1068,18 @@ export {
   paramName,
   parse,
   parseCaseArgExpr,
+  parseEnvPayload2 as parseEnvPayload,
+  parseMockModulePayload2 as parseMockModulePayload,
+  parseNudoImportPayload,
   programBody,
+  scanBudgetDecl,
+  scanCaseTags2 as scanCaseTags,
+  scanContractSegments,
+  scanThrowsDecl,
+  setDirectiveDiagCollector,
   stripTypes,
+  takeDirectiveDiags,
+  takeDirectiveDiagsSince,
   unwrapDefaultExport,
   unwrapExport
 };

package/package.json

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