@furystack/mongodb-store 10.1.7 → 11.0.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [11.0.0] - 2026-04-25
+
+### 💥 Breaking Changes
+
+Stores are now first-class DI tokens. See the [v7 migration guide](../../docs/migrations/v7-functional-di.md) for rationale, recipes, and pitfalls.
+
+- Removed `useMongoDb(...)`. Declare the store at module scope with `defineMongoDbStore<T, PK>({ name, model, primaryKey, url, db, collection, options? })`.
+- `MongoClientFactory` is now an exported interface + `defineService({ lifetime: 'singleton' })` token. It pools `MongoClient` instances per URL and closes every pooled client on injector teardown.
+- Dropped the unused `EventHub<{ onClientCreated, onDisposed }>` surface from the factory (no consumers in-repo).
+
 ## [10.1.7] - 2026-04-17
 
 ### ⬆️ Dependencies

package/README.md

@@ -12,19 +12,22 @@ yarn add @furystack/mongodb-store
 
 ## Initialization
 
+`defineMongoDbStore` mints a `StoreToken` backed by a MongoDB collection.
+The shared `MongoClientFactory` singleton pools `MongoClient` instances by
+URL and closes them when the owning injector is disposed.
+
 ```ts
-import { Injector } from '@furystack/inject'
-import { StoreManager } from '@furystack/core'
-import { useMongoDb } from '@furystack/mongodb-store'
+import { createInjector } from '@furystack/inject'
+import { defineMongoDbStore } from '@furystack/mongodb-store'
+import { defineDataSet } from '@furystack/repository'
 
 export class TestEntry {
   declare _id: string
   declare value: string
 }
 
-const myInjector = new Injector()
-useMongoDb({
-  injector: myInjector,
+export const TestEntryStore = defineMongoDbStore<TestEntry, '_id'>({
+  name: 'my-app/TestEntryStore',
   model: TestEntry,
   primaryKey: '_id',
   url: 'mongodb://localhost:27017',
@@ -32,7 +35,17 @@ useMongoDb({
   collection: 'TestEntries',
 })
 
-const myMongoStore = myInjector.getInstance(StoreManager).getStoreFor(TestEntry, '_id')
+export const TestEntryDataSet = defineDataSet({
+  name: 'my-app/TestEntryDataSet',
+  store: TestEntryStore,
+})
+
+const myInjector = createInjector()
+const dataSet = myInjector.get(TestEntryDataSet)
 ```
 
-> **Tip:** For application-level data access, wrap the physical store with a Repository DataSet using `getRepository(injector).createDataSet(Model, 'primaryKey')` and then use `getDataSetFor(injector, Model, 'primaryKey')` from `@furystack/repository`. This ensures authorization, hooks, and entity sync events are properly triggered.
+> **Tip:** For application-level data access, always go through a
+> `DataSetToken` rather than resolving the `StoreToken` directly. The
+> DataSet layer runs authorization, modification hooks, and entity-sync
+> events; a direct store access skips all of them. The
+> `furystack/no-direct-store-token` lint rule guards against this.

package/esm/define-mongodb-store.d.ts

@@ -0,0 +1,43 @@
+import type { Constructable, StoreToken } from '@furystack/core';
+import type { MongoClientOptions } from 'mongodb';
+/**
+ * Options accepted by {@link defineMongoDbStore}.
+ */
+export type DefineMongoDbStoreOptions<T extends object, TPrimaryKey extends keyof T> = {
+    /** Human-readable token name used for debug/readability. */
+    name: string;
+    /** Entity model constructor. */
+    model: Constructable<T>;
+    /** Primary key field name. */
+    primaryKey: TPrimaryKey;
+    /** MongoDB deployment URL (e.g. `mongodb://localhost:27017`). */
+    url: string;
+    /** MongoDB database name. */
+    db: string;
+    /** MongoDB collection name. */
+    collection: string;
+    /** Optional {@link MongoClientOptions}. */
+    options?: MongoClientOptions;
+};
+/**
+ * Mints a singleton {@link StoreToken} backed by a {@link MongodbStore}.
+ *
+ * Internally resolves the singleton {@link MongoClientFactory} so every store
+ * declared against the same `url` shares one {@link MongoClient}. Declare the
+ * token once at module scope — inline calls mint new identities and defeat
+ * singleton caching.
+ *
+ * @example
+ * ```ts
+ * export const UserStore = defineMongoDbStore({
+ *   name: 'my-app/UserStore',
+ *   model: User,
+ *   primaryKey: 'username',
+ *   url: 'mongodb://localhost:27017',
+ *   db: 'my-app',
+ *   collection: 'users',
+ * })
+ * ```
+ */
+export declare const defineMongoDbStore: <T extends object, const TPrimaryKey extends keyof T>(options: DefineMongoDbStoreOptions<T, TPrimaryKey>) => StoreToken<T, TPrimaryKey>;
+//# sourceMappingURL=define-mongodb-store.d.ts.map

package/esm/define-mongodb-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"define-mongodb-store.d.ts","sourceRoot":"","sources":["../src/define-mongodb-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEhE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAIjD;;GAEG;AACH,MAAM,MAAM,yBAAyB,CAAC,CAAC,SAAS,MAAM,EAAE,WAAW,SAAS,MAAM,CAAC,IAAI;IACrF,4DAA4D;IAC5D,IAAI,EAAE,MAAM,CAAA;IACZ,gCAAgC;IAChC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,CAAA;IACvB,8BAA8B;IAC9B,UAAU,EAAE,WAAW,CAAA;IACvB,iEAAiE;IACjE,GAAG,EAAE,MAAM,CAAA;IACX,6BAA6B;IAC7B,EAAE,EAAE,MAAM,CAAA;IACV,+BAA+B;IAC/B,UAAU,EAAE,MAAM,CAAA;IAClB,2CAA2C;IAC3C,OAAO,CAAC,EAAE,kBAAkB,CAAA;CAC7B,CAAA;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,MAAM,EAAE,KAAK,CAAC,WAAW,SAAS,MAAM,CAAC,EACpF,SAAS,yBAAyB,CAAC,CAAC,EAAE,WAAW,CAAC,KACjD,UAAU,CAAC,CAAC,EAAE,WAAW,CAexB,CAAA"}

package/esm/define-mongodb-store.js

