json-as 0.5.67 → 0.6.1

package/README.md

@@ -59,7 +59,8 @@ const player: Player = {
   isVerified: true
 };
 
-const stringified = JSON.stringify<Player>(player);
+const stringified = JSON.stringify<Player>(player, true);
+// You can toggle on setting default values with the 2nd parameter
 // Alternative: use JSON.serializeTo(player, out);
 
 const parsed = JSON.parse<Player>(stringified);

package/assembly/src/json.ts

@@ -1,5 +1,6 @@
 import { StringSink } from "as-string-sink/assembly";
 import { isSpace } from "util/string";
+import { E_INVALIDDATE } from "util/error";
 import {
   backSlashCode,
   commaCode,
@@ -192,7 +193,7 @@ export namespace JSON {
    */
 
   // @ts-ignore: Decorator
-  @inline export function parse<T>(data: string): T {
+  @inline export function parse<T>(data: string, initializeDefaultValues: boolean = false): T {
     let type: T;
     if (isString<T>()) {
       // @ts-ignore
@@ -211,10 +212,10 @@ export namespace JSON {
       return null;
       // @ts-ignore
     } else if (isDefined(type.__JSON_Set_Key)) {
-      return parseObject<T>(data.trimStart());
+      return parseObject<T>(data.trimStart(), initializeDefaultValues);
     } else if (idof<nonnull<T>>() == idof<Date>()) {
       // @ts-ignore
-      return Date.fromString(data);
+      return parseDate(data);
     } else {
       // @ts-ignore
       throw new Error(
@@ -225,7 +226,7 @@ export namespace JSON {
 }
 
 // @ts-ignore: Decorator
-@global @inline function __parseObjectValue<T>(data: string): T {
+@global @inline function __parseObjectValue<T>(data: string, initializeDefaultValues: boolean): T {
   let type: T;
   if (isString<T>()) {
     // @ts-ignore
@@ -288,10 +289,10 @@ export namespace JSON {
     return null;
     // @ts-ignore
   } else if (isDefined(type.__JSON_Set_Key)) {
-    return parseObject<T>(data.trimStart());
+    return parseObject<T>(data.trimStart(), initializeDefaultValues);
   } else if (idof<nonnull<T>>() == idof<Date>()) {
     // @ts-ignore
-    return Date.fromString(data);
+    return parseDate(data);
   } else {
     // @ts-ignore
     throw new Error(
@@ -435,10 +436,13 @@ export namespace JSON {
 }
 
 // @ts-ignore: Decorator
-@inline function parseObject<T>(data: string): T {
+@inline function parseObject<T>(data: string, initializeDefaultValues: boolean): T {
   let schema: nonnull<T> = changetype<nonnull<T>>(
     __new(offsetof<nonnull<T>>(), idof<nonnull<T>>())
   );
+  // @ts-ignore
+  if (initializeDefaultValues) schema.__JSON_Initialize();
+
   let key = Virtual.createEmpty<string>();
   let isKey = false;
   let depth = 0;
@@ -459,7 +463,7 @@ export namespace JSON {
           if (depth === 0) {
             ++arrayValueIndex;
             // @ts-ignore
-            schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex, arrayValueIndex);
+            schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex, arrayValueIndex, initializeDefaultValues);
             outerLoopIndex = arrayValueIndex;
             isKey = false;
             break;
@@ -480,7 +484,7 @@ export namespace JSON {
           if (depth === 0) {
             ++objectValueIndex;
             // @ts-ignore
-            schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex, objectValueIndex);
+            schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex, objectValueIndex, initializeDefaultValues);
             outerLoopIndex = objectValueIndex;
             isKey = false;
             break;
@@ -506,7 +510,7 @@ export namespace JSON {
               isKey = true;
             } else {
               // @ts-ignore
-              schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex, stringValueIndex);
+              schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex, stringValueIndex, initializeDefaultValues);
               isKey = false;
             }
             outerLoopIndex = ++stringValueIndex;
@@ -517,7 +521,7 @@ export namespace JSON {
       }
     } else if (char == nCode) {
       // @ts-ignore
-      schema.__JSON_Set_Key<Virtual<string>>(key, nullWord, 0, 4);
+      schema.__JSON_Set_Key<Virtual<string>>(key, nullWord, 0, 4, initializeDefaultValues);
       isKey = false;
     } else if (
       char === tCode &&
@@ -526,7 +530,7 @@ export namespace JSON {
       unsafeCharCodeAt(data, ++outerLoopIndex) === eCode
     ) {
       // @ts-ignore
-      schema.__JSON_Set_Key<Virtual<string>>(key, trueWord, 0, 4);
+      schema.__JSON_Set_Key<Virtual<string>>(key, trueWord, 0, 4, initializeDefaultValues);
       isKey = false;
     } else if (
       char === fCode &&
@@ -536,7 +540,7 @@ export namespace JSON {
       unsafeCharCodeAt(data, ++outerLoopIndex) === eCode
     ) {
       // @ts-ignore
-      schema.__JSON_Set_Key<Virtual<string>>(key, falseWord, 0, 5);
+      schema.__JSON_Set_Key<Virtual<string>>(key, falseWord, 0, 5, initializeDefaultValues);
       isKey = false;
     } else if ((char >= 48 && char <= 57) || char === 45) {
       let numberValueIndex = ++outerLoopIndex;
@@ -544,7 +548,7 @@ export namespace JSON {
         const char = unsafeCharCodeAt(data, numberValueIndex);
         if (char === commaCode || char === rightBraceCode || isSpace(char)) {
           // @ts-ignore
-          schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex - 1, numberValueIndex);
+          schema.__JSON_Set_Key<Virtual<string>>(key, data, outerLoopIndex - 1, numberValueIndex, initializeDefaultValues);
           outerLoopIndex = numberValueIndex;
           isKey = false;
           break;
@@ -711,3 +715,95 @@ export namespace JSON {
   }
   return result;
 }
+
+// @ts-ignore: decorator
+@inline const
+  MILLIS_PER_DAY = 1000 * 60 * 60 * 24,
+  MILLIS_PER_HOUR = 1000 * 60 * 60,
+  MILLIS_PER_MINUTE = 1000 * 60,
+  MILLIS_PER_SECOND = 1000,
+
+  YEARS_PER_EPOCH = 400,
+  DAYS_PER_EPOCH = 146097,
+  EPOCH_OFFSET = 719468, // Jan 1, 1970
+  MILLIS_LIMIT = 8640000000000000;
+
+function parseDate(dateTimeString: string): Date {
+  if (!dateTimeString.length) throw new RangeError(E_INVALIDDATE);
+  var
+    hour: i32 = 0,
+    min: i32 = 0,
+    sec: i32 = 0,
+    ms: i32 = 0;
+
+  let dateString = dateTimeString;
+  let posT = dateTimeString.indexOf("T");
+  if (~posT) {
+    // includes a time component
+    let timeString: string;
+    dateString = dateTimeString.substring(0, posT);
+    timeString = dateTimeString.substring(posT + 1);
+    // parse the HH-MM-SS component
+    let timeParts = timeString.split(":");
+    let len = timeParts.length;
+    if (len <= 1) throw new RangeError(E_INVALIDDATE);
+
+    hour = i32.parse(timeParts[0]);
+    min = i32.parse(timeParts[1]);
+    if (len >= 3) {
+      let secAndMs = timeParts[2];
+      let posDot = secAndMs.indexOf(".");
+      if (~posDot) {
+        // includes milliseconds
+        sec = i32.parse(secAndMs.substring(0, posDot));
+        ms = i32.parse(secAndMs.substring(posDot + 1));
+      } else {
+        sec = i32.parse(secAndMs);
+      }
+    }
+  }
+  // parse the YYYY-MM-DD component
+  let parts = dateString.split("-");
+  let year = i32.parse(parts[0]);
+  let month = 1, day = 1;
+  let len = parts.length;
+  if (len >= 2) {
+    month = i32.parse(parts[1]);
+    if (len >= 3) {
+      day = i32.parse(parts[2]);
+    }
+  }
+  return new Date(epochMillis(year, month, day, hour, min, sec, ms));
+}
+
+function epochMillis(
+  year: i32,
+  month: i32,
+  day: i32,
+  hour: i32,
+  minute: i32,
+  second: i32,
+  milliseconds: i32
+): i64 {
+  return (
+    daysSinceEpoch(year, month, day) * MILLIS_PER_DAY +
+    hour * MILLIS_PER_HOUR +
+    minute * MILLIS_PER_MINUTE +
+    second * MILLIS_PER_SECOND +
+    milliseconds
+  );
+}
+
+function daysSinceEpoch(y: i32, m: i32, d: i32): i64 {
+  y -= i32(m <= 2);
+  let era = <u32>floorDiv(y, YEARS_PER_EPOCH);
+  let yoe = <u32>y - era * YEARS_PER_EPOCH; // [0, 399]
+  let doy = <u32>(153 * (m + (m > 2 ? -3 : 9)) + 2) / 5 + d - 1; // [0, 365]
+  let doe = yoe * 365 + yoe / 4 - yoe / 100 + doy; // [0, 146096]
+  return <i64><i32>(era * 146097 + doe - EPOCH_OFFSET);
+}
+
+// @ts-ignore: decorator
+@inline function floorDiv<T extends number>(a: T, b: T): T {
+  return (a - (a < 0 ? b - 1 : 0)) / b as T;
+}

package/assembly/test.ts

@@ -1,4 +1,5 @@
 import { JSON } from "./src/json";
+
 // @ts-ignore
 @json
 class Vec3 {
@@ -12,7 +13,7 @@ class Vec3 {
 class Player {
     firstName: string;
     lastName: string;
-    lastActive: i32[];
+    lastActive: Date;
     age: i32;
     pos: Vec3 | null;
     isVerified: boolean;
@@ -23,7 +24,7 @@ const vec = new Vec3();
 const player: Player = {
     firstName: "Emmet",
     lastName: "West",
-    lastActive: [8, 27, 2022],
+    lastActive: new Date(0),
     age: 23,
     pos: {
         x: 3.4,
@@ -39,11 +40,11 @@ JSON.stringifyTo(vec, out);
 
 console.log("Original: " + out);
 //console.log("Revised: " + vec.__JSON_Deserialize('{"x":3,"y":1,"z":8}').__JSON_Serialize());
-console.log("Implemented: " + JSON.stringify(JSON.parse<Vec3>('{}')));
+console.log("Implemented: " + JSON.stringify(JSON.parse<Vec3>('{}', true)));
 
 console.log("Original: " + JSON.stringify(player));
 //console.log("Revised: " + vec.__JSON_Deserialize('{"x":3,"y":1,"z":8}').__JSON_Serialize());
-console.log("Implemented: " + JSON.stringify(JSON.parse<Player>('{"firstName":"Emmet","lastName":"West","lastActive":[8,27,2022],"age":23,"pos":{"x":3.4,"y":1.2,"z":8.3},"isVerified":true}')));
+console.log("Implemented: " + JSON.stringify(JSON.parse<Player>('{"firstName":"Emmet","lastName":"West","lastActive":2023-11-16T04:06:35.108285303Z,"age":23,"pos":{"x":3.4,"y":1.2,"z":8.3},"isVerified":true}')));
 /*
 // 9,325,755
 bench("Stringify Object (Vec3)", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.5.67",
+  "version": "0.6.1",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -16,8 +16,7 @@
   "scripts": {
     "test:aspect": "asp",
     "bench:astral": "astral --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior never --runtime stub",
-    "build:test": "asc assembly/test.ts -o build/test.wasm --transform ./transform/lib/index.js --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 3 --shrinkLevel 0 --noAssert --uncheckedBehavior always --converge --runtime stub",
-    "build:test:debug": "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 --runtime stub",
+    "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 --runtime stub",
     "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:wavm": "wavm run ./bench/benchmark.wasm",
@@ -33,12 +32,12 @@
     "@as-tral/cli": "^2.0.1",
     "@assemblyscript/wasi-shim": "^0.1.0",
     "as-bench": "^0.0.0-alpha",
-    "assemblyscript": "^0.27.14",
+    "assemblyscript": "^0.27.18",
     "assemblyscript-prettier": "^3.0.1",
     "benchmark": "^2.1.4",
     "kati": "^0.6.2",
     "microtime": "^3.1.1",
-    "prettier": "^3.0.3",
+    "prettier": "^3.1.0",
     "tinybench": "^2.5.1",
     "typescript": "^5.2.2",
     "visitor-as": "^0.11.4"

package/transform/lib/index.js

@@ -10,6 +10,7 @@ class SchemaData {
         this.parent = "";
         this.encodeStmts = [];
         this.setDataStmts = [];
+        this.initializeStmts = [];
     }
 }
 class AsJSONTransform extends BaseVisitor {
@@ -49,6 +50,7 @@ class AsJSONTransform extends BaseVisitor {
             node: node,
             encodeStmts: [],
             setDataStmts: [],
+            initializeStmts: []
         };
         if (this.currentClass.parent.length > 0) {
             const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
@@ -100,6 +102,9 @@ class AsJSONTransform extends BaseVisitor {
         return;
       }
       `);
+                    if (member.initializer) {
+                        this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
+                    }
                 }
                 else // @ts-ignore
                  if ([
@@ -109,19 +114,25 @@ class AsJSONTransform extends BaseVisitor {
                     this.currentClass.encodeStmts.push(`"${name}":\${this.${name}.toString()},`);
                     // @ts-ignore
                     this.currentClass.setDataStmts.push(`if (key.equals("${name}")) {
-        this.${name} = __parseObjectValue<${type}>(data.slice(val_start, val_end));
+        this.${name} = __parseObjectValue<${type}>(data.slice(val_start, val_end), initializeDefaultValues);
         return;
       }
       `);
+                    if (member.initializer) {
+                        this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
+                    }
                 }
                 else {
                     this.currentClass.encodeStmts.push(`"${name}":\${JSON.stringify<${type}>(this.${name})},`);
                     // @ts-ignore
                     this.currentClass.setDataStmts.push(`if (key.equals("${name}")) {
-        this.${name} = __parseObjectValue<${type}>(val_start ? data.slice(val_start, val_end) : data);
+        this.${name} = __parseObjectValue<${type}>(val_start ? data.slice(val_start, val_end) : data, initializeDefaultValues);
         return;
       }
       `);
+                    if (member.initializer) {
+                        this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
+                    }
                 }
             }
         }
@@ -146,16 +157,31 @@ 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 = `
-      __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, initializeDefaultValues: boolean): void {
         ${
         // @ts-ignore
         this.currentClass.setDataStmts.join("")}
       }
     `;
+        let initializeFunc = "";
+        if (this.currentClass.initializeStmts.length > 0) {
+            initializeFunc = `
+      @inline __JSON_Initialize(): void {
+      ${this.currentClass.initializeStmts.join(";\n")};
+      }
+      `;
+        }
+        else {
+            initializeFunc = `
+      @inline __JSON_Initialize(): void {}
+      `;
+        }
         const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
         node.members.push(serializeMethod);
         const setDataMethod = SimpleParser.parseClassMember(setKeyFunc, node);
         node.members.push(setDataMethod);
+        const initializeMethod = SimpleParser.parseClassMember(initializeFunc, node);
+        node.members.push(initializeMethod);
         this.schemasList.push(this.currentClass);
         //console.log(toString(node));
     }

package/transform/package.json

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

package/transform/src/index.ts

@@ -17,7 +17,9 @@ class SchemaData {
   public node!: ClassDeclaration;
   public encodeStmts: string[] = [];
   public setDataStmts: string[] = [];
+  public initializeStmts: string[] = [];
 }
+
 class AsJSONTransform extends BaseVisitor {
   public schemasList: SchemaData[] = [];
   public currentClass!: SchemaData;
@@ -53,6 +55,7 @@ class AsJSONTransform extends BaseVisitor {
       node: node,
       encodeStmts: [],
       setDataStmts: [],
+      initializeStmts: []
     };
 
     if (this.currentClass.parent.length > 0) {
@@ -118,6 +121,11 @@ class AsJSONTransform extends BaseVisitor {
       }
       `
           );
+          if (member.initializer) {
+            this.currentClass.initializeStmts.push(
+              `this.${name} = ${toString(member.initializer)}`
+            );
+          }
         } else // @ts-ignore
           if (
             [
@@ -131,24 +139,34 @@ class AsJSONTransform extends BaseVisitor {
             // @ts-ignore
             this.currentClass.setDataStmts.push(
               `if (key.equals("${name}")) {
-        this.${name} = __parseObjectValue<${type}>(data.slice(val_start, val_end));
+        this.${name} = __parseObjectValue<${type}>(data.slice(val_start, val_end), initializeDefaultValues);
         return;
       }
       `
             );
+            if (member.initializer) {
+              this.currentClass.initializeStmts.push(
+                `this.${name} = ${toString(member.initializer)}`
+              );
+            }
           } else {
-          this.currentClass.encodeStmts.push(
-            `"${name}":\${JSON.stringify<${type}>(this.${name})},`
-          );
-          // @ts-ignore
-          this.currentClass.setDataStmts.push(
-            `if (key.equals("${name}")) {
-        this.${name} = __parseObjectValue<${type}>(val_start ? data.slice(val_start, val_end) : data);
+            this.currentClass.encodeStmts.push(
+              `"${name}":\${JSON.stringify<${type}>(this.${name})},`
+            );
+            // @ts-ignore
+            this.currentClass.setDataStmts.push(
+              `if (key.equals("${name}")) {
+        this.${name} = __parseObjectValue<${type}>(val_start ? data.slice(val_start, val_end) : data, initializeDefaultValues);
         return;
       }
       `
-          );
-        }
+            );
+            if (member.initializer) {
+              this.currentClass.initializeStmts.push(
+                `this.${name} = ${toString(member.initializer)}`
+              );
+            }
+          }
       }
     }
 
@@ -177,7 +195,7 @@ 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 = `
-      __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, initializeDefaultValues: boolean): void {
         ${
       // @ts-ignore
       this.currentClass.setDataStmts.join("")
@@ -185,12 +203,28 @@ class AsJSONTransform extends BaseVisitor {
       }
     `;
 
+    let initializeFunc = "";
+
+    if (this.currentClass.initializeStmts.length > 0) {
+      initializeFunc = `
+      @inline __JSON_Initialize(): void {
+      ${this.currentClass.initializeStmts.join(";\n")};
+      }
+      `;
+    } else {
+      initializeFunc = `
+      @inline __JSON_Initialize(): void {}
+      `;
+    }
     const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
     node.members.push(serializeMethod);
 
     const setDataMethod = SimpleParser.parseClassMember(setKeyFunc, node);
     node.members.push(setDataMethod);
 
+    const initializeMethod = SimpleParser.parseClassMember(initializeFunc, node);
+    node.members.push(initializeMethod);
+
     this.schemasList.push(this.currentClass);
     //console.log(toString(node));
   }