primate 0.29.5 → 0.29.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primate",
-  "version": "0.29.5",
+  "version": "0.29.7",
   "description": "Polymorphic development platform",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",

package/src/app.js

@@ -238,8 +238,8 @@ export default async (log, root, config) => {
       const dependency = File.resolve().join(...path);
       const target = File.join(this.runpath(client), this.library, ...parts);
       await dependency.copy(target);
-      this.importmaps = {
-        ...valmap(exports, value => File.join(root, this.library, value).path),
+      this.importmaps = { ...valmap(exports, value =>
+        File.join(root, this.library, value).normalize()),
         ...this.importmaps };
     },
   };

package/src/hooks/parse.js

@@ -3,15 +3,14 @@ import { from, valmap } from "rcompat/object";
 import { tryreturn } from "rcompat/async";
 import errors from "../errors.js";
 
-const deslash = url => url.replaceAll(/(?<!http:)\/{2,}/gu, _ => "/");
-
 const parse_body = (request, url) =>
   tryreturn(async _ => await Body.parse(request) ?? {})
     .orelse(error => errors.MismatchedBody.throw(url.pathname, error.message));
 
 export default dispatch => async original => {
   const { headers } = original;
-  const url = new URL(deslash(globalThis.decodeURIComponent(original.url)));
+
+  const url = new URL(globalThis.decodeURIComponent(original.url));
   const cookies = headers.get("cookie");
   const body = await parse_body(original, url);
 

package/src/hooks/publish.js

@@ -16,7 +16,7 @@ const post = async app => {
       type: "module",
     });
 
-    const imports = { ...app.importmaps, app: src.path };
+    const imports = { ...app.importmaps, app: src.normalize() };
     const type = "importmap";
     await app.publish({ inline: true, code: stringify({ imports }), type });
   }

package/src/hooks/route.js

@@ -39,9 +39,11 @@ export default app => {
     is_method({ route, method, pathname }));
 
   const index = path => `${location.routes}${path === "/" ? "/index" : path}`;
+  // remove excess slashes
+  const deslash = url => url.replaceAll(/\/{2,}/gu, _ => "/");
 
   return ({ original: { method }, url }) => {
-    const pathname = deroot(url.pathname);
+    const pathname = deroot(deslash(url.pathname));
     const route = find(method, pathname) ?? errors.NoRouteToPath
       .throw(method.toLowerCase(), pathname, index(pathname));
     return { ...route, path: to_path(route, pathname) };

package/src/loaders/routes.js

@@ -1,11 +1,14 @@
 import { tryreturn } from "rcompat/sync";
 import { from } from "rcompat/object";
+import { File } from "rcompat/fs";
 import { default as fs, doubled } from "./common.js";
 import * as get from "./routes/exports.js";
 import errors from "../errors.js";
 
+const { separator } = File;
+
 const make = path => {
-  const double = doubled(path.split("/")
+  const double = doubled(path.split(separator)
     .filter(part => part.startsWith("{") && part.endsWith("}"))
     .map(part => part.slice(1, part.indexOf("="))));
   double && errors.DoublePathParameter.throw(double, path);
@@ -17,7 +20,8 @@ const make = path => {
       return `(?<${param}>[^/]{1,}?)`;
     }).orelse(_ => errors.InvalidPathParameter.throw(named, path)));
 
-  return new RegExp(`^/${route}$`, "u");
+  // normalize to unix
+  return new RegExp(`^/${route.replaceAll(separator, "/")}$`, "u");
 };
 
 export default async (app, load = fs) => {
@@ -38,7 +42,7 @@ export default async (app, load = fs) => {
     return Object.entries(route).map(([method, handler]) => ({
       method,
       handler,
-      pathname: make(path.endsWith("/") ? path.slice(0, -1) : path),
+      pathname: make(path.endsWith(separator) ? path.slice(0, -1) : path),
       guards: routes.guards.filter(filtered).map(([, guard]) => guard.default),
       errors: routes.errors.filter(filtered).map(([, error]) => error.default),
       layouts: routes.layouts.filter(filtered).map(([, layout]) => layout),