@miqro/core 1.5.12 → 1.5.15

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 (56) hide show
  1. package/dist/api-router.d.ts +6 -5
  2. package/dist/api-router.js +9 -3
  3. package/dist/api-router.js.map +1 -1
  4. package/dist/common/api-router-utils.d.ts +1 -1
  5. package/dist/common/api-router-utils.js +4 -3
  6. package/dist/common/api-router-utils.js.map +1 -1
  7. package/dist/common/config/index.js +5 -1
  8. package/dist/common/config/index.js.map +1 -1
  9. package/dist/common/error/index.js +5 -1
  10. package/dist/common/error/index.js.map +1 -1
  11. package/dist/common/index.js +5 -1
  12. package/dist/common/index.js.map +1 -1
  13. package/dist/common/logger/index.js +5 -1
  14. package/dist/common/logger/index.js.map +1 -1
  15. package/dist/common/router-handler.d.ts +20 -0
  16. package/dist/common/router-handler.js +136 -0
  17. package/dist/common/router-handler.js.map +1 -0
  18. package/dist/common/router-utils.d.ts +7 -5
  19. package/dist/common/router-utils.js +37 -47
  20. package/dist/common/router-utils.js.map +1 -1
  21. package/dist/common/session/common.d.ts +5 -2
  22. package/dist/common/session/index.js +5 -1
  23. package/dist/common/session/index.js.map +1 -1
  24. package/dist/common/tokenize-match.d.ts +13 -20
  25. package/dist/common/tokenize-match.js +25 -57
  26. package/dist/common/tokenize-match.js.map +1 -1
  27. package/dist/index.js +5 -1
  28. package/dist/index.js.map +1 -1
  29. package/dist/middleware/group.js +2 -0
  30. package/dist/middleware/group.js.map +1 -1
  31. package/dist/middleware/index.d.ts +1 -0
  32. package/dist/middleware/index.js +6 -1
  33. package/dist/middleware/index.js.map +1 -1
  34. package/dist/middleware/result.d.ts +3 -0
  35. package/dist/middleware/result.js +51 -0
  36. package/dist/middleware/result.js.map +1 -0
  37. package/dist/router.d.ts +3 -30
  38. package/dist/router.js +2 -167
  39. package/dist/router.js.map +1 -1
  40. package/dist/static.d.ts +1 -0
  41. package/dist/static.js +8 -3
  42. package/dist/static.js.map +1 -1
  43. package/package.json +11 -9
  44. package/src/api-router.ts +16 -7
  45. package/src/api-router.unit.test.js +273 -0
  46. package/src/common/api-router-utils.ts +3 -3
  47. package/src/common/router-handler.ts +159 -0
  48. package/src/common/router-utils.ts +46 -44
  49. package/src/common/session/common.ts +5 -2
  50. package/src/common/tokenize-match.ts +30 -52
  51. package/src/middleware/group.ts +2 -0
  52. package/src/middleware/index.ts +1 -0
  53. package/src/middleware/result.ts +43 -0
  54. package/src/router.ts +4 -196
  55. package/src/setup-test.js +3 -0
  56. package/src/static.ts +11 -4
