@vida-global/core 1.2.3 → 1.2.5

package/lib/server/server.js

@@ -200,6 +200,7 @@ class VidaServer {
     #registerAction(action, controllerCls) {
         const method         = action.method.toLowerCase();
         const requestHandler = this.requestHandler(action.action, controllerCls)
+        logger.info(`ROUTE: ${method.toUpperCase().padEnd(6)} ${action.path}`);
         this['_'+method](action.path, requestHandler);
     }
 

package/lib/server/serverController.js

@@ -1,5 +1,5 @@
-const { logger }    = require('../logger');
-const { camelize }  = require('inflection');
+const { logger }                 = require('../logger');
+const { camelize, singularize }  = require('inflection');
 
 
 class VidaServerController {
@@ -304,7 +304,26 @@ class VidaServerController {
 
     static _routeForAction(method, path, routePrefix, actionName) {
         if (this.routes[actionName]) return this.routes[actionName];
-        if (path == 'Index')         return routePrefix;
+
+        // If the path starts with Record, use :id as a path parameter
+        /*
+          class UsersController {
+              // Get /users
+              async getIndex() {}
+
+              // Get /user/:id
+              async getRecord() {}
+
+              // Get /user/:id/status
+              async getRecordStatus() {}
+          }
+        */
+        if (/^Record($|[A-Z])/.test(path)) {
+          routePrefix = `${singularize(routePrefix)}/:id`;
+          path = path == 'Record' ? 'Index' : path.replace(/^Record/, '');
+        }
+
+        if (path == 'Index') return routePrefix;
 
         path = path.charAt(0).toLowerCase() + path.slice(1);
         return `${routePrefix}/${path}`;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vida-global/core",
-    "version": "1.2.3",
+    "version": "1.2.5",
     "description": "Core libraries for supporting Vida development",
     "author": "",
     "license": "ISC",

package/test/server/serverController.test.js

@@ -23,22 +23,55 @@ describe('VidaServerController', () => {
 
 
     describe('VidaServerController._constructAction', () => {
+        class UsersController extends VidaServerController {
+            static get routes() {
+                return {getBazBan: '/baz/:id/ban'};
+            }
+        };
+
         it ('returns an object with path, method, and action', () => {
             const expected   = {
               method: 'GET',
-              path:   '/foo/fooBar',
+              path:   '/users/fooBar',
               action: 'getFooBar'
             }
-            expect(FooController._constructAction('getFooBar', '')).toEqual(expected);
+            expect(UsersController._constructAction('getFooBar', '')).toEqual(expected);
         });
 
         it ('uses a blank path for index actions', () => {
             const expected   = {
               method: 'POST',
-              path:   '/foo',
+              path:   '/users',
               action: 'postIndex'
             }
-            expect(FooController._constructAction('postIndex', '')).toEqual(expected);
+            expect(UsersController._constructAction('postIndex', '')).toEqual(expected);
+        });
+
+        it ('creates a single resource route for Record', () => {
+            const expected   = {
+              method: 'GET',
+              path:   '/user/:id',
+              action: 'getRecord'
+            }
+            expect(UsersController._constructAction('getRecord', '')).toEqual(expected);
+        });
+
+        it ('only uses Record when checking for single resource routes', () => {
+            const expected   = {
+              method: 'GET',
+              path:   '/users/recording',
+              action: 'getRecording'
+            }
+            expect(UsersController._constructAction('getRecording', '')).toEqual(expected);
+        });
+
+        it ('creates a single sub resource route for RecordFoo', () => {
+            const expected   = {
+              method: 'GET',
+              path:   '/user/:id/foo',
+              action: 'getRecordFoo'
+            }
+            expect(UsersController._constructAction('getRecordFoo', '')).toEqual(expected);
         });
 
         it ('uses a custom path when defined', () => {
@@ -47,7 +80,7 @@ describe('VidaServerController', () => {
               path:   '/baz/:id/ban',
               action: 'getBazBan'
             }
-            expect(FooController._constructAction('getBazBan', '')).toEqual(expected);
+            expect(UsersController._constructAction('getBazBan', '')).toEqual(expected);
         });
     });