@volcanicminds/typeorm 0.0.9 → 0.0.11

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.
Files changed (20) hide show
  1. package/README.md +42 -4
  2. package/dist/index.d.ts +3 -1
  3. package/dist/index.js +8 -2
  4. package/dist/index.js.map +1 -1
  5. package/dist/lib/query.d.ts +16 -0
  6. package/dist/lib/query.js +153 -0
  7. package/dist/lib/query.js.map +1 -0
  8. package/dist/lib/util/logger.d.ts +6 -0
  9. package/dist/lib/util/logger.js +34 -0
  10. package/dist/lib/util/logger.js.map +1 -0
  11. package/esm/index.d.ts +3 -1
  12. package/esm/index.js +8 -2
  13. package/esm/index.js.map +1 -1
  14. package/esm/lib/query.d.ts +16 -0
  15. package/esm/lib/query.js +132 -0
  16. package/esm/lib/query.js.map +1 -0
  17. package/esm/lib/util/logger.d.ts +6 -0
  18. package/esm/lib/util/logger.js +34 -0
  19. package/esm/lib/util/logger.js.map +1 -0
  20. package/package.json +2 -2
package/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
2
2
  [![opensource](https://img.shields.io/badge/open-source-blue)](https://en.wikipedia.org/wiki/Open_source)
3
- [![volcanic-backend](https://img.shields.io/badge/volcanic-minds-orange)](https://github.com/volcanicminds/volcanic-backend)
3
+ [![volcanic-typeorm](https://img.shields.io/badge/volcanic-minds-orange)](https://github.com/volcanicminds/volcanic-typeorm)
4
4
  [![npm](https://img.shields.io/badge/package-npm-white)](https://www.npmjs.com/package/@volcanicminds/typeorm)
5
5
 
6
6
  # volcanic-database-typeorm
@@ -19,6 +19,8 @@ And, what you see in [package.json](package.json).
19
19
  yarn add @volcanicminds/typeorm
20
20
  ```
21
21
 
22
+ It's possible use this module with module [`@volcanicminds/backend`](https://github.com/volcanicminds/volcanic-backend)
23
+
22
24
  ## How to upgrade packages
23
25
 
24
26
  ```js
@@ -42,7 +44,7 @@ For example, under `/src/entities` create the following:
42
44
  import { Entity, Column, Index, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn } from 'typeorm'
43
45
 
44
46
  @Entity()
45
- class Player {
47
+ export class Player {
46
48
  @PrimaryGeneratedColumn('uuid')
47
49
  id: number
48
50
 
@@ -59,8 +61,6 @@ class Player {
59
61
  @UpdateDateColumn()
60
62
  updatedAt: Date
61
63
  }
62
-
63
- module.exports = Player
64
64
  ```
65
65
 
66
66
  For more info and possibilities see [typeorm decorators](https://typeorm.io/decorator-reference)
@@ -81,3 +81,41 @@ Log levels:
81
81
  - **warn**: useful warnings if the environment is controlled
82
82
  - **error**: print out errors even if not blocking/fatal errors
83
83
  - **fatal**: ok you are dead now, but you want to know
84
+
85
+ ## Query: Operators
86
+
87
+ It's possible use some operators:
88
+
89
+ | Operator | Description | Datatypes | Example |
90
+ | ---------- | ---------------------------------- | ------------- | -------------------- |
91
+ | null | Is null | all | field:null=true |
92
+ | notNull | Not is null | all | field:notNull=true |
93
+ | in | Included in an array | all | field:in=A,B,C |
94
+ | nin | Not included in an array | all | field:nin=A,B,C |
95
+ | gt | Greater than | numeric, date | field:gt=10 |
96
+ | ge | Greater than or equals to | numeric, date | field:ge=10 |
97
+ | lt | Less than | numeric, date | field:lt=10 |
98
+ | le | Less than or equals to | numeric, date | field:le=10 |
99
+ | between | Is between A and B | numeric, date | field:between=A,B |
100
+ | like | Like with wildcard % | text | field:like=va%ue |
101
+ | contains | Contains | text | field:contains=alu |
102
+ | ncontains | Not contains | text | field:ncontains=xyz |
103
+ | starts | Starts with | text | field:starts=val |
104
+ | ends | Ends with | text | field:ends=lue |
105
+ | eq | Equals to | all | field:eq=value |
106
+ | neq | Not equals to | all | field:neq=xyz |
107
+ | likei | Like with wildcard % (ignore-case) | text | field:likei=va%ue |
108
+ | containsi | Contains (ignore-case) | text | field:containsi=alu |
109
+ | ncontainsi | Not contains (ignore-case) | text | field:ncontainsi=xyz |
110
+ | startsi | Starts with (ignore-case) | text | field:startsi=val |
111
+ | endsi | Ends with (ignore-case) | text | field:endsi=lue |
112
+ | eqi | Equals to (ignore-case) | text | field:eqi=value |
113
+ | neqi | Not equals to (ignore-case) | text | field:neqi=xyz |
114
+
115
+ The expression `field=value` is equals to `field:eq=value`
116
+
117
+ **Pay attention**: Some datatypes, like UUID, are special types and have possibility to use only specific operator (for example: eq, null, notNull, ..)
118
+
119
+ ## Logging
120
+
121
+ Use Pino logger if in your project you have a `global.log` with a valid instance.
package/dist/index.d.ts CHANGED
@@ -1,5 +1,7 @@
1
1
  import 'reflect-metadata';
2
+ import { DataSource } from 'typeorm';
2
3
  import * as userManager from './lib/loader/userManager';
3
4
  import { User } from './lib/entities/user.e';
5
+ import { applyQuery, executeCountQuery, executeFindQuery } from './lib/query';
4
6
  export { Database } from './types/global';
5
- export { User, userManager };
7
+ export { User, userManager, DataSource, applyQuery, executeCountQuery, executeFindQuery };
package/dist/index.js CHANGED
@@ -32,14 +32,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
32
32
  });
33
33
  };
34
34
  Object.defineProperty(exports, "__esModule", { value: true });
35
- exports.userManager = exports.User = void 0;
35
+ exports.executeFindQuery = exports.executeCountQuery = exports.applyQuery = exports.DataSource = exports.userManager = exports.User = void 0;
36
36
  require("reflect-metadata");
37
37
  const typeorm_1 = require("typeorm");
38
+ Object.defineProperty(exports, "DataSource", { enumerable: true, get: function () { return typeorm_1.DataSource; } });
38
39
  const loaderEntities = __importStar(require("./lib/loader/entities"));
39
40
  const userManager = __importStar(require("./lib/loader/userManager"));
40
41
  exports.userManager = userManager;
41
42
  const user_e_1 = require("./lib/entities/user.e");
42
43
  Object.defineProperty(exports, "User", { enumerable: true, get: function () { return user_e_1.User; } });
44
+ const query_1 = require("./lib/query");
45
+ Object.defineProperty(exports, "applyQuery", { enumerable: true, get: function () { return query_1.applyQuery; } });
46
+ Object.defineProperty(exports, "executeCountQuery", { enumerable: true, get: function () { return query_1.executeCountQuery; } });
47
+ Object.defineProperty(exports, "executeFindQuery", { enumerable: true, get: function () { return query_1.executeFindQuery; } });
43
48
  function start(options) {
44
49
  return __awaiter(this, void 0, void 0, function* () {
45
50
  return new Promise((resolve, reject) => {
@@ -71,6 +76,7 @@ function start(options) {
71
76
  : LOG_DB_LEVEL === 'error'
72
77
  ? 'error'
73
78
  : false;
79
+ global.isLoggingEnabled = (options === null || options === void 0 ? void 0 : options.logging) || true;
74
80
  const { classes, repositories, entities } = loaderEntities.load();
75
81
  options.entities = [...(options.entities || []), ...(entities || [])];
76
82
  options.logger = LOG_COLORIZE ? 'advanced-console' : 'simple-console';
@@ -89,5 +95,5 @@ function start(options) {
89
95
  });
90
96
  });
91
97
  }
92
- module.exports = { start, User: user_e_1.User, userManager };
98
+ module.exports = { start, User: user_e_1.User, userManager, applyQuery: query_1.applyQuery, executeCountQuery: query_1.executeCountQuery, executeFindQuery: query_1.executeFindQuery };
93
99
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEZ,4BAAyB;AACzB,qCAAoC;AACpC,sEAAuD;AACvD,sEAAuD;AAkExC,kCAAW;AAjE1B,kDAA4C;AAiEnC,qFAjEA,aAAI,OAiEA;AA/Db,SAAe,KAAK,CAAC,OAAO;;QAC1B,OAAO,IAAI,OAAO,CAAa,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACjD,IAAI,MAAM,CAAC,qBAAqB,EAAE;gBAChC,OAAO,GAAG;oBACR,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,WAAW;oBACjB,IAAI,EAAE,IAAI;oBACV,QAAQ,EAAE,QAAQ;oBAClB,QAAQ,EAAE,QAAQ;oBAClB,QAAQ,EAAE,QAAQ;oBAClB,WAAW,EAAE,IAAI;oBACjB,OAAO,EAAE,IAAI;oBACb,MAAM,EAAE,EAAE;iBACX,CAAA;aACF;YAED,IAAI,OAAO,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,EAAE;gBACvD,MAAM,KAAK,CAAC,0CAA0C,CAAC,CAAA;aACxD;YAED,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,OAAO,EAAE,YAAY,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,CAAA;YAE5F,MAAM,QAAQ,GACZ,YAAY,KAAK,OAAO;gBACtB,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,YAAY,KAAK,OAAO;oBAC1B,CAAC,CAAC,OAAO;oBACT,CAAC,CAAC,YAAY,KAAK,MAAM;wBACzB,CAAC,CAAC,MAAM;wBACR,CAAC,CAAC,YAAY,KAAK,MAAM;4BACzB,CAAC,CAAC,MAAM;4BACR,CAAC,CAAC,YAAY,KAAK,OAAO;gCAC1B,CAAC,CAAC,OAAO;gCACT,CAAC,CAAC,KAAK,CAAA;YAEX,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC,IAAI,EAAE,CAAA;YACjE,OAAO,CAAC,QAAQ,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAA;YACrE,OAAO,CAAC,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,gBAAgB,CAAA;YACrE,OAAO,CAAC,OAAO,GAAG,QAAQ,CAAA;YAQ1B,IAAI,oBAAU,CAAC,OAAO,CAAC;iBACpB,UAAU,EAAE;iBACZ,IAAI,CAAC,CAAO,EAAE,EAAE,EAAE;gBAEjB,MAAM,UAAU,GAAG,EAAE,CAAA;gBACrB,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;gBAEzF,MAAM,CAAC,UAAU,GAAG,EAAE,CAAA;gBACtB,MAAM,CAAC,MAAM,GAAG,OAAO,CAAA;gBACvB,MAAM,CAAC,UAAU,GAAG,UAAU,CAAA;gBAC9B,OAAO,OAAO,CAAC,EAAE,CAAC,CAAA;YACpB,CAAC,CAAA,CAAC;iBACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;QACpC,CAAC,CAAC,CAAA;IACJ,CAAC;CAAA;AAID,MAAM,CAAC,OAAO,GAAG,EAAE,KAAK,EAAE,IAAI,EAAJ,aAAI,EAAE,WAAW,EAAE,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
package/dist/lib/query.d.ts ADDED
@@ -0,0 +1,16 @@
1
+ export declare function applyQuery(data: any): {
2
+ skip?: number | undefined;
3
+ take?: number | undefined;
4
+ order?: object | undefined;
5
+ where?: object | undefined;
6
+ };
7
+ export declare function executeFindQuery(repo: any, relations?: {}, data?: {}): Promise<{
8
+ records: any;
9
+ headers: {
10
+ 'v-total': any;
11
+ 'v-count': any;
12
+ 'v-pagesize': number | undefined;
13
+ 'v-page': number;
14
+ };
15
+ }>;
16
+ export declare function executeCountQuery(repo: any, data?: {}): Promise<any>;
package/dist/lib/query.js ADDED
@@ -0,0 +1,153 @@
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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
26
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
27
+ return new (P || (P = Promise))(function (resolve, reject) {
28
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
29
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
30
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
31
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
32
+ });
33
+ };
34
+ var __rest = (this && this.__rest) || function (s, e) {
35
+ var t = {};
36
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
37
+ t[p] = s[p];
38
+ if (s != null && typeof Object.getOwnPropertySymbols === "function")
39
+ for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
40
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
41
+ t[p[i]] = s[p[i]];
42
+ }
43
+ return t;
44
+ };
45
+ Object.defineProperty(exports, "__esModule", { value: true });
46
+ exports.executeCountQuery = exports.executeFindQuery = exports.applyQuery = void 0;
47
+ const typeorm_1 = require("typeorm");
48
+ const log = __importStar(require("./util/logger"));
49
+ function applyQuery(data) {
50
+ const { page = 0, pageSize = 0, skip: sk = 0, take: tk = 0, sort: s } = data, where = __rest(data, ["page", "pageSize", "skip", "take", "sort"]);
51
+ const take = tk || pageSize || 50;
52
+ const skip = sk || page * pageSize || 0;
53
+ const order = !Array.isArray(s) ? [s] : s;
54
+ const evalOrder = (val = '') => (['desc', 'd', 'false', '1'].includes(val.toLowerCase()) ? 'desc' : 'asc');
55
+ const useOrder = (order = []) => {
56
+ const orderBy = {};
57
+ order
58
+ .filter((o) => !!o)
59
+ .forEach((o) => {
60
+ const p = o.split(':');
61
+ orderBy[p[0]] = evalOrder(p[1]);
62
+ });
63
+ return orderBy;
64
+ };
65
+ const useWhere = (where) => {
66
+ const result = {};
67
+ const val = (v) => v || 'notFound';
68
+ const reservedOperators = {
69
+ ':null': (v) => (v == 'false' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()),
70
+ ':notNull': (v) => (v == 'true' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()),
71
+ ':in': (v) => (0, typeorm_1.In)(val(v).split(',')),
72
+ ':nin': (v) => (0, typeorm_1.Not)((0, typeorm_1.In)(val(v).split(','))),
73
+ ':likei': (v) => (0, typeorm_1.ILike)(`${val(v)}`),
74
+ ':containsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}%`),
75
+ ':ncontainsi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(`%${val(v)}%`)),
76
+ ':startsi': (v) => (0, typeorm_1.ILike)(`${val(v)}%`),
77
+ ':endsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}`),
78
+ ':eqi': (v) => (0, typeorm_1.ILike)(v),
79
+ ':neqi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(v)),
80
+ ':like': (v) => (0, typeorm_1.Like)(`${val(v)}`),
81
+ ':contains': (v) => (0, typeorm_1.Like)(`%${val(v)}%`),
82
+ ':ncontains': (v) => (0, typeorm_1.Not)((0, typeorm_1.Like)(`%${val(v)}%`)),
83
+ ':starts': (v) => (0, typeorm_1.Like)(`${val(v)}%`),
84
+ ':ends': (v) => (0, typeorm_1.Like)(`%${val(v)}`),
85
+ ':eq': (v) => (0, typeorm_1.Equal)(v),
86
+ ':neq': (v) => (0, typeorm_1.Not)((0, typeorm_1.Equal)(v)),
87
+ ':gt': (v) => (0, typeorm_1.MoreThan)(v),
88
+ ':ge': (v) => (0, typeorm_1.MoreThanOrEqual)(v),
89
+ ':lt': (v) => (0, typeorm_1.LessThan)(v),
90
+ ':le': (v) => (0, typeorm_1.LessThanOrEqual)(v),
91
+ ':between': (v) => {
92
+ const s = v === null || v === void 0 ? void 0 : v.split(':');
93
+ return (s === null || s === void 0 ? void 0 : s.length) == 2 ? (0, typeorm_1.Between)(s[0], s[1]) : v;
94
+ }
95
+ };
96
+ const reservedWords = Object.keys(reservedOperators).join('|');
97
+ for (const objectPath in where) {
98
+ const parts = objectPath.split('.');
99
+ let target = result;
100
+ while (parts.length > 1) {
101
+ const part = parts.shift() || '';
102
+ target = target[part] = target[part] || {};
103
+ }
104
+ const m = parts[0].match(new RegExp(`(${reservedWords})\\b`, 'ig'));
105
+ const operator = (m === null || m === void 0 ? void 0 : m.length) ? m[0] : null;
106
+ const fieldName = operator ? parts[0].replace(operator, '') : parts[0];
107
+ let value = where[objectPath];
108
+ log.debug('fieldName: ' + fieldName + ' with path: ' + objectPath);
109
+ log.debug('operator: ' + operator + ' on value: ' + value);
110
+ if (operator) {
111
+ value = reservedOperators[operator](value);
112
+ }
113
+ target[fieldName] = value;
114
+ }
115
+ return result;
116
+ };
117
+ const query = {};
118
+ if (skip)
119
+ query.skip = skip;
120
+ if (take)
121
+ query.take = take;
122
+ if (order)
123
+ query.order = useOrder(order);
124
+ if (where)
125
+ query.where = useWhere(where);
126
+ log.debug('FINAL WHERE: ' + JSON.stringify(query.where));
127
+ return query;
128
+ }
129
+ exports.applyQuery = applyQuery;
130
+ function executeFindQuery(repo, relations = {}, data = {}) {
131
+ return __awaiter(this, void 0, void 0, function* () {
132
+ const extra = applyQuery(data);
133
+ const [records = [], totalCount] = yield repo.findAndCount(Object.assign({ relations: relations }, extra));
134
+ return {
135
+ records,
136
+ headers: {
137
+ 'v-total': totalCount,
138
+ 'v-count': records.length,
139
+ 'v-pagesize': extra.take,
140
+ 'v-page': 1
141
+ }
142
+ };
143
+ });
144
+ }
145
+ exports.executeFindQuery = executeFindQuery;
146
+ function executeCountQuery(repo, data = {}) {
147
+ return __awaiter(this, void 0, void 0, function* () {
148
+ const { where = {} } = applyQuery(data);
149
+ return yield repo.count({ where: where });
150
+ });
151
+ }
152
+ exports.executeCountQuery = executeCountQuery;
153
+ //# sourceMappingURL=query.js.map
package/dist/lib/query.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"query.js","sourceRoot":"","sources":["../../lib/query.ts"],"names":[],"mappings":"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"}
package/dist/lib/util/logger.d.ts ADDED
@@ -0,0 +1,6 @@
1
+ export declare function trace(data: any): void;
2
+ export declare function debug(data: any): void;
3
+ export declare function info(data: any): void;
4
+ export declare function warn(data: any): void;
5
+ export declare function error(data: any): void;
6
+ export declare function fatal(data: any): void;
package/dist/lib/util/logger.js ADDED
@@ -0,0 +1,34 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.fatal = exports.error = exports.warn = exports.info = exports.debug = exports.trace = void 0;
4
+ function trace(data) {
5
+ var _a;
6
+ global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.trace) && global.log.trace(data);
7
+ }
8
+ exports.trace = trace;
9
+ function debug(data) {
10
+ var _a;
11
+ global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.debug) && global.log.debug(data);
12
+ }
13
+ exports.debug = debug;
14
+ function info(data) {
15
+ var _a;
16
+ global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.info) && global.log.info(data);
17
+ }
18
+ exports.info = info;
19
+ function warn(data) {
20
+ var _a;
21
+ global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.warn) && global.log.warn(data);
22
+ }
23
+ exports.warn = warn;
24
+ function error(data) {
25
+ var _a;
26
+ global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.error) && global.log.error(data);
27
+ }
28
+ exports.error = error;
29
+ function fatal(data) {
30
+ var _a;
31
+ global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.fatal) && global.log.fatal(data);
32
+ }
33
+ exports.fatal = fatal;
34
+ //# sourceMappingURL=logger.js.map
package/dist/lib/util/logger.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../lib/util/logger.ts"],"names":[],"mappings":";;;AAAA,SAAgB,KAAK,CAAC,IAAI;;IACxB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,KAAK,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACxE,CAAC;AAFD,sBAEC;AAED,SAAgB,KAAK,CAAC,IAAI;;IACxB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,KAAK,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACxE,CAAC;AAFD,sBAEC;AAED,SAAgB,IAAI,CAAC,IAAI;;IACvB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,IAAI,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACtE,CAAC;AAFD,oBAEC;AAED,SAAgB,IAAI,CAAC,IAAI;;IACvB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,IAAI,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACtE,CAAC;AAFD,oBAEC;AAED,SAAgB,KAAK,CAAC,IAAI;;IACxB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,KAAK,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACxE,CAAC;AAFD,sBAEC;AAED,SAAgB,KAAK,CAAC,IAAI;;IACxB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,KAAK,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACxE,CAAC;AAFD,sBAEC"}
package/esm/index.d.ts CHANGED
@@ -1,5 +1,7 @@
1
1
  import 'reflect-metadata';
