json-as 0.2.1 → 0.2.5

package/assembly/DynamicObject.ts

@@ -0,0 +1,29 @@
+import { unknown } from "./unknown"
+
+/**
+ * Provides functionality common to all JavaScript objects.
+ */
+export class DynamicObject {
+    [key: string]: any
+    // Having it marked as 'any' is for intellisense only
+    protected __data: Map<string, unknown> = new Map<string, unknown>()
+    set(path: string, value: unknown): void {
+        this.__data.set(path, value)
+    }
+    get<T = unknown>(path: string): T {
+        let type!: T
+        if (type instanceof unknown) {
+            // @ts-ignore
+            return this.__data.get(path)
+        } else {
+            // @ts-ignore
+            return this.__data.get(path).get<T>()
+        }
+    }
+    static keys(o: DynamicObject): string[] {
+        return o.__data.keys()
+    }
+    static values(o: DynamicObject): unknown[] {
+        return o.__data.values()
+    }
+}

package/assembly/bench.ts

@@ -2,12 +2,12 @@ import 'wasi'
 
 import { Date } from 'as-wasi'
 
-import { JSON } from './json'
+import { JSON } from '.'
 
 import * as asJSON from "assemblyscript-json"
 
 import { unknown } from './unknown'
-import { Object } from './Object'
+import { DynamicObject } from './DynamicObject'
 
 // @ts-ignore
 @json
@@ -19,7 +19,7 @@ const jsonData: JSONSchema = {
     hello: 'world'
 }
 
-const o = new Object()
+const o = new DynamicObject()
 
 o['hello'] = unknown.wrap('world')
 
