@rsdoctor/utils 1.3.2 → 1.3.4

package/dist/build.cjs

@@ -471,8 +471,7 @@ function getResolverFileDetails(filepath, resolvers, modules, moduleCodeMap) {
     };
 }
 function modules_getModulesByAsset(asset, chunks, modules, filterModules, checkModules) {
-    let cks = getChunksByChunkIds(getChunkIdsByAsset(asset), chunks);
-    return getModulesByChunks(asset.path, cks, modules, filterModules, checkModules);
+    return getModulesByChunks(getChunksByChunkIds(getChunkIdsByAsset(asset), chunks), modules, filterModules, checkModules);
 }
 function getModuleIdsByChunk(chunk) {
     let { modules = [] } = chunk;
@@ -493,16 +492,12 @@ function getModulesByChunk(chunk, modules, filterModules) {
         return module;
     }).filter(Boolean);
 }
-function getTypeChecker(assetPath) {
-    return isStyleExt(assetPath) ? isStyleExt : isJsExt(assetPath) ? isJsExt : ()=>!0;
-}
-function getModulesByChunks(assetPath, chunks, modules, filterModules, checkModules) {
-    let res = [], typeChecker = getTypeChecker(assetPath);
+function getModulesByChunks(chunks, modules, filterModules, checkModules) {
+    let res = [];
     try {
         chunks.forEach((chunk)=>{
             getModulesByChunk(chunk, modules, filterModules).forEach((md)=>{
-                let name = md.path || '';
-                typeChecker(name) && (!checkModules || checkModules(md)) && !res.filter((_m)=>_m.id === md.id).length && res.push(md);
+                (!checkModules || checkModules(md)) && !res.filter((_m)=>_m.id === md.id).length && res.push(md);
             });
         });
     } catch (error) {

package/dist/common/graph/modules.d.ts

@@ -3,7 +3,7 @@ export declare function getModulesByAsset(asset: SDK.AssetData, chunks: SDK.Chun
 export declare function getModuleIdsByChunk(chunk: SDK.ChunkData): number[];
 export declare function getModuleIdsByModulesIds(moduleIds: number[], modules: SDK.ModuleData[]): SDK.ModuleData[];
 export declare function getModulesByChunk(chunk: SDK.ChunkData, modules: SDK.ModuleData[], filterModules?: (keyof SDK.ModuleData)[]): SDK.ModuleData[];
-export declare function getModulesByChunks(assetPath: string, chunks: SDK.ChunkData[], modules: SDK.ModuleData[], filterModules?: (keyof SDK.ModuleData)[], checkModules?: (module: SDK.ModuleData) => boolean): SDK.ModuleData[];
+export declare function getModulesByChunks(chunks: SDK.ChunkData[], modules: SDK.ModuleData[], filterModules?: (keyof SDK.ModuleData)[], checkModules?: (module: SDK.ModuleData) => boolean): SDK.ModuleData[];
 export declare function getModuleByDependency(dep: SDK.DependencyData, modules: SDK.ModuleData[]): SDK.ModuleData | undefined;
 export declare function filterModulesAndDependenciesByPackageDeps(deps: Rule.DependencyWithPackageData[], dependencies: SDK.DependencyData[], modules: SDK.ModuleData[]): Pick<SDK.ModuleGraphData, 'dependencies' | 'modules'>;
 export declare function getModuleDetails(moduleId: number, modules: SDK.ModuleData[], dependencies: SDK.DependencyData[]): SDK.ServerAPI.InferResponseType<SDK.ServerAPI.API.GetModuleDetails>;

package/dist/common.cjs

@@ -100,11 +100,6 @@ __webpack_require__.r(resolver_namespaceObject), __webpack_require__.d(resolver_
     isResolveFailData: ()=>isResolveFailData,
     isResolveSuccessData: ()=>isResolveSuccessData
 });
-var file_namespaceObject = {};
-__webpack_require__.r(file_namespaceObject), __webpack_require__.d(file_namespaceObject, {
-    isJsExt: ()=>isJsExt,
-    isStyleExt: ()=>isStyleExt
-});
 var graph_namespaceObject = {};
 __webpack_require__.r(graph_namespaceObject), __webpack_require__.d(graph_namespaceObject, {
     diffAssetsByExtensions: ()=>diffAssetsByExtensions,
@@ -192,6 +187,11 @@ __webpack_require__.r(global_config_namespaceObject), __webpack_require__.d(glob
     getMcpConfigPath: ()=>getMcpConfigPath,
     writeMcpPort: ()=>writeMcpPort
 });
+var file_namespaceObject = {};
+__webpack_require__.r(file_namespaceObject), __webpack_require__.d(file_namespaceObject, {
+    isJsExt: ()=>isJsExt,
+    isStyleExt: ()=>isStyleExt
+});
 var summary_SummaryCostsDataName = function(SummaryCostsDataName) {
     return SummaryCostsDataName.Bootstrap = "bootstrap->beforeCompile", SummaryCostsDataName.Compile = "beforeCompile->afterCompile", SummaryCostsDataName.Done = "afterCompile->done", SummaryCostsDataName.Minify = "minify(processAssets)", SummaryCostsDataName;
 }({});
@@ -591,15 +591,8 @@ function getDependenciesByModule(module, dependencies) {
 function getDependencyByResolvedRequest(resolvedRequest, dependencies) {
     return dependencies.find((e)=>e.resolvedRequest === resolvedRequest);
 }
-function isStyleExt(path) {
-    return /\.(c|le|sa|sc)ss(\?.*)?$/.test(path);
-}
-function isJsExt(path) {
-    return /\.(js|ts|jsx|tsx)(\?.*)?$/.test(path);
-}
 function getModulesByAsset(asset, chunks, modules, filterModules, checkModules) {
-    let cks = getChunksByChunkIds(getChunkIdsByAsset(asset), chunks);
-    return getModulesByChunks(asset.path, cks, modules, filterModules, checkModules);
+    return getModulesByChunks(getChunksByChunkIds(getChunkIdsByAsset(asset), chunks), modules, filterModules, checkModules);
 }
 function getModuleIdsByChunk(chunk) {
     let { modules = [] } = chunk;
@@ -620,16 +613,12 @@ function getModulesByChunk(chunk, modules, filterModules) {
         return module;
     }).filter(Boolean);
 }
-function getTypeChecker(assetPath) {
-    return isStyleExt(assetPath) ? isStyleExt : isJsExt(assetPath) ? isJsExt : ()=>!0;
-}
-function getModulesByChunks(assetPath, chunks, modules, filterModules, checkModules) {
-    let res = [], typeChecker = getTypeChecker(assetPath);
+function getModulesByChunks(chunks, modules, filterModules, checkModules) {
+    let res = [];
     try {
         chunks.forEach((chunk)=>{
             getModulesByChunk(chunk, modules, filterModules).forEach((md)=>{
-                let name = md.path || '';
-                typeChecker(name) && (!checkModules || checkModules(md)) && !res.filter((_m)=>_m.id === md.id).length && res.push(md);
+                (!checkModules || checkModules(md)) && !res.filter((_m)=>_m.id === md.id).length && res.push(md);
             });
         });
     } catch (error) {
@@ -1304,6 +1293,12 @@ function getMcpConfigPath() {
     let homeDir = external_os_default().homedir(), rsdoctorDir = external_path_default().join(homeDir, '.cache/rsdoctor');
     return external_path_default().join(rsdoctorDir, 'mcp.json');
 }
+function isStyleExt(path) {
+    return /\.(c|le|sa|sc)ss(\?.*)?$/.test(path);
+}
+function isJsExt(path) {
+    return /\.(js|ts|jsx|tsx)(\?.*)?$/.test(path);
+}
 function decycle(object) {
     let objects = [], paths = [];
     return function derez(value, path) {

package/dist/common.js

@@ -80,11 +80,6 @@ __webpack_require__.r(resolver_namespaceObject), __webpack_require__.d(resolver_
     isResolveFailData: ()=>isResolveFailData,
     isResolveSuccessData: ()=>isResolveSuccessData
 });
-var file_namespaceObject = {};
-__webpack_require__.r(file_namespaceObject), __webpack_require__.d(file_namespaceObject, {
-    isJsExt: ()=>isJsExt,
-    isStyleExt: ()=>isStyleExt
-});
 var graph_namespaceObject = {};
 __webpack_require__.r(graph_namespaceObject), __webpack_require__.d(graph_namespaceObject, {
     diffAssetsByExtensions: ()=>diffAssetsByExtensions,
@@ -172,6 +167,11 @@ __webpack_require__.r(global_config_namespaceObject), __webpack_require__.d(glob
     getMcpConfigPath: ()=>getMcpConfigPath,
     writeMcpPort: ()=>writeMcpPort
 });
+var file_namespaceObject = {};
+__webpack_require__.r(file_namespaceObject), __webpack_require__.d(file_namespaceObject, {
+    isJsExt: ()=>isJsExt,
+    isStyleExt: ()=>isStyleExt
+});
 var summary_SummaryCostsDataName = ((SummaryCostsDataName = {}).Bootstrap = "bootstrap->beforeCompile", SummaryCostsDataName.Compile = "beforeCompile->afterCompile", SummaryCostsDataName.Done = "afterCompile->done", SummaryCostsDataName.Minify = "minify(processAssets)", SummaryCostsDataName);
 function encode(str) {
     let res = `${str.charCodeAt(0)}`;
@@ -546,15 +546,8 @@ function getDependenciesByModule(module, dependencies) {
 function getDependencyByResolvedRequest(resolvedRequest, dependencies) {
     return dependencies.find((e)=>e.resolvedRequest === resolvedRequest);
 }
-function isStyleExt(path) {
-    return /\.(c|le|sa|sc)ss(\?.*)?$/.test(path);
-}
-function isJsExt(path) {
-    return /\.(js|ts|jsx|tsx)(\?.*)?$/.test(path);
-}
 function getModulesByAsset(asset, chunks, modules, filterModules, checkModules) {
-    let cks = getChunksByChunkIds(getChunkIdsByAsset(asset), chunks);
-    return getModulesByChunks(asset.path, cks, modules, filterModules, checkModules);
+    return getModulesByChunks(getChunksByChunkIds(getChunkIdsByAsset(asset), chunks), modules, filterModules, checkModules);
 }
 function getModuleIdsByChunk(chunk) {
     let { modules = [] } = chunk;
@@ -575,13 +568,12 @@ function getModulesByChunk(chunk, modules, filterModules) {
         return module;
     }).filter(Boolean);
 }
-function getModulesByChunks(assetPath, chunks, modules, filterModules, checkModules) {
-    let res = [], typeChecker = isStyleExt(assetPath) ? isStyleExt : isJsExt(assetPath) ? isJsExt : ()=>!0;
+function getModulesByChunks(chunks, modules, filterModules, checkModules) {
+    let res = [];
     try {
         chunks.forEach((chunk)=>{
             getModulesByChunk(chunk, modules, filterModules).forEach((md)=>{
-                let name = md.path || '';
-                typeChecker(name) && (!checkModules || checkModules(md)) && !res.filter((_m)=>_m.id === md.id).length && res.push(md);
+                (!checkModules || checkModules(md)) && !res.filter((_m)=>_m.id === md.id).length && res.push(md);
             });
         });
     } catch (error) {
@@ -1248,6 +1240,12 @@ function getMcpConfigPath() {
     let homeDir = os.homedir(), rsdoctorDir = path_0.join(homeDir, '.cache/rsdoctor');
     return path_0.join(rsdoctorDir, 'mcp.json');
 }
+function isStyleExt(path) {
+    return /\.(c|le|sa|sc)ss(\?.*)?$/.test(path);
+}
+function isJsExt(path) {
+    return /\.(js|ts|jsx|tsx)(\?.*)?$/.test(path);
+}
 function decycle(object) {
     let objects = [], paths = [];
     return function derez(value, path) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/utils",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -68,7 +68,7 @@
     "acorn-import-attributes": "^1.9.5",
     "acorn-walk": "8.3.4",
     "deep-eql": "4.1.4",
-    "envinfo": "7.14.0",
+    "envinfo": "7.19.0",
     "fs-extra": "^11.1.1",
     "get-port": "5.1.1",
     "json-stream-stringify": "3.0.1",
@@ -76,7 +76,7 @@
     "picocolors": "^1.1.1",
     "rslog": "^1.2.11",
     "strip-ansi": "^6.0.1",
-    "@rsdoctor/types": "1.3.2"
+    "@rsdoctor/types": "1.3.4"
   },
   "devDependencies": {
     "@types/babel__code-frame": "7.0.6",