@bhsd/common 1.3.0 → 1.4.0

package/dist/index.d.ts

@@ -61,4 +61,9 @@ export declare const lintJSONNative: (str: string, force?: boolean) => JsonError
  * @param str JSON字符串
  */
 export declare const lintJSON: (str: string) => JsonError[];
+/**
+ * 诊断JSONC字符串中的语法错误
+ * @param str JSONC字符串
+ */
+export declare const lintJSONC: (str: string) => JsonError[];
 export {};

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lintJSON = exports.lintJSONNative = exports.splitLines = exports.getObjRegex = exports.sanitizeInlineStyle = exports.splitColors = exports.numToHex = exports.rawurldecode = exports.wmf = void 0;
+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)';
@@ -51,7 +51,8 @@ exports.splitColors = splitColors;
  * 清理内联样式中的`{`和`}`
  * @param style 内联样式
  */
-const sanitizeInlineStyle = (style) => style.replace(/[{}]/gu, p => p === '{' ? '｛' : '｝');
+const sanitizeInlineStyle = (style) => style.replace(/[{}]/gu, p => p === '{' ? '｛' : '｝')
+    .replace(/^[\s;]+/u, p => p.replace(/;/gu, ' '));
 exports.sanitizeInlineStyle = sanitizeInlineStyle;
 function getRegex(f) {
     const map = new Map(), weakMap = new WeakMap();
@@ -141,17 +142,9 @@ const lintJSONNative = (str, force) => {
     return [];
 };
 exports.lintJSONNative = lintJSONNative;
-/**
- * 诊断JSON字符串中的语法错误
- * @param str JSON字符串
- */
-const lintJSON = (str) => {
-    if (!str.trim()) {
-        return [];
-    }
-    let errors;
+const lintJSONBase = (str, parse) => {
     try {
-        (0, json_parse_js_1.json_parse)(str);
+        parse(str);
     }
     catch (e) {
         if (!(e instanceof Error)) {
@@ -159,13 +152,26 @@ const lintJSON = (str) => {
             if (error.message) {
                 warnings.push(error);
             }
-            errors = formatJsonError(str, warnings);
-            if (error.message) {
-                return errors;
-            }
+            return formatJsonError(str, warnings);
         }
     }
-    const nativeErrors = (0, exports.lintJSONNative)(str);
-    return errors ? [...nativeErrors, ...errors] : nativeErrors;
+    return [];
+};
+/**
+ * 诊断JSON字符串中的语法错误
+ * @param str JSON字符串
+ */
+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)];
 };
 exports.lintJSON = lintJSON;
+/**
+ * 诊断JSONC字符串中的语法错误
+ * @param str JSONC字符串
+ */
+const lintJSONC = (str) => str.trim() ? lintJSONBase(str, json_parse_js_1.jsonc_parse) : [];
+exports.lintJSONC = lintJSONC;

package/dist/index.mjs

@@ -16,7 +16,7 @@ var stringify = (c) => {
   }
   return c === '"' ? `'"'` : JSON.stringify(c);
 };
