@furystack/sequelize-store 2.2.2 → 3.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/index.js +3 -0
- package/esm/index.js.map +1 -0
- package/esm/sequelize-client-factory.js +75 -0
- package/esm/sequelize-client-factory.js.map +1 -0
- package/{dist → esm}/sequelize-store.js +3 -10
- package/esm/sequelize-store.js.map +1 -0
- package/esm/store-manager-helpers.js +15 -0
- package/esm/store-manager-helpers.js.map +1 -0
- package/package.json +26 -8
- package/src/sequelize-store.spec.ts +3 -2
- package/src/sequelize-store.ts +2 -2
- package/types/sequelize-store.d.ts.map +1 -1
- package/dist/index.js +0 -19
- package/dist/index.js.map +0 -1
- package/dist/sequelize-client-factory.js +0 -78
- package/dist/sequelize-client-factory.js.map +0 -1
- package/dist/sequelize-store.js.map +0 -1
- package/dist/sequelize-store.spec.js +0 -153
- package/dist/sequelize-store.spec.js.map +0 -1
- package/dist/store-manager-helpers.js +0 -19
- package/dist/store-manager-helpers.js.map +0 -1
- package/types/sequelize-store.spec.d.ts +0 -2
- package/types/sequelize-store.spec.d.ts.map +0 -1
package/esm/index.js
ADDED
package/esm/index.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,yBAAyB,CAAA"}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
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;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
import { Injectable } from '@furystack/inject';
|
|
8
|
+
import { Sequelize, Op } from 'sequelize';
|
|
9
|
+
const operatorsAliases = {
|
|
10
|
+
$eq: Op.eq,
|
|
11
|
+
$ne: Op.ne,
|
|
12
|
+
$gte: Op.gte,
|
|
13
|
+
$gt: Op.gt,
|
|
14
|
+
$lte: Op.lte,
|
|
15
|
+
$lt: Op.lt,
|
|
16
|
+
$not: Op.not,
|
|
17
|
+
$in: Op.in,
|
|
18
|
+
$nin: Op.notIn,
|
|
19
|
+
$notIn: Op.notIn,
|
|
20
|
+
$is: Op.is,
|
|
21
|
+
$like: Op.like,
|
|
22
|
+
$notLike: Op.notLike,
|
|
23
|
+
$iLike: Op.iLike,
|
|
24
|
+
$notILike: Op.notILike,
|
|
25
|
+
$regex: Op.regexp,
|
|
26
|
+
$regexp: Op.regexp,
|
|
27
|
+
$notRegexp: Op.notRegexp,
|
|
28
|
+
$iRegexp: Op.iRegexp,
|
|
29
|
+
$notIRegexp: Op.notIRegexp,
|
|
30
|
+
$startsWith: Op.startsWith,
|
|
31
|
+
$endsWith: Op.endsWith,
|
|
32
|
+
$between: Op.between,
|
|
33
|
+
$notBetween: Op.notBetween,
|
|
34
|
+
$overlap: Op.overlap,
|
|
35
|
+
$contains: Op.contains,
|
|
36
|
+
$contained: Op.contained,
|
|
37
|
+
$adjacent: Op.adjacent,
|
|
38
|
+
$strictLeft: Op.strictLeft,
|
|
39
|
+
$strictRight: Op.strictRight,
|
|
40
|
+
$noExtendRight: Op.noExtendRight,
|
|
41
|
+
$noExtendLeft: Op.noExtendLeft,
|
|
42
|
+
$and: Op.and,
|
|
43
|
+
$or: Op.or,
|
|
44
|
+
$any: Op.any,
|
|
45
|
+
$all: Op.all,
|
|
46
|
+
$values: Op.values,
|
|
47
|
+
$col: Op.col,
|
|
48
|
+
};
|
|
49
|
+
/**
|
|
50
|
+
* Factory for instantiating Sequelize clients
|
|
51
|
+
*/
|
|
52
|
+
let SequelizeClientFactory = class SequelizeClientFactory {
|
|
53
|
+
constructor() {
|
|
54
|
+
this.connections = new Map();
|
|
55
|
+
}
|
|
56
|
+
async dispose() {
|
|
57
|
+
await Promise.all([...this.connections.values()].map((c) => c.close()));
|
|
58
|
+
this.connections.clear();
|
|
59
|
+
}
|
|
60
|
+
getSequelizeClient(options) {
|
|
61
|
+
const key = JSON.stringify(options);
|
|
62
|
+
const existing = this.connections.get(key);
|
|
63
|
+
if (existing) {
|
|
64
|
+
return existing;
|
|
65
|
+
}
|
|
66
|
+
const client = new Sequelize({ ...options, operatorsAliases });
|
|
67
|
+
this.connections.set(key, client);
|
|
68
|
+
return client;
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
SequelizeClientFactory = __decorate([
|
|
72
|
+
Injectable({ lifetime: 'singleton' })
|
|
73
|
+
], SequelizeClientFactory);
|
|
74
|
+
export { SequelizeClientFactory };
|
|
75
|
+
//# sourceMappingURL=sequelize-client-factory.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sequelize-client-factory.js","sourceRoot":"","sources":["../src/sequelize-client-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.SequelizeStore = void 0;
|
|
7
|
-
const semaphore_async_await_1 = __importDefault(require("semaphore-async-await"));
|
|
1
|
+
import { Lock } from 'semaphore-async-await';
|
|
8
2
|
/**
|
|
9
3
|
* TypeORM Store implementation for FuryStack
|
|
10
4
|
*/
|
|
11
|
-
class SequelizeStore {
|
|
5
|
+
export class SequelizeStore {
|
|
12
6
|
async getModel() {
|
|
13
7
|
if (this.initializedModel) {
|
|
14
8
|
return this.initializedModel;
|
|
@@ -33,7 +27,7 @@ class SequelizeStore {
|
|
|
33
27
|
}
|
|
34
28
|
constructor(options) {
|
|
35
29
|
this.options = options;
|
|
36
|
-
this.initLock = new
|
|
30
|
+
this.initLock = new Lock();
|
|
37
31
|
this.primaryKey = options.primaryKey;
|
|
38
32
|
this.model = options.model;
|
|
39
33
|
this.sequelizeModel = options.sequelizeModel;
|
|
@@ -87,5 +81,4 @@ class SequelizeStore {
|
|
|
87
81
|
/** */
|
|
88
82
|
}
|
|
89
83
|
}
|
|
90
|
-
exports.SequelizeStore = SequelizeStore;
|
|
91
84
|
//# sourceMappingURL=sequelize-store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sequelize-store.js","sourceRoot":"","sources":["../src/sequelize-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { addStore } from '@furystack/core';
|
|
2
|
+
import { SequelizeClientFactory } from './sequelize-client-factory';
|
|
3
|
+
import { SequelizeStore } from './sequelize-store';
|
|
4
|
+
export const useSequelize = function ({ injector, model, sequelizeModel, primaryKey, options, initModel, }) {
|
|
5
|
+
const clientFactory = injector.getInstance(SequelizeClientFactory);
|
|
6
|
+
const store = new SequelizeStore({
|
|
7
|
+
model,
|
|
8
|
+
primaryKey,
|
|
9
|
+
getSequelizeClient: () => clientFactory.getSequelizeClient(options),
|
|
10
|
+
initModel,
|
|
11
|
+
sequelizeModel,
|
|
12
|
+
});
|
|
13
|
+
addStore(injector, store);
|
|
14
|
+
};
|
|
15
|
+
//# sourceMappingURL=store-manager-helpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"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,4BAA4B,CAAA;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAElD,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/package.json
CHANGED
|
@@ -1,10 +1,27 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@furystack/sequelize-store",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.1",
|
|
4
4
|
"description": "Sequelize-based Store implementation for FuryStack",
|
|
5
|
-
"
|
|
5
|
+
"type": "module",
|
|
6
|
+
"scripts": {
|
|
7
|
+
"build:es6": "tsc --outDir ./esm"
|
|
8
|
+
},
|
|
9
|
+
"exports": {
|
|
10
|
+
".": {
|
|
11
|
+
"import": "./esm/index.js",
|
|
12
|
+
"types": "./types/index.d.ts"
|
|
13
|
+
},
|
|
14
|
+
"./package.json": "./package.json"
|
|
15
|
+
},
|
|
16
|
+
"typesVersions": {
|
|
17
|
+
"*": {
|
|
18
|
+
"*": [
|
|
19
|
+
"types/*"
|
|
20
|
+
]
|
|
21
|
+
}
|
|
22
|
+
},
|
|
6
23
|
"files": [
|
|
7
|
-
"
|
|
24
|
+
"esm",
|
|
8
25
|
"types",
|
|
9
26
|
"src"
|
|
10
27
|
],
|
|
@@ -27,16 +44,17 @@
|
|
|
27
44
|
},
|
|
28
45
|
"homepage": "https://github.com/furystack/furystack",
|
|
29
46
|
"dependencies": {
|
|
30
|
-
"@furystack/core": "^
|
|
31
|
-
"@furystack/inject": "^
|
|
32
|
-
"@furystack/utils": "^
|
|
47
|
+
"@furystack/core": "^12.0.1",
|
|
48
|
+
"@furystack/inject": "^8.0.1",
|
|
49
|
+
"@furystack/utils": "^4.0.1",
|
|
33
50
|
"semaphore-async-await": "^1.5.1",
|
|
34
51
|
"sequelize": "^6.31.0"
|
|
35
52
|
},
|
|
36
53
|
"devDependencies": {
|
|
37
|
-
"@types/jest": "^29.5.0",
|
|
38
54
|
"@types/node": "^18.15.11",
|
|
39
|
-
"sqlite3": "5.1.6"
|
|
55
|
+
"sqlite3": "5.1.6",
|
|
56
|
+
"typescript": "^5.0.4",
|
|
57
|
+
"vitest": "^0.30.1"
|
|
40
58
|
},
|
|
41
59
|
"typings": "./types/index.d.ts"
|
|
42
60
|
}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import { TestClass } from '@furystack/core'
|
|
2
|
-
import { StoreManager
|
|
1
|
+
import { TestClass, createStoreTest } from '@furystack/core/create-physical-store-tests'
|
|
2
|
+
import { StoreManager } from '@furystack/core'
|
|
3
3
|
import { useSequelize } from './store-manager-helpers'
|
|
4
4
|
import { DataTypes, Model } from 'sequelize'
|
|
5
5
|
import { sleepAsync, usingAsync } from '@furystack/utils'
|
|
6
6
|
import { Injector } from '@furystack/inject'
|
|
7
7
|
import { SequelizeClientFactory } from './sequelize-client-factory'
|
|
8
8
|
import type { SequelizeStore } from './sequelize-store'
|
|
9
|
+
import { describe, it, expect } from 'vitest'
|
|
9
10
|
|
|
10
11
|
class TestSequelizeClass extends Model<TestClass, TestClass> implements TestClass {
|
|
11
12
|
id!: number
|
package/src/sequelize-store.ts
CHANGED
|
@@ -8,7 +8,7 @@ import type {
|
|
|
8
8
|
} from '@furystack/core'
|
|
9
9
|
import type { Constructable } from '@furystack/inject'
|
|
10
10
|
import type { Sequelize, ModelStatic, Model, WhereOptions, Attributes } from 'sequelize'
|
|
11
|
-
import
|
|
11
|
+
import { Lock } from 'semaphore-async-await'
|
|
12
12
|
|
|
13
13
|
export interface SequelizeStoreSettings<T extends object, M extends Model<T>, TPrimaryKey extends keyof T> {
|
|
14
14
|
/**
|
|
@@ -50,7 +50,7 @@ export class SequelizeStore<
|
|
|
50
50
|
|
|
51
51
|
public readonly sequelizeModel: ModelStatic<M>
|
|
52
52
|
|
|
53
|
-
private initLock = new
|
|
53
|
+
private initLock = new Lock()
|
|
54
54
|
|
|
55
55
|
private initializedModel?: ModelStatic<M>
|
|
56
56
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sequelize-store.d.ts","sourceRoot":"","sources":["../src/sequelize-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACb,aAAa,EACb,UAAU,EACV,cAAc,EACd,YAAY,EACb,MAAM,iBAAiB,CAAA;AACxB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,KAAK,EAA4B,MAAM,WAAW,CAAA;AAGxF,MAAM,WAAW,sBAAsB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAAE,WAAW,SAAS,MAAM,CAAC;IACvG;;OAEG;IACH,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,CAAA;IAEvB;;OAEG;IACH,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;IAC9B;;OAEG;IACH,UAAU,EAAE,WAAW,CAAA;IACvB;;OAEG;IACH,kBAAkB,EAAE,MAAM,SAAS,CAAA;IACnC;;OAEG;IACH,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CACpD;AAED;;GAEG;AACH,qBAAa,cAAc,CACzB,CAAC,SAAS,MAAM,EAChB,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAClB,WAAW,SAAS,MAAM,CAAC,EAC3B,cAAc,GAAG,cAAc,CAAC,CAAC,EAAE,WAAW,CAAC,CAC/C,YAAW,aAAa,CAAC,CAAC,EAAE,WAAW,EAAE,cAAc,CAAC;IAqC5C,OAAO,CAAC,QAAQ,CAAC,OAAO;IAnCpC,SAAgB,UAAU,EAAE,WAAW,CAAA;IAEvC,SAAgB,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,CAAA;IAEvC,SAAgB,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;IAE9C,OAAO,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"sequelize-store.d.ts","sourceRoot":"","sources":["../src/sequelize-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACb,aAAa,EACb,UAAU,EACV,cAAc,EACd,YAAY,EACb,MAAM,iBAAiB,CAAA;AACxB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,KAAK,EAA4B,MAAM,WAAW,CAAA;AAGxF,MAAM,WAAW,sBAAsB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAAE,WAAW,SAAS,MAAM,CAAC;IACvG;;OAEG;IACH,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,CAAA;IAEvB;;OAEG;IACH,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;IAC9B;;OAEG;IACH,UAAU,EAAE,WAAW,CAAA;IACvB;;OAEG;IACH,kBAAkB,EAAE,MAAM,SAAS,CAAA;IACnC;;OAEG;IACH,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CACpD;AAED;;GAEG;AACH,qBAAa,cAAc,CACzB,CAAC,SAAS,MAAM,EAChB,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAClB,WAAW,SAAS,MAAM,CAAC,EAC3B,cAAc,GAAG,cAAc,CAAC,CAAC,EAAE,WAAW,CAAC,CAC/C,YAAW,aAAa,CAAC,CAAC,EAAE,WAAW,EAAE,cAAc,CAAC;IAqC5C,OAAO,CAAC,QAAQ,CAAC,OAAO;IAnCpC,SAAgB,UAAU,EAAE,WAAW,CAAA;IAEvC,SAAgB,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,CAAA;IAEvC,SAAgB,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;IAE9C,OAAO,CAAC,QAAQ,CAAa;IAE7B,OAAO,CAAC,gBAAgB,CAAC,CAAgB;IAE5B,QAAQ,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBAyBnB,OAAO,EAAE,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC;IAKlE,GAAG,CAAC,GAAG,OAAO,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAO3D,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3D,KAAK,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAI9C,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;IAsB/B,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAIzE,MAAM,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrD,OAAO;CAGrB"}
|
package/dist/index.js
DELETED
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./sequelize-store"), exports);
|
|
18
|
-
__exportStar(require("./store-manager-helpers"), exports);
|
|
19
|
-
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAiC;AACjC,0DAAuC"}
|
|
@@ -1,78 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
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;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.SequelizeClientFactory = void 0;
|
|
10
|
-
const inject_1 = require("@furystack/inject");
|
|
11
|
-
const sequelize_1 = require("sequelize");
|
|
12
|
-
const operatorsAliases = {
|
|
13
|
-
$eq: sequelize_1.Op.eq,
|
|
14
|
-
$ne: sequelize_1.Op.ne,
|
|
15
|
-
$gte: sequelize_1.Op.gte,
|
|
16
|
-
$gt: sequelize_1.Op.gt,
|
|
17
|
-
$lte: sequelize_1.Op.lte,
|
|
18
|
-
$lt: sequelize_1.Op.lt,
|
|
19
|
-
$not: sequelize_1.Op.not,
|
|
20
|
-
$in: sequelize_1.Op.in,
|
|
21
|
-
$nin: sequelize_1.Op.notIn,
|
|
22
|
-
$notIn: sequelize_1.Op.notIn,
|
|
23
|
-
$is: sequelize_1.Op.is,
|
|
24
|
-
$like: sequelize_1.Op.like,
|
|
25
|
-
$notLike: sequelize_1.Op.notLike,
|
|
26
|
-
$iLike: sequelize_1.Op.iLike,
|
|
27
|
-
$notILike: sequelize_1.Op.notILike,
|
|
28
|
-
$regex: sequelize_1.Op.regexp,
|
|
29
|
-
$regexp: sequelize_1.Op.regexp,
|
|
30
|
-
$notRegexp: sequelize_1.Op.notRegexp,
|
|
31
|
-
$iRegexp: sequelize_1.Op.iRegexp,
|
|
32
|
-
$notIRegexp: sequelize_1.Op.notIRegexp,
|
|
33
|
-
$startsWith: sequelize_1.Op.startsWith,
|
|
34
|
-
$endsWith: sequelize_1.Op.endsWith,
|
|
35
|
-
$between: sequelize_1.Op.between,
|
|
36
|
-
$notBetween: sequelize_1.Op.notBetween,
|
|
37
|
-
$overlap: sequelize_1.Op.overlap,
|
|
38
|
-
$contains: sequelize_1.Op.contains,
|
|
39
|
-
$contained: sequelize_1.Op.contained,
|
|
40
|
-
$adjacent: sequelize_1.Op.adjacent,
|
|
41
|
-
$strictLeft: sequelize_1.Op.strictLeft,
|
|
42
|
-
$strictRight: sequelize_1.Op.strictRight,
|
|
43
|
-
$noExtendRight: sequelize_1.Op.noExtendRight,
|
|
44
|
-
$noExtendLeft: sequelize_1.Op.noExtendLeft,
|
|
45
|
-
$and: sequelize_1.Op.and,
|
|
46
|
-
$or: sequelize_1.Op.or,
|
|
47
|
-
$any: sequelize_1.Op.any,
|
|
48
|
-
$all: sequelize_1.Op.all,
|
|
49
|
-
$values: sequelize_1.Op.values,
|
|
50
|
-
$col: sequelize_1.Op.col,
|
|
51
|
-
};
|
|
52
|
-
/**
|
|
53
|
-
* Factory for instantiating Sequelize clients
|
|
54
|
-
*/
|
|
55
|
-
let SequelizeClientFactory = class SequelizeClientFactory {
|
|
56
|
-
constructor() {
|
|
57
|
-
this.connections = new Map();
|
|
58
|
-
}
|
|
59
|
-
async dispose() {
|
|
60
|
-
await Promise.all([...this.connections.values()].map((c) => c.close()));
|
|
61
|
-
this.connections.clear();
|
|
62
|
-
}
|
|
63
|
-
getSequelizeClient(options) {
|
|
64
|
-
const key = JSON.stringify(options);
|
|
65
|
-
const existing = this.connections.get(key);
|
|
66
|
-
if (existing) {
|
|
67
|
-
return existing;
|
|
68
|
-
}
|
|
69
|
-
const client = new sequelize_1.Sequelize({ ...options, operatorsAliases });
|
|
70
|
-
this.connections.set(key, client);
|
|
71
|
-
return client;
|
|
72
|
-
}
|
|
73
|
-
};
|
|
74
|
-
SequelizeClientFactory = __decorate([
|
|
75
|
-
(0, inject_1.Injectable)({ lifetime: 'singleton' })
|
|
76
|
-
], SequelizeClientFactory);
|
|
77
|
-
exports.SequelizeClientFactory = SequelizeClientFactory;
|
|
78
|
-
//# sourceMappingURL=sequelize-client-factory.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"sequelize-client-factory.js","sourceRoot":"","sources":["../src/sequelize-client-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"sequelize-store.js","sourceRoot":"","sources":["../src/sequelize-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,153 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const core_1 = require("@furystack/core");
|
|
4
|
-
const core_2 = require("@furystack/core");
|
|
5
|
-
const store_manager_helpers_1 = require("./store-manager-helpers");
|
|
6
|
-
const sequelize_1 = require("sequelize");
|
|
7
|
-
const utils_1 = require("@furystack/utils");
|
|
8
|
-
const inject_1 = require("@furystack/inject");
|
|
9
|
-
const sequelize_client_factory_1 = require("./sequelize-client-factory");
|
|
10
|
-
class TestSequelizeClass extends sequelize_1.Model {
|
|
11
|
-
}
|
|
12
|
-
describe('Sequelize Store', () => {
|
|
13
|
-
(0, core_2.createStoreTest)({
|
|
14
|
-
typeName: 'sequelize-store',
|
|
15
|
-
skipRegexTests: true,
|
|
16
|
-
createStore: (i) => {
|
|
17
|
-
(0, store_manager_helpers_1.useSequelize)({
|
|
18
|
-
injector: i,
|
|
19
|
-
model: core_1.TestClass,
|
|
20
|
-
sequelizeModel: TestSequelizeClass,
|
|
21
|
-
primaryKey: 'id',
|
|
22
|
-
options: {
|
|
23
|
-
dialect: 'sqlite',
|
|
24
|
-
storage: ':memory:',
|
|
25
|
-
logging: false,
|
|
26
|
-
},
|
|
27
|
-
initModel: async (sequelize) => {
|
|
28
|
-
TestSequelizeClass.init({
|
|
29
|
-
id: {
|
|
30
|
-
type: sequelize_1.DataTypes.INTEGER,
|
|
31
|
-
autoIncrement: true,
|
|
32
|
-
primaryKey: true,
|
|
33
|
-
},
|
|
34
|
-
stringValue1: {
|
|
35
|
-
type: sequelize_1.DataTypes.STRING,
|
|
36
|
-
},
|
|
37
|
-
stringValue2: {
|
|
38
|
-
type: sequelize_1.DataTypes.STRING,
|
|
39
|
-
},
|
|
40
|
-
numberValue1: {
|
|
41
|
-
type: sequelize_1.DataTypes.INTEGER,
|
|
42
|
-
},
|
|
43
|
-
numberValue2: {
|
|
44
|
-
type: sequelize_1.DataTypes.INTEGER,
|
|
45
|
-
},
|
|
46
|
-
booleanValue: {
|
|
47
|
-
type: sequelize_1.DataTypes.BOOLEAN,
|
|
48
|
-
},
|
|
49
|
-
dateValue: {
|
|
50
|
-
type: sequelize_1.DataTypes.DATE,
|
|
51
|
-
},
|
|
52
|
-
}, { sequelize, timestamps: false });
|
|
53
|
-
},
|
|
54
|
-
});
|
|
55
|
-
const store = i.getInstance(core_2.StoreManager).getStoreFor(core_1.TestClass, 'id');
|
|
56
|
-
return store;
|
|
57
|
-
},
|
|
58
|
-
});
|
|
59
|
-
it('should return the cached sequelize client instance from the factory', async () => {
|
|
60
|
-
await (0, utils_1.usingAsync)(new inject_1.Injector(), async (i) => {
|
|
61
|
-
const factory = i.getInstance(sequelize_client_factory_1.SequelizeClientFactory);
|
|
62
|
-
const settings = {
|
|
63
|
-
dialect: 'sqlite',
|
|
64
|
-
storage: ':memory:',
|
|
65
|
-
logging: false,
|
|
66
|
-
};
|
|
67
|
-
const client1 = factory.getSequelizeClient(settings);
|
|
68
|
-
const client2 = factory.getSequelizeClient(settings);
|
|
69
|
-
expect(client1).toBe(client2);
|
|
70
|
-
});
|
|
71
|
-
});
|
|
72
|
-
it('should return the cached model from the store class', async () => {
|
|
73
|
-
await (0, utils_1.usingAsync)(new inject_1.Injector(), async (i) => {
|
|
74
|
-
(0, store_manager_helpers_1.useSequelize)({
|
|
75
|
-
injector: i,
|
|
76
|
-
model: core_1.TestClass,
|
|
77
|
-
sequelizeModel: TestSequelizeClass,
|
|
78
|
-
primaryKey: 'id',
|
|
79
|
-
options: {
|
|
80
|
-
dialect: 'sqlite',
|
|
81
|
-
storage: ':memory:',
|
|
82
|
-
logging: false,
|
|
83
|
-
},
|
|
84
|
-
initModel: async (sequelize) => {
|
|
85
|
-
await (0, utils_1.sleepAsync)(100);
|
|
86
|
-
TestSequelizeClass.init({
|
|
87
|
-
id: {
|
|
88
|
-
type: sequelize_1.DataTypes.INTEGER,
|
|
89
|
-
autoIncrement: true,
|
|
90
|
-
primaryKey: true,
|
|
91
|
-
},
|
|
92
|
-
stringValue1: {
|
|
93
|
-
type: sequelize_1.DataTypes.STRING,
|
|
94
|
-
},
|
|
95
|
-
stringValue2: {
|
|
96
|
-
type: sequelize_1.DataTypes.STRING,
|
|
97
|
-
},
|
|
98
|
-
numberValue1: {
|
|
99
|
-
type: sequelize_1.DataTypes.INTEGER,
|
|
100
|
-
},
|
|
101
|
-
numberValue2: {
|
|
102
|
-
type: sequelize_1.DataTypes.INTEGER,
|
|
103
|
-
},
|
|
104
|
-
booleanValue: {
|
|
105
|
-
type: sequelize_1.DataTypes.BOOLEAN,
|
|
106
|
-
},
|
|
107
|
-
dateValue: {
|
|
108
|
-
type: sequelize_1.DataTypes.DATE,
|
|
109
|
-
},
|
|
110
|
-
}, { sequelize, timestamps: false });
|
|
111
|
-
},
|
|
112
|
-
});
|
|
113
|
-
const store = i
|
|
114
|
-
.getInstance(core_2.StoreManager)
|
|
115
|
-
.getStoreFor(core_1.TestClass, 'id');
|
|
116
|
-
const model1Promise = store.getModel();
|
|
117
|
-
const model2 = await store.getModel();
|
|
118
|
-
const model1 = await model1Promise;
|
|
119
|
-
expect(model2).toBe(model1);
|
|
120
|
-
const model3 = await store.getModel();
|
|
121
|
-
expect(model3).toBe(model1);
|
|
122
|
-
});
|
|
123
|
-
});
|
|
124
|
-
it('should throw if the sequelize model is not initialized', async () => {
|
|
125
|
-
await (0, utils_1.usingAsync)(new inject_1.Injector(), async (i) => {
|
|
126
|
-
(0, store_manager_helpers_1.useSequelize)({
|
|
127
|
-
injector: i,
|
|
128
|
-
model: core_1.TestClass,
|
|
129
|
-
sequelizeModel: TestSequelizeClass,
|
|
130
|
-
primaryKey: 'id',
|
|
131
|
-
options: {
|
|
132
|
-
dialect: 'sqlite',
|
|
133
|
-
storage: ':memory:',
|
|
134
|
-
logging: false,
|
|
135
|
-
},
|
|
136
|
-
initModel: async () => {
|
|
137
|
-
// won't init the model here
|
|
138
|
-
},
|
|
139
|
-
});
|
|
140
|
-
const store = i
|
|
141
|
-
.getInstance(core_2.StoreManager)
|
|
142
|
-
.getStoreFor(core_1.TestClass, 'id');
|
|
143
|
-
expect.assertions(1);
|
|
144
|
-
try {
|
|
145
|
-
await store.getModel();
|
|
146
|
-
}
|
|
147
|
-
catch (error) {
|
|
148
|
-
expect(error.message).toBe('TestSequelizeClass has not been defined'); // will be thrown by sequelize
|
|
149
|
-
}
|
|
150
|
-
});
|
|
151
|
-
});
|
|
152
|
-
});
|
|
153
|
-
//# sourceMappingURL=sequelize-store.spec.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"sequelize-store.spec.js","sourceRoot":"","sources":["../src/sequelize-store.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.useSequelize = void 0;
|
|
4
|
-
const core_1 = require("@furystack/core");
|
|
5
|
-
const sequelize_client_factory_1 = require("./sequelize-client-factory");
|
|
6
|
-
const sequelize_store_1 = require("./sequelize-store");
|
|
7
|
-
const useSequelize = function ({ injector, model, sequelizeModel, primaryKey, options, initModel, }) {
|
|
8
|
-
const clientFactory = injector.getInstance(sequelize_client_factory_1.SequelizeClientFactory);
|
|
9
|
-
const store = new sequelize_store_1.SequelizeStore({
|
|
10
|
-
model,
|
|
11
|
-
primaryKey,
|
|
12
|
-
getSequelizeClient: () => clientFactory.getSequelizeClient(options),
|
|
13
|
-
initModel,
|
|
14
|
-
sequelizeModel,
|
|
15
|
-
});
|
|
16
|
-
(0, core_1.addStore)(injector, store);
|
|
17
|
-
};
|
|
18
|
-
exports.useSequelize = useSequelize;
|
|
19
|
-
//# sourceMappingURL=store-manager-helpers.js.map
|
|
@@ -1 +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,UAAkF,EAC5G,QAAQ,EACR,KAAK,EACL,cAAc,EACd,UAAU,EACV,OAAO,EACP,SAAS,GA0BV;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,GAAG,EAAE,CAAC,aAAa,CAAC,kBAAkB,CAAC,OAAO,CAAC;QACnE,SAAS;QACT,cAAc;KACf,CAAC,CAAA;IACF,IAAA,eAAQ,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC3B,CAAC,CAAA;AA1CY,QAAA,YAAY,gBA0CxB"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"sequelize-store.spec.d.ts","sourceRoot":"","sources":["../src/sequelize-store.spec.ts"],"names":[],"mappings":""}
|