json-as 1.1.9 → 1.1.11

package/transform/src/linker.ts

@@ -1,21 +1,70 @@
-import { ClassDeclaration, ImportStatement, NodeKind, Parser, Source } from "assemblyscript/dist/assemblyscript.js";
+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 source.statements.filter((v) => v.kind === NodeKind.Import) as ImportStatement[];
+  return ImportGetter.getImports(source);
 }
 
 export function getImportedClass(name: string, source: Source, parser: Parser): ClassDeclaration | null {
   for (const stmt of getImports(source)) {
-    const externalSource = parser.sources.find((src) => src.internalPath === stmt.internalPath);
+    const externalSource = parser.sources.filter((src) => src.internalPath != source.internalPath).find((src) => src.internalPath == stmt.internalPath);
     if (!externalSource) continue;
 
-    const classDeclaration = externalSource.statements.find((s) => s.kind === NodeKind.ClassDeclaration && (<ClassDeclaration>s).name.text === name) as ClassDeclaration | null;
-
-    if (classDeclaration) return classDeclaration;
+    const classDeclaration = ClassGetter.getClass(name, externalSource);
+    if (!classDeclaration) continue;
+    if (!(classDeclaration.flags & CommonFlags.Export)) continue;
+    return classDeclaration;
   }
   return null;
 }
 
+class ClassGetter extends Visitor {
+  static SN: ClassGetter = new ClassGetter();
+
+  private classes: ClassDeclaration[] = [];
+
+  visitClassDeclaration(node: ClassDeclaration): void {
+    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;
+    return source.statements.filter((stmt) => stmt.kind == NodeKind.ClassDeclaration) as ClassDeclaration[];
+  }
+}
+
 export function getClasses(source: Source): ClassDeclaration[] {
-  return source.statements.filter((v) => v.kind === NodeKind.ClassDeclaration) as ClassDeclaration[];
+  return ClassGetter.getClasses(source);
 }
+
+export function getClass(name: string, source: Source): ClassDeclaration | null {
+  return ClassGetter.getClass(name, source);
+}

package/transform/src/util.ts

@@ -1,6 +1,7 @@
 // Taken from https://github.com/as-pect/visitor-as/blob/master/src/simpleParser.ts
 import { Parser, Tokenizer, Source, SourceKind, Expression, Statement, NamespaceDeclaration, ClassDeclaration, DeclarationStatement, Range, Node, NodeKind } from "assemblyscript/dist/assemblyscript.js";
 import { ASTBuilder } from "./builder.js";
+import * as path from "path";
 
 export class SimpleParser {
   private static get parser(): Parser {
@@ -120,3 +121,8 @@ export function stripExpr(node: Node): Node {
   if (node.kind == NodeKind.Expression) return node["expression"];
   return node;
 }
+
+export function removeExtension(filePath: string): string {
+  const parsed = path.parse(filePath);
+  return path.join(parsed.dir, parsed.name);
+}