@@ -86,11 +86,11 @@ bench('AS-JSON Parse Object', () => {
 })
 
 bench('AS-JSON Stringify Dynamic Object', () => {
-    JSON.stringify<Object>(o)
+    JSON.stringify<DynamicObject>(o)
 })
 
 bench('AS-JSON Parse Object', () => {
-    JSON.parse<Object>('{"hello":"world"}')
+    JSON.parse<DynamicObject>('{"hello":"world"}')
 })
 
 bench('AS-JSON Stringify Dynamic Array', () => {
@@ -116,7 +116,7 @@ bench('AssemblyScript-JSON Stringify String', () => {
     String.UTF8.decode(binary.buffer)
     // Its odd. Not encoded in UTF16 Strings.
     // Since AS-JSON returns a string, so does assemblyscript-json in this bench.
-    // Or else, the bench is biased. 
+    // Or else, the bench is biased.
 })
 
 bench('AssemblyScript-JSON Parse String', () => {

package/assembly/{json.ts → index.ts}

@@ -1,8 +1,9 @@
+import { console, stringify } from '../node_modules/as-console/assembly/wasi'
 import { StringSink } from 'as-string-sink'
-import { Object } from './Object'
+import { DynamicObject } from './DynamicObject'
 import { unknown, unknownTypes } from './unknown'
 export { unknown, unknownTypes } from './unknown'
-export { Object } from './Object'
+export { DynamicObject as Object } from './DynamicObject'
 
 @global
 export class Nullable { }
@@ -29,7 +30,7 @@ const f_charCode: u16 = 116// "t"
 const nCode: u16 = 110// "n"
 const unknownId = idof<unknown>()
 const stringId = idof<string>()
-const objectId = idof<Object>()
+const objectId = idof<DynamicObject>()
 const arrayStringId = idof<string[]>()
 const arrayBooleanId = idof<boolean[]>()
 const arrayBoolId = idof<bool[]>()
@@ -52,6 +53,8 @@ const WS5code = '\u0009'.charCodeAt(0)
 const unknownTrue = unknown.wrap(true)
 const unknownFalse = unknown.wrap(false)
 const unknownNull = unknown.wrap(null)
+const fwd_slash = "\\"
+const empty_stringCode = " ".charCodeAt(0)
 
 /**
  * JSON Encoder/Decoder for AssemblyScript
@@ -81,7 +84,7 @@ export namespace JSON {
       return serializeArray<T>(data)
     } else if (data instanceof unknown) {
       return serializeUnknown(data)
-    } else if (data instanceof Object) {
+    } else if (data instanceof DynamicObject) {
       return serializeDynamicObject(data)
     }
 
@@ -115,16 +118,16 @@ export namespace JSON {
     // @ts-ignore
     else if (type instanceof unknown) return parseUnknown(data)
     // @ts-ignore
-    else if (type instanceof Object) return parseDynamicObject(data)
+    else if (type instanceof DynamicObject) return parseDynamicObject(data)
     // @ts-ignore
     return parseObject<T>(data)
   }
 }
 
-export function serializeDynamicObject(data: Object): string {
+export function serializeDynamicObject(data: DynamicObject): string {
   const result = new StringSink(lcbracket)
-  const keys = Object.keys(data)
-  const values = Object.values(data)
+  const keys = DynamicObject.keys(data)
+  const values = DynamicObject.values(data)
   const len: u32 = keys.length - 1
   if (len === -1) return '{}'
   for (let i: u32 = 0; i < len; i++) {
@@ -150,134 +153,134 @@ export function serializeUnknown(data: unknown): string {
     return serializeString(data.get<string>())
   }
   // @ts-ignore
-  else if (data.type === objectId) {
+  else if (data.type === unknownTypes.boolean) {
     // @ts-ignore
-    return serializeDynamicObject(data.get<Object>())
+    return serializeBoolean(data.get<boolean>())
   }
   // @ts-ignore
-  else if (data.type === arrayUnknownId) {
+  else if (data.type === unknownTypes.i8) {
     // @ts-ignore
-    return serializeUnknownArray(data.get<unknown[]>())
+    return data.get<i8>().toString()
   }
   // @ts-ignore
-  else if (data.type === arrayBoolId) {
+  else if (data.type === unknownTypes.i16) {
     // @ts-ignore
-    return serializeBooleanArray(data.get<bool[]>())
+    return data.get<i16>().toString()
   }
   // @ts-ignore
-  else if (data.type === arrayBooleanId) {
+  else if (data.type === unknownTypes.i32) {
     // @ts-ignore
-    return serializeBooleanArray(data.get<boolean[]>())
+    return data.get<i32>().toString()
   }
   // @ts-ignore
-  else if (data.type === arrayF32Id) {
+  else if (data.type === unknownTypes.i64) {
     // @ts-ignore
-    return serializeNumberArray<f32[]>(data.get<f32[]>())
+    return data.get<i64>().toString()
   }
   // @ts-ignore
-  else if (data.type === arrayF64Id) {
+  else if (data.type === unknownTypes.u8) {
     // @ts-ignore
-    return serializeNumberArray<f64[]>(data.get<f64[]>())
+    return data.get<u8>().toString()
   }
   // @ts-ignore
-  else if (data.type === arrayU8Id) {
+  else if (data.type === unknownTypes.u16) {
     // @ts-ignore
-    return serializeNumberArray<u8[]>(data.get<u8[]>())
+    return data.get<u16>().toString()
   }
   // @ts-ignore
-  else if (data.type === arrayU16Id) {
+  else if (data.type === unknownTypes.u32) {
     // @ts-ignore
-    return serializeNumberArray<u16[]>(data.get<u16[]>())
+    return data.get<u32>().toString()
   }
   // @ts-ignore
-  else if (data.type === arrayU32Id) {
+  else if (data.type === unknownTypes.u64) {
     // @ts-ignore
-    return serializeNumberArray<u32[]>(data.get<u32[]>())
+    return data.get<u64>().toString()
   }
   // @ts-ignore
-  else if (data.type === arrayU64Id) {
+  else if (data.type === unknownTypes.f32) {
     // @ts-ignore
-    return serializeNumberArray<u64[]>(data.get<u64[]>())
+    return data.get<f32>().toString()
   }
   // @ts-ignore
-  else if (data.type === arrayI8Id) {
+  else if (data.type === unknownTypes.f64) {
     // @ts-ignore
-    return serializeNumberArray<i8[]>(data.get<i8[]>())
+    return data.get<f64>().toString()
   }
   // @ts-ignore
-  else if (data.type === arrayI16Id) {
+  else if (data.type === objectId) {
     // @ts-ignore
-    return serializeNumberArray<i16[]>(data.get<i16[]>())
+    return serializeDynamicObject(data.get<DynamicObject>())
   }
   // @ts-ignore
-  else if (data.type === arrayI32Id) {
+  else if (data.type === arrayUnknownId) {
     // @ts-ignore
-    return serializeNumberArray<i32[]>(data.get<i32[]>())
+    return serializeUnknownArray(data.get<unknown[]>())
   }
   // @ts-ignore
-  else if (data.type === arrayI64Id) {
+  else if (data.type === arrayBoolId) {
     // @ts-ignore
-    return serializeNumberArray<i64[]>(data.get<i64[]>())
+    return serializeBooleanArray(data.get<bool[]>())
   }
   // @ts-ignore
-  else if (data.type === arrayStringId) {
+  else if (data.type === arrayBooleanId) {
     // @ts-ignore
-    return serializeStringArray(data.get<string[]>())
+    return serializeBooleanArray(data.get<boolean[]>())
   }
   // @ts-ignore
-  else if (data.type === unknownTypes.boolean) {
+  else if (data.type === arrayF32Id) {
     // @ts-ignore
-    return serializeBoolean(data.get<boolean>())
+    return serializeNumberArray<f32[]>(data.get<f32[]>())
   }
   // @ts-ignore
-  else if (data.type === unknownTypes.i8) {
+  else if (data.type === arrayF64Id) {
     // @ts-ignore
-    return data.get<i8>().toString()
+    return serializeNumberArray<f64[]>(data.get<f64[]>())
   }
   // @ts-ignore
-  else if (data.type === unknownTypes.i16) {
+  else if (data.type === arrayU8Id) {
     // @ts-ignore
-    return data.get<i16>().toString()
+    return serializeNumberArray<u8[]>(data.get<u8[]>())
   }
   // @ts-ignore
-  else if (data.type === unknownTypes.i32) {
+  else if (data.type === arrayU16Id) {
     // @ts-ignore
-    return data.get<i32>().toString()
+    return serializeNumberArray<u16[]>(data.get<u16[]>())
   }
   // @ts-ignore
-  else if (data.type === unknownTypes.i64) {
+  else if (data.type === arrayU32Id) {
     // @ts-ignore
-    return data.get<i64>().toString()
+    return serializeNumberArray<u32[]>(data.get<u32[]>())
   }
   // @ts-ignore
-  else if (data.type === unknownTypes.u8) {
+  else if (data.type === arrayU64Id) {
     // @ts-ignore
-    return data.get<u8>().toString()
+    return serializeNumberArray<u64[]>(data.get<u64[]>())
   }
   // @ts-ignore
-  else if (data.type === unknownTypes.u16) {
+  else if (data.type === arrayI8Id) {
     // @ts-ignore
-    return data.get<u16>().toString()
+    return serializeNumberArray<i8[]>(data.get<i8[]>())
   }
   // @ts-ignore
-  else if (data.type === unknownTypes.u32) {
+  else if (data.type === arrayI16Id) {
     // @ts-ignore
-    return data.get<u32>().toString()
+    return serializeNumberArray<i16[]>(data.get<i16[]>())
   }
   // @ts-ignore
-  else if (data.type === unknownTypes.u64) {
+  else if (data.type === arrayI32Id) {
     // @ts-ignore
-    return data.get<u64>().toString()
+    return serializeNumberArray<i32[]>(data.get<i32[]>())
   }
   // @ts-ignore
-  else if (data.type === unknownTypes.f32) {
+  else if (data.type === arrayI64Id) {
     // @ts-ignore
-    return data.get<f32>().toString()
+    return serializeNumberArray<i64[]>(data.get<i64[]>())
   }
   // @ts-ignore
-  else if (data.type === unknownTypes.f64) {
+  else if (data.type === arrayStringId) {
     // @ts-ignore
-    return data.get<f64>().toString()
+    return serializeStringArray(data.get<string[]>())
   }
   // @ts-ignore
   else {
@@ -377,7 +380,7 @@ function serializeObjectArray<T extends Array<any>>(data: T): string {
   return result.toString()
 }
 
-function serializeDynamicObjectArray(data: Object[]): string {
+function serializeDynamicObjectArray(data: DynamicObject[]): string {
   const result = new StringSink(lbracket)
   const len: u32 = data.length - 1
   for (let i: u32 = 0; i < len; i++) {
@@ -436,7 +439,7 @@ export function serializeArray<T extends Array<any>>(data: T): string {
     result.writeCodePoint(rbracketCode)
     return result.toString()
     // @ts-ignore
-  } else if (type instanceof Object) {
+  } else if (type instanceof DynamicObject) {
     for (let i = 0; i < len; i++) {
       result.write(serializeDynamicObject(unchecked(data[i])))
       result.writeCodePoint(commaCode)
@@ -667,6 +670,7 @@ export function parseArrayArray<T extends Array<unknown>>(data: string): T {
 
 export function parseObject<T>(data: string): T {
   //console.log('Data ' + data)
+  data = removeJSONWhitespace(data)
   const len: u32 = data.length - 1
   let schema: T
   const result = new Map<string, string>()
@@ -684,7 +688,7 @@ export function parseObject<T>(data: string): T {
       if (char === rcbracketCode || char === rbracketCode) fdepth++
     }
     if (depth !== 0 && depth === fdepth) {
-      //console.log(`Deep: ${prependType(data.slice(lastPos + 1, i + 1))}`)
+      //console.log(`Deep: ${data.slice(lastPos + 1, i + 1)}`)
       result.set(key, data.slice(lastPos + 1, i + 1).trim())
       // Reset the depth
       depth = 0
@@ -694,27 +698,29 @@ export function parseObject<T>(data: string): T {
     }
     if (depth === 0) {
       if (char === colonCode) {
-        //console.log(`Key: ${prependType(data.slice(lastPos + 1, i - 1))}`)
+        //console.log(`Key: ${data.slice(lastPos + 1, i - 1)}`)
         key = data.slice(lastPos + 1, i - 1).trim()
         lastPos = i
       }
       else if (char === commaCode) {
-        //console.log(`Value: ${prependType(data.slice(lastPos + 1, i))}`)
+        //console.log(`Value: ${data.slice(lastPos + 1, i)}`)
         if ((i - lastPos) > 0) result.set(key, data.slice(lastPos + 1, i).trim())
         lastPos = i + 1
       }
     }
   }
-  //console.log(`Trailing: ${prependType(data.slice(lastPos + 1, len))}\n\t\sValid: ${data.slice(lastPos + 1, len).length > 0}`)
+  //console.log(`Trailing: ${data.slice(lastPos + 1, len)}\n\t\sValid: ${data.slice(lastPos + 1, len).length > 0}`)
 
   if ((len - lastPos) > 0) result.set(key, data.slice(lastPos + 1, len).trim())
+  console.log(result.keys())
+  console.log(result.values())
   // @ts-ignore
   return schema.__decode(result)
 }
 
-export function parseDynamicObject(data: string): Object {
+export function parseDynamicObject(data: string): DynamicObject {
   const len: u32 = data.length - 1
-  if (len === 1) return new Object()
+  if (len === 1) return new DynamicObject()
   const result = new Map<string, unknown>()
   let lastPos: u32 = 1
   let key: string = ''
@@ -750,8 +756,26 @@ export function parseDynamicObject(data: string): Object {
   }
 
   if ((len - lastPos) > 0) result.set(key, unknown.wrap(data.slice(lastPos + 1, len - 1).trim()))
-  const o = new Object()
+  const o = new DynamicObject()
   // @ts-ignore
   o.__data = result
   return o
+}
+
+export function removeJSONWhitespace(data: string): string {
+  let result = new StringSink()
+  let instr = false
+  let char = 0
+  for (let i = 0; i < data.length; i++) {
+    char = data.charCodeAt(i)
+    if (char === quoteCode && data.charCodeAt(i - 1) === fwd_slashCode) {
+      instr = !instr
+    }
+    if (instr === true) {
+      result.writeCodePoint(char)
+    } else if (instr === false && char !== empty_stringCode) {
+      result.writeCodePoint(char)
+    }
+  }
+  return result.toString()
 }

package/assembly/test.ts

@@ -2,10 +2,10 @@ import { unknown, unknownTypes } from './unknown'
 
 import { console, stringify } from "../node_modules/as-console/assembly/wasi"
 
-import { JSON, parseDynamicObject, parseUnknown, parseUnknownArray } from './json'
-
-import { Object } from './Object'
+import { JSON, parseDynamicObject, parseUnknown, parseUnknownArray, removeJSONWhitespace } from '.'
 
+import { DynamicObject } from './DynamicObject'
+/*
 // Not inlining results in an error for some reason
 // @ts-ignore
 @inline
@@ -180,3 +180,28 @@ check<string[][]>('Encode/Decode string[][]', [['Hey'], ['ha'], ['ho']])
 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}'))))

package/package.json

@@ -1,61 +1,60 @@
-{
-  "name": "json-as",
-  "version": "0.2.1",
-  "description": "JSON encoder/decoder for AssemblyScript",
-  "types": "assembly/json.ts",
-  "ascMain": "assembly/json.ts",
-  "author": "JairusSW",
-  "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"
-  },
-  "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-console": "^6.0.2",
-    "as-string-sink": "^0.4.2",
-    "as-variant": "^0.2.1",
-    "as-wasi": "^0.4.6",
-    "asbuild": "^0.2.0",
-    "assemblyscript": "^0.19.10",
-    "assemblyscript-json": "^1.1.0",
-    "jest": "^27.0.6",
-    "kati": "^0.6.1",
-    "lerna": "^4.0.0",
-    "rimraf": "^3.0.2",
-    "ts-jest": "^27.0.4",
-    "ts-node": "^10.1.0",
-    "typescript": "^4.3.5"
-  },
-  "dependencies": {
-    "@assemblyscript/loader": "^0.19.17"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/aspkg/as-json.git"
-  },
-  "keywords": [
-    "assemblyscript",
-    "json",
-    "serialize",
-    "deserialize"
-  ],
-  "bugs": {
-    "url": "https://github.com/aspkg/as-json/issues"
-  },
-  "homepage": "https://github.com/aspkg/as-json#readme"
-}
+{
+  "name": "json-as",
+  "version": "0.2.5",
+  "description": "JSON encoder/decoder for AssemblyScript",
+  "types": "assembly/index.ts",
+  "ascMain": "assembly/index.ts",
+  "author": "JairusSW",
+  "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"
+  },
+  "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-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"
+  },
+  "dependencies": {
+    "as-string-sink": "^0.4.2"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/aspkg/as-json.git"
+  },
+  "keywords": [
+    "assemblyscript",
+    "json",
+    "serialize",
+    "deserialize"
+  ],
+  "bugs": {
+    "url": "https://github.com/aspkg/as-json/issues"
+  },
+  "homepage": "https://github.com/aspkg/as-json#readme"
+}

package/tests/index.js

@@ -0,0 +1,4 @@
+const assert = require("assert");
+const myModule = require("..");
+assert.strictEqual(myModule.add(1, 2), 3);
+console.log("ok");

package/tests/test.js

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

package/transform/index.ts

@@ -95,6 +95,7 @@ class JSONTransformer extends BaseVisitor {
       const className = this.currentClass!.name.text
       if (!this.encodeStmts.has(className)) this.encodeStmts.set(className, [])
       if (!this.decodeCode.has(className)) this.decodeCode.set(className, [])
+      // TODO: fix later
       // @ts-ignore
       this.encodeStmts.get(className).push(
         `this.__encoded += '' + '"' + '${name}' + '"' + ':' + JSON.stringify<${type}>(this.${name}) + ',';`

package/transform/lib/index.js

@@ -3,7 +3,7 @@ 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 = utils_1.getName(type);
+    let _type = (0, utils_1.getName)(type);
     const OR_NULL = /\|.*null/;
     if (type.isNullable && !OR_NULL.test(_type)) {
         _type = `${_type} | null`;
@@ -29,9 +29,9 @@ class JSONTransformer extends visitor_as_1.BaseVisitor {
     }
     visitElementAccessExpression(node) {
         super.visitElementAccessExpression(node);
-        if (utils_1.toString(node.expression) === 'o') {
+        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>(${utils_1.toString(node.elementExpression)}))`);
+            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);
         }
@@ -49,7 +49,7 @@ class JSONTransformer extends visitor_as_1.BaseVisitor {
                     this.convertToAnyArray(expr.elementExpressions);
                 }
                 // @ts-ignore
-                replacement = visitor_as_1.SimpleParser.parseExpression(`unknown.wrap(${utils_1.toString(expr)})`);
+                replacement = visitor_as_1.SimpleParser.parseExpression(`unknown.wrap(${(0, utils_1.toString)(expr)})`);
                 node.elementExpressions[i] = replacement;
                 this.sources.push(replacement.range.source);
             }
@@ -66,14 +66,14 @@ class JSONTransformer extends visitor_as_1.BaseVisitor {
                 this.convertToAnyArray(expr.elementExpressions);
             }
             // @ts-ignore
-            replacement = visitor_as_1.SimpleParser.parseExpression(`unknown.wrap(${utils_1.toString(expr)})`);
+            replacement = visitor_as_1.SimpleParser.parseExpression(`unknown.wrap(${(0, utils_1.toString)(expr)})`);
             exprs[i] = replacement;
             this.sources.push(replacement.range.source);
         }
     }
     visitFieldDeclaration(node) {
         super.visitFieldDeclaration(node);
-        const name = utils_1.toString(node.name);
+        const name = (0, utils_1.toString)(node.name);
         if (!node.type) {
             throw new Error(`Field ${name} is missing a type declaration`);
         }
@@ -96,7 +96,7 @@ class JSONTransformer extends visitor_as_1.BaseVisitor {
             return;
         }
         this.currentClass = node;
-        const name = utils_1.getName(node);
+        const name = (0, utils_1.getName)(node);
         this.encodeStmts.delete(name);
         this.decodeCode.delete(name);
         this.visit(node.members);
@@ -146,10 +146,10 @@ function isanyArray(node) {
     if (node.elementExpressions.length === 0)
         return false;
     const firstKind = node.elementExpressions[0]?.kind;
-    const isBoolean = (utils_1.toString(node.elementExpressions[0]) === 'true' || utils_1.toString(node.elementExpressions[0]) === 'false');
+    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 (utils_1.toString(chunk) !== 'true' || utils_1.toString(chunk) !== 'false')
+            if ((0, utils_1.toString)(chunk) !== 'true' || (0, utils_1.toString)(chunk) !== 'false')
                 true;
         }
         else if (chunk.kind !== firstKind)

package/assembly/Object.ts

@@ -1,28 +0,0 @@
-import { unknown } from "./unknown"
-
-/**
- * Provides functionality common to all JavaScript objects.
- */
-export class Object {
-    [key: string]: any
-    // Having it marked as 'any' is for intellisense only
-    protected __data: Map<string, unknown> = new Map<string, unknown>()
-    @operator('[]')
-    private __getKeyOp(key: usize): unknown {
-        if (this.__data.has(changetype<string>(key))) {
-            return this.__data.get(changetype<string>(key))
-        } else {
-            return unknown.wrap(null)
-        }
-    }
-    @operator('[]=')
-    private __setKeyOp(key: usize, value: unknown): void {
-        this.__data.set(changetype<string>(key), value)
-    }
-    static keys(o: Object): string[] {
-        return o.__data.keys()
-    }
-    static values(o: Object): unknown[] {
-        return o.__data.values()
-    }
-}