Skip to content

fix: prefix filtering in datastore-fs #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+15 −10
Open

fix: prefix filtering in datastore-fs #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
884f719
test: add test to demonstrate bug with prefix
2color Aug 7, 2025
e015899
fix: correct pattern from prefix
2color Aug 7, 2025
e791df3
chore: fix build
2color Aug 8, 2025
0ee794f
test: fix mount datastore test
2color Aug 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/blockstore-s3/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ export class S3Blockstore extends BaseBlockstore {
return new Uint8Array(buf, 0, buf.byteLength)
}

// @ts-expect-error s3 types define their own Blob as an empty interface
return await toBuffer(data.Body)
} catch (err: any) {
if (err.statusCode === 404) {
Expand Down
3 changes: 3 additions & 0 deletions packages/datastore-core/test/mount.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ describe('MountDatastore', () => {
}, {
prefix: new Key('/q'),
datastore: new MemoryDatastore()
}, {
prefix: new Key('/dht/provider/third'),
datastore: new MemoryDatastore()
}])
},
teardown () { }
Expand Down
4 changes: 2 additions & 2 deletions packages/datastore-fs/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ export class FsDatastore extends BaseDatastore {
// strip leading slashes
prefix = prefix.replace(/^\/+/, '')

const pattern = `${prefix}/*${this.extension}`
const pattern = `${prefix}/**/*${this.extension}`
.split(path.sep)
.join('/')
const files = glob(this.path, pattern, {
Expand Down Expand Up @@ -278,7 +278,7 @@ export class FsDatastore extends BaseDatastore {
// strip leading slashes
prefix = prefix.replace(/^\/+/, '')

const pattern = `${prefix}/*${this.extension}`
const pattern = `${prefix}/**/*${this.extension}`
.split(path.sep)
.join('/')
const files = glob(this.path, pattern, {
Expand Down
1 change: 0 additions & 1 deletion packages/datastore-s3/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ export class S3Datastore extends BaseDatastore {
return new Uint8Array(buf, 0, buf.byteLength)
}

// @ts-expect-error s3 types define their own Blob as an empty interface
return await toBuffer(data.Body)
} catch (err: any) {
if (err.statusCode === 404) {
Expand Down
16 changes: 10 additions & 6 deletions packages/interface-datastore-tests/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ export function interfaceDatastoreTests <D extends Datastore = Datastore> (test:
const hello = { key: new Key('/q/1hello'), value: uint8ArrayFromString('1') }
const world = { key: new Key('/z/2world'), value: uint8ArrayFromString('2') }
const hello2 = { key: new Key('/z/3hello2'), value: uint8ArrayFromString('3') }
const many = { key: new Key('/dht/provider/third/bafyyyyy'), value: uint8ArrayFromString('4') }

const filter1: QueryFilter = entry => !entry.key.toString().endsWith('hello')
const filter2: QueryFilter = entry => entry.key.toString().endsWith('hello2')
Expand All @@ -432,14 +433,15 @@ export function interfaceDatastoreTests <D extends Datastore = Datastore> (test:
}

const tests: Array<[string, any, any[] | number]> = [
['empty', {}, [hello, world, hello2]],
['empty', {}, [hello, world, hello2, many]],
['prefix', { prefix: '/z' }, [world, hello2]],
['1 filter', { filters: [filter1] }, [world, hello2]],
['prefix-three-slashes', { prefix: '/dht/provider' }, [many]],
['1 filter', { filters: [filter1] }, [world, hello2, many]],
['2 filters', { filters: [filter1, filter2] }, [hello2]],
['limit', { limit: 1 }, 1],
['offset', { offset: 1 }, 2],
['1 order (1)', { orders: [order1] }, [hello, world, hello2]],
['1 order (reverse 1)', { orders: [order2] }, [hello2, world, hello]]
['offset', { offset: 1 }, 3],
['1 order (1)', { orders: [order1] }, [hello, world, hello2, many]],
['1 order (reverse 1)', { orders: [order2] }, [many, hello2, world, hello]]
]

before(async () => {
Expand All @@ -450,6 +452,7 @@ export function interfaceDatastoreTests <D extends Datastore = Datastore> (test:
b.put(hello.key, hello.value)
b.put(world.key, world.value)
b.put(hello2.key, hello2.value)
b.put(many.key, many.value)

await b.commit()
})
Expand Down Expand Up @@ -511,7 +514,8 @@ export function interfaceDatastoreTests <D extends Datastore = Datastore> (test:
expect(results.map(result => result.key)).to.have.deep.members([
hello.key,
world.key,
hello3.key
hello3.key,
many.key
])
})

Expand Down
Loading