Add JUSTC validation to fix decompress() returning null for compressed objects, and disable JSON string to JUSTC conversion by default

Author: justdevw

src/core.js

@@ -246,6 +246,35 @@ async function validateOffsetEncoding(string, inp, group) {
     }
 }
 
+async function parseJUSTC(str) {
+    try {
+        const result = JUSTC.parse(str);
+
+        if (result && typeof result.then === 'function') {
+            return await result;
+        }
+
+        return result;
+    } catch (err) {
+        if (typeof window !== 'undefined') { /* Browsers */
+            try {
+                await JUSTC.initialize();
+
+                const retry = JUSTC.parse(str);
+                if (retry && typeof retry.then === 'function') {
+                    return await retry;
+                }
+
+                return retry;
+            } catch {
+                return null;
+            }
+        }
+
+        return null;
+    }
+}
+
 /**
  * **JavaScript String Compressor - compress function.**
  * @param {string|object|number} input string
@@ -269,6 +298,7 @@ export async function compress(input, options) {
         minifiedworker: true,
         depthlimit: 10,
         workerlimit: 2,
+        jsonstring: false,
         debug: false,
 
         depth: 0,
@@ -325,9 +355,15 @@ export async function compress(input, options) {
         } else
         /* JSON Object (as object) */
         if (typeof str == 'object') try {
+            let JUSTCstr = undefined;
             if (opts.justc) {
                 const JUSTCobj = await toJUSTC(str);
-                str = JUSTCobj;
+                const JSONstr = JSON.stringify(await parseJUSTC(JUSTCobj));
+                if (JSONstr == JSON.stringify(str)) JUSTCstr = JUSTCobj;
+            }
+
+            if (typeof JUSTCstr != 'undefined') {
+                str = JUSTCstr;
                 code3 = 2;
             } else {
                 str = JSON.stringify(str);
@@ -342,16 +378,21 @@ export async function compress(input, options) {
             const obj = JSON.parse(str);
             if (!Array.isArray(obj) && typeof obj == 'object') {
 
-            const JUSTCobj = opts.justc ? await toJUSTC(obj) : false;
+            let JUSTCstr = undefined;
+            if (opts.justc && opts.jsonstring) {
+                const JUSTCobj = await toJUSTC(obj);
+                const JSONstr = JSON.stringify(await parseJUSTC(JUSTCobj));
+                if (JSONstr == JSON.stringify(str)) JUSTCstr = JUSTCobj;
+            }
 
-            if (JUSTCobj && JUSTCobj.length < str.length && str == JSON.stringify(obj)) {                
-                str = JUSTCobj;
+            if (typeof JUSTCstr != 'undefined' && JUSTCstr.length < str.length && str == JSON.stringify(obj)) {                
+                str = JUSTCstr;
                 code3 = 1;
             } else {
                 str = str.slice(1,-1);
                 code3 = 5;
             }
-        } else if (typeof obj == 'object') {
+        } else if (typeof obj == 'object' && Array.isArray(obj)) {
         /* JSON Array (as string) */
         str = str.slice(1,-1);
         code3 = 3;
@@ -514,35 +555,6 @@ function characterEncodings(id, realstr) {
     }
 }
 
-async function parseJUSTC(str) {
-    try {
-        const result = JUSTC.parse(str);
-
-        if (result && typeof result.then === 'function') {
-            return await result;
-        }
-
-        return result;
-    } catch (err) {
-        if (typeof window !== 'undefined') { /* Browsers */
-            try {
-                await JUSTC.initialize();
-
-                const retry = JUSTC.parse(str);
-                if (retry && typeof retry.then === 'function') {
-                    return await retry;
-                }
-
-                return retry;
-            } catch {
-                return null;
-            }
-        }
-
-        return null;
-    }
-}
-
 function offsetDecoding(str, group) {
     const offset = group * 32;
     const result = [];