@scefira/dfw 1.2.0 → 1.2.2

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 (129) hide show
  1. package/dist/index.d.ts +4 -2
  2. package/dist/index.d.ts.map +1 -1
  3. package/dist/index.js +7 -4
  4. package/dist/index.js.map +1 -1
  5. package/dist/lib/APIListener.d.ts +56 -0
  6. package/dist/lib/APIListener.d.ts.map +1 -0
  7. package/dist/lib/APIListener.js +16 -0
  8. package/dist/lib/APIListener.js.map +1 -0
  9. package/dist/lib/APIManager.d.ts +2 -3
  10. package/dist/lib/APIManager.d.ts.map +1 -1
  11. package/dist/lib/APIManager.js +26 -46
  12. package/dist/lib/APIManager.js.map +1 -1
  13. package/dist/lib/DFWCore.d.ts +9 -9
  14. package/dist/lib/DFWCore.d.ts.map +1 -1
  15. package/dist/lib/DFWCore.js +12 -37
  16. package/dist/lib/DFWCore.js.map +1 -1
  17. package/dist/lib/{DFWRepository.d.ts → DFWModule.d.ts} +10 -3
  18. package/dist/lib/DFWModule.d.ts.map +1 -0
  19. package/dist/lib/{DFWRepository.js → DFWModule.js} +13 -10
  20. package/dist/lib/DFWModule.js.map +1 -0
  21. package/dist/lib/DFWService.d.ts +16 -0
  22. package/dist/lib/DFWService.d.ts.map +1 -0
  23. package/dist/lib/DFWService.js +10 -0
  24. package/dist/lib/DFWService.js.map +1 -0
  25. package/dist/lib/DFWUtils.d.ts +2 -2
  26. package/dist/lib/DFWUtils.d.ts.map +1 -1
  27. package/dist/lib/DFWUtils.js +2 -2
  28. package/dist/lib/DFWUtils.js.map +1 -1
  29. package/dist/lib/strategies/DFWPassportStrategy.js +2 -2
  30. package/dist/lib/strategies/DFWPassportStrategy.js.map +1 -1
  31. package/dist/listeners/DELETEListener.d.ts +6 -2
  32. package/dist/listeners/DELETEListener.d.ts.map +1 -1
  33. package/dist/listeners/DELETEListener.js +4 -6
  34. package/dist/listeners/DELETEListener.js.map +1 -1
  35. package/dist/listeners/GETListener.d.ts +6 -2
  36. package/dist/listeners/GETListener.d.ts.map +1 -1
  37. package/dist/listeners/GETListener.js +4 -6
  38. package/dist/listeners/GETListener.js.map +1 -1
  39. package/dist/listeners/PATCHListener.d.ts +6 -2
  40. package/dist/listeners/PATCHListener.d.ts.map +1 -1
  41. package/dist/listeners/PATCHListener.js +4 -6
  42. package/dist/listeners/PATCHListener.js.map +1 -1
  43. package/dist/listeners/POSTListener.d.ts +6 -2
  44. package/dist/listeners/POSTListener.d.ts.map +1 -1
  45. package/dist/listeners/POSTListener.js +4 -6
  46. package/dist/listeners/POSTListener.js.map +1 -1
  47. package/dist/listeners/PUTListener.d.ts +6 -2
  48. package/dist/listeners/PUTListener.d.ts.map +1 -1
  49. package/dist/listeners/PUTListener.js +4 -6
  50. package/dist/listeners/PUTListener.js.map +1 -1
  51. package/dist/listeners/RawListener.d.ts +1 -1
  52. package/dist/listeners/RawListener.d.ts.map +1 -1
  53. package/dist/listeners/RawListener.js +2 -5
  54. package/dist/listeners/RawListener.js.map +1 -1
  55. package/dist/listeners/StaticPathListener.d.ts +3 -3
  56. package/dist/listeners/StaticPathListener.d.ts.map +1 -1
  57. package/dist/listeners/StaticPathListener.js +17 -7
  58. package/dist/listeners/StaticPathListener.js.map +1 -1
  59. package/dist/listeners/auth/DFWAuthListener.d.ts +2 -2
  60. package/dist/listeners/auth/DFWAuthListener.d.ts.map +1 -1
  61. package/dist/listeners/auth/DFWAuthListener.js +9 -14
  62. package/dist/listeners/auth/DFWAuthListener.js.map +1 -1
  63. package/dist/listeners/index.d.ts.map +1 -1
  64. package/dist/listeners/index.js.map +1 -1
  65. package/dist/{repositories/file.repository.d.ts → modules/DFWFileModule.d.ts} +4 -4
  66. package/dist/modules/DFWFileModule.d.ts.map +1 -0
  67. package/dist/{repositories/file.repository.js → modules/DFWFileModule.js} +4 -4
  68. package/dist/modules/DFWFileModule.js.map +1 -0
  69. package/dist/modules/DFWSecurityModule.d.ts +35 -0
  70. package/dist/modules/DFWSecurityModule.d.ts.map +1 -0
  71. package/dist/modules/DFWSecurityModule.js +125 -0
  72. package/dist/modules/DFWSecurityModule.js.map +1 -0
  73. package/dist/modules/FileModule.d.ts +32 -0
  74. package/dist/modules/FileModule.d.ts.map +1 -0
  75. package/dist/modules/FileModule.js +59 -0
  76. package/dist/modules/FileModule.js.map +1 -0
  77. package/dist/{repositories/security.repository.d.ts → modules/SecurityModule.d.ts} +5 -4
  78. package/dist/modules/SecurityModule.d.ts.map +1 -0
  79. package/dist/{repositories/security.repository.js → modules/SecurityModule.js} +8 -4
  80. package/dist/modules/SecurityModule.js.map +1 -0
  81. package/dist/modules/SessionModule.d.ts +11 -0
  82. package/dist/modules/SessionModule.d.ts.map +1 -0
  83. package/dist/{repositories/session.repository.js → modules/SessionModule.js} +19 -6
  84. package/dist/modules/SessionModule.js.map +1 -0
  85. package/dist/modules/UserModule.d.ts +24 -0
  86. package/dist/modules/UserModule.d.ts.map +1 -0
  87. package/dist/{repositories/user.repository.js → modules/UserModule.js} +10 -10
  88. package/dist/modules/UserModule.js.map +1 -0
  89. package/dist/modules/index.d.ts +5 -0
  90. package/dist/modules/index.d.ts.map +1 -0
  91. package/dist/modules/index.js +15 -0
  92. package/dist/modules/index.js.map +1 -0
  93. package/dist/strategies/DFWPassportStrategy.d.ts +4 -0
  94. package/dist/strategies/DFWPassportStrategy.d.ts.map +1 -0
  95. package/dist/strategies/DFWPassportStrategy.js +36 -0
  96. package/dist/strategies/DFWPassportStrategy.js.map +1 -0
  97. package/dist/test.d.ts +7 -1
  98. package/dist/test.d.ts.map +1 -1
  99. package/dist/test.js +164 -85
  100. package/dist/test.js.map +1 -1
  101. package/dist/types/DFWConfig.d.ts +3 -4
  102. package/dist/types/DFWConfig.d.ts.map +1 -1
  103. package/dist/types/DFWRequest.d.ts +14 -15
  104. package/dist/types/DFWRequest.d.ts.map +1 -1
  105. package/dist/types/index.d.ts +0 -1
  106. package/dist/types/index.d.ts.map +1 -1
  107. package/dist/types/index.js +0 -1
  108. package/dist/types/index.js.map +1 -1
  109. package/package.json +5 -4
  110. package/dist/lib/DFWRepository.d.ts.map +0 -1
  111. package/dist/lib/DFWRepository.js.map +0 -1
  112. package/dist/repositories/file.repository.d.ts.map +0 -1
  113. package/dist/repositories/file.repository.js.map +0 -1
  114. package/dist/repositories/index.d.ts +0 -5
  115. package/dist/repositories/index.d.ts.map +0 -1
  116. package/dist/repositories/index.js +0 -15
  117. package/dist/repositories/index.js.map +0 -1
  118. package/dist/repositories/security.repository.d.ts.map +0 -1
  119. package/dist/repositories/security.repository.js.map +0 -1
  120. package/dist/repositories/session.repository.d.ts +0 -8
  121. package/dist/repositories/session.repository.d.ts.map +0 -1
  122. package/dist/repositories/session.repository.js.map +0 -1
  123. package/dist/repositories/user.repository.d.ts +0 -22
  124. package/dist/repositories/user.repository.d.ts.map +0 -1
  125. package/dist/repositories/user.repository.js.map +0 -1
  126. package/dist/types/APIListener.d.ts +0 -56
  127. package/dist/types/APIListener.d.ts.map +0 -1
  128. package/dist/types/APIListener.js +0 -3
  129. package/dist/types/APIListener.js.map +0 -1
