json-as 0.9.10 → 0.9.12

package/assembly/serialize/array.ts

@@ -6,15 +6,13 @@ import {
     BRACKET_LEFT_WORD,
     BRACKET_RIGHT,
     BRACKET_RIGHT_WORD
-} from "../chars";
-import { Sink } from "../sink";
+} from "../custom/chars";
+import { Sink } from "../custom/sink";
 import { serializeString } from "./string";
 
 // @ts-ignore: Decorator valid here
 @inline export function serializeArray<T extends any[]>(data: T): string {
-    if (changetype<usize>(data) == <usize>0) return EMPTY_BRACKET_WORD;
-    // @ts-ignore
-    else if (data.length == 0) {
+    if (data.length == 0) {
         return EMPTY_BRACKET_WORD;
         // @ts-ignore
     } else if (isString<valueof<T>>()) {

package/assembly/serialize/map.ts

@@ -1,10 +1,9 @@
-import { COLON, COMMA, BRACE_LEFT_WORD, BRACE_RIGHT } from "../chars";
+import { COLON, COMMA, BRACE_LEFT_WORD, BRACE_RIGHT } from "../custom/chars";
 import { JSON } from "..";
-import { Sink } from "../sink";
+import { Sink } from "../custom/sink";
 
 // @ts-ignore: Decorator valid here
 @inline export function serializeMap<T extends Map<any, any>>(data: T): string {
-    if (changetype<usize>(data) == <usize>0) return "{}";
     let result = Sink.fromString(BRACE_LEFT_WORD);
     if (!data.size) return "{}";
     let keys = data.keys();

package/assembly/serialize/string.ts

@@ -5,69 +5,80 @@ import {
     FORM_FEED,
     NEW_LINE,
     QUOTE,
-    QUOTE_WORD,
     TAB
-} from "../chars";
-import { Sink } from "../sink";
-import { unsafeCharCodeAt } from "../util";
+} from "../custom/chars";
+import { OBJECT, TOTAL_OVERHEAD } from "rt/common";
+import { bs } from "../custom/bs";
+import { _intTo16, intTo16 } from "../custom/util";
 
 // @ts-ignore: Decorator valid here
 @inline export function serializeString(data: string): string {
-    if (data.length === 0) {
-        return QUOTE_WORD + QUOTE_WORD;
+    const len = data.length << 1;
+    if (len === 0) {
+        bs.write_16(2228258); /* {} */
+        return bs.out<string>();
     }
 
-    let result = Sink.fromString(QUOTE_WORD, data.length);
+    bs.write_16(QUOTE);
 
     let last: i32 = 0;
-    for (let i = 0; i < data.length; i++) {
-        const char = unsafeCharCodeAt(<string>data, i);
-        if (char === QUOTE || char === BACK_SLASH) {
-            result.write(<string>data, last, i);
-            result.writeCodePoint(BACK_SLASH);
-            last = i;
-        } else if (16 > char) {
-            result.write(<string>data, last, i);
-            last = i + 1;
-            switch (char) {
-                case BACKSPACE: {
-                    result.write("\\b");
-                    break;
-                }
-                case TAB: {
-                    result.write("\\t");
-                    break;
-                }
-                case NEW_LINE: {
-                    result.write("\\n");
-                    break;
-                }
-                case FORM_FEED: {
-                    result.write("\\f");
-                    break;
-                }
-                case CARRIAGE_RETURN: {
-                    result.write("\\r");
-                    break;
-                }
-                default: {
+    for (let i = 0; i < len; i += 2) {
+        const char = load<u16>(changetype<usize>(data) + i);
+        if (char < 35) {
+            if (char === QUOTE) {
+                bs.write_s_se(<string>data, last, i);
+                bs.write_16(BACK_SLASH);
+                last = i;
+                continue;
+            } else if (char < 32) {
+                if (char < 16) {
+                    bs.write_s_se(<string>data, last, i);
+                    last = i + 2;
+                    switch (char) {
+                        case BACKSPACE: {
+                            bs.write_32(6422620);
+                            continue;
+                        }
+                        case TAB: {
+                            bs.write_32(7602268);
+                            continue;
+                        }
+                        case NEW_LINE: {
+                            bs.write_32(7209052);
+                            continue;
+                        }
+                        case FORM_FEED: {
+                            bs.write_32(6684764);
+                            continue;
+                        }
+                        case CARRIAGE_RETURN: {
+                            bs.write_32(7471196);
+                            continue;
+                        }
+                        default: {
+                            // all chars 0-31 must be encoded as a four digit unicode escape sequence
+                            // \u0000 to \u000f handled here
+                            bs.write_64(13511005048209500) /* \\u00 */
+                            bs.write_32((_intTo16(char) << 16) | 48); /* 0_ */
+                            continue;
+                        }
+                    }
+                } else {
+                    bs.write_s_se(<string>data, last, i);
+                    last = i + 2;
                     // all chars 0-31 must be encoded as a four digit unicode escape sequence
-                    // \u0000 to \u000f handled here
-                    result.write("\\u000");
-                    result.write(char.toString(16));
-                    break;
+                    // \u0010 to \u001f handled here
+                    bs.write_64(13511005048209500) /* \\u00 */
+                    bs.write_32((intTo16(char) << 16) | 48); /* 0_ */
                 }
             }
-        } else if (32 > char) {
-            result.write(<string>data, last, i);
-            last = i + 1;
-            // all chars 0-31 must be encoded as a four digit unicode escape sequence
-            // \u0010 to \u001f handled here
-            result.write("\\u00");
-            result.write(char.toString(16));
+        } else if (char === BACK_SLASH) {
+            bs.write_s_se(<string>data, last, i);
+            bs.write_16(BACK_SLASH);
+            last = i;
         }
     }
-    result.write(<string>data, last);
-    result.writeCodePoint(QUOTE);
-    return result.toString();
+    bs.write_s_se_u(<string>data, last, changetype<OBJECT>(changetype<usize>(data) - TOTAL_OVERHEAD).rtSize);
+    bs.write_16(QUOTE);
+    return bs.out<string>();
 }

package/assembly/test.ts

@@ -1,38 +1,42 @@
-import { JSON } from ".";
-@json
-class Vec3 {
-  x: f32 = 0.0;
-  y: f32 = 0.0;
-  z: f32 = 0.0;
-}
+// import { JSON } from ".";
+import { bs } from "./custom/bs";
+// @json
+// class Vec3 {
+//   x: f32 = 0.0;
+//   y: f32 = 0.0;
+//   z: f32 = 0.0;
+// }
 
-@json
-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;
-}
+// @json
+// 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;
+// }
 
-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
-};
+// 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
+// };
 
-const stringified = JSON.stringify<Player>(player);
+// const stringified = JSON.stringify<Player>(player);
 
-const parsed = JSON.parse<Player>(stringified);
+// const parsed = JSON.parse<Player>(stringified);
+
+bs.write_32(6422620);
+console.log(bs.out<string>())

package/bench/benchmark.ts

@@ -1,19 +1,32 @@
-import { bench, blackbox } from "as-bench/assembly/bench";
-import { __atoi_fast } from "../assembly/util";
-import { JSON } from "../assembly";
+import { bench } from "as-bench/assembly/bench";
+import { serializeString } from "../assembly/serialize/string";
+import { bs } from "../assembly/custom/bs";
 
 @json
 class Vec3 {
     x: i32;
     y: i32;
     z: i32;
+    __SERIALIZE_BS(): void {
+        bs.write_128_u(i16x8(123, 34, 120, 34, 58, 49, 44, 34)); /* {"x":1," */
+        bs.write_128_u(i16x8(121, 34, 58, 50, 44, 34, 122, 34)); /* y":2,"z" */
+        bs.write_32_u(3342394); /* :3 */
+        bs.write_16_u(125); /* } */
+    }
 }
-
+const out = memory.data(1000);
 const vec: Vec3 = {
     x: 3,
     y: 1,
     z: 8,
 }
+bench("Stringify Vec3", () => {
+    vec.__SERIALIZE_BS();
+    //bs.reset()
+})
+bench("Stringify String", () => {
+    serializeString('Hello World');
+});
 /*
 bench("Parse Number SNIP", () => {
     blackbox<i32>(snip_fast<i32>("12345"));
@@ -29,7 +42,7 @@ bench("Parse Number STDLIB", () => {
 
 bench("Stringify Object (Vec3)", () => {
     blackbox<string>(JSON.stringify(vec));
-});*/
+});
 
 bench("Parse Object (Vec3)", () => {
     blackbox<Vec3>(JSON.parse<Vec3>('{"x":0,"y":0,"z":0}'));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "json-as",
-  "version": "0.9.10",
-  "description": "JSON encoder/decoder for AssemblyScript",
+  "version": "0.9.12",
+  "description": "The only JSON library you'll need for AssemblyScript. SIMD enabled",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
   "contributors": [
@@ -15,10 +15,10 @@
   ],
   "license": "MIT",
   "scripts": {
-    "test": "wasmtime build/test.spec.wasm",
-    "pretest": "asc assembly/__tests__/test.spec.ts --target test",
-    "build:test": "JSON_DEBUG=true asc assembly/test.ts --transform ./transform -o ./build/test.wasm",
-    "build:bench": "asc bench/benchmark.ts -o bench/benchmark.wasm --transform ./transform --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior always --runtime stub",
+    "test": "ast test",
+    "pretest": "rm -rf ./build/ && ast build",
+    "build:test": "rm -rf ./build/ && JSON_DEBUG=true asc assembly/test.ts --transform ./transform -o ./build/test.wasm",
+    "build:bench": "asc bench/benchmark.ts -o bench/benchmark.wasm --transform ./transform --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior always --runtime stub --enable simd",
     "bench:wasmtime": "wasmtime ./bench/benchmark.wasm",
     "bench:wasmer": "wasmer --llvm ./bench/benchmark.wasm",
     "build:transform": "tsc -p ./transform",
@@ -32,7 +32,8 @@
     "@assemblyscript/wasi-shim": "^0.1.0",
     "as-bench": "^0.0.0-alpha",
     "as-console": "^7.0.0",
-    "assemblyscript": "^0.27.28",
+    "as-test": "0.1.9",
+    "assemblyscript": "^0.27.29",
     "assemblyscript-prettier": "^3.0.1",
     "benchmark": "^2.1.4",
     "microtime": "^3.1.1",
@@ -41,12 +42,7 @@
     "typescript": "^5.5.3",
     "visitor-as": "^0.11.4"
   },
-  "dependencies": {
-    "@hypercubed/as-mpz": "^2.2.0",
-    "as-string-sink": "^0.5.3",
-    "as-test": "^0.1.4",
-    "as-virtual": "^0.2.0"
-  },
+  "dependencies": { "as-virtual": "^0.2.0" },
   "overrides": {
     "assemblyscript": "$assemblyscript"
   },
@@ -60,7 +56,11 @@
     "serialize",
     "deserialize",
     "dynamic",
-    "serde"
+    "serde",
+    "SIMD",
+    "optimized",
+    "fast",
+    "algorithm"
   ],
   "bugs": {
     "url": "https://github.com/JairusSW/as-json/issues"

package/transform/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@json-as/transform",
-  "version": "0.9.10",
-  "description": "JSON encoder/decoder for AssemblyScript",
+  "version": "0.9.12",
+  "description": "The only JSON library you'll need for AssemblyScript. SIMD enabled",
   "main": "./lib/index.js",
   "author": "Jairus Tanaka",
   "contributors": [
@@ -12,9 +12,7 @@
     "lekiano"
   ],
   "license": "MIT",
-  "devDependencies": {
-    "assemblyscript": "^0.27.1"
-  },
+  "devDependencies": {},
   "dependencies": {},
   "repository": {
     "type": "git",

package/transform/src/index.ts

@@ -13,6 +13,7 @@ import { toString, isStdlib } from "visitor-as/dist/utils.js";
 import { BaseVisitor, SimpleParser } from "visitor-as/dist/index.js";
 import { Transform } from "assemblyscript/dist/transform.js";
 import { CommonFlags } from "types:assemblyscript/src/common";
+import { DecoratorNode } from "types:assemblyscript/src/ast";
 
 class JSONTransform extends BaseVisitor {
   public schemasList: SchemaData[] = [];

package/assembly/deserialize/mpz.ts

@@ -1,12 +0,0 @@
-import { MpZ } from "@hypercubed/as-mpz";
-
-/**
- * Deserialize a string to type MpZ
- * @param data data to parse
- * @returns MpZ
- */
-// @ts-ignore: Decorator valid here
-@inline export function deserializeMpZ(data: string, start: i32 = 0, end: i32 = 0): MpZ {
-    if (!end) end = data.length;
-    return MpZ.from(data.slice(start, end));
-}

package/assembly/serialize/mpz.ts

@@ -1,6 +0,0 @@
-import { MpZ } from "@hypercubed/as-mpz";
-
-// @ts-ignore: Decorator valid here
-@inline export function serializeMpZ(data: MpZ): string {
-  return data.toString();
-}

package/assembly/serialize/unknown.ts

@@ -1,45 +0,0 @@
-import { JSON } from "..";
-import { Sink } from "../sink";
-import { __atoi_fast } from "../util";
-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.
- */
-// @ts-ignore: Decorator valid here
-@inline 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 "ERROR"//serializeUnknownArray(data.get<JSON.Value[]>());
-}