@yowasp/yosys 0.59.84-dev.1025 → 0.59.1037

package/gen/bundle.js

@@ -1,137 +1,13 @@
 var __defProp = Object.defineProperty;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// node_modules/nanotar/dist/index.mjs
-function parseTar(data, opts) {
-  const buffer = data.buffer || data;
-  const files = [];
-  let offset = 0;
-  while (offset < buffer.byteLength - 512) {
-    const name = _readString(buffer, offset, 100);
-    if (name.length === 0) {
-      break;
-    }
-    const mode = _readString(buffer, offset + 100, 8).trim();
-    const uid = Number.parseInt(_readString(buffer, offset + 108, 8));
-    const gid = Number.parseInt(_readString(buffer, offset + 116, 8));
-    const size = _readNumber(buffer, offset + 124, 12);
-    const seek = 512 + 512 * Math.trunc(size / 512) + (size % 512 ? 512 : 0);
-    const mtime = _readNumber(buffer, offset + 136, 12);
-    const _type = _readNumber(buffer, offset + 156, 1);
-    const type = _type === TAR_TYPE_FILE ? "file" : _type === TAR_TYPE_DIR ? "directory" : _type;
-    const user = _readString(buffer, offset + 265, 32);
-    const group = _readString(buffer, offset + 297, 32);
-    const meta = {
-      name,
-      type,
-      size,
-      attrs: {
-        mode,
-        uid,
-        gid,
-        mtime,
-        user,
-        group
-      }
-    };
-    if (opts?.filter && !opts.filter(meta)) {
-      offset += seek;
-      continue;
-    }
-    if (opts?.metaOnly) {
-      files.push(meta);
-      offset += seek;
-      continue;
-    }
-    const data2 = _type === TAR_TYPE_DIR ? void 0 : new Uint8Array(buffer, offset + 512, size);
-    files.push({
-      ...meta,
-      data: data2,
-      get text() {
-        return new TextDecoder().decode(this.data);
-      }
-    });
-    offset += seek;
-  }
-  return files;
-}
-function _readString(buffer, offset, size) {
-  const view = new Uint8Array(buffer, offset, size);
-  const i = view.indexOf(0);
-  const td = new TextDecoder();
-  return td.decode(i === -1 ? view : view.slice(0, i));
-}
-function _readNumber(buffer, offset, size) {
-  const view = new Uint8Array(buffer, offset, size);
-  let str = "";
-  for (let i = 0; i < size; i++) {
-    str += String.fromCodePoint(view[i]);
-  }
-  return Number.parseInt(str, 8);
-}
-var TAR_TYPE_FILE, TAR_TYPE_DIR;
-var init_dist = __esm({
-  "node_modules/nanotar/dist/index.mjs"() {
-    TAR_TYPE_FILE = 0;
-    TAR_TYPE_DIR = 5;
-  }
-});
-
-// gen/yosys-resources.js
-var yosys_resources_exports = {};
-__export(yosys_resources_exports, {
-  filesystem: () => filesystem,
-  modules: () => modules
-});
-function unpackResources(url) {
-  function defaultFetchFn(url2) {
-    return fetch(url2).then((resp) => resp.arrayBuffer());
-  }
-  return async (fetchFn = defaultFetchFn) => {
-    const root = {};
-    for (const tarEntry of parseTar(await fetchFn(url))) {
-      const nameParts = tarEntry.name.split("/");
-      const dirNames = nameParts.slice(0, -1);
-      const fileName = nameParts[nameParts.length - 1];
-      let dir = root;
-      for (const dirName of dirNames)
-        dir = dir[dirName];
-      if (tarEntry.type === "directory") {
-        dir[fileName] = {};
-      } else {
-        dir[fileName] = tarEntry.data;
-      }
-    }
-    return root;
-  };
-}
-var modules, filesystem;
-var init_yosys_resources = __esm({
-  "gen/yosys-resources.js"() {
-    init_dist();
-    modules = {
-      "yosys.core.wasm": new URL("./yosys.core.wasm", import.meta.url),
-      "yosys.core2.wasm": new URL("./yosys.core2.wasm", import.meta.url),
-      "yosys.core3.wasm": new URL("./yosys.core3.wasm", import.meta.url),
-      "yosys.core4.wasm": new URL("./yosys.core4.wasm", import.meta.url)
-    };
-    filesystem = {
-      share: unpackResources(new URL("./yosys-resources.tar", import.meta.url))
-    };
-  }
-});
-
 // node_modules/@yowasp/runtime/lib/fetch.js
