@creatioart-js/express-storage 0.4.0 → 1.0.0
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/CHANGELOG.md +4 -0
- package/lib/enum/datastore.operator.type.d.ts +12 -0
- package/lib/enum/datastore.operator.type.js +17 -0
- package/lib/enum/datastore.operator.type.js.map +1 -0
- package/lib/enum/firestore.operator.type.d.ts +12 -0
- package/lib/enum/firestore.operator.type.js +17 -0
- package/lib/enum/firestore.operator.type.js.map +1 -0
- package/lib/index.d.ts +2 -0
- package/lib/index.js +5 -1
- package/lib/index.js.map +1 -1
- package/lib/repository/base.datastore.repository.d.ts +3 -1
- package/lib/repository/base.datastore.repository.js +31 -4
- package/lib/repository/base.datastore.repository.js.map +1 -1
- package/lib/repository/base.firestore.repository.d.ts +3 -1
- package/lib/repository/base.firestore.repository.js +34 -6
- package/lib/repository/base.firestore.repository.js.map +1 -1
- package/lib/repository/interface/iRepository.d.ts +1 -1
- package/package.json +6 -6
package/CHANGELOG.md
CHANGED
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export declare enum DatastoreOperatorType {
|
|
2
|
+
EQUAL = "=",
|
|
3
|
+
NOT_EQUAL = "!=",
|
|
4
|
+
LESS_THAN = "<",
|
|
5
|
+
LESS_THAN_OR_EQUAL = "<=",
|
|
6
|
+
GREATER_THAN = ">",
|
|
7
|
+
GREATER_THAN_OR_EQUAL = ">=",
|
|
8
|
+
IN = "IN",
|
|
9
|
+
NOT_IN = "NOT_IN",
|
|
10
|
+
ARRAY_CONTAINS = "IN",
|
|
11
|
+
ARRAY_CONTAINS_ANY = "IN"
|
|
12
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DatastoreOperatorType = void 0;
|
|
4
|
+
var DatastoreOperatorType;
|
|
5
|
+
(function (DatastoreOperatorType) {
|
|
6
|
+
DatastoreOperatorType["EQUAL"] = "=";
|
|
7
|
+
DatastoreOperatorType["NOT_EQUAL"] = "!=";
|
|
8
|
+
DatastoreOperatorType["LESS_THAN"] = "<";
|
|
9
|
+
DatastoreOperatorType["LESS_THAN_OR_EQUAL"] = "<=";
|
|
10
|
+
DatastoreOperatorType["GREATER_THAN"] = ">";
|
|
11
|
+
DatastoreOperatorType["GREATER_THAN_OR_EQUAL"] = ">=";
|
|
12
|
+
DatastoreOperatorType["IN"] = "IN";
|
|
13
|
+
DatastoreOperatorType["NOT_IN"] = "NOT_IN";
|
|
14
|
+
DatastoreOperatorType["ARRAY_CONTAINS"] = "IN";
|
|
15
|
+
DatastoreOperatorType["ARRAY_CONTAINS_ANY"] = "IN";
|
|
16
|
+
})(DatastoreOperatorType || (exports.DatastoreOperatorType = DatastoreOperatorType = {}));
|
|
17
|
+
//# sourceMappingURL=datastore.operator.type.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"datastore.operator.type.js","sourceRoot":"","sources":["../../src/enum/datastore.operator.type.ts"],"names":[],"mappings":";;;AAGA,IAAY,qBAkDX;AAlDD,WAAY,qBAAqB;IAI/B,oCAAW,CAAA;IAKX,yCAAgB,CAAA;IAKhB,wCAAe,CAAA;IAKf,kDAAyB,CAAA;IAKzB,2CAAkB,CAAA;IAKlB,qDAA4B,CAAA;IAK5B,kCAAS,CAAA;IAKT,0CAAiB,CAAA;IAKjB,8CAAmB,CAAA;IAKnB,kDAAuB,CAAA;AACzB,CAAC,EAlDW,qBAAqB,qCAArB,qBAAqB,QAkDhC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export declare enum FirestoreOperatorType {
|
|
2
|
+
EQUAL = "==",
|
|
3
|
+
NOT_EQUAL = "!=",
|
|
4
|
+
LESS_THAN = "<",
|
|
5
|
+
LESS_THAN_OR_EQUAL = "<=",
|
|
6
|
+
GREATER_THAN = ">",
|
|
7
|
+
GREATER_THAN_OR_EQUAL = ">=",
|
|
8
|
+
IN = "in",
|
|
9
|
+
NOT_IN = "not-in",
|
|
10
|
+
ARRAY_CONTAINS = "array-contains",
|
|
11
|
+
ARRAY_CONTAINS_ANY = "array-contains-any"
|
|
12
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.FirestoreOperatorType = void 0;
|
|
4
|
+
var FirestoreOperatorType;
|
|
5
|
+
(function (FirestoreOperatorType) {
|
|
6
|
+
FirestoreOperatorType["EQUAL"] = "==";
|
|
7
|
+
FirestoreOperatorType["NOT_EQUAL"] = "!=";
|
|
8
|
+
FirestoreOperatorType["LESS_THAN"] = "<";
|
|
9
|
+
FirestoreOperatorType["LESS_THAN_OR_EQUAL"] = "<=";
|
|
10
|
+
FirestoreOperatorType["GREATER_THAN"] = ">";
|
|
11
|
+
FirestoreOperatorType["GREATER_THAN_OR_EQUAL"] = ">=";
|
|
12
|
+
FirestoreOperatorType["IN"] = "in";
|
|
13
|
+
FirestoreOperatorType["NOT_IN"] = "not-in";
|
|
14
|
+
FirestoreOperatorType["ARRAY_CONTAINS"] = "array-contains";
|
|
15
|
+
FirestoreOperatorType["ARRAY_CONTAINS_ANY"] = "array-contains-any";
|
|
16
|
+
})(FirestoreOperatorType || (exports.FirestoreOperatorType = FirestoreOperatorType = {}));
|
|
17
|
+
//# sourceMappingURL=firestore.operator.type.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"firestore.operator.type.js","sourceRoot":"","sources":["../../src/enum/firestore.operator.type.ts"],"names":[],"mappings":";;;AAGA,IAAY,qBAkDX;AAlDD,WAAY,qBAAqB;IAI/B,qCAAY,CAAA;IAKZ,yCAAgB,CAAA;IAKhB,wCAAe,CAAA;IAKf,kDAAyB,CAAA;IAKzB,2CAAkB,CAAA;IAKlB,qDAA4B,CAAA;IAK5B,kCAAS,CAAA;IAKT,0CAAiB,CAAA;IAKjB,0DAAiC,CAAA;IAKjC,kEAAyC,CAAA;AAC3C,CAAC,EAlDW,qBAAqB,qCAArB,qBAAqB,QAkDhC"}
|
package/lib/index.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
export { DatabaseType } from './enum/database.type';
|
|
2
|
+
export { DatastoreOperatorType } from './enum/datastore.operator.type';
|
|
3
|
+
export { FirestoreOperatorType } from './enum/firestore.operator.type';
|
|
2
4
|
export { IRepository } from './repository/interface/iRepository';
|
|
3
5
|
export { IRepositoryManager } from './repository/interface/iRepository.manager.repository';
|
|
4
6
|
export { BaseDatastoreRepository } from './repository/base.datastore.repository';
|
package/lib/index.js
CHANGED
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.RedisCacheService = exports.BigQueryService = exports.BaseService = exports.BaseFirestoreRepository = exports.BaseDatastoreRepository = exports.DatabaseType = void 0;
|
|
3
|
+
exports.RedisCacheService = exports.BigQueryService = exports.BaseService = exports.BaseFirestoreRepository = exports.BaseDatastoreRepository = exports.FirestoreOperatorType = exports.DatastoreOperatorType = exports.DatabaseType = void 0;
|
|
4
4
|
var database_type_1 = require("./enum/database.type");
|
|
5
5
|
Object.defineProperty(exports, "DatabaseType", { enumerable: true, get: function () { return database_type_1.DatabaseType; } });
|
|
6
|
+
var datastore_operator_type_1 = require("./enum/datastore.operator.type");
|
|
7
|
+
Object.defineProperty(exports, "DatastoreOperatorType", { enumerable: true, get: function () { return datastore_operator_type_1.DatastoreOperatorType; } });
|
|
8
|
+
var firestore_operator_type_1 = require("./enum/firestore.operator.type");
|
|
9
|
+
Object.defineProperty(exports, "FirestoreOperatorType", { enumerable: true, get: function () { return firestore_operator_type_1.FirestoreOperatorType; } });
|
|
6
10
|
var base_datastore_repository_1 = require("./repository/base.datastore.repository");
|
|
7
11
|
Object.defineProperty(exports, "BaseDatastoreRepository", { enumerable: true, get: function () { return base_datastore_repository_1.BaseDatastoreRepository; } });
|
|
8
12
|
var base_firestore_repository_1 = require("./repository/base.firestore.repository");
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAMA,sDAAkD;AAA1C,6GAAA,YAAY,OAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAMA,sDAAkD;AAA1C,6GAAA,YAAY,OAAA;AACpB,0EAAqE;AAA7D,gIAAA,qBAAqB,OAAA;AAC7B,0EAAqE;AAA7D,gIAAA,qBAAqB,OAAA;AAO7B,oFAA+E;AAAvE,oIAAA,uBAAuB,OAAA;AAC/B,oFAA+E;AAAvE,oIAAA,uBAAuB,OAAA;AAM/B,uDAAmD;AAA3C,2GAAA,WAAW,OAAA;AAEnB,iEAA4D;AAApD,oHAAA,eAAe,OAAA;AAEvB,qEAAgE;AAAxD,wHAAA,iBAAiB,OAAA"}
|
|
@@ -10,5 +10,7 @@ export declare abstract class BaseDatastoreRepository<T extends BaseEntity<T>> i
|
|
|
10
10
|
delete(id: any, traceId?: string): Promise<boolean>;
|
|
11
11
|
findOne(id: any, _: Filter[] | undefined, traceId?: string): Promise<T>;
|
|
12
12
|
findBy(filter: Filter[] | undefined, order: Order | undefined, page: number | 0, pageCount: number | 0, traceId?: string): Promise<BaseList<T>>;
|
|
13
|
-
count(
|
|
13
|
+
count(filters: Filter[] | undefined, traceId?: string): Promise<number>;
|
|
14
|
+
protected setQueryFilter(query: any, filters: Filter[] | undefined, traceId?: string): any;
|
|
15
|
+
protected setQueryOrder(query: any, order?: Order, traceId?: string): any;
|
|
14
16
|
}
|
|
@@ -6,6 +6,7 @@ const express_logging_1 = require("@creatioart-js/express-logging");
|
|
|
6
6
|
const express_core_1 = require("@creatioart-js/express-core");
|
|
7
7
|
const express_error_1 = require("@creatioart-js/express-error");
|
|
8
8
|
const express_error_handler_1 = require("@creatioart-js/express-error-handler");
|
|
9
|
+
const datastore_operator_type_1 = require("../enum/datastore.operator.type");
|
|
9
10
|
class BaseDatastoreRepository {
|
|
10
11
|
key;
|
|
11
12
|
datastore;
|
|
@@ -115,8 +116,8 @@ class BaseDatastoreRepository {
|
|
|
115
116
|
`${traceId !== undefined ? `. Trace: ${traceId}` : ''}`);
|
|
116
117
|
try {
|
|
117
118
|
let query = this.datastore.createQuery(this.key);
|
|
118
|
-
query =
|
|
119
|
-
query =
|
|
119
|
+
query = this.setQueryFilter(query, filter, traceId);
|
|
120
|
+
query = this.setQueryOrder(query, order, traceId);
|
|
120
121
|
const count = await this.count(filter);
|
|
121
122
|
if (page !== undefined && pageCount !== undefined && page > 0 && pageCount > 0) {
|
|
122
123
|
query = query.limit(pageCount);
|
|
@@ -145,17 +146,43 @@ class BaseDatastoreRepository {
|
|
|
145
146
|
}
|
|
146
147
|
return new express_core_1.BaseList(0, []);
|
|
147
148
|
}
|
|
148
|
-
async count(
|
|
149
|
+
async count(filters, traceId) {
|
|
149
150
|
(0, express_logging_1.Logger)().info(`Get count element on Datastore by ${this.key} ` +
|
|
150
151
|
`${traceId !== undefined ? `. Trace: ${traceId}` : ''}`);
|
|
151
152
|
let countQuery = this.datastore.createQuery(this.key);
|
|
152
|
-
countQuery =
|
|
153
|
+
countQuery = this.setQueryFilter(countQuery, filters, traceId);
|
|
153
154
|
countQuery = countQuery.select('__key__');
|
|
154
155
|
const countResponse = await this.datastore.runQuery(countQuery);
|
|
155
156
|
const size = countResponse !== undefined ? countResponse[0].length : 0;
|
|
156
157
|
(0, express_logging_1.Logger)().info(`Count element: ${size} ${traceId !== undefined ? `. Trace: ${traceId}` : ''}`);
|
|
157
158
|
return size;
|
|
158
159
|
}
|
|
160
|
+
setQueryFilter(query, filters, traceId) {
|
|
161
|
+
(0, express_logging_1.Logger)().info(`Set the Filter on Datastore Quey. Filters: ${JSON.stringify(filters)} ` +
|
|
162
|
+
`${traceId !== undefined ? `. Trace: ${traceId}` : ''}`);
|
|
163
|
+
let queryResponse = query;
|
|
164
|
+
if (filters !== undefined) {
|
|
165
|
+
for (const item of filters) {
|
|
166
|
+
if (item.property !== undefined && item.property !== '') {
|
|
167
|
+
const operatorKey = Object.keys(express_core_1.OperatorType)[Object.values(express_core_1.OperatorType).indexOf(item.operator)];
|
|
168
|
+
const operator = datastore_operator_type_1.DatastoreOperatorType[operatorKey];
|
|
169
|
+
queryResponse = queryResponse.filter(item.property, operator, item.value);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
return queryResponse;
|
|
174
|
+
}
|
|
175
|
+
setQueryOrder(query, order, traceId) {
|
|
176
|
+
(0, express_logging_1.Logger)().info(`Set the Order on Datastore Quey. Order: ${JSON.stringify(order) ?? ''} ` +
|
|
177
|
+
`${traceId !== undefined ? `. Trace: ${traceId}` : ''}`);
|
|
178
|
+
let queryResponse = query;
|
|
179
|
+
if (order !== undefined) {
|
|
180
|
+
queryResponse = order.sort === express_core_1.SortType.ASCENDING
|
|
181
|
+
? queryResponse.order(order.property)
|
|
182
|
+
: queryResponse.order(order.property, { descending: true });
|
|
183
|
+
}
|
|
184
|
+
return queryResponse;
|
|
185
|
+
}
|
|
159
186
|
}
|
|
160
187
|
exports.BaseDatastoreRepository = BaseDatastoreRepository;
|
|
161
188
|
//# sourceMappingURL=base.datastore.repository.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.datastore.repository.js","sourceRoot":"","sources":["../../src/repository/base.datastore.repository.ts"],"names":[],"mappings":";;;AAAA,4BAA0B;AAE1B,oEAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"base.datastore.repository.js","sourceRoot":"","sources":["../../src/repository/base.datastore.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,5 +10,7 @@ export declare abstract class BaseFirestoreRepository<T extends BaseEntity<T>> i
|
|
|
10
10
|
delete(id: any, traceId?: string): Promise<boolean>;
|
|
11
11
|
findOne(id: any, filter: Filter[] | undefined, traceId?: string): Promise<T>;
|
|
12
12
|
findBy(filter: Filter[] | undefined, order: Order | undefined, page: number | 0, pageCount: number | 0, traceId?: string): Promise<BaseList<T>>;
|
|
13
|
-
count(
|
|
13
|
+
count(filters: Filter[] | undefined, traceId?: string): Promise<number>;
|
|
14
|
+
protected setQueryFilter(query: any, filters: Filter[] | undefined, traceId?: string): any;
|
|
15
|
+
protected setQueryOrder(query: any, order?: Order, traceId?: string): any;
|
|
14
16
|
}
|
|
@@ -6,6 +6,7 @@ const express_logging_1 = require("@creatioart-js/express-logging");
|
|
|
6
6
|
const express_core_1 = require("@creatioart-js/express-core");
|
|
7
7
|
const express_error_1 = require("@creatioart-js/express-error");
|
|
8
8
|
const express_error_handler_1 = require("@creatioart-js/express-error-handler");
|
|
9
|
+
const firestore_operator_type_1 = require("../enum/firestore.operator.type");
|
|
9
10
|
class BaseFirestoreRepository {
|
|
10
11
|
key;
|
|
11
12
|
firestore;
|
|
@@ -93,7 +94,7 @@ class BaseFirestoreRepository {
|
|
|
93
94
|
`${traceId !== undefined ? `. Trace: ${traceId}` : ''}`);
|
|
94
95
|
try {
|
|
95
96
|
let collectionReference = this.firestore.collection(this.key);
|
|
96
|
-
collectionReference =
|
|
97
|
+
collectionReference = this.setQueryFilter(collectionReference, filter, traceId);
|
|
97
98
|
const documentReference = collectionReference.doc(id);
|
|
98
99
|
if (documentReference !== undefined) {
|
|
99
100
|
const response = await documentReference.get();
|
|
@@ -121,8 +122,8 @@ class BaseFirestoreRepository {
|
|
|
121
122
|
`${traceId !== undefined ? `. Trace: ${traceId}` : ''}`);
|
|
122
123
|
try {
|
|
123
124
|
let collectionReference = this.firestore.collection(this.key);
|
|
124
|
-
collectionReference =
|
|
125
|
-
collectionReference =
|
|
125
|
+
collectionReference = this.setQueryFilter(collectionReference, filter, traceId);
|
|
126
|
+
collectionReference = this.setQueryOrder(collectionReference, order, traceId);
|
|
126
127
|
const count = await this.count(filter);
|
|
127
128
|
if (page !== undefined && pageCount !== undefined && page > 0 && pageCount > 0) {
|
|
128
129
|
collectionReference = collectionReference.limit(pageCount);
|
|
@@ -151,15 +152,42 @@ class BaseFirestoreRepository {
|
|
|
151
152
|
}
|
|
152
153
|
return new express_core_1.BaseList(0, []);
|
|
153
154
|
}
|
|
154
|
-
async count(
|
|
155
|
-
(0, express_logging_1.Logger)().info(`Get
|
|
155
|
+
async count(filters, traceId) {
|
|
156
|
+
(0, express_logging_1.Logger)().info(`Get count element on Firestore by ${this.key} ` +
|
|
157
|
+
`${traceId !== undefined ? `. Trace: ${traceId}` : ''}`);
|
|
156
158
|
let countQuery = this.firestore.collection(this.key);
|
|
157
|
-
countQuery =
|
|
159
|
+
countQuery = this.setQueryFilter(countQuery, filters, traceId);
|
|
158
160
|
const countResponse = await countQuery.get();
|
|
159
161
|
const size = countResponse !== undefined && countResponse.size !== undefined ? countResponse.size : 0;
|
|
160
162
|
(0, express_logging_1.Logger)().info(`Count element: ${size} ${traceId !== undefined ? `. Trace: ${traceId}` : ''}`);
|
|
161
163
|
return size;
|
|
162
164
|
}
|
|
165
|
+
setQueryFilter(query, filters, traceId) {
|
|
166
|
+
(0, express_logging_1.Logger)().info(`Set the Filter on Firestore Quey. Filters: ${JSON.stringify(filters)} ` +
|
|
167
|
+
`${traceId !== undefined ? `. Trace: ${traceId}` : ''}`);
|
|
168
|
+
let queryResponse = query;
|
|
169
|
+
if (filters !== undefined) {
|
|
170
|
+
for (const item of filters) {
|
|
171
|
+
if (item.property !== undefined && item.property !== '') {
|
|
172
|
+
const operatorKey = Object.keys(express_core_1.OperatorType)[Object.values(express_core_1.OperatorType).indexOf(item.operator)];
|
|
173
|
+
const operator = firestore_operator_type_1.FirestoreOperatorType[operatorKey];
|
|
174
|
+
queryResponse = queryResponse.where(item.property, operator, item.value);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
return queryResponse;
|
|
179
|
+
}
|
|
180
|
+
setQueryOrder(query, order, traceId) {
|
|
181
|
+
(0, express_logging_1.Logger)().info(`Set the Order on Firestore Quey. Order: ${JSON.stringify(order) ?? ''} ` +
|
|
182
|
+
`${traceId !== undefined ? `. Trace: ${traceId}` : ''}`);
|
|
183
|
+
let queryResponse = query;
|
|
184
|
+
if (order !== undefined) {
|
|
185
|
+
queryResponse = order.sort === express_core_1.SortType.ASCENDING
|
|
186
|
+
? queryResponse.orderBy(order.property, 'asc')
|
|
187
|
+
: queryResponse.orderBy(order.property, 'desc');
|
|
188
|
+
}
|
|
189
|
+
return queryResponse;
|
|
190
|
+
}
|
|
163
191
|
}
|
|
164
192
|
exports.BaseFirestoreRepository = BaseFirestoreRepository;
|
|
165
193
|
//# sourceMappingURL=base.firestore.repository.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.firestore.repository.js","sourceRoot":"","sources":["../../src/repository/base.firestore.repository.ts"],"names":[],"mappings":";;;AAAA,4BAA0B;AAE1B,oEAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"base.firestore.repository.js","sourceRoot":"","sources":["../../src/repository/base.firestore.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,5 +5,5 @@ export interface IRepository<T> {
|
|
|
5
5
|
delete(id: any, traceId?: string): Promise<boolean>;
|
|
6
6
|
findOne(id: any, filter: Filter[] | undefined, traceId?: string): Promise<T>;
|
|
7
7
|
findBy(filter: Filter[] | undefined, order: Order | undefined, page: number | 0, pageCount: number | 0, traceId?: string): Promise<BaseList<T>>;
|
|
8
|
-
count(
|
|
8
|
+
count(filters: Filter[] | undefined, traceId?: string): Promise<number>;
|
|
9
9
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@creatioart-js/express-storage",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "1.0.0",
|
|
4
4
|
"description": "CreatioART - Core storage library package for Express framework that contains storage management class",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"package",
|
|
@@ -78,10 +78,10 @@
|
|
|
78
78
|
"statements": 100
|
|
79
79
|
},
|
|
80
80
|
"dependencies": {
|
|
81
|
-
"@creatioart-js/express-core": "^0.
|
|
82
|
-
"@creatioart-js/express-error": "^0.
|
|
83
|
-
"@creatioart-js/express-error-handler": "^0.
|
|
84
|
-
"@creatioart-js/express-logging": "^0.
|
|
81
|
+
"@creatioart-js/express-core": "^1.0.0",
|
|
82
|
+
"@creatioart-js/express-error": "^1.0.0",
|
|
83
|
+
"@creatioart-js/express-error-handler": "^1.0.0",
|
|
84
|
+
"@creatioart-js/express-logging": "^1.0.0",
|
|
85
85
|
"@types/node": "^22.8.6",
|
|
86
86
|
"class-transformer": "^0.5.1",
|
|
87
87
|
"class-validator": "^0.14.1",
|
|
@@ -116,7 +116,7 @@
|
|
|
116
116
|
"sinon": "^19.0.2",
|
|
117
117
|
"sinon-chai": "^4.0.0",
|
|
118
118
|
"ts-node": "^10.9.2",
|
|
119
|
-
"typedoc": "^0.26.
|
|
119
|
+
"typedoc": "^0.26.11",
|
|
120
120
|
"typescript": "^5.6.3"
|
|
121
121
|
},
|
|
122
122
|
"engines": {
|