wallace 0.15.0 → 0.17.1

package/lib/component.js

@@ -1,10 +1,14 @@
 const throwAway = document.createElement("template");
 const NO_LOOKUP = "__";
 
+const defaultSetFunction = function (props, /* #INCLUDE-IF: allowCtrl */ ctrl) {
+  this.props = props;
+  /* #INCLUDE-IF: allowCtrl */ this.ctrl = ctrl;
+};
+
 const ComponentPrototype = {
   render: function (props, /* #INCLUDE-IF: allowCtrl */ ctrl) {
-    this.props = props;
-    /* #INCLUDE-IF: allowCtrl */ this.ctrl = ctrl;
+    this.set(props, /* #INCLUDE-IF: allowCtrl */ ctrl);
     this.update();
   },
 
@@ -57,7 +61,7 @@ const ComponentPrototype = {
         detacher = displayToggle.d;
         if (query !== undefined) {
           lookupTrue = !!lookups[query](props, this);
-          shouldBeVisible = displayToggle.r ? lookupTrue : !lookupTrue;
+          shouldBeVisible = displayToggle.r ? !lookupTrue : lookupTrue;
         }
         if (detacher) {
           detacher.apply(element, shouldBeVisible, elements, stash);
@@ -100,7 +104,7 @@ const ComponentPrototype = {
 
 const ComponentBase = {
   prototype: ComponentPrototype,
-  /* #INCLUDE-IF: allowStubs */ stubs: {}
+  /* #INCLUDE-IF: allowStubs */ stub: {}
 };
 
 /**
@@ -129,12 +133,12 @@ export const initConstructor = (ComponentFunction, BaseComponentFunction) => {
       Object.defineProperty(ComponentFunction, "methods", {
         set: function (value) {
           throw new Error(
-            'Flag "allowMethods" must be set to true in the config for this feature.'
+            "Flag `allowMethods` must be set to true in the config for this feature."
           );
         },
         get: function () {
           throw new Error(
-            'Flag "allowMethods" must be set to true in the config for this feature.'
+            "Flag `allowMethods` must be set to true in the config for this feature."
           );
         }
       });
@@ -142,7 +146,7 @@ export const initConstructor = (ComponentFunction, BaseComponentFunction) => {
   }
 
   /* #INCLUDE-IF: allowStubs */
-  ComponentFunction.stubs = Object.assign({}, BaseComponentFunction.stubs);
+  ComponentFunction.stub = Object.assign({}, BaseComponentFunction.stub);
 
   return ComponentFunction;
 };
@@ -152,12 +156,14 @@ export const defineComponent = (
   watches,
   queries,
   contructor,
+  setFunction,
   /* #INCLUDE-IF: allowDismount */ dismountKeys,
   inheritFrom
 ) => {
   const ComponentDefinition = initConstructor(contructor, inheritFrom || ComponentBase);
   const proto = ComponentDefinition.prototype;
   throwAway.innerHTML = html;
+  proto.set = setFunction || defaultSetFunction;
   proto._w = watches;
   proto._q = queries;
   proto._t = throwAway.content.firstChild;
@@ -172,12 +178,12 @@ export const defineComponent = (
       Object.defineProperty(proto, "base", {
         set: function (value) {
           throw new Error(
-            'Flag "allowBase" must be set to true in the config for this feature.'
+            "Flag `allowBase` must be set to true in the config for this feature."
           );
         },
         get: function () {
           throw new Error(
-            'Flag "allowBase" must be set to true in the config for this feature.'
+            "Flag `allowBase` must be set to true in the config for this feature."
           );
         }
       });

package/lib/detacher.js

@@ -16,7 +16,7 @@ It is affected by:
   - initialIndex as passed into Detacher constructor.
   - offsetTracker's initial value.
 
-It take either:
+It takes either:
   - an element, which starts attached.
   - a nester, whose element isn't attached to begin with.
 

package/lib/router.js

@@ -1,5 +1,5 @@
 /*
-The Router is a component which mounts other components based on hash (URL bit after #).
+The Router is a component which mounts other components based on URL hash.
 
 It currently expects the route to be made of chunks separated by / which are either
 text or placeholders:
@@ -24,10 +24,31 @@ export const Router = () => <div></div>;
 
 Object.assign(Router.prototype, {
   render(props, /* #INCLUDE-IF: allowCtrl */ ctrl) {
-    const defaultError = (error, router) => (router.el.innerHTML = error.message);
-    this.error = props.error || defaultError;
+    if (wallaceConfig.flags.allowBase) {
+    } else {
+      throw new Error(
+        "Flag `allowBase` must be set to true in the config for this feature."
+      );
+    }
+    if (wallaceConfig.flags.allowDismount) {
+    } else {
+      throw new Error(
+        "Flag `allowDismount` must be set to true in the config for this feature."
+      );
+    }
+    this._alive = true;
+    this.error =
+      props.error ||
+      (error => {
+        throw error;
+      });
     this.current = null;
-    events.forEach(e => window.addEventListener(e, () => this.onHashChange()));
+    this.handlers = events.map(e => {
+      const handler = () => this.onHashChange();
+      window.addEventListener(e, handler);
+      return { e, handler };
+    });
+
     if (props.atts) {
       Object.keys(props.atts).forEach(k => {
         this.el.setAttribute(k, props.atts[k]);
@@ -49,6 +70,7 @@ Object.assign(Router.prototype, {
             routeData,
             /* #INCLUDE-IF: allowCtrl */ this.ctrl
           );
+          if (!this._alive) return;
           this.current && this.current.cleanup();
           this.mount(component);
           this.current = route;
@@ -56,6 +78,7 @@ Object.assign(Router.prototype, {
         }
         i++;
       }
+      if (!this._alive) return;
       throw new Error(`Router unable to match path "${path}"`);
     } catch (error) {
       this.error(error, this);
@@ -64,6 +87,19 @@ Object.assign(Router.prototype, {
   mount(component) {
     this.el.textContent = "";
     this.el.appendChild(component.el);
+  },
+  /* #INCLUDE-IF: allowDismount */
+  dismount() {
+    this._alive = false;
+    if (this.current) {
+      this.current.cleanup();
+    }
+    this.base.dismount.call(this);
+    if (this._handlers) {
+      this._handlers.forEach(({ e, handler }) => {
+        window.removeEventListener(e, handler);
+      });
+    }
   }
 });
 
@@ -108,10 +144,10 @@ Route.prototype = {
     return this.component;
   },
   /**
-   * Allows user to delete component or perform other cleanup.
+   * Allows user to dismount component or perform other cleanup.
    */
   cleanup() {
-    this._cleanup(this);
+    this._cleanup(this.component);
   }
 };
 

package/lib/stubs.js

@@ -1,4 +1,4 @@
 /**
  * Gets a stub by name.
  */
-export const getStub = (component, name) => component.constructor.stubs[name];
+export const getStub = (component, name) => component.constructor.stub[name];