corebasic 1.0.224 → 1.0.226

package/dist/libs/utils.js

@@ -228,59 +228,117 @@ export function validityToUTCMillisecs(start, validity) {
 export async function fileToJson(path, file) {
     let data = (await readFile(new URL(file, path).toString().replace('file://', ''), 'utf8'));
     // return JSON.parse((JSON as Record<string, any>).minify(data))
-    const json_minify = function (json) {
-        var tokenizer = /"|(\/\*)|(\*\/)|(\/\/)|\n|\r|\[|]/g, in_string = false, in_multiline_comment = false, in_singleline_comment = false, tmp, tmp2, new_str = [], ns = 0, from = 0, lc, rc, prevFrom;
-        tokenizer.lastIndex = 0;
-        while (tmp = tokenizer.exec(json)) {
-            lc = RegExp.leftContext;
-            rc = RegExp.rightContext;
-            if (!in_multiline_comment && !in_singleline_comment) {
-                tmp2 = lc.substring(from);
-                if (!in_string) {
-                    tmp2 = tmp2.replace(/(\n|\r|\s)*/g, "");
+    // import stripJsonComments from "strip-json-comments";
+    // ====================================================
+    const singleComment = Symbol('singleComment');
+    const multiComment = Symbol('multiComment');
+    const stripWithoutWhitespace = () => '';
+    // Replace all characters except ASCII spaces, tabs and line endings with regular spaces to ensure valid JSON output.
+    const stripWithWhitespace = (string, start, end) => string.slice(start, end).replace(/[^ \t\r\n]/g, ' ');
+    const isEscaped = (jsonString, quotePosition) => {
+        let index = quotePosition - 1;
+        let backslashCount = 0;
+        while (jsonString[index] === '\\') {
+            index -= 1;
+            backslashCount += 1;
+        }
+        return Boolean(backslashCount % 2);
+    };
+    function stripJsonComments(jsonString, { whitespace = true, trailingCommas = false } = {}) {
+        if (typeof jsonString !== 'string') {
+            throw new TypeError(`Expected argument \`jsonString\` to be a \`string\`, got \`${typeof jsonString}\``);
+        }
+        const strip = whitespace ? stripWithWhitespace : stripWithoutWhitespace;
+        let isInsideString = false;
+        let isInsideComment = false;
+        // let isInsideComment = false;
+        let offset = 0;
+        let buffer = '';
+        let result = '';
+        let commaIndex = -1;
+        for (let index = 0; index < jsonString.length; index++) {
+            const currentCharacter = jsonString[index];
+            const nextCharacter = jsonString[index + 1];
+            if (!isInsideComment && currentCharacter === '"') {
+                // Enter or exit string
+                const escaped = isEscaped(jsonString, index);
+                if (!escaped) {
+                    isInsideString = !isInsideString;
                 }
-                new_str[ns++] = tmp2;
             }
-            prevFrom = from;
-            from = tokenizer.lastIndex;
-            // found a " character, and we're not currently in
-            // a comment? check for previous `\` escaping immediately
-            // leftward adjacent to this match
-            if (tmp[0] === "\"" && !in_multiline_comment && !in_singleline_comment) {
-                // limit left-context matching to only go back
-                // to the position of the last token match
-                //
-                // see: https://github.com/getify/JSON.minify/issues/64
-                lc.lastIndex = prevFrom;
-                // perform leftward adjacent escaping match
-                tmp2 = lc.match(/(\\)*$/);
-                // start of string with ", or unescaped " character found to end string?
-                if (!in_string || !tmp2 || (tmp2[0].length % 2) === 0) {
-                    in_string = !in_string;
-                }
-                from--; // include " character in next catch
-                rc = json.substring(from);
+            if (isInsideString) {
+                continue;
             }
-            else if (tmp[0] === "/*" && !in_string && !in_multiline_comment && !in_singleline_comment) {
-                in_multiline_comment = true;
+            if (!isInsideComment && currentCharacter + nextCharacter === '//') {
+                // Enter single-line comment
+                buffer += jsonString.slice(offset, index);
+                offset = index;
+                isInsideComment = singleComment;
+                index++;
             }
-            else if (tmp[0] === "*/" && !in_string && in_multiline_comment && !in_singleline_comment) {
-                in_multiline_comment = false;
+            else if (isInsideComment === singleComment && currentCharacter + nextCharacter === '\r\n') {
+                // Exit single-line comment via \r\n
+                index++;
+                isInsideComment = false;
+                buffer += strip(jsonString, offset, index);
+                offset = index;
+                continue;
             }
-            else if (tmp[0] === "//" && !in_string && !in_multiline_comment && !in_singleline_comment) {
-                in_singleline_comment = true;
+            else if (isInsideComment === singleComment && currentCharacter === '\n') {
+                // Exit single-line comment via \n
+                isInsideComment = false;
+                buffer += strip(jsonString, offset, index);
+                offset = index;
             }
-            else if ((tmp[0] === "\n" || tmp[0] === "\r") && !in_string && !in_multiline_comment && in_singleline_comment) {
-                in_singleline_comment = false;
+            else if (!isInsideComment && currentCharacter + nextCharacter === '/*') {
+                // Enter multiline comment
+                buffer += jsonString.slice(offset, index);
+                offset = index;
+                isInsideComment = multiComment;
+                index++;
+                continue;
             }
-            else if (!in_multiline_comment && !in_singleline_comment && !(/\n|\r|\s/.test(tmp[0]))) {
-                new_str[ns++] = tmp[0];
+            else if (isInsideComment === multiComment && currentCharacter + nextCharacter === '*/') {
+                // Exit multiline comment
+                index++;
+                isInsideComment = false;
+                buffer += strip(jsonString, offset, index + 1);
+                offset = index + 1;
+                continue;
+            }
+            else if (trailingCommas && !isInsideComment) {
+                if (commaIndex !== -1) {
+                    if (currentCharacter === '}' || currentCharacter === ']') {
+                        // Strip trailing comma
+                        buffer += jsonString.slice(offset, index);
+                        result += strip(buffer, 0, 1) + buffer.slice(1);
+                        buffer = '';
+                        offset = index;
+                        commaIndex = -1;
+                    }
+                    else if (currentCharacter !== ' ' && currentCharacter !== '\t' && currentCharacter !== '\r' && currentCharacter !== '\n') {
+                        // Hit non-whitespace following a comma; comma is not trailing
+                        buffer += jsonString.slice(offset, index);
+                        offset = index;
+                        commaIndex = -1;
+                    }
+                }
+                else if (currentCharacter === ',') {
+                    // Flush buffer prior to this point, and save new comma index
+                    result += buffer + jsonString.slice(offset, index);
+                    buffer = '';
+                    offset = index;
+                    commaIndex = index;
+                }
             }
         }
-        new_str[ns++] = rc;
-        return new_str.join("");
-    };
-    return JSON.parse(json_minify(data));
+        const remaining = (isInsideComment === singleComment)
+            ? strip(jsonString, offset)
+            : jsonString.slice(offset);
+        return result + buffer + remaining;
+    }
+    // ====================================================
+    return JSON.parse(stripJsonComments(data));
 }
 // ----------------
 // File

package/libs/utils.ts

@@ -280,72 +280,126 @@ export async function fileToJson(path, file) {
     let data = (await readFile(new URL(file, path).toString().replace('file://',''), 'utf8'))
     // return JSON.parse((JSON as Record<string, any>).minify(data))
 
-    const json_minify = function (json: string): string {
-
-        var tokenizer = /"|(\/\*)|(\*\/)|(\/\/)|\n|\r|\[|]/g,
-        in_string = false,
-        in_multiline_comment = false,
-        in_singleline_comment = false,
-        tmp, tmp2, new_str = [], ns = 0, from = 0, lc, rc,
-        prevFrom
-        ;
-
-        tokenizer.lastIndex = 0;
-
-        while ( tmp = tokenizer.exec(json) ) {
-            lc = RegExp.leftContext;
-            rc = RegExp.rightContext;
-            if (!in_multiline_comment && !in_singleline_comment) {
-                tmp2 = lc.substring(from);
-                if (!in_string) {
-                    tmp2 = tmp2.replace(/(\n|\r|\s)*/g,"");
-                }
-                new_str[ns++] = tmp2;
-            }
-            prevFrom = from;
-            from = tokenizer.lastIndex;
-
-            // found a " character, and we're not currently in
-            // a comment? check for previous `\` escaping immediately
-            // leftward adjacent to this match
-            if (tmp[0] === "\"" && !in_multiline_comment && !in_singleline_comment) {
-                // limit left-context matching to only go back
-                // to the position of the last token match
-                //
-                // see: https://github.com/getify/JSON.minify/issues/64
-                lc.lastIndex = prevFrom;
-
-                // perform leftward adjacent escaping match
-                tmp2 = lc.match(/(\\)*$/);
-                // start of string with ", or unescaped " character found to end string?
-                if (!in_string || !tmp2 || (tmp2[0].length % 2) === 0) {
-                    in_string = !in_string;
+    // import stripJsonComments from "strip-json-comments";
+    // ====================================================
+    const singleComment = Symbol('singleComment');
+    const multiComment = Symbol('multiComment');
+
+    const stripWithoutWhitespace = () => '';
+
+    // Replace all characters except ASCII spaces, tabs and line endings with regular spaces to ensure valid JSON output.
+    const stripWithWhitespace = (string, start, end?: number) => string.slice(start, end).replace(/[^ \t\r\n]/g, ' ');
+
+    const isEscaped = (jsonString, quotePosition) => {
+        let index = quotePosition - 1;
+        let backslashCount = 0;
+
+        while (jsonString[index] === '\\') {
+            index -= 1;
+            backslashCount += 1;
+        }
+
+        return Boolean(backslashCount % 2);
+    };
+
+    function stripJsonComments(jsonString, {whitespace = true, trailingCommas = false} = {}) {
+        if (typeof jsonString !== 'string') {
+            throw new TypeError(`Expected argument \`jsonString\` to be a \`string\`, got \`${typeof jsonString}\``);
+        }
+
+        const strip = whitespace ? stripWithWhitespace : stripWithoutWhitespace;
+
+        let isInsideString = false;
+        let isInsideComment: false | typeof singleComment | typeof multiComment = false;
+        // let isInsideComment = false;
+        let offset = 0;
+        let buffer = '';
+        let result = '';
+        let commaIndex = -1;
+
+        for (let index = 0; index < jsonString.length; index++) {
+            const currentCharacter = jsonString[index];
+            const nextCharacter = jsonString[index + 1];
+
+            if (!isInsideComment && currentCharacter === '"') {
+                // Enter or exit string
+                const escaped = isEscaped(jsonString, index);
+                if (!escaped) {
+                    isInsideString = !isInsideString;
                 }
-                from--; // include " character in next catch
-                rc = json.substring(from);
-            }
-            else if (tmp[0] === "/*" && !in_string && !in_multiline_comment && !in_singleline_comment) {
-                in_multiline_comment = true;
-            }
-            else if (tmp[0] === "*/" && !in_string && in_multiline_comment && !in_singleline_comment) {
-                in_multiline_comment = false;
             }
-            else if (tmp[0] === "//" && !in_string && !in_multiline_comment && !in_singleline_comment) {
-                in_singleline_comment = true;
-            }
-            else if ((tmp[0] === "\n" || tmp[0] === "\r") && !in_string && !in_multiline_comment && in_singleline_comment) {
-                in_singleline_comment = false;
+
+            if (isInsideString) {
+                continue;
             }
-            else if (!in_multiline_comment && !in_singleline_comment && !(/\n|\r|\s/.test(tmp[0]))) {
-                new_str[ns++] = tmp[0];
+
+            if (!isInsideComment && currentCharacter + nextCharacter === '//') {
+                // Enter single-line comment
+                buffer += jsonString.slice(offset, index);
+                offset = index;
+                isInsideComment = singleComment;
+                index++;
+            } else if (isInsideComment === singleComment && currentCharacter + nextCharacter === '\r\n') {
+                // Exit single-line comment via \r\n
+                index++;
+                isInsideComment = false;
+                buffer += strip(jsonString, offset, index);
+                offset = index;
+                continue;
+            } else if (isInsideComment === singleComment && currentCharacter === '\n') {
+                // Exit single-line comment via \n
+                isInsideComment = false;
+                buffer += strip(jsonString, offset, index);
+                offset = index;
+            } else if (!isInsideComment && currentCharacter + nextCharacter === '/*') {
+                // Enter multiline comment
+                buffer += jsonString.slice(offset, index);
+                offset = index;
+                isInsideComment = multiComment;
+                index++;
+                continue;
+            } else if (isInsideComment === multiComment && currentCharacter + nextCharacter === '*/') {
+                // Exit multiline comment
+                index++;
+                isInsideComment = false;
+                buffer += strip(jsonString, offset, index + 1);
+                offset = index + 1;
+                continue;
+            } else if (trailingCommas && !isInsideComment) {
+                if (commaIndex !== -1) {
+                    if (currentCharacter === '}' || currentCharacter === ']') {
+                        // Strip trailing comma
+                        buffer += jsonString.slice(offset, index);
+                        result += strip(buffer, 0, 1) + buffer.slice(1);
+                        buffer = '';
+                        offset = index;
+                        commaIndex = -1;
+                    } else if (currentCharacter !== ' ' && currentCharacter !== '\t' && currentCharacter !== '\r' && currentCharacter !== '\n') {
+                        // Hit non-whitespace following a comma; comma is not trailing
+                        buffer += jsonString.slice(offset, index);
+                        offset = index;
+                        commaIndex = -1;
+                    }
+                } else if (currentCharacter === ',') {
+                    // Flush buffer prior to this point, and save new comma index
+                    result += buffer + jsonString.slice(offset, index);
+                    buffer = '';
+                    offset = index;
+                    commaIndex = index;
+                }
             }
         }
-        new_str[ns++] = rc;
-        return new_str.join("");
+
+        const remaining = (isInsideComment === singleComment)
+        ? strip(jsonString, offset)
+        : jsonString.slice(offset);
+
+        return result + buffer + remaining;
     }
+    // ====================================================
 
 
-    return JSON.parse(json_minify(data))
+    return JSON.parse(stripJsonComments(data))
 }
 
 // ----------------

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "corebasic",
   "type": "module",
-  "version": "1.0.224",
+  "version": "1.0.226",
   "description": "",
   "main": "dist/index.js",
   "types": "./index.ts",

package/tsconfig.json

@@ -38,7 +38,7 @@
       // "noPropertyAccessFromIndexSignature": true,
 
       // Recommended Options
-      "strict": true,
+      "strict": false,
       "jsx": "react-jsx",
       "verbatimModuleSyntax": true,
       "isolatedModules": true,