tutuca 0.9.68 → 0.9.69

package/dist/tutuca-cli.js

@@ -5833,16 +5833,16 @@ function parseXOpVal(opName, value, px, parserFn) {
   return val;
 }
 function processXExtras(node, attrs, opName, startIdx, px) {
-  const consumed = X_OP_CONSUMED[opName];
-  const wrappable = X_OP_WRAPPABLE.has(opName);
+  const { consumed, wrappable } = X_OPS[opName];
   const wrappers = [];
   for (let i = startIdx;i < attrs.length; i++) {
     const a = attrs[i];
     const aName = a.name;
     if (consumed.has(aName))
       continue;
-    if (wrappable && X_ATTR_WRAPPERS[aName]) {
-      wrappers.push([X_ATTR_WRAPPERS[aName], vp.parseBool(a.value, px)]);
+    const wrapper = wrappable ? X_OPS[aName]?.wrapper : null;
+    if (wrapper) {
+      wrappers.push([wrapper, vp.parseBool(a.value, px)]);
       continue;
     }
     const issueInfo = { op: opName, name: aName, value: a.value };
@@ -5878,6 +5878,12 @@ function makeWrapperNode(data, px) {
   }
   return node;
 }
+function dynRenderStep(comp, name, key) {
+  const p = resolveDynProducer(comp, name);
+  if (!p)
+    return null;
+  return key === undefined ? new DynStep(p.producerCompId, p.producerSteps) : new DynEachStep(p.producerCompId, p.producerSteps, key);
+}
 
 class IterInfo {
   constructor(val, whenVal, loopWithVal, enrichWithVal) {
@@ -5894,6 +5900,9 @@ class IterInfo {
     return { seq, filter, loopWith, enricher };
   }
 }
+function xOp(consumed = [], { wrappable = false, wrapper = null } = {}) {
+  return { consumed: new Set(consumed), wrappable, wrapper };
+}
 
 class ParseContext {
   constructor(document2, Text, Comment, nodes, events, macroNodes, frame, parent) {
@@ -5967,29 +5976,29 @@ class ParseContext {
     console.warn(`tutuca parse issue [${kind}]`, info);
   }
 }
+function trimEdgeWhite(node) {
+  if (!node.isWhiteSpace?.())
+    return false;
+  node.condenseWhiteSpace();
+  return true;
+}
 function condenseChildsWhites(childs) {
   if (childs.length === 0)
     return childs;
-  let changed = false;
-  if (childs[0].isWhiteSpace?.()) {
-    childs[0].condenseWhiteSpace();
-    changed = true;
-  }
   const last = childs.length - 1;
-  if (last > 0 && childs[last].isWhiteSpace?.()) {
-    childs[last].condenseWhiteSpace();
-    changed = true;
-  }
+  let emptied = trimEdgeWhite(childs[0]);
+  if (last > 0 && trimEdgeWhite(childs[last]))
+    emptied = true;
   for (let i = 1;i < last; i++) {
     const cur = childs[i];
-    if (cur.isWhiteSpace?.() && cur.hasNewLine()) {
-      const bothBlock = isBlockDomNode(childs[i - 1]) && isBlockDomNode(childs[i + 1]);
-      cur.condenseWhiteSpace(bothBlock ? "" : " ");
-      if (bothBlock)
-        changed = true;
-    }
+    if (!(cur.isWhiteSpace?.() && cur.hasNewLine()))
+      continue;
+    const bothBlock = isBlockDomNode(childs[i - 1]) && isBlockDomNode(childs[i + 1]);
+    cur.condenseWhiteSpace(bothBlock ? "" : " ");
+    if (bothBlock)
+      emptied = true;
   }
-  return changed ? childs.filter((c) => !(c instanceof TextNode && c.val === "")) : childs;
+  return emptied ? childs.filter((c) => !isEmptyText(c)) : childs;
 }
 
 class NodeEvents {
@@ -6045,10 +6054,10 @@ function compileModifiers(eventName, names) {
     return w(this, f, args, ctx);
   };
 }
-var TextNode, CommentNode, ChildsNode, DomNode, FragmentNode, maybeFragment = (xs) => xs.length === 1 ? xs[0] : new FragmentNode(xs), VALID_NODE_RE, ANode, MacroNode, RenderViewId, RenderNode, RenderItNode, RenderEachNode, RenderTextNode, RenderOnceNode, WrapperNode, ShowNode, HideNode, PushViewNameNode, SlotNode, ScopeNode, EachNode, filterAlwaysTrue = (_v, _k, _seq) => true, nullLoopWith = (seq) => ({ iterData: { seq } }), X_OP_CONSUMED, X_OP_WRAPPABLE, X_ATTR_WRAPPERS, WRAPPER_NODES, _htmlBlockTags = "ADDRESS,ARTICLE,ASIDE,BLOCKQUOTE,CAPTION,COL,COLGROUP,DETAILS,DIALOG,DIV,DD,DL,DT,FIELDSET,FIGCAPTION,FIGURE,FOOTER,FORM,H1,H2,H3,H4,H5,H6,HEADER,HGROUP,HR,LEGEND,LI,MAIN,MENU,NAV,OL,P,PRE,SECTION,SUMMARY,TABLE,TBODY,TD,TFOOT,TH,THEAD,TR,UL", HTML_BLOCK_TAGS, isBlockDomNode = (n) => {
+var TextNode, CommentNode, ChildsNode, DomNode, FragmentNode, maybeFragment = (xs) => xs.length === 1 ? xs[0] : new FragmentNode(xs), VALID_NODE_RE, ANode, MacroNode, RenderViewId, RenderNode, RenderItNode, RenderEachNode, RenderTextNode, RenderOnceNode, WrapperNode, ShowNode, HideNode, PushViewNameNode, SlotNode, ScopeNode, EachNode, filterAlwaysTrue = (_v, _k, _seq) => true, nullLoopWith = (seq) => ({ iterData: { seq } }), X_OPS, WRAPPER_NODES, _htmlBlockTags = "ADDRESS,ARTICLE,ASIDE,BLOCKQUOTE,CAPTION,COL,COLGROUP,DETAILS,DIALOG,DIV,DD,DL,DT,FIELDSET,FIGCAPTION,FIGURE,FOOTER,FORM,H1,H2,H3,H4,H5,H6,HEADER,HGROUP,HR,LEGEND,LI,MAIN,MENU,NAV,OL,P,PRE,SECTION,SUMMARY,TABLE,TBODY,TD,TFOOT,TH,THEAD,TR,UL", HTML_BLOCK_TAGS, isBlockDomNode = (n) => {
   const node = n instanceof FragmentNode ? n.childs[0] : n;
   return node instanceof DomNode && HTML_BLOCK_TAGS.has(node.tagName);
-}, isMac, fwdIfCtxPred = (pred) => (w) => (that, f, args, ctx) => pred(ctx) ? w(that, f, args, ctx) : that, fwdIfKey = (keyName) => fwdIfCtxPred((ctx) => ctx.e.key === keyName), fwdCtrl, fwdMeta, fwdAlt, metaWraps, MOD_WRAPPERS_BY_EVENT, identityModifierWrapper = (f, _ctx) => f;
+}, isEmptyText = (c) => c instanceof TextNode && c.val === "", isMac, fwdIfCtxPred = (pred) => (w) => (that, f, args, ctx) => pred(ctx) ? w(that, f, args, ctx) : that, fwdIfKey = (keyName) => fwdIfCtxPred((ctx) => ctx.e.key === keyName), fwdCtrl, fwdMeta, fwdAlt, metaWraps, MOD_WRAPPERS_BY_EVENT, identityModifierWrapper = (f, _ctx) => f;
 var init_anode = __esm(() => {
   init_attribute();
   init_path();
@@ -6252,10 +6261,8 @@ var init_anode = __esm(() => {
       return rx.renderIt(newStack, this, "", this.viewId);
     }
     toPathStep(ctx) {
-      if (this.val instanceof DynVal) {
-        const p = resolveDynProducer(ctx.comp, this.val.name);
-        return p ? new DynStep(p.producerCompId, p.producerSteps) : null;
-      }
+      if (this.val instanceof DynVal)
+        return dynRenderStep(ctx.comp, this.val.name);
       return super.toPathStep(ctx);
     }
   };
@@ -6270,10 +6277,8 @@ var init_anode = __esm(() => {
         return null;
       const nextNode = next.resolveNode();
       if (nextNode instanceof EachNode && next.hasKey) {
-        if (nextNode.val instanceof DynVal) {
-          const p = resolveDynProducer(ctx.comp, nextNode.val.name);
-          return p ? new DynEachStep(p.producerCompId, p.producerSteps, next.key) : null;
-        }
+        if (nextNode.val instanceof DynVal)
+          return dynRenderStep(ctx.comp, nextNode.val.name, next.key);
         return new EachRenderItStep(nextNode.val.name, next.key);
       }
       return null;
@@ -6288,12 +6293,8 @@ var init_anode = __esm(() => {
       return rx.renderEach(stack, this.iterInfo, this, this.viewId);
     }
     toPathStep(ctx) {
-      if (this.val instanceof DynVal) {
-        if (!ctx.hasKey)
-          return null;
-        const p = resolveDynProducer(ctx.comp, this.val.name);
-        return p ? new DynEachStep(p.producerCompId, p.producerSteps, ctx.key) : null;
-      }
+      if (this.val instanceof DynVal)
+        return ctx.hasKey ? dynRenderStep(ctx.comp, this.val.name, ctx.key) : null;
       return super.toPathStep(ctx);
     }
     static parse(px, vp2, s, as, attrs) {
@@ -6396,17 +6397,15 @@ var init_anode = __esm(() => {
     }
     static register = true;
   };
-  X_OP_CONSUMED = {
-    slot: new Set,
-    text: new Set,
-    render: new Set(["as"]),
-    "render-it": new Set(["as"]),
-    "render-each": new Set(["as", "when", "loop-with"]),
-    show: new Set,
-    hide: new Set
-  };
-  X_OP_WRAPPABLE = new Set(["text", "render", "render-it", "render-each"]);
-  X_ATTR_WRAPPERS = { show: ShowNode, hide: HideNode };
+  X_OPS = {
+    slot: xOp(),
+    text: xOp([], { wrappable: true }),
+    render: xOp(["as"], { wrappable: true }),
+    "render-it": xOp(["as"], { wrappable: true }),
+    "render-each": xOp(["as", "when", "loop-with"], { wrappable: true }),
+    show: xOp([], { wrapper: ShowNode }),
+    hide: xOp([], { wrapper: HideNode })
+  };
   WRAPPER_NODES = {
     slot: SlotNode,
     show: ShowNode,

package/dist/tutuca-dev.ext.js

@@ -5264,16 +5264,16 @@ function parseXOpVal(opName, value, px, parserFn) {
   return val;
 }
 function processXExtras(node, attrs, opName, startIdx, px) {
-  const consumed = X_OP_CONSUMED[opName];
-  const wrappable = X_OP_WRAPPABLE.has(opName);
+  const { consumed, wrappable } = X_OPS[opName];
   const wrappers = [];
   for (let i = startIdx;i < attrs.length; i++) {
     const a = attrs[i];
     const aName = a.name;
     if (consumed.has(aName))
       continue;
-    if (wrappable && X_ATTR_WRAPPERS[aName]) {
-      wrappers.push([X_ATTR_WRAPPERS[aName], vp.parseBool(a.value, px)]);
+    const wrapper = wrappable ? X_OPS[aName]?.wrapper : null;
+    if (wrapper) {
+      wrappers.push([wrapper, vp.parseBool(a.value, px)]);
       continue;
     }
     const issueInfo = { op: opName, name: aName, value: a.value };
@@ -5365,6 +5365,12 @@ class RenderViewId extends ANode {
   }
   setDataAttr(_key, _val) {}
 }
+function dynRenderStep(comp, name, key) {
+  const p = resolveDynProducer(comp, name);
+  if (!p)
+    return null;
+  return key === undefined ? new DynStep(p.producerCompId, p.producerSteps) : new DynEachStep(p.producerCompId, p.producerSteps, key);
+}
 
 class RenderNode extends RenderViewId {
   render(stack, rx) {
@@ -5372,10 +5378,8 @@ class RenderNode extends RenderViewId {
     return rx.renderIt(newStack, this, "", this.viewId);
   }
   toPathStep(ctx) {
-    if (this.val instanceof DynVal) {
-      const p = resolveDynProducer(ctx.comp, this.val.name);
-      return p ? new DynStep(p.producerCompId, p.producerSteps) : null;
-    }
+    if (this.val instanceof DynVal)
+      return dynRenderStep(ctx.comp, this.val.name);
     return super.toPathStep(ctx);
   }
 }
@@ -5391,10 +5395,8 @@ class RenderItNode extends RenderViewId {
       return null;
     const nextNode = next.resolveNode();
     if (nextNode instanceof EachNode && next.hasKey) {
-      if (nextNode.val instanceof DynVal) {
-        const p = resolveDynProducer(ctx.comp, nextNode.val.name);
-        return p ? new DynEachStep(p.producerCompId, p.producerSteps, next.key) : null;
-      }
+      if (nextNode.val instanceof DynVal)
+        return dynRenderStep(ctx.comp, nextNode.val.name, next.key);
       return new EachRenderItStep(nextNode.val.name, next.key);
     }
     return null;
@@ -5410,12 +5412,8 @@ class RenderEachNode extends RenderViewId {
     return rx.renderEach(stack, this.iterInfo, this, this.viewId);
   }
   toPathStep(ctx) {
-    if (this.val instanceof DynVal) {
-      if (!ctx.hasKey)
-        return null;
-      const p = resolveDynProducer(ctx.comp, this.val.name);
-      return p ? new DynEachStep(p.producerCompId, p.producerSteps, ctx.key) : null;
-    }
+    if (this.val instanceof DynVal)
+      return ctx.hasKey ? dynRenderStep(ctx.comp, this.val.name, ctx.key) : null;
     return super.toPathStep(ctx);
   }
   static parse(px, vp2, s, as, attrs) {
@@ -5545,17 +5543,18 @@ class IterInfo {
 }
 var filterAlwaysTrue = (_v, _k, _seq) => true;
 var nullLoopWith = (seq) => ({ iterData: { seq } });
-var X_OP_CONSUMED = {
-  slot: new Set,
-  text: new Set,
-  render: new Set(["as"]),
-  "render-it": new Set(["as"]),
-  "render-each": new Set(["as", "when", "loop-with"]),
-  show: new Set,
-  hide: new Set
-};
-var X_OP_WRAPPABLE = new Set(["text", "render", "render-it", "render-each"]);
-var X_ATTR_WRAPPERS = { show: ShowNode, hide: HideNode };
+function xOp(consumed = [], { wrappable = false, wrapper = null } = {}) {
+  return { consumed: new Set(consumed), wrappable, wrapper };
+}
+var X_OPS = {
+  slot: xOp(),
+  text: xOp([], { wrappable: true }),
+  render: xOp(["as"], { wrappable: true }),
+  "render-it": xOp(["as"], { wrappable: true }),
+  "render-each": xOp(["as", "when", "loop-with"], { wrappable: true }),
+  show: xOp([], { wrapper: ShowNode }),
+  hide: xOp([], { wrapper: HideNode })
+};
 var WRAPPER_NODES = {
   slot: SlotNode,
   show: ShowNode,
@@ -5643,29 +5642,30 @@ var isBlockDomNode = (n) => {
   const node = n instanceof FragmentNode ? n.childs[0] : n;
   return node instanceof DomNode && HTML_BLOCK_TAGS.has(node.tagName);
 };
+var isEmptyText = (c) => c instanceof TextNode && c.val === "";
+function trimEdgeWhite(node) {
+  if (!node.isWhiteSpace?.())
+    return false;
+  node.condenseWhiteSpace();
+  return true;
+}
 function condenseChildsWhites(childs) {
   if (childs.length === 0)
     return childs;
-  let changed = false;
-  if (childs[0].isWhiteSpace?.()) {
-    childs[0].condenseWhiteSpace();
-    changed = true;
-  }
   const last = childs.length - 1;
-  if (last > 0 && childs[last].isWhiteSpace?.()) {
-    childs[last].condenseWhiteSpace();
-    changed = true;
-  }
+  let emptied = trimEdgeWhite(childs[0]);
+  if (last > 0 && trimEdgeWhite(childs[last]))
+    emptied = true;
   for (let i = 1;i < last; i++) {
     const cur = childs[i];
-    if (cur.isWhiteSpace?.() && cur.hasNewLine()) {
-      const bothBlock = isBlockDomNode(childs[i - 1]) && isBlockDomNode(childs[i + 1]);
-      cur.condenseWhiteSpace(bothBlock ? "" : " ");
-      if (bothBlock)
-        changed = true;
-    }
+    if (!(cur.isWhiteSpace?.() && cur.hasNewLine()))
+      continue;
+    const bothBlock = isBlockDomNode(childs[i - 1]) && isBlockDomNode(childs[i + 1]);
+    cur.condenseWhiteSpace(bothBlock ? "" : " ");
+    if (bothBlock)
+      emptied = true;
   }
-  return changed ? childs.filter((c) => !(c instanceof TextNode && c.val === "")) : childs;
+  return emptied ? childs.filter((c) => !isEmptyText(c)) : childs;
 }
 
 class View {

package/dist/tutuca-dev.js

@@ -9470,16 +9470,16 @@ function parseXOpVal(opName, value, px, parserFn) {
   return val;
 }
 function processXExtras(node, attrs, opName, startIdx, px) {
-  const consumed = X_OP_CONSUMED[opName];
-  const wrappable = X_OP_WRAPPABLE.has(opName);
+  const { consumed, wrappable } = X_OPS[opName];
   const wrappers = [];
   for (let i = startIdx;i < attrs.length; i++) {
     const a = attrs[i];
     const aName = a.name;
     if (consumed.has(aName))
       continue;
-    if (wrappable && X_ATTR_WRAPPERS[aName]) {
-      wrappers.push([X_ATTR_WRAPPERS[aName], vp.parseBool(a.value, px)]);
+    const wrapper = wrappable ? X_OPS[aName]?.wrapper : null;
+    if (wrapper) {
+      wrappers.push([wrapper, vp.parseBool(a.value, px)]);
       continue;
     }
     const issueInfo = { op: opName, name: aName, value: a.value };
@@ -9571,6 +9571,12 @@ class RenderViewId extends ANode {
   }
   setDataAttr(_key, _val) {}
 }
+function dynRenderStep(comp, name, key) {
+  const p = resolveDynProducer(comp, name);
+  if (!p)
+    return null;
+  return key === undefined ? new DynStep(p.producerCompId, p.producerSteps) : new DynEachStep(p.producerCompId, p.producerSteps, key);
+}
 
 class RenderNode extends RenderViewId {
   render(stack, rx) {
@@ -9578,10 +9584,8 @@ class RenderNode extends RenderViewId {
     return rx.renderIt(newStack, this, "", this.viewId);
   }
   toPathStep(ctx) {
-    if (this.val instanceof DynVal) {
-      const p = resolveDynProducer(ctx.comp, this.val.name);
-      return p ? new DynStep(p.producerCompId, p.producerSteps) : null;
-    }
+    if (this.val instanceof DynVal)
+      return dynRenderStep(ctx.comp, this.val.name);
     return super.toPathStep(ctx);
   }
 }
@@ -9597,10 +9601,8 @@ class RenderItNode extends RenderViewId {
       return null;
     const nextNode = next.resolveNode();
     if (nextNode instanceof EachNode && next.hasKey) {
-      if (nextNode.val instanceof DynVal) {
-        const p = resolveDynProducer(ctx.comp, nextNode.val.name);
-        return p ? new DynEachStep(p.producerCompId, p.producerSteps, next.key) : null;
-      }
+      if (nextNode.val instanceof DynVal)
+        return dynRenderStep(ctx.comp, nextNode.val.name, next.key);
       return new EachRenderItStep(nextNode.val.name, next.key);
     }
     return null;
@@ -9616,12 +9618,8 @@ class RenderEachNode extends RenderViewId {
     return rx.renderEach(stack, this.iterInfo, this, this.viewId);
   }
   toPathStep(ctx) {
-    if (this.val instanceof DynVal) {
-      if (!ctx.hasKey)
-        return null;
-      const p = resolveDynProducer(ctx.comp, this.val.name);
-      return p ? new DynEachStep(p.producerCompId, p.producerSteps, ctx.key) : null;
-    }
+    if (this.val instanceof DynVal)
+      return ctx.hasKey ? dynRenderStep(ctx.comp, this.val.name, ctx.key) : null;
     return super.toPathStep(ctx);
   }
   static parse(px, vp2, s, as, attrs) {
@@ -9751,17 +9749,18 @@ class IterInfo {
 }
 var filterAlwaysTrue = (_v, _k, _seq) => true;
 var nullLoopWith = (seq) => ({ iterData: { seq } });
-var X_OP_CONSUMED = {
-  slot: new Set,
-  text: new Set,
-  render: new Set(["as"]),
-  "render-it": new Set(["as"]),
-  "render-each": new Set(["as", "when", "loop-with"]),
-  show: new Set,
-  hide: new Set
-};
-var X_OP_WRAPPABLE = new Set(["text", "render", "render-it", "render-each"]);
-var X_ATTR_WRAPPERS = { show: ShowNode, hide: HideNode };
+function xOp(consumed = [], { wrappable = false, wrapper = null } = {}) {
+  return { consumed: new Set(consumed), wrappable, wrapper };
+}
+var X_OPS = {
+  slot: xOp(),
+  text: xOp([], { wrappable: true }),
+  render: xOp(["as"], { wrappable: true }),
+  "render-it": xOp(["as"], { wrappable: true }),
+  "render-each": xOp(["as", "when", "loop-with"], { wrappable: true }),
+  show: xOp([], { wrapper: ShowNode }),
+  hide: xOp([], { wrapper: HideNode })
+};
 var WRAPPER_NODES = {
   slot: SlotNode,
   show: ShowNode,
@@ -9849,29 +9848,30 @@ var isBlockDomNode = (n) => {
   const node = n instanceof FragmentNode ? n.childs[0] : n;
   return node instanceof DomNode && HTML_BLOCK_TAGS.has(node.tagName);
 };
+var isEmptyText = (c) => c instanceof TextNode && c.val === "";
+function trimEdgeWhite(node) {
+  if (!node.isWhiteSpace?.())
+    return false;
+  node.condenseWhiteSpace();
+  return true;
+}
 function condenseChildsWhites(childs) {
   if (childs.length === 0)
     return childs;
-  let changed = false;
-  if (childs[0].isWhiteSpace?.()) {
-    childs[0].condenseWhiteSpace();
-    changed = true;
-  }
   const last = childs.length - 1;
-  if (last > 0 && childs[last].isWhiteSpace?.()) {
-    childs[last].condenseWhiteSpace();
-    changed = true;
-  }
+  let emptied = trimEdgeWhite(childs[0]);
+  if (last > 0 && trimEdgeWhite(childs[last]))
+    emptied = true;
   for (let i = 1;i < last; i++) {
     const cur = childs[i];
-    if (cur.isWhiteSpace?.() && cur.hasNewLine()) {
-      const bothBlock = isBlockDomNode(childs[i - 1]) && isBlockDomNode(childs[i + 1]);
-      cur.condenseWhiteSpace(bothBlock ? "" : " ");
-      if (bothBlock)
-        changed = true;
-    }
+    if (!(cur.isWhiteSpace?.() && cur.hasNewLine()))
+      continue;
+    const bothBlock = isBlockDomNode(childs[i - 1]) && isBlockDomNode(childs[i + 1]);
+    cur.condenseWhiteSpace(bothBlock ? "" : " ");
+    if (bothBlock)
+      emptied = true;
   }
-  return changed ? childs.filter((c) => !(c instanceof TextNode && c.val === "")) : childs;
+  return emptied ? childs.filter((c) => !isEmptyText(c)) : childs;
 }
 
 class View {