@rsdoctor/utils 1.4.1-beta.0 → 1.5.1

package/dist/build.cjs

@@ -18,7 +18,7 @@ var __webpack_modules__ = {
             MODULE_PATH_PACKAGES: ()=>MODULE_PATH_PACKAGES,
             PACKAGE_PATH_NAME: ()=>PACKAGE_PATH_NAME,
             getPackageMetaFromModulePath: ()=>getPackageMetaFromModulePath
-        }), __webpack_require__("./src/common/algorithm.ts"), __webpack_require__("path"), __webpack_require__("process"), __webpack_require__("@rsdoctor/types"), __webpack_require__("./src/logger.ts"), RegExp(`(.*)${/[-|.]/.source}${/[a-z|A-Z|0-9]{4,32}/.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;

package/dist/build.js

@@ -146,7 +146,7 @@ createLogger().override({
     debug: (message)=>{
         process.env.DEBUG && console.log(`${picocolors.blue('[RSDOCTOR DEBUG]')} ${message}`);
     }
-}), RegExp(`(.*)${/[-|.]/.source}${/[a-z|A-Z|0-9]{4,32}/.source}(${/(?:\.[a-z｜A-Z|0-9]{2,}){1,}/.source})$`);
+}), 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})$`);
 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;
     let res, paths = modulePath.match(MODULE_PATH_PACKAGES);

package/dist/common.cjs

