primate 0.7.0 → 0.7.3

package/README.md

@@ -1,8 +1,8 @@
-# Primate, A JavaScript Framework
+# Primate, a cross-runtime framework
 
-A full-stack Javascript framework, Primate relieves you of dealing with
-repetitive, error-prone tasks and lets you concentrate on writing effective,
-expressive code.
+Primate is a full-stack cross-runtime Javascript framework (Node.js and Deno).
+It relieves you of dealing with repetitive, error-prone tasks and lets you
+concentrate on writing effective, expressive code.
 
 ## Highlights
 
@@ -15,10 +15,12 @@ expressive code.
 [MongoDB][primate-mongodb-store]
 * Easy modelling of`1:1`, `1:n` and `n:m` relationships
 * Minimally opinionated with sane, overrideable defaults
-* No dependencies
+* Supports both Node.js and Deno
 
 ## Getting started
 
+### Prepare
+
 Lay out your app
 
 ```sh
@@ -56,6 +58,8 @@ import {app} from "primate";
 app.run();
 ```
 
+### Run on Node.js
+
 Create a start script and enable ES modules (in `package.json`)
 
 ```json
@@ -79,7 +83,27 @@ Run app
 $ npm start
 ```
 
-Visit `https://localhost:9999`
+### Run on Deno
+
+Create an import map file (`import-map.json`)
+
+```json
+{
+  "imports": {
+    "runtime-compat": "https://deno.land/x/runtime_compat/exports.js",
+    "primate": "https:/deno.land/x/primate/exports.js"
+  }
+}
+```
+
+Run app
+
+```
+deno run --import-map=import-map.json app.js
+```
+
+You will typically need the `allow-read`, `allow-write` and `allow-net`
+permissions.
 
 ## Table of Contents
 

package/exports.js

@@ -0,0 +1,28 @@
+import conf from "./source/conf.js";
+import App from "./source/App.js";
+
+export {App};
+export {default as Bundler} from "./source/Bundler.js";
+export {default as EagerPromise, eager} from "./source/EagerPromise.js" ;
+
+export {default as Domain} from "./source/domain/Domain.js";
+export {default as Storeable} from "./source/types/Storeable.js";
+
+export * from "./source/errors.js";
+export * from "./source/invariants.js";
+
+export {default as MemoryStore} from "./source/store/Memory.js";
+export {default as Store} from "./source/store/Store.js";
+
+export {default as extend_object} from "./source/extend_object.js";
+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 {default as router} from "./source/Router.js";
+
+const app = new App(conf());
+
+export {app};

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "primate",
-  "version": "0.7.0",
+  "version": "0.7.3",
   "author": "Primate core team <core@primatejs.com>",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",
   "repository": "https://github.com/primatejs/primate",
-  "description": "Full-stack JavaScript framework",
+  "description": "Cross-runtime JavaScript framework",
   "license": "BSD-3-Clause",
   "scripts": {
     "copy": "rm -rf output && mkdir output && cp source/* output -a",
@@ -15,7 +15,7 @@
     "test": "npm run copy && npm run debris"
   },
   "dependencies": {
-    "runtime-compat": "^0.1.0"
+    "runtime-compat": "^0.1.4"
   },
   "devDependencies": {
     "debris": "^0.2.2",
@@ -24,7 +24,7 @@
     "nyc": "^15.1.0"
   },
   "type": "module",
-  "exports": "./source/exports.js",
+  "exports": "./exports.js",
   "engines": {
     "node": ">=17.9.0"
   }

package/source/App.js

@@ -13,7 +13,7 @@ export default class App {
     log.reset("Primate").yellow(package_json.version);
     const routes = await File.list(this.conf.paths.routes);
     for (const route of routes) {
-      await import(`${this.conf.paths.routes}/${route}`);
+      await import(`file://${this.conf.paths.routes}/${route}`);
     }
     await new Bundler(this.conf).bundle();
 

package/source/Bundler.js

@@ -12,25 +12,16 @@ export default class Bundler {
     this.scripts = [];
   }
 
-  async copy_with_preset(subdirectory, to) {
-    const {paths} = this.conf;
-
-    // copy files preset files first
-    await File.copy(`${preset}/${subdirectory}`, to);
-
-    // copy any user code over it, not recreating the folder
-    try {
-      await File.copy(paths[subdirectory], to);
-    } catch(error) {
-      // directory doesn't exist
-    }
-  }
-
   async bundle() {
     const {paths} = this.conf;
 
+    // remove public directory in case exists
+    await File.remove(paths.public);
+    // create public directory
+    await File.create(paths.public);
+
     // copy static files to public
-    await this.copy_with_preset("static", paths.public);
+    await File.copy(paths.static, paths.public);
 
     // read index.html from public, then remove it (we serve it dynamically)
     await File.remove(`${paths.public}/${this.index}`);

package/source/Server.js

@@ -30,12 +30,12 @@ export default class Server {
         response.setHeader("Set-Cookie", `${cookie}; SameSite=${same_site}`);
       }
       response.session = session;
-      const body = await request.body;
-      const payload = Object.fromEntries(decodeURI(body).replaceAll("+", " ")
+      const text = await request.text();
+      const payload = Object.fromEntries(decodeURI(text).replaceAll("+", " ")
         .split("&")
         .map(part => part.split("="))
         .filter(([, value]) => value !== ""));
-      const {pathname, search} = new URL(`https://1${request.url}`);
+      const {pathname, search} = request.url;
       return this.try(pathname + search, request, response, payload);
     });
   }

package/source/exports.js

@@ -1,28 +0,0 @@
-import conf from "./conf.js";
-import App from "./App.js";
-
-export {App};
-export {default as Bundler} from "./Bundler.js";
-export {default as EagerPromise, eager} from "./EagerPromise.js" ;
-
-export {default as Domain} from "./domain/Domain.js";
-export {default as Storeable} from "./types/Storeable.js";
-
-export * from "./errors.js";
-export * from "./invariants.js";
-
-export {default as MemoryStore} from "./store/Memory.js";
-export {default as Store} from "./store/Store.js";
-
-export {default as extend_object} from "./extend_object.js";
-export {default as sanitize} from "./sanitize.js";
-
-export {default as html} from "./handlers/html.js";
-export {default as json} from "./handlers/json.js";
-export {default as redirect} from "./handlers/redirect.js";
-
-export {default as router} from "./Router.js";
-
-const app = new App(conf());
-
-export {app};

package/source/preset/static/index.html

@@ -1,8 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>Primate app</title>
-    <meta charset="utf-8" />
-  </head>
-  <body></body>
-</html>