-var json_parse = /* @__PURE__ */ (() => {
+var factory = (jsonc) => {
   let at;
   let ch;
   let text;
@@ -152,8 +152,33 @@ var json_parse = /* @__PURE__ */ (() => {
     return error("Unterminated string");
   };
   const white = () => {
-    while (ch && spaces.has(ch)) {
-      next();
+    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 = () => {
@@ -187,10 +212,19 @@ var json_parse = /* @__PURE__ */ (() => {
     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();
@@ -215,10 +249,19 @@ var json_parse = /* @__PURE__ */ (() => {
     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;
@@ -249,6 +292,8 @@ var json_parse = /* @__PURE__ */ (() => {
   const value = () => {
     white();
     switch (ch) {
+      case "":
+        return void 0;
       case "{":
         return object();
       case "[":
@@ -274,7 +319,9 @@ var json_parse = /* @__PURE__ */ (() => {
       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)";
@@ -305,7 +352,7 @@ var splitColors = (str, hsl = true) => {
   }
   return pieces;
 };
-var sanitizeInlineStyle = (style) => style.replace(/[{}]/gu, (p) => p === "{" ? "｛" : "｝");
+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) => {
@@ -375,32 +422,33 @@ var lintJSONNative = (str, force) => {
   }
   return [];
 };
-var lintJSON = (str) => {
-  if (!str.trim()) {
-    return [];
-  }
-  let errors;
+var lintJSONBase = (str, parse) => {
   try {
-    json_parse(str);
+    parse(str);
   } catch (e) {
     if (!(e instanceof Error)) {
       const { warnings, ...error } = e;
       if (error.message) {
         warnings.push(error);
       }
-      errors = formatJsonError(str, warnings);
-      if (error.message) {
-        return errors;
-      }
+      return formatJsonError(str, warnings);
     }
   }
-  const nativeErrors = lintJSONNative(str);
-  return errors ? [...nativeErrors, ...errors] : nativeErrors;
+  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,

package/dist/json_parse.js

@@ -28,7 +28,7 @@
     USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO NOT CONTROL.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.json_parse = void 0;
+exports.jsonc_parse = exports.json_parse = void 0;
 const escapee = {
     '"': '"',
     "\\": "\\",
@@ -46,7 +46,7 @@ const stringify = (c) => {
     }
     return c === '"' ? `'"'` : JSON.stringify(c);
 };
-exports.json_parse = (() => {
+const factory = (jsonc) => {
     // This is a function that can parse a JSON text.
     // It is a simple, recursive descent parser.
     // It does not use eval or regular expressions,
@@ -203,9 +203,40 @@ exports.json_parse = (() => {
         return error("Unterminated string");
     };
     const white = () => {
-        // Skip whitespace.
-        while (ch && spaces.has(ch)) {
-            next();
+        // Skip whitespace and comments (JSONC).
+        while (ch) {
+            // Skip whitespace.
+            while (ch && spaces.has(ch)) {
+                next();
+            }
+            if (jsonc && ch === "/") {
+                const peek = text.charAt(at);
+                if (peek === "/") {
+                    // Skip single-line comments.
+                    next(); // skip /
+                    next(); // skip /
+                    // @ts-expect-error `ch` modified
+                    while (ch && ch !== "\n" && ch !== "\r") {
+                        next();
+                    }
+                    continue;
+                }
+                else if (peek === "*") {
+                    // Skip multi-line comments.
+                    next(); // skip /
+                    next(); // skip *
+                    // @ts-expect-error `ch` modified
+                    while (ch && !(ch === "*" && text.charAt(at) === "/")) {
+                        next();
+                    }
+                    if (ch === "*") {
+                        next(); // skip *
+                        next(); // skip /
+                    }
+                    continue;
+                }
+            }
+            break;
         }
     };
     const word = () => {
@@ -242,9 +273,19 @@ exports.json_parse = (() => {
             next();
             return; // empty array
         }
+        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();
@@ -273,9 +314,19 @@ exports.json_parse = (() => {
             next();
             return; // empty object
         }
+        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;
@@ -311,6 +362,8 @@ exports.json_parse = (() => {
         // or a word.
         white();
         switch (ch) {
+            case "":
+                return undefined;
             case "{":
                 return object();
             case "[":
@@ -341,4 +394,5 @@ exports.json_parse = (() => {
             throw { warnings };
         }
     };
-})();
+};
+exports.json_parse = factory(), exports.jsonc_parse = factory(true);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/common",
-	"version": "1.3.0",
+	"version": "1.4.0",
 	"homepage": "https://github.com/bhsd-harry/common#readme",
 	"bugs": {
 		"url": "https://github.com/bhsd-harry/common/issues"
@@ -29,24 +29,24 @@
 		"test": "mocha"
 	},
 	"devDependencies": {
-		"@bhsd/code-standard": "^1.3.2",
-		"@stylistic/eslint-plugin": "^5.5.0",
+		"@bhsd/code-standard": "^2.1.1",
+		"@stylistic/eslint-plugin": "^5.10.0",
 		"@types/mocha": "^10.0.10",
-		"@typescript-eslint/eslint-plugin": "^8.46.4",
-		"@typescript-eslint/parser": "^8.46.4",
-		"esbuild": "^0.25.12",
-		"eslint": "^9.39.1",
-		"eslint-plugin-es-x": "^9.1.2",
+		"@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": "^61.2.1",
-		"eslint-plugin-jsonc": "^2.21.0",
+		"eslint-plugin-jsdoc": "^62.7.1",
+		"eslint-plugin-jsonc": "^3.1.1",
 		"eslint-plugin-promise": "^7.2.1",
-		"eslint-plugin-regexp": "^2.10.0",
-		"eslint-plugin-unicorn": "^62.0.0",
+		"eslint-plugin-regexp": "^3.1.0",
+		"eslint-plugin-unicorn": "^63.0.0",
 		"mocha": "^11.7.5",
 		"typescript": "^5.9.3"
 	},
 	"engines": {
-		"node": ">=18.17.0"
+		"node": ">=20.19.0"
 	}
 }