regor 1.4.3 → 1.4.5

package/dist/regor.es2019.esm.js

@@ -463,10 +463,13 @@ var IfBinder = class {
   }
   __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) {
@@ -738,6 +741,12 @@ var teleportDirective = {
   mount: () => void 0
 };
 
+// src/common/class-tokens.ts
+var toClassTokens = (value) => {
+  const trimmed = value.trim();
+  return trimmed ? trimmed.split(/\s+/) : [];
+};
+
 // src/composition/callMounted.ts
 var callMounted = (context) => {
   var _a, _b;
@@ -1252,8 +1261,16 @@ var ComponentBinder = class {
     }
     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;
@@ -1262,16 +1279,9 @@ var ComponentBinder = class {
       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;
@@ -1345,7 +1355,7 @@ var ComponentBinder = class {
       };
       const capturedContext = [...parser.__capture()];
       const createComponentCtx = () => {
-        var _a2;
+        var _a;
         const props = getProps(component, capturedContext);
         const head2 = new ComponentHead(
           props,
@@ -1355,8 +1365,8 @@ var ComponentBinder = class {
           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)) {
@@ -1380,7 +1390,7 @@ var ComponentBinder = class {
               }
             } 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 };
       };
@@ -1389,6 +1399,7 @@ var ComponentBinder = class {
       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)) {
@@ -1418,9 +1429,12 @@ var ComponentBinder = class {
           `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;
@@ -1456,7 +1470,7 @@ var ComponentBinder = class {
             return;
           }
           const childNodes2 = [...getChildNodes(component)].filter(
-            (x) => !isTemplate(x)
+            (x) => !this.__isNamedSlotTemplateShortcut(x)
           );
           for (const slotChild of childNodes2) {
             parent2.insertBefore(slotChild, slot);
@@ -1502,7 +1516,8 @@ var ComponentBinder = class {
             continue;
           const value = component.getAttribute(attrName);
           if (attrName === "class") {
-            inheritor.classList.add(...value.split(" "));
+            const classTokens = toClassTokens(value);
+            if (classTokens.length > 0) inheritor.classList.add(...classTokens);
           } else if (attrName === "style") {
             const inheritorStyle = inheritor.style;
             const componentStyle = component.style;
@@ -1541,6 +1556,65 @@ var ComponentBinder = class {
       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
@@ -1633,10 +1707,10 @@ var DirectiveCollector = class {
     };
     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;
   }
 };
@@ -1654,17 +1728,19 @@ var DynamicBinder = class {
   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) {
@@ -2141,10 +2217,13 @@ var _ForBinder = class _ForBinder {
   }
   __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) {
@@ -2870,11 +2949,14 @@ var patchClass = (el, next, prev) => {
   } else {
     if (isClassString) {
       if (prev !== next) {
-        if (isPrevClassString) classList.remove(...prev.trim().split(/\s+/));
-        classList.add(...next.trim().split(/\s+/));
+        const prevTokens = isPrevClassString ? toClassTokens(prev) : [];
+        const nextTokens = toClassTokens(next);
+        if (prevTokens.length > 0) classList.remove(...prevTokens);
+        if (nextTokens.length > 0) classList.add(...nextTokens);
       }
     } else if (prev) {
-      if (isPrevClassString) classList.remove(...prev.trim().split(/\s+/));
+      const prevTokens = isPrevClassString ? toClassTokens(prev) : [];
+      if (prevTokens.length > 0) classList.remove(...prevTokens);
     }
   }
 };