Skip to content

Commit 8426d65

Browse files
authored
fix: export unixfs errors (#50)
Export error defs for reuse in other unixfs related modules
1 parent 189d7e5 commit 8426d65

17 files changed

+33
-25
lines changed

package.json

-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
"keywords": [
1515
"ipfs"
1616
],
17-
"engines": {
18-
"node": ">=16.0.0",
19-
"npm": ">=7.0.0"
20-
},
2117
"private": true,
2218
"scripts": {
2319
"reset": "aegir run clean && aegir clean **/node_modules **/package-lock.json",

packages/interop/package.json

-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
"keywords": [
1515
"IPFS"
1616
],
17-
"engines": {
18-
"node": ">=16.0.0",
19-
"npm": ">=7.0.0"
20-
},
2117
"type": "module",
2218
"types": "./dist/src/index.d.ts",
2319
"files": [

packages/unixfs/package.json

+20-4
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,24 @@
1414
"keywords": [
1515
"IPFS"
1616
],
17-
"engines": {
18-
"node": ">=16.0.0",
19-
"npm": ">=7.0.0"
20-
},
2117
"type": "module",
2218
"types": "./dist/src/index.d.ts",
19+
"typesVersions": {
20+
"*": {
21+
"*": [
22+
"*",
23+
"dist/*",
24+
"dist/src/*",
25+
"dist/src/*/index"
26+
],
27+
"src/*": [
28+
"*",
29+
"dist/*",
30+
"dist/src/*",
31+
"dist/src/*/index"
32+
]
33+
}
34+
},
2335
"files": [
2436
"src",
2537
"dist",
@@ -30,6 +42,10 @@
3042
".": {
3143
"types": "./dist/src/index.d.ts",
3244
"import": "./dist/src/index.js"
45+
},
46+
"./errors": {
47+
"types": "./dist/src/errors.d.ts",
48+
"import": "./dist/src/errors.js"
3349
}
3450
},
3551
"eslintConfig": {

packages/unixfs/src/commands/cat.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { exporter } from 'ipfs-unixfs-exporter'
22
import mergeOpts from 'merge-options'
3-
import { NoContentError, NotAFileError } from './utils/errors.js'
3+
import { NoContentError, NotAFileError } from '../errors.js'
44
import { resolve } from './utils/resolve.js'
55
import type { CatOptions } from '../index.js'
66
import type { Blocks } from '@helia/interface/blocks'

packages/unixfs/src/commands/chmod.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import mergeOpts from 'merge-options'
99
import { CID } from 'multiformats/cid'
1010
import * as raw from 'multiformats/codecs/raw'
1111
import { sha256 } from 'multiformats/hashes/sha2'
12+
import { InvalidPBNodeError, NotUnixFSError, UnknownError } from '../errors.js'
1213
import { SHARD_SPLIT_THRESHOLD_BYTES } from './utils/constants.js'
13-
import { InvalidPBNodeError, NotUnixFSError, UnknownError } from './utils/errors.js'
1414
import { persist } from './utils/persist.js'
1515
import { resolve, updatePathCids } from './utils/resolve.js'
1616
import type { ChmodOptions } from '../index.js'

packages/unixfs/src/commands/cp.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { logger } from '@libp2p/logger'
22
import mergeOpts from 'merge-options'
3+
import { InvalidParametersError } from '../errors.js'
34
import { addLink } from './utils/add-link.js'
45
import { cidToDirectory } from './utils/cid-to-directory.js'
56
import { cidToPBLink } from './utils/cid-to-pblink.js'
67
import { SHARD_SPLIT_THRESHOLD_BYTES } from './utils/constants.js'
7-
import { InvalidParametersError } from './utils/errors.js'
88
import type { CpOptions } from '../index.js'
99
import type { Blocks } from '@helia/interface/blocks'
1010
import type { CID } from 'multiformats/cid'

packages/unixfs/src/commands/ls.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { exporter, type UnixFSEntry } from 'ipfs-unixfs-exporter'
22
import mergeOpts from 'merge-options'
3-
import { NoContentError, NotADirectoryError } from './utils/errors.js'
3+
import { NoContentError, NotADirectoryError } from '../errors.js'
44
import { resolve } from './utils/resolve.js'
55
import type { LsOptions } from '../index.js'
66
import type { Blocks } from '@helia/interface/blocks'

packages/unixfs/src/commands/mkdir.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import { exporter } from 'ipfs-unixfs-exporter'
55
import mergeOpts from 'merge-options'
66
import { CID } from 'multiformats/cid'
77
import { sha256 } from 'multiformats/hashes/sha2'
8+
import { InvalidParametersError, NotADirectoryError } from '../errors.js'
89
import { addLink } from './utils/add-link.js'
910
import { cidToDirectory } from './utils/cid-to-directory.js'
1011
import { cidToPBLink } from './utils/cid-to-pblink.js'
1112
import { SHARD_SPLIT_THRESHOLD_BYTES } from './utils/constants.js'
12-
import { InvalidParametersError, NotADirectoryError } from './utils/errors.js'
1313
import type { MkdirOptions } from '../index.js'
1414
import type { Blocks } from '@helia/interface/blocks'
1515

packages/unixfs/src/commands/rm.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { logger } from '@libp2p/logger'
22
import mergeOpts from 'merge-options'
3+
import { InvalidParametersError } from '../errors.js'
34
import { cidToDirectory } from './utils/cid-to-directory.js'
45
import { SHARD_SPLIT_THRESHOLD_BYTES } from './utils/constants.js'
5-
import { InvalidParametersError } from './utils/errors.js'
66
import { removeLink } from './utils/remove-link.js'
77
import type { RmOptions } from '../index.js'
88
import type { Blocks } from '@helia/interface/blocks'

packages/unixfs/src/commands/stat.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { UnixFS } from 'ipfs-unixfs'
44
import { exporter } from 'ipfs-unixfs-exporter'
55
import mergeOpts from 'merge-options'
66
import * as raw from 'multiformats/codecs/raw'
7-
import { InvalidPBNodeError, NotUnixFSError, UnknownError } from './utils/errors.js'
7+
import { InvalidPBNodeError, NotUnixFSError, UnknownError } from '../errors.js'
88
import { resolve } from './utils/resolve.js'
99
import type { StatOptions, UnixFSStats } from '../index.js'
1010
import type { Blocks } from '@helia/interface/blocks'

packages/unixfs/src/commands/touch.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import mergeOpts from 'merge-options'
99
import { CID } from 'multiformats/cid'
1010
import * as raw from 'multiformats/codecs/raw'
1111
import { sha256 } from 'multiformats/hashes/sha2'
12+
import { InvalidPBNodeError, NotUnixFSError, UnknownError } from '../errors.js'
1213
import { SHARD_SPLIT_THRESHOLD_BYTES } from './utils/constants.js'
13-
import { InvalidPBNodeError, NotUnixFSError, UnknownError } from './utils/errors.js'
1414
import { persist } from './utils/persist.js'
1515
import { resolve, updatePathCids } from './utils/resolve.js'
1616
import type { TouchOptions } from '../index.js'

packages/unixfs/src/commands/utils/add-link.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { sha256 } from 'multiformats/hashes/sha2'
66
// @ts-expect-error no types
77
import SparseArray from 'sparse-array'
88
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
9+
import { AlreadyExistsError, InvalidParametersError, InvalidPBNodeError } from '../../errors.js'
910
import { wrapHash } from './consumable-hash.js'
10-
import { AlreadyExistsError, InvalidParametersError, InvalidPBNodeError } from './errors.js'
1111
import { hamtBucketBits, hamtHashFn } from './hamt-constants.js'
1212
import {
1313
createShard,

packages/unixfs/src/commands/utils/cid-to-directory.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { exporter, type ExporterOptions } from 'ipfs-unixfs-exporter'
2-
import { NotADirectoryError } from './errors.js'
2+
import { NotADirectoryError } from '../../errors.js'
33
import type { Blocks } from '@helia/interface/blocks'
44
import type { PBNode } from '@ipld/dag-pb'
55
import type { CID } from 'multiformats/cid'

packages/unixfs/src/commands/utils/cid-to-pblink.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as dagPb from '@ipld/dag-pb'
22
import { exporter, type ExporterOptions } from 'ipfs-unixfs-exporter'
3-
import { NotUnixFSError } from './errors.js'
3+
import { NotUnixFSError } from '../../errors.js'
44
import type { Blocks } from '@helia/interface/blocks'
55
import type { PBNode, PBLink } from '@ipld/dag-pb'
66
import type { CID } from 'multiformats/cid'

packages/unixfs/src/commands/utils/remove-link.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as dagPB from '@ipld/dag-pb'
33
import { logger } from '@libp2p/logger'
44
import { UnixFS } from 'ipfs-unixfs'
55
import { exporter } from 'ipfs-unixfs-exporter'
6-
import { InvalidParametersError, InvalidPBNodeError } from './errors.js'
6+
import { InvalidParametersError, InvalidPBNodeError } from '../../errors.js'
77
import {
88
recreateShardedDirectory,
99
type UpdateHamtDirectoryOptions,

packages/unixfs/src/commands/utils/resolve.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { logger } from '@libp2p/logger'
22
import { exporter } from 'ipfs-unixfs-exporter'
3+
import { DoesNotExistError, InvalidParametersError } from '../../errors.js'
34
import { addLink } from './add-link.js'
45
import { cidToDirectory } from './cid-to-directory.js'
56
import { cidToPBLink } from './cid-to-pblink.js'
6-
import { DoesNotExistError, InvalidParametersError } from './errors.js'
77
import type { Blocks } from '@helia/interface/blocks'
88
import type { AbortOptions } from '@libp2p/interfaces'
99
import type { CID } from 'multiformats/cid'
File renamed without changes.

0 commit comments

Comments
 (0)