primate 0.8.0 → 0.8.1

package/exports.js

@@ -20,6 +20,9 @@ export {default as sanitize} from "./source/sanitize.js";
 export {default as html} from "./source/handlers/html.js";
 export {default as json} from "./source/handlers/json.js";
 export {default as redirect} from "./source/handlers/redirect.js";
+export {http404} from "./source/handlers/http.js";
+
+export {default as DOMParser} from "./source/handlers/DOM/Parser.js";
 
 export {default as router} from "./source/Router.js";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primate",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "author": "Primate core team <core@primatejs.com>",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",
@@ -15,7 +15,7 @@
     "test": "npm run copy && npm run debris"
   },
   "dependencies": {
-    "runtime-compat": "^0.1.5"
+    "runtime-compat": "^0.1.6"
   },
   "devDependencies": {
     "debris": "^0.2.2",

package/source/App.js

@@ -1,5 +1,5 @@
 import {Path, File, log} from "runtime-compat";
-import Bundler from "./Bundler.js";
+import {default as Bundler, index} from "./Bundler.js";
 import Router from "./Router.js";
 import Server from "./Server.js";
 import package_json from "../package.json" assert {"type": "json"};
@@ -16,6 +16,7 @@ export default class App {
       await import(`file://${this.conf.paths.routes}/${route}`);
     }
     await new Bundler(this.conf).bundle();
+    this.index = await index(this.conf);
 
     const conf = {"router": Router,
       "serve_from": this.conf.paths.public,

package/source/Router.js

@@ -19,7 +19,7 @@ export default {
     const url = new URL(`https://primatejs.com${original_request.pathname}`);
     const {pathname, searchParams} = url;
     const params = Object.fromEntries(searchParams);
-    const verb = find(method, pathname, () => ({"handler": http404``}));
+    const verb = find(method, pathname, {"handler": http404``});
     const path = pathname.split("/").filter(path => path !== "");
     Object.entries(verb.path.exec(pathname)?.groups ?? [])
       .filter(([key]) => path[key] === undefined)

package/source/handlers/DOM/Node.js

@@ -3,19 +3,19 @@ import Parser from "./Parser.js";
 const replacement_regex = /^\$([0-9]*)$/;
 const data_regex = /\${([^}]*)}/g;
 const attributes_regex = /([-a-z]*="[^"]+")/g;
-const replace = (attribute, source) => {
+const replace = async (attribute, source) => {
   if (attribute.includes(".")) {
     const index = attribute.indexOf(".");
     const left = attribute.slice(0, index);
     const rest = attribute.slice(index+1);
     if (source[left] !== undefined) {
-      return replace(rest, source[left]);
+      return await replace(rest, source[left]);
     }
   } else {
     return source[attribute];
   }
 };
-const fulfill = (attribute, source) => {
+const fulfill = async (attribute, source) => {
   if (source === undefined) {
     return undefined;
   }
@@ -24,7 +24,7 @@ const fulfill = (attribute, source) => {
   if (matches.length > 0) {
     for (const match of matches) {
       const [key] = match;
-      const new_value = replace(match[1], source);
+      const new_value = await replace(match[1], source);
       if (attribute === key) {
         return new_value;
       }
@@ -153,7 +153,7 @@ export default class Node {
       return newparent.expand();
     }
     for (const attribute in this.attributes) {
-      const fulfilled = fulfill(this.attributes[attribute], this.data);
+      const fulfilled = await fulfill(this.attributes[attribute], this.data);
       switch(attribute) {
         case "value":
           if (this.tag_name === "input") {

package/source/handlers/html.js

@@ -4,7 +4,6 @@ import {index} from "../Bundler.js";
 import _conf from "../conf.js";
 const conf = _conf();
 
-const last = -1;
 const {"paths": {"components": path}} = conf;
 const components = {};
 if (await File.exists(path)) {
@@ -14,16 +13,16 @@ if (await File.exists(path)) {
   }
 }
 
+const last = -1;
 export default async (strings, ...keys) => {
-  const awaited_keys = await Promise.all(keys);
-  const rendered = await (await (await Parser.parse(strings
+  const html = await (await (await Parser.parse(strings
     .slice(0, last)
     .map((string, i) => `${string}$${i}`)
-    .join("") + strings[strings.length+last], awaited_keys)
+    .join("") + strings[strings.length + last], await Promise.all(keys))
     .unfold(components)))
     .render();
-  const body = (await index(conf)).replace("<body>", () => `<body>${rendered}`);
+  const body = (await index(conf)).replace("<body>", () => `<body>${html}`);
   const code = 200;
   const headers = {"Content-Type": "text/html"};
-  return {code, body, headers};
+  return {body, code, headers};
 };

package/source/handlers/http.js

@@ -1,6 +1,8 @@
 const http404 = () => {
+  const body = "Page not found";
+  const code = 404;
   const headers = {"Content-Type": "text/html"};
-  return {"code": 404, "body": "Page not found", headers};
+  return {body, code, headers};
 };
 
 export {http404};

package/source/handlers/redirect.js

@@ -2,9 +2,13 @@ const last = -1;
 
 export default async (strings, ...keys) => {
   const awaited_keys = await Promise.all(keys);
-  const Location = strings
-    .slice(0, last)
-    .map((string, i) => string + awaited_keys[i])
-    .join("") + strings[strings.length+last];
-  return {"code": 302, "headers": {Location}};
+  const headers = {
+    "Location": strings
+      .slice(0, last)
+      .map((string, i) => string + awaited_keys[i])
+      .join("") + strings[strings.length + last],
+  };
+  const code = 302;
+  // no body
+  return {code, headers};
 };