json-as 0.9.28 → 1.0.0-alpha.1

package/.github/workflows/nodejs.yml

@@ -19,8 +19,5 @@ jobs:
       - name: Install Dependencies
         run: bun install
 
-      - name: Build Tests
-        run: bun run pretest
-
       - name: Run Tests
         run: bun run test

package/.prettierrc.json

@@ -1,4 +1,7 @@
 {
+  "pluginSearchDirs": ["node_modules"],
+  "plugins": ["assemblyscript-prettier"],
   "singleQuote": false,
-  "printWidth": 65536
+  "printWidth": 65536,
+  "tabWidth": 2
 }

package/CHANGELOG

@@ -0,0 +1,13 @@
+# Change Log
+
+## UNRELEASED
+
+## 2025-01-20 - 1.0.0-alpha.1
+
+- feat: finish implementation of arbitrary data serialization and deserialization using JSON.Value
+- feat: reinstate usage of `JSON.Box<T>()` to support nullable primitive types
+- feat: eliminate the need to import the `JSON` namespace when defining a schema
+- feat: reduce memory usage so that it is viable for low-memory environments
+- feat: write to a central buffer and reduce memory overhead
+- feat: rewrite the transform to properly resolve schemas and link them together
+- feat: pre-allocate and compute the minimum size of a schema to avoid memory out of range errors

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Jairus Tanaka <jairus.v.tanaka@outlook.com>
+Copyright (c) 2025 Jairus Tanaka <me@jairus.dev>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -6,29 +6,29 @@
 ██   ██      ██ ██    ██ ██  ██ ██       ██   ██      ██
  █████  ███████  ██████  ██   ████       ██   ██ ███████
  </span>
-    AssemblyScript - v0.9.28
+    AssemblyScript - v1.0.0-alpha.1
   </pre>
 </h5>
 
 ## Installation
 
 ```bash
-npm install json-as visitor-as
+npm install json-as@1.0.0-alpha.1
 ```
 
 Add the `--transform` to your `asc` command (e.g. in package.json)
 
 ```bash
---transform json-as/transform
+--transform json-as
 ```
 
 Alternatively, add it to your `asconfig.json`
 
-```json
+```
 {
   // ...
   "options": {
-    "transform": ["json-as/transform"]
+    "transform": ["json-as"]
   }
 }
 ```
@@ -38,7 +38,7 @@ If you'd like to see the code that the transform generates, run with `JSON_DEBUG
 ## Usage
 
 ```js
-import { JSON } from "json-as/assembly";
+import { JSON } from "json-as";
 
 // @json or @serializable work here
 @json
@@ -55,7 +55,7 @@ class Player {
   lastName!: string;
   lastActive!: i32[];
   // Drop in a code block, function, or expression that evaluates to a boolean
-  @omitif("this.age < 18")
+  @omitif((age) => age < 18)
   age!: i32;
   @omitnull()
   pos!: Vec3 | null;
@@ -110,8 +110,23 @@ const serialized = JSON.stringify(arr);
 const parsed = JSON.parse<Base[]>(serialized);
 ```
 
+You can also add it to your `asconfig.json`
+
+```json
+{
+  // ...
+  "options": {
+    "transform": ["json-as/transform"]
+  }
+}
+```
+
 If you use this project in your codebase, consider dropping a [star](https://github.com/JairusSW/as-json). I would really appreciate it!
 
+## Notes
+
+If you want a feature, drop an issue (and again, maybe a star). I'll likely add it in less than 7 days.
+
 ## Contact
 
 - [Email](mailto:me@jairus.dev)

package/as-test.config.json

@@ -6,7 +6,7 @@
     "coverage": false
   },
   "buildOptions": {
-    "args": ["--transform ./transform"],
+    "args": ["--enable simd", "--runtime stub"],
     "target": "wasi"
   },
   "runOptions": {

package/asconfig.json

@@ -29,8 +29,8 @@
     }
   },
   "options": {
-    "transform": ["./transform", "as-test/transform"],
-    "disableWarning": [226]
+    "transform": [],
+    "disableWarning": []
   },
   "extends": "./node_modules/@assemblyscript/wasi-shim/asconfig.json"
 }

package/assembly/__benches__/misc.bench.ts

