@bhsd/common 3.0.0 → 4.0.1

package/dist/index.d.ts

@@ -11,7 +11,6 @@ declare interface JsonError {
     position: number;
 }
 export type RegexGetter<T = string> = (s: T) => RegExp;
-export * from './color.js';
 export declare const wmf = "wiktionary|wiki(?:pedia|books|news|quote|source|versity|voyage)";
 /**
  * PHP的`rawurldecode`函数的JavaScript实现
@@ -79,3 +78,4 @@ export declare const lintJSONC: (str: string) => JsonError[];
  * @param re 其他正则表达式，默认为匹配非空白字符的正则表达式
  */
 export declare const numLeadingSpaces: (str: string, re?: RegExp) => number;
+export {};

package/dist/index.js

@@ -1,13 +1,21 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import { json_parse, jsonc_parse } from './json_parse.js';
-export * from './color.js';
 export const wmf = 'wiktionary|wiki(?:pedia|books|news|quote|source|versity|voyage)';
 /**
  * PHP的`rawurldecode`函数的JavaScript实现
  * @param str 要解码的字符串
  */
-export const rawurldecode = (str) => 
-// eslint-disable-next-line unicorn/prefer-string-replace-all
-decodeURIComponent(str.replace(/%(?![\da-f]{2})/giu, '%25'));
+export const rawurldecode = (str) => decodeURIComponent(str.replace(/%(?![\da-f]{2})/giu, '%25'));
 /**
  * 将0~255之间的整数转换为十六进制
  * @param d 0~255之间的整数
@@ -33,7 +41,7 @@ const regex = /* #__PURE__ */ (() => {
  */
 export const splitColors = (str, names) => {
     const pieces = [], re = Array.isArray(names) && names.length > 0
-        ? new RegExp(regex.names.replace('$1', names.join('|')), 'giu')
+        ? new RegExp(regex.names.replace('$1', () => names.join('|')), 'giu')
         : regex.full;
     re.lastIndex = 0;
     let mt = re.exec(str), lastIndex = 0;
@@ -55,8 +63,8 @@ export const splitColors = (str, names) => {
  * 清理内联样式中的`{`和`}`
  * @param style 内联样式
  */
-export const sanitizeInlineStyle = (style) => style.replaceAll(/[{}]/gu, p => p === '{' ? '｛' : '｝')
-    .replace(/^[\s;]+/u, p => p.replaceAll(';', ' '));
+export const sanitizeInlineStyle = (style) => style.replace(/[{}]/gu, p => p === '{' ? '｛' : '｝')
+    .replace(/^[\s;]+/u, p => p.replace(/;/gu, ' '));
 export function getRegex(f) {
     const map = new Map(), weakMap = new WeakMap();
     return s => {
@@ -93,9 +101,10 @@ export const splitLines = (str) => {
 };
 const mt2num = (mt) => mt && Number(mt[1]);
 const formatJsonError = (str, errors) => {
+    var _a;
     let lines;
     const offsetToPosition = (offset) => {
-        lines ??= splitLines(str);
+        lines !== null && lines !== void 0 ? lines : (lines = splitLines(str));
         const line = lines.findIndex(([, , end]) => offset <= end) + 1;
         return {
             line,
@@ -106,8 +115,8 @@ const formatJsonError = (str, errors) => {
         const { line, column, from, to } = error;
         if (from === null || from === undefined) {
             if (line) {
-                lines ??= splitLines(str);
-                error.column ??= 1;
+                lines !== null && lines !== void 0 ? lines : (lines = splitLines(str));
+                (_a = error.column) !== null && _a !== void 0 ? _a : (error.column = 1);
                 error.from = lines[line - 1][1] + (error.column - 1);
             }
             else {
@@ -149,7 +158,7 @@ const lintJSONBase = (str, parse) => {
     }
     catch (e) {
         if (!(e instanceof Error)) {
-            const { warnings, ...error } = e;
+            const _a = e, { warnings } = _a, error = __rest(_a, ["warnings"]);
             if (error.message) {
                 warnings.push(error);
             }
@@ -163,12 +172,13 @@ const lintJSONBase = (str, parse) => {
  * @param str JSON字符串
  */
 export const lintJSON = (str) => {
+    var _a;
     if (!str.trim()) {
         return [];
     }
     const errors = lintJSONBase(str, json_parse);
     // eslint-disable-next-line unicorn/prefer-at
-    return errors[errors.length - 1]?.severity === 'error' ? errors : [...errors, ...lintJSONNative(str)];
+    return ((_a = errors[errors.length - 1]) === null || _a === void 0 ? void 0 : _a.severity) === 'error' ? errors : [...errors, ...lintJSONNative(str)];
 };
 /**
  * 诊断JSONC字符串中的语法错误

package/dist/json_parse.d.ts

@@ -1,14 +1,14 @@
 export interface JsonSyntaxError {
     warnings: ExtendedJsonSyntaxError[];
-    severity?: "error" | "warning";
+    severity?: 'error' | 'warning';
     message?: string;
     from?: number | null;
     to?: number;
     /** @deprecated */
     position?: number;
 }
-export interface ExtendedJsonSyntaxError extends Omit<JsonSyntaxError, "warnings"> {
-    severity: "error" | "warning";
+export interface ExtendedJsonSyntaxError extends Omit<JsonSyntaxError, 'warnings'> {
+    severity: 'error' | 'warning';
     message: string;
     line?: number | null;
     column?: number | null;

package/dist/json_parse.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line @stylistic/multiline-comment-style
 /*
     json_parse.js
     2016-05-02
@@ -28,18 +29,18 @@
 */
 const escapee = {
     '"': '"',
-    "\\": "\\",
-    "/": "/",
-    b: "\b",
-    f: "\f",
-    n: "\n",
-    r: "\r",
-    t: "\t",
+    '\\': '\\',
+    '/': '/',
+    b: '\b',
+    f: '\f',
+    n: '\n',
+    r: '\r',
+    t: '\t',
 };
-const spaces = new Set([" ", "\t", "\n", "\r"]);
+const spaces = new Set([' ', '\t', '\n', '\r']);
 const stringify = (c) => {
-    if (c === "") {
-        return "end of input";
+    if (c === '') {
+        return 'end of input';
     }
     return c === '"' ? `'"'` : JSON.stringify(c);
 };
@@ -59,14 +60,14 @@ const factory = (jsonc) => {
         }
         else {
             e.from = from;
-            e.to = to ?? at - 1;
+            e.to = to !== null && to !== void 0 ? to : at - 1;
         }
     };
     const warn = (message, from, to) => {
         // Log warning when something is wrong.
         const warning = {
             message,
-            severity: "warning",
+            severity: 'warning',
         };
         prepareError(warning, from, to);
         warnings.push(warning);
@@ -76,7 +77,7 @@ const factory = (jsonc) => {
         const e = {
             warnings,
             message,
-            severity: "error",
+            severity: 'error',
         };
         prepareError(e, from, to);
         throw e;
@@ -93,67 +94,67 @@ const factory = (jsonc) => {
     };
     const number = () => {
         // Parse a number value.
-        let string = "";
+        let string = '';
         const from = at - 1;
-        if (ch === "-") {
-            string = "-";
+        if (ch === '-') {
+            string = '-';
             next();
         }
-        if (ch === "0") {
+        if (ch === '0') {
             string += ch;
             next();
-            if (ch >= "0" && ch <= "9") {
-                error("Bad number");
+            if (ch >= '0' && ch <= '9') {
+                error('Bad number');
             }
         }
-        else if (ch >= "1" && ch <= "9") {
-            while (ch >= "0" && ch <= "9") {
+        else if (ch >= '1' && ch <= '9') {
+            while (ch >= '0' && ch <= '9') {
                 string += ch;
                 next();
             }
         }
         else {
-            error("No number after minus sign");
+            error('No number after minus sign');
         }
-        if (ch !== "." && ch !== "e" && ch !== "E") {
+        if (ch !== '.' && ch !== 'e' && ch !== 'E') {
             const value = Number(string);
             if (!Number.isSafeInteger(value)) {
-                warn("Not a safe integer", from);
+                warn('Not a safe integer', from);
             }
             return;
         }
-        if (ch === ".") {
-            string += ".";
+        if (ch === '.') {
+            string += '.';
             next();
-            if (ch < "0" || ch > "9") {
-                error("Unterminated fractional number");
+            if (ch < '0' || ch > '9') {
+                error('Unterminated fractional number');
             }
-            while (ch >= "0" && ch <= "9") {
+            while (ch >= '0' && ch <= '9') {
                 string += ch;
                 next();
             }
         }
-        if (ch === "e" || ch === "E") {
+        if (ch === 'e' || ch === 'E') { // eslint-disable-line unicorn/prefer-else-if
             string += ch;
             next();
             // @ts-expect-error `ch` modified
-            if (ch === "-" || ch === "+") {
+            if (ch === '-' || ch === '+') {
                 string += ch;
                 next();
             }
-            while (ch >= "0" && ch <= "9") {
+            while (ch >= '0' && ch <= '9') {
                 string += ch;
                 next();
             }
         }
         const value = Number(string);
         if (!Number.isFinite(value)) {
-            error("Bad number");
+            error('Bad number');
         }
     };
     const string = () => {
         // Parse a string value.
-        let value = "";
+        let value = '';
         // When parsing for string values, we must look for " and \ characters.
         if (ch === '"') {
             while (next()) {
@@ -162,9 +163,9 @@ const factory = (jsonc) => {
                     return value;
                 }
                 const from = at - 1;
-                if (ch === "\\") {
+                if (ch === '\\') {
                     next();
-                    if (ch === "u") {
+                    if (ch === 'u') {
                         let i = 0;
                         let uffff = 0;
                         for (; i < 4; i++) {
@@ -175,19 +176,19 @@ const factory = (jsonc) => {
                             uffff = uffff * 16 + hex;
                         }
                         if (i < 4) {
-                            error("Bad unicode escape", from);
+                            error('Bad unicode escape', from);
                         }
-                        value += String.fromCharCode(uffff);
+                        value += String.fromCodePoint(uffff);
                     }
-                    else if (typeof escapee[ch] === "string") {
+                    else if (typeof escapee[ch] === 'string') {
                         value += escapee[ch];
                     }
                     else {
-                        error("Bad escaped character", from, at);
+                        error('Bad escaped character', from, at);
                     }
                 }
-                else if (ch < " ") {
-                    error("Bad control character", from, at);
+                else if (ch < ' ') {
+                    error('Bad control character', from, at);
                 }
                 else {
                     value += ch;
@@ -197,7 +198,7 @@ const factory = (jsonc) => {
         else {
             error(`Expected '"' instead of ${JSON.stringify(ch)}`);
         }
-        return error("Unterminated string");
+        return error('Unterminated string');
     };
     const white = () => {
         // Skip whitespace and comments (JSONC).
@@ -206,27 +207,27 @@ const factory = (jsonc) => {
             while (ch && spaces.has(ch)) {
                 next();
             }
-            if (jsonc && ch === "/") {
+            if (jsonc && ch === '/') {
                 const peek = text.charAt(at);
-                if (peek === "/") {
+                if (peek === '/') {
                     // Skip single-line comments.
                     next(); // skip /
                     next(); // skip /
                     // @ts-expect-error `ch` modified
-                    while (ch && ch !== "\n" && ch !== "\r") {
+                    while (ch && ch !== '\n' && ch !== '\r') {
                         next();
                     }
                     continue;
                 }
-                else if (peek === "*") {
+                else if (peek === '*') {
                     // Skip multi-line comments.
                     next(); // skip /
                     next(); // skip *
                     // @ts-expect-error `ch` modified
-                    while (ch && !(ch === "*" && text.charAt(at) === "/")) {
+                    while (ch && (ch !== '*' || text.charAt(at) !== '/')) {
                         next();
                     }
-                    if (ch === "*") {
+                    if (ch === '*') {
                         next(); // skip *
                         next(); // skip /
                     }
@@ -239,24 +240,24 @@ const factory = (jsonc) => {
     const word = () => {
         // true, false, or null.
         switch (ch) {
-            case "t":
+            case 't':
                 next();
-                next("r");
-                next("u");
-                next("e");
+                next('r');
+                next('u');
+                next('e');
                 return;
-            case "f":
+            case 'f':
                 next();
-                next("a");
-                next("l");
-                next("s");
-                next("e");
+                next('a');
+                next('l');
+                next('s');
+                next('e');
                 return;
-            case "n":
+            case 'n':
                 next();
-                next("u");
-                next("l");
-                next("l");
+                next('u');
+                next('l');
+                next('l');
                 return;
             default:
                 error(`Unexpected ${JSON.stringify(ch)}`);
@@ -266,32 +267,32 @@ const factory = (jsonc) => {
         // Parse an array value.
         next();
         white();
-        if (ch === "]") {
+        if (ch === ']') {
             next();
             return; // empty array
         }
-        else if (jsonc && ch === ",") {
+        else if (jsonc && ch === ',') {
             next();
             white();
-            next("]");
+            next(']');
             return;
         }
         let from;
         while (ch) {
-            if (ch === "]") {
+            if (ch === ']') {
                 if (jsonc) {
                     next();
                     return;
                 }
-                error("Trailing comma in array", from, from + 1);
+                error('Trailing comma in array', from, from + 1);
             }
             value();
             white();
-            if (ch === "]") {
+            if (ch === ']') {
                 next();
                 return;
             }
-            else if (ch === ",") {
+            else if (ch === ',') {
                 from = at - 1;
                 next();
                 white();
@@ -300,37 +301,37 @@ const factory = (jsonc) => {
                 error(`Expected "," or "]" instead of ${stringify(ch)}`);
             }
         }
-        error("Unterminated array");
+        error('Unterminated array');
     };
     const object = () => {
         // Parse an object value.
         const keys = new Set();
         next();
         white();
-        if (ch === "}") {
+        if (ch === '}') {
             next();
             return; // empty object
         }
-        else if (jsonc && ch === ",") {
+        else if (jsonc && ch === ',') {
             next();
             white();
-            next("}");
+            next('}');
             return;
         }
         let from;
         while (ch) {
-            if (ch === "}") {
+            if (ch === '}') {
                 if (jsonc) {
                     next();
                     return;
                 }
-                error("Trailing comma in object", from, from + 1);
+                error('Trailing comma in object', from, from + 1);
             }
             from = at;
             const key = string();
             const to = at - 2;
             white();
-            next(":");
+            next(':');
             if (keys.has(key)) {
                 warn(`Duplicate key ${stringify(key)}`, from, to);
             }
@@ -339,11 +340,11 @@ const factory = (jsonc) => {
             }
             value();
             white();
-            if (ch === "}") {
+            if (ch === '}') {
                 next();
                 return;
             }
-            else if (ch === ",") {
+            else if (ch === ',') {
                 from = at - 1;
                 next();
                 white();
@@ -359,21 +360,23 @@ const factory = (jsonc) => {
         // or a word.
         white();
         switch (ch) {
-            case "":
-                return undefined;
-            case "{":
-                return object();
-            case "[":
-                return array();
+            case '':
+                break;
+            case '{':
+                object();
+                break;
+            case '[':
+                array();
+                break;
             case '"':
                 return string();
-            case "-":
-                return number();
+            case '-':
+                number();
+                break;
             default:
-                return ch >= "0" && ch <= "9"
-                    ? number()
-                    : word();
+                (ch >= '0' && ch <= '9' ? number : word)();
         }
+        return undefined;
     };
     // Return the json_parse function. It will have access to all of the above
     // functions and variables.
@@ -381,11 +384,11 @@ const factory = (jsonc) => {
         text = source;
         warnings = [];
         at = 0;
-        ch = " ";
+        ch = ' ';
         value();
         white();
         if (ch) {
-            error("Syntax error");
+            error('Syntax error');
         }
         else if (warnings.length > 0) {
             throw { warnings };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/common",
-	"version": "3.0.0",
+	"version": "4.0.1",
 	"homepage": "https://github.com/bhsd-harry/common#readme",
 	"bugs": {
 		"url": "https://github.com/bhsd-harry/common/issues"
@@ -8,32 +8,39 @@
 	"license": "MIT",
 	"author": "Bhsd",
 	"files": [
-		"/dist/*"
+		"/dist/"
 	],
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
+	"exports": {
+		".": "./dist/index.js",
+		"./color": "./dist/color.js"
+	},
 	"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",
+		"build": "tsc && eslint --no-inline-config --no-config-lookup -c eslint.dist.js dist/*.js",
 		"lint:ts": "tsc --noEmit && eslint --cache .",
 		"lint": "npm run lint:ts",
-		"test": "mocha"
+		"test": "testUtil test/*.test.js"
+	},
+	"peerDependencies": {
+		"culori": "^4.0.0"
 	},
-	"dependencies": {
-		"culori": "^4.0.2"
+	"peerDependenciesMeta": {
+		"culori": {
+			"optional": true
+		}
 	},
 	"devDependencies": {
-		"@bhsd/code-standard": "^2.6.2",
+		"@bhsd/code-standard": "^3.3.0",
 		"@bhsd/lezer-json": "^2.1.0",
+		"@bhsd/test-util": "^3.1.0",
 		"@types/culori": "^4.0.1",
-		"@types/mocha": "^10.0.10",
-		"esbuild": "^0.28.0",
-		"eslint": "^10.4.1",
-		"globals": "^17.6.0",
-		"mocha": "^11.7.6",
+		"culori": "^4.0.2",
+		"eslint": "^10.7.0",
 		"typescript": "^6.0.3"
 	},
 	"engines": {