@rsdoctor/utils 1.6.3-beta.0 → 1.6.4

package/dist/build/json.d.cts

@@ -1,3 +1,3 @@
 import { SDK } from '@rsdoctor/types';
-export declare function stringify<T, P = T extends undefined ? undefined : string>(json: T, replacer?: (this: any, key: string, value: any) => any, space?: string | number, cycle?: boolean, chunkSize?: number): Promise<P>;
+export declare function stringify<T, P = T extends undefined ? undefined : string>(json: T, replacer?: (this: any, key: string, value: any) => any, space?: string | number, cycle?: boolean): Promise<P>;
 export declare const readPackageJson: (file: string, readFile?: SDK.GetPackageFile) => SDK.PackageBasicData | undefined;

package/dist/build/json.d.ts

@@ -1,3 +1,3 @@
 import { SDK } from '@rsdoctor/types';
-export declare function stringify<T, P = T extends undefined ? undefined : string>(json: T, replacer?: (this: any, key: string, value: any) => any, space?: string | number, cycle?: boolean, chunkSize?: number): Promise<P>;
+export declare function stringify<T, P = T extends undefined ? undefined : string>(json: T, replacer?: (this: any, key: string, value: any) => any, space?: string | number, cycle?: boolean): Promise<P>;
 export declare const readPackageJson: (file: string, readFile?: SDK.GetPackageFile) => SDK.PackageBasicData | undefined;

package/dist/build.cjs

@@ -5,9 +5,9 @@ var __webpack_modules__ = {
         function random(min, max) {
             return Math.floor(Math.random() * (max - min + 1) + min);
         }
-        __webpack_require__("zlib"), __webpack_require__("buffer"), __webpack_require__("./src/logger.ts"), __webpack_require__.d(__webpack_exports__, {
+        __webpack_require__.d(__webpack_exports__, {
             random: ()=>random
-        });
+        }), require("zlib"), require("buffer"), __webpack_require__("./src/logger.ts");
     },
     "./src/common/index.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.d(__webpack_exports__, {
@@ -16,7 +16,7 @@ var __webpack_modules__ = {
         var package_namespaceObject = {};
         __webpack_require__.r(package_namespaceObject), __webpack_require__.d(package_namespaceObject, {
             getPackageMetaFromModulePath: ()=>getPackageMetaFromModulePath
-        }), __webpack_require__("buffer"), __webpack_require__("stream"), require("string_decoder"), __webpack_require__("zlib"), __webpack_require__("path"), __webpack_require__("./src/common/algorithm.ts"), __webpack_require__("process"), __webpack_require__("@rsdoctor/types"), __webpack_require__("./src/logger.ts"), RegExp(`(.*)${/[-|.]/.source}(${/(?:[a-f0-9]{4,32}|[a-zA-Z]{3,}[0-9]|[a-zA-Z]*[0-9][a-zA-Z]{2,}|[a-zA-Z]*[0-9][a-zA-Z0-9]{3,31})/.source})(${/(?:\.[a-z｜A-Z|0-9]{2,}){1,}/.source})$`);
+        }), __webpack_require__("./src/common/algorithm.ts"), __webpack_require__("path"), __webpack_require__("process"), __webpack_require__("@rsdoctor/types"), __webpack_require__("./src/logger.ts"), RegExp(`(.*)${/[-|.]/.source}(${/(?:[a-f0-9]{4,32}|[a-zA-Z]{3,}[0-9]|[a-zA-Z]*[0-9][a-zA-Z]{2,}|[a-zA-Z]*[0-9][a-zA-Z0-9]{3,31})/.source})(${/(?:\.[a-z｜A-Z|0-9]{2,}){1,}/.source})$`);
         var lodash = __webpack_require__("./src/common/lodash.ts");
         let PACKAGE_SLUG = /[a-zA-Z0-9]+(?:[-|_|.]+[a-zA-Z0-9]+)*/, MODULE_PATH_PACKAGES = RegExp(`(?:${/(?:node_modules|~)(?:\/\.pnpm)?/.source}/)(?:(?:@${PACKAGE_SLUG.source}[/|+])?(?:${PACKAGE_SLUG.source}\\+)*(?:${PACKAGE_SLUG.source})(?:${/@[\w|\-|_|.]+/.source})?)(?:_(?:@${PACKAGE_SLUG.source}[/|+])?(?:${PACKAGE_SLUG.source})(?:@${PACKAGE_SLUG.source})?)*/`, 'g'), PACKAGE_PATH_NAME = /(?:(?:node_modules|~)(?:\/\.pnpm)?\/)(?:((?:@[a-zA-Z0-9]+(?:[-|_|.]+[a-zA-Z0-9]+)*[/|+])?(?:(?:[a-zA-Z0-9]+(?:[-|_|.]+[a-zA-Z0-9]+)*\+)*)(?:[a-zA-Z0-9]+(?:[-|_|.]+[a-zA-Z0-9]+)*))(?:@[\w|\-|_|.]+)?)(?:_((?:@[a-zA-Z0-9]+(?:[-|_|.]+[a-zA-Z0-9]+)*[/|+])?(?:[a-zA-Z0-9]+(?:[-|_|.]+[a-zA-Z0-9]+)*))(?:@[a-zA-Z0-9]+(?:[-|_|.]+[a-zA-Z0-9]+)*))*\//gm, getPackageMetaFromModulePath = (modulePath)=>{
             var data;