package/dist/index.d.ts CHANGED
@@ -1,7 +1,9 @@
1
- export * from "./repositories";
1
+ export * from "./modules";
2
2
  export * from "./types";
3
3
  export * from "./listeners";
4
+ export * from './lib/APIListener';
4
5
  export { default as DFWCore } from './lib/DFWCore';
5
6
  export { default as DFWUtils } from "./lib/DFWUtils";
6
- export { default as DFWRepository } from './lib/DFWRepository';
7
+ export { default as DFWModule } from './lib/DFWModule';
8
+ export { default as DFWService } from './lib/DFWService';
7
9
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,SAAS,CAAA;AACvB,cAAc,aAAa,CAAA;AAE3B,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,qBAAqB,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,aAAa,CAAA;AAE3B,cAAc,mBAAmB,CAAA;AAEjC,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACtD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,kBAAkB,CAAA"}
package/dist/index.js CHANGED
@@ -17,14 +17,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
17
17
  return (mod && mod.__esModule) ? mod : { "default": mod };
18
18
  };
19
19
  Object.defineProperty(exports, "__esModule", { value: true });
20
- exports.DFWRepository = exports.DFWUtils = exports.DFWCore = void 0;
21
- __exportStar(require("./repositories"), exports);
20
+ exports.DFWService = exports.DFWModule = exports.DFWUtils = exports.DFWCore = void 0;
21
+ __exportStar(require("./modules"), exports);
22
22
  __exportStar(require("./types"), exports);
23
23
  __exportStar(require("./listeners"), exports);
24
+ __exportStar(require("./lib/APIListener"), exports);
24
25
  var DFWCore_1 = require("./lib/DFWCore");
25
26
  Object.defineProperty(exports, "DFWCore", { enumerable: true, get: function () { return __importDefault(DFWCore_1).default; } });
26
27
  var DFWUtils_1 = require("./lib/DFWUtils");
27
28
  Object.defineProperty(exports, "DFWUtils", { enumerable: true, get: function () { return __importDefault(DFWUtils_1).default; } });