-var fetch2;
+var fetch;
 if (typeof process === "object" && process.release?.name === "node") {
-  fetch2 = async function(url, options) {
+  fetch = async function(url, options) {
     if (url.protocol === "file:") {
       const { readFile } = await import("node:fs/promises");
       const data = await readFile(url);
@@ -146,9 +22,9 @@ if (typeof process === "object" && process.release?.name === "node") {
     }
   };
 } else {
-  fetch2 = globalThis.fetch;
+  fetch = globalThis.fetch;
 }
-var fetch_default = fetch2;
+var fetch_default = fetch;
 
 // node_modules/@yowasp/runtime/lib/wasi-virt.js
 var Exit = class extends Error {
@@ -616,81 +492,13 @@ function lineBuffered(processLine) {
 }
 
 // node_modules/@yowasp/runtime/lib/api.js
-async function fetchObject(obj, fetchFn) {
-  const promises = [];
-  for (const [key, value] of Object.entries(obj)) {
-    if (typeof value === "string" || value instanceof Uint8Array) {
-      promises.push(Promise.resolve([key, value]));
-    } else if (value instanceof URL) {
-      promises.push(fetchFn(value).then((fetched) => [key, fetched]));
-    } else if (value instanceof Function) {
-      promises.push(await value(fetchFn).then((fetched) => [key, fetched]));
-    } else {
-      promises.push(fetchObject(value, fetchFn).then((fetched) => [key, fetched]));
-    }
-  }
-  for (const [key, value] of await Promise.all(promises))
-    obj[key] = value;
-  return obj;
-}
-function fetchWebAssembly(url, monitorProgress) {
-  const response = fetch_default(url).then(monitorProgress);
-  if (WebAssembly.compileStreaming !== void 0) {
-    return response.then(WebAssembly.compileStreaming);
-  } else {
-    return response.then((resp) => resp.arrayBuffer()).then(WebAssembly.compile);
-  }
-}
-function fetchUint8Array(url, monitorProgress) {
-  const response = fetch_default(url).then(monitorProgress);
-  return response.then((resp) => resp.arrayBuffer()).then((buf) => new Uint8Array(buf));
-}
-function fetchResources({ modules: modules2, filesystem: filesystem2 }, fetchProgress, application) {
-  let monitorProgress = (response) => response;
-  if (fetchProgress !== void 0) {
-    const progress = /* @__PURE__ */ new Map();
-    const notifyProgress = () => {
-      let cumTotalLength = 0, cumDoneLength = 0;
-      for (const { totalLength, doneLength } of progress.values()) {
-        cumTotalLength += totalLength;
-        cumDoneLength += doneLength;
-      }
-      fetchProgress({
-        source: application,
-        totalLength: cumTotalLength,
-        doneLength: cumDoneLength
-      });
-    };
-    monitorProgress = (response) => {
-      let totalLength = +response.headers.get("content-length");
-      let doneLength = 0;
-      progress.set(response, { totalLength, doneLength });
-      notifyProgress();
-      const monitorStream = new TransformStream({
-        transform(chunk, controller) {
-          controller.enqueue(chunk);
-          doneLength += chunk.length;
-          progress.set(response, { totalLength, doneLength });
-          notifyProgress();
-        }
-      });
-      return new Response(response.body.pipeThrough(monitorStream), response);
-    };
-  }
-  return Promise.all([
-    fetchObject(modules2, (url) => fetchWebAssembly(url, monitorProgress)),
-    fetchObject(filesystem2, (url) => fetchUint8Array(url, monitorProgress))
-  ]).then(([modules3, filesystem3]) => {
-    return { modules: modules3, filesystem: filesystem3 };
-  });
-}
 var Application = class {
-  #resources;
+  #resourceModule;
   #resourceData;
   #instantiate;
   #argv0;
-  constructor(resources, instantiate2, argv0) {
-    this.#resources = resources;
+  constructor(resourceModule, instantiate2, argv0) {
+    this.#resourceModule = resourceModule;
     this.#resourceData = null;
     this.#instantiate = instantiate2;
     this.#argv0 = argv0;
@@ -698,6 +506,28 @@ var Application = class {
   get argv0() {
     return this.#argv0;
   }
+  async #fetchResources(fetchProgress) {
+    const resourceModule = await this.#resourceModule;
+    let fetchFn = fetch_default;
+    if (fetchProgress !== void 0) {
+      const status = { source: this, totalLength: resourceModule.totalSize, doneLength: 0 };
+      fetchProgress(status);
+      fetchFn = (input, init) => fetch_default(input, init).then((response) => {
+        return new Response(response.body.pipeThrough(new TransformStream({
+          transform(chunk, controller) {
+            controller.enqueue(chunk);
+            status.doneLength += chunk.length;
+            fetchProgress(status);
+          }
+        })), response);
+      });
+    }
+    const [modules2, filesystem2] = await Promise.all([
+      resourceModule.modules(fetchFn),
+      resourceModule.filesystem(fetchFn)
+    ]);
+    this.#resourceData = { modules: modules2, filesystem: filesystem2 };
+  }
   // The `printLine` option is deprecated and not documented but still accepted for compatibility.
   run(args = null, files = {}, options = {}) {
     if (this.#resourceData === null) {
@@ -707,9 +537,7 @@ var Application = class {
         const percent = (100 * doneLength / totalLength).toFixed(0);
         console.log(`${source.argv0}: fetched ${percent}% (${doneLength} / ${totalLength})`);
       };
-      const fetchProgress = options.fetchProgress ?? defaultFetchProgress;
-      return this.#resources().then((resourceObject) => fetchResources(resourceObject, fetchProgress, this)).then((resourceData) => {
-        this.#resourceData = resourceData;
+      return this.#fetchResources(options.fetchProgress ?? defaultFetchProgress).then(() => {
         return this.run(args, files, options);
       });
     }
@@ -755,6 +583,121 @@ var Application = class {
   }
 };
 
+// gen/yosys-resources.js
+var yosys_resources_exports = {};
+__export(yosys_resources_exports, {
+  filesystem: () => filesystem,
+  modules: () => modules,
+  totalSize: () => totalSize
+});
+
+// node_modules/nanotar/dist/index.mjs
+var TAR_TYPE_FILE = 0;
+var TAR_TYPE_DIR = 5;
+function parseTar(data, opts) {
+  const buffer = data.buffer || data;
+  const files = [];
+  let offset = 0;
+  while (offset < buffer.byteLength - 512) {
+    const name = _readString(buffer, offset, 100);
+    if (name.length === 0) {
+      break;
+    }
+    const mode = _readString(buffer, offset + 100, 8).trim();
+    const uid = Number.parseInt(_readString(buffer, offset + 108, 8));
+    const gid = Number.parseInt(_readString(buffer, offset + 116, 8));
+    const size = _readNumber(buffer, offset + 124, 12);
+    const seek = 512 + 512 * Math.trunc(size / 512) + (size % 512 ? 512 : 0);
+    const mtime = _readNumber(buffer, offset + 136, 12);
+    const _type = _readNumber(buffer, offset + 156, 1);
+    const type = _type === TAR_TYPE_FILE ? "file" : _type === TAR_TYPE_DIR ? "directory" : _type;
+    const user = _readString(buffer, offset + 265, 32);
+    const group = _readString(buffer, offset + 297, 32);
+    const meta = {
+      name,
+      type,
+      size,
+      attrs: {
+        mode,
+        uid,
+        gid,
+        mtime,
+        user,
+        group
+      }
+    };
+    if (opts?.filter && !opts.filter(meta)) {
+      offset += seek;
+      continue;
+    }
+    if (opts?.metaOnly) {
+      files.push(meta);
+      offset += seek;
+      continue;
+    }
+    const data2 = _type === TAR_TYPE_DIR ? void 0 : new Uint8Array(buffer, offset + 512, size);
+    files.push({
+      ...meta,
+      data: data2,
+      get text() {
+        return new TextDecoder().decode(this.data);
+      }
+    });
+    offset += seek;
+  }
+  return files;
+}
+function _readString(buffer, offset, size) {
+  const view = new Uint8Array(buffer, offset, size);
+  const i = view.indexOf(0);
+  const td = new TextDecoder();
+  return td.decode(i === -1 ? view : view.slice(0, i));
+}
+function _readNumber(buffer, offset, size) {
+  const view = new Uint8Array(buffer, offset, size);
+  let str = "";
+  for (let i = 0; i < size; i++) {
+    str += String.fromCodePoint(view[i]);
+  }
+  return Number.parseInt(str, 8);
+}
+
+// gen/yosys-resources.js
+function compileWasmModule(response) {
+  if (WebAssembly.compileStreaming !== void 0) {
+    return WebAssembly.compileStreaming(response);
+  } else {
+    return WebAssembly.compile(response.arrayBuffer());
+  }
+}
+function unpackTarFilesystem(buffer) {
+  const root = {};
+  for (const tarEntry of parseTar(buffer)) {
+    const nameParts = tarEntry.name.split("/");
+    const dirNames = nameParts.slice(0, -1);
+    const fileName = nameParts[nameParts.length - 1];
+    let dir = root;
+    for (const dirName of dirNames)
+      dir = dir[dirName];
+    if (tarEntry.type === "directory") {
+      dir[fileName] = {};
+    } else {
+      dir[fileName] = tarEntry.data;
+    }
+  }
+  return root;
+}
+var modules = async (fetch2) => ({
+  "yosys.core.wasm": await fetch2(new URL("./yosys.core.wasm", import.meta.url)).then(compileWasmModule),
+  "yosys.core2.wasm": await fetch2(new URL("./yosys.core2.wasm", import.meta.url)).then(compileWasmModule),
+  "yosys.core3.wasm": await fetch2(new URL("./yosys.core3.wasm", import.meta.url)).then(compileWasmModule),
+  "yosys.core4.wasm": await fetch2(new URL("./yosys.core4.wasm", import.meta.url)).then(compileWasmModule)
+});
+var filesystem = async (fetch2) => ({
+  "share": await fetch2(new URL("./yosys-resources.tar", import.meta.url)).then((resp) => resp.arrayBuffer()).then(unpackTarFilesystem)
+});
+var totalSize = 48972600;
+
 // gen/yosys.js
 var ComponentError = class extends Error {
   constructor(value) {
@@ -5640,10 +5583,10 @@ function instantiate(getCoreModule, imports, instantiateCore = WebAssembly.insta
 }
 
 // lib/api.js
-var yosys = new Application(() => Promise.resolve().then(() => (init_yosys_resources(), yosys_resources_exports)), instantiate, "yowasp-yosys");
+var yosys = new Application(yosys_resources_exports, instantiate, "yowasp-yosys");
 var runYosys = yosys.run.bind(yosys);
 var commands = { "yosys": runYosys };
-var version = "0.59.84-dev.1025";
+var version = "0.59.1037";
 export {
   Exit,
   commands,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yowasp/yosys",
-  "version": "0.59.84-dev.1025",
+  "version": "0.59.1037",
   "description": "Yosys Open SYnthesis Suite",
   "author": "Catherine <whitequark@whitequark.org>",
   "license": "ISC",
@@ -26,13 +26,13 @@
   "types": "./lib/api.d.ts",
   "devDependencies": {
     "@bytecodealliance/jco": "1.3.0",
-    "@yowasp/runtime": "10.0.64",
+    "@yowasp/runtime": "11.0.66",
     "esbuild": "^0.25.11"
   },
   "scripts": {
     "transpile": "jco new ../yosys-build/yosys.wasm --wasi-command --output yosys.wasm && jco transpile yosys.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/yosys-resources.js gen ../yosys-build/share",
-    "build": "esbuild --bundle lib/api.js --outfile=gen/bundle.js --format=esm --platform=node --define:VERSION=\\\"0.59.84-dev.1025\\\"",
+    "build": "esbuild --bundle lib/api.js --outfile=gen/bundle.js --format=esm --platform=node --define:VERSION=\\\"0.59.1037\\\"",
     "all": "npm run transpile && npm run pack && npm run build"
   }
 }