@rsdoctor/core 0.4.1 → 0.4.3

package/dist/build-utils/build/index.d.ts

@@ -1,5 +1,6 @@
 export * as Chunks from './chunks';
 export * as Utils from './utils';
+export * as Loader from './loader';
 export * as Types from '../../types';
 export * as ModuleGraph from './module-graph';
 //# sourceMappingURL=index.d.ts.map

package/dist/build-utils/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/build-utils/build/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,KAAK,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,WAAW,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/build-utils/build/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,KAAK,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,WAAW,MAAM,gBAAgB,CAAC"}

package/dist/build-utils/build/index.js

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var build_exports = {};
 __export(build_exports, {
   Chunks: () => Chunks,
+  Loader: () => Loader,
   ModuleGraph: () => ModuleGraph,
   Types: () => Types,
   Utils: () => Utils
@@ -36,11 +37,13 @@ __export(build_exports, {
 module.exports = __toCommonJS(build_exports);
 var Chunks = __toESM(require("./chunks"));
 var Utils = __toESM(require("./utils"));
+var Loader = __toESM(require("./loader"));
 var Types = __toESM(require("../../types"));
 var ModuleGraph = __toESM(require("./module-graph"));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Chunks,
+  Loader,
   ModuleGraph,
   Types,
   Utils

package/dist/build-utils/build/loader/index.d.ts

@@ -0,0 +1,2 @@
+export * from './probeLoaderPlugin';
+//# sourceMappingURL=index.d.ts.map

package/dist/build-utils/build/loader/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/build-utils/build/loader/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC"}

package/dist/build-utils/build/loader/index.js

@@ -0,0 +1,22 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var loader_exports = {};
+module.exports = __toCommonJS(loader_exports);
+__reExport(loader_exports, require("./probeLoaderPlugin"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("./probeLoaderPlugin")
+});

package/dist/build-utils/build/loader/probeLoader.d.ts

@@ -0,0 +1,5 @@
+import { Plugin } from '@rsdoctor/types';
+import type { LoaderDefinitionFunction } from '@rspack/core';
+export declare const loaderModule: Plugin.LoaderDefinition<Parameters<LoaderDefinitionFunction>, {}>;
+export default loaderModule;
+//# sourceMappingURL=probeLoader.d.ts.map

package/dist/build-utils/build/loader/probeLoader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"probeLoader.d.ts","sourceRoot":"","sources":["../../../../src/build-utils/build/loader/probeLoader.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAO,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAI7D,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,gBAAgB,CAChD,UAAU,CAAC,wBAAwB,CAAC,EACpC,EAAE,CAwCH,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/dist/build-utils/build/loader/probeLoader.js

@@ -0,0 +1,76 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var probeLoader_exports = {};
+__export(probeLoader_exports, {
+  default: () => probeLoader_default,
+  loaderModule: () => loaderModule
+});
+module.exports = __toCommonJS(probeLoader_exports);
+var import__ = require("../..");
+var import_inner_plugins = require("../../../inner-plugins");
+var import_lodash = require("lodash");
+var import_path = __toESM(require("path"));
+const loaderModule = function(...args) {
+  const time = Date.now();
+  const code = args[0];
+  const _options = this.getOptions();
+  const sdk = (0, import_inner_plugins.getSDK)(_options.builderName);
+  const loaderData = {
+    resource: {
+      path: this.resourcePath,
+      query: import__.Build.Utils.parseQuery(this.resourceQuery),
+      queryRaw: this.resourceQuery,
+      ext: import_path.default.extname(this.resourcePath).slice(1)
+    },
+    loaders: [
+      {
+        loader: _options.loader,
+        loaderIndex: this.loaderIndex,
+        path: _options.loader,
+        input: _options.type === "start" ? code : null,
+        result: _options.type === "end" ? code : null,
+        startAt: _options.type === "start" ? time : 0,
+        endAt: _options.type === "end" ? time : 0,
+        options: (0, import_lodash.omit)(_options.options, "type"),
+        isPitch: false,
+        sync: false,
+        errors: [],
+        pid: process.pid,
+        ppid: process.ppid
+      }
+    ]
+  };
+  sdk.reportLoaderStartOrEnd(loaderData);
+  this.callback(null, ...args);
+};
+var probeLoader_default = loaderModule;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  loaderModule
+});

package/dist/build-utils/build/loader/probeLoaderPlugin.d.ts

@@ -0,0 +1,6 @@
+import { Plugin } from '@rsdoctor/types';
+export declare class ProbeLoaderPlugin {
+    apply(compiler: Plugin.BaseCompiler): void;
+    private addProbeLoader;
+}
+//# sourceMappingURL=probeLoaderPlugin.d.ts.map

package/dist/build-utils/build/loader/probeLoaderPlugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"probeLoaderPlugin.d.ts","sourceRoot":"","sources":["../../../../src/build-utils/build/loader/probeLoaderPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAUzC,qBAAa,iBAAiB;IAC5B,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,YAAY;IAoBnC,OAAO,CAAC,cAAc;CA0DvB"}

package/dist/build-utils/build/loader/probeLoaderPlugin.js

@@ -0,0 +1,111 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var probeLoaderPlugin_exports = {};
+__export(probeLoaderPlugin_exports, {
+  ProbeLoaderPlugin: () => ProbeLoaderPlugin
+});
+module.exports = __toCommonJS(probeLoaderPlugin_exports);
+var import_common = require("@rsdoctor/utils/common");
+var import__ = require("../..");
+var import__2 = require("..");
+var import_path = __toESM(require("path"));
+const BuiltinLoaderName = "builtin:swc-loader";
+const ESMLoaderFile = ".mjs";
+class ProbeLoaderPlugin {
+  apply(compiler) {
+    compiler.hooks.beforeRun.tap(
+      {
+        name: "ProbeLoaderPlugin"
+      },
+      () => {
+        this.addProbeLoader(compiler);
+      }
+    );
+    compiler.hooks.watchRun.tap(
+      {
+        name: "ProbeLoaderPlugin"
+      },
+      () => {
+        this.addProbeLoader(compiler);
+      }
+    );
+  }
+  addProbeLoader(compiler) {
+    let rules = compiler.options.module.rules;
+    const appendRule = (rule, index) => {
+      if ("use" in rule && Array.isArray(rule.use)) {
+        const _builtinRule = rule.use[index];
+        const _options = typeof _builtinRule.options === "string" ? {} : { ..._builtinRule };
+        rule.use.splice(index, 0, {
+          loader: import_path.default.join(__dirname, "./probeLoader.js"),
+          options: {
+            ..._options,
+            ident: void 0,
+            type: "end",
+            builderName: compiler.options.name
+          }
+        });
+        rule.use.splice(index + 2, 0, {
+          loader: import_path.default.join(__dirname, "./probeLoader.js"),
+          options: {
+            ..._options,
+            ident: void 0,
+            type: "start",
+            builderName: compiler.options.name
+          }
+        });
+      }
+      return rule;
+    };
+    if (import_common.Loader.isVue(compiler)) {
+      compiler.options.module.rules = import__2.Utils.addProbeLoader2Rules(
+        rules,
+        appendRule,
+        (r) => !!r.loader
+      );
+      return;
+    }
+    rules = import__2.Utils.addProbeLoader2Rules(
+      rules,
+      appendRule,
+      (r) => import__.Build.Utils.getLoaderNameMatch(r, BuiltinLoaderName, true)
+    );
+    compiler.options.module.rules = import__2.Utils.addProbeLoader2Rules(
+      rules,
+      appendRule,
+      (r) => {
+        return import__.Build.Utils.getLoaderNameMatch(r, ESMLoaderFile, false) || import__.Build.Utils.isESMLoader(r);
+      }
+    );
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ProbeLoaderPlugin
+});

package/dist/build-utils/build/module-graph/webpack/transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../../../src/build-utils/build/module-graph/webpack/transform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAU,WAAW,EAAe,MAAM,iBAAiB,CAAC;AAmBnE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACnD,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,YAAY,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAAC;CACvE;AAoND,wBAAsB,8BAA8B,CAClD,WAAW,EAAE,MAAM,CAAC,eAAe,EACnC,KAAK,EAAE,WAAW,EAClB,QAAQ,CAAC,EAAE,MAAM,CAAC,6BAA6B,EAC/C,OAAO,CAAC,EAAE,gBAAgB,wBA2B3B"}
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../../../src/build-utils/build/module-graph/webpack/transform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAU,WAAW,EAAe,MAAM,iBAAiB,CAAC;AAmBnE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACnD,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,YAAY,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAAC;CACvE;AAsND,wBAAsB,8BAA8B,CAClD,WAAW,EAAE,MAAM,CAAC,eAAe,EACnC,KAAK,EAAE,WAAW,EAClB,QAAQ,CAAC,EAAE,MAAM,CAAC,6BAA6B,EAC/C,OAAO,CAAC,EAAE,gBAAgB,wBA2B3B"}

package/dist/build-utils/build/module-graph/webpack/transform.js

@@ -125,7 +125,7 @@ async function appendModuleData(origin, webpackGraph, graph, wbFs, features, con
       module2.setProgram(program);
       module2.meta.hasSetEsModuleStatement = (0, import_parser.hasSetEsModuleStatement)(program);
     }
-    const transformed = (0, import_compatible.isExternalModule)(origin) ? "" : module2.getSource().transformed.length > 0 ? module2.getSource().transformed : (0, import_lodash.isFunction)(origin?.originalSource) ? origin.originalSource()?.source()?.toString() : "";
+    const transformed = (0, import_compatible.isExternalModule)(origin) ? "" : module2.getSource().transformed.length > 0 ? module2.getSource().transformed : (0, import_lodash.isFunction)(origin?.originalSource) ? origin.originalSource()?.source()?.toString() ?? "" : "";
     const transformedSize = (0, import_compatible.isExternalModule)(origin) ? 0 : module2.getSize().transformedSize > 0 ? module2.getSize().transformedSize : Buffer.from(transformed).byteLength;
     module2.setSource({
       transformed,

package/dist/build-utils/build/utils/index.d.ts

@@ -1,4 +1,5 @@
 export * from './loader';
 export * from './plugin';
 export * from './parseBundle';
+export * from '../loader/probeLoader';
 //# sourceMappingURL=index.d.ts.map

package/dist/build-utils/build/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/build-utils/build/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/build-utils/build/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC"}

package/dist/build-utils/build/utils/index.js

@@ -18,9 +18,11 @@ module.exports = __toCommonJS(utils_exports);
 __reExport(utils_exports, require("./loader"), module.exports);
 __reExport(utils_exports, require("./plugin"), module.exports);
 __reExport(utils_exports, require("./parseBundle"), module.exports);
+__reExport(utils_exports, require("../loader/probeLoader"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./loader"),
   ...require("./plugin"),
-  ...require("./parseBundle")
+  ...require("./parseBundle"),
+  ...require("../loader/probeLoader")
 });

package/dist/build-utils/build/utils/loader.d.ts

@@ -10,11 +10,13 @@ export declare function loadLoaderModule(loaderPath: string, cwd?: string): {
     pitch: Plugin.PitchLoaderDefinitionFunction;
     raw: boolean | void;
 };
-export declare function getLoaderOptions<T>(loaderContext: Plugin.LoaderContext<T>): T;
 export declare function extractLoaderName(loaderPath: string, cwd?: string): string;
 export declare function mapEachRules<T extends Plugin.BuildRuleSetRule>(rules: T[], callback: (rule: T) => T): T[];
 export declare function isESMLoader(r: Plugin.BuildRuleSetRule): boolean;
 export declare function getLoaderNameMatch(r: Plugin.BuildRuleSetRule, loaderName: string, strict?: boolean): boolean;
 export declare function addProbeLoader2Rules<T extends Plugin.BuildRuleSetRule>(rules: T[], appendRules: (rule: T, index: number) => T, fn: (r: Plugin.BuildRuleSetRule) => boolean): T[];
 export declare function createLoaderContextTrap(this: Plugin.LoaderContext<Common.PlainObject>, final: (err: Error | null | undefined, res: string | Buffer | null, sourceMap?: WebpackSourceMapInput) => void): Plugin.LoaderContext<Common.PlainObject<any>>;
+export declare function parseQuery(query: string): {
+    [k: string]: string;
+};
 //# sourceMappingURL=loader.d.ts.map

package/dist/build-utils/build/utils/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../src/build-utils/build/utils/loader.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAQ,cAAc,IAAI,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAQ/E,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,CAOA;AAED,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,GAAG,SAAgB,GAClB;IACD,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACzD,KAAK,EAAE,MAAM,CAAC,6BAA6B,CAAC;IAC5C,GAAG,EAAE,OAAO,GAAG,IAAI,CAAC;CACrB,CAiBA;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,KAQzE;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,SAAK,GAAG,MAAM,CAqBtE;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,gBAAgB,EAC5D,KAAK,EAAE,CAAC,EAAE,EACV,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GACvB,CAAC,EAAE,CAgFL;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,gBAAgB,WA2BrD;AAED,wBAAgB,kBAAkB,CAChC,CAAC,EAAE,MAAM,CAAC,gBAAgB,EAC1B,UAAU,EAAE,MAAM,EAClB,MAAM,UAAO,WAiBd;AAGD,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,MAAM,CAAC,gBAAgB,EACpE,KAAK,EAAE,CAAC,EAAE,EACV,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,CAAC,EAC1C,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,gBAAgB,KAAK,OAAO,GAC1C,CAAC,EAAE,CAsDL;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,EAC9C,KAAK,EAAE,CACL,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,EAC3B,SAAS,CAAC,EAAE,qBAAqB,KAC9B,IAAI,iDAsFV"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../src/build-utils/build/utils/loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAQ,cAAc,IAAI,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAQ/E,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,CAOA;AAED,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,GAAG,SAAgB,GAClB;IACD,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACzD,KAAK,EAAE,MAAM,CAAC,6BAA6B,CAAC;IAC5C,GAAG,EAAE,OAAO,GAAG,IAAI,CAAC;CACrB,CAiBA;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,SAAK,GAAG,MAAM,CAqBtE;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,gBAAgB,EAC5D,KAAK,EAAE,CAAC,EAAE,EACV,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GACvB,CAAC,EAAE,CAgFL;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,gBAAgB,WA2BrD;AAED,wBAAgB,kBAAkB,CAChC,CAAC,EAAE,MAAM,CAAC,gBAAgB,EAC1B,UAAU,EAAE,MAAM,EAClB,MAAM,UAAO,WAiBd;AAGD,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,MAAM,CAAC,gBAAgB,EACpE,KAAK,EAAE,CAAC,EAAE,EACV,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,CAAC,EAC1C,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,gBAAgB,KAAK,OAAO,GAC1C,CAAC,EAAE,CAuEL;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,EAC9C,KAAK,EAAE,CACL,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,EAC3B,SAAS,CAAC,EAAE,qBAAqB,KAC9B,IAAI,iDAsFV;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM;;EAMvC"}

package/dist/build-utils/build/utils/loader.js

@@ -32,14 +32,13 @@ __export(loader_exports, {
   createLoaderContextTrap: () => createLoaderContextTrap,
   extractLoaderName: () => extractLoaderName,
   getLoaderNameMatch: () => getLoaderNameMatch,
-  getLoaderOptions: () => getLoaderOptions,
   isESMLoader: () => isESMLoader,
   loadLoaderModule: () => loadLoaderModule,
   mapEachRules: () => mapEachRules,
-  parsePathQueryFragment: () => parsePathQueryFragment
+  parsePathQueryFragment: () => parsePathQueryFragment,
+  parseQuery: () => parseQuery
 });
 module.exports = __toCommonJS(loader_exports);
-var import_loader_utils = require("loader-utils");
 var import_path = __toESM(require("path"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_lodash = require("lodash");
@@ -66,12 +65,6 @@ function loadLoaderModule(loaderPath, cwd = process.cwd()) {
     raw: mod.default?.raw || mod.raw || false
   };
 }
-function getLoaderOptions(loaderContext) {
-  if (typeof loaderContext.getOptions === "function") {
-    return loaderContext.getOptions();
-  }
-  return (0, import_loader_utils.getOptions)(loaderContext);
-}
 function extractLoaderName(loaderPath, cwd = "") {
   let res = loaderPath.replace(cwd, "");
   if (!import_path.default.isAbsolute(res))
@@ -89,7 +82,7 @@ function extractLoaderName(loaderPath, cwd = "") {
   return res;
 }
 function mapEachRules(rules, callback) {
-  return rules.map((rule) => {
+  return rules.filter(Boolean).map((rule) => {
     if (typeof rule === "string") {
       return callback({
         loader: rule
@@ -184,13 +177,14 @@ function addProbeLoader2Rules(rules, appendRules, fn) {
   return rules.map((rule) => {
     if (!rule || typeof rule === "string")
       return rule;
-    if (fn(rule)) {
+    if (fn(rule) && !rule.use) {
       const _rule = {
         ...rule,
         use: [
           {
             loader: rule.loader,
-            options: rule.options
+            options: rule.options,
+            ident: "ident" in rule && rule.ident || void 0
           }
         ],
         loader: void 0,
@@ -200,11 +194,23 @@ function addProbeLoader2Rules(rules, appendRules, fn) {
     }
     if (rule.use) {
       if (Array.isArray(rule.use)) {
-        const _index = (0, import_lodash.findIndex)(rule.use, (_r) => fn(_r));
-        if (_index > -1) {
-          return appendRules(rule, _index);
+        let indexList = [];
+        rule.use.forEach((_r, index) => {
+          if (fn(_r)) {
+            indexList.push(index);
+          }
+        });
+        let _rule2 = (0, import_lodash.cloneDeep)(rule);
+        if (indexList.length) {
+          indexList.forEach((i, _index) => {
+            if (i !== void 0) {
+              _rule2 = appendRules(_rule2, i + _index * 2);
+            }
+          });
         }
-      } else if (typeof rule.use === "object" && !Array.isArray(rule.use) && typeof rule.use !== "function") {
+        return _rule2;
+      }
+      if (typeof rule.use === "object" && !Array.isArray(rule.use) && typeof rule.use !== "function") {
         rule.use = [
           {
             ...rule.use
@@ -297,15 +303,22 @@ function createLoaderContextTrap(final) {
   });
   return trap;
 }
+function parseQuery(query) {
+  if (query.startsWith("?")) {
+    query = query.slice(1);
+  }
+  const searchParams = new URLSearchParams(query);
+  return Object.fromEntries(searchParams.entries());
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   addProbeLoader2Rules,
   createLoaderContextTrap,
   extractLoaderName,
   getLoaderNameMatch,
-  getLoaderOptions,
   isESMLoader,
   loadLoaderModule,
   mapEachRules,
-  parsePathQueryFragment
+  parsePathQueryFragment,
+  parseQuery
 });

package/dist/inner-plugins/plugins/bundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/plugins/bundle.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAI5C,qBAAa,oBAAoB,CAC/B,CAAC,SAAS,MAAM,CAAC,YAAY,CAC7B,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAC7B,SAAgB,IAAI,YAAY;IAEzB,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAa;IAElD,KAAK,CAAC,QAAQ,EAAE,CAAC;IAOjB,kBAAkB,CAAC,IAAI,EAAE,MAAM;iBATH,MAAM;;IAiBlC,eAAe,gBAAiB,MAAM,CAAC,eAAe,UA0C3D;IAEK,IAAI,QAAa,OAAO,CAAC,IAAI,CAAC,CASnC;CACH"}
+{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/plugins/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAG5C,qBAAa,oBAAoB,CAC/B,CAAC,SAAS,MAAM,CAAC,YAAY,CAC7B,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAC7B,SAAgB,IAAI,YAAY;IAEzB,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAa;IAElD,KAAK,CAAC,QAAQ,EAAE,CAAC;IAOjB,kBAAkB,CAAC,IAAI,EAAE,MAAM;iBATH,MAAM;;IAiBlC,eAAe,gBAAiB,MAAM,CAAC,eAAe,UAuC3D;IAEK,IAAI,QAAa,OAAO,CAAC,IAAI,CAAC,CASnC;CACH"}

package/dist/inner-plugins/plugins/bundle.js

@@ -41,15 +41,12 @@ class InternalBundlePlugin extends import_base.InternalBasePlugin {
           }
         );
       } else if (compilation.hooks.processAssets && "afterProcessAssets" in compilation.hooks) {
-        compilation.hooks.afterProcessAssets.tap(
-          this.tapPostOptions,
-          () => {
-            Object.keys(compilation.assets).forEach((file) => {
-              const v = this.ensureAssetContent(file);
-              v.content = compilation.assets[file].source().toString();
-            });
-          }
-        );
+        compilation.hooks.afterProcessAssets.tap(this.tapPostOptions, () => {
+          Object.keys(compilation.assets).forEach((file) => {
+            const v = this.ensureAssetContent(file);
+            v.content = compilation.assets[file].source().toString();
+          });
+        });
       } else if ("afterOptimizeChunkAssets" in compilation.hooks) {
         compilation.hooks.afterOptimizeChunkAssets.tap(
           this.tapPostOptions,

package/dist/inner-plugins/plugins/bundleTagPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bundleTagPlugin.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/plugins/bundleTagPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAG5C,qBAAa,uBAAuB,CAClC,CAAC,SAAS,MAAM,CAAC,YAAY,CAC7B,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAC7B,SAAgB,IAAI,eAAe;IAE5B,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,YAAY;CAsD3C"}
+{"version":3,"file":"bundleTagPlugin.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/plugins/bundleTagPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAG5C,qBAAa,uBAAuB,CAClC,CAAC,SAAS,MAAM,CAAC,YAAY,CAC7B,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAC7B,SAAgB,IAAI,eAAe;IAE5B,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,YAAY;CAuD3C"}

package/dist/inner-plugins/plugins/bundleTagPlugin.js

@@ -22,7 +22,6 @@ __export(bundleTagPlugin_exports, {
 });
 module.exports = __toCommonJS(bundleTagPlugin_exports);
 var import_path = require("path");
-var import_webpack_sources = require("webpack-sources");
 var import_base = require("./base");
 var import_logger = require("@rsdoctor/utils/logger");
 class InternalBundleTagPlugin extends import_base.InternalBasePlugin {
@@ -55,11 +54,11 @@ class InternalBundleTagPlugin extends import_base.InternalBasePlugin {
                 if (!file || (0, import_path.extname)(file) !== ".js") {
                   continue;
                 }
+                const { ConcatSource } = compiler.webpack.sources;
                 compilation.updateAsset(
                   file,
-                  // @ts-ignore
                   (old) => {
-                    const concatSource = new import_webpack_sources.ConcatSource();
+                    const concatSource = new ConcatSource();
                     let header = "\n console.log('RSDOCTOR_START::');\n";
                     let footer = "\n console.log('RSDOCTOR_END::');\n";
                     concatSource.add(header);

package/dist/inner-plugins/utils/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/utils/loader.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAK9C,OAAO,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AACzE,OAAO,EAAE,KAAK,IAAI,UAAU,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAGjE,wBAAgB,wBAAwB,CACtC,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,GACtD,0BAA0B,CAI5B;AAED,wBAAgB,mCAAmC,CACjD,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,sDAiBxD;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,GACtD,UAAU,CAAC,OAAO,UAAU,CAAC,gBAAgB,CAAC,CAGhD;AAED,wBAAgB,gBAAgB,CAC9B,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,WAgBxD;AAED,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,CAAC,gBAAgB,EAC/D,KAAK,EAAE,CAAC,EAAE,EACV,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,IAAI,CAAC,0BAA0B,EAAE,QAAQ,GAAG,YAAY,CAAC,EAClE,GAAG,SAAgB,EACnB,aAAa,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,GAC9C,CAAC,EAAE,CAsDL;AAED,wBAAsB,YAAY,CAChC,GAAG,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,EAC7C,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,EAC3B,SAAS,CAAC,EAAE,KAAK,CAAC,cAAc,2BAoFjC"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/utils/loader.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAK9C,OAAO,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AACzE,OAAO,EAAE,KAAK,IAAI,UAAU,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAGjE,wBAAgB,wBAAwB,CACtC,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,GACtD,0BAA0B,CAI5B;AAED,wBAAgB,mCAAmC,CACjD,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,sDAiBxD;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,GACtD,UAAU,CAAC,OAAO,UAAU,CAAC,gBAAgB,CAAC,CAGhD;AAED,wBAAgB,gBAAgB,CAC9B,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,WAgBxD;AAED,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,CAAC,gBAAgB,EAC/D,KAAK,EAAE,CAAC,EAAE,EACV,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,IAAI,CAAC,0BAA0B,EAAE,QAAQ,GAAG,YAAY,CAAC,EAClE,GAAG,SAAgB,EACnB,aAAa,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,GAC9C,CAAC,EAAE,CAsDL;AAED,wBAAsB,YAAY,CAChC,GAAG,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,EAC7C,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,EAC3B,SAAS,CAAC,EAAE,KAAK,CAAC,cAAc,2BAoFjC"}

package/dist/inner-plugins/utils/loader.js

@@ -39,7 +39,6 @@ module.exports = __toCommonJS(loader_exports);
 var import_axios = __toESM(require("axios"));
 var import_enhanced_resolve = require("enhanced-resolve");
 var import_fs = __toESM(require("fs"));
-var import_loader_utils = require("loader-utils");
 var import_lodash = require("lodash");
 var import_path = __toESM(require("path"));
 var import_logger = require("@rsdoctor/utils/logger");
@@ -52,11 +51,11 @@ var import_circleDetect = require("./circleDetect");
 var import_build = require("../../build-utils/build");
 var import_utils = require("../../build-utils/build/utils");
 function getInternalLoaderOptions(loaderContext) {
-  const options = import_build.Utils.getLoaderOptions(loaderContext);
+  const options = loaderContext.getOptions();
   return options[import_common.Loader.LoaderInternalPropertyName];
 }
 function getLoaderOptionsWithoutInternalKeys(loaderContext) {
-  const options = import_build.Utils.getLoaderOptions(loaderContext);
+  const options = loaderContext.getOptions();
   const circlePaths = [];
   const loaderOptions = (0, import_lodash.omit)(options, [import_common.Loader.LoaderInternalPropertyName]);
   (0, import_circleDetect.checkCirclePath)(loaderOptions, [], circlePaths, 0);
@@ -133,7 +132,7 @@ async function reportLoader(ctx, start, startHRTime, isPitch, sync, code, err, r
     {
       resource: {
         path: ctx.resourcePath,
-        query: (0, import_loader_utils.parseQuery)(ctx.resourceQuery || "?"),
+        query: (0, import_utils.parseQuery)(ctx.resourceQuery || "?"),
         queryRaw: ctx.resourceQuery,
         ext: import_path.default.extname(ctx.resourcePath).slice(1)
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/core",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -66,36 +66,31 @@
     "enhanced-resolve": "5.12.0",
     "filesize": "^10.1.4",
     "fs-extra": "^11.1.1",
-    "loader-utils": "^2.0.4",
     "lodash": "^4.17.21",
     "path-browserify": "1.0.1",
     "semver": "^7.6.3",
     "source-map": "^0.7.4",
     "webpack-bundle-analyzer": "^4.10.2",
-    "webpack-sources": "^3.2.3",
-    "@rsdoctor/graph": "0.4.1",
-    "@rsdoctor/sdk": "0.4.1",
-    "@rsdoctor/types": "0.4.1",
-    "@rsdoctor/utils": "0.4.1"
+    "@rsdoctor/graph": "0.4.3",
+    "@rsdoctor/sdk": "0.4.3",
+    "@rsdoctor/types": "0.4.3",
+    "@rsdoctor/utils": "0.4.3"
   },
   "devDependencies": {
     "@rspack/core": "0.7.5",
     "@types/fs-extra": "^11.0.4",
-    "@types/loader-utils": "^2.0.6",
     "@types/lodash": "^4.17.7",
     "@types/node": "^16",
     "@types/node-fetch": "^2.6.11",
     "@types/path-browserify": "1.0.3",
     "@types/semver": "^7.5.8",
     "@types/tapable": "2.2.7",
-    "@types/webpack": "5.28.5",
-    "@types/webpack-sources": "^3.2.3",
     "babel-loader": "9.1.3",
     "string-loader": "0.0.1",
     "ts-loader": "^9.5.1",
     "tslib": "2.4.1",
     "typescript": "^5.2.2",
-    "webpack": "^5.89.0",
+    "webpack": "^5.90.0",
     "@scripts/test-helper": "0.1.1"
   },
   "publishConfig": {
@@ -107,6 +102,6 @@
     "dev": "npm run start",
     "build": "modern build",
     "start": "modern build -w",
-    "test": "vitest run"
+    "test": "vitest run -u"
   }
 }