@yowasp/yosys 0.0.0-experimental2 → 0.0.0-experimental4

package/gen/bundle-browser.js

@@ -366,23 +366,23 @@ var BaseApplication = class {
         throw e;
     }
     for (const dirName of Object.keys(this._resources))
-      delete environment.root[dirName];
+      delete environment.root.files[dirName];
     return directoryIntoTree(environment.root);
   }
 };
 
 // node_modules/@yowasp/runtime/lib/api-browser.js
 var Application = class extends BaseApplication {
-  constructor(baseURL2, resourceFilenames, wasmFilenames, instantiate2, argv0) {
+  constructor(baseURL, resourceFilenames, wasmFilenames, instantiate2, argv0) {
     async function getResources() {
       const resources = {};
       for (const [dirName, jsonFilename] of Object.entries(resourceFilenames))
-        resources[dirName] = await fetch(new URL(jsonFilename, baseURL2)).then((resp) => resp.json());
+        resources[dirName] = await fetch(new URL(jsonFilename, baseURL)).then((resp) => resp.json());
       return resources;
     }
     const wasmModules = {};
     for (const [modName, wasmFilename] of Object.entries(wasmFilenames))
-      wasmModules[modName] = fetch(new URL(wasmFilename, baseURL2)).then(WebAssembly.compileStreaming);
+      wasmModules[modName] = fetch(new URL(wasmFilename, baseURL)).then(WebAssembly.compileStreaming);
     super(getResources, wasmModules, instantiate2, argv0);
   }
 };
@@ -4537,9 +4537,7 @@ async function instantiate(getCoreModule, imports, instantiateCore = WebAssembly
 }
 
 // lib/api.js
-var baseURL = "https://unpkg.com/@yowasp/yosys@0.0.0-experimental2/gen/bundle-browser.js";
-console.log("baseURL", baseURL);
-var yosys = new Application(baseURL, {
+var yosys = new Application(import.meta.url, {
   "share": "./yosys-share.json"
 }, {
   "yosys.core.wasm": "./yosys.core.wasm",

package/gen/bundle-node.js

@@ -369,23 +369,23 @@ var BaseApplication = class {
         throw e;
     }
     for (const dirName of Object.keys(this._resources))
-      delete environment.root[dirName];
+      delete environment.root.files[dirName];
     return directoryIntoTree(environment.root);
   }
 };
 
 // node_modules/@yowasp/runtime/lib/api-node.js
 var Application = class extends BaseApplication {
-  constructor(baseURL2, resourceFilenames, wasmFilenames, instantiate2, argv0) {
+  constructor(baseURL, resourceFilenames, wasmFilenames, instantiate2, argv0) {
     async function getResources() {
       const resources = {};
       for (const [dirName, jsonFilename] of Object.entries(resourceFilenames))
-        resources[dirName] = JSON.parse(await readFile(new URL(jsonFilename, baseURL2)));
+        resources[dirName] = JSON.parse(await readFile(new URL(jsonFilename, baseURL)));
       return resources;
     }
     const wasmModules = {};
     for (const [modName, wasmFilename] of Object.entries(wasmFilenames))
-      wasmModules[modName] = readFile(new URL(wasmFilename, baseURL2)).then(WebAssembly.compile);
+      wasmModules[modName] = readFile(new URL(wasmFilename, baseURL)).then(WebAssembly.compile);
     super(getResources, wasmModules, instantiate2, argv0);
   }
 };
@@ -4540,9 +4540,7 @@ async function instantiate(getCoreModule, imports, instantiateCore = WebAssembly
 }
 
 // lib/api.js
-var baseURL = import.meta.url;
-console.log("baseURL", baseURL);
-var yosys = new Application(baseURL, {
+var yosys = new Application(import.meta.url, {
   "share": "./yosys-share.json"
 }, {
   "yosys.core.wasm": "./yosys.core.wasm",

package/package.json

@@ -1 +1 @@
-{"name": "@yowasp/yosys", "version": "0.0.0-experimental2", "description": "Yosys Open SYnthesis Suite", "author": "Catherine <whitequark@whitequark.org>", "license": "ISC", "homepage": "https://yowasp.org/", "repository": {"type": "git", "url": "git+https://github.com/YoWASP/yosys.git"}, "bugs": {"url": "https://github.com/YoWASP/yosys/issues"}, "type": "module", "files": ["gen/*.json", "gen/*.wasm", "gen/bundle-*.js"], "exports": {"node": "./gen/bundle-node.js", "browser": "./gen/bundle-browser.js"}, "dependencies": {"@yowasp/runtime": "../../runtime-js"}, "devDependencies": {"@bytecodealliance/jco": "^0.14.1", "esbuild": "^0.19.8"}, "scripts": {"pack": "yowasp-pack-resources ../yosys-build/share gen/yosys-share.json", "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' --out-dir gen/", "build:node": "esbuild --bundle lib/api.js --outfile=gen/bundle-node.js --format=esm --platform=node --define:BASE_URL=null", "build:browser": "esbuild --bundle lib/api.js --outfile=gen/bundle-browser.js --format=esm --platform=browser --define:BASE_URL=\\\"https://unpkg.com/@yowasp/yosys@0.0.0-experimental2/gen/bundle-browser.js\\\""}}
+{"name": "@yowasp/yosys", "version": "0.0.0-experimental4", "description": "Yosys Open SYnthesis Suite", "author": "Catherine <whitequark@whitequark.org>", "license": "ISC", "homepage": "https://yowasp.org/", "repository": {"type": "git", "url": "git+https://github.com/YoWASP/yosys.git"}, "bugs": {"url": "https://github.com/YoWASP/yosys/issues"}, "type": "module", "files": ["gen/*.json", "gen/*.wasm", "gen/bundle-*.js"], "exports": {"node": "./gen/bundle-node.js", "browser": "./gen/bundle-browser.js"}, "dependencies": {"@yowasp/runtime": "^2.0.7"}, "devDependencies": {"@bytecodealliance/jco": "^0.14.1", "esbuild": "^0.19.8"}, "scripts": {"pack": "yowasp-pack-resources ../yosys-build/share gen/yosys-share.json", "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' --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"}}