@@ -1 +1 @@
1
- {"version":3,"file":"static.js","sourceRoot":"","sources":["../src/static.ts"],"names":[],"mappings":";;;AAAA,2BAAmE;AACnE,+BAAsC;AAEtC,0CAAoC;AAEpC,qCAA+C;AAE/C,MAAM,UAAU,GAAG,KAAK,EAAE,IAAY,EAAE,WAAmB,EAAE,GAAY,EAAE,YAAqB,EAAE,EAAE;IAClG,MAAM,MAAM,GAAG,IAAA,iBAAY,EAAC,IAAI,CAAC,CAAC;IAClC,OAAO,YAAY,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;QACtE,GAAG,CAAC,IAAI,CAAC;YACP,MAAM;SACP,CAAC,CAAC,CAAC;QACJ,GAAG,CAAC,GAAG,CAAC;YACN,MAAM,EAAE,GAAG;YACX,OAAO,EAAE;gBACP,CAAC,cAAc,CAAC,EAAE,WAAW;aAC9B;YACD,IAAI,EAAE,MAAM;SACb,CAAC,CAAC;AACP,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,KAAK,EAAE,IAAY,EAAE,GAAY,EAAE,aAAsB,EAAE,EAAE;IAChF,MAAM,KAAK,GAAG,IAAA,gBAAW,EAAC,IAAI,CAAC,CAAC;IAChC,OAAO,aAAa,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;QACvE,GAAG,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC,CAAC;QACtD,GAAG,CAAC,IAAI,CAAC,mBAAmB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,gBAAgB,GAAG,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC;AAC7H,CAAC,CAAA;AAaD,SAAgB,MAAM,CAAC,OAA4B;IACjD,OAAO,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AAFD,wBAEC;AAED,MAAM,YAAa,SAAQ,eAAM;IAa/B,YAAY,OAA4B;QACtC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,aAAa,GAAG,IAAA,cAAK,EAAC,OAAO,EAAE;YAClC,aAAa,EAAE;gBACb,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,KAAK;aACZ;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;aACf;YACD,IAAI,EAAE;gBACJ,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,KAAK;gBACf,YAAY,EAAE,KAAK;aACpB;YACD,aAAa,EAAE;gBACb,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,KAAK;gBACf,YAAY,EAAE,KAAK;aACpB;YACD,YAAY,EAAE;gBACZ,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,KAAK;gBACf,YAAY,EAAE,KAAK;aACpB;YACD,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,KAAK;gBACf,YAAY,EAAE,YAAY;aAC3B;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,KAAK;aAChB;YACD,YAAY,EAAE;gBACZ,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,KAAK;gBACf,YAAY,EAAE;oBACZ,MAAM,EAAE,WAAW;oBACnB,MAAM,EAAE,uBAAuB;oBAC/B,MAAM,EAAE,uBAAuB;oBAC/B,OAAO,EAAE,YAAY;oBACrB,MAAM,EAAE,iBAAiB;oBACzB,MAAM,EAAE,8BAA8B;oBACtC,MAAM,EAAE,0BAA0B;oBAClC,MAAM,EAAE,WAAW;oBACnB,KAAK,EAAE,oBAAoB;oBAC3B,MAAM,EAAE,qBAAqB;oBAC7B,MAAM,EAAE,mBAAmB;oBAC3B,MAAM,EAAE,mBAAmB;oBAC3B,MAAM,EAAE,UAAU;oBAClB,MAAM,EAAE,UAAU;oBAClB,MAAM,EAAE,oBAAoB;oBAC5B,OAAO,EAAE,yEAAyE;oBAClF,MAAM,EAAE,+BAA+B;oBACvC,OAAO,EAAE,sBAAsB;oBAC/B,KAAK,EAAE,kBAAkB;oBACzB,MAAM,EAAE,WAAW;oBACnB,MAAM,EAAE,WAAW;oBACnB,OAAO,EAAE,WAAW;oBACpB,MAAM,EAAE,0BAA0B;oBAClC,MAAM,EAAE,eAAe;oBACvB,MAAM,EAAE,0BAA0B;oBAClC,OAAO,EAAE,YAAY;oBACrB,MAAM,EAAE,YAAY;oBACpB,KAAK,EAAE,iBAAiB;oBACxB,OAAO,EAAE,kBAAkB;oBAC3B,SAAS,EAAE,qBAAqB;oBAChC,MAAM,EAAE,yBAAyB;oBACjC,OAAO,EAAE,yBAAyB;oBAClC,MAAM,EAAE,iBAAiB;oBACzB,MAAM,EAAE,YAAY;oBACpB,MAAM,EAAE,WAAW;oBACnB,OAAO,EAAE,YAAY;oBACrB,OAAO,EAAE,qCAAqC;oBAC9C,MAAM,EAAE,iDAAiD;oBACzD,MAAM,EAAE,gDAAgD;oBACxD,MAAM,EAAE,yCAAyC;oBACjD,MAAM,EAAE,WAAW;oBACnB,MAAM,EAAE,WAAW;oBACnB,MAAM,EAAE,iBAAiB;oBACzB,OAAO,EAAE,YAAY;oBACrB,MAAM,EAAE,UAAU;oBAClB,MAAM,EAAE,WAAW;oBACnB,MAAM,EAAE,iBAAiB;oBACzB,MAAM,EAAE,yBAAyB;oBACjC,MAAM,EAAE,+BAA+B;oBACvC,OAAO,EAAE,2EAA2E;oBACpF,MAAM,EAAE,qBAAqB;oBAC7B,MAAM,EAAE,iBAAiB;oBACzB,KAAK,EAAE,kBAAkB;oBACzB,MAAM,EAAE,eAAe;oBACvB,MAAM,EAAE,+BAA+B;oBACvC,MAAM,EAAE,mBAAmB;oBAC3B,MAAM,EAAE,YAAY;oBACpB,OAAO,EAAE,YAAY;oBACrB,KAAK,EAAE,YAAY;oBACnB,MAAM,EAAE,UAAU;oBAClB,MAAM,EAAE,YAAY;oBACpB,MAAM,EAAE,uBAAuB;oBAC/B,MAAM,EAAE,WAAW;oBACnB,OAAO,EAAE,YAAY;oBACrB,OAAO,EAAE,YAAY;oBACrB,OAAO,EAAE,YAAY;oBACrB,OAAO,EAAE,WAAW;oBACpB,QAAQ,EAAE,YAAY;oBACtB,QAAQ,EAAE,uBAAuB;oBACjC,MAAM,EAAE,0BAA0B;oBAClC,OAAO,EAAE,mEAAmE;oBAC5E,MAAM,EAAE,iBAAiB;oBACzB,MAAM,EAAE,iCAAiC;oBACzC,MAAM,EAAE,iBAAiB;oBACzB,MAAM,EAAE,wBAAwB;oBAChC,MAAM,EAAE,0BAA0B;oBAClC,KAAK,EAAE,6BAA6B;iBACrC;aACF;YACD,kBAAkB,EAAE;gBAClB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,KAAK;gBACf,YAAY,EAAE,0BAA0B;aACzC;SACF,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QAC1B,IAAI,CAAC,IAAA,aAAQ,EAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,EAAE;YACzD,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,CAAC,aAAa,CAAC,SAAS,kBAAkB,CAAC,CAAC;SACtF;QACD,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,IAAI,CAAC,IAAA,eAAU,EAAC,IAAA,cAAO,EAAC,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,EAAE;YAClH,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,aAAa,CAAC,QAAQ,cAAc,CAAC,CAAC;SAChF;IACH,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,UAAgD,EAAE,gBAAiC,EAAE;QAClH,MAAM,EAAC,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAC,GAAG,IAAI,CAAC,aAAa,CAAC;QACnH,MAAM,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC;QACnC,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,EAAE;YACxB,MAAM,QAAQ,GAAG,IAAA,cAAO,EAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAClH,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;YAE5C,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE;gBACxB,IAAI,IAAA,aAAQ,EAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE;oBACpC,YAAY;oBACZ,MAAM,SAAS,GAAG,IAAA,cAAO,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;oBAC3C,IAAI,KAAK,IAAI,IAAA,eAAU,EAAC,SAAS,CAAC,IAAI,IAAA,aAAQ,EAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE;wBAClE,oBAAoB;wBACpB,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,SAAS,CAAC,CAAC;wBAC/B,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC;wBAC/E,MAAM,UAAU,CAAC,SAAS,EAAE,WAAW,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;qBAC7D;yBAAM;wBACL,uBAAuB;wBACvB,IAAI,IAAI,EAAE;4BACR,gBAAgB;4BAChB,MAAM,YAAY,CAAC,QAAQ,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;yBAClD;qBACF;iBACF;qBAAM;oBACL,qBAAqB;oBACrB,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;oBAC9B,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC;oBAC/E,MAAM,UAAU,CAAC,QAAQ,EAAE,WAAW,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;iBAC5D;aACF;SACF;QACD,IAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE;YAC9B,MAAM,QAAQ,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YACpF,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE;gBACxB,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;gBAC9B,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC;gBAC/E,MAAM,UAAU,CAAC,QAAQ,EAAE,WAAW,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;aAC5D;SACF;QACD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAClF,CAAC;CACF"}
1
+ {"version":3,"file":"static.js","sourceRoot":"","sources":["../src/static.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@miqro/core",
3
- "version": "1.5.12",
3
+ "version": "1.5.15",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -8,26 +8,28 @@
8
8
  "prepare": "npm run build",
9
9
  "prebuild": "rm -Rf dist/;",
10
10
  "build": "tsc",
11
- "pretest:file": "npm run build",
12
- "test": "npm run pretest:file && LOG_LEVEL=debug NODE_ENV=test miqro-test test/*.test.js -n ",
11
+ "pretest": "npm run build",
12
+ "test": "npm run test:unit && npm run test:func",
13
+ "test:unit": "LOG_LEVEL=debug NODE_ENV=test miqro-test -r src/ -n ",
14
+ "test:func": "LOG_LEVEL=debug NODE_ENV=test miqro-test test/*.test.js -n ",
13
15
  "test:file": "LOG_LEVEL=debug NODE_ENV=test miqro-test"
14
16
  },
15
17
  "author": "claukers",
16
18
  "license": "ISC",
17
19
  "devDependencies": {
18
- "@miqro/test": "^0.0.11",
20
+ "@miqro/test": "0.1.1",
21
+ "@types/node": "17.0.23",
22
+ "typescript": "4.6.3",
19
23
  "@types/cookie": "0.4.1",
20
- "@types/node": "16.7.10",
21
- "@types/uuid": "8.3.4",
22
- "typescript": "^4.5.4"
24
+ "@types/uuid": "8.3.4"
23
25
  },
24
26
  "engines": {
25
27
  "node": ">=16.0.0",
26
28
  "npm": ">=6.0.0"
27
29
  },
28
30
  "dependencies": {
29
- "@miqro/request": "^0.0.5",
30
- "@miqro/parser": "^0.0.6",
31
+ "@miqro/request": "^0.0.7",
32
+ "@miqro/parser": "^0.1.2",
31
33
  "cookie": "0.4.1",
32
34
  "uuid": "8.3.2"
33
35
  }
package/src/api-router.ts CHANGED
@@ -2,6 +2,19 @@ import {existsSync, lstatSync} from "fs";
2
2
  import {basename} from "path";
3
3
  import {FeatureRouter, traverseAPIRouteDir} from "./common/api-router-utils";
4
4
  import {Logger} from "./common/logger";
5
+ import {parse, ParseOptionMap} from "@miqro/parser";
6
+
7
+ export interface APIRouterOptions {
8
+ dirname: string;
9
+ apiName?: string;
10
+ path?: string;
11
+ }
12
+
13
+ const APIRouterParseOptions: ParseOptionMap = {
14
+ dirname: "string",
15
+ apiName: "string?",
16
+ path: "string?"
17
+ };
5
18
 
6
19
  /**
7
20
  * # APIRouter
@@ -33,12 +46,8 @@ import {Logger} from "./common/logger";
33
46
  *export default route;
34
47
  * ```
35
48
  */
36
- export const APIRouter = (options: {
37
- dirname: string;
38
- apiName?: string;
39
- path?: string;
40
- }, logger?: Logger) => {
41
- const {dirname} = options;
49
+ export function APIRouter(options: APIRouterOptions, logger?: Logger) {
50
+ const {dirname} = parse(options, APIRouterParseOptions, "no_extra", "options") as APIRouterOptions;
42
51
  if (typeof dirname !== "string") {
43
52
  throw new Error(`options.dirname must be defined!`);
44
53
  }
@@ -48,4 +57,4 @@ export const APIRouter = (options: {
48
57
  const apiName = options.apiName !== undefined ? options.apiName : basename(dirname);
49
58
  const apiPath = options.path !== undefined ? options.path : `/${apiName}`;
50
59
  return FeatureRouter(traverseAPIRouteDir(apiName.toUpperCase(), dirname, apiPath, undefined, logger), logger);
51
- };
60
+ }
@@ -0,0 +1,273 @@
1
+ const {fake, requireMock} = require("@miqro/test");
2
+ const {resolve} = require("path");
3
+ const {strictEqual} = require("assert");
4
+ const {distPath} = require("./setup-test.js");
5
+
6
+ const testFilePath = resolve(distPath, "api-router.js");
7
+
8
+ describe("api-router unit tests", () => {
9
+ it("directory doesnt exists", () => {
10
+ const parse = fake((args) => {
11
+ return args;
12
+ });
13
+ const existsSync = fake(() => {
14
+ return false;
15
+ });
16
+ const {APIRouter} = requireMock(testFilePath, {
17
+ fs: {
18
+ existsSync
19
+ },
20
+ path: {},
21
+ ["./common/api-router-utils"]: {},
22
+ ["./common/logger"]: {},
23
+ ["@miqro/parser"]: {
24
+ parse
25
+ }
26
+ }, distPath);
27
+ try {
28
+ APIRouter({
29
+ dirname: "dirname"
30
+ });
31
+ strictEqual(false, true);
32
+ } catch(e) {
33
+ strictEqual(parse.callCount, 1);
34
+ strictEqual(existsSync.callCount, 1);
35
+ strictEqual(e.message, "dirname not a directory!");
36
+ }
37
+
38
+ });
39
+ it("directory not directory", () => {
40
+ const parse = fake((args) => {
41
+ return args;
42
+ });
43
+ const existsSync = fake(() => {
44
+ return true;
45
+ });
46
+ const lstatSync = fake((arg) => {
47
+ return {
48
+ isDirectory: () => {
49
+ return false;
50
+ }
51
+ }
52
+ });
53
+ const {APIRouter} = requireMock(testFilePath, {
54
+ fs: {
55
+ existsSync,
56
+ lstatSync
57
+ },
58
+ path: {},
59
+ ["./common/api-router-utils"]: {},
60
+ ["./common/logger"]: {},
61
+ ["@miqro/parser"]: {
62
+ parse
63
+ }
64
+ }, distPath);
65
+
66
+ try {
67
+ APIRouter({
68
+ dirname: "dirname"
69
+ });
70
+ strictEqual(false, true);
71
+ } catch(e) {
72
+ strictEqual(parse.callCount, 1);
73
+ strictEqual(existsSync.callCount, 1);
74
+ strictEqual(lstatSync.callCount, 1);
75
+ strictEqual(e.message, "dirname not a directory!");
76
+ }
77
+ });
78
+ it("options.apiName undefined uses basename", () => {
79
+ const traverseAPIRouteDirRet = "traverseAPIRouteDirRet";
80
+ const FeatureRouterRet = "FeatureRouterRet";
81
+ const basenameRet = "basenameRet";
82
+ const parse = fake((args) => {
83
+ return args;
84
+ });
85
+ const existsSync = fake(() => {
86
+ return true;
87
+ });
88
+ const lstatSync = fake((arg) => {
89
+ return {
90
+ isDirectory: () => {
91
+ return true;
92
+ }
93
+ }
94
+ });
95
+ const basename = fake((arg)=>{
96
+ return basenameRet;
97
+ });
98
+ const traverseAPIRouteDir = fake(()=>{
99
+ return traverseAPIRouteDirRet;
100
+ });
101
+ const FeatureRouter = fake(()=>{
102
+ return FeatureRouterRet;
103
+ });
104
+ const {APIRouter} = requireMock(testFilePath, {
105
+ fs: {
106
+ existsSync,
107
+ lstatSync
108
+ },
109
+ path: {
110
+ basename
111
+ },
112
+ ["./common/api-router-utils"]: {
113
+ traverseAPIRouteDir,
114
+ FeatureRouter
115
+ },
116
+ ["./common/logger"]: {},
117
+ ["@miqro/parser"]: {
118
+ parse
119
+ }
120
+ }, distPath);
121
+
122
+ const apiOptions = {
123
+ dirname: "dirname"
124
+ };
125
+ const logger = "fakeLogger";
126
+ APIRouter(apiOptions, logger);
127
+
128
+ strictEqual(parse.callCount, 1);
129
+ strictEqual(parse.callArgs[0][0], apiOptions);
130
+ strictEqual(existsSync.callCount, 1);
131
+ strictEqual(existsSync.callArgs[0][0], apiOptions.dirname);
132
+ strictEqual(lstatSync.callCount, 1);
133
+ strictEqual(lstatSync.callArgs[0][0], apiOptions.dirname);
134
+ strictEqual(basename.callCount, 1);
135
+ strictEqual(basename.callArgs[0][0], apiOptions.dirname);
136
+ strictEqual(traverseAPIRouteDir.callCount, 1);
137
+ strictEqual(traverseAPIRouteDir.callArgs[0][0], basenameRet.toUpperCase());
138
+ strictEqual(traverseAPIRouteDir.callArgs[0][1], apiOptions.dirname);
139
+ strictEqual(traverseAPIRouteDir.callArgs[0][2], `/${basenameRet}`);
140
+ strictEqual(traverseAPIRouteDir.callArgs[0][3], undefined);
141
+ strictEqual(traverseAPIRouteDir.callArgs[0][4], logger);
142
+ strictEqual(FeatureRouter.callCount, 1);
143
+ strictEqual(FeatureRouter.callArgs[0][0], traverseAPIRouteDirRet);
144
+ strictEqual(FeatureRouter.callArgs[0][1], logger);
145
+ });
146
+ it("options.apiName defined", () => {
147
+ const traverseAPIRouteDirRet = "traverseAPIRouteDirRet";
148
+ const FeatureRouterRet = "FeatureRouterRet";
149
+ const parse = fake((args) => {
150
+ return args;
151
+ });
152
+ const existsSync = fake(() => {
153
+ return true;
154
+ });
155
+ const lstatSync = fake((arg) => {
156
+ return {
157
+ isDirectory: () => {
158
+ return true;
159
+ }
160
+ }
161
+ });
162
+ const traverseAPIRouteDir = fake(()=>{
163
+ return traverseAPIRouteDirRet;
164
+ });
165
+ const FeatureRouter = fake(()=>{
166
+ return FeatureRouterRet;
167
+ });
168
+ const {APIRouter} = requireMock(testFilePath, {
169
+ fs: {
170
+ existsSync,
171
+ lstatSync
172
+ },
173
+ path: {
174
+
175
+ },
176
+ ["./common/api-router-utils"]: {
177
+ traverseAPIRouteDir,
178
+ FeatureRouter
179
+ },
180
+ ["./common/logger"]: {},
181
+ ["@miqro/parser"]: {
182
+ parse
183
+ }
184
+ }, distPath);
185
+
186
+ const apiOptions = {
187
+ dirname: "dirname",
188
+ apiName: "apiName"
189
+ };
190
+ const logger = "fakeLogger";
191
+ APIRouter(apiOptions, logger);
192
+
193
+ strictEqual(parse.callCount, 1);
194
+ strictEqual(parse.callArgs[0][0], apiOptions);
195
+ strictEqual(existsSync.callCount, 1);
196
+ strictEqual(existsSync.callArgs[0][0], apiOptions.dirname);
197
+ strictEqual(lstatSync.callCount, 1);
198
+ strictEqual(lstatSync.callArgs[0][0], apiOptions.dirname);
199
+ strictEqual(traverseAPIRouteDir.callCount, 1);
200
+ strictEqual(traverseAPIRouteDir.callArgs[0][0], apiOptions.apiName.toUpperCase());
201
+ strictEqual(traverseAPIRouteDir.callArgs[0][1], apiOptions.dirname);
202
+ strictEqual(traverseAPIRouteDir.callArgs[0][2], `/${apiOptions.apiName}`);
203
+ strictEqual(traverseAPIRouteDir.callArgs[0][3], undefined);
204
+ strictEqual(traverseAPIRouteDir.callArgs[0][4], logger);
205
+ strictEqual(FeatureRouter.callCount, 1);
206
+ strictEqual(FeatureRouter.callArgs[0][0], traverseAPIRouteDirRet);
207
+ strictEqual(FeatureRouter.callArgs[0][1], logger);
208
+ });
209
+ it("options.path defined", () => {
210
+ const traverseAPIRouteDirRet = "traverseAPIRouteDirRet";
211
+ const FeatureRouterRet = "FeatureRouterRet";
212
+ const parse = fake((args) => {
213
+ return args;
214
+ });
215
+ const existsSync = fake(() => {
216
+ return true;
217
+ });
218
+ const lstatSync = fake((arg) => {
219
+ return {
220
+ isDirectory: () => {
221
+ return true;
222
+ }
223
+ }
224
+ });
225
+ const traverseAPIRouteDir = fake(()=>{
226
+ return traverseAPIRouteDirRet;
227
+ });
228
+ const FeatureRouter = fake(()=>{
229
+ return FeatureRouterRet;
230
+ });
231
+ const {APIRouter} = requireMock(testFilePath, {
232
+ fs: {
233
+ existsSync,
234
+ lstatSync
235
+ },
236
+ path: {
237
+
238
+ },
239
+ ["./common/api-router-utils"]: {
240
+ traverseAPIRouteDir,
241
+ FeatureRouter
242
+ },
243
+ ["./common/logger"]: {},
244
+ ["@miqro/parser"]: {
245
+ parse
246
+ }
247
+ }, distPath);
248
+
249
+ const apiOptions = {
250
+ dirname: "dirname",
251
+ apiName: "apiName",
252
+ path: "apiPath"
253
+ };
254
+ const logger = "fakeLogger";
255
+ APIRouter(apiOptions, logger);
256
+
257
+ strictEqual(parse.callCount, 1);
258
+ strictEqual(parse.callArgs[0][0], apiOptions);
259
+ strictEqual(existsSync.callCount, 1);
260
+ strictEqual(existsSync.callArgs[0][0], apiOptions.dirname);
261
+ strictEqual(lstatSync.callCount, 1);
262
+ strictEqual(lstatSync.callArgs[0][0], apiOptions.dirname);
263
+ strictEqual(traverseAPIRouteDir.callCount, 1);
264
+ strictEqual(traverseAPIRouteDir.callArgs[0][0], apiOptions.apiName.toUpperCase());
265
+ strictEqual(traverseAPIRouteDir.callArgs[0][1], apiOptions.dirname);
266
+ strictEqual(traverseAPIRouteDir.callArgs[0][2], `${apiOptions.path}`);
267
+ strictEqual(traverseAPIRouteDir.callArgs[0][3], undefined);
268
+ strictEqual(traverseAPIRouteDir.callArgs[0][4], logger);
269
+ strictEqual(FeatureRouter.callCount, 1);
270
+ strictEqual(FeatureRouter.callArgs[0][0], traverseAPIRouteDirRet);
271
+ strictEqual(FeatureRouter.callArgs[0][1], logger);
272
+ });
273
+ });
@@ -26,11 +26,11 @@ export const APIRouteValidator: ParseOptionMap = {
26
26
  handler: "function[]!"
27
27
  };
28
28
 
29
- export const traverseAPIRouteDir = (
29
+ export function traverseAPIRouteDir(
30
30
  featureName: string,
31
31
  dirname: string,
32
32
  basePath = "/",
33
- features: FeatureRouterOptions = {}, logger?: Logger): FeatureRouterOptions => {
33
+ features: FeatureRouterOptions = {}, logger?: Logger): FeatureRouterOptions {
34
34
  if (logger) {
35
35
  logger.trace("loading routes from [%s]", dirname);
36
36
  }
@@ -203,4 +203,4 @@ export const FeatureRouter = (options: FeatureRouterOptions, logger?: Logger): R
203
203
  }
204
204
  }
205
205
  return router;
206
- };
206
+ }
@@ -0,0 +1,159 @@
1
+ import {matchTokenizePath, PathPart, PathParams, PathPartToken, tokenizePath} from "./tokenize-match";
2
+ import {Context, Handler, Method} from "./context";
3
+ import {Router} from "../router";
4
+ import {parse} from "@miqro/parser";
5
+ import {GroupPolicyHandler, ParseRequest, SessionHandler, ResultParser} from "../middleware";
6
+ import {
7
+ HandlerWithOptions,
8
+ handlerWithOptionsParseOptions, ResponseHandler,
9
+ RouterHandlerOptions,
10
+ routerHandlerParseOptions, RouterJSONDoc
11
+ } from "./router-utils";
12
+
13
+ export class RouterHandler {
14
+
15
+ private readonly tokens: PathPartToken[];
16
+ private readonly handler: Array<Handler | Router>;
17
+ private readonly isRouter: boolean;
18
+ private readonly options?: RouterHandlerOptions;
19
+
20
+ public constructor(
21
+ handler: Array<Handler> | HandlerWithOptions | Handler | Router,
22
+ private readonly path: string | undefined,
23
+ private readonly method: Method | undefined,
24
+ options?: RouterHandlerOptions) {
25
+ this.tokens = tokenizePath(path);
26
+
27
+ if (options) {
28
+ options = parse(options, routerHandlerParseOptions, "no_extra", "options");
29
+ }
30
+
31
+ let handlers: Array<Handler | Router> = []
32
+ this.isRouter = handler instanceof Router;
33
+
34
+ if (!this.isRouter && !(handler instanceof Array) && typeof handler === "object") {
35
+ // HandlerWithOptions
36
+ if (options) {
37
+ throw new Error("bad arguments. cannot send options with HandlerWithOptions");
38
+ }
39
+ handler = parse(handler, handlerWithOptionsParseOptions, "no_extra", "handler");
40
+ const realHandler = (handler as HandlerWithOptions).handler;
41
+ const newOptions = {
42
+ ...(handler as HandlerWithOptions)
43
+ };
44
+ delete (newOptions as any).handler;
45
+ handler = realHandler;
46
+ this.options = newOptions;
47
+ } else {
48
+ this.options = options;
49
+ }
50
+ const routeHandlers = handler instanceof Array ? handler : [handler] as Array<Handler | Router>;
51
+
52
+ if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length) || (this.isRouter && this.options)) {
53
+ throw new Error("bad arguments");
54
+ }
55
+
56
+ if (this.options && this.options.middleware) {
57
+ handlers = handlers.concat(this.options.middleware);
58
+ }
59
+ if (this.options && this.options.session) {
60
+ handlers.push(typeof this.options.session !== "function" ? SessionHandler(this.options.session) : this.options.session);
61
+ }
62
+ if (this.options && this.options.policy) {
63
+ handlers.push(GroupPolicyHandler(this.options.policy));
64
+ }
65
+ if (this.options && this.options.request) {
66
+ handlers.push(ParseRequest(this.options.request, this.options.parser));
67
+ }
68
+
69
+ handlers = handlers.concat(routeHandlers);
70
+
71
+ if (this.options && this.options.response) {
72
+ if (typeof this.options.response.body === "boolean" && this.options.response.body) {
73
+ (handlers as Handler[]).push(ResponseHandler());
74
+ } else if (this.options.response.body) {
75
+ (handlers as Handler[]).push(ResultParser(this.options.response.body, this.options.parser));
76
+ (handlers as Handler[]).push(ResponseHandler());
77
+ }
78
+ }
79
+ this.handler = handlers;
80
+ }
81
+
82
+ public getJSONDoc(doc: RouterJSONDoc = {}, prePath = "/"): RouterJSONDoc {
83
+ const nPath = this.path && this.path.length > 1 ? this.path.substring(1) : "";
84
+ const nMethod = this.method ? this.method : "";
85
+
86
+ if (this.isRouter) {
87
+ const router: Router = this.handler[0] as Router;
88
+ router.getJSONDoc(doc, `${prePath}${nPath}`);
89
+ } else if (this.options) {
90
+ if (!doc[`${prePath}${nPath}`]) {
91
+ doc[`${prePath}${nPath}`] = {};
92
+ }
93
+ if (doc[`${prePath}${nPath}`][nMethod]) {
94
+ throw new Error("cannot create doc routes override each other");
95
+ }
96
+ doc[`${prePath}${nPath}`][nMethod] = {
97
+ description: this.options.description,
98
+ name: this.options.name,
99
+ identifier: `${prePath}${nPath}${this.options.name ? this.options.name : ""}${nMethod ? `_${nMethod}` : ""}`.replace(/[^a-z0-9+]+/gi, '_').split("_").map(s => s.trim()).filter(s => s).join("_").toUpperCase(),
100
+ policy: this.options.policy,
101
+ request: this.options.request ? {
102
+ body: this.options.request.body,
103
+ headers: this.options.request.headers,
104
+ params: this.options.request.params,
105
+ query: this.options.request.query,
106
+ } : undefined,
107
+ response: this.options.response
108
+ };
109
+ }
110
+ return doc;
111
+ }
112
+
113
+ public async invoke(ctx: Context, pathTokens: PathPart[], prePathTokens: PathPartToken[]): Promise<boolean> {
114
+ for (let i = 0; i < this.handler.length; i++) {
115
+ const h = this.handler[i];
116
+ if (h instanceof Router) {
117
+ if (!RouterHandler.pushResults(await h.run(ctx, pathTokens, prePathTokens.concat(this.tokens)), ctx)) {
118
+ return false;
119
+ }
120
+ } else {
121
+ if (!RouterHandler.pushResults(await h(ctx), ctx)) {
122
+ return false;
123
+ }
124
+ }
125
+ }
126
+ return true;
127
+ }
128
+
129
+ public isMatch(
130
+ method: string,
131
+ requestParts: PathPart[],
132
+ prePathTokens: PathPartToken[]): {
133
+ match: boolean;
134
+ params?: PathParams
135
+ } {
136
+ if ((this.method === undefined || this.method === method)) {
137
+ if (this.path === undefined) {
138
+ return {
139
+ match: true
140
+ };
141
+ }
142
+ return matchTokenizePath(this.isRouter, prePathTokens.concat(this.tokens), requestParts);
143
+ }
144
+ return {
145
+ match: false
146
+ };
147
+ }
148
+
149
+ private static pushResults(result: any, ctx: Context): boolean {
150
+ if (result === false) {
151
+ // ctx.logger.debug(`avoiding next handlers because handler returned false.`);
152
+ return false;
153
+ } else if (result !== true && result !== undefined) {
154
+ ctx.logger.trace("pushing to results [%o]", result);
155
+ ctx.results.push(result);
156
+ }
157
+ return true;
158
+ }
159
+ }
@@ -1,47 +1,7 @@
1
1
  import {Context, Handler} from "./context";
