@novice1/routing 1.1.7 → 2.0.0

package/README.md

@@ -1,6 +1,6 @@
 # @novice1/routing
 
-A small extension of [Express routing](https://expressjs.com/en/guide/routing.html).
+A small extension of [Express (v5) routing](https://expressjs.com/en/guide/routing.html).
 
 ## Installation
 

package/lib/layer.js

@@ -1,8 +1,9 @@
-var inherits = require('util').inherits;
+//var inherits = require('util').inherits;
 var { flatten } = require('array-flatten');
-var ExpressLayer = require("express/lib/router/layer");
+var ExpressLayer = require("router/lib/layer");
 var toArray = require('./utils/toArray');
 
+/*
 function Layer() {
   var args = Array.from(arguments);
   ExpressLayer.apply(this, args);
@@ -16,6 +17,21 @@ function Layer() {
 }
 
 inherits(Layer, ExpressLayer);
+*/
+
+class Layer extends ExpressLayer {
+  constructor() {
+    var args = Array.from(arguments);
+    super(...args)
+
+    this.get_meta = get_meta;
+    this.set_auth = set_auth;
+    this.set_auth_if_none = set_auth_if_none;
+    this.set_validators = set_validators;
+    this.set_validators_if_none = set_validators_if_none;
+    this.meta_path = args[0];
+  }
+}
 
 function get_meta(path) {
   var v = [];

package/lib/route/createLayers.js

@@ -1,5 +1,5 @@
 // var Layer = require("./layer"); // no need for extra methods if layer is inside a Route
-var Layer = require("express/lib/router/layer");
+var Layer = require("router/lib/layer");
 
 /**
  * @description returns Layers in opposite order

package/lib/route.js

@@ -1,5 +1,5 @@
-var inherits = require('util').inherits
-var ExpressRoute = require("express/lib/router/route");
+//var inherits = require('util').inherits
+var ExpressRoute = require("router/lib/route");
 var { flatten } = require('array-flatten');
 var methods = require("methods");
 
@@ -9,13 +9,21 @@ var createLayers = require('./route/createLayers');
 /**
  * @classdesc Initialize `Route` with the given `path`,
  * @class
- * @augments ExpressRoute express/lib/router/route
+ * @augments ExpressRoute router/route
  */
+/*
 function Route() {
   return ExpressRoute.apply(this, Array.from(arguments));
 }
 
 inherits(Route, ExpressRoute);
+*/
+
+class Route extends ExpressRoute {
+  constructor() {
+    super(...Array.from(arguments))
+  }
+}
 
 methods.concat('all').forEach(function(method){
   /** @inheritdoc */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@novice1/routing",
   "private": false,
-  "version": "1.1.7",
+  "version": "2.0.0",
   "description": "",
   "main": "index.js",
   "keywords": [
@@ -21,13 +21,15 @@
   "license": "MIT",
   "dependencies": {
     "array-flatten": "^3.0.0",
-    "express": "^4.21.1",
-    "extend": "^3.0.2"
+    "express": "^5.1.0",
+    "extend": "^3.0.2",
+    "methods": "^1.1.2",
+    "router": "^2.2.0"
   },
   "devDependencies": {
-    "@types/express": "^5.0.0",
+    "@types/express": "^5.0.1",
     "chai": "^4.5.0",
-    "kaukau": "^4.0.0"
+    "kaukau": "^4.1.5"
   },
   "engines": {
     "node": ">=14.0.0"