@vulkano/core 1.5.4 → 1.6.0

package/bootstrap/server.js

@@ -333,6 +333,7 @@ module.exports = function loadServer() {
       let pathToRoute;
       let handler;
 
+      // Routes from convention (controller name & method = route)
       Object.keys(routes).forEach((route) => {
 
         const parts = route.split(' ');
@@ -358,45 +359,66 @@ module.exports = function loadServer() {
 
       });
 
+      // Routes from config/routes.js
       Object.keys(this.routes || {}).forEach((i) => {
 
-        const fullPath = this.routes[i].split('.');
+        const current = this.routes[i];
+        const parts = i.split(' ');
+        let pathToRun = parts.pop();
 
-        const [
-          moduleToRun,
-          controllerToRun,
-          actionToRun
-        ] = fullPath;
-
-        let module;
-        let controller;
-        let action;
-
-        if (actionToRun) { // Has folder
-          module = moduleToRun;
-          controller = controllerToRun;
-          action = actionToRun;
-        } else {
-          module = null;
-          controller = moduleToRun;
-          action = controllerToRun;
-        }
+        // Capture the HTTP Method
+        let option = (parts[0] !== undefined) ? String(parts[0]).toLowerCase() : 'get';
 
-        const parts = i.split(' ');
-        const pathToRun = parts.pop();
-        let option = (parts[0] !== undefined) ? parts[0].toLowerCase() : 'get';
         if (option !== 'get' && option !== 'post' && option !== 'put' && option !== 'delete') {
           option = 'get';
         }
 
+        if (!String(pathToRun).startsWith('/')) {
+          pathToRun = `/${pathToRun}`;
+        }
+
         let toExecute = null;
 
-        try {
-          toExecute = module
-            ? (AllControllers[module][controller][action])
-            : AllControllers[controller][action];
-        } catch (e) {
-          toExecute = null;
+        if (typeof current === 'function') {
+
+          toExecute = current;
+
+        } else {
+
+          const fullPath = this.routes[i].split('.');
+
+          const [
+            moduleToRun,
+            controllerToRun,
+            actionToRun
+          ] = fullPath;
+
+          let module;
+          let controller;
+          let action;
+
+          if (actionToRun) { // Has folder
+            module = moduleToRun;
+            controller = controllerToRun;
+            action = actionToRun;
+          } else {
+            module = null;
+            controller = moduleToRun;
+            action = controllerToRun;
+          }
+
+          try {
+            toExecute = module
+              ? (AllControllers[module][controller][action])
+              : AllControllers[controller][action];
+          } catch (e) {
+            toExecute = null;
+          }
+
+          if (!toExecute) {
+            console.error('\x1b[31mError:', 'Controller not found in', (module) ? `${module}.${controller}.${action}` : `${controller}.${action}`, '\x1b[0m');
+          }
+
         }
 
         if (toExecute) {
@@ -405,8 +427,6 @@ module.exports = function loadServer() {
           } else {
             vulkano[option](pathToRun || '/', middleware, toExecute);
           }
-        } else {
-          console.error('\x1b[31mError:', 'Controller not found in', (module) ? `${module}.${controller}.${action}` : `${controller}.${action}`, '\x1b[0m');
         }
 
       });

package/libs/Paginate.js

@@ -2,6 +2,39 @@ const _ = require('underscore');
 
 module.exports = {
 
+  accentToRegex(_text) {
+
+    const ACCENT_STRINGS = 'ŠŒŽšœžŸ¥µÀÁÂÃÄÅÆÇÈÉÊËẼÌÍÎÏĨÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëẽìíîïĩðñòóôõöøùúûüýÿ';
+    const NO_ACCENT_STRINGS = 'SOZsozYYuAAAAAAACEEEEEIIIIIDNOOOOOOUUUUYsaaaaaaaceeeeeiiiiionoooooouuuuyy';
+
+    const from = ACCENT_STRINGS.split('');
+    const to = NO_ACCENT_STRINGS.split('');
+    const result = [];
+    let text = _text;
+
+    to.forEach( (letter, key) => {
+      const exist = result.indexOf(letter);
+      if (exist >= 0) {
+        result[exist] += from[key];
+      } else {
+        result.push(letter);
+      }
+    });
+
+    result.forEach( (rg, key) => {
+      const regex = new RegExp(`[${rg}]`);
+      text = text.replace(regex, `_${key}_`);
+    });
+
+    result.forEach( (rg, key) => {
+      const regex = new RegExp(`_${key}_`);
+      text = text.replace(regex, `[${rg}]`);
+    });
+
+    return text;
+
+  },
+
   serializeQuery(_props, _query) {
 
     const props = typeof _props === 'object'
@@ -45,11 +78,11 @@ module.exports = {
         if (type === String) {
 
           if (searchType === 'startwith' || searchType === 'start') {
-            row[item] = new RegExp(['^', Utils.accentToRegex(search), '*.'].join(''), 'i');
+            row[item] = new RegExp(['^', this.accentToRegex(search), '*.'].join(''), 'i');
           } else if (searchType === 'endwith' || searchType === 'end') {
-            row[item] = new RegExp(['.*', Utils.accentToRegex(search)].join(''), 'i');
+            row[item] = new RegExp(['.*', this.accentToRegex(search)].join(''), 'i');
           } else {
-            row[item] = new RegExp(['.*', Utils.accentToRegex(search), '*.'].join(''), 'i');
+            row[item] = new RegExp(['.*', this.accentToRegex(search), '*.'].join(''), 'i');
           }
 
         } else if (type === Number) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vulkano/core",
-  "version": "1.5.4",
+  "version": "1.6.0",
   "description": "A MVC framework using Express 4",
   "license": "MIT",
   "author": "Vulkano Team",
@@ -36,7 +36,7 @@
     "compression": "^1.7.4",
     "connect-timeout": "^1.9.0",
     "cookie-parser": "^1.4.6",
-    "cron": "^3.1.6",
+    "cron": "^3.1.7",
     "deepmerge": "^4.3.1",
     "dotenv": "^16.4.5",
     "express": "^4.19.2",
@@ -46,7 +46,7 @@
     "fs": "^0.0.1-security",
     "fs-extra": "^11.2.0",
     "helmet": "^7.1.0",
-    "i18next": "^23.10.1",
+    "i18next": "^23.11.4",
     "include-all": "^4.0.3",
     "jwt-simple": "^0.5.6",
     "moment": "^2.30.1",
@@ -67,11 +67,11 @@
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.24.4",
-    "@babel/eslint-parser": "^7.24.1",
+    "@babel/core": "^7.24.5",
+    "@babel/eslint-parser": "^7.24.5",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-syntax-jsx": "^7.24.1",
-    "@babel/preset-env": "^7.24.4",
+    "@babel/preset-env": "^7.24.5",
     "@babel/preset-react": "^7.24.1",
     "@babel/preset-stage-1": "^7.8.3",
     "eslint": "^8.57.0",
@@ -79,6 +79,6 @@
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-react": "^7.34.1",
-    "eslint-plugin-react-hooks": "^4.6.0"
+    "eslint-plugin-react-hooks": "^4.6.2"
   }
 }

package/responses/vsr.js

@@ -16,7 +16,7 @@ module.exports = function VSRPromise(promiseToRun, httpStatusCode) {
   } = req;
 
   let code = httpStatusCode || 200;
-  let output = {
+  const output = {
     success: true,
     statusCode: code
   };