@hirarijs/loader 1.0.8 → 1.0.10

package/dist/index.cjs

@@ -44,7 +44,12 @@ var import_fs = __toESM(require("fs"), 1);
 var import_path = __toESM(require("path"), 1);
 var DEFAULT_CONFIG = {
   format: "cjs",
-  plugins: ["@hirarijs/loader-ts", "@hirarijs/loader-tsx", "@hirarijs/loader-vue"]
+  plugins: [
+    "@hirarijs/loader-ts",
+    "@hirarijs/loader-tsx",
+    "@hirarijs/loader-vue",
+    "@hirarijs/loader-cjs-interop"
+  ]
 };
 function loadHirariConfig(cwd = process.cwd()) {
   const configPath = import_path.default.join(cwd, "hirari.json");
@@ -168,30 +173,30 @@ function createRuntime(cwd = process.cwd()) {
     format: getFormat(loaderConfig)
   };
 }
-function pickPlugin(filename, plugins) {
-  return plugins.find(({ plugin }) => plugin.match(filename));
-}
 function applyPlugin(code, filename, runtime) {
-  const match = pickPlugin(filename, runtime.resolvedPlugins);
-  if (!match) {
+  for (const match of runtime.resolvedPlugins) {
+    if (!match.plugin.match(filename)) continue;
+    const ctx = {
+      format: runtime.format,
+      loaderConfig: runtime.loaderConfig,
+      pluginOptions: match.options
+    };
+    const result = match.plugin.transform(code, filename, ctx);
     if (runtime.loaderConfig.debug) {
-      console.log(`[hirari-loader] no plugin matched ${filename}`);
+      console.log(`[hirari-loader][${match.plugin.name}] compiled ${filename}`);
+    }
+    if (result.continue) {
+      continue;
+    }
+    if (result.map) {
+      map[filename] = result.map;
     }
-    return { code };
+    return result;
   }
-  const ctx = {
-    format: runtime.format,
-    loaderConfig: runtime.loaderConfig,
-    pluginOptions: match.options
-  };
-  const result = match.plugin.transform(code, filename, ctx);
   if (runtime.loaderConfig.debug) {
-    console.log(`[hirari-loader][${match.plugin.name}] compiled ${filename}`);
-  }
-  if (result.map) {
-    map[filename] = result.map;
+    console.log(`[hirari-loader] no plugin matched ${filename}`);
   }
-  return result;
+  return { code };
 }
 function collectExtensions(plugins) {
   const set = /* @__PURE__ */ new Set();
@@ -212,7 +217,7 @@ function registerRequireHooks(runtime) {
   };
   const revert = (0, import_pirates.addHook)(compile, {
     exts: extensions,
-    ignoreNodeModules: runtime.loaderConfig.hookIgnoreNodeModules ?? true
+    ignoreNodeModules: false
   });
   const extensionsObj = import_module2.default.Module._extensions;
   const jsHandler = extensionsObj[".js"];

package/dist/index.d.cts

@@ -10,6 +10,10 @@ interface TransformResult {
     code: string;
     map?: string;
     format?: ModuleFormat;
+    /**
+     * When true, loader will continue to next plugin instead of short-circuiting.
+     */
+    continue?: boolean;
 }
 interface LoaderPlugin {
     name: string;
@@ -31,6 +35,9 @@ interface LoaderConfig {
     plugins?: string[];
     pluginOptions?: Record<string, Record<string, unknown>>;
     autoInstall?: boolean;
+    /**
+     * @deprecated 全局 ignore 已取消，请使用各插件的 ignoreNodeModules/allowNodeModules 配置。
+     */
     hookIgnoreNodeModules?: boolean;
     debug?: boolean;
 }

package/dist/index.d.ts

@@ -10,6 +10,10 @@ interface TransformResult {
     code: string;
     map?: string;
     format?: ModuleFormat;
+    /**
+     * When true, loader will continue to next plugin instead of short-circuiting.
+     */
+    continue?: boolean;
 }
 interface LoaderPlugin {
     name: string;
@@ -31,6 +35,9 @@ interface LoaderConfig {
     plugins?: string[];
     pluginOptions?: Record<string, Record<string, unknown>>;
     autoInstall?: boolean;
+    /**
+     * @deprecated 全局 ignore 已取消，请使用各插件的 ignoreNodeModules/allowNodeModules 配置。
+     */
     hookIgnoreNodeModules?: boolean;
     debug?: boolean;
 }

package/dist/index.js

@@ -1,12 +1,12 @@
 import {
   register
-} from "./chunk-NGPAJOT3.js";
+} from "./chunk-JPHIWQ7S.js";
 import {
   IMPORT_META_URL_VARIABLE,
   createRuntime,
   loadHirariConfig,
   resolvePlugins
-} from "./chunk-ZZJ5GQ5Y.js";
+} from "./chunk-2YMWZ4IT.js";
 export {
   IMPORT_META_URL_VARIABLE,
   createRuntime,

package/dist/loader.cjs

@@ -47,7 +47,12 @@ var import_fs = __toESM(require("fs"), 1);
 var import_path = __toESM(require("path"), 1);
 var DEFAULT_CONFIG = {
   format: "cjs",
-  plugins: ["@hirarijs/loader-ts", "@hirarijs/loader-tsx", "@hirarijs/loader-vue"]
+  plugins: [
+    "@hirarijs/loader-ts",
+    "@hirarijs/loader-tsx",
+    "@hirarijs/loader-vue",
+    "@hirarijs/loader-cjs-interop"
+  ]
 };
 function loadHirariConfig(cwd = process.cwd()) {
   const configPath = import_path.default.join(cwd, "hirari.json");
@@ -174,41 +179,40 @@ function createRuntime(cwd = process.cwd()) {
     format: getFormat(loaderConfig)
   };
 }
-function pickPlugin(filename, plugins) {
-  return plugins.find(({ plugin }) => plugin.match(filename));
-}
 function applyPlugin(code, filename, runtime2) {
-  const match = pickPlugin(filename, runtime2.resolvedPlugins);
-  if (!match) {
+  for (const match of runtime2.resolvedPlugins) {
+    if (!match.plugin.match(filename)) continue;
+    const ctx = {
+      format: runtime2.format,
+      loaderConfig: runtime2.loaderConfig,
+      pluginOptions: match.options
+    };
+    const result = match.plugin.transform(code, filename, ctx);
     if (runtime2.loaderConfig.debug) {
-      console.log(`[hirari-loader] no plugin matched ${filename}`);
+      console.log(`[hirari-loader][${match.plugin.name}] compiled ${filename}`);
+    }
+    if (result.continue) {
+      continue;
     }
-    return { code };
+    if (result.map) {
+      map[filename] = result.map;
+    }
+    return result;
   }
-  const ctx = {
-    format: runtime2.format,
-    loaderConfig: runtime2.loaderConfig,
-    pluginOptions: match.options
-  };
-  const result = match.plugin.transform(code, filename, ctx);
   if (runtime2.loaderConfig.debug) {
-    console.log(`[hirari-loader][${match.plugin.name}] compiled ${filename}`);
+    console.log(`[hirari-loader] no plugin matched ${filename}`);
   }
-  if (result.map) {
-    map[filename] = result.map;
-  }
-  return result;
+  return { code };
+}
+function pickPlugin(filename, runtime2) {
+  return runtime2.resolvedPlugins.find(({ plugin }) => plugin.match(filename));
 }
 async function loaderResolve(specifier, context, next, runtime2) {
-  const ignoreNodeModules = runtime2.loaderConfig.hookIgnoreNodeModules ?? true;
   const parentUrl = context && context.parentURL;
   const baseDir = parentUrl && typeof parentUrl === "string" && parentUrl.startsWith("file:") ? import_path3.default.dirname((0, import_url.fileURLToPath)(parentUrl)) : process.cwd();
   const tryResolve = (basePath, note) => {
     for (const ext2 of EXTENSION_CANDIDATES) {
       const candidate = basePath + ext2;
-      if (ignoreNodeModules && candidate.includes("node_modules")) {
-        continue;
-      }
       if (import_fs3.default.existsSync(candidate) && import_fs3.default.statSync(candidate).isFile()) {
         const url = (0, import_url.pathToFileURL)(candidate).href;
         if (runtime2.loaderConfig.debug) {
@@ -217,9 +221,6 @@ async function loaderResolve(specifier, context, next, runtime2) {
         return { url, shortCircuit: true };
       }
       const indexCandidate = import_path3.default.join(basePath, "index" + ext2);
-      if (ignoreNodeModules && indexCandidate.includes("node_modules")) {
-        continue;
-      }
       if (import_fs3.default.existsSync(indexCandidate) && import_fs3.default.statSync(indexCandidate).isFile()) {
         const url = (0, import_url.pathToFileURL)(indexCandidate).href;
         if (runtime2.loaderConfig.debug) {
@@ -249,7 +250,7 @@ async function loaderLoad(url, context, next, runtime2) {
   const { format: expectedFormat } = runtime2;
   if (url.startsWith("file://")) {
     const filename = (0, import_url.fileURLToPath)(url);
-    const match = pickPlugin(filename, runtime2.resolvedPlugins);
+    const match = pickPlugin(filename, runtime2);
     if (runtime2.loaderConfig.debug) {
       console.log(`[hirari-loader] load hook url=${url} match=${!!match}`);
     }

package/dist/loader.js

@@ -2,7 +2,7 @@ import {
   createRuntime,
   loaderLoad,
   loaderResolve
-} from "./chunk-ZZJ5GQ5Y.js";
+} from "./chunk-2YMWZ4IT.js";
 
 // src/loader.ts
 var runtime = createRuntime();

package/dist/register-auto.cjs

@@ -36,7 +36,12 @@ var import_fs = __toESM(require("fs"), 1);
 var import_path = __toESM(require("path"), 1);
 var DEFAULT_CONFIG = {
   format: "cjs",
-  plugins: ["@hirarijs/loader-ts", "@hirarijs/loader-tsx", "@hirarijs/loader-vue"]
+  plugins: [
+    "@hirarijs/loader-ts",
+    "@hirarijs/loader-tsx",
+    "@hirarijs/loader-vue",
+    "@hirarijs/loader-cjs-interop"
+  ]
 };
 function loadHirariConfig(cwd = process.cwd()) {
   const configPath = import_path.default.join(cwd, "hirari.json");
@@ -151,30 +156,30 @@ function createRuntime(cwd = process.cwd()) {
     format: getFormat(loaderConfig)
   };
 }
-function pickPlugin(filename, plugins) {
-  return plugins.find(({ plugin }) => plugin.match(filename));
-}
 function applyPlugin(code, filename, runtime) {
-  const match = pickPlugin(filename, runtime.resolvedPlugins);
-  if (!match) {
+  for (const match of runtime.resolvedPlugins) {
+    if (!match.plugin.match(filename)) continue;
+    const ctx = {
+      format: runtime.format,
+      loaderConfig: runtime.loaderConfig,
+      pluginOptions: match.options
+    };
+    const result = match.plugin.transform(code, filename, ctx);
     if (runtime.loaderConfig.debug) {
-      console.log(`[hirari-loader] no plugin matched ${filename}`);
+      console.log(`[hirari-loader][${match.plugin.name}] compiled ${filename}`);
+    }
+    if (result.continue) {
+      continue;
+    }
+    if (result.map) {
+      map[filename] = result.map;
     }
-    return { code };
+    return result;
   }
-  const ctx = {
-    format: runtime.format,
-    loaderConfig: runtime.loaderConfig,
-    pluginOptions: match.options
-  };
-  const result = match.plugin.transform(code, filename, ctx);
   if (runtime.loaderConfig.debug) {
-    console.log(`[hirari-loader][${match.plugin.name}] compiled ${filename}`);
-  }
-  if (result.map) {
-    map[filename] = result.map;
+    console.log(`[hirari-loader] no plugin matched ${filename}`);
   }
-  return result;
+  return { code };
 }
 function collectExtensions(plugins) {
   const set = /* @__PURE__ */ new Set();
@@ -195,7 +200,7 @@ function registerRequireHooks(runtime) {
   };
   const revert = (0, import_pirates.addHook)(compile, {
     exts: extensions,
-    ignoreNodeModules: runtime.loaderConfig.hookIgnoreNodeModules ?? true
+    ignoreNodeModules: false
   });
   const extensionsObj = import_module2.default.Module._extensions;
   const jsHandler = extensionsObj[".js"];

package/dist/register-auto.js

@@ -1,7 +1,7 @@
 import {
   register
-} from "./chunk-NGPAJOT3.js";
-import "./chunk-ZZJ5GQ5Y.js";
+} from "./chunk-JPHIWQ7S.js";
+import "./chunk-2YMWZ4IT.js";
 
 // src/register-auto.ts
 register();

package/dist/register.cjs

@@ -48,7 +48,12 @@ var import_fs = __toESM(require("fs"), 1);
 var import_path = __toESM(require("path"), 1);
 var DEFAULT_CONFIG = {
   format: "cjs",
-  plugins: ["@hirarijs/loader-ts", "@hirarijs/loader-tsx", "@hirarijs/loader-vue"]
+  plugins: [
+    "@hirarijs/loader-ts",
+    "@hirarijs/loader-tsx",
+    "@hirarijs/loader-vue",
+    "@hirarijs/loader-cjs-interop"
+  ]
 };
 function loadHirariConfig(cwd = process.cwd()) {
   const configPath = import_path.default.join(cwd, "hirari.json");
@@ -163,30 +168,30 @@ function createRuntime(cwd = process.cwd()) {
     format: getFormat(loaderConfig)
   };
 }
-function pickPlugin(filename, plugins) {
-  return plugins.find(({ plugin }) => plugin.match(filename));
-}
 function applyPlugin(code, filename, runtime) {
-  const match = pickPlugin(filename, runtime.resolvedPlugins);
-  if (!match) {
+  for (const match of runtime.resolvedPlugins) {
+    if (!match.plugin.match(filename)) continue;
+    const ctx = {
+      format: runtime.format,
+      loaderConfig: runtime.loaderConfig,
+      pluginOptions: match.options
+    };
+    const result = match.plugin.transform(code, filename, ctx);
     if (runtime.loaderConfig.debug) {
-      console.log(`[hirari-loader] no plugin matched ${filename}`);
+      console.log(`[hirari-loader][${match.plugin.name}] compiled ${filename}`);
+    }
+    if (result.continue) {
+      continue;
+    }
+    if (result.map) {
+      map[filename] = result.map;
     }
-    return { code };
+    return result;
   }
-  const ctx = {
-    format: runtime.format,
-    loaderConfig: runtime.loaderConfig,
-    pluginOptions: match.options
-  };
-  const result = match.plugin.transform(code, filename, ctx);
   if (runtime.loaderConfig.debug) {
-    console.log(`[hirari-loader][${match.plugin.name}] compiled ${filename}`);
-  }
-  if (result.map) {
-    map[filename] = result.map;
+    console.log(`[hirari-loader] no plugin matched ${filename}`);
   }
-  return result;
+  return { code };
 }
 function collectExtensions(plugins) {
   const set = /* @__PURE__ */ new Set();
@@ -207,7 +212,7 @@ function registerRequireHooks(runtime) {
   };
   const revert = (0, import_pirates.addHook)(compile, {
     exts: extensions,
-    ignoreNodeModules: runtime.loaderConfig.hookIgnoreNodeModules ?? true
+    ignoreNodeModules: false
   });
   const extensionsObj = import_module2.default.Module._extensions;
   const jsHandler = extensionsObj[".js"];

package/dist/register.js

@@ -1,7 +1,7 @@
 import {
   register
-} from "./chunk-NGPAJOT3.js";
-import "./chunk-ZZJ5GQ5Y.js";
+} from "./chunk-JPHIWQ7S.js";
+import "./chunk-2YMWZ4IT.js";
 export {
   register
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hirarijs/loader",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Runtime loader for HirariJS that wires loader plugins and config",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -33,6 +33,7 @@
     "source-map-support": "^0.5.21"
   },
   "peerDependencies": {
+    "@hirarijs/loader-cjs-interop": "*",
     "@hirarijs/loader-ts": "*",
     "@hirarijs/loader-tsx": "*",
     "@hirarijs/loader-vue": "*"