@spade-lang/spade 0.20.0-dev50.50.eba48a-eba48a → 0.21.0-dev1.1.0052ab-0052ab

package/README.md

@@ -5,7 +5,7 @@ This package provides [Spade][] binaries built for [WebAssembly][]. This is usin
 
 At the moment, this package only provides an API allowing to run Spade in a virtual filesystem; no binaries are provided.
 
-[Spade]: https://gitlab.com/spade-lang/spade/
+[Spade]: https://codeberg.org/spade-lang/spade/
 [webassembly]: https://webassembly.org/
 [yowasp]: https://yowasp.github.io/
 

package/gen/bundle.js

@@ -121,8 +121,13 @@ var TerminalInput = class {
 };
 var TerminalOutput = class {
 };
+var nextFilesystemId = /* @__PURE__ */ function() {
+  let id = 0;
+  return () => id++;
+}();
 var File = class {
   constructor(data = "") {
+    this.id = nextFilesystemId();
     if (data instanceof Uint8Array) {
       this.data = data;
     } else if (typeof data === "string") {
@@ -135,40 +140,15 @@ var File = class {
     return this.data.length;
   }
 };
-var ReadStream = class extends InputStream {
-  constructor(file, offset) {
-    super();
-    this.file = file;
-    this.offset = offset;
-  }
-  read(len) {
-    const data = this.file.data.subarray(Number(this.offset), Number(this.offset + len));
-    this.offset += len;
-    return data;
-  }
-};
-var WriteStream = class extends OutputStream {
-  constructor(file, offset) {
-    super();
-    this.file = file;
-    this.offset = offset;
-  }
-  write(contents) {
-    const newData = new Uint8Array(this.file.data.length + contents.length);
-    newData.set(this.file.data);
-    newData.subarray(Number(this.offset)).set(contents);
-    this.file.data = newData;
-    this.offset += BigInt(contents.length);
-  }
-};
 var Directory = class _Directory {
   constructor(files = {}) {
+    this.id = nextFilesystemId();
     this.files = files;
   }
   get size() {
     return Object.keys(this.files).length;
   }
-  traverse(path, flags = { create: false, remove: false }) {
+  traverse(path, { create = null, remove = false } = {}) {
     let entry = this;
     let separatorAt = -1;
     do {
@@ -177,7 +157,7 @@ var Directory = class _Directory {
       const files = entry.files;
       separatorAt = path.indexOf("/");
       const segment = separatorAt === -1 ? path : path.substring(0, separatorAt);
-      if (separatorAt === -1 && flags.remove)
+      if (separatorAt === -1 && remove)
         delete files[segment];
       else if (segment === "" || segment === ".")
         ;
@@ -185,10 +165,12 @@ var Directory = class _Directory {
         ;
       else if (Object.hasOwn(files, segment))
         entry = files[segment];
-      else if (flags.create === "directory" || flags.create === "file" && separatorAt !== -1)
+      else if (create === "directory" || create !== null && separatorAt !== -1)
         entry = files[segment] = new _Directory({});
-      else if (flags.create === "file")
+      else if (create === "file")
         entry = files[segment] = new File(new Uint8Array());
+      else if (create instanceof File || create instanceof _Directory)
+        entry = files[segment] = create;
       else
         throw "no-entry";
       path = path.substring(separatorAt + 1);
@@ -196,6 +178,33 @@ var Directory = class _Directory {
     return entry;
   }
 };
+var ReadStream = class extends InputStream {
+  constructor(file, offset) {
+    super();
+    this.file = file;
+    this.offset = offset;
+  }
+  read(len) {
+    const data = this.file.data.subarray(Number(this.offset), Number(this.offset + len));
+    this.offset += len;
+    return data;
+  }
+};
+var WriteStream = class extends OutputStream {
+  constructor(file, offset) {
+    super();
+    this.file = file;
+    this.offset = offset;
+  }
+  write(contents) {
+    const offset = Number(this.offset);
+    const newData = new Uint8Array(Math.max(this.file.data.length, offset + contents.length));
+    newData.set(this.file.data);
+    newData.subarray(offset).set(contents);
+    this.file.data = newData;
+    this.offset += BigInt(contents.length);
+  }
+};
 var Descriptor = class _Descriptor {
   constructor(entry) {
     this.entry = entry;
@@ -210,7 +219,7 @@ var Descriptor = class _Descriptor {
     return {};
   }
   metadataHash() {
-    return { upper: 0, lower: 0 };
+    return { upper: 0, lower: this.entry.id };
   }
   metadataHashAt(_pathFlags, path) {
     if (!(this.entry instanceof Directory))
@@ -242,7 +251,7 @@ var Descriptor = class _Descriptor {
   openAt(_pathFlags, path, openFlags, _descriptorFlags) {
     if (!(this.entry instanceof Directory))
       throw "invalid";
-    const openEntry = this.entry.traverse(path, { create: openFlags.create ? "file" : false });
+    const openEntry = this.entry.traverse(path, openFlags.create ? { create: "file" } : {});
     if (openFlags.directory) {
       if (!(openEntry instanceof Directory))
         throw "not-directory";
@@ -272,6 +281,18 @@ var Descriptor = class _Descriptor {
   writeViaStream(offset) {
     return new WriteStream(this.entry, offset);
   }
+  setSize(size) {
+    if (this.entry instanceof Directory)
+      throw "is-directory";
+    size = Number(size);
+    if (size > this.entry.data.length) {
+      const newData = new Uint8Array(size);
+      newData.set(this.entry.data);
+      this.entry.data = newData;
+    } else if (size < this.entry.data.length) {
+      this.entry.data = this.entry.data.subarray(0, size);
+    }
+  }
   readDirectory() {
     return new DirectoryEntryStream(this.entry);
   }
@@ -281,15 +302,28 @@ var Descriptor = class _Descriptor {
   unlinkFileAt(path) {
     const pathEntry = this.entry.traverse(path);
     if (pathEntry instanceof Directory)
-      return "is-directory";
+      throw "is-directory";
     this.entry.traverse(path, { remove: true });
   }
   removeDirectoryAt(path) {
     const pathEntry = this.entry.traverse(path);
     if (!(pathEntry instanceof Directory))
-      return "not-directory";
+      throw "not-directory";
     this.entry.traverse(path, { remove: true });
   }
+  readlinkAt(path) {
+    const _pathEntry = this.entry.traverse(path);
+    throw "invalid";
+  }
+  renameAt(oldPath, newDescriptor, newPath) {
+    if (!(this.entry instanceof Directory))
+      throw "not-directory";
+    if (!(newDescriptor.entry instanceof Directory))
+      throw "not-directory";
+    const oldEntry = this.entry.traverse(oldPath);
+    this.entry.traverse(newPath, { create: oldEntry });
+    this.entry.traverse(oldPath, { remove: true });
+  }
 };
 var DirectoryEntryStream = class {
   constructor(directory) {
@@ -466,7 +500,11 @@ async function fetchObject(obj, fetchFn) {
   return obj;
 }
 function fetchWebAssembly(url) {
-  return fetch_default(url).then(WebAssembly.compileStreaming);
+  if (WebAssembly.compileStreaming !== void 0) {
+    return fetch_default(url).then(WebAssembly.compileStreaming);
+  } else {
+    return fetch_default(url).then((resp) => resp.arrayBuffer()).then(WebAssembly.compile);
+  }
 }
 function fetchUint8Array(url) {
   return fetch_default(url).then((resp) => resp.arrayBuffer()).then((buf) => new Uint8Array(buf));
@@ -486,53 +524,56 @@ var Application = class {
     this.instantiate = instantiate2;
     this.argv0 = argv0;
   }
-  async preload() {
-    if (this.resourceData === null)
-      this.resourceData = await this.resources().then(fetchResources);
-  }
   // The `printLine` option is deprecated and not documented but still accepted for compatibility.
-  execute(args, files = {}, { stdin, stdout, stderr, decodeASCII = true, printLine } = {}) {
+  run(args = null, files = {}, options = {}) {
+    if (this.resourceData === null) {
+      if (options.synchronously)
+        throw new Error("Cannot run application synchronously unless resources are prefetched first; use `await run()` to do so");
+      return this.resources().then(fetchResources).then((resourceData) => {
+        this.resourceData = resourceData;
+        return this.run(args, files, options);
+      });
+    }
+    if (args === null)
+      return;
     const environment = new Environment();
     environment.args = [this.argv0].concat(args);
     environment.root = directoryFromTree(files);
     for (const [dirName, dirContents] of Object.entries(this.resourceData.filesystem))
       environment.root.files[dirName] = directoryFromTree(dirContents);
-    const lineBufferedConsole = lineBuffered(printLine ?? console.log);
-    environment.stdin = stdin === void 0 ? null : stdin;
-    environment.stdout = stdout === void 0 ? lineBufferedConsole : stdout;
-    environment.stderr = stderr === void 0 ? lineBufferedConsole : stderr;
-    const wasmCommand = this.instantiate(
-      (filename) => this.resourceData.modules[filename],
-      { runtime: environment.exports },
-      // workaround for bytecodealliance/jco#374
-      (module, imports) => new WebAssembly.Instance(module, imports)
-    );
-    let error = null;
-    try {
-      wasmCommand.run.run();
-    } catch (e) {
-      if (!(e instanceof Exit))
-        throw e;
-      if (e instanceof Exit && e.code !== 0)
-        error = e;
-    }
-    for (const dirName of Object.keys(this.resourceData.filesystem))
-      delete environment.root.files[dirName];
-    files = directoryIntoTree(environment.root, { decodeASCII });
-    if (error !== null) {
-      error.files = files;
-      throw error;
+    const lineBufferedConsole = lineBuffered(options.printLine ?? console.log);
+    environment.stdin = options.stdin === void 0 ? null : options.stdin;
+    environment.stdout = options.stdout === void 0 ? lineBufferedConsole : options.stdout;
+    environment.stderr = options.stderr === void 0 ? lineBufferedConsole : options.stderr;
+    const runCommand = (wasmCommand) => {
+      let error = null;
+      try {
+        wasmCommand.run.run();
+      } catch (e) {
+        if (!(e instanceof Exit))
+          throw e;
+        if (e instanceof Exit && e.code !== 0)
+          error = e;
+      }
+      for (const dirName of Object.keys(this.resourceData.filesystem))
+        delete environment.root.files[dirName];
+      files = directoryIntoTree(environment.root, { decodeASCII: options.decodeASCII ?? true });
+      if (error !== null) {
+        error.files = files;
+        throw error;
+      } else {
+        return files;
+      }
+    };
+    const getCoreModule = (filename) => this.resourceData.modules[filename];
+    const imports = { runtime: environment.exports };
+    if (options.synchronously) {
+      const instantiateCore = (module, imports2) => new WebAssembly.Instance(module, imports2);
+      return runCommand(this.instantiate(getCoreModule, imports, instantiateCore));
     } else {
-      return files;
+      return this.instantiate(getCoreModule, imports).then(runCommand);
     }
   }
-  run(args = null, files = {}, options = {}) {
-    if (this.resourceData === null)
-      return this.preload().then((_) => this.run(args, files, options));
-    if (args === null)
-      return;
-    return this.execute(args, files, options);
-  }
 };
 
 // gen/spade.js
@@ -582,7 +623,7 @@ function utf8Encode(s, realloc, memory) {
   utf8EncodedLen = writtenTotal;
   return ptr;
 }
-function instantiate(getCoreModule, imports, instantiateCore = WebAssembly.Instance) {
+async function instantiate(getCoreModule, imports, instantiateCore = WebAssembly.instantiate) {
   const module0 = getCoreModule("spade.core.wasm");
   const module1 = getCoreModule("spade.core2.wasm");
   const module2 = getCoreModule("spade.core3.wasm");
@@ -3005,29 +3046,31 @@ function instantiate(getCoreModule, imports, instantiateCore = WebAssembly.Insta
       handleEntry.rep[symbolDispose]();
     }
   }
-  ({ exports: exports0 } = instantiateCore(module2));
-  ({ exports: exports1 } = instantiateCore(module0, {
+  Promise.all([module0, module1, module2, module3]).catch(() => {
+  });
+  ({ exports: exports0 } = await instantiateCore(await module2));
+  ({ exports: exports1 } = await instantiateCore(await module0, {
     wasi_snapshot_preview1: {
-      args_get: exports0["25"],
+      args_get: exports0["23"],
       args_sizes_get: exports0["24"],
-      clock_time_get: exports0["28"],
-      environ_get: exports0["26"],
-      environ_sizes_get: exports0["27"],
-      fd_close: exports0["29"],
-      fd_fdstat_get: exports0["30"],
-      fd_filestat_get: exports0["31"],
-      fd_prestat_dir_name: exports0["33"],
-      fd_prestat_get: exports0["32"],
-      fd_read: exports0["34"],
-      fd_seek: exports0["35"],
-      fd_write: exports0["36"],
-      path_open: exports0["37"],
-      proc_exit: exports0["38"],
-      random_get: exports0["23"],
-      sched_yield: exports0["39"]
+      clock_time_get: exports0["25"],
+      environ_get: exports0["33"],
+      environ_sizes_get: exports0["34"],
+      fd_close: exports0["35"],
+      fd_fdstat_get: exports0["36"],
+      fd_filestat_get: exports0["26"],
+      fd_prestat_dir_name: exports0["38"],
+      fd_prestat_get: exports0["37"],
+      fd_read: exports0["27"],
+      fd_tell: exports0["28"],
+      fd_write: exports0["29"],
+      path_open: exports0["30"],
+      proc_exit: exports0["39"],
+      random_get: exports0["32"],
+      sched_yield: exports0["31"]
     }
   }));
-  ({ exports: exports2 } = instantiateCore(module1, {
+  ({ exports: exports2 } = await instantiateCore(await module1, {
     __main_module__: {
       _start: exports1._start
     },
@@ -3106,7 +3149,7 @@ function instantiate(getCoreModule, imports, instantiateCore = WebAssembly.Insta
   }));
   memory0 = exports1.memory;
   realloc0 = exports2.cabi_import_realloc;
-  ({ exports: exports3 } = instantiateCore(module3, {
+  ({ exports: exports3 } = await instantiateCore(await module3, {
     "": {
       $imports: exports0.$imports,
       "0": trampoline12,
@@ -3125,24 +3168,24 @@ function instantiate(getCoreModule, imports, instantiateCore = WebAssembly.Insta
       "20": trampoline32,
       "21": trampoline33,
       "22": trampoline34,
-      "23": exports2.random_get,
+      "23": exports2.args_get,
       "24": exports2.args_sizes_get,
-      "25": exports2.args_get,
-      "26": exports2.environ_get,
-      "27": exports2.environ_sizes_get,
-      "28": exports2.clock_time_get,
-      "29": exports2.fd_close,
+      "25": exports2.clock_time_get,
+      "26": exports2.fd_filestat_get,
+      "27": exports2.fd_read,
+      "28": exports2.fd_tell,
+      "29": exports2.fd_write,
       "3": trampoline15,
-      "30": exports2.fd_fdstat_get,
-      "31": exports2.fd_filestat_get,
-      "32": exports2.fd_prestat_get,
-      "33": exports2.fd_prestat_dir_name,
-      "34": exports2.fd_read,
-      "35": exports2.fd_seek,
-      "36": exports2.fd_write,
-      "37": exports2.path_open,
-      "38": exports2.proc_exit,
-      "39": exports2.sched_yield,
+      "30": exports2.path_open,
+      "31": exports2.sched_yield,
+      "32": exports2.random_get,
+      "33": exports2.environ_get,
+      "34": exports2.environ_sizes_get,
+      "35": exports2.fd_close,
+      "36": exports2.fd_fdstat_get,
+      "37": exports2.fd_prestat_get,
+      "38": exports2.fd_prestat_dir_name,
+      "39": exports2.proc_exit,
       "4": trampoline16,
       "5": trampoline17,
       "6": trampoline18,

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@spade-lang/spade",
-  "version": "0.20.0-dev50.50.eba48a-eba48a",
+  "version": "0.21.0-dev1.1.0052ab-0052ab",
   "description": "Spade HDL (YoWASP package)",
   "author": "Frans Skarman <frans.skarman@liu.se>",
   "license": "ISC",
   "homepage": "https://spade-lang.org/",
   "repository": {
     "type": "git",
-    "url": "git+https://gitlab.com/spade-lang/yowasp.git"
+    "url": "git+https://codeberg.org/spade-lang/spade.git"
   },
   "bugs": {
-    "url": "https://github.com/spade-lang/spade/issues"
+    "url": "https://codeberg.org/spade-lang/spade/issues"
   },
   "type": "module",
   "files": [
@@ -27,11 +27,11 @@
   "types": "./lib/api.d.ts",
   "devDependencies": {
     "@bytecodealliance/jco": "1.0.0",
-    "@yowasp/runtime": "8.0.40",
+    "@yowasp/runtime": "9.0.58",
     "esbuild": "^0.19.8"
   },
   "scripts": {
-    "transpile": "jco new ${CARGO_TARGET_DIR:-../../target}/wasm32-wasip1/release/spade.wasm --wasi-command --output spade.wasm && jco transpile spade.wasm --instantiation sync --no-typescript --no-namespaced-exports --map 'wasi:io/*=runtime#io' --map 'wasi:cli/*=runtime#cli' --map 'wasi:clocks/*=runtime#*' --map 'wasi:filesystem/*=runtime#fs' --map 'wasi:random/*=runtime#random' --out-dir gen/",
+    "transpile": "jco new ${CARGO_TARGET_DIR:-../../target}/wasm32-wasip1/release/spade.wasm --wasi-command --output spade.wasm && jco transpile spade.wasm --instantiation async --no-typescript --no-namespaced-exports --map 'wasi:io/*=runtime#io' --map 'wasi:cli/*=runtime#cli' --map 'wasi:clocks/*=runtime#*' --map 'wasi:filesystem/*=runtime#fs' --map 'wasi:random/*=runtime#random' --out-dir gen/",
     "pack": "yowasp-pack-resources gen/resources-spade.js gen",
     "build": "esbuild --bundle lib/api.js --outfile=gen/bundle.js --format=esm --platform=node --external:./resources-*.js",
     "all": "npm run transpile && npm run pack && npm run build"