chore: dedupe load

Author: achingbrain

packages/ipfs-unixfs-exporter/src/resolvers/unixfs-v1/content/directory.ts

@@ -23,22 +23,23 @@ const directoryContent: UnixfsV1Resolver = (cid, node, unixfs, path, resolve, de
           const linkName = link.Name ?? ''
           const linkPath = `${path}/${linkName}`
 
+          const load = async (options = {}) => {
+            const result = await resolve(link.Hash, linkName, linkPath, [], depth + 1, blockstore, options)
+            return result.entry
+          }
+
           if (isBasicExporterOptions(options)) {
             const basic: UnixfsV1BasicContent = {
               cid: link.Hash,
               name: linkName,
               path: linkPath,
-              resolve: async (options = {}) => {
-                const result = await resolve(link.Hash, linkName, linkPath, [], depth + 1, blockstore, options)
-                return result.entry
-              }
+              resolve: load
             }
 
             return basic
           }
 
-          const result = await resolve(link.Hash, linkName, linkPath, [], depth + 1, blockstore, options)
-          return result.entry
+          return load(options)
         }
       }),
       source => parallel(source, {

packages/ipfs-unixfs-exporter/src/resolvers/unixfs-v1/content/hamt-sharded-directory.ts

@@ -6,7 +6,7 @@ import { pipe } from 'it-pipe'
 import { CustomProgressEvent } from 'progress-events'
 import { NotUnixFSError } from '../../../errors.js'
 import { isBasicExporterOptions } from '../../../utils/is-basic-exporter-options.ts'
-import type { ExporterOptions, Resolve, UnixfsV1DirectoryContent, UnixfsV1Resolver, ReadableStorage, ExportWalk, BasicExporterOptions, UnixfsV1BasicContent } from '../../../index.js'
+import type { ExporterOptions, Resolve, UnixfsV1DirectoryContent, UnixfsV1Resolver, ReadableStorage, ExportWalk, BasicExporterOptions } from '../../../index.js'
 import type { PBNode } from '@ipld/dag-pb'
 
 const hamtShardedDirectoryContent: UnixfsV1Resolver = (cid, node, unixfs, path, resolve, depth, blockstore) => {
@@ -49,24 +49,27 @@ async function * listDirectory (node: PBNode, path: string, resolve: Resolve, de
 
         if (name != null && name !== '') {
           const linkPath = `${path}/${name}`
+          const load = async (options = {}) => {
+            const result = await resolve(link.Hash, name, linkPath, [], depth + 1, blockstore, options)
+            return result.entry
+          }
 
           if (isBasicExporterOptions(options)) {
-            const basic: UnixfsV1BasicContent = {
-              cid: link.Hash,
-              name,
-              path: linkPath,
-              resolve: async (options = {}) => {
-                const result = await resolve(link.Hash, name, linkPath, [], depth + 1, blockstore, options)
-                return result.entry
-              }
+            return {
+              entries: [{
+                cid: link.Hash,
+                name,
+                path: linkPath,
+                resolve: load
+              }]
             }
-
-            return { entries: [basic] }
           }
 
-          const result = await resolve(link.Hash, name, linkPath, [], depth + 1, blockstore, options)
-
-          return { entries: result.entry == null ? [] : [result.entry] }
+          return {
+            entries: [
+              await load()
+            ].filter(Boolean)
+          }
         } else {
           // descend into subshard
           const block = await blockstore.get(link.Hash, options)
@@ -76,7 +79,9 @@ async function * listDirectory (node: PBNode, path: string, resolve: Resolve, de
             cid: link.Hash
           }))
 
-          return { entries: listDirectory(node, path, resolve, depth, blockstore, options) }
+          return {
+            entries: listDirectory(node, path, resolve, depth, blockstore, options)
+          }
         }
       }
     }),