@@ -95,9 +95,6 @@ var __webpack_modules__ = {
     "@rsdoctor/types" (module) {
         module.exports = require("@rsdoctor/types");
     },
-    buffer (module) {
-        module.exports = require("buffer");
-    },
     fs (module) {
         module.exports = require("fs");
     },
@@ -109,12 +106,6 @@ var __webpack_modules__ = {
     },
     process (module) {
         module.exports = require("process");
-    },
-    stream (module) {
-        module.exports = require("stream");
-    },
-    zlib (module) {
-        module.exports = require("zlib");
     }
 }, __webpack_module_cache__ = {};
 function __webpack_require__(moduleId) {
@@ -248,22 +239,23 @@ for(var __rspack_i in (()=>{
         return JSON.parse(readFileSync(path));
     }
     let external_json_stream_stringify_namespaceObject = require("json-stream-stringify");
-    var common = __webpack_require__("./src/common/index.ts"), external_stream_ = __webpack_require__("stream");
-    function stringify(json, replacer, space, cycle, chunkSize = 419430400) {
+    var common = __webpack_require__("./src/common/index.ts");
+    let external_stream_namespaceObject = require("stream");
+    function stringify(json, replacer, space, cycle) {
         let jsonList = [];
         return json && 'object' == typeof json ? new Promise((resolve, reject)=>{
-            let stream = new external_json_stream_stringify_namespaceObject.JsonStreamStringify(json, replacer, space, cycle), currentLength = 0, currentContent = '', batchProcessor = new external_stream_.Transform({
+            let stream = new external_json_stream_stringify_namespaceObject.JsonStreamStringify(json, replacer, space, cycle), currentLength = 0, currentContent = '', batchProcessor = new external_stream_namespaceObject.Transform({
                 readableObjectMode: !0,
                 transform (chunk, _encoding, callback) {
                     chunk.toString().split('\\n').forEach((line)=>{
-                        currentLength + line.length > chunkSize && (jsonList.push(currentContent), currentContent = '', currentLength = 0), line.length && (currentContent += line, currentLength += line.length);
+                        currentLength + line.length > 419430400 && (jsonList.push(currentContent), currentContent = '', currentLength = 0), line.length && (currentContent += line, currentLength += line.length);
                     }), callback();
                 }
             });
             stream.pipe(batchProcessor).on('data', (line)=>{
-                currentLength + line.length > chunkSize && (jsonList.push(currentContent), currentContent = '', currentLength = 0), line.length && (currentContent += line, currentLength += line.length);
+                currentLength + line.length > 419430400 && (jsonList.push(currentContent), currentContent = '', currentLength = 0), line.length && (currentContent += line, currentLength += line.length);
             }).on('end', ()=>{
-                currentContent.length > 0 && jsonList.push(currentContent), resolve(jsonList);
+                jsonList.length < 1 && jsonList.push(currentContent), resolve(jsonList);
             }).on('error', (err)=>reject(err));
         }) : Promise.resolve(JSON.stringify(json, replacer, space));
     }

package/dist/build.js

@@ -103,21 +103,21 @@ async function readJSON(path) {
 function readJSONSync(path) {
     return JSON.parse(readFileSync(path));
 }
-function stringify(json, replacer, space, cycle, chunkSize = 419430400) {
+function stringify(json, replacer, space, cycle) {
     let jsonList = [];
     return json && 'object' == typeof json ? new Promise((resolve, reject)=>{
         let stream = new JsonStreamStringify(json, replacer, space, cycle), currentLength = 0, currentContent = '', batchProcessor = new Transform({
             readableObjectMode: !0,
             transform (chunk, _encoding, callback) {
                 chunk.toString().split('\\n').forEach((line)=>{
-                    currentLength + line.length > chunkSize && (jsonList.push(currentContent), currentContent = '', currentLength = 0), line.length && (currentContent += line, currentLength += line.length);
+                    currentLength + line.length > 419430400 && (jsonList.push(currentContent), currentContent = '', currentLength = 0), line.length && (currentContent += line, currentLength += line.length);
                 }), callback();
             }
         });
         stream.pipe(batchProcessor).on('data', (line)=>{
-            currentLength + line.length > chunkSize && (jsonList.push(currentContent), currentContent = '', currentLength = 0), line.length && (currentContent += line, currentLength += line.length);
+            currentLength + line.length > 419430400 && (jsonList.push(currentContent), currentContent = '', currentLength = 0), line.length && (currentContent += line, currentLength += line.length);
         }).on('end', ()=>{
-            currentContent.length > 0 && jsonList.push(currentContent), resolve(jsonList);
+            jsonList.length < 1 && jsonList.push(currentContent), resolve(jsonList);
         }).on('error', (err)=>reject(err));
     }) : Promise.resolve(JSON.stringify(json, replacer, space));
 }

package/dist/common.cjs

@@ -2,8 +2,14 @@
 const __rslib_import_meta_url__ = "u" < typeof document ? new (require('url'.replace('', ''))).URL('file:' + __filename).href : document.currentScript && document.currentScript.src || new URL('main.js', document.baseURI).href;
 var __webpack_modules__ = {
     "./src/common/algorithm.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
-        __webpack_require__.r(__webpack_exports__);
-        var zlib__rspack_import_0 = __webpack_require__("zlib"), buffer__rspack_import_1 = __webpack_require__("buffer"), _logger__rspack_import_2 = __webpack_require__("./src/logger.ts");
+        __webpack_require__.r(__webpack_exports__), __webpack_require__.d(__webpack_exports__, {
+            compressText: ()=>compressText,
+            decompressText: ()=>decompressText,
+            mergeIntervals: ()=>mergeIntervals,
+            random: ()=>random
+        });
+        let external_zlib_namespaceObject = require("zlib"), external_buffer_namespaceObject = require("buffer");
+        var logger = __webpack_require__("./src/logger.ts");
         function mergeIntervals(intervals) {
             let previous, current;
             intervals.sort((a, b)=>a[0] - b[0]);
@@ -13,23 +19,17 @@ var __webpack_modules__ = {
         }
         function compressText(input) {
             try {
-                return (0, zlib__rspack_import_0.deflateSync)(input).toString('base64');
+                return (0, external_zlib_namespaceObject.deflateSync)(input).toString('base64');
             } catch (e) {
-                return _logger__rspack_import_2.logger.debug(`compressText error: ${e}`), '';
+                return logger.logger.debug(`compressText error: ${e}`), '';
             }
         }
         function decompressText(input) {
-            return (0, zlib__rspack_import_0.inflateSync)(buffer__rspack_import_1.Buffer.from(input, 'base64')).toString();
+            return (0, external_zlib_namespaceObject.inflateSync)(external_buffer_namespaceObject.Buffer.from(input, 'base64')).toString();
         }
         function random(min, max) {
             return Math.floor(Math.random() * (max - min + 1) + min);
         }
-        __webpack_require__.d(__webpack_exports__, {
-            compressText: ()=>compressText,
-            decompressText: ()=>decompressText,
-            mergeIntervals: ()=>mergeIntervals,
-            random: ()=>random
-        });
     },
     "./src/common/crypto.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         function encode(str) {
@@ -338,9 +338,6 @@ var __webpack_modules__ = {
     "@rsdoctor/types" (module) {
         module.exports = require("@rsdoctor/types");
     },
-    buffer (module) {
-        module.exports = require("buffer");
-    },
     fs (module) {
         module.exports = require("fs");
     },
@@ -352,12 +349,6 @@ var __webpack_modules__ = {
     },
     process (module) {
         module.exports = require("process");
-    },
-    stream (module) {
-        module.exports = require("stream");
-    },
-    zlib (module) {
-        module.exports = require("zlib");
     }
 }, __webpack_module_cache__ = {};
 function __webpack_require__(moduleId) {
@@ -523,9 +514,7 @@ for(var __rspack_i in (()=>{
         readMcpConfig: ()=>readMcpConfig,
         writeMcpPort: ()=>writeMcpPort
     });
-    var common_summary = __webpack_require__("./src/common/summary.ts"), common_crypto = __webpack_require__("./src/common/crypto.ts"), external_buffer_ = __webpack_require__("buffer"), external_stream_ = __webpack_require__("stream");
-    let external_string_decoder_namespaceObject = require("string_decoder");
-    var external_zlib_ = __webpack_require__("zlib"), external_path_ = __webpack_require__("path"), external_path_default = __webpack_require__.n(external_path_);
+    var common_summary = __webpack_require__("./src/common/summary.ts"), common_crypto = __webpack_require__("./src/common/crypto.ts"), algorithm = __webpack_require__("./src/common/algorithm.ts"), external_path_ = __webpack_require__("path"), external_path_default = __webpack_require__.n(external_path_);
     function isUrl(uri) {
         return /^https?:\/\//.test(uri);
     }
@@ -535,31 +524,12 @@ for(var __rspack_i in (()=>{
     function isRemoteUrl(uri) {
         return !!('string' == typeof uri && (isUrl(uri) || isFilePath(uri)));
     }
-    async function* decodeBase64Shards(shardingFiles, fetchImplement) {
-        let remainder = '';
-        for (let url of shardingFiles){
-            let encodedText = remainder + await fetchImplement(url), decodableLength = encodedText.length - encodedText.length % 4;
-            decodableLength > 0 && (yield external_buffer_.Buffer.from(encodedText.slice(0, decodableLength), 'base64')), remainder = encodedText.slice(decodableLength);
-        }
-        remainder.length > 0 && (yield external_buffer_.Buffer.from(remainder, 'base64'));
-    }
     function isShardingData(data) {
         return !!(Array.isArray(data) && data.length > 0 && data.every((e)=>isRemoteUrl(e)));
     }
     async function fetchShardingData(shardingFiles, fetchImplement) {
-        if (0 === shardingFiles.length) return [];
-        let decoder = new external_string_decoder_namespaceObject.StringDecoder('utf8'), jsonParts = [];
-        await new Promise((resolve, reject)=>{
-            (0, external_stream_.pipeline)(external_stream_.Readable.from(decodeBase64Shards(shardingFiles, fetchImplement)), (0, external_zlib_.createInflate)(), new external_stream_.Writable({
-                write (chunk, _encoding, callback) {
-                    jsonParts.push(decoder.write(external_buffer_.Buffer.from(chunk))), callback();
-                }
-            }), (error)=>{
-                error ? reject(error) : resolve();
-            });
-        });
-        let finalPart = decoder.end();
-        return finalPart && jsonParts.push(finalPart), JSON.parse(jsonParts.join(''));
+        let res = await Promise.all(shardingFiles.map((url)=>fetchImplement(url))), strings = 0 === res.length ? [] : res.reduce((t, e)=>t + e);
+        return 'object' == typeof strings ? strings : JSON.parse((0, algorithm.decompressText)(strings));
     }
     async function fetchShardingFiles(data, fetchImplement, filterKeys) {
         return (await Promise.all(Object.keys(data).map(async (_key)=>{
@@ -573,7 +543,6 @@ for(var __rspack_i in (()=>{
             };
         }))).reduce((t, c)=>Object.assign(t, c));
     }
-    var algorithm = __webpack_require__("./src/common/algorithm.ts");
     function findLoaderTotalTiming(loaders) {
         let start = 1 / 0, end = -1 / 0;
         for(let i = 0; i < loaders.length; i++){
@@ -721,10 +690,10 @@ for(var __rspack_i in (()=>{
         let directories, rootPath = root || process.cwd();
         return (loaders1 = loaders, root1 = rootPath, directories = new Set(), loaders1.forEach((item)=>{
             if (item.resource.path.startsWith(root1)) {
-                let pathParts = item.resource.path.slice(root1.length).replace(/^\/+/, '').split('/');
+                let pathParts = item.resource.path.split(root1).slice(1).join('/').split('/');
                 if (pathParts.length >= 2) {
-                    let normalizedRoot = root1.replace(/\/+$/, '');
-                    directories.add(`${normalizedRoot}/${pathParts[0]}`);
+                    let twoLevelDir = pathParts.slice(0, 2).join('/');
+                    directories.add(`${root1}/${twoLevelDir}`);
                 }
             } else {
                 let pathParts = item.resource.path.split('/'), twoLevelDir = pathParts.slice(0, pathParts.length - 1).join('/');

package/dist/common.js

@@ -1,8 +1,6 @@
 import { __webpack_require__ } from "./0~rslib-runtime.js";
+import { deflateSync, inflateSync } from "zlib";
 import { Buffer } from "buffer";
-import { Readable, Writable, pipeline } from "stream";
-import { StringDecoder } from "string_decoder";
-import { createInflate, deflateSync, inflateSync } from "zlib";
 import path_0, { isAbsolute, relative } from "path";
 import { hrtime } from "process";
 import { Client, Constants, Rule, SDK } from "@rsdoctor/types";
@@ -172,6 +170,26 @@ function decode(str) {
     for(let i = 0; i < str.length; i++)'!' === str[i] ? (res += String.fromCharCode(+tmp), tmp = '') : tmp += str[i];
     return tmp && (res += String.fromCharCode(+tmp)), res;
 }
+function mergeIntervals(intervals) {
+    let previous, current;
+    intervals.sort((a, b)=>a[0] - b[0]);
+    let result = [];
+    for(let i = 0; i < intervals.length; i++)current = intervals[i], !previous || current[0] > previous[1] ? (previous = current, result.push(current)) : previous[1] = Math.max(previous[1], current[1]);
+    return result;
+}
+function compressText(input) {
+    try {
+        return deflateSync(input).toString('base64');
+    } catch (e) {
+        return rsdoctorLogger.debug(`compressText error: ${e}`), '';
+    }
+}
+function decompressText(input) {
+    return inflateSync(Buffer.from(input, 'base64')).toString();
+}
+function random(min, max) {
+    return Math.floor(Math.random() * (max - min + 1) + min);
+}
 function isUrl(uri) {
     return /^https?:\/\//.test(uri);
 }
@@ -181,31 +199,12 @@ function isFilePath(uri) {
 function isRemoteUrl(uri) {
     return !!('string' == typeof uri && (isUrl(uri) || isAbsolute(uri)));
 }
-async function* decodeBase64Shards(shardingFiles, fetchImplement) {
-    let remainder = '';
-    for (let url of shardingFiles){
-        let encodedText = remainder + await fetchImplement(url), decodableLength = encodedText.length - encodedText.length % 4;
-        decodableLength > 0 && (yield Buffer.from(encodedText.slice(0, decodableLength), 'base64')), remainder = encodedText.slice(decodableLength);
-    }
-    remainder.length > 0 && (yield Buffer.from(remainder, 'base64'));
-}
 function isShardingData(data) {
     return !!(Array.isArray(data) && data.length > 0 && data.every((e)=>isRemoteUrl(e)));
 }
 async function fetchShardingData(shardingFiles, fetchImplement) {
-    if (0 === shardingFiles.length) return [];
-    let decoder = new StringDecoder('utf8'), jsonParts = [];
-    await new Promise((resolve, reject)=>{
-        pipeline(Readable.from(decodeBase64Shards(shardingFiles, fetchImplement)), createInflate(), new Writable({
-            write (chunk, _encoding, callback) {
-                jsonParts.push(decoder.write(Buffer.from(chunk))), callback();
-            }
-        }), (error)=>{
-            error ? reject(error) : resolve();
-        });
-    });
-    let finalPart = decoder.end();
-    return finalPart && jsonParts.push(finalPart), JSON.parse(jsonParts.join(''));
+    let res = await Promise.all(shardingFiles.map((url)=>fetchImplement(url))), strings = 0 === res.length ? [] : res.reduce((t, e)=>t + e);
+    return 'object' == typeof strings ? strings : JSON.parse(decompressText(strings));
 }
 async function fetchShardingFiles(data, fetchImplement, filterKeys) {
     return (await Promise.all(Object.keys(data).map(async (_key)=>{
@@ -219,26 +218,6 @@ async function fetchShardingFiles(data, fetchImplement, filterKeys) {
         };
     }))).reduce((t, c)=>Object.assign(t, c));
 }
-function mergeIntervals(intervals) {
-    let previous, current;
-    intervals.sort((a, b)=>a[0] - b[0]);
-    let result = [];
-    for(let i = 0; i < intervals.length; i++)current = intervals[i], !previous || current[0] > previous[1] ? (previous = current, result.push(current)) : previous[1] = Math.max(previous[1], current[1]);
-    return result;
-}
-function compressText(input) {
-    try {
-        return deflateSync(input).toString('base64');
-    } catch (e) {
-        return rsdoctorLogger.debug(`compressText error: ${e}`), '';
-    }
-}
-function decompressText(input) {
-    return inflateSync(Buffer.from(input, 'base64')).toString();
-}
-function random(min, max) {
-    return Math.floor(Math.random() * (max - min + 1) + min);
-}
 function findLoaderTotalTiming(loaders) {
     let start = 1 / 0, end = -1 / 0;
     for(let i = 0; i < loaders.length; i++){
@@ -381,10 +360,10 @@ function getDirectoriesLoaders(loaders, root) {
     let directories, rootPath = root || process.cwd();
     return (directories = new Set(), loaders.forEach((item)=>{
         if (item.resource.path.startsWith(rootPath)) {
-            let pathParts = item.resource.path.slice(rootPath.length).replace(/^\/+/, '').split('/');
+            let pathParts = item.resource.path.split(rootPath).slice(1).join('/').split('/');
             if (pathParts.length >= 2) {
-                let normalizedRoot = rootPath.replace(/\/+$/, '');
-                directories.add(`${normalizedRoot}/${pathParts[0]}`);
+                let twoLevelDir = pathParts.slice(0, 2).join('/');
+                directories.add(`${rootPath}/${twoLevelDir}`);
             }
         } else {
             let pathParts = item.resource.path.split('/'), twoLevelDir = pathParts.slice(0, pathParts.length - 1).join('/');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/utils",
-  "version": "1.6.3-beta.0",
+  "version": "1.6.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -101,7 +101,7 @@
     "picocolors": "^1.1.1",
     "rslog": "^2.1.2",
     "strip-ansi": "^7.2.0",
-    "@rsdoctor/types": "1.6.3-beta.0"
+    "@rsdoctor/types": "1.6.4"
   },
   "devDependencies": {
     "@types/babel__code-frame": "7.27.0",