@bitgo/wasm-utxo 1.2.0 → 1.4.0

package/dist/{browser/js → cjs}/address.d.ts

@@ -1,4 +1,4 @@
-import type { CoinName } from "./coinName";
+import type { CoinName } from "./coinName.js";
 /**
  * Most coins only have one unambiguous address format (base58check and bech32/bech32m)
  * For Bitcoin Cash and eCash, we can select between base58check and cashaddr.

package/dist/{node/js → cjs}/address.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toOutputScriptWithCoin = toOutputScriptWithCoin;
 exports.fromOutputScriptWithCoin = fromOutputScriptWithCoin;
-const wasm_utxo_1 = require("./wasm/wasm_utxo");
+const wasm_utxo_js_1 = require("./wasm/wasm_utxo.js");
 function toOutputScriptWithCoin(address, coin) {
-    return wasm_utxo_1.AddressNamespace.to_output_script_with_coin(address, coin);
+    return wasm_utxo_js_1.AddressNamespace.to_output_script_with_coin(address, coin);
 }
 function fromOutputScriptWithCoin(script, coin, format) {
-    return wasm_utxo_1.AddressNamespace.from_output_script_with_coin(script, coin, format);
+    return wasm_utxo_js_1.AddressNamespace.from_output_script_with_coin(script, coin, format);
 }

package/dist/{browser/js → cjs}/ast/fromWasmNode.d.ts

@@ -1,4 +1,4 @@
-import { DescriptorNode, MiniscriptNode } from "./formatNode";
-import { Descriptor, Miniscript } from "../index";
+import { DescriptorNode, MiniscriptNode } from "./formatNode.js";
+import { Descriptor, Miniscript } from "../index.js";
 export declare function fromDescriptor(d: Descriptor): DescriptorNode;
 export declare function fromMiniscript(m: Miniscript): MiniscriptNode;

package/dist/cjs/ast/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./formatNode.js";
+export * from "./fromWasmNode.js";

package/dist/{node/js → cjs}/ast/index.js

@@ -14,5 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./formatNode"), exports);
-__exportStar(require("./fromWasmNode"), exports);
+__exportStar(require("./formatNode.js"), exports);
+__exportStar(require("./fromWasmNode.js"), exports);

package/dist/{node/js → cjs}/fixedScriptWallet.d.ts

@@ -1,7 +1,7 @@
-import type { UtxolibName, UtxolibNetwork, UtxolibRootWalletKeys } from "./utxolibCompat";
-import type { CoinName } from "./coinName";
-import { Triple } from "./triple";
-import { AddressFormat } from "./address";
+import type { UtxolibName, UtxolibNetwork, UtxolibRootWalletKeys } from "./utxolibCompat.js";
+import type { CoinName } from "./coinName.js";
+import { Triple } from "./triple.js";
+import { AddressFormat } from "./address.js";
 export type NetworkName = UtxolibName | CoinName;
 export type WalletKeys = 
 /** Just an xpub triple, will assume default derivation prefixes  */

package/dist/{node/js → cjs}/fixedScriptWallet.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BitGoPsbt = void 0;
 exports.outputScript = outputScript;
 exports.address = address;
-const wasm_utxo_1 = require("./wasm/wasm_utxo");
+const wasm_utxo_js_1 = require("./wasm/wasm_utxo.js");
 /**
  * Create the output script for a given wallet keys and chain and index
  */
 function outputScript(keys, chain, index, network) {
-    return wasm_utxo_1.FixedScriptWalletNamespace.output_script(keys, chain, index, network);
+    return wasm_utxo_js_1.FixedScriptWalletNamespace.output_script(keys, chain, index, network);
 }
 /**
  * Create the address for a given wallet keys and chain and index and network.
@@ -23,9 +23,9 @@ function outputScript(keys, chain, index, network) {
  *   - "cashaddr" means cashaddr.
  */
 function address(keys, chain, index, network, addressFormat) {
-    return wasm_utxo_1.FixedScriptWalletNamespace.address(keys, chain, index, network, addressFormat);
+    return wasm_utxo_js_1.FixedScriptWalletNamespace.address(keys, chain, index, network, addressFormat);
 }
