json-as 1.1.11 → 1.1.12

package/transform/src/index.ts

@@ -1,12 +1,13 @@
-import { ClassDeclaration, FieldDeclaration, IdentifierExpression, Parser, Source, NodeKind, CommonFlags, ImportStatement, Node, Tokenizer, SourceKind, NamedTypeNode, Range, FEATURE_SIMD, FunctionExpression, MethodDeclaration, Statement, Program, Feature, CallExpression, PropertyAccessExpression } from "assemblyscript/dist/assemblyscript.js";
+import { ClassDeclaration, FieldDeclaration, IdentifierExpression, Parser, Source, NodeKind, CommonFlags, ImportStatement, Node, SourceKind, NamedTypeNode, Range, FunctionExpression, MethodDeclaration, Program, Feature } from "assemblyscript/dist/assemblyscript.js";
 import { Transform } from "assemblyscript/dist/transform.js";
 import { Visitor } from "./visitor.js";
-import { cloneNode, isStdlib, removeExtension, replaceRef, SimpleParser, toString } from "./util.js";
+import { isStdlib, removeExtension, SimpleParser, toString } from "./util.js";
 import * as path from "path";
 import { fileURLToPath } from "url";
-import { Property, PropertyFlags, Schema } from "./types.js";
-import { getClass, getClasses, getImportedClass } from "./linker.js";
+import { Property, PropertyFlags, Schema, Src } from "./types.js";
+import { getClass, getImportedClass } from "./linkers/classes.js";
 import { existsSync, writeFileSync } from "fs";
+import { CustomTransform } from "./linkers/custom.js";
 
 let indent = "  ";
 
@@ -25,37 +26,6 @@ const DEBUG = rawValue === "true"
 
 const STRICT = process.env["JSON_STRICT"] && process.env["JSON_STRICT"] == "true";
 
-class CustomTransform extends Visitor {
-  static SN: CustomTransform = new CustomTransform();
-
-  private modify: boolean = false;
-  visitCallExpression(node: CallExpression) {
-    super.visit(node.args, node);
-    if (node.expression.kind != NodeKind.PropertyAccess || (node.expression as PropertyAccessExpression).property.text != "stringify") return;
-    if ((node.expression as PropertyAccessExpression).expression.kind != NodeKind.Identifier || ((node.expression as PropertyAccessExpression).expression as IdentifierExpression).text != "JSON") return;
-
-    if (this.modify) {
-      (node.expression as PropertyAccessExpression).expression = Node.createPropertyAccessExpression(Node.createIdentifierExpression("JSON", node.expression.range), Node.createIdentifierExpression("internal", node.expression.range), node.expression.range);
-    }
-    this.modify = true;
-
-    // console.log(toString(node));
-    // console.log(SimpleParser.parseStatement("JSON.internal.stringify").expression.expression)
-  }
-  static visit(node: Node | Node[], ref: Node | null = null): void {
-    if (!node) return;
-    CustomTransform.SN.modify = true;
-    CustomTransform.SN.visit(node, ref);
-    CustomTransform.SN.modify = false;
-  }
-  static hasCall(node: Node | Node[]): boolean {
-    if (!node) return;
-    CustomTransform.SN.modify = false;
-    CustomTransform.SN.visit(node);
-    return CustomTransform.SN.modify;
-  }
-}
-
 class JSONTransform extends Visitor {
   static SN: JSONTransform = new JSONTransform();
 
@@ -64,10 +34,10 @@ class JSONTransform extends Visitor {
   public parser!: Parser;
   public schemas: Map<string, Schema[]> = new Map<string, Schema[]>();
   public schema!: Schema;
-  public sources = new Set<Source>();
+  public src!: Src;
+  public sources: Map<string, Src> = new Map<string, Src>();
   public imports: ImportStatement[] = [];
 
-  public topStatements: Statement[] = [];
   public simdStatements: string[] = [];
 
   private visitedClasses: Set<string> = new Set<string>();
@@ -90,11 +60,16 @@ class JSONTransform extends Visitor {
         const name = (<IdentifierExpression>decorator.name).text;
         return name === "json" || name === "serializable";
       })
-    )
-      return;
+    ) return;
 
