primate 0.2.0 → 0.5.0

package/source/server/store/Store.js

@@ -1,3 +1,6 @@
+import {resolve} from "path";
+const preset = "../../preset/data/stores";
+
 export default class Store {
   constructor(conf = {}) {
     this.conf = conf;
@@ -14,4 +17,14 @@ export default class Store {
   open() {
     return this;
   }
+
+  static async get(directory, file) {
+    let store;
+    try {
+      store = await import(resolve(`${directory}/${file}`));
+    } catch(error) {
+      store = await import(`${preset}/${file}`);
+    }
+    return store.default.open();
+  }
 }

package/source/server/types/Array.js

@@ -1,7 +1,7 @@
-import Instance from "./Instance.js";
+import InstanceType from "./Instance.js";
 import errors from "./errors/Array.json" assert {"type": "json"};
 
-export default class extends Instance {
+export default class ArrayType extends InstanceType {
   static get instance() {
     return Array;
   }

package/source/server/types/Boolean.js

@@ -1,8 +1,8 @@
-import Primitive from "./Primitive.js";
+import PrimitiveType from "./Primitive.js";
 import {boolish} from "../attributes.js";
 import errors from "./errors/Boolean.json" assert {"type": "json"};
 
-export default class extends Primitive {
+export default class BooleanType extends PrimitiveType {
   static get type() {
     return "boolean";
   }

package/source/server/types/Date.js

@@ -1,7 +1,7 @@
-import Instance from "./Instance.js";
+import InstanceType from "./Instance.js";
 import errors from "./errors/Date.json" assert {"type": "json"};
 
-export default class extends Instance {
+export default class DateType extends InstanceType {
   static get instance() {
     return Date;
   }

package/source/server/types/Domain.js

@@ -1,11 +1,6 @@
 import Storeable from "./Storeable.js";
-import Domain from "../domain/Domain.js";
-
-export default class extends Storeable {
-  static get instance() {
-    return Domain;
-  }
 
+export default class DomainType extends Storeable {
   static type_error({name}) {
     return `Must be a ${name}`;
   }

package/source/server/types/Instance.js

@@ -1,6 +1,6 @@
 import Storeable from "./Storeable.js";
 
-export default class extends Storeable {
+export default class InstanceType extends Storeable {
   static is(value) {
     // no subclassing allowed, as [] instanceof Object === true et al.
     return value?.constructor === this.instance;

package/source/server/types/Number.js

@@ -1,8 +1,8 @@
-import Primitive from "./Primitive.js";
+import PrimitiveType from "./Primitive.js";
 import {numeric} from "../attributes.js";
 import errors from "./errors/Number.json" assert {"type": "json"};
 
-export default class extends Primitive {
+export default class NumberType extends PrimitiveType {
   static get type() {
     return "number";
   }

package/source/server/types/Object.js

@@ -1,7 +1,7 @@
-import Instance from "./Instance.js";
+import InstanceType from "./Instance.js";
 import errors from "./errors/Object.json" assert {"type": "json"};
 
-export default class extends Instance {
+export default class ObjectType extends InstanceType {
   static get instance() {
     return Object;
   }

package/source/server/types/Primitive.js

@@ -1,6 +1,6 @@
 import Storeable from "./Storeable.js";
 
-export default class extends Storeable {
+export default class PrimitiveType extends Storeable {
   static is(value) {
     return typeof value === this.type;
   }

package/source/server/types/Storeable.js

@@ -1,13 +1,13 @@
 import {PredicateError} from "../errors.js";
 
-export default class {
-  static async verify(property, value, predicates, type) {
-    const coerced = this.coerce(value);
-    if (!await this.is(coerced, type)) {
+export default class Storeable {
+  static async verify(property, document, predicates, type) {
+    document[property] = this.coerce(document[property]);
+    if (!await this.is(document[property], type)) {
       throw new PredicateError(this.type_error(type));
     }
-    await this.has(property, coerced, predicates);
-    return coerced;
+    await Promise.all(predicates.map(predicate =>
+      predicate.check(property, document, this)));
   }
 
   static type_error() {
@@ -18,20 +18,13 @@ export default class {
     throw new Error("must be implemented");
   }
 
-  static async has(property, value, predicates) {
-    for (const predicate of predicates) {
-      if (typeof predicate === "object") {
-        await predicate.function(property, ...predicate.params);
-      } else {
-        const [name, ...params] = predicate.split(":");
-        if (!this[name](value, ...params)) {
-          let error = this.errors[name];
-          for (let i = 0; i < params.length; i++) {
-            error = error.replace(`$${i+1}`, params[i]);
-          }
-          throw new PredicateError(error);
-        }
+  static async has(name, value, params) {
+    if (!this[name](value, ...params)) {
+      let error = this.errors[name];
+      for (let i = 0; i < params.length; i++) {
+        error = error.replace(`$${i+1}`, () => params[i]);
       }
+      throw new PredicateError(error);
     }
   }
 

package/source/server/types/String.js

@@ -1,7 +1,7 @@
-import Primitive from "./Primitive.js";
+import PrimitiveType from "./Primitive.js";
 import errors from "./errors/String.json" assert {"type": "json"};
 
-export default class extends Primitive {
+export default class StringType extends PrimitiveType {
   static get type() {
     return "string";
   }

package/source/server/view/TreeNode.js

@@ -147,7 +147,9 @@ export default class TreeNode {
         put(found_node, right);
       }
     };
+    //const flattened = [...new Set(flatten)];
     flatten.forEach(part => put(tree, part));
+    //return {tree, flattened};
     return tree;
   }
 

package/source/server/view/View.js

@@ -1,4 +1,5 @@
 import Parser from "./Parser.js";
+import File from "../File.js";
 import {InternalServerError} from "../errors.js";
 
 const $content = "${content}";
@@ -10,6 +11,10 @@ export default class View {
     this.layouts = layouts;
   }
 
+  static async new(path, layouts) {
+    return new View(path, await File.read(`${path}.html`), layouts);
+  }
+
   elements(layout) {
     try {
       return Parser.parse(layout === undefined
@@ -25,6 +30,6 @@ export default class View {
   }
 
   file(layout = "default") {
-    return this.layout(layout).replace($content, this.content);
+    return this.layout(layout).replace($content, () => this.content);
   }
 }

package/source/client/Base.js

@@ -1,5 +0,0 @@
-export default class Base {
-  Class() {
-    return this.constructor;
-  }
-}

package/source/server/Base.js

@@ -1,35 +0,0 @@
-import conf from "./conf.js";
-import log from "./log.js";
-import package_json from "../../package.json" assert {"type": "json" };
-
-const _conf = conf();
-let routes;
-try {
-  routes = await import(`${_conf.root}/routes.json`, {
-    "assert": {"type": "json"}
-  });
-} catch (error) {
-  // local routes.json not required
-}
-
-export default class Base {
-  static get conf() {
-    return _conf;
-  }
-
-  get conf() {
-    return this.Class().conf;
-  }
-
-  get package() {
-    return package_json;
-  }
-
-  get routes() {
-    return routes?.default ?? [];
-  }
-
-  Class() {
-    return this.constructor;
-  }
-}

package/source/server/errors/Fallback.js

@@ -1 +0,0 @@
-export default class extends Error {}

package/source/server/fallback.js

@@ -1,11 +0,0 @@
-const fallback = async (from, to, logic_from, logic_to) => {
-  try {
-    return await logic_from(from);
-  } catch (error) {
-    return logic_to(to);
-  }
-};
-
-export default (from, to, logic) => logic !== undefined
-  ? fallback(from, to, logic, logic)
-  : fallback(undefined, undefined, from, to);

package/source/server/promises/Meta.js

@@ -1,42 +0,0 @@
-import Domain from "../domain/Domain.js";
-
-const identity = value => value;
-const by = {
-  "undefined": () => undefined,
-  "boolean": identity,
-  "string": identity,
-  "number": identity,
-  "array": identity,
-  "true_object": value => value instanceof Domain ? {} : value,
-  "object": value => by[Array.isArray(value) ? "array" : "true_object"](value),
-};
-const resolve_type = async (document, property) => {
-  if (document === undefined) {
-    return undefined;
-  }
-  const resolved = await document[property];
-  return by[typeof resolved](resolved);
-};
-
-export default async function resolve(document, projection = []) {
-  const resolved = {};
-  if (Array.isArray(document)) {
-    return Promise.all(document.map(sub => resolve(sub, projection)));
-  }
-  for (const property of projection) {
-    if (typeof property === "string") {
-      const result = await resolve_type(document, property);
-      if (result !== undefined) {
-        resolved[property] = result;
-      }
-    } else if (typeof property === "object") {
-      for (const property2 in property) {
-        const value = await document[property2];
-        if (value !== undefined) {
-          resolved[property2] = await resolve(value, property[property2]);
-        }
-      }
-    }
-  }
-  return resolved;
-}

package/source/server/promises.js

@@ -1,2 +0,0 @@
-export {default as EagerPromise, eager} from "./promises/Eager.js";
-export {default as MetaPromise} from "./promises/Meta.js";