tutuca 0.9.30 → 0.9.32

package/dist/tutuca-dev.js

@@ -722,6 +722,8 @@ class AttrParser {
       this.parseThen(s);
     else if (directiveName.startsWith("else."))
       this.parseElse(s);
+    else
+      this.px.onParseIssue("unknown-directive", { name: directiveName, value: s });
   }
   _parseWhen(s) {
     if (this.eachAttr !== null)
@@ -1005,7 +1007,21 @@ class ANode extends BaseNode {
     return this.val.toPathItem();
   }
   static parse(html, px) {
-    return ANode.fromDOM(px.parseHTML(html)[0] ?? new px.Text(""), px);
+    const nodes = px.parseHTML(html);
+    if (nodes.length === 0)
+      return new CommentNode("Empty View in ANode.parse");
+    if (nodes.length === 1)
+      return ANode.fromDOM(nodes[0], px);
+    const childs = [];
+    for (let i = 0;i < nodes.length; i++) {
+      const child = ANode.fromDOM(nodes[i], px);
+      if (child !== null)
+        childs.push(child);
+    }
+    const trimmed = condenseChildsWhites(childs);
+    if (trimmed.length === 0)
+      return new CommentNode("Empty View in ANode.parse");
+    return maybeFragment(trimmed);
   }
   static fromDOM(node, px) {
     if (node instanceof px.Text)
@@ -1020,27 +1036,37 @@ class ANode extends BaseNode {
     if (tag === "X" || isPseudoX) {
       if (attrs.length === 0)
         return maybeFragment(childs);
-      const { name, value } = attrs[isPseudoX ? 1 : 0];
+      const opIdx = isPseudoX ? 1 : 0;
+      const { name, value } = attrs[opIdx];
       const as = attrs.getNamedItem("as")?.value ?? null;
+      let node2;
       switch (name) {
         case "slot":
-          return new SlotNode(null, vp.const(value), maybeFragment(childs));
-        case "text": {
-          const v = vp.parseText(value, px);
-          return v !== null ? new RenderTextNode(null, v) : null;
-        }
+          node2 = new SlotNode(null, vp.const(value), maybeFragment(childs));
+          break;
+        case "text":
+          node2 = px.addNodeIf(RenderTextNode, vp.parseText(value, px));
+          break;
         case "render":
-          return px.addNodeIf(RenderNode, vp.parseRender(value, px), as);
+          node2 = px.addNodeIf(RenderNode, vp.parseRender(value, px), as);
+          break;
         case "render-it":
-          return px.addNodeIf(RenderItNode, vp.bindValIt, as);
+          node2 = px.addNodeIf(RenderItNode, vp.bindValIt, as);
+          break;
         case "render-each":
-          return RenderEachNode.parse(px, vp, value, as, attrs);
+          node2 = RenderEachNode.parse(px, vp, value, as, attrs);
+          break;
         case "show":
-          return px.addNodeIf(ShowNode, vp.parseCondValue(value, px), maybeFragment(childs));
+          node2 = px.addNodeIf(ShowNode, vp.parseCondValue(value, px), maybeFragment(childs));
+          break;
         case "hide":
-          return px.addNodeIf(HideNode, vp.parseCondValue(value, px), maybeFragment(childs));
+          node2 = px.addNodeIf(HideNode, vp.parseCondValue(value, px), maybeFragment(childs));
+          break;
+        default:
+          px.onParseIssue("unknown-x-op", { name, value });
+          return new CommentNode(`Error: InvalidSpecialTagOp ${name}=${value}`);
       }
-      return new CommentNode(`Error: InvalidSpecialTagOp ${name}=${value}`);
+      return processXExtras(node2, attrs, name, (isPseudoX ? 1 : 0) + 1, px);
     } else if (tag.charCodeAt(1) === 58 && tag.charCodeAt(0) === 88) {
       const macroName = tag.slice(2).toLowerCase();
       if (macroName === "slot") {
@@ -1061,6 +1087,30 @@ class ANode extends BaseNode {
     return new CommentNode(`Error: InvalidTagName ${tag}`);
   }
 }
+function processXExtras(node, attrs, opName, startIdx, px) {
+  const consumed = X_OP_CONSUMED[opName];
+  const wrappable = X_OP_WRAPPABLE.has(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.parseCondValue(a.value, px)]);
+      continue;
+    }
+    const issueInfo = { op: opName, name: aName, value: a.value };
+    px.onParseIssue("unknown-x-attr", issueInfo);
+  }
+  for (let i = wrappers.length - 1;i >= 0; i--) {
+    const [Cls, val] = wrappers[i];
+    const wrapper = px.addNodeIf(Cls, val, node);
+    if (wrapper !== null)
+      node = wrapper;
+  }
+  return node;
+}
 function wrap(node, px, wrappers) {
   if (wrappers) {
     for (let i = wrappers.length - 1;i >= 0; i--) {
@@ -1288,6 +1338,17 @@ class IterInfo {
 }
 var filterAlwaysTrue = (_v, _k, _seq) => true;
 var nullLoopWith = (seq) => ({ 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 };
 var WRAPPER_NODES = {
   slot: SlotNode,
   show: ShowNode,
@@ -1320,7 +1381,7 @@ class ParseContext {
   parseHTML(html) {
     const t = this.document.createElement("template");
     t.innerHTML = html;
-    return Array.from(t.content.childNodes);
+    return t.content.childNodes;
   }
   addNodeIf(Class, val, extra) {
     if (val !== null) {
@@ -1364,6 +1425,9 @@ class ParseContext {
     return this.nodes[id] ?? null;
   }
   onAttributes(_attrs, _wrapperAttrs, _textChild, _isMacroCall) {}
+  onParseIssue(kind, info) {
+    console.warn(`tutuca parse issue [${kind}]`, info);
+  }
 }
 var _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";
 var HTML_BLOCK_TAGS = new Set(_htmlBlockTags.split(","));
@@ -1563,6 +1627,29 @@ var DUPLICATE_ATTR_DEFINITION = "DUPLICATE_ATTR_DEFINITION";
 var UNKNOWN_REQUEST_NAME = "UNKNOWN_REQUEST_NAME";
 var UNKNOWN_COMPONENT_NAME = "UNKNOWN_COMPONENT_NAME";
 var UNKNOWN_MACRO_ARG = "UNKNOWN_MACRO_ARG";
+var UNKNOWN_DIRECTIVE = "UNKNOWN_DIRECTIVE";
+var UNKNOWN_X_OP = "UNKNOWN_X_OP";
+var UNKNOWN_X_ATTR = "UNKNOWN_X_ATTR";
+var MAYBE_DROP_AT_PREFIX = "MAYBE_DROP_AT_PREFIX";
+var PARSE_ISSUE_KIND_TO_LINT_ID = {
+  "unknown-directive": UNKNOWN_DIRECTIVE,
+  "unknown-x-op": UNKNOWN_X_OP,
+  "unknown-x-attr": UNKNOWN_X_ATTR
+};
+var X_KNOWN_OP_NAMES = new Set([
+  "slot",
+  "text",
+  "render",
+  "render-it",
+  "render-each",
+  "show",
+  "hide"
+]);
+var X_KNOWN_ATTR_NAMES = new Set(["as", "when", "loop-with", "show", "hide"]);
+var AT_PREFIX_HINT_KNOWN_BY_KIND = {
+  "unknown-x-op": X_KNOWN_OP_NAMES,
+  "unknown-x-attr": X_KNOWN_ATTR_NAMES
+};
 var LEVEL_WARN = "warn";
 var LEVEL_ERROR = "error";
 var LEVEL_HINT = "hint";
@@ -1583,11 +1670,29 @@ function checkComponent(Comp, lx = new LintContext) {
   });
 }
 function checkView(lx, view, Comp, referencedAlters, referencedComputed) {
+  checkParseIssues(lx, view);
   checkRenderItInLoop(lx, view);
   checkEventModifiers(lx, view);
   checkKnownHandlerNames(lx, view, Comp, referencedAlters, referencedComputed);
   checkMacroCallArgs(lx, view, Comp);
 }
+function checkParseIssues(lx, view) {
+  const issues = view.ctx.parseIssues;
+  if (!issues)
+    return;
+  for (const { kind, info } of issues) {
+    const id = PARSE_ISSUE_KIND_TO_LINT_ID[kind];
+    if (!id)
+      continue;
+    lx.error(id, info);
+    const known = AT_PREFIX_HINT_KNOWN_BY_KIND[kind];
+    if (known && info.name?.startsWith("@")) {
+      const suggestion = info.name.slice(1);
+      if (known.has(suggestion))
+        lx.hint(MAYBE_DROP_AT_PREFIX, { ...info, suggestion });
+    }
+  }
+}
 function checkMacroCallArgs(lx, view, Comp) {
   const { scope } = Comp;
   for (const macroNode of view.ctx.macroNodes) {
@@ -1597,7 +1702,10 @@ function checkMacroCallArgs(lx, view, Comp) {
     const { defaults } = macro;
     for (const argName in macroNode.attrs) {
       if (!(argName in defaults)) {
-        lx.error(UNKNOWN_MACRO_ARG, { name: argName, macroName: macroNode.name });
+        lx.error(UNKNOWN_MACRO_ARG, {
+          name: argName,
+          macroName: macroNode.name
+        });
       }
     }
   }
@@ -1779,7 +1887,7 @@ function checkConsistentAttrVal(lx, val, fields, proto, computed, scope, alter,
     if (alter[val.name] === undefined) {
       lx.error(ALT_HANDLER_NOT_DEFINED, { name: val.name });
     }
-  } else if (valName !== "ConstVal" && valName !== "BindVal") {
+  } else if (valName !== "ConstVal" && valName !== "BindVal" && valName !== "DynVal") {
     console.log(val);
   }
 }
@@ -1899,10 +2007,14 @@ class LintParseContext extends ParseContext {
   constructor(document2, Text, Comment) {
     super(document2, Text, Comment);
     this.attrs = [];
+    this.parseIssues = [];
   }
   onAttributes(attrs, wrapperAttrs, textChild, isMacroCall = false) {
     this.attrs.push({ attrs, wrapperAttrs, textChild, isMacroCall });
   }
+  onParseIssue(kind, info) {
+    this.parseIssues.push({ kind, info });
+  }
 }
 
 // tools/format/lint.js
@@ -1942,6 +2054,14 @@ function lintIdToMessage(id, info) {
       return `Alter handler '${info.name}' is defined but not referenced`;
     case "UNKNOWN_MACRO_ARG":
       return `Argument '${info.name}' is not declared in macro '${info.macroName}'`;
+    case "UNKNOWN_DIRECTIVE":
+      return `Unknown directive '@${info.name}=${JSON.stringify(info.value)}'`;
+    case "UNKNOWN_X_OP":
+      return `Unknown <x> op '${info.name}=${JSON.stringify(info.value)}'`;
+    case "UNKNOWN_X_ATTR":
+      return `Unknown attribute '${info.name}=${JSON.stringify(info.value)}' on <x ${info.op}>`;
+    case "MAYBE_DROP_AT_PREFIX":
+      return `Did you mean '${info.suggestion}'? Drop the '@' prefix on <x>.`;
     case "LINT_ERROR":
       return info.message;
     default:
@@ -2117,7 +2237,11 @@ class ComponentStack {
     }
   }
   registerMacros(macros) {
-    Object.assign(this.macros, macros);
+    for (const key in macros) {
+      const lower = key.toLowerCase();
+      console.assert(this.macros[lower] === undefined, "macro key collision", lower);
+      this.macros[lower] = macros[key];
+    }
   }
   getCompFor(v) {
     return this.comps.getCompFor(v);
@@ -8068,7 +8192,7 @@ class ClassBuilder {
     return field;
   }
 }
-var fieldsByClass = new Map;
+var FIELD_CLASS = Symbol.for("tutuca.fieldClass");
 var fieldsByTypeName = {
   text: FieldString,
   int: FieldInt,
@@ -8105,7 +8229,7 @@ function classFromData(name, { fields = {}, methods, statics }) {
     else if (Map2.isMap(value) || value?.constructor === Object)
       b.addField(field, Map2(value), FieldMap);
     else {
-      const Field2 = fieldsByClass.get(value?.constructor) ?? FieldAny;
+      const Field2 = value?.[FIELD_CLASS] ?? FieldAny;
       b.addField(field, value, Field2);
     }
   }
@@ -8126,7 +8250,7 @@ class Renderer {
     this.cache = new WeakMapDomCache;
   }
   getSeqInfo(seq) {
-    return isIndexed(seq) ? imIndexedIter : isKeyed(seq) ? imKeyedIter : seqInfoByClass.get(seq?.constructor) ?? unkIter;
+    return isIndexed(seq) ? imIndexedIter : isKeyed(seq) ? imKeyedIter : seq?.[SEQ_INFO] ?? unkIter;
   }
   renderTag(tag, attrs, childs) {
     return h(tag, attrs, childs);
@@ -8245,7 +8369,7 @@ var imKeyedIter = (seq, visit) => {
     visit(k, v, "sk");
 };
 var unkIter = () => {};
-var seqInfoByClass = new Map;
+var SEQ_INFO = Symbol.for("tutuca.seqInfo");
 
 // extra/klist.js
 class KList {
@@ -8337,11 +8461,11 @@ class FieldKList extends Field {
     };
   }
 }
-fieldsByClass.set(KList, FieldKList);
-seqInfoByClass.set(KList, (seq, visit) => {
+KList.prototype[FIELD_CLASS] = FieldKList;
+KList.prototype[SEQ_INFO] = (seq, visit) => {
   for (const k of seq.order)
     visit(k, seq.items.get(k), "data-sk");
-});
+};
 // index.js
 var css = String.raw;
 var html = String.raw;
@@ -8606,6 +8730,7 @@ class LintClassCollectorCtx extends ParseCtxClassSetCollector {
   constructor(...args) {
     super(...args);
     this.attrs = [];
+    this.parseIssues = [];
   }
   enterMacro(macroName, macroVars, macroSlots) {
     const { document: document2, Text, Comment, nodes, events, macroNodes } = this;
@@ -8613,12 +8738,16 @@ class LintClassCollectorCtx extends ParseCtxClassSetCollector {
     const v = new LintClassCollectorCtx(document2, Text, Comment, nodes, events, macroNodes, frame, this);
     v.classes = this.classes;
     v.attrs = this.attrs;
+    v.parseIssues = this.parseIssues;
     return v;
   }
   onAttributes(attrs, wrapperAttrs, textChild, isMacroCall = false) {
     super.onAttributes(attrs, wrapperAttrs, textChild, isMacroCall);
     this.attrs.push({ attrs, wrapperAttrs, textChild, isMacroCall });
   }
+  onParseIssue(kind, info) {
+    this.parseIssues.push({ kind, info });
+  }
 }
 export {
   version,
@@ -8627,7 +8756,6 @@ export {
   tutuca,
   setIn$1 as setIn,
   set,
-  seqInfoByClass,
   removeIn,
   remove,
   mergeWith$1 as mergeWith,
@@ -8664,7 +8792,6 @@ export {
   getComponentsDocs,
   get,
   fromJS,
-  fieldsByClass,
   docComponents,
   css,
   component,
@@ -8672,14 +8799,18 @@ export {
   compileClassesToStyle,
   checkComponent,
   check,
+  UNKNOWN_X_OP,
+  UNKNOWN_X_ATTR,
   UNKNOWN_REQUEST_NAME,
   UNKNOWN_MACRO_ARG,
   UNKNOWN_HANDLER_ARG_NAME,
   UNKNOWN_EVENT_MODIFIER,
+  UNKNOWN_DIRECTIVE,
   UNKNOWN_COMPONENT_NAME,
   Stack2 as Stack,
   Set2 as Set,
   Seq,
+  SEQ_INFO,
   Repeat,
   Record,
   Range,
@@ -8690,6 +8821,7 @@ export {
   OrderedMap,
   OrderedMap as OMap,
   Map2 as Map,
+  MAYBE_DROP_AT_PREFIX,
   List,
   LintParseContext,
   LintContext,
@@ -8703,6 +8835,7 @@ export {
   INPUT_HANDLER_FOR_INPUT_HANDLER_METHOD,
   Map2 as IMap,
   FIELD_VAL_NOT_DEFINED,
+  FIELD_CLASS,
   DUPLICATE_ATTR_DEFINITION,
   Collection,
   COMPUTED_VAL_NOT_DEFINED,