@furystack/sequelize-store 6.0.48 → 7.0.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [7.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 `useSequelize(...)`. Declare the store at module scope with `defineSequelizeStore<T, M, PK>({ name, model, sequelizeModel, primaryKey, options, initModel? })`.
+- `SequelizeClientFactory` is now an exported interface + `defineService({ lifetime: 'singleton' })` token. Clients are pooled by `JSON.stringify(options)` and closed on injector teardown.
+
+## [6.0.49] - 2026-04-17
+
+### ⬆️ Dependencies
+
+- Raised `@types/node` to ^25.6.0, `typescript` to ^6.0.3, and `vitest` to ^4.1.4 so package development matches the workspace toolchain.
+
 ## [6.0.48] - 2026-03-27
 
 ### ⬆️ Dependencies

package/README.md

@@ -12,10 +12,15 @@ yarn add @furystack/sequelize-store
 
 ## Initialization
 
+`defineSequelizeStore` mints a `StoreToken` backed by a Sequelize model. The
+shared `SequelizeClientFactory` singleton pools `Sequelize` clients keyed by
+`JSON.stringify(options)` and closes them when the owning injector is
+disposed.
+
 ```ts
-import { Injector } from '@furystack/inject'
-import { StoreManager, type PhysicalStore } from '@furystack/core'
-import { useSequelize } from '@furystack/sequelize-store'
+import { createInjector } from '@furystack/inject'
+import { defineSequelizeStore } from '@furystack/sequelize-store'
+import { defineDataSet } from '@furystack/repository'
 import { Model, type Options } from 'sequelize'
 
 export class TestEntry extends Model {
@@ -23,20 +28,28 @@ export class TestEntry extends Model {
   declare public value: string
 }
 
-const myInjector = new Injector()
-useSequelize({
-  injector: myInjector,
+export const TestEntryStore = defineSequelizeStore<TestEntry, TestEntry, '_id'>({
+  name: 'my-app/TestEntryStore',
   model: TestEntry,
-  sequelizeModel: TestEntry, // Your Sequelize Model class
+  sequelizeModel: TestEntry,
   primaryKey: '_id',
   options: {
-    // Sequelize connection options
     dialect: 'sqlite',
     storage: ':memory:',
   } as Options,
 })
 
-const myStore: PhysicalStore<TestEntry, '_id'> = 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-sequelize-store.d.ts

@@ -0,0 +1,41 @@
+import type { Constructable, StoreToken } from '@furystack/core';
+import type { Model, ModelStatic, Options, Sequelize } from 'sequelize';
+/**
+ * Options accepted by {@link defineSequelizeStore}.
+ */
+export type DefineSequelizeStoreOptions<T extends object, M extends Model<T>, TPrimaryKey extends keyof T> = {
+    /** Human-readable token name used for debug/readability. */
+    name: string;
+    /** Entity model constructor. */
+    model: Constructable<T>;
+    /** The Sequelize Model class. */
+    sequelizeModel: ModelStatic<M>;
+    /** Primary key field name. */
+    primaryKey: TPrimaryKey;
+    /** Sequelize client options (dialect, storage, etc.). */
+    options: Options;
+    /** Optional callback that initializes the Sequelize model. Runs once per store. */
+    initModel?: (sequelize: Sequelize) => Promise<void>;
+};
+/**
+ * Mints a singleton {@link StoreToken} backed by a {@link SequelizeStore}.
+ *
+ * Internally resolves the singleton {@link SequelizeClientFactory} so every
+ * store declared against the same `options` shares one {@link Sequelize}
+ * client. Declare the token once at module scope — inline calls mint new
+ * identities and defeat singleton caching.
+ *
+ * @example
+ * ```ts
+ * export const UserStore = defineSequelizeStore({
+ *   name: 'my-app/UserStore',
+ *   model: User,
+ *   sequelizeModel: UserSequelizeModel,
+ *   primaryKey: 'username',
+ *   options: { dialect: 'sqlite', storage: './data.sqlite' },
+ *   initModel: async (sequelize) => { ... },
+ * })
+ * ```
+ */
+export declare const defineSequelizeStore: <T extends object, M extends Model<T>, const TPrimaryKey extends keyof T>(opts: DefineSequelizeStoreOptions<T, M, TPrimaryKey>) => StoreToken<T, TPrimaryKey>;
+//# sourceMappingURL=define-sequelize-store.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"define-sequelize-store.d.ts","sourceRoot":"","sources":["../src/define-sequelize-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEhE,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAIvE;;GAEG;AACH,MAAM,MAAM,2BAA2B,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAAE,WAAW,SAAS,MAAM,CAAC,IAAI;IAC3G,4DAA4D;IAC5D,IAAI,EAAE,MAAM,CAAA;IACZ,gCAAgC;IAChC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,CAAA;IACvB,iCAAiC;IACjC,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;IAC9B,8BAA8B;IAC9B,UAAU,EAAE,WAAW,CAAA;IACvB,yDAAyD;IACzD,OAAO,EAAE,OAAO,CAAA;IAChB,mFAAmF;IACnF,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CACpD,CAAA;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,WAAW,SAAS,MAAM,CAAC,EAC1G,MAAM,2BAA2B,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,KACnD,UAAU,CAAC,CAAC,EAAE,WAAW,CAexB,CAAA"}

package/esm/define-sequelize-store.js

@@ -0,0 +1,39 @@
+import { defineStore } from '@furystack/core';
+import { SequelizeClientFactory } from './sequelize-client-factory.js';
+import { SequelizeStore } from './sequelize-store.js';
+/**
+ * Mints a singleton {@link StoreToken} backed by a {@link SequelizeStore}.
+ *
+ * Internally resolves the singleton {@link SequelizeClientFactory} so every
+ * store declared against the same `options` shares one {@link Sequelize}
+ * client. Declare the token once at module scope — inline calls mint new
+ * identities and defeat singleton caching.
+ *
+ * @example
+ * ```ts
+ * export const UserStore = defineSequelizeStore({
+ *   name: 'my-app/UserStore',
+ *   model: User,
+ *   sequelizeModel: UserSequelizeModel,
+ *   primaryKey: 'username',
+ *   options: { dialect: 'sqlite', storage: './data.sqlite' },
+ *   initModel: async (sequelize) => { ... },
+ * })
+ * ```
+ */
+export const defineSequelizeStore = (opts) => defineStore({
+    name: opts.name,
+    model: opts.model,
+    primaryKey: opts.primaryKey,
+    factory: ({ inject }) => {
+        const factory = inject(SequelizeClientFactory);
+        return new SequelizeStore({
+            model: opts.model,
+            primaryKey: opts.primaryKey,
+            sequelizeModel: opts.sequelizeModel,
+            getSequelizeClient: () => factory.getSequelizeClient(opts.options),
+            initModel: opts.initModel,
+        });
+    },
+});
+//# sourceMappingURL=define-sequelize-store.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"define-sequelize-store.js","sourceRoot":"","sources":["../src/define-sequelize-store.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAE7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAoBrD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,IAAoD,EACxB,EAAE,CAC9B,WAAW,CAAiB;IAC1B,IAAI,EAAE,IAAI,CAAC,IAAI;IACf,KAAK,EAAE,IAAI,CAAC,KAAK;IACjB,UAAU,EAAE,IAAI,CAAC,UAAU;IAC3B,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;QACtB,MAAM,OAAO,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAA;QAC9C,OAAO,IAAI,cAAc,CAAoB;YAC3C,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,kBAAkB,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC;YAClE,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAA;IACJ,CAAC;CACF,CAAC,CAAA"}

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

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

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

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

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

@@ -0,0 +1,40 @@
+import { Model } from 'sequelize';
+import { describe, expect, it } from 'vitest';
+import { defineSequelizeStore } from './define-sequelize-store.js';
+class Item {
+}
+class ItemSequelizeClass extends Model {
+}
+describe('defineSequelizeStore (metadata)', () => {
+    it('propagates name, lifetime, model and primaryKey onto the returned token', () => {
+        const token = defineSequelizeStore({
+            name: 'test/SequelizeItems',
+            model: Item,
+            sequelizeModel: ItemSequelizeClass,
+            primaryKey: 'id',
+            options: { dialect: 'sqlite', storage: ':memory:', logging: false },
+        });
+        expect(token.name).toBe('test/SequelizeItems');
+        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 a = defineSequelizeStore({
+            name: 'test/SequelizeDupe',
+            model: Item,
+            sequelizeModel: ItemSequelizeClass,
+            primaryKey: 'id',
+            options: { dialect: 'sqlite', storage: ':memory:', logging: false },
+        });
+        const b = defineSequelizeStore({
+            name: 'test/SequelizeDupe',
+            model: Item,
+            sequelizeModel: ItemSequelizeClass,
+            primaryKey: 'id',
+            options: { dialect: 'sqlite', storage: ':memory:', logging: false },
+        });
+        expect(a.id).not.toBe(b.id);
+    });
+});
+//# sourceMappingURL=define-sequelize-store.spec.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"define-sequelize-store.spec.js","sourceRoot":"","sources":["../src/define-sequelize-store.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAElE,MAAM,IAAI;CAGT;AAED,MAAM,kBAAmB,SAAQ,KAAiB;CAGjD;AAED,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,EAAE,CAAC,yEAAyE,EAAE,GAAG,EAAE;QACjF,MAAM,KAAK,GAAG,oBAAoB,CAAiC;YACjE,IAAI,EAAE,qBAAqB;YAC3B,KAAK,EAAE,IAAI;YACX,cAAc,EAAE,kBAAkB;YAClC,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE;SACpE,CAAC,CAAA;QACF,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;QAC9C,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QACxC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC9B,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACrC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,kGAAkG,EAAE,GAAG,EAAE;QAC1G,MAAM,CAAC,GAAG,oBAAoB,CAAiC;YAC7D,IAAI,EAAE,oBAAoB;YAC1B,KAAK,EAAE,IAAI;YACX,cAAc,EAAE,kBAAkB;YAClC,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE;SACpE,CAAC,CAAA;QACF,MAAM,CAAC,GAAG,oBAAoB,CAAiC;YAC7D,IAAI,EAAE,oBAAoB;YAC1B,KAAK,EAAE,IAAI;YACX,cAAc,EAAE,kBAAkB;YAClC,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE;SACpE,CAAC,CAAA;QACF,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAC7B,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/esm/index.d.ts

@@ -1,3 +1,4 @@
+export * from './define-sequelize-store.js';
+export * from './sequelize-client-factory.js';
 export * from './sequelize-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,sBAAsB,CAAA;AACpC,cAAc,4BAA4B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAA;AAC3C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,sBAAsB,CAAA"}

package/esm/index.js

@@ -1,3 +1,4 @@
+export * from './define-sequelize-store.js';
+export * from './sequelize-client-factory.js';
 export * from './sequelize-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,sBAAsB,CAAA;AACpC,cAAc,4BAA4B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAA;AAC3C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,sBAAsB,CAAA"}

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

@@ -1,11 +1,16 @@
+import type { Token } from '@furystack/inject';
 import type { Options } from 'sequelize';
 import { Sequelize } from 'sequelize';
 /**
- * Factory for instantiating Sequelize clients
+ * Pools {@link Sequelize} client instances keyed by the serialized options so
+ * multiple stores against the same connection string share one client.
  */
-export declare class SequelizeClientFactory implements AsyncDisposable {
-    private connections;
-    [Symbol.asyncDispose](): Promise<void>;
+export interface SequelizeClientFactory {
     getSequelizeClient(options: Options): Sequelize;
 }
+/**
+ * Singleton token for the {@link SequelizeClientFactory}. Closes every pooled
+ * client when the owning injector is disposed.
+ */
+export declare const SequelizeClientFactory: Token<SequelizeClientFactory, 'singleton'>;
 //# sourceMappingURL=sequelize-client-factory.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"sequelize-client-factory.d.ts","sourceRoot":"","sources":["../src/sequelize-client-factory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAM,SAAS,EAAE,MAAM,WAAW,CAAA;AA2CzC;;GAEG;AACH,qBACa,sBAAuB,YAAW,eAAe;IAC5D,OAAO,CAAC,WAAW,CAAoC;IAE1C,CAAC,MAAM,CAAC,YAAY,CAAC;IAK3B,kBAAkB,CAAC,OAAO,EAAE,OAAO;CAW3C"}
+{"version":3,"file":"sequelize-client-factory.d.ts","sourceRoot":"","sources":["../src/sequelize-client-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAM,SAAS,EAAE,MAAM,WAAW,CAAA;AA2CzC;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,CAAA;CAChD;AAED;;;GAGG;AACH,eAAO,MAAM,sBAAsB,EAAE,KAAK,CAAC,sBAAsB,EAAE,WAAW,CAsB5E,CAAA"}

package/esm/sequelize-client-factory.js

@@ -1,10 +1,4 @@
-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 { defineService } from '@furystack/inject';
 import { Op, Sequelize } from 'sequelize';
 const operatorsAliases = {
     $eq: Op.eq,
@@ -47,27 +41,30 @@ const operatorsAliases = {
     $col: Op.col,
 };
 /**
- * Factory for instantiating Sequelize clients
+ * Singleton token for the {@link SequelizeClientFactory}. Closes every pooled
+ * client when the owning injector is disposed.
  */
-let SequelizeClientFactory = class SequelizeClientFactory {
-    connections = new Map();
-    async [Symbol.asyncDispose]() {
-        await Promise.all([...this.connections.values()].map((c) => c.close()));
-        this.connections.clear();
-    }
-    getSequelizeClient(options) {
-        const key = JSON.stringify(options);
-        const existing = this.connections.get(key);
-        if (existing) {
-            return existing;
-        }
-        const client = new Sequelize({ ...options, operatorsAliases });
-        this.connections.set(key, client);
-        return client;
-    }
-};
-SequelizeClientFactory = __decorate([
-    Injectable({ lifetime: 'singleton' })
-], SequelizeClientFactory);
-export { SequelizeClientFactory };
+export const SequelizeClientFactory = defineService({
+    name: '@furystack/sequelize-store/SequelizeClientFactory',
+    lifetime: 'singleton',
+    factory: ({ onDispose }) => {
+        const connections = new Map();
+        onDispose(async () => {
+            await Promise.all([...connections.values()].map((c) => c.close()));
+            connections.clear();
+        });
+        return {
+            getSequelizeClient(options) {
+                const key = JSON.stringify(options);
+                const existing = connections.get(key);
+                if (existing) {
+                    return existing;
+                }
+                const client = new Sequelize({ ...options, operatorsAliases });
+                connections.set(key, client);
+                return client;
+            },
+        };
+    },
+});
 //# sourceMappingURL=sequelize-client-factory.js.map

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

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

package/esm/sequelize-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 { Model, ModelStatic, Sequelize } from 'sequelize';
 export interface SequelizeStoreSettings<T extends object, M extends Model<T>, TPrimaryKey extends keyof T> {

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

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

package/esm/sequelize-store.spec.js

@@ -1,20 +1,30 @@
 import { TestClass, createStoreTest } from '@furystack/core/create-physical-store-tests';
-import { StoreManager } from '@furystack/core';
-import { useSequelize } from './store-manager-helpers.js';
-import { DataTypes, Model } from 'sequelize';
+import { createInjector } from '@furystack/inject';
 import { sleepAsync, usingAsync } from '@furystack/utils';
-import { Injector } from '@furystack/inject';
+import { DataTypes, Model } from 'sequelize';
+import { describe, expect, it } from 'vitest';
+import { defineSequelizeStore } from './define-sequelize-store.js';
 import { SequelizeClientFactory } from './sequelize-client-factory.js';
-import { describe, it, expect } from 'vitest';
 class TestSequelizeClass extends Model {
 }
+const initTestModel = async (sequelize) => {
+    TestSequelizeClass.init({
+        id: { type: DataTypes.INTEGER, autoIncrement: true, primaryKey: true },
+        stringValue1: { type: DataTypes.STRING },
+        stringValue2: { type: DataTypes.STRING },
+        numberValue1: { type: DataTypes.INTEGER },
+        numberValue2: { type: DataTypes.INTEGER },
+        booleanValue: { type: DataTypes.BOOLEAN },
+        dateValue: { type: DataTypes.DATE },
+    }, { sequelize, timestamps: false });
+};
 describe('Sequelize Store', () => {
     createStoreTest({
         typeName: 'sequelize-store',
         skipRegexTests: true,
         createStore: (i) => {
-            useSequelize({
-                injector: i,
+            const token = defineSequelizeStore({
+                name: 'sequelize-store/TestClass',
                 model: TestClass,
                 sequelizeModel: TestSequelizeClass,
                 primaryKey: 'id',
@@ -23,41 +33,14 @@ describe('Sequelize Store', () => {
                     storage: ':memory:',
                     logging: false,
                 },
-                initModel: async (sequelize) => {
-                    TestSequelizeClass.init({
-                        id: {
-                            type: DataTypes.INTEGER,
-                            autoIncrement: true,
-                            primaryKey: true,
-                        },
-                        stringValue1: {
-                            type: DataTypes.STRING,
-                        },
-                        stringValue2: {
-                            type: DataTypes.STRING,
-                        },
-                        numberValue1: {
-                            type: DataTypes.INTEGER,
-                        },
-                        numberValue2: {
-                            type: DataTypes.INTEGER,
-                        },
-                        booleanValue: {
-                            type: DataTypes.BOOLEAN,
-                        },
-                        dateValue: {
-                            type: DataTypes.DATE,
-                        },
-                    }, { sequelize, timestamps: false });
-                },
+                initModel: initTestModel,
             });
-            const store = i.getInstance(StoreManager).getStoreFor(TestClass, 'id');
-            return store;
+            return i.get(token);
         },
     });
     it('should return the cached sequelize client instance from the factory', async () => {
-        await usingAsync(new Injector(), async (i) => {
-            const factory = i.getInstance(SequelizeClientFactory);
+        await usingAsync(createInjector(), async (i) => {
+            const factory = i.get(SequelizeClientFactory);
             const settings = {
                 dialect: 'sqlite',
                 storage: ':memory:',
@@ -69,9 +52,9 @@ describe('Sequelize Store', () => {
         });
     });
     it('should return the cached model from the store class', async () => {
-        await usingAsync(new Injector(), async (i) => {
-            useSequelize({
-                injector: i,
+        await usingAsync(createInjector(), async (i) => {
+            const token = defineSequelizeStore({
+                name: 'sequelize-store/TestClass/cached-model',
                 model: TestClass,
                 sequelizeModel: TestSequelizeClass,
                 primaryKey: 'id',
@@ -82,36 +65,10 @@ describe('Sequelize Store', () => {
                 },
                 initModel: async (sequelize) => {
                     await sleepAsync(100);
-                    TestSequelizeClass.init({
-                        id: {
-                            type: DataTypes.INTEGER,
-                            autoIncrement: true,
-                            primaryKey: true,
-                        },
-                        stringValue1: {
-                            type: DataTypes.STRING,
-                        },
-                        stringValue2: {
-                            type: DataTypes.STRING,
-                        },
-                        numberValue1: {
-                            type: DataTypes.INTEGER,
-                        },
-                        numberValue2: {
-                            type: DataTypes.INTEGER,
-                        },
-                        booleanValue: {
-                            type: DataTypes.BOOLEAN,
-                        },
-                        dateValue: {
-                            type: DataTypes.DATE,
-                        },
-                    }, { sequelize, timestamps: false });
+                    await initTestModel(sequelize);
                 },
             });
-            const store = i
-                .getInstance(StoreManager)
-                .getStoreFor(TestClass, 'id');
+            const store = i.get(token);
             const model1Promise = store.getModel();
             const model2 = await store.getModel();
             const model1 = await model1Promise;
@@ -121,9 +78,9 @@ describe('Sequelize Store', () => {
         });
     });
     it('should throw if the sequelize model is not initialized', async () => {
-        await usingAsync(new Injector(), async (i) => {
-            useSequelize({
-                injector: i,
+        await usingAsync(createInjector(), async (i) => {
+            const token = defineSequelizeStore({
+                name: 'sequelize-store/TestClass/no-init',
                 model: TestClass,
                 sequelizeModel: TestSequelizeClass,
                 primaryKey: 'id',
@@ -136,15 +93,13 @@ describe('Sequelize Store', () => {
                     // won't init the model here
                 },
             });
-            const store = i
-                .getInstance(StoreManager)
-                .getStoreFor(TestClass, 'id');
+            const store = i.get(token);
             expect.assertions(1);
             try {
                 await store.getModel();
             }
             catch (error) {
-                expect(error.message).toBe('TestSequelizeClass has not been defined'); // will be thrown by sequelize
+                expect(error.message).toBe('TestSequelizeClass has not been defined');
             }
         });
     });

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@furystack/sequelize-store",
-  "version": "6.0.48",
+  "version": "7.0.0",
   "description": "Sequelize-based Store implementation for FuryStack",
   "type": "module",
   "scripts": {
@@ -38,16 +38,16 @@
   },
   "homepage": "https://github.com/furystack/furystack",
   "dependencies": {
-    "@furystack/core": "^16.0.3",
-    "@furystack/inject": "^12.0.35",
-    "@furystack/utils": "^8.2.4",
+    "@furystack/core": "^17.0.0",
+    "@furystack/inject": "^13.0.0",
+    "@furystack/utils": "^9.0.0",
     "sequelize": "^6.37.8"
   },
   "devDependencies": {
-    "@types/node": "^25.5.0",
+    "@types/node": "^25.6.0",
     "sqlite3": "6.0.1",
-    "typescript": "^6.0.2",
-    "vitest": "^4.1.2"
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.4"
   },
   "engines": {
     "node": ">=22.0.0"

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

@@ -0,0 +1,47 @@
+import { Model } from 'sequelize'
+import { describe, expect, it } from 'vitest'
+import { defineSequelizeStore } from './define-sequelize-store.js'
+
+class Item {
+  declare id: number
+  declare name: string
+}
+
+class ItemSequelizeClass extends Model<Item, Item> implements Item {
+  declare id: number
+  declare name: string
+}
+
+describe('defineSequelizeStore (metadata)', () => {
+  it('propagates name, lifetime, model and primaryKey onto the returned token', () => {
+    const token = defineSequelizeStore<Item, ItemSequelizeClass, 'id'>({
+      name: 'test/SequelizeItems',
+      model: Item,
+      sequelizeModel: ItemSequelizeClass,
+      primaryKey: 'id',
+      options: { dialect: 'sqlite', storage: ':memory:', logging: false },
+    })
+    expect(token.name).toBe('test/SequelizeItems')
+    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 a = defineSequelizeStore<Item, ItemSequelizeClass, 'id'>({
+      name: 'test/SequelizeDupe',
+      model: Item,
+      sequelizeModel: ItemSequelizeClass,
+      primaryKey: 'id',
+      options: { dialect: 'sqlite', storage: ':memory:', logging: false },
+    })
+    const b = defineSequelizeStore<Item, ItemSequelizeClass, 'id'>({
+      name: 'test/SequelizeDupe',
+      model: Item,
+      sequelizeModel: ItemSequelizeClass,
+      primaryKey: 'id',
+      options: { dialect: 'sqlite', storage: ':memory:', logging: false },
+    })
+    expect(a.id).not.toBe(b.id)
+  })
+})

package/src/define-sequelize-store.ts

@@ -0,0 +1,62 @@
+import type { Constructable, StoreToken } from '@furystack/core'
+import { defineStore } from '@furystack/core'
+import type { Model, ModelStatic, Options, Sequelize } from 'sequelize'
+import { SequelizeClientFactory } from './sequelize-client-factory.js'
+import { SequelizeStore } from './sequelize-store.js'
+
+/**
+ * Options accepted by {@link defineSequelizeStore}.
+ */
+export type DefineSequelizeStoreOptions<T extends object, M extends Model<T>, TPrimaryKey extends keyof T> = {
+  /** Human-readable token name used for debug/readability. */
+  name: string
+  /** Entity model constructor. */
+  model: Constructable<T>
+  /** The Sequelize Model class. */
+  sequelizeModel: ModelStatic<M>
+  /** Primary key field name. */
+  primaryKey: TPrimaryKey
+  /** Sequelize client options (dialect, storage, etc.). */
+  options: Options
+  /** Optional callback that initializes the Sequelize model. Runs once per store. */
+  initModel?: (sequelize: Sequelize) => Promise<void>
+}
+
+/**
+ * Mints a singleton {@link StoreToken} backed by a {@link SequelizeStore}.
+ *
+ * Internally resolves the singleton {@link SequelizeClientFactory} so every
+ * store declared against the same `options` shares one {@link Sequelize}
+ * client. Declare the token once at module scope — inline calls mint new
+ * identities and defeat singleton caching.
+ *
+ * @example
+ * ```ts
+ * export const UserStore = defineSequelizeStore({
+ *   name: 'my-app/UserStore',
+ *   model: User,
+ *   sequelizeModel: UserSequelizeModel,
+ *   primaryKey: 'username',
+ *   options: { dialect: 'sqlite', storage: './data.sqlite' },
+ *   initModel: async (sequelize) => { ... },
+ * })
+ * ```
+ */
+export const defineSequelizeStore = <T extends object, M extends Model<T>, const TPrimaryKey extends keyof T>(
+  opts: DefineSequelizeStoreOptions<T, M, TPrimaryKey>,
+): StoreToken<T, TPrimaryKey> =>
+  defineStore<T, TPrimaryKey>({
+    name: opts.name,
+    model: opts.model,
+    primaryKey: opts.primaryKey,
+    factory: ({ inject }) => {
+      const factory = inject(SequelizeClientFactory)
+      return new SequelizeStore<T, M, TPrimaryKey>({
+        model: opts.model,
+        primaryKey: opts.primaryKey,
+        sequelizeModel: opts.sequelizeModel,
+        getSequelizeClient: () => factory.getSequelizeClient(opts.options),
+        initModel: opts.initModel,
+      })
+    },
+  })

package/src/index.ts

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

package/src/sequelize-client-factory.ts

@@ -1,4 +1,5 @@
-import { Injectable } from '@furystack/inject'
+import type { Token } from '@furystack/inject'
+import { defineService } from '@furystack/inject'
 import type { Options } from 'sequelize'
 import { Op, Sequelize } from 'sequelize'
 
@@ -44,26 +45,37 @@ const operatorsAliases = {
 }
 
 /**
- * Factory for instantiating Sequelize clients
+ * Pools {@link Sequelize} client instances keyed by the serialized options so
+ * multiple stores against the same connection string share one client.
  */
-@Injectable({ lifetime: 'singleton' })
-export class SequelizeClientFactory implements AsyncDisposable {
-  private connections: Map<string, Sequelize> = new Map()
-
-  public async [Symbol.asyncDispose]() {
-    await Promise.all([...this.connections.values()].map((c) => c.close()))
-    this.connections.clear()
-  }
+export interface SequelizeClientFactory {
+  getSequelizeClient(options: Options): Sequelize
+}
 
-  public getSequelizeClient(options: Options) {
-    const key = JSON.stringify(options)
-    const existing = this.connections.get(key)
-    if (existing) {
-      return existing
+/**
+ * Singleton token for the {@link SequelizeClientFactory}. Closes every pooled
+ * client when the owning injector is disposed.
+ */
+export const SequelizeClientFactory: Token<SequelizeClientFactory, 'singleton'> = defineService({
+  name: '@furystack/sequelize-store/SequelizeClientFactory',
+  lifetime: 'singleton',
+  factory: ({ onDispose }) => {
+    const connections = new Map<string, Sequelize>()
+    onDispose(async () => {
+      await Promise.all([...connections.values()].map((c) => c.close()))
+      connections.clear()
+    })
+    return {
+      getSequelizeClient(options: Options): Sequelize {
+        const key = JSON.stringify(options)
+        const existing = connections.get(key)
+        if (existing) {
+          return existing
+        }
+        const client = new Sequelize({ ...options, operatorsAliases })
+        connections.set(key, client)
+        return client
+      },
     }
-
-    const client = new Sequelize({ ...options, operatorsAliases })
-    this.connections.set(key, client)
-    return client
-  }
-}
+  },
+})

package/src/sequelize-store.spec.ts

@@ -1,12 +1,12 @@
 import { TestClass, createStoreTest } from '@furystack/core/create-physical-store-tests'
-import { StoreManager } from '@furystack/core'
-import { useSequelize } from './store-manager-helpers.js'
-import { DataTypes, Model } from 'sequelize'
+import { createInjector } from '@furystack/inject'
 import { sleepAsync, usingAsync } from '@furystack/utils'
-import { Injector } from '@furystack/inject'
+import type { Sequelize } from 'sequelize'
+import { DataTypes, Model } from 'sequelize'
+import { describe, expect, it } from 'vitest'
+import { defineSequelizeStore } from './define-sequelize-store.js'
 import { SequelizeClientFactory } from './sequelize-client-factory.js'
 import type { SequelizeStore } from './sequelize-store.js'
-import { describe, it, expect } from 'vitest'
 
 class TestSequelizeClass extends Model<TestClass, TestClass> implements TestClass {
   declare id: number
@@ -18,13 +18,28 @@ class TestSequelizeClass extends Model<TestClass, TestClass> implements TestClas
   declare dateValue: Date
 }
 
+const initTestModel = async (sequelize: Sequelize) => {
+  TestSequelizeClass.init(
+    {
+      id: { type: DataTypes.INTEGER, autoIncrement: true, primaryKey: true },
+      stringValue1: { type: DataTypes.STRING },
+      stringValue2: { type: DataTypes.STRING },
+      numberValue1: { type: DataTypes.INTEGER },
+      numberValue2: { type: DataTypes.INTEGER },
+      booleanValue: { type: DataTypes.BOOLEAN },
+      dateValue: { type: DataTypes.DATE },
+    },
+    { sequelize, timestamps: false },
+  )
+}
+
 describe('Sequelize Store', () => {
   createStoreTest({
     typeName: 'sequelize-store',
     skipRegexTests: true,
     createStore: (i) => {
-      useSequelize({
-        injector: i,
+      const token = defineSequelizeStore<TestClass, TestSequelizeClass, 'id'>({
+        name: 'sequelize-store/TestClass',
         model: TestClass,
         sequelizeModel: TestSequelizeClass,
         primaryKey: 'id',
@@ -33,45 +48,15 @@ describe('Sequelize Store', () => {
           storage: ':memory:',
           logging: false,
         },
-        initModel: async (sequelize) => {
-          TestSequelizeClass.init(
-            {
-              id: {
-                type: DataTypes.INTEGER,
-                autoIncrement: true,
-                primaryKey: true,
-              },
-              stringValue1: {
-                type: DataTypes.STRING,
-              },
-              stringValue2: {
-                type: DataTypes.STRING,
-              },
-              numberValue1: {
-                type: DataTypes.INTEGER,
-              },
-              numberValue2: {
-                type: DataTypes.INTEGER,
-              },
-              booleanValue: {
-                type: DataTypes.BOOLEAN,
-              },
-              dateValue: {
-                type: DataTypes.DATE,
-              },
-            },
-            { sequelize, timestamps: false },
-          )
-        },
+        initModel: initTestModel,
       })
-      const store = i.getInstance(StoreManager).getStoreFor(TestClass, 'id')
-      return store
+      return i.get(token)
     },
   })
 
   it('should return the cached sequelize client instance from the factory', async () => {
-    await usingAsync(new Injector(), async (i) => {
-      const factory = i.getInstance(SequelizeClientFactory)
+    await usingAsync(createInjector(), async (i) => {
+      const factory = i.get(SequelizeClientFactory)
       const settings = {
         dialect: 'sqlite',
         storage: ':memory:',
@@ -84,9 +69,9 @@ describe('Sequelize Store', () => {
   })
 
   it('should return the cached model from the store class', async () => {
-    await usingAsync(new Injector(), async (i) => {
-      useSequelize({
-        injector: i,
+    await usingAsync(createInjector(), async (i) => {
+      const token = defineSequelizeStore<TestClass, TestSequelizeClass, 'id'>({
+        name: 'sequelize-store/TestClass/cached-model',
         model: TestClass,
         sequelizeModel: TestSequelizeClass,
         primaryKey: 'id',
@@ -97,39 +82,10 @@ describe('Sequelize Store', () => {
         },
         initModel: async (sequelize) => {
           await sleepAsync(100)
-          TestSequelizeClass.init(
-            {
-              id: {
-                type: DataTypes.INTEGER,
-                autoIncrement: true,
-                primaryKey: true,
-              },
-              stringValue1: {
-                type: DataTypes.STRING,
-              },
-              stringValue2: {
-                type: DataTypes.STRING,
-              },
-              numberValue1: {
-                type: DataTypes.INTEGER,
-              },
-              numberValue2: {
-                type: DataTypes.INTEGER,
-              },
-              booleanValue: {
-                type: DataTypes.BOOLEAN,
-              },
-              dateValue: {
-                type: DataTypes.DATE,
-              },
-            },
-            { sequelize, timestamps: false },
-          )
+          await initTestModel(sequelize)
         },
       })
-      const store: SequelizeStore<TestClass, TestSequelizeClass, 'id'> = i
-        .getInstance(StoreManager)
-        .getStoreFor(TestClass, 'id')
+      const store = i.get(token) as SequelizeStore<TestClass, TestSequelizeClass, 'id'>
 
       const model1Promise = store.getModel()
       const model2 = await store.getModel()
@@ -143,9 +99,9 @@ describe('Sequelize Store', () => {
   })
 
   it('should throw if the sequelize model is not initialized', async () => {
-    await usingAsync(new Injector(), async (i) => {
-      useSequelize({
-        injector: i,
+    await usingAsync(createInjector(), async (i) => {
+      const token = defineSequelizeStore<TestClass, TestSequelizeClass, 'id'>({
+        name: 'sequelize-store/TestClass/no-init',
         model: TestClass,
         sequelizeModel: TestSequelizeClass,
         primaryKey: 'id',
@@ -158,15 +114,13 @@ describe('Sequelize Store', () => {
           // won't init the model here
         },
       })
-      const store: SequelizeStore<TestClass, TestSequelizeClass, 'id'> = i
-        .getInstance(StoreManager)
-        .getStoreFor(TestClass, 'id')
+      const store = i.get(token) as SequelizeStore<TestClass, TestSequelizeClass, 'id'>
 
       expect.assertions(1)
       try {
         await store.getModel()
       } catch (error) {
-        expect((error as Error).message).toBe('TestSequelizeClass has not been defined') // will be thrown by sequelize
+        expect((error as Error).message).toBe('TestSequelizeClass has not been defined')
       }
     })
   })

package/src/sequelize-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 { FindAttributeOptions, Identifier, Model, ModelStatic, Sequelize, WhereOptions } from 'sequelize'
 

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

@@ -1,26 +0,0 @@
-import type { Constructable, Injector } from '@furystack/inject';
-import type { Options, Sequelize, ModelStatic, Model } from 'sequelize';
-export declare const useSequelize: <T extends object, M extends ModelStatic<Model<T>>, Key extends keyof T>({ injector, model, sequelizeModel, primaryKey, options, initModel, }: {
-    injector: Injector;
-    /**
-     * The constructable model class
-     */
-    model: Constructable<T>;
-    /**
-     * The Sequelize Model class
-     */
-    sequelizeModel: M;
-    /**
-     * The name of the Primary Key property
-     */
-    primaryKey: Key;
-    /**
-     * Optional options for the MongoDb Client
-     */
-    options: Options;
-    /**
-     * A callback for model initialization
-     */
-    initModel?: (sequelize: Sequelize) => Promise<void>;
-}) => 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,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAIvE,eAAO,MAAM,YAAY,GAAa,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,SAAS,MAAM,CAAC,EAAE,sEAO3G;IACD,QAAQ,EAAE,QAAQ,CAAA;IAClB;;OAEG;IACH,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,CAAA;IAEvB;;OAEG;IACH,cAAc,EAAE,CAAC,CAAA;IAEjB;;OAEG;IACH,UAAU,EAAE,GAAG,CAAA;IACf;;OAEG;IACH,OAAO,EAAE,OAAO,CAAA;IAChB;;OAEG;IAEH,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CACpD,SAUA,CAAA"}

package/esm/store-manager-helpers.js

@@ -1,15 +0,0 @@
-import { addStore } from '@furystack/core';
-import { SequelizeClientFactory } from './sequelize-client-factory.js';
-import { SequelizeStore } from './sequelize-store.js';
-export const useSequelize = function ({ injector, model, sequelizeModel, primaryKey, options, initModel, }) {
-    const clientFactory = injector.getInstance(SequelizeClientFactory);
-    const store = new SequelizeStore({
-        model,
-        primaryKey,
-        getSequelizeClient: () => clientFactory.getSequelizeClient(options),
-        initModel,
-        sequelizeModel,
-    });
-    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,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,MAAM,CAAC,MAAM,YAAY,GAAG,UAAkF,EAC5G,QAAQ,EACR,KAAK,EACL,cAAc,EACd,UAAU,EACV,OAAO,EACP,SAAS,GA0BV;IACC,MAAM,aAAa,GAAG,QAAQ,CAAC,WAAW,CAAC,sBAAsB,CAAC,CAAA;IAClE,MAAM,KAAK,GAAG,IAAI,cAAc,CAAC;QAC/B,KAAK;QACL,UAAU;QACV,kBAAkB,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,kBAAkB,CAAC,OAAO,CAAC;QACnE,SAAS;QACT,cAAc;KACf,CAAC,CAAA;IACF,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC3B,CAAC,CAAA"}

package/src/store-manager-helpers.ts

@@ -1,49 +0,0 @@
-import { addStore } from '@furystack/core'
-import type { Constructable, Injector } from '@furystack/inject'
-import type { Options, Sequelize, ModelStatic, Model } from 'sequelize'
-import { SequelizeClientFactory } from './sequelize-client-factory.js'
-import { SequelizeStore } from './sequelize-store.js'
-
-export const useSequelize = function <T extends object, M extends ModelStatic<Model<T>>, Key extends keyof T>({
-  injector,
-  model,
-  sequelizeModel,
-  primaryKey,
-  options,
-  initModel,
-}: {
-  injector: Injector
-  /**
-   * The constructable model class
-   */
-  model: Constructable<T>
-
-  /**
-   * The Sequelize Model class
-   */
-  sequelizeModel: M
-
-  /**
-   * The name of the Primary Key property
-   */
-  primaryKey: Key
-  /**
-   * Optional options for the MongoDb Client
-   */
-  options: Options
-  /**
-   * A callback for model initialization
-   */
-
-  initModel?: (sequelize: Sequelize) => Promise<void>
-}) {
-  const clientFactory = injector.getInstance(SequelizeClientFactory)
-  const store = new SequelizeStore({
-    model,
-    primaryKey,
-    getSequelizeClient: () => clientFactory.getSequelizeClient(options),
-    initModel,
-    sequelizeModel,
-  })
-  addStore(injector, store)
-}