json-as 0.9.2 → 0.9.4

package/CHANGELOG

@@ -7,5 +7,7 @@ v0.8.6 - Fix. Forgot to stash before publishing. Stash and push what should have
 v0.9.0 - BREAKING CHANGE - API changed from JSON.parse(data, defaultValues) to JSON.parse(data). Default Values defaults to true. Large update. Refactor all the code, nullable primitives, rewrite the transform, allow extensibility with @omit keywords, and fix a plethora of bugs
 v0.9.1 - Fix #71
 v0.9.2 - Fix #75 + Build sizes significantly reduced
+v0.9.3 - Fix #76
+v0.9.4 - Fix #77
 
 [UNRELEASED] v0.9.x - Port JSON.Value from the `develop` branch to allow for union types, parsing of arbitrary data, and whatever the hell you want.

package/README.md

@@ -7,7 +7,7 @@
 ██║  ██║███████║      ╚█████╔╝███████║╚██████╔╝██║ ╚████║
 ╚═╝  ╚═╝╚══════╝       ╚════╝ ╚══════╝ ╚═════╝ ╚═╝  ╚═══╝
 
-v0.9.1
+v0.9.4
 </pre>
 </h3>
 

package/assembly/__tests__/deserialize.spec.ts

@@ -240,7 +240,7 @@ describe("Should deserialize object arrays", () => {
 
 });
 
