@primate/htmx 0.7.1 → 0.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/htmx",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "Primate HTMX module",
   "homepage": "https://primatejs.com/modules/htmx",
   "bugs": "https://github.com/primatejs/htmx/issues",
@@ -8,13 +8,13 @@
   "repository": "https://github.com/primatejs/htmx",
   "dependencies": {
     "htmx.org": "^1.8.6",
-    "runtime-compat": "^0.14.1"
+    "runtime-compat": "^0.15.0"
   },
   "devDependencies": {
     "maximin": "^0.1.2"
   },
   "peerDependencies": {
-    "primate": "0.14.0"
+    "primate": "0.15"
   },
   "type": "module",
   "exports": "./exports.js",

package/src/module.js

@@ -1,23 +1,19 @@
 import {Path} from "runtime-compat/fs";
 
-const loadComponent = async (env, name) => {
+const loadComponent = async (file) => {
   try {
-    return await env.paths.components.join(`${name}.html`).file.read();
+    return await file.read();
   } catch (error) {
-    throw new Error(`cannot load component at ${name}.html`);
+    throw new Error(`cannot load component at ${file.name}`);
   }
 };
 
-const getContent = (env, {adhoc, content}) => {
-  return adhoc ? content : loadComponent(env, content);
-};
-
-const getBody = async (env, {adhoc, partial, content}) => {
-  const body = await getContent(env, {adhoc, content});
+const getBody = async (env, partial, file) => {
+  const body = await loadComponent(file);
   return partial ? body : env.render({body});
 };
 
-const htmx = (content, {status = 200, partial = false, adhoc = false} = {}) =>
+const handler = path => (name, {status = 200, partial = false} = {}) =>
   async (env, headers) => {
     const styleSrc = "style-src 'unsafe-inline';";
     const csp = `${headers["Content-Security-Policy"]}${styleSrc}`;
@@ -29,13 +25,12 @@ const htmx = (content, {status = 200, partial = false, adhoc = false} = {}) =>
         "Content-Security-Policy": csp,
       },
     };
-
-    return [await getBody(env, {adhoc, partial, content}), options];
+    return [await getBody(env, partial, path.join(name).file), options];
   };
 
-export default () => ({
+export default directory => ({
   register(env, next) {
-    env.register("htmx", htmx);
+    env.register("htmx", handler(directory ?? env.paths.components));
     return next(env);
   },
   async publish(env, next) {