@conduitplatform/grpc-sdk 0.14.7 → 0.15.0-rc.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.
Files changed (151) hide show
  1. package/dist/classes/ConduitActiveSchema.d.ts +12 -12
  2. package/dist/classes/ConduitActiveSchema.js +2 -2
  3. package/dist/classes/ConduitActiveSchema.js.map +1 -1
  4. package/dist/classes/ConduitModule.js.map +1 -1
  5. package/dist/classes/ConduitParser.d.ts +5 -2
  6. package/dist/classes/ConduitParser.js +8 -5
  7. package/dist/classes/ConduitParser.js.map +1 -1
  8. package/dist/classes/ConduitSchema.d.ts +3 -4
  9. package/dist/classes/ConduitSchema.js +2 -9
  10. package/dist/classes/ConduitSchema.js.map +1 -1
  11. package/dist/classes/HealthCheck.js +2 -3
  12. package/dist/classes/HealthCheck.js.map +1 -1
  13. package/dist/classes/ManagedModule.d.ts +10 -4
  14. package/dist/classes/ManagedModule.js +30 -17
  15. package/dist/classes/ManagedModule.js.map +1 -1
  16. package/dist/classes/ModuleManager.d.ts +0 -1
  17. package/dist/classes/ModuleManager.js +24 -27
  18. package/dist/classes/ModuleManager.js.map +1 -1
  19. package/dist/classes/index.d.ts +0 -7
  20. package/dist/classes/index.js +0 -7
  21. package/dist/classes/index.js.map +1 -1
  22. package/dist/helpers/index.d.ts +0 -2
  23. package/dist/helpers/index.js +0 -2
  24. package/dist/helpers/index.js.map +1 -1
  25. package/dist/helpers/wrapGrpcFunctions.js +12 -3
  26. package/dist/helpers/wrapGrpcFunctions.js.map +1 -1
  27. package/dist/index.d.ts +3 -5
  28. package/dist/index.js +16 -48
  29. package/dist/index.js.map +1 -1
  30. package/dist/interfaces/ConduitSchemaExtension.d.ts +5 -0
  31. package/dist/interfaces/ConduitSchemaExtension.js +3 -0
  32. package/dist/interfaces/ConduitSchemaExtension.js.map +1 -0
  33. package/dist/interfaces/Indexable.d.ts +1 -0
  34. package/dist/interfaces/Model.d.ts +1 -1
  35. package/dist/interfaces/index.d.ts +1 -3
  36. package/dist/interfaces/index.js +1 -3
  37. package/dist/interfaces/index.js.map +1 -1
  38. package/dist/metrics/MetricsServer.d.ts +1 -2
  39. package/dist/metrics/MetricsServer.js +0 -11
  40. package/dist/metrics/MetricsServer.js.map +1 -1
  41. package/dist/metrics/clientMiddleware.d.ts +2 -0
  42. package/dist/metrics/clientMiddleware.js +265 -0
  43. package/dist/metrics/clientMiddleware.js.map +1 -0
  44. package/dist/metrics/index.d.ts +3 -0
  45. package/dist/metrics/index.js +55 -3
  46. package/dist/metrics/index.js.map +1 -1
  47. package/dist/modules/admin/index.d.ts +3 -9
  48. package/dist/modules/admin/index.js +1 -92
  49. package/dist/modules/admin/index.js.map +1 -1
  50. package/dist/modules/authorization/index.d.ts +13 -0
  51. package/dist/modules/authorization/index.js +53 -0
  52. package/dist/modules/authorization/index.js.map +1 -0
  53. package/dist/modules/config/index.d.ts +1 -3
  54. package/dist/modules/config/index.js +2 -19
  55. package/dist/modules/config/index.js.map +1 -1
  56. package/dist/modules/database/index.d.ts +27 -18
  57. package/dist/modules/database/index.js +23 -25
  58. package/dist/modules/database/index.js.map +1 -1
  59. package/dist/modules/index.d.ts +2 -0
  60. package/dist/modules/index.js +2 -0
  61. package/dist/modules/index.js.map +1 -1
  62. package/dist/modules/router/index.d.ts +2 -2
  63. package/dist/modules/router/index.js.map +1 -1
  64. package/dist/protoUtils/authentication.d.ts +1 -1
  65. package/dist/protoUtils/authentication.js +4 -4
  66. package/dist/protoUtils/authentication.js.map +1 -1
  67. package/dist/protoUtils/authorization.d.ts +293 -0
  68. package/dist/protoUtils/authorization.js +727 -0
  69. package/dist/protoUtils/authorization.js.map +1 -0
  70. package/dist/protoUtils/core.d.ts +1 -40
  71. package/dist/protoUtils/core.js +15 -21
  72. package/dist/protoUtils/core.js.map +1 -1
  73. package/dist/protoUtils/database.d.ts +28 -64
  74. package/dist/protoUtils/database.js +69 -209
  75. package/dist/protoUtils/database.js.map +1 -1
  76. package/dist/protoUtils/email.js +2 -2
  77. package/dist/protoUtils/email.js.map +1 -1
  78. package/dist/{classes → routing}/ConduitRouteReturn.d.ts +1 -1
  79. package/dist/{classes → routing}/ConduitRouteReturn.js +9 -1
  80. package/dist/routing/ConduitRouteReturn.js.map +1 -0
  81. package/dist/{classes/Routing → routing}/RouteBuilder.d.ts +5 -8
  82. package/dist/{classes/Routing → routing}/RouteBuilder.js +1 -1
  83. package/dist/routing/RouteBuilder.js.map +1 -0
  84. package/dist/routing/RoutingJsonConstructor.d.ts +3 -0
  85. package/dist/routing/RoutingJsonConstructor.js +29 -0
  86. package/dist/routing/RoutingJsonConstructor.js.map +1 -0
  87. package/dist/{classes/Routing → routing}/RoutingManager.d.ts +11 -6
  88. package/dist/{classes/Routing → routing}/RoutingManager.js +43 -58
  89. package/dist/routing/RoutingManager.js.map +1 -0
  90. package/dist/routing/RoutingUtilities.d.ts +15 -0
  91. package/dist/{helpers → routing}/RoutingUtilities.js +14 -10
  92. package/dist/routing/RoutingUtilities.js.map +1 -0
  93. package/dist/routing/index.d.ts +7 -0
  94. package/dist/routing/index.js +24 -0
  95. package/dist/routing/index.js.map +1 -0
  96. package/dist/routing/interfaces/ConduitMiddleware.d.ts +11 -0
  97. package/dist/routing/interfaces/ConduitMiddleware.js +3 -0
  98. package/dist/routing/interfaces/ConduitMiddleware.js.map +1 -0
  99. package/dist/routing/interfaces/ConduitRoute.d.ts +8 -0
  100. package/dist/routing/interfaces/ConduitRoute.js +3 -0
  101. package/dist/routing/interfaces/ConduitRoute.js.map +1 -0
  102. package/dist/routing/interfaces/ConduitSocket.d.ts +5 -0
  103. package/dist/routing/interfaces/ConduitSocket.js +3 -0
  104. package/dist/routing/interfaces/ConduitSocket.js.map +1 -0
  105. package/dist/{interfaces → routing/interfaces}/Route.d.ts +7 -4
  106. package/dist/{interfaces → routing/interfaces}/Route.js +0 -0
  107. package/dist/routing/interfaces/Route.js.map +1 -0
  108. package/dist/{interfaces → routing/interfaces}/Socket.d.ts +3 -3
  109. package/dist/{interfaces/Middleware.js → routing/interfaces/Socket.js} +1 -1
  110. package/dist/routing/interfaces/Socket.js.map +1 -0
  111. package/dist/routing/interfaces/index.d.ts +6 -0
  112. package/dist/routing/interfaces/index.js +23 -0
  113. package/dist/routing/interfaces/index.js.map +1 -0
  114. package/dist/routing/interfaces/types.d.ts +32 -0
  115. package/dist/routing/interfaces/types.js +3 -0
  116. package/dist/routing/interfaces/types.js.map +1 -0
  117. package/dist/{helpers → routing}/wrapRouterFunctions.d.ts +1 -2
  118. package/dist/{helpers → routing}/wrapRouterFunctions.js +2 -12
  119. package/dist/routing/wrapRouterFunctions.js.map +1 -0
  120. package/dist/types/db.d.ts +24 -0
  121. package/dist/types/db.js +3 -0
  122. package/dist/types/db.js.map +1 -0
  123. package/dist/types/index.d.ts +0 -29
  124. package/dist/types/index.js.map +1 -1
  125. package/package.json +2 -2
  126. package/dist/classes/ConduitMiddleware.d.ts +0 -8
  127. package/dist/classes/ConduitMiddleware.js +0 -26
  128. package/dist/classes/ConduitMiddleware.js.map +0 -1
  129. package/dist/classes/ConduitRoute.d.ts +0 -12
  130. package/dist/classes/ConduitRoute.js +0 -44
  131. package/dist/classes/ConduitRoute.js.map +0 -1
  132. package/dist/classes/ConduitRouteReturn.js.map +0 -1
  133. package/dist/classes/ConduitSchemaExtension.d.ts +0 -7
  134. package/dist/classes/ConduitSchemaExtension.js +0 -19
  135. package/dist/classes/ConduitSchemaExtension.js.map +0 -1
  136. package/dist/classes/ConduitSocket.d.ts +0 -9
  137. package/dist/classes/ConduitSocket.js +0 -27
  138. package/dist/classes/ConduitSocket.js.map +0 -1
  139. package/dist/classes/Routing/RouteBuilder.js.map +0 -1
  140. package/dist/classes/Routing/RoutingManager.js.map +0 -1
  141. package/dist/helpers/RoutingJsonConstructor.d.ts +0 -9
  142. package/dist/helpers/RoutingJsonConstructor.js +0 -89
  143. package/dist/helpers/RoutingJsonConstructor.js.map +0 -1
  144. package/dist/helpers/RoutingUtilities.d.ts +0 -13
  145. package/dist/helpers/RoutingUtilities.js.map +0 -1
  146. package/dist/helpers/wrapRouterFunctions.js.map +0 -1
  147. package/dist/interfaces/Middleware.d.ts +0 -7
  148. package/dist/interfaces/Middleware.js.map +0 -1
  149. package/dist/interfaces/Route.js.map +0 -1
  150. package/dist/interfaces/Socket.js +0 -9
  151. package/dist/interfaces/Socket.js.map +0 -1