2
- import {parse, ParseOptions, ParserInterface} from "@miqro/parser";
2
+ import {ParseOptionMap, ParseOptions, ParserInterface} from "@miqro/parser";
3
3
  import {GroupPolicy, SessionHandlerOptions} from "./session";
4
4
 
5
- export const ResultParser = (options: ParseOptions | ParseOptions[] | string, parser?: ParserInterface): Handler => {
6
- return async function ResultParser(ctx: Context): Promise<any> {
7
- if (!ctx.results || ctx.results.length === 0) {
8
- ctx.logger.debug(`not parsing results`);
9
- return undefined;
10
- } else {
11
- const index = ctx.results.length - 1;
12
- const lastResult = ctx.results[index];
13
- ctx.logger.trace(`parsing lastResult[%o]`, lastResult);
14
- try {
15
- if (options instanceof Array) {
16
- for (let i = 0; i < options.length; i++) {
17
- const o = options[i];
18
- try {
19
- const mappedResults = (parser ? parser : {parse}).parse(lastResult, o.options, o.mode, `ctx.results[${index}]`);
20
- ctx.logger.trace(`ctx.results[%s] mapped to %o`, index, mappedResults);
21
- return mappedResults;
22
- } catch (e) {
23
- if (i === options.length - 1) {
24
- throw e;
25
- }
26
- }
27
- }
28
- } else if (typeof options !== "string") {
29
- const mappedResults = (parser ? parser : {parse}).parse(lastResult, options.options, options.mode, `ctx.results[${index}]`);
30
- ctx.logger.trace(`ctx.results[%s] mapped to %o`, index, mappedResults);
31
- return mappedResults;
32
- } else {
33
- const mappedResults = (parser ? parser : {parse}).parse(lastResult, options, "no_extra", `ctx.results[${index}]`);
34
- ctx.logger.trace(`ctx.results[%s] mapped to %o`, index, mappedResults);
35
- return mappedResults;
36
- }
37
- } catch (e) {
38
- ctx.logger.error(`error parsing lastResult[%o]`, lastResult);
39
- throw e;
40
- }
41
- }
42
- }
43
- }
44
-
45
5
  export const ResponseHandler = (): Handler<void> => async (ctx: Context): Promise<void> => {
46
6
  ctx.logger.trace("results [%o]", ctx.results);
47
7
  if (!ctx.results || ctx.results.length === 0) {
@@ -57,9 +17,33 @@ export const ResponseHandler = (): Handler<void> => async (ctx: Context): Promis
57
17
  }
58
18
  };
