fix: re-add as-bs dependency so that it will not break in non-local e…

…nvironments

CHANGELOG

@@ -5,6 +5,7 @@
 ## 2025-01-20 - 1.0.0-alpha.2
 
 - fix: disable SIMD in generated transform code by default
+- fix: re-add as-bs dependency so that it will not break in non-local environments
 
 ## 2025-01-20 - 1.0.0-alpha.1
 

assembly/__benches__/misc.bench.ts

@@ -1,5 +1,5 @@
 import { bench } from "as-bench/assembly/bench";
-import { bs } from "../../modules/bs";
+import { bs } from "as-bs";
 import { deserializeString_SIMD } from "../deserialize/simd/string";
 import { deserializeString } from "../deserialize/simple/string";
 import { bytes } from "../util/bytes";

assembly/index.ts

@@ -1,5 +1,5 @@
 /// <reference path="./index.d.ts" />
-import { bs } from "../modules/bs";
+import { bs } from "as-bs";
 
 import { serializeString } from "./serialize/simple/string";
 import { serializeArray } from "./serialize/simple/array";
@@ -23,7 +23,6 @@ import { serializeFloat } from "./serialize/simple/float";
 import { serializeObject } from "./serialize/simple/object";
 import { ptrToStr } from "./util/ptrToStr";
 import { bytes } from "./util";
-import { serializeString_SIMD } from "./serialize/simd/string";
 
 export type Raw = string;
 
