@bhsd/common 1.4.0 → 2.1.0

package/dist/index.d.ts

@@ -17,6 +17,11 @@ export declare const wmf = "wiktionary|wiki(?:pedia|books|news|quote|source|vers
  * @param str 要解码的字符串
  */
 export declare const rawurldecode: (str: string) => string;
+/**
+ * 将0~255之间的整数转换为十六进制
+ * @param d 0~255之间的整数
+ */
+export declare const intToHex: (d: number) => string;
 /**
  * 将0~1之间的数字转换为十六进制
  * @param d 0~1之间的数字

package/dist/index.js

@@ -1,21 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.lintJSONC = exports.lintJSON = exports.lintJSONNative = exports.splitLines = exports.getObjRegex = exports.sanitizeInlineStyle = exports.splitColors = exports.numToHex = exports.rawurldecode = exports.wmf = void 0;
-exports.getRegex = getRegex;
-const json_parse_js_1 = require("./json_parse.js");
-exports.wmf = 'wiktionary|wiki(?:pedia|books|news|quote|source|versity|voyage)';
+import { json_parse, jsonc_parse } from './json_parse.js';
+export const wmf = 'wiktionary|wiki(?:pedia|books|news|quote|source|versity|voyage)';
 /**
  * PHP的`rawurldecode`函数的JavaScript实现
  * @param str 要解码的字符串
  */
-const rawurldecode = (str) => decodeURIComponent(str.replace(/%(?![\da-f]{2})/giu, '%25'));
-exports.rawurldecode = rawurldecode;
+export const rawurldecode = (str) => decodeURIComponent(str.replace(/%(?![\da-f]{2})/giu, '%25'));
+/**
+ * 将0~255之间的整数转换为十六进制
+ * @param d 0~255之间的整数
+ */
+export const intToHex = (d) => Math.round(d).toString(16).padStart(2, '0');
 /**
  * 将0~1之间的数字转换为十六进制
  * @param d 0~1之间的数字
  */
