@yowasp/yosys 0.37.67-dev.638 → 0.37.67-dev.640

package/gen/{bundle-browser.js → bundle.js}

@@ -1,3 +1,22 @@
+// node_modules/@yowasp/runtime/lib/fetch.js
+var fetch;
+if (typeof process === "object" && process.release?.name === "node") {
+  fetch = async function(url, options) {
+    if (url.protocol === "file:") {
+      const { readFile } = await import("fs/promises");
+      let contentType = "application/octet-stream";
+      if (url.pathname.endsWith(".wasm"))
+        contentType = "application/wasm";
+      return new Response(await readFile(url), { headers: { "Content-Type": contentType } });
+    } else {
+      return globalThis.fetch(url, options);
+    }
+  };
+} else {
+  fetch = globalThis.fetch;
+}
+var fetch_default = fetch;
+
 // node_modules/@yowasp/runtime/lib/wasi-virt.js
 var Exit = class extends Error {
   constructor(code = 0) {
@@ -410,8 +429,37 @@ function lineBuffered(processLine) {
   };
 }
 
-// node_modules/@yowasp/runtime/lib/api-base.js
-var BaseApplication = class {
+// 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 {
+      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) {
+  return fetch_default(url).then(WebAssembly.compileStreaming);
+}
+function fetchUint8Array(url) {
+  return fetch_default(url).then((resp) => resp.arrayBuffer()).then((buf) => new Uint8Array(buf));
+}
+function fetchResources({ modules, filesystem }) {
+  return Promise.all([
+    fetchObject(modules, fetchWebAssembly),
+    fetchObject(filesystem, fetchUint8Array)
+  ]).then(([modules2, filesystem2]) => {
+    return { modules: modules2, filesystem: filesystem2 };
+  });
+}
+var Application = class {
   constructor(resourceFileURL2, instantiate2, argv0) {
     this.resourceFileURL = resourceFileURL2;
     this.resources = null;
@@ -421,7 +469,7 @@ var BaseApplication = class {
   // The `printLine` option is deprecated and not documented but still accepted for compatibility.
   async run(args = null, files = {}, { stdout, stderr, decodeASCII = true, printLine } = {}) {
     if (this.resources === null)
-      this.resources = await this._fetchResources();
+      this.resources = await import(this.resourceFileURL).then(fetchResources);
     if (args === null)
       return;
     const environment = new Environment();
@@ -455,44 +503,6 @@ var BaseApplication = class {
       return files;
     }
   }
-  async _fetchResources() {
-    const { modules, filesystem } = await import(this.resourceFileURL);
-    return {
-      modules: await this._fetchObject(modules, this._fetchWebAssembly),
-      filesystem: await this._fetchObject(filesystem, this._fetchUint8Array)
-    };
-  }
-  async _fetchObject(obj, fetchFn) {
-    const promises = [];
-    for (const [key, value] of Object.entries(obj)) {
-      if (value instanceof URL) {
-        promises.push(fetchFn(value).then((fetched) => [key, fetched]));
-      } else if (typeof value === "string" || value instanceof Uint8Array) {
-        promises.push(Promise.resolve([key, value]));
-      } else {
-        promises.push(this._fetchObject(value, fetchFn).then((fetched) => [key, fetched]));
-      }
-    }
-    for (const [key, value] of await Promise.all(promises))
-      obj[key] = value;
-    return obj;
-  }
-  async _fetchUint8Array(_url) {
-    throw "not implemented";
-  }
-  async _fetchWebAssembly(_url) {
-    throw "not implemented";
-  }
-};
-
-// node_modules/@yowasp/runtime/lib/api-browser.js
-var Application = class extends BaseApplication {
-  _fetchUint8Array(url) {
-    return fetch(url).then((resp) => resp.arrayBuffer()).then((buf) => new Uint8Array(buf));
-  }
-  _fetchWebAssembly(url) {
-    return fetch(url).then(WebAssembly.compileStreaming);
-  }
 };
 
 // gen/yosys.js

package/gen/share/quicklogic/qlf_k6n10f/bram_types_sim.v

@@ -1,5 +1,5 @@
 // **AUTOGENERATED FILE** **DO NOT EDIT**
-// Generated by ../yosys-src/techlibs/quicklogic/qlf_k6n10f/generate_bram_types_sim.py at 2024-01-06 17:35:19.527610+00:00
+// Generated by ../yosys-src/techlibs/quicklogic/qlf_k6n10f/generate_bram_types_sim.py at 2024-01-07 03:38:07.613641+00:00
 `timescale 1ns /10ps
 
 module TDP36K_BRAM_A_X1_B_X1_nonsplit (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yowasp/yosys",
-  "version": "0.37.67-dev.638",
+  "version": "0.37.67-dev.640",
   "description": "Yosys Open SYnthesis Suite",
   "author": "Catherine <whitequark@whitequark.org>",
   "license": "ISC",
@@ -15,26 +15,25 @@
   "type": "module",
   "files": [
     "lib/api.d.ts",
-    "gen/bundle-*.js",
+    "gen/bundle.js",
     "gen/resources-*.js",
     "gen/*.wasm",
-    "gen/share"
+    "gen/share/"
   ],
   "exports": {
-    "node": "./gen/bundle-node.js",
-    "browser": "./gen/bundle-browser.js",
+    "default": "./gen/bundle.js",
     "types": "./lib/api.d.ts"
   },
   "types": "./lib/api.d.ts",
   "devDependencies": {
     "@bytecodealliance/jco": "0.14.2",
-    "@yowasp/runtime": "6.0.30",
+    "@yowasp/runtime": "6.0.34",
     "esbuild": "^0.19.8"
   },
   "scripts": {
-    "pack": "yowasp-pack-resources gen/resources-yosys.js gen ../yosys-build/share",
     "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/",
-    "build:node": "esbuild --bundle lib/api.js --outfile=gen/bundle-node.js --format=esm --platform=node",
-    "build:browser": "esbuild --bundle lib/api.js --outfile=gen/bundle-browser.js --format=esm --platform=browser"
+    "pack": "yowasp-pack-resources gen/resources-yosys.js gen ../yosys-build/share",
+    "build": "esbuild --bundle lib/api.js --outfile=gen/bundle.js --format=esm --platform=node",
+    "all": "npm run transpile && npm run pack && npm run build"
   }
 }