59
19
 
60
- export interface HandlerWithOptions extends RouterHandlerOptions {
61
- handler: Handler | Array<Handler>;
62
- }
20
+
21
+ export const routeParseOptions: ParseOptionMap = {
22
+ name: "string?",
23
+ description: "string?",
24
+ policy: "GroupPolicy?",
25
+ response: {
26
+ type: "nested?",
27
+ nestedOptions: {
28
+ options: {
29
+ body: "boolean?|ParseOptions[]!?|string?"
30
+ },
31
+ mode: "no_extra"
32
+ }
33
+ },
34
+ request: {
35
+ type: "nested?",
36
+ nestedOptions: {
37
+ options: {
38
+ headers: "ParseOptions[]!?",
39
+ query: "boolean?|ParseOptions[]!?|string?",
40
+ params: "boolean?|ParseOptions[]!?|string?",
41
+ body: "boolean?|ParseOptions[]!?|string?"
42
+ },
43
+ mode: "no_extra"
44
+ }
45
+ }
46
+ };
63
47
 
64
48
  export interface RouteOptions {
65
49
  name?: string;
@@ -86,8 +70,26 @@ export interface RouterJSONDoc {
86
70
  }
87
71
  }
88
72
 
73
+ export const routerHandlerParseOptions: ParseOptionMap = {
74
+ ...routeParseOptions,
75
+ parser: "ParserInterface?",
76
+ middleware: "function[]!?",
77
+ session: "SessionHandlerOptions?|function?"
78
+ };
79
+
89
80
  export interface RouterHandlerOptions extends RouteOptions {
90
81
  parser?: ParserInterface;
91
82
  middleware?: Handler | Handler[];
92
83
  session?: SessionHandlerOptions | Handler;
93
84
  }
85
+
86
+ export const handlerWithOptionsParseOptions: ParseOptionMap = {
87
+ ...routerHandlerParseOptions,
88
+ handler: "function[]!",
89
+ };
90
+
91
+ export interface HandlerWithOptions extends RouterHandlerOptions {
92
+ handler: Handler | Array<Handler>;
93
+ }
94
+
95
+