@@ -0,0 +1,39 @@
+import { defineStore } from '@furystack/core';
+import { MongoClientFactory } from './mongo-client-factory.js';
+import { MongodbStore } from './mongodb-store.js';
+/**
+ * Mints a singleton {@link StoreToken} backed by a {@link MongodbStore}.
+ *
+ * Internally resolves the singleton {@link MongoClientFactory} so every store
+ * declared against the same `url` shares one {@link MongoClient}. Declare the
+ * token once at module scope — inline calls mint new identities and defeat
+ * singleton caching.
+ *
+ * @example
+ * ```ts
+ * export const UserStore = defineMongoDbStore({
+ *   name: 'my-app/UserStore',
+ *   model: User,
+ *   primaryKey: 'username',
+ *   url: 'mongodb://localhost:27017',
+ *   db: 'my-app',
+ *   collection: 'users',
+ * })
+ * ```
+ */
+export const defineMongoDbStore = (options) => defineStore({
+    name: options.name,
+    model: options.model,
+    primaryKey: options.primaryKey,
+    factory: ({ inject }) => {
+        const factory = inject(MongoClientFactory);
+        return new MongodbStore({
+            model: options.model,
+            primaryKey: options.primaryKey,
+            db: options.db,
+            collection: options.collection,
+            mongoClient: () => factory.getClientFor(options.url, options.options),
+        });
+    },
+});
+//# sourceMappingURL=define-mongodb-store.js.map

package/esm/define-mongodb-store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"define-mongodb-store.js","sourceRoot":"","sources":["../src/define-mongodb-store.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAE7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAsBjD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,OAAkD,EACtB,EAAE,CAC9B,WAAW,CAAiB;IAC1B,IAAI,EAAE,OAAO,CAAC,IAAI;IAClB,KAAK,EAAE,OAAO,CAAC,KAAK;IACpB,UAAU,EAAE,OAAO,CAAC,UAAU;IAC9B,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;QACtB,MAAM,OAAO,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAA;QAC1C,OAAO,IAAI,YAAY,CAAiB;YACtC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,WAAW,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC;SACtE,CAAC,CAAA;IACJ,CAAC;CACF,CAAC,CAAA"}

package/esm/define-mongodb-store.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=define-mongodb-store.spec.d.ts.map

package/esm/define-mongodb-store.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"define-mongodb-store.spec.d.ts","sourceRoot":"","sources":["../src/define-mongodb-store.spec.ts"],"names":[],"mappings":""}

package/esm/define-mongodb-store.spec.js

@@ -0,0 +1,93 @@
+import { createInjector } from '@furystack/inject';
+import { describe, expect, it, vi } from 'vitest';
+import { defineMongoDbStore } from './define-mongodb-store.js';
+import { MongoClientFactory } from './mongo-client-factory.js';
+import { MongodbStore } from './mongodb-store.js';
+class Item {
+}
+describe('defineMongoDbStore (metadata)', () => {
+    it('propagates name, lifetime, model and primaryKey onto the returned token', () => {
+        const token = defineMongoDbStore({
+            name: 'test/MongoItems',
+            model: Item,
+            primaryKey: 'id',
+            url: 'mongodb://localhost:27017',
+            db: 'unit-test',
+            collection: 'items',
+        });
+        expect(token.name).toBe('test/MongoItems');
+        expect(token.lifetime).toBe('singleton');
+        expect(token.model).toBe(Item);
+        expect(token.primaryKey).toBe('id');
+    });
+    it('mints a distinct token identity per call even when options match -- declare once at module scope', () => {
+        const options = {
+            name: 'test/MongoDupe',
+            model: Item,
+            primaryKey: 'id',
+            url: 'mongodb://localhost:27017',
+            db: 'unit-test',
+            collection: 'items',
+        };
+        const a = defineMongoDbStore(options);
+        const b = defineMongoDbStore(options);
+        expect(a.id).not.toBe(b.id);
+    });
+});
+describe('defineMongoDbStore (factory + disposal)', () => {
+    const buildClientStub = () => {
+        const createIndex = vi.fn(() => Promise.resolve('id_1'));
+        const collection = vi.fn(() => ({ createIndex }));
+        const db = vi.fn(() => ({ collection }));
+        const client = { db };
+        return { client, db, collection, createIndex };
+    };
+    it('instantiates a MongodbStore whose lazy client pulls from the injected MongoClientFactory with the right url', async () => {
+        const { client, db, collection, createIndex } = buildClientStub();
+        const getClientFor = vi.fn(() => client);
+        const Token = defineMongoDbStore({
+            name: 'test/MongoFactory',
+            model: Item,
+            primaryKey: 'id',
+            url: 'mongodb://stub-host:1234',
+            db: 'unit-db',
+            collection: 'unit-coll',
+            options: { appName: 'spec' },
+        });
+        const injector = createInjector();
+        injector.bind(MongoClientFactory, () => ({ getClientFor }));
+        try {
+            const store = injector.get(Token);
+            expect(store).toBeInstanceOf(MongodbStore);
+            expect(store.model).toBe(Item);
+            expect(store.primaryKey).toBe('id');
+            expect(getClientFor).not.toHaveBeenCalled();
+            await store.getCollection();
+            expect(getClientFor).toHaveBeenCalledTimes(1);
+            expect(getClientFor).toHaveBeenCalledWith('mongodb://stub-host:1234', { appName: 'spec' });
+            expect(db).toHaveBeenCalledWith('unit-db');
+            expect(collection).toHaveBeenCalledWith('unit-coll');
+            expect(createIndex).toHaveBeenCalledWith({ id: 1 }, { unique: true });
+        }
+        finally {
+            await injector[Symbol.asyncDispose]();
+        }
+    });
+    it('disposing the injector tears down the bound MongoClientFactory', async () => {
+        const { client } = buildClientStub();
+        const getClientFor = vi.fn(() => client);
+        const Token = defineMongoDbStore({
+            name: 'test/MongoDispose',
+            model: Item,
+            primaryKey: 'id',
+            url: 'mongodb://stub-host:1234',
+            db: 'unit-db',
+            collection: 'unit-coll',
+        });
+        const injector = createInjector();
+        injector.bind(MongoClientFactory, () => ({ getClientFor }));
+        injector.get(Token);
+        await expect(injector[Symbol.asyncDispose]()).resolves.toBeUndefined();
+    });
+});
+//# sourceMappingURL=define-mongodb-store.spec.js.map

package/esm/define-mongodb-store.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"define-mongodb-store.spec.js","sourceRoot":"","sources":["../src/define-mongodb-store.spec.ts"],"names":[],"mappings":"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"}

package/esm/index.d.ts

@@ -1,3 +1,4 @@
+export * from './define-mongodb-store.js';
+export * from './mongo-client-factory.js';
 export * from './mongodb-store.js';
-export * from './store-manager-helpers.js';
 //# sourceMappingURL=index.d.ts.map

package/esm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,4BAA4B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAA;AACzC,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA"}

package/esm/index.js

@@ -1,3 +1,4 @@
+export * from './define-mongodb-store.js';
+export * from './mongo-client-factory.js';
 export * from './mongodb-store.js';
-export * from './store-manager-helpers.js';
 //# sourceMappingURL=index.js.map

package/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,4BAA4B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAA;AACzC,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA"}

package/esm/mongo-client-factory.d.ts

