json-as 1.1.10 → 1.1.12

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,25 +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)) {
@@ -27,6 +8,7 @@ export function getImportedClass(name: string, source: Source, parser: Parser):
     if (!externalSource) continue;
 
     const classDeclaration = ClassGetter.getClass(name, externalSource);
+    if (!classDeclaration) continue;
     if (!(classDeclaration.flags & CommonFlags.Export)) continue;
     return classDeclaration;
   }
@@ -42,14 +24,20 @@ class ClassGetter extends Visitor {
     this.classes.push(node);
   }
 
+  // visitTypeName(node: TypeName, ref?: Node | null): void {}
+  // visitParameter(node: ParameterNode, ref?: Node | null): void {}
+  // visitFunctionTypeNode(node: FunctionTypeNode, ref?: Node | null): void {}
+  // visitNamedTypeNode(node: NamedTypeNode, ref?: Node | null): void {}
+
   static getClass(name: string, source: Source): ClassDeclaration | null {
     return ClassGetter.getClasses(source).find((c) => c.name.text == name) || null;
   }
 
   static getClasses(source: Source): ClassDeclaration[] {
-    ClassGetter.SN.classes = [];
-    ClassGetter.SN.visit(source);
-    return ClassGetter.SN.classes;
+    // ClassGetter.SN.classes = [];
+    // ClassGetter.SN.visit(source);
+    // return ClassGetter.SN.classes;
+    return source.statements.filter((stmt) => stmt.kind == NodeKind.ClassDeclaration) as ClassDeclaration[];
   }
 }
 

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/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;IACD,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,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;IAED,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;QAC9B,WAAW,CAAC,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC;QAC5B,WAAW,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7B,OAAO,WAAW,CAAC,EAAE,CAAC,OAAO,CAAC;IAChC,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"}