wallace 0.14.1 → 0.16.0

package/lib/repeaters/sequential.js

@@ -2,77 +2,103 @@ import { countOffset } from "../offsetter";
 
 /**
  * Repeats nested components, yielding from the pool sequentially.
- *
- * COMPILER_MODS:
- *   if allowRepeaterSiblings is false the last two parameters are removed.
  */
-export function SequentialRepeater(componentDefinition, adjustmentTracker, initialIndex) {
+export function SequentialRepeater(
+  componentDefinition,
+  /* #INCLUDE-IF: allowRepeaterSiblings */ adjustmentTracker,
+  /* #INCLUDE-IF: allowRepeaterSiblings */ initialIndex
+) {
   this.d = componentDefinition;
+  /* #INCLUDE-IF: allowDismount */ this.s = componentDefinition.pool;
+  this.p = [];
   this.c = 0; // Child count
-  if (wallaceConfig.flags.allowRepeaterSiblings) {
-    this.a = adjustmentTracker;
-    this.i = initialIndex;
-  }
+  /* #INCLUDE-IF: allowRepeaterSiblings */ this.a = adjustmentTracker;
+  /* #INCLUDE-IF: allowRepeaterSiblings */ this.i = initialIndex;
 }
 
 /**
  * Updates the element's childNodes to match the items.
  * Performance is important.
- *
- * @param {DOMElement} parent - The DOM element to patch.
- * @param {Array} items - Array of items which will be passed as props.
- * @param {Array} pool -  pool of component instances.
- * @param {any} ctrl - The parent item's controller.
  */
-SequentialRepeater.prototype.patch = function (parent, items, pool, ctrl) {
-  const componentDefinition = this.d,
-    previousChildCount = this.c,
-    itemsLength = items.length,
-    childNodes = parent.childNodes;
+SequentialRepeater.prototype = {
+  patch: function (parent, items, /* #INCLUDE-IF: allowCtrl */ ctrl) {
+    const componentDefinition = this.d,
+      /* #INCLUDE-IF: allowDismount */ sharedPool = this.s,
+      previousChildCount = this.c,
+      pool = this.p,
+      itemsLength = items.length,
+      childNodes = parent.childNodes;
 
-  let i = 0,
-    offset = 0,
-    component,
-    nextElement,
-    initialIndex,
-    offsetTracker,
-    endOfRange = previousChildCount,
-    poolCount = pool.length;
+    let i = 0,
+      offset = 0,
+      component,
+      nextElement,
+      initialIndex,
+      offsetTracker,
+      endOfRange = previousChildCount,
+      poolCount = pool.length,
+      originalPoolCount = poolCount;
 
-  if (wallaceConfig.flags.allowRepeaterSiblings) {
-    initialIndex = this.i;
-    offsetTracker = this.a;
-    if (offsetTracker) {
-      // The repeat element has siblings
-      offset = countOffset(offsetTracker, initialIndex);
-      endOfRange += offset;
-      nextElement = childNodes[endOfRange] || null;
+    if (wallaceConfig.flags.allowRepeaterSiblings) {
+      initialIndex = this.i;
+      offsetTracker = this.a;
+      if (offsetTracker) {
+        // The repeat element has siblings
+        offset = countOffset(offsetTracker, initialIndex);
+        endOfRange += offset;
+        nextElement = childNodes[endOfRange] || null;
+      }
     }
-  }
-  while (i < itemsLength) {
-    if (i < poolCount) {
-      component = pool[i];
-    } else {
-      component = new componentDefinition();
-      pool.push(component);
-      poolCount++;
+    while (i < itemsLength) {
+      if (i < poolCount) {
+        component = pool[i];
+      } else {
+        if (wallaceConfig.flags.allowDismount) {
+          component = sharedPool.pop() || new componentDefinition();
+        } else {
+          component = new componentDefinition();
+        }
+        pool.push(component);
+        poolCount++;
+      }
+      component.render(items[i], /* #INCLUDE-IF: allowCtrl */ ctrl);
+      if (i >= previousChildCount) {
+        parent.insertBefore(component.el, nextElement);
+      }
+      i++;
     }
-    component.render(items[i], ctrl);
-    if (i >= previousChildCount) {
-      parent.insertBefore(component.el, nextElement);
+    this.c = itemsLength;
+
+    let removeAtIndex = offset + previousChildCount - 1;
+    const stopAtIndex = offset + itemsLength - 1;
+    for (let i = removeAtIndex; i > stopAtIndex; i--) {
+      parent.removeChild(childNodes[i]);
     }
-    i++;
-  }
-  this.c = itemsLength;
 
-  let removeAtIndex = offset + previousChildCount - 1;
-  const stopatIndex = offset + itemsLength - 1;
-  for (let i = removeAtIndex; i > stopatIndex; i--) {
-    parent.removeChild(childNodes[i]);
-  }
-  if (wallaceConfig.flags.allowRepeaterSiblings) {
+    /* #INCLUDE-IF: allowRepeaterSiblings */
     if (offsetTracker) {
       offsetTracker.set(initialIndex, itemsLength - 1);
     }
+
+    /* #INCLUDE-IF: allowDismount */
+    while (originalPoolCount > itemsLength) {
+      component = pool.pop();
+      sharedPool.push(component);
+      component.dismount();
+      originalPoolCount--;
+    }
+  },
+  /* #INCLUDE-IF: allowDismount */ dismount: function () {
+    let component,
+      pool = this.p,
+      poolCount = pool.length,
+      sharedPool = this.s;
+    while (poolCount > 0) {
+      component = pool.pop();
+      sharedPool.push(component);
+      component.dismount();
+      poolCount--;
+    }
+    pool.length = 0;
   }
 };

package/lib/router.js

@@ -22,8 +22,8 @@ export const route = (path, componentDef, converter, cleanup) =>
 
 export const Router = () => <div></div>;
 
-Router.methods = {
-  render(props, ctrl) {
+Object.assign(Router.prototype, {
+  render(props, /* #INCLUDE-IF: allowCtrl */ ctrl) {
     const defaultError = (error, router) => (router.el.innerHTML = error.message);
     this.error = props.error || defaultError;
     this.current = null;
@@ -33,7 +33,7 @@ Router.methods = {
         this.el.setAttribute(k, props.atts[k]);
       });
     }
-    this.base.render.call(this, props, ctrl);
+    this.base.render.call(this, props, /* #INCLUDE-IF: allowCtrl */ ctrl);
   },
   async onHashChange() {
     const path = location.hash.slice(1) || "",
@@ -45,7 +45,10 @@ Router.methods = {
       while (i < len) {
         let route = routes[i];
         if ((routeData = route.match(path))) {
-          const component = await route.getComponent(routeData, this.ctrl);
+          const component = await route.getComponent(
+            routeData,
+            /* #INCLUDE-IF: allowCtrl */ this.ctrl
+          );
           this.current && this.current.cleanup();
           this.mount(component);
           this.current = route;
@@ -62,7 +65,7 @@ Router.methods = {
     this.el.textContent = "";
     this.el.appendChild(component.el);
   }
-};
+});
 
 export function Route(path, def, convert, cleanup) {
   this.chunks = path
@@ -96,12 +99,12 @@ Route.prototype = {
     }
     return { args, params: new URLSearchParams(query), url };
   },
-  async getComponent(routeData, ctrl) {
+  async getComponent(routeData, /* #INCLUDE-IF: allowCtrl */ ctrl) {
     if (!this.component) {
       this.component = new this.def();
     }
     const props = await this._convert(routeData);
-    this.component.render(props, ctrl);
+    this.component.render(props, /* #INCLUDE-IF: allowCtrl */ ctrl);
     return 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];