@creator.co/wapi 1.5.9-alpha.4 → 1.5.9-alpha.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/src/Server/lib/Server.js +0 -1
  2. package/dist/src/Server/lib/Server.js.map +1 -1
  3. package/package.json +1 -1
  4. package/src/Server/lib/Server.ts +8 -5
  5. package/tests/Server/lib/ContainerServer.test.ts +10 -10
package/dist/src/Server/lib/Server.js CHANGED
@@ -106,7 +106,6 @@ var Server = /** @class */ (function () {
106
106
  return [4 /*yield*/, route.handler(transaction)];
107
107
  case 1:
108
108
  // Continue to route handler
109
- // TODO: fix me
110
109
  return [2 /*return*/, _a.sent()];
111
110
  case 2:
112
111
  //No route found :/
package/dist/src/Server/lib/Server.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Server.js","sourceRoot":"","sources":["../../../../src/Server/lib/Server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Server.js","sourceRoot":"","sources":["../../../../src/Server/lib/Server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,iDAA6C;AAG7C,+CAAgE;AAChE,2DAAoE;AACpE,wDAAkD;AAElD,kDAA4C;AAE5C;;GAEG;AACH;IAcE;;;;OAIG;IACH,gBAAY,MAAoB;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,aAAa,GAAG,IAAI,uBAAa,CAAC,MAAM,CAAC,CAAA;IAChD,CAAC;IAED;;;OAGG;IACI,0BAAS,GAAhB;QACE,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED;;;;;OAKG;IACU,sCAAqB,GAAlC,UAAmC,KAA2B,EAAE,OAAgB;;;;;;oBAC9E,mBAAmB;oBACnB,qBAAM,IAAI,qBAAW,CACnB,KAAK,EACL,OAAO,EACP,IAAI,CAAC,MAAM,CACZ,CAAC,OAAO,CAAC,UAAM,WAAW;;;;;wCACnB,OAAO,GAAG,WAAW,CAAC,OAAO,CAAA;wCAC7B,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;6CACjF,KAAK,EAAL,wBAAK;wCACP,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;wCAC5D,iBAAiB;wCACjB,IAAI,KAAK,CAAC,WAAW,EAAE;4CACf,cAAc,GAAG,mBAAS,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,WAAW,CAAC,CAAA;4CACrF,IAAI,cAAc,IAAI,cAAc,YAAY,kBAAQ;gDAAE,sBAAO,cAAc,EAAA;yCAChF;wCAED,iBAAiB;wCACjB,IAAI,KAAK,CAAC,WAAW,EAAE;4CACf,cAAc,GAAG,mBAAS,CAAC,cAAc,CAC7C,OAAO,CAAC,cAAc,EAAE,EACxB,KAAK,CAAC,WAAW,CAClB,CAAA;4CACD,IAAI,cAAc,IAAI,cAAc,YAAY,kBAAQ;gDAAE,sBAAO,cAAc,EAAA;yCAChF;wCAED,0BAA0B;wCAC1B,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;wCACzC,gBAAgB;wCAChB,IAAI,KAAK,CAAC,UAAU,EAAE;4CACd,cAAc,GAAG,mBAAS,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;4CAC1F,IAAI,cAAc,IAAI,cAAc,YAAY,kBAAQ;gDAAE,sBAAO,cAAc,EAAA;yCAChF;wCAGM,qBAAM,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAA;;oCADvC,4BAA4B;oCAC5B,sBAAO,SAAgC,EAAA;;oCAEzC,mBAAmB;oCACnB,sBAAO,IAAI,kBAAQ,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC,EAAA;;;6BACtD,CAAC,EAAA;;wBAtCF,mBAAmB;wBACnB,SAqCE,CAAA;;;;;KACH;IAED;;;;;OAKG;IACK,gCAAe,GAAvB,UAAwB,GAA2B,EAAE,SAAiB;QACpE,IAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAA;QAC1B,IAAM,IAAI,GAAG,EAAE,CAAA;QACf,IAAM,MAAM,GAAG,IAAA,6BAAY,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACvD,IAAI,MAAM;YAAE,GAAG,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAClD,CAAC;IACH,aAAC;AAAD,CAAC,AA5FD,IA4FC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@creator.co/wapi",
3
- "version": "1.5.9-alpha.4",
3
+ "version": "1.5.9-alpha.5",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/Server/lib/Server.ts CHANGED
@@ -2,8 +2,8 @@ import { APIGatewayProxyEvent, Context } from 'aws-lambda'
2
2
  import { pathToRegexp } from 'path-to-regexp'
3
3
 
4
4
  import Request from '../../API/Request'
5
- import Response from '../../API/Response'
6
- import Transaction from '../../BaseEvent/Transaction'
5
+ import Response, { ResponseErrorType } from '../../API/Response'
6
+ import Transaction, { StringMap } from '../../BaseEvent/Transaction'
7
7
  import Validator from '../../Validation/Validator'
8
8
  import { RouterConfig } from '../Router'
9
9
  import RouteResolver from '../RouteResolver'
@@ -51,7 +51,11 @@ export default class Server {
51
51
  */
52
52
  public async handleServerlessEvent(event: APIGatewayProxyEvent, context: Context) {
53
53
  // init transaction
54
- await new Transaction(event, context, this.config).execute(async transaction => {
54
+ await new Transaction<never, ResponseErrorType, never, StringMap, StringMap>(
55
+ event,
56
+ context,
57
+ this.config
58
+ ).execute(async transaction => {
55
59
  const request = transaction.request
56
60
  const route = this.routeResolver.resolveRoute(request.getMethod(), request.getPath())
57
61
  if (route) {
@@ -80,8 +84,7 @@ export default class Server {
80
84
  }
81
85
 
82
86
  // Continue to route handler
83
- // TODO: fix me
84
- return await route.handler(transaction as any)
87
+ return await route.handler(transaction)
85
88
  }
86
89
  //No route found :/
87
90
  return new Response(404, { err: 'Route not found!' })
package/tests/Server/lib/ContainerServer.test.ts CHANGED
@@ -70,7 +70,7 @@ describe('Container server routing', () => {
70
70
  handler: async () => {
71
71
  return Response.SimpleResponse({ name: 'abc' })
72
72
  },
73
- },
73
+ } as any,
74
74
  ],
75
75
  })
76
76
  await server.start()
@@ -198,7 +198,7 @@ describe('Container server validation (body)', () => {
198
198
  handler: async () => {
199
199
  return Response.SimpleResponse({ name: 'abc' })
200
200
  },
201
- },
201
+ } as any,
202
202
  ],
203
203
  })
204
204
  await server.start()
@@ -221,7 +221,7 @@ describe('Container server validation (body)', () => {
221
221
  handler: async () => {
222
222
  return Response.SimpleResponse({ name: 'abc' })
223
223
  },
224
- },
224
+ } as any,
225
225
  ],
226
226
  })
