@fjell/express-router 4.4.1 → 4.4.3
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/CItemRouter.cjs +20 -4
- package/dist/CItemRouter.cjs.map +1 -1
- package/dist/CItemRouter.d.ts +2 -2
- package/dist/CItemRouter.js +20 -4
- package/dist/CItemRouter.js.map +1 -1
- package/dist/ItemRouter.cjs +79 -36
- package/dist/ItemRouter.cjs.map +1 -1
- package/dist/ItemRouter.d.ts +8 -12
- package/dist/ItemRouter.js +79 -36
- package/dist/ItemRouter.js.map +1 -1
- package/dist/PItemRouter.cjs +14 -5
- package/dist/PItemRouter.cjs.map +1 -1
- package/dist/PItemRouter.d.ts +2 -2
- package/dist/PItemRouter.js +14 -5
- package/dist/PItemRouter.js.map +1 -1
- package/dist/index.cjs +113 -45
- package/dist/index.cjs.map +1 -1
- package/dist/logger.cjs.map +1 -1
- package/dist/logger.js.map +1 -1
- package/package.json +8 -31
- package/src/CItemRouter.ts +14 -7
- package/src/ItemRouter.ts +64 -55
- package/src/PItemRouter.ts +14 -8
package/dist/CItemRouter.cjs
CHANGED
|
@@ -60,8 +60,8 @@ class CItemRouter extends ItemRouter.ItemRouter {
|
|
|
60
60
|
locations: this.getLocations(res)
|
|
61
61
|
}), this.getPkType());
|
|
62
62
|
item = await this.postCreateItem(item);
|
|
63
|
-
|
|
64
|
-
}),
|
|
63
|
+
res.json(item);
|
|
64
|
+
}), _define_property(this, "findItems", async (req, res)=>{
|
|
65
65
|
logger.trace('Finding Items', {
|
|
66
66
|
query: req.query,
|
|
67
67
|
params: req.params,
|
|
@@ -70,16 +70,32 @@ class CItemRouter extends ItemRouter.ItemRouter {
|
|
|
70
70
|
const query = req.query;
|
|
71
71
|
const finder = query['finder'];
|
|
72
72
|
const finderParams = query['finderParams'];
|
|
73
|
+
const one = query['one'];
|
|
73
74
|
let items = [];
|
|
74
75
|
if (finder) {
|
|
75
76
|
// If finder is defined? Call a finder.
|
|
76
|
-
|
|
77
|
+
logger.trace('Finding Items with a finder', {
|
|
78
|
+
finder,
|
|
79
|
+
finderParams,
|
|
80
|
+
one
|
|
81
|
+
});
|
|
82
|
+
if (one === 'true') {
|
|
83
|
+
const item = await this.lib.findOne(finder, JSON.parse(finderParams), this.getLocations(res));
|
|
84
|
+
items = item ? [
|
|
85
|
+
item
|
|
86
|
+
] : [];
|
|
87
|
+
} else {
|
|
88
|
+
items = await this.lib.find(finder, JSON.parse(finderParams), this.getLocations(res));
|
|
89
|
+
}
|
|
77
90
|
} else {
|
|
91
|
+
logger.trace('Finding Items with a query', {
|
|
92
|
+
query: req.query
|
|
93
|
+
});
|
|
78
94
|
// TODO: This is once of the more important places to perform some validaation and feedback
|
|
79
95
|
const itemQuery = core.paramsToQuery(req.query);
|
|
80
96
|
items = await this.lib.all(itemQuery, this.getLocations(res));
|
|
81
97
|
}
|
|
82
|
-
|
|
98
|
+
res.json(items.map((item)=>core.validatePK(item, this.getPkType())));
|
|
83
99
|
});
|
|
84
100
|
this.parentRoute = parentRoute;
|
|
85
101
|
}
|
package/dist/CItemRouter.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CItemRouter.cjs","sources":["../src/CItemRouter.ts"],"sourcesContent":["import {\n ComKey, Item, ItemQuery, LocKey, LocKeyArray, paramsToQuery, PriKey, QueryParams, validatePK\n} from \"@fjell/core\";\nimport { Request, Response } from \"express\";\nimport { ItemRouter, ItemRouterOptions } from \"@/ItemRouter\";\nimport LibLogger from \"@/logger\";\nimport { Contained } from \"@fjell/lib\";\n\nconst logger = LibLogger.get('CItemRouter');\ninterface ParsedQuery {\n [key: string]: undefined | string | string[] | ParsedQuery | ParsedQuery[];\n}\n\nexport class CItemRouter<\n T extends Item<S, L1, L2, L3, L4, L5>,\n S extends string,\n L1 extends string,\n L2 extends string = never,\n L3 extends string = never,\n L4 extends string = never,\n L5 extends string = never\n> extends ItemRouter<S, L1, L2, L3, L4, L5> {\n\n private parentRoute: ItemRouter<L1, L2, L3, L4, L5, never>;\n\n constructor(\n lib: Contained.Operations<T, S, L1, L2, L3, L4, L5>,\n type: S,\n parentRoute: ItemRouter<L1, L2, L3, L4, L5, never>,\n options: ItemRouterOptions = {},\n ) {\n super(lib, type, options);\n this.parentRoute = parentRoute;\n }\n\n public hasParent(): boolean {\n return !!this.parentRoute;\n }\n\n public getIk(res: Response): ComKey<S, L1, L2, L3, L4, L5> {\n const pri = this.getPk(res) as PriKey<S>;\n const loc = this.getLocations(res) as LocKeyArray<L1, L2, L3, L4, L5>;\n return { kt: pri.kt, pk: pri.pk, loc }\n }\n\n public getLKA(res: Response): LocKeyArray<S, L1, L2, L3, L4> {\n /**\n * A location key array is passed to a child router to provide contextfor the items it will\n * be working with. It is always a concatenation of \"My LKA\" + \"Parent LKA\" which will\n * bubble all the way up to the root Primary.\n */\n let lka: LocKey<S | L1 | L2 | L3 | L4>[] = [this.getLk(res)];\n lka = lka.concat(this.parentRoute.getLKA(res) as LocKey<S | L1 | L2 | L3 | L4>[]);\n return lka as LocKeyArray<S, L1, L2, L3, L4>;\n }\n\n public getLocations(res: Response): LocKeyArray<L1, L2, L3, L4, L5> {\n return this.parentRoute.getLKA(res) as LocKeyArray<L1, L2, L3, L4, L5>;\n }\n\n protected createItem = async (req: Request, res: Response) => {\n logger.trace('Creating Item 2',\n { body: req?.body, query: req?.query, params: req?.params, locals: res?.locals });\n const itemToCreate = this.convertDates(req.body as Item<S, L1, L2, L3, L4, L5>);\n let item =\n validatePK(await this.lib.create(\n itemToCreate, { locations: this.getLocations(res) }), this.getPkType()) as Item<S, L1, L2, L3, L4, L5>;\n item = await this.postCreateItem(item);\n
|
|
1
|
+
{"version":3,"file":"CItemRouter.cjs","sources":["../src/CItemRouter.ts"],"sourcesContent":["import {\n ComKey, Item, ItemQuery, LocKey, LocKeyArray, paramsToQuery, PriKey, QueryParams, validatePK\n} from \"@fjell/core\";\nimport { Request, Response } from \"express\";\nimport { ItemRouter, ItemRouterOptions } from \"@/ItemRouter\";\nimport LibLogger from \"@/logger\";\nimport { Contained } from \"@fjell/lib\";\n\nconst logger = LibLogger.get('CItemRouter');\ninterface ParsedQuery {\n [key: string]: undefined | string | string[] | ParsedQuery | ParsedQuery[];\n}\n\nexport class CItemRouter<\n T extends Item<S, L1, L2, L3, L4, L5>,\n S extends string,\n L1 extends string,\n L2 extends string = never,\n L3 extends string = never,\n L4 extends string = never,\n L5 extends string = never\n> extends ItemRouter<S, L1, L2, L3, L4, L5> {\n\n private parentRoute: ItemRouter<L1, L2, L3, L4, L5, never>;\n\n constructor(\n lib: Contained.Operations<T, S, L1, L2, L3, L4, L5>,\n type: S,\n parentRoute: ItemRouter<L1, L2, L3, L4, L5, never>,\n options: ItemRouterOptions = {},\n ) {\n super(lib as any, type, options);\n this.parentRoute = parentRoute;\n }\n\n public hasParent(): boolean {\n return !!this.parentRoute;\n }\n\n public getIk(res: Response): ComKey<S, L1, L2, L3, L4, L5> {\n const pri = this.getPk(res) as PriKey<S>;\n const loc = this.getLocations(res) as LocKeyArray<L1, L2, L3, L4, L5>;\n return { kt: pri.kt, pk: pri.pk, loc }\n }\n\n public getLKA(res: Response): LocKeyArray<S, L1, L2, L3, L4> {\n /**\n * A location key array is passed to a child router to provide contextfor the items it will\n * be working with. It is always a concatenation of \"My LKA\" + \"Parent LKA\" which will\n * bubble all the way up to the root Primary.\n */\n let lka: LocKey<S | L1 | L2 | L3 | L4>[] = [this.getLk(res)];\n lka = lka.concat(this.parentRoute.getLKA(res) as LocKey<S | L1 | L2 | L3 | L4>[]);\n return lka as LocKeyArray<S, L1, L2, L3, L4>;\n }\n\n public getLocations(res: Response): LocKeyArray<L1, L2, L3, L4, L5> {\n return this.parentRoute.getLKA(res) as LocKeyArray<L1, L2, L3, L4, L5>;\n }\n\n protected createItem = async (req: Request, res: Response) => {\n logger.trace('Creating Item 2',\n { body: req?.body, query: req?.query, params: req?.params, locals: res?.locals });\n const itemToCreate = this.convertDates(req.body as Item<S, L1, L2, L3, L4, L5>);\n let item =\n validatePK(await this.lib.create(\n itemToCreate, { locations: this.getLocations(res) }), this.getPkType()) as Item<S, L1, L2, L3, L4, L5>;\n item = await this.postCreateItem(item);\n res.json(item);\n };\n\n protected findItems = async (req: Request, res: Response) => {\n logger.trace('Finding Items', { query: req.query, params: req.params, locals: res.locals });\n\n const query: ParsedQuery = req.query as unknown as ParsedQuery;\n const finder = query['finder'] as string;\n const finderParams = query['finderParams'] as string;\n const one = query['one'] as string;\n\n let items: Item<S, L1, L2, L3, L4, L5>[] = [];\n\n if (finder) {\n // If finder is defined? Call a finder.\n logger.trace('Finding Items with a finder', { finder, finderParams, one });\n\n if (one === 'true') {\n const item = await (this.lib as any).findOne(finder, JSON.parse(finderParams), this.getLocations(res));\n items = item ? [item] : [];\n } else {\n items = await this.lib.find(finder, JSON.parse(finderParams), this.getLocations(res));\n }\n } else {\n logger.trace('Finding Items with a query', { query: req.query });\n // TODO: This is once of the more important places to perform some validaation and feedback\n const itemQuery: ItemQuery = paramsToQuery(req.query as QueryParams);\n items = await this.lib.all(itemQuery, this.getLocations(res));\n }\n\n res.json(items.map((item: Item<S, L1, L2, L3, L4, L5>) => validatePK(item, this.getPkType())));\n };\n\n}\n"],"names":["logger","LibLogger","get","CItemRouter","ItemRouter","hasParent","parentRoute","getIk","res","pri","getPk","loc","getLocations","kt","pk","getLKA","lka","getLk","concat","lib","type","options","createItem","req","trace","body","query","params","locals","itemToCreate","convertDates","item","validatePK","create","locations","getPkType","postCreateItem","json","findItems","finder","finderParams","one","items","findOne","JSON","parse","find","itemQuery","paramsToQuery","all","map"],"mappings":"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"}
|
package/dist/CItemRouter.d.ts
CHANGED
|
@@ -9,6 +9,6 @@ export declare class CItemRouter<T extends Item<S, L1, L2, L3, L4, L5>, S extend
|
|
|
9
9
|
getIk(res: Response): ComKey<S, L1, L2, L3, L4, L5>;
|
|
10
10
|
getLKA(res: Response): LocKeyArray<S, L1, L2, L3, L4>;
|
|
11
11
|
getLocations(res: Response): LocKeyArray<L1, L2, L3, L4, L5>;
|
|
12
|
-
protected createItem: (req: Request, res: Response) => Promise<
|
|
13
|
-
protected findItems: (req: Request, res: Response) => Promise<
|
|
12
|
+
protected createItem: (req: Request, res: Response) => Promise<void>;
|
|
13
|
+
protected findItems: (req: Request, res: Response) => Promise<void>;
|
|
14
14
|
}
|
package/dist/CItemRouter.js
CHANGED
|
@@ -56,8 +56,8 @@ class CItemRouter extends ItemRouter {
|
|
|
56
56
|
locations: this.getLocations(res)
|
|
57
57
|
}), this.getPkType());
|
|
58
58
|
item = await this.postCreateItem(item);
|
|
59
|
-
|
|
60
|
-
}),
|
|
59
|
+
res.json(item);
|
|
60
|
+
}), _define_property(this, "findItems", async (req, res)=>{
|
|
61
61
|
logger.trace('Finding Items', {
|
|
62
62
|
query: req.query,
|
|
63
63
|
params: req.params,
|
|
@@ -66,16 +66,32 @@ class CItemRouter extends ItemRouter {
|
|
|
66
66
|
const query = req.query;
|
|
67
67
|
const finder = query['finder'];
|
|
68
68
|
const finderParams = query['finderParams'];
|
|
69
|
+
const one = query['one'];
|
|
69
70
|
let items = [];
|
|
70
71
|
if (finder) {
|
|
71
72
|
// If finder is defined? Call a finder.
|
|
72
|
-
|
|
73
|
+
logger.trace('Finding Items with a finder', {
|
|
74
|
+
finder,
|
|
75
|
+
finderParams,
|
|
76
|
+
one
|
|
77
|
+
});
|
|
78
|
+
if (one === 'true') {
|
|
79
|
+
const item = await this.lib.findOne(finder, JSON.parse(finderParams), this.getLocations(res));
|
|
80
|
+
items = item ? [
|
|
81
|
+
item
|
|
82
|
+
] : [];
|
|
83
|
+
} else {
|
|
84
|
+
items = await this.lib.find(finder, JSON.parse(finderParams), this.getLocations(res));
|
|
85
|
+
}
|
|
73
86
|
} else {
|
|
87
|
+
logger.trace('Finding Items with a query', {
|
|
88
|
+
query: req.query
|
|
89
|
+
});
|
|
74
90
|
// TODO: This is once of the more important places to perform some validaation and feedback
|
|
75
91
|
const itemQuery = paramsToQuery(req.query);
|
|
76
92
|
items = await this.lib.all(itemQuery, this.getLocations(res));
|
|
77
93
|
}
|
|
78
|
-
|
|
94
|
+
res.json(items.map((item)=>validatePK(item, this.getPkType())));
|
|
79
95
|
});
|
|
80
96
|
this.parentRoute = parentRoute;
|
|
81
97
|
}
|
package/dist/CItemRouter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CItemRouter.js","sources":["../src/CItemRouter.ts"],"sourcesContent":["import {\n ComKey, Item, ItemQuery, LocKey, LocKeyArray, paramsToQuery, PriKey, QueryParams, validatePK\n} from \"@fjell/core\";\nimport { Request, Response } from \"express\";\nimport { ItemRouter, ItemRouterOptions } from \"@/ItemRouter\";\nimport LibLogger from \"@/logger\";\nimport { Contained } from \"@fjell/lib\";\n\nconst logger = LibLogger.get('CItemRouter');\ninterface ParsedQuery {\n [key: string]: undefined | string | string[] | ParsedQuery | ParsedQuery[];\n}\n\nexport class CItemRouter<\n T extends Item<S, L1, L2, L3, L4, L5>,\n S extends string,\n L1 extends string,\n L2 extends string = never,\n L3 extends string = never,\n L4 extends string = never,\n L5 extends string = never\n> extends ItemRouter<S, L1, L2, L3, L4, L5> {\n\n private parentRoute: ItemRouter<L1, L2, L3, L4, L5, never>;\n\n constructor(\n lib: Contained.Operations<T, S, L1, L2, L3, L4, L5>,\n type: S,\n parentRoute: ItemRouter<L1, L2, L3, L4, L5, never>,\n options: ItemRouterOptions = {},\n ) {\n super(lib, type, options);\n this.parentRoute = parentRoute;\n }\n\n public hasParent(): boolean {\n return !!this.parentRoute;\n }\n\n public getIk(res: Response): ComKey<S, L1, L2, L3, L4, L5> {\n const pri = this.getPk(res) as PriKey<S>;\n const loc = this.getLocations(res) as LocKeyArray<L1, L2, L3, L4, L5>;\n return { kt: pri.kt, pk: pri.pk, loc }\n }\n\n public getLKA(res: Response): LocKeyArray<S, L1, L2, L3, L4> {\n /**\n * A location key array is passed to a child router to provide contextfor the items it will\n * be working with. It is always a concatenation of \"My LKA\" + \"Parent LKA\" which will\n * bubble all the way up to the root Primary.\n */\n let lka: LocKey<S | L1 | L2 | L3 | L4>[] = [this.getLk(res)];\n lka = lka.concat(this.parentRoute.getLKA(res) as LocKey<S | L1 | L2 | L3 | L4>[]);\n return lka as LocKeyArray<S, L1, L2, L3, L4>;\n }\n\n public getLocations(res: Response): LocKeyArray<L1, L2, L3, L4, L5> {\n return this.parentRoute.getLKA(res) as LocKeyArray<L1, L2, L3, L4, L5>;\n }\n\n protected createItem = async (req: Request, res: Response) => {\n logger.trace('Creating Item 2',\n { body: req?.body, query: req?.query, params: req?.params, locals: res?.locals });\n const itemToCreate = this.convertDates(req.body as Item<S, L1, L2, L3, L4, L5>);\n let item =\n validatePK(await this.lib.create(\n itemToCreate, { locations: this.getLocations(res) }), this.getPkType()) as Item<S, L1, L2, L3, L4, L5>;\n item = await this.postCreateItem(item);\n
|
|
1
|
+
{"version":3,"file":"CItemRouter.js","sources":["../src/CItemRouter.ts"],"sourcesContent":["import {\n ComKey, Item, ItemQuery, LocKey, LocKeyArray, paramsToQuery, PriKey, QueryParams, validatePK\n} from \"@fjell/core\";\nimport { Request, Response } from \"express\";\nimport { ItemRouter, ItemRouterOptions } from \"@/ItemRouter\";\nimport LibLogger from \"@/logger\";\nimport { Contained } from \"@fjell/lib\";\n\nconst logger = LibLogger.get('CItemRouter');\ninterface ParsedQuery {\n [key: string]: undefined | string | string[] | ParsedQuery | ParsedQuery[];\n}\n\nexport class CItemRouter<\n T extends Item<S, L1, L2, L3, L4, L5>,\n S extends string,\n L1 extends string,\n L2 extends string = never,\n L3 extends string = never,\n L4 extends string = never,\n L5 extends string = never\n> extends ItemRouter<S, L1, L2, L3, L4, L5> {\n\n private parentRoute: ItemRouter<L1, L2, L3, L4, L5, never>;\n\n constructor(\n lib: Contained.Operations<T, S, L1, L2, L3, L4, L5>,\n type: S,\n parentRoute: ItemRouter<L1, L2, L3, L4, L5, never>,\n options: ItemRouterOptions = {},\n ) {\n super(lib as any, type, options);\n this.parentRoute = parentRoute;\n }\n\n public hasParent(): boolean {\n return !!this.parentRoute;\n }\n\n public getIk(res: Response): ComKey<S, L1, L2, L3, L4, L5> {\n const pri = this.getPk(res) as PriKey<S>;\n const loc = this.getLocations(res) as LocKeyArray<L1, L2, L3, L4, L5>;\n return { kt: pri.kt, pk: pri.pk, loc }\n }\n\n public getLKA(res: Response): LocKeyArray<S, L1, L2, L3, L4> {\n /**\n * A location key array is passed to a child router to provide contextfor the items it will\n * be working with. It is always a concatenation of \"My LKA\" + \"Parent LKA\" which will\n * bubble all the way up to the root Primary.\n */\n let lka: LocKey<S | L1 | L2 | L3 | L4>[] = [this.getLk(res)];\n lka = lka.concat(this.parentRoute.getLKA(res) as LocKey<S | L1 | L2 | L3 | L4>[]);\n return lka as LocKeyArray<S, L1, L2, L3, L4>;\n }\n\n public getLocations(res: Response): LocKeyArray<L1, L2, L3, L4, L5> {\n return this.parentRoute.getLKA(res) as LocKeyArray<L1, L2, L3, L4, L5>;\n }\n\n protected createItem = async (req: Request, res: Response) => {\n logger.trace('Creating Item 2',\n { body: req?.body, query: req?.query, params: req?.params, locals: res?.locals });\n const itemToCreate = this.convertDates(req.body as Item<S, L1, L2, L3, L4, L5>);\n let item =\n validatePK(await this.lib.create(\n itemToCreate, { locations: this.getLocations(res) }), this.getPkType()) as Item<S, L1, L2, L3, L4, L5>;\n item = await this.postCreateItem(item);\n res.json(item);\n };\n\n protected findItems = async (req: Request, res: Response) => {\n logger.trace('Finding Items', { query: req.query, params: req.params, locals: res.locals });\n\n const query: ParsedQuery = req.query as unknown as ParsedQuery;\n const finder = query['finder'] as string;\n const finderParams = query['finderParams'] as string;\n const one = query['one'] as string;\n\n let items: Item<S, L1, L2, L3, L4, L5>[] = [];\n\n if (finder) {\n // If finder is defined? Call a finder.\n logger.trace('Finding Items with a finder', { finder, finderParams, one });\n\n if (one === 'true') {\n const item = await (this.lib as any).findOne(finder, JSON.parse(finderParams), this.getLocations(res));\n items = item ? [item] : [];\n } else {\n items = await this.lib.find(finder, JSON.parse(finderParams), this.getLocations(res));\n }\n } else {\n logger.trace('Finding Items with a query', { query: req.query });\n // TODO: This is once of the more important places to perform some validaation and feedback\n const itemQuery: ItemQuery = paramsToQuery(req.query as QueryParams);\n items = await this.lib.all(itemQuery, this.getLocations(res));\n }\n\n res.json(items.map((item: Item<S, L1, L2, L3, L4, L5>) => validatePK(item, this.getPkType())));\n };\n\n}\n"],"names":["logger","LibLogger","get","CItemRouter","ItemRouter","hasParent","parentRoute","getIk","res","pri","getPk","loc","getLocations","kt","pk","getLKA","lka","getLk","concat","lib","type","options","createItem","req","trace","body","query","params","locals","itemToCreate","convertDates","item","validatePK","create","locations","getPkType","postCreateItem","json","findItems","finder","finderParams","one","items","findOne","JSON","parse","find","itemQuery","paramsToQuery","all","map"],"mappings":"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"}
|
package/dist/ItemRouter.cjs
CHANGED
|
@@ -45,14 +45,6 @@ class ItemRouter {
|
|
|
45
45
|
getIk(res) {
|
|
46
46
|
throw new Error('Method not implemented in an abstract router');
|
|
47
47
|
}
|
|
48
|
-
/* istanbul ignore next */ configureItemActions() {
|
|
49
|
-
this.logger.debug('ARouter - No Item Actions Configured');
|
|
50
|
-
return {};
|
|
51
|
-
}
|
|
52
|
-
/* istanbul ignore next */ configureAllActions() {
|
|
53
|
-
this.logger.debug('ARouter - No All Actions Configured');
|
|
54
|
-
return {};
|
|
55
|
-
}
|
|
56
48
|
/* istanbul ignore next */ getRouter() {
|
|
57
49
|
const router = express.Router();
|
|
58
50
|
this.configure(router);
|
|
@@ -64,7 +56,6 @@ class ItemRouter {
|
|
|
64
56
|
_define_property(this, "options", void 0);
|
|
65
57
|
_define_property(this, "childRouters", {});
|
|
66
58
|
_define_property(this, "logger", void 0);
|
|
67
|
-
_define_property(this, "itemActions", void 0);
|
|
68
59
|
_define_property(this, "getPkType", ()=>{
|
|
69
60
|
return this.keyType;
|
|
70
61
|
});
|
|
@@ -79,21 +70,66 @@ class ItemRouter {
|
|
|
79
70
|
});
|
|
80
71
|
const ik = this.getIk(res);
|
|
81
72
|
const actionKey = req.path.substring(req.path.lastIndexOf('/') + 1);
|
|
82
|
-
if (!this.
|
|
73
|
+
if (!this.lib.actions) {
|
|
83
74
|
this.logger.error('Item Actions are not configured');
|
|
84
|
-
|
|
75
|
+
res.status(500).json({
|
|
85
76
|
error: 'Item Actions are not configured'
|
|
86
77
|
});
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
const action = this.lib.actions[actionKey];
|
|
81
|
+
if (!action) {
|
|
82
|
+
this.logger.error('Item Action is not configured', {
|
|
83
|
+
actionKey
|
|
84
|
+
});
|
|
85
|
+
res.status(500).json({
|
|
86
|
+
error: 'Item Action is not configured'
|
|
87
|
+
});
|
|
88
|
+
return;
|
|
87
89
|
}
|
|
88
90
|
try {
|
|
89
|
-
|
|
90
|
-
return res.json(await this.itemActions[actionKey](req, res, item, req.params, req.body));
|
|
91
|
+
res.json(await this.lib.action(ik, actionKey, req.body));
|
|
91
92
|
} catch (err) {
|
|
92
93
|
this.logger.error('Error in Item Action', {
|
|
93
94
|
message: err === null || err === void 0 ? void 0 : err.message,
|
|
94
95
|
stack: err === null || err === void 0 ? void 0 : err.stack
|
|
95
96
|
});
|
|
96
|
-
|
|
97
|
+
res.status(500).json(err);
|
|
98
|
+
}
|
|
99
|
+
});
|
|
100
|
+
_define_property(this, "getItemFacet", async (req, res)=>{
|
|
101
|
+
this.logger.default('Getting Item', {
|
|
102
|
+
query: req === null || req === void 0 ? void 0 : req.query,
|
|
103
|
+
params: req === null || req === void 0 ? void 0 : req.params,
|
|
104
|
+
locals: res === null || res === void 0 ? void 0 : res.locals
|
|
105
|
+
});
|
|
106
|
+
const ik = this.getIk(res);
|
|
107
|
+
const facetKey = req.path.substring(req.path.lastIndexOf('/') + 1);
|
|
108
|
+
if (!this.lib.facets) {
|
|
109
|
+
this.logger.error('Item Facets are not configured');
|
|
110
|
+
res.status(500).json({
|
|
111
|
+
error: 'Item Facets are not configured'
|
|
112
|
+
});
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
const facet = this.lib.facets[facetKey];
|
|
116
|
+
if (!facet) {
|
|
117
|
+
this.logger.error('Item Facet is not configured', {
|
|
118
|
+
facetKey
|
|
119
|
+
});
|
|
120
|
+
res.status(500).json({
|
|
121
|
+
error: 'Item Facet is not configured'
|
|
122
|
+
});
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
125
|
+
try {
|
|
126
|
+
res.json(await this.lib.facet(ik, facetKey, req.params));
|
|
127
|
+
} catch (err) {
|
|
128
|
+
this.logger.error('Error in Item Facet', {
|
|
129
|
+
message: err === null || err === void 0 ? void 0 : err.message,
|
|
130
|
+
stack: err === null || err === void 0 ? void 0 : err.stack
|
|
131
|
+
});
|
|
132
|
+
res.status(500).json(err);
|
|
97
133
|
}
|
|
98
134
|
});
|
|
99
135
|
_define_property(this, "configure", (router)=>{
|
|
@@ -102,29 +138,24 @@ class ItemRouter {
|
|
|
102
138
|
});
|
|
103
139
|
router.get('/', this.findItems);
|
|
104
140
|
router.post('/', this.createItem);
|
|
105
|
-
const allActions = this.configureAllActions();
|
|
106
|
-
this.logger.debug('All Actions supplied to Router', {
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
// TODO: Ok, this is a bit of a hack, but we need to customize the types of the request handlers
|
|
115
|
-
router.post(`/${actionKey}`, ...allActions[actionKey]);
|
|
116
|
-
});
|
|
117
|
-
}
|
|
141
|
+
// const allActions = this.configureAllActions();
|
|
142
|
+
// this.logger.debug('All Actions supplied to Router', { allActions });
|
|
143
|
+
// if (allActions) {
|
|
144
|
+
// Object.keys(allActions).forEach((actionKey) => {
|
|
145
|
+
// this.logger.default('Configuring All Action', { actionKey });
|
|
146
|
+
// // TODO: Ok, this is a bit of a hack, but we need to customize the types of the request handlers
|
|
147
|
+
// router.post(`/${actionKey}`, ...allActions[actionKey]);
|
|
148
|
+
// });
|
|
149
|
+
// }
|
|
118
150
|
const itemRouter = express.Router();
|
|
119
151
|
itemRouter.get('/', this.getItem);
|
|
120
152
|
itemRouter.put('/', this.updateItem);
|
|
121
153
|
itemRouter.delete('/', this.deleteItem);
|
|
122
|
-
this.itemActions = this.configureItemActions();
|
|
123
154
|
this.logger.debug('Item Actions supplied to Router', {
|
|
124
|
-
itemActions: this.
|
|
155
|
+
itemActions: this.lib.actions
|
|
125
156
|
});
|
|
126
|
-
if (this.
|
|
127
|
-
Object.keys(this.
|
|
157
|
+
if (this.lib.actions) {
|
|
158
|
+
Object.keys(this.lib.actions).forEach((actionKey)=>{
|
|
128
159
|
this.logger.default('Configuring Item Action', {
|
|
129
160
|
actionKey
|
|
130
161
|
});
|
|
@@ -132,6 +163,18 @@ class ItemRouter {
|
|
|
132
163
|
itemRouter.post(`/${actionKey}`, this.postItemAction);
|
|
133
164
|
});
|
|
134
165
|
}
|
|
166
|
+
this.logger.debug('Item Facets supplied to Router', {
|
|
167
|
+
itemFacets: this.lib.facets
|
|
168
|
+
});
|
|
169
|
+
if (this.lib.facets) {
|
|
170
|
+
Object.keys(this.lib.facets).forEach((facetKey)=>{
|
|
171
|
+
this.logger.default('Configuring Item Facet', {
|
|
172
|
+
facetKey
|
|
173
|
+
});
|
|
174
|
+
// TODO: Ok, this is a bit of a hack, but we need to customize the types of the request handlers
|
|
175
|
+
itemRouter.get(`/${facetKey}`, this.getItemFacet);
|
|
176
|
+
});
|
|
177
|
+
}
|
|
135
178
|
this.logger.default('Configuring Item Operations under PK Param', {
|
|
136
179
|
pkParam: this.getPkParam()
|
|
137
180
|
});
|
|
@@ -189,7 +232,7 @@ class ItemRouter {
|
|
|
189
232
|
const ik = this.getIk(res);
|
|
190
233
|
const removedItem = await this.lib.remove(ik);
|
|
191
234
|
const item = core.validatePK(removedItem, this.getPkType());
|
|
192
|
-
|
|
235
|
+
res.json(item);
|
|
193
236
|
});
|
|
194
237
|
/* eslint-disable */ /* istanbul ignore next */ _define_property(this, "findItems", async (req, res)=>{
|
|
195
238
|
throw new Error('Method not implemented in an abstract router');
|
|
@@ -204,7 +247,7 @@ class ItemRouter {
|
|
|
204
247
|
try {
|
|
205
248
|
// TODO: What error does validate PK throw, when can that fail?
|
|
206
249
|
const item = core.validatePK(await this.lib.get(ik), this.getPkType());
|
|
207
|
-
|
|
250
|
+
res.json(item);
|
|
208
251
|
} catch (err) {
|
|
209
252
|
if (err instanceof lib.NotFoundError) {
|
|
210
253
|
this.logger.error('Item Not Found', {
|
|
@@ -212,7 +255,7 @@ class ItemRouter {
|
|
|
212
255
|
message: err === null || err === void 0 ? void 0 : err.message,
|
|
213
256
|
stack: err === null || err === void 0 ? void 0 : err.stack
|
|
214
257
|
});
|
|
215
|
-
|
|
258
|
+
res.status(404).json({
|
|
216
259
|
ik,
|
|
217
260
|
message: "Item Not Found"
|
|
218
261
|
});
|
|
@@ -222,7 +265,7 @@ class ItemRouter {
|
|
|
222
265
|
message: err === null || err === void 0 ? void 0 : err.message,
|
|
223
266
|
stack: err === null || err === void 0 ? void 0 : err.stack
|
|
224
267
|
});
|
|
225
|
-
|
|
268
|
+
res.status(500).json({
|
|
226
269
|
ik,
|
|
227
270
|
message: "General Error"
|
|
228
271
|
});
|
|
@@ -239,7 +282,7 @@ class ItemRouter {
|
|
|
239
282
|
const ik = this.getIk(res);
|
|
240
283
|
const itemToUpdate = this.convertDates(req.body);
|
|
241
284
|
const retItem = core.validatePK(await this.lib.update(ik, itemToUpdate), this.getPkType());
|
|
242
|
-
|
|
285
|
+
res.json(retItem);
|
|
243
286
|
});
|
|
244
287
|
_define_property(this, "convertDates", (item)=>{
|
|
245
288
|
const events = item.events;
|
package/dist/ItemRouter.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ItemRouter.cjs","sources":["../src/ItemRouter.ts"],"sourcesContent":["import {\n ComKey,\n cPK,\n Item,\n ItemEvent,\n ItemProperties,\n LocKey,\n LocKeyArray,\n PriKey,\n validatePK\n} from \"@fjell/core\";\nimport { NotFoundError, Operations } from \"@fjell/lib\";\nimport deepmerge from \"deepmerge\";\nimport { Request, RequestHandler, Response, Router } from \"express\";\nimport LibLogger from \"./logger\";\n\nexport type ItemRouterOptions = Record<string, never>;\n\n// TODO: body is in the request, it's not needed in the parameters\nexport type ActionMethod = <\n S extends string,\n L1 extends string = never,\n L2 extends string = never,\n L3 extends string = never,\n L4 extends string = never,\n L5 extends string = never\n>(req: Request, res: Response, item: Item<S, L1, L2, L3, L4, L5>, params: any, body: any) =>\n Promise<Item<S, L1, L2, L3, L4, L5>>;\n\n// TODO: body is in the request, it's not needed in the parameters\nexport type AllActionMethods = Array<RequestHandler>;\n\nexport class ItemRouter<\n S extends string,\n L1 extends string = never,\n L2 extends string = never,\n L3 extends string = never,\n L4 extends string = never,\n L5 extends string = never\n> {\n\n protected lib: Operations<Item<S, L1, L2, L3, L4, L5>, S, L1, L2, L3, L4, L5>;\n private keyType: S;\n protected options: ItemRouterOptions;\n private childRouters: Record<string, Router> = {};\n private logger;\n private itemActions: Record<string, ActionMethod> | undefined;\n\n constructor(\n lib: Operations<Item<S, L1, L2, L3, L4, L5>, S, L1, L2, L3, L4, L5>,\n keyType: S,\n options: ItemRouterOptions = {}\n ) {\n this.lib = lib;\n this.keyType = keyType;\n this.options = options;\n this.logger = LibLogger.get(\"ItemRouter\", keyType);\n }\n\n public getPkType = (): S => {\n return this.keyType;\n }\n\n protected getPkParam = (): string => {\n return `${this.getPkType()}Pk`;\n }\n\n protected getLk(res: Response): LocKey<S> {\n return { kt: this.keyType, lk: res.locals[this.getPkParam()] };\n }\n\n // this is meant to be consumed by children routers\n public getLKA(res: Response): LocKeyArray<S, L1, L2, L3, L4> {\n return [this.getLk(res)] as LocKeyArray<S, L1, L2, L3, L4>;\n }\n\n public getPk(res: Response): PriKey<S> {\n return cPK<S>(res.locals[this.getPkParam()], this.getPkType());\n }\n\n // Unless this is a contained router, the locations will always be an empty array.\n /* eslint-disable */\n protected getLocations(res: Response): LocKeyArray<L1, L2, L3, L4, L5> | [] {\n throw new Error('Method not implemented in an abstract router');\n }\n /* eslint-enable */\n\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n protected getIk(res: Response): PriKey<S> | ComKey<S, L1, L2, L3, L4, L5> {\n throw new Error('Method not implemented in an abstract router');\n }\n\n protected postItemAction = async (req: Request, res: Response) => {\n this.logger.default('Getting Item', { query: req?.query, params: req?.params, locals: res?.locals });\n const ik = this.getIk(res);\n const actionKey = req.path.substring(req.path.lastIndexOf('/') + 1);\n if (!this.itemActions) {\n this.logger.error('Item Actions are not configured');\n return res.status(500).json({ error: 'Item Actions are not configured' });\n }\n try {\n const item =\n validatePK(await this.lib.get(ik), this.getPkType()) as Item<S, L1, L2, L3, L4, L5>;\n return res.json(await this.itemActions[actionKey](req, res, item, req.params, req.body));\n } catch (err: any) {\n this.logger.error('Error in Item Action', { message: err?.message, stack: err?.stack });\n return res.status(500).json(err);\n }\n }\n\n private configure = (router: Router) => {\n this.logger.default('Configuring Router', { pkType: this.getPkType() });\n router.get('/', this.findItems);\n router.post('/', this.createItem);\n\n const allActions = this.configureAllActions();\n this.logger.debug('All Actions supplied to Router', { allActions });\n if (allActions) {\n Object.keys(allActions).forEach((actionKey) => {\n this.logger.default('Configuring All Action', { actionKey });\n // TODO: Ok, this is a bit of a hack, but we need to customize the types of the request handlers\n router.post(`/${actionKey}`, ...allActions[actionKey]);\n });\n }\n\n const itemRouter = Router();\n itemRouter.get('/', this.getItem);\n itemRouter.put('/', this.updateItem);\n itemRouter.delete('/', this.deleteItem);\n\n this.itemActions = this.configureItemActions();\n this.logger.debug('Item Actions supplied to Router', { itemActions: this.itemActions });\n if (this.itemActions) {\n Object.keys(this.itemActions).forEach((actionKey) => {\n this.logger.default('Configuring Item Action', { actionKey });\n // TODO: Ok, this is a bit of a hack, but we need to customize the types of the request handlers\n itemRouter.post(`/${actionKey}`, this.postItemAction)\n });\n }\n\n this.logger.default('Configuring Item Operations under PK Param', { pkParam: this.getPkParam() });\n router.use(`/:${this.getPkParam()}`, this.validatePrimaryKeyValue, itemRouter);\n\n if (this.childRouters) {\n this.configureChildRouters(itemRouter, this.childRouters);\n }\n return router;\n }\n\n private validatePrimaryKeyValue = (req: Request, res: Response, next: any) => {\n const pkParamValue = req.params[this.getPkParam()];\n if (this.validatePKParam(pkParamValue)) {\n res.locals[this.getPkParam()] = pkParamValue;\n next();\n } else {\n this.logger.error('Invalid Primary Key', { pkParamValue, path: req?.path });\n res.status(500).json({ error: 'Invalid Primary Key', path: req?.path });\n }\n }\n\n private configureChildRouters = (router: Router, childRouters: Record<string, Router>) => {\n for (const path in childRouters) {\n this.logger.default('Configuring Child Router at Path', { path });\n\n router.use(`/${path}`, childRouters[path]);\n }\n return router;\n }\n\n public addChildRouter = (path: string, router: Router) => {\n this.childRouters[path] = router;\n }\n\n /* istanbul ignore next */\n protected configureItemActions(): Record<string, ActionMethod> {\n this.logger.debug('ARouter - No Item Actions Configured');\n return {};\n }\n\n /* istanbul ignore next */\n protected configureAllActions(): Record<string, AllActionMethods> {\n this.logger.debug('ARouter - No All Actions Configured');\n return {};\n }\n\n /* istanbul ignore next */\n public getRouter(): Router {\n const router = Router();\n this.configure(router);\n return router;\n }\n\n /* istanbul ignore next */\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n protected createItem = async (req: Request, res: Response): Promise<Response<any, Record<string, any>>> => {\n throw new Error('Method not implemented in an abstract router');\n };\n\n // TODO: Probably a better way to do this, but this postCreate hook only needs the item.\n /* istanbul ignore next */\n public postCreateItem = async (item: Item<S, L1, L2, L3, L4, L5>): Promise<Item<S, L1, L2, L3, L4, L5>> => {\n this.logger.default('Post Create Item', { item });\n return item;\n };\n\n protected deleteItem = async (req: Request, res: Response): Promise<Response<any, Record<string, any>>> => {\n this.logger.default('Deleting Item', { query: req.query, params: req.params, locals: res.locals });\n const ik = this.getIk(res);\n const removedItem = await this.lib.remove(ik);\n const item = validatePK(removedItem, this.getPkType());\n return res.json(item);\n };\n\n /* eslint-disable */\n /* istanbul ignore next */\n protected findItems = async (req: Request, res: Response): Promise<Response<any, Record<string, any>>> => {\n throw new Error('Method not implemented in an abstract router');\n };\n /* eslint-enable */\n\n protected getItem = async (req: Request, res: Response) => {\n this.logger.default('Getting Item', { query: req.query, params: req.params, locals: res.locals });\n const ik = this.getIk(res);\n try {\n // TODO: What error does validate PK throw, when can that fail?\n const item = validatePK(await this.lib.get(ik), this.getPkType());\n return res.json(item);\n } catch (err: any) {\n if (err instanceof NotFoundError) {\n this.logger.error('Item Not Found', { ik, message: err?.message, stack: err?.stack });\n return res.status(404).json({\n ik,\n message: \"Item Not Found\",\n });\n } else {\n this.logger.error('General Error', { ik, message: err?.message, stack: err?.stack });\n return res.status(500).json({\n ik,\n message: \"General Error\",\n });\n }\n }\n }\n\n protected updateItem = async (req: Request, res: Response) => {\n this.logger.default('Updating Item',\n { body: req?.body, query: req?.query, params: req?.params, locals: res?.locals });\n const ik = this.getIk(res);\n const itemToUpdate = this.convertDates(req.body as ItemProperties<S, L1, L2, L3, L4, L5>);\n const retItem = validatePK(await this.lib.update(ik, itemToUpdate), this.getPkType());\n return res.json(retItem);\n };\n\n public convertDates = (item: Item<S, L1, L2, L3, L4, L5> | ItemProperties<S, L1, L2, L3, L4, L5>):\n Item<S, L1, L2, L3, L4, L5> | ItemProperties<S, L1, L2, L3, L4, L5> => {\n const events = item.events as Record<string, ItemEvent>;\n this.logger.default('Converting Dates', { item });\n if (events) {\n Object.keys(events).forEach((key: string) => {\n Object.assign(events, {\n [key]: deepmerge(events[key], { at: events[key].at ? new Date(events[key].at) : null })\n });\n });\n }\n Object.assign(item, { events });\n return item;\n };\n\n // TODO: Maybe just simplify this and require that everything is a UUID?\n /**\n * This method might be an annoyance, but we need to capture a few cases where someone passes\n * a PK parameter that has an odd string in it.\n *\n * @param pkParamValue The value of the primary key parameter\n * @returns if the value is valid.\n */\n protected validatePKParam = (pkParamValue: string): boolean => {\n let validPkParam = true;\n if (pkParamValue.length <= 0) {\n this.logger.error('Primary Key is an Empty String', { pkParamValue });\n validPkParam = false;\n } else if (pkParamValue === 'undefined') {\n this.logger.error('Primary Key is the string \\'undefined\\'', { pkParamValue });\n validPkParam = false;\n }\n return validPkParam;\n }\n\n}\n"],"names":["ItemRouter","getLk","res","kt","keyType","lk","locals","getPkParam","getLKA","getPk","cPK","getPkType","getLocations","Error","getIk","logger","debug","router","Router","configure","lib","options","childRouters","itemActions","postItemAction","req","default","query","params","ik","actionKey","path","substring","lastIndexOf","error","status","json","item","validatePK","get","body","err","message","stack","pkType","findItems","post","createItem","allActions","configureAllActions","Object","keys","forEach","itemRouter","getItem","put","updateItem","delete","deleteItem","configureItemActions","pkParam","use","validatePrimaryKeyValue","configureChildRouters","next","pkParamValue","validatePKParam","addChildRouter","postCreateItem","removedItem","remove","NotFoundError","itemToUpdate","convertDates","retItem","update","events","key","assign","deepmerge","at","Date","validPkParam","length","LibLogger"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ItemRouter.cjs","sources":["../src/ItemRouter.ts"],"sourcesContent":["import {\n ComKey,\n cPK,\n Item,\n ItemEvent,\n ItemProperties,\n LocKey,\n LocKeyArray,\n PriKey,\n validatePK\n} from \"@fjell/core\";\nimport { NotFoundError, Operations } from \"@fjell/lib\";\nimport deepmerge from \"deepmerge\";\nimport { Request, Response, Router } from \"express\";\nimport LibLogger from \"./logger\";\n\nexport type ItemRouterOptions = Record<string, never>;\n\nexport class ItemRouter<\n S extends string,\n L1 extends string = never,\n L2 extends string = never,\n L3 extends string = never,\n L4 extends string = never,\n L5 extends string = never\n> {\n\n protected lib: Operations<Item<S, L1, L2, L3, L4, L5>, S, L1, L2, L3, L4, L5>;\n private keyType: S;\n protected options: ItemRouterOptions;\n private childRouters: Record<string, Router> = {};\n private logger;\n\n constructor(\n lib: Operations<Item<S, L1, L2, L3, L4, L5>, S, L1, L2, L3, L4, L5>,\n keyType: S,\n options: ItemRouterOptions = {}\n ) {\n this.lib = lib;\n this.keyType = keyType;\n this.options = options;\n this.logger = LibLogger.get(\"ItemRouter\", keyType);\n }\n\n public getPkType = (): S => {\n return this.keyType;\n }\n\n protected getPkParam = (): string => {\n return `${this.getPkType()}Pk`;\n }\n\n protected getLk(res: Response): LocKey<S> {\n return { kt: this.keyType, lk: res.locals[this.getPkParam()] };\n }\n\n // this is meant to be consumed by children routers\n public getLKA(res: Response): LocKeyArray<S, L1, L2, L3, L4> {\n return [this.getLk(res)] as LocKeyArray<S, L1, L2, L3, L4>;\n }\n\n public getPk(res: Response): PriKey<S> {\n return cPK<S>(res.locals[this.getPkParam()], this.getPkType());\n }\n\n // Unless this is a contained router, the locations will always be an empty array.\n /* eslint-disable */\n protected getLocations(res: Response): LocKeyArray<L1, L2, L3, L4, L5> | [] {\n throw new Error('Method not implemented in an abstract router');\n }\n /* eslint-enable */\n\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n protected getIk(res: Response): PriKey<S> | ComKey<S, L1, L2, L3, L4, L5> {\n throw new Error('Method not implemented in an abstract router');\n }\n\n protected postItemAction = async (req: Request, res: Response) => {\n this.logger.default('Getting Item', { query: req?.query, params: req?.params, locals: res?.locals });\n const ik = this.getIk(res);\n const actionKey = req.path.substring(req.path.lastIndexOf('/') + 1);\n if (!this.lib.actions) {\n this.logger.error('Item Actions are not configured');\n res.status(500).json({ error: 'Item Actions are not configured' });\n return;\n }\n const action = this.lib.actions[actionKey];\n if (!action) {\n this.logger.error('Item Action is not configured', { actionKey });\n res.status(500).json({ error: 'Item Action is not configured' });\n return;\n }\n try {\n res.json(await this.lib.action(ik, actionKey, req.body));\n } catch (err: any) {\n this.logger.error('Error in Item Action', { message: err?.message, stack: err?.stack });\n res.status(500).json(err);\n }\n }\n\n protected getItemFacet = async (req: Request, res: Response) => {\n this.logger.default('Getting Item', { query: req?.query, params: req?.params, locals: res?.locals });\n const ik = this.getIk(res);\n const facetKey = req.path.substring(req.path.lastIndexOf('/') + 1);\n if (!this.lib.facets) {\n this.logger.error('Item Facets are not configured');\n res.status(500).json({ error: 'Item Facets are not configured' });\n return;\n }\n const facet = this.lib.facets[facetKey];\n if (!facet) {\n this.logger.error('Item Facet is not configured', { facetKey });\n res.status(500).json({ error: 'Item Facet is not configured' });\n return;\n }\n try {\n res.json(await this.lib.facet(ik, facetKey, req.params));\n } catch (err: any) {\n this.logger.error('Error in Item Facet', { message: err?.message, stack: err?.stack });\n res.status(500).json(err);\n }\n }\n\n private configure = (router: Router) => {\n this.logger.default('Configuring Router', { pkType: this.getPkType() });\n router.get('/', this.findItems);\n router.post('/', this.createItem);\n\n // const allActions = this.configureAllActions();\n // this.logger.debug('All Actions supplied to Router', { allActions });\n // if (allActions) {\n // Object.keys(allActions).forEach((actionKey) => {\n // this.logger.default('Configuring All Action', { actionKey });\n // // TODO: Ok, this is a bit of a hack, but we need to customize the types of the request handlers\n // router.post(`/${actionKey}`, ...allActions[actionKey]);\n // });\n // }\n\n const itemRouter = Router();\n itemRouter.get('/', this.getItem);\n itemRouter.put('/', this.updateItem);\n itemRouter.delete('/', this.deleteItem);\n\n this.logger.debug('Item Actions supplied to Router', { itemActions: this.lib.actions });\n if (this.lib.actions) {\n Object.keys(this.lib.actions).forEach((actionKey) => {\n this.logger.default('Configuring Item Action', { actionKey });\n // TODO: Ok, this is a bit of a hack, but we need to customize the types of the request handlers\n itemRouter.post(`/${actionKey}`, this.postItemAction)\n });\n }\n\n this.logger.debug('Item Facets supplied to Router', { itemFacets: this.lib.facets });\n if (this.lib.facets) {\n Object.keys(this.lib.facets).forEach((facetKey) => {\n this.logger.default('Configuring Item Facet', { facetKey });\n // TODO: Ok, this is a bit of a hack, but we need to customize the types of the request handlers\n itemRouter.get(`/${facetKey}`, this.getItemFacet)\n });\n }\n\n this.logger.default('Configuring Item Operations under PK Param', { pkParam: this.getPkParam() });\n router.use(`/:${this.getPkParam()}`, this.validatePrimaryKeyValue, itemRouter);\n\n if (this.childRouters) {\n this.configureChildRouters(itemRouter, this.childRouters);\n }\n return router;\n }\n\n private validatePrimaryKeyValue = (req: Request, res: Response, next: any) => {\n const pkParamValue = req.params[this.getPkParam()];\n if (this.validatePKParam(pkParamValue)) {\n res.locals[this.getPkParam()] = pkParamValue;\n next();\n } else {\n this.logger.error('Invalid Primary Key', { pkParamValue, path: req?.path });\n res.status(500).json({ error: 'Invalid Primary Key', path: req?.path });\n }\n }\n\n private configureChildRouters = (router: Router, childRouters: Record<string, Router>) => {\n for (const path in childRouters) {\n this.logger.default('Configuring Child Router at Path', { path });\n\n router.use(`/${path}`, childRouters[path]);\n }\n return router;\n }\n\n public addChildRouter = (path: string, router: Router) => {\n this.childRouters[path] = router;\n }\n\n /* istanbul ignore next */\n public getRouter(): Router {\n const router = Router();\n this.configure(router);\n return router;\n }\n\n /* istanbul ignore next */\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n protected createItem = async (req: Request, res: Response): Promise<void> => {\n throw new Error('Method not implemented in an abstract router');\n };\n\n // TODO: Probably a better way to do this, but this postCreate hook only needs the item.\n /* istanbul ignore next */\n public postCreateItem = async (item: Item<S, L1, L2, L3, L4, L5>): Promise<Item<S, L1, L2, L3, L4, L5>> => {\n this.logger.default('Post Create Item', { item });\n return item;\n };\n\n protected deleteItem = async (req: Request, res: Response): Promise<void> => {\n this.logger.default('Deleting Item', { query: req.query, params: req.params, locals: res.locals });\n const ik = this.getIk(res);\n const removedItem = await this.lib.remove(ik);\n const item = validatePK(removedItem, this.getPkType());\n res.json(item);\n };\n\n /* eslint-disable */\n /* istanbul ignore next */\n protected findItems = async (req: Request, res: Response): Promise<void> => {\n throw new Error('Method not implemented in an abstract router');\n };\n /* eslint-enable */\n\n protected getItem = async (req: Request, res: Response) => {\n this.logger.default('Getting Item', { query: req.query, params: req.params, locals: res.locals });\n const ik = this.getIk(res);\n try {\n // TODO: What error does validate PK throw, when can that fail?\n const item = validatePK(await this.lib.get(ik), this.getPkType());\n res.json(item);\n } catch (err: any) {\n if (err instanceof NotFoundError) {\n this.logger.error('Item Not Found', { ik, message: err?.message, stack: err?.stack });\n res.status(404).json({\n ik,\n message: \"Item Not Found\",\n });\n } else {\n this.logger.error('General Error', { ik, message: err?.message, stack: err?.stack });\n res.status(500).json({\n ik,\n message: \"General Error\",\n });\n }\n }\n }\n\n protected updateItem = async (req: Request, res: Response) => {\n this.logger.default('Updating Item',\n { body: req?.body, query: req?.query, params: req?.params, locals: res?.locals });\n const ik = this.getIk(res);\n const itemToUpdate = this.convertDates(req.body as ItemProperties<S, L1, L2, L3, L4, L5>);\n const retItem = validatePK(await this.lib.update(ik, itemToUpdate), this.getPkType());\n res.json(retItem);\n };\n\n public convertDates = (item: Item<S, L1, L2, L3, L4, L5> | ItemProperties<S, L1, L2, L3, L4, L5>):\n Item<S, L1, L2, L3, L4, L5> | ItemProperties<S, L1, L2, L3, L4, L5> => {\n const events = item.events as Record<string, ItemEvent>;\n this.logger.default('Converting Dates', { item });\n if (events) {\n Object.keys(events).forEach((key: string) => {\n Object.assign(events, {\n [key]: deepmerge(events[key], { at: events[key].at ? new Date(events[key].at) : null })\n });\n });\n }\n Object.assign(item, { events });\n return item;\n };\n\n // TODO: Maybe just simplify this and require that everything is a UUID?\n /**\n * This method might be an annoyance, but we need to capture a few cases where someone passes\n * a PK parameter that has an odd string in it.\n *\n * @param pkParamValue The value of the primary key parameter\n * @returns if the value is valid.\n */\n protected validatePKParam = (pkParamValue: string): boolean => {\n let validPkParam = true;\n if (pkParamValue.length <= 0) {\n this.logger.error('Primary Key is an Empty String', { pkParamValue });\n validPkParam = false;\n } else if (pkParamValue === 'undefined') {\n this.logger.error('Primary Key is the string \\'undefined\\'', { pkParamValue });\n validPkParam = false;\n }\n return validPkParam;\n }\n\n}\n"],"names":["ItemRouter","getLk","res","kt","keyType","lk","locals","getPkParam","getLKA","getPk","cPK","getPkType","getLocations","Error","getIk","getRouter","router","Router","configure","lib","options","childRouters","logger","postItemAction","req","default","query","params","ik","actionKey","path","substring","lastIndexOf","actions","error","status","json","action","body","err","message","stack","getItemFacet","facetKey","facets","facet","pkType","get","findItems","post","createItem","itemRouter","getItem","put","updateItem","delete","deleteItem","debug","itemActions","Object","keys","forEach","itemFacets","pkParam","use","validatePrimaryKeyValue","configureChildRouters","next","pkParamValue","validatePKParam","addChildRouter","postCreateItem","item","removedItem","remove","validatePK","NotFoundError","itemToUpdate","convertDates","retItem","update","events","key","assign","deepmerge","at","Date","validPkParam","length","LibLogger"],"mappings":"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"}
|
package/dist/ItemRouter.d.ts
CHANGED
|
@@ -1,16 +1,13 @@
|
|
|
1
1
|
import { ComKey, Item, ItemProperties, LocKey, LocKeyArray, PriKey } from '@fjell/core';
|
|
2
2
|
import { Operations } from '@fjell/lib';
|
|
3
|
-
import { Request,
|
|
3
|
+
import { Request, Response, Router } from 'express';
|
|
4
4
|
export type ItemRouterOptions = Record<string, never>;
|
|
5
|
-
export type ActionMethod = <S extends string, L1 extends string = never, L2 extends string = never, L3 extends string = never, L4 extends string = never, L5 extends string = never>(req: Request, res: Response, item: Item<S, L1, L2, L3, L4, L5>, params: any, body: any) => Promise<Item<S, L1, L2, L3, L4, L5>>;
|
|
6
|
-
export type AllActionMethods = Array<RequestHandler>;
|
|
7
5
|
export declare class ItemRouter<S extends string, L1 extends string = never, L2 extends string = never, L3 extends string = never, L4 extends string = never, L5 extends string = never> {
|
|
8
6
|
protected lib: Operations<Item<S, L1, L2, L3, L4, L5>, S, L1, L2, L3, L4, L5>;
|
|
9
7
|
private keyType;
|
|
10
8
|
protected options: ItemRouterOptions;
|
|
11
9
|
private childRouters;
|
|
12
10
|
private logger;
|
|
13
|
-
private itemActions;
|
|
14
11
|
constructor(lib: Operations<Item<S, L1, L2, L3, L4, L5>, S, L1, L2, L3, L4, L5>, keyType: S, options?: ItemRouterOptions);
|
|
15
12
|
getPkType: () => S;
|
|
16
13
|
protected getPkParam: () => string;
|
|
@@ -19,20 +16,19 @@ export declare class ItemRouter<S extends string, L1 extends string = never, L2
|
|
|
19
16
|
getPk(res: Response): PriKey<S>;
|
|
20
17
|
protected getLocations(res: Response): LocKeyArray<L1, L2, L3, L4, L5> | [];
|
|
21
18
|
protected getIk(res: Response): PriKey<S> | ComKey<S, L1, L2, L3, L4, L5>;
|
|
22
|
-
protected postItemAction: (req: Request, res: Response) => Promise<
|
|
19
|
+
protected postItemAction: (req: Request, res: Response) => Promise<void>;
|
|
20
|
+
protected getItemFacet: (req: Request, res: Response) => Promise<void>;
|
|
23
21
|
private configure;
|
|
24
22
|
private validatePrimaryKeyValue;
|
|
25
23
|
private configureChildRouters;
|
|
26
24
|
addChildRouter: (path: string, router: Router) => void;
|
|
27
|
-
protected configureItemActions(): Record<string, ActionMethod>;
|
|
28
|
-
protected configureAllActions(): Record<string, AllActionMethods>;
|
|
29
25
|
getRouter(): Router;
|
|
30
|
-
protected createItem: (req: Request, res: Response) => Promise<
|
|
26
|
+
protected createItem: (req: Request, res: Response) => Promise<void>;
|
|
31
27
|
postCreateItem: (item: Item<S, L1, L2, L3, L4, L5>) => Promise<Item<S, L1, L2, L3, L4, L5>>;
|
|
32
|
-
protected deleteItem: (req: Request, res: Response) => Promise<
|
|
33
|
-
protected findItems: (req: Request, res: Response) => Promise<
|
|
34
|
-
protected getItem: (req: Request, res: Response) => Promise<
|
|
35
|
-
protected updateItem: (req: Request, res: Response) => Promise<
|
|
28
|
+
protected deleteItem: (req: Request, res: Response) => Promise<void>;
|
|
29
|
+
protected findItems: (req: Request, res: Response) => Promise<void>;
|
|
30
|
+
protected getItem: (req: Request, res: Response) => Promise<void>;
|
|
31
|
+
protected updateItem: (req: Request, res: Response) => Promise<void>;
|
|
36
32
|
convertDates: (item: Item<S, L1, L2, L3, L4, L5> | ItemProperties<S, L1, L2, L3, L4, L5>) => Item<S, L1, L2, L3, L4, L5> | ItemProperties<S, L1, L2, L3, L4, L5>;
|
|
37
33
|
/**
|
|
38
34
|
* This method might be an annoyance, but we need to capture a few cases where someone passes
|