-const wasm_utxo_2 = require("./wasm/wasm_utxo");
+const wasm_utxo_js_2 = require("./wasm/wasm_utxo.js");
 class BitGoPsbt {
     wasm;
     constructor(wasm) {
@@ -38,7 +38,7 @@ class BitGoPsbt {
      * @returns A BitGoPsbt instance
      */
     static fromBytes(bytes, network) {
-        const wasm = wasm_utxo_2.BitGoPsbt.from_bytes(bytes, network);
+        const wasm = wasm_utxo_js_2.BitGoPsbt.from_bytes(bytes, network);
         return new BitGoPsbt(wasm);
     }
     /**

package/dist/{node/js → cjs}/index.d.ts

@@ -1,16 +1,16 @@
-export * as address from "./address";
-export * as ast from "./ast";
-export * as utxolibCompat from "./utxolibCompat";
-export * as fixedScriptWallet from "./fixedScriptWallet";
-export type { CoinName } from "./coinName";
-export type { Triple } from "./triple";
-export type { AddressFormat } from "./address";
+export * as address from "./address.js";
+export * as ast from "./ast/index.js";
+export * as utxolibCompat from "./utxolibCompat.js";
+export * as fixedScriptWallet from "./fixedScriptWallet.js";
+export type { CoinName } from "./coinName.js";
+export type { Triple } from "./triple.js";
+export type { AddressFormat } from "./address.js";
 export type DescriptorPkType = "derivable" | "definite" | "string";
 export type ScriptContext = "tap" | "segwitv0" | "legacy";
 export type SignPsbtResult = {
     [inputIndex: number]: [pubkey: string][];
 };
-declare module "./wasm/wasm_utxo" {
+declare module "./wasm/wasm_utxo.js" {
     interface WrapDescriptor {
         /** These are not the same types of nodes as in the ast module */
         node(): unknown;
@@ -32,6 +32,6 @@ declare module "./wasm/wasm_utxo" {
         signWithPrv(this: WrapPsbt, prv: Uint8Array): SignPsbtResult;
     }
 }
-export { WrapDescriptor as Descriptor } from "./wasm/wasm_utxo";
-export { WrapMiniscript as Miniscript } from "./wasm/wasm_utxo";
-export { WrapPsbt as Psbt } from "./wasm/wasm_utxo";
+export { WrapDescriptor as Descriptor } from "./wasm/wasm_utxo.js";
+export { WrapMiniscript as Miniscript } from "./wasm/wasm_utxo.js";
+export { WrapPsbt as Psbt } from "./wasm/wasm_utxo.js";

package/dist/{node/js → cjs}/index.js

@@ -34,17 +34,17 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Psbt = exports.Miniscript = exports.Descriptor = exports.fixedScriptWallet = exports.utxolibCompat = exports.ast = exports.address = void 0;
-const wasm = __importStar(require("./wasm/wasm_utxo"));
+const wasm = __importStar(require("./wasm/wasm_utxo.js"));
 // we need to access the wasm module here, otherwise webpack gets all weird
 // and forgets to include it in the bundle
 void wasm;
-exports.address = __importStar(require("./address"));
-exports.ast = __importStar(require("./ast"));
-exports.utxolibCompat = __importStar(require("./utxolibCompat"));
-exports.fixedScriptWallet = __importStar(require("./fixedScriptWallet"));
-var wasm_utxo_1 = require("./wasm/wasm_utxo");
-Object.defineProperty(exports, "Descriptor", { enumerable: true, get: function () { return wasm_utxo_1.WrapDescriptor; } });
-var wasm_utxo_2 = require("./wasm/wasm_utxo");
-Object.defineProperty(exports, "Miniscript", { enumerable: true, get: function () { return wasm_utxo_2.WrapMiniscript; } });
-var wasm_utxo_3 = require("./wasm/wasm_utxo");
-Object.defineProperty(exports, "Psbt", { enumerable: true, get: function () { return wasm_utxo_3.WrapPsbt; } });
+exports.address = __importStar(require("./address.js"));
+exports.ast = __importStar(require("./ast/index.js"));
+exports.utxolibCompat = __importStar(require("./utxolibCompat.js"));
+exports.fixedScriptWallet = __importStar(require("./fixedScriptWallet.js"));
+var wasm_utxo_js_1 = require("./wasm/wasm_utxo.js");
+Object.defineProperty(exports, "Descriptor", { enumerable: true, get: function () { return wasm_utxo_js_1.WrapDescriptor; } });
+var wasm_utxo_js_2 = require("./wasm/wasm_utxo.js");
+Object.defineProperty(exports, "Miniscript", { enumerable: true, get: function () { return wasm_utxo_js_2.WrapMiniscript; } });
+var wasm_utxo_js_3 = require("./wasm/wasm_utxo.js");
+Object.defineProperty(exports, "Psbt", { enumerable: true, get: function () { return wasm_utxo_js_3.WrapPsbt; } });

package/dist/cjs/package.json

@@ -0,0 +1 @@
+{"type":"commonjs"}

package/dist/{browser/js → cjs}/utxolibCompat.d.ts

@@ -1,5 +1,5 @@
-import type { AddressFormat } from "./address";
-import { Triple } from "./triple";
+import type { AddressFormat } from "./address.js";
+import { Triple } from "./triple.js";
 export type UtxolibName = "bitcoin" | "testnet" | "bitcoinTestnet4" | "bitcoinPublicSignet" | "bitcoinBitGoSignet" | "bitcoincash" | "bitcoincashTestnet" | "ecash" | "ecashTest" | "bitcoingold" | "bitcoingoldTestnet" | "bitcoinsv" | "bitcoinsvTestnet" | "dash" | "dashTest" | "dogecoin" | "dogecoinTest" | "litecoin" | "litecoinTest" | "zcash" | "zcashTest";
 export type BIP32Interface = {
     network: {

package/dist/{node/js → cjs}/utxolibCompat.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fromOutputScript = fromOutputScript;
 exports.toOutputScript = toOutputScript;
-const wasm_utxo_1 = require("./wasm/wasm_utxo");
+const wasm_utxo_js_1 = require("./wasm/wasm_utxo.js");
 function fromOutputScript(script, network, format) {
-    return wasm_utxo_1.UtxolibCompatNamespace.from_output_script(script, network, format);
+    return wasm_utxo_js_1.UtxolibCompatNamespace.from_output_script(script, network, format);
 }
 function toOutputScript(address, network, format) {
-    return wasm_utxo_1.UtxolibCompatNamespace.to_output_script(address, network, format);
+    return wasm_utxo_js_1.UtxolibCompatNamespace.to_output_script(address, network, format);
 }

package/dist/{node/js → esm}/address.d.ts

@@ -1,4 +1,4 @@
-import type { CoinName } from "./coinName";
+import type { CoinName } from "./coinName.js";
 /**
  * Most coins only have one unambiguous address format (base58check and bech32/bech32m)
  * For Bitcoin Cash and eCash, we can select between base58check and cashaddr.

package/dist/{browser/js → esm}/address.js

@@ -1,4 +1,4 @@
-import { AddressNamespace } from "./wasm/wasm_utxo";
+import { AddressNamespace } from "./wasm/wasm_utxo.js";
 export function toOutputScriptWithCoin(address, coin) {
     return AddressNamespace.to_output_script_with_coin(address, coin);
 }

package/dist/{node/js → esm}/ast/fromWasmNode.d.ts

@@ -1,4 +1,4 @@
-import { DescriptorNode, MiniscriptNode } from "./formatNode";
-import { Descriptor, Miniscript } from "../index";
+import { DescriptorNode, MiniscriptNode } from "./formatNode.js";
+import { Descriptor, Miniscript } from "../index.js";
 export declare function fromDescriptor(d: Descriptor): DescriptorNode;
 export declare function fromMiniscript(m: Miniscript): MiniscriptNode;

package/dist/esm/ast/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./formatNode.js";
+export * from "./fromWasmNode.js";

package/dist/esm/ast/index.js

@@ -0,0 +1,2 @@
+export * from "./formatNode.js";
+export * from "./fromWasmNode.js";

package/dist/{browser/js → esm}/fixedScriptWallet.d.ts

@@ -1,7 +1,7 @@
-import type { UtxolibName, UtxolibNetwork, UtxolibRootWalletKeys } from "./utxolibCompat";
-import type { CoinName } from "./coinName";
-import { Triple } from "./triple";
-import { AddressFormat } from "./address";
+import type { UtxolibName, UtxolibNetwork, UtxolibRootWalletKeys } from "./utxolibCompat.js";
+import type { CoinName } from "./coinName.js";
+import { Triple } from "./triple.js";
+import { AddressFormat } from "./address.js";
 export type NetworkName = UtxolibName | CoinName;
 export type WalletKeys = 
 /** Just an xpub triple, will assume default derivation prefixes  */

package/dist/{browser/js → esm}/fixedScriptWallet.js

@@ -1,4 +1,4 @@
-import { FixedScriptWalletNamespace } from "./wasm/wasm_utxo";
+import { FixedScriptWalletNamespace } from "./wasm/wasm_utxo.js";
 /**
  * Create the output script for a given wallet keys and chain and index
  */
@@ -20,8 +20,9 @@ export function outputScript(keys, chain, index, network) {
 export function address(keys, chain, index, network, addressFormat) {
     return FixedScriptWalletNamespace.address(keys, chain, index, network, addressFormat);
 }
-import { BitGoPsbt as WasmBitGoPsbt } from "./wasm/wasm_utxo";
+import { BitGoPsbt as WasmBitGoPsbt } from "./wasm/wasm_utxo.js";
 export class BitGoPsbt {
+    wasm;
     constructor(wasm) {
         this.wasm = wasm;
     }

package/dist/{browser/js → esm}/index.d.ts

@@ -1,16 +1,16 @@
-export * as address from "./address";
-export * as ast from "./ast";
-export * as utxolibCompat from "./utxolibCompat";
-export * as fixedScriptWallet from "./fixedScriptWallet";
-export type { CoinName } from "./coinName";
-export type { Triple } from "./triple";
-export type { AddressFormat } from "./address";
+export * as address from "./address.js";
+export * as ast from "./ast/index.js";
+export * as utxolibCompat from "./utxolibCompat.js";
+export * as fixedScriptWallet from "./fixedScriptWallet.js";
+export type { CoinName } from "./coinName.js";
+export type { Triple } from "./triple.js";
+export type { AddressFormat } from "./address.js";
 export type DescriptorPkType = "derivable" | "definite" | "string";
 export type ScriptContext = "tap" | "segwitv0" | "legacy";
 export type SignPsbtResult = {
     [inputIndex: number]: [pubkey: string][];
 };
-declare module "./wasm/wasm_utxo" {
+declare module "./wasm/wasm_utxo.js" {
     interface WrapDescriptor {
         /** These are not the same types of nodes as in the ast module */
         node(): unknown;
@@ -32,6 +32,6 @@ declare module "./wasm/wasm_utxo" {
         signWithPrv(this: WrapPsbt, prv: Uint8Array): SignPsbtResult;
     }
 }
-export { WrapDescriptor as Descriptor } from "./wasm/wasm_utxo";
-export { WrapMiniscript as Miniscript } from "./wasm/wasm_utxo";
-export { WrapPsbt as Psbt } from "./wasm/wasm_utxo";
+export { WrapDescriptor as Descriptor } from "./wasm/wasm_utxo.js";
+export { WrapMiniscript as Miniscript } from "./wasm/wasm_utxo.js";
+export { WrapPsbt as Psbt } from "./wasm/wasm_utxo.js";

package/dist/esm/index.js

@@ -0,0 +1,11 @@
+import * as wasm from "./wasm/wasm_utxo.js";
+// we need to access the wasm module here, otherwise webpack gets all weird
+// and forgets to include it in the bundle
+void wasm;
+export * as address from "./address.js";
+export * as ast from "./ast/index.js";
+export * as utxolibCompat from "./utxolibCompat.js";
+export * as fixedScriptWallet from "./fixedScriptWallet.js";
+export { WrapDescriptor as Descriptor } from "./wasm/wasm_utxo.js";
+export { WrapMiniscript as Miniscript } from "./wasm/wasm_utxo.js";
+export { WrapPsbt as Psbt } from "./wasm/wasm_utxo.js";

package/dist/{node/js → esm}/utxolibCompat.d.ts

@@ -1,5 +1,5 @@
-import type { AddressFormat } from "./address";
-import { Triple } from "./triple";
+import type { AddressFormat } from "./address.js";
+import { Triple } from "./triple.js";
 export type UtxolibName = "bitcoin" | "testnet" | "bitcoinTestnet4" | "bitcoinPublicSignet" | "bitcoinBitGoSignet" | "bitcoincash" | "bitcoincashTestnet" | "ecash" | "ecashTest" | "bitcoingold" | "bitcoingoldTestnet" | "bitcoinsv" | "bitcoinsvTestnet" | "dash" | "dashTest" | "dogecoin" | "dogecoinTest" | "litecoin" | "litecoinTest" | "zcash" | "zcashTest";
 export type BIP32Interface = {
     network: {

package/dist/{browser/js → esm}/utxolibCompat.js

@@ -1,4 +1,4 @@
-import { UtxolibCompatNamespace } from "./wasm/wasm_utxo";
+import { UtxolibCompatNamespace } from "./wasm/wasm_utxo.js";
 export function fromOutputScript(script, network, format) {
     return UtxolibCompatNamespace.from_output_script(script, network, format);
 }

package/package.json

@@ -1,77 +1,51 @@
 {
   "name": "@bitgo/wasm-utxo",
   "description": "WebAssembly wrapper for rust-bitcoin (beta)",
-  "version": "1.2.0",
+  "version": "1.4.0",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/BitGo/BitGoWASM"
   },
   "license": "MIT",
   "files": [
-    "dist/*/js/wasm/wasm_utxo.d.ts",
-    "dist/*/js/wasm/wasm_utxo.js",
-    "dist/*/js/wasm/wasm_utxo_bg.js",
-    "dist/*/js/wasm/wasm_utxo_bg.wasm",
-    "dist/*/js/wasm/wasm_utxo_bg.wasm.d.ts",
-    "dist/*/js/ast/*",
-    "dist/*/js/index.*",
-    "dist/*/js/address.*",
-    "dist/*/js/utxolibCompat.*",
-    "dist/*/js/fixedScriptWallet.*",
-    "dist/*/js/coinName.*",
-    "dist/*/js/triple.*"
+    "dist/esm/**/*",
+    "dist/cjs/**/*"
   ],
-  "main": "dist/node/js/index.js",
-  "types": "dist/node/js/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/node/js/index.d.ts",
-      "browser": "./dist/browser/js/index.js",
-      "default": "./dist/node/js/index.js"
-    },
-    "./address": {
-      "types": "./dist/node/js/address.d.ts",
-      "browser": "./dist/browser/js/address.js",
-      "default": "./dist/node/js/address.js"
-    },
-    "./ast": {
-      "types": "./dist/node/js/ast/index.d.ts",
-      "browser": "./dist/browser/js/ast/index.js",
-      "default": "./dist/node/js/ast/index.js"
-    },
-    "./fixedScriptWallet": {
-      "types": "./dist/node/js/fixedScriptWallet.d.ts",
-      "browser": "./dist/browser/js/fixedScriptWallet.js",
-      "default": "./dist/node/js/fixedScriptWallet.js"
-    },
-    "./utxolibCompat": {
-      "types": "./dist/node/js/utxolibCompat.d.ts",
-      "browser": "./dist/browser/js/utxolibCompat.js",
-      "default": "./dist/node/js/utxolibCompat.js"
-    },
-    "./dist/browser/js/wasm/wasm_utxo_bg.js": "./dist/browser/js/wasm/wasm_utxo_bg.js",
-    "./dist/browser/js/wasm/wasm_utxo_bg.wasm": "./dist/browser/js/wasm/wasm_utxo_bg.wasm",
-    "./dist/node/js/wasm/wasm_utxo_bg.js": "./dist/node/js/wasm/wasm_utxo_bg.js",
-    "./dist/node/js/wasm/wasm_utxo_bg.wasm": "./dist/node/js/wasm/wasm_utxo_bg.wasm"
+      "import": {
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
+    }
   },
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
+  "types": "./dist/esm/index.d.ts",
   "sideEffects": [
-    "./dist/node/js/wasm/wasm_utxo.js",
-    "./dist/browser/js/wasm/wasm_utxo.js"
+    "./dist/esm/wasm/wasm_utxo.js",
+    "./dist/cjs/wasm/wasm_utxo.js"
   ],
-  "browser": {
-    "./dist/node/js/index.js": "./dist/browser/js/index.js"
-  },
   "scripts": {
     "test": "npm run test:mocha && npm run test:wasm-pack",
     "test:mocha": "mocha --recursive test",
     "test:wasm-pack": "npm run test:wasm-pack-node && npm run test:wasm-pack-chrome",
     "test:wasm-pack-node": "wasm-pack test --node",
     "test:wasm-pack-chrome": "wasm-pack test --headless --chrome",
-    "build:wasm": "make js/wasm/ && make dist/node/js/wasm/ && make dist/browser/js/wasm/",
-    "build:ts-browser": "tsc --noEmit false --module es2020 --target es2020 --outDir dist/browser",
-    "build:ts-node": "tsc --noEmit false --outDir dist/node",
-    "build:ts": "npm run build:ts-browser && npm run build:ts-node",
-    "build": "npm run build:wasm && npm run build:ts",
+    "test:esm-import": "node --experimental-wasm-modules bundler-test/test-esm-import.mjs",
+    "test:cjs-import": "node bundler-test/test-cjs-import.cjs",
+    "test:imports": "npm run test:esm-import && npm run test:cjs-import",
+    "build:wasm": "make js/wasm/ && make dist/esm/wasm/ && make dist/cjs/wasm/",
+    "build:ts-esm": "tsc",
+    "build:ts-cjs": "tsc --project tsconfig.cjs.json",
+    "build:ts": "npm run build:ts-esm && npm run build:ts-cjs",
+    "build:package-json": "echo '{\"type\":\"commonjs\"}' > dist/cjs/package.json",
+    "build": "npm run build:wasm && npm run build:ts && npm run build:package-json",
     "check-fmt": "prettier --check . && cargo fmt -- --check"
   },
   "devDependencies": {

package/dist/browser/js/ast/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./formatNode";
-export * from "./fromWasmNode";

package/dist/browser/js/ast/index.js

@@ -1,2 +0,0 @@
-export * from "./formatNode";
-export * from "./fromWasmNode";

package/dist/browser/js/index.js

@@ -1,11 +0,0 @@
-import * as wasm from "./wasm/wasm_utxo";
-// we need to access the wasm module here, otherwise webpack gets all weird
-// and forgets to include it in the bundle
-void wasm;
-export * as address from "./address";
-export * as ast from "./ast";
-export * as utxolibCompat from "./utxolibCompat";
-export * as fixedScriptWallet from "./fixedScriptWallet";
-export { WrapDescriptor as Descriptor } from "./wasm/wasm_utxo";
-export { WrapMiniscript as Miniscript } from "./wasm/wasm_utxo";
-export { WrapPsbt as Psbt } from "./wasm/wasm_utxo";

package/dist/node/js/ast/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./formatNode";
-export * from "./fromWasmNode";