nhanh-pure-function 1.4.0 → 1.4.1

package/lib/Constant.ts

@@ -0,0 +1,249 @@
+export const EXTENSION_TO_MIME = {
+  /* 常见扩展名映射 */
+  ".mp3": "audio/mpeg",
+  ".mp4": "video/mp4",
+  ".m4a": "audio/mp4",
+  ".aac": "audio/aac",
+  ".ogg": "audio/ogg",
+  ".wav": "audio/wav",
+  ".flac": "audio/flac",
+  ".opus": "audio/opus",
+  ".webm": "video/webm",
+  ".avi": "video/x-msvideo",
+  ".mov": "video/quicktime",
+  ".wmv": "video/x-ms-wmv",
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".gif": "image/gif",
+  ".bmp": "image/bmp",
+  ".tiff": "image/tiff",
+  ".ico": "image/vnd.microsoft.icon",
+  ".svg": "image/svg+xml",
+  ".webp": "image/webp",
+  ".heif": "image/heif",
+  ".heic": "image/heic",
+  ".json": "application/json",
+  ".xml": "application/xml",
+  ".html": "text/html",
+  ".htm": "text/html",
+  ".css": "text/css",
+  ".js": "application/javascript",
+  ".ts": "application/typescript",
+  ".csv": "text/csv",
+  ".tsv": "text/tab-separated-values",
+  ".txt": "text/plain",
+  ".md": "text/markdown",
+  ".rtf": "application/rtf",
+  ".pdf": "application/pdf",
+  ".zip": "application/zip",
+  ".rar": "application/x-rar-compressed",
+  ".tar": "application/x-tar",
+  ".gz": "application/gzip",
+  ".7z": "application/x-7z-compressed",
+  ".exe": "application/x-msdownload",
+  ".apk": "application/vnd.android.package-archive",
+  ".doc": "application/msword",
+  ".docx":
+    "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+  ".xls": "application/vnd.ms-excel",
+  ".xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+  ".ppt": "application/vnd.ms-powerpoint",
+  ".pptx":
+    "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+  ".odt": "application/vnd.oasis.opendocument.text",
+  ".ods": "application/vnd.oasis.opendocument.spreadsheet",
+  ".odp": "application/vnd.oasis.opendocument.presentation",
+  ".jsonld": "application/ld+json",
+  ".yaml": "application/x-yaml",
+  ".yml": "application/x-yaml",
+  ".woff": "font/woff",
+  ".woff2": "font/woff2",
+  ".ttf": "font/ttf",
+  ".otf": "font/otf",
+  ".eot": "application/vnd.ms-fontobject",
+  ".map": "application/json",
+  // 可根据需要继续扩展
+};
+
+export const FILE_EXTENSIONS = {
+  image: [
+    ".jpg",
+    ".jpeg",
+    ".png",
+    ".gif",
+    ".bmp",
+    ".webp",
+    ".tiff",
+    ".svg",
+    ".heif",
+    ".heic",
+    ".ico",
+    ".raw",
+    ".jfif",
+    ".avif",
+    ".png8",
+    ".indd",
+    ".eps",
+    ".ai",
+  ],
+  ppt: [".ppt", ".pptx", ".odp"],
+  word: [".doc", ".docx", ".odt", ".rtf"],
+  excel: [".xls", ".xlsx", ".ods", ".csv", ".tsv"],
+  pdf: [".pdf"],
+  text: [
+    ".txt",
+    ".csv",
+    ".md",
+    ".json",
+    ".yaml",
+    ".yml",
+    ".log",
+    ".ini",
+    ".rtf",
+  ],
+  audio: [
+    ".mp3",
+    ".wav",
+    ".ogg",
+    ".flac",
+    ".aac",
+    ".wma",
+    ".m4a",
+    ".alac",
+    ".ape",
+    ".opus",
+    ".amr",
+    ".ra",
+    ".mid",
+    ".midi",
+    ".aiff",
+    ".pcm",
+    ".au",
+    ".wavpack",
+    ".spx",
+  ],
+  video: [
+    ".mp4",
+    ".avi",
+    ".mkv",
+    ".mov",
+    ".wmv",
+    ".flv",
+    ".webm",
+    ".mpg",
+    ".mpeg",
+    ".3gp",
+    ".vob",
+    ".ogv",
+    ".m4v",
+    ".ts",
+    ".rm",
+    ".rmvb",
+    ".m2ts",
+    ".divx",
+    ".xvid",
+    ".swf",
+    ".f4v",
+  ],
+  archive: [
+    ".zip",
+    ".rar",
+    ".tar",
+    ".gz",
+    ".bz2",
+    ".xz",
+    ".7z",
+    ".tar.gz",
+    ".tar.bz2",
+    ".tar.xz",
+    ".tar.lz",
+    ".tar.lzma",
+    ".cab",
+    ".iso",
+    ".dmg",
+    ".tgz",
+    ".apk",
+    ".gz2",
+    ".tar.zst",
+  ],
+  code: [
+    ".js",
+    ".ts",
+    ".py",
+    ".java",
+    ".cpp",
+    ".c",
+    ".html",
+    ".css",
+    ".scss",
+    ".less",
+    ".sass",
+    ".php",
+    ".rb",
+    ".go",
+    ".swift",
+    ".rs",
+    ".kt",
+    ".scala",
+    ".lua",
+    ".pl",
+    ".m",
+    ".h",
+    ".xml",
+    ".json",
+    ".yaml",
+    ".yml",
+    ".toml",
+    ".vue",
+    ".ejs",
+    ".handlebars",
+    ".jinja",
+    ".dart",
+  ],
+  font: [
+    ".woff",
+    ".woff2",
+    ".ttf",
+    ".otf",
+    ".eot",
+    ".svg",
+    ".ttc",
+    ".fnt",
+    ".fon",
+    ".otc",
+  ],
+  database: [
+    ".sql",
+    ".sqlite",
+    ".db",
+    ".mdb",
+    ".accdb",
+    ".jsonld",
+    ".xml",
+    ".csv",
+  ],
+  markup: [".html", ".htm", ".xhtml", ".xml", ".json", ".yaml", ".yml"],
+  configuration: [
+    ".ini",
+    ".conf",
+    ".cfg",
+    ".env",
+    ".properties",
+    ".json",
+    ".toml",
+  ],
+  logs: [".log", ".err", ".trace", ".out"],
+  script: [
+    ".bash",
+    ".sh",
+    ".zsh",
+    ".bat",
+    ".ps1",
+    ".vbs",
+    ".cmd",
+    ".sed",
+    ".awk",
+    ".php",
+  ],
+};

