jgloo 1.6.0 → 1.8.0

package/CHANGELOG.md

@@ -1,3 +1,33 @@
+<a name="1.8.0"></a>
+
+## [1.8.0](https://github.com/zosma180/jgloo/compare/1.7.0...1.8.0) (2022-07-29)
+
+### Features
+
+- Added the optional "priority" property to the configuration
+
+---
+
+<a name="1.7.0"></a>
+
+## [1.7.0](https://github.com/zosma180/jgloo/compare/1.6.1...1.7.0) (2022-07-28)
+
+### Features
+
+- Added the support for the recursive folder loading (api and middlewares)
+
+---
+
+<a name="1.6.1"></a>
+
+## [1.6.1](https://github.com/zosma180/jgloo/compare/1.6.0...1.6.1) (2022-07-22)
+
+### Bug Fixes
+
+- Updated the package-lock to fix the security issues
+
+---
+
 <a name="1.6.0"></a>
 
 ## [1.6.0](https://github.com/zosma180/jgloo/compare/1.5.2...1.6.0) (2022-02-20)

package/README.md

@@ -46,6 +46,7 @@ Now you are ready to [create your first API](#create-a-simple-api).
 - [Expose the static files](#expose-the-static-files)
 - [Handle requests with file uploads](#handle-requests-with-file-uploads)
 - [Simulate network delay](#simulate-network-delay)
+- [Manage path conflicts](#manage-path-conflicts)
 - [Run the server](#run-the-server)
 
 ---
@@ -197,6 +198,25 @@ module.exports = {
 
 ---
 
+### Manage path conflicts
+
+If you have a scenario where two or more paths have conflicting values, e.g.:
+- /my-path/:id
+- /my-path/my-sub-path
+
+you can add the `priority` property to your API configuration:
+
+```javascript
+module.exports = {
+  ...
+  priority: 2
+};
+```
+
+The default value is 0. The api with the higher value will be used.
+
+---
+
 ### Run the server
 
 To run the server execute the following command in your project root:

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "jgloo",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "description": "The coldest mock server.",
-  "homepage": "https://github.com/zosma180/jgloo#readme",
+  "homepage": "https://github.com/zosma180/jgloo",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/zosma180/jgloo.git"
@@ -29,7 +29,7 @@
     "cors": "^2.8.5",
     "express": "^4.17.1",
     "minimist": "^1.2.5",
-    "multer": "^1.4.2",
+    "multer": "^1.4.5-lts.1",
     "nodemon": "^2.0.4"
   }
 }

package/server.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const { existsSync, readdirSync } = require('fs');
+const { existsSync, readdirSync, lstatSync } = require('fs');
 const express = require('express');
 const cors = require('cors');
 const bodyParser = require('body-parser');
@@ -22,6 +22,22 @@ if (!existsSync(root)) {
   process.exit(2);
 }
 
+// Utility to deep load files
+const walk = (entry, level = 1) => {
+  let list = [];
+  const items = readdirSync(entry);
+
+  items.forEach(item => {
+    const subEntry = path.join(entry, item);
+
+    lstatSync(subEntry).isDirectory() && level < 10
+      ? list = list.concat(walk(subEntry, level + 1))
+      : list.push(subEntry);
+  });
+
+  return list;
+};
+
 // Config
 app.use(cors());
 app.use(bodyParser.json());
@@ -29,10 +45,10 @@ app.use(multer({ dest: staticPath }).any());
 
 // Add middlewares
 if (existsSync(middlewarePath)) {
-  readdirSync(middlewarePath)
-    .filter((file) => file.endsWith('.js'))
-    .forEach((file) => {
-      const middleware = require(path.join(middlewarePath, file));
+  walk(middlewarePath)
+    .filter(file => file.endsWith('.js'))
+    .forEach(file => {
+      const middleware = require(file);
       app.use(middleware);
     });
 }
@@ -48,16 +64,17 @@ if (!existsSync(apiPath)) {
   process.exit(2);
 }
 
-const api = readdirSync(apiPath).filter((file) => file.endsWith('.js'));
+const api = walk(apiPath)
+  .filter(file => file.endsWith('.js'))
+  .map(file => require(file))
+  .sort((a, b) => (b.priority || 0) - (a.priority || 0));
 
 if (!api.length) {
   console.error(`No API file defined. Create one.`);
   process.exit(2);
 }
 
-api.forEach((file) => {
-  const config = require(path.join(apiPath, file));
-
+api.forEach(config => {
   // Add the API delay, if it is provided
   if (config.delay) {
     app.use(config.path, getDelayMiddleware(config.delay));
@@ -74,3 +91,4 @@ api.forEach((file) => {
 
 const message = `jgloo builded on the ice shelf "${root}" and the port ${port}.`;
 app.listen(port, () => console.log('\x1b[36m', message));
+