tutuca 0.9.24 → 0.9.26

package/dist/tutuca-cli.js

@@ -91,14 +91,7 @@ class LintReport {
 }
 
 class RenderedExample {
-  constructor({
-    title,
-    description = null,
-    componentName,
-    view,
-    html,
-    error = null
-  }) {
+  constructor({ title, description = null, componentName, view, html, error = null }) {
     this.title = title;
     this.description = description;
     this.componentName = componentName;
@@ -1458,7 +1451,7 @@ class ParseContext {
   getNodeForId(id) {
     return this.nodes[id] ?? null;
   }
-  onAttributes(_attrs, _wrapperAttrs, _textChild) {}
+  onAttributes(_attrs, _wrapperAttrs, _textChild, _isMacroCall) {}
 }
 function condenseChildsWhites(childs) {
   let end = childs.length;
@@ -1676,7 +1669,7 @@ var init_anode = __esm(() => {
           return px.frame.macroSlots[slotName] ?? maybeFragment(childs);
         }
         const [nAttrs, wrappers] = Attributes.parse(attrs, px, true);
-        px.onAttributes(nAttrs, wrappers, null);
+        px.onAttributes(nAttrs, wrappers, null, true);
         return wrap(px.newMacroNode(macroName, nAttrs.toMacroVars(), childs), px, wrappers);
       } else if (VALID_NODE_RE.test(tag)) {
         const [nAttrs, wrappers, textChild] = Attributes.parse(attrs, px);
@@ -2082,6 +2075,21 @@ function checkView(lx, view, Comp, referencedAlters, referencedComputed) {
   checkRenderItInLoop(lx, view);
   checkEventModifiers(lx, view);
   checkKnownHandlerNames(lx, view, Comp, referencedAlters, referencedComputed);
+  checkMacroCallArgs(lx, view, Comp);
+}
+function checkMacroCallArgs(lx, view, Comp) {
+  const { scope } = Comp;
+  for (const macroNode of view.ctx.macroNodes) {
+    const macro = scope.lookupMacro(macroNode.name);
+    if (macro === null)
+      continue;
+    const { defaults } = macro;
+    for (const argName in macroNode.attrs) {
+      if (!(argName in defaults)) {
+        lx.error(UNKNOWN_MACRO_ARG, { name: argName, macroName: macroNode.name });
+      }
+    }
+  }
 }
 function checkRenderItInLoop(lx, view) {
   let hasRenderIt = false;
@@ -2131,7 +2139,7 @@ function checkEventModifiers(lx, view) {
       const modWrappers = MOD_WRAPPERS_BY_EVENT[name] ?? NO_WRAPPERS;
       for (const modifier of modifiers) {
         if (modWrappers[modifier] === undefined) {
-          lx.warn(UNKNOWN_EVENT_MODIFIER, { name, modifier, handler, event });
+          lx.error(UNKNOWN_EVENT_MODIFIER, { name, modifier, handler, event });
         }
       }
     }
@@ -2167,7 +2175,7 @@ function checkEventHandlersHaveImpls(lx, Comp, referencedInputs) {
           if (hvName === "InputHandlerNameVal") {
             referencedInputs?.add(handlerVal.name);
             if (input[handlerVal.name] === undefined) {
-              lx.warn(INPUT_HANDLER_NOT_IMPLEMENTED, {
+              lx.error(INPUT_HANDLER_NOT_IMPLEMENTED, {
                 name: handlerVal.name,
                 handler,
                 event
@@ -2183,7 +2191,7 @@ function checkEventHandlersHaveImpls(lx, Comp, referencedInputs) {
           } else if (hvName === "RawFieldVal") {
             referencedInputs?.add(handlerVal.name);
             if (proto[handlerVal.name] === undefined) {
-              lx.warn(INPUT_HANDLER_METHOD_NOT_IMPLEMENTED, {
+              lx.error(INPUT_HANDLER_METHOD_NOT_IMPLEMENTED, {
                 name: handlerVal.name,
                 handler,
                 event
@@ -2202,7 +2210,7 @@ function checkEventHandlersHaveImpls(lx, Comp, referencedInputs) {
     });
   }
 }
-function checkConsistentAttrVal(lx, val, fields, proto, computed, scope, alter, referencedAlters, referencedComputed) {
+function checkConsistentAttrVal(lx, val, fields, proto, computed, scope, alter, referencedAlters, referencedComputed, skipNameVal = false) {
   const valName = val?.constructor.name;
   if (valName === "FieldVal" || valName === "RawFieldVal") {
     const { name } = val;
@@ -2216,28 +2224,28 @@ function checkConsistentAttrVal(lx, val, fields, proto, computed, scope, alter,
       lx.error(COMPUTED_VAL_NOT_DEFINED, { val, name });
     }
   } else if (valName === "SeqAccessVal") {
-    checkConsistentAttrVal(lx, val.seqVal, fields, proto, computed, scope, alter, referencedAlters, referencedComputed);
-    checkConsistentAttrVal(lx, val.keyVal, fields, proto, computed, scope, alter, referencedAlters, referencedComputed);
+    checkConsistentAttrVal(lx, val.seqVal, fields, proto, computed, scope, alter, referencedAlters, referencedComputed, skipNameVal);
+    checkConsistentAttrVal(lx, val.keyVal, fields, proto, computed, scope, alter, referencedAlters, referencedComputed, skipNameVal);
   } else if (valName === "RequestVal") {
     if (scope.lookupRequest(val.name) === null) {
-      lx.warn(UNKNOWN_REQUEST_NAME, { name: val.name });
+      lx.error(UNKNOWN_REQUEST_NAME, { name: val.name });
     }
   } else if (valName === "TypeVal") {
     if (scope.lookupComponent(val.name) === null) {
-      lx.warn(UNKNOWN_COMPONENT_NAME, { name: val.name });
+      lx.error(UNKNOWN_COMPONENT_NAME, { name: val.name });
     }
   } else if (valName === "NameVal") {
-    if (!isKnownHandlerName(val.name)) {
-      lx.warn(UNKNOWN_HANDLER_ARG_NAME, { name: val.name });
+    if (!skipNameVal && !isKnownHandlerName(val.name)) {
+      lx.error(UNKNOWN_HANDLER_ARG_NAME, { name: val.name });
     }
   } else if (valName === "StrTplVal") {
     for (const subVal of val.vals) {
-      checkConsistentAttrVal(lx, subVal, fields, proto, computed, scope, alter, referencedAlters, referencedComputed);
+      checkConsistentAttrVal(lx, subVal, fields, proto, computed, scope, alter, referencedAlters, referencedComputed, skipNameVal);
     }
   } else if (valName === "AlterHandlerNameVal") {
     referencedAlters?.add(val.name);
     if (alter[val.name] === undefined) {
-      lx.warn(ALT_HANDLER_NOT_DEFINED, { name: val.name });
+      lx.error(ALT_HANDLER_NOT_DEFINED, { name: val.name });
     }
   } else if (valName !== "ConstVal" && valName !== "BindVal") {
     console.log(val);
@@ -2251,11 +2259,11 @@ function checkConsistentAttrs(lx, Comp, referencedAlters, referencedComputed) {
     lx.push({ viewName }, () => {
       const view = views[viewName];
       for (const attr of view.ctx.attrs) {
-        const { attrs, wrapperAttrs, textChild } = attr;
+        const { attrs, wrapperAttrs, textChild, isMacroCall } = attr;
         if (attrs?.constructor.name === "DynAttrs") {
           for (const attr2 of attrs.items) {
             if (attr2?.constructor.name === "Attr") {
-              checkConsistentAttrVal(lx, attr2.val, fields, proto, computed, scope, alter, referencedAlters, referencedComputed);
+              checkConsistentAttrVal(lx, attr2.val, fields, proto, computed, scope, alter, referencedAlters, referencedComputed, isMacroCall);
             }
           }
         }
@@ -2341,7 +2349,7 @@ 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", UNKNOWN_REQUEST_NAME = "UNKNOWN_REQUEST_NAME", UNKNOWN_COMPONENT_NAME = "UNKNOWN_COMPONENT_NAME", 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", 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 init_lint_check = __esm(() => {
   init_anode();
   NO_WRAPPERS = {};
@@ -2370,8 +2378,8 @@ var init_lint_check = __esm(() => {
       super(DOMParser, Text, Comment);
       this.attrs = [];
     }
-    onAttributes(attrs, wrapperAttrs, textChild) {
-      this.attrs.push({ attrs, wrapperAttrs, textChild });
+    onAttributes(attrs, wrapperAttrs, textChild, isMacroCall = false) {
+      this.attrs.push({ attrs, wrapperAttrs, textChild, isMacroCall });
     }
   };
 });
@@ -8589,7 +8597,7 @@ function pickFormatter(name) {
 async function formatResult(formatName, result, options = {}) {
   const f = pickFormatter(formatName);
   const kind = result.constructor.name;
-  if (!f.supports || !f.supports.has(kind)) {
+  if (!f.supports?.has(kind)) {
     throw new Error(`Formatter "${formatName}" does not support ${kind}`);
   }
   return await f.format(result, options);

package/dist/tutuca-dev.js

@@ -1053,7 +1053,7 @@ class ANode extends BaseNode {
         return px.frame.macroSlots[slotName] ?? maybeFragment(childs);
       }
       const [nAttrs, wrappers] = Attributes.parse(attrs, px, true);
-      px.onAttributes(nAttrs, wrappers, null);
+      px.onAttributes(nAttrs, wrappers, null, true);
       return wrap(px.newMacroNode(macroName, nAttrs.toMacroVars(), childs), px, wrappers);
     } else if (VALID_NODE_RE.test(tag)) {
       const [nAttrs, wrappers, textChild] = Attributes.parse(attrs, px);
@@ -1375,7 +1375,7 @@ class ParseContext {
   getNodeForId(id) {
     return this.nodes[id] ?? null;
   }
-  onAttributes(_attrs, _wrapperAttrs, _textChild) {}
+  onAttributes(_attrs, _wrapperAttrs, _textChild, _isMacroCall) {}
 }
 var isTextNodeAllBlanks = (n) => n instanceof TextNode && n.isWhiteSpace();
 var isFirstDomNode = (n) => n instanceof DomNode || n instanceof FragmentNode && n.childs[0] instanceof DomNode;
@@ -1568,6 +1568,7 @@ var COMPUTED_VAL_NOT_DEFINED = "COMPUTED_VAL_NOT_DEFINED";
 var COMPUTED_NOT_REFERENCED = "COMPUTED_NOT_REFERENCED";
 var UNKNOWN_REQUEST_NAME = "UNKNOWN_REQUEST_NAME";
 var UNKNOWN_COMPONENT_NAME = "UNKNOWN_COMPONENT_NAME";
+var UNKNOWN_MACRO_ARG = "UNKNOWN_MACRO_ARG";
 var LEVEL_WARN = "warn";
 var LEVEL_ERROR = "error";
 var LEVEL_HINT = "hint";
@@ -1591,6 +1592,21 @@ function checkView(lx, view, Comp, referencedAlters, referencedComputed) {
   checkRenderItInLoop(lx, view);
   checkEventModifiers(lx, view);
   checkKnownHandlerNames(lx, view, Comp, referencedAlters, referencedComputed);
+  checkMacroCallArgs(lx, view, Comp);
+}
+function checkMacroCallArgs(lx, view, Comp) {
+  const { scope } = Comp;
+  for (const macroNode of view.ctx.macroNodes) {
+    const macro = scope.lookupMacro(macroNode.name);
+    if (macro === null)
+      continue;
+    const { defaults } = macro;
+    for (const argName in macroNode.attrs) {
+      if (!(argName in defaults)) {
+        lx.error(UNKNOWN_MACRO_ARG, { name: argName, macroName: macroNode.name });
+      }
+    }
+  }
 }
 function checkRenderItInLoop(lx, view) {
   let hasRenderIt = false;
@@ -1641,7 +1657,7 @@ function checkEventModifiers(lx, view) {
       const modWrappers = MOD_WRAPPERS_BY_EVENT[name] ?? NO_WRAPPERS;
       for (const modifier of modifiers) {
         if (modWrappers[modifier] === undefined) {
-          lx.warn(UNKNOWN_EVENT_MODIFIER, { name, modifier, handler, event });
+          lx.error(UNKNOWN_EVENT_MODIFIER, { name, modifier, handler, event });
         }
       }
     }
@@ -1697,7 +1713,7 @@ function checkEventHandlersHaveImpls(lx, Comp, referencedInputs) {
           if (hvName === "InputHandlerNameVal") {
             referencedInputs?.add(handlerVal.name);
             if (input[handlerVal.name] === undefined) {
-              lx.warn(INPUT_HANDLER_NOT_IMPLEMENTED, {
+              lx.error(INPUT_HANDLER_NOT_IMPLEMENTED, {
                 name: handlerVal.name,
                 handler,
                 event
@@ -1713,7 +1729,7 @@ function checkEventHandlersHaveImpls(lx, Comp, referencedInputs) {
           } else if (hvName === "RawFieldVal") {
             referencedInputs?.add(handlerVal.name);
             if (proto[handlerVal.name] === undefined) {
-              lx.warn(INPUT_HANDLER_METHOD_NOT_IMPLEMENTED, {
+              lx.error(INPUT_HANDLER_METHOD_NOT_IMPLEMENTED, {
                 name: handlerVal.name,
                 handler,
                 event
@@ -1732,7 +1748,7 @@ function checkEventHandlersHaveImpls(lx, Comp, referencedInputs) {
     });
   }
 }
-function checkConsistentAttrVal(lx, val, fields, proto, computed, scope, alter, referencedAlters, referencedComputed) {
+function checkConsistentAttrVal(lx, val, fields, proto, computed, scope, alter, referencedAlters, referencedComputed, skipNameVal = false) {
   const valName = val?.constructor.name;
   if (valName === "FieldVal" || valName === "RawFieldVal") {
     const { name } = val;
@@ -1746,28 +1762,28 @@ function checkConsistentAttrVal(lx, val, fields, proto, computed, scope, alter,
       lx.error(COMPUTED_VAL_NOT_DEFINED, { val, name });
     }
   } else if (valName === "SeqAccessVal") {
-    checkConsistentAttrVal(lx, val.seqVal, fields, proto, computed, scope, alter, referencedAlters, referencedComputed);
-    checkConsistentAttrVal(lx, val.keyVal, fields, proto, computed, scope, alter, referencedAlters, referencedComputed);
+    checkConsistentAttrVal(lx, val.seqVal, fields, proto, computed, scope, alter, referencedAlters, referencedComputed, skipNameVal);
+    checkConsistentAttrVal(lx, val.keyVal, fields, proto, computed, scope, alter, referencedAlters, referencedComputed, skipNameVal);
   } else if (valName === "RequestVal") {
     if (scope.lookupRequest(val.name) === null) {
-      lx.warn(UNKNOWN_REQUEST_NAME, { name: val.name });
+      lx.error(UNKNOWN_REQUEST_NAME, { name: val.name });
     }
   } else if (valName === "TypeVal") {
     if (scope.lookupComponent(val.name) === null) {
-      lx.warn(UNKNOWN_COMPONENT_NAME, { name: val.name });
+      lx.error(UNKNOWN_COMPONENT_NAME, { name: val.name });
     }
   } else if (valName === "NameVal") {
-    if (!isKnownHandlerName(val.name)) {
-      lx.warn(UNKNOWN_HANDLER_ARG_NAME, { name: val.name });
+    if (!skipNameVal && !isKnownHandlerName(val.name)) {
+      lx.error(UNKNOWN_HANDLER_ARG_NAME, { name: val.name });
     }
   } else if (valName === "StrTplVal") {
     for (const subVal of val.vals) {
-      checkConsistentAttrVal(lx, subVal, fields, proto, computed, scope, alter, referencedAlters, referencedComputed);
+      checkConsistentAttrVal(lx, subVal, fields, proto, computed, scope, alter, referencedAlters, referencedComputed, skipNameVal);
     }
   } else if (valName === "AlterHandlerNameVal") {
     referencedAlters?.add(val.name);
     if (alter[val.name] === undefined) {
-      lx.warn(ALT_HANDLER_NOT_DEFINED, { name: val.name });
+      lx.error(ALT_HANDLER_NOT_DEFINED, { name: val.name });
     }
   } else if (valName !== "ConstVal" && valName !== "BindVal") {
     console.log(val);
@@ -1781,11 +1797,11 @@ function checkConsistentAttrs(lx, Comp, referencedAlters, referencedComputed) {
     lx.push({ viewName }, () => {
       const view = views[viewName];
       for (const attr of view.ctx.attrs) {
-        const { attrs, wrapperAttrs, textChild } = attr;
+        const { attrs, wrapperAttrs, textChild, isMacroCall } = attr;
         if (attrs?.constructor.name === "DynAttrs") {
           for (const attr2 of attrs.items) {
             if (attr2?.constructor.name === "Attr") {
-              checkConsistentAttrVal(lx, attr2.val, fields, proto, computed, scope, alter, referencedAlters, referencedComputed);
+              checkConsistentAttrVal(lx, attr2.val, fields, proto, computed, scope, alter, referencedAlters, referencedComputed, isMacroCall);
             }
           }
         }
@@ -1877,8 +1893,8 @@ class LintParseContext extends ParseContext {
     super(DOMParser, Text, Comment);
     this.attrs = [];
   }
-  onAttributes(attrs, wrapperAttrs, textChild) {
-    this.attrs.push({ attrs, wrapperAttrs, textChild });
+  onAttributes(attrs, wrapperAttrs, textChild, isMacroCall = false) {
+    this.attrs.push({ attrs, wrapperAttrs, textChild, isMacroCall });
   }
 }
 
@@ -1915,6 +1931,8 @@ function lintIdToMessage(id, info) {
       return `Alter handler '${info.name}' is not defined`;
     case "ALT_HANDLER_NOT_REFERENCED":
       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 "LINT_ERROR":
       return info.message;
     default:
@@ -8547,9 +8565,9 @@ class LintClassCollectorCtx extends ParseCtxClassSetCollector {
     v.attrs = this.attrs;
     return v;
   }
-  onAttributes(attrs, wrapperAttrs, textChild) {
-    super.onAttributes(attrs, wrapperAttrs, textChild);
-    this.attrs.push({ attrs, wrapperAttrs, textChild });
+  onAttributes(attrs, wrapperAttrs, textChild, isMacroCall = false) {
+    super.onAttributes(attrs, wrapperAttrs, textChild, isMacroCall);
+    this.attrs.push({ attrs, wrapperAttrs, textChild, isMacroCall });
   }
 }
 export {
@@ -8605,6 +8623,7 @@ export {
   checkComponent,
   check,
   UNKNOWN_REQUEST_NAME,
+  UNKNOWN_MACRO_ARG,
   UNKNOWN_HANDLER_ARG_NAME,
   UNKNOWN_EVENT_MODIFIER,
   UNKNOWN_COMPONENT_NAME,