json-as 1.0.0-beta.9 → 1.0.1

package/assembly/test.ts

@@ -57,6 +57,16 @@ class Point {
   }
 }
 
+@json
+class InnerObj<T> {
+  obj: T = instantiate<T>()
+}
+
+@json
+class ObjWithBracketString {
+  data: string = "";
+}
+
 const player: Player = {
   firstName: "Jairus",
   lastName: "Tanaka",
@@ -120,3 +130,11 @@ m10.set("pos", new JSON.Raw("{\"x\":1.0,\"y\":2.0,\"z\":3.0}"));
 const a10 = JSON.stringify(m10);
 
 console.log("a10: " + a10);
+
+const a11 = JSON.parse<Vec3>('  {  "x"  :  3.4  ,  "y"   :   1.2    ,  "z"  :  8.3   }     ');
+
+console.log("a11: " + JSON.stringify(a11));
+
+const a12 = JSON.parse<InnerObj<ObjWithBracketString>>('{"obj":{"data":"hello} world"}}');
+
+console.log("a12: " + JSON.stringify(a12))

package/bench/abc.bench.ts

@@ -0,0 +1,20 @@
+import { bench } from "./lib/bench";
+
+const v1 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+const v2 = '"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"';
+
+bench(
+  "Serialize Alphabet",
+  () => {
+    JSON.stringify(v1);
+  },
+  64_000_00,
+);
+
+bench(
+  "Deserialize Alphabet",
+  () => {
+    JSON.parse(v2);
+  },
+  64_000_00,
+);

package/bench/large.bench.ts

@@ -0,0 +1,126 @@
+import { bench } from "./lib/bench";
+
+class Vec3 {
+  public x!: number;
+  public y!: number;
+  public z!: number;
+}
+
+class LargeJSON {
+  public id!: number;
+  public name!: string;
+  public age!: number;
+  public email!: string;
+  public street!: string;
+  public city!: string;
+  public state!: string;
+  public zip!: string;
+  public tags!: string[];
+  public theme!: string;
+  public notifications!: boolean;
+  public language!: string;
+  public movement!: Vec3[];
+}
+
+const v1: LargeJSON = {
+  id: 2,
+  name: "Medium Object",
+  age: 18,
+  email: "me@jairus.dev",
+  street: "I don't want to say my street",
+  city: "I don't want to say this either",
+  state: "It really depends",
+  zip: "I forget what it is",
+  tags: ["me", "dogs", "mountains", "bar", "foo"],
+  theme: "Hyper Term Black",
+  notifications: true,
+  language: "en-US",
+  movement: [
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+    { x: 1, y: 2, z: 3 },
+  ],
+};
+
+const v2 = `{"id":2,"name":"Medium Object","age":18,"email":"me@jairus.dev","street":"I don't want to say my street","city":"I don't want to say this either","state":"It really depends","zip":"I forget what it is","tags":["me","dogs","mountains","bar","foo"],"theme":"Hyper Term Black","notifications":true,"language":"en-US","movement":[{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3},{"x":1,"y":2,"z":3}]}`;
+
+bench(
+  "Serialize Medium Object",
+  () => {
+    JSON.stringify(v1);
+  },
+  3_000_00,
+);
+
+bench(
+  "Deserialize Medium Object",
+  () => {
+    JSON.parse(v2);
+  },
+  3_000_00,
+);

package/bench/medium.bench.ts

@@ -0,0 +1,43 @@
+import { bench } from "./lib/bench";
+
+class MediumJSON {
+  public id!: number;
+  public name!: string;
+  public age!: number;
+  public email!: string;
+  public street!: string;
+  public city!: string;
+  public state!: string;
+  public zip!: string;
+  public tags!: string[];
+}
+
+const v1: MediumJSON = {
+  id: 2,
+  name: "Medium Object",
+  age: 18,
+  email: "me@jairus.dev",
+  street: "I don't want to say my street",
+  city: "I don't want to say this either",
+  state: "It really depends",
+  zip: "I forget what it is",
+  tags: ["me", "dogs", "mountains", "bar", "foo"],
+};
+
+const v2 = `{"id":2,"name":"Medium Object","age":18,"email":"me@jairus.dev","street":"I don't want to say my street","city":"I don't want to say this either","state":"It really depends","zip":"I forget what it is","tags":["me","dogs","mountains","bar","foo"]}`;
+
+bench(
+  "Serialize Medium Object",
+  () => {
+    JSON.stringify(v1);
+  },
+  8_000_00,
+);
+
+bench(
+  "Deserialize Medium Object",
+  () => {
+    JSON.parse(v2);
+  },
+  8_000_00,
+);

package/bench/small.bench.ts

@@ -0,0 +1,30 @@
+import { bench } from "./lib/bench";
+
+class SmallJSON {
+  public id!: number;
+  public name!: string;
+  public active!: boolean;
+}
+
+const v1: SmallJSON = {
+  id: 1,
+  name: "Small Object",
+  active: true,
+};
+const v2 = '{"id":1,"name":"Small Object","active":true}';
+
+bench(
+  "Serialize Small Object",
+  () => {
+    JSON.stringify(v1);
+  },
+  16_000_00,
+);
+
+bench(
+  "Deserialize Small Object",
+  () => {
+    JSON.parse(v2);
+  },
+  16_000_00,
+);

package/bench/vec3.bench.ts

@@ -0,0 +1,26 @@
+import { bench } from "./lib/bench";
+
+class Vec3 {
+  public x!: number;
+  public y!: number;
+  public z!: number;
+}
+
+const v1: Vec3 = { x: 1, y: 2, z: 3 };
+const v2 = '{"x":1,"y":2,"z":3}';
+
+bench(
+  "Serialize Vec3",
+  () => {
+    JSON.stringify(v1);
+  },
+  16_000_00,
+);
+
+bench(
+  "Deserialize Vec3",
+  () => {
+    JSON.parse(v2);
+  },
+  16_000_00,
+);

package/index.ts

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

package/package.json

@@ -1,25 +1,41 @@
 {
   "name": "json-as",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.1",
   "author": "Jairus Tanaka",
+  "description": "The only JSON library you'll need for AssemblyScript. SIMD enabled",
+  "types": "assembly/index.ts",
+  "main": "transform/lib/index.js",
+  "homepage": "https://github.com/JairusSW/json-as#readme",
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/JairusSW/json-as.git"
   },
-  "main": "transform/lib/index.js",
+  "bugs": {
+    "url": "https://github.com/JairusSW/json-as/issues"
+  },
+  "scripts": {
+    "test": "bash ./run-tests.sh",
+    "bench:as": "bash ./run-bench.as.sh",
+    "bench:js": "bash ./run-bench.js.sh",
+    "build:time": "time npx asc ./assembly/__benches__/abc.bench.ts --transform ./transform -o ./build/abc.bench.wasm --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior always --runtime stub --enable simd --enable bulk-memory",
+    "build:test": "rm -rf ./build/ && JSON_DEBUG=true asc --lib ./lib/ assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --optimizeLevel 3 --shrinkLevel 0",
+    "build:test:simd": "rm -rf ./build/ && JSON_DEBUG=true asc assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --optimizeLevel 3 --shrinkLevel 0 --enable simd",
+    "test:wasmtime": "wasmtime ./build/test.wasm",
+    "test:wasmer": "wasmer ./build/test.wasm",
+    "build:transform": "tsc -p ./transform",
+    "bench:wasmer": "wasmer ./build/bench.wasm --llvm",
+    "prettier": "prettier -w ."
+  },
   "devDependencies": {
     "@assemblyscript/wasi-shim": "^0.1.0",
     "@types/node": "^22.13.1",
-    "as-bench": "JairusSW/as-bench",
-    "as-console": "^7.0.0",
     "assemblyscript": "^0.27.34",
     "assemblyscript-prettier": "^3.0.1",
     "prettier": "^3.5.0",
+    "tsx": "^4.19.3",
     "typescript": "^5.7.3"
   },
-  "bugs": {
-    "url": "https://github.com/JairusSW/json-as/issues"
-  },
   "contributors": [
     "DogWhich",
     "Romdotdog",
@@ -30,8 +46,6 @@
     "Matt Johnson-Pint",
     "Tomáš Hromada"
   ],
-  "description": "The only JSON library you'll need for AssemblyScript. SIMD enabled",
-  "homepage": "https://github.com/JairusSW/json-as#readme",
   "keywords": [
     "assemblyscript",
     "json",
@@ -47,24 +61,8 @@
     "fast",
     "algorithm"
   ],
-  "license": "MIT",
-  "overrides": {
-    "assemblyscript": "$assemblyscript"
-  },
   "publishConfig": {
     "@JairusSW:registry": "https://npm.pkg.github.com"
   },
-  "scripts": {
-    "test": "bash ./run-tests.sh",
-    "build:bench": "rm -rf ./build/ && JSON_DEBUG=true asc assembly/__benches__/misc.bench.ts -o ./build/bench.wasm --textFile ./build/bench.wat --transform ./transform --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior always --runtime stub --enable simd --enable bulk-memory",
-    "build:test": "rm -rf ./build/ && JSON_DEBUG=true asc --lib ./libs/ assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --optimizeLevel 3 --shrinkLevel 0",
-    "build:test:simd": "rm -rf ./build/ && JSON_DEBUG=true asc assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --optimizeLevel 3 --shrinkLevel 0 --enable simd",
-    "test:wasmtime": "wasmtime ./build/test.wasm",
-    "test:wasmer": "wasmer ./build/test.wasm",
-    "build:transform": "tsc -p ./transform",
-    "bench:wasmer": "wasmer ./build/bench.wasm --llvm",
-    "prettier": "prettier -w ."
-  },
-  "type": "module",
-  "types": "assembly/index.ts"
+  "type": "module"
 }