2
+ import { DataSource } from 'typeorm';
2
3
  import * as userManager from './lib/loader/userManager';
3
4
  import { User } from './lib/entities/user.e';
5
+ import { applyQuery, executeCountQuery, executeFindQuery } from './lib/query';
4
6
  export { Database } from './types/global';
5
- export { User, userManager };
7
+ export { User, userManager, DataSource, applyQuery, executeCountQuery, executeFindQuery };
package/esm/index.js CHANGED
@@ -23,14 +23,19 @@ var __importStar = (this && this.__importStar) || function (mod) {
23
23
  return result;
24
24
  };
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
- exports.userManager = exports.User = void 0;
26
+ exports.executeFindQuery = exports.executeCountQuery = exports.applyQuery = exports.DataSource = exports.userManager = exports.User = void 0;
27
27
  require("reflect-metadata");
28
28
  const typeorm_1 = require("typeorm");
29
+ Object.defineProperty(exports, "DataSource", { enumerable: true, get: function () { return typeorm_1.DataSource; } });
29
30
  const loaderEntities = __importStar(require("./lib/loader/entities"));
30
31
  const userManager = __importStar(require("./lib/loader/userManager"));
31
32
  exports.userManager = userManager;
32
33
  const user_e_1 = require("./lib/entities/user.e");
