json-as 0.5.60 → 0.5.62

package/README.md

@@ -1,6 +1,4 @@
-# AS-JSON
-
-JSON for AssemblyScript focused on performance, low-overhead, and ease-of-use.
+<h1 align=center>JSON<h4 align=center>Implementation of JSON for modern AssemblyScript</h3></h1>
 
 ## Installation
 

package/assembly/__tests__/as-json.spec.ts

@@ -5,6 +5,25 @@ function canSerde<T>(data: T, toBe: string = ""): void {
   expect(deserialized).toBe(toBe);
 }
 
+function canDeser<T>(data: string, toBe: T): void {
+  const deserialized = JSON.parse<T>(data);
+  expect(deserialized).toStrictEqual(toBe);
+}
+
+function canSer<T>(data: T, toBe: string): void {
+  const serialized = JSON.stringify<T>(data);
+  expect(serialized).toBe(toBe);
+}
+
+// @ts-ignore
+@json
+class Map4 {
+  a: string;
+  b: string;
+  c: string;
+  d: string;
+}
+
 // @ts-ignore
 @json
 class Vec3 {
@@ -152,3 +171,35 @@ describe("Ser/de Objects", () => {
     }, '{"firstName":"Emmet","lastName":"West","lastActive":[8,27,2022],"age":23,"pos":{"x":3.4,"y":1.2,"z":8.3},"isVerified":true}');
   });
 });
+
+describe("Ser externals", () => {
+  it("should serialize valid objects", () => {
+    canSer<Map4>({ a: '\\', b: '}', c: '][', d: '"' }, '{"a":"\\\\","b":"}","c":"][","d":"\\""}')
+    canSer<Vec3>({ x: 0.4, y: 1.4, z: 0 }, '{"x":0.4,"y":1.4,"z":0.0}')
+  })
+});
+
+// @ts-ignore
+@json
+class HttpResp {
+  statusCode: number;
+  headers: Array<Array<string>>;
+  body: string;
+}
+
+describe("Deser externals", () => {
+  it("should deserialize valid JSON strings", () => {
+    canDeser<Map4>('\n{"a":\r"\\\\",\n\r"b":"}","c":"][","d"\t:\t"\\""}', { a: '\\', b: '}', c: '][', d: '"' })
+    canDeser<Vec3>('{"x":0.4,"y":1.4,"z":0.0}', { x: 0.4, y: 1.4, z: 0 })
+    canDeser<HttpResp>('{"statusCode":200,"headers":[["Conn\\\\ection","close"],["Content-Length","375"],["ETag","W/\\"177-/Ihew5Z+fiI8NLbTM2Wyphl/PFY\\""]],\n"body":"{\\n  \\\"args\\\": {},\\n  \\\"headers\\\": {\\n    \\\"content-length\\\": \\\"0\\\",\\n    \\\"accept\\\": \\\"*/*\\\" \\n}}"}',
+      {
+        statusCode: 200,
+        headers: [
+          ['Conn\\ection', 'close'],
+          ['Content-Length', '375'],
+          ['ETag', 'W/\"177-/Ihew5Z+fiI8NLbTM2Wyphl/PFY\"']
+        ],
+        body: '{\n  "args": {},\n  "headers": {\n    "content-length": "0",\n    "accept": "*/*" \n}}'
+      })
+  })
+});

package/assembly/src/json.ts

@@ -407,26 +407,31 @@ export namespace JSON {
         }
       }
     } else if (char === quoteCode) {
+      let escaping = false;
       for (
         let stringValueIndex = ++outerLoopIndex;
         stringValueIndex < data.length - 1;
         stringValueIndex++
       ) {
         const char = unsafeCharCodeAt(data, stringValueIndex);
-        if (
-          char === quoteCode &&
-          unsafeCharCodeAt(data, stringValueIndex - 1) !== backSlashCode
-        ) {
-          if (isKey === false) {
-            key.reinst(data, outerLoopIndex, stringValueIndex);
-            isKey = true;
-          } else {
-            // @ts-ignore
-            schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex, stringValueIndex);
-            isKey = false;
+        if (char === backSlashCode && !escaping) {
+          escaping = true;
+        } else {
+          if (
+            char === quoteCode && !escaping
+          ) {
+            if (isKey === false) {
+              key.reinst(data, outerLoopIndex, stringValueIndex);
+              isKey = true;
+            } else {
+              // @ts-ignore
+              schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex, stringValueIndex);
+              isKey = false;
+            }
+            outerLoopIndex = ++stringValueIndex;
+            break;
           }
-          outerLoopIndex = ++stringValueIndex;
-          break;
+          escaping = false;
         }
       }
     } else if (char == nCode) {
@@ -503,15 +508,22 @@ export namespace JSON {
   const result: string[] = [];
   let lastPos = 0;
   let instr = false;
+  let escaping = false;
   for (let i = 1; i < data.length - 1; i++) {
-    if (unsafeCharCodeAt(data, i) === quoteCode) {
-      if (instr === false) {
-        instr = true;
-        lastPos = i;
-      } else if (unsafeCharCodeAt(data, i - 1) !== backSlashCode) {
-        instr = false;
-        result.push(parseString(data.slice(lastPos, i)));
+    const char = unsafeCharCodeAt(data, i);
+    if (char === backSlashCode && !escaping) {
+      escaping = true;
+    } else {
+      if (char === quoteCode && !escaping) {
+        if (instr === false) {
+          instr = true;
+          lastPos = i;
+        } else {
+          instr = false;
+          result.push(parseString(data.slice(lastPos, i + 1)));
+        }
       }
+      escaping = false;
     }
   }
   return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.5.60",
+  "version": "0.5.62",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -9,7 +9,8 @@
     "Romdotdog",
     "Derek Barrera",
     "Frankk Taylor",
-    "lekiano"
+    "lekiano",
+    "Florian Guitton"
   ],
   "license": "MIT",
   "scripts": {
@@ -33,7 +34,7 @@
     "@assemblyscript/wasi-shim": "^0.1.0",
     "as-bench": "^0.0.0-alpha",
     "assemblyscript": "^0.27.9",
-    "assemblyscript-prettier": "^2.0.2",
+    "assemblyscript-prettier": "^3.0.1",
     "benchmark": "^2.1.4",
     "kati": "^0.6.2",
     "microtime": "^3.1.1",

package/transform/lib/index.js

@@ -143,8 +143,10 @@ class AsJSONTransform extends BaseVisitor {
       }
       `;
         }
+        // Odd behavior here... When pairing this transform with asyncify, having @inline on __JSON_Set_Key<T> with a generic will cause it to freeze.
+        // Binaryen cannot predict and add/mangle code when it is genericed.
         const setKeyFunc = `
-      @inline __JSON_Set_Key<T>(key: T, data: string, val_start: i32, val_end: i32): void {
+      __JSON_Set_Key<T>(key: T, data: string, val_start: i32, val_end: i32): void {
         ${
         // @ts-ignore
         this.currentClass.setDataStmts.join("")}

package/transform/package.json

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