json-as 0.5.65 → 0.6.0

package/README.md

@@ -60,6 +60,7 @@ const player: Player = {
 };
 
 const stringified = JSON.stringify<Player>(player);
+// Alternative: use JSON.serializeTo(player, out);
 
 const parsed = JSON.parse<Player>(stringified);
 ```

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

@@ -189,7 +189,7 @@ class HttpResp {
 
 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<Map4>('{"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}}"}',
       {

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,
@@ -101,6 +102,87 @@ export namespace JSON {
       );
     }
   }
+  /**
+   * Stringifies valid JSON data.
+   * ```js
+   * JSON.stringify<T>(data)
+   * ```
+   * @param data T
+   * @returns string
+   */
+  // @ts-ignore: Decorator
+  @inline export function stringifyTo<T>(data: T, out: string): void {
+    // String
+    if (isString<T>() && data != null) {
+      out = serializeString(data as string);
+      return;
+    } else if (isBoolean<T>()) {
+      out = data ? "true" : "false";
+      return;
+    } else if (isNullable<T>() && data == null) {
+      out = "null";
+      return;
+      // @ts-ignore
+    } else if ((isInteger<T>() || isFloat<T>()) && isFinite(data)) {
+      // @ts-ignore
+      out = data.toString();
+      return;
+      // @ts-ignore: Hidden function
+    } else if (isDefined(data.__JSON_Serialize)) {
+      // @ts-ignore: Hidden function
+      out = data.__JSON_Serialize();
+      return;
+    } else if (data instanceof Date) {
+      out = data.toISOString();
+      return;
+    } else if (isArrayLike<T>()) {
+      // @ts-ignore
+      if (data.length == 0) {
+        out = emptyArrayWord;
+        return;
+        // @ts-ignore
+      } else if (isString<valueof<T>>()) {
+        out = "[";
+        // @ts-ignore
+        for (let i = 0; i < data.length - 1; i++) {
+          // @ts-ignore
+          out += serializeString(unchecked(data[i]));
+          out += commaWord;
+        }
+        // @ts-ignore
+        out += serializeString(unchecked(data[data.length - 1]));
+        out += rightBracketWord;
+        return;
+        // @ts-ignore
+      } else if (isBoolean<valueof<T>>()) {
+        // @ts-ignore
+        out = leftBracketWord + data.join(commaWord) + rightBracketWord;
+        return;
+        // @ts-ignore
+      } else if (isFloat<valueof<T>>() || isInteger<valueof<T>>()) {
+        // @ts-ignore
+        out = leftBracketWord + data.join(commaWord) + rightBracketWord;
+        return;
+      } else {
+        let result = new StringSink(leftBracketWord);
+        // @ts-ignore
+        for (let i = 0; i < data.length - 1; i++) {
+          // @ts-ignore
+          result.write(JSON.stringify(unchecked(data[i])));
+          result.write(commaWord);
+        }
+        // @ts-ignore
+        result.write(JSON.stringify(unchecked(data[data.length - 1])));
+        result.write(rightBracketWord);
+        out = result.toString();
+        return;
+      }
+    } else {
+      throw new Error(
+        `Could not serialize data of type ${nameof<T>()}. Make sure to add the correct decorators to classes.`
+      );
+    }
+  }
   /**
    * Parses valid JSON strings into their original format.
    * ```js
@@ -133,7 +215,7 @@ export namespace JSON {
       return parseObject<T>(data.trimStart());
     } else if (idof<nonnull<T>>() == idof<Date>()) {
       // @ts-ignore
-      return Date.fromString(data);
+      return parseDate(data);
     } else {
       // @ts-ignore
       throw new Error(
@@ -210,7 +292,7 @@ export namespace JSON {
     return parseObject<T>(data.trimStart());
   } else if (idof<nonnull<T>>() == idof<Date>()) {
     // @ts-ignore
-    return Date.fromString(data);
+    return parseDate(data);
   } else {
     // @ts-ignore
     throw new Error(
@@ -630,3 +712,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,11 +1,11 @@
-import { bench, blackbox } from "as-bench/assembly/bench";
 import { JSON } from "./src/json";
+
 // @ts-ignore
 @json
 class Vec3 {
-    x: f64;
-    y: f64;
-    z: f64;
+    x: f64 = 3.4;
+    y: f64 = 1.2;
+    z: f64 = 8.3;
 }
 
 // @ts-ignore
@@ -13,22 +13,18 @@ class Vec3 {
 class Player {
     firstName: string;
     lastName: string;
-    lastActive: i32[];
+    lastActive: Date;
     age: i32;
     pos: Vec3 | null;
     isVerified: boolean;
 }
 
-const vec: Vec3 = {
-    x: 3.4,
-    y: 1.2,
-    z: 8.3,
-}
+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,
@@ -38,13 +34,17 @@ const player: Player = {
     isVerified: true,
 }
 
-console.log("Original: " + JSON.stringify(vec));
+let out = "";
+
+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>('{"x":3.4,"y":1.2,"z":8.3}')));
+console.log("Implemented: " + JSON.stringify(JSON.parse<Vec3>('{}')));
 
 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.65",
+  "version": "0.6.0",
   "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,14 +32,14 @@
     "@as-tral/cli": "^2.0.1",
     "@assemblyscript/wasi-shim": "^0.1.0",
     "as-bench": "^0.0.0-alpha",
-    "assemblyscript": "^0.27.9",
+    "assemblyscript": "^0.27.18",
     "assemblyscript-prettier": "^3.0.1",
     "benchmark": "^2.1.4",
     "kati": "^0.6.2",
     "microtime": "^3.1.1",
-    "prettier": "^3.0.2",
-    "tinybench": "^2.5.0",
-    "typescript": "^5.1.6",
+    "prettier": "^3.1.0",
+    "tinybench": "^2.5.1",
+    "typescript": "^5.2.2",
     "visitor-as": "^0.11.4"
   },
   "dependencies": {

package/transform/package.json

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

package/transform/src/index.ts

@@ -18,6 +18,7 @@ class SchemaData {
   public encodeStmts: string[] = [];
   public setDataStmts: string[] = [];
 }
+
 class AsJSONTransform extends BaseVisitor {
   public schemasList: SchemaData[] = [];
   public currentClass!: SchemaData;
@@ -137,18 +138,18 @@ class AsJSONTransform extends BaseVisitor {
       `
             );
           } else {
-          this.currentClass.encodeStmts.push(
-            `"${name}":\${JSON.stringify<${type}>(this.${name})},`
-          );
-          // @ts-ignore
-          this.currentClass.setDataStmts.push(
-            `if (key.equals("${name}")) {
+            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);
         return;
       }
       `
-          );
-        }
+            );
+          }
       }
     }