@adaas/a-server 0.0.13 → 0.0.14

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 CHANGED
@@ -22,3 +22,4 @@ export * from './src/context/A_ProxyConfig/A_ProxyConfig.types';
22
22
  export * from './src/entities/A-Request/A-Request.entity.types';
23
23
  export * from './src/entities/A-Response/A-Response.entity.types';
24
24
  export * from './src/components/A-ServerCORS/A_ServerCORS.component.types';
25
+ export * from "./src/components/A-Router/A-Router.component.types";
package/dist/index.js CHANGED
@@ -63,6 +63,7 @@ __exportStar(require("./src/context/A_ProxyConfig/A_ProxyConfig.types"), exports
63
63
  __exportStar(require("./src/entities/A-Request/A-Request.entity.types"), exports);
64
64
  __exportStar(require("./src/entities/A-Response/A-Response.entity.types"), exports);
65
65
  __exportStar(require("./src/components/A-ServerCORS/A_ServerCORS.component.types"), exports);
66
+ __exportStar(require("./src/components/A-Router/A-Router.component.types"), exports);
66
67
  // export * from './src/entities/A-Route/A-Route.entity.types';
67
68
  // export * from './src/components/A-ServerLogger/A_ServerLogger.component.types';
68
69
  // export * from './src/components/A-EntityController/A-EntityController.component.types';
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAEA,mEAAmE;AACnE,qBAAqB;AACrB,mFAAiF;AAAxE,uHAAA,iBAAiB,OAAA;AAE1B,mBAAmB;AACnB,4EAAmE;AAA1D,4GAAA,QAAQ,OAAA;AACjB,2FAAkF;AAAzE,sHAAA,aAAa,OAAA;AACtB,8FAAqF;AAA5E,wHAAA,cAAc,OAAA;AACvB,uGAA8F;AAArF,8HAAA,iBAAiB,OAAA;AAE1B,mBAAmB;AACnB,8EAAsE;AAA7D,6GAAA,SAAS,OAAA;AAClB,iFAAyE;AAAhE,+GAAA,UAAU,OAAA;AACnB,wEAAgE;AAAvD,yGAAA,OAAO,OAAA;AAChB,uFAA+E;AAAtE,mHAAA,YAAY,OAAA;AAErB,qBAAqB;AACrB,qGAA0F;AAAjF,0HAAA,cAAc,OAAA;AACvB,iHAAsG;AAA7F,kIAAA,kBAAkB,OAAA;AAC3B,mFAAwE;AAA/D,8GAAA,QAAQ,OAAA;AACjB,0HAA+G;AAAtG,wIAAA,qBAAqB,OAAA;AAC9B,kGAAuF;AAA9E,wHAAA,aAAa,OAAA;AACtB,+FAAoF;AAA3E,sHAAA,YAAY,OAAA;AACrB,qGAA0F;AAAjF,0HAAA,cAAc,OAAA;AACvB,+FAAoF;AAA3E,sHAAA,YAAY,OAAA;AACrB,oHAAyG;AAAhG,oIAAA,mBAAmB,OAAA;AAE5B,gBAAgB;AAChB,qFAAmE;AACnE,qFAAmE;AACnE,kFAAgE;AAChE,kFAAgE;AAChE,oFAAkE;AAClE,6FAA2E;AAG3E,+DAA+D;AAC/D,kFAAkF;AAClF,0FAA0F;AAC1F,sEAAsE;AACtE,gGAAgG;AAChG,gFAAgF"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAEA,mEAAmE;AACnE,qBAAqB;AACrB,mFAAiF;AAAxE,uHAAA,iBAAiB,OAAA;AAE1B,mBAAmB;AACnB,4EAAmE;AAA1D,4GAAA,QAAQ,OAAA;AACjB,2FAAkF;AAAzE,sHAAA,aAAa,OAAA;AACtB,8FAAqF;AAA5E,wHAAA,cAAc,OAAA;AACvB,uGAA8F;AAArF,8HAAA,iBAAiB,OAAA;AAE1B,mBAAmB;AACnB,8EAAsE;AAA7D,6GAAA,SAAS,OAAA;AAClB,iFAAyE;AAAhE,+GAAA,UAAU,OAAA;AACnB,wEAAgE;AAAvD,yGAAA,OAAO,OAAA;AAChB,uFAA+E;AAAtE,mHAAA,YAAY,OAAA;AAErB,qBAAqB;AACrB,qGAA0F;AAAjF,0HAAA,cAAc,OAAA;AACvB,iHAAsG;AAA7F,kIAAA,kBAAkB,OAAA;AAC3B,mFAAwE;AAA/D,8GAAA,QAAQ,OAAA;AACjB,0HAA+G;AAAtG,wIAAA,qBAAqB,OAAA;AAC9B,kGAAuF;AAA9E,wHAAA,aAAa,OAAA;AACtB,+FAAoF;AAA3E,sHAAA,YAAY,OAAA;AACrB,qGAA0F;AAAjF,0HAAA,cAAc,OAAA;AACvB,+FAAoF;AAA3E,sHAAA,YAAY,OAAA;AACrB,oHAAyG;AAAhG,oIAAA,mBAAmB,OAAA;AAE5B,gBAAgB;AAChB,qFAAmE;AACnE,qFAAmE;AACnE,kFAAgE;AAChE,kFAAgE;AAChE,oFAAkE;AAClE,6FAA2E;AAC3E,qFAAmE;AAGnE,+DAA+D;AAC/D,kFAAkF;AAClF,0FAA0F;AAC1F,sEAAsE;AACtE,gGAAgG;AAChG,gFAAgF"}
@@ -131,7 +131,11 @@ class A_Router extends a_concept_1.A_Component {
131
131
  const meta = a_concept_1.A_Context.meta(target);
132
132
  const routes = meta.get(A_Router_component_types_1.A_SERVER_TYPES__ARouterComponentMetaKey.ROUTES) || new Map();
133
133
  const searchKey = route.toAFeatureExtension(['A_Router', 'A_ServerContainer']);
134
- routes.set(searchKey.source, route);
134
+ routes.set(searchKey.source, {
135
+ component: target,
136
+ handler: propertyKey,
137
+ route
138
+ });
135
139
  meta.set(A_Router_component_types_1.A_SERVER_TYPES__ARouterComponentMetaKey.ROUTES, routes);
136
140
  (0, a_concept_1.A_Feature_Define)({
137
141
  name: searchKey.source,
@@ -175,7 +179,7 @@ class A_Router extends a_concept_1.A_Component {
175
179
  if (routes) {
176
180
  const currentRoute = routes.get(step.name || '');
177
181
  if (currentRoute) {
178
- request.params = Object.assign(Object.assign({}, request.params), currentRoute.extractParams(url));
182
+ request.params = Object.assign(Object.assign({}, request.params), currentRoute.route.extractParams(url));
179
183
  }
180
184
  }
181
185
  }
@@ -1 +1 @@
1
- {"version":3,"file":"A-Router.component.js","sourceRoot":"","sources":["../../../../src/components/A-Router/A-Router.component.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"A-Router.component.js","sourceRoot":"","sources":["../../../../src/components/A-Router/A-Router.component.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { A_TYPES__ComponentMeta } from "@adaas/a-concept";
1
+ import { A_Component, A_TYPES__ComponentMeta } from "@adaas/a-concept";
2
2
  import { A_Route } from "../../entities/A-Route/A-Route.entity";
3
3
  export declare enum A_SERVER_TYPES__RouterMethod {
4
4
  POST = "POST",
@@ -9,8 +9,13 @@ export declare enum A_SERVER_TYPES__RouterMethod {
9
9
  DEFAULT = "DEFAULT"
10
10
  }
11
11
  export type A_TYPES__ARouterComponentMeta = {
12
- [A_SERVER_TYPES__ARouterComponentMetaKey.ROUTES]: Map<string, A_Route>;
12
+ [A_SERVER_TYPES__ARouterComponentMetaKey.ROUTES]: Map<string, A_TYPES__ARouterDefineRoute>;
13
13
  } & A_TYPES__ComponentMeta;
14
+ export type A_TYPES__ARouterDefineRoute = {
15
+ component: A_Component;
16
+ handler: string;
17
+ route: A_Route;
18
+ };
14
19
  export declare enum A_SERVER_TYPES__ARouterComponentMetaKey {
15
20
  ROUTES = "ROUTES"
16
21
  }
@@ -1 +1 @@
1
- {"version":3,"file":"A-Router.component.types.js","sourceRoot":"","sources":["../../../../src/components/A-Router/A-Router.component.types.ts"],"names":[],"mappings":";;;AAIA,IAAY,4BAOX;AAPD,WAAY,4BAA4B;IACpC,6CAAa,CAAA;IACb,2CAAW,CAAA;IACX,2CAAW,CAAA;IACX,iDAAiB,CAAA;IACjB,+CAAe,CAAA;IACf,mDAAmB,CAAA;AACvB,CAAC,EAPW,4BAA4B,4CAA5B,4BAA4B,QAOvC;AAQD,IAAY,uCAGX;AAHD,WAAY,uCAAuC;IAC/C,4DAAiB,CAAA;AAErB,CAAC,EAHW,uCAAuC,uDAAvC,uCAAuC,QAGlD"}
1
+ {"version":3,"file":"A-Router.component.types.js","sourceRoot":"","sources":["../../../../src/components/A-Router/A-Router.component.types.ts"],"names":[],"mappings":";;;AAIA,IAAY,4BAOX;AAPD,WAAY,4BAA4B;IACpC,6CAAa,CAAA;IACb,2CAAW,CAAA;IACX,2CAAW,CAAA;IACX,iDAAiB,CAAA;IACjB,+CAAe,CAAA;IACf,mDAAmB,CAAA;AACvB,CAAC,EAPW,4BAA4B,4CAA5B,4BAA4B,QAOvC;AAeD,IAAY,uCAGX;AAHD,WAAY,uCAAuC;IAC/C,4DAAiB,CAAA;AAErB,CAAC,EAHW,uCAAuC,uDAAvC,uCAAuC,QAGlD"}
package/index.ts CHANGED
@@ -34,6 +34,7 @@ export * from './src/context/A_ProxyConfig/A_ProxyConfig.types';
34
34
  export * from './src/entities/A-Request/A-Request.entity.types';
35
35
  export * from './src/entities/A-Response/A-Response.entity.types';
36
36
  export * from './src/components/A-ServerCORS/A_ServerCORS.component.types';
37
+ export * from "./src/components/A-Router/A-Router.component.types";
37
38
 
38
39
 
39
40
  // export * from './src/entities/A-Route/A-Route.entity.types';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adaas/a-server",
3
- "version": "0.0.13",
3
+ "version": "0.0.14",
4
4
  "description": "SDK to create a server with ease. Build your backend server with modular structure and use it within or outside the ADAAS ecosystem.",
5
5
  "main": "./dist/index.js",
6
6
  "module": "./dist/index.mjs",
@@ -18,7 +18,8 @@ import {
18
18
  A_SERVER_TYPES__ARouterComponentMetaKey,
19
19
  A_SERVER_TYPES__ARouterRouteConfig,
20
20
  A_SERVER_TYPES__RouterMethod,
21
- A_TYPES__ARouterComponentMeta
21
+ A_TYPES__ARouterComponentMeta,
22
+ A_TYPES__ARouterDefineRoute
22
23
  } from "./A-Router.component.types";
23
24
  import { A_Route } from "@adaas/a-server/entities/A-Route/A-Route.entity";
24
25
  import { A_Response } from "@adaas/a-server/entities/A-Response/A-Response.entity";
@@ -154,11 +155,15 @@ export class A_Router extends A_Component {
154
155
 
155
156
  const meta: A_Meta<A_TYPES__ARouterComponentMeta> = A_Context.meta<A_TYPES__ARouterComponentMeta>(target as any);
156
157
 
157
- const routes = meta.get(A_SERVER_TYPES__ARouterComponentMetaKey.ROUTES) || new Map();
158
+ const routes = meta.get(A_SERVER_TYPES__ARouterComponentMetaKey.ROUTES) || new Map<string, A_TYPES__ARouterDefineRoute>();
158
159
 
159
160
  const searchKey = route.toAFeatureExtension(['A_Router', 'A_ServerContainer']);
160
161
 
161
- routes.set(searchKey.source, route);
162
+ routes.set(searchKey.source, {
163
+ component: target,
164
+ handler: propertyKey,
165
+ route
166
+ });
162
167
 
163
168
  meta.set(A_SERVER_TYPES__ARouterComponentMetaKey.ROUTES, routes);
164
169
 
@@ -237,7 +242,7 @@ export class A_Router extends A_Component {
237
242
  if (currentRoute) {
238
243
  request.params = {
239
244
  ...request.params,
240
- ...currentRoute.extractParams(url)
245
+ ...currentRoute.route.extractParams(url)
241
246
  };
242
247
  }
243
248
  }
@@ -1,4 +1,4 @@
1
- import { A_TYPES__ComponentMeta, A_TYPES__ComponentMetaKey } from "@adaas/a-concept";
1
+ import { A_Component, A_TYPES__ComponentMeta, A_TYPES__ComponentMetaKey } from "@adaas/a-concept";
2
2
  import { A_Route } from "@adaas/a-server/entities/A-Route/A-Route.entity";
3
3
 
4
4
 
@@ -13,10 +13,17 @@ export enum A_SERVER_TYPES__RouterMethod {
13
13
 
14
14
 
15
15
  export type A_TYPES__ARouterComponentMeta = {
16
- [A_SERVER_TYPES__ARouterComponentMetaKey.ROUTES]: Map<string, A_Route>
16
+ [A_SERVER_TYPES__ARouterComponentMetaKey.ROUTES]: Map<string, A_TYPES__ARouterDefineRoute>
17
17
  } & A_TYPES__ComponentMeta
18
18
 
19
19
 
20
+ export type A_TYPES__ARouterDefineRoute = {
21
+ component: A_Component,
22
+ handler: string,
23
+ route: A_Route
24
+ }
25
+
26
+
20
27
  export enum A_SERVER_TYPES__ARouterComponentMetaKey {
21
28
  ROUTES = 'ROUTES'
22
29