package/run-bench.as.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+mkdir -p ./build
+
+for file in ./assembly/__benches__/*.bench.ts; do
+  filename=$(basename -- "$file")
+  output="./build/${filename%.ts}.wasm"
+
+  start_time=$(date +%s%3N)
+  npx asc "$file" --transform ./transform -o "$output" --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior always --runtime stub --enable simd --enable bulk-memory || { echo "Build failed"; exit 1; }
+  end_time=$(date +%s%3N)
+
+  build_time=$((end_time - start_time))
+
+  if [ "$build_time" -ge 60000 ]; then
+    formatted_time="$(bc <<< "scale=2; $build_time/60000")m"
+  elif [ "$build_time" -ge 1000 ]; then
+    formatted_time="$(bc <<< "scale=2; $build_time/1000")s"
+  else
+    formatted_time="${build_time}ms"
+  fi
+
+  echo -e "$filename (built in $formatted_time)\n"
+  wasmer "$output" --llvm || { echo "Benchmarked failed."; exit 1; }
+done
+
+echo "Finished benchmarks."

package/run-bench.js.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+mkdir -p ./build
+
+for file in ./bench/*.bench.ts; do
+  filename=$(basename -- "$file")
+
+  echo -e "$filename\n"
+  npx tsx "$file" || { echo "Benchmark failed."; exit 1; }
+done
+
+echo "Finished benchmarks."

package/run-tests.sh

@@ -6,9 +6,21 @@ for file in ./assembly/__tests__/*.spec.ts; do
   filename=$(basename -- "$file")
   output="./build/${filename%.ts}.wasm"
 
-  asc "$file" --transform ./transform --lib ./libs/ -o "$output" || { echo "Tests failed"; exit 1; }
+  start_time=$(date +%s%3N)
+  npx asc "$file" --transform ./transform --lib ./lib/ -o "$output" || { echo "Tests failed"; exit 1; }
+  end_time=$(date +%s%3N) 
 
-  echo " -> $filename"
+  build_time=$((end_time - start_time))
+
+  if [ "$build_time" -ge 60000 ]; then
+    formatted_time="$(bc <<< "scale=2; $build_time/60000")m"
+  elif [ "$build_time" -ge 1000 ]; then
+    formatted_time="$(bc <<< "scale=2; $build_time/1000")s"
+  else
+    formatted_time="${build_time}ms"
+  fi
+
+  echo " -> $filename (built in $formatted_time)"
   wasmtime "$output" || { echo "Tests failed"; exit 1; }
 done
 

package/transform/lib/index.js

@@ -1,4 +1,4 @@
-import { Source, Node, Tokenizer } from "assemblyscript/dist/assemblyscript.js";
+import { Node } from "assemblyscript/dist/assemblyscript.js";
 import { Transform } from "assemblyscript/dist/transform.js";
 import { Visitor } from "./visitor.js";
 import { SimpleParser, toString } from "./util.js";
@@ -13,9 +13,7 @@ class JSONTransform extends Visitor {
     schema;
     sources = new Set();
     imports = [];
-    jsonImport = null;
-    bsImport = null;
-    newStmts = { simd: [] };
+    topStatements = [];
     visitClassDeclaration(node) {
         if (!node.decorators?.length)
             return;
@@ -312,7 +310,7 @@ class JSONTransform extends Visitor {
                 DESERIALIZE += `${indent}switch (load<u32>(keyStart)) {\n`;
             else if (memberLen == 6)
                 DESERIALIZE += `${indent}let code = load<u64>(keyStart) & 0x0000FFFFFFFFFFFF;\n`;
-            else if (memberLen == 6)
+            else if (memberLen == 8)
                 DESERIALIZE += `${indent}let code = load<u64>(keyStart);\n`;
             else
                 DESERIALIZE += toMemCDecl(memberLen, indent);
@@ -410,9 +408,6 @@ class JSONTransform extends Visitor {
     }
     visitImportStatement(node) {
         super.visitImportStatement(node);
-        const source = this.parser.sources.find((src) => src.internalPath == node.internalPath);
-        if (!source)
-            return;
         this.imports.push(node);
     }
     visitSource(node) {
@@ -420,35 +415,29 @@ class JSONTransform extends Visitor {
         super.visitSource(node);
     }
     addRequiredImports(node) {
-        const bsImport = this.imports.find((i) => i.declarations.find((d) => d.foreignName.text == "bs"));
-        if (bsImport) {
-            const txt = `import { bs } from "as-bs";`;
-            if (!this.bsImport) {
-                this.bsImport = txt;
-                if (process.env["JSON_DEBUG"])
-                    console.log("Added as-bs import: " + txt + "\n");
-            }
-        }
-        else {
-            const txt = `import { bs } from "as-bs";`;
-            if (!this.bsImport) {
-                this.bsImport = txt;
-                if (process.env["JSON_DEBUG"])
-                    console.log("Added as-bs import: " + txt + "\n");
-            }
+        const filePath = fileURLToPath(import.meta.url);
+        const fileDir = path.dirname(filePath);
+        const bsImport = this.imports.find((i) => i.declarations?.find((d) => d.foreignName.text == "bs" || d.name.text == "bs"));
+        const jsonImport = this.imports.find((i) => i.declarations?.find((d) => d.foreignName.text == "JSON" || d.name.text == "JSON"));
+        let pkgRel = path.relative(path.dirname(node.range.source.normalizedPath), path.resolve(fileDir, "../../"));
+        if (!pkgRel.startsWith(".") && !pkgRel.startsWith("/"))
+            pkgRel = "./" + pkgRel;
+        pkgRel = pkgRel.replace(/^.*json-as/, "json-as");
+        if (!bsImport) {
+            const replaceNode = Node.createImportStatement([
+                Node.createImportDeclaration(Node.createIdentifierExpression("bs", node.range, false), null, node.range)
+            ], Node.createStringLiteralExpression(path.join(pkgRel, "./lib/as-bs"), node.range), node.range);
+            this.topStatements.push(replaceNode);
+            if (process.env["JSON_DEBUG"])
+                console.log("Added as-bs import: " + toString(replaceNode) + "\n");
         }
-        if (!this.imports.find((i) => i.declarations.find((d) => d.foreignName.text == "JSON"))) {
-            const __filename = fileURLToPath(import.meta.url);
-            const __dirname = path.dirname(__filename);
-            let relativePath = path.relative(path.dirname(node.range.source.normalizedPath), path.resolve(__dirname, "../../assembly/index.ts"));
-            if (!relativePath.startsWith(".") && !relativePath.startsWith("/"))
-                relativePath = "./" + relativePath;
-            const txt = `import { JSON } from "${relativePath}";`;
-            if (!this.jsonImport) {
-                this.jsonImport = txt;
-                if (process.env["JSON_DEBUG"])
-                    console.log("Added json-as import: " + txt + "\n");
-            }
+        if (!jsonImport) {
+            const replaceNode = Node.createImportStatement([
+                Node.createImportDeclaration(Node.createIdentifierExpression("JSON", node.range, false), null, node.range)
+            ], Node.createStringLiteralExpression(path.join(pkgRel, "./assembly"), node.range), node.range);
+            this.topStatements.push(replaceNode);
+            if (process.env["JSON_DEBUG"])
+                console.log("Added json-as import: " + toString(replaceNode) + "\n");
         }
     }
     getStores(data, simd = false) {
@@ -456,14 +445,6 @@ class JSONTransform extends Visitor {
         const sizes = strToNum(data, simd);
         let offset = 0;
         for (const [size, num] of sizes) {
-            if (size == "v128") {
-                let index = this.newStmts.simd.findIndex((v) => v.includes(num));
-                let name = "SIMD_" + (index == -1 ? this.newStmts.simd.length : index);
-                if (index && !this.newStmts.simd.includes(`const ${name} = ${num};`))
-                    this.newStmts.simd.push(`const ${name} = ${num};`);
-                out.push("store<v128>(bs.offset, " + name + ", " + offset + "); // " + data.slice(offset >> 1, (offset >> 1) + 8));
-                offset += 16;
-            }
             if (size == "u64") {
                 out.push("store<u64>(bs.offset, " + num + ", " + offset + "); // " + data.slice(offset >> 1, (offset >> 1) + 4));
                 offset += 8;
@@ -546,27 +527,9 @@ export default class Transformer extends Transform {
             transformer.imports = [];
             transformer.currentSource = source;
             transformer.visit(source);
-            if (transformer.newStmts.simd) {
-                const tokenizer = new Tokenizer(new Source(0, source.normalizedPath, transformer.newStmts.simd.join("\n")));
-                parser.currentSource = tokenizer.source;
-                for (let i = 0; i < transformer.newStmts.simd.length; i++)
-                    source.statements.unshift(parser.parseTopLevelStatement(tokenizer));
-                parser.currentSource = source;
-                transformer.newStmts.simd = [];
-            }
-            if (transformer.jsonImport) {
-                const tokenizer = new Tokenizer(new Source(0, source.normalizedPath, transformer.jsonImport));
-                parser.currentSource = tokenizer.source;
-                source.statements.unshift(parser.parseTopLevelStatement(tokenizer));
-                parser.currentSource = source;
-                transformer.jsonImport = null;
-            }
-            if (transformer.bsImport) {
-                const tokenizer = new Tokenizer(new Source(0, source.normalizedPath, transformer.bsImport));
-                parser.currentSource = tokenizer.source;
-                source.statements.unshift(parser.parseTopLevelStatement(tokenizer));
-                parser.currentSource = source;
-                transformer.bsImport = null;
+            if (transformer.topStatements.length) {
+                source.statements.unshift(...transformer.topStatements);
+                transformer.topStatements = [];
             }
         }
         const schemas = transformer.schemas;
@@ -671,7 +634,7 @@ function strToNum(data, simd = false, offset = 0) {
 }
 function isPrimitive(type) {
     const primitiveTypes = ["u8", "u16", "u32", "u64", "i8", "i16", "i32", "i64", "f32", "f64", "bool", "boolean"];
-    return primitiveTypes.some((v) => type.includes(v));
+    return primitiveTypes.some((v) => type.startsWith(v));
 }
 function throwError(message, range) {
     const err = new Error();
@@ -706,7 +669,4 @@ function sizeof(type) {
     else
         return 0;
 }
-function allPrimitive(schema) {
-    return !schema.members.some((p) => p.byteSize == 0);
-}
 //# sourceMappingURL=index.js.map