primate 0.29.4 → 0.29.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primate",
-  "version": "0.29.4",
+  "version": "0.29.6",
   "description": "Polymorphic development platform",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",
@@ -19,7 +19,7 @@
     "directory": "packages/primate"
   },
   "dependencies": {
-    "rcompat": "^0.8.0"
+    "rcompat": "^0.8.3"
   },
   "engines": {
     "node": ">=18"

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/handle.js

@@ -1,6 +1,6 @@
 import { Response, Status, MediaType } from "rcompat/http";
 import { cascade, tryreturn } from "rcompat/async";
-import { respond } from "./respond/exports.js";
+import respond from "./respond.js";
 import { error as clientError } from "../handlers.js";
 
 const guard_error = Symbol("guard_error");

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/{respond/respond.js → respond.js}

@@ -9,8 +9,8 @@ const not_found = value => {
 const is_text = value => typeof value === "string";
 const is_non_null_object = value => typeof value === "object" && value !== null;
 const is_instance = of => value => value instanceof of;
-const is_response = is_instance(Response);
-const is_global_response = is_instance(globalThis.Response);
+const is_response = is_instance(globalThis.Response);
+const is_fake_response = is_instance(Response);
 const is_streamable =
   value => value instanceof Blob || value?.streamable === s_streamable;
 
@@ -19,7 +19,7 @@ const guesses = [
   [is_instance(URL), redirect],
   [is_streamable, value => stream(value.stream())],
   [is_instance(ReadableStream), stream],
-  [value => is_response(value) || is_global_response(value), identity],
+  [value => is_response(value) || is_fake_response(value), value => _ => value],
   [is_non_null_object, json],
   [is_text, text],
   [not_found, identity],

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),

package/src/hooks/respond/duck.js

@@ -1,4 +0,0 @@
-import { Headers } from "rcompat/http";
-
-export default value =>
-  value.body !== undefined && value.headers instanceof Headers;

package/src/hooks/respond/exports.js

@@ -1 +0,0 @@
-export { default as respond } from "./respond.js";