@@ -817,10 +817,16 @@ for(var __rspack_i in (()=>{
             dependencies: (0, graph_dependency.NL)(module, dependencies)
         };
     }
-    let filenamePattern = RegExp(`(.*)${/[-|.]/.source}${/[a-z|A-Z|0-9]{4,32}/.source}(${/(?:\.[a-z｜A-Z|0-9]{2,}){1,}/.source})$`);
+    let filenamePattern = 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})$`);
     function formatAssetName(assetName, fileConfig) {
         let splitFilesList = fileConfig?.split('.'), outputFileTailName = '', unHashedFileName = assetName;
-        return splitFilesList?.length && splitFilesList.length >= 3 && splitFilesList[splitFilesList.length - 2]?.indexOf('[') < 0 && 'js|css|html'.indexOf(splitFilesList[splitFilesList.length - 1]) > -1 ? (outputFileTailName = splitFilesList[splitFilesList.length - 2], unHashedFileName = assetName.replace(/(.*)(\.[a-f0-9]{4,32})([^.]*.[^.]+){2,}/g, '$1'), `${unHashedFileName}.${outputFileTailName}.${assetName.substring(assetName.lastIndexOf('.') + 1)}`) : assetName.replace(filenamePattern, '$1$2');
+        if (splitFilesList?.length && splitFilesList.length >= 3 && splitFilesList[splitFilesList.length - 2]?.indexOf('[') < 0 && 'js|css|html'.indexOf(splitFilesList[splitFilesList.length - 1]) > -1) {
+            outputFileTailName = splitFilesList[splitFilesList.length - 2];
+            let match = assetName.match(/(.*)(\.([a-f0-9]{4,32}|[a-zA-Z]*[0-9][a-zA-Z0-9]*))(\.[^.]+){2,}$/);
+            if (match && match[3].length >= 4 && match[3].length <= 32) return unHashedFileName = match[1], `${unHashedFileName}.${outputFileTailName}.${assetName.substring(assetName.lastIndexOf('.') + 1)}`;
+        }
+        let match = assetName.match(filenamePattern);
+        return match && match[2] && match[2].length >= 4 && match[2].length <= 32 ? assetName.replace(filenamePattern, '$1$3') : assetName;
     }
     function isAssetMatchExtension(asset, ext) {
         return asset.path.slice(-ext.length) === ext || extname(asset.path) === ext;

package/dist/common.js

@@ -606,10 +606,16 @@ function getModuleDetails(moduleId, modules, dependencies) {
         dependencies: getDependenciesByModule(module, dependencies)
     };
 }
-let filenamePattern = RegExp(`(.*)${/[-|.]/.source}${/[a-z|A-Z|0-9]{4,32}/.source}(${/(?:\.[a-z｜A-Z|0-9]{2,}){1,}/.source})$`);
+let filenamePattern = 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})$`);
 function formatAssetName(assetName, fileConfig) {
     let splitFilesList = fileConfig?.split('.'), outputFileTailName = '', unHashedFileName = assetName;
-    return splitFilesList?.length && splitFilesList.length >= 3 && splitFilesList[splitFilesList.length - 2]?.indexOf('[') < 0 && 'js|css|html'.indexOf(splitFilesList[splitFilesList.length - 1]) > -1 ? (outputFileTailName = splitFilesList[splitFilesList.length - 2], unHashedFileName = assetName.replace(/(.*)(\.[a-f0-9]{4,32})([^.]*.[^.]+){2,}/g, '$1'), `${unHashedFileName}.${outputFileTailName}.${assetName.substring(assetName.lastIndexOf('.') + 1)}`) : assetName.replace(filenamePattern, '$1$2');
+    if (splitFilesList?.length && splitFilesList.length >= 3 && splitFilesList[splitFilesList.length - 2]?.indexOf('[') < 0 && 'js|css|html'.indexOf(splitFilesList[splitFilesList.length - 1]) > -1) {
+        outputFileTailName = splitFilesList[splitFilesList.length - 2];
+        let match = assetName.match(/(.*)(\.([a-f0-9]{4,32}|[a-zA-Z]*[0-9][a-zA-Z0-9]*))(\.[^.]+){2,}$/);
+        if (match && match[3].length >= 4 && match[3].length <= 32) return unHashedFileName = match[1], `${unHashedFileName}.${outputFileTailName}.${assetName.substring(assetName.lastIndexOf('.') + 1)}`;
+    }
+    let match = assetName.match(filenamePattern);
+    return match && match[2] && match[2].length >= 4 && match[2].length <= 32 ? assetName.replace(filenamePattern, '$1$3') : assetName;
 }
 function isAssetMatchExtension(asset, ext) {
     return asset.path.slice(-ext.length) === ext || extname(asset.path) === ext;

package/dist/error.cjs

@@ -27,6 +27,11 @@ const code_frame_namespaceObject = require("@babel/code-frame"), types_namespace
 var external_deep_eql_default = __webpack_require__.n(external_deep_eql_namespaceObject);
 const external_strip_ansi_namespaceObject = require("strip-ansi");
 var external_strip_ansi_default = __webpack_require__.n(external_strip_ansi_namespaceObject);
+const MAX_ERROR_MESSAGE_LENGTH = 1000;
+function truncateMessage(input, maxLen = 1000) {
+    let str = 'string' == typeof input ? input : String(input ?? '');
+    return str.length > maxLen ? str.slice(0, maxLen) : str;
+}
 function isEsbuildError(err) {
     return 'pluginName' in err && 'text' in err && 'location' in err;
 }
@@ -37,7 +42,7 @@ function isDiagnosticError(err) {
     return 'severity' in err && 'title' in err;
 }
 function parseBabelErrorMessage(input) {
-    let lines = external_strip_ansi_default()(input).split('\n'), filePath = lines[0].replace(/^([^:]+):.*/, '$1');
+    let lines = external_strip_ansi_default()(truncateMessage(input)).split('\n'), filePath = lines[0].replace(/^([^:]+):.*/, '$1');
     return {
         message: lines[0].replace(/.*: (.*) \(\d+:\d+\)*/, '$1'),
         filePath,
@@ -45,7 +50,7 @@ function parseBabelErrorMessage(input) {
     };
 }
 function clearMessage(str) {
-    return external_strip_ansi_default()(str).replace(/.*: (.*)\n\n[\s\S]*/g, '$1');
+    return external_strip_ansi_default()(truncateMessage(str)).replace(/.*: (.*)\n\n[\s\S]*/g, '$1');
 }
 function clearStack(str) {
     return str.slice(str.indexOf('  at')).replace(/\s*at(.*) \((.*)\)/g, '$1\n$2\n');
@@ -72,7 +77,7 @@ function transformEsbuildError(err, opt) {
 }
 function transformBabelError(err, opt) {
     if (isBabelError(err)) {
-        let errorCode = opt?.code ?? err.code ?? 'BABEL', title = err.reasonCode, errorParsed = parseBabelErrorMessage(err.message), speedyError = new DevToolError(title, errorParsed.message, {
+        let errorCode = opt?.code ?? err.code ?? 'BABEL', title = err.reasonCode, errorParsed = parseBabelErrorMessage(err.message), speedyError = new DevToolError(title, truncateMessage(errorParsed.message), {
             ...opt,
             code: errorCode,
             stack: err.stack && clearStack(err.stack)
@@ -100,8 +105,8 @@ function transformNormalError(err, opt) {
 }
 function transformErrorLike(err, opt) {
     if (err && 'object' == typeof err && err.message) {
-        let filePath = [][0]?.getFileName?.();
-        return new DevToolError(err.name || 'UNKNOWN_ERROR', clearMessage(err.message), {
+        let filePath = [][0]?.getFileName?.(), message = truncateMessage(err.message);
+        return new DevToolError(err.name || 'UNKNOWN_ERROR', clearMessage(message), {
             ...opt,
             codeFrame: filePath ? {
                 filePath
@@ -111,7 +116,7 @@ function transformErrorLike(err, opt) {
     }
 }
 function transformDiagnostic(err, opt) {
-    if (isDiagnosticError(err)) return new DevToolError(err.title, err.message, {
+    if (isDiagnosticError(err)) return new DevToolError(err.title, truncateMessage(err.message), {
         ...err,
         ...opt,
         hint: err.suggestions?.description,

package/dist/error.js

@@ -3,8 +3,12 @@ import { Err, Linter } from "@rsdoctor/types";
 import { createColors } from "picocolors";
 import deep_eql from "deep-eql";
 import strip_ansi from "strip-ansi";
+function truncateMessage(input, maxLen = 1000) {
+    let str = 'string' == typeof input ? input : String(input ?? '');
+    return str.length > maxLen ? str.slice(0, maxLen) : str;
+}
 function clearMessage(str) {
-    return strip_ansi(str).replace(/.*: (.*)\n\n[\s\S]*/g, '$1');
+    return strip_ansi(truncateMessage(str)).replace(/.*: (.*)\n\n[\s\S]*/g, '$1');
 }
 function clearStack(str) {
     return str.slice(str.indexOf('  at')).replace(/\s*at(.*) \((.*)\)/g, '$1\n$2\n');
@@ -31,11 +35,11 @@ function transformEsbuildError(err, opt) {
 }
 function transformBabelError(err, opt) {
     if ('code' in err && 'reasonCode' in err) {
-        let lines, filePath, errorCode = opt?.code ?? err.code ?? 'BABEL', title = err.reasonCode, errorParsed = (filePath = (lines = strip_ansi(err.message).split('\n'))[0].replace(/^([^:]+):.*/, '$1'), {
+        let lines, filePath, errorCode = opt?.code ?? err.code ?? 'BABEL', title = err.reasonCode, errorParsed = (filePath = (lines = strip_ansi(truncateMessage(err.message)).split('\n'))[0].replace(/^([^:]+):.*/, '$1'), {
             message: lines[0].replace(/.*: (.*) \(\d+:\d+\)*/, '$1'),
             filePath,
             lineText: lines.find((line)=>line.startsWith('> '))?.replace(/> \d+ \| /, '') ?? ''
-        }), speedyError = new DevToolError(title, errorParsed.message, {
+        }), speedyError = new DevToolError(title, truncateMessage(errorParsed.message), {
             ...opt,
             code: errorCode,
             stack: err.stack && clearStack(err.stack)
@@ -63,8 +67,8 @@ function transformNormalError(err, opt) {
 }
 function transformErrorLike(err, opt) {
     if (err && 'object' == typeof err && err.message) {
-        let filePath = [][0]?.getFileName?.();
-        return new DevToolError(err.name || 'UNKNOWN_ERROR', clearMessage(err.message), {
+        let filePath = [][0]?.getFileName?.(), message = truncateMessage(err.message);
+        return new DevToolError(err.name || 'UNKNOWN_ERROR', clearMessage(message), {
             ...opt,
             codeFrame: filePath ? {
                 filePath
@@ -74,7 +78,7 @@ function transformErrorLike(err, opt) {
     }
 }
 function transformDiagnostic(err, opt) {
-    if ('severity' in err && 'title' in err) return new DevToolError(err.title, err.message, {
+    if ('severity' in err && 'title' in err) return new DevToolError(err.title, truncateMessage(err.message), {
         ...err,
         ...opt,
         hint: err.suggestions?.description,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/utils",
-  "version": "1.4.1-beta.0",
+  "version": "1.5.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -76,10 +76,10 @@
     "picocolors": "^1.1.1",
     "rslog": "^1.2.11",
     "strip-ansi": "^6.0.1",
-    "@rsdoctor/types": "1.4.1-beta.0"
+    "@rsdoctor/types": "1.5.1"
   },
   "devDependencies": {
-    "@types/babel__code-frame": "7.0.6",
+    "@types/babel__code-frame": "7.27.0",
     "@types/connect": "3.4.38",
     "@types/deep-eql": "4.0.2",
     "@types/envinfo": "7.8.4",