28
- var DFWRepository_1 = require("./lib/DFWRepository");
29
- Object.defineProperty(exports, "DFWRepository", { enumerable: true, get: function () { return __importDefault(DFWRepository_1).default; } });
29
+ var DFWModule_1 = require("./lib/DFWModule");
30
+ Object.defineProperty(exports, "DFWModule", { enumerable: true, get: function () { return __importDefault(DFWModule_1).default; } });
31
+ var DFWService_1 = require("./lib/DFWService");
32
+ Object.defineProperty(exports, "DFWService", { enumerable: true, get: function () { return __importDefault(DFWService_1).default; } });
30
33
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,iDAA8B;AAC9B,0CAAuB;AACvB,8CAA2B;AAE3B,yCAAkD;AAAzC,mHAAA,OAAO,OAAW;AAC3B,2CAAoD;AAA3C,qHAAA,OAAO,OAAY;AAC5B,qDAA8D;AAArD,+HAAA,OAAO,OAAiB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,4CAAyB;AACzB,0CAAuB;AACvB,8CAA2B;AAE3B,oDAAiC;AAEjC,yCAAkD;AAAzC,mHAAA,OAAO,OAAW;AAC3B,2CAAoD;AAA3C,qHAAA,OAAO,OAAY;AAC5B,6CAAsD;AAA7C,uHAAA,OAAO,OAAa;AAC7B,+CAAwD;AAA/C,yHAAA,OAAO,OAAc"}
@@ -0,0 +1,56 @@
1
+ import { Handler } from "express";
2
+ import fileUpload from "express-fileupload";
3
+ import { DFWRequest, DFWRequestSchema, DFWResponse } from "../types";
4
+ import { DFWServiceConstructor } from "./DFWService";
5
+ export type APIMethod = 'get' | 'post' | 'put' | 'delete' | 'options' | 'patch' | 'use';
6
+ export type ListenerFn<TServices extends readonly DFWServiceConstructor[] = []> = (dfw: DFWRequestSchema<TServices>, req: DFWRequest<TServices>, res: DFWResponse) => Promise<any | void> | any | void;
7
+ export type APIListener = {
8
+ /**
9
+ * REST API Method
10
+ */
11
+ method?: APIMethod;
12
+ /**
13
+ * Main function to be called
14
+ */
15
+ listener?: ListenerFn;
16
+ /**
17
+ * Express middleware (compatible with raw listeners)
18
+ */
19
+ middleware?: Handler | Handler[];
20
+ /**
21
+ *
22
+ */
23
+ services?: DFWServiceConstructor[];
24
+ /**
25
+ * File Upload middleware enabled receive a fileUpload.Options
26
+ */
27
+ upload?: fileUpload.Options | boolean;
28
+ /**
29
+ * Disable the autosend system, you must specify what send to the clien and when
30
+ */
31
+ disableAutoSend?: boolean;
32
+ /**
33
+ * Disable body parser (body parser is installed only on post methods)
34
+ */
35
+ disableBodyParser?: boolean;
36
+ /**
37
+ * Callback function after the server responses to the client (after the connection was closed)
38
+ * @param req
39
+ * @param listenerRes
40
+ * @returns
41
+ */
42
+ callback?: (req: DFWRequest, listenerRes: any) => Promise<void>;
43
+ };
44
+ export type APIListenerWithoutFn = Omit<APIListener, 'listener'>;
45
+ export type APIListenerWithoutMethod = Omit<APIListener, 'method'>;
46
+ export type APIListenerFunction = {
47
+ (fn: ListenerFn): APIListener;
48
+ (params: APIListenerWithoutFn, fn: ListenerFn): APIListener;
49
+ };
50
+ export declare const makeAPIListenerFunction: (baseParams: Partial<APIListener>) => {
51
+ <TServices extends readonly DFWServiceConstructor[]>(params: APIListenerWithoutMethod & {
52
+ services: TServices;
53
+ }, fn: ListenerFn<TServices>): APIListener;
54
+ (fn: ListenerFn): APIListener;
55
+ };
56
+ //# sourceMappingURL=APIListener.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"APIListener.d.ts","sourceRoot":"","sources":["../../src/lib/APIListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,UAAU,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAErD,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,KAAK,CAAA;AACvF,MAAM,MAAM,UAAU,CAAC,SAAS,SAAS,SAAS,qBAAqB,EAAE,GAAG,EAAE,IAC5E,CACE,GAAG,EAAE,gBAAgB,CAAC,SAAS,CAAC,EAChC,GAAG,EAAE,UAAU,CAAC,SAAS,CAAC,EAC1B,GAAG,EAAE,WAAW,KACb,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG;IAExB;;OAEG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,EAAE,UAAU,CAAA;IAErB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,GAAG,OAAO,EAAE,CAAC;IAEjC;;OAEG;IACH,QAAQ,CAAC,EAAE,qBAAqB,EAAE,CAAA;IAElC;;OAEG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,GAAG,OAAO,CAAA;IAErC;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAChE,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;AACjE,MAAM,MAAM,wBAAwB,GAAG,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;AAEnE,MAAM,MAAM,mBAAmB,GAAG;IAChC,CAAC,EAAE,EAAE,UAAU,GAAG,WAAW,CAAC;IAC9B,CAAC,MAAM,EAAE,oBAAoB,EAAE,EAAE,EAAE,UAAU,GAAG,WAAW,CAAC;CAC7D,CAAA;AAED,eAAO,MAAM,uBAAuB,eAAgB,OAAO,CAAC,WAAW,CAAC;KACpD,SAAS,SAAS,SAAS,qBAAqB,EAAE,UAC1D,wBAAwB,GAAG;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,MACtD,UAAU,CAAC,SAAS,CAAC,GACxB,WAAW;SAGR,UAAU,GACb,WAAW;CAkBf,CAAC"}
@@ -0,0 +1,16 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.makeAPIListenerFunction = void 0;
4
+ const makeAPIListenerFunction = (baseParams) => {
5
+ function listener(arg1, arg2) {
6
+ if (typeof arg1 === "function") {
7
+ return Object.assign({ listener: arg1 }, baseParams);
8
+ }
9
+ else {
10
+ return Object.assign(Object.assign({ listener: arg2 }, arg1), baseParams);
11
+ }
12
+ }
13
+ return listener;
14
+ };
15
+ exports.makeAPIListenerFunction = makeAPIListenerFunction;
16
+ //# sourceMappingURL=APIListener.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"APIListener.js","sourceRoot":"","sources":["../../src/lib/APIListener.ts"],"names":[],"mappings":";;;AAmEO,MAAM,uBAAuB,GAAG,CAAC,UAAgC,EAAE,EAAE;IAU1E,SAAS,QAAQ,CAAC,IAAS,EAAE,IAAU;QACrC,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,uBACE,QAAQ,EAAE,IAAI,IACX,UAAU,EACb;QACJ,CAAC;aAAM,CAAC;YACN,qCACE,QAAQ,EAAE,IAAK,IACZ,IAAI,GACJ,UAAU,EACb;QACJ,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AA1BW,QAAA,uBAAuB,2BA0BlC"}
@@ -1,10 +1,9 @@
1
1
  import DFWCore from "./DFWCore";
2
- import { APIListenerParams, APIListenerFunction } from "../types/APIListener";
2
+ import { APIListener } from "./APIListener";
3
3
  export default class APIManager {
4
4
  private DFW;
5
5
  constructor(DFW: DFWCore);
6
6
  installAPILAyer(): void;
7
- installSecurityLayer(): void;
8
- addListener(path: string, params?: APIListenerParams, listener?: APIListenerFunction): void;
7
+ addListener(path: string, params: APIListener): void;
9
8
  }
10
9
  //# sourceMappingURL=APIManager.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"APIManager.d.ts","sourceRoot":"","sources":["../../src/lib/APIManager.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,WAAW,CAAC;AAGhC,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAW9E,MAAM,CAAC,OAAO,OAAO,UAAU;IAC3B,OAAO,CAAC,GAAG,CAAS;gBAER,GAAG,EAAE,OAAO;IAIjB,eAAe;IAwEf,oBAAoB;IAIpB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,iBAAsB,EAAE,QAAQ,CAAC,EAAE,mBAAmB;CA8DlG"}
