json-as 1.0.0-beta.9 → 1.0.0

package/transform/src/index.ts

@@ -1,4 +1,4 @@
-import { ClassDeclaration, FieldDeclaration, IdentifierExpression, Parser, Source, NodeKind, CommonFlags, ImportStatement, Node, Tokenizer, SourceKind, NamedTypeNode, Range, FEATURE_SIMD, FunctionExpression, MethodDeclaration } from "assemblyscript/dist/assemblyscript.js";
+import { ClassDeclaration, FieldDeclaration, IdentifierExpression, Parser, Source, NodeKind, CommonFlags, ImportStatement, Node, Tokenizer, SourceKind, NamedTypeNode, Range, FEATURE_SIMD, FunctionExpression, MethodDeclaration, Statement } from "assemblyscript/dist/assemblyscript.js";
 import { Transform } from "assemblyscript/dist/transform.js";
 import { Visitor } from "./visitor.js";
 import { SimpleParser, toString } from "./util.js";
@@ -16,11 +16,7 @@ class JSONTransform extends Visitor {
   public sources = new Set<Source>();
   public imports: ImportStatement[] = [];
 
-  public jsonImport: string | null = null;
-  public bsImport: string | null = null;
-  public newStmts: {
-    simd: string[];
-  } = { simd: [] };
+  public topStatements: Statement[] = [];
 
   visitClassDeclaration(node: ClassDeclaration): void {
     if (!node.decorators?.length) return;
@@ -352,7 +348,7 @@ class JSONTransform extends Visitor {
       if (memberLen == 2) DESERIALIZE += `${indent}switch (load<u16>(keyStart)) {\n`;
       else if (memberLen == 4) DESERIALIZE += `${indent}switch (load<u32>(keyStart)) {\n`;
       else if (memberLen == 6) DESERIALIZE += `${indent}let code = load<u64>(keyStart) & 0x0000FFFFFFFFFFFF;\n`;
-      else if (memberLen == 6) DESERIALIZE += `${indent}let code = load<u64>(keyStart);\n`;
+      else if (memberLen == 8) DESERIALIZE += `${indent}let code = load<u64>(keyStart);\n`;
       else DESERIALIZE += toMemCDecl(memberLen, indent);
       for (let i = 0; i < memberGroup.length; i++) {
         const member = memberGroup[i];
@@ -474,8 +470,6 @@ class JSONTransform extends Visitor {
   // }
   visitImportStatement(node: ImportStatement): void {
     super.visitImportStatement(node);
-    const source = this.parser.sources.find((src) => src.internalPath == node.internalPath);
-    if (!source) return;
     this.imports.push(node);
   }
   visitSource(node: Source): void {
@@ -483,37 +477,50 @@ class JSONTransform extends Visitor {
     super.visitSource(node);
   }
   addRequiredImports(node: Source): void {
-    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);
 
-    if (!this.imports.find((i) => i.declarations.find((d) => d.foreignName.text == "JSON"))) {
-      const __filename = fileURLToPath(import.meta.url);
-      const __dirname = path.dirname(__filename);
+    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 relativePath = path.relative(path.dirname(node.range.source.normalizedPath), path.resolve(__dirname, "../../assembly/index.ts"));
+    let pkgRel = path.relative(
+      path.dirname(node.range.source.normalizedPath),
+      path.resolve(fileDir, "../../")
+    );
 
-      if (!relativePath.startsWith(".") && !relativePath.startsWith("/")) relativePath = "./" + relativePath;
-      // if (!existsSync(relativePath)) {
-      //   throw new Error("Could not find a valid json-as library to import from! Please add import { JSON } from \"path-to-json-as\"; in " + node.range.source.normalizedPath + "!");
-      // }
+    if (!pkgRel.startsWith(".") && !pkgRel.startsWith("/")) pkgRel = "./" + pkgRel;
+    pkgRel = pkgRel.replace(/^.*json-as/, "json-as");
 
-      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 (!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 (!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");
     }
   }
 
@@ -522,14 +529,14 @@ class JSONTransform extends Visitor {
     const sizes = strToNum(data, simd);
     let offset = 0;
     for (const [size, num] of sizes) {
-      if (size == "v128") {
-        // This could be put in its own file
-        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 == "v128") {
+      //   // This could be put in its own file
+      //   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;
@@ -616,28 +623,9 @@ export default class Transformer extends Transform {
       // Ignore all lib and std. Visit everything else.
       transformer.visit(source);
 
-      if (transformer.newStmts.simd) {
-        const tokenizer = new Tokenizer(new Source(SourceKind.User, 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(SourceKind.User, 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(SourceKind.User, 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 = [];
       }
     }
     // Check that every parent and child class is hooked up correctly
@@ -760,7 +748,7 @@ function strToNum(data: string, simd: boolean = false, offset: number = 0): stri
 
 function isPrimitive(type: string): boolean {
   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: string, range: Range): never {
@@ -797,7 +785,3 @@ function sizeof(type: string): number {
   else if (type == "bool" || type == "boolean") return 10;
   else return 0;
 }
-
-function allPrimitive(schema: Schema): boolean {
-  return !schema.members.some((p) => p.byteSize == 0);
-}

package/assembly/as-bs.d.ts

@@ -1,53 +0,0 @@
-/**
- * Central buffer namespace for managing memory operations.
- */
-declare namespace bs {
-  /** Current buffer pointer. */
-  export let buffer: ArrayBuffer;
-
-  /** Current offset within the buffer. */
-  export let offset: usize;
-
-  /** Proposed size of output. */
-  export let stackSize: usize;
-
-  /**
-   * Ensures the buffer size is at least the proposed size.
-   * If necessary, reallocates the buffer to the exact new size.
-   * @param size - The size to propose.
-   */
-  export function ensureSize(size: u32): void;
-
-  /**
-   * Proposes that the buffer size should be at least the given size.
-   * If necessary, reallocates the buffer to the exact new size.
-   * @param size - The size to propose.
-   */
-  export function proposeSize(size: u32): void;
-
-  /**
-   * Increases the proposed size by nextPowerOf2(n + 64) if necessary.
-   * If necessary, reallocates the buffer to the exact new size.
-   * @param size - The size to grow by.
-   */
-  export function growSize(size: u32): void;
-
-  /**
-   * Resizes the buffer to the specified size.
-   * @param newSize - The new buffer size.
-   */
-  export function resize(newSize: u32): void;
-
-  /**
-   * Copies the buffer's content to a new object of a specified type.
-   * @returns The new object containing the buffer's content.
-   */
-  export function out<T>(): T;
-
-  /**
-   * Copies the buffer's content to a given destination pointer.
-   * @param dst - The destination pointer.
-   * @returns The destination pointer cast to the specified type.
-   */
-  export function outTo<T>(dst: usize): T;
-}