227
227
  await server.start()
@@ -245,7 +245,7 @@ describe('Container server validation (body)', () => {
245
245
  handler: async () => {
246
246
  return Response.SimpleResponse({ name: 'abc' })
247
247
  },
248
- },
248
+ } as any,
249
249
  ],
250
250
  })
251
251
  await server.start()
@@ -269,7 +269,7 @@ describe('Container server validation (body)', () => {
269
269
  handler: async () => {
270
270
  return Response.SimpleResponse({ name: 'abc' })
271
271
  },
272
- },
272
+ } as any,
273
273
  ],
274
274
  })
275
275
  await server.start()
@@ -293,7 +293,7 @@ describe('Container server validation (body)', () => {
293
293
  handler: async () => {
294
294
  return Response.SimpleResponse({ name: 'abc' })
295
295
  },
296
- },
296
+ } as any,
297
297
  ],
298
298
  })
299
299
  await server.start()
@@ -317,7 +317,7 @@ describe('Container server validation (body)', () => {
317
317
  handler: async () => {
318
318
  return Response.SimpleResponse({ name: 'abc' })
319
319
  },
320
- },
320
+ } as any,
321
321
  ],
322
322
  })
323
323
  await server.start()
@@ -358,7 +358,7 @@ describe('Container server validation (query)', () => {
358
358
  handler: async () => {
359
359
  return Response.SimpleResponse({ name: 'abc' })
360
360
  },
361
- },
361
+ } as any,
362
362
  ],
363
363
  })
364
364
  await server.start()
@@ -444,7 +444,7 @@ describe('Container server validation (path)', () => {
444
444
  handler: async () => {
445
445
  return Response.SimpleResponse({ name: 'abc' })
446
446
  },
447
- },
447
+ } as any,
448
448
  ],
449
449
  })
450
450
  await server.start()
@@ -507,7 +507,7 @@ describe('Container server raw body', () => {
507
507
  raw = t.request.getBody(true)
508
508
  return Response.SimpleResponse(null)
509
509
  },
510
- },
510
+ } as any,
511
511
  ],
512
512
  })
513
513
  await server.start()