1
+ {"version":3,"file":"APIManager.d.ts","sourceRoot":"","sources":["../../src/lib/APIManager.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,WAAW,CAAC;AAYhC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,CAAC,OAAO,OAAO,UAAU;IAC3B,OAAO,CAAC,GAAG,CAAS;gBAER,GAAG,EAAE,OAAO;IAIjB,eAAe;IA6Df,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW;CA8DvD"}
@@ -16,7 +16,7 @@ const body_parser_1 = __importDefault(require("body-parser"));
16
16
  const DFWUtils_1 = __importDefault(require("./DFWUtils"));
17
17
  const chalk_1 = __importDefault(require("chalk"));
18
18
  const passport_1 = __importDefault(require("passport"));
19
- const DFWPassportStrategy_1 = __importDefault(require("./strategies/DFWPassportStrategy"));
19
+ const DFWPassportStrategy_1 = __importDefault(require("../strategies/DFWPassportStrategy"));
20
20
  const express_session_1 = __importDefault(require("express-session"));
21
21
  const DFWSessionStore_1 = __importDefault(require("./DFWSessionStore"));
22
22
  const express_fileupload_1 = __importDefault(require("express-fileupload"));
@@ -57,78 +57,57 @@ class APIManager {
57
57
  APIRouter.use(((req, res, next) => {
58
58
  const callbackStack = [];
59
59
  const dfw = {
60
- instance: this.DFW,
61
60
  db: this.DFW.db,
62
- isAuthenticated: () => req.isAuthenticated(),
63
- user: req.user,
64
- session: {
65
- login: (user) => __awaiter(this, void 0, void 0, function* () {
66
- return new Promise((resolve, reject) => {
67
- req.login(user, (err) => {
68
- if (err)
69
- return reject(err);
70
- req.session['passport'] = { user: user.id };
71
- req.dfw.user = user;
72
- resolve();
73
- });
74
- });
75
- }),
76
- logout: () => new Promise((resolve, reject) => {
77
- req.logout((err) => {
78
- if (err)
79
- return reject(err);
80
- req.session['passport'] = { user: undefined };
81
- req.dfw.user = undefined;
82
- resolve();
83
- });
84
- })
85
- },
61
+ getSession: () => ({
62
+ isAuthenticated: req.isAuthenticated(),
63
+ user: req.user
64
+ }),
86
65
  addCallback: (cb) => {
87
66
  callbackStack.push(cb);
88
67
  }
89
68
  };
90
69
  req.dfw = dfw;
70
+ res.error = (message, status = 500) => {
71
+ res.status(status);
72
+ throw message;
73
+ };
91
74
  res.on('finish', () => {
92
75
  callbackStack.forEach((cb) => cb());
93
76
  });
94
77
  next();
95
78
  }));
96
79
  }
97
- installSecurityLayer() {
98
- // Nothing to do here yet
99
- }
100
- addListener(path, params = {}, listener) {
80
+ addListener(path, params) {
101
81
  var _a;
102
82
  const server = this.DFW.server;
103
83
  const method = (_a = params.method) !== null && _a !== void 0 ? _a : 'get';
104
- if (!listener && !params.middleware) {
84
+ const fn = params.listener;
85
+ if (!params.middleware && !fn) {
105
86
  DFWUtils_1.default.log(`Unable to set listener for [${method}] ${path} listener and middleware are undefined`);
106
87
  return;
107
88
  }
108
- if (params.raw) {
109
- if (params.middleware)
110
- server[method](path, params.middleware);
111
- if (listener)
112
- server[method](path, listener);
113
- DFWUtils_1.default.log(`${chalk_1.default.yellow(method.toUpperCase().padEnd(7, ' '))} ${chalk_1.default.green(path)}`);
114
- return;
115
- }
116
89
  // Body Parser
117
- if (['post', 'put', 'patch'].includes(method) && params.disableBodyParser !== true)
90
+ if (['post', 'put', 'patch', 'delete'].includes(method) && params.disableBodyParser !== true)
118
91
  server[method](path, body_parser_1.default.json());
119
- // DFW middlewares
92
+ // DFW native middleware
120
93
  server[method](path, this.DFW.RouterAPILevel);
121
- server[method](path, this.DFW.RouterAccessLevel);
122
94
  // file upload middleware
123
95
  if (params.upload)
124
96
  server[method](path, (0, express_fileupload_1.default)(typeof params.upload === 'boolean' ? {} : params.upload));
125
97
  // plugged middlewares and handlers
126
98
  if (params.middleware)
127
99
  server[method](path, params.middleware);
128
- if (listener) {
100
+ if (fn) {
129
101
  server[method](path, (req, res, next) => __awaiter(this, void 0, void 0, function* () {
102
+ var _a;
130
103
  try {
131
- const data = yield listener(req, res);
104
+ // Setting up services
105
+ (_a = params.services) === null || _a === void 0 ? void 0 : _a.forEach((Service) => {
106
+ const serviceInstance = new Service(req.dfw);
107
+ req.dfw[serviceInstance.namespace] = serviceInstance;
108
+ });
109
+ // calling the listener
110
+ const data = yield fn(req.dfw, req, res);
132
111
  if (params.callback) {
133
112
  res.on('finish', () => params.callback(req, data));
134
113
  }
@@ -148,11 +127,12 @@ class APIManager {
148
127
  server.use(path, (err, _, res, next) => {
149
128
  if (process.env.NODE_ENV == "development")
150
129
  DFWUtils_1.default.log(err, true);
130
+ const errorStatus = res.statusCode === 200 ? 500 : res.statusCode;
151
131
  if (typeof err === "object" && err.message) {
152
- res.status(500).json({ error: err.message, stack: process.env.NODE_ENV == "development" ? err.stack : null }).end();
132
+ res.status(errorStatus).json({ error: err.message, stack: process.env.NODE_ENV == "development" ? err.stack : null }).end();
153
133
  }
154
134
  else {
155
- res.status(500).json({ error: err }).end();
135
+ res.status(errorStatus).json({ error: err }).end();
156
136
  }
157
137
  });
158
138
  DFWUtils_1.default.log(`${chalk_1.default.yellow(method.toUpperCase().padEnd(7, ' '))} ${chalk_1.default.green(path)}`);
@@ -1 +1 @@
1
- {"version":3,"file":"APIManager.js","sourceRoot":"","sources":["../../src/lib/APIManager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"APIManager.js","sourceRoot":"","sources":["../../src/lib/APIManager.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,18 @@
1
1
  import { PrismaClient } from "@prisma/client";
2
2
  import { Express, Router } from "express";
3
3
  import { DFWConfig } from "../types/DFWConfig";
4
- import { APIListener, APIListenerFunction, APIListenerParams } from "../types/APIListener";
5
- import { DFWRequest, DFWRequestSchema } from "../types/DFWRequest";
4
+ import { APIListener, ListenerFn } from "../lib/APIListener";
5
+ import { DFWRequestSchema } from "../types/DFWRequest";
6
6
  type DFWRegisterItem = APIListener | {
7
7
  [key: string]: DFWRegisterItem;
8
8
  } | DFWRegisterItem[];
9
9
  declare global {
10
10
  namespace Express {
11
11
  interface Request {
12
- dfw?: DFWRequestSchema;
12
+ dfw: DFWRequestSchema;
13
+ }
14
+ interface Response {
15
+ error: (message: any, status?: number) => void;
13
16
  }
14
17
  }
15
18
  }
@@ -19,23 +22,20 @@ export declare class DFWCore {
19
22
  static DFW_UPLOAD_DIR: string;
20
23
  readonly server: Express;
21
24
  readonly RouterAPILevel: Router;
22
- readonly RouterAccessLevel: Router;
23
25
  readonly tmpDir: string;
24
26
  readonly config: DFWConfig;
25
27
  private database;
26
28
  private APIManager;
27
29
  constructor(config: DFWConfig);
28
30
  start(): this;
29
- addListener(path: string, params: APIListenerParams, listener: APIListenerFunction): any;
30
- addListener(path: string, params: APIListenerParams): any;
31
- addListener(path: string, listener: APIListenerFunction): any;
32
- addAccessValidator(path: string, validator: (req: DFWRequest) => boolean | Promise<boolean>): void;
31
+ addListener(path: string, listener: APIListener): void;
32
+ addListener(path: string, fn: ListenerFn): void;
33
33
  /**
34
34
  * @param DFW
35
35
  * @param node
36
36
  * @param path
37
37
  */
38
- register(node: DFWRegisterItem | DFWRegisterItem[], path?: string): void;
38
+ register(node: DFWRegisterItem, path?: string): void;
39
39
  get db(): PrismaClient<import(".prisma/client").Prisma.PrismaClientOptions, never, import("@prisma/client/runtime/library").DefaultArgs>;
40
40
  }
41
41
  export default DFWCore;
@@ -1 +1 @@
1
- {"version":3,"file":"DFWCore.d.ts","sourceRoot":"","sources":["../../src/lib/DFWCore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,EAA4B,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAK3F,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAInE,KAAK,eAAe,GAAG,WAAW,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAA;CAAE,GAAG,eAAe,EAAE,CAAA;AAE3F,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,OAAO,CAAC;QACd,UAAiB,OAAO;YACpB,GAAG,CAAC,EAAE,gBAAgB,CAAA;SACzB;KACJ;CACJ;AAED,qBAAa,OAAO;IAEhB,OAAc,aAAa,EAAE,OAAO,CAAA;IAEpC,OAAc,OAAO,SAAW;IAChC,OAAc,cAAc,SAA8B;IAE1D,SAAgB,MAAM,EAAE,OAAO,CAAmB;IAClD,SAAgB,cAAc,EAAE,MAAM,CAAY;IAClD,SAAgB,iBAAiB,EAAE,MAAM,CAAY;IAErD,SAAgB,MAAM,EAAE,MAAM,CAAA;IAE9B,SAAgB,MAAM,EAAE,SAAS,CAAC;IAClC,OAAO,CAAC,QAAQ,CAAe;IAE/B,OAAO,CAAC,UAAU,CAAuB;gBAE7B,MAAM,EAAE,SAAS;IAqCtB,KAAK;IAQL,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,mBAAmB;IAClF,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB;IACnD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,mBAAmB;IAQvD,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAWlG;;;;OAIG;IACI,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,eAAe,EAAE,EAAE,IAAI,GAAE,MAAW;IAoB5E,IAAI,EAAE,mIAEL;CACJ;AAED,eAAe,OAAO,CAAC"}
1
+ {"version":3,"file":"DFWCore.d.ts","sourceRoot":"","sources":["../../src/lib/DFWCore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAqC,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAK7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAIvD,KAAK,eAAe,GAAG,WAAW,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAA;CAAE,GAAG,eAAe,EAAE,CAAA;AAE3F,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,OAAO,CAAC;QACd,UAAiB,OAAO;YACpB,GAAG,EAAE,gBAAgB,CAAA;SACxB;QAED,UAAiB,QAAQ;YACrB,KAAK,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;SACjD;KACJ;CACJ;AAED,qBAAa,OAAO;IAEhB,OAAc,aAAa,EAAE,OAAO,CAAA;IAEpC,OAAc,OAAO,SAAW;IAChC,OAAc,cAAc,SAA8B;IAE1D,SAAgB,MAAM,EAAE,OAAO,CAAmB;IAClD,SAAgB,cAAc,EAAE,MAAM,CAAY;IAElD,SAAgB,MAAM,EAAE,MAAM,CAAA;IAE9B,SAAgB,MAAM,EAAE,SAAS,CAAC;IAClC,OAAO,CAAC,QAAQ,CAAe;IAE/B,OAAO,CAAC,UAAU,CAAuB;gBAE7B,MAAM,EAAE,SAAS;IAoCtB,KAAK;IAQL,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,GAAG,IAAI;IACtD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,IAAI;IAStD;;;;OAIG;IACI,QAAQ,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,GAAE,MAAW;IAcxD,IAAI,EAAE,mIAEL;CACJ;AAED,eAAe,OAAO,CAAC"}
@@ -32,15 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
32
32
  return result;
33
33
  };
34
34
  })();
35
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
36
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
37
- return new (P || (P = Promise))(function (resolve, reject) {
38
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
39
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
40
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
41
- step((generator = generator.apply(thisArg, _arguments || [])).next());
42
- });
43
- };
44
35
  var __importDefault = (this && this.__importDefault) || function (mod) {
45
36
  return (mod && mod.__esModule) ? mod : { "default": mod };
46
37
  };
@@ -59,10 +50,11 @@ class DFWCore {
59
50
  var _a, _b, _c, _d, _e, _f;
60
51
  this.server = (0, express_1.default)();
61
52
  this.RouterAPILevel = (0, express_1.Router)();
62
- this.RouterAccessLevel = (0, express_1.Router)();
63
53
  this.APIManager = new APIManager_1.default(this);
64
54
  this.config = Object.freeze(config);
65
- this.tmpDir = (_b = (_a = config.server) === null || _a === void 0 ? void 0 : _a.tmpDir) !== null && _b !== void 0 ? _b : '.dfw/temp';
55
+ this.tmpDir = (_b = (_a = config.server) === null || _a === void 0 ? void 0 : _a.tmpDir) !== null && _b !== void 0 ? _b : `${DFWCore.DFW_DIR}/temp`;
56
+ if (!fs_1.default.existsSync(this.tmpDir))
57
+ fs_1.default.mkdirSync(DFWCore.DFW_DIR);
66
58
  if (fs_1.default.existsSync(this.tmpDir)) {
67
59
  fs_1.default.rmSync(this.tmpDir, { recursive: true });
68
60
  fs_1.default.mkdirSync(this.tmpDir);
@@ -74,9 +66,7 @@ class DFWCore {
74
66
  this.database = ((_c = config.server) === null || _c === void 0 ? void 0 : _c.prismaGenerathor) ?
75
67
  config.server.prismaGenerathor(this)
76
68
  :
77
- new client_1.PrismaClient({
78
- log: config.database ? config.database.log ? ['query', 'info', 'warn', 'error'] : undefined : undefined,
79
- });
69
+ new client_1.PrismaClient(config.prisma);
80
70
  if (fs_1.default.existsSync(DFWCore.DFW_DIR) == false) {
81
71
  fs_1.default.mkdirSync(DFWCore.DFW_DIR);
82
72
  }
@@ -87,7 +77,6 @@ class DFWCore {
87
77
  this.server.use((0, cors_1.default)(config.server.cors));
88
78
  }
89
79
  this.APIManager.installAPILAyer();
90
- this.APIManager.installSecurityLayer();
91
80
  DFWCore.MAIN_INSTANCE = this;
92
81
  }
93
82
  start() {
@@ -98,19 +87,13 @@ class DFWCore {
98
87
  });
99
88
  return this;
100
89
  }
101
- addListener(path, b, c) {
102
- const params = (typeof b == 'function' ? c : b);
103
- const listener = typeof b === 'function' ? b : c;
104
- this.APIManager.addListener(path, params, listener);
105
- }
106
- addAccessValidator(path, validator) {
107
- this.RouterAccessLevel.use(path, (req, res, next) => __awaiter(this, void 0, void 0, function* () {
108
- const isValid = yield Promise.resolve(validator(req));
109
- if (!isValid) {
110
- return res.status(403).json({ error: 'ACCESS_DENIED' }).end();
111
- }
112
- next();
113
- }));
90
+ addListener(path, b) {
91
+ if (typeof b === 'function') {
92
+ this.APIManager.addListener(path, { listener: b });
93
+ }
94
+ else {
95
+ this.APIManager.addListener(path, b);
96
+ }
114
97
  }
115
98
  /**
116
99
  * @param DFW
@@ -121,15 +104,7 @@ class DFWCore {
121
104
  if (Array.isArray(node)) {
122
105
  node.forEach((n) => { this.register(n, path); });
123
106
  }
124
- else if (!!node.listener || !!node.params) {
125
- if (node.listener) {
126
- this.addListener(path, node.params, node.listener);
127
- }
128
- else {
129
- this.addListener(path, node.params);
130
- }
131
- }
132
- else if (typeof node == "function") {
107
+ else if (!!node.listener || !!node.middleware) {
133
108
  this.addListener(path, node);
134
109
  }
135
110
  else if (typeof node == "object") {
@@ -1 +1 @@
1
- {"version":3,"file":"DFWCore.js","sourceRoot":"","sources":["../../src/lib/DFWCore.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA8C;AAC9C,mDAAoE;AAGpE,kDAA0B;AAC1B,4CAAmB;AACnB,0DAAkC;AAClC,8DAAsC;AAEtC,gDAAuB;AACvB,gDAA8B;AAY9B,MAAa,OAAO;IAkBhB,YAAY,MAAiB;;QAXb,WAAM,GAAY,IAAA,iBAAa,GAAE,CAAC;QAClC,mBAAc,GAAW,IAAA,gBAAM,GAAE,CAAC;QAClC,sBAAiB,GAAW,IAAA,gBAAM,GAAE,CAAC;QAO7C,eAAU,GAAG,IAAI,oBAAU,CAAC,IAAI,CAAC,CAAA;QAGrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QACnC,IAAI,CAAC,MAAM,GAAG,MAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,MAAM,mCAAI,WAAW,CAAA;QAElD,IAAI,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,YAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5C,YAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACJ,YAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,cAAU,CAAC,SAAS,CAAC,YAAE,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,cAAU,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAEtF,IAAI,CAAC,QAAQ,GAAG,CAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,gBAAgB,EAAC,CAAC;YAC7C,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC;YACpC,CAAC;gBACD,IAAI,qBAAY,CAAC;oBACb,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;iBAC1G,CAAC,CAAC;QAEP,IAAI,YAAE,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,EAAE,CAAC;YAC1C,YAAE,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;QAED,IAAI,MAAA,MAAM,CAAC,MAAM,0CAAE,UAAU;YAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,MAAA,MAAM,CAAC,MAAM,0CAAE,UAAU,CAAC,CAAA;QAExF,cAAc;QACd,IAAI,MAAA,MAAM,CAAC,MAAM,0CAAE,IAAI,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAA,cAAI,EAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;QAC7C,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,CAAA;QACjC,IAAI,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAA;QAEtC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAA;IAChC,CAAC;IAEM,KAAK;;QACR,MAAM,IAAI,GAAG,MAAA,MAAA,IAAI,CAAC,MAAM,CAAC,MAAM,0CAAE,IAAI,mCAAI,IAAI,CAAA;QAC7C,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;YAC1B,kBAAQ,CAAC,GAAG,CAAC,4BAA4B,eAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnE,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACf,CAAC;IAKM,WAAW,CAAC,IAAY,EAAE,CAA0C,EAAE,CAAuB;QAChG,MAAM,MAAM,GAAG,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAsB,CAAA;QACpE,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAwB,CAAA;QAEvE,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;IACvD,CAAC;IAEM,kBAAkB,CAAC,IAAY,EAAE,SAA0D;QAC9F,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACtD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAiB,CAAC,CAAC,CAAA;YACnE,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC,GAAG,EAAE,CAAA;YACjE,CAAC;YACD,IAAI,EAAE,CAAA;QACV,CAAC,CAAA,CAAC,CAAA;IACN,CAAC;IAGD;;;;OAIG;IACI,QAAQ,CAAC,IAAyC,EAAE,OAAe,EAAE;QACxE,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA;QACnD,CAAC;aAAM,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAC1C,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChB,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,MAA2B,EAAE,IAAI,CAAC,QAA+B,CAAC,CAAA;YAClG,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,MAA2B,CAAC,CAAA;YAC5D,CAAC;QACL,CAAC;aAAM,IAAI,OAAO,IAAI,IAAI,UAAU,EAAE,CAAC;YACnC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QAChC,CAAC;aAAM,IAAI,OAAO,IAAI,IAAI,QAAQ,EAAE,CAAC;YACjC,KAAK,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;gBACpB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC,CAAA;YAChD,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,kBAAQ,CAAC,GAAG,CAAC,uBAAuB,IAAI,KAAK,OAAO,IAAI,EAAE,EAAE,IAAI,CAAC,CAAA;QACrE,CAAC;IACL,CAAC;IAED,IAAI,EAAE;QACF,OAAO,IAAI,CAAC,QAAQ,CAAA;IACxB,CAAC;;AA/GL,0BAgHC;AA5GiB,eAAO,GAAG,QAAQ,AAAX,CAAW;AAClB,sBAAc,GAAG,GAAG,OAAO,CAAC,OAAO,SAAS,AAA9B,CAA8B;AA6G9D,kBAAe,OAAO,CAAC"}
1
+ {"version":3,"file":"DFWCore.js","sourceRoot":"","sources":["../../src/lib/DFWCore.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA8C;AAC9C,mDAA6E;AAG7E,kDAA0B;AAC1B,4CAAmB;AACnB,0DAAkC;AAClC,8DAAsC;AAEtC,gDAAuB;AACvB,gDAA8B;AAgB9B,MAAa,OAAO;IAiBhB,YAAY,MAAiB;;QAVb,WAAM,GAAY,IAAA,iBAAa,GAAE,CAAC;QAClC,mBAAc,GAAW,IAAA,gBAAM,GAAE,CAAC;QAO1C,eAAU,GAAG,IAAI,oBAAU,CAAC,IAAI,CAAC,CAAA;QAGrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QACnC,IAAI,CAAC,MAAM,GAAG,MAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,MAAM,mCAAI,GAAG,OAAO,CAAC,OAAO,OAAO,CAAA;QAEhE,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;YAAE,YAAE,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAE/D,IAAI,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,YAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5C,YAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACJ,YAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,cAAU,CAAC,SAAS,CAAC,YAAE,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,cAAU,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAEtF,IAAI,CAAC,QAAQ,GAAG,CAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,gBAAgB,EAAC,CAAC;YAC7C,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC;YACpC,CAAC;gBACD,IAAI,qBAAY,CAAC,MAAM,CAAC,MAAa,CAAC,CAAC;QAE3C,IAAI,YAAE,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,EAAE,CAAC;YAC1C,YAAE,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;QAED,IAAI,MAAA,MAAM,CAAC,MAAM,0CAAE,UAAU;YAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,MAAA,MAAM,CAAC,MAAM,0CAAE,UAAU,CAAC,CAAA;QAExF,cAAc;QACd,IAAI,MAAA,MAAM,CAAC,MAAM,0CAAE,IAAI,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAA,cAAI,EAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;QAC7C,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,CAAA;QAEjC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAA;IAChC,CAAC;IAEM,KAAK;;QACR,MAAM,IAAI,GAAG,MAAA,MAAA,IAAI,CAAC,MAAM,CAAC,MAAM,0CAAE,IAAI,mCAAI,IAAI,CAAA;QAC7C,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;YAC1B,kBAAQ,CAAC,GAAG,CAAC,4BAA4B,eAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnE,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACf,CAAC;IAIM,WAAW,CAAC,IAAY,EAAE,CAA2B;QACxD,IAAI,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC;YAC1B,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;QACvD,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACzC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACI,QAAQ,CAAC,IAAqB,EAAE,OAAe,EAAE;QACpD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA;QACnD,CAAC;aAAM,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAC9C,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QAChC,CAAC;aAAM,IAAI,OAAO,IAAI,IAAI,QAAQ,EAAE,CAAC;YACjC,KAAK,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;gBACpB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC,CAAA;YAChD,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,kBAAQ,CAAC,GAAG,CAAC,uBAAuB,IAAI,KAAK,OAAO,IAAI,EAAE,EAAE,IAAI,CAAC,CAAA;QACrE,CAAC;IACL,CAAC;IAED,IAAI,EAAE;QACF,OAAO,IAAI,CAAC,QAAQ,CAAA;IACxB,CAAC;;AA5FL,0BA6FC;AAzFiB,eAAO,GAAG,QAAQ,AAAX,CAAW;AAClB,sBAAc,GAAG,GAAG,OAAO,CAAC,OAAO,SAAS,AAA9B,CAA8B;AA0F9D,kBAAe,OAAO,CAAC"}
@@ -1,10 +1,17 @@
1
1
  import { PrismaClient } from "@prisma/client";
2
2
  import * as runtime from "@prisma/client/runtime/library";
3
3
  import { DFWCore } from "..";
4
- declare class DFWRepository {
4
+ type Constructor<T = any> = new (...args: any[]) => T;
5
+ export type ExtractRepositories<T extends Constructor[]> = {
6
+ [K in T[number] as K extends {
7
+ namespace: string;
8
+ } ? K['namespace'] : never]: InstanceType<K>;
9
+ };
10
+ declare class DFWModule {
5
11
  private _db;
6
12
  get db(): PrismaClient<import(".prisma/client").Prisma.PrismaClientOptions, never, runtime.DefaultArgs>;
7
13
  get DFW(): DFWCore;
14
+ constructor(db?: PrismaClient | Omit<PrismaClient, runtime.ITXClientDenyList>);
8
15
  /**
9
16
  *
10
17
  * @param db
@@ -13,5 +20,5 @@ declare class DFWRepository {
13
20
  use(db: PrismaClient | Omit<PrismaClient, runtime.ITXClientDenyList>): this;
14
21
  transaction: (cb: (tx: PrismaClient | Omit<PrismaClient, runtime.ITXClientDenyList>) => Promise<any>) => Promise<any>;
15
22
  }
16
- export default DFWRepository;
17
- //# sourceMappingURL=DFWRepository.d.ts.map
23
+ export default DFWModule;
24
+ //# sourceMappingURL=DFWModule.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"DFWModule.d.ts","sourceRoot":"","sources":["../../src/lib/DFWModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,KAAK,OAAO,MAAM,gCAAgC,CAAA;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAA;AAE5B,KAAK,WAAW,CAAC,CAAC,GAAG,GAAG,IAAI,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAEtD,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,WAAW,EAAE,IAAI;KACtD,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAG,CAAC,SAAS;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,GAC/C,CAAC,CAAC,WAAW,CAAC,GACd,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC;CAC5B,CAAC;AAEF,cAAM,SAAS;IACX,OAAO,CAAC,GAAG,CAAyC;IAEpD,IAAI,EAAE,kGAEL;IAED,IAAI,GAAG,YAEN;gBAEW,EAAE,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,iBAAiB,CAAC;IAM7E;;;;OAIG;IACI,GAAG,CACN,EAAE,EAAE,YAAY,GAAG,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,iBAAiB,CAAC,GACjE,IAAI;IAKA,WAAW,OACV,CACA,EAAE,EAAE,YAAY,GAAG,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,iBAAiB,CAAC,KAC/D,OAAO,CAAC,GAAG,CAAC,kBAOpB;CACJ;AAED,eAAe,SAAS,CAAA"}
@@ -10,8 +10,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  const __1 = require("..");
13
- class DFWRepository {
14
- constructor() {
13
+ class DFWModule {
14
+ get db() {
15
+ return this._db;
16
+ }
17
+ get DFW() {
18
+ return __1.DFWCore.MAIN_INSTANCE;
19
+ }
20
+ constructor(db) {
15
21
  this._db = __1.DFWCore.MAIN_INSTANCE.db;
16
22
  this.transaction = (cb) => __awaiter(this, void 0, void 0, function* () {
17
23
  if (this.db.$transaction) {
@@ -21,12 +27,9 @@ class DFWRepository {
21
27
  return cb(this.db);
22
28
  }
23
29
  });
24
- }
25
- get db() {
26
- return this._db;
27
- }
28
- get DFW() {
29
- return __1.DFWCore.MAIN_INSTANCE;
30
+ if (db) {
31
+ this.use(db);
32
+ }
30
33
  }
31
34
  /**
32
35
  *
@@ -38,5 +41,5 @@ class DFWRepository {
38
41
  return this;
39
42
  }
40
43
  }
41
- exports.default = DFWRepository;
42
- //# sourceMappingURL=DFWRepository.js.map
44
+ exports.default = DFWModule;
45
+ //# sourceMappingURL=DFWModule.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"DFWModule.js","sourceRoot":"","sources":["../../src/lib/DFWModule.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,0BAA4B;AAU5B,MAAM,SAAS;IAGX,IAAI,EAAE;QACF,OAAO,IAAI,CAAC,GAAG,CAAA;IACnB,CAAC;IAED,IAAI,GAAG;QACH,OAAO,WAAO,CAAC,aAAa,CAAA;IAChC,CAAC;IAED,YAAY,EAAiE;QAVrE,QAAG,GAAiB,WAAO,CAAC,aAAa,CAAC,EAAE,CAAA;QA4B7C,gBAAW,GAAG,CACjB,EAEiB,EACnB,EAAE;YACA,IAAI,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC;gBACvB,OAAO,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;YACnC,CAAC;iBAAM,CAAC;gBACJ,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACtB,CAAC;QACL,CAAC,CAAA,CAAA;QA3BG,IAAI,EAAE,EAAE,CAAC;YACL,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAChB,CAAC;IACL,CAAC;IAED;;;;OAIG;IACI,GAAG,CACN,EAAgE;QAEhE,IAAI,CAAC,GAAG,GAAG,EAAkB,CAAA;QAC7B,OAAO,IAAI,CAAA;IACf,CAAC;CAaJ;AAED,kBAAe,SAAS,CAAA"}
@@ -0,0 +1,16 @@
1
+ import { PrismaClient } from "@prisma/client";
2
+ import { DFWRequestSchema } from "../types";
3
+ export type DFWServiceConstructor = new (dfw: any) => DFWService;
4
+ export type InferServiceInstance<T extends DFWServiceConstructor> = T extends new () => infer R ? R : never;
5
+ export type MapServiceConstructors<T extends readonly DFWServiceConstructor[]> = {
6
+ [K in keyof T as T[K] extends DFWServiceConstructor ? InstanceType<T[K]>['namespace'] : never]: T[K] extends DFWServiceConstructor ? InstanceType<T[K]> : never;
7
+ };
8
+ export default abstract class DFWService {
9
+ abstract readonly namespace: string;
10
+ protected readonly db: PrismaClient;
11
+ protected readonly user?: {
12
+ id: string;
13
+ };
14
+ constructor(dfw: DFWRequestSchema);
15
+ }
16
+ //# sourceMappingURL=DFWService.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"DFWService.d.ts","sourceRoot":"","sources":["../../src/lib/DFWService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAG5C,MAAM,MAAM,qBAAqB,GAAG,KAAK,GAAG,EAAE,GAAG,KAAK,UAAU,CAAC;AAEjE,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,qBAAqB,IAC9D,CAAC,SAAS,UAAU,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAE1C,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,SAAS,qBAAqB,EAAE,IAAI;KAC9E,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,qBAAqB,GACjD,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,GAC/B,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,qBAAqB,GAC1C,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAClB,KAAK;CACR,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,UAAU;IACtC,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAEpC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAA;IACnC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAA;gBAE5B,GAAG,EAAE,gBAAgB;CAIlC"}
@@ -0,0 +1,10 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ class DFWService {
4
+ constructor(dfw) {
5
+ this.db = dfw.db;
6
+ this.user = dfw.getSession().user;
7
+ }
8
+ }
9
+ exports.default = DFWService;
10
+ //# sourceMappingURL=DFWService.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"DFWService.js","sourceRoot":"","sources":["../../src/lib/DFWService.ts"],"names":[],"mappings":";;AAiBA,MAA8B,UAAU;IAMtC,YAAY,GAAqB;QAC/B,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC;IACpC,CAAC;CACF;AAVD,6BAUC"}
@@ -26,7 +26,7 @@ export default class DFWUtils {
26
26
  */
27
27
  static uuid(): string;
28
28
  static cuid(): string;
29
- static verifyPassword(encoded: string, test: string): Promise<boolean>;
30
- static encryptPassword(password: string): Promise<string>;
29
+ static verifyPasswordAsync(encoded: string, test: string): Promise<boolean>;
30
+ static encryptPasswordAsync(password: string): Promise<string>;
31
31
  }
32
32
  //# sourceMappingURL=DFWUtils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"DFWUtils.d.ts","sourceRoot":"","sources":["../../src/lib/DFWUtils.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,OAAO,OAAO,QAAQ;IAEzB,gBAAuB,WAAW,SAA6J;WAEjL,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;WAI/B,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe;IAQ3D;;;OAGG;WACiB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D;;;OAGG;WACW,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAK1D;;;OAGG;WACW,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAI5D;;OAEG;WACW,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAY1D;;OAEG;WACW,IAAI,IAAI,MAAM;WAId,IAAI,IAAI,MAAM;WAIR,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;WAS/D,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAOzE"}
1
+ {"version":3,"file":"DFWUtils.d.ts","sourceRoot":"","sources":["../../src/lib/DFWUtils.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,OAAO,OAAO,QAAQ;IAEzB,gBAAuB,WAAW,SAA6J;WAEjL,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;WAI/B,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe;IAQ3D;;;OAGG;WACiB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D;;;OAGG;WACW,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAK1D;;;OAGG;WACW,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAI5D;;OAEG;WACW,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAY1D;;OAEG;WACW,IAAI,IAAI,MAAM;WAId,IAAI,IAAI,MAAM;WAIR,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;WASpE,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAO9E"}