tutuca 0.9.31 → 0.9.33

package/dist/tutuca-cli.js

@@ -734,9 +734,11 @@ class ValParser {
     const charCode = s.charCodeAt(0);
     switch (charCode) {
       case 94: {
-        const newS = px.frame.macroVars?.[s.slice(1)];
+        const name = s.slice(1);
+        const newS = px.frame.macroVars?.[name];
         if (newS !== undefined)
           return this.parse(newS, px);
+        px.onParseIssue("bad-value", { role: "macro-var", name, value: s });
         return null;
       }
       case 39:
@@ -1057,6 +1059,8 @@ class AttrParser {
       this.attrs ??= [];
       this.attrs.push(new Attr(name, val));
       this.hasDynamic ||= !(val instanceof ConstVal);
+    } else {
+      this.px.onParseIssue("bad-value", { role: "attr", attr: name, value });
     }
   }
   pushWrapper(name, raw, val) {
@@ -1072,6 +1076,9 @@ class AttrParser {
       this.attrs ??= [];
       this.attrs.push(this.ifAttr);
       this.hasDynamic = true;
+    } else {
+      const info = { role: "if", attr: directiveName.slice(3), value };
+      this.px.onParseIssue("bad-value", info);
     }
   }
   parseThen(s) {
@@ -1094,36 +1101,44 @@ class AttrParser {
       this.events.add(eventName, handler, modifiers);
     }
   }
+  _parseDirectiveValue(directiveName, s, parserFn) {
+    const val = parserFn.call(vp, s, this.px);
+    if (val === null) {
+      const info = { role: "directive", directive: directiveName, value: s };
+      this.px.onParseIssue("bad-value", info);
+    }
+    return val;
+  }
   parseDirective(s, directiveName) {
     switch (directiveName) {
       case "dangerouslysetinnerhtml":
         this.attrs ??= [];
-        this.attrs.push(new RawHtmlAttr(vp.parseText(s, this.px)));
+        this.attrs.push(new RawHtmlAttr(this._parseDirectiveValue(directiveName, s, vp.parseText)));
         this.hasDynamic = true;
         return;
       case "slot":
         this.pushWrapper("slot", s, vp.const(s));
         return;
       case "push-view":
-        this.pushWrapper("push-view", s, vp.parseText(s, this.px));
+        this.pushWrapper("push-view", s, this._parseDirectiveValue(directiveName, s, vp.parseText));
         return;
       case "text":
-        this.textChild = vp.parseText(s, this.px);
+        this.textChild = this._parseDirectiveValue(directiveName, s, vp.parseText);
         return;
       case "show":
-        this.pushWrapper("show", s, vp.parseCondValue(s, this.px));
+        this.pushWrapper("show", s, this._parseDirectiveValue(directiveName, s, vp.parseCondValue));
         return;
       case "hide":
-        this.pushWrapper("hide", s, vp.parseCondValue(s, this.px));
+        this.pushWrapper("hide", s, this._parseDirectiveValue(directiveName, s, vp.parseCondValue));
         return;
       case "each":
-        this.eachAttr = this.pushWrapper("each", s, vp.parseEach(s, this.px));
+        this.eachAttr = this.pushWrapper("each", s, this._parseDirectiveValue(directiveName, s, vp.parseEach));
         return;
       case "enrich-with":
         if (this.eachAttr !== null) {
-          this.eachAttr.enrichWithVal = vp.parseAlter(s, this.px);
+          this.eachAttr.enrichWithVal = this._parseDirectiveValue(directiveName, s, vp.parseAlter);
         } else {
-          this.pushWrapper("scope", s, vp.parseAlter(s, this.px));
+          this.pushWrapper("scope", s, this._parseDirectiveValue(directiveName, s, vp.parseAlter));
         }
         return;
       case "when":
@@ -1147,14 +1162,18 @@ class AttrParser {
       this.parseThen(s);
     else if (directiveName.startsWith("else."))
       this.parseElse(s);
+    else {
+      const info = { name: directiveName, value: s };
+      this.px.onParseIssue("unknown-directive", info);
+    }
   }
   _parseWhen(s) {
     if (this.eachAttr !== null)
-      this.eachAttr.whenVal = vp.parseAlter(s, this.px);
+      this.eachAttr.whenVal = this._parseDirectiveValue("when", s, vp.parseAlter);
   }
   _parseLoopWith(s) {
     if (this.eachAttr !== null)
-      this.eachAttr.loopWithVal = vp.parseAlter(s, this.px);
+      this.eachAttr.loopWithVal = this._parseDirectiveValue("loop-with", s, vp.parseAlter);
   }
   parse(attributes, parseAll = false) {
     for (const { name, value } of attributes) {
@@ -1200,13 +1219,22 @@ class EventHandler {
   static parse(s, px) {
     const [handlerName, ...rawArgs] = s.trim().split(/\s+/);
     const handlerVal = vp.parseHandlerName(handlerName, px);
-    if (handlerVal === null)
+    if (handlerVal === null) {
+      const info = { role: "handler-name", value: handlerName };
+      px.onParseIssue("bad-value", info);
       return null;
+    }
     const args = new Array(rawArgs.length);
     vp.allowHandlerArg();
     for (let i = 0;i < rawArgs.length; i++) {
       const val = vp.parse(rawArgs[i], px);
-      args[i] = val !== null ? val : vp.nullConstVal;
+      if (val !== null) {
+        args[i] = val;
+      } else {
+        const info = { role: "handler-arg", value: rawArgs[i] };
+        px.onParseIssue("bad-value", info);
+        args[i] = vp.nullConstVal;
+      }
     }
     return new EventHandler(handlerVal, args);
   }
@@ -1332,6 +1360,74 @@ function optimizeNode(node) {
   node.optimize();
   return node;
 }
+function parseXOp(attrs, childs, opIdx, px) {
+  if (attrs.length === 0)
+    return maybeFragment(childs);
+  const { name, value } = attrs[opIdx];
+  const as = attrs.getNamedItem("as")?.value ?? null;
+  let node;
+  switch (name) {
+    case "slot":
+      node = new SlotNode(null, vp.const(value), maybeFragment(childs));
+      break;
+    case "text":
+      node = px.addNodeIf(RenderTextNode, parseXOpVal(name, value, px, vp.parseText));
+      break;
+    case "render":
+      node = px.addNodeIf(RenderNode, parseXOpVal(name, value, px, vp.parseRender), as);
+      break;
+    case "render-it":
+      node = px.addNodeIf(RenderItNode, vp.bindValIt, as);
+      break;
+    case "render-each":
+      node = RenderEachNode.parse(px, vp, value, as, attrs);
+      break;
+    case "show": {
+      const val = parseXOpVal(name, value, px, vp.parseCondValue);
+      node = px.addNodeIf(ShowNode, val, maybeFragment(childs));
+      break;
+    }
+    case "hide": {
+      const val = parseXOpVal(name, value, px, vp.parseCondValue);
+      node = px.addNodeIf(HideNode, val, maybeFragment(childs));
+      break;
+    }
+    default:
+      px.onParseIssue("unknown-x-op", { name, value });
+      return new CommentNode(`Error: InvalidSpecialTagOp ${name}=${value}`);
+  }
+  return processXExtras(node, attrs, name, opIdx + 1, px);
+}
+function parseXOpVal(opName, value, px, parserFn) {
+  const val = parserFn.call(vp, value, px);
+  if (val === null)
+    px.onParseIssue("bad-value", { role: "x-op", op: opName, value });
+  return val;
+}
+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--) {
@@ -1438,6 +1534,9 @@ class ParseContext {
     return this.nodes[id] ?? null;
   }
   onAttributes(_attrs, _wrapperAttrs, _textChild, _isMacroCall) {}
+  onParseIssue(kind, info) {
+    console.warn(`tutuca parse issue [${kind}]`, info);
+  }
 }
 function condenseChildsWhites(childs) {
   if (childs.length === 0)
@@ -1517,7 +1616,7 @@ 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) => ({ seq }), 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) => ({ 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) => {
   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;
@@ -1616,18 +1715,19 @@ var init_anode = __esm(() => {
     static parse(html, px) {
       const nodes = px.parseHTML(html);
       if (nodes.length === 0)
-        return new TextNode("");
+        return new CommentNode("Empty View in ANode.parse");
       if (nodes.length === 1)
         return ANode.fromDOM(nodes[0], px);
-      const childs = new Array(nodes.length);
-      for (let i = 0;i < nodes.length; i++)
-        childs[i] = ANode.fromDOM(nodes[i], 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 TextNode("");
-      if (trimmed.length === 1)
-        return trimmed[0];
-      return new FragmentNode(trimmed);
+        return new CommentNode("Empty View in ANode.parse");
+      return maybeFragment(trimmed);
     }
     static fromDOM(node, px) {
       if (node instanceof px.Text)
@@ -1635,32 +1735,15 @@ var init_anode = __esm(() => {
       else if (node instanceof px.Comment)
         return new CommentNode(node.textContent);
       const { childNodes, attributes: attrs, tagName: tag } = node;
-      const childs = new Array(childNodes.length);
-      for (let i = 0;i < childNodes.length; i++)
-        childs[i] = ANode.fromDOM(childNodes[i], px);
+      const childs = [];
+      for (let i = 0;i < childNodes.length; i++) {
+        const child = ANode.fromDOM(childNodes[i], px);
+        if (child !== null)
+          childs.push(child);
+      }
       const isPseudoX = attrs[0]?.name === "@x";
       if (tag === "X" || isPseudoX) {
-        if (attrs.length === 0)
-          return maybeFragment(childs);
-        const { name, value } = attrs[isPseudoX ? 1 : 0];
-        const as = attrs.getNamedItem("as")?.value ?? null;
-        switch (name) {
-          case "slot":
-            return new SlotNode(null, vp.const(value), maybeFragment(childs));
-          case "text":
-            return px.addNodeIf(RenderTextNode, vp.parseText(value, px));
-          case "render":
-            return px.addNodeIf(RenderNode, vp.parseRender(value, px), as);
-          case "render-it":
-            return px.addNodeIf(RenderItNode, vp.bindValIt, as);
-          case "render-each":
-            return RenderEachNode.parse(px, vp, value, as, attrs);
-          case "show":
-            return px.addNodeIf(ShowNode, vp.parseCondValue(value, px), maybeFragment(childs));
-          case "hide":
-            return px.addNodeIf(HideNode, vp.parseCondValue(value, px), maybeFragment(childs));
-        }
-        return new CommentNode(`Error: InvalidSpecialTagOp ${name}=${value}`);
+        return parseXOp(attrs, childs, isPseudoX ? 1 : 0, px);
       } else if (tag.charCodeAt(1) === 58 && tag.charCodeAt(0) === 88) {
         const macroName = tag.slice(2).toLowerCase();
         if (macroName === "slot") {
@@ -1746,7 +1829,7 @@ var init_anode = __esm(() => {
       return rx.renderEach(stack, this.iterInfo, this.nodeId, this.viewId);
     }
     static parse(px, vp2, s, as, attrs) {
-      const node = px.addNodeIf(RenderEachNode, vp2.parseEach(s, px), as);
+      const node = px.addNodeIf(RenderEachNode, parseXOpVal("render-each", s, px, vp2.parseEach), as);
       if (node !== null) {
         const attrParser = getAttrParser(px);
         attrParser.eachAttr = attrParser.pushWrapper("each", s, node.val);
@@ -1844,6 +1927,17 @@ 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 };
   WRAPPER_NODES = {
     slot: SlotNode,
     show: ShowNode,
@@ -2084,11 +2178,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) {
@@ -2377,9 +2489,29 @@ class LintContext {
     this.reports.push({ id, info, level, context: { ...this.frame } });
   }
 }
-var ALT_HANDLER_NOT_DEFINED = "ALT_HANDLER_NOT_DEFINED", ALT_HANDLER_NOT_REFERENCED = "ALT_HANDLER_NOT_REFERENCED", RENDER_IT_OUTSIDE_OF_LOOP = "RENDER_IT_OUTSIDE_OF_LOOP", UNKNOWN_EVENT_MODIFIER = "UNKNOWN_EVENT_MODIFIER", UNKNOWN_HANDLER_ARG_NAME = "UNKNOWN_HANDLER_ARG_NAME", INPUT_HANDLER_NOT_IMPLEMENTED = "INPUT_HANDLER_NOT_IMPLEMENTED", INPUT_HANDLER_NOT_REFERENCED = "INPUT_HANDLER_NOT_REFERENCED", INPUT_HANDLER_METHOD_NOT_IMPLEMENTED = "INPUT_HANDLER_METHOD_NOT_IMPLEMENTED", INPUT_HANDLER_FOR_INPUT_HANDLER_METHOD = "INPUT_HANDLER_FOR_INPUT_HANDLER_METHOD", INPUT_HANDLER_METHOD_FOR_INPUT_HANDLER = "INPUT_HANDLER_METHOD_FOR_INPUT_HANDLER", FIELD_VAL_NOT_DEFINED = "FIELD_VAL_NOT_DEFINED", COMPUTED_VAL_NOT_DEFINED = "COMPUTED_VAL_NOT_DEFINED", COMPUTED_NOT_REFERENCED = "COMPUTED_NOT_REFERENCED", DUPLICATE_ATTR_DEFINITION = "DUPLICATE_ATTR_DEFINITION", UNKNOWN_REQUEST_NAME = "UNKNOWN_REQUEST_NAME", UNKNOWN_COMPONENT_NAME = "UNKNOWN_COMPONENT_NAME", UNKNOWN_MACRO_ARG = "UNKNOWN_MACRO_ARG", LEVEL_WARN = "warn", LEVEL_ERROR = "error", LEVEL_HINT = "hint", NO_WRAPPERS, KNOWN_HANDLER_NAMES, LintParseContext;
+var ALT_HANDLER_NOT_DEFINED = "ALT_HANDLER_NOT_DEFINED", ALT_HANDLER_NOT_REFERENCED = "ALT_HANDLER_NOT_REFERENCED", RENDER_IT_OUTSIDE_OF_LOOP = "RENDER_IT_OUTSIDE_OF_LOOP", UNKNOWN_EVENT_MODIFIER = "UNKNOWN_EVENT_MODIFIER", UNKNOWN_HANDLER_ARG_NAME = "UNKNOWN_HANDLER_ARG_NAME", INPUT_HANDLER_NOT_IMPLEMENTED = "INPUT_HANDLER_NOT_IMPLEMENTED", INPUT_HANDLER_NOT_REFERENCED = "INPUT_HANDLER_NOT_REFERENCED", INPUT_HANDLER_METHOD_NOT_IMPLEMENTED = "INPUT_HANDLER_METHOD_NOT_IMPLEMENTED", INPUT_HANDLER_FOR_INPUT_HANDLER_METHOD = "INPUT_HANDLER_FOR_INPUT_HANDLER_METHOD", INPUT_HANDLER_METHOD_FOR_INPUT_HANDLER = "INPUT_HANDLER_METHOD_FOR_INPUT_HANDLER", FIELD_VAL_NOT_DEFINED = "FIELD_VAL_NOT_DEFINED", COMPUTED_VAL_NOT_DEFINED = "COMPUTED_VAL_NOT_DEFINED", COMPUTED_NOT_REFERENCED = "COMPUTED_NOT_REFERENCED", DUPLICATE_ATTR_DEFINITION = "DUPLICATE_ATTR_DEFINITION", UNKNOWN_REQUEST_NAME = "UNKNOWN_REQUEST_NAME", UNKNOWN_COMPONENT_NAME = "UNKNOWN_COMPONENT_NAME", UNKNOWN_MACRO_ARG = "UNKNOWN_MACRO_ARG", UNKNOWN_DIRECTIVE = "UNKNOWN_DIRECTIVE", UNKNOWN_X_OP = "UNKNOWN_X_OP", UNKNOWN_X_ATTR = "UNKNOWN_X_ATTR", MAYBE_DROP_AT_PREFIX = "MAYBE_DROP_AT_PREFIX", BAD_VALUE = "BAD_VALUE", PARSE_ISSUE_KIND_TO_LINT_ID, X_KNOWN_OP_NAMES, X_KNOWN_ATTR_NAMES, AT_PREFIX_HINT_KNOWN_BY_KIND, LEVEL_WARN = "warn", LEVEL_ERROR = "error", LEVEL_HINT = "hint", NO_WRAPPERS, KNOWN_HANDLER_NAMES, LintParseContext;
 var init_lint_check = __esm(() => {
   init_anode();
+  PARSE_ISSUE_KIND_TO_LINT_ID = {
+    "unknown-directive": UNKNOWN_DIRECTIVE,
+    "unknown-x-op": UNKNOWN_X_OP,
+    "unknown-x-attr": UNKNOWN_X_ATTR,
+    "bad-value": BAD_VALUE
+  };
+  X_KNOWN_OP_NAMES = new Set([
+    "slot",
+    "text",
+    "render",
+    "render-it",
+    "render-each",
+    "show",
+    "hide"
+  ]);
+  X_KNOWN_ATTR_NAMES = new Set(["as", "when", "loop-with", "show", "hide"]);
+  AT_PREFIX_HINT_KNOWN_BY_KIND = {
+    "unknown-x-op": X_KNOWN_OP_NAMES,
+    "unknown-x-attr": X_KNOWN_ATTR_NAMES
+  };
   NO_WRAPPERS = {};
   KNOWN_HANDLER_NAMES = new Set([
     "value",
@@ -2405,10 +2537,14 @@ var init_lint_check = __esm(() => {
     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 });
+    }
   };
 });