@@ -1,19 +1,19 @@
1
- import { ConduitModel, ConduitModelOptions } from '../interfaces';
1
+ import { ConduitModel, ConduitSchemaOptions } from '../interfaces';
2
2
  import { ConduitSchema } from './ConduitSchema';
3
3
  import { DatabaseProvider } from '../modules';
4
- import { Query } from '../interfaces';
4
+ import { Query } from '../types/db';
5
5
  export declare class ConduitActiveSchema<T> extends ConduitSchema {
6
6
  private readonly dbInstance;
7
- constructor(dbInstance: DatabaseProvider, name: string, fields?: ConduitModel, schemaOptions?: ConduitModelOptions, collectionName?: string);
8
- findOne(query: Query, select?: string, populate?: string | string[]): Promise<T | null>;
9
- findMany(query: Query, select?: string, skip?: number, limit?: number, sort?: {
7
+ constructor(dbInstance: DatabaseProvider, name: string, fields?: ConduitModel, modelOptions?: ConduitSchemaOptions, collectionName?: string);
8
+ findOne(query: Query<T>, select?: string, populate?: string | string[]): Promise<T | null>;
9
+ findMany(query: Query<T>, select?: string, skip?: number, limit?: number, sort?: {
10
10
  [key: string]: number;
11
11
  } | string[], populate?: string | string[]): Promise<T[]>;
12
- create(query: Query): Promise<T>;
13
- createMany(query: Query): Promise<T[]>;
14
- findByIdAndUpdate(id: string, document: Query, updateProvidedOnly?: boolean, populate?: string | string[]): Promise<T | null>;
15
- updateMany(filterQuery: Query, query: Query, updateProvidedOnly?: boolean): Promise<any>;
16
- deleteOne(query: Query): Promise<any>;
17
- deleteMany(query: Query): Promise<any>;
18
- countDocuments(query: Query): Promise<number>;
12
+ create(query: Query<T>): Promise<T>;
13
+ createMany(query: Query<T>): Promise<T[]>;
14
+ findByIdAndUpdate(id: string, document: Query<T>, updateProvidedOnly?: boolean, populate?: string | string[]): Promise<T | null>;
15
+ updateMany(filterQuery: Query<T>, query: Query<T>, updateProvidedOnly?: boolean): Promise<any>;
16
+ deleteOne(query: Query<T>): Promise<any>;
17
+ deleteMany(query: Query<T>): Promise<any>;
18
+ countDocuments(query: Query<T>): Promise<number>;
19
19
  }
@@ -19,8 +19,8 @@ exports.ConduitActiveSchema = void 0;
19
19
  var ConduitSchema_1 = require("./ConduitSchema");
20
20
  var ConduitActiveSchema = /** @class */ (function (_super) {
21
21
  __extends(ConduitActiveSchema, _super);
22
- function ConduitActiveSchema(dbInstance, name, fields, schemaOptions, collectionName) {
23
- var _this = _super.call(this, name, fields !== null && fields !== void 0 ? fields : {}, schemaOptions, collectionName) || this;
22
+ function ConduitActiveSchema(dbInstance, name, fields, modelOptions, collectionName) {
23
+ var _this = _super.call(this, name, fields !== null && fields !== void 0 ? fields : {}, modelOptions, collectionName) || this;
24
24
  _this.dbInstance = dbInstance;
25
25
  return _this;
26
26
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ConduitActiveSchema.js","sourceRoot":"","sources":["../../src/classes/ConduitActiveSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AACA,iDAAgD;AAIhD;IAA4C,uCAAa;IAGvD,6BACE,UAA4B,EAC5B,IAAY,EACZ,MAAqB,EACrB,aAAmC,EACnC,cAAuB;QALzB,YAOE,kBAAM,IAAI,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,EAAE,aAAa,EAAE,cAAc,CAAC,SAEzD;QADC,KAAI,CAAC,UAAU,GAAG,UAAU,CAAC;;IAC/B,CAAC;IAED,qCAAO,GAAP,UACE,KAAY,EACZ,MAAe,EACf,QAA4B;QAE5B,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACxE,CAAC;IAED,sCAAQ,GAAR,UACE,KAAY,EACZ,MAAe,EACf,IAAa,EACb,KAAc,EACd,IAA2C,EAC3C,QAA4B;QAE5B,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAC7B,IAAI,CAAC,IAAI,EACT,KAAK,EACL,MAAM,EACN,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,oCAAM,GAAN,UAAO,KAAY;QACjB,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAI,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACrD,CAAC;IAED,wCAAU,GAAV,UAAW,KAAY;QACrB,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAI,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACzD,CAAC;IAED,+CAAiB,GAAjB,UACE,EAAU,EACV,QAAe,EACf,kBAA4B,EAC5B,QAA4B;QAE5B,OAAO,IAAI,CAAC,UAAU,CAAC,iBAAiB,CACtC,IAAI,CAAC,IAAI,EACT,EAAE,EACF,QAAQ,EACR,kBAAkB,EAClB,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,wCAAU,GAAV,UAAW,WAAkB,EAAE,KAAY,EAAE,kBAA4B;QACvE,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,kBAAkB,CAAC,CAAC;IACvF,CAAC;IAED,uCAAS,GAAT,UAAU,KAAY;QACpB,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACrD,CAAC;IAED,wCAAU,GAAV,UAAW,KAAY;QACrB,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC;IAED,4CAAc,GAAd,UAAe,KAAY;QACzB,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC1D,CAAC;IACH,0BAAC;AAAD,CAAC,AA/ED,CAA4C,6BAAa,GA+ExD;AA/EY,kDAAmB"}
1
+ {"version":3,"file":"ConduitActiveSchema.js","sourceRoot":"","sources":["../../src/classes/ConduitActiveSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AACA,iDAAgD;AAIhD;IAA4C,uCAAa;IAGvD,6BACE,UAA4B,EAC5B,IAAY,EACZ,MAAqB,EACrB,YAAmC,EACnC,cAAuB;QALzB,YAOE,kBAAM,IAAI,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,EAAE,YAAY,EAAE,cAAc,CAAC,SAExD;QADC,KAAI,CAAC,UAAU,GAAG,UAAU,CAAC;;IAC/B,CAAC;IAED,qCAAO,GAAP,UACE,KAAe,EACf,MAAe,EACf,QAA4B;QAE5B,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACxE,CAAC;IAED,sCAAQ,GAAR,UACE,KAAe,EACf,MAAe,EACf,IAAa,EACb,KAAc,EACd,IAA2C,EAC3C,QAA4B;QAE5B,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAC7B,IAAI,CAAC,IAAI,EACT,KAAK,EACL,MAAM,EACN,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,oCAAM,GAAN,UAAO,KAAe;QACpB,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAI,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACrD,CAAC;IAED,wCAAU,GAAV,UAAW,KAAe;QACxB,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAI,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACzD,CAAC;IAED,+CAAiB,GAAjB,UACE,EAAU,EACV,QAAkB,EAClB,kBAA4B,EAC5B,QAA4B;QAE5B,OAAO,IAAI,CAAC,UAAU,CAAC,iBAAiB,CACtC,IAAI,CAAC,IAAI,EACT,EAAE,EACF,QAAQ,EACR,kBAAkB,EAClB,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,wCAAU,GAAV,UAAW,WAAqB,EAAE,KAAe,EAAE,kBAA4B;QAC7E,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,kBAAkB,CAAC,CAAC;IACvF,CAAC;IAED,uCAAS,GAAT,UAAU,KAAe;QACvB,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACrD,CAAC;IAED,wCAAU,GAAV,UAAW,KAAe;QACxB,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC;IAED,4CAAc,GAAd,UAAe,KAAe;QAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC1D,CAAC;IACH,0BAAC;AAAD,CAAC,AA/ED,CAA4C,6BAAa,GA+ExD;AA/EY,kDAAmB"}
@@ -1 +1 @@
1
- {"version":3,"file":"ConduitModule.js","sourceRoot":"","sources":["../../src/classes/ConduitModule.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ConduitModule.js","sourceRoot":"","sources":["../../src/classes/ConduitModule.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,10 @@
1
- import { Array, ConduitModel, ConduitRouteOption, TYPE } from '../interfaces';
1
+ import { Array, ConduitModel, TYPE } from '../interfaces';
2
+ import { ConduitRouteOption } from '../routing';
2
3
  export declare abstract class ConduitParser<ParseResult, ProcessingObject> {
3
4
  result: ParseResult;
4
5
  isInput: boolean;
6
+ readonly knownTypes: Set<string>;
7
+ readonly requestedTypes: Set<string>;
5
8
  abstract extractTypes(name: string, fields: ConduitModel | ConduitRouteOption | string, isInput: boolean): ParseResult;
6
9
  protected abstract getType(conduitType: TYPE): string | {
7
10
  type?: string;
@@ -12,7 +15,7 @@ export declare abstract class ConduitParser<ParseResult, ProcessingObject> {
12
15
  protected abstract getInitializedResult(): ParseResult;
13
16
  protected abstract getProcessingObject(name: string, isArray: boolean): ProcessingObject;
14
17
  protected abstract finalizeProcessingObject(object: ProcessingObject): ProcessingObject;
15
- protected abstract getResultFromString(processingObject: ProcessingObject, name: string, value: any, isRequired: boolean, isArray: boolean): void;
18
+ protected abstract getResultFromString(processingObject: ProcessingObject, name: string, value: any, isRequired: boolean, isArray: boolean, parentField: string): void;
16
19
  protected abstract getResultFromObject(processingObject: ProcessingObject, name: string, fieldName: string, value: any, isRequired: boolean, isArray: boolean): void;
17
20
  protected abstract getResultFromArray(processingObject: ProcessingObject, resolverName: string, name: string, value: any[], isRequired: boolean, nestedType?: boolean): void;
18
21
  protected abstract getResultFromRelation(processingObject: ProcessingObject, resolverName: string, name: string, value: any, isRequired: boolean, isArray: boolean): void;
@@ -1,13 +1,16 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ConduitParser = void 0;
4
+ var baseTypes = ['String', 'Number', 'Boolean', 'Date', 'ObjectId', 'JSON'];
4
5
  var ConduitParser = /** @class */ (function () {
5
6
  function ConduitParser() {
7
+ this.knownTypes = new Set();
8
+ this.requestedTypes = new Set();
6
9
  }
7
10
  ConduitParser.prototype.extractTypesInternal = function (name, fields) {
8
11
  var processingObject = this.getProcessingObject(name, false);
9
12
  if (typeof fields === 'string') {
10
- this.getResultFromString(processingObject, 'result', fields, false, false);
13
+ this.getResultFromString(processingObject, baseTypes.includes(fields) ? 'result' : name, fields, false, false, name);
11
14
  }
12
15
  else {
13
16
  for (var field in fields) {
@@ -15,7 +18,7 @@ var ConduitParser = /** @class */ (function () {
15
18
  continue;
16
19
  // if field is simply a type
17
20
  if (typeof fields[field] === 'string') {
18
- this.getResultFromString(processingObject, field, fields[field], false, false);
21
+ this.getResultFromString(processingObject, field, fields[field], false, false, name);
19
22
  }
20
23
  // if field is an array
21
24
  else if (Array.isArray(fields[field])) {
@@ -30,7 +33,7 @@ var ConduitParser = /** @class */ (function () {
30
33
  this.getResultFromRelation(processingObject, name, field, fields[field].model, fields[field].required, false);
31
34
  }
32
35
  else {
33
- this.getResultFromString(processingObject, field, fields[field].type, fields[field].required, false);
36
+ this.getResultFromString(processingObject, field, fields[field].type, fields[field].required, false, name);
34
37
  }
35
38
  }
36
39
  // if type is an array
@@ -54,7 +57,7 @@ var ConduitParser = /** @class */ (function () {
54
57
  var processingObject = this.getProcessingObject(name, true);
55
58
  // if array contains simply a type
56
59
  if (typeof value[0] === 'string') {
57
- this.getResultFromString(processingObject, field, value[0], false, true);
60
+ this.getResultFromString(processingObject, field, value[0], false, true, name);
58
61
  }
59
62
  else if (value[0].type) {
60
63
  // if array contains a model
@@ -62,7 +65,7 @@ var ConduitParser = /** @class */ (function () {
62
65
  this.getResultFromRelation(processingObject, name, field, value[0].model, value[0].required, true);
63
66
  }
64
67
  else if (typeof value[0].type === 'string') {
65
- this.getResultFromString(processingObject, field, value[0].type, value[0].required, true);
68
+ this.getResultFromString(processingObject, field, value[0].type, value[0].required, true, name);
66
69
  }
67
70
  else if (Array.isArray(value[0].type)) {
68
71
  this.getResultFromArray(processingObject, name, field, value[0].type, value[0].required, true);
@@ -1 +1 @@
1
- {"version":3,"file":"ConduitParser.js","sourceRoot":"","sources":["../../src/classes/ConduitParser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ConduitParser.js","sourceRoot":"","sources":["../../src/classes/ConduitParser.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,9 @@
1
- import { ConduitModel, ConduitModelOptions } from '../interfaces';
1
+ import { ConduitModel, ConduitSchemaOptions } from '../interfaces';
2
2
  export declare class ConduitSchema {
3
3
  readonly name: string;
4
4
  readonly fields: ConduitModel;
5
5
  readonly collectionName: string | '';
6
- readonly schemaOptions: ConduitModelOptions;
6
+ readonly modelOptions: ConduitSchemaOptions;
7
7
  ownerModule: string;
8
- constructor(name: string, fields: ConduitModel, schemaOptions?: ConduitModelOptions, collectionName?: string);
9
- get modelSchema(): ConduitModel;
8
+ constructor(name: string, fields: ConduitModel, modelOptions?: ConduitSchemaOptions, collectionName?: string);
10
9
  }
@@ -2,20 +2,13 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ConduitSchema = void 0;
4
4
  var ConduitSchema = /** @class */ (function () {
5
- function ConduitSchema(name, fields, schemaOptions, collectionName) {
5
+ function ConduitSchema(name, fields, modelOptions, collectionName) {
6
6
  this.ownerModule = 'unknown';
7
7
  this.name = name;
8
8
  this.fields = fields;
9
- this.schemaOptions = schemaOptions !== null && schemaOptions !== void 0 ? schemaOptions : {};
9
+ this.modelOptions = modelOptions !== null && modelOptions !== void 0 ? modelOptions : {};
10
10
  this.collectionName = collectionName && collectionName !== '' ? collectionName : '';
11
11
  }
12
- Object.defineProperty(ConduitSchema.prototype, "modelSchema", {
13
- get: function () {
14
- return this.fields;
15
- },
16
- enumerable: false,
17
- configurable: true
18
- });
19
12
  return ConduitSchema;
20
13
  }());
21
14
  exports.ConduitSchema = ConduitSchema;
@@ -1 +1 @@
1
- {"version":3,"file":"ConduitSchema.js","sourceRoot":"","sources":["../../src/classes/ConduitSchema.ts"],"names":[],"mappings":";;;AAEA;IAOE,uBACE,IAAY,EACZ,MAAoB,EACpB,aAAmC,EACnC,cAAuB;QANzB,gBAAW,GAAW,SAAS,CAAC;QAQ9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,aAAa,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,EAAE,CAAC;QACzC,IAAI,CAAC,cAAc,GAAG,cAAc,IAAI,cAAc,KAAK,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;IACtF,CAAC;IAED,sBAAI,sCAAW;aAAf;YACE,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;;;OAAA;IACH,oBAAC;AAAD,CAAC,AAtBD,IAsBC;AAtBY,sCAAa"}
1
+ {"version":3,"file":"ConduitSchema.js","sourceRoot":"","sources":["../../src/classes/ConduitSchema.ts"],"names":[],"mappings":";;;AAEA;IAOE,uBACE,IAAY,EACZ,MAAoB,EACpB,YAAmC,EACnC,cAAuB;QANzB,gBAAW,GAAW,SAAS,CAAC;QAQ9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,cAAc,IAAI,cAAc,KAAK,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;IACtF,CAAC;IACH,oBAAC;AAAD,CAAC,AAlBD,IAkBC;AAlBY,sCAAa"}
@@ -40,7 +40,7 @@ exports.checkModuleHealth = void 0;
40
40
  var interceptors_1 = require("../interceptors");
41
41
  var nice_grpc_1 = require("nice-grpc");
42
42
  var grpc_health_check_1 = require("../protoUtils/grpc_health_check");
43
- var nice_grpc_prometheus_1 = require("nice-grpc-prometheus");
43
+ var clientMiddleware_1 = require("../metrics/clientMiddleware");
44
44
  function checkModuleHealth(clientName, serviceUrl, service, grpcToken) {
45
45
  if (service === void 0) { service = ''; }
46
46
  return __awaiter(this, void 0, void 0, function () {
@@ -53,8 +53,7 @@ function checkModuleHealth(clientName, serviceUrl, service, grpcToken) {
53
53
  'grpc.max_send_message_length': 1024 * 1024 * 100,
54
54
  });
55
55
  clientFactory = (0, nice_grpc_1.createClientFactory)()
56
- //@ts-ignore
57
- .use((0, nice_grpc_prometheus_1.prometheusClientMiddleware)())
56
+ .use((0, clientMiddleware_1.clientMiddleware)())
58
57
  .use(grpcToken
59
58
  ? (0, interceptors_1.getGrpcSignedTokenInterceptor)(grpcToken)
60
59
  : (0, interceptors_1.getModuleNameInterceptor)(clientName));
@@ -1 +1 @@
1
- {"version":3,"file":"HealthCheck.js","sourceRoot":"","sources":["../../src/classes/HealthCheck.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0F;AAC1F,uCAA+D;AAC/D,qEAAwF;AACxF,6DAAkE;AAElE,SAAsB,iBAAiB,CACrC,UAAkB,EAClB,UAAkB,EAClB,OAAoB,EACpB,SAAkB;IADlB,wBAAA,EAAA,YAAoB;;;;;;oBAGhB,OAAO,GAAG,IAAA,yBAAa,EAAC,UAAU,EAAE,SAAS,EAAE;wBACjD,iCAAiC,EAAE,IAAI,GAAG,IAAI,GAAG,GAAG;wBACpD,8BAA8B,EAAE,IAAI,GAAG,IAAI,GAAG,GAAG;qBAClD,CAAC,CAAC;oBACG,aAAa,GAAG,IAAA,+BAAmB,GAAE;wBACzC,YAAY;yBACX,GAAG,CAAC,IAAA,iDAA0B,GAAE,CAAC;yBACjC,GAAG,CACF,SAAS;wBACP,CAAC,CAAC,IAAA,4CAA6B,EAAC,SAAS,CAAC;wBAC1C,CAAC,CAAC,IAAA,uCAAwB,EAAC,UAAU,CAAC,CACzC,CAAC;oBACA,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,oCAAgB,EAAE,OAAO,CAAC,CAAC;oBAGvD,qBAAM,aAAa;6BAC7B,KAAK,CAAC,EAAE,OAAO,SAAA,EAAE,CAAC;6BAClB,IAAI,CAAC,UAAC,GAAwB;4BAC7B,OAAO,GAAG,CAAC,MAAM,CAAC;wBACpB,CAAC,CAAC;6BACD,KAAK,CAAC,UAAA,GAAG,IAAI,OAAA,CAAC,KAAK,GAAG,GAAG,CAAC,EAAb,CAAa,CAAC,EAAA;;oBAL1B,MAAM,GAAG,SAKiB;oBAC9B,OAAO,CAAC,KAAK,EAAE,CAAC;oBAChB,IAAI,CAAC,KAAK,EAAE;wBACV,sBAAO,MAAM,EAAC;qBACf;oBACD,MAAM,KAAK,CAAC;;;;CACb;AAhCD,8CAgCC"}
1
+ {"version":3,"file":"HealthCheck.js","sourceRoot":"","sources":["../../src/classes/HealthCheck.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0F;AAC1F,uCAA+D;AAC/D,qEAAwF;AACxF,gEAA+D;AAE/D,SAAsB,iBAAiB,CACrC,UAAkB,EAClB,UAAkB,EAClB,OAAoB,EACpB,SAAkB;IADlB,wBAAA,EAAA,YAAoB;;;;;;oBAGd,OAAO,GAAG,IAAA,yBAAa,EAAC,UAAU,EAAE,SAAS,EAAE;wBACnD,iCAAiC,EAAE,IAAI,GAAG,IAAI,GAAG,GAAG;wBACpD,8BAA8B,EAAE,IAAI,GAAG,IAAI,GAAG,GAAG;qBAClD,CAAC,CAAC;oBACG,aAAa,GAAG,IAAA,+BAAmB,GAAE;yBACxC,GAAG,CAAC,IAAA,mCAAgB,GAAE,CAAC;yBACvB,GAAG,CACF,SAAS;wBACP,CAAC,CAAC,IAAA,4CAA6B,EAAC,SAAS,CAAC;wBAC1C,CAAC,CAAC,IAAA,uCAAwB,EAAC,UAAU,CAAC,CACzC,CAAC;oBACE,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,oCAAgB,EAAE,OAAO,CAAC,CAAC;oBAGzD,qBAAM,aAAa;6BAC7B,KAAK,CAAC,EAAE,OAAO,SAAA,EAAE,CAAC;6BAClB,IAAI,CAAC,UAAC,GAAwB;4BAC7B,OAAO,GAAG,CAAC,MAAM,CAAC;wBACpB,CAAC,CAAC;6BACD,KAAK,CAAC,UAAA,GAAG,IAAI,OAAA,CAAC,KAAK,GAAG,GAAG,CAAC,EAAb,CAAa,CAAC,EAAA;;oBAL1B,MAAM,GAAG,SAKiB;oBAC9B,OAAO,CAAC,KAAK,EAAE,CAAC;oBAChB,IAAI,CAAC,KAAK,EAAE;wBACV,sBAAO,MAAM,EAAC;qBACf;oBACD,MAAM,KAAK,CAAC;;;;CACb;AA/BD,8CA+BC"}
@@ -2,8 +2,10 @@ import ConduitGrpcSdk, { ConduitService, SetConfigRequest, SetConfigResponse } f
2
2
  import { ConduitServiceModule } from './ConduitServiceModule';
3
3
  import convict from 'convict';
4
4
  export declare abstract class ManagedModule<T> extends ConduitServiceModule {
5
- abstract readonly configSchema?: object;
5
+ protected abstract readonly configSchema?: object;
6
+ protected abstract readonly metricsSchema?: object;
6
7
  readonly config?: convict.Config<T>;
8
+ configOverride: boolean;
7
9
  service?: ConduitService;
8
10
  protected constructor(moduleName: string);
9
11
  get name(): string;
@@ -53,10 +55,14 @@ export declare abstract class ManagedModule<T> extends ConduitServiceModule {
53
55
  */
54
56
  onConfig(): Promise<void>;
55
57
  /**
56
- * This is triggered when a module needs to initialize its own custom metric
57
- * types and configuration by using the sdk's ConduitMetrics.
58
+ * Registers common and module-specific metric types.
58
59
  */
59
- initializeMetrics(): void;
60
+ registerMetrics(): Promise<void>;
61
+ /**
62
+ * Initializes metric startup values.
63
+ * Implemented by individual modules.
64
+ */
65
+ initializeMetrics(): Promise<void>;
60
66
  createGrpcServer(servicePort?: string): Promise<void>;
61
67
  startGrpcServer(): Promise<void>;
62
68
  setConfig(call: SetConfigRequest, callback: SetConfigResponse): Promise<void>;
@@ -14,17 +14,6 @@ var __extends = (this && this.__extends) || (function () {
14
14
  d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
15
15
  };
16
16
  })();
17
- var __assign = (this && this.__assign) || function () {
18
- __assign = Object.assign || function(t) {
19
- for (var s, i = 1, n = arguments.length; i < n; i++) {
20
- s = arguments[i];
21
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
22
- t[p] = s[p];
23
- }
24
- return t;
25
- };
26
- return __assign.apply(this, arguments);
27
- };
28
17
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
29
18
  if (k2 === undefined) k2 = k;
30
19
  var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -98,7 +87,9 @@ var convict_1 = __importDefault(require("convict"));
98
87
  var ManagedModule = /** @class */ (function (_super) {
99
88
  __extends(ManagedModule, _super);
100
89
  function ManagedModule(moduleName) {
101
- return _super.call(this, moduleName) || this;
90
+ var _this = _super.call(this, moduleName) || this;
91
+ _this.configOverride = false;
92
+ return _this;
102
93
  }
103
94
  Object.defineProperty(ManagedModule.prototype, "name", {
104
95
  get: function () {
@@ -184,10 +175,32 @@ var ManagedModule = /** @class */ (function (_super) {
184
175
  }); });
185
176
  };
186
177
  /**
187
- * This is triggered when a module needs to initialize its own custom metric
188
- * types and configuration by using the sdk's ConduitMetrics.
178
+ * Registers common and module-specific metric types.
179
+ */
180
+ ManagedModule.prototype.registerMetrics = function () {
181
+ return __awaiter(this, void 0, void 0, function () {
182
+ return __generator(this, function (_a) {
183
+ if (__1.default.Metrics) {
184
+ __1.default.Metrics.initializeDefaultMetrics();
185
+ if (this.metricsSchema) {
186
+ Object.values(this.metricsSchema).forEach(function (metric) {
187
+ __1.default.Metrics.registerMetric(metric.type, metric.config);
188
+ });
189
+ }
190
+ }
191
+ return [2 /*return*/];
192
+ });
193
+ });
194
+ };
195
+ /**
196
+ * Initializes metric startup values.
197
+ * Implemented by individual modules.
189
198
  */
190
- ManagedModule.prototype.initializeMetrics = function () { };
199
+ ManagedModule.prototype.initializeMetrics = function () {
200
+ return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
201
+ return [2 /*return*/];
202
+ }); });
203
+ };
191
204
  ManagedModule.prototype.createGrpcServer = function (servicePort) {
192
205
  return __awaiter(this, void 0, void 0, function () {
193
206
  var _a;
@@ -220,7 +233,7 @@ var ManagedModule = /** @class */ (function (_super) {
220
233
  return [4 /*yield*/, this.grpcServer.start()];
221
234
  case 3:
222
235
  _a.sent();
223
- __1.default.Logger.log('gRPC server is online');
236
+ __1.default.Logger.log('gRPC server listening on ' + this._port);
224
237
  _a.label = 4;
225
238
  case 4: return [2 /*return*/];
226
239
  }
@@ -242,7 +255,7 @@ var ManagedModule = /** @class */ (function (_super) {
242
255
  })];
243
256
  }
244
257
  config = JSON.parse(call.request.newConfig);
245
- config = __assign(__assign({}, this.config.getProperties()), config);
258
+ config = (0, lodash_1.merge)(this.config.getProperties(), config);
246
259
  return [4 /*yield*/, this.preConfig(config)];
247
260
  case 1:
248
261
  config = _b.sent();
@@ -1 +1 @@
1
- {"version":3,"file":"ManagedModule.js","sourceRoot":"","sources":["../../src/classes/ManagedModule.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ManagedModule.js","sourceRoot":"","sources":["../../src/classes/ManagedModule.ts"],"names":[],"mappings":"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"}
@@ -8,5 +8,4 @@ export declare class ModuleManager<T> {
8
8
  start(): Promise<void>;
9
9
  private preRegisterLifecycle;
10
10
  private postRegisterLifecycle;
11
- private initializeMetrics;
12
11
  }
@@ -77,28 +77,27 @@ var convictConfigParser = function (config) {
77
77
  var ModuleManager = /** @class */ (function () {
78
78
  function ModuleManager(module) {
79
79
  var _this = this;
80
+ var _a;
80
81
  this.module = module;
81
82
  if (!process.env.CONDUIT_SERVER) {
82
83
  throw new Error('CONDUIT_SERVER is undefined, specify Conduit server URL');
83
84
  }
84
- this.serviceAddress = process.env.SERVICE_IP
85
- ? process.env.SERVICE_IP.split(':')[0]
86
- : '0.0.0.0';
87
- this.servicePort = process.env.SERVICE_IP
88
- ? process.env.SERVICE_IP.split(':')[1]
89
- : undefined;
85
+ this.servicePort = (_a = process.env.GRPC_PORT) !== null && _a !== void 0 ? _a : '5000';
86
+ this.serviceAddress =
87
+ // @compat (v0.15): SERVICE_IP -> SERVICE_URL
88
+ process.env.SERVICE_URL || process.env.SERVICE_IP || '0.0.0.0:' + this.servicePort;
90
89
  try {
91
90
  this.grpcSdk = new __1.default(process.env.CONDUIT_SERVER, function () {
92
91
  return _this.module.healthState;
93
92
  }, module.name);
94
93
  }
95
- catch (_a) {
94
+ catch (_b) {
96
95
  throw new Error('Failed to initialize grpcSdk');
97
96
  }
98
97
  }
99
98
  ModuleManager.prototype.start = function () {
100
99
  return __awaiter(this, void 0, void 0, function () {
101
- var self, url, err_1;
100
+ var self, err_1;
102
101
  return __generator(this, function (_a) {
103
102
  switch (_a.label) {
104
103
  case 0: return [4 /*yield*/, this.grpcSdk.initialize()];
@@ -112,10 +111,7 @@ var ModuleManager = /** @class */ (function () {
112
111
  return [4 /*yield*/, this.preRegisterLifecycle()];
113
112
  case 3:
114
113
  _a.sent();
115
- url = (process.env.REGISTER_NAME === 'true'
116
- ? "".concat(self.module.name, ":")
117
- : "".concat(self.serviceAddress, ":")) + self.module.port;
118
- return [4 /*yield*/, self.grpcSdk.config.registerModule(self.module.name, url, this.module.healthState)];
114
+ return [4 /*yield*/, self.grpcSdk.config.registerModule(self.module.name, this.serviceAddress, this.module.healthState)];
119
115
  case 4:
120
116
  _a.sent();
121
117
  return [3 /*break*/, 6];
@@ -153,17 +149,20 @@ var ModuleManager = /** @class */ (function () {
153
149
  return [4 /*yield*/, this.module.handleConfigSyncUpdate()];
154
150
  case 4:
155
151
  _a.sent();
156
- return [4 /*yield*/, this.module.startGrpcServer()];
152
+ return [4 /*yield*/, this.module.registerMetrics()];
157
153
  case 5:
158
154
  _a.sent();
159
- return [4 /*yield*/, this.initializeMetrics()];
155
+ return [4 /*yield*/, this.module.startGrpcServer()];
160
156
  case 6:
161
157
  _a.sent();
162
158
  return [4 /*yield*/, this.module.onServerStart()];
163
159
  case 7:
164
160
  _a.sent();
165
- return [4 /*yield*/, this.module.preRegister()];
161
+ return [4 /*yield*/, this.module.initializeMetrics()];
166
162
  case 8:
163
+ _a.sent();
164
+ return [4 /*yield*/, this.module.preRegister()];
165
+ case 9:
167
166
  _a.sent();
168
167
  return [2 /*return*/];
169
168
  }
@@ -178,30 +177,28 @@ var ModuleManager = /** @class */ (function () {
178
177
  case 0: return [4 /*yield*/, this.module.onRegister()];
179
178
  case 1:
180
179
  _a.sent();
181
- if (!this.module.config) return [3 /*break*/, 4];
180
+ if (!this.module.config) return [3 /*break*/, 5];
182
181
  configSchema = this.module.config.getSchema();
183
- return [4 /*yield*/, this.grpcSdk.config.configure(this.module.config.getProperties(), convictConfigParser(configSchema))];
182
+ config = this.module.config.getProperties();
183
+ return [4 /*yield*/, this.module.preConfig(config)];
184
184
  case 2:
185
+ config = _a.sent();
186
+ return [4 /*yield*/, this.grpcSdk.config.configure(config, convictConfigParser(configSchema), this.module.configOverride)];
187
+ case 3:
185
188
  config = _a.sent();
186
189
  __1.ConfigController.getInstance();
187
190
  if (config)
188
191
  __1.ConfigController.getInstance().config = config;
189
- if (!(!config || config.active || !config.hasOwnProperty('active'))) return [3 /*break*/, 4];
192
+ if (!(!config || config.active || !config.hasOwnProperty('active'))) return [3 /*break*/, 5];
190
193
  return [4 /*yield*/, this.module.onConfig()];
191
- case 3:
194
+ case 4:
192
195
  _a.sent();
193
- _a.label = 4;
194
- case 4: return [2 /*return*/];
196
+ _a.label = 5;
197
+ case 5: return [2 /*return*/];
195
198
  }
196
199
  });
197
200
  });
198
201
  };
199
- ModuleManager.prototype.initializeMetrics = function () {
200
- if (process.env['METRICS_PORT']) {
201
- this.grpcSdk.initializeDefaultMetrics();
202
- this.module.initializeMetrics();
203
- }
204
- };
205
202
  return ModuleManager;
206
203
  }());
207
204
  exports.ModuleManager = ModuleManager;
@@ -1 +1 @@
1
- {"version":3,"file":"ModuleManager.js","sourceRoot":"","sources":["../../src/classes/ModuleManager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ModuleManager.js","sourceRoot":"","sources":["../../src/classes/ModuleManager.ts"],"names":[],"mappings":"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"}
@@ -1,16 +1,9 @@
1
1
  export * from './Error';
2
- export * from './ConduitRoute';
3
- export * from './ConduitRouteReturn';
4
- export * from './ConduitMiddleware';
5
2
  export * from './ConduitSchema';
6
- export * from './ConduitSchemaExtension';
7
3
  export * from './ConduitActiveSchema';
8
4
  export * from './GrpcServer';
9
- export * from './ConduitSocket';
10
5
  export * from './ConduitServiceModule';
11
6
  export * from './ManagedModule';
12
7
  export * from './ModuleManager';
13
- export * from './Routing/RoutingManager';
14
- export * from './Routing/RouteBuilder';
15
8
  export * from './ConfigController';
16
9
  export * from './ConduitParser';
@@ -15,19 +15,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./Error"), exports);
18
- __exportStar(require("./ConduitRoute"), exports);
19
- __exportStar(require("./ConduitRouteReturn"), exports);
20
- __exportStar(require("./ConduitMiddleware"), exports);
21
18
  __exportStar(require("./ConduitSchema"), exports);
22
- __exportStar(require("./ConduitSchemaExtension"), exports);
23
19
  __exportStar(require("./ConduitActiveSchema"), exports);
24
20
  __exportStar(require("./GrpcServer"), exports);
25
- __exportStar(require("./ConduitSocket"), exports);
26
21
  __exportStar(require("./ConduitServiceModule"), exports);
27
22
  __exportStar(require("./ManagedModule"), exports);
28
23
  __exportStar(require("./ModuleManager"), exports);
29
- __exportStar(require("./Routing/RoutingManager"), exports);
30
- __exportStar(require("./Routing/RouteBuilder"), exports);
31
24
  __exportStar(require("./ConfigController"), exports);
32
25
  __exportStar(require("./ConduitParser"), exports);
33
26
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/classes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,iDAA+B;AAC/B,uDAAqC;AACrC,sDAAoC;AACpC,kDAAgC;AAChC,2DAAyC;AACzC,wDAAsC;AACtC,+CAA6B;AAC7B,kDAAgC;AAChC,yDAAuC;AACvC,kDAAgC;AAChC,kDAAgC;AAChC,2DAAyC;AACzC,yDAAuC;AACvC,qDAAmC;AACnC,kDAAgC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/classes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,kDAAgC;AAChC,wDAAsC;AACtC,+CAA6B;AAC7B,yDAAuC;AACvC,kDAAgC;AAChC,kDAAgC;AAChC,qDAAmC;AACnC,kDAAgC"}
@@ -1,5 +1,3 @@
1
1
  export * from './TypeHelpers';
2
- export * from './RoutingJsonConstructor';
3
2
  export * from './GrpcHelper';
4
- export * from './wrapRouterFunctions';
5
3
  export * from './wrapGrpcFunctions';
@@ -15,8 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./TypeHelpers"), exports);
18
- __exportStar(require("./RoutingJsonConstructor"), exports);
19
18
  __exportStar(require("./GrpcHelper"), exports);
20
- __exportStar(require("./wrapRouterFunctions"), exports);
21
19
  __exportStar(require("./wrapGrpcFunctions"), exports);
22
20
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/helpers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,2DAAyC;AACzC,+CAA6B;AAC7B,wDAAsC;AACtC,sDAAoC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/helpers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,+CAA6B;AAC7B,sDAAoC"}