-const numToHex = (d) => Math.round(d * 255).toString(16).padStart(2, '0');
-exports.numToHex = numToHex;
+export const numToHex = (d) => intToHex(d * 255);
 const regex = /* #__PURE__ */ (() => {
     const hexColor = String.raw `#(?:[\da-f]{3,4}|(?:[\da-f]{2}){3,4})(?![\p{L}\p{N}_])`, rgbValue = String.raw `(?:\d*\.)?\d+%?`, hue = String.raw `(?:\d*\.)?\d+(?:deg|grad|rad|turn)?`, rgbColor = String.raw `rgba?\(\s*(?:${String.raw `${new Array(3).fill(rgbValue).join(String.raw `\s+`)}(?:\s*\/\s*${rgbValue})?`}|${String.raw `${new Array(3).fill(rgbValue).join(String.raw `\s*,\s*`)}(?:\s*,\s*${rgbValue})?`})\s*\)`, hslColor = String.raw `hsla?\(\s*(?:${String.raw `${hue}\s+${rgbValue}\s+${rgbValue}(?:\s*\/\s*${rgbValue})?`}|${String.raw `${hue}${String.raw `\s*,\s*(?:\d*\.)?\d+%`.repeat(2)}(?:\s*,\s*${rgbValue})?`})\s*\)`;
     return {
@@ -28,7 +27,7 @@ const regex = /* #__PURE__ */ (() => {
  * @param str 字符串
  * @param hsl 是否包含 HSL
  */
-const splitColors = (str, hsl = true) => {
+export const splitColors = (str, hsl = true) => {
     const pieces = [], re = regex[hsl ? 'full' : 'rgb'];
     re.lastIndex = 0;
     let mt = re.exec(str), lastIndex = 0;
@@ -46,15 +45,13 @@ const splitColors = (str, hsl = true) => {
     }
     return pieces;
 };
-exports.splitColors = splitColors;
 /**
  * 清理内联样式中的`{`和`}`
  * @param style 内联样式
  */
-const sanitizeInlineStyle = (style) => style.replace(/[{}]/gu, p => p === '{' ? '｛' : '｝')
-    .replace(/^[\s;]+/u, p => p.replace(/;/gu, ' '));
-exports.sanitizeInlineStyle = sanitizeInlineStyle;
-function getRegex(f) {
+export const sanitizeInlineStyle = (style) => style.replace(/[{}]/gu, p => p === '{' ? '｛' : '｝')
+    .replace(/^[\s;]+/u, p => p.replaceAll(';', ' '));
+export function getRegex(f) {
     const map = new Map(), weakMap = new WeakMap();
     return s => {
         const regexp = typeof s === 'string' ? map : weakMap;
@@ -73,12 +70,12 @@ function getRegex(f) {
  * @param f 生成正则表达式的函数
  * @deprecated 需要改为使用`getRegex`
  */
-exports.getObjRegex = getRegex;
+export const getObjRegex = getRegex;
 /**
  * 按行分割字符串并记录每行的起止位置
  * @param str 字符串
  */
-const splitLines = (str) => {
+export const splitLines = (str) => {
     const lines = [];
     let start = 0;
     for (const line of str.split('\n')) {
@@ -88,12 +85,11 @@ const splitLines = (str) => {
     }
     return lines;
 };
-exports.splitLines = splitLines;
 const mt2num = (mt) => mt && Number(mt[1]);
 const formatJsonError = (str, errors) => {
     let lines;
     const offsetToPosition = (offset) => {
-        lines ??= (0, exports.splitLines)(str);
+        lines ??= splitLines(str);
         const line = lines.findIndex(([, , end]) => offset <= end) + 1;
         return {
             line,
@@ -104,7 +100,7 @@ const formatJsonError = (str, errors) => {
         const { line, column, from, to } = error;
         if (from === null || from === undefined) {
             if (line) {
-                lines ??= (0, exports.splitLines)(str);
+                lines ??= splitLines(str);
                 error.column ??= 1;
                 error.from = lines[line - 1][1] + (error.column - 1);
             }
@@ -129,7 +125,7 @@ const formatJsonError = (str, errors) => {
  * @param str JSON字符串
  * @param force 是否强制诊断
  */
-const lintJSONNative = (str, force) => {
+export const lintJSONNative = (str, force) => {
     if (force || str.trim()) {
         try {
             JSON.parse(str);
@@ -141,7 +137,6 @@ const lintJSONNative = (str, force) => {
     }
     return [];
 };
-exports.lintJSONNative = lintJSONNative;
 const lintJSONBase = (str, parse) => {
     try {
         parse(str);
@@ -161,17 +156,15 @@ const lintJSONBase = (str, parse) => {
  * 诊断JSON字符串中的语法错误
  * @param str JSON字符串
  */
-const lintJSON = (str) => {
+export const lintJSON = (str) => {
     if (!str.trim()) {
         return [];
     }
-    const errors = lintJSONBase(str, json_parse_js_1.json_parse);
-    return errors[errors.length - 1]?.severity === 'error' ? errors : [...errors, ...(0, exports.lintJSONNative)(str)];
+    const errors = lintJSONBase(str, json_parse);
+    return errors[errors.length - 1]?.severity === 'error' ? errors : [...errors, ...lintJSONNative(str)];
 };
-exports.lintJSON = lintJSON;
 /**
  * 诊断JSONC字符串中的语法错误
  * @param str JSONC字符串
  */
-const lintJSONC = (str) => str.trim() ? lintJSONBase(str, json_parse_js_1.jsonc_parse) : [];
-exports.lintJSONC = lintJSONC;
+export const lintJSONC = (str) => str.trim() ? lintJSONBase(str, jsonc_parse) : [];

package/dist/json_parse.js

@@ -1,4 +1,3 @@
-"use strict";
 /*
     json_parse.js
     2016-05-02
@@ -27,8 +26,6 @@
 
     USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO NOT CONTROL.
 */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsonc_parse = exports.json_parse = void 0;
 const escapee = {
     '"': '"',
     "\\": "\\",
@@ -395,4 +392,4 @@ const factory = (jsonc) => {
         }
     };
 };
-exports.json_parse = factory(), exports.jsonc_parse = factory(true);
+export const json_parse = /* @__PURE__ */ factory(), jsonc_parse = /* @__PURE__ */ factory(true);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/common",
-	"version": "1.4.0",
+	"version": "2.1.0",
 	"homepage": "https://github.com/bhsd-harry/common#readme",
 	"bugs": {
 		"url": "https://github.com/bhsd-harry/common/issues"
@@ -9,44 +9,42 @@
 	"author": "Bhsd",
 	"files": [
 		"/dist/*.js",
-		"/dist/index.mjs",
 		"/dist/index.d.ts"
 	],
-	"exports": {
-		".": {
-			"types": "./dist/index.d.ts",
-			"import": "./dist/index.mjs",
-			"require": "./dist/index.js"
-		}
-	},
+	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
+	"type": "module",
 	"sideEffects": false,
 	"scripts": {
+		"ls": "npm i --package-lock-only && npm ls --package-lock-only --all --omit=dev",
 		"prepublishOnly": "npm run build",
-		"build": "tsc && esbuild src/index.ts --charset=utf8 --target=es2024 --bundle --format=esm --outfile=dist/index.mjs && cp dist/index.d.ts dist/index.d.mts",
+		"build": "tsc",
 		"lint:ts": "tsc --noEmit && eslint --cache .",
 		"lint": "npm run lint:ts",
 		"test": "mocha"
 	},
 	"devDependencies": {
-		"@bhsd/code-standard": "^2.1.1",
+		"@bhsd/code-standard": "^2.3.0",
+		"@eslint-community/eslint-plugin-eslint-comments": "^4.7.1",
 		"@stylistic/eslint-plugin": "^5.10.0",
 		"@types/mocha": "^10.0.10",
-		"@typescript-eslint/eslint-plugin": "^8.57.0",
-		"@typescript-eslint/parser": "^8.57.0",
-		"esbuild": "^0.27.4",
-		"eslint": "^9.39.4",
-		"eslint-plugin-es-x": "^9.5.0",
-		"eslint-plugin-eslint-comments": "^3.2.0",
-		"eslint-plugin-jsdoc": "^62.7.1",
-		"eslint-plugin-jsonc": "^3.1.1",
+		"@typescript-eslint/eslint-plugin": "^8.59.0",
+		"@typescript-eslint/parser": "^8.59.0",
+		"esbuild": "^0.28.0",
+		"eslint": "^10.2.1",
+		"eslint-plugin-es-x": "^9.6.0",
+		"eslint-plugin-jsdoc": "^62.9.0",
+		"eslint-plugin-jsonc": "^3.1.2",
 		"eslint-plugin-promise": "^7.2.1",
 		"eslint-plugin-regexp": "^3.1.0",
-		"eslint-plugin-unicorn": "^63.0.0",
+		"eslint-plugin-unicorn": "^64.0.0",
 		"mocha": "^11.7.5",
-		"typescript": "^5.9.3"
+		"typescript": "^6.0.3"
+	},
+	"overrides": {
+		"eslint": "^10.2.1"
 	},
 	"engines": {
-		"node": ">=20.19.0"
+		"node": "^20.19.0 || ^22.13.0 || >=24.11.0"
 	}
 }

package/dist/index.mjs

@@ -1,459 +0,0 @@
-// src/json_parse.ts
-var escapee = {
-  '"': '"',
-  "\\": "\\",
-  "/": "/",
-  b: "\b",
-  f: "\f",
-  n: "\n",
-  r: "\r",
-  t: "	"
-};
-var spaces = /* @__PURE__ */ new Set([" ", "	", "\n", "\r"]);
-var stringify = (c) => {
-  if (c === "") {
-    return "end of input";
-  }
-  return c === '"' ? `'"'` : JSON.stringify(c);
-};
-var factory = (jsonc) => {
-  let at;
-  let ch;
-  let text;
-  let warnings;
-  const prepareError = (e, from, to) => {
-    if (from === void 0) {
-      e.from = at - 1;
-    } else {
-      e.from = from;
-      e.to = to ?? at - 1;
-    }
-  };
-  const warn = (message, from, to) => {
-    const warning = {
-      message,
-      severity: "warning"
-    };
-    prepareError(warning, from, to);
-    warnings.push(warning);
-  };
-  const error = (message, from, to) => {
-    const e = {
-      warnings,
-      message,
-      severity: "error"
-    };
-    prepareError(e, from, to);
-    throw e;
-  };
-  const next = (c) => {
-    if (c && c !== ch) {
-      error(`Expected ${stringify(c)} instead of ${stringify(ch)}`);
-    }
-    ch = text.charAt(at);
-    at++;
-    return ch;
-  };
-  const number = () => {
-    let string2 = "";
-    const from = at - 1;
-    if (ch === "-") {
-      string2 = "-";
-      next();
-    }
-    if (ch === "0") {
-      string2 += ch;
-      next();
-      if (ch >= "0" && ch <= "9") {
-        error("Bad number");
-      }
-    } else if (ch >= "1" && ch <= "9") {
-      while (ch >= "0" && ch <= "9") {
-        string2 += ch;
-        next();
-      }
-    } else {
-      error("No number after minus sign");
-    }
-    if (ch !== "." && ch !== "e" && ch !== "E") {
-      const value3 = Number(string2);
-      if (!Number.isSafeInteger(value3)) {
-        warn("Not a safe integer", from);
-      }
-      return;
-    }
-    if (ch === ".") {
-      string2 += ".";
-      next();
-      if (ch < "0" || ch > "9") {
-        error("Unterminated fractional number");
-      }
-      while (ch >= "0" && ch <= "9") {
-        string2 += ch;
-        next();
-      }
-    }
-    if (ch === "e" || ch === "E") {
-      string2 += ch;
-      next();
-      if (ch === "-" || ch === "+") {
-        string2 += ch;
-        next();
-      }
-      while (ch >= "0" && ch <= "9") {
-        string2 += ch;
-        next();
-      }
-    }
-    const value2 = Number(string2);
-    if (!Number.isFinite(value2)) {
-      error("Bad number");
-    }
-  };
-  const string = () => {
-    let value2 = "";
-    if (ch === '"') {
-      while (next()) {
-        if (ch === '"') {
-          next();
-          return value2;
-        }
-        const from = at - 1;
-        if (ch === "\\") {
-          next();
-          if (ch === "u") {
-            let i = 0;
-            let uffff = 0;
-            for (; i < 4; i++) {
-              const hex = parseInt(next(), 16);
-              if (!isFinite(hex)) {
-                break;
-              }
-              uffff = uffff * 16 + hex;
-            }
-            if (i < 4) {
-              error("Bad unicode escape", from);
-            }
-            value2 += String.fromCharCode(uffff);
-          } else if (typeof escapee[ch] === "string") {
-            value2 += escapee[ch];
-          } else {
-            error("Bad escaped character", from, at);
-          }
-        } else if (ch < " ") {
-          error("Bad control character", from, at);
-        } else {
-          value2 += ch;
-        }
-      }
-    } else {
-      error(`Expected '"' instead of ${JSON.stringify(ch)}`);
-    }
-    return error("Unterminated string");
-  };
-  const white = () => {
-    while (ch) {
-      while (ch && spaces.has(ch)) {
-        next();
-      }
-      if (jsonc && ch === "/") {
-        const peek = text.charAt(at);
-        if (peek === "/") {
-          next();
-          next();
-          while (ch && ch !== "\n" && ch !== "\r") {
-            next();
-          }
-          continue;
-        } else if (peek === "*") {
-          next();
-          next();
-          while (ch && !(ch === "*" && text.charAt(at) === "/")) {
-            next();
-          }
-          if (ch === "*") {
-            next();
-            next();
-          }
-          continue;
-        }
-      }
-      break;
-    }
-  };
-  const word = () => {
-    switch (ch) {
-      case "t":
-        next();
-        next("r");
-        next("u");
-        next("e");
-        return;
-      case "f":
-        next();
-        next("a");
-        next("l");
-        next("s");
-        next("e");
-        return;
-      case "n":
-        next();
-        next("u");
-        next("l");
-        next("l");
-        return;
-      default:
-        error(`Unexpected ${JSON.stringify(ch)}`);
-    }
-  };
-  const array = () => {
-    next();
-    white();
-    if (ch === "]") {
-      next();
-      return;
-    } else if (jsonc && ch === ",") {
-      next();
-      white();
-      next("]");
-      return;
-    }
-    let from;
-    while (ch) {
-      if (ch === "]") {
-        if (jsonc) {
-          next();
-          return;
-        }
-        error("Trailing comma in array", from, from + 1);
-      }
-      value();
-      white();
-      if (ch === "]") {
-        next();
-        return;
-      } else if (ch === ",") {
-        from = at - 1;
-        next();
-        white();
-      } else {
-        error(`Expected "," or "]" instead of ${stringify(ch)}`);
-      }
-    }
-    error("Unterminated array");
-  };
-  const object = () => {
-    const keys = /* @__PURE__ */ new Set();
-    next();
-    white();
-    if (ch === "}") {
-      next();
-      return;
-    } else if (jsonc && ch === ",") {
-      next();
-      white();
-      next("}");
-      return;
-    }
-    let from;
-    while (ch) {
-      if (ch === "}") {
-        if (jsonc) {
-          next();
-          return;
-        }
-        error("Trailing comma in object", from, from + 1);
-      }
-      from = at;
-      const key = string();
-      const to = at - 2;
-      white();
-      next(":");
-      if (keys.has(key)) {
-        warn(`Duplicate key ${stringify(key)}`, from, to);
-      } else {
-        keys.add(key);
-      }
-      value();
-      white();
-      if (ch === "}") {
-        next();
-        return;
-      } else if (ch === ",") {
-        from = at - 1;
-        next();
-        white();
-      } else {
-        error(`Expected "," or "}" instead of ${stringify(ch)}`);
-      }
-    }
-    error(`Expected '"'`);
-  };
-  const value = () => {
-    white();
-    switch (ch) {
-      case "":
-        return void 0;
-      case "{":
-        return object();
-      case "[":
-        return array();
-      case '"':
-        return string();
-      case "-":
-        return number();
-      default:
-        return ch >= "0" && ch <= "9" ? number() : word();
-    }
-  };
-  return (source) => {
-    text = source;
-    warnings = [];
-    at = 0;
-    ch = " ";
-    value();
-    white();
-    if (ch) {
-      error("Syntax error");
-    } else if (warnings.length > 0) {
-      throw { warnings };
-    }
-  };
-};
-var json_parse = /* @__PURE__ */ factory();
-var jsonc_parse = /* @__PURE__ */ factory(true);
-
-// src/index.ts
-var wmf = "wiktionary|wiki(?:pedia|books|news|quote|source|versity|voyage)";
-var rawurldecode = (str) => decodeURIComponent(str.replace(/%(?![\da-f]{2})/giu, "%25"));
-var numToHex = (d) => Math.round(d * 255).toString(16).padStart(2, "0");
-var regex = /* @__PURE__ */ (() => {
-  const hexColor = String.raw`#(?:[\da-f]{3,4}|(?:[\da-f]{2}){3,4})(?![\p{L}\p{N}_])`, rgbValue = String.raw`(?:\d*\.)?\d+%?`, hue = String.raw`(?:\d*\.)?\d+(?:deg|grad|rad|turn)?`, rgbColor = String.raw`rgba?\(\s*(?:${String.raw`${new Array(3).fill(rgbValue).join(String.raw`\s+`)}(?:\s*\/\s*${rgbValue})?`}|${String.raw`${new Array(3).fill(rgbValue).join(String.raw`\s*,\s*`)}(?:\s*,\s*${rgbValue})?`})\s*\)`, hslColor = String.raw`hsla?\(\s*(?:${String.raw`${hue}\s+${rgbValue}\s+${rgbValue}(?:\s*\/\s*${rgbValue})?`}|${String.raw`${hue}${String.raw`\s*,\s*(?:\d*\.)?\d+%`.repeat(2)}(?:\s*,\s*${rgbValue})?`})\s*\)`;
-  return {
-    full: new RegExp(String.raw`(^|[^\p{L}\p{N}_])(${hexColor}|${rgbColor}|${hslColor})`, "giu"),
-    rgb: new RegExp(String.raw`(^|[^\p{L}\p{N}_])(${hexColor}|${rgbColor})`, "giu")
-  };
-})();
-var splitColors = (str, hsl = true) => {
-  const pieces = [], re = regex[hsl ? "full" : "rgb"];
-  re.lastIndex = 0;
-  let mt = re.exec(str), lastIndex = 0;
-  while (mt) {
-    const index = mt.index + mt[1].length;
-    if (index > lastIndex) {
-      pieces.push([str.slice(lastIndex, index), lastIndex, index, false]);
-    }
-    ({ lastIndex } = re);
-    pieces.push([mt[2], index, lastIndex, str[index - 1] !== "&" || !/^#\d+$/u.test(mt[2])]);
-    mt = re.exec(str);
-  }
-  if (str.length > lastIndex) {
-    pieces.push([str.slice(lastIndex), lastIndex, str.length, false]);
-  }
-  return pieces;
-};
-var sanitizeInlineStyle = (style) => style.replace(/[{}]/gu, (p) => p === "{" ? "｛" : "｝").replace(/^[\s;]+/u, (p) => p.replace(/;/gu, " "));
-function getRegex(f) {
-  const map = /* @__PURE__ */ new Map(), weakMap = /* @__PURE__ */ new WeakMap();
-  return (s) => {
-    const regexp = typeof s === "string" ? map : weakMap;
-    if (regexp.has(s)) {
-      const re2 = regexp.get(s);
-      re2.lastIndex = 0;
-      return re2;
-    }
-    const re = f(s);
-    regexp.set(s, re);
-    return re;
-  };
-}
-var getObjRegex = getRegex;
-var splitLines = (str) => {
-  const lines = [];
-  let start = 0;
-  for (const line of str.split("\n")) {
-    const end = start + line.length;
-    lines.push([line, start, end]);
-    start = end + 1;
-  }
-  return lines;
-};
-var mt2num = (mt) => mt && Number(mt[1]);
-var formatJsonError = (str, errors) => {
-  let lines;
-  const offsetToPosition = (offset) => {
-    lines ??= splitLines(str);
-    const line = lines.findIndex(([, , end]) => offset <= end) + 1;
-    return {
-      line,
-      column: offset - lines[line - 1][1] + 1
-    };
-  };
-  for (const error of errors) {
-    const { line, column, from, to } = error;
-    if (from === null || from === void 0) {
-      if (line) {
-        lines ??= splitLines(str);
-        error.column ??= 1;
-        error.from = lines[line - 1][1] + (error.column - 1);
-      } else {
-        error.from = 0;
-        error.line = 1;
-        error.column = 1;
-      }
-    } else if (!line || !column) {
-      Object.assign(error, offsetToPosition(from));
-    }
-    if (to !== void 0) {
-      ({ line: error.endLine, column: error.endColumn } = offsetToPosition(to));
-    }
-    error.position = error.from;
-  }
-  return errors;
-};
-var lintJSONNative = (str, force) => {
-  if (force || str.trim()) {
-    try {
-      JSON.parse(str);
-    } catch (e) {
-      const { message } = e, line = mt2num(/\bline (\d+)/u.exec(message)), column = mt2num(/\bcolumn (\d+)/u.exec(message)), from = mt2num(/\bposition (\d+)/u.exec(message));
-      return formatJsonError(str, [{ message, line, column, from, severity: "error" }]);
-    }
-  }
-  return [];
-};
-var lintJSONBase = (str, parse) => {
-  try {
-    parse(str);
-  } catch (e) {
-    if (!(e instanceof Error)) {
-      const { warnings, ...error } = e;
-      if (error.message) {
-        warnings.push(error);
-      }
-      return formatJsonError(str, warnings);
-    }
-  }
-  return [];
-};
-var lintJSON = (str) => {
-  if (!str.trim()) {
-    return [];
-  }
-  const errors = lintJSONBase(str, json_parse);
-  return errors[errors.length - 1]?.severity === "error" ? errors : [...errors, ...lintJSONNative(str)];
-};
-var lintJSONC = (str) => str.trim() ? lintJSONBase(str, jsonc_parse) : [];
-export {
-  getObjRegex,
-  getRegex,
-  lintJSON,
-  lintJSONC,
-  lintJSONNative,
-  numToHex,
-  rawurldecode,
-  sanitizeInlineStyle,
-  splitColors,
-  splitLines,
-  wmf
-};