json-as 0.9.6 → 0.9.8-a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.9.6",
+  "version": "0.9.8a",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -15,12 +15,10 @@
   ],
   "license": "MIT",
   "scripts": {
-    "test": "npm run test:serialize && npm run test:deserialize",
-    "test:serialize": "wasmtime build/serialize.spec.wasm",
-    "test:deserialize": "wasmtime build/deserialize.spec.wasm",
-    "tests:build": "asc assembly/__tests__/serialize.spec.ts -o build/serialize.spec.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 0 --shrinkLevel 0 --noAssert --uncheckedBehavior always & asc assembly/__tests__/deserialize.spec.ts -o build/deserialize.spec.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 0 --shrinkLevel 0 --noAssert --uncheckedBehavior always",
-    "build:test": "JSON_DEBUG=true 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",
-    "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",
+    "test": "wasmtime build/test.spec.wasm",
+    "pretest": "asc assembly/__tests__/test.spec.ts --target test",
+    "build:test": "JSON_DEBUG=write asc assembly/test.ts --target debug",
+    "build:bench": "asc bench/benchmark.ts -o bench/benchmark.wasm --transform ./transform --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior always --runtime stub",
     "bench:wasmtime": "wasmtime ./bench/benchmark.wasm",
     "bench:wasmer": "wasmer --llvm ./bench/benchmark.wasm",
     "build:transform": "tsc -p ./transform",
@@ -33,20 +31,20 @@
   "devDependencies": {
     "@assemblyscript/wasi-shim": "^0.1.0",
     "as-bench": "^0.0.0-alpha",
-    "as-test": "JairusSW/as-test",
-    "assemblyscript": "^0.27.22",
+    "assemblyscript": "^0.27.28",
     "assemblyscript-prettier": "^3.0.1",
     "benchmark": "^2.1.4",
+    "json-as": "./",
     "microtime": "^3.1.1",
-    "prettier": "^3.1.1",
-    "tinybench": "^2.5.1",
-    "typescript": "^5.3.3",
+    "prettier": "^3.3.2",
+    "tinybench": "^2.8.0",
+    "typescript": "^5.5.2",
     "visitor-as": "^0.11.4"
   },
   "dependencies": {
-    "as-container": "^0.8.0",
+    "@hypercubed/as-mpz": "^2.2.0",
     "as-string-sink": "^0.5.3",
-    "as-variant": "^0.4.1",
+    "as-test": "^0.1.4",
     "as-virtual": "^0.2.0"
   },
   "overrides": {

package/transform/lib/index.js

@@ -1,4 +1,4 @@
-import { FieldDeclaration } from "assemblyscript/dist/assemblyscript.js";
+import { FieldDeclaration, IdentifierExpression, Source, Node, NewExpression, ObjectLiteralExpression, CallExpression, PropertyAccessExpression, AssertionExpression, LiteralExpression, TrueExpression, FalseExpression, Tokenizer } from "assemblyscript/dist/assemblyscript.js";
 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";
@@ -7,8 +7,185 @@ class JSONTransform extends BaseVisitor {
         super(...arguments);
         this.schemasList = [];
         this.sources = new Set();
+        this.boxRefs = new Map();
+        this.mustImport = false;
+    }
+    visitVariableDeclaration(node) {
+        let typ = "";
+        let className = "";
+        // const tempFoo = foo;
+        if (node.initializer instanceof IdentifierExpression && this.boxRefs.has(node.initializer.text)) {
+            this.boxRefs.set(node.name.text, this.boxRefs.get(node.initializer.text));
+        }
+        // const foo = new Foo();
+        else if (node.initializer instanceof NewExpression && this.schemasList.find((v) => v.name == (className = node.initializer.typeName.identifier.text))) {
+            this.boxRefs.set(node.name.text, className);
+        }
+        // const foo: Foo = {};
+        // const foo = {} as Foo;
+        // const foo = <Foo>{};
+        else if (node.initializer instanceof ObjectLiteralExpression && this.schemasList.find((v) => v.name == (className = node.type.name.identifier.text))) {
+            this.boxRefs.set(node.name.text, className);
+            const schema = (this.schemasList.find((e) => e.name == node.type.name.identifier.text) || ((this.currentClass.name === className) ? this.currentClass : null));
+            if (!schema)
+                return;
+            for (let i = 0; i < node.initializer.names.length; i++) {
+                const name = node.initializer.names[i];
+                const value = node.initializer.values[i];
+                if (schema.boxRefs.has(name.text)) {
+                    if ((value instanceof LiteralExpression
+                        && (value.literalKind === 1 /* LiteralKind.Integer */
+                            || value.literalKind === 0 /* LiteralKind.Float */))
+                        || value instanceof TrueExpression
+                        || value instanceof FalseExpression) {
+                        this.mustImport = true;
+                        const accessorType = Node.createSimpleTypeName("__JSON", node.range);
+                        accessorType.next = Node.createSimpleTypeName("Box", node.range);
+                        const newTypeGeneric = schema.boxRefs.get(name.text);
+                        const initializer = Node.createNewExpression(accessorType, [
+                            newTypeGeneric
+                        ], [
+                            value
+                        ], node.range);
+                        node.initializer.values[i] = initializer;
+                    }
+                }
+            }
+        }
+        // const foo = changetype<Foo>(ptr);
+        else if (node.initializer instanceof CallExpression && this.schemasList.find((v) => node.initializer.typeArguments?.find((e) => (typ = v.name) == e.name.identifier.text))) {
+            this.boxRefs.set(node.name.text, typ);
+        }
+    }
+    visitBinaryExpression(node) {
+        if (node.operator == 101 /* Token.Equals */) {
+            if (node.left.kind == 21 /* NodeKind.PropertyAccess */) {
+                const left = node.left;
+                // TODO
+                if ((this.boxRefs.has(toString(left).split(".")[0]))) {
+                    if ((node.right instanceof LiteralExpression
+                        && (node.right.literalKind === 1 /* LiteralKind.Integer */
+                            || node.right.literalKind === 0 /* LiteralKind.Float */))
+                        || node.right instanceof TrueExpression
+                        || node.right instanceof FalseExpression) {
+                        let schema = null;
+                        let subLeft = left;
+                        while (true) {
+                            if (subLeft instanceof IdentifierExpression) {
+                                const baseType = this.boxRefs.get(subLeft.text);
+                                schema = (this.schemasList.find((e) => e.name === baseType) || (this.currentClass.name === baseType) ? this.currentClass : null);
+                                break;
+                            }
+                            else if (subLeft.expression) {
+                                // @ts-ignore
+                                subLeft = subLeft.expression;
+                            }
+                            else {
+                                break;
+                            }
+                        }
+                        if (!schema)
+                            return;
+                        this.mustImport = true;
+                        const accessorType = Node.createSimpleTypeName("__JSON", node.range);
+                        accessorType.next = Node.createSimpleTypeName("Box", node.range);
+                        const newTypeGeneric = schema.boxRefs.get(left.property.text);
+                        const initializer = Node.createNewExpression(accessorType, [
+                            newTypeGeneric
+                        ], [
+                            node.right
+                        ], node.range);
+                        node.right = initializer;
+                    }
+                }
+            }
+        }
     }
     visitMethodDeclaration() { }
+    visitPropertyAccessExpression(node) {
+        let subNode = node;
+        let baseRef = "";
+        while (true) {
+            // @ts-ignore
+            if (subNode.expression instanceof IdentifierExpression) {
+                // @ts-ignore
+                if (this.boxRefs.has(subNode.expression.text)) {
+                    //console.log(subNode);
+                    // @ts-ignore
+                    baseRef = subNode.expression.text;
+                    break;
+                }
+                else {
+                    break;
+                }
+                // @ts-ignore
+            }
+            else if (subNode.expression) {
+                // @ts-ignore
+                subNode = subNode.expression;
+            }
+            else {
+                break;
+            }
+        }
+        subNode = node;
+        if (baseRef) {
+            const baseType = this.boxRefs.get(baseRef);
+            let properties = [];
+            let lastNode = subNode;
+            const schema = (this.schemasList.find((e) => e.name === baseType) || (this.currentClass.name === baseType) ? this.currentClass : null);
+            while (true) {
+                if (subNode instanceof AssertionExpression || subNode instanceof PropertyAccessExpression) {
+                    //console.log(subNode);
+                    // @ts-ignore
+                    if (schema?.members.find((e) => e.name === subNode.expression.property?.text)) {
+                        let newExpression = Node.createPropertyAccessExpression(subNode, Node.createIdentifierExpression("value", node.range), node.range);
+                        const _newExpression = newExpression;
+                        for (let i = 0; i < properties.length - 1; i++) {
+                            const prop = properties[i];
+                            newExpression = Node.createPropertyAccessExpression(newExpression, prop, node.range);
+                        }
+                        if (subNode instanceof AssertionExpression) {
+                            // @ts-ignore
+                            subNode = subNode.expression;
+                        }
+                        let t = Node.createPropertyAccessExpression(Node.createParenthesizedExpression(Node.createTernaryExpression(subNode, _newExpression, Node.createNullExpression(node.range), node.range), node.range), properties[0], node.range);
+                        for (let i = 1; i < properties.length; i++) {
+                            const prop = properties[i];
+                            t = Node.createPropertyAccessExpression(t, prop, node.range);
+                        }
+                        node.expression = t.expression;
+                        node.property = t.property;
+                        this.mustImport = true;
+                        break;
+                    }
+                    else {
+                        lastNode = subNode;
+                        // @ts-ignore
+                        subNode = subNode.expression;
+                        // @ts-ignore
+                        if (lastNode.property)
+                            properties.push(lastNode.property);
+                    }
+                }
+                else if (subNode instanceof IdentifierExpression) {
+                    break;
+                    // @ts-ignore
+                }
+                else if (subNode.expression) {
+                    lastNode = subNode;
+                    // @ts-ignore
+                    subNode = subNode.expression;
+                    // @ts-ignore
+                    if (lastNode.property)
+                        properties.push(lastNode.property);
+                }
+                else {
+                    break;
+                }
+            }
+        }
+    }
     visitClassDeclaration(node) {
         if (!node.decorators?.length)
             return;
@@ -22,9 +199,36 @@ class JSONTransform extends BaseVisitor {
         }
         if (!found)
             return;
+        this.mustImport = true;
         const schema = new SchemaData();
         schema.node = node;
         schema.name = node.name.text;
+        this.currentClass = schema;
+        for (const _member of node.members) {
+            if (!(_member instanceof FieldDeclaration))
+                continue;
+            const member = _member;
+            if (member.type?.isNullable && isPrimitiveType(member.type?.name.identifier.text)) {
+                const accessorType = Node.createSimpleTypeName("__JSON", node.range);
+                accessorType.next = Node.createSimpleTypeName("Box", node.range);
+                const newTypeGeneric = member.type;
+                member.type.isNullable = false;
+                const refType = member.type;
+                schema.boxRefs.set(member.name.text, refType);
+                const newType = Node.createNamedType(accessorType, [
+                    newTypeGeneric
+                ], true, node.range);
+                member.type = newType;
+                if (member.initializer) {
+                    const initializer = Node.createNewExpression(accessorType, [
+                        newTypeGeneric
+                    ], [
+                        member.initializer
+                    ], node.range);
+                    member.initializer = initializer;
+                }
+            }
+        }
         const members = [
             ...node.members.filter(v => v instanceof FieldDeclaration)
         ];
@@ -44,11 +248,9 @@ class JSONTransform extends BaseVisitor {
             //let SERIALIZE_PRETTY_EMPTY = "__SERIALIZE_PRETTY(): string {\n  return \"{}\";\n}";
             let INITIALIZE_EMPTY = "__INITIALIZE(): this {\n  return this;\n}";
             let DESERIALIZE_EMPTY = "__DESERIALIZE(data: string, key_start: i32, key_end: i32, value_start: i32, value_end: i32): boolean {\n  return false;\n}";
-            if (process.env["JSON_DEBUG"]) {
-                console.log(SERIALIZE_RAW_EMPTY);
-                //console.log(SERIALIZE_PRETTY_EMPTY);
-                console.log(INITIALIZE_EMPTY);
-                console.log(DESERIALIZE_EMPTY);
+            // @ts-ignore
+            if (process && process.env["JSON_DEBUG"]) {
+                console.log("File: " + node.range.source.normalizedPath + "\n" + toString(node) + "\n\n");
             }
             const SERIALIZE_RAW_METHOD_EMPTY = SimpleParser.parseClassMember(SERIALIZE_RAW_EMPTY, node);
             //const SERIALIZE_PRETTY_METHOD = SimpleParser.parseClassMember(SERIALIZE_PRETTY, node);
@@ -115,31 +317,31 @@ class JSONTransform extends BaseVisitor {
             }
             if (!mem.flags.length) {
                 mem.flags = [PropertyFlags.None];
-                mem.serialize = escapeString(JSON.stringify(mem.alias || mem.name)) + ":${__SERIALIZE<" + type + ">(this." + name.text + ")}";
-                mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end));";
+                mem.serialize = escapeString(JSON.stringify(mem.alias || mem.name)) + ":${__JSON.stringify<" + type + ">(this." + name.text + ")}";
+                mem.deserialize = "this." + name.text + " = " + "__JSON.parse<" + type + ">(data.substring(value_start, value_end));";
             }
             if (mem.flags.includes(PropertyFlags.OmitNull)) {
-                mem.serialize = "${changetype<usize>(this." + mem.name + ") == <usize>0" + " ? \"\" : '" + escapeString(JSON.stringify(mem.alias || mem.name)) + ":' + __SERIALIZE<" + type + ">(this." + name.text + ") + \",\"}";
-                mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end));";
+                mem.serialize = "${changetype<usize>(this." + mem.name + ") == <usize>0" + " ? \"\" : '" + escapeString(JSON.stringify(mem.alias || mem.name)) + ":' + __JSON.stringify<" + type + ">(this." + name.text + ") + \",\"}";
+                mem.deserialize = "this." + name.text + " = " + "__JSON.parse<" + type + ">(data.substring(value_start, value_end));";
             }
             else if (mem.flags.includes(PropertyFlags.OmitIf)) {
-                mem.serialize = "${" + mem.args[0] + " ? \"\" : '" + escapeString(JSON.stringify(mem.alias || mem.name)) + ":' + __SERIALIZE<" + type + ">(this." + name.text + ") + \",\"}";
-                mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end));";
+                mem.serialize = "${" + mem.args[0] + " ? \"\" : '" + escapeString(JSON.stringify(mem.alias || mem.name)) + ":' + __JSON.stringify<" + type + ">(this." + name.text + ") + \",\"}";
+                mem.deserialize = "this." + name.text + " = " + "__JSON.parse<" + type + ">(data.substring(value_start, value_end));";
             }
             else if (mem.flags.includes(PropertyFlags.Alias)) {
-                mem.serialize = escapeString(JSON.stringify(mem.alias || mem.name)) + ":${__SERIALIZE<" + type + ">(this." + name.text + ")}";
-                mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end));";
+                mem.serialize = escapeString(JSON.stringify(mem.alias || mem.name)) + ":${__JSON.stringify<" + type + ">(this." + name.text + ")}";
+                mem.deserialize = "this." + name.text + " = " + "__JSON.parse<" + type + ">(data.substring(value_start, value_end));";
                 mem.name = name.text;
             }
             else if (mem.flags.includes(PropertyFlags.Flatten)) {
                 const nullable = mem.node.type.isNullable;
                 if (nullable) {
                     mem.serialize = escapeString(JSON.stringify(mem.alias || 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      }";
+                    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 + " = " + "__JSON.parse<" + type + ">('{\"" + mem.args[0] + "\":' + data.substring(value_start, value_end) + \"}\");\n      }";
                 }
                 else {
                     mem.serialize = escapeString(JSON.stringify(mem.alias || 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.deserialize = "this." + name.text + " = " + "__JSON.parse<" + type + ">('{\"" + mem.args[0] + "\":' + data.substring(value_start, value_end) + \"}\");";
                 }
                 mem.name = name.text;
             }
@@ -295,11 +497,9 @@ class JSONTransform extends BaseVisitor {
         }
         DESERIALIZE += "\n  return false;\n}";
         //console.log(sortedMembers);
-        if (process.env["JSON_DEBUG"]) {
-            console.log(SERIALIZE_RAW);
-            //console.log(SERIALIZE_PRETTY);
-            console.log(INITIALIZE);
-            console.log(DESERIALIZE);
+        // @ts-ignore
+        if (process && process.env["JSON_DEBUG"]) {
+            console.log("File: " + node.range.source.internalPath + "\n" + toString(node) + "\n\n");
         }
         const SERIALIZE_RAW_METHOD = SimpleParser.parseClassMember(SERIALIZE_RAW, node);
         //const SERIALIZE_PRETTY_METHOD = SimpleParser.parseClassMember(SERIALIZE_PRETTY, node);
@@ -347,6 +547,25 @@ export default class Transformer extends Transform {
             // Ignore all lib and std. Visit everything else.
             if (!isStdlib(source)) {
                 transformer.visit(source);
+                if (transformer.mustImport) {
+                    const tokenizer = new Tokenizer(new Source(0 /* SourceKind.User */, source.normalizedPath, "import { JSON as __JSON } from \"json-as/assembly\";"));
+                    parser.currentSource = tokenizer.source;
+                    source.statements.unshift(parser.parseTopLevelStatement(tokenizer));
+                    parser.currentSource = source;
+                    const tokenizer2 = new Tokenizer(new Source(0 /* SourceKind.User */, source.normalizedPath, "import { __atoi_fast } from \"json-as/assembly/util\";"));
+                    parser.currentSource = tokenizer2.source;
+                    source.statements.unshift(parser.parseTopLevelStatement(tokenizer2));
+                    parser.currentSource = source;
+                    transformer.mustImport = false;
+                    // @ts-ignore
+                    if (process && process.env["JSON_DEBUG"]?.toString().toLowerCase() == "all") {
+                        console.log("File: " + source.normalizedPath + "\n" + toString(source) + "\n\n");
+                    }
+                    // @ts-ignore
+                    if (process && process.env["JSON_DEBUG"]?.toString().toLowerCase() == "write") {
+                        this.writeFile(source.internalPath + ".ts", toString(source), process.cwd());
+                    }
+                }
             }
         }
         // Check that every parent and child class is hooked up correctly
@@ -387,6 +606,7 @@ class SchemaData {
         this.name = "";
         this.members = [];
         this.parent = null;
+        this.boxRefs = new Map();
     }
 }
 function charCodeAt32(data, offset) {
@@ -418,3 +638,18 @@ function escapeSlash(data) {
 function escapeQuote(data) {
     return data.replace(/\"/g, "\\\"");
 }
+function isPrimitiveType(data) {
+    return data == "u8"
+        || data == "u16"
+        || data == "u16"
+        || data == "u32"
+        || data == "u64"
+        || data == "i8"
+        || data == "i16"
+        || data == "i32"
+        || data == "i64"
+        || data == "f32"
+        || data == "f64"
+        || data == "bool"
+        || data == "boolean";
+}