vite-plugin-nudo 0.2.1 → 0.3.1

package/dist/index.js

@@ -1,37 +1,105 @@
 // src/index.ts
-import { analyzeFile } from "@nudojs/service";
-var DEFAULT_INCLUDE = ["**/*.js"];
-var DEFAULT_EXCLUDE = ["**/node_modules/**"];
-function matchesPatterns(id, include, exclude) {
-  const isExcluded = exclude.some((p) => minimatch(id, p));
-  if (isExcluded) return false;
-  return include.some((p) => minimatch(id, p));
+import {
+  analyzeFileAsync,
+  defaultLoadModule as loadModule,
+  clearAnalysisSessionCaches
+} from "@nudojs/service";
+import { checkSource, pTrue } from "@nudojs/core";
+var NUDO_DIRECTIVE_RE = /@nudo:(case|mock|pure|skip|sample|refine|import|env|mock-module|as|replace)\b/;
+function checkIssuesToDiagnostics(id, code) {
+  try {
+    const report = checkSource(id, code, pTrue, { loadModule, fromFile: id });
+    return report.issues.filter((i) => i.severity === "error" || i.severity === "warning").map((i) => {
+      const line = i.line ?? 1;
+      const column = i.column ?? 0;
+      const parts = [i.message];
+      if (i.actual) parts.push(`actual: ${i.actual}`);
+      if (i.expected) parts.push(`expected: ${i.expected}`);
+      if (i.suggestion) parts.push(i.suggestion);
+      if (i.code) parts.push(`(${i.code})`);
+      return {
+        severity: i.severity === "error" ? "error" : "warning",
+        message: parts.join(" \xB7 "),
+        code: i.code,
+        range: {
+          start: { line, column },
+          end: { line, column: column + 1 }
+        }
+      };
+    });
+  } catch {
+    return [];
+  }
+}
+var DEFAULT_INCLUDE = ["**/*.js", "**/*.mjs", "**/*.ts", "**/*.mts"];
+var DEFAULT_EXCLUDE = ["**/node_modules/**", "**/*.d.ts"];
+var REGEX_SPECIALS = /[\\^$.|?*+(){}\[\]]/;
+function escapeRegExpChar(ch) {
+  return REGEX_SPECIALS.test(ch) ? `\\${ch}` : ch;
 }
-function minimatch(str, pattern) {
-  if (pattern === "**/*.js") return str.endsWith(".js");
-  if (pattern === "**/node_modules/**") return str.includes("/node_modules/");
-  if (pattern.startsWith("**/")) {
-    return str.endsWith(pattern.slice(3)) || str.includes(pattern.slice(2));
+function segmentToRegExpSource(segment) {
+  let source = "";
+  for (const ch of segment) {
+    if (ch === "*") source += "[^/]*";
+    else if (ch === "?") source += "[^/]";
+    else source += escapeRegExpChar(ch);
   }
-  return str.includes(pattern);
+  return source;
+}
+function patternToRegExp(pattern) {
+  const segments = pattern.split("/");
+  let source = "";
+  for (let i = 0; i < segments.length; i++) {
+    const segment = segments[i];
+    const isLast = i === segments.length - 1;
+    if (segment === "**") {
+      if (isLast) {
+        source = source.endsWith("/") ? `${source.slice(0, -1)}(?:/.*)?` : `${source}.*`;
+      } else {
+        source += "(?:.*/)?";
+      }
+    } else {
+      source += segmentToRegExpSource(segment);
+      if (!isLast) source += "/";
+    }
+  }
+  return new RegExp(`^${source}$`);
+}
+function compilePattern(pattern) {
+  if (!/[*?]/.test(pattern)) return (id) => id.includes(pattern);
+  const regExp = patternToRegExp(pattern);
+  return (id) => regExp.test(id);
+}
+function compileAnyMatcher(patterns) {
+  const matchers = patterns.map(compilePattern);
+  return (id) => matchers.some((match) => match(id));
 }
 function nudoPlugin(options = {}) {
-  const include = options.include ?? DEFAULT_INCLUDE;
-  const exclude = options.exclude ?? DEFAULT_EXCLUDE;
+  const includeMatch = compileAnyMatcher(options.include ?? DEFAULT_INCLUDE);
+  const excludeMatch = compileAnyMatcher(options.exclude ?? DEFAULT_EXCLUDE);
   const failOnError = options.failOnError ?? false;
   const analysisCache = /* @__PURE__ */ new Map();
   return {
     name: "vite-plugin-nudo",
     buildStart() {
       analysisCache.clear();
+      clearAnalysisSessionCaches();
+    },
+    /** 任一文件变更后，未改 source 的 importer 再 transform 时可能命中陈旧会话缓存 */
+    watchChange() {
+      analysisCache.clear();
+      clearAnalysisSessionCaches();
     },
-    transform(code, id) {
-      if (!matchesPatterns(id, include, exclude)) return null;
-      if (!/@nudo:(case|mock|pure|skip|sample|returns|env|mock-module|as|replace)\b/.test(code)) return null;
+    async transform(code, id) {
+      if (excludeMatch(id)) return null;
+      if (!includeMatch(id)) return null;
+      if (!NUDO_DIRECTIVE_RE.test(code)) return null;
       try {
-        const result = analyzeFile(id, code);
-        analysisCache.set(id, result);
-        for (const diag of result.diagnostics) {
+        const result = await analyzeFileAsync(id, code);
+        const checkDiags = checkIssuesToDiagnostics(id, code);
+        const merged = { ...result, diagnostics: [...result.diagnostics, ...checkDiags] };
+        analysisCache.set(id, merged);
+        for (const diag of merged.diagnostics) {
           const loc = `${id}:${diag.range.start.line}:${diag.range.start.column}`;
           const msg = `[nudo] ${loc} ${diag.severity}: ${diag.message}`;
           if (diag.severity === "error") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-nudo",
-  "version": "0.2.1",
+  "version": "0.3.1",
   "description": "Vite plugin for build-time JavaScript type inference with Nudo",
   "type": "module",
   "license": "MIT",
@@ -11,7 +11,17 @@
     "vite",
     "vite-plugin"
   ],
-  "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",
@@ -25,7 +35,8 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@nudojs/service": "0.2.1"
+    "@nudojs/core": "0.3.1",
+    "@nudojs/service": "0.3.1"
   },
   "peerDependencies": {
     "vite": ">=5.0.0"

package/CHANGELOG.md

@@ -1,33 +0,0 @@
-# vite-plugin-nudo
-
-## 0.2.1
-
-### Patch Changes
-
-- @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/service@0.2.0
-
-## 0.1.0
-
-### Minor Changes
-
-- Conceptual design and basic implementation.
-
-### Patch Changes
-
-- Updated dependencies
-  - @nudojs/service@0.1.0

package/src/__tests__/plugin.test.ts

@@ -1,81 +0,0 @@
-import { describe, it, expect, vi } from "vitest";
-import nudoPlugin from "../index.ts";
-
-describe("vite-plugin-nudo", () => {
-  it("creates a plugin with correct name", () => {
-    const plugin = nudoPlugin();
-    expect(plugin.name).toBe("vite-plugin-nudo");
-  });
-
-  it("returns null for files without @nudo: directives", () => {
-    const plugin = nudoPlugin();
-    const result = plugin.transform.call({}, "const x = 1;", "/test/file.js");
-    expect(result).toBeNull();
-  });
-
-  it("returns null for node_modules files", () => {
-    const plugin = nudoPlugin();
-    const result = plugin.transform.call({}, "const x = 1;", "/node_modules/pkg/file.js");
-    expect(result).toBeNull();
-  });
-
-  it("analyzes files with @nudo: directives and reports warnings", () => {
-    const plugin = nudoPlugin();
-    const warnFn = vi.fn();
-    const ctx = { warn: warnFn, error: vi.fn() };
-
-    const source = `
-/**
- * @nudo:case "negative" (-1)
- */
-function safeSqrt(x) {
-  if (x < 0) {
-    throw new RangeError("negative input");
-  }
-  return x;
-}
-`;
-    const result = plugin.transform.call(ctx, source, "/test/throws.js");
-    expect(result).toBeNull();
-    expect(warnFn).toHaveBeenCalled();
-  });
-
-  it("respects custom include patterns", () => {
-    const plugin = nudoPlugin({ include: ["**/*.typed.js"] });
-    const result = plugin.transform.call({}, "const x = 1;", "/test/file.js");
-    expect(result).toBeNull();
-  });
-
-  it("clears cache on buildStart", () => {
-    const plugin = nudoPlugin();
-    plugin.buildStart.call({});
-    // No error means cache cleared successfully
-  });
-
-  it("reports summary on buildEnd", () => {
-    const plugin = nudoPlugin();
-    const consoleSpy = vi.spyOn(console, "log").mockImplementation(() => {});
-    plugin.buildStart.call({});
-    plugin.buildEnd.call({});
-    consoleSpy.mockRestore();
-  });
-
-  it("errors when failOnError is true and diagnostics have errors", () => {
-    const plugin = nudoPlugin({ failOnError: true });
-    const errorFn = vi.fn();
-    const warnFn = vi.fn();
-    const ctx = { warn: warnFn, error: errorFn };
-
-    const source = `
-/**
- * @nudo:case "test" (T.number)
- * @nudo:returns (T.string)
- */
-function identity(x) {
-  return x;
-}
-`;
-    plugin.transform.call(ctx, source, "/test/fail.js");
-    expect(errorFn).toHaveBeenCalled();
-  });
-});

package/src/index.ts

@@ -1,81 +0,0 @@
-import { analyzeFile, type AnalysisResult } from "@nudojs/service";
-
-export type NudoPluginOptions = {
-  include?: string[];
-  exclude?: string[];
-  failOnError?: boolean;
-};
-
-const DEFAULT_INCLUDE = ["**/*.js"];
-const DEFAULT_EXCLUDE = ["**/node_modules/**"];
-
-function matchesPatterns(id: string, include: string[], exclude: string[]): boolean {
-  const isExcluded = exclude.some((p) => minimatch(id, p));
-  if (isExcluded) return false;
-  return include.some((p) => minimatch(id, p));
-}
-
-function minimatch(str: string, pattern: string): boolean {
-  if (pattern === "**/*.js") return str.endsWith(".js");
-  if (pattern === "**/node_modules/**") return str.includes("/node_modules/");
-  if (pattern.startsWith("**/")) {
-    return str.endsWith(pattern.slice(3)) || str.includes(pattern.slice(2));
-  }
-  return str.includes(pattern);
-}
-
-export default function nudoPlugin(options: NudoPluginOptions = {}): any {
-  const include = options.include ?? DEFAULT_INCLUDE;
-  const exclude = options.exclude ?? DEFAULT_EXCLUDE;
-  const failOnError = options.failOnError ?? false;
-
-  const analysisCache = new Map<string, AnalysisResult>();
-
-  return {
-    name: "vite-plugin-nudo",
-
-    buildStart() {
-      analysisCache.clear();
-    },
-
-    transform(code: string, id: string) {
-      if (!matchesPatterns(id, include, exclude)) return null;
-      if (!/@nudo:(case|mock|pure|skip|sample|returns|env|mock-module|as|replace)\b/.test(code)) return null;
-
-      try {
-        const result = analyzeFile(id, code);
-        analysisCache.set(id, result);
-
-        for (const diag of result.diagnostics) {
-          const loc = `${id}:${diag.range.start.line}:${diag.range.start.column}`;
-          const msg = `[nudo] ${loc} ${diag.severity}: ${diag.message}`;
-
-          if (diag.severity === "error") {
-            if (failOnError) {
-              (this as any).error(msg);
-            } else {
-              (this as any).warn(msg);
-            }
-          } else if (diag.severity === "warning") {
-            (this as any).warn(msg);
-          }
-        }
-      } catch (err) {
-        (this as any).warn(`[nudo] Failed to analyze ${id}: ${(err as Error).message}`);
-      }
-
-      return null;
-    },
-
-    buildEnd() {
-      const totalDiags = Array.from(analysisCache.values())
-        .reduce((sum, r) => sum + r.diagnostics.length, 0);
-      if (totalDiags > 0) {
-        const errorCount = Array.from(analysisCache.values())
-          .reduce((sum, r) => sum + r.diagnostics.filter((d) => d.severity === "error").length, 0);
-        const warnCount = totalDiags - errorCount;
-        console.log(`[nudo] Analysis complete: ${errorCount} error(s), ${warnCount} warning(s)`);
-      }
-    },
-  };
-}

package/tsconfig.json

@@ -1,11 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "dist",
-    "rootDir": "src"
-  },
-  "include": ["src"],
-  "references": [
-    { "path": "../service" }
-  ]
-}