@rsdoctor/core 0.2.2 → 0.2.3

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

@@ -14,5 +14,5 @@ export declare function loadLoaderModule(loaderPath: string, cwd?: string): {
 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 changeBuiltinLoader<T extends Plugin.BuildRuleSetRule>(rules: T[], loaderName: string, appendRules: (rule: T, index: number) => T): T[];
+export declare function addProbeLoader2Rules<T extends Plugin.BuildRuleSetRule>(rules: T[], loaderName: string, appendRules: (rule: T, index: number) => T, strict?: 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>>;

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

@@ -28,7 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var loader_exports = {};
 __export(loader_exports, {
-  changeBuiltinLoader: () => changeBuiltinLoader,
+  addProbeLoader2Rules: () => addProbeLoader2Rules,
   createLoaderContextTrap: () => createLoaderContextTrap,
   extractLoaderName: () => extractLoaderName,
   getLoaderOptions: () => getLoaderOptions,
@@ -153,14 +153,17 @@ function mapEachRules(rules, callback) {
     return rule;
   });
 }
-function getLoaderNameMatch(_r, loaderName) {
+function getLoaderNameMatch(_r, loaderName, strict = true) {
+  if (!strict) {
+    return typeof _r === "object" && typeof _r?.loader === "string" && _r.loader.includes(loaderName) || typeof _r === "string" && _r.includes(loaderName);
+  }
   return typeof _r === "object" && typeof _r?.loader === "string" && _r.loader === loaderName || typeof _r === "string" && _r === loaderName;
 }
-function changeBuiltinLoader(rules, loaderName, appendRules) {
+function addProbeLoader2Rules(rules, loaderName, appendRules, strict) {
   return rules.map((rule) => {
     if (!rule || typeof rule === "string")
       return rule;
-    if (getLoaderNameMatch(rule, loaderName)) {
+    if (getLoaderNameMatch(rule, loaderName, strict)) {
       const _rule = {
         ...rule,
         use: [
@@ -178,7 +181,7 @@ function changeBuiltinLoader(rules, loaderName, appendRules) {
       if (Array.isArray(rule.use)) {
         const _index = (0, import_lodash.findIndex)(
           rule.use,
-          (_r) => getLoaderNameMatch(_r, loaderName)
+          (_r) => getLoaderNameMatch(_r, loaderName, strict)
         );
         if (_index > -1) {
           return appendRules(rule, _index);
@@ -195,7 +198,7 @@ function changeBuiltinLoader(rules, loaderName, appendRules) {
     if ("oneOf" in rule && rule.oneOf) {
       return {
         ...rule,
-        oneOf: changeBuiltinLoader(
+        oneOf: addProbeLoader2Rules(
           rule.oneOf,
           loaderName,
           appendRules
@@ -205,7 +208,7 @@ function changeBuiltinLoader(rules, loaderName, appendRules) {
     if ("rules" in rule && rule.rules) {
       return {
         ...rule,
-        rules: changeBuiltinLoader(
+        rules: addProbeLoader2Rules(
           rule.rules,
           loaderName,
           appendRules
@@ -286,7 +289,7 @@ function createLoaderContextTrap(final) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  changeBuiltinLoader,
+  addProbeLoader2Rules,
   createLoaderContextTrap,
   extractLoaderName,
   getLoaderOptions,

package/dist/inner-plugins/plugins/base.d.ts

@@ -2,9 +2,9 @@ import type { RsdoctorWebpackSDK } from '@rsdoctor/sdk';
 import type { Linter, Plugin } from '@rsdoctor/types';
 import type { InternalPlugin, RsdoctorPluginInstance } from '../../types';
 export declare abstract class InternalBasePlugin<T extends Plugin.BaseCompiler> implements InternalPlugin<T, Linter.ExtendRuleData[]> {
-    readonly scheduler: RsdoctorPluginInstance<Plugin.BaseCompiler, Linter.ExtendRuleData[]>;
+    readonly scheduler: RsdoctorPluginInstance<T, Linter.ExtendRuleData[]>;
     abstract name: string;
-    constructor(scheduler: RsdoctorPluginInstance<Plugin.BaseCompiler, Linter.ExtendRuleData[]>);
+    constructor(scheduler: RsdoctorPluginInstance<T, Linter.ExtendRuleData[]>);
     abstract apply(compiler: T): void;
     get options(): import("@/types").RsdoctorPluginOptionsNormalized<Linter.ExtendRuleData<any, string>[]>;
     get sdk(): RsdoctorWebpackSDK;

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

@@ -107,7 +107,7 @@ function interceptLoader(rules, loaderPath, options, cwd = process.cwd(), resolv
     return target;
   };
   return import_build.Utils.mapEachRules(rules, (rule) => {
-    if (rule.loader?.startsWith("builtin:")) {
+    if (rule.loader?.startsWith("builtin:") || rule.loader?.endsWith(".mjs")) {
       return rule;
     }
     const opts = {

package/dist/types/plugin.d.ts

@@ -2,8 +2,7 @@ import type { Linter as LinterType, Common, Plugin, SDK } from '@rsdoctor/types'
 import type { RsdoctorSlaveSDK, RsdoctorWebpackSDK } from '@rsdoctor/sdk';
 import { ChunkGraph, ModuleGraph } from '@rsdoctor/graph';
 import { rules } from '../rules/rules';
-import { RuleData } from '@rsdoctor/types/dist/linter';
-type InternalRules = (typeof rules)[number] & RuleData[];
+type InternalRules = Common.UnionToTuple<(typeof rules)[number]>;
 export interface RsdoctorWebpackPluginOptions<Rules extends LinterType.ExtendRuleData[]> {
     /** Checker configuration */
     linter?: LinterType.Options<Rules, InternalRules>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/core",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -72,9 +72,10 @@
     "semver": "^7.5.4",
     "source-map": "^0.7.4",
     "webpack-bundle-analyzer": "^4.9.1",
-    "@rsdoctor/graph": "0.2.2",
-    "@rsdoctor/sdk": "0.2.2",
-    "@rsdoctor/utils": "0.2.2"
+    "@rsdoctor/graph": "0.2.3",
+    "@rsdoctor/sdk": "0.2.3",
+    "@rsdoctor/types": "0.2.3",
+    "@rsdoctor/utils": "0.2.3"
   },
   "devDependencies": {
     "@rspack/core": "0.5.1",
@@ -94,7 +95,6 @@
     "tslib": "2.4.1",
     "typescript": "^5.2.2",
     "webpack": "^5.89.0",
-    "@rsdoctor/types": "0.2.2",
     "@scripts/test-helper": "0.1.1"
   },
   "publishConfig": {