@fjell/express-router 4.4.2 → 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.
@@ -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 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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"}
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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"}
@@ -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 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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"}
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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"}
@@ -45,18 +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 */ configureItemFacets() {
53
- this.logger.debug('ARouter - No Item Facets Configured');
54
- return {};
55
- }
56
- /* istanbul ignore next */ configureAllActions() {
57
- this.logger.debug('ARouter - No All Actions Configured');
58
- return {};
59
- }
60
48
  /* istanbul ignore next */ getRouter() {
61
49
  const router = express.Router();
62
50
  this.configure(router);
@@ -68,8 +56,6 @@ class ItemRouter {
68
56
  _define_property(this, "options", void 0);
69
57
  _define_property(this, "childRouters", {});
70
58
  _define_property(this, "logger", void 0);
71
- _define_property(this, "itemActions", void 0);
72
- _define_property(this, "itemFacets", void 0);
73
59
  _define_property(this, "getPkType", ()=>{
74
60
  return this.keyType;
75
61
  });
@@ -84,16 +70,25 @@ class ItemRouter {
84
70
  });
85
71
  const ik = this.getIk(res);
86
72
  const actionKey = req.path.substring(req.path.lastIndexOf('/') + 1);
87
- if (!this.itemActions) {
73
+ if (!this.lib.actions) {
88
74
  this.logger.error('Item Actions are not configured');
89
75
  res.status(500).json({
90
76
  error: 'Item Actions are not configured'
91
77
  });
92
78
  return;
93
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;
89
+ }
94
90
  try {
95
- const item = core.validatePK(await this.lib.get(ik), this.getPkType());
96
- res.json(await this.itemActions[actionKey](req, res, item, req.params, req.body));
91
+ res.json(await this.lib.action(ik, actionKey, req.body));
97
92
  } catch (err) {
98
93
  this.logger.error('Error in Item Action', {
99
94
  message: err === null || err === void 0 ? void 0 : err.message,
@@ -110,16 +105,25 @@ class ItemRouter {
110
105
  });
111
106
  const ik = this.getIk(res);
112
107
  const facetKey = req.path.substring(req.path.lastIndexOf('/') + 1);
113
- if (!this.itemFacets) {
108
+ if (!this.lib.facets) {
114
109
  this.logger.error('Item Facets are not configured');
115
110
  res.status(500).json({
116
111
  error: 'Item Facets are not configured'
117
112
  });
118
113
  return;
119
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
+ }
120
125
  try {
121
- const item = core.validatePK(await this.lib.get(ik), this.getPkType());
122
- await this.itemFacets[facetKey](req, res, item, req.params);
126
+ res.json(await this.lib.facet(ik, facetKey, req.params));
123
127
  } catch (err) {
124
128
  this.logger.error('Error in Item Facet', {
125
129
  message: err === null || err === void 0 ? void 0 : err.message,
@@ -134,29 +138,24 @@ class ItemRouter {
134
138
  });
135
139
  router.get('/', this.findItems);
136
140
  router.post('/', this.createItem);
137
- const allActions = this.configureAllActions();
138
- this.logger.debug('All Actions supplied to Router', {
139
- allActions
140
- });
141
- if (allActions) {
142
- Object.keys(allActions).forEach((actionKey)=>{
143
- this.logger.default('Configuring All Action', {
144
- actionKey
145
- });
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
- }
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
+ // }
150
150
  const itemRouter = express.Router();
151
151
  itemRouter.get('/', this.getItem);
152
152
  itemRouter.put('/', this.updateItem);
153
153
  itemRouter.delete('/', this.deleteItem);
154
- this.itemActions = this.configureItemActions();
155
154
  this.logger.debug('Item Actions supplied to Router', {
156
- itemActions: this.itemActions
155
+ itemActions: this.lib.actions
157
156
  });
158
- if (this.itemActions) {
159
- Object.keys(this.itemActions).forEach((actionKey)=>{
157
+ if (this.lib.actions) {
158
+ Object.keys(this.lib.actions).forEach((actionKey)=>{
160
159
  this.logger.default('Configuring Item Action', {
161
160
  actionKey
162
161
  });
@@ -164,12 +163,11 @@ class ItemRouter {
164
163
  itemRouter.post(`/${actionKey}`, this.postItemAction);
165
164
  });
166
165
  }
167
- this.itemFacets = this.configureItemFacets();
168
166
  this.logger.debug('Item Facets supplied to Router', {
169
- itemFacets: this.itemFacets
167
+ itemFacets: this.lib.facets
170
168
  });
171
- if (this.itemFacets) {
172
- Object.keys(this.itemFacets).forEach((facetKey)=>{
169
+ if (this.lib.facets) {
170
+ Object.keys(this.lib.facets).forEach((facetKey)=>{
173
171
  this.logger.default('Configuring Item Facet', {
174
172
  facetKey
175
173
  });
@@ -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\n// TODO: body is in the request, it's not needed in the parameters\nexport type FacetMethod = <\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) =>\n Promise<any>;\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 private itemFacets: Record<string, FacetMethod> | 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 res.status(500).json({ error: 'Item Actions are not configured' });\n return;\n }\n try {\n const item =\n validatePK(await this.lib.get(ik), this.getPkType()) as Item<S, L1, L2, L3, L4, L5>;\n 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 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.itemFacets) {\n this.logger.error('Item Facets are not configured');\n res.status(500).json({ error: 'Item Facets are not configured' });\n return;\n }\n try {\n const item =\n validatePK(await this.lib.get(ik), this.getPkType()) as Item<S, L1, L2, L3, L4, L5>;\n await this.itemFacets[facetKey](req, res, item, 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.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.itemFacets = this.configureItemFacets();\n this.logger.debug('Item Facets supplied to Router', { itemFacets: this.itemFacets });\n if (this.itemFacets) {\n Object.keys(this.itemFacets).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 protected configureItemActions(): Record<string, ActionMethod> {\n this.logger.debug('ARouter - No Item Actions Configured');\n return {};\n }\n\n /* istanbul ignore next */\n protected configureItemFacets(): Record<string, FacetMethod> {\n this.logger.debug('ARouter - No Item Facets 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<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","logger","debug","router","Router","configure","lib","options","childRouters","itemActions","itemFacets","postItemAction","req","default","query","params","ik","actionKey","path","substring","lastIndexOf","error","status","json","item","validatePK","get","body","err","message","stack","getItemFacet","facetKey","pkType","findItems","post","createItem","allActions","configureAllActions","Object","keys","forEach","itemRouter","getItem","put","updateItem","delete","deleteItem","configureItemActions","configureItemFacets","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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"}
@@ -1,18 +1,13 @@
1
1
  import { ComKey, Item, ItemProperties, LocKey, LocKeyArray, PriKey } from '@fjell/core';
2
2
  import { Operations } from '@fjell/lib';
3
- import { Request, RequestHandler, Response, Router } from 'express';
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
- export type FacetMethod = <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) => Promise<any>;
8
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> {
9
6
  protected lib: Operations<Item<S, L1, L2, L3, L4, L5>, S, L1, L2, L3, L4, L5>;
10
7
  private keyType;
11
8
  protected options: ItemRouterOptions;
12
9
  private childRouters;
13
10
  private logger;
14
- private itemActions;
15
- private itemFacets;
16
11
  constructor(lib: Operations<Item<S, L1, L2, L3, L4, L5>, S, L1, L2, L3, L4, L5>, keyType: S, options?: ItemRouterOptions);
17
12
  getPkType: () => S;
18
13
  protected getPkParam: () => string;
@@ -27,9 +22,6 @@ export declare class ItemRouter<S extends string, L1 extends string = never, L2
27
22
  private validatePrimaryKeyValue;
28
23
  private configureChildRouters;
29
24
  addChildRouter: (path: string, router: Router) => void;
30
- protected configureItemActions(): Record<string, ActionMethod>;
31
- protected configureItemFacets(): Record<string, FacetMethod>;
32
- protected configureAllActions(): Record<string, AllActionMethods>;
33
25
  getRouter(): Router;
34
26
  protected createItem: (req: Request, res: Response) => Promise<void>;
35
27
  postCreateItem: (item: Item<S, L1, L2, L3, L4, L5>) => Promise<Item<S, L1, L2, L3, L4, L5>>;
@@ -41,18 +41,6 @@ class ItemRouter {
41
41
  getIk(res) {
42
42
  throw new Error('Method not implemented in an abstract router');
43
43
  }
44
- /* istanbul ignore next */ configureItemActions() {
45
- this.logger.debug('ARouter - No Item Actions Configured');
46
- return {};
47
- }
48
- /* istanbul ignore next */ configureItemFacets() {
49
- this.logger.debug('ARouter - No Item Facets Configured');
50
- return {};
51
- }
52
- /* istanbul ignore next */ configureAllActions() {
53
- this.logger.debug('ARouter - No All Actions Configured');
54
- return {};
55
- }
56
44
  /* istanbul ignore next */ getRouter() {
57
45
  const router = Router();
58
46
  this.configure(router);
@@ -64,8 +52,6 @@ class ItemRouter {
64
52
  _define_property(this, "options", void 0);
65
53
  _define_property(this, "childRouters", {});
66
54
  _define_property(this, "logger", void 0);
67
- _define_property(this, "itemActions", void 0);
68
- _define_property(this, "itemFacets", void 0);
69
55
  _define_property(this, "getPkType", ()=>{
70
56
  return this.keyType;
71
57
  });
@@ -80,16 +66,25 @@ class ItemRouter {
80
66
  });
81
67
  const ik = this.getIk(res);
82
68
  const actionKey = req.path.substring(req.path.lastIndexOf('/') + 1);
83
- if (!this.itemActions) {
69
+ if (!this.lib.actions) {
84
70
  this.logger.error('Item Actions are not configured');
85
71
  res.status(500).json({
86
72
  error: 'Item Actions are not configured'
87
73
  });
88
74
  return;
89
75
  }
76
+ const action = this.lib.actions[actionKey];
77
+ if (!action) {
78
+ this.logger.error('Item Action is not configured', {
79
+ actionKey
80
+ });
81
+ res.status(500).json({
82
+ error: 'Item Action is not configured'
83
+ });
84
+ return;
85
+ }
90
86
  try {
91
- const item = validatePK(await this.lib.get(ik), this.getPkType());
92
- res.json(await this.itemActions[actionKey](req, res, item, req.params, req.body));
87
+ res.json(await this.lib.action(ik, actionKey, req.body));
93
88
  } catch (err) {
94
89
  this.logger.error('Error in Item Action', {
95
90
  message: err === null || err === void 0 ? void 0 : err.message,
@@ -106,16 +101,25 @@ class ItemRouter {
106
101
  });
107
102
  const ik = this.getIk(res);
108
103
  const facetKey = req.path.substring(req.path.lastIndexOf('/') + 1);
109
- if (!this.itemFacets) {
104
+ if (!this.lib.facets) {
110
105
  this.logger.error('Item Facets are not configured');
111
106
  res.status(500).json({
112
107
  error: 'Item Facets are not configured'
113
108
  });
114
109
  return;
115
110
  }
111
+ const facet = this.lib.facets[facetKey];
112
+ if (!facet) {
113
+ this.logger.error('Item Facet is not configured', {
114
+ facetKey
115
+ });
116
+ res.status(500).json({
117
+ error: 'Item Facet is not configured'
118
+ });
119
+ return;
120
+ }
116
121
  try {
117
- const item = validatePK(await this.lib.get(ik), this.getPkType());
118
- await this.itemFacets[facetKey](req, res, item, req.params);
122
+ res.json(await this.lib.facet(ik, facetKey, req.params));
119
123
  } catch (err) {
120
124
  this.logger.error('Error in Item Facet', {
121
125
  message: err === null || err === void 0 ? void 0 : err.message,
@@ -130,29 +134,24 @@ class ItemRouter {
130
134
  });
131
135
  router.get('/', this.findItems);
132
136
  router.post('/', this.createItem);
133
- const allActions = this.configureAllActions();
134
- this.logger.debug('All Actions supplied to Router', {
135
- allActions
136
- });
137
- if (allActions) {
138
- Object.keys(allActions).forEach((actionKey)=>{
139
- this.logger.default('Configuring All Action', {
140
- actionKey
141
- });
142
- // TODO: Ok, this is a bit of a hack, but we need to customize the types of the request handlers
143
- router.post(`/${actionKey}`, ...allActions[actionKey]);
144
- });
145
- }
137
+ // const allActions = this.configureAllActions();
138
+ // this.logger.debug('All Actions supplied to Router', { allActions });
139
+ // if (allActions) {
140
+ // Object.keys(allActions).forEach((actionKey) => {
141
+ // this.logger.default('Configuring All Action', { actionKey });
142
+ // // TODO: Ok, this is a bit of a hack, but we need to customize the types of the request handlers
143
+ // router.post(`/${actionKey}`, ...allActions[actionKey]);
144
+ // });
145
+ // }
146
146
  const itemRouter = Router();
147
147
  itemRouter.get('/', this.getItem);
148
148
  itemRouter.put('/', this.updateItem);
149
149
  itemRouter.delete('/', this.deleteItem);
150
- this.itemActions = this.configureItemActions();
151
150
  this.logger.debug('Item Actions supplied to Router', {
152
- itemActions: this.itemActions
151
+ itemActions: this.lib.actions
153
152
  });
154
- if (this.itemActions) {
155
- Object.keys(this.itemActions).forEach((actionKey)=>{
153
+ if (this.lib.actions) {
154
+ Object.keys(this.lib.actions).forEach((actionKey)=>{
156
155
  this.logger.default('Configuring Item Action', {
157
156
  actionKey
158
157
  });
@@ -160,12 +159,11 @@ class ItemRouter {
160
159
  itemRouter.post(`/${actionKey}`, this.postItemAction);
161
160
  });
162
161
  }
163
- this.itemFacets = this.configureItemFacets();
164
162
  this.logger.debug('Item Facets supplied to Router', {
165
- itemFacets: this.itemFacets
163
+ itemFacets: this.lib.facets
166
164
  });
167
- if (this.itemFacets) {
168
- Object.keys(this.itemFacets).forEach((facetKey)=>{
165
+ if (this.lib.facets) {
166
+ Object.keys(this.lib.facets).forEach((facetKey)=>{
169
167
  this.logger.default('Configuring Item Facet', {
170
168
  facetKey
171
169
  });