From 77199fe2261355f9c24fa06ab6aa5aad419e649a Mon Sep 17 00:00:00 2001 From: Travis Vachon Date: Wed, 10 Apr 2024 23:32:46 -0700 Subject: [PATCH] fix: look for the correct capability in `client.capability.upload.get` (#1357) I was seeing some strange errors in the nft.storage work I'm doing right now and realized it's a result of a copypasta bug in `upload-client` where we query for the wrong capability when putting together this invocation. We missed this in testing because tests use one big proof, which means that asking for `upload/add` is equivalent to asking for `upload/get` - in an ideal world I'd spend a bit of time untangling this but since I'm at the bottom of a stack of shaved yaks I'd like to get this shipped and file an issue to come back to this later. --- package.json | 2 +- packages/w3up-client/src/capability/upload.js | 2 +- pnpm-lock.yaml | 106 +++++++++--------- 3 files changed, 53 insertions(+), 57 deletions(-) diff --git a/package.json b/package.json index 7a6e512ab..fa853f1d1 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "docs:markdown": "pnpm run build && docusaurus generate-typedoc" }, "devDependencies": { - "@arethetypeswrong/cli": "^0.12.2", + "@arethetypeswrong/cli": "^0.15.3", "@docusaurus/core": "^3.0.0", "@docusaurus/preset-classic": "^3.0.0", "docusaurus-plugin-typedoc": "^0.21.0", diff --git a/packages/w3up-client/src/capability/upload.js b/packages/w3up-client/src/capability/upload.js index 976a71b34..c9d9b3e72 100644 --- a/packages/w3up-client/src/capability/upload.js +++ b/packages/w3up-client/src/capability/upload.js @@ -26,7 +26,7 @@ export class UploadClient extends Base { * @param {import('../types.js').RequestOptions} [options] */ async get(root, options = {}) { - const conf = await this._invocationConfig([UploadCapabilities.add.can]) + const conf = await this._invocationConfig([UploadCapabilities.get.can]) options.connection = this._serviceConf.upload return Upload.get(conf, root, options) } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5ca039474..1886aeefb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '6.1' +lockfileVersion: '6.0' settings: autoInstallPeers: true @@ -16,8 +16,8 @@ importers: version: 2.1.0(typedoc@0.25.3) devDependencies: '@arethetypeswrong/cli': - specifier: ^0.12.2 - version: 0.12.2 + specifier: ^0.15.3 + version: 0.15.3 '@docusaurus/core': specifier: ^3.0.0 version: 3.0.0(@docusaurus/types@3.0.0)(react@18.2.0)(typescript@5.2.2) @@ -783,33 +783,30 @@ packages: resolution: {integrity: sha512-Jh15/qVmrLGhkKJBdXlK1+9tY4lZruYjsgkDFj08ZmDiWVBLJcqkok7Z0/R0In+i1rScBpJlSvrTS2Lm41Pbnw==} dev: true - /@arethetypeswrong/cli@0.12.2: - resolution: {integrity: sha512-SE4Rqy8LM8zgRLeVXZqFIOg4w4TCDG2AMguuZDDRcrUmVQj7phW0tWJnKwsZtyJ6SdqXTIzWvGYiUJiHg2hb9w==} + /@arethetypeswrong/cli@0.15.3: + resolution: {integrity: sha512-sIMA9ZJBWDEg1+xt5RkAEflZuf8+PO8SdKj17x6PtETuUho+qlZJg4DgmKc3q+QwQ9zOB5VLK6jVRbFdNLdUIA==} + engines: {node: '>=18'} hasBin: true dependencies: - '@arethetypeswrong/core': 0.12.2 + '@arethetypeswrong/core': 0.15.1 chalk: 4.1.2 cli-table3: 0.6.3 commander: 10.0.1 - marked: 5.1.2 - marked-terminal: 5.2.0(marked@5.1.2) - node-fetch: 2.7.0 + marked: 9.1.6 + marked-terminal: 6.2.0(marked@9.1.6) semver: 7.5.4 - transitivePeerDependencies: - - encoding dev: true - /@arethetypeswrong/core@0.12.2: - resolution: {integrity: sha512-ez/quGfC6RVg7VrwCgMVreJ01jbkfJQRNxOG7Bpl4YGcPRs45ZE1AzpHiIdzqfwFg9EBVSaewaffrsK5MVbALw==} + /@arethetypeswrong/core@0.15.1: + resolution: {integrity: sha512-FYp6GBAgsNz81BkfItRz8RLZO03w5+BaeiPma1uCfmxTnxbtuMrI/dbzGiOk8VghO108uFI0oJo0OkewdSHw7g==} + engines: {node: '>=18'} dependencies: '@andrewbranch/untar.js': 1.0.3 - fetch-ponyfill: 7.1.0 - fflate: 0.7.4 + fflate: 0.8.2 semver: 7.5.4 - typescript: 5.2.2 + ts-expose-internals-conditionally: 1.0.0-empty.0 + typescript: 5.3.3 validate-npm-package-name: 5.0.0 - transitivePeerDependencies: - - encoding dev: true /@arr/every@1.0.1: @@ -3573,6 +3570,11 @@ packages: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} dev: true + /@sindresorhus/is@4.6.0: + resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==} + engines: {node: '>=10'} + dev: true + /@sindresorhus/is@5.6.0: resolution: {integrity: sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==} engines: {node: '>=14.16'} @@ -6888,16 +6890,8 @@ packages: xml-js: 1.6.11 dev: true - /fetch-ponyfill@7.1.0: - resolution: {integrity: sha512-FhbbL55dj/qdVO3YNK7ZEkshvj3eQ7EuIGV2I6ic/2YiocvyWv+7jg2s4AyS0wdRU75s3tA8ZxI/xPigb0v5Aw==} - dependencies: - node-fetch: 2.6.13 - transitivePeerDependencies: - - encoding - dev: true - - /fflate@0.7.4: - resolution: {integrity: sha512-5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw==} + /fflate@0.8.2: + resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==} dev: true /file-entry-cache@6.0.1: @@ -8812,19 +8806,19 @@ packages: resolution: {integrity: sha512-Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw==} dev: true - /marked-terminal@5.2.0(marked@5.1.2): - resolution: {integrity: sha512-Piv6yNwAQXGFjZSaiNljyNFw7jKDdGrw70FSbtxEyldLsyeuV5ZHm/1wW++kWbrOF1VPnUgYOhB2oLL0ZpnekA==} - engines: {node: '>=14.13.1 || >=16.0.0'} + /marked-terminal@6.2.0(marked@9.1.6): + resolution: {integrity: sha512-ubWhwcBFHnXsjYNsu+Wndpg0zhY4CahSpPlA70PlO0rR9r2sZpkyU+rkCsOWH+KMEkx847UpALON+HWgxowFtw==} + engines: {node: '>=16.0.0'} peerDependencies: - marked: ^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 + marked: '>=1 <12' dependencies: ansi-escapes: 6.2.0 cardinal: 2.1.1 chalk: 5.3.0 cli-table3: 0.6.3 - marked: 5.1.2 - node-emoji: 1.11.0 - supports-hyperlinks: 2.3.0 + marked: 9.1.6 + node-emoji: 2.1.3 + supports-hyperlinks: 3.0.0 dev: true /marked@4.3.0: @@ -8832,8 +8826,8 @@ packages: engines: {node: '>= 12'} hasBin: true - /marked@5.1.2: - resolution: {integrity: sha512-ahRPGXJpjMjwSOlBoTMZAK7ATXkli5qCPxZ21TG44rx1KEo44bii4ekgTDQPNRQ4Kh7JMb9Ub1PVk1NxRSsorg==} + /marked@9.1.6: + resolution: {integrity: sha512-jcByLnIFkd5gSXZmjNvS1TlmRhCXZjIzHYlaGkPlLIekG55JDR2Z4va9tZwCiP+/RDERiNhMOFu01xd6O5ct1Q==} engines: {node: '>= 16'} hasBin: true dev: true @@ -9734,12 +9728,6 @@ packages: tslib: 2.6.2 dev: true - /node-emoji@1.11.0: - resolution: {integrity: sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==} - dependencies: - lodash: 4.17.21 - dev: true - /node-emoji@2.1.1: resolution: {integrity: sha512-+fyi06+Z9LARCwnTmUF1sRPVQFhGlIpuye3zwlzMN8bIKou6l7k1rGV8WVOEu9EQnRLfoVOYj/p107u0CoQoKA==} engines: {node: '>=18'} @@ -9750,16 +9738,14 @@ packages: skin-tone: 2.0.0 dev: true - /node-fetch@2.6.13: - resolution: {integrity: sha512-StxNAxh15zr77QvvkmveSQ8uCQ4+v5FkvNTj0OESmiHu+VRi/gXArXtkWMElOsOUNLtUEvI4yS+rdtOHZTwlQA==} - engines: {node: 4.x || >=6.0.0} - peerDependencies: - encoding: ^0.1.0 - peerDependenciesMeta: - encoding: - optional: true + /node-emoji@2.1.3: + resolution: {integrity: sha512-E2WEOVsgs7O16zsURJ/eH8BqhF029wGpEOnv7Urwdo2wmQanOACwJQh0devF9D9RhoZru0+9JXIS0dBXIAz+lA==} + engines: {node: '>=18'} dependencies: - whatwg-url: 5.0.0 + '@sindresorhus/is': 4.6.0 + char-regex: 1.0.2 + emojilib: 2.4.0 + skin-tone: 2.0.0 dev: true /node-fetch@2.7.0: @@ -12165,9 +12151,9 @@ packages: dependencies: has-flag: 4.0.0 - /supports-hyperlinks@2.3.0: - resolution: {integrity: sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==} - engines: {node: '>=8'} + /supports-hyperlinks@3.0.0: + resolution: {integrity: sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==} + engines: {node: '>=14.18'} dependencies: has-flag: 4.0.0 supports-color: 7.2.0 @@ -12331,6 +12317,10 @@ packages: typescript: 5.2.2 dev: false + /ts-expose-internals-conditionally@1.0.0-empty.0: + resolution: {integrity: sha512-F8m9NOF6ZhdOClDVdlM8gj3fDCav4ZIFSs/EI3ksQbAAXVSCN/Jh5OCJDDZWBuBy9psFc6jULGDlPwjMYMhJDw==} + dev: true + /tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} dev: true @@ -12458,6 +12448,12 @@ packages: engines: {node: '>=14.17'} hasBin: true + /typescript@5.3.3: + resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==} + engines: {node: '>=14.17'} + hasBin: true + dev: true + /ua-parser-js@1.0.37: resolution: {integrity: sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==} dev: true