primate 0.6.0 → 0.6.1

package/README.md

@@ -1,6 +1,8 @@
 # Primate, A JavaScript Framework
 
-A full-stack Javascript framework with batteries included, Primate relieves you of dealing with repetitive, error-prone tasks and lets you concentrate on writing effective, expressive code.
+A full-stack Javascript framework, Primate relieves you of dealing with
+repetitive, error-prone tasks and lets you concentrate on writing effective,
+expressive code.
 
 ## Installing
 
@@ -14,7 +16,9 @@ npm install primate
 * Secure by default with HTTPS, hash-verified scripts and a strong CSP
 * Built-in support for sessions with secure cookies
 * Input verification using data domains
-* Many different data store modules: In-Memory (built-in), [File][primate-store-file], [JSON][primate-store-json], [MongoDB][primate-store-mongodb]
+* Many different data store modules: In-Memory (built-in),
+[File][primate-store-file], [JSON][primate-store-json],
+[MongoDB][primate-store-mongodb]
 * Easy modelling of`1:1`, `1:n` and `n:m` relationships
 * Minimally opinionated with sane, overrideable defaults
 * No dependencies
@@ -23,11 +27,6 @@ npm install primate
 
 See the [getting started][getting-started] guide.
 
-## Resources
-
-* [Source code][source-code]
-* [Issues][issues]
-
 ## License
 
 BSD-3-Clause

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primate",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "author": "Primate core team <core@primatejs.com>",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",

package/source/Router.js

@@ -14,9 +14,14 @@ export default {
   "get": (path, callback) => push("get", path, callback),
   "post": (path, callback) => push("post", path, callback),
   "alias": (key, value) => aliases.push({key, value}),
-  "process": async request => {
-    const {pathname, method} = request;
-    request.path = pathname.split("/").filter(path => path !== "");
+  "process": async original_request => {
+    const {method} = original_request;
+    const url = new URL(`https://primatejs.com${original_request.pathname}`);
+    const {pathname, searchParams} = url;
+    const params = Object.fromEntries(searchParams);
+    const request = {...original_request, pathname, params,
+      "path": pathname.split("/").filter(path => path !== ""),
+    };
     const verb = find(method, pathname, () => http404``);
     return verb(await find("map", pathname, _ => _)(request));
   },

package/source/Server.js

@@ -46,7 +46,7 @@ export default class Server {
       }
 
       const data = Buffer.concat(buffers).toString();
-      const payload = Object.fromEntries(data
+      const payload = Object.fromEntries(decodeURI(data).replaceAll("+", " ")
         .split("&")
         .map(part => part.split("="))
         .filter(([, value]) => value !== ""));

package/source/handlers/DOM/Node.js

@@ -89,7 +89,7 @@ export default class Node {
     }
   }
 
-  as_tag() {
+  async render() {
     let tag = "<" + this.tag_name;
     for (const [key, value] of Object.entries(this.attributes)) {
       if (value === undefined) {
@@ -109,20 +109,16 @@ export default class Node {
     } else {
       tag += ">";
       for (const child of this.children) {
-        tag += child.as_tag();
+        tag += await child.render();
       }
       if (this.text) {
-        tag += this.text;
+        tag += await this.text;
       }
       tag += "</" + this.tag_name + ">";
     }
     return tag;
   }
 
-  render() {
-    return this.as_tag();
-  }
-
   compose(components) {
     if (components[this.tag_name]) {
       return Parser.parse(components[this.tag_name], this.attributes);
@@ -144,11 +140,11 @@ export default class Node {
     }
   }
 
-  expand() {
+  async expand() {
     if (this.attributes["data-for"] !== undefined) {
       const key = this.attributes["data-for"];
       delete this.attributes["data-for"];
-      const value = this.data[key];
+      const value = await this.data[key];
       const arr = Array.isArray(value) ? value : [value];
       const newparent = new Node();
       for (const val of arr) {
@@ -177,7 +173,7 @@ export default class Node {
       }
     }
     for (let i = 0; i < this.children.length; i++) {
-      this.children[i] = this.children[i].expand();
+      this.children[i] = await this.children[i].expand();
     }
     return this;
   }

package/source/handlers/html.js

@@ -15,11 +15,11 @@ if (await File.exists(path)) {
 
 export default async (strings, ...keys) => {
   const awaited_keys = await Promise.all(keys);
-  const body = Parser.parse(strings
+  const body = await (await Parser.parse(strings
     .slice(0, last)
     .map((string, i) => `${string}$${i}`)
     .join("") + strings[strings.length+last], awaited_keys)
-    .unfold(components)
+    .unfold(components))
     .render();
   const code = 200;
   const headers = {"Content-Type": "text/html"};