@bhsd/common 1.2.0 → 1.3.1

package/dist/index.d.ts

@@ -3,6 +3,11 @@ declare interface JsonError {
     message: string;
     line: number;
     column: number;
+    endLine?: number;
+    endColumn?: number;
+    from: number;
+    to?: number;
+    /** @deprecated */
     position: number;
 }
 export type RegexGetter<T = string> = (s: T) => RegExp;

package/dist/index.js

@@ -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();
@@ -91,25 +92,35 @@ exports.splitLines = splitLines;
 const mt2num = (mt) => mt && Number(mt[1]);
 const formatJsonError = (str, errors) => {
     let lines;
+    const offsetToPosition = (offset) => {
+        lines ??= (0, exports.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, position } = error;
-        if (position === null || position === undefined) {
+        const { line, column, from, to } = error;
+        if (from === null || from === undefined) {
             if (line) {
                 lines ??= (0, exports.splitLines)(str);
                 error.column ??= 1;
-                error.position = lines[line - 1][1] + (error.column - 1);
+                error.from = lines[line - 1][1] + (error.column - 1);
             }
             else {
-                error.position = 0;
+                error.from = 0;
                 error.line = 1;
                 error.column = 1;
             }
         }
         else if (!line || !column) {
-            lines ??= (0, exports.splitLines)(str);
-            error.line = lines.findIndex(([, , end]) => position <= end) + 1;
-            error.column = position - lines[error.line - 1][1] + 1;
+            Object.assign(error, offsetToPosition(from));
+        }
+        if (to !== undefined) {
+            ({ line: error.endLine, column: error.endColumn } = offsetToPosition(to));
         }
+        error.position = error.from;
     }
     return errors;
 };
@@ -124,8 +135,8 @@ const lintJSONNative = (str, force) => {
             JSON.parse(str);
         }
         catch (e) {
-            const { message } = e, line = mt2num(/\bline (\d+)/u.exec(message)), column = mt2num(/\bcolumn (\d+)/u.exec(message)), position = mt2num(/\bposition (\d+)/u.exec(message));
-            return formatJsonError(str, [{ message, line, column, position, severity: 'error' }]);
+            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 [];

package/dist/index.mjs

@@ -1,52 +1,62 @@
 // 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 json_parse = /* @__PURE__ */ (() => {
   let at;
   let ch;
-  const escapee = {
-    '"': '"',
-    "\\": "\\",
-    "/": "/",
-    b: "\b",
-    f: "\f",
-    n: "\n",
-    r: "\r",
-    t: "	"
-  };
-  const spaces = /* @__PURE__ */ new Set([" ", "	", "\n", "\r"]);
   let text;
   let warnings;
-  const stringify = (c) => {
-    if (c === "") {
-      return "end of input";
+  const prepareError = (e, from, to) => {
+    if (from === void 0) {
+      e.from = at - 1;
+    } else {
+      e.from = from;
+      e.to = to ?? at - 1;
     }
-    return c === '"' ? `'"'` : JSON.stringify(c);
   };
-  const warn = (m) => {
-    warnings.push({
-      message: m,
-      position: at - 1,
+  const warn = (message, from, to) => {
+    const warning = {
+      message,
       severity: "warning"
-    });
+    };
+    prepareError(warning, from, to);
+    warnings.push(warning);
   };
-  const error = (m) => {
-    throw {
+  const error = (message, from, to) => {
+    const e = {
       warnings,
-      message: m,
-      position: at - 1,
+      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 += 1;
+    at++;
     return ch;
   };
   const number = () => {
-    let value2;
     let string2 = "";
+    const from = at - 1;
     if (ch === "-") {
       string2 = "-";
       next();
@@ -66,10 +76,11 @@ var json_parse = /* @__PURE__ */ (() => {
       error("No number after minus sign");
     }
     if (ch !== "." && ch !== "e" && ch !== "E") {
-      value2 = Number(string2);
-      if (!Number.isSafeInteger(value2)) {
-        warn("Not a safe integer");
+      const value3 = Number(string2);
+      if (!Number.isSafeInteger(value3)) {
+        warn("Not a safe integer", from);
       }
+      return;
     }
     if (ch === ".") {
       string2 += ".";
@@ -94,44 +105,43 @@ var json_parse = /* @__PURE__ */ (() => {
         next();
       }
     }
-    value2 ??= Number(string2);
+    const value2 = Number(string2);
     if (!Number.isFinite(value2)) {
       error("Bad number");
     }
   };
   const string = () => {
-    let hex;
-    let i;
     let value2 = "";
-    let uffff;
     if (ch === '"') {
       while (next()) {
         if (ch === '"') {
           next();
           return value2;
         }
+        const from = at - 1;
         if (ch === "\\") {
           next();
           if (ch === "u") {
-            uffff = 0;
-            for (i = 0; i < 4; i++) {
-              hex = parseInt(next(), 16);
+            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");
+              error("Bad unicode escape", from);
             }
             value2 += String.fromCharCode(uffff);
           } else if (typeof escapee[ch] === "string") {
             value2 += escapee[ch];
           } else {
-            error("Bad escaped character");
+            error("Bad escaped character", from, at);
           }
         } else if (ch < " ") {
-          error("Bad control character");
+          error("Bad control character", from, at);
         } else {
           value2 += ch;
         }
@@ -172,15 +182,16 @@ var json_parse = /* @__PURE__ */ (() => {
     }
   };
   const array = () => {
-    next("[");
+    next();
     white();
     if (ch === "]") {
       next();
       return;
     }
+    let from;
     while (ch) {
       if (ch === "]") {
-        error("Trailing comma in array");
+        error("Trailing comma in array", from, from + 1);
       }
       value();
       white();
@@ -188,6 +199,7 @@ var json_parse = /* @__PURE__ */ (() => {
         next();
         return;
       } else if (ch === ",") {
+        from = at - 1;
         next();
         white();
       } else {
@@ -197,23 +209,25 @@ var json_parse = /* @__PURE__ */ (() => {
     error("Unterminated array");
   };
   const object = () => {
-    let key;
     const keys = /* @__PURE__ */ new Set();
-    next("{");
+    next();
     white();
     if (ch === "}") {
       next();
       return;
     }
+    let from;
     while (ch) {
       if (ch === "}") {
-        error("Trailing comma in object");
+        error("Trailing comma in object", from, from + 1);
       }
-      key = string();
+      from = at;
+      const key = string();
+      const to = at - 2;
       white();
       next(":");
       if (keys.has(key)) {
-        warn(`Duplicate key ${stringify(key)}`);
+        warn(`Duplicate key ${stringify(key)}`, from, to);
       } else {
         keys.add(key);
       }
@@ -223,6 +237,7 @@ var json_parse = /* @__PURE__ */ (() => {
         next();
         return;
       } else if (ch === ",") {
+        from = at - 1;
         next();
         white();
       } else {
@@ -290,7 +305,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) => {
@@ -319,23 +334,33 @@ var splitLines = (str) => {
 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, position } = error;
-    if (position === null || position === void 0) {
+    const { line, column, from, to } = error;
+    if (from === null || from === void 0) {
       if (line) {
         lines ??= splitLines(str);
         error.column ??= 1;
-        error.position = lines[line - 1][1] + (error.column - 1);
+        error.from = lines[line - 1][1] + (error.column - 1);
       } else {
-        error.position = 0;
+        error.from = 0;
         error.line = 1;
         error.column = 1;
       }
     } else if (!line || !column) {
-      lines ??= splitLines(str);
-      error.line = lines.findIndex(([, , end]) => position <= end) + 1;
-      error.column = position - lines[error.line - 1][1] + 1;
+      Object.assign(error, offsetToPosition(from));
+    }
+    if (to !== void 0) {
+      ({ line: error.endLine, column: error.endColumn } = offsetToPosition(to));
     }
+    error.position = error.from;
   }
   return errors;
 };
@@ -344,8 +369,8 @@ var lintJSONNative = (str, force) => {
     try {
       JSON.parse(str);
     } catch (e) {
-      const { message } = e, line = mt2num(/\bline (\d+)/u.exec(message)), column = mt2num(/\bcolumn (\d+)/u.exec(message)), position = mt2num(/\bposition (\d+)/u.exec(message));
-      return formatJsonError(str, [{ message, line, column, position, severity: "error" }]);
+      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 [];

package/dist/json_parse.js

@@ -29,6 +29,23 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.json_parse = void 0;
+const escapee = {
+    '"': '"',
+    "\\": "\\",
+    "/": "/",
+    b: "\b",
+    f: "\f",
+    n: "\n",
+    r: "\r",
+    t: "\t",
+};
+const spaces = new Set([" ", "\t", "\n", "\r"]);
+const stringify = (c) => {
+    if (c === "") {
+        return "end of input";
+    }
+    return c === '"' ? `'"'` : JSON.stringify(c);
+};
 exports.json_parse = (() => {
     // This is a function that can parse a JSON text.
     // It is a simple, recursive descent parser.
@@ -37,41 +54,35 @@ exports.json_parse = (() => {
     // We are defining the function inside of another function to avoid creating global variables.
     let at; // The index of the current character
     let ch; // The current character
-    const escapee = {
-        '"': '"',
-        "\\": "\\",
-        "/": "/",
-        b: "\b",
-        f: "\f",
-        n: "\n",
-        r: "\r",
-        t: "\t",
-    };
-    const spaces = new Set([" ", "\t", "\n", "\r"]);
     let text;
     let warnings;
-    const stringify = (c) => {
-        if (c === "") {
-            return "end of input";
+    const prepareError = (e, from, to) => {
+        if (from === undefined) {
+            e.from = at - 1;
+        }
+        else {
+            e.from = from;
+            e.to = to ?? at - 1;
         }
-        return c === '"' ? `'"'` : JSON.stringify(c);
     };
-    const warn = (m) => {
+    const warn = (message, from, to) => {
         // Log warning when something is wrong.
-        warnings.push({
-            message: m,
-            position: at - 1,
+        const warning = {
+            message,
             severity: "warning",
-        });
+        };
+        prepareError(warning, from, to);
+        warnings.push(warning);
     };
-    const error = (m) => {
+    const error = (message, from, to) => {
         // Call error when something is wrong.
-        throw {
+        const e = {
             warnings,
-            message: m,
-            position: at - 1,
+            message,
             severity: "error",
         };
+        prepareError(e, from, to);
+        throw e;
     };
     const next = (c) => {
         // If a c parameter is provided, verify that it matches the current character.
@@ -80,13 +91,13 @@ exports.json_parse = (() => {
         }
         // Get the next character. When there are no more characters, return the empty string.
         ch = text.charAt(at);
-        at += 1;
+        at++;
         return ch;
     };
     const number = () => {
         // Parse a number value.
-        let value;
         let string = "";
+        const from = at - 1;
         if (ch === "-") {
             string = "-";
             next();
@@ -108,10 +119,11 @@ exports.json_parse = (() => {
             error("No number after minus sign");
         }
         if (ch !== "." && ch !== "e" && ch !== "E") {
-            value = Number(string);
+            const value = Number(string);
             if (!Number.isSafeInteger(value)) {
-                warn("Not a safe integer");
+                warn("Not a safe integer", from);
             }
+            return;
         }
         if (ch === ".") {
             string += ".";
@@ -137,17 +149,14 @@ exports.json_parse = (() => {
                 next();
             }
         }
-        value ??= Number(string);
+        const value = Number(string);
         if (!Number.isFinite(value)) {
             error("Bad number");
         }
     };
     const string = () => {
         // Parse a string value.
-        let hex;
-        let i;
         let value = "";
-        let uffff;
         // When parsing for string values, we must look for " and \ characters.
         if (ch === '"') {
             while (next()) {
@@ -155,19 +164,21 @@ exports.json_parse = (() => {
                     next();
                     return value;
                 }
+                const from = at - 1;
                 if (ch === "\\") {
                     next();
                     if (ch === "u") {
-                        uffff = 0;
-                        for (i = 0; i < 4; i++) {
-                            hex = parseInt(next(), 16);
+                        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");
+                            error("Bad unicode escape", from);
                         }
                         value += String.fromCharCode(uffff);
                     }
@@ -175,11 +186,11 @@ exports.json_parse = (() => {
                         value += escapee[ch];
                     }
                     else {
-                        error("Bad escaped character");
+                        error("Bad escaped character", from, at);
                     }
                 }
                 else if (ch < " ") {
-                    error("Bad control character");
+                    error("Bad control character", from, at);
                 }
                 else {
                     value += ch;
@@ -225,15 +236,16 @@ exports.json_parse = (() => {
     };
     const array = () => {
         // Parse an array value.
-        next("[");
+        next();
         white();
         if (ch === "]") {
             next();
             return; // empty array
         }
+        let from;
         while (ch) {
             if (ch === "]") {
-                error("Trailing comma in array");
+                error("Trailing comma in array", from, from + 1);
             }
             value();
             white();
@@ -242,6 +254,7 @@ exports.json_parse = (() => {
                 return;
             }
             else if (ch === ",") {
+                from = at - 1;
                 next();
                 white();
             }
@@ -253,23 +266,25 @@ exports.json_parse = (() => {
     };
     const object = () => {
         // Parse an object value.
-        let key;
         const keys = new Set();
-        next("{");
+        next();
         white();
         if (ch === "}") {
             next();
             return; // empty object
         }
+        let from;
         while (ch) {
             if (ch === "}") {
-                error("Trailing comma in object");
+                error("Trailing comma in object", from, from + 1);
             }
-            key = string();
+            from = at;
+            const key = string();
+            const to = at - 2;
             white();
             next(":");
             if (keys.has(key)) {
-                warn(`Duplicate key ${stringify(key)}`);
+                warn(`Duplicate key ${stringify(key)}`, from, to);
             }
             else {
                 keys.add(key);
@@ -281,6 +296,7 @@ exports.json_parse = (() => {
                 return;
             }
             else if (ch === ",") {
+                from = at - 1;
                 next();
                 white();
             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/common",
-	"version": "1.2.0",
+	"version": "1.3.1",
 	"homepage": "https://github.com/bhsd-harry/common#readme",
 	"bugs": {
 		"url": "https://github.com/bhsd-harry/common/issues"