json-as 0.5.25 → 0.5.27

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
+    MIT License
 
-Copyright (c) 2023 Jairus Tanaka <jairus.v.tanaka@outlook.com>
+    Copyright (c) 2023 Jairus Tanaka <jairus.v.tanaka@outlook.com>
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.

package/asconfig.json

@@ -12,9 +12,6 @@
   "options": {
     "transform": [
       "./transform"
-    ],
-    "bindings": "esm",
-    "exportStart": "_start"
-  },
-  "extends": "./node_modules/@assemblyscript/wasi-shim/asconfig.json"
+    ]
+  }
 }

package/assembly/__benches__/as-json.ts

@@ -1,22 +1,24 @@
 import { JSON } from "..";
 
 @json
-class Vec2 {
+class Vec3 {
   x: f32;
   y: f32;
+  z: f32;
 }
 
-const vec: Vec2 = blackbox<Vec2>({
+const vec: Vec3 = blackbox<Vec3>({
   x: 0.0,
   y: 0.0,
+  z: 0.0
 });
 
-bench("Stringify Object (Vec2)", () => {
+bench("Stringify Object (Vec3)", () => {
   blackbox(JSON.stringify(vec));
-});
+});/*
 
-bench("Parse Object (Vec2)", () => {
-  blackbox(JSON.parse<Vec2>(blackbox('{"x":0.0,"y":0.0}')));
+bench("Parse Object (Vec3)", () => {
+  blackbox(JSON.parse<Vec3>(blackbox('{"x":0.0,"y":0.0,"z":0.0}')));
 });
 
 bench("Stringify Array", () => {
@@ -39,14 +41,14 @@ bench("Stringify Nested Array", () => {
 
 bench("Parse Nested Array", () => {
   blackbox(JSON.parse<string[][]>(blackbox('[["a","b","c"]]')));
-});
+});*/
 
 bench("Stringify String", () => {
-  blackbox(JSON.stringify(blackbox("Hello")));
+  blackbox(JSON.stringify(blackbox("Hello \"World!")));
 });
 
 bench("Parse String", () => {
-  blackbox(JSON.parse<string>(blackbox('"Hello"')));
+  blackbox(JSON.parse<string>(blackbox('"Hello \"World!"')));
 });
 /*
 bench("Stringify Boolean", () => {

package/assembly/src/json.ts

@@ -40,52 +40,65 @@ export namespace JSON {
     export function stringify<T>(data: T): string {
         // String
         if (isString<T>() && data != null) {
-            let result = new StringSink("\"");
+            // @ts-ignore
+            if (data.length === 0) return "\"\"";
+
+            let result = "\"";
+
+            let char: i32 = 0;
+            let last: i32 = 0;
+            let found: boolean = false;
             // @ts-ignore
             for (let i = 0; i < data.length; i++) {
-                // @ts-ignore
-                switch (unsafeCharCodeAt(data, i)) {
-                    case 0x22: {
-                        result.write("\\\"");
-                        break;
-                    }
-                    case 0x5C: {
-                        result.write("\\\\");
-                        break;
-                    }
-                    case 0x08: {
-                        result.write("\\b");
-                        break;
-                    }
-                    case 0x0A: {
-                        result.write("\\n");
-                        break;
-                    }
-                    case 0x0D: {
-                        result.write("\\r");
-                        break;
-                    }
-                    case 0x09: {
-                        result.write("\\t");
-                        break;
-                    }
-                    case 0x0C: {
-                        result.write("\\f");
-                        break;
-                    }
-                    case 0x0B: {
-                        result.write("\\u000b");
-                        break;
-                    }
-                    default: {
-                        // @ts-ignore
-                        result.write(data.charAt(i));
-                        break;
+                char = unsafeCharCodeAt(<string>data, i);
+                if (char === 34 || char === 92) {
+                    result += (<string>data).slice(last, i) + "\\";
+                    last = i;
+                    found = true;
+                    i++;
+                } else if (char <= 13 && char >= 8) {
+                    result += (<string>data).slice(last, i);
+                    last = ++i;
+                    found = true;
+                    switch (char) {
+                        case 0x22: {
+                            result += "\\\"";
+                            break;
+                        }
+                        case 0x5C: {
+                            result += "\\\\";
+                            break;
+                        }
+                        case 0x08: {
+                            result += "\\b";
+                            break;
+                        }
+                        case 0x0A: {
+                            result += "\\n";
+                            break;
+                        }
+                        case 0x0D: {
+                            result += "\\r";
+                            break;
+                        }
+                        case 0x09: {
+                            result += "\\t";
+                            break;
+                        }
+                        case 0x0C: {
+                            result += "\\f";
+                            break;
+                        }
+                        case 0x0B: {
+                            result += "\\u000b";
+                            break;
+                        }
                     }
                 }
-            }
-            result.write("\"");
-            return result.toString();
+            }// 8 10 13 9 12
+            if (!found) return "\"" + data + "\"";
+            else result += (<string>data).slice(last);
+            return result + "\"";
         }
         // Boolean
         else if (isBoolean<T>()) {
@@ -205,17 +218,17 @@ export namespace JSON {
 function parseBigNum<T>(data: string): T {
     // @ts-ignore
     if (idof<T>() == idof<u128>()) return u128.fromString(data);
-        // @ts-ignore
+    // @ts-ignore
     if (idof<T>() == idof<u128Safe>()) return u128Safe.fromString(data);
-        // @ts-ignore
+    // @ts-ignore
     if (idof<T>() == idof<u256>()) return u128Safe.fromString(data);
-        // @ts-ignore
+    // @ts-ignore
     if (idof<T>() == idof<u256Safe>()) return u256Safe.fromString(data);
-        // @ts-ignore
+    // @ts-ignore
     if (idof<T>() == idof<i128>()) return i128.fromString(data);
-        // @ts-ignore
+    // @ts-ignore
     if (idof<T>() == idof<i128Safe>()) return i128Safe.fromString(data);
-        // @ts-ignore
+    // @ts-ignore
     //if (idof<T>() == idof<i256Safe>()) return data.
 }
 
@@ -394,7 +407,7 @@ function parseArray<T extends unknown[]>(data: string): T {
         return parseArrayArray<T>(data);
         // @ts-ignore
     } else if (isManaged<valueof<T>>() || isReference<valueof<T>>()) {
-        const type = changetype<nonnull<valueof<T>>>(__new(offsetof<nonnull<valueof<T>>>(), idof <nonnull<valueof<T>>>()));
+        const type = changetype<nonnull<valueof<T>>>(__new(offsetof<nonnull<valueof<T>>>(), idof<nonnull<valueof<T>>>()));
         // @ts-ignore
         if (isDefined(type.__JSON_Set_Key)) {
             // @ts-ignore

package/assembly/test.ts

@@ -5,13 +5,25 @@ import {
 
 const exp = `["abcdefg","st\\"ring\\" w\\"\\"ith quotes\\"","string \\t\\r\\"with ran\\tdom spa\\nces and \\nnewlines\\n\\n\\n","string with colon : comma , brace [ ] bracket { } and quote \\" and other quote \\""]`;
 
-console.log(exp);
-console.log(JSON.stringify([
+///console.log(exp);
+/*console.log(JSON.stringify([
   "abcdefg",
   'st"ring" w""ith quotes"',
   'string \t\r"with ran\tdom spa\nces and \nnewlines\n\n\n',
   'string with colon : comma , brace [ ] bracket { } and quote " and other quote "',
-]))
+]));*/
+
+console.log("abcdefg");
+console.log('st"ring" w""ith quotes"');
+console.log('string \t\r"with ran\tdom spa\nces and \nnewlines\n\n\n');
+console.log('string with colon : comma , brace [ ] bracket { } and quote " and other quote "');
+
+console.log(JSON.stringify("abcdefg"));
+console.log(JSON.stringify('st"ring" w""ith quotes"'));
+console.log(JSON.stringify('string \t\r"with ran\tdom spa\nces and \nnewlines\n\n\n'));
+console.log(JSON.stringify('string with colon : comma , brace [ ] bracket { } and quote " and other quote "'));
+
+console.log(JSON.stringify("Hello W\"orld!"));
 // @ts-ignore
 @JSON
 class Vec3 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.5.25",
+  "version": "0.5.27",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",

package/transform/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@json-as/transform",
-    "version": "0.5.25",
+    "version": "0.5.27",
     "description": "JSON encoder/decoder for AssemblyScript",
     "main": "./lib/index.js",
     "author": "Jairus Tanaka",