json-as 1.1.8 → 1.1.10

package/transform/src/linker.ts

@@ -1,21 +1,62 @@
-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.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);
+  }
+
+  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;
+  }
+}
+
 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/types.ts

@@ -4,7 +4,7 @@ export enum PropertyFlags {
   OmitNull,
   OmitIf,
   Raw,
-  Custom
+  Custom,
 }
 
 export class Property {

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 {
@@ -55,11 +56,7 @@ export function toString(node: Node): string {
   return ASTBuilder.build(node);
 }
 
-export function replaceRef(
-  node: Node,
-  replacement: Node | Node[],
-  ref: Node | Node[] | null,
-): void {
+export function replaceRef(node: Node, replacement: Node | Node[], ref: Node | Node[] | null): void {
   if (!node || !ref) return;
   const nodeExpr = stripExpr(node);
 
@@ -77,8 +74,7 @@ export function replaceRef(
       if (Array.isArray(current)) {
         for (let i = 0; i < current.length; i++) {
           if (stripExpr(current[i]) === nodeExpr) {
-            if (Array.isArray(replacement))
-              current.splice(i, 1, ...replacement);
+            if (Array.isArray(replacement)) current.splice(i, 1, ...replacement);
             else current.splice(i, 1, replacement);
             return;
           }
@@ -91,17 +87,11 @@ export function replaceRef(
   }
 }
 
-export function cloneNode(
-  input: Node | Node[] | null,
-  seen = new WeakMap(),
-  path = "",
-): Node | Node[] | null {
+export function cloneNode(input: Node | Node[] | null, seen = new WeakMap(), path = ""): Node | Node[] | null {
   if (input === null || typeof input !== "object") return input;
 
   if (Array.isArray(input)) {
-    return input.map((item, index) =>
-      cloneNode(item, seen, `${path}[${index}]`),
-    ) as Node | Node[] | null;
+    return input.map((item, index) => cloneNode(item, seen, `${path}[${index}]`)) as Node | Node[] | null;
   }
 
   if (seen.has(input)) return seen.get(input);
@@ -130,4 +120,9 @@ export function stripExpr(node: Node): Node {
   if (!node) return 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);
+}