@@ -1,22 +1,20 @@
-import { EventHub, type ListenerErrorPayload } from '@furystack/utils';
+import type { Token } from '@furystack/inject';
 import type { MongoClientOptions } from 'mongodb';
 import { MongoClient } from 'mongodb';
 /**
- * Events emitted by the {@link MongoClientFactory}
+ * Pools {@link MongoClient} instances by URL so every store that targets the
+ * same MongoDB deployment shares a single connection.
+ *
+ * Application code rarely calls this directly — {@link defineMongoDbStore}
+ * resolves the factory token internally. Exported for tests and advanced
+ * integrations that need raw client access (e.g. dropping a test database).
  */
-export type MongoClientFactoryEvents = {
-    onClientCreated: {
-        url: string;
-    };
-    onDisposed: undefined;
-    onListenerError: ListenerErrorPayload;
-};
-/**
- * Factory for instantiating MongoDb clients
- */
-export declare class MongoClientFactory extends EventHub<MongoClientFactoryEvents> implements AsyncDisposable {
-    private connections;
-    [Symbol.asyncDispose](): Promise<void>;
+export interface MongoClientFactory {
     getClientFor(url: string, options?: MongoClientOptions): MongoClient;
 }
+/**
+ * Singleton token for the {@link MongoClientFactory}. Closes every pooled
+ * client when the owning injector is disposed.
+ */
+export declare const MongoClientFactory: Token<MongoClientFactory, 'singleton'>;
 //# sourceMappingURL=mongo-client-factory.d.ts.map

package/esm/mongo-client-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mongo-client-factory.d.ts","sourceRoot":"","sources":["../src/mongo-client-factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AACtE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAErC;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG;IACrC,eAAe,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;IAChC,UAAU,EAAE,SAAS,CAAA;IACrB,eAAe,EAAE,oBAAoB,CAAA;CACtC,CAAA;AAED;;GAEG;AACH,qBACa,kBAAmB,SAAQ,QAAQ,CAAC,wBAAwB,CAAE,YAAW,eAAe;IACnG,OAAO,CAAC,WAAW,CAAsC;IAE5C,CAAC,MAAM,CAAC,YAAY,CAAC;IAO3B,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB;CAW9D"}
+{"version":3,"file":"mongo-client-factory.d.ts","sourceRoot":"","sources":["../src/mongo-client-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAErC;;;;;;;GAOG;AACH,MAAM,WAAW,kBAAkB;IACjC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,WAAW,CAAA;CACrE;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,kBAAkB,EAAE,WAAW,CAqBpE,CAAA"}

package/esm/mongo-client-factory.js

@@ -1,36 +1,29 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { Injectable } from '@furystack/inject';
-import { EventHub } from '@furystack/utils';
+import { defineService } from '@furystack/inject';
 import { MongoClient } from 'mongodb';
 /**
- * Factory for instantiating MongoDb clients
+ * Singleton token for the {@link MongoClientFactory}. Closes every pooled
+ * client when the owning injector is disposed.
  */
-let MongoClientFactory = class MongoClientFactory extends EventHub {
-    connections = new Map();
-    async [Symbol.asyncDispose]() {
-        await Promise.all([...this.connections.values()].map((c) => c.close(true)));
-        this.connections.clear();
-        this.emit('onDisposed', undefined);
-        super[Symbol.dispose]();
-    }
-    getClientFor(url, options) {
-        const existing = this.connections.get(url);
-        if (existing) {
-            return existing;
-        }
-        const client = new MongoClient(url, options);
-        this.connections.set(url, client);
-        this.emit('onClientCreated', { url });
-        return client;
-    }
-};
-MongoClientFactory = __decorate([
-    Injectable({ lifetime: 'singleton' })
-], MongoClientFactory);
-export { MongoClientFactory };
+export const MongoClientFactory = defineService({
+    name: '@furystack/mongodb-store/MongoClientFactory',
+    lifetime: 'singleton',
+    factory: ({ onDispose }) => {
+        const connections = new Map();
+        onDispose(async () => {
+            await Promise.all([...connections.values()].map((c) => c.close(true)));
+            connections.clear();
+        });
+        return {
+            getClientFor(url, options) {
+                const existing = connections.get(url);
+                if (existing) {
+                    return existing;
+                }
+                const client = new MongoClient(url, options);
+                connections.set(url, client);
+                return client;
+            },
+        };
+    },
+});
 //# sourceMappingURL=mongo-client-factory.js.map

package/esm/mongo-client-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"mongo-client-factory.js","sourceRoot":"","sources":["../src/mongo-client-factory.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAA6B,MAAM,kBAAkB,CAAA;AAEtE,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAWrC;;GAEG;AAEI,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,QAAkC;IAChE,WAAW,GAA6B,IAAI,GAAG,EAAE,CAAA;IAElD,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;QAChC,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAC3E,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAA;QACxB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;QAClC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAA;IACzB,CAAC;IAEM,YAAY,CAAC,GAAW,EAAE,OAA4B;QAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC1C,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAA;QACjB,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QAC5C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QACjC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;QACrC,OAAO,MAAM,CAAA;IACf,CAAC;CACF,CAAA;AArBY,kBAAkB;IAD9B,UAAU,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;GACzB,kBAAkB,CAqB9B"}
+{"version":3,"file":"mongo-client-factory.js","sourceRoot":"","sources":["../src/mongo-client-factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAcrC;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAA2C,aAAa,CAAC;IACtF,IAAI,EAAE,6CAA6C;IACnD,QAAQ,EAAE,WAAW;IACrB,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;QACzB,MAAM,WAAW,GAAG,IAAI,GAAG,EAAuB,CAAA;QAClD,SAAS,CAAC,KAAK,IAAI,EAAE;YACnB,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YACtE,WAAW,CAAC,KAAK,EAAE,CAAA;QACrB,CAAC,CAAC,CAAA;QACF,OAAO;YACL,YAAY,CAAC,GAAW,EAAE,OAA4B;gBACpD,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;gBACrC,IAAI,QAAQ,EAAE,CAAC;oBACb,OAAO,QAAQ,CAAA;gBACjB,CAAC;gBACD,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;gBAC5C,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;gBAC5B,OAAO,MAAM,CAAA;YACf,CAAC;SACF,CAAA;IACH,CAAC;CACF,CAAC,CAAA"}

package/esm/mongodb-store.d.ts

@@ -1,5 +1,4 @@
-import type { CreateResult, FilterType, FindOptions, PartialResult, PhysicalStore, WithOptionalId } from '@furystack/core';
-import type { Constructable } from '@furystack/inject';
+import type { Constructable, CreateResult, FilterType, FindOptions, PartialResult, PhysicalStore, WithOptionalId } from '@furystack/core';
 import { EventHub } from '@furystack/utils';
 import type { Collection, MongoClient } from 'mongodb';
 /**

package/esm/mongodb-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mongodb-store.d.ts","sourceRoot":"","sources":["../src/mongodb-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EACV,WAAW,EACX,aAAa,EACb,aAAa,EACb,cAAc,EACf,MAAM,iBAAiB,CAAA;AACxB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAU,WAAW,EAAgD,MAAM,SAAS,CAAA;AAQ5G;;GAEG;AACH,qBAAa,YAAY,CACvB,CAAC,SAAS,MAAM,EAChB,WAAW,SAAS,MAAM,CAAC,EAC3B,cAAc,GAAG,cAAc,CAAC,CAAC,EAAE,WAAW,CAAC,CAE/C,SAAQ,QAAQ,CAAC;IACf,aAAa,EAAE;QAAE,MAAM,EAAE,CAAC,CAAA;KAAE,CAAA;IAC5B,eAAe,EAAE;QAAE,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;KAAE,CAAA;IAC3D,eAAe,EAAE;QAAE,GAAG,EAAE,CAAC,CAAC,WAAW,CAAC,CAAA;KAAE,CAAA;CACzC,CACD,YAAW,aAAa,CAAC,CAAC,EAAE,WAAW,EAAE,cAAc,CAAC;IA+EtD,OAAO,CAAC,QAAQ,CAAC,OAAO;IA7E1B,SAAgB,UAAU,EAAE,WAAW,CAAA;IACvC,SAAgB,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,CAAA;IACvC,OAAO,CAAC,WAAW,CAAsC;IACzD,OAAO,CAAC,UAAU,CAAC,CAAe;IAElC,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,iBAAiB;IAWzB,OAAO,CAAC,WAAW;IA0BN,aAAa,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAUtC,oBAAoB;gBAgBf,OAAO,EAAE;QACxB,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,CAAA;QACvB,UAAU,EAAE,WAAW,CAAA;QACvB,EAAE,EAAE,MAAM,CAAA;QACV,UAAU,EAAE,MAAM,CAAA;QAClB,WAAW,EAAE,MAAM,WAAW,CAAA;KAC/B;IAOU,GAAG,CAAC,GAAG,OAAO,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAmB3D,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAS3D,KAAK,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAK9C,IAAI,CAAC,OAAO,SAAS,KAAK,CAAC,MAAM,CAAC,CAAC,EAC9C,MAAM,EAAE,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAe5C,OAAO,CAAC,aAAa;IAOR,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAOzE,MAAM,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAKnE"}
+{"version":3,"file":"mongodb-store.d.ts","sourceRoot":"","sources":["../src/mongodb-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,YAAY,EACZ,UAAU,EACV,WAAW,EACX,aAAa,EACb,aAAa,EACb,cAAc,EACf,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAU,WAAW,EAAgD,MAAM,SAAS,CAAA;AAQ5G;;GAEG;AACH,qBAAa,YAAY,CACvB,CAAC,SAAS,MAAM,EAChB,WAAW,SAAS,MAAM,CAAC,EAC3B,cAAc,GAAG,cAAc,CAAC,CAAC,EAAE,WAAW,CAAC,CAE/C,SAAQ,QAAQ,CAAC;IACf,aAAa,EAAE;QAAE,MAAM,EAAE,CAAC,CAAA;KAAE,CAAA;IAC5B,eAAe,EAAE;QAAE,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;KAAE,CAAA;IAC3D,eAAe,EAAE;QAAE,GAAG,EAAE,CAAC,CAAC,WAAW,CAAC,CAAA;KAAE,CAAA;CACzC,CACD,YAAW,aAAa,CAAC,CAAC,EAAE,WAAW,EAAE,cAAc,CAAC;IA+EtD,OAAO,CAAC,QAAQ,CAAC,OAAO;IA7E1B,SAAgB,UAAU,EAAE,WAAW,CAAA;IACvC,SAAgB,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,CAAA;IACvC,OAAO,CAAC,WAAW,CAAsC;IACzD,OAAO,CAAC,UAAU,CAAC,CAAe;IAElC,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,iBAAiB;IAWzB,OAAO,CAAC,WAAW;IA0BN,aAAa,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAUtC,oBAAoB;gBAgBf,OAAO,EAAE;QACxB,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,CAAA;QACvB,UAAU,EAAE,WAAW,CAAA;QACvB,EAAE,EAAE,MAAM,CAAA;QACV,UAAU,EAAE,MAAM,CAAA;QAClB,WAAW,EAAE,MAAM,WAAW,CAAA;KAC/B;IAOU,GAAG,CAAC,GAAG,OAAO,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAmB3D,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAS3D,KAAK,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAK9C,IAAI,CAAC,OAAO,SAAS,KAAK,CAAC,MAAM,CAAC,CAAC,EAC9C,MAAM,EAAE,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAe5C,OAAO,CAAC,aAAa;IAOR,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAOzE,MAAM,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAKnE"}

package/esm/mongodb-store.spec.js

@@ -1,18 +1,16 @@
-import { StoreManager } from '@furystack/core';
 import { TestClass, createStoreTest } from '@furystack/core/create-physical-store-tests';
-import { Injector } from '@furystack/inject';
+import { createInjector } from '@furystack/inject';
 import { usingAsync } from '@furystack/utils';
-import { describe, expect, it, vi } from 'vitest';
+import { describe, expect, it } from 'vitest';
+import { defineMongoDbStore } from './define-mongodb-store.js';
 import { MongoClientFactory } from './mongo-client-factory.js';
-import { useMongoDb } from './store-manager-helpers.js';
 class TestClassWithId {
 }
 let storeCount = 0;
 const mongoDbUrl = process?.env?.MONGODB_URL || 'mongodb://localhost:27017';
 describe('MongoDB Store', () => {
     let dbIdx = 0;
-    const getMongoOptions = (injector) => ({
-        injector,
+    const getMongoOptions = () => ({
         model: TestClass,
         primaryKey: 'id',
         collection: `furystack-mongo-store-tests-${storeCount++}`,
@@ -24,12 +22,15 @@ describe('MongoDB Store', () => {
         typeName: 'mongodb-store',
         skipStringTests: true,
         createStore: (i) => {
-            const mongoOptions = getMongoOptions(i);
-            useMongoDb(mongoOptions);
-            const store = i.getInstance(StoreManager).getStoreFor(TestClass, 'id');
+            const mongoOptions = getMongoOptions();
+            const token = defineMongoDbStore({
+                name: `mongodb-store/${mongoOptions.collection}`,
+                ...mongoOptions,
+            });
+            const store = i.get(token);
             const oldDispose = i[Symbol.asyncDispose];
             i[Symbol.asyncDispose] = async () => {
-                const client = i.getInstance(MongoClientFactory).getClientFor(mongoOptions.url, mongoOptions.options);
+                const client = i.get(MongoClientFactory).getClientFor(mongoOptions.url, mongoOptions.options);
                 const db = client.db(mongoOptions.db);
                 await db.dropDatabase();
                 await oldDispose.call(i);
@@ -38,19 +39,22 @@ describe('MongoDB Store', () => {
         },
     });
     const createTestClassWithIdStore = (injector) => {
-        const mongoOptions = { ...getMongoOptions(injector), model: TestClassWithId, primaryKey: '_id' };
-        useMongoDb(mongoOptions);
+        const mongoOptions = { ...getMongoOptions(), model: TestClassWithId, primaryKey: '_id' };
+        const token = defineMongoDbStore({
+            name: `mongodb-store/${mongoOptions.collection}`,
+            ...mongoOptions,
+        });
         const oldDispose = injector[Symbol.asyncDispose];
         injector[Symbol.asyncDispose] = async () => {
-            const client = injector.getInstance(MongoClientFactory).getClientFor(mongoOptions.url, mongoOptions.options);
+            const client = injector.get(MongoClientFactory).getClientFor(mongoOptions.url, mongoOptions.options);
             const db = client.db(mongoOptions.db);
             await db.dropDatabase();
             await oldDispose.call(injector);
         };
-        return injector.getInstance(StoreManager).getStoreFor(TestClassWithId, '_id');
+        return injector.get(token);
     };
     it('Should retrieve an entity with its id', async () => {
-        await usingAsync(new Injector(), async (injector) => {
+        await usingAsync(createInjector(), async (injector) => {
             const store = createTestClassWithIdStore(injector);
             const { created } = await store.add({ value: 'value1' });
             expect(typeof created[0]._id).toBe('string');
@@ -59,7 +63,7 @@ describe('MongoDB Store', () => {
         });
     });
     it('Should retrieve more entities with theis ids', async () => {
-        await usingAsync(new Injector(), async (injector) => {
+        await usingAsync(createInjector(), async (injector) => {
             const store = createTestClassWithIdStore(injector);
             const { created } = await store.add({ value: 'value1' }, { value: 'value2' }, { value: 'value3' });
             const retrieved = await store.find({ filter: { _id: { $in: created.map((c) => c._id) } } });
@@ -68,7 +72,7 @@ describe('MongoDB Store', () => {
         });
     });
     it('Should filter by _id as a string', async () => {
-        await usingAsync(new Injector(), async (injector) => {
+        await usingAsync(createInjector(), async (injector) => {
             const store = createTestClassWithIdStore(injector);
             const { created } = await store.add({ value: 'value1' });
             const retrieved = await store.find({ filter: { _id: { $eq: created[0]._id } } });
@@ -77,7 +81,7 @@ describe('MongoDB Store', () => {
         });
     });
     it('Should filter by _id.$eq as a string', async () => {
-        await usingAsync(new Injector(), async (injector) => {
+        await usingAsync(createInjector(), async (injector) => {
             const store = createTestClassWithIdStore(injector);
             const { created } = await store.add({ value: 'value1' });
             const retrieved = await store.find({ filter: { _id: { $eq: created[0]._id } } });
@@ -86,7 +90,7 @@ describe('MongoDB Store', () => {
         });
     });
     it('Should filter by _id.$in as array of strings', async () => {
-        await usingAsync(new Injector(), async (injector) => {
+        await usingAsync(createInjector(), async (injector) => {
             const store = createTestClassWithIdStore(injector);
             const { created } = await store.add({ value: 'value1' }, { value: 'value2' });
             const ids = created.map((c) => c._id);
@@ -96,7 +100,7 @@ describe('MongoDB Store', () => {
         });
     });
     it('Should filter by _id.$nin as array of strings', async () => {
-        await usingAsync(new Injector(), async (injector) => {
+        await usingAsync(createInjector(), async (injector) => {
             const store = createTestClassWithIdStore(injector);
             const { created } = await store.add({ value: 'value1' }, { value: 'value2' });
             const ids = created.map((c) => c._id);
@@ -106,7 +110,7 @@ describe('MongoDB Store', () => {
         });
     });
     it('Should filter by a non-_id field', async () => {
-        await usingAsync(new Injector(), async (injector) => {
+        await usingAsync(createInjector(), async (injector) => {
             const store = createTestClassWithIdStore(injector);
             await store.add({ value: 'value1' }, { value: 'value2' });
             const retrieved = await store.find({ filter: { value: { $eq: 'value2' } } });
@@ -115,32 +119,4 @@ describe('MongoDB Store', () => {
         });
     });
 });
-describe('MongoClientFactory EventHub', () => {
-    it('should emit onClientCreated when a new client is created', async () => {
-        const factory = new MongoClientFactory();
-        try {
-            const handler = vi.fn();
-            factory.addListener('onClientCreated', handler);
-            factory.getClientFor('mongodb://localhost:27017/test-db');
-            expect(handler).toHaveBeenCalledTimes(1);
-            expect(handler).toHaveBeenCalledWith({ url: 'mongodb://localhost:27017/test-db' });
-        }
-        finally {
-            await factory[Symbol.asyncDispose]();
-        }
-    });
-    it('should not emit onClientCreated when returning an existing client', async () => {
-        const factory = new MongoClientFactory();
-        try {
-            const handler = vi.fn();
-            factory.getClientFor('mongodb://localhost:27017/test-db');
-            factory.addListener('onClientCreated', handler);
-            factory.getClientFor('mongodb://localhost:27017/test-db');
-            expect(handler).not.toHaveBeenCalled();
-        }
-        finally {
-            await factory[Symbol.asyncDispose]();
-        }
-    });
-});
 //# sourceMappingURL=mongodb-store.spec.js.map

package/esm/mongodb-store.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"mongodb-store.spec.js","sourceRoot":"","sources":["../src/mongodb-store.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mongodb-store.spec.js","sourceRoot":"","sources":["../src/mongodb-store.spec.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@furystack/mongodb-store",
-  "version": "10.1.7",
+  "version": "11.0.0",
   "description": "MongoDB Store implementation for FuryStack",
   "type": "module",
   "scripts": {
@@ -38,9 +38,9 @@
   },
   "homepage": "https://github.com/furystack/furystack",
   "dependencies": {
-    "@furystack/core": "^16.0.4",
-    "@furystack/inject": "^12.0.36",
-    "@furystack/utils": "^8.2.5",
+    "@furystack/core": "^17.0.0",
+    "@furystack/inject": "^13.0.0",
+    "@furystack/utils": "^9.0.0",
     "mongodb": "7.1.1"
   },
   "devDependencies": {

package/src/define-mongodb-store.spec.ts

@@ -0,0 +1,108 @@
+import { createInjector } from '@furystack/inject'
+import type { MongoClient } from 'mongodb'
+import { describe, expect, it, vi } from 'vitest'
+import { defineMongoDbStore } from './define-mongodb-store.js'
+import { MongoClientFactory } from './mongo-client-factory.js'
+import { MongodbStore } from './mongodb-store.js'
+
+class Item {
+  declare id: string
+  declare value: string
+}
+
+describe('defineMongoDbStore (metadata)', () => {
+  it('propagates name, lifetime, model and primaryKey onto the returned token', () => {
+    const token = defineMongoDbStore<Item, 'id'>({
+      name: 'test/MongoItems',
+      model: Item,
+      primaryKey: 'id',
+      url: 'mongodb://localhost:27017',
+      db: 'unit-test',
+      collection: 'items',
+    })
+    expect(token.name).toBe('test/MongoItems')
+    expect(token.lifetime).toBe('singleton')
+    expect(token.model).toBe(Item)
+    expect(token.primaryKey).toBe('id')
+  })
+
+  it('mints a distinct token identity per call even when options match -- declare once at module scope', () => {
+    const options = {
+      name: 'test/MongoDupe',
+      model: Item,
+      primaryKey: 'id' as const,
+      url: 'mongodb://localhost:27017',
+      db: 'unit-test',
+      collection: 'items',
+    }
+    const a = defineMongoDbStore<Item, 'id'>(options)
+    const b = defineMongoDbStore<Item, 'id'>(options)
+    expect(a.id).not.toBe(b.id)
+  })
+})
+
+describe('defineMongoDbStore (factory + disposal)', () => {
+  const buildClientStub = () => {
+    const createIndex = vi.fn<() => Promise<string>>(() => Promise.resolve('id_1'))
+    const collection = vi.fn(() => ({ createIndex }))
+    const db = vi.fn(() => ({ collection }))
+    const client = { db } as unknown as MongoClient
+    return { client, db, collection, createIndex }
+  }
+
+  it('instantiates a MongodbStore whose lazy client pulls from the injected MongoClientFactory with the right url', async () => {
+    const { client, db, collection, createIndex } = buildClientStub()
+    const getClientFor = vi.fn(() => client)
+
+    const Token = defineMongoDbStore<Item, 'id'>({
+      name: 'test/MongoFactory',
+      model: Item,
+      primaryKey: 'id',
+      url: 'mongodb://stub-host:1234',
+      db: 'unit-db',
+      collection: 'unit-coll',
+      options: { appName: 'spec' },
+    })
+
+    const injector = createInjector()
+    injector.bind(MongoClientFactory, () => ({ getClientFor }))
+
+    try {
+      const store = injector.get(Token) as MongodbStore<Item, 'id'>
+      expect(store).toBeInstanceOf(MongodbStore)
+      expect(store.model).toBe(Item)
+      expect(store.primaryKey).toBe('id')
+      expect(getClientFor).not.toHaveBeenCalled()
+
+      await store.getCollection()
+
+      expect(getClientFor).toHaveBeenCalledTimes(1)
+      expect(getClientFor).toHaveBeenCalledWith('mongodb://stub-host:1234', { appName: 'spec' })
+      expect(db).toHaveBeenCalledWith('unit-db')
+      expect(collection).toHaveBeenCalledWith('unit-coll')
+      expect(createIndex).toHaveBeenCalledWith({ id: 1 }, { unique: true })
+    } finally {
+      await injector[Symbol.asyncDispose]()
+    }
+  })
+
+  it('disposing the injector tears down the bound MongoClientFactory', async () => {
+    const { client } = buildClientStub()
+    const getClientFor = vi.fn(() => client)
+
+    const Token = defineMongoDbStore<Item, 'id'>({
+      name: 'test/MongoDispose',
+      model: Item,
+      primaryKey: 'id',
+      url: 'mongodb://stub-host:1234',
+      db: 'unit-db',
+      collection: 'unit-coll',
+    })
+
+    const injector = createInjector()
+    injector.bind(MongoClientFactory, () => ({ getClientFor }))
+
+    injector.get(Token)
+    await expect(injector[Symbol.asyncDispose]()).resolves.toBeUndefined()
+  })
+})

package/src/define-mongodb-store.ts

@@ -0,0 +1,64 @@
+import type { Constructable, StoreToken } from '@furystack/core'
+import { defineStore } from '@furystack/core'
+import type { MongoClientOptions } from 'mongodb'
+import { MongoClientFactory } from './mongo-client-factory.js'
+import { MongodbStore } from './mongodb-store.js'
+
+/**
+ * Options accepted by {@link defineMongoDbStore}.
+ */
+export type DefineMongoDbStoreOptions<T extends object, TPrimaryKey extends keyof T> = {
+  /** Human-readable token name used for debug/readability. */
+  name: string
+  /** Entity model constructor. */
+  model: Constructable<T>
+  /** Primary key field name. */
+  primaryKey: TPrimaryKey
+  /** MongoDB deployment URL (e.g. `mongodb://localhost:27017`). */
+  url: string
+  /** MongoDB database name. */
+  db: string
+  /** MongoDB collection name. */
+  collection: string
+  /** Optional {@link MongoClientOptions}. */
+  options?: MongoClientOptions
+}
+
+/**
+ * Mints a singleton {@link StoreToken} backed by a {@link MongodbStore}.
+ *
+ * Internally resolves the singleton {@link MongoClientFactory} so every store
+ * declared against the same `url` shares one {@link MongoClient}. Declare the
+ * token once at module scope — inline calls mint new identities and defeat
+ * singleton caching.
+ *
+ * @example
+ * ```ts
+ * export const UserStore = defineMongoDbStore({
+ *   name: 'my-app/UserStore',
+ *   model: User,
+ *   primaryKey: 'username',
+ *   url: 'mongodb://localhost:27017',
+ *   db: 'my-app',
+ *   collection: 'users',
+ * })
+ * ```
+ */
+export const defineMongoDbStore = <T extends object, const TPrimaryKey extends keyof T>(
+  options: DefineMongoDbStoreOptions<T, TPrimaryKey>,
+): StoreToken<T, TPrimaryKey> =>
+  defineStore<T, TPrimaryKey>({
+    name: options.name,
+    model: options.model,
+    primaryKey: options.primaryKey,
+    factory: ({ inject }) => {
+      const factory = inject(MongoClientFactory)
+      return new MongodbStore<T, TPrimaryKey>({
+        model: options.model,
+        primaryKey: options.primaryKey,
+        db: options.db,
+        collection: options.collection,
+        mongoClient: () => factory.getClientFor(options.url, options.options),
+      })
+    },
+  })

package/src/index.ts

@@ -1,2 +1,3 @@
+export * from './define-mongodb-store.js'
+export * from './mongo-client-factory.js'
 export * from './mongodb-store.js'
-export * from './store-manager-helpers.js'

package/src/mongo-client-factory.ts

@@ -1,40 +1,43 @@
-import { Injectable } from '@furystack/inject'
-import { EventHub, type ListenerErrorPayload } from '@furystack/utils'
+import type { Token } from '@furystack/inject'
+import { defineService } from '@furystack/inject'
 import type { MongoClientOptions } from 'mongodb'
 import { MongoClient } from 'mongodb'
 
 /**
- * Events emitted by the {@link MongoClientFactory}
+ * Pools {@link MongoClient} instances by URL so every store that targets the
+ * same MongoDB deployment shares a single connection.
+ *
+ * Application code rarely calls this directly — {@link defineMongoDbStore}
+ * resolves the factory token internally. Exported for tests and advanced
+ * integrations that need raw client access (e.g. dropping a test database).
  */
-export type MongoClientFactoryEvents = {
-  onClientCreated: { url: string }
-  onDisposed: undefined
-  onListenerError: ListenerErrorPayload
+export interface MongoClientFactory {
+  getClientFor(url: string, options?: MongoClientOptions): MongoClient
 }
 
 /**
- * Factory for instantiating MongoDb clients
+ * Singleton token for the {@link MongoClientFactory}. Closes every pooled
+ * client when the owning injector is disposed.
  */
-@Injectable({ lifetime: 'singleton' })
-export class MongoClientFactory extends EventHub<MongoClientFactoryEvents> implements AsyncDisposable {
-  private connections: Map<string, MongoClient> = new Map()
-
-  public async [Symbol.asyncDispose]() {
-    await Promise.all([...this.connections.values()].map((c) => c.close(true)))
-    this.connections.clear()
-    this.emit('onDisposed', undefined)
-    super[Symbol.dispose]()
-  }
-
-  public getClientFor(url: string, options?: MongoClientOptions) {
-    const existing = this.connections.get(url)
-    if (existing) {
-      return existing
+export const MongoClientFactory: Token<MongoClientFactory, 'singleton'> = defineService({
+  name: '@furystack/mongodb-store/MongoClientFactory',
+  lifetime: 'singleton',
+  factory: ({ onDispose }) => {
+    const connections = new Map<string, MongoClient>()
+    onDispose(async () => {
+      await Promise.all([...connections.values()].map((c) => c.close(true)))
+      connections.clear()
+    })
+    return {
+      getClientFor(url: string, options?: MongoClientOptions): MongoClient {
+        const existing = connections.get(url)
+        if (existing) {
+          return existing
+        }
+        const client = new MongoClient(url, options)
+        connections.set(url, client)
+        return client
+      },
     }
-
-    const client = new MongoClient(url, options)
-    this.connections.set(url, client)
-    this.emit('onClientCreated', { url })
-    return client
-  }
-}
+  },
+})

package/src/mongodb-store.spec.ts

@@ -1,10 +1,10 @@
-import { StoreManager } from '@furystack/core'
 import { TestClass, createStoreTest } from '@furystack/core/create-physical-store-tests'
-import { Injector } from '@furystack/inject'
+import type { Injector } from '@furystack/inject'
+import { createInjector } from '@furystack/inject'
 import { usingAsync } from '@furystack/utils'
-import { describe, expect, it, vi } from 'vitest'
+import { describe, expect, it } from 'vitest'
+import { defineMongoDbStore } from './define-mongodb-store.js'
 import { MongoClientFactory } from './mongo-client-factory.js'
-import { useMongoDb } from './store-manager-helpers.js'
 
 class TestClassWithId {
   declare _id: string
@@ -18,8 +18,7 @@ const mongoDbUrl = process?.env?.MONGODB_URL || 'mongodb://localhost:27017'
 describe('MongoDB Store', () => {
   let dbIdx = 0
 
-  const getMongoOptions = (injector: Injector) => ({
-    injector,
+  const getMongoOptions = () => ({
     model: TestClass,
     primaryKey: 'id' as const,
     collection: `furystack-mongo-store-tests-${storeCount++}`,
@@ -27,16 +26,20 @@ describe('MongoDB Store', () => {
     url: mongoDbUrl,
     options: {},
   })
+
   createStoreTest({
     typeName: 'mongodb-store',
     skipStringTests: true,
     createStore: (i) => {
-      const mongoOptions = getMongoOptions(i)
-      useMongoDb(mongoOptions)
-      const store = i.getInstance(StoreManager).getStoreFor(TestClass, 'id')
+      const mongoOptions = getMongoOptions()
+      const token = defineMongoDbStore<TestClass, 'id'>({
+        name: `mongodb-store/${mongoOptions.collection}`,
+        ...mongoOptions,
+      })
+      const store = i.get(token)
       const oldDispose = i[Symbol.asyncDispose]
       i[Symbol.asyncDispose] = async () => {
-        const client = i.getInstance(MongoClientFactory).getClientFor(mongoOptions.url, mongoOptions.options)
+        const client = i.get(MongoClientFactory).getClientFor(mongoOptions.url, mongoOptions.options)
         const db = client.db(mongoOptions.db)
         await db.dropDatabase()
         await oldDispose.call(i)
@@ -46,20 +49,23 @@ describe('MongoDB Store', () => {
   })
 
   const createTestClassWithIdStore = (injector: Injector) => {
-    const mongoOptions = { ...getMongoOptions(injector), model: TestClassWithId, primaryKey: '_id' as const }
-    useMongoDb(mongoOptions)
+    const mongoOptions = { ...getMongoOptions(), model: TestClassWithId, primaryKey: '_id' as const }
+    const token = defineMongoDbStore<TestClassWithId, '_id'>({
+      name: `mongodb-store/${mongoOptions.collection}`,
+      ...mongoOptions,
+    })
     const oldDispose = injector[Symbol.asyncDispose]
     injector[Symbol.asyncDispose] = async () => {
-      const client = injector.getInstance(MongoClientFactory).getClientFor(mongoOptions.url, mongoOptions.options)
+      const client = injector.get(MongoClientFactory).getClientFor(mongoOptions.url, mongoOptions.options)
       const db = client.db(mongoOptions.db)
       await db.dropDatabase()
       await oldDispose.call(injector)
     }
-    return injector.getInstance(StoreManager).getStoreFor(TestClassWithId, '_id')
+    return injector.get(token)
   }
 
   it('Should retrieve an entity with its id', async () => {
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const store = createTestClassWithIdStore(injector)
       const { created } = await store.add({ value: 'value1' })
 
@@ -71,7 +77,7 @@ describe('MongoDB Store', () => {
   })
 
   it('Should retrieve more entities with theis ids', async () => {
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const store = createTestClassWithIdStore(injector)
       const { created } = await store.add({ value: 'value1' }, { value: 'value2' }, { value: 'value3' })
       const retrieved = await store.find({ filter: { _id: { $in: created.map((c) => c._id) } } })
@@ -81,7 +87,7 @@ describe('MongoDB Store', () => {
   })
 
   it('Should filter by _id as a string', async () => {
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const store = createTestClassWithIdStore(injector)
       const { created } = await store.add({ value: 'value1' })
       const retrieved = await store.find({ filter: { _id: { $eq: created[0]._id } } })
@@ -91,7 +97,7 @@ describe('MongoDB Store', () => {
   })
 
   it('Should filter by _id.$eq as a string', async () => {
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const store = createTestClassWithIdStore(injector)
       const { created } = await store.add({ value: 'value1' })
       const retrieved = await store.find({ filter: { _id: { $eq: created[0]._id } } })
@@ -101,7 +107,7 @@ describe('MongoDB Store', () => {
   })
 
   it('Should filter by _id.$in as array of strings', async () => {
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const store = createTestClassWithIdStore(injector)
       const { created } = await store.add({ value: 'value1' }, { value: 'value2' })
       const ids = created.map((c) => c._id)
@@ -112,7 +118,7 @@ describe('MongoDB Store', () => {
   })
 
   it('Should filter by _id.$nin as array of strings', async () => {
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const store = createTestClassWithIdStore(injector)
       const { created } = await store.add({ value: 'value1' }, { value: 'value2' })
       const ids = created.map((c) => c._id)
@@ -123,7 +129,7 @@ describe('MongoDB Store', () => {
   })
 
   it('Should filter by a non-_id field', async () => {
-    await usingAsync(new Injector(), async (injector) => {
+    await usingAsync(createInjector(), async (injector) => {
       const store = createTestClassWithIdStore(injector)
       await store.add({ value: 'value1' }, { value: 'value2' })
       const retrieved = await store.find({ filter: { value: { $eq: 'value2' } } })
@@ -132,35 +138,3 @@ describe('MongoDB Store', () => {
     })
   })
 })
-
-describe('MongoClientFactory EventHub', () => {
-  it('should emit onClientCreated when a new client is created', async () => {
-    const factory = new MongoClientFactory()
-    try {
-      const handler = vi.fn()
-      factory.addListener('onClientCreated', handler)
-
-      factory.getClientFor('mongodb://localhost:27017/test-db')
-
-      expect(handler).toHaveBeenCalledTimes(1)
-      expect(handler).toHaveBeenCalledWith({ url: 'mongodb://localhost:27017/test-db' })
-    } finally {
-      await factory[Symbol.asyncDispose]()
-    }
-  })
-
-  it('should not emit onClientCreated when returning an existing client', async () => {
-    const factory = new MongoClientFactory()
-    try {
-      const handler = vi.fn()
-
-      factory.getClientFor('mongodb://localhost:27017/test-db')
-      factory.addListener('onClientCreated', handler)
-      factory.getClientFor('mongodb://localhost:27017/test-db')
-
-      expect(handler).not.toHaveBeenCalled()
-    } finally {
-      await factory[Symbol.asyncDispose]()
-    }
-  })
-})

package/src/mongodb-store.ts

@@ -1,4 +1,5 @@
 import type {
+  Constructable,
   CreateResult,
   FilterType,
   FindOptions,
@@ -6,7 +7,6 @@ import type {
   PhysicalStore,
   WithOptionalId,
 } from '@furystack/core'
-import type { Constructable } from '@furystack/inject'
 import { EventHub } from '@furystack/utils'
 import type { Collection, Filter, MongoClient, OptionalUnlessRequiredId, Sort, UpdateFilter } from 'mongodb'
 import { ObjectId } from 'mongodb'

package/esm/store-manager-helpers.d.ts

@@ -1,33 +0,0 @@
-import type { Constructable, Injector } from '@furystack/inject';
-import type { MongoClientOptions } from 'mongodb';
-export declare const useMongoDb: <T extends object>({ injector, model, primaryKey, db, collection, url, options, }: {
-    /**
-     * The Injector instance to use
-     */
-    injector: Injector;
-    /**
-     * The constructable model class
-     */
-    model: Constructable<T>;
-    /**
-     * The name of the Primary Key property
-     */
-    primaryKey: keyof T;
-    /**
-     * Url of the MongoDb repository
-     */
-    url: string;
-    /**
-     * MongoDb Database name
-     */
-    db: string;
-    /**
-     * MongoDb Collection name
-     */
-    collection: string;
-    /**
-     * Optional options for the MongoDb Client
-     */
-    options?: MongoClientOptions;
-}) => void;
-//# sourceMappingURL=store-manager-helpers.d.ts.map

package/esm/store-manager-helpers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"store-manager-helpers.d.ts","sourceRoot":"","sources":["../src/store-manager-helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAIjD,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,MAAM,EAAE,gEAQ1C;IACD;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAA;IAClB;;OAEG;IACH,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,CAAA;IACvB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC,CAAA;IACnB;;OAEG;IACH,GAAG,EAAE,MAAM,CAAA;IACX;;OAEG;IACH,EAAE,EAAE,MAAM,CAAA;IACV;;OAEG;IACH,UAAU,EAAE,MAAM,CAAA;IAElB;;OAEG;IACH,OAAO,CAAC,EAAE,kBAAkB,CAAA;CAC7B,SAUA,CAAA"}

package/esm/store-manager-helpers.js

@@ -1,15 +0,0 @@
-import { addStore } from '@furystack/core';
-import { MongoClientFactory } from './mongo-client-factory.js';
-import { MongodbStore } from './mongodb-store.js';
-export const useMongoDb = ({ injector, model, primaryKey, db, collection, url, options, }) => {
-    const clientFactory = injector.getInstance(MongoClientFactory);
-    const store = new MongodbStore({
-        model,
-        primaryKey,
-        db,
-        collection,
-        mongoClient: () => clientFactory.getClientFor(url, options),
-    });
-    addStore(injector, store);
-};
-//# sourceMappingURL=store-manager-helpers.js.map

package/esm/store-manager-helpers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"store-manager-helpers.js","sourceRoot":"","sources":["../src/store-manager-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAG1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAmB,EAC3C,QAAQ,EACR,KAAK,EACL,UAAU,EACV,EAAE,EACF,UAAU,EACV,GAAG,EACH,OAAO,GA+BR,EAAE,EAAE;IACH,MAAM,aAAa,GAAG,QAAQ,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAA;IAC9D,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC;QAC7B,KAAK;QACL,UAAU;QACV,EAAE;QACF,UAAU;QACV,WAAW,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC;KAC5D,CAAC,CAAA;IACF,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC3B,CAAC,CAAA"}

package/src/store-manager-helpers.ts

@@ -1,55 +0,0 @@
-import { addStore } from '@furystack/core'
-import type { Constructable, Injector } from '@furystack/inject'
-import type { MongoClientOptions } from 'mongodb'
-import { MongoClientFactory } from './mongo-client-factory.js'
-import { MongodbStore } from './mongodb-store.js'
-
-export const useMongoDb = <T extends object>({
-  injector,
-  model,
-  primaryKey,
-  db,
-  collection,
-  url,
-  options,
-}: {
-  /**
-   * The Injector instance to use
-   */
-  injector: Injector
-  /**
-   * The constructable model class
-   */
-  model: Constructable<T>
-  /**
-   * The name of the Primary Key property
-   */
-  primaryKey: keyof T
-  /**
-   * Url of the MongoDb repository
-   */
-  url: string
-  /**
-   * MongoDb Database name
-   */
-  db: string
-  /**
-   * MongoDb Collection name
-   */
-  collection: string
-
-  /**
-   * Optional options for the MongoDb Client
-   */
-  options?: MongoClientOptions
-}) => {
-  const clientFactory = injector.getInstance(MongoClientFactory)
-  const store = new MongodbStore({
-    model,
-    primaryKey,
-    db,
-    collection,
-    mongoClient: () => clientFactory.getClientFor(url, options),
-  })
-  addStore(injector, store)
-}