diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..898a781 --- /dev/null +++ b/Makefile @@ -0,0 +1,13 @@ +test: + make test-cjs + make test-esm + +test-cjs: + node cjs/service.cjs + node cjs/btc.cjs + node cjs/ckb.cjs + +test-esm: + node esm/service.mjs + node esm/btc.mjs + node esm/ckb.mjs diff --git a/test-build/dist/index.d.mts b/build/dist/index.d.mts similarity index 100% rename from test-build/dist/index.d.mts rename to build/dist/index.d.mts diff --git a/test-build/dist/index.d.ts b/build/dist/index.d.ts similarity index 100% rename from test-build/dist/index.d.ts rename to build/dist/index.d.ts diff --git a/test-build/dist/index.js b/build/dist/index.js similarity index 100% rename from test-build/dist/index.js rename to build/dist/index.js diff --git a/test-build/dist/index.js.map b/build/dist/index.js.map similarity index 100% rename from test-build/dist/index.js.map rename to build/dist/index.js.map diff --git a/test-build/dist/index.mjs b/build/dist/index.mjs similarity index 100% rename from test-build/dist/index.mjs rename to build/dist/index.mjs diff --git a/test-build/dist/index.mjs.map b/build/dist/index.mjs.map similarity index 100% rename from test-build/dist/index.mjs.map rename to build/dist/index.mjs.map diff --git a/test-build/src/dep.ts b/build/src/dep.ts similarity index 100% rename from test-build/src/dep.ts rename to build/src/dep.ts diff --git a/test-build/src/index.ts b/build/src/index.ts similarity index 100% rename from test-build/src/index.ts rename to build/src/index.ts diff --git a/tsconfig.json b/build/tsconfig.json similarity index 95% rename from tsconfig.json rename to build/tsconfig.json index b463688..0fbf15c 100644 --- a/tsconfig.json +++ b/build/tsconfig.json @@ -16,7 +16,7 @@ "lib": ["ESNext", "DOM"] }, "exclude": [ - "node_modules", + "../node_modules", "*/dist" ] } diff --git a/test-build/tsup.config.ts b/build/tsup.config.ts similarity index 85% rename from test-build/tsup.config.ts rename to build/tsup.config.ts index 735cb99..fa2f5ea 100644 --- a/test-build/tsup.config.ts +++ b/build/tsup.config.ts @@ -7,5 +7,5 @@ export default defineConfig({ sourcemap: true, format: ['esm', 'cjs'], entry: ['src/index.ts'], - tsconfig: '../tsconfig.json', + tsconfig: './tsconfig.json', }); diff --git a/test-import/btc.cjs b/cjs/btc.cjs similarity index 100% rename from test-import/btc.cjs rename to cjs/btc.cjs diff --git a/cjs/ckb.cjs b/cjs/ckb.cjs new file mode 100644 index 0000000..8a80d76 --- /dev/null +++ b/cjs/ckb.cjs @@ -0,0 +1,4 @@ +const { remove0x } = require('rgbpp/ckb'); + +const x = remove0x('0x0001'); +console.log(x); diff --git a/cjs/service.cjs b/cjs/service.cjs new file mode 100644 index 0000000..c15cd2b --- /dev/null +++ b/cjs/service.cjs @@ -0,0 +1,4 @@ +const { BtcAssetsApi } = require('rgbpp/service'); + +const service = BtcAssetsApi.fromToken('', '', ''); +console.log(service); diff --git a/test-import/btc.mjs b/esm/btc.mjs similarity index 100% rename from test-import/btc.mjs rename to esm/btc.mjs diff --git a/esm/build.mjs b/esm/build.mjs new file mode 100644 index 0000000..0ab28f0 --- /dev/null +++ b/esm/build.mjs @@ -0,0 +1,3 @@ +import { printVersion } from '../build/dist/index.mjs'; + +printVersion(); diff --git a/esm/ckb.mjs b/esm/ckb.mjs new file mode 100644 index 0000000..bec3fe9 --- /dev/null +++ b/esm/ckb.mjs @@ -0,0 +1,4 @@ +import { remove0x } from 'rgbpp/ckb'; + +const x = remove0x('0x0001'); +console.log(x); diff --git a/test-import/service.mjs b/esm/service.mjs similarity index 100% rename from test-import/service.mjs rename to esm/service.mjs diff --git a/package-lock.json b/package-lock.json index eb3f8fe..eb949ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,8 +8,9 @@ "name": "test-rgbpp-pure-esm", "version": "0.1.0", "dependencies": { + "@joyid/ckb": "^1.0.0", "lodash": "^4.17.21", - "rgbpp": "0.0.0-snap-20240702110120" + "rgbpp": "0.0.0-snap-20240705090030" }, "devDependencies": { "tsup": "^8.1.0", @@ -1187,6 +1188,45 @@ "node": ">=12" } }, + "node_modules/@joyid/ckb": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@joyid/ckb/-/ckb-1.0.0.tgz", + "integrity": "sha512-uJocaVSN9sBXun/ANkNohZtG8ByfC7B3PZtCrmhzEQ6etpbPa6ByGMZZubIFwjOG5i1ynPWXLvAi8CW2SKOmCw==", + "dependencies": { + "@joyid/common": "0.2.0", + "@nervosnetwork/ckb-sdk-utils": "^0.109.1", + "cross-fetch": "4.0.0", + "uncrypto": "^0.1.3" + } + }, + "node_modules/@joyid/ckb/node_modules/cross-fetch": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", + "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==", + "dependencies": { + "node-fetch": "^2.6.12" + } + }, + "node_modules/@joyid/common": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@joyid/common/-/common-0.2.0.tgz", + "integrity": "sha512-WBZtgdEccWxjiGHIoDgRFIbnC42ZvmfvFRCTxmx9D4BLvtiFdhAa+g70lUmiHwO28GjgHIHgzHRGNRdLuk81xw==", + "dependencies": { + "abitype": "0.8.7", + "type-fest": "4.6.0" + } + }, + "node_modules/@joyid/common/node_modules/type-fest": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.6.0.tgz", + "integrity": "sha512-rLjWJzQFOq4xw7MgJrCZ6T1jIOvvYElXT12r+y0CC6u67hegDHaxcPqb2fZHOGlqxugGQPNB1EnTezjBetkwkw==", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", @@ -1351,15 +1391,15 @@ } }, "node_modules/@rgbpp-sdk/btc": { - "version": "0.0.0-snap-20240702110120", - "resolved": "https://registry.npmjs.org/@rgbpp-sdk/btc/-/btc-0.0.0-snap-20240702110120.tgz", - "integrity": "sha512-WiqWE40Ko4ygNZrQkCIY3OGiCSD710CdUhWLyWn09ug5pfQQ6P36LEKoKH37nBzxjHak7LrXDrbStUrWz+LtAQ==", + "version": "0.0.0-snap-20240705090030", + "resolved": "https://registry.npmjs.org/@rgbpp-sdk/btc/-/btc-0.0.0-snap-20240705090030.tgz", + "integrity": "sha512-zxNR424JSEeTVEe2ZYeI6ESLusm+qXLR7cPt1fz5mxa5NLiidTpwtnsFf2fRSQSSDnnKWEyzpREx5UV5OWfZCw==", "dependencies": { "@bitcoinerlab/secp256k1": "^1.1.1", "@ckb-lumos/codec": "0.22.2", "@nervosnetwork/ckb-types": "^0.109.1", - "@rgbpp-sdk/ckb": "^0.0.0-snap-20240702110120", - "@rgbpp-sdk/service": "^0.0.0-snap-20240702110120", + "@rgbpp-sdk/ckb": "^0.0.0-snap-20240705090030", + "@rgbpp-sdk/service": "^0.0.0-snap-20240705090030", "bip32": "^4.0.0", "bitcoinjs-lib": "^6.1.5", "ecpair": "^2.1.0", @@ -1368,9 +1408,9 @@ } }, "node_modules/@rgbpp-sdk/ckb": { - "version": "0.0.0-snap-20240702110120", - "resolved": "https://registry.npmjs.org/@rgbpp-sdk/ckb/-/ckb-0.0.0-snap-20240702110120.tgz", - "integrity": "sha512-37DbCDJ9IKwgACFxz/3gEKPD/RvNbB0Yg4KAmf8Xn2fo1pjIcKf/mbXmiCYqylNriUrzibkmXan2NzK8mW0+UQ==", + "version": "0.0.0-snap-20240705090030", + "resolved": "https://registry.npmjs.org/@rgbpp-sdk/ckb/-/ckb-0.0.0-snap-20240705090030.tgz", + "integrity": "sha512-3sAnLsf6pzvzUPL4k2Xy5biDK4oRng0UEg1nOcVnHoL6EbffSn4oPz1HqiToSJTcDrnMs16WvP8s7ufzWVvztA==", "dependencies": { "@ckb-lumos/base": "^0.22.2", "@ckb-lumos/codec": "^0.22.2", @@ -1378,7 +1418,7 @@ "@nervosnetwork/ckb-sdk-core": "^0.109.1", "@nervosnetwork/ckb-sdk-utils": "^0.109.1", "@nervosnetwork/ckb-types": "^0.109.1", - "@rgbpp-sdk/service": "^0.0.0-snap-20240702110120", + "@rgbpp-sdk/service": "^0.0.0-snap-20240705090030", "@spore-sdk/core": "^0.2.0-beta.6", "axios": "^1.6.8", "camelcase-keys": "^7.0.2", @@ -1386,9 +1426,9 @@ } }, "node_modules/@rgbpp-sdk/service": { - "version": "0.0.0-snap-20240702110120", - "resolved": "https://registry.npmjs.org/@rgbpp-sdk/service/-/service-0.0.0-snap-20240702110120.tgz", - "integrity": "sha512-x3kE1mwB/u6d0FUato19RdUyhef2bONE7o/iribrITbxxtOc/vNLu/h0E3r4jyQ0npdWD8IHwG7uSacL4uVLbg==", + "version": "0.0.0-snap-20240705090030", + "resolved": "https://registry.npmjs.org/@rgbpp-sdk/service/-/service-0.0.0-snap-20240705090030.tgz", + "integrity": "sha512-YOYOR1weM4ifRJ37YtM6wQk5sAM4dkojOg0/Q7JcJ0OY3QM125Pfs1d2wJSgRPI181OSBKT+lJKbT4i3i3dJPQ==", "dependencies": { "@ckb-lumos/base": "0.22.2", "@ckb-lumos/codec": "0.22.2", @@ -1613,9 +1653,9 @@ } }, "node_modules/@spore-sdk/core": { - "version": "0.2.0-beta.9", - "resolved": "https://registry.npmjs.org/@spore-sdk/core/-/core-0.2.0-beta.9.tgz", - "integrity": "sha512-3X1UoVOjXNHwrucqSb3EjIZQ5xn6blyTEXyXS+n0t6v692bnQn9fjtHMIyT71u+fV6c78mtsL4pa3p7GhPYUhg==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@spore-sdk/core/-/core-0.2.0.tgz", + "integrity": "sha512-UBxpY4bQlZtJecBQ9RaUg3aPHWAWYkEbEZUTwmY3jEBeqacOdwTJE7DzI7TaAV8wGydC9JeGBABIgABoScYPeA==", "peerDependencies": { "@ckb-lumos/lumos": "0.22.0-next.5", "lodash": "^4.17.21" @@ -1651,6 +1691,20 @@ "@types/lodash": "*" } }, + "node_modules/abitype": { + "version": "0.8.7", + "resolved": "https://registry.npmjs.org/abitype/-/abitype-0.8.7.tgz", + "integrity": "sha512-wQ7hV8Yg/yKmGyFpqrNZufCxbszDe5es4AZGYPBitocfSqXtjrTG9JMWFcc4N30ukl2ve48aBTwt7NJxVQdU3w==", + "peerDependencies": { + "typescript": ">=5.0.4", + "zod": "^3 >=3.19.1" + }, + "peerDependenciesMeta": { + "zod": { + "optional": true + } + } + }, "node_modules/abort-controller": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", @@ -2798,7 +2852,6 @@ "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "peer": true, "dependencies": { "whatwg-url": "^5.0.0" }, @@ -3067,14 +3120,14 @@ } }, "node_modules/rgbpp": { - "version": "0.0.0-snap-20240702110120", - "resolved": "https://registry.npmjs.org/rgbpp/-/rgbpp-0.0.0-snap-20240702110120.tgz", - "integrity": "sha512-TISjVXM1c9pEjyBcv3X/2Z3TK+fGYofLH6BdVgU4uLGwgz1DRJAKXinnc4H6P9M6u3gHolVz3GPSj9MgIYZE3g==", + "version": "0.0.0-snap-20240705090030", + "resolved": "https://registry.npmjs.org/rgbpp/-/rgbpp-0.0.0-snap-20240705090030.tgz", + "integrity": "sha512-WbEdTNJPQE7ECWYBc9DX788fH8g3wvSqN/ymbpE37Uw9l8a999QUnEeCaGoeTPDFBvkwORWDUwb3AzkxwmMjuw==", "dependencies": { "@nervosnetwork/ckb-sdk-utils": "^0.109.1", - "@rgbpp-sdk/btc": "0.0.0-snap-20240702110120", - "@rgbpp-sdk/ckb": "0.0.0-snap-20240702110120", - "@rgbpp-sdk/service": "0.0.0-snap-20240702110120" + "@rgbpp-sdk/btc": "0.0.0-snap-20240705090030", + "@rgbpp-sdk/ckb": "0.0.0-snap-20240705090030", + "@rgbpp-sdk/service": "0.0.0-snap-20240705090030" } }, "node_modules/ripemd160": { @@ -3435,8 +3488,7 @@ "node_modules/tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "peer": true + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "node_modules/tree-kill": { "version": "1.2.2", @@ -3527,7 +3579,6 @@ "version": "5.5.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz", "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==", - "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -3536,6 +3587,11 @@ "node": ">=14.17" } }, + "node_modules/uncrypto": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/uncrypto/-/uncrypto-0.1.3.tgz", + "integrity": "sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==" + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -3561,14 +3617,12 @@ "node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "peer": true + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, "node_modules/whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "peer": true, "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -3598,9 +3652,9 @@ } }, "node_modules/wif/node_modules/base-x": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.9.tgz", - "integrity": "sha512-H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ==", + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz", + "integrity": "sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==", "dependencies": { "safe-buffer": "^5.0.1" } diff --git a/package.json b/package.json index 9ed788d..1cbf6cc 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,9 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "dependencies": { + "@joyid/ckb": "^1.0.0", "lodash": "^4.17.21", - "rgbpp": "0.0.0-snap-20240702110120" + "rgbpp": "0.0.0-snap-20240705090030" }, "devDependencies": { "tsup": "^8.1.0", diff --git a/test-import/build.mjs b/test-import/build.mjs deleted file mode 100644 index 91bcdf4..0000000 --- a/test-import/build.mjs +++ /dev/null @@ -1,3 +0,0 @@ -import { printVersion } from '../test-build/dist/index.mjs'; - -printVersion(); diff --git a/test-import/ckb.mjs b/test-import/ckb.mjs deleted file mode 100644 index 291d629..0000000 --- a/test-import/ckb.mjs +++ /dev/null @@ -1,11 +0,0 @@ -import { remove0x } from 'rgbpp/ckb'; - -/*const hex = serializeScript({ - codeHash: '0x' + '0'.repeat(64), - hashType: 'data', - args: '0x01' -}); -console.log(hex);*/ - -const x = remove0x('0x0001'); -console.log(x);