@furystack/sequelize-store 0.3.26 → 1.0.2

package/README.md

@@ -9,7 +9,6 @@ Initialization
 import '@furystack/sequelize-store'
 
 export class TestEntry extends Model<...,...> {
-  // tslint:disable-next-line: naming-convention
   public _id!: string
   public value!: string
 }

package/dist/index.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./sequelize-store"), exports);
-require("./store-manager-extensions");
+tslib_1.__exportStar(require("./store-manager-helpers"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,4DAAiC;AACjC,sCAAmC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,4DAAiC;AACjC,kEAAuC"}

package/dist/sequelize-store.spec.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@furystack/core");
-const create_physical_store_tests_1 = require("@furystack/core/dist/create-physical-store-tests");
-require("./store-manager-extensions");
+const store_manager_helpers_1 = require("./store-manager-helpers");
 const sequelize_1 = require("sequelize");
 class TestSequelizeClass extends sequelize_1.Model {
 }
 describe('Sequelize Store', () => {
-    (0, create_physical_store_tests_1.createStoreTest)({
+    (0, core_1.createStoreTest)({
         typeName: 'sequelize-store',
         skipRegexTests: true,
         createStore: (i) => {
-            i.setupStores((sm) => sm.useSequelize({
+            (0, store_manager_helpers_1.useSequelize)({
+                injector: i,
                 model: TestSequelizeClass,
                 primaryKey: 'id',
                 options: {
@@ -46,7 +46,7 @@ describe('Sequelize Store', () => {
                         },
                     }, { sequelize, timestamps: false });
                 },
-            }));
+            });
             const store = i.getInstance(core_1.StoreManager).getStoreFor(TestSequelizeClass, 'id');
             return store;
         },

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

@@ -1 +1 @@
-{"version":3,"file":"sequelize-store.spec.js","sourceRoot":"","sources":["../src/sequelize-store.spec.ts"],"names":[],"mappings":";;AAAA,0CAA8C;AAC9C,kGAA6F;AAC7F,sCAAmC;AACnC,yCAA4C;AAE5C,MAAM,kBAAmB,SAAQ,iBAAK;CAQrC;AAED,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,IAAA,6CAAe,EAAC;QACd,QAAQ,EAAE,iBAAiB;QAC3B,cAAc,EAAE,IAAI;QACpB,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE;YACjB,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CACnB,EAAE,CAAC,YAAY,CAAC;gBACd,KAAK,EAAE,kBAAkB;gBACzB,UAAU,EAAE,IAAI;gBAChB,OAAO,EAAE;oBACP,OAAO,EAAE,QAAQ;oBACjB,OAAO,EAAE,UAAU;oBACnB,OAAO,EAAE,KAAK;iBACf;gBACD,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;oBAC7B,kBAAkB,CAAC,IAAI,CACrB;wBACE,EAAE,EAAE;4BACF,IAAI,EAAE,qBAAS,CAAC,OAAO;4BACvB,aAAa,EAAE,IAAI;4BACnB,UAAU,EAAE,IAAI;yBACjB;wBACD,YAAY,EAAE;4BACZ,IAAI,EAAE,qBAAS,CAAC,MAAM;yBACvB;wBACD,YAAY,EAAE;4BACZ,IAAI,EAAE,qBAAS,CAAC,MAAM;yBACvB;wBACD,YAAY,EAAE;4BACZ,IAAI,EAAE,qBAAS,CAAC,OAAO;yBACxB;wBACD,YAAY,EAAE;4BACZ,IAAI,EAAE,qBAAS,CAAC,OAAO;yBACxB;wBACD,YAAY,EAAE;4BACZ,IAAI,EAAE,qBAAS,CAAC,OAAO;yBACxB;wBACD,SAAS,EAAE;4BACT,IAAI,EAAE,qBAAS,CAAC,IAAI;yBACrB;qBACF,EACD,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,CACjC,CAAA;gBACH,CAAC;aACF,CAAC,CACH,CAAA;YACD,MAAM,KAAK,GAAG,CAAC,CAAC,WAAW,CAAC,mBAAY,CAAC,CAAC,WAAW,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAA;YAC/E,OAAO,KAAK,CAAA;QACd,CAAC;KACF,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"sequelize-store.spec.js","sourceRoot":"","sources":["../src/sequelize-store.spec.ts"],"names":[],"mappings":";;AAAA,0CAA0E;AAC1E,mEAAsD;AACtD,yCAA4C;AAE5C,MAAM,kBAAmB,SAAQ,iBAAK;CAQrC;AAED,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,IAAA,sBAAe,EAAC;QACd,QAAQ,EAAE,iBAAiB;QAC3B,cAAc,EAAE,IAAI;QACpB,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE;YACjB,IAAA,oCAAY,EAAC;gBACX,QAAQ,EAAE,CAAC;gBACX,KAAK,EAAE,kBAAkB;gBACzB,UAAU,EAAE,IAAI;gBAChB,OAAO,EAAE;oBACP,OAAO,EAAE,QAAQ;oBACjB,OAAO,EAAE,UAAU;oBACnB,OAAO,EAAE,KAAK;iBACf;gBACD,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;oBAC7B,kBAAkB,CAAC,IAAI,CACrB;wBACE,EAAE,EAAE;4BACF,IAAI,EAAE,qBAAS,CAAC,OAAO;4BACvB,aAAa,EAAE,IAAI;4BACnB,UAAU,EAAE,IAAI;yBACjB;wBACD,YAAY,EAAE;4BACZ,IAAI,EAAE,qBAAS,CAAC,MAAM;yBACvB;wBACD,YAAY,EAAE;4BACZ,IAAI,EAAE,qBAAS,CAAC,MAAM;yBACvB;wBACD,YAAY,EAAE;4BACZ,IAAI,EAAE,qBAAS,CAAC,OAAO;yBACxB;wBACD,YAAY,EAAE;4BACZ,IAAI,EAAE,qBAAS,CAAC,OAAO;yBACxB;wBACD,YAAY,EAAE;4BACZ,IAAI,EAAE,qBAAS,CAAC,OAAO;yBACxB;wBACD,SAAS,EAAE;4BACT,IAAI,EAAE,qBAAS,CAAC,IAAI;yBACrB;qBACF,EACD,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,CACjC,CAAA;gBACH,CAAC;aACF,CAAC,CAAA;YACF,MAAM,KAAK,GAAG,CAAC,CAAC,WAAW,CAAC,mBAAY,CAAC,CAAC,WAAW,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAA;YAC/E,OAAO,KAAK,CAAA;QACd,CAAC;KACF,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/dist/{store-manager-extensions.js → store-manager-helpers.js}

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const store_manager_1 = require("@furystack/core/dist/store-manager");
+exports.useSequelize = void 0;
+const core_1 = require("@furystack/core");
 const sequelize_client_factory_1 = require("./sequelize-client-factory");
 const sequelize_store_1 = require("./sequelize-store");
-store_manager_1.StoreManager.prototype.useSequelize = function ({ model, primaryKey, options, initModel }) {
-    const clientFactory = this.injector.getInstance(sequelize_client_factory_1.SequelizeClientFactory);
+const useSequelize = function ({ injector, model, primaryKey, options, initModel, }) {
+    const clientFactory = injector.getInstance(sequelize_client_factory_1.SequelizeClientFactory);
     const store = new sequelize_store_1.SequelizeStore({
         model,
         primaryKey,
         getSequelizeClient: async () => await clientFactory.getSequelizeClient(options),
         initModel,
     });
-    this.addStore(store);
-    return this;
+    (0, core_1.addStore)(injector, store);
 };
-//# sourceMappingURL=store-manager-extensions.js.map
+exports.useSequelize = useSequelize;
+//# sourceMappingURL=store-manager-helpers.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"store-manager-helpers.js","sourceRoot":"","sources":["../src/store-manager-helpers.ts"],"names":[],"mappings":";;;AAAA,0CAA0C;AAG1C,yEAAmE;AACnE,uDAAkD;AAE3C,MAAM,YAAY,GAAG,UAA2B,EACrD,QAAQ,EACR,KAAK,EACL,UAAU,EACV,OAAO,EACP,SAAS,GAoBV;IACC,MAAM,aAAa,GAAG,QAAQ,CAAC,WAAW,CAAC,iDAAsB,CAAC,CAAA;IAClE,MAAM,KAAK,GAAG,IAAI,gCAAc,CAAC;QAC/B,KAAK;QACL,UAAU;QACV,kBAAkB,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,aAAa,CAAC,kBAAkB,CAAC,OAAO,CAAC;QAC/E,SAAS;KACV,CAAC,CAAA;IACF,IAAA,eAAQ,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC3B,CAAC,CAAA;AAlCY,QAAA,YAAY,gBAkCxB"}

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@furystack/sequelize-store",
-  "version": "0.3.26",
+  "version": "1.0.2",
   "description": "Sequelize-based Store implementation for FuryStack",
   "main": "dist/index.js",
   "files": [
     "dist",
+    "types",
     "src"
   ],
   "repository": {
@@ -26,20 +27,18 @@
   },
   "homepage": "https://github.com/furystack/furystack",
   "dependencies": {
-    "@furystack/core": "^10.4.10",
-    "@furystack/inject": "^5.0.7",
-    "@furystack/logging": "^2.0.91",
-    "@furystack/utils": "^2.1.0",
+    "@furystack/core": "^11.0.1",
+    "@furystack/inject": "^6.0.1",
+    "@furystack/logging": "^3.0.1",
+    "@furystack/utils": "^3.0.1",
     "semaphore-async-await": "^1.5.1",
     "sequelize": "^6.19.0",
-    "tslib": "^2.3.1"
+    "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@types/jest": "^27.4.1",
-    "@types/node": "^17.0.23",
-    "@types/uuid": "^8.3.4",
-    "sqlite3": "^5.0.2",
-    "uuid": "^8.3.2"
+    "@types/jest": "^27.5.0",
+    "@types/node": "^17.0.31",
+    "sqlite3": "^5.0.6"
   },
-  "typings": "./dist/index.d.ts"
+  "typings": "./types/index.d.ts"
 }

package/src/index.ts

@@ -1,2 +1,2 @@
 export * from './sequelize-store'
-import './store-manager-extensions'
+export * from './store-manager-helpers'

package/src/sequelize-store.spec.ts

@@ -1,6 +1,5 @@
-import { StoreManager } from '@furystack/core'
-import { TestClass, createStoreTest } from '@furystack/core/dist/create-physical-store-tests'
-import './store-manager-extensions'
+import { StoreManager, TestClass, createStoreTest } from '@furystack/core'
+import { useSequelize } from './store-manager-helpers'
 import { DataTypes, Model } from 'sequelize'
 
 class TestSequelizeClass extends Model implements TestClass {
@@ -18,47 +17,46 @@ describe('Sequelize Store', () => {
     typeName: 'sequelize-store',
     skipRegexTests: true,
     createStore: (i) => {
-      i.setupStores((sm) =>
-        sm.useSequelize({
-          model: TestSequelizeClass,
-          primaryKey: 'id',
-          options: {
-            dialect: 'sqlite',
-            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,
-                },
+      useSequelize({
+        injector: i,
+        model: TestSequelizeClass,
+        primaryKey: 'id',
+        options: {
+          dialect: 'sqlite',
+          storage: ':memory:',
+          logging: false,
+        },
+        initModel: async (sequelize) => {
+          TestSequelizeClass.init(
+            {
+              id: {
+                type: DataTypes.INTEGER,
+                autoIncrement: true,
+                primaryKey: true,
               },
-              { sequelize, timestamps: false },
-            )
-          },
-        }),
-      )
+              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 },
+          )
+        },
+      })
       const store = i.getInstance(StoreManager).getStoreFor(TestSequelizeClass, 'id')
       return store
     },

package/src/store-manager-helpers.ts

@@ -0,0 +1,41 @@
+import { addStore } from '@furystack/core'
+import { Injector } from '@furystack/inject'
+import { Options, Model, Sequelize, ModelStatic } from 'sequelize'
+import { SequelizeClientFactory } from './sequelize-client-factory'
+import { SequelizeStore } from './sequelize-store'
+
+export const useSequelize = function <T extends Model>({
+  injector,
+  model,
+  primaryKey,
+  options,
+  initModel,
+}: {
+  injector: Injector
+  /**
+   * The constructable model class
+   */
+  model: ModelStatic<T>
+  /**
+   * The name of the Primary Key property
+   */
+  primaryKey: keyof T
+  /**
+   * 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: async () => await clientFactory.getSequelizeClient(options),
+    initModel,
+  })
+  addStore(injector, store)
+}

package/types/index.d.ts

@@ -0,0 +1,3 @@
+export * from './sequelize-store';
+export * from './store-manager-helpers';
+//# sourceMappingURL=index.d.ts.map

package/{dist → types}/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,OAAO,4BAA4B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,yBAAyB,CAAA"}

package/types/sequelize-store.spec.d.ts

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

package/{dist → types}/sequelize-store.spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sequelize-store.spec.d.ts","sourceRoot":"","sources":["../src/sequelize-store.spec.ts"],"names":[],"mappings":"AAEA,OAAO,4BAA4B,CAAA"}
+{"version":3,"file":"sequelize-store.spec.d.ts","sourceRoot":"","sources":["../src/sequelize-store.spec.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,22 @@
+import { Injector } from '@furystack/inject';
+import { Options, Model, Sequelize, ModelStatic } from 'sequelize';
+export declare const useSequelize: <T extends Model<any, any>>({ injector, model, primaryKey, options, initModel, }: {
+    injector: Injector;
+    /**
+     * The constructable model class
+     */
+    model: ModelStatic<T>;
+    /**
+     * The name of the Primary Key property
+     */
+    primaryKey: keyof T;
+    /**
+     * Optional options for the MongoDb Client
+     */
+    options: Options;
+    /**
+     * A callback for model initialization
+     */
+    initModel?: ((sequelize: Sequelize) => Promise<void>) | undefined;
+}) => void;
+//# sourceMappingURL=store-manager-helpers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"store-manager-helpers.d.ts","sourceRoot":"","sources":["../src/store-manager-helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAIlE,eAAO,MAAM,YAAY;cAOb,QAAQ;IAClB;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;aACM,OAAO;IAChB;;OAEG;6BAEqB,SAAS,KAAK,QAAQ,IAAI,CAAC;UAUpD,CAAA"}

package/dist/index.d.ts

@@ -1,3 +0,0 @@
-export * from './sequelize-store';
-import './store-manager-extensions';
-//# sourceMappingURL=index.d.ts.map

package/dist/sequelize-store.spec.d.ts

@@ -1,2 +0,0 @@
-import './store-manager-extensions';
-//# sourceMappingURL=sequelize-store.spec.d.ts.map

package/dist/store-manager-extensions.d.ts

@@ -1,27 +0,0 @@
-import { Options, ModelCtor, Model, Sequelize } from 'sequelize';
-declare module '@furystack/core/dist/store-manager' {
-    /**
-     * Defines an extended Injector instance
-     */
-    interface StoreManager {
-        /**
-         * Registers a MongoDb store to the StoreManager instance with the provided model.
-         */
-        useSequelize: <T extends Model>(options: {
-            /**
-             * The constructable model class
-             */
-            model: ModelCtor<T>;
-            /**
-             * The name of the Primary Key property
-             */
-            primaryKey: keyof T;
-            /**
-             * Optional options for the MongoDb Client
-             */
-            options: Options;
-            initModel?: (sequelize: Sequelize) => Promise<void>;
-        }) => this;
-    }
-}
-//# sourceMappingURL=store-manager-extensions.d.ts.map

package/dist/store-manager-extensions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"store-manager-extensions.d.ts","sourceRoot":"","sources":["../src/store-manager-extensions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAIhE,OAAO,QAAQ,oCAAoC,CAAC;IAClD;;OAEG;IACH,UAAU,YAAY;QACpB;;WAEG;QACH,YAAY,EAAE,CAAC,CAAC,SAAS,KAAK,EAAE,OAAO,EAAE;YACvC;;eAEG;YACH,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;YACnB;;eAEG;YACH,UAAU,EAAE,MAAM,CAAC,CAAA;YACnB;;eAEG;YACH,OAAO,EAAE,OAAO,CAAA;YAEhB,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;SACpD,KAAK,IAAI,CAAA;KACX;CACF"}

package/dist/store-manager-extensions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"store-manager-extensions.js","sourceRoot":"","sources":["../src/store-manager-extensions.ts"],"names":[],"mappings":";;AAAA,sEAAiE;AAEjE,yEAAmE;AACnE,uDAAkD;AA6BlD,4BAAY,CAAC,SAAS,CAAC,YAAY,GAAG,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE;IACvF,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,iDAAsB,CAAC,CAAA;IACvE,MAAM,KAAK,GAAG,IAAI,gCAAc,CAAC;QAC/B,KAAK;QACL,UAAU;QACV,kBAAkB,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,aAAa,CAAC,kBAAkB,CAAC,OAAO,CAAC;QAC/E,SAAS;KACV,CAAC,CAAA;IACF,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACpB,OAAO,IAAI,CAAA;AACb,CAAC,CAAA"}

package/src/store-manager-extensions.ts

@@ -1,43 +0,0 @@
-import { StoreManager } from '@furystack/core/dist/store-manager'
-import { Options, ModelCtor, Model, Sequelize } from 'sequelize'
-import { SequelizeClientFactory } from './sequelize-client-factory'
-import { SequelizeStore } from './sequelize-store'
-
-declare module '@furystack/core/dist/store-manager' {
-  /**
-   * Defines an extended Injector instance
-   */
-  interface StoreManager {
-    /**
-     * Registers a MongoDb store to the StoreManager instance with the provided model.
-     */
-    useSequelize: <T extends Model>(options: {
-      /**
-       * The constructable model class
-       */
-      model: ModelCtor<T>
-      /**
-       * The name of the Primary Key property
-       */
-      primaryKey: keyof T
-      /**
-       * Optional options for the MongoDb Client
-       */
-      options: Options
-
-      initModel?: (sequelize: Sequelize) => Promise<void>
-    }) => this
-  }
-}
-
-StoreManager.prototype.useSequelize = function ({ model, primaryKey, options, initModel }) {
-  const clientFactory = this.injector.getInstance(SequelizeClientFactory)
-  const store = new SequelizeStore({
-    model,
-    primaryKey,
-    getSequelizeClient: async () => await clientFactory.getSequelizeClient(options),
-    initModel,
-  })
-  this.addStore(store)
-  return this
-}