@@ -340,7 +339,7 @@ export namespace JSON {
    * Box for primitive types
    */
   export class Box<T> {
-    constructor(public value: T) {}
+    constructor(public value: T) { }
     /**
      * Creates a reference to a primitive type
      * This means that it can create a nullable primitive
@@ -375,11 +374,7 @@ export namespace JSON {
       store<u64>(bs.offset, 30399761348886638);
       bs.offset += 8;
     } else if (isString<nonnull<T>>()) {
-      if (ASC_FEATURE_SIMD) {
-        serializeString_SIMD(src as string);
-      } else {
-        serializeString(src as string);
-      }
+      serializeString(src as string);
       // @ts-ignore: Supplied by transform
     } else if (isDefined(src.__SERIALIZE)) {
       // @ts-ignore

assembly/serialize/simd/string.ts

@@ -1,4 +1,4 @@
-import { bs } from "../../../modules/bs";
+import { bs } from "as-bs";
 import { BACK_SLASH } from "../../custom/chars";
 import { SERIALIZE_ESCAPE_TABLE } from "../../globals/tables";
 import { OBJECT, TOTAL_OVERHEAD } from "rt/common";

assembly/serialize/simple/array.ts

@@ -1,4 +1,4 @@
-import { bs } from "../../../modules/bs";
+import { bs } from "as-bs";
 import { COMMA, BRACKET_RIGHT, BRACKET_LEFT } from "../../custom/chars";
 import { JSON } from "../..";
 

assembly/serialize/simple/bool.ts

@@ -1,4 +1,4 @@
-import { bs } from "../../../modules/bs";
+import { bs } from "as-bs";
 
 /**
  * Serialize a bool to type string

assembly/serialize/simple/date.ts

@@ -1,4 +1,4 @@
-import { bs } from "../../../modules/bs";
+import { bs } from "as-bs";
 import { QUOTE } from "../../custom/chars";
 import { bytes } from "../../util/bytes";
 

assembly/serialize/simple/float.ts

@@ -1,5 +1,5 @@
 import { dtoa_buffered } from "util/number";
-import { bs } from "../../../modules/bs";
+import { bs } from "as-bs";
 
 export function serializeFloat<T extends number>(data: T): void {
   bs.ensureSize(64);

assembly/serialize/simple/integer.ts

@@ -1,5 +1,5 @@
 import { itoa_buffered } from "util/number";
-import { bs } from "../../../modules/bs";
+import { bs } from "as-bs";
 
 export function serializeInteger<T extends number>(data: T): void {
   bs.ensureSize(sizeof<T>() << 3);

assembly/serialize/simple/map.ts

@@ -1,6 +1,6 @@
 import { JSON } from "../..";
 import { BRACE_LEFT, BRACE_RIGHT, COLON, COMMA } from "../../custom/chars";
-import { bs } from "../../../modules/bs";
+import { bs } from "as-bs";
 
 export function serializeMap<T extends Map<any, any>>(src: T): void {
   const srcSize = src.size;

assembly/serialize/simple/string.ts

@@ -1,6 +1,6 @@
 import { _intTo16 } from "../../custom/util";
 import { bytes } from "../../util/bytes";
-import { bs } from "../../../modules/bs";
+import { bs } from "as-bs";
 import { BACK_SLASH, QUOTE } from "../../custom/chars";
 import { SERIALIZE_ESCAPE_TABLE } from "../../globals/tables";
 

assembly/test.ts

@@ -10,14 +10,14 @@ class Vec3 {
 
 @json
 class Player {
-  // @alias("first name")
+  @alias("first name")
   firstName!: string;
   lastName!: string;
   lastActive!: i32[];
   // Drop in a code block, function, or expression that evaluates to a boolean
   @omitif((self: Player): boolean => self.age < 18)
   age!: i32;
-  // @omitnull()
+  @omitnull()
   pos!: Vec3 | null;
   isVerified!: boolean;
   @inline __INITIALIZE(): this {

package.json

@@ -58,7 +58,7 @@
   "scripts": {
     "test": "rm -rf ./build/ && ast test",
     "build:bench": "rm -rf ./build/ && asc assembly/__benches__/misc.bench.ts -o ./build/bench.wasm --textFile ./build/bench.wat --transform ./transform --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior always --runtime incremental --enable simd --enable bulk-memory",
-    "build:test": "rm -rf ./build/ && JSON_DEBUG=true asc assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --optimizeLevel 3 --shrinkLevel 0 --enable simd --runtime stub",
+    "build:test": "rm -rf ./build/ && JSON_DEBUG=true asc assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --optimizeLevel 3 --shrinkLevel 0 --runtime stub",
     "build:test:simd": "rm -rf ./build/ && JSON_DEBUG=true asc assembly/test.ts --transform ./transform -o ./build/test.wasm --textFile ./build/test.wat --optimizeLevel 3 --shrinkLevel 0 --enable simd --runtime stub",
     "test:wasmtime": "wasmtime ./build/test.wasm",
     "test:wasmer": "wasmer ./build/test.wasm",
@@ -67,5 +67,8 @@
     "prettier": "prettier -w ."
   },
   "type": "module",
-  "types": "assembly/index.ts"
+  "types": "assembly/index.ts",
+  "dependencies": {
+    "as-bs": "^1.0.1"
+  }
 }

transform/src/index.ts

@@ -405,20 +405,9 @@ class JSONTransform extends Visitor {
     //   }
     // }
     if (!this.imports.find((i) => i.declarations.find((d) => d.foreignName.text == "bs"))) {
-      const __filename = fileURLToPath(import.meta.url);
-      const __dirname = path.dirname(__filename);
-
-      let relativePath = path.relative(path.dirname(node.range.source.normalizedPath), path.resolve(__dirname, "../../modules/bs/index.ts"));
-
-      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 + "!");
-      // }
-
-      const txt = `import { bs } from "${relativePath}";`;
-      if (!this.jsonImport) {
-        this.jsonImport = txt;
-        if (process.env["JSON_DEBUG"]) console.log("Added bs import: " + txt + "\n");
+      if (!this.bsImport) {
+        this.bsImport = "import { bs } from \"as-bs\"";
+        if (process.env["JSON_DEBUG"]) console.log("Added as-bs import: " + this.bsImport + "\n");
       }
     }