json-as 0.2.5 → 0.4.1

package/assembly/test.ts

@@ -1,207 +1,35 @@
-import { unknown, unknownTypes } from './unknown'
-
-import { console, stringify } from "../node_modules/as-console/assembly/wasi"
-
-import { JSON, parseDynamicObject, parseUnknown, parseUnknownArray, removeJSONWhitespace } from '.'
-
-import { DynamicObject } from './DynamicObject'
-/*
-// Not inlining results in an error for some reason
-// @ts-ignore
-@inline
-function check<T>(message: string, data: T): void {
-    const encoded = JSON.stringify<T>(data)
-    const decoded = JSON.parse<T>(encoded)
-    if (encoded == JSON.stringify(decoded)) {
-        console.log(`Success: ${message}`)
-    } else {
-        console.log(`Fail: ${message}`)
-    }
-}
-
-// @ts-ignore
-@json
-class EmptySchema { }
-
-// @ts-ignore
-@json
-class JSONSchema {
-    string1: string
-    string2: string
-    string3: string
-    f641: f64
-    f642: f64
-    f643: f64
-    f644: f64
-    f645: f64
-    f646: f64
-    f321: f32
-    f322: f32
-    f323: f32
-    f324: f32
-    f325: f32
-    f326: f32
-    u8: u8
-    u16: u16
-    u32: u32
-    u64: u64
-    i8: i8
-    i16: i16
-    i32: i32
-    i64: i64
-    bool: bool
-    boolean: boolean
-    stringArr: string[]
-    f64Arr: f64[]
-    u8Arr: u8[]
-    u16Arr: u16[]
-    u32Arr: u32[]
-    u64Arr: u64[]
-    i8Arr: i8[]
-    i16Arr: i16[]
-    i32Arr: i32[]
-    i64Arr: i64[]
-    emptyArr: string[]
-    boolArr: bool[]
-    booleanArr: boolean[]
-    stringArrArr: string[][]
-    object: JSONSchema2
-}
-
-// @ts-ignore
-@json
-class JSONSchema2 {
-    string1: string
-}
-
-const obj: JSONSchema = {
-    string1: 'Hello World',
-    string2: 'Hell[}o Wo[rld}{',
-    string3: 'Hel`"lo Wo"`r"ld',
-    f641: 7.23,
-    f642: 10e2,
-    f643: 10E2,
-    f644: 123456e-5,
-    f645: 123456E-5,
-    f646: 0.0,
-    f321: 7.23,
-    f322: 10e2,
-    f323: 10E2,
-    f324: 123456e-5,
-    f325: 123456E-5,
-    f326: 0.0,
-    u8: 100,
-    u16: 101,
-    u32: 102,
-    u64: 103,
-    i8: -100,
-    i16: -101,
-    i32: -102,
-    i64: -103,
-    bool: true,
-    boolean: false,
-    stringArr: ['Hello World', 'Hell[}o Wo[rld}{', 'Hel`"lo Wo"`r"ld'],
-    f64Arr: [7.23, 10e2, 10e2, 10E2, 123456e-5, 123456E-5, 0.0],
-    u8Arr: [100, 100, 100],
-    u16Arr: [101, 101, 101],
-    u32Arr: [102, 102, 102],
-    u64Arr: [103, 103, 103],
-    i8Arr: [-100, -100, -100],
-    i16Arr: [-101, -101, -101],
-    i32Arr: [-102, -102, -102],
-    i64Arr: [-103, -103, -103],
-    emptyArr: [],
-    boolArr: [true, false, true],
-    booleanArr: [true, false, true],
-    stringArrArr: [['Hey'], ['ha'], ['ho']],
-    object: {
-        string1: 'Hello World'
-    }
-}
-
-const emptyObj: EmptySchema = {}
-// Strings
-check<string>('Encode/Decode String', 'Hello World')
-check<string>('Encode/Decode String', 'Hell[}o Wo[rld}{')
-check<string>('Encode/Decode String', 'Hel`"lo Wo"`r"ld')
-// Floats
-check<f64>('Encode/Decode f64', 7.23)
-check<f64>('Encode/Decode f64', 10e2)
-check<f64>('Encode/Decode f64', 10E2)
-check<f64>('Encode/Decode f64', 123456e-5)
-check<f64>('Encode/Decode f64', 123456E-5)
-check<f64>('Encode/Decode f64', 0.0)
-
-check<f32>('Encode/Decode f32', 7.23)
-check<f32>('Encode/Decode f32', 10e2)
-check<f32>('Encode/Decode f32', 10E2)
-check<f32>('Encode/Decode f32', 123456e-5)
-check<f32>('Encode/Decode f32', 123456E-5)
-check<f32>('Encode/Decode f32', 0.0)
-// Integers
-check<u8>('Encode/Decode u8', 100)
-check<u16>('Encode/Decode u16', 101)
-check<u32>('Encode/Decode u32', 102)
-check<u64>('Encode/Decode u64', 103)
-
-check<i8>('Encode/Decode i8', -100)
-check<i16>('Encode/Decode i16', -101)
-check<i32>('Encode/Decode i32', -102)
-check<i64>('Encode/Decode i64', -103)
-
-// Bools
-check<bool>('Encode/Decode bool', true)
-check<bool>('Encode/Decode bool', false)
-
-// Booleans
-check<boolean>('Encode/Decode boolean', true)
-check<boolean>('Encode/Decode boolean', false)
-
-// Null 
-check('Encode/Decode null', null)
-
-// Arrays
-check<string[]>('Encode/Decode string[]', ['Hello World', 'Hell[}o Wo[rld}{', 'Hel`"lo Wo"`r"ld'])
-check<f64[]>('Encode/Decode f32[]', [7.23, 10e2, 10e2, 10E2, 123456e-5, 123456E-5, 0.0])
-check<u8[]>('Encode/Decode u8[]', [100, 100, 100])
-check<u16[]>('Encode/Decode u16[]', [101, 101, 101])
-check<u32[]>('Encode/Decode u32[]', [102, 102, 102])
-check<u64[]>('Encode/Decode u64[]', [103, 103, 103])
-check<i8[]>('Encode/Decode i8[]', [-100, -100, -100])
-check<i16[]>('Encode/Decode i16[]', [-101, -101, -101])
-check<i32[]>('Encode/Decode i32[]', [-102, -102, -102])
-check<i64[]>('Encode/Decode i64[]', [-103, -103, -103])
-check<string[]>('Encode/Decode empty[]', [])
-check<bool[]>('Encode/Decode bool[]', [true, false, true])
-check<boolean[]>('Encode/Decode boolean[]', [true, false, true])
-check<string[][]>('Encode/Decode string[][]', [['Hey'], ['ha'], ['ho']])
-
-// Object
-check<JSONSchema>('Encode/Decode object', obj)
-
-check<EmptySchema>('Encode/Decode object', emptyObj)
-*/
-// Unknown
-//check<unknown[]>('Encode/Decode unknown[]', ["Welcome to dynamic arrays", ["Very", ["Deep", ["Array"]]], "It also supports nulls"])
-
-//console.log(JSON.stringify(["Welcome to dynamic arrays", 3.14, ["Very", ["Deep", ["Array"]]], true, "It also supports nulls", null]))
-
-//console.log(JSON.stringify(JSON.parse<unknown[]>('["Welcome to dynamic arrays",3.14,["Very",["Deep",["Array"]]],true,"It also supports nulls",null]')))
-//const foo = new Map()
-
-//console.log(JSON.stringify(parseDynamicObject('{"hello":"world"}')))
-// @ts-ignore
-@json
-class Test {
-    stuff: string
-    things: i32
-}
-
-const test: Test = {
-    stuff: "hi",
-    things: 42
-}
-
-console.log(stringify(JSON.stringify(test)))
-console.log(removeJSONWhitespace('{"stuff":"hi", "things":42}'))
-console.log(stringify(JSON.stringify(JSON.parse<Test>('{"stuff":"hi", "things":42}'))))
+import "wasi";
+import { JSON } from ".";
+
+@json
+class Vec2 {
+  x: f32
+  y: f32
+}
+@json
+class Player {
+  firstName: string
+  lastName: string
+  lastActive: i32[]
+  age: i32
+  pos: Vec2
+}
+
+const data: Player = {
+  firstName: "Emmet",
+  lastName: "West",
+  lastActive: [8, 27, 2022],
+  age: 23,
+  pos: {
+    x: -3.4,
+    y: 1.2
+  }
+}
+
+const stringified = JSON.stringify<Player>(data);
+// '{"firstName":"Emmet","lastName":"West","lastActive":[8,27,2022],"age":23}'
+console.log(`Stringified: ${stringified}`);
+
+const parsed = JSON.parse<Player>(stringified)
+// { firstName: "Emmet", lastName: "West", "lastActive": [8,27,2022], age: 23 }
+console.log(`Parsed: ${JSON.stringify(parsed)}`)

