@fjell/express-router 4.4.3 → 4.4.5

package/dist/index.cjs

@@ -64,22 +64,100 @@ class ItemRouter {
         _define_property$2(this, "getPkParam", ()=>{
             return `${this.getPkType()}Pk`;
         });
+        _define_property$2(this, "postAllAction", async (req, res)=>{
+            const libOptions = this.lib.definition.options;
+            const libOperations = this.lib.operations;
+            this.logger.debug('Posting All Action', {
+                query: req === null || req === void 0 ? void 0 : req.query,
+                params: req === null || req === void 0 ? void 0 : req.params,
+                locals: res === null || res === void 0 ? void 0 : res.locals
+            });
+            const allActionKey = req.path.substring(req.path.lastIndexOf('/') + 1);
+            if (!libOptions.allActions) {
+                this.logger.error('Item Actions are not configured');
+                res.status(500).json({
+                    error: 'Item Actions are not configured'
+                });
+                return;
+            }
+            const allAction = libOptions.allActions[allActionKey];
+            if (!allAction) {
+                this.logger.error('All Action is not configured', {
+                    allActionKey
+                });
+                res.status(500).json({
+                    error: 'Item Action is not configured'
+                });
+                return;
+            }
+            try {
+                res.json(await libOperations.allAction(allActionKey, req.body));
+            } catch (err) {
+                this.logger.error('Error in All Action', {
+                    message: err === null || err === void 0 ? void 0 : err.message,
+                    stack: err === null || err === void 0 ? void 0 : err.stack
+                });
+                res.status(500).json(err);
+            }
+        });
+        _define_property$2(this, "getAllFacet", async (req, res)=>{
+            const libOptions = this.lib.definition.options;
+            const libOperations = this.lib.operations;
+            this.logger.debug('Getting All Facet', {
+                query: req === null || req === void 0 ? void 0 : req.query,
+                params: req === null || req === void 0 ? void 0 : req.params,
+                locals: res === null || res === void 0 ? void 0 : res.locals
+            });
+            const facetKey = req.path.substring(req.path.lastIndexOf('/') + 1);
+            if (!libOptions.allFacets) {
+                this.logger.error('Item Facets are not configured');
+                res.status(500).json({
+                    error: 'Item Facets are not configured'
+                });
+                return;
+            }
+            const facet = libOptions.allFacets[facetKey];
+            if (!facet) {
+                this.logger.error('Item Facet is not configured', {
+                    facetKey
+                });
+                res.status(500).json({
+                    error: 'Item Facet is not configured'
+                });
+                return;
+            }
+            try {
+                const combinedQueryParams = {
+                    ...req.query,
+                    ...req.params
+                };
+                res.json(await libOperations.allFacet(facetKey, combinedQueryParams));
+            } catch (err) {
+                this.logger.error('Error in All Facet', {
+                    message: err === null || err === void 0 ? void 0 : err.message,
+                    stack: err === null || err === void 0 ? void 0 : err.stack
+                });
+                res.status(500).json(err);
+            }
+        });
         _define_property$2(this, "postItemAction", async (req, res)=>{
-            this.logger.default('Getting Item', {
+            const libOptions = this.lib.definition.options;
+            const libOperations = this.lib.operations;
+            this.logger.debug('Getting Item', {
                 query: req === null || req === void 0 ? void 0 : req.query,
                 params: req === null || req === void 0 ? void 0 : req.params,
                 locals: res === null || res === void 0 ? void 0 : res.locals
             });
             const ik = this.getIk(res);
             const actionKey = req.path.substring(req.path.lastIndexOf('/') + 1);
-            if (!this.lib.actions) {
+            if (!libOptions.actions) {
                 this.logger.error('Item Actions are not configured');
                 res.status(500).json({
                     error: 'Item Actions are not configured'
                 });
                 return;
             }
-            const action = this.lib.actions[actionKey];
+            const action = libOptions.actions[actionKey];
             if (!action) {
                 this.logger.error('Item Action is not configured', {
                     actionKey
@@ -90,7 +168,7 @@ class ItemRouter {
                 return;
             }
             try {
-                res.json(await this.lib.action(ik, actionKey, req.body));
+                res.json(await libOperations.action(ik, actionKey, req.body));
             } catch (err) {
                 this.logger.error('Error in Item Action', {
                     message: err === null || err === void 0 ? void 0 : err.message,
@@ -100,21 +178,23 @@ class ItemRouter {
             }
         });
         _define_property$2(this, "getItemFacet", async (req, res)=>{
-            this.logger.default('Getting Item', {
+            const libOptions = this.lib.definition.options;
+            const libOperations = this.lib.operations;
+            this.logger.debug('Getting Item', {
                 query: req === null || req === void 0 ? void 0 : req.query,
                 params: req === null || req === void 0 ? void 0 : req.params,
                 locals: res === null || res === void 0 ? void 0 : res.locals
             });
             const ik = this.getIk(res);
             const facetKey = req.path.substring(req.path.lastIndexOf('/') + 1);
-            if (!this.lib.facets) {
+            if (!libOptions.facets) {
                 this.logger.error('Item Facets are not configured');
                 res.status(500).json({
                     error: 'Item Facets are not configured'
                 });
                 return;
             }
-            const facet = this.lib.facets[facetKey];
+            const facet = libOptions.facets[facetKey];
             if (!facet) {
                 this.logger.error('Item Facet is not configured', {
                     facetKey
@@ -125,7 +205,11 @@ class ItemRouter {
                 return;
             }
             try {
-                res.json(await this.lib.facet(ik, facetKey, req.params));
+                const combinedQueryParams = {
+                    ...req.query,
+                    ...req.params
+                };
+                res.json(await libOperations.facet(ik, facetKey, combinedQueryParams));
             } catch (err) {
                 this.logger.error('Error in Item Facet', {
                     message: err === null || err === void 0 ? void 0 : err.message,
@@ -135,51 +219,57 @@ class ItemRouter {
             }
         });
         _define_property$2(this, "configure", (router)=>{
-            this.logger.default('Configuring Router', {
+            const libOptions = this.lib.definition.options;
+            this.logger.debug('Configuring Router', {
                 pkType: this.getPkType()
             });
             router.get('/', this.findItems);
             router.post('/', this.createItem);
-            // const allActions = this.configureAllActions();
-            // this.logger.debug('All Actions supplied to Router', { allActions });
-            // if (allActions) {
-            //   Object.keys(allActions).forEach((actionKey) => {
-            //     this.logger.default('Configuring All Action', { actionKey });
-            //     // TODO: Ok, this is a bit of a hack, but we need to customize the types of the request handlers
-            //     router.post(`/${actionKey}`, ...allActions[actionKey]);
-            //   });
-            // }
+            this.logger.default('All Actions supplied to Router', {
+                allActions: libOptions.allActions
+            });
+            if (libOptions.allActions) {
+                Object.keys(libOptions.allActions).forEach((actionKey)=>{
+                    this.logger.debug('Configuring All Action %s', actionKey);
+                    // TODO: Ok, this is a bit of a hack, but we need to customize the types of the request handlers
+                    router.post(`/${actionKey}`, this.postAllAction);
+                });
+            }
+            this.logger.default('All Facets supplied to Router', {
+                allFacets: libOptions.allFacets
+            });
+            if (libOptions.allFacets) {
+                Object.keys(libOptions.allFacets).forEach((facetKey)=>{
+                    this.logger.debug('Configuring All Facet %s', facetKey);
+                    // TODO: Ok, this is a bit of a hack, but we need to customize the types of the request handlers
+                    router.get(`/${facetKey}`, this.getAllFacet);
+                });
+            }
             const itemRouter = express.Router();
             itemRouter.get('/', this.getItem);
             itemRouter.put('/', this.updateItem);
             itemRouter.delete('/', this.deleteItem);
-            this.logger.debug('Item Actions supplied to Router', {
-                itemActions: this.lib.actions
+            this.logger.default('Item Actions supplied to Router', {
+                itemActions: libOptions.actions
             });
-            if (this.lib.actions) {
-                Object.keys(this.lib.actions).forEach((actionKey)=>{
-                    this.logger.default('Configuring Item Action', {
-                        actionKey
-                    });
+            if (libOptions.actions) {
+                Object.keys(libOptions.actions).forEach((actionKey)=>{
+                    this.logger.debug('Configuring Item Action %s', actionKey);
                     // TODO: Ok, this is a bit of a hack, but we need to customize the types of the request handlers
                     itemRouter.post(`/${actionKey}`, this.postItemAction);
                 });
             }
-            this.logger.debug('Item Facets supplied to Router', {
-                itemFacets: this.lib.facets
+            this.logger.default('Item Facets supplied to Router', {
+                itemFacets: libOptions.facets
             });
-            if (this.lib.facets) {
-                Object.keys(this.lib.facets).forEach((facetKey)=>{
-                    this.logger.default('Configuring Item Facet', {
-                        facetKey
-                    });
+            if (libOptions.facets) {
+                Object.keys(libOptions.facets).forEach((facetKey)=>{
+                    this.logger.debug('Configuring Item Facet %s', facetKey);
                     // TODO: Ok, this is a bit of a hack, but we need to customize the types of the request handlers
                     itemRouter.get(`/${facetKey}`, this.getItemFacet);
                 });
             }
-            this.logger.default('Configuring Item Operations under PK Param', {
-                pkParam: this.getPkParam()
-            });
+            this.logger.debug('Configuring Item Operations under PK Param %s', this.getPkParam());
             router.use(`/:${this.getPkParam()}`, this.validatePrimaryKeyValue, itemRouter);
             if (this.childRouters) {
                 this.configureChildRouters(itemRouter, this.childRouters);
@@ -194,19 +284,17 @@ class ItemRouter {
             } else {
                 this.logger.error('Invalid Primary Key', {
                     pkParamValue,
-                    path: req === null || req === void 0 ? void 0 : req.path
+                    path: req === null || req === void 0 ? void 0 : req.originalUrl
                 });
                 res.status(500).json({
                     error: 'Invalid Primary Key',
-                    path: req === null || req === void 0 ? void 0 : req.path
+                    path: req === null || req === void 0 ? void 0 : req.originalUrl
                 });
             }
         });
         _define_property$2(this, "configureChildRouters", (router, childRouters)=>{
             for(const path in childRouters){
-                this.logger.default('Configuring Child Router at Path', {
-                    path
-                });
+                this.logger.debug('Configuring Child Router at Path %s', path);
                 router.use(`/${path}`, childRouters[path]);
             }
             return router;
@@ -220,19 +308,20 @@ class ItemRouter {
         });
         // TODO: Probably a better way to do this, but this postCreate hook only needs the item.
         /* istanbul ignore next */ _define_property$2(this, "postCreateItem", async (item)=>{
-            this.logger.default('Post Create Item', {
+            this.logger.debug('Post Create Item', {
                 item
             });
             return item;
         });
         _define_property$2(this, "deleteItem", async (req, res)=>{
-            this.logger.default('Deleting Item', {
+            const libOperations = this.lib.operations;
+            this.logger.debug('Deleting Item', {
                 query: req.query,
                 params: req.params,
                 locals: res.locals
             });
             const ik = this.getIk(res);
-            const removedItem = await this.lib.remove(ik);
+            const removedItem = await libOperations.remove(ik);
             const item = core.validatePK(removedItem, this.getPkType());
             res.json(item);
         });
@@ -240,7 +329,8 @@ class ItemRouter {
             throw new Error('Method not implemented in an abstract router');
         });
         /* eslint-enable */ _define_property$2(this, "getItem", async (req, res)=>{
-            this.logger.default('Getting Item', {
+            const libOperations = this.lib.operations;
+            this.logger.debug('Getting Item', {
                 query: req.query,
                 params: req.params,
                 locals: res.locals
@@ -248,7 +338,7 @@ class ItemRouter {
             const ik = this.getIk(res);
             try {
                 // TODO: What error does validate PK throw, when can that fail?
-                const item = core.validatePK(await this.lib.get(ik), this.getPkType());
+                const item = core.validatePK(await libOperations.get(ik), this.getPkType());
                 res.json(item);
             } catch (err) {
                 if (err instanceof lib.NotFoundError) {
@@ -275,7 +365,8 @@ class ItemRouter {
             }
         });
         _define_property$2(this, "updateItem", async (req, res)=>{
-            this.logger.default('Updating Item', {
+            const libOperations = this.lib.operations;
+            this.logger.debug('Updating Item', {
                 body: req === null || req === void 0 ? void 0 : req.body,
                 query: req === null || req === void 0 ? void 0 : req.query,
                 params: req === null || req === void 0 ? void 0 : req.params,
@@ -283,12 +374,12 @@ class ItemRouter {
             });
             const ik = this.getIk(res);
             const itemToUpdate = this.convertDates(req.body);
-            const retItem = core.validatePK(await this.lib.update(ik, itemToUpdate), this.getPkType());
+            const retItem = core.validatePK(await libOperations.update(ik, itemToUpdate), this.getPkType());
             res.json(retItem);
         });
         _define_property$2(this, "convertDates", (item)=>{
             const events = item.events;
-            this.logger.default('Converting Dates', {
+            this.logger.debug('Converting Dates', {
                 item
             });
             if (events) {
@@ -347,7 +438,6 @@ function _define_property$1(obj, key, value) {
     }
     return obj;
 }
-const logger$1 = LibLogger.get('CItemRouter');
 class CItemRouter extends ItemRouter {
     hasParent() {
         return !!this.parentRoute;
@@ -377,24 +467,22 @@ class CItemRouter extends ItemRouter {
     }
     constructor(lib, type, parentRoute, options = {}){
         super(lib, type, options), _define_property$1(this, "parentRoute", void 0), _define_property$1(this, "createItem", async (req, res)=>{
-            logger$1.trace('Creating Item 2', {
+            const libOperations = this.lib.operations;
+            this.logger.default('Creating Item', {
                 body: req === null || req === void 0 ? void 0 : req.body,
                 query: req === null || req === void 0 ? void 0 : req.query,
                 params: req === null || req === void 0 ? void 0 : req.params,
                 locals: res === null || res === void 0 ? void 0 : res.locals
             });
             const itemToCreate = this.convertDates(req.body);
-            let item = core.validatePK(await this.lib.create(itemToCreate, {
+            let item = core.validatePK(await libOperations.create(itemToCreate, {
                 locations: this.getLocations(res)
             }), this.getPkType());
             item = await this.postCreateItem(item);
+            this.logger.default('Created Item %j', item);
             res.json(item);
         }), _define_property$1(this, "findItems", async (req, res)=>{
-            logger$1.trace('Finding Items', {
-                query: req.query,
-                params: req.params,
-                locals: res.locals
-            });
+            const libOperations = this.lib.operations;
             const query = req.query;
             const finder = query['finder'];
             const finderParams = query['finderParams'];
@@ -402,7 +490,7 @@ class CItemRouter extends ItemRouter {
             let items = [];
             if (finder) {
                 // If finder is defined?  Call a finder.
-                logger$1.trace('Finding Items with a finder', {
+                this.logger.default('Finding Items with Finder', {
                     finder,
                     finderParams,
                     one
@@ -413,15 +501,14 @@ class CItemRouter extends ItemRouter {
                         item
                     ] : [];
                 } else {
-                    items = await this.lib.find(finder, JSON.parse(finderParams), this.getLocations(res));
+                    items = await libOperations.find(finder, JSON.parse(finderParams), this.getLocations(res));
                 }
             } else {
-                logger$1.trace('Finding Items with a query', {
-                    query: req.query
-                });
                 // TODO: This is once of the more important places to perform some validaation and feedback
                 const itemQuery = core.paramsToQuery(req.query);
-                items = await this.lib.all(itemQuery, this.getLocations(res));
+                this.logger.default('Finding Items with Query: %j', itemQuery);
+                items = await libOperations.all(itemQuery, this.getLocations(res));
+                this.logger.default('Found %d Items with Query', items.length);
             }
             res.json(items.map((item)=>core.validatePK(item, this.getPkType())));
         });
@@ -442,7 +529,6 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
-const logger = LibLogger.get('PItemRouter');
 class PItemRouter extends ItemRouter {
     getIk(res) {
         const pri = this.getPk(res);
@@ -450,18 +536,21 @@ class PItemRouter extends ItemRouter {
     }
     constructor(lib, keyType, options = {}){
         super(lib, keyType, options), _define_property(this, "createItem", async (req, res)=>{
-            logger.default('Creating Item 2', {
+            const libOperations = this.lib.operations;
+            this.logger.default('Creating Item', {
                 body: req.body,
                 query: req.query,
                 params: req.params,
                 locals: res.locals
             });
             const itemToCreate = this.convertDates(req.body);
-            let item = core.validatePK(await this.lib.create(itemToCreate), this.getPkType());
+            let item = core.validatePK(await libOperations.create(itemToCreate), this.getPkType());
             item = await this.postCreateItem(item);
+            this.logger.default('Created Item %j', item);
             res.json(item);
         }), _define_property(this, "findItems", async (req, res)=>{
-            logger.default('Finding Items', {
+            const libOperations = this.lib.operations;
+            this.logger.default('Finding Items', {
                 query: req.query,
                 params: req.params,
                 locals: res.locals
@@ -473,26 +562,20 @@ class PItemRouter extends ItemRouter {
             const one = query['one'];
             if (finder) {
                 // If finder is defined?  Call a finder.
-                logger.default('Finding Items with a finder', {
-                    finder,
-                    finderParams,
-                    one
-                });
+                this.logger.default('Finding Items with Finder %s %j one:%s', finder, finderParams, one);
                 if (one === 'true') {
                     const item = await this.lib.findOne(finder, JSON.parse(finderParams));
                     items = item ? [
                         item
                     ] : [];
                 } else {
-                    items = await this.lib.find(finder, JSON.parse(finderParams));
+                    items = await libOperations.find(finder, JSON.parse(finderParams));
                 }
             } else {
-                logger.default('Finding Items with a query', {
-                    query: req.query
-                });
                 // TODO: This is once of the more important places to perform some validaation and feedback
                 const itemQuery = core.paramsToQuery(req.query);
-                items = await this.lib.all(itemQuery);
+                this.logger.default('Finding Items with a query %j', itemQuery);
+                items = await libOperations.all(itemQuery);
             }
             res.json(items.map((item)=>core.validatePK(item, this.getPkType())));
         });