@@ -1,33 +1,19 @@
-import { JSON } from "..";
-import { BRACE_LEFT, BRACKET_LEFT, CHAR_F, CHAR_T, QUOTE } from "../custom/chars";
-
-bench("Match Type (string)", () => {
-    blackbox<boolean>(matchType(blackbox<string>("\""), JSON.Types.String));
+import { bench } from "as-bench/assembly/bench";
+import { bs } from "../../modules/bs";
+import { deserializeString_SIMD } from "../deserialize/simd/string";
+import { deserializeString } from "../deserialize/simple/string";
+import { bytes } from "../util/bytes";
+const str = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!@#$%^&*()\\\"\t\r\f\n\u0000';
+const str2 = '"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!@#$%^&*()\\\\\\"\\t\\r\\f\\n\\u0000"';
+const srcStart = changetype<usize>(str);
+const srcEnd = srcStart + bytes(str);
+bs.ensureSize(2048);
+bench("Deserialize String (Simple)", () => {
+  deserializeStrin(str2);
 });
-
-bench("Match Type (bool)", () => {
-    blackbox<boolean>(matchType(blackbox<string>("t"), JSON.Types.Bool));
+// bench("Deserialize String (SIMD)", () => {
+//   (str2, bs.buffer);
+// });
+bench("Deserialize String (SIMD)", () => {
+  deserializeString_SIMD(str2, srcStart, srcEnd, __new(158, idof<string>()));
 });
-
-bench("Match Type (array)", () => {
-    blackbox<boolean>(matchType(blackbox<string>("["), JSON.Types.Array));
-});
-
-bench("Match Type (struct)", () => {
-    blackbox<boolean>(matchType(blackbox<string>("{"), JSON.Types.Obj));
-});
-
-bench("Match Type (raw)", () => {
-    blackbox<boolean>(matchType(blackbox<string>("\""), JSON.Types.Raw));
-});
-
-@inline function matchType(data: string, type: JSON.Types): boolean {
-    const firstChar = load<u8>(changetype<usize>(data));
-    if (JSON.Types.String == type && firstChar == QUOTE) return true;
-    else if (JSON.Types.Bool == type && (firstChar == CHAR_T || firstChar == CHAR_F)) return true;
-    else if (JSON.Types.Array == type && firstChar == BRACKET_LEFT) return true;
-    else if (JSON.Types.Obj == type && firstChar == BRACE_LEFT) return true;
-    else if (type < 7 && type > 0 && (firstChar < 58 && firstChar > 46)) return true;
-    else if (JSON.Types.Raw == type) return true;
-    else return false;
-}

package/assembly/__tests__/bool.spec.ts

@@ -1,4 +1,4 @@
-import { JSON } from "json-as";
+import { JSON } from "../";
 import { describe, expect, run } from "as-test/assembly";
 
 describe("Should serialize booleans", () => {

package/assembly/__tests__/simd/string.spec.ts

@@ -0,0 +1,32 @@
+import { describe, expect, run } from "as-test/assembly";
+import { serializeString_SIMD } from "../../serialize/simd/string";
+import { deserializeString_SIMD } from "../../deserialize/simd/string";
+
+const out = changetype<usize>(new ArrayBuffer(512));
+
+const serialize_simd = (data: string): string => String.UTF16.decodeUnsafe(out, serializeString_SIMD(data, out));
+const deserialize_simd = (data: string): string => String.UTF16.decodeUnsafe(out, deserializeString_SIMD(data, out));
+describe("Should serialize strings", () => {
+  expect(serialize_simd("abcdefg")).toBe('"abcdefg"');
+
+  expect(serialize_simd('st"ring" w""ith quotes"')).toBe('"st\\"ring\\" w\\"\\"ith quotes\\""');
+
+  expect(serialize_simd('string "with random spa\nces and \nnewlines\n\n\n')).toBe('"string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"');
+
+  expect(serialize_simd('string with colon : comma , brace [ ] bracket { } and quote " and other quote "')).toBe('"string with colon : comma , brace [ ] bracket { } and quote \\" and other quote \\""');
+
+  expect(serialize_simd("\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000a\u000b\u000c\u000d\u000e\u000f\u000f\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f")).toBe('"\\u0000\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\b\\t\\n\\u000b\\f\\r\\u000e\\u000f\\u000f\\u0011\\u0012\\u0013\\u0014\\u0015\\u0016\\u0017\\u0018\\u0019\\u001a\\u001b\\u001c\\u001d\\u001e\\u001f"');
+});
+
+describe("Should deserialize strings", () => {
+  expect(deserialize_simd('"abcdefg"')).toBe("abcdefg");
+  expect(deserialize_simd('"st\\"ring\\" w\\"\\"ith quotes\\""')).toBe('st"ring" w""ith quotes"');
+
+  expect(deserialize_simd('"string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"')).toBe('string "with random spa\nces and \nnewlines\n\n\n');
+
+  expect(deserialize_simd('"string with colon : comma , brace [ ] bracket { } and quote \\" and other quote \\""')).toBe('string with colon : comma , brace [ ] bracket { } and quote " and other quote "');
+
+  expect(deserialize_simd('"\\u0000\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\b\\t\\n\\u000b\\f\\r\\u000e\\u000f\\u000f\\u0011\\u0012\\u0013\\u0014\\u0015\\u0016\\u0017\\u0018\\u0019\\u001a\\u001b\\u001c\\u001d\\u001e\\u001f"')).toBe("\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000a\u000b\u000c\u000d\u000e\u000f\u000f\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f");
+});
+
+run();

package/assembly/__tests__/types.ts

@@ -1,28 +1,36 @@
+
 @json
 export class ObjWithString {
   s!: string;
 }
 
+
 @json
 export class ObjWithStrangeKey<T> {
+
   @alias('a\\\t"\x02b`c')
   data!: T;
 }
+
+
 @json
 export class ObjectWithStringArray {
   sa!: string[];
 }
 
+
 @json
 export class ObjectWithFloat {
   f!: f64;
 }
 
+
 @json
 export class ObjectWithFloatArray {
   fa!: f64[];
 }
 
+
 @json
 export class BaseObject {
   a: string;
@@ -31,6 +39,7 @@ export class BaseObject {
   }
 }
 
+
 @json
 export class DerivedObject extends BaseObject {
   b: string;
@@ -40,6 +49,7 @@ export class DerivedObject extends BaseObject {
   }
 }
 
+
 @json
 export class Map4 {
   a: string;
@@ -48,6 +58,7 @@ export class Map4 {
   d: string;
 }
 
+
 @json
 export class Vec3 {
   x: f64;
@@ -57,6 +68,7 @@ export class Vec3 {
   static shouldIgnore: string = "should not be serialized";
 }
 
+
 @json
 export class Player {
   firstName: string;
@@ -70,12 +82,17 @@ export class Player {
 export class Nullable {}
 export type Null = Nullable | null;
 
+
 @json
 export class OmitIf {
   x: i32 = 1;
+
+
   @omitif("this.y == -1")
   y: i32 = -1;
   z: i32 = 1;
+
+
   @omitnull()
   foo: string | null = null;
 }

package/assembly/custom/chars.ts

@@ -59,9 +59,9 @@
 // @ts-ignore: Decorator is valid here
 @inline export const BRACKET_RIGHT_WORD = "]";
 // @ts-ignore: Decorator is valid here
-@inline export const QUOTE_WORD = "\"";
+@inline export const QUOTE_WORD = '"';
 // @ts-ignore: Decorator is valid here
-@inline export const EMPTY_QUOTE_WORD = "\"\"";
+@inline export const EMPTY_QUOTE_WORD = '""';
 
 // Escape Codes
 // @ts-ignore: Decorator is valid here

package/assembly/custom/memory.ts

@@ -0,0 +1,25 @@
+import { BLOCK_MAXSIZE, OBJECT, TOTAL_OVERHEAD } from "rt/common";
+import { E_INVALIDLENGTH } from "util/error";
+
+// @ts-ignore: Decorator valid here
+@inline export function ensureCapacity<T>(obj: T, newSize: usize): usize {
+  const ptr = changetype<usize>(obj);
+  const oldCapacity = changetype<OBJECT>(ptr - TOTAL_OVERHEAD).rtSize;
+  if (newSize > oldCapacity) {
+    if (newSize > BLOCK_MAXSIZE) throw new RangeError(E_INVALIDLENGTH);
+    const newCapacity = max(min(oldCapacity << 1, BLOCK_MAXSIZE), newSize);
+    const newObj = __renew(ptr, newCapacity);
+    return newObj;
+  }
+  return ptr;
+}
+
+// @ts-ignore: Decorator valid here
+@inline export function setCapacity<T>(obj: T, oldCapacity: usize, newCapacity: usize): usize {
+  const ptr = changetype<usize>(obj);
+  if (newCapacity > oldCapacity) {
+    if (newCapacity > BLOCK_MAXSIZE) throw new RangeError(E_INVALIDLENGTH);
+    return __renew(ptr, newCapacity);
+  }
+  return ptr;
+}

package/assembly/custom/types.ts

@@ -1,3 +1,4 @@
+
 @json
 export class Vec3 {
   x: f64 = 1.0;