package/lib/Utility/Utility.d.ts

@@ -317,6 +317,16 @@ export class _FileTypeChecker {
    */
   static matchesMimeType(type: string, accept?: string): boolean;
 
+  /**
+   * 类型标准化函数
+   * 该函数旨在将文件类型或MIME类型字符串转换为标准格式
+   * 主要处理三种情况：带扩展名的字符串、简写格式的类型以及已标准格式的类型
+   *
+   * @param {string} type - 文件类型或MIME类型字符串
+   * @returns {string} 标准化的MIME类型字符串，如果无法识别则返回原始输入
+   */
+  static _normalizeType(type: string): string;
+
   /**
    * 检查URL是否具有任何指定的文件扩展名
    * @param {string} url - 文件的URL

package/lib/Utility/Utility.js

@@ -1,3 +1,5 @@
+import { EXTENSION_TO_MIME, FILE_EXTENSIONS } from "../Constant";
+
 /**
  * 非null | undefined判断
  * @param value any
@@ -141,39 +143,27 @@ export function _TimeTransition(
   template = "YYYY-MM-DD hh:mm:ss",
   pad = true
 ) {
-  try {
-    time = new Date(time);
-  } catch (error) {
-    console.error(error);
+  const date = new Date(time);
+
+  if (isNaN(date.getTime())) {
+    console.error("Invalid date");
     return "";
   }
+
   const dictionary = {
-    YYYY: "getFullYear",
-    MM: "getMonth",
-    DD: "getDate",
-    hh: "getHours",
-    mm: "getMinutes",
-    ss: "getSeconds",
-    ms: (num) => +num % 1000,
+    YYYY: (date) => date.getFullYear(),
+    MM: (date) => date.getMonth() + 1, // Adjust for 0-based month
+    DD: (date) => date.getDate(),
+    hh: (date) => date.getHours(),
+    mm: (date) => date.getMinutes(),
+    ss: (date) => date.getSeconds(),
+    ms: (date) => date.getMilliseconds(),
   };
-  for (const key in dictionary) {
-    if (Object.hasOwnProperty.call(dictionary, key)) {
-      if (new RegExp(key).test(template)) {
-        let value,
-          fun = dictionary[key];
-
-        if (typeof fun == "function") value = fun(time);
-        else value = time[fun]();
 
-        if (key == "MM") value++;
-
-        if (pad) value = String(value).padStart(2, "0");
-
-        template = template.replace(key, value);
-      }
-    }
-  }
-  return template;
+  return template.replace(/YYYY|MM|DD|hh|mm|ss|ms/g, (match) => {
+    const value = dictionary[match](date);
+    return pad ? String(value).padStart(2, "0") : String(value);
+  });
 }
 
 /**
@@ -667,78 +657,8 @@ export function _IsSecureContext(url) {
  * 用于检查文件URL的类型
  */
 export class _FileTypeChecker {
-  // 定义各种文件类型的文件扩展名
-  static fileExtensions = {
-    image: [
-      ".jpg",
-      ".jpeg",
-      ".png",
-      ".gif",
-      ".bmp",
-      ".webp",
-      ".tiff",
-      ".svg",
-      ".heif",
-      ".heic",
-      ".ico",
-      ".raw",
-      ".jfif",
-    ],
-    ppt: [".ppt", ".pptx"],
-    word: [".doc", ".docx"],
-    excel: [".xls", ".xlsx"],
-    pdf: [".pdf"],
-    text: [".txt", ".csv"],
-    audio: [
-      ".mp3",
-      ".wav",
-      ".ogg",
-      ".flac",
-      ".aac",
-      ".wma",
-      ".m4a",
-      ".alac",
-      ".ape",
-      ".opus",
-      ".amr",
-      ".ra",
-    ],
-    video: [
-      ".mp4",
-      ".avi",
-      ".mkv",
-      ".mov",
-      ".wmv",
-      ".flv",
-      ".webm",
-      ".mpg",
-      ".mpeg",
-      ".3gp",
-      ".vob",
-      ".ogv",
-      ".m4v",
-      ".ts",
-      ".rm",
-      ".rmvb",
-    ],
-    archive: [
-      ".zip",
-      ".rar",
-      ".tar",
-      ".gz",
-      ".bz2",
-      ".xz",
-      ".7z",
-      ".tar.gz",
-      ".tar.bz2",
-      ".tar.xz",
-    ],
-    code: [".js", ".ts", ".py", ".java", ".cpp", ".c"],
-    font: [".woff", ".woff2", ".ttf", ".otf"],
-  };
-
   // 缓存文件扩展名的条目，以提高性能
-  static cachedEntries = Object.entries(_FileTypeChecker.fileExtensions);
+  static cachedEntries = Object.entries(FILE_EXTENSIONS);
 
   /**
    * 检查给定URL的文件类型
@@ -759,11 +679,11 @@ export class _FileTypeChecker {
     // 如果指定了文件类型，则检查URL是否具有该类型的任何文件扩展名
     if (type) {
       // 确保指定的文件类型是已知的
-      if (!_FileTypeChecker.fileExtensions.hasOwnProperty(type)) {
+      if (!FILE_EXTENSIONS.hasOwnProperty(type)) {
         console.error(`Unknown file type: ${type}`);
         return "unknown";
       }
-      const extensions = _FileTypeChecker.fileExtensions[type];
+      const extensions = FILE_EXTENSIONS[type];
       return _FileTypeChecker._checkExtension(lowerCaseUrl, extensions);
     }
 
@@ -804,38 +724,63 @@ export class _FileTypeChecker {
    * @returns {boolean} - 如果类型匹配，则返回 true，否则返回 false
    */
   static matchesMimeType(type, accept) {
+    // 参数有效性检查
     if (
       !accept ||
       !type ||
       typeof accept !== "string" ||
       typeof type !== "string"
-    )
+    ) {
       return true;
+    }
 
-    const [typeMain, typeSub] = type.split("/");
-    const mimePatterns = accept.split(",");
+    // 标准化类型和接受模式
+    const normalizedType = _FileTypeChecker._normalizeType(type);
+    const mimePatterns = accept
+      .split(",")
+      .map((pattern) => _FileTypeChecker._normalizeType(pattern.trim()));
 
-    return mimePatterns.some((pattern) => {
-      const [patternMain, patternSub] = pattern.split("/");
+    // 拆分主/子类型
+    const [typeMain, typeSub = "*"] = normalizedType.split("/");
 
-      // 处理简写格式（如 "image" 等价于 "image/*"）
-      const effectivePatternSub = patternSub || "*";
-      const effectiveTypeSub = typeSub || "*";
+    return mimePatterns.some((pattern) => {
+      const [patternMain, patternSub = "*"] = pattern.split("/");
 
-      // 主类型匹配：模式包含通配符 或 类型包含通配符 或 精确匹配
+      // 主类型匹配逻辑
       const mainMatch =
         patternMain === "*" || typeMain === "*" || patternMain === typeMain;
 
-      // 子类型匹配：同上逻辑
+      // 子类型匹配逻辑
       const subMatch =
-        effectivePatternSub === "*" ||
-        effectiveTypeSub === "*" ||
-        effectivePatternSub === effectiveTypeSub;
+        patternSub === "*" || typeSub === "*" || patternSub === typeSub;
 
       return mainMatch && subMatch;
     });
   }
 
+  /**
+   * 类型标准化函数
+   * 该函数旨在将文件类型或MIME类型字符串转换为标准格式
+   * 主要处理三种情况：带扩展名的字符串、简写格式的类型以及已标准格式的类型
+   *
+   * @param {string} type - 文件类型或MIME类型字符串
+   * @returns {string} 标准化的MIME类型字符串，如果无法识别则返回原始输入
+   */
+  static _normalizeType(type) {
+    // 处理扩展名（如 .mp3）
+    if (type.startsWith(".") && !type.includes("/")) {
+      return EXTENSION_TO_MIME[type.toLowerCase()] || type;
+    }
+
+    // 处理简写格式（如 "image" 转换为 "image/*"）
+    if (!type.includes("/")) {
+      return `${type}/*`;
+    }
+
+    // 返回原始输入，因为它已经是标准格式
+    return type;
+  }
+
   /**
    * 检查URL是否具有任何指定的文件扩展名
    * @param {string} url - 文件的URL

package/lib/test.ts

@@ -1,12 +1 @@
 import { _FileTypeChecker, _GetHrefName } from "./Utility/Utility";
-
-let value: any = _GetHrefName(
-  "https://fastly.picsum.photos/id/841/805/453.jpg?hmac=RMVB2BBB6T34wI08nwWz1urBgdzSQxNR6L48hkOsTNo"
-);
-
-console.log(value);
-
-value = _FileTypeChecker.parseAddresses(
-  "https://emergency.wjtsc.com:1128/resources/life-cycle/test/1-110000251006481.pcm,https://emergency.wjtsc.com:1128/resources/life-cycle/test/car-828972667665784.mp3,https://emergency.wjtsc.com:1128/resources/life-cycle/test/317361004975528.jpg"
-);
-console.log(value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nhanh-pure-function",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "纯函数工具",
   "main": "lib/Index.js",
   "scripts": {