json-as 0.9.3 → 0.9.5

package/CHANGELOG

@@ -7,5 +7,8 @@ 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
+v0.9.5 - Fix #46
 
 [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.3
+v0.9.5
 </pre>
 </h3>
 
@@ -111,6 +111,17 @@ const serialized = JSON.stringify(arr);
 const parsed = JSON.parse<Base[]>(serialized);
 ```
 
+Classes can even have inheritance. Here's a nasty example
+
+```js
+@json
+class Base {}
+
+const serialized = JSON.stringify(arr);
+// [{"x":1.0},{"x":1.0,"y":2.0},{"y":2.0,"x":1.0,"z":3.0}]
+const parsed = JSON.parse<Base[]>(serialized);
+```
+
 If you use this project in your codebase, consider dropping a [star](https://github.com/JairusSW/as-json). I would really appreciate it!
 
 ## Notes

package/assembly/index.d.ts

@@ -28,3 +28,9 @@ declare function omitif(condition: string): Function;
  * Property decorator that allows a field to be omitted when a property is null.
  */
 declare function omitnull(): Function;
+
+/**
+ * Property decorator that allows a field to be flattened.
+ * @param fieldName - Points to the field to flatten. Can use dot-notation here like @omit("foo.identifier.text")
+ */
+declare function flatten(fieldName: string = "value"): Function;

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

@@ -1,25 +1,50 @@
 import { JSON } from ".";
 
+// @json or @serializable work here
 @json
-class Base {}
-@json
-class Vec1 extends Base {
-  x: f64 = 1.0;
+class Vec3 {
+  x: f32 = 0.0;
+  y: f32 = 0.0;
+  z: f32 = 0.0;
 }
-@json
-class Vec2 extends Vec1 {
-  @omit()
-  y: f32 = 2.0;
+
+class Box<T> {
+  value: T;
 }
+
 @json
-class Vec3 extends Vec2 {
-  z: f32 = 3.0;
+class Player {
+  @alias("first name")
+  firstName!: string;
+  lastName!: string;
+  lastActive!: i32[];
+  // Drop in a code block, function, or expression that evaluates to a boolean
+  @omitif("this.age < 18")
+  age!: i32;
+  @omitnull()
+  pos!: Vec3 | null;
+  isVerified!: boolean;
+  @flatten("value")
+  box: Box<i32> | null;
 }
 
-const arr: Base[] = [
-  new Vec1(),
-  new Vec2(),
-  new Vec3()
-];
+const player: Player = {
+  firstName: "Emmet",
+  lastName: "West",
+  lastActive: [8, 27, 2022],
+  age: 23,
+  pos: {
+    x: 3.4,
+    y: 1.2,
+    z: 8.3
+  },
+  isVerified: true,
+  box: null
+};
+
+const stringified = JSON.stringify<Player>(player);
+
+const parsed = JSON.parse<Player>(stringified);
 
-console.log(JSON.stringify(arr));
+console.log("Stringified: " + stringified);
+console.log("Parsed: " + JSON.stringify(parsed));

package/package.json

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

package/transform/lib/index.js

@@ -102,6 +102,12 @@ class JSONTransform extends BaseVisitor {
                         mem.args?.push(decorator.args[0].value);
                         mem.flag = PropertyFlags.OmitIf;
                     }
+                    else if (decorator.name.text == "flatten") {
+                        if (!decorator.args?.length)
+                            throw new Error("Expected 1 argument but got zero at @flatten in " + node.range.source.normalizedPath);
+                        mem.flag = PropertyFlags.Flatten;
+                        mem.args = [decorator.args[0].value];
+                    }
                 }
             }
             if (mem.flag === PropertyFlags.Alias) {
@@ -124,9 +130,21 @@ class JSONTransform extends BaseVisitor {
                 mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end));";
                 mem.name = name.text;
             }
+            else if (mem.flag == PropertyFlags.Flatten) {
+                const nullable = mem.node.type.isNullable;
+                if (nullable) {
+                    mem.serialize = escapeString(JSON.stringify(mem.name)) + ":${this." + name.text + " ? __SERIALIZE(changetype<nonnull<" + type + ">>(this." + name.text + ")" + (mem.args?.length ? '.' + mem.args[0] : '') + ") : \"null\"}";
+                    mem.deserialize = "if (value_end - value_start == 4 && load<u64>(changetype<usize>(data) + <usize>(value_start << 1)) == " + charCodeAt64("null", 0) + ") {\n        this." + name.text + " = null;\n      } else {\n        this." + name.text + " = " + "__DESERIALIZE<" + type + ">('{\"" + mem.args[0] + "\":' + data.substring(value_start, value_end) + \"}\");\n      }";
+                }
+                else {
+                    mem.serialize = escapeString(JSON.stringify(mem.name)) + ":${this." + name.text + " ? __SERIALIZE(this." + name.text + (mem.args?.length ? '.' + mem.args[0] : '') + ") : \"null\"}";
+                    mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">('{\"" + mem.args[0] + "\":' + data.substring(value_start, value_end) + \"}\");";
+                }
+                mem.name = name.text;
+            }
             const t = mem.node.type.name.identifier.text;
             if (this.schemasList.find(v => v.name == t)) {
-                mem.initialize = "this." + name.text + " = changetype<nonnull<" + t + ">>(__new(offsetof<nonnull<" + t + ">>(), idof<nonnull<" + t + ">>()));\n  changetype<nonnull<" + t + ">>(this." + name.text + ").__INITIALIZE()";
+                mem.initialize = "this." + name.text + " = changetype<nonnull<" + mem.type + ">>(__new(offsetof<nonnull<" + mem.type + ">>(), idof<nonnull<" + mem.type + ">>()));\n  changetype<nonnull<" + mem.type + ">>(this." + name.text + ").__INITIALIZE()";
             }
             else if (mem.value) {
                 mem.initialize = "this." + name.text + " = " + mem.value;
@@ -348,6 +366,7 @@ var PropertyFlags;
     PropertyFlags[PropertyFlags["OmitNull"] = 2] = "OmitNull";
     PropertyFlags[PropertyFlags["OmitIf"] = 3] = "OmitIf";
     PropertyFlags[PropertyFlags["Alias"] = 4] = "Alias";
+    PropertyFlags[PropertyFlags["Flatten"] = 5] = "Flatten";
 })(PropertyFlags || (PropertyFlags = {}));
 class Property {
     constructor() {

package/transform/package.json

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

package/transform/src/index.ts

@@ -117,6 +117,10 @@ class JSONTransform extends BaseVisitor {
             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;
+          } else if ((<IdentifierExpression>decorator.name).text == "flatten") {
+            if (!decorator.args?.length) throw new Error("Expected 1 argument but got zero at @flatten in " + node.range.source.normalizedPath);
+            mem.flag = PropertyFlags.Flatten;
+            mem.args = [(decorator.args[0] as StringLiteralExpression).value];
           }
         }
       }
@@ -138,11 +142,21 @@ class JSONTransform extends BaseVisitor {
         mem.serialize = escapeString(JSON.stringify(mem.name)) + ":${__SERIALIZE<" + type + ">(this." + name.text + ")}";
         mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end));"
         mem.name = name.text;
+      } else if (mem.flag == PropertyFlags.Flatten) {
+        const nullable = (mem.node.type as NamedTypeNode).isNullable;
+        if (nullable) {
+          mem.serialize = escapeString(JSON.stringify(mem.name)) + ":${this." + name.text + " ? __SERIALIZE(changetype<nonnull<" + type + ">>(this." + name.text + ")" + (mem.args?.length ? '.' + mem.args[0]! : '') + ") : \"null\"}";
+          mem.deserialize = "if (value_end - value_start == 4 && load<u64>(changetype<usize>(data) + <usize>(value_start << 1)) == " + charCodeAt64("null", 0) + ") {\n        this." + name.text + " = null;\n      } else {\n        this." + name.text + " = " + "__DESERIALIZE<" + type + ">('{\"" + mem.args![0]! + "\":' + data.substring(value_start, value_end) + \"}\");\n      }";
+        } else {
+          mem.serialize = escapeString(JSON.stringify(mem.name)) + ":${this." + name.text + " ? __SERIALIZE(this." + name.text + (mem.args?.length ? '.' + mem.args[0]! : '') + ") : \"null\"}";
+          mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">('{\"" + mem.args![0]! + "\":' + data.substring(value_start, value_end) + \"}\");";
+        }
+        mem.name = name.text;
       }
 
       const t = (mem.node.type as NamedTypeNode).name.identifier.text;
       if (this.schemasList.find(v => v.name == t)) {
-        mem.initialize = "this." + name.text + " = changetype<nonnull<" + t + ">>(__new(offsetof<nonnull<" + t + ">>(), idof<nonnull<" + t + ">>()));\n  changetype<nonnull<" + t + ">>(this." + name.text + ").__INITIALIZE()"
+        mem.initialize = "this." + name.text + " = changetype<nonnull<" + mem.type + ">>(__new(offsetof<nonnull<" + mem.type + ">>(), idof<nonnull<" + mem.type + ">>()));\n  changetype<nonnull<" + mem.type + ">>(this." + name.text + ").__INITIALIZE()";
       } else if (mem.value) {
         mem.initialize = "this." + name.text + " = " + mem.value;
       }
@@ -362,7 +376,8 @@ enum PropertyFlags {
   Omit,
   OmitNull,
   OmitIf,
-  Alias
+  Alias,
+  Flatten
 }
 
 class Property {