33
34
  Object.defineProperty(exports, "User", { enumerable: true, get: function () { return user_e_1.User; } });
35
+ const query_1 = require("./lib/query");
36
+ Object.defineProperty(exports, "applyQuery", { enumerable: true, get: function () { return query_1.applyQuery; } });
37
+ Object.defineProperty(exports, "executeCountQuery", { enumerable: true, get: function () { return query_1.executeCountQuery; } });
38
+ Object.defineProperty(exports, "executeFindQuery", { enumerable: true, get: function () { return query_1.executeFindQuery; } });
34
39
  async function start(options) {
35
40
  return new Promise((resolve, reject) => {
36
41
  if (global.npmDebugServerStarted) {
@@ -61,6 +66,7 @@ async function start(options) {
61
66
  : LOG_DB_LEVEL === 'error'
62
67
  ? 'error'
63
68
  : false;
69
+ global.isLoggingEnabled = (options === null || options === void 0 ? void 0 : options.logging) || true;
64
70
  const { classes, repositories, entities } = loaderEntities.load();
65
71
  options.entities = [...(options.entities || []), ...(entities || [])];
66
72
  options.logger = LOG_COLORIZE ? 'advanced-console' : 'simple-console';
@@ -78,5 +84,5 @@ async function start(options) {
78
84
  .catch((error) => reject(error));
79
85
  });
80
86
  }
81
- module.exports = { start, User: user_e_1.User, userManager };
87
+ module.exports = { start, User: user_e_1.User, userManager, applyQuery: query_1.applyQuery, executeCountQuery: query_1.executeCountQuery, executeFindQuery: query_1.executeFindQuery };
82
88
  //# sourceMappingURL=index.js.map
package/esm/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;AAEZ,4BAAyB;AACzB,qCAAoC;AACpC,sEAAuD;AACvD,sEAAuD;AAkExC,kCAAW;AAjE1B,kDAA4C;AAiEnC,qFAjEA,aAAI,OAiEA;AA/Db,KAAK,UAAU,KAAK,CAAC,OAAO;IAC1B,OAAO,IAAI,OAAO,CAAa,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACjD,IAAI,MAAM,CAAC,qBAAqB,EAAE;YAChC,OAAO,GAAG;gBACR,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,IAAI;gBACV,QAAQ,EAAE,QAAQ;gBAClB,QAAQ,EAAE,QAAQ;gBAClB,QAAQ,EAAE,QAAQ;gBAClB,WAAW,EAAE,IAAI;gBACjB,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,EAAE;aACX,CAAA;SACF;QAED,IAAI,OAAO,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,EAAE;YACvD,MAAM,KAAK,CAAC,0CAA0C,CAAC,CAAA;SACxD;QAED,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,OAAO,EAAE,YAAY,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,CAAA;QAE5F,MAAM,QAAQ,GACZ,YAAY,KAAK,OAAO;YACtB,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,YAAY,KAAK,OAAO;gBAC1B,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,YAAY,KAAK,MAAM;oBACzB,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,YAAY,KAAK,MAAM;wBACzB,CAAC,CAAC,MAAM;wBACR,CAAC,CAAC,YAAY,KAAK,OAAO;4BAC1B,CAAC,CAAC,OAAO;4BACT,CAAC,CAAC,KAAK,CAAA;QAEX,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC,IAAI,EAAE,CAAA;QACjE,OAAO,CAAC,QAAQ,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAA;QACrE,OAAO,CAAC,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,gBAAgB,CAAA;QACrE,OAAO,CAAC,OAAO,GAAG,QAAQ,CAAA;QAQ1B,IAAI,oBAAU,CAAC,OAAO,CAAC;aACpB,UAAU,EAAE;aACZ,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;YAEjB,MAAM,UAAU,GAAG,EAAE,CAAA;YACrB,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAEzF,MAAM,CAAC,UAAU,GAAG,EAAE,CAAA;YACtB,MAAM,CAAC,MAAM,GAAG,OAAO,CAAA;YACvB,MAAM,CAAC,UAAU,GAAG,UAAU,CAAA;YAC9B,OAAO,OAAO,CAAC,EAAE,CAAC,CAAA;QACpB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;AACJ,CAAC;AAID,MAAM,CAAC,OAAO,GAAG,EAAE,KAAK,EAAE,IAAI,EAAJ,aAAI,EAAE,WAAW,EAAE,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
package/esm/lib/query.d.ts ADDED
@@ -0,0 +1,16 @@
1
+ export declare function applyQuery(data: any): {
2
+ skip?: number | undefined;
3
+ take?: number | undefined;
4
+ order?: object | undefined;
5
+ where?: object | undefined;
6
+ };
7
+ export declare function executeFindQuery(repo: any, relations?: {}, data?: {}): Promise<{
8
+ records: any;
9
+ headers: {
10
+ 'v-total': any;
11
+ 'v-count': any;
12
+ 'v-pagesize': number | undefined;
13
+ 'v-page': number;
14
+ };
15
+ }>;
16
+ export declare function executeCountQuery(repo: any, data?: {}): Promise<any>;
package/esm/lib/query.js ADDED
@@ -0,0 +1,132 @@
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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ exports.executeCountQuery = exports.executeFindQuery = exports.applyQuery = void 0;
27
+ const typeorm_1 = require("typeorm");
28
+ const log = __importStar(require("./util/logger"));
29
+ function applyQuery(data) {
30
+ const { page = 0, pageSize = 0, skip: sk = 0, take: tk = 0, sort: s, ...where } = data;
31
+ const take = tk || pageSize || 50;
32
+ const skip = sk || page * pageSize || 0;
33
+ const order = !Array.isArray(s) ? [s] : s;
34
+ const evalOrder = (val = '') => (['desc', 'd', 'false', '1'].includes(val.toLowerCase()) ? 'desc' : 'asc');
35
+ const useOrder = (order = []) => {
36
+ const orderBy = {};
37
+ order
38
+ .filter((o) => !!o)
39
+ .forEach((o) => {
40
+ const p = o.split(':');
41
+ orderBy[p[0]] = evalOrder(p[1]);
42
+ });
43
+ return orderBy;
44
+ };
45
+ const useWhere = (where) => {
46
+ const result = {};
47
+ const val = (v) => v || 'notFound';
48
+ const reservedOperators = {
49
+ ':null': (v) => (v == 'false' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()),
50
+ ':notNull': (v) => (v == 'true' ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.IsNull)()),
51
+ ':in': (v) => (0, typeorm_1.In)(val(v).split(',')),
52
+ ':nin': (v) => (0, typeorm_1.Not)((0, typeorm_1.In)(val(v).split(','))),
53
+ ':likei': (v) => (0, typeorm_1.ILike)(`${val(v)}`),
54
+ ':containsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}%`),
55
+ ':ncontainsi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(`%${val(v)}%`)),
56
+ ':startsi': (v) => (0, typeorm_1.ILike)(`${val(v)}%`),
57
+ ':endsi': (v) => (0, typeorm_1.ILike)(`%${val(v)}`),
58
+ ':eqi': (v) => (0, typeorm_1.ILike)(v),
59
+ ':neqi': (v) => (0, typeorm_1.Not)((0, typeorm_1.ILike)(v)),
60
+ ':like': (v) => (0, typeorm_1.Like)(`${val(v)}`),
61
+ ':contains': (v) => (0, typeorm_1.Like)(`%${val(v)}%`),
62
+ ':ncontains': (v) => (0, typeorm_1.Not)((0, typeorm_1.Like)(`%${val(v)}%`)),
63
+ ':starts': (v) => (0, typeorm_1.Like)(`${val(v)}%`),
64
+ ':ends': (v) => (0, typeorm_1.Like)(`%${val(v)}`),
65
+ ':eq': (v) => (0, typeorm_1.Equal)(v),
66
+ ':neq': (v) => (0, typeorm_1.Not)((0, typeorm_1.Equal)(v)),
67
+ ':gt': (v) => (0, typeorm_1.MoreThan)(v),
68
+ ':ge': (v) => (0, typeorm_1.MoreThanOrEqual)(v),
69
+ ':lt': (v) => (0, typeorm_1.LessThan)(v),
70
+ ':le': (v) => (0, typeorm_1.LessThanOrEqual)(v),
71
+ ':between': (v) => {
72
+ const s = v === null || v === void 0 ? void 0 : v.split(':');
73
+ return (s === null || s === void 0 ? void 0 : s.length) == 2 ? (0, typeorm_1.Between)(s[0], s[1]) : v;
74
+ }
75
+ };
76
+ const reservedWords = Object.keys(reservedOperators).join('|');
77
+ for (const objectPath in where) {
78
+ const parts = objectPath.split('.');
79
+ let target = result;
80
+ while (parts.length > 1) {
81
+ const part = parts.shift() || '';
82
+ target = target[part] = target[part] || {};
83
+ }
84
+ const m = parts[0].match(new RegExp(`(${reservedWords})\\b`, 'ig'));
85
+ const operator = (m === null || m === void 0 ? void 0 : m.length) ? m[0] : null;
86
+ const fieldName = operator ? parts[0].replace(operator, '') : parts[0];
87
+ let value = where[objectPath];
88
+ log.debug('fieldName: ' + fieldName + ' with path: ' + objectPath);
89
+ log.debug('operator: ' + operator + ' on value: ' + value);
90
+ if (operator) {
91
+ value = reservedOperators[operator](value);
92
+ }
93
+ target[fieldName] = value;
94
+ }
95
+ return result;
96
+ };
97
+ const query = {};
98
+ if (skip)
99
+ query.skip = skip;
100
+ if (take)
101
+ query.take = take;
102
+ if (order)
103
+ query.order = useOrder(order);
104
+ if (where)
105
+ query.where = useWhere(where);
106
+ log.debug('FINAL WHERE: ' + JSON.stringify(query.where));
107
+ return query;
108
+ }
109
+ exports.applyQuery = applyQuery;
110
+ async function executeFindQuery(repo, relations = {}, data = {}) {
111
+ const extra = applyQuery(data);
112
+ const [records = [], totalCount] = await repo.findAndCount({
113
+ relations: relations,
114
+ ...extra
115
+ });
116
+ return {
117
+ records,
118
+ headers: {
119
+ 'v-total': totalCount,
120
+ 'v-count': records.length,
121
+ 'v-pagesize': extra.take,
122
+ 'v-page': 1
123
+ }
124
+ };
125
+ }
126
+ exports.executeFindQuery = executeFindQuery;
127
+ async function executeCountQuery(repo, data = {}) {
128
+ const { where = {} } = applyQuery(data);
129
+ return await repo.count({ where: where });
130
+ }
131
+ exports.executeCountQuery = executeCountQuery;
132
+ //# sourceMappingURL=query.js.map
package/esm/lib/query.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"query.js","sourceRoot":"","sources":["../../lib/query.ts"],"names":[],"mappings":"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"}
package/esm/lib/util/logger.d.ts ADDED
@@ -0,0 +1,6 @@
1
+ export declare function trace(data: any): void;
2
+ export declare function debug(data: any): void;
3
+ export declare function info(data: any): void;
4
+ export declare function warn(data: any): void;
5
+ export declare function error(data: any): void;
6
+ export declare function fatal(data: any): void;
package/esm/lib/util/logger.js ADDED
@@ -0,0 +1,34 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.fatal = exports.error = exports.warn = exports.info = exports.debug = exports.trace = void 0;
4
+ function trace(data) {
5
+ var _a;
6
+ global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.trace) && global.log.trace(data);
7
+ }
8
+ exports.trace = trace;
9
+ function debug(data) {
10
+ var _a;
11
+ global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.debug) && global.log.debug(data);
12
+ }
13
+ exports.debug = debug;
14
+ function info(data) {
15
+ var _a;
16
+ global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.info) && global.log.info(data);
17
+ }
18
+ exports.info = info;
19
+ function warn(data) {
20
+ var _a;
21
+ global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.warn) && global.log.warn(data);
22
+ }
23
+ exports.warn = warn;
24
+ function error(data) {
25
+ var _a;
26
+ global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.error) && global.log.error(data);
27
+ }
28
+ exports.error = error;
29
+ function fatal(data) {
30
+ var _a;
31
+ global.isLoggingEnabled && ((_a = global.log) === null || _a === void 0 ? void 0 : _a.fatal) && global.log.fatal(data);
32
+ }
33
+ exports.fatal = fatal;
34
+ //# sourceMappingURL=logger.js.map
package/esm/lib/util/logger.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../lib/util/logger.ts"],"names":[],"mappings":";;;AAAA,SAAgB,KAAK,CAAC,IAAI;;IACxB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,KAAK,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACxE,CAAC;AAFD,sBAEC;AAED,SAAgB,KAAK,CAAC,IAAI;;IACxB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,KAAK,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACxE,CAAC;AAFD,sBAEC;AAED,SAAgB,IAAI,CAAC,IAAI;;IACvB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,IAAI,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACtE,CAAC;AAFD,oBAEC;AAED,SAAgB,IAAI,CAAC,IAAI;;IACvB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,IAAI,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACtE,CAAC;AAFD,oBAEC;AAED,SAAgB,KAAK,CAAC,IAAI;;IACxB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,KAAK,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACxE,CAAC;AAFD,sBAEC;AAED,SAAgB,KAAK,CAAC,IAAI;;IACxB,MAAM,CAAC,gBAAgB,KAAI,MAAA,MAAM,CAAC,GAAG,0CAAE,KAAK,CAAA,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACxE,CAAC;AAFD,sBAEC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@volcanicminds/typeorm",
3
- "version": "0.0.9",
3
+ "version": "0.0.11",
4
4
  "license": "MIT",
5
5
  "description": "TypeORM for the volcanic (minds) backend",
6
6
  "keywords": [
@@ -38,7 +38,7 @@
38
38
  "typeorm": "^0.3.10"
39
39
  },
40
40
  "devDependencies": {
41
- "@types/node": "^18.11.9",
41
+ "@types/node": "^18.11.10",
42
42
  "jest": "^29.3.1",
43
43
  "npm-upgrade": "^3.1.0",
44
44
  "ts-node": "^10.9.1",