next-middleware-router 1.0.2 → 1.0.4

package/README.md

@@ -1,5 +1,3 @@
 # Next.js Middleware Router
 
 **TODO**
-
-<sub><sub>(just gimme a sec. ill write the README over the weekend)</sub></sub>

package/dist/cjs/compilePath.js

@@ -4,39 +4,42 @@ exports.compilePath = void 0;
 const raise_1 = require("./raise");
 // Compile a RegEx that matches a specific route and extracts its params and wildcard
 const compilePath = (path, caseSensitive = false) => {
-    const parts = path.split('/');
+    const parts = path.split("/");
     const params = [];
-    let patt = '^', wildcard = Infinity;
+    let wildcard = Infinity;
+    let patt = "^";
     // Iterate over segments of the route
     for (let i = 0; i < parts.length; i++) {
-        if (parts[i] === '*') {
+        if (parts[i] === "*") {
             // Wildcard
-            if (i < parts.length - 1)
+            if (i < parts.length - 1) {
                 (0, raise_1.raise)(`Invalid path '/${path}'. Wildcard use is only permitted at the very end.`);
+            }
             patt += "(/[a-zA-Z0-9.\\-/%_~!$&'()*+,;=:@]+)?";
             wildcard = i;
         }
-        else if (parts[i].startsWith(':')) {
+        else if (parts[i].startsWith(":")) {
             // Param
             params.push([
-                parts[i].endsWith('?') ? parts[i].slice(1, -1) : parts[i].slice(1),
+                parts[i].endsWith("?") ? parts[i].slice(1, -1) : parts[i].slice(1),
                 i,
             ]);
             patt += "(/[a-zA-Z0-9.\\-%_~!$&'()*+,;=:@]+)";
-            if (parts[i].endsWith('?'))
-                patt += '?';
+            if (parts[i].endsWith("?"))
+                patt += "?";
         }
         else {
             // Exact
-            let name = parts[i].endsWith('?') ? parts[i].slice(0, -1) : parts[i];
+            let name = parts[i].endsWith("?") ? parts[i].slice(0, -1) : parts[i];
             name = encodeURI(name);
-            name = name.replace(/[\\.*+^$?{}|()[\]]/g, '\\$&'); // Escape RegExp special chars
+            // Escape RegExp special chars
+            name = name.replace(/[\\.*+^$?{}|()[\]]/g, "\\$&");
             patt += `(/${name})`;
-            if (parts[i].endsWith('?'))
-                patt += '?';
+            if (parts[i].endsWith("?"))
+                patt += "?";
         }
     }
-    patt += '$';
-    return [new RegExp(patt, caseSensitive ? '' : 'i'), params, wildcard];
+    patt += "$";
+    return [new RegExp(patt, caseSensitive ? "" : "i"), params, wildcard];
 };
 exports.compilePath = compilePath;

package/dist/cjs/concatPaths.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.concatPaths = void 0;
 function concatPaths(...paths) {
-    let res = '';
+    let res = "";
     for (const path of paths) {
         if (res && path)
-            res += '/';
+            res += "/";
         res += path;
     }
     return res;

package/dist/cjs/handleRoutes.js

@@ -123,6 +123,11 @@ const handleRoutes = (pathname, { basename = "", children = [], } = {}) => {
                 params[name] = decodeURIComponent(paramVal.slice(1));
             }
         }
+        // Extract splat
+        let splat;
+        if (route.wild < Infinity && (splat = match.at(route.wild + 1))) {
+            params["*"] = decodeURIComponent(splat.slice(1));
+        }
         // Traverse matching RouteNode's parents to build a complete
         // RouteNode chain with handler functions to be executed
         const routeChain = [route];

package/dist/cjs/index.d.ts

@@ -1 +1 @@
-export { handleRoutes } from './handleRoutes';
+export { handleRoutes } from "./handleRoutes";

package/dist/cjs/normalizePath.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizePath = void 0;
 // Remove leading and trailing slashes on a path
 const normalizePath = (path) => {
-    const normalized = path[0] === '/' ? path.slice(1) : path;
-    return normalized.endsWith('/') ? normalized.slice(0, -1) : normalized;
+    const normalized = path[0] === "/" ? path.slice(1) : path;
+    return normalized.endsWith("/") ? normalized.slice(0, -1) : normalized;
 };
 exports.normalizePath = normalizePath;

package/dist/cjs/stripWild.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stripWild = exports.isWild = void 0;
-const isWild = (path) => path === '*' || path.endsWith('/*');
+const isWild = (path) => path === "*" || path.endsWith("/*");
 exports.isWild = isWild;
 const stripWild = (path) => (0, exports.isWild)(path) ? path.slice(0, -2) : path;
 exports.stripWild = stripWild;

package/dist/esm/compilePath.js

@@ -1,38 +1,41 @@
-import { raise } from './raise';
+import { raise } from "./raise";
 // Compile a RegEx that matches a specific route and extracts its params and wildcard
 export const compilePath = (path, caseSensitive = false) => {
-    const parts = path.split('/');
+    const parts = path.split("/");
     const params = [];
-    let patt = '^', wildcard = Infinity;
+    let wildcard = Infinity;
+    let patt = "^";
     // Iterate over segments of the route
     for (let i = 0; i < parts.length; i++) {
-        if (parts[i] === '*') {
+        if (parts[i] === "*") {
             // Wildcard
-            if (i < parts.length - 1)
+            if (i < parts.length - 1) {
                 raise(`Invalid path '/${path}'. Wildcard use is only permitted at the very end.`);
+            }
             patt += "(/[a-zA-Z0-9.\\-/%_~!$&'()*+,;=:@]+)?";
             wildcard = i;
         }
-        else if (parts[i].startsWith(':')) {
+        else if (parts[i].startsWith(":")) {
             // Param
             params.push([
-                parts[i].endsWith('?') ? parts[i].slice(1, -1) : parts[i].slice(1),
+                parts[i].endsWith("?") ? parts[i].slice(1, -1) : parts[i].slice(1),
                 i,
             ]);
             patt += "(/[a-zA-Z0-9.\\-%_~!$&'()*+,;=:@]+)";
-            if (parts[i].endsWith('?'))
-                patt += '?';
+            if (parts[i].endsWith("?"))
+                patt += "?";
         }
         else {
             // Exact
-            let name = parts[i].endsWith('?') ? parts[i].slice(0, -1) : parts[i];
+            let name = parts[i].endsWith("?") ? parts[i].slice(0, -1) : parts[i];
             name = encodeURI(name);
-            name = name.replace(/[\\.*+^$?{}|()[\]]/g, '\\$&'); // Escape RegExp special chars
+            // Escape RegExp special chars
+            name = name.replace(/[\\.*+^$?{}|()[\]]/g, "\\$&");
             patt += `(/${name})`;
-            if (parts[i].endsWith('?'))
-                patt += '?';
+            if (parts[i].endsWith("?"))
+                patt += "?";
         }
     }
-    patt += '$';
-    return [new RegExp(patt, caseSensitive ? '' : 'i'), params, wildcard];
+    patt += "$";
+    return [new RegExp(patt, caseSensitive ? "" : "i"), params, wildcard];
 };

package/dist/esm/concatPaths.js

@@ -1,8 +1,8 @@
 export function concatPaths(...paths) {
-    let res = '';
+    let res = "";
     for (const path of paths) {
         if (res && path)
-            res += '/';
+            res += "/";
         res += path;
     }
     return res;

package/dist/esm/handleRoutes.js

@@ -120,6 +120,11 @@ export const handleRoutes = (pathname, { basename = "", children = [], } = {}) =
                 params[name] = decodeURIComponent(paramVal.slice(1));
             }
         }
+        // Extract splat
+        let splat;
+        if (route.wild < Infinity && (splat = match.at(route.wild + 1))) {
+            params["*"] = decodeURIComponent(splat.slice(1));
+        }
         // Traverse matching RouteNode's parents to build a complete
         // RouteNode chain with handler functions to be executed
         const routeChain = [route];

package/dist/esm/index.d.ts

@@ -1 +1 @@
-export { handleRoutes } from './handleRoutes';
+export { handleRoutes } from "./handleRoutes";

package/dist/esm/index.js

@@ -1 +1 @@
-export { handleRoutes } from './handleRoutes';
+export { handleRoutes } from "./handleRoutes";

package/dist/esm/normalizePath.js

@@ -1,5 +1,5 @@
 // Remove leading and trailing slashes on a path
 export const normalizePath = (path) => {
-    const normalized = path[0] === '/' ? path.slice(1) : path;
-    return normalized.endsWith('/') ? normalized.slice(0, -1) : normalized;
+    const normalized = path[0] === "/" ? path.slice(1) : path;
+    return normalized.endsWith("/") ? normalized.slice(0, -1) : normalized;
 };

package/dist/esm/stripWild.js

@@ -1,2 +1,2 @@
-export const isWild = (path) => path === '*' || path.endsWith('/*');
+export const isWild = (path) => path === "*" || path.endsWith("/*");
 export const stripWild = (path) => isWild(path) ? path.slice(0, -2) : path;

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "next-middleware-router",
-  "version": "1.0.2",
+  "version": "1.0.4",
+  "type": "module",
   "author": "Fry",
   "license": "MIT",
   "description": "Router for middleware in Next.js",
   "files": [
     "dist"
   ],
+  "types": "dist/esm/index.d.ts",
   "exports": {
     ".": {
       "import": {