-describe("Ser/de Objects", () => {
+describe("Should deserialize Objects", () => {
 
   expect(
     JSON.stringify(JSON.parse<Vec3>('{"x":3.4,"y":1.2,"z":8.3}'))

package/assembly/__tests__/serialize.spec.ts

@@ -48,6 +48,16 @@ class Player {
   isVerified: boolean;
 }
 
+@json
+class OmitIf {
+  x: i32 = 1;
+  @omitif("this.y == -1")
+  y: i32 = -1;
+  z: i32 = 1;
+  @omitnull()
+  foo: string | null = null
+}
+
 class Nullable { }
 type Null = Nullable | null;
 
@@ -297,7 +307,7 @@ describe("Should serialize object arrays", () => {
 
 });
 
-describe("Ser/de Objects", () => {
+describe("Should serialize objects", () => {
 
   expect(
     JSON.stringify<Vec3>({
@@ -348,6 +358,16 @@ describe("Ser/de Objects", () => {
 
 });
 
+describe("Should serialize @omit'ed objects", () => {
+
+  expect(
+    JSON.stringify(<OmitIf>{
+      y: 1
+    })
+  ).toBe('{"x":1,"y":1,"z":1}');
+
+});
+
 @json
 class ObjWithString {
   s!: string;

package/assembly/serialize/unknown.ts

@@ -0,0 +1,45 @@
+import { JSON } from "..";
+import { Sink } from "../src/sink";
+import { __atoi_fast } from "../src/util";
+import { serializeUnknownArray } from "./array/unknown";
+import { serializeBool } from "./bool";
+import { serializeFloat } from "./float";
+import { serializeInteger } from "./integer";
+import { serializeString } from "./string";
+
+/**
+ * Serializes unknown values into their correct serializer and returns the data.
+ *
+ * @param data - The JSON.Value to be serialized.
+ * @returns The serialized result.
+ */
+export function serializeUnknown(data: JSON.Value): string {
+    const type = data.type;
+    switch (type) {
+        case JSON.Types.String: {
+            return serializeString(data.get<string>());
+        }
+        case JSON.Types.Bool: {
+            return serializeBool(data.get<bool>());
+        }
+        case JSON.Types.U8: {
+            return serializeInteger(data.get<u8>());
+        }
+        case JSON.Types.U16: {
+            return serializeInteger(data.get<u16>());
+        }
+        case JSON.Types.U32: {
+            return serializeInteger(data.get<u32>());
+        }
+        case JSON.Types.U64: {
+            return serializeInteger(data.get<u64>());
+        }
+        case JSON.Types.F32: {
+            return serializeFloat(data.get<f32>());
+        }
+        case JSON.Types.F64: {
+            return serializeFloat(data.get<f64>());
+        }
+    }
+    return serializeUnknownArray(data.get<JSON.Value[]>());
+}

package/assembly/test.ts

@@ -4,10 +4,11 @@ import { JSON } from ".";
 class Base {}
 @json
 class Vec1 extends Base {
-  x: f32 = 1.0;
+  x: f64 = 1.0;
 }
 @json
 class Vec2 extends Vec1 {
+  @omit()
   y: f32 = 2.0;
 }
 @json

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -17,7 +17,7 @@
   "scripts": {
     "test": "wasmtime build/serialize.spec.wasm && wasmtime build/deserialize.spec.wasm",
     "tests:build": "asc assembly/__tests__/serialize.spec.ts -o build/serialize.spec.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 0 --shrinkLevel 0 --noAssert --uncheckedBehavior always & asc assembly/__tests__/deserialize.spec.ts -o build/deserialize.spec.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 0 --shrinkLevel 0 --noAssert --uncheckedBehavior always",
-    "build:test": "asc assembly/test.ts -o build/test.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 0 --shrinkLevel 0 --noAssert --uncheckedBehavior always",
+    "build:test": "JSON_DEBUG=true asc assembly/test.ts -o build/test.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 0 --shrinkLevel 0 --noAssert --uncheckedBehavior always",
     "build:bench": "asc bench/benchmark.ts -o bench/benchmark.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior always --runtime stub",
     "bench:wasmtime": "wasmtime ./bench/benchmark.wasm",
     "bench:wasmer": "wasmer --llvm ./bench/benchmark.wasm",

package/transform/lib/index.js

@@ -33,8 +33,9 @@ class JSONTransform extends BaseVisitor {
             if (schema.parent?.members) {
                 for (let i = 0; i < schema.parent.members.length; i++) {
                     const replace = schema.members.find((v) => v.name == schema.parent?.members[i]?.name);
-                    if (!replace)
+                    if (!replace) {
                         schema.members.unshift(schema.parent.members[i]);
+                    }
                 }
             }
         }
@@ -76,29 +77,31 @@ class JSONTransform extends BaseVisitor {
                 continue;
             if (member.flags === 1024 /* CommonFlags.Protected */)
                 continue;
+            if (member.decorators && member.decorators.find((v) => v.name.text == "omit"))
+                continue;
             const mem = new Property();
             mem.name = name.text;
             mem.type = type;
             mem.value = value;
             mem.node = member;
-            for (const decorator of member.decorators || []) {
-                if (decorator.name.text == "alias") {
-                    if (!decorator.args?.length)
-                        throw new Error("Expected 1 argument but got zero at @alias in " + node.range.source.normalizedPath);
-                    mem.flag = PropertyFlags.Alias;
-                    mem.alias = decorator.args[0].value;
-                }
-                else if (decorator.name.text == "omit") {
-                    mem.flag = PropertyFlags.Omit;
-                }
-                else if (decorator.name.text == "omitnull") {
-                    mem.flag = PropertyFlags.OmitNull;
-                }
-                else if (decorator.name.text == "omitif") {
-                    if (!decorator.args?.length)
-                        throw new Error("Expected 1 argument but got zero at @omitif in " + node.range.source.normalizedPath);
-                    mem.args?.push(decorator.args[0].value);
-                    mem.flag = PropertyFlags.OmitIf;
+            if (member.decorators) {
+                for (let i = 0; i < (member.decorators).length; i++) {
+                    const decorator = member.decorators[i];
+                    if (decorator.name.text == "alias") {
+                        if (!decorator.args?.length)
+                            throw new Error("Expected 1 argument but got zero at @alias in " + node.range.source.normalizedPath);
+                        mem.flag = PropertyFlags.Alias;
+                        mem.alias = decorator.args[0].value;
+                    }
+                    else if (decorator.name.text == "omitnull") {
+                        mem.flag = PropertyFlags.OmitNull;
+                    }
+                    else if (decorator.name.text == "omitif") {
+                        if (!decorator.args?.length)
+                            throw new Error("Expected 1 argument but got zero at @omitif in " + node.range.source.normalizedPath);
+                        mem.args?.push(decorator.args[0].value);
+                        mem.flag = PropertyFlags.OmitIf;
+                    }
                 }
             }
             if (mem.flag === PropertyFlags.Alias) {
@@ -113,7 +116,7 @@ class JSONTransform extends BaseVisitor {
                 mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end));";
             }
             else if (mem.flag == PropertyFlags.OmitIf) {
-                mem.serialize = "${" + mem.args[0] + " ? \"\" : '" + escapeString(JSON.stringify(mem.name)) + ":' + __SERIALIZE<" + type + ">(this." + name.text + ")}";
+                mem.serialize = "${" + mem.args[0] + " ? \"\" : '" + escapeString(JSON.stringify(mem.name)) + ":' + __SERIALIZE<" + type + ">(this." + name.text + ") + \",\"}";
                 mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end));";
             }
             else if (mem.flag == PropertyFlags.Alias) {

package/transform/package.json

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

package/transform/src/index.ts

@@ -49,8 +49,10 @@ class JSONTransform extends BaseVisitor {
         for (let i = 0; i < schema.parent.members.length; i++) {
           const replace = schema.members.find(
             (v) => v.name == schema.parent?.members[i]?.name
-          )
-          if (!replace) schema.members.unshift(schema.parent.members[i]!);
+          );
+          if (!replace) {
+            schema.members.unshift(schema.parent.members[i]!);
+          }
         }
       }
     }
@@ -94,6 +96,7 @@ class JSONTransform extends BaseVisitor {
       if (member.flags == CommonFlags.Static) continue;
       if (member.flags === CommonFlags.Private) continue;
       if (member.flags === CommonFlags.Protected) continue;
+      if (member.decorators && member.decorators.find((v) => (<IdentifierExpression>v.name).text == "omit")) continue;
 
       const mem = new Property();
       mem.name = name.text;
@@ -101,19 +104,20 @@ class JSONTransform extends BaseVisitor {
       mem.value = value;
       mem.node = member;
 
-      for (const decorator of member.decorators || []) {
-        if ((<IdentifierExpression>decorator.name).text == "alias") {
-          if (!decorator.args?.length) throw new Error("Expected 1 argument but got zero at @alias in " + node.range.source.normalizedPath);
-          mem.flag = PropertyFlags.Alias;
-          mem.alias = (decorator.args[0] as StringLiteralExpression).value;
-        } else if ((<IdentifierExpression>decorator.name).text == "omit") {
-          mem.flag = PropertyFlags.Omit;
-        } else if ((<IdentifierExpression>decorator.name).text == "omitnull") {
-          mem.flag = PropertyFlags.OmitNull;
-        } else if ((<IdentifierExpression>decorator.name).text == "omitif") {
-          if (!decorator.args?.length) throw new Error("Expected 1 argument but got zero at @omitif in " + node.range.source.normalizedPath);
-          mem.args?.push((decorator.args[0] as StringLiteralExpression).value);
-          mem.flag = PropertyFlags.OmitIf;
+      if (member.decorators) {
+        for (let i = 0; i < (member.decorators).length; i++) {
+          const decorator = member.decorators[i]!;
+          if ((<IdentifierExpression>decorator.name).text == "alias") {
+            if (!decorator.args?.length) throw new Error("Expected 1 argument but got zero at @alias in " + node.range.source.normalizedPath);
+            mem.flag = PropertyFlags.Alias;
+            mem.alias = (decorator.args[0] as StringLiteralExpression).value;
+          } else if ((<IdentifierExpression>decorator.name).text == "omitnull") {
+            mem.flag = PropertyFlags.OmitNull;
+          } else if ((<IdentifierExpression>decorator.name).text == "omitif") {
+            if (!decorator.args?.length) throw new Error("Expected 1 argument but got zero at @omitif in " + node.range.source.normalizedPath);
+            mem.args?.push((decorator.args[0] as StringLiteralExpression).value);
+            mem.flag = PropertyFlags.OmitIf;
+          }
         }
       }
 
@@ -128,7 +132,7 @@ class JSONTransform extends BaseVisitor {
         mem.serialize = "${changetype<usize>(this." + mem.name + ") == <usize>0" + " ? \"\" : '" + escapeString(JSON.stringify(mem.name)) + ":' + __SERIALIZE<" + type + ">(this." + name.text + ") + \",\"}";
         mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end));"
       } else if (mem.flag == PropertyFlags.OmitIf) {
-        mem.serialize = "${" + mem.args![0]! + " ? \"\" : '" + escapeString(JSON.stringify(mem.name)) + ":' + __SERIALIZE<" + type + ">(this." + name.text + ")}";
+        mem.serialize = "${" + mem.args![0]! + " ? \"\" : '" + escapeString(JSON.stringify(mem.name)) + ":' + __SERIALIZE<" + type + ">(this." + name.text + ") + \",\"}";
         mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end));"
       } else if (mem.flag == PropertyFlags.Alias) {
         mem.serialize = escapeString(JSON.stringify(mem.name)) + ":${__SERIALIZE<" + type + ">(this." + name.text + ")}";