@creator.co/wapi 1.7.5-alpha2 → 1.7.5
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/dist/index.d.ts +2 -2
- package/dist/index.js.map +1 -1
- package/dist/package-lock.json +557 -994
- package/dist/package.json +1 -3
- package/dist/src/API/Request.js +2 -1
- package/dist/src/API/Request.js.map +1 -1
- package/dist/src/Database/DatabaseManager.d.ts +0 -2
- package/dist/src/Database/DatabaseManager.js +0 -2
- package/dist/src/Database/DatabaseManager.js.map +1 -1
- package/dist/src/Database/DatabaseTransaction.js +1 -1
- package/dist/src/Database/DatabaseTransaction.js.map +1 -1
- package/dist/src/Database/index.d.ts +1 -2
- package/dist/src/Database/index.js +1 -6
- package/dist/src/Database/index.js.map +1 -1
- package/dist/src/Database/integrations/kysely/KyselyDatabase.js +1 -1
- package/dist/src/Database/integrations/kysely/KyselyDatabase.js.map +1 -1
- package/dist/src/Database/integrations/pgsql/PostgresDatabase.d.ts +1 -1
- package/dist/src/Database/integrations/pgsql/PostgresDatabase.js +1 -1
- package/dist/src/Database/integrations/pgsql/PostgresDatabase.js.map +1 -1
- package/dist/src/Database/types.d.ts +3 -10
- package/dist/src/Server/RouteResolver.js +10 -2
- package/dist/src/Server/RouteResolver.js.map +1 -1
- package/dist/src/Server/Router.d.ts +1 -1
- package/dist/src/Server/lib/Server.js +3 -1
- package/dist/src/Server/lib/Server.js.map +1 -1
- package/dist/src/Validation/Validator.js +2 -1
- package/dist/src/Validation/Validator.js.map +1 -1
- package/index.ts +1 -2
- package/package.json +1 -3
- package/src/API/Request.ts +1 -1
- package/src/Database/DatabaseManager.ts +1 -3
- package/src/Database/DatabaseTransaction.ts +1 -1
- package/src/Database/index.ts +0 -5
- package/src/Database/integrations/kysely/KyselyDatabase.ts +1 -1
- package/src/Database/integrations/pgsql/PostgresDatabase.ts +1 -1
- package/src/Database/types.ts +6 -16
- package/src/Server/lib/Server.ts +4 -1
- package/src/Validation/Validator.ts +2 -1
- package/tests/Database/DatabaseManager.test.ts +1 -24
- package/tests/Database/integrations/knex/KnexTransaction.test.ts +1 -1
- package/tests/Database/integrations/kysely/KyselyTransaction.test.ts +1 -1
- package/tests/Database/integrations/pg/PostgresTransaction.test.ts +1 -1
- package/tests/Server/RouteResolver.test.ts +18 -4
- package/tests/Validation/Validator.test.ts +6 -0
- package/dist/src/Database/integrations/dynamo/DynamoDatabase.d.ts +0 -10
- package/dist/src/Database/integrations/dynamo/DynamoDatabase.js +0 -37
- package/dist/src/Database/integrations/dynamo/DynamoDatabase.js.map +0 -1
- package/dist/src/Database/integrations/dynamo/DynamoTransaction.d.ts +0 -12
- package/dist/src/Database/integrations/dynamo/DynamoTransaction.js +0 -30
- package/dist/src/Database/integrations/dynamo/DynamoTransaction.js.map +0 -1
- package/src/Database/integrations/dynamo/DynamoDatabase.ts +0 -33
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@creator.co/wapi",
|
|
3
|
-
"version": "1.7.5
|
|
3
|
+
"version": "1.7.5",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -18,14 +18,12 @@
|
|
|
18
18
|
"author": "",
|
|
19
19
|
"license": "ISC",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@aws-sdk/client-dynamodb": "^3.574.0",
|
|
22
21
|
"@aws-sdk/client-kms": "^3.556.0",
|
|
23
22
|
"@aws-sdk/client-secrets-manager": "3.556",
|
|
24
23
|
"@aws-sdk/client-ses": "3.556",
|
|
25
24
|
"@aws-sdk/client-sns": "3.556",
|
|
26
25
|
"@aws-sdk/client-ssm": "3.556",
|
|
27
26
|
"@aws-sdk/credential-provider-node": "3.556",
|
|
28
|
-
"@smithy/node-http-handler": "^3.0.0",
|
|
29
27
|
"@types/email-templates": "^10.0.1",
|
|
30
28
|
"@types/nodemailer": "^6.4.10",
|
|
31
29
|
"@types/object-hash": "^3.0.4",
|
package/dist/src/API/Request.js
CHANGED
|
@@ -157,7 +157,8 @@ export default class Request {
|
|
|
157
157
|
* @returns None
|
|
158
158
|
*/
|
|
159
159
|
setFixedPathParams(keys, result) {
|
|
160
|
-
this.requestEvent.pathParameters
|
|
160
|
+
if (!this.requestEvent.pathParameters)
|
|
161
|
+
this.requestEvent.pathParameters = {};
|
|
161
162
|
keys.forEach((key, index) => {
|
|
162
163
|
var _a;
|
|
163
164
|
if ((_a = this.requestEvent) === null || _a === void 0 ? void 0 : _a.pathParameters) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Request.js","sourceRoot":"","sources":["../../../src/API/Request.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,kBAAkB,CAAA;AAEpC;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,OAAO;IAW1B;;;;;;OAMG;IACH,YAAY,YAA6B,EAAE,OAAgB,EAAE,MAAc;QACzE,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,YAAY,CAAC,CAAA;QAC3C,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAC3C,CAAC;IAED;;;;OAIG;IACI,kBAAkB,CAAC,SAAgC;QACxD,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QACzC,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;IACxE,CAAC;IAED;;;;OAIG;IACI,aAAa,CAAC,SAAgC;QACnD,OAAO,KAAK,CAAC,2BAA2B,CACtC,IAAI,CAAC,YAAY,CAAC,qBAAqB,EACvC,MAAM,CAAC,SAAS,CAAC,CAClB,CAAA;IACH,CAAC;IAED;;;;OAIG;IACI,SAAS,CAAC,UAAkB;QACjC,OAAO,KAAK,CAAC,2BAA2B,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;IACjF,CAAC;IAED;;;;OAIG;IACI,eAAe,CAAC,QAAgB;QACrC,OAAO,KAAK,CAAC,2BAA2B,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAA;IACtF,CAAC;IAED;;;;OAIG;IACI,iBAAiB,CAAC,SAA+B;QACtD,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;QACxC,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;IACxE,CAAC;IAED;;;;OAIG;IACI,YAAY,CAAC,SAA+B;QACjD,OAAO,KAAK,CAAC,2BAA2B,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAA;IAC/F,CAAC;IAED;;;OAGG;IACI,OAAO,CAAC,GAAa;QAC1B,MAAM,IAAI,GAAQ,IAAI,CAAC,YAAY,CAAC,IAAI,CAAA;QAExC,IAAI,GAAG;YAAE,OAAO,KAAK,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAEnF,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,YAAY,MAAM,EAAE,CAAC;YACvD,IAAI,CAAC;gBACH,OAAO,IAAI,CAAC,KAAK,CAAC,IAAc,CAAC,CAAA;YACnC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAA;YACvD,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;OAGG;IACI,OAAO;QACZ,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAA;IAC/B,CAAC;IAED;;;OAGG;IACI,SAAS;QACd,IAAI,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;YACjC,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,WAAW,EAAE,CAAA;YAC7D,IAAI,UAAU,IAAI,UAAU,EAAE,CAAC;gBAC7B,OAAO,UAAU,CAAC,UAAU,CAAC,CAAA;YAC/B,CAAC;QACH,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,wBAAwB,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,CAAA;IACzE,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,2CAA2C;QAC3C,OAAO,IAAI,CAAC,YAAY,CAAC,cAAgC,CAAA;IAC3D,CAAC;IAED;;;OAGG;IACI,cAAc;QACnB,2CAA2C;QAC3C,OAAO,IAAI,CAAC,YAAY,CAAC,qBAAwC,CAAA;IACnE,CAAC;IAED;;;OAGG;IACI,sBAAsB;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAA;IACxC,CAAC;IAED;;;OAGG;IACI,YAAY;QACjB,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY;YAAE,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAA;QAC/D,OAAO,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;IAClG,CAAC;IAED;;;OAGG;IACI,WAAW;;QAChB,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,0CAAE,QAAQ,CAAA;QACzD,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAA;QACjD,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAA;IACxD,CAAC;IAED;;;;;OAKG;IACI,kBAAkB,CAAC,IAAW,EAAE,MAAa;QAClD,IAAI,CAAC,YAAY,CAAC,cAAc,GAAG,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"Request.js","sourceRoot":"","sources":["../../../src/API/Request.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { DynamoDatabase } from './integrations/dynamo/DynamoDatabase.js';
|
|
2
1
|
import { KnexDatabase } from './integrations/knex/KnexDatabase.js';
|
|
3
2
|
import { KyselyDatabase } from './integrations/kysely/KyselyDatabase.js';
|
|
4
3
|
import { PostgresDatabase } from './integrations/pgsql/PostgresDatabase.js';
|
|
@@ -14,7 +13,6 @@ export declare const DATABASES: {
|
|
|
14
13
|
knex: typeof KnexDatabase;
|
|
15
14
|
pg: typeof PostgresDatabase;
|
|
16
15
|
kysely: typeof KyselyDatabase;
|
|
17
|
-
dynamo: typeof DynamoDatabase;
|
|
18
16
|
};
|
|
19
17
|
/**
|
|
20
18
|
* Manages the creation and storage of database instances.
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import hash from 'object-hash';
|
|
2
|
-
import { DynamoDatabase } from './integrations/dynamo/DynamoDatabase.js';
|
|
3
2
|
import { KnexDatabase } from './integrations/knex/KnexDatabase.js';
|
|
4
3
|
import { KyselyDatabase } from './integrations/kysely/KyselyDatabase.js';
|
|
5
4
|
import { PostgresDatabase } from './integrations/pgsql/PostgresDatabase.js';
|
|
@@ -14,7 +13,6 @@ export const DATABASES = {
|
|
|
14
13
|
knex: KnexDatabase,
|
|
15
14
|
pg: PostgresDatabase,
|
|
16
15
|
kysely: KyselyDatabase,
|
|
17
|
-
dynamo: DynamoDatabase,
|
|
18
16
|
};
|
|
19
17
|
/**
|
|
20
18
|
* Manages the creation and storage of database instances.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatabaseManager.js","sourceRoot":"","sources":["../../../src/Database/DatabaseManager.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,aAAa,CAAA;AAE9B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"DatabaseManager.js","sourceRoot":"","sources":["../../../src/Database/DatabaseManager.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,aAAa,CAAA;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAA;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAA;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAA;AAG3E;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,IAAI,EAAE,YAAY;IAClB,EAAE,EAAE,gBAAgB;IACpB,MAAM,EAAE,cAAc;CACvB,CAAA;AAED;;GAEG;AACH,MAAM,OAAO,eAAe;IAA5B;QAME;;;WAGG;QACK,cAAS,GAAqB,SAAS,CAAA;QAC/C;;;WAGG;QACK,cAAS,GAAgD,EAAE,CAAA;IA6BrE,CAAC;IA3BC;;;;OAIG;IACI,MAAM,CACX,MAAmB;QAEnB,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAA;QAC/B,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAQ,CAAA;QAC1C,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAc,MAAa,CAAC,CAAA;QAC/D,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAA;QACrC,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED;;;;OAIG;IACK,aAAa,CACnB,MAA8D;QAE9D,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAa,CAAQ,CAAA;IAC9D,CAAC;;AA1CD;;;GAGG;AACoB,wBAAQ,GAAG,IAAI,eAAe,EAAE,AAAxB,CAAwB"}
|
|
@@ -75,7 +75,7 @@ export class DatabaseTransaction extends Function {
|
|
|
75
75
|
*/
|
|
76
76
|
this.closeSuccess = () => __awaiter(this, void 0, void 0, function* () {
|
|
77
77
|
if (this._isOpen) {
|
|
78
|
-
if (this.database.config
|
|
78
|
+
if (this.database.config.autoCommit) {
|
|
79
79
|
yield this.doCommit();
|
|
80
80
|
}
|
|
81
81
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatabaseTransaction.js","sourceRoot":"","sources":["../../../src/Database/DatabaseTransaction.ts"],"names":[],"mappings":";;;;;;;;;AAEA;;;;GAIG;AACH,MAAM,OAAgB,mBAAoB,SAAQ,QAAQ;IA2BxD;;;;;;OAMG;IACH,YAAsB,MAAW,EAAE,QAAuB,EAAE,MAAY;QACtE,KAAK,CAAC,SAAS,EAAE,kCAAkC,CAAC,CAAA;QAkCtD;;;WAGG;QACI,WAAM,GAAG,GAAY,EAAE;YAC5B,OAAO,IAAI,CAAC,OAAO,CAAA;QACrB,CAAC,CAAA;QAED;;;;WAIG;QACI,UAAK,GAAG,GAAwB,EAAE;YACvC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;YACjE,CAAC;YACD,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;YACpB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACrB,CAAC,CAAA,CAAA;QAED;;;;;WAKG;QACI,WAAM,GAAG,GAAwB,EAAE;YACxC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;YAClE,CAAC;YACD,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;YACrB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACtB,CAAC,CAAA,CAAA;QAED;;;;;WAKG;QACI,aAAQ,GAAG,GAAwB,EAAE;YAC1C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;YACpE,CAAC;YACD,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;YACvB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACtB,CAAC,CAAA,CAAA;QAED;;;;;WAKG;QACI,iBAAY,GAAG,GAAS,EAAE;YAC/B,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBACjB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"DatabaseTransaction.js","sourceRoot":"","sources":["../../../src/Database/DatabaseTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Database } from './Database.js';
|
|
2
2
|
import { DatabaseManager } from './DatabaseManager.js';
|
|
3
3
|
import { DatabaseTransaction } from './DatabaseTransaction.js';
|
|
4
|
-
import { DynamoDatabase } from './integrations/dynamo/DynamoDatabase.js';
|
|
5
4
|
import { KnexDatabase } from './integrations/knex/KnexDatabase.js';
|
|
6
5
|
import { KnexTransaction } from './integrations/knex/KnexTransaction.js';
|
|
7
6
|
import { KyselyDatabase } from './integrations/kysely/KyselyDatabase.js';
|
|
@@ -9,4 +8,4 @@ import { KyselyTransaction } from './integrations/kysely/KyselyTransaction.js';
|
|
|
9
8
|
import { PostgresDatabase } from './integrations/pgsql/PostgresDatabase.js';
|
|
10
9
|
import { PostgresTransaction } from './integrations/pgsql/PostgresTransaction.js';
|
|
11
10
|
import { DbConfig } from './types.js';
|
|
12
|
-
export { DatabaseTransaction, Database, DatabaseManager, DbConfig, KnexTransaction, KnexDatabase, PostgresTransaction, PostgresDatabase, KyselyTransaction, KyselyDatabase,
|
|
11
|
+
export { DatabaseTransaction, Database, DatabaseManager, DbConfig, KnexTransaction, KnexDatabase, PostgresTransaction, PostgresDatabase, KyselyTransaction, KyselyDatabase, };
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { Database } from './Database.js';
|
|
2
2
|
import { DatabaseManager } from './DatabaseManager.js';
|
|
3
3
|
import { DatabaseTransaction } from './DatabaseTransaction.js';
|
|
4
|
-
import { DynamoDatabase } from './integrations/dynamo/DynamoDatabase.js';
|
|
5
|
-
// import { DynamoTransaction } from './integrations/dynamo/DynamoTransaction.js'
|
|
6
4
|
import { KnexDatabase } from './integrations/knex/KnexDatabase.js';
|
|
7
5
|
import { KyselyDatabase } from './integrations/kysely/KyselyDatabase.js';
|
|
8
6
|
import { PostgresDatabase } from './integrations/pgsql/PostgresDatabase.js';
|
|
@@ -10,8 +8,5 @@ export {
|
|
|
10
8
|
// Abstracts
|
|
11
9
|
DatabaseTransaction, Database,
|
|
12
10
|
// 'Entrypoints'
|
|
13
|
-
DatabaseManager, KnexDatabase, PostgresDatabase, KyselyDatabase,
|
|
14
|
-
// Dynamo
|
|
15
|
-
// DynamoTransaction,
|
|
16
|
-
DynamoDatabase, };
|
|
11
|
+
DatabaseManager, KnexDatabase, PostgresDatabase, KyselyDatabase, };
|
|
17
12
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Database/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Database/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAA;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAA;AAExE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAA;AAI3E,OAAO;AACL,YAAY;AACZ,mBAAmB,EACnB,QAAQ;AACR,gBAAgB;AAChB,eAAe,EAIf,YAAY,EAGZ,gBAAgB,EAGhB,cAAc,GACf,CAAA"}
|
|
@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { CamelCasePlugin, Kysely, PostgresDialect } from 'kysely';
|
|
11
|
-
import
|
|
11
|
+
import pg from 'pg';
|
|
12
12
|
import { KyselyTransactionImpl } from './KyselyTransaction.js';
|
|
13
13
|
import { Database } from '../../Database.js';
|
|
14
14
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KyselyDatabase.js","sourceRoot":"","sources":["../../../../../src/Database/integrations/kysely/KyselyDatabase.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AACjE,OAAO,
|
|
1
|
+
{"version":3,"file":"KyselyDatabase.js","sourceRoot":"","sources":["../../../../../src/Database/integrations/kysely/KyselyDatabase.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AACjE,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,OAAO,EAAqB,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AACjF,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAG5C;;;GAGG;AACH,MAAM,OAAO,cAAiC,SAAQ,QAAqC;IAmCzF;;;;OAIG;IACH,YAAmB,MAA0B;QAC3C,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;QAC3C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACjD,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACvB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAC3D,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAC3D,CAAC;IACH,CAAC;IAED;;;OAGG;IACmB,WAAW;;YAC/B,OAAO,qBAAqB,CAAC,cAAc,CAAW,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;QAC3F,CAAC;KAAA;IACD;;;;OAIG;IACK,cAAc,CAAC,MAAoB;QACzC,OAAO,IAAI,cAAc,CAAC,gBAAgB,CAAC;YACzC,IAAI,EAAE,IAAI,cAAc,CAAC,UAAU,CAAC;gBAClC,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,IAAI,EAAE,MAAM,CAAC,QAAQ;gBACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,GAAG,EAAE,MAAM,CAAC,cAAc;aAC3B,CAAC;SACH,CAAC,CAAA;IACJ,CAAC;IACD;;;;OAIG;IACK,eAAe,CAAC,OAAwB;QAC9C,OAAO,IAAI,cAAc,CAAC,cAAc,CAAW;YACjD,OAAO;YACP,OAAO,EAAE,CAAC,IAAI,eAAe,EAAE,CAAC;SACjC,CAAC,CAAA;IACJ,CAAC;;AAnFD;;;GAGG;AACY,+BAAgB,GAAG,eAAe,CAAA;AACjD;;;GAGG;AACY,6BAAc,GAAG,MAAM,CAAA;AACtC;;;GAGG;AACY,yBAAU,GAAG,EAAE,CAAC,IAAI,CAAA"}
|
|
@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
|
-
import
|
|
10
|
+
import pg from 'pg';
|
|
11
11
|
import { PostgresTransactionImpl } from './PostgresTransaction.js';
|
|
12
12
|
import { Database } from '../../Database.js';
|
|
13
13
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgresDatabase.js","sourceRoot":"","sources":["../../../../../src/Database/integrations/pgsql/PostgresDatabase.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"PostgresDatabase.js","sourceRoot":"","sources":["../../../../../src/Database/integrations/pgsql/PostgresDatabase.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,OAAO,EAAuB,uBAAuB,EAAE,MAAM,0BAA0B,CAAA;AACvF,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAG5C;;;GAGG;AACH,MAAM,OAAO,gBAAiB,SAAQ,QAA6B;IAgBjE;;;;OAIG;IACH,YAAmB,MAAsB;QACvC,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;QAC1C,IAAI,MAAM,CAAC,WAAW;YAAE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;IACpF,CAAC;IAED;;;OAGG;IACmB,WAAW;;YAC/B,OAAO,uBAAuB,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;QACnF,CAAC;KAAA;IACO,eAAe,CAAC,MAAoB;QAC1C,OAAO,IAAI,gBAAgB,CAAC,UAAU,CAAC;YACrC,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,QAAQ;YACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,GAAG,EAAE,MAAM,CAAC,cAAc;SAC3B,CAAC,CAAA;IACJ,CAAC;;AA1CD;;;GAGG;AACY,2BAAU,GAAG,EAAE,CAAC,IAAI,CAAA"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Database } from './Database.js';
|
|
2
2
|
import { DATABASES } from './DatabaseManager.js';
|
|
3
|
-
import { DynamoDatabase } from './integrations/dynamo/DynamoDatabase.js';
|
|
4
3
|
import { KnexDatabase } from './integrations/knex/KnexDatabase.js';
|
|
5
4
|
import { KyselyDatabase } from './integrations/kysely/KyselyDatabase.js';
|
|
6
5
|
import { PostgresDatabase } from './integrations/pgsql/PostgresDatabase.js';
|
|
@@ -20,7 +19,6 @@ export type DatabaseClass<T> = {
|
|
|
20
19
|
knex: new (...args: any[]) => KnexDatabase;
|
|
21
20
|
pg: new (...args: any[]) => PostgresDatabase;
|
|
22
21
|
kysely: new (...args: any[]) => KyselyDatabase<T>;
|
|
23
|
-
dynamo: new (...args: any[]) => DynamoDatabase;
|
|
24
22
|
};
|
|
25
23
|
/**
|
|
26
24
|
* Represents a specific implementation type for a database based on the provided DatabaseType.
|
|
@@ -69,16 +67,11 @@ export type DbBaseConfig = {
|
|
|
69
67
|
* @property {boolean} [convertCamelToSnake] - Whether to convert camel case to snake case for 'knex' database type.
|
|
70
68
|
* @property {DbBaseConfig} [readReplica] - The read replica configuration for '
|
|
71
69
|
*/
|
|
72
|
-
export type DbConfig<S extends DatabaseType> = {
|
|
70
|
+
export type DbConfig<S extends DatabaseType> = DbBaseConfig & {
|
|
73
71
|
type: S;
|
|
74
|
-
} & (S extends 'knex' ?
|
|
72
|
+
} & (S extends 'knex' ? {
|
|
75
73
|
driver?: string;
|
|
76
74
|
convertCamelToSnake?: boolean;
|
|
77
|
-
} : unknown) & (S extends 'pg' | 'kysely' ?
|
|
75
|
+
} : unknown) & (S extends 'pg' | 'kysely' ? {
|
|
78
76
|
readReplica?: DbBaseConfig;
|
|
79
|
-
} : unknown) & (S extends 'dynamo' ? {
|
|
80
|
-
region: string;
|
|
81
|
-
tableName: string;
|
|
82
|
-
maxAttempts?: number;
|
|
83
|
-
connectionTimeout?: number;
|
|
84
77
|
} : unknown);
|
|
@@ -83,10 +83,18 @@ export default class RouteResolver {
|
|
|
83
83
|
* @returns None
|
|
84
84
|
*/
|
|
85
85
|
buildRoutes(config) {
|
|
86
|
-
|
|
87
|
-
const parts =
|
|
86
|
+
const addRoute = (path, route) => {
|
|
87
|
+
const parts = path.split('/').filter(p => p.length);
|
|
88
88
|
this.routes[route.method] = this.routes[route.method] || new Routes();
|
|
89
89
|
this.routes[route.method].addRoute(route, parts);
|
|
90
|
+
};
|
|
91
|
+
for (const route of config.routes) {
|
|
92
|
+
if (Array.isArray(route.path)) {
|
|
93
|
+
for (const path of route.path)
|
|
94
|
+
addRoute(path, route);
|
|
95
|
+
}
|
|
96
|
+
else
|
|
97
|
+
addRoute(route.path, route);
|
|
90
98
|
}
|
|
91
99
|
}
|
|
92
100
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouteResolver.js","sourceRoot":"","sources":["../../../src/Server/RouteResolver.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,MAAM;IAkBV;;;OAGG;IACH;QACE,IAAI,CAAC,IAAI,GAAG,EAAE,CAAA;IAChB,CAAC;IAED;;;;;;OAMG;IACI,QAAQ,CAAC,KAAe,EAAE,KAAe;QAC9C,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAA;QAC3B,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,MAAM,EAAE,CAAA;gBAC7C,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;YACtC,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,MAAM,EAAE,CAAA;gBACnD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;YACzC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,IAAI,CAAC,OAAO;gBAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;YAEpF,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACtB,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,YAAY,CAAC,KAAe;;QACjC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAA;QAC3B,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACvB,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;YAC7C,CAAC;YACD,OAAO,MAAA,IAAI,CAAC,QAAQ,0CAAE,YAAY,CAAC,KAAK,CAAC,CAAA;QAC3C,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,aAAa;IAQhC;;;;OAIG;IACH,YAAqB,MAAoB;QAApB,WAAM,GAAN,MAAM,CAAc;QACvC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAA;QAChB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;IAC1B,CAAC;IAED;;;;;OAKG;IACI,YAAY,CAAC,MAAkB,EAAE,IAAY;;QAClD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;QACnD,OAAO,MAAA,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,0CAAE,YAAY,CAAC,KAAK,CAAC,CAAA;IACjD,CAAC;IAED;;;;OAIG;IACK,WAAW,CAAC,MAAoB;QACtC,
|
|
1
|
+
{"version":3,"file":"RouteResolver.js","sourceRoot":"","sources":["../../../src/Server/RouteResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ export interface Route<InputType = never, OutputType = never, PathParamsType = S
|
|
|
22
22
|
* @param {string} path - The file path.
|
|
23
23
|
* @returns None
|
|
24
24
|
*/
|
|
25
|
-
path: string;
|
|
25
|
+
path: string | string[];
|
|
26
26
|
/**
|
|
27
27
|
* Represents the method used in an API request.
|
|
28
28
|
* @type {string}
|
|
@@ -59,7 +59,9 @@ export default class Server {
|
|
|
59
59
|
return validationResp;
|
|
60
60
|
}
|
|
61
61
|
// parse before validating
|
|
62
|
-
|
|
62
|
+
for (const path of Array.isArray(route.path) ? route.path : [route.path]) {
|
|
63
|
+
this.parsePathParams(request, path);
|
|
64
|
+
}
|
|
63
65
|
// Validate path
|
|
64
66
|
if (route.pathSchema) {
|
|
65
67
|
const validationResp = Validator.validateSchema(request.getPathParams(), route.pathSchema);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../../../../src/Server/lib/Server.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAG7C,OAAO,QAA+B,MAAM,uBAAuB,CAAA;AACnE,OAAO,WAA0B,MAAM,gCAAgC,CAAA;AACvE,OAAO,SAAS,MAAM,+BAA+B,CAAA;AAErD,OAAO,aAAa,MAAM,qBAAqB,CAAA;AAE/C;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,MAAM;IAczB;;;;OAIG;IACH,YAAY,MAAoB;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,aAAa,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,CAAA;IAChD,CAAC;IAED;;;OAGG;IACI,SAAS;QACd,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED;;;;;OAKG;IACU,qBAAqB,CAAC,KAA2B,EAAE,OAAgB;;YAC9E,mBAAmB;YACnB,MAAM,IAAI,WAAW,CACnB,KAAK,EACL,OAAO,EACP,IAAI,CAAC,MAAM,CACZ,CAAC,OAAO,CAAC,CAAM,WAAW,EAAC,EAAE;gBAC5B,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAA;gBACnC,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;gBACrF,IAAI,KAAK,EAAE,CAAC;oBACV,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;oBAC5D,iBAAiB;oBACjB,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;wBACtB,MAAM,cAAc,GAAG,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,WAAW,CAAC,CAAA;wBACrF,IAAI,cAAc,IAAI,cAAc,YAAY,QAAQ;4BAAE,OAAO,cAAc,CAAA;oBACjF,CAAC;oBAED,iBAAiB;oBACjB,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;wBACtB,MAAM,cAAc,GAAG,SAAS,CAAC,cAAc,CAC7C,OAAO,CAAC,cAAc,EAAE,EACxB,KAAK,CAAC,WAAW,CAClB,CAAA;wBACD,IAAI,cAAc,IAAI,cAAc,YAAY,QAAQ;4BAAE,OAAO,cAAc,CAAA;oBACjF,CAAC;oBAED,0BAA0B;oBAC1B,IAAI,
|
|
1
|
+
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../../../../src/Server/lib/Server.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,8 @@ export default class Validator {
|
|
|
18
18
|
let error, validatedInput;
|
|
19
19
|
// Validate body against known zod schema
|
|
20
20
|
try {
|
|
21
|
-
|
|
21
|
+
schema.parse(data);
|
|
22
|
+
validatedInput = true;
|
|
22
23
|
}
|
|
23
24
|
catch (err) {
|
|
24
25
|
if (err instanceof z.ZodError)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../../src/Validation/Validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,QAA+B,MAAM,oBAAoB,CAAA;AAChE,OAAO,OAAO,MAAM,eAAe,CAAA;AAEnC;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,SAAS;IAC5B;;;;;OAKG;IACI,MAAM,CAAC,cAAc,CAC1B,IAAS,EACT,MAAwE;QAExE,IAAI,KAAK,EAAE,cAAc,CAAA;QAEzB,yCAAyC;QACzC,IAAI,CAAC;YACH,
|
|
1
|
+
{"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../../src/Validation/Validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,QAA+B,MAAM,oBAAoB,CAAA;AAChE,OAAO,OAAO,MAAM,eAAe,CAAA;AAEnC;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,SAAS;IAC5B;;;;;OAKG;IACI,MAAM,CAAC,cAAc,CAC1B,IAAS,EACT,MAAwE;QAExE,IAAI,KAAK,EAAE,cAAc,CAAA;QAEzB,yCAAyC;QACzC,IAAI,CAAC;YACH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YAClB,cAAc,GAAG,IAAI,CAAA;QACvB,CAAC;QAAC,OAAO,GAAqB,EAAE,CAAC;YAC/B,IAAI,GAAG,YAAY,CAAC,CAAC,QAAQ;gBAAE,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;;gBACzD,KAAK,GAAG,2BAA2B,CAAA,CAAC,8BAA8B;QACzE,CAAC;QAED,mBAAmB;QACnB,IAAI,CAAC,cAAc,IAAI,KAAK,EAAE,CAAC;YAC7B,OAAO,QAAQ,CAAC,kBAAkB,CAChC,OAAO,CAAC,2BAA2B,EACnC,OAAO,CAAC,sBAAsB,EAC9B,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAC7B,CAAA;QACH,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;CACF"}
|
package/index.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { HttpMethod } from './src/API/Request.js'
|
|
|
2
2
|
import Response, { ResponseErrorType } from './src/API/Response.js'
|
|
3
3
|
import EventProcessor from './src/BaseEvent/EventProcessor.js'
|
|
4
4
|
import Process from './src/BaseEvent/Process.js'
|
|
5
|
-
import Transaction
|
|
5
|
+
import Transaction from './src/BaseEvent/Transaction.js'
|
|
6
6
|
import Redis from './src/Cache/Redis.js'
|
|
7
7
|
import Configuration from './src/Config/Configuration.js'
|
|
8
8
|
import Crypto from './src/Crypto/Crypto.js'
|
|
@@ -53,7 +53,6 @@ export {
|
|
|
53
53
|
Utils,
|
|
54
54
|
AsyncSingleton,
|
|
55
55
|
Route,
|
|
56
|
-
TransactionConfig,
|
|
57
56
|
// Misc types
|
|
58
57
|
ResponseErrorType,
|
|
59
58
|
HttpMethod,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@creator.co/wapi",
|
|
3
|
-
"version": "1.7.5
|
|
3
|
+
"version": "1.7.5",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -18,14 +18,12 @@
|
|
|
18
18
|
"author": "",
|
|
19
19
|
"license": "ISC",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@aws-sdk/client-dynamodb": "^3.574.0",
|
|
22
21
|
"@aws-sdk/client-kms": "^3.556.0",
|
|
23
22
|
"@aws-sdk/client-secrets-manager": "3.556",
|
|
24
23
|
"@aws-sdk/client-ses": "3.556",
|
|
25
24
|
"@aws-sdk/client-sns": "3.556",
|
|
26
25
|
"@aws-sdk/client-ssm": "3.556",
|
|
27
26
|
"@aws-sdk/credential-provider-node": "3.556",
|
|
28
|
-
"@smithy/node-http-handler": "^3.0.0",
|
|
29
27
|
"@types/email-templates": "^10.0.1",
|
|
30
28
|
"@types/nodemailer": "^6.4.10",
|
|
31
29
|
"@types/object-hash": "^3.0.4",
|
package/src/API/Request.ts
CHANGED
|
@@ -189,7 +189,7 @@ export default class Request<InputType, PathParamsType, QueryParamsType> {
|
|
|
189
189
|
* @returns None
|
|
190
190
|
*/
|
|
191
191
|
public setFixedPathParams(keys: any[], result: any[]): void {
|
|
192
|
-
this.requestEvent.pathParameters = {}
|
|
192
|
+
if (!this.requestEvent.pathParameters) this.requestEvent.pathParameters = {}
|
|
193
193
|
keys.forEach((key, index) => {
|
|
194
194
|
if (this.requestEvent?.pathParameters) {
|
|
195
195
|
this.requestEvent.pathParameters[key.name] = result[index + 1]
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import hash from 'object-hash'
|
|
2
2
|
|
|
3
|
-
import { DynamoDatabase } from './integrations/dynamo/DynamoDatabase.js'
|
|
4
3
|
import { KnexDatabase } from './integrations/knex/KnexDatabase.js'
|
|
5
4
|
import { KyselyDatabase } from './integrations/kysely/KyselyDatabase.js'
|
|
6
5
|
import { PostgresDatabase } from './integrations/pgsql/PostgresDatabase.js'
|
|
@@ -17,7 +16,6 @@ export const DATABASES = {
|
|
|
17
16
|
knex: KnexDatabase,
|
|
18
17
|
pg: PostgresDatabase,
|
|
19
18
|
kysely: KyselyDatabase,
|
|
20
|
-
dynamo: DynamoDatabase,
|
|
21
19
|
}
|
|
22
20
|
|
|
23
21
|
/**
|
|
@@ -63,7 +61,7 @@ export class DatabaseManager {
|
|
|
63
61
|
* @returns {DatabaseImplType<S, DBSchema>} An instance of the specified database connection.
|
|
64
62
|
*/
|
|
65
63
|
private instantiateDb<S extends DatabaseType, DBSchema>(
|
|
66
|
-
config: DbConfig<'knex'> | DbConfig<'pg'> | DbConfig<'kysely'>
|
|
64
|
+
config: DbConfig<'knex'> | DbConfig<'pg'> | DbConfig<'kysely'>
|
|
67
65
|
): DatabaseImplType<S, DBSchema> {
|
|
68
66
|
return new this.databases[config.type](config as any) as any
|
|
69
67
|
}
|
|
@@ -131,7 +131,7 @@ export abstract class DatabaseTransaction extends Function {
|
|
|
131
131
|
*/
|
|
132
132
|
public closeSuccess = async () => {
|
|
133
133
|
if (this._isOpen) {
|
|
134
|
-
if (this.database.config
|
|
134
|
+
if (this.database.config.autoCommit) {
|
|
135
135
|
await this.doCommit()
|
|
136
136
|
} else {
|
|
137
137
|
await this.doRollback()
|
package/src/Database/index.ts
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { Database } from './Database.js'
|
|
2
2
|
import { DatabaseManager } from './DatabaseManager.js'
|
|
3
3
|
import { DatabaseTransaction } from './DatabaseTransaction.js'
|
|
4
|
-
import { DynamoDatabase } from './integrations/dynamo/DynamoDatabase.js'
|
|
5
|
-
// import { DynamoTransaction } from './integrations/dynamo/DynamoTransaction.js'
|
|
6
4
|
import { KnexDatabase } from './integrations/knex/KnexDatabase.js'
|
|
7
5
|
import { KnexTransaction } from './integrations/knex/KnexTransaction.js'
|
|
8
6
|
import { KyselyDatabase } from './integrations/kysely/KyselyDatabase.js'
|
|
@@ -27,7 +25,4 @@ export {
|
|
|
27
25
|
// Kysely
|
|
28
26
|
KyselyTransaction,
|
|
29
27
|
KyselyDatabase,
|
|
30
|
-
// Dynamo
|
|
31
|
-
// DynamoTransaction,
|
|
32
|
-
DynamoDatabase,
|
|
33
28
|
}
|
package/src/Database/types.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Database } from './Database.js'
|
|
2
2
|
import { DATABASES } from './DatabaseManager.js'
|
|
3
|
-
import { DynamoDatabase } from './integrations/dynamo/DynamoDatabase.js'
|
|
4
3
|
import { KnexDatabase } from './integrations/knex/KnexDatabase.js'
|
|
5
4
|
import { KyselyDatabase } from './integrations/kysely/KyselyDatabase.js'
|
|
6
5
|
import { PostgresDatabase } from './integrations/pgsql/PostgresDatabase.js'
|
|
@@ -22,7 +21,6 @@ export type DatabaseClass<T> = {
|
|
|
22
21
|
knex: new (...args: any[]) => KnexDatabase
|
|
23
22
|
pg: new (...args: any[]) => PostgresDatabase
|
|
24
23
|
kysely: new (...args: any[]) => KyselyDatabase<T>
|
|
25
|
-
dynamo: new (...args: any[]) => DynamoDatabase
|
|
26
24
|
}
|
|
27
25
|
|
|
28
26
|
/**
|
|
@@ -75,22 +73,14 @@ export type DbBaseConfig = {
|
|
|
75
73
|
* @property {boolean} [convertCamelToSnake] - Whether to convert camel case to snake case for 'knex' database type.
|
|
76
74
|
* @property {DbBaseConfig} [readReplica] - The read replica configuration for '
|
|
77
75
|
*/
|
|
78
|
-
export type DbConfig<S extends DatabaseType> = { type: S } & (S extends 'knex'
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
}
|
|
83
|
-
: unknown) &
|
|
84
|
-
(S extends 'pg' | 'kysely'
|
|
85
|
-
? DbBaseConfig & {
|
|
86
|
-
readReplica?: DbBaseConfig
|
|
76
|
+
export type DbConfig<S extends DatabaseType> = DbBaseConfig & { type: S } & (S extends 'knex'
|
|
77
|
+
? {
|
|
78
|
+
driver?: string
|
|
79
|
+
convertCamelToSnake?: boolean
|
|
87
80
|
}
|
|
88
81
|
: unknown) &
|
|
89
|
-
(S extends '
|
|
82
|
+
(S extends 'pg' | 'kysely'
|
|
90
83
|
? {
|
|
91
|
-
|
|
92
|
-
tableName: string
|
|
93
|
-
maxAttempts?: number
|
|
94
|
-
connectionTimeout?: number
|
|
84
|
+
readReplica?: DbBaseConfig
|
|
95
85
|
}
|
|
96
86
|
: unknown)
|
package/src/Server/lib/Server.ts
CHANGED
|
@@ -76,7 +76,10 @@ export default class Server {
|
|
|
76
76
|
}
|
|
77
77
|
|
|
78
78
|
// parse before validating
|
|
79
|
-
|
|
79
|
+
for (const path of Array.isArray(route.path) ? route.path : [route.path]) {
|
|
80
|
+
this.parsePathParams(request, path)
|
|
81
|
+
}
|
|
82
|
+
|
|
80
83
|
// Validate path
|
|
81
84
|
if (route.pathSchema) {
|
|
82
85
|
const validationResp = Validator.validateSchema(request.getPathParams(), route.pathSchema)
|
|
@@ -24,7 +24,8 @@ export default class Validator {
|
|
|
24
24
|
|
|
25
25
|
// Validate body against known zod schema
|
|
26
26
|
try {
|
|
27
|
-
|
|
27
|
+
schema.parse(data)
|
|
28
|
+
validatedInput = true
|
|
28
29
|
} catch (err: z.ZodError | any) {
|
|
29
30
|
if (err instanceof z.ZodError) error = JSON.parse(err.message)
|
|
30
31
|
else error = 'Unknown validation error!' //unhandled case, hard to test
|
|
@@ -4,7 +4,7 @@ import { expect } from 'chai'
|
|
|
4
4
|
import { DatabaseManager } from '../../src/Database/index.js'
|
|
5
5
|
import type { DatabaseType, DbConfig } from '../../src/Database/types.js'
|
|
6
6
|
|
|
7
|
-
type FakeDatabase = { host: string;
|
|
7
|
+
type FakeDatabase = { host: string; type: 'knex' | 'pg' | 'kysely' }
|
|
8
8
|
|
|
9
9
|
const fakeConfig = (host: string, type: DatabaseType) => {
|
|
10
10
|
return {
|
|
@@ -13,13 +13,6 @@ const fakeConfig = (host: string, type: DatabaseType) => {
|
|
|
13
13
|
} as DbConfig<typeof type>
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
-
const fakeNoSQLConfig = (tableName: string, type: DatabaseType) => {
|
|
17
|
-
return {
|
|
18
|
-
type,
|
|
19
|
-
tableName,
|
|
20
|
-
} as DbConfig<typeof type>
|
|
21
|
-
}
|
|
22
|
-
|
|
23
16
|
describe('Database Manager', () => {
|
|
24
17
|
test('should correctly create and cache database instances', () => {
|
|
25
18
|
const underTest = new DatabaseManager()
|
|
@@ -34,9 +27,6 @@ describe('Database Manager', () => {
|
|
|
34
27
|
kysely: jest.fn((config: any) => {
|
|
35
28
|
return { host: config.host, type: 'kysely' } as any
|
|
36
29
|
}) as any,
|
|
37
|
-
dynamo: jest.fn((config: any) => {
|
|
38
|
-
return { tableName: config.tableName, type: 'dynamo' } as any
|
|
39
|
-
}) as any,
|
|
40
30
|
}
|
|
41
31
|
|
|
42
32
|
const create = config => underTest.create({ ...config }) as unknown as FakeDatabase
|
|
@@ -47,8 +37,6 @@ describe('Database Manager', () => {
|
|
|
47
37
|
const pgConfig2 = fakeConfig('other', 'pg')
|
|
48
38
|
const kyselyConfig1 = fakeConfig('localhost', 'pg')
|
|
49
39
|
const kyselyConfig2 = fakeConfig('other', 'pg')
|
|
50
|
-
const dynamoConfig1 = fakeNoSQLConfig('localhost', 'dynamo')
|
|
51
|
-
const dynamoConfig2 = fakeNoSQLConfig('other', 'dynamo')
|
|
52
40
|
|
|
53
41
|
const knex1 = create(knexConfig1)
|
|
54
42
|
const knex2 = create(knexConfig1)
|
|
@@ -62,10 +50,6 @@ describe('Database Manager', () => {
|
|
|
62
50
|
const kysely2 = create(kyselyConfig1)
|
|
63
51
|
const kysely3 = create(kyselyConfig2)
|
|
64
52
|
|
|
65
|
-
const dynamo1 = create(dynamoConfig1)
|
|
66
|
-
const dynamo2 = create(dynamoConfig1)
|
|
67
|
-
const dynamo3 = create(dynamoConfig2)
|
|
68
|
-
|
|
69
53
|
expect(knex1).to.equal(knex2).to.not.equal(knex3).to.not.equal(pg1)
|
|
70
54
|
|
|
71
55
|
expect(knexConfig1).to.be.deep.equal(knex1).to.be.deep.equal(knex2)
|
|
@@ -83,12 +67,5 @@ describe('Database Manager', () => {
|
|
|
83
67
|
expect(kyselyConfig1).to.be.deep.equal(kysely1).to.be.deep.equal(kysely2)
|
|
84
68
|
|
|
85
69
|
expect(kysely3).to.be.deep.equal(kyselyConfig2)
|
|
86
|
-
|
|
87
|
-
expect(dynamo1).to.equal(dynamo2).to.not.equal(dynamo3).to.not.equal(pg1)
|
|
88
|
-
console.log(dynamoConfig1)
|
|
89
|
-
console.log(dynamo1)
|
|
90
|
-
expect(dynamoConfig1).to.be.deep.equal(dynamo1).to.be.deep.equal(dynamo2)
|
|
91
|
-
|
|
92
|
-
expect(dynamo3).to.be.deep.equal(dynamoConfig2)
|
|
93
70
|
})
|
|
94
71
|
})
|
|
@@ -20,7 +20,7 @@ const testResources = async (config: Partial<DbConfig<'kysely'>>) => {
|
|
|
20
20
|
autoCommit: true,
|
|
21
21
|
...config,
|
|
22
22
|
} as DbConfig<'kysely'>,
|
|
23
|
-
} as
|
|
23
|
+
} as KyselyDatabase<DB>
|
|
24
24
|
|
|
25
25
|
const transaction = jest.fn().mockImplementation(() => {
|
|
26
26
|
return {
|