From ae5f7a9fe3cc5c8252e7a97d4db3e75e2f8269a0 Mon Sep 17 00:00:00 2001 From: Benjamin Goering <171782+gobengo@users.noreply.github.com> Date: Wed, 7 Dec 2022 10:02:13 -0800 Subject: [PATCH] fix: import capabilities from @web3-storage/capabilities (#65) (instead of @web3-storage/access/capabilities) Motivation: * https://github.com/web3-storage/upload-api/issues/64 --- README.md | 2 +- api/access.js | 2 +- api/package.json | 1 + api/service/store/add.js | 4 ++-- api/service/store/list.js | 4 ++-- api/service/store/remove.js | 4 ++-- api/service/types.ts | 2 +- api/service/upload/add.js | 4 ++-- api/service/upload/list.js | 4 ++-- api/service/upload/remove.js | 4 ++-- api/test/service/store.test.js | 2 +- api/test/service/upload.test.js | 2 +- package-lock.json | 34 +++++++++++++++++++++++++++++++++ 13 files changed, 52 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 55c54148..e4943b0a 100644 --- a/README.md +++ b/README.md @@ -175,7 +175,7 @@ Use the JS [upload-client] to handle the details of content-addressing your file ```js import { Agent } from '@web3-storage/access' -import { store } from '@web3-storage/access/capabilities/store' +import { store } from '@web3-storage/capabilities/store' import { uploadFile } from '@web3-storage/upload-client' // holds your identity on this device diff --git a/api/access.js b/api/access.js index dfa3bc50..dba8bba8 100644 --- a/api/access.js +++ b/api/access.js @@ -1,4 +1,4 @@ -import { info } from '@web3-storage/access/capabilities/space' +import { info } from '@web3-storage/capabilities/space' import { connect } from '@ucanto/client' import { CAR, CBOR, HTTP } from '@ucanto/transport' import fetch from '@web-std/fetch' diff --git a/api/package.json b/api/package.json index 9dfe8ec2..52a0cce0 100644 --- a/api/package.json +++ b/api/package.json @@ -17,6 +17,7 @@ "@ucanto/transport": "^3.0.2", "@web-std/fetch": "^4.1.0", "@web3-storage/access": "^6.0.1", + "@web3-storage/capabilities": "^1.0.0", "@web3-storage/sigv4": "^1.0.2", "multiformats": "^10.0.2", "p-retry": "^5.1.2" diff --git a/api/service/store/add.js b/api/service/store/add.js index 05db8e59..2f36fc85 100644 --- a/api/service/store/add.js +++ b/api/service/store/add.js @@ -1,9 +1,9 @@ import * as Server from '@ucanto/server' -import * as Store from '@web3-storage/access/capabilities/store' +import * as Store from '@web3-storage/capabilities/store' /** * @typedef {import('@ucanto/interface').Link} Link - * @typedef {import('@web3-storage/access/types').StoreAdd} StoreAddCapability + * @typedef {import('@web3-storage/capabilities/types').StoreAdd} StoreAddCapability * @typedef {import('@ucanto/interface').Failure} Failure * @typedef {import('../types').StoreAddResult} StoreAddResult */ diff --git a/api/service/store/list.js b/api/service/store/list.js index 8b7c977b..61a6ea63 100644 --- a/api/service/store/list.js +++ b/api/service/store/list.js @@ -1,9 +1,9 @@ import * as Server from '@ucanto/server' -import * as Store from '@web3-storage/access/capabilities/store' +import * as Store from '@web3-storage/capabilities/store' /** * @typedef {import('@ucanto/interface').Link} Link - * @typedef {import('@web3-storage/access/types').StoreList} StoreListCapability + * @typedef {import('@web3-storage/capabilities/types').StoreList} StoreListCapability * @typedef {import('@ucanto/interface').Failure} Failure * @typedef {import('../types').StoreListItem} StoreListItem * @typedef {import('../types').ListResponse} ListResponse diff --git a/api/service/store/remove.js b/api/service/store/remove.js index 825b1ae1..21d925f9 100644 --- a/api/service/store/remove.js +++ b/api/service/store/remove.js @@ -1,9 +1,9 @@ import * as Server from '@ucanto/server' -import * as Store from '@web3-storage/access/capabilities/store' +import * as Store from '@web3-storage/capabilities/store' /** * @typedef {import('@ucanto/interface').Link} Link - * @typedef {import('@web3-storage/access/types').StoreRemove} StoreRemoveCapability + * @typedef {import('@web3-storage/capabilities/types').StoreRemove} StoreRemoveCapability * @typedef {import('@ucanto/interface').Failure} Failure */ diff --git a/api/service/types.ts b/api/service/types.ts index ff21b4d0..10b12833 100644 --- a/api/service/types.ts +++ b/api/service/types.ts @@ -14,7 +14,7 @@ import { UploadAdd, UploadRemove, UploadList -} from '@web3-storage/access/capabilities/types' +} from '@web3-storage/capabilities/types' /** CID v0 or CID v1 */ export interface AnyLink extends API.Link {} diff --git a/api/service/upload/add.js b/api/service/upload/add.js index 854f29e2..0f493858 100644 --- a/api/service/upload/add.js +++ b/api/service/upload/add.js @@ -1,9 +1,9 @@ import pRetry from 'p-retry' import * as Server from '@ucanto/server' -import * as Upload from '@web3-storage/access/capabilities/upload' +import * as Upload from '@web3-storage/capabilities/upload' /** - * @typedef {import('@web3-storage/access/types').UploadAdd} UploadAddCapability + * @typedef {import('@web3-storage/capabilities/types').UploadAdd} UploadAddCapability * @typedef {import('@ucanto/interface').Failure} Failure * @typedef {import('../types').UploadAddResult} UploadAddResult */ diff --git a/api/service/upload/list.js b/api/service/upload/list.js index 3af2a4c7..dc196f59 100644 --- a/api/service/upload/list.js +++ b/api/service/upload/list.js @@ -1,8 +1,8 @@ import * as Server from '@ucanto/server' -import * as Upload from '@web3-storage/access/capabilities/upload' +import * as Upload from '@web3-storage/capabilities/upload' /** - * @typedef {import('@web3-storage/access/types').UploadList} UploadListCapability + * @typedef {import('@web3-storage/capabilities/types').UploadList} UploadListCapability * @typedef {import('@ucanto/interface').Failure} Failure * @typedef {import('../types').UploadListItem} UploadItemOutput * @typedef {import('../types').ListResponse} ListResponse diff --git a/api/service/upload/remove.js b/api/service/upload/remove.js index 57022bec..c688fe69 100644 --- a/api/service/upload/remove.js +++ b/api/service/upload/remove.js @@ -1,8 +1,8 @@ import * as Server from '@ucanto/server' -import * as Upload from '@web3-storage/access/capabilities/upload' +import * as Upload from '@web3-storage/capabilities/upload' /** - * @typedef {import('@web3-storage/access/types').UploadRemove} UploadRemoveCapability + * @typedef {import('@web3-storage/capabilities/types').UploadRemove} UploadRemoveCapability * @typedef {import('@ucanto/interface').Failure} Failure */ diff --git a/api/test/service/store.test.js b/api/test/service/store.test.js index 815d5b86..c15eef49 100644 --- a/api/test/service/store.test.js +++ b/api/test/service/store.test.js @@ -6,7 +6,7 @@ import { PutObjectCommand } from '@aws-sdk/client-s3' import * as Signer from '@ucanto/principal/ed25519' import { CAR } from '@ucanto/transport' import * as Server from '@ucanto/server' -import * as StoreCapabilities from '@web3-storage/access/capabilities/store' +import * as StoreCapabilities from '@web3-storage/capabilities/store' import { base64pad } from 'multiformats/bases/base64' import { getClientConnection, createSpace } from '../helpers/ucanto.js' import { createS3, createBucket, createDynamodDb, createAccessServer, dynamoDBTableConfig } from '../helpers/resources.js' diff --git a/api/test/service/upload.test.js b/api/test/service/upload.test.js index e198d2c8..50c11560 100644 --- a/api/test/service/upload.test.js +++ b/api/test/service/upload.test.js @@ -4,7 +4,7 @@ import { CreateTableCommand, QueryCommand } from '@aws-sdk/client-dynamodb' import { ListObjectsV2Command } from '@aws-sdk/client-s3' import { unmarshall } from '@aws-sdk/util-dynamodb' import * as Signer from '@ucanto/principal/ed25519' -import * as UploadCapabilities from '@web3-storage/access/capabilities/upload' +import * as UploadCapabilities from '@web3-storage/capabilities/upload' import { uploadTableProps } from '../../tables/index.js' import { createS3, createBucket, createAccessServer, createDynamodDb, dynamoDBTableConfig } from '../helpers/resources.js' import { randomCAR } from '../helpers/random.js' diff --git a/package-lock.json b/package-lock.json index 59e6dd2f..f4fb916b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,6 +43,7 @@ "@ucanto/transport": "^3.0.2", "@web-std/fetch": "^4.1.0", "@web3-storage/access": "^6.0.1", + "@web3-storage/capabilities": "^1.0.0", "@web3-storage/sigv4": "^1.0.2", "multiformats": "^10.0.2", "p-retry": "^5.1.2" @@ -7958,6 +7959,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@web3-storage/capabilities": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@web3-storage/capabilities/-/capabilities-1.0.0.tgz", + "integrity": "sha512-Qt/bWvZ45mXAnoVnna/UklTaQKBExdwxJ94qO+cwCKP728c491g9bXwmlEAmbGcgmXF340NuLYOq/xaT3x2Vbg==", + "dependencies": { + "@ipld/car": "^5.0.1", + "@ipld/dag-ucan": "^2.0.1", + "@ucanto/client": "^3.0.2", + "@ucanto/core": "^3.0.2", + "@ucanto/interface": "^3.0.1", + "@ucanto/principal": "^3.0.1", + "@ucanto/server": "^3.0.4", + "@ucanto/transport": "^3.0.2", + "@ucanto/validator": "^3.0.4" + } + }, "node_modules/@web3-storage/multipart-parser": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@web3-storage/multipart-parser/-/multipart-parser-1.0.0.tgz", @@ -24002,6 +24019,22 @@ } } }, + "@web3-storage/capabilities": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@web3-storage/capabilities/-/capabilities-1.0.0.tgz", + "integrity": "sha512-Qt/bWvZ45mXAnoVnna/UklTaQKBExdwxJ94qO+cwCKP728c491g9bXwmlEAmbGcgmXF340NuLYOq/xaT3x2Vbg==", + "requires": { + "@ipld/car": "^5.0.1", + "@ipld/dag-ucan": "^2.0.1", + "@ucanto/client": "^3.0.2", + "@ucanto/core": "^3.0.2", + "@ucanto/interface": "^3.0.1", + "@ucanto/principal": "^3.0.1", + "@ucanto/server": "^3.0.4", + "@ucanto/transport": "^3.0.2", + "@ucanto/validator": "^3.0.4" + } + }, "@web3-storage/multipart-parser": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@web3-storage/multipart-parser/-/multipart-parser-1.0.0.tgz", @@ -24034,6 +24067,7 @@ "@web-std/blob": "3.0.4", "@web-std/fetch": "^4.1.0", "@web3-storage/access": "^6.0.1", + "@web3-storage/capabilities": "^1.0.0", "@web3-storage/sigv4": "^1.0.2", "ava": "^4.3.3", "multiformats": "^10.0.2",