regor 1.4.4 → 1.4.5

package/dist/regor.es2019.iife.js

@@ -529,10 +529,13 @@ var Regor = (() => {
     }
     __bindAll(element) {
       const isIfElement = element.hasAttribute(this.__if);
-      const elements = findElements(element, this.__ifSelector);
-      for (const el of elements) {
-        this.__bind(el);
-      }
+      if (isIfElement) this.__bind(element);
+      this.__binder.__componentBinder.__forEachBindableDescendant(
+        element,
+        (el) => {
+          if (el.hasAttribute(this.__if)) this.__bind(el);
+        }
+      );
       return isIfElement;
     }
     __isProcessedOrMark(el) {
@@ -1324,8 +1327,16 @@ var Regor = (() => {
       }
       return false;
     }
+    __isNamedSlotTemplateShortcut(node) {
+      if (!isTemplate(node)) return false;
+      const attributeNames = node.getAttributeNames();
+      if (node.hasAttribute("name")) return true;
+      return attributeNames.some((x) => x.startsWith("#"));
+    }
+    __isDefaultSlotTemplateShortcut(node) {
+      return isTemplate(node) && node.getAttributeNames().length === 0;
+    }
     __unwrapComponents(element) {
-      var _a;
       const binder = this.__binder;
       const parser = binder.__parser;
       const registeredComponents = binder.__config.__components;
@@ -1334,16 +1345,9 @@ var Regor = (() => {
         return;
       }
       const contextComponents = parser.__getComponents();
-      const contextComponentSelectors = parser.__getComponentSelectors();
-      const registeredSelector = this.__getRegisteredComponentSelector(registeredComponents);
-      const selector = [
-        ...registeredSelector ? [registeredSelector] : [],
-        ...contextComponentSelectors,
-        ...contextComponentSelectors.map(hyphenate)
-      ].join(",");
+      const selector = this.__getComponentSelector();
       if (isNullOrWhitespace(selector)) return;
-      const list = element.querySelectorAll(selector);
-      const components = ((_a = element.matches) == null ? void 0 : _a.call(element, selector)) ? [element, ...list] : list;
+      const components = this.__collectTopLevelComponentHosts(element, selector);
       for (const component of components) {
         if (component.hasAttribute(binder.__pre)) continue;
         const parent = component.parentNode;
@@ -1417,7 +1421,7 @@ var Regor = (() => {
         };
         const capturedContext = [...parser.__capture()];
         const createComponentCtx = () => {
-          var _a2;
+          var _a;
           const props = getProps(component, capturedContext);
           const head2 = new ComponentHead(
             props,
@@ -1427,8 +1431,8 @@ var Regor = (() => {
             endOfComponent
           );
           const componentCtx2 = useScope(() => {
-            var _a3;
-            return (_a3 = registeredComponent.context(head2)) != null ? _a3 : {};
+            var _a2;
+            return (_a2 = registeredComponent.context(head2)) != null ? _a2 : {};
           }).context;
           if (head2.autoProps) {
             for (const [key, propsValue] of Object.entries(props)) {
@@ -1452,7 +1456,7 @@ var Regor = (() => {
                 }
               } else componentCtx2[key] = propsValue;
             }
-            (_a2 = head2.onAutoPropsAssigned) == null ? void 0 : _a2.call(head2);
+            (_a = head2.onAutoPropsAssigned) == null ? void 0 : _a.call(head2);
           }
           return { componentCtx: componentCtx2, head: head2 };
         };
@@ -1461,6 +1465,7 @@ var Regor = (() => {
         const len = childNodes.length;
         const isEmptyComponent = component.childNodes.length === 0;
         const expandSlot = (slot) => {
+          var _a;
           const parent2 = slot.parentElement;
           let name = slot.name;
           if (isNullOrWhitespace(name)) {
@@ -1490,9 +1495,12 @@ var Regor = (() => {
             `template[name='${name}'], template[\\#${name}]`
           );
           if (!compTemplate && name === "default") {
-            compTemplate = component.querySelector("template:not([name])");
-            if (compTemplate && compTemplate.getAttributeNames().filter((x) => x.startsWith("#")).length > 0)
-              compTemplate = null;
+            const unnamedTemplates = component.querySelectorAll(
+              "template:not([name])"
+            );
+            compTemplate = (_a = [...unnamedTemplates].find(
+              (x) => this.__isDefaultSlotTemplateShortcut(x)
+            )) != null ? _a : null;
           }
           const createSwitchContext = (childNodes2) => {
             if (!head.enableSwitch) return;
@@ -1528,7 +1536,7 @@ var Regor = (() => {
               return;
             }
             const childNodes2 = [...getChildNodes(component)].filter(
-              (x) => !isTemplate(x)
+              (x) => !this.__isNamedSlotTemplateShortcut(x)
             );
             for (const slotChild of childNodes2) {
               parent2.insertBefore(slotChild, slot);
@@ -1614,6 +1622,65 @@ var Regor = (() => {
         parser.__scoped(capturedContext, bindComponent);
       }
     }
+    __getComponentSelector() {
+      const binder = this.__binder;
+      const parser = binder.__parser;
+      const registeredComponents = binder.__config.__components;
+      const contextComponentSelectors = parser.__getComponentSelectors();
+      const registeredSelector = this.__getRegisteredComponentSelector(registeredComponents);
+      return [
+        ...registeredSelector ? [registeredSelector] : [],
+        ...contextComponentSelectors,
+        ...contextComponentSelectors.map(hyphenate)
+      ].join(",");
+    }
+    __collectTopLevelComponentHosts(root, selector) {
+      var _a;
+      const result = [];
+      if (isNullOrWhitespace(selector)) return result;
+      if ((_a = root.matches) == null ? void 0 : _a.call(root, selector)) return [root];
+      const stack = this.__getChildElements(root).reverse();
+      while (stack.length > 0) {
+        const current = stack.pop();
+        if (current.matches(selector)) {
+          result.push(current);
+          continue;
+        }
+        stack.push(...this.__getChildElements(current).reverse());
+      }
+      return result;
+    }
+    __forEachBindableDescendant(root, action) {
+      const selector = this.__getComponentSelector();
+      const stack = this.__getChildElements(root).reverse();
+      while (stack.length > 0) {
+        const current = stack.pop();
+        action(current);
+        if (!isNullOrWhitespace(selector) && current.matches(selector)) continue;
+        stack.push(...this.__getChildElements(current).reverse());
+      }
+    }
+    __getChildElements(root) {
+      const children = root == null ? void 0 : root.children;
+      if ((children == null ? void 0 : children.length) != null) {
+        const result = [];
+        for (let i = 0; i < children.length; ++i) {
+          const child = children[i];
+          if (isElement(child)) result.push(child);
+        }
+        return result;
+      }
+      const childNodes = root == null ? void 0 : root.childNodes;
+      if ((childNodes == null ? void 0 : childNodes.length) != null) {
+        const result = [];
+        for (let i = 0; i < childNodes.length; ++i) {
+          const child = childNodes[i];
+          if (isElement(child)) result.push(child);
+        }
+        return result;
+      }
+      return [];
+    }
   };
 
   // src/bind/DirectiveCollector.ts
@@ -1706,10 +1773,10 @@ var Regor = (() => {
       };
       processNode(element);
       if (!isRecursive || !element.firstElementChild) return map;
-      const nodes = element.querySelectorAll("*");
-      for (const node of nodes) {
-        processNode(node);
-      }
+      this.__binder.__componentBinder.__forEachBindableDescendant(
+        element,
+        processNode
+      );
       return map;
     }
   };
@@ -1727,17 +1794,19 @@ var Regor = (() => {
     constructor(binder) {
       __publicField(this, "__binder");
       __publicField(this, "__is");
-      __publicField(this, "__isSelector");
       this.__binder = binder;
       this.__is = binder.__config.__builtInNames.is;
-      this.__isSelector = toSelector(this.__is) + ", [is]";
     }
     __bindAll(element) {
       const isComponentElement = element.hasAttribute(this.__is);
-      const elements = findElements(element, this.__isSelector);
-      for (const el of elements) {
-        this.__bind(el);
-      }
+      if (isComponentElement || element.hasAttribute("is"))
+        this.__bind(element);
+      this.__binder.__componentBinder.__forEachBindableDescendant(
+        element,
+        (el) => {
+          if (el.hasAttribute(this.__is) || el.hasAttribute("is")) this.__bind(el);
+        }
+      );
       return isComponentElement;
     }
     __bind(el) {
@@ -2214,10 +2283,13 @@ var Regor = (() => {
     }
     __bindAll(element) {
       const isForElement = element.hasAttribute(this.__for);
-      const elements = findElements(element, this.__forSelector);
-      for (const el of elements) {
-        this.__bindFor(el);
-      }
+      if (isForElement) this.__bindFor(element);
+      this.__binder.__componentBinder.__forEachBindableDescendant(
+        element,
+        (el) => {
+          if (el.hasAttribute(this.__for)) this.__bindFor(el);
+        }
+      );
       return isForElement;
     }
     __isProcessedOrMark(el) {