-    if (this.visitedClasses.has(node.range.source.internalPath + node.name.text)) return;
-    if (!this.schemas.has(node.range.source.internalPath)) this.schemas.set(node.range.source.internalPath, []);
+    const source = node.range.source;
+    if (!this.sources.has(source.internalPath)) {
+      this.src = new Src(source);
+      this.sources.set(source.internalPath, this.src);
+    } else this.src = this.sources.get(source.internalPath);
+
+    if (this.visitedClasses.has(source.internalPath + node.name.text)) return;
+    if (!this.schemas.has(source.internalPath)) this.schemas.set(source.internalPath, []);
 
     const members: FieldDeclaration[] = [...(node.members.filter((v) => v.kind === NodeKind.FieldDeclaration && v.flags !== CommonFlags.Static && v.flags !== CommonFlags.Private && v.flags !== CommonFlags.Protected && !v.decorators?.some((decorator) => (<IdentifierExpression>decorator.name).text === "omit")) as FieldDeclaration[])];
     const serializers: MethodDeclaration[] = [...node.members.filter((v) => v.kind === NodeKind.MethodDeclaration && v.decorators && v.decorators.some((e) => (<IdentifierExpression>e.name).text.toLowerCase() === "serializer"))] as MethodDeclaration[];
@@ -109,13 +84,13 @@ class JSONTransform extends Visitor {
       if (!schema.parent) {
         const depSearch = schema.deps.find((v) => v.name == extendsName);
         if (depSearch) {
-          if (DEBUG > 0) console.log("Found " + extendsName + " in dependencies of " + node.range.source.internalPath);
+          if (DEBUG > 0) console.log("Found " + extendsName + " in dependencies of " + source.internalPath);
           if (!schema.deps.some(v => v.name == depSearch.name)) schema.deps.push(depSearch);
           schema.parent = depSearch;
         } else {
-          const internalSearch = getClass(extendsName, node.range.source);
+          const internalSearch = getClass(extendsName, source);
           if (internalSearch) {
-            if (DEBUG > 0) console.log("Found " + extendsName + " internally from " + node.range.source.internalPath);
+            if (DEBUG > 0) console.log("Found " + extendsName + " internally from " + source.internalPath);
             if (!this.visitedClasses.has(internalSearch.range.source.internalPath + internalSearch.name.text)) {
               this.visitClassDeclarationRef(internalSearch);
               this.schemas.get(internalSearch.range.source.internalPath).push(this.schema);
@@ -127,9 +102,9 @@ class JSONTransform extends Visitor {
             schema.deps.push(schem);
             schema.parent = schem;
           } else {
-            const externalSearch = getImportedClass(extendsName, node.range.source, this.parser);
+            const externalSearch = getImportedClass(extendsName, source, this.parser);
             if (externalSearch) {
-              if (DEBUG > 0) console.log("Found " + externalSearch.name.text + " externally from " + node.range.source.internalPath);
+              if (DEBUG > 0) console.log("Found " + externalSearch.name.text + " externally from " + source.internalPath);
               if (!this.visitedClasses.has(externalSearch.range.source.internalPath + externalSearch.name.text)) {
                 this.visitClassDeclarationRef(externalSearch);
                 this.schemas.get(externalSearch.range.source.internalPath).push(this.schema);
@@ -156,6 +131,7 @@ class JSONTransform extends Visitor {
 
     const getUnknownTypes = (type: string, types: string[] = []): string[] => {
       type = stripNull(type);
+      type = this.src.aliases.find(v => stripNull(v.name) == type)?.getBaseType() || type;
       if (type.startsWith("Array<")) {
         return getUnknownTypes(type.slice(6, -1));
       } else if (type.startsWith("Map<")) {
@@ -181,12 +157,12 @@ class JSONTransform extends Visitor {
       for (const unknownType of unknown) {
         const depSearch = schema.deps.find((v) => v.name == unknownType);
         if (depSearch) {
-          if (DEBUG > 0) console.log("Found " + unknownType + " in dependencies of " + node.range.source.internalPath);
+          if (DEBUG > 0) console.log("Found " + unknownType + " in dependencies of " + source.internalPath);
           if (!schema.deps.some(v => v.name == depSearch.name)) schema.deps.push(depSearch);
         } else {
-          const internalSearch = getClass(unknownType, node.range.source);
+          const internalSearch = getClass(unknownType, source);
           if (internalSearch) {
-            if (DEBUG > 0) console.log("Found " + unknownType + " internally from " + node.range.source.internalPath);
+            if (DEBUG > 0) console.log("Found " + unknownType + " internally from " + source.internalPath);
             if (!this.visitedClasses.has(internalSearch.range.source.internalPath + internalSearch.name.text)) {
               this.visitClassDeclarationRef(internalSearch);
               this.schemas.get(internalSearch.range.source.internalPath).push(this.schema);
@@ -197,9 +173,9 @@ class JSONTransform extends Visitor {
             if (!schem) throw new Error("Could not find schema for " + internalSearch.name.text + " in " + internalSearch.range.source.internalPath);
             schema.deps.push(schem);
           } else {
-            const externalSearch = getImportedClass(unknownType, node.range.source, this.parser);
+            const externalSearch = getImportedClass(unknownType, source, this.parser);
             if (externalSearch) {
-              if (DEBUG > 0) console.log("Found " + externalSearch.name.text + " externally from " + node.range.source.internalPath);
+              if (DEBUG > 0) console.log("Found " + externalSearch.name.text + " externally from " + source.internalPath);
               if (!this.visitedClasses.has(externalSearch.range.source.internalPath + externalSearch.name.text)) {
                 this.visitClassDeclarationRef(externalSearch);
                 this.schemas.get(externalSearch.range.source.internalPath).push(this.schema);
@@ -215,9 +191,9 @@ class JSONTransform extends Visitor {
       }
     }
 
-    this.schemas.get(node.range.source.internalPath).push(schema);
+    this.schemas.get(source.internalPath).push(schema);
     this.schema = schema;
-    this.visitedClasses.add(node.range.source.internalPath + node.name.text);
+    this.visitedClasses.add(source.internalPath + node.name.text);
 
     let SERIALIZE = "__SERIALIZE(ptr: usize): void {\n";
     let INITIALIZE = "@inline __INITIALIZE(): this {\n";
@@ -225,7 +201,7 @@ class JSONTransform extends Visitor {
     let DESERIALIZE_CUSTOM = "";
     let SERIALIZE_CUSTOM = "";
 
-    if (DEBUG > 0) console.log("Created schema: " + this.schema.name + " in file " + node.range.source.normalizedPath + (this.schema.deps.length ? " with dependencies:\n  " + this.schema.deps.map((v) => v.name).join("\n  ") : ""));
+    if (DEBUG > 0) console.log("Created schema: " + this.schema.name + " in file " + source.normalizedPath + (this.schema.deps.length ? " with dependencies:\n  " + this.schema.deps.map((v) => v.name).join("\n  ") : ""));
 
     if (serializers.length > 1) throwError("Multiple serializers detected for class " + node.name.text + " but schemas can only have one serializer!", serializers[1].range);
     if (deserializers.length > 1) throwError("Multiple deserializers detected for class " + node.name.text + " but schemas can only have one deserializer!", deserializers[1].range);
@@ -278,7 +254,9 @@ class JSONTransform extends Visitor {
 
     for (const member of members) {
       if (!member.type) throwError("Fields must be strongly typed", node.range);
-      const type = toString(member.type!);
+      let type = toString(member.type!);
+      type = this.src.aliases.find(v => stripNull(v.name) == stripNull(type))?.getBaseType() || type;
+
       const name = member.name;
       const value = member.initializer ? toString(member.initializer!) : null;
 
@@ -448,16 +426,27 @@ class JSONTransform extends Visitor {
     };
 
     for (const member of this.schema.members) {
-      if (member.type.endsWith(" | null")) sortedMembers.null.push(member);
-      if (isString(member.type) || member.type == "JSON.Raw") sortedMembers.string.push(member);
-      else if (isBoolean(member.type) || member.type.startsWith("JSON.Box<bool")) sortedMembers.boolean.push(member);
-      else if (isPrimitive(member.type) || member.type.startsWith("JSON.Box<")) sortedMembers.number.push(member);
-      else if (isArray(member.type)) sortedMembers.array.push(member);
-      else sortedMembers.object.push(member);
+      const type = stripNull(member.type);
+      if (node.isGeneric && node.typeParameters.some((p) => stripNull(p.name.text) == type)) {
+        member.generic = true;
+        sortedMembers.string.push(member);
+        sortedMembers.number.push(member);
+        sortedMembers.object.push(member);
+        sortedMembers.array.push(member);
+        sortedMembers.boolean.push(member);
+        sortedMembers.null.push(member);
+      } else {
+        if (member.node.type.isNullable) sortedMembers.null.push(member);
+        if (isString(type) || type == "JSON.Raw") sortedMembers.string.push(member);
+        else if (isBoolean(type) || type.startsWith("JSON.Box<bool")) sortedMembers.boolean.push(member);
+        else if (isPrimitive(type) || type.startsWith("JSON.Box<")) sortedMembers.number.push(member);
+        else if (isArray(type)) sortedMembers.array.push(member);
+        else if (isStruct(type, source)) sortedMembers.object.push(member);
+        else throw new Error("Could not determine type " + type + " for member " + member.name + " in class " + this.schema.name);
+      }
     }
 
     indent = "";
-    let shouldGroup = false;
 
     DESERIALIZE += indent + "  let keyStart: usize = 0;\n";
     DESERIALIZE += indent + "  let keyEnd: usize = 0;\n";
@@ -634,7 +623,7 @@ class JSONTransform extends Visitor {
         generateConsts(group);
         const first = group[0];
         const fName = first.alias || first.name;
-        DESERIALIZE += indent + "            if (" + getComparision(fName) + ") { // " + fName + "\n";
+        DESERIALIZE += indent + "            if (" + (first.generic ? "isString<" + first.type + ">() && " : "") + getComparision(fName) + ") { // " + fName + "\n";
         DESERIALIZE += indent + "              store<" + first.type + ">(changetype<usize>(out), JSON.__deserialize<" + first.type + ">(lastIndex, srcStart + 2), offsetof<this>(" + JSON.stringify(first.name) + "));\n";
         DESERIALIZE += indent + "              srcStart += 4;\n";
         DESERIALIZE += indent + "              keyStart = 0;\n";
@@ -644,7 +633,7 @@ class JSONTransform extends Visitor {
         for (let i = 1; i < group.length; i++) {
           const mem = group[i];
           const memName = mem.alias || mem.name;
-          DESERIALIZE += indent + " else if (" + getComparision(memName) + ") { // " + memName + "\n";
+          DESERIALIZE += indent + " else if (" + (mem.generic ? "isString<" + mem.type + ">() && " : "") + getComparision(memName) + ") { // " + memName + "\n";
           DESERIALIZE += indent + "              store<" + mem.type + ">(changetype<usize>(out), JSON.__deserialize<" + mem.type + ">(lastIndex, srcStart + 2), offsetof<this>(" + JSON.stringify(mem.name) + "));\n";
           DESERIALIZE += indent + "              srcStart += 4;\n";
           DESERIALIZE += indent + "              keyStart = 0;\n";
@@ -685,7 +674,7 @@ class JSONTransform extends Visitor {
         generateConsts(group);
         const first = group[0];
         const fName = first.alias || first.name;
-        DESERIALIZE += indent + "            if (" + getComparision(fName) + ") { // " + fName + "\n";
+        DESERIALIZE += indent + "            if (" + (first.generic ? "(isInteger<" + first.type + ">() || isFloat<" + first.type + ">()) && " : "") + getComparision(fName) + ") { // " + fName + "\n";
         DESERIALIZE += indent + "              store<" + first.type + ">(changetype<usize>(out), JSON.__deserialize<" + first.type + ">(lastIndex, srcStart), offsetof<this>(" + JSON.stringify(first.name) + "));\n";
         DESERIALIZE += indent + "              srcStart += 2;\n";
         DESERIALIZE += indent + "              keyStart = 0;\n";
@@ -695,7 +684,7 @@ class JSONTransform extends Visitor {
         for (let i = 1; i < group.length; i++) {
           const mem = group[i];
           const memName = mem.alias || mem.name;
-          DESERIALIZE += indent + " else if (" + getComparision(memName) + ") { // " + memName + "\n";
+          DESERIALIZE += indent + " else if (" + (mem.generic ? "(isInteger<" + mem.type + ">() || isFloat<" + mem.type + ">()) && " : "") + getComparision(memName) + ") { // " + memName + "\n";
           DESERIALIZE += indent + "              store<" + mem.type + ">(changetype<usize>(out), JSON.__deserialize<" + mem.type + ">(lastIndex, srcStart), offsetof<this>(" + JSON.stringify(mem.name) + "));\n";
           DESERIALIZE += indent + "              srcStart += 2;\n";
           DESERIALIZE += indent + "              keyStart = 0;\n";
@@ -742,7 +731,7 @@ class JSONTransform extends Visitor {
         generateConsts(group);
         const first = group[0];
         const fName = first.alias || first.name;
-        DESERIALIZE += indent + "            if (" + getComparision(fName) + ") { // " + fName + "\n";
+        DESERIALIZE += indent + "            if (" + (first.generic ? "isDefined(out.__DESERIALIZE) &&" : "") + getComparision(fName) + ") { // " + fName + "\n";
         DESERIALIZE += indent + "              store<" + first.type + ">(changetype<usize>(out), JSON.__deserialize<" + first.type + ">(lastIndex, srcStart), offsetof<this>(" + JSON.stringify(first.name) + "));\n";
         DESERIALIZE += indent + "              keyStart = 0;\n";
         DESERIALIZE += indent + "              break;\n";
@@ -751,7 +740,7 @@ class JSONTransform extends Visitor {
         for (let i = 1; i < group.length; i++) {
           const mem = group[i];
           const memName = mem.alias || mem.name;
-          DESERIALIZE += indent + " else if (" + getComparision(memName) + ") { // " + memName + "\n";
+          DESERIALIZE += indent + " else if (" + (mem.generic ? "isDefined(out.__DESERIALIZE) &&" : "") + getComparision(memName) + ") { // " + memName + "\n";
           DESERIALIZE += indent + "              store<" + mem.type + ">(changetype<usize>(out), JSON.__deserialize<" + mem.type + ">(lastIndex, srcStart), offsetof<this>(" + JSON.stringify(mem.name) + "));\n";
           DESERIALIZE += indent + "              keyStart = 0;\n";
           DESERIALIZE += indent + "              break;\n";
@@ -798,7 +787,7 @@ class JSONTransform extends Visitor {
         generateConsts(group);
         const first = group[0];
         const fName = first.alias || first.name;
-        DESERIALIZE += indent + "            if (" + getComparision(fName) + ") { // " + fName + "\n";
+        DESERIALIZE += indent + "            if (" + (first.generic ? "isArray<" + first.type + ">() && " : "") + getComparision(fName) + ") { // " + fName + "\n";
         DESERIALIZE += indent + "              store<" + first.type + ">(changetype<usize>(out), JSON.__deserialize<" + first.type + ">(lastIndex, srcStart), offsetof<this>(" + JSON.stringify(first.name) + "));\n";
         DESERIALIZE += indent + "              keyStart = 0;\n";
         DESERIALIZE += indent + "              break;\n";
@@ -807,7 +796,7 @@ class JSONTransform extends Visitor {
         for (let i = 1; i < group.length; i++) {
           const mem = group[i];
           const memName = mem.alias || mem.name;
-          DESERIALIZE += indent + " else if (" + getComparision(memName) + ") { // " + memName + "\n";
+          DESERIALIZE += indent + " else if (" + (mem.generic ? "isArray" + mem.type + ">() && " : "") + getComparision(memName) + ") { // " + memName + "\n";
           DESERIALIZE += indent + "              store<" + mem.type + ">(changetype<usize>(out), JSON.__deserialize<" + mem.type + ">(lastIndex, srcStart), offsetof<this>(" + JSON.stringify(mem.name) + "));\n";
           DESERIALIZE += indent + "              keyStart = 0;\n";
           DESERIALIZE += indent + "              break;\n";
@@ -846,7 +835,7 @@ class JSONTransform extends Visitor {
         generateConsts(group);
         const first = group[0];
         const fName = first.alias || first.name;
-        DESERIALIZE += indent + "          if (" + getComparision(fName) + ") { // " + fName + "\n";
+        DESERIALIZE += indent + "          if (" + (first.generic ? "isBoolean<" + first.type + ">() && " : "") + getComparision(fName) + ") { // " + fName + "\n";
         DESERIALIZE += indent + "            store<" + first.type + ">(changetype<usize>(out), true, offsetof<this>(" + JSON.stringify(first.name) + "));\n";
         DESERIALIZE += indent + "            srcStart += 2;\n";
         DESERIALIZE += indent + "            keyStart = 0;\n";
@@ -856,7 +845,7 @@ class JSONTransform extends Visitor {
         for (let i = 1; i < group.length; i++) {
           const mem = group[i];
           const memName = mem.alias || mem.name;
-          DESERIALIZE += indent + " else if (" + getComparision(memName) + ") { // " + memName + "\n";
+          DESERIALIZE += indent + " else if (" + (mem.generic ? "isBoolean<" + mem.type + ">() && " : "") + getComparision(memName) + ") { // " + memName + "\n";
           DESERIALIZE += indent + "            store<" + mem.type + ">(changetype<usize>(out), true, offsetof<this>(" + JSON.stringify(mem.name) + "));\n";
           DESERIALIZE += indent + "            srcStart += 2;\n";
           DESERIALIZE += indent + "            keyStart = 0;\n";
@@ -898,7 +887,7 @@ class JSONTransform extends Visitor {
 
         const first = group[0];
         const fName = first.alias || first.name;
-        DESERIALIZE += indent + "          if (" + getComparision(fName) + ") { // " + fName + "\n";
+        DESERIALIZE += indent + "          if (" + (first.generic ? "isBoolean<" + first.type + ">() && " : "") + getComparision(fName) + ") { // " + fName + "\n";
         DESERIALIZE += indent + "            store<" + first.type + ">(changetype<usize>(out), false, offsetof<this>(" + JSON.stringify(first.name) + "));\n";
         DESERIALIZE += indent + "            srcStart += 2;\n";
         DESERIALIZE += indent + "            keyStart = 0;\n";
@@ -908,7 +897,7 @@ class JSONTransform extends Visitor {
         for (let i = 1; i < group.length; i++) {
           const mem = group[i];
           const memName = mem.alias || mem.name;
-          DESERIALIZE += indent + " else if (" + getComparision(memName) + ") { // " + memName + "\n";
+          DESERIALIZE += indent + " else if (" + (mem.generic ? "isBoolean<" + mem.type + ">() && " : "") + getComparision(memName) + ") { // " + memName + "\n";
           DESERIALIZE += indent + "            store<" + mem.type + ">(changetype<usize>(out), false, offsetof<this>(" + JSON.stringify(mem.name) + "));\n";
           DESERIALIZE += indent + "            srcStart += 2;\n";
           DESERIALIZE += indent + "            keyStart = 0;\n";
@@ -951,8 +940,8 @@ class JSONTransform extends Visitor {
 
         const first = group[0];
         const fName = first.alias || first.name;
-        DESERIALIZE += indent + "          if (" + getComparision(fName) + ") { // " + fName + "\n";
-        DESERIALIZE += indent + "            store<" + first.type + ">(changetype<usize>(out), null, offsetof<this>(" + JSON.stringify(first.name) + "));\n";
+        DESERIALIZE += indent + "          if (" + (first.generic ? "isNullable<" + first.type + ">() && " : "") + getComparision(fName) + ") { // " + fName + "\n";
+        DESERIALIZE += indent + "            store<usize>(changetype<usize>(out), 0, offsetof<this>(" + JSON.stringify(first.name) + "));\n";
         DESERIALIZE += indent + "            srcStart += 2;\n";
         DESERIALIZE += indent + "            keyStart = 0;\n";
         DESERIALIZE += indent + "            break;\n";
@@ -961,8 +950,8 @@ class JSONTransform extends Visitor {
         for (let i = 1; i < group.length; i++) {
           const mem = group[i];
           const memName = mem.alias || mem.name;
-          DESERIALIZE += indent + " else if (" + getComparision(memName) + ") { // " + memName + "\n";
-          DESERIALIZE += indent + "            store<" + mem.type + ">(changetype<usize>(out), null, offsetof<this>(" + JSON.stringify(mem.name) + "));\n";
+          DESERIALIZE += indent + " else if (" + (mem.generic ? "isNullable<" + mem.type + ">() && " : "") + getComparision(memName) + ") { // " + memName + "\n";
+          DESERIALIZE += indent + "            store<usize>(changetype<usize>(out), 0, offsetof<this>(" + JSON.stringify(mem.name) + "));\n";
           DESERIALIZE += indent + "            srcStart += 2;\n";
           DESERIALIZE += indent + "            keyStart = 0;\n";
           DESERIALIZE += indent + "            break;\n";
@@ -1267,10 +1256,6 @@ export default class Transformer extends Transform {
       transformer.currentSource = source;
       transformer.visit(source);
 
-      if (transformer.topStatements.length) {
-        source.statements.unshift(...transformer.topStatements);
-        transformer.topStatements = [];
-      }
       if (transformer.simdStatements.length) {
         for (const simd of transformer.simdStatements) source.statements.unshift(SimpleParser.parseTopLevelStatement(simd));
       }

package/transform/src/linkers/alias.ts

@@ -0,0 +1,59 @@
+import { Node, Source, TypeDeclaration, TypeNode } from "assemblyscript/dist/assemblyscript.js";
+import { Visitor } from "../visitor.js";
+import { toString } from "../util.js";
+
+class AliasFinder extends Visitor {
+  visitTypeDeclaration(node: TypeDeclaration, ref?: Node | null): void {
+    TypeAlias.add(node.name.text, node.type);
+  }
+}
+
+export class TypeAlias {
+  public name: string;
+  public type: TypeAlias | string;
+
+  constructor(name: string, type: TypeAlias | string) {
+    this.name = name;
+    this.type = type;
+  }
+
+  getBaseType(type: TypeAlias | string = this.type): string {
+    if (typeof type === "string") return type;
+    return this.getBaseType(type.type);
+  }
+
+  static foundAliases: Map<string, string> = new Map<string, string>();
+  static aliases: Map<string, TypeAlias> = new Map<string, TypeAlias>();
+
+  static add(name: string, type: TypeNode): void {
+    if (!TypeAlias.foundAliases.has(name)) {
+      TypeAlias.foundAliases.set(name, toString(type));
+    } else {
+      const existingType = TypeAlias.foundAliases.get(name);
+      if (existingType !== toString(type)) {
+        throw new Error(`Type alias conflict for ${name}: "${existingType}" vs "${toString(type)}"`);
+      }
+    }
+  }
+
+  static getAliases(source: Source): TypeAlias[] {
+    this.foundAliases.clear();
+    this.aliases.clear();
+
+    const finder = new AliasFinder();
+    finder.visit(source);
+
+    for (const [name, typeStr] of this.foundAliases) {
+      this.aliases.set(name, new TypeAlias(name, typeStr));
+    }
+
+    for (const alias of this.aliases.values()) {
+      if (typeof alias.type === "string" && this.aliases.has(alias.type)) {
+        alias.type = this.aliases.get(alias.type)!;
+      }
+    }
+
+    return [...this.aliases.values()];
+  }
+
+}

package/transform/src/{linker.ts → linkers/classes.ts}

@@ -1,26 +1,6 @@
-import { ClassDeclaration, CommonFlags, ImportStatement, NodeKind, Parser, Source } from "assemblyscript/dist/assemblyscript.js";
-import { Visitor } from "./visitor.js";
-import { Node } from "types:assemblyscript/src/ast";
-
-class ImportGetter extends Visitor {
-  static SN: ImportGetter = new ImportGetter();
-
-  private imports: ImportStatement[] = [];
-
-  visitImportStatement(node: ImportStatement, ref?: Node | null): void {
-    this.imports.push(node);
-  }
-
-  static getImports(source: Source): ImportStatement[] {
-    ImportGetter.SN.imports = [];
-    ImportGetter.SN.visit(source);
-    return ImportGetter.SN.imports;
-  }
-}
-
-export function getImports(source: Source): ImportStatement[] {
-  return ImportGetter.getImports(source);
-}
+import { ClassDeclaration, CommonFlags, NodeKind, Parser, Source } from "assemblyscript/dist/assemblyscript.js";
+import { Visitor } from "../visitor.js";
+import { getImports } from "./imports.js";
 
 export function getImportedClass(name: string, source: Source, parser: Parser): ClassDeclaration | null {
   for (const stmt of getImports(source)) {

package/transform/src/linkers/custom.ts

@@ -0,0 +1,32 @@
+import { CallExpression, IdentifierExpression, Node, NodeKind, PropertyAccessExpression } from "assemblyscript/dist/assemblyscript.js";
+import { Visitor } from "../visitor.js";
+
+export class CustomTransform extends Visitor {
+    static SN: CustomTransform = new CustomTransform();
+    private modify: boolean = false;
+    visitCallExpression(node: CallExpression) {
+        super.visit(node.args, node);
+        if (node.expression.kind != NodeKind.PropertyAccess || (node.expression as PropertyAccessExpression).property.text != "stringify") return;
+        if ((node.expression as PropertyAccessExpression).expression.kind != NodeKind.Identifier || ((node.expression as PropertyAccessExpression).expression as IdentifierExpression).text != "JSON") return;
+
+        if (this.modify) {
+            (node.expression as PropertyAccessExpression).expression = Node.createPropertyAccessExpression(Node.createIdentifierExpression("JSON", node.expression.range), Node.createIdentifierExpression("internal", node.expression.range), node.expression.range);
+        }
+        this.modify = true;
+
+        // console.log(toString(node));
+        // console.log(SimpleParser.parseStatement("JSON.internal.stringify").expression.expression)
+    }
+    static visit(node: Node | Node[], ref: Node | null = null): void {
+        if (!node) return;
+        CustomTransform.SN.modify = true;
+        CustomTransform.SN.visit(node, ref);
+        CustomTransform.SN.modify = false;
+    }
+    static hasCall(node: Node | Node[]): boolean {
+        if (!node) return false;
+        CustomTransform.SN.modify = false;
+        CustomTransform.SN.visit(node);
+        return CustomTransform.SN.modify;
+    }
+}

package/transform/src/linkers/imports.ts

@@ -0,0 +1,22 @@
+import { ImportStatement, Node, Source } from "assemblyscript/dist/assemblyscript.js";
+import { Visitor } from "../visitor.js";
+
+class ImportGetter extends Visitor {
+  static SN: ImportGetter = new ImportGetter();
+
+  private imports: ImportStatement[] = [];
+
+  visitImportStatement(node: ImportStatement, ref?: Node | null): void {
+    this.imports.push(node);
+  }
+
+  static getImports(source: Source): ImportStatement[] {
+    ImportGetter.SN.imports = [];
+    ImportGetter.SN.visit(source);
+    return ImportGetter.SN.imports;
+  }
+}
+
+export function getImports(source: Source): ImportStatement[] {
+  return ImportGetter.getImports(source);
+}

package/transform/src/types.ts

@@ -1,4 +1,5 @@
-import { ClassDeclaration, Expression, FieldDeclaration } from "assemblyscript/dist/assemblyscript.js";
+import { ClassDeclaration, Expression, FieldDeclaration, Source } from "assemblyscript/dist/assemblyscript.js";
+import { TypeAlias } from "./linkers/alias.js";
 
 export enum PropertyFlags {
   OmitNull,
@@ -15,6 +16,7 @@ export class Property {
   public flags: Map<PropertyFlags, Expression | null> = new Map<PropertyFlags, Expression | null>();
   public node!: FieldDeclaration;
   public byteSize: number = 0;
+  public generic: boolean = false;
 }
 
 export class Schema {
@@ -28,3 +30,15 @@ export class Schema {
   public deps: Schema[] = [];
   public custom: boolean = false;
 }
+
+export class Src {
+  public internalPath: string;
+  public schemas: Schema[];
+  public aliases: TypeAlias[];
+  public imports: Schema[];
+  public exports: Schema[];
+  constructor(source: Source) {
+    this.internalPath = source.internalPath;
+    this.aliases = TypeAlias.getAliases(source);
+  }
+}

package/transform/tsconfig.json

@@ -8,5 +8,5 @@
     "outDir": "./lib",
     "sourceMap": true
   },
-  "include": ["./src/*.ts"]
+  "include": ["./src/**.ts"]
 }

package/bench/lib/test.ts

@@ -1,37 +0,0 @@
-let currentDescription: string = "";
-export function describe(description: string, routine: () => void): void {
-  currentDescription = description;
-  routine();
-}
-
-export function it(description: string, routine: () => void): void {
-  currentDescription = description;
-  routine();
-}
-
-export function expect<T>(left: T): Expectation {
-  // @ts-ignore
-  if (!left.toString) throw new Error("Expected left to have a toString method, but it does not.");
-  // @ts-ignore
-  return new Expectation(left == null ? "null" : left.toString());
-}
-
-class Expectation {
-  public left: string;
-
-  constructor(left: string) {
-    this.left = left;
-  }
-  toBe<T>(right: T): void {
-    // @ts-ignore
-    if (!right.toString) throw new Error("Expected right to have a toString method, but it does not.");
-    // @ts-ignore
-    if (this.left != (right == null ? "null" : right.toString())) {
-      console.log("  " + currentDescription + "\n");
-      // @ts-ignore
-      console.log("  (expected) -> " + (right == null ? "null" : right.toString()));
-      console.log("  (received) -> " + this.left);
-      process.exit(1);
-    }
-  }
-}

package/transform/lib/linker.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"linker.js","sourceRoot":"","sources":["../src/linker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,MAAM,YAAa,SAAQ,OAAO;IAChC,MAAM,CAAC,EAAE,GAAiB,IAAI,YAAY,EAAE,CAAC;IAErC,OAAO,GAAsB,EAAE,CAAC;IAExC,oBAAoB,CAAC,IAAqB,EAAE,GAAiB;QAC3D,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,MAAc;QAC9B,YAAY,CAAC,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC;QAC7B,YAAY,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC9B,OAAO,YAAY,CAAC,EAAE,CAAC,OAAO,CAAC;IACjC,CAAC;;AAGH,MAAM,UAAU,UAAU,CAAC,MAAc;IACvC,OAAO,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY,EAAE,MAAc,EAAE,MAAc;IAC3E,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,CAAC;QACpJ,IAAI,CAAC,cAAc;YAAE,SAAS;QAE9B,MAAM,gBAAgB,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACpE,IAAI,CAAC,gBAAgB;YAAE,SAAS;QAChC,IAAI,CAAC,CAAC,gBAAgB,CAAC,KAAK,IAAqB,CAAC;YAAE,SAAS;QAC7D,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,WAAY,SAAQ,OAAO;IAC/B,MAAM,CAAC,EAAE,GAAgB,IAAI,WAAW,EAAE,CAAC;IAEnC,OAAO,GAAuB,EAAE,CAAC;IAEzC,qBAAqB,CAAC,IAAsB;QAC1C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAOD,MAAM,CAAC,QAAQ,CAAC,IAAY,EAAE,MAAc;QAC1C,OAAO,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC;IACjF,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,MAAc;QAI9B,OAAO,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,MAA6B,CAAuB,CAAC;IAC1G,CAAC;;AAGH,MAAM,UAAU,UAAU,CAAC,MAAc;IACvC,OAAO,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,IAAY,EAAE,MAAc;IACnD,OAAO,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC5C,CAAC"}