Skip to content

Commit

Permalink
fix: import capabilities from @web3-storage/capabilities (#65)
Browse files Browse the repository at this point in the history
(instead of @web3-storage/access/capabilities)

Motivation:
* #64
  • Loading branch information
gobengo committed Dec 7, 2022
1 parent c25e879 commit ae5f7a9
Show file tree
Hide file tree
Showing 13 changed files with 52 additions and 17 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/access.js
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
1 change: 1 addition & 0 deletions api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions api/service/store/add.js
Original file line number Diff line number Diff line change
@@ -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<unknown, number, number, 0 | 1>} 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
*/
Expand Down
4 changes: 2 additions & 2 deletions api/service/store/list.js
Original file line number Diff line number Diff line change
@@ -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<unknown, number, number, 0 | 1>} 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<StoreListItem>} ListResponse
Expand Down
4 changes: 2 additions & 2 deletions api/service/store/remove.js
Original file line number Diff line number Diff line change
@@ -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<unknown, number, number, 0 | 1>} Link
* @typedef {import('@web3-storage/access/types').StoreRemove} StoreRemoveCapability
* @typedef {import('@web3-storage/capabilities/types').StoreRemove} StoreRemoveCapability
* @typedef {import('@ucanto/interface').Failure} Failure
*/

Expand Down
2 changes: 1 addition & 1 deletion api/service/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<unknown, number, number, 0 | 1> {}
Expand Down
4 changes: 2 additions & 2 deletions api/service/upload/add.js
Original file line number Diff line number Diff line change
@@ -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
*/
Expand Down
4 changes: 2 additions & 2 deletions api/service/upload/list.js
Original file line number Diff line number Diff line change
@@ -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<UploadItemOutput>} ListResponse
Expand Down
4 changes: 2 additions & 2 deletions api/service/upload/remove.js
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
2 changes: 1 addition & 1 deletion api/test/service/store.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion api/test/service/upload.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
34 changes: 34 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ae5f7a9

Please sign in to comment.