@helia/unixfs 7.0.4 → 7.1.0

package/dist/src/commands/utils/cid-to-pblink.d.ts

@@ -1,4 +1,4 @@
-import type { GetStore } from '../../unixfs.js';
+import type { GetStore } from '../../unixfs.ts';
 import type { PBLink } from '@ipld/dag-pb';
 import type { ExporterOptions } from 'ipfs-unixfs-exporter';
 import type { CID } from 'multiformats/cid';

package/dist/src/commands/utils/cid-to-pblink.js

@@ -1,6 +1,6 @@
 import * as dagPb from '@ipld/dag-pb';
 import { exporter } from 'ipfs-unixfs-exporter';
-import { NotUnixFSError } from '../../errors.js';
+import { NotUnixFSError } from "../../errors.js";
 export async function cidToPBLink(cid, name, blockstore, options) {
     const sourceEntry = await exporter(cid, blockstore, options);
     if (sourceEntry.type !== 'directory' && sourceEntry.type !== 'file' && sourceEntry.type !== 'raw') {

package/dist/src/commands/utils/hamt-utils.d.ts

@@ -1,17 +1,16 @@
 import * as dagPB from '@ipld/dag-pb';
 import SparseArray from 'sparse-array';
-import type { InfiniteHash } from './consumable-hash.js';
-import type { PersistOptions } from './persist.js';
-import type { GetStore, PutStore } from '../../unixfs.js';
+import type { InfiniteHash } from './consumable-hash.ts';
+import type { GetStore, PutStore } from '../../unixfs.ts';
 import type { AbortOptions } from '@libp2p/interface';
 import type { Blockstore } from 'interface-blockstore';
 import type { Mtime } from 'ipfs-unixfs';
-import type { ImportResult } from 'ipfs-unixfs-importer';
+import type { ImporterOptions, ImportResult } from 'ipfs-unixfs-importer';
 import type { CID, Version } from 'multiformats/cid';
-export interface UpdateHamtDirectoryOptions extends AbortOptions {
+export interface UpdateHamtDirectoryOptions extends HAMTOptions {
     cidVersion?: Version;
 }
-export declare const toPrefix: (position: number) => string;
+export declare const toPrefix: (position: number, bits?: number) => string;
 export interface CreateShardOptions {
     mtime?: Mtime;
     mode?: number;
@@ -27,11 +26,13 @@ export interface HAMTPath {
     children: SparseArray;
     node: dagPB.PBNode;
 }
-export declare const updateShardedDirectory: (path: HAMTPath[], blockstore: GetStore & PutStore, options: PersistOptions) => Promise<{
+export declare const updateShardedDirectory: (path: HAMTPath[], blockstore: GetStore & PutStore, options: HAMTOptions) => Promise<{
     cid: CID;
     node: dagPB.PBNode;
 }>;
-export declare const recreateShardedDirectory: (cid: CID, fileName: string, blockstore: Pick<Blockstore, "get">, options: AbortOptions) => Promise<{
+export interface HAMTOptions extends AbortOptions, Pick<ImporterOptions, 'shardFanoutBits' | 'shardSplitStrategy' | 'shardSplitThresholdBytes'> {
+}
+export declare const recreateShardedDirectory: (cid: CID, fileName: string, blockstore: Pick<Blockstore, "get">, options: HAMTOptions) => Promise<{
     path: HAMTPath[];
     hash: InfiniteHash;
 }>;

package/dist/src/commands/utils/hamt-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hamt-utils.d.ts","sourceRoot":"","sources":["../../../../src/commands/utils/hamt-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAMrC,OAAO,WAAW,MAAM,cAAc,CAAA;AAUtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAIpD,MAAM,WAAW,0BAA2B,SAAQ,YAAY;IAC9D,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB;AAED,eAAO,MAAM,QAAQ,GAAI,UAAU,MAAM,KAAG,MAM3C,CAAA;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB;AAED,eAAO,MAAM,WAAW,GAAU,YAAY,QAAQ,EAAE,UAAU,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,GAAG,CAAA;CAAE,CAAC,EAAE,SAAS,kBAAkB,KAAG,OAAO,CAAC,YAAY,CA2BpK,CAAA;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,WAAW,CAAA;IACrB,IAAI,EAAE,KAAK,CAAC,MAAM,CAAA;CACnB;AAED,eAAO,MAAM,sBAAsB,GAAU,MAAM,QAAQ,EAAE,EAAE,YAAY,QAAQ,GAAG,QAAQ,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAA;CAAE,CAiEjK,CAAA;AAED,eAAO,MAAM,wBAAwB,GAAU,KAAK,GAAG,EAAE,UAAU,MAAM,EAAE,YAAY,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,SAAS,YAAY,KAAG,OAAO,CAAC;IAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAAC,IAAI,EAAE,YAAY,CAAA;CAAE,CA+DvL,CAAA"}
+{"version":3,"file":"hamt-utils.d.ts","sourceRoot":"","sources":["../../../../src/commands/utils/hamt-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAOrC,OAAO,WAAW,MAAM,cAAc,CAAA;AAStC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACzE,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAIpD,MAAM,WAAW,0BAA2B,SAAQ,WAAW;IAC7D,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB;AAED,eAAO,MAAM,QAAQ,GAAI,UAAU,MAAM,EAAE,aAAqB,KAAG,MAQlE,CAAA;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB;AAED,eAAO,MAAM,WAAW,GAAU,YAAY,QAAQ,EAAE,UAAU,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,GAAG,CAAA;CAAE,CAAC,EAAE,SAAS,kBAAkB,KAAG,OAAO,CAAC,YAAY,CA2BpK,CAAA;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,WAAW,CAAA;IACrB,IAAI,EAAE,KAAK,CAAC,MAAM,CAAA;CACnB;AAED,eAAO,MAAM,sBAAsB,GAAU,MAAM,QAAQ,EAAE,EAAE,YAAY,QAAQ,GAAG,QAAQ,EAAE,SAAS,WAAW,KAAG,OAAO,CAAC;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAA;CAAE,CAiE9J,CAAA;AAED,MAAM,WAAW,WAAY,SAAQ,YAAY,EAAE,IAAI,CAAC,eAAe,EAAE,iBAAiB,GAAG,oBAAoB,GAAG,0BAA0B,CAAC;CAE9I;AAED,eAAO,MAAM,wBAAwB,GAAU,KAAK,GAAG,EAAE,UAAU,MAAM,EAAE,YAAY,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,SAAS,WAAW,KAAG,OAAO,CAAC;IAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAAC,IAAI,EAAE,YAAY,CAAA;CAAE,CAgEtL,CAAA"}

package/dist/src/commands/utils/hamt-utils.js

@@ -1,22 +1,23 @@
 import * as dagPB from '@ipld/dag-pb';
 import { logger } from '@libp2p/logger';
 import { UnixFS } from 'ipfs-unixfs';
+import { DirSharded } from 'ipfs-unixfs-importer/utils';
 import last from 'it-last';
 import toBuffer from 'it-to-buffer';
 // @ts-expect-error no types
 import SparseArray from 'sparse-array';
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string';
-import { wrapHash } from './consumable-hash.js';
-import { DirSharded } from './dir-sharded.js';
-import { hamtHashCode, hamtHashFn, hamtBucketBits } from './hamt-constants.js';
-import { persist } from './persist.js';
+import { wrapHash } from "./consumable-hash.js";
+import { hamtHashCode, hamtHashFn, hamtBucketBits } from "./hamt-constants.js";
+import { persist } from "./persist.js";
 const log = logger('helia:unixfs:commands:utils:hamt-utils');
-export const toPrefix = (position) => {
+export const toPrefix = (position, bits = hamtBucketBits) => {
+    const length = (Math.pow(2, bits) - 1).toString(16).length;
     return position
         .toString(16)
         .toUpperCase()
-        .padStart(2, '0')
-        .substring(0, 2);
+        .padStart(length, '0')
+        .substring(0, length);
 };
 export const createShard = async (blockstore, contents, options) => {
     const shard = new DirSharded({
@@ -31,7 +32,7 @@ export const createShard = async (blockstore, contents, options) => {
         mode: options.mode
     }, options);
     for (let i = 0; i < contents.length; i++) {
-        await shard._bucket.put(contents[i].name, {
+        await shard.bucket.put(contents[i].name, {
             size: contents[i].size,
             cid: contents[i].cid
         });
@@ -46,7 +47,7 @@ export const updateShardedDirectory = async (path, blockstore, options) => {
     // persist any metadata on the shard root
     const shardRoot = UnixFS.unmarshal(path[0].node.Data ?? new Uint8Array(0));
     // this is always the same
-    const fanout = BigInt(Math.pow(2, hamtBucketBits));
+    const fanout = BigInt(Math.pow(2, options.shardFanoutBits ?? hamtBucketBits));
     // start from the leaf and ascend to the root
     path.reverse();
     let cid;
@@ -97,13 +98,14 @@ export const recreateShardedDirectory = async (cid, fileName, blockstore, option
     const wrapped = wrapHash(hamtHashFn);
     const hash = wrapped(uint8ArrayFromString(fileName));
     const path = [];
+    const hashBits = options.shardFanoutBits ?? hamtBucketBits;
     // descend the HAMT, loading each layer as we head towards the target child
     while (true) {
         const block = await toBuffer(blockstore.get(cid, options));
         const node = dagPB.decode(block);
         const children = new SparseArray();
-        const index = await hash.take(hamtBucketBits);
-        const prefix = toPrefix(index);
+        const index = await hash.take(hashBits);
+        const prefix = toPrefix(index, hashBits);
         path.push({
             prefix,
             children,
@@ -114,10 +116,10 @@ export const recreateShardedDirectory = async (cid, fileName, blockstore, option
         // intermediate DAG node so this is required to generate consistent hashes
         for (const link of node.Links) {
             const linkName = link.Name ?? '';
-            if (linkName.length < 2) {
+            if (linkName.length < prefix.length) {
                 throw new Error('Invalid HAMT - link name was too short');
             }
-            const position = parseInt(linkName.substring(0, 2), 16);
+            const position = parseInt(linkName.substring(0, prefix.length), 16);
             children.set(position, true);
             // we found the child we are looking for
             if (linkName.startsWith(prefix)) {
@@ -126,14 +128,14 @@ export const recreateShardedDirectory = async (cid, fileName, blockstore, option
         }
         if (childLink == null) {
             log('no link found with prefix %s for %s', prefix, fileName);
-            // hash.untake(hamtBucketBits)
+            // hash.untake(hashBits)
             break;
         }
         const linkName = childLink.Name ?? '';
-        if (linkName.length < 2) {
+        if (linkName.length < prefix.length) {
             throw new Error('Invalid HAMT - link name was too short');
         }
-        if (linkName.length === 2) {
+        if (linkName.length === prefix.length) {
             // found sub-shard
             cid = childLink.Hash;
             log('descend into sub-shard with prefix %s', linkName);

package/dist/src/commands/utils/hamt-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"hamt-utils.js","sourceRoot":"","sources":["../../../../src/commands/utils/hamt-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,IAAI,MAAM,SAAS,CAAA;AAC1B,OAAO,QAAQ,MAAM,cAAc,CAAA;AACnC,4BAA4B;AAC5B,OAAO,WAAW,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EACL,YAAY,EACZ,UAAU,EACV,cAAc,EACf,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAUtC,MAAM,GAAG,GAAG,MAAM,CAAC,wCAAwC,CAAC,CAAA;AAM5D,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,QAAgB,EAAU,EAAE;IACnD,OAAO,QAAQ;SACZ,QAAQ,CAAC,EAAE,CAAC;SACZ,WAAW,EAAE;SACb,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;SAChB,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;AACpB,CAAC,CAAA;AAQD,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,UAAoB,EAAE,QAAyD,EAAE,OAA2B,EAAyB,EAAE;IACvK,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC;QAC3B,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,SAAS;QACpB,IAAI,EAAE,EAAE;QACR,KAAK,EAAE,IAAI;QACX,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,EAAE,OAAO,CAAC,CAAA;IAEX,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;YACxC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI;YACtB,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG;SACrB,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;IAE/C,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;IACrD,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAQD,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EAAE,IAAgB,EAAE,UAA+B,EAAE,OAAuB,EAA6C,EAAE;IACpK,yCAAyC;IACzC,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;IAE1E,0BAA0B;IAC1B,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAA;IAElD,6CAA6C;IAC7C,IAAI,CAAC,OAAO,EAAE,CAAA;IAEd,IAAI,GAAoB,CAAA;IACxB,IAAI,IAA8B,CAAA;IAElC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,CAAC,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,CAAA;QACpC,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QAEvB,oDAAoD;QACpD,0CAA0C;QAC1C,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA;QACnE,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC;YACrB,IAAI,EAAE,wBAAwB;YAC9B,IAAI;YACJ,MAAM;YACN,QAAQ,EAAE,YAAY;SACvB,CAAC,CAAA;QAEF,IAAI,MAAM,EAAE,CAAC;YACX,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAA;YAC3B,GAAG,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAA;QAC3B,CAAC;QAED,IAAI,GAAG;YACL,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE;YACnB,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK;SAC1B,CAAA;QAED,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;QAE/C,GAAG,GAAG,MAAM,OAAO,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;QAE/C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,kCAAkC;YAClC,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;YAE/B,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;gBACxB,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAA;YAC5E,CAAC;YAED,GAAG,CAAC,kDAAkD,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;YAE3E,WAAW,CAAC,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,MAAM,CAAC,CAAA;YAC1F,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBAC1B,IAAI,EAAE,WAAW,CAAC,MAAM;gBACxB,IAAI,EAAE,GAAG;gBACT,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC;aAC3F,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,IAAI,GAAG,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;IACrC,CAAC;IAED,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAA;AACtB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAAE,GAAQ,EAAE,QAAgB,EAAE,UAAmC,EAAE,OAAqB,EAAqD,EAAE;IAC1L,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAA;IACpC,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAA;IACpD,MAAM,IAAI,GAAe,EAAE,CAAA;IAE3B,2EAA2E;IAC3E,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;QAC1D,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAChC,MAAM,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAA;QAClC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QAC7C,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;QAE9B,IAAI,CAAC,IAAI,CAAC;YACR,MAAM;YACN,QAAQ;YACR,IAAI;SACL,CAAC,CAAA;QAEF,IAAI,SAAmC,CAAA;QAEvC,mFAAmF;QACnF,0EAA0E;QAC1E,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAA;YAEhC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;YAC3D,CAAC;YAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;YACvD,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;YAE5B,wCAAwC;YACxC,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBAChC,SAAS,GAAG,IAAI,CAAA;YAClB,CAAC;QACH,CAAC;QAED,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;YACtB,GAAG,CAAC,qCAAqC,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;YAC5D,8BAA8B;YAC9B,MAAK;QACP,CAAC;QAED,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,IAAI,EAAE,CAAA;QAErC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;QAC3D,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,kBAAkB;YAClB,GAAG,GAAG,SAAS,CAAC,IAAI,CAAA;YACpB,GAAG,CAAC,uCAAuC,EAAE,QAAQ,CAAC,CAAA;YAEtD,SAAQ;QACV,CAAC;QAED,MAAK;IACP,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;AACvB,CAAC,CAAA"}
+{"version":3,"file":"hamt-utils.js","sourceRoot":"","sources":["../../../../src/commands/utils/hamt-utils.ts"],"names":[],"mappings":"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"}

package/dist/src/commands/utils/is-over-shard-threshold.d.ts

@@ -1,11 +1,15 @@
 import type { GetStore } from '../../unixfs.js';
 import type { PBNode } from '@ipld/dag-pb';
 import type { AbortOptions } from '@libp2p/interface';
+import type { ImporterOptions } from 'ipfs-unixfs-importer';
+export interface IsOverShardThresholdOptions extends AbortOptions, Pick<ImporterOptions, 'profile' | 'shardSplitThresholdBytes' | 'shardSplitStrategy' | 'shardFanoutBits'> {
+}
 /**
  * Estimate node size only based on DAGLink name and CID byte lengths
  * https://github.com/ipfs/go-unixfsnode/blob/37b47f1f917f1b2f54c207682f38886e49896ef9/data/builder/directory.go#L81-L96
  *
- * If the node is a hamt sharded directory the calculation is based on if it was a regular directory.
+ * If the node is a hamt sharded directory the calculation is based on if it was
+ * a regular directory.
  */
-export declare function isOverShardThreshold(node: PBNode, blockstore: GetStore, threshold: number, options: AbortOptions): Promise<boolean>;
+export declare function isOverShardThreshold(node: PBNode, blockstore: GetStore, options: IsOverShardThresholdOptions): Promise<boolean>;
 //# sourceMappingURL=is-over-shard-threshold.d.ts.map

package/dist/src/commands/utils/is-over-shard-threshold.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"is-over-shard-threshold.d.ts","sourceRoot":"","sources":["../../../../src/commands/utils/is-over-shard-threshold.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAErD;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,CAiB1I"}
+{"version":3,"file":"is-over-shard-threshold.d.ts","sourceRoot":"","sources":["../../../../src/commands/utils/is-over-shard-threshold.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,eAAe,EAAsB,MAAM,sBAAsB,CAAA;AAE/E,MAAM,WAAW,2BAA4B,SAAQ,YAAY,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,0BAA0B,GAAG,oBAAoB,GAAG,iBAAiB,CAAC;CAE1K;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,CA+BtI"}

package/dist/src/commands/utils/is-over-shard-threshold.js

@@ -1,27 +1,39 @@
 import * as dagPb from '@ipld/dag-pb';
+import { InvalidParametersError } from '@libp2p/interface';
 import { UnixFS } from 'ipfs-unixfs';
+import { dataFieldSerializedSize, linkSerializedSize, utf8ByteLength } from 'ipfs-unixfs-importer/utils';
 import toBuffer from 'it-to-buffer';
-import { CID_V0, CID_V1 } from './dir-sharded.js';
+import { DEFAULT_SHARD_SPLIT_THRESHOLD_BYTES } from "../../constants.js";
+import { hamtBucketBits } from "./hamt-constants.js";
 /**
  * Estimate node size only based on DAGLink name and CID byte lengths
  * https://github.com/ipfs/go-unixfsnode/blob/37b47f1f917f1b2f54c207682f38886e49896ef9/data/builder/directory.go#L81-L96
  *
- * If the node is a hamt sharded directory the calculation is based on if it was a regular directory.
+ * If the node is a hamt sharded directory the calculation is based on if it was
+ * a regular directory.
  */
-export async function isOverShardThreshold(node, blockstore, threshold, options) {
+export async function isOverShardThreshold(node, blockstore, options) {
     if (node.Data == null) {
         throw new Error('DagPB node had no data');
     }
+    const threshold = options.shardSplitThresholdBytes ?? DEFAULT_SHARD_SPLIT_THRESHOLD_BYTES;
+    let strategy = options.shardSplitStrategy ?? 'links-bytes';
+    if (options.profile === 'unixfs-v0-2015') {
+        strategy = 'links-bytes';
+    }
     const unixfs = UnixFS.unmarshal(node.Data);
-    let size;
+    if (!unixfs.isDirectory()) {
+        throw new Error('Can only estimate the size of directories or shards');
+    }
+    if (strategy !== 'links-bytes' && strategy !== 'block-bytes') {
+        throw new InvalidParametersError(`Invalid shard split threshold "${strategy}"`);
+    }
+    let size = 0;
     if (unixfs.type === 'directory') {
-        size = estimateNodeSize(node);
+        size = strategy === 'links-bytes' ? estimateNodeSize(node) : calculateNodeSize(unixfs, node);
     }
     else if (unixfs.type === 'hamt-sharded-directory') {
-        size = await estimateShardSize(node, 0, threshold, blockstore, options);
-    }
-    else {
-        throw new Error('Can only estimate the size of directories or shards');
+        size = strategy === 'links-bytes' ? await estimateShardSize(node, 0, threshold, blockstore, options) : await calculateShardSize(node, dataFieldSerializedSize(unixfs.mode, unixfs.mtime), threshold, blockstore, options);
     }
     return size > threshold;
 }
@@ -30,8 +42,15 @@ function estimateNodeSize(node) {
     // estimate size only based on DAGLink name and CID byte lengths
     // https://github.com/ipfs/go-unixfsnode/blob/37b47f1f917f1b2f54c207682f38886e49896ef9/data/builder/directory.go#L81-L96
     for (const link of node.Links) {
-        size += (link.Name ?? '').length;
-        size += link.Hash.version === 1 ? CID_V1.bytes.byteLength : CID_V0.bytes.byteLength;
+        size += utf8ByteLength(link.Name ?? '');
+        size += link.Hash.byteLength;
+    }
+    return size;
+}
+function calculateNodeSize(unixfs, node) {
+    let size = dataFieldSerializedSize(unixfs.mode, unixfs.mtime);
+    for (const link of node.Links) {
+        size += linkSerializedSize(utf8ByteLength(link.Name ?? ''), link.Hash.byteLength, Number(link.Tsize ?? 0));
     }
     return size;
 }
@@ -46,11 +65,12 @@ async function estimateShardSize(node, current, max, blockstore, options) {
     if (!unixfs.isDirectory()) {
         return current;
     }
+    const prefixLength = (Math.pow(2, options.shardFanoutBits ?? hamtBucketBits) - 1).toString(16).length;
     for (const link of node.Links) {
         let name = link.Name ?? '';
         // remove hamt hash prefix from name
-        name = name.substring(2);
-        current += name.length;
+        name = name.substring(prefixLength);
+        current += utf8ByteLength(name);
         current += link.Hash.bytes.byteLength;
         if (link.Hash.code === dagPb.code) {
             const block = await toBuffer(blockstore.get(link.Hash, options));
@@ -60,4 +80,29 @@ async function estimateShardSize(node, current, max, blockstore, options) {
     }
     return current;
 }
+async function calculateShardSize(node, current, max, blockstore, options) {
+    if (current > max) {
+        return max;
+    }
+    if (node.Data == null) {
+        return current;
+    }
+    const unixfs = UnixFS.unmarshal(node.Data);
+    if (!unixfs.isDirectory()) {
+        return current;
+    }
+    const prefixLength = (Math.pow(2, options.shardFanoutBits ?? hamtBucketBits) - 1).toString(16).length;
+    for (const link of node.Links) {
+        let name = link.Name ?? '';
+        // remove hamt hash prefix from name
+        name = name.substring(prefixLength);
+        current += linkSerializedSize(utf8ByteLength(name), link.Hash.byteLength, Number(link.Tsize ?? 0));
+        if (link.Hash.code === dagPb.code) {
+            const block = await toBuffer(blockstore.get(link.Hash, options));
+            const node = dagPb.decode(block);
+            current += await calculateShardSize(node, current, max, blockstore, options);
+        }
+    }
+    return current;
+}
 //# sourceMappingURL=is-over-shard-threshold.js.map

package/dist/src/commands/utils/is-over-shard-threshold.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-over-shard-threshold.js","sourceRoot":"","sources":["../../../../src/commands/utils/is-over-shard-threshold.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"is-over-shard-threshold.js","sourceRoot":"","sources":["../../../../src/commands/utils/is-over-shard-threshold.ts"],"names":[],"mappings":"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"}

package/dist/src/commands/utils/persist.d.ts

@@ -1,11 +1,11 @@
 import { CID } from 'multiformats/cid';
-import type { PutStore } from '../../unixfs.js';
+import type { PutStore } from '../../unixfs.ts';
+import type { AbortOptions } from '@libp2p/interface';
 import type { Version as CIDVersion } from 'multiformats/cid';
 import type { BlockCodec } from 'multiformats/codecs/interface';
-export interface PersistOptions {
+export interface PersistOptions extends AbortOptions {
     codec?: BlockCodec<any, any>;
     cidVersion?: CIDVersion;
-    signal?: AbortSignal;
 }
 export declare const persist: (buffer: Uint8Array, blockstore: PutStore, options: PersistOptions) => Promise<CID>;
 //# sourceMappingURL=persist.d.ts.map

package/dist/src/commands/utils/persist.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"persist.d.ts","sourceRoot":"","sources":["../../../../src/commands/utils/persist.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAGtC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAE/D,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC5B,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAED,eAAO,MAAM,OAAO,GAAU,QAAQ,UAAU,EAAE,YAAY,QAAQ,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,GAAG,CAc5G,CAAA"}
+{"version":3,"file":"persist.d.ts","sourceRoot":"","sources":["../../../../src/commands/utils/persist.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAGtC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAE/D,MAAM,WAAW,cAAe,SAAQ,YAAY;IAClD,KAAK,CAAC,EAAE,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC5B,UAAU,CAAC,EAAE,UAAU,CAAA;CACxB;AAED,eAAO,MAAM,OAAO,GAAU,QAAQ,UAAU,EAAE,YAAY,QAAQ,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,GAAG,CAc5G,CAAA"}

package/dist/src/commands/utils/remove-link.d.ts

@@ -1,11 +1,10 @@
-import type { Directory } from './cid-to-directory.js';
-import type { GetStore, PutStore } from '../../unixfs.js';
+import type { Directory } from './cid-to-directory.ts';
+import type { GetStore, PutStore } from '../../unixfs.ts';
 import type { PBNode } from '@ipld/dag-pb';
 import type { AbortOptions } from '@libp2p/interface';
-import type { CID, Version } from 'multiformats/cid';
-export interface RmLinkOptions extends AbortOptions {
-    shardSplitThresholdBytes?: number;
-    cidVersion?: Version;
+import type { ImporterOptions } from 'ipfs-unixfs-importer';
+import type { CID } from 'multiformats/cid';
+export interface RmLinkOptions extends AbortOptions, Pick<ImporterOptions, 'profile' | 'shardSplitThresholdBytes' | 'shardSplitStrategy' | 'shardFanoutBits' | 'cidVersion'> {
 }
 export interface RemoveLinkResult {
     node: PBNode;

package/dist/src/commands/utils/remove-link.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-link.d.ts","sourceRoot":"","sources":["../../../../src/commands/utils/remove-link.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEtD,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAIpD,MAAM,WAAW,aAAc,SAAQ,YAAY;IACjD,wBAAwB,CAAC,EAAE,MAAM,CAAA;IACjC,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,GAAG,CAAA;CACT;AAED,wBAAsB,UAAU,CAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,GAAG,QAAQ,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwBrJ"}
+{"version":3,"file":"remove-link.d.ts","sourceRoot":"","sources":["../../../../src/commands/utils/remove-link.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEtD,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAI3C,MAAM,WAAW,aAAc,SAAQ,YAAY,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,0BAA0B,GAAG,oBAAoB,GAAG,iBAAiB,GAAG,YAAY,CAAC;CAE3K;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,GAAG,CAAA;CACT;AAED,wBAAsB,UAAU,CAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,GAAG,QAAQ,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwBrJ"}

package/dist/src/commands/utils/remove-link.js

@@ -2,11 +2,11 @@ import * as dagPB from '@ipld/dag-pb';
 import { logger } from '@libp2p/logger';
 import { UnixFS } from 'ipfs-unixfs';
 import { exporter } from 'ipfs-unixfs-exporter';
-import { DEFAULT_SHARD_SPLIT_THRESHOLD_BYTES } from "../../constants.js";
-import { InvalidParametersError, InvalidPBNodeError } from '../../errors.js';
-import { recreateShardedDirectory, updateShardedDirectory } from './hamt-utils.js';
-import { isOverShardThreshold } from './is-over-shard-threshold.js';
-import { persist } from './persist.js';
+import { InvalidParametersError, InvalidPBNodeError } from "../../errors.js";
+import { hamtBucketBits } from "./hamt-constants.js";
+import { recreateShardedDirectory, updateShardedDirectory } from "./hamt-utils.js";
+import { isOverShardThreshold } from "./is-over-shard-threshold.js";
+import { persist } from "./persist.js";
 const log = logger('helia:unixfs:utils:remove-link');
 export async function removeLink(parent, name, blockstore, options) {
     if (parent.node.Data == null) {
@@ -16,7 +16,7 @@ export async function removeLink(parent, name, blockstore, options) {
     if (meta.type === 'hamt-sharded-directory') {
         log(`removing ${name} from sharded directory`);
         const result = await removeFromShardedDirectory(parent, name, blockstore, options);
-        if (!(await isOverShardThreshold(result.node, blockstore, options.shardSplitThresholdBytes ?? DEFAULT_SHARD_SPLIT_THRESHOLD_BYTES, options))) {
+        if (!(await isOverShardThreshold(result.node, blockstore, options))) {
             log('converting shard to flat directory %c', parent.cid);
             return convertToFlatDirectory(result, blockstore, options);
         }
@@ -47,11 +47,12 @@ const removeFromShardedDirectory = async (parent, name, blockstore, options) =>
     if (finalSegment == null) {
         throw new Error('Invalid HAMT, could not generate path');
     }
-    const linkName = finalSegment.node.Links.filter(l => (l.Name ?? '').substring(2) === name).map(l => l.Name).pop();
+    const prefixLength = (Math.pow(2, options.shardFanoutBits ?? hamtBucketBits) - 1).toString(16).length;
+    const linkName = finalSegment.node.Links.filter(l => (l.Name ?? '').substring(prefixLength) === name).map(l => l.Name).pop();
     if (linkName == null) {
         throw new Error('File not found');
     }
-    const prefix = linkName.substring(0, 2);
+    const prefix = linkName.substring(0, prefixLength);
     const index = parseInt(prefix, 16);
     // remove the file from the shard
     finalSegment.node.Links = finalSegment.node.Links.filter(link => link.Name !== linkName);
@@ -76,7 +77,7 @@ const removeFromShardedDirectory = async (parent, name, blockstore, options) =>
             nextSegment.node.Links = nextSegment.node.Links.filter(l => !(l.Name ?? '').startsWith(nextSegment.prefix));
             nextSegment.node.Links.push({
                 Hash: link.Hash,
-                Name: `${nextSegment.prefix}${(link.Name ?? '').substring(2)}`,
+                Name: `${nextSegment.prefix}${(link.Name ?? '').substring(prefixLength)}`,
                 Tsize: link.Tsize
             });
         }

package/dist/src/commands/utils/remove-link.js.map

@@ -1 +1 @@
-{"version":3,"file":"remove-link.js","sourceRoot":"","sources":["../../../../src/commands/utils/remove-link.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,mCAAmC,EAAE,MAAM,oBAAoB,CAAA;AACxE,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAC5E,OAAO,EACL,wBAAwB,EAExB,sBAAsB,EACvB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAQtC,MAAM,GAAG,GAAG,MAAM,CAAC,gCAAgC,CAAC,CAAA;AAYpD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAE,MAAiB,EAAE,IAAY,EAAE,UAA+B,EAAE,OAAsB;IACxH,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;QAC7B,MAAM,IAAI,kBAAkB,CAAC,yBAAyB,CAAC,CAAA;IACzD,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAE/C,IAAI,IAAI,CAAC,IAAI,KAAK,wBAAwB,EAAE,CAAC;QAC3C,GAAG,CAAC,YAAY,IAAI,yBAAyB,CAAC,CAAA;QAE9C,MAAM,MAAM,GAAG,MAAM,0BAA0B,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;QAElF,IAAI,CAAC,CAAC,MAAM,oBAAoB,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,wBAAwB,IAAI,mCAAmC,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC;YAC7I,GAAG,CAAC,uCAAuC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAA;YAExD,OAAO,sBAAsB,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;QAC5D,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED,GAAG,CAAC,iBAAiB,IAAI,oBAAoB,CAAC,CAAA;IAE9C,OAAO,mBAAmB,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;AAC/D,CAAC;AAED,MAAM,mBAAmB,GAAG,KAAK,EAAE,MAAiB,EAAE,IAAY,EAAE,UAA+B,EAAE,OAAqB,EAA6B,EAAE;IACvJ,oCAAoC;IACpC,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACpD,OAAO,IAAI,CAAC,IAAI,KAAK,IAAI,CAAA;IAC3B,CAAC,CAAC,CAAA;IAEF,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAC7C,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE;QACvD,GAAG,OAAO;QACV,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO;KAC/B,CAAC,CAAA;IAEF,GAAG,CAAC,6BAA6B,SAAS,EAAE,CAAC,CAAA;IAE7C,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,GAAG,EAAE,SAAS;KACf,CAAA;AACH,CAAC,CAAA;AAED,MAAM,0BAA0B,GAAG,KAAK,EAAE,MAAiB,EAAE,IAAY,EAAE,UAA+B,EAAE,OAAmC,EAAuC,EAAE;IACtL,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,wBAAwB,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;IACtF,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAE1C,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;IAC1D,CAAC;IAED,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAA;IAEjH,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAA;IACnC,CAAC;IAED,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IACvC,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAElC,iCAAiC;IACjC,YAAY,CAAC,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;IACxF,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAElC,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,mEAAmE;QACnE,OAAO,IAAI,EAAE,CAAC;YACZ,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACtB,MAAK;YACP,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;YAErC,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrD,MAAK;YACP,CAAC;YAED,uBAAuB;YACvB,IAAI,CAAC,GAAG,EAAE,CAAA;YAEV,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;YAEzC,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;gBACxB,MAAK;YACP,CAAC;YAED,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YAElC,WAAW,CAAC,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAA;YAC3G,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBAC1B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,IAAI,EAAE,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;gBAC9D,KAAK,EAAE,IAAI,CAAC,KAAK;aAClB,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,OAAO,sBAAsB,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;AAC1D,CAAC,CAAA;AAED,MAAM,sBAAsB,GAAG,KAAK,EAAE,MAAiB,EAAE,UAA+B,EAAE,OAAsB,EAA6B,EAAE;IAC7I,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;QAC7B,MAAM,IAAI,sBAAsB,CAAC,iDAAiD,CAAC,CAAA;IACrF,CAAC;IAED,MAAM,QAAQ,GAAW;QACvB,KAAK,EAAE,EAAE;KACV,CAAA;IACD,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;IAE3D,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACzC,CAAC;IAED,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC;QACxC,IAAI,KAAK,GAAG,CAAC,CAAA;QAEb,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;QAE3D,IAAI,IAAI,CAAC,IAAI,YAAY,UAAU,EAAE,CAAC;YACpC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAA;QAC9B,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAA;QACxC,CAAC;QAED,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;YAClB,IAAI,EAAE,KAAK,CAAC,GAAG;YACf,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,KAAK,EAAE,KAAK;SACb,CAAC,CAAA;IACJ,CAAC;IAED,8BAA8B;IAC9B,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACpD,QAAQ,CAAC,IAAI,GAAG,IAAI,MAAM,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAA;IACzG,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEnD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,KAAK,EAAE,UAAU,EAAE;QAC3C,KAAK,EAAE,KAAK;QACZ,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO;QAC9B,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAA;IAEF,OAAO;QACL,GAAG;QACH,IAAI,EAAE,QAAQ;KACf,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"remove-link.js","sourceRoot":"","sources":["../../../../src/commands/utils/remove-link.ts"],"names":[],"mappings":"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"}

package/dist/src/commands/utils/resolve.d.ts

@@ -1,4 +1,4 @@
-import type { GetStore, PutStore } from '../../unixfs.js';
+import type { GetStore, PutStore } from '../../unixfs.ts';
 import type { AbortOptions } from '@libp2p/interface';
 import type { PathEntry } from 'ipfs-unixfs-exporter';
 import type { CID } from 'multiformats/cid';

package/dist/src/commands/utils/resolve.js

@@ -1,10 +1,10 @@
 import { logger } from '@libp2p/logger';
 import { walkPath } from 'ipfs-unixfs-exporter';
 import all from 'it-all';
-import { DoesNotExistError } from '../../errors.js';
-import { addLink } from './add-link.js';
-import { cidToDirectory } from './cid-to-directory.js';
-import { cidToPBLink } from './cid-to-pblink.js';
+import { DoesNotExistError } from "../../errors.js";
+import { addLink } from "./add-link.js";
+import { cidToDirectory } from "./cid-to-directory.js";
+import { cidToPBLink } from "./cid-to-pblink.js";
 const log = logger('helia:unixfs:components:utils:resolve');
 export async function resolve(cid, path, blockstore, options) {
     if (path == null || path === '') {