package/assembly/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "assemblyscript/std/assembly.json",
+  "compilerOptions": {
+    "experimentalDecorators": true
+  },
+  "include": [
+    "./**/*.ts"
+  ]
+}

package/index.ts

@@ -0,0 +1 @@
+export { JSON } from "./assembly/index";

package/package.json

@@ -1,60 +1,49 @@
 {
   "name": "json-as",
-  "version": "0.2.5",
+  "version": "0.4.1",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
-  "ascMain": "assembly/index.ts",
-  "author": "JairusSW",
+  "author": "Jairus Tanaka",
+  "contributors": [
+    "DogWhich"
+  ],
   "license": "MIT",
   "scripts": {
-    "build:transform": "tsc -w -p ./transform",
-    "build:test": "asc assembly/test.ts --transform ./transform --target test --explicitStart",
-    "test": "node --experimental-wasi-unstable-preview1 ./tests/test",
-    "bench:build": "asc assembly/bench.ts --runtime incremental --transform ./transform --target bench --explicitStart",
-    "bench:node": "node --experimental-wasi-unstable-preview1 ./bench/bench",
-    "bench:wasmtime": "wasmtime ./bench/output/bench.wasm",
-    "bench:lunatic": "lunatic ./bench/output/bench.wasm",
-    "asbuild:untouched": "asc assembly/index.ts --target debug",
-    "asbuild:optimized": "asc assembly/index.ts --target release",
-    "asbuild": "yarn asbuild:untouched && yarn asbuild:optimized"
+    "bench:astral": "astral",
+    "build:test": "asc assembly/test.ts --target test",
+    "build:transform": "tsc -p ./transform",
+    "test:wasmtime": "wasmtime ./build/test.wasm",
+    "test:lunatic": "lunatic ./build/test.wasm",
+    "test:wasm3": "wasm3 ./build/test.wasm"
   },
   "devDependencies": {
-    "@as-pect/cli": "^6.2.4",
-    "@assemblyscript/loader": "^0.19.10",
-    "@serial-as/json": "^1.0.2",
-    "@types/jest": "^27.0.2",
-    "@types/line-column": "^1.0.0",
-    "as-base64": "^0.2.0",
-    "as-bignum": "^0.2.18",
+    "@as-tral/cli": "^1.1.1",
     "as-console": "^6.0.2",
-    "as-variant": "^0.2.1",
-    "as-wasi": "^0.4.6",
-    "asbuild": "^0.2.0",
-    "assemblyscript": "^0.19.18",
-    "assemblyscript-json": "^1.1.0",
-    "jest": "^27.3.1",
-    "kati": "^0.6.2",
-    "lerna": "^4.0.0",
-    "rimraf": "^3.0.2",
-    "ts-jest": "^27.0.7",
-    "ts-node": "^10.4.0",
-    "typescript": "^4.4.4"
+    "assemblyscript": "^0.20.7",
+    "assemblyscript-prettier": "^1.0.2",
+    "benchmark": "^2.1.4",
+    "microtime": "^3.0.0",
+    "typescript": "^4.7.2"
   },
   "dependencies": {
-    "as-string-sink": "^0.4.2"
+    "as-string-sink": "^0.5.0",
+    "as-variant": "^0.3.0",
+    "visitor-as": "^0.10.0"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/aspkg/as-json.git"
+    "url": "git+https://github.com/JairusSW/as-json.git"
   },
   "keywords": [
     "assemblyscript",
     "json",
     "serialize",
-    "deserialize"
+    "deserialize",
+    "dynamic"
   ],
   "bugs": {
-    "url": "https://github.com/aspkg/as-json/issues"
+    "url": "https://github.com/JairusSW/as-json/issues"
   },
-  "homepage": "https://github.com/aspkg/as-json#readme"
+  "homepage": "https://github.com/JairusSW/as-json#readme",
+  "type": "module"
 }

package/tests/index.js

@@ -1,4 +1,4 @@
-const assert = require("assert");
-const myModule = require("..");
-assert.strictEqual(myModule.add(1, 2), 3);
+import assert from "assert";
+import { add } from "../build/debug.js";
+assert.strictEqual(add(1, 2), 3);
 console.log("ok");

package/tests/test.js

@@ -1,10 +1,17 @@
 const fs = require("fs");
 const loader = require("@assemblyscript/loader");
-const { WASI } = require('wasi')
-const wasiOptions = {}
-const wasi = new WASI(wasiOptions)
+const { WASI } = require("wasi");
+const ConsoleImport = require('as-console/imports')
+const Console = new ConsoleImport()
+const wasiOptions = {};
+const wasi = new WASI(wasiOptions);
 const imports = {
-  wasi_snapshot_preview1: wasi.wasiImport
+  wasi_snapshot_preview1: wasi.wasiImport,
+  ...Console.wasmImports
 };
-const wasmModule = loader.instantiateSync(fs.readFileSync(__dirname + "/output/test.wasm"), imports);
-wasi.start(wasmModule)
+const wasmModule = loader.instantiateSync(
+  fs.readFileSync(__dirname + "/output/test.wasm"),
+  imports
+);
+Console.wasmExports = wasmModule.exports
+wasi.start(wasmModule);

package/transform/lib/index.js

@@ -1,181 +1,78 @@
-"use strict";
-const as_1 = require("visitor-as/as");
-const visitor_as_1 = require("visitor-as");
-const utils_1 = require("visitor-as/dist/utils");
-function getTypeName(type) {
-    let _type = (0, utils_1.getName)(type);
-    const OR_NULL = /\|.*null/;
-    if (type.isNullable && !OR_NULL.test(_type)) {
-        _type = `${_type} | null`;
-    }
-    return _type;
-}
-// Replace Next Line
-const replaceNextLineRegex = /^\W*\/\/ <replace next line>.*$/gm;
-class JSONTransformer extends visitor_as_1.BaseVisitor {
-    currentClass;
-    encodeStmts = new Map();
-    decodeCode = new Map();
-    lastType = '';
-    sources = [];
-    globalStatements = [];
-    replaceNextLines = new Set();
-    visitObjectLiteralExpression(node) {
-        const keys = node.names;
-        const values = node.values;
-        const replacer = visitor_as_1.SimpleParser.parseExpression(`new Object()`);
-        for (const key of keys) {
-        }
-    }
-    visitElementAccessExpression(node) {
-        super.visitElementAccessExpression(node);
-        if ((0, utils_1.toString)(node.expression) === 'o') {
-            // Should be like if (node.expression.type.text === "Object") {
-            const replacer = visitor_as_1.SimpleParser.parseExpression(`u32(changetype<usize>(${(0, utils_1.toString)(node.elementExpression)}))`);
-            node.elementExpression = replacer;
-            this.sources.push(replacer.range.source);
-        }
-    }
-    visitArrayLiteralExpression(node) {
-        super.visitArrayLiteralExpression(node);
-        if (isanyArray(node)) {
-            for (let i = 0; i < node.elementExpressions.length; i++) {
-                const expr = node.elementExpressions[i];
-                // @ts-ignore
-                let replacement;
-                // @ts-ignore
-                if (expr.elementExpressions) {
-                    // @ts-ignore
-                    this.convertToAnyArray(expr.elementExpressions);
-                }
-                // @ts-ignore
-                replacement = visitor_as_1.SimpleParser.parseExpression(`unknown.wrap(${(0, utils_1.toString)(expr)})`);
-                node.elementExpressions[i] = replacement;
-                this.sources.push(replacement.range.source);
-            }
-        }
-    }
-    convertToAnyArray(exprs) {
-        for (let i = 0; i < exprs.length; i++) {
-            const expr = exprs[i];
-            // @ts-ignore
-            let replacement;
-            // @ts-ignore
-            if (expr.elementExpressions) {
-                // @ts-ignore
-                this.convertToAnyArray(expr.elementExpressions);
-            }
-            // @ts-ignore
-            replacement = visitor_as_1.SimpleParser.parseExpression(`unknown.wrap(${(0, utils_1.toString)(expr)})`);
-            exprs[i] = replacement;
-            this.sources.push(replacement.range.source);
-        }
+import { ClassDecorator, registerDecorator } from "visitor-as/dist/decorator.js";
+import { getName } from "visitor-as/dist/utils.js";
+import { SimpleParser } from "visitor-as/dist/index.js";
+class AsJSONTransform extends ClassDecorator {
+    constructor() {
+        super(...arguments);
+        this.sources = [];
+        this.encodeStmts = new Map();
+        this.decodeCode = new Map();
     }
+    visitMethodDeclaration(node) { }
     visitFieldDeclaration(node) {
-        super.visitFieldDeclaration(node);
-        const name = (0, utils_1.toString)(node.name);
+        const name = getName(node);
         if (!node.type) {
             throw new Error(`Field ${name} is missing a type declaration`);
         }
-        const type = getTypeName(node.type);
-        if (this.currentClass) {
-            const className = this.currentClass.name.text;
-            if (!this.encodeStmts.has(className))
-                this.encodeStmts.set(className, []);
-            if (!this.decodeCode.has(className))
-                this.decodeCode.set(className, []);
-            // @ts-ignore
-            this.encodeStmts.get(className).push(`this.__encoded += '' + '"' + '${name}' + '"' + ':' + JSON.stringify<${type}>(this.${name}) + ',';`);
-            // @ts-ignore
-            this.decodeCode.get(className).push(`${name}: JSON.parse<${type}>(unchecked(values.get('${name}'))),\n`);
-        }
+        const type = getName(node.type);
+        const className = this.currentClass.name.text;
+        if (!this.encodeStmts.has(className))
+            this.encodeStmts.set(className, []);
+        if (!this.decodeCode.has(className))
+            this.decodeCode.set(className, []);
+        // @ts-ignore
+        this.encodeStmts.get(className).push(`this.__JSON_Serialized += '' + '"' + '${name}' + '"' + ':' + JSON.stringify<${type}>(this.${name}) + ',';`);
+        // @ts-ignore
+        this.decodeCode.get(className).push(`${name}: JSON.parse<${type}>(values.get("${name}")),\n`);
     }
     visitClassDeclaration(node) {
-        super.visitClassDeclaration(node);
         if (!node.members) {
             return;
         }
         this.currentClass = node;
-        const name = (0, utils_1.getName)(node);
+        const name = getName(node);
         this.encodeStmts.delete(name);
         this.decodeCode.delete(name);
         this.visit(node.members);
-        const encodedProp = `__encoded: string = ''`;
-        let encodeMethod = ``;
+        const serializedProp = `__JSON_Serialized: string = "";`;
+        let serializeFunc = ``;
         if (this.encodeStmts.has(name) && this.encodeStmts.get(name)) {
-            encodeMethod = `
-      __encode(): void {
-        if (!this.__encoded) {
+            serializeFunc = `
+      __JSON_Serialize(): string {
+        if (!this.__JSON_Serialized) {
           ${ // @ts-ignore
             this.encodeStmts.get(name).join("\n")};
-          this.__encoded = this.__encoded.slice(0, this.__encoded.length - 1)
+          this.__JSON_Serialized = "{" + this.__JSON_Serialized.slice(0, this.__JSON_Serialized.length - 1) + "}";
         }
+        return this.__JSON_Serialized;
       }
       `;
         }
         else {
-            encodeMethod = `
-      __encode(): void {}
+            serializeFunc = `
+      __JSON_Serialize(): string {
+        return "{}";
+      }
       `;
         }
-        const decodeMethod = `
-    __decode(values: Map<string, string>): ${name} {
-        const decoded: ${name} = {
+        const deserializeFunc = `
+    __JSON_Deserialize(values: Map<string, string>): ${name} {
+        return {
           ${ // @ts-ignore
-        this.decodeCode.get(name) ? this.decodeCode.get(name).join("") : ''}
+        this.decodeCode.get(name) ? this.decodeCode.get(name).join("") : ""}
         }
-      return decoded
     }
     `;
-        const encodedPropMember = visitor_as_1.SimpleParser.parseClassMember(encodedProp, node);
-        node.members.push(encodedPropMember);
-        const encodeMember = visitor_as_1.SimpleParser.parseClassMember(encodeMethod, node);
-        node.members.push(encodeMember);
-        const decodeMember = visitor_as_1.SimpleParser.parseClassMember(decodeMethod, node);
-        node.members.push(decodeMember);
-    }
-    static visit(node) {
-        new JSONTransformer().visit(node);
+        //console.log(serializedProp, serializeFunc, deserializeFunc)
+        const serializedProperty = SimpleParser.parseClassMember(serializedProp, node);
+        node.members.push(serializedProperty);
+        const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
+        node.members.push(serializeMethod);
+        const deserializeMethod = SimpleParser.parseClassMember(deserializeFunc, node);
+        node.members.push(deserializeMethod);
     }
-    visitSource(source) {
-        this.globalStatements = [];
-        super.visitSource(source);
+    get name() {
+        return "json";
     }
 }
-function isanyArray(node) {
-    if (node.elementExpressions.length === 0)
-        return false;
-    const firstKind = node.elementExpressions[0]?.kind;
-    const isBoolean = ((0, utils_1.toString)(node.elementExpressions[0]) === 'true' || (0, utils_1.toString)(node.elementExpressions[0]) === 'false');
-    for (const chunk of node.elementExpressions) {
-        if (isBoolean) {
-            if ((0, utils_1.toString)(chunk) !== 'true' || (0, utils_1.toString)(chunk) !== 'false')
-                true;
-        }
-        else if (chunk.kind !== firstKind)
-            return true;
-    }
-    return false;
-}
-module.exports = class MyTransform extends as_1.Transform {
-    // Trigger the transform after parse.
-    afterParse(parser) {
-        // Create new transform
-        const transformer = new JSONTransformer();
-        // Loop over every source
-        for (const source of parser.sources) {
-            // Ignore all lib (std lib). Visit everything else.
-            if (!source.isLibrary && !source.internalPath.startsWith(`~lib/`)) {
-                transformer.visit(source);
-            }
-        }
-        let i = 0;
-        for (const source of transformer.sources) {
-            //source.internalPath += `${i++}.ts`
-            if (i === 0) {
-                parser.sources.push(source);
-                i++;
-            }
-        }
-    }
-};
+export default registerDecorator(new AsJSONTransform());

package/transform/package.json

@@ -1,3 +1,31 @@
 {
-    "main": "./lib/index.js"
-}
+    "name": "@json-as/transform",
+    "version": "0.4.0",
+    "description": "JSON encoder/decoder for AssemblyScript",
+    "main": "./lib/index.js",
+    "author": "Jairus Tanaka",
+    "contributors": [
+        "DogWhich"
+    ],
+    "license": "MIT",
+    "scripts": {},
+    "devDependencies": {},
+    "dependencies": {},
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/JairusSW/as-json.git"
+    },
+    "keywords": [
+        "assemblyscript",
+        "json",
+        "serialize",
+        "deserialize",
+        "dynamic"
+    ],
+    "bugs": {
+        "url": "https://github.com/JairusSW/as-json/issues"
+    },
+    "homepage": "https://github.com/JairusSW/as-json#readme",
+    "type": "module",
+    "exports": "./lib/index.js"
+}