tutuca 0.9.65 → 0.9.67

package/dist/tutuca-cli.js

@@ -4344,49 +4344,67 @@ class Path {
     let handlers = null;
     let nodeIds = [];
     let isLeafComponent = true;
+    const crossComponent = (cidNum, vid) => {
+      const comp = comps.getComponentForId(cidNum);
+      let pushStep = true;
+      if (handlers === null && (isLeafComponent || bubbles)) {
+        handlers = findHandlers(comp, eventIds, vid, eventName);
+        if (handlers === null) {
+          if (isLeafComponent && stopOnNoEvent && !bubbles)
+            return false;
+        } else if (!isLeafComponent) {
+          pathSteps.length = 0;
+          pendingDyns.length = 0;
+          pushStep = false;
+        }
+      }
+      isLeafComponent = false;
+      for (const dyn of pendingDyns)
+        dyn.interiorCids.add(cidNum);
+      if (pushStep) {
+        const step = resolvePathStep(comp, nodeIds, vid);
+        if (step) {
+          step._originCid = cidNum;
+          pathSteps.push(step);
+          if (step instanceof DynStep) {
+            step.interiorCids.add(cidNum);
+            pendingDyns.push(step);
+          }
+        }
+      }
+      for (let i = pendingDyns.length - 1;i >= 0; i--)
+        if (pendingDyns[i].producerCompId === cidNum)
+          pendingDyns.splice(i, 1);
+      eventIds = [];
+      nodeIds = [];
+      return true;
+    };
     while (node && node !== rootNode && depth < maxDepth) {
       if (node?.dataset) {
-        const { nid, si, sk } = parseMetaComment(node.previousSibling);
         const { eid, cid, vid } = node.dataset;
         if (eid !== undefined)
           eventIds.push(eid);
-        if (cid !== undefined) {
-          const cidNum = +cid;
-          const comp = comps.getComponentForId(cidNum);
-          let pushStep = true;
-          if (handlers === null && (isLeafComponent || bubbles)) {
-            handlers = findHandlers(comp, eventIds, vid, eventName);
-            if (handlers === null) {
-              if (isLeafComponent && stopOnNoEvent && !bubbles)
-                return NO_EVENT_INFO;
-            } else if (!isLeafComponent) {
-              pathSteps.length = 0;
-              pendingDyns.length = 0;
-              pushStep = false;
-            }
-          }
-          isLeafComponent = false;
-          for (const dyn of pendingDyns)
-            dyn.interiorCids.add(cidNum);
-          if (pushStep) {
-            const step = resolvePathStep(comp, nodeIds, vid);
-            if (step) {
-              step._originCid = cidNum;
-              pathSteps.push(step);
-              if (step instanceof DynStep) {
-                step.interiorCids.add(cidNum);
-                pendingDyns.push(step);
-              }
+        const metas = metaChain(node.previousSibling);
+        let sawComp = false;
+        for (let i = 0;i < metas.length; i++) {
+          const m = metas[i];
+          if (m.$ === "Comp") {
+            sawComp = true;
+            if (!crossComponent(m.cid, m.vid))
+              return NO_EVENT_INFO;
+            const outer = metas[i + 1];
+            if (outer?.$ === "Each" && outer.nid === m.nid) {
+              nodeIds.push({ nid: outer.nid, si: outer.si, sk: outer.sk });
+              i += 1;
+            } else {
+              nodeIds.push({ nid: m.nid });
             }
+          } else {
+            nodeIds.push({ nid: m.nid, si: m.si, sk: m.sk });
           }
-          for (let i = pendingDyns.length - 1;i >= 0; i--)
-            if (pendingDyns[i].producerCompId === cidNum)
-              pendingDyns.splice(i, 1);
-          eventIds = [];
-          nodeIds = [];
         }
-        if (nid !== undefined)
-          nodeIds.push({ nid, si, sk });
+        if (!sawComp && cid !== undefined && !crossComponent(+cid, vid))
+          return NO_EVENT_INFO;
       }
       depth += 1;
       node = node.parentNode;
@@ -4400,18 +4418,17 @@ class Path {
     return Path.fromNodeAndEventName(target, type, rNode, maxDepth, comps, stopOnNoEvent);
   }
 }
-function parseMetaComment(n) {
-  if (n?.nodeType === 8 && n.textContent[0] === "§") {
-    const m = parseMetaComment(n.previousSibling);
-    if (m !== EMPTY_META)
-      return m;
+function metaChain(n) {
+  const out = [];
+  while (n?.nodeType === 8 && n.textContent[0] === "§") {
     try {
-      return JSON.parse(n.textContent.slice(1, -1));
+      out.push(JSON.parse(n.textContent.slice(1, -1)));
     } catch (err) {
       console.warn(err, n);
     }
+    n = n.previousSibling;
   }
-  return EMPTY_META;
+  return out;
 }
 function findHandlers(comp, eventIds, vid, eventName) {
   for (const eid of eventIds) {
@@ -4486,7 +4503,7 @@ class PathBuilder {
     return this.add(new SeqStep(name, key));
   }
 }
-var NONE, BindStep, FieldStep, SeqStep, SeqAccessStep, EachBindStep, EachRenderItStep, DynStep, DynEachStep, EMPTY_META, NO_EVENT_INFO, BUBBLING_EVENTS;
+var NONE, BindStep, FieldStep, SeqStep, SeqAccessStep, EachBindStep, EachRenderItStep, DynStep, DynEachStep, NO_EVENT_INFO, BUBBLING_EVENTS;
 var init_path = __esm(() => {
   NONE = Symbol("NONE");
   BindStep = class BindStep extends Step {
@@ -4634,7 +4651,6 @@ var init_path = __esm(() => {
       return producerSteps.slice(0, -1).concat(new SeqStep(last.field, key));
     }
   };
-  EMPTY_META = {};
   NO_EVENT_INFO = [null, null];
   BUBBLING_EVENTS = new Set(["drop"]);
 });
@@ -5351,34 +5367,31 @@ var init_attribute = __esm(() => {
 });
 
 // src/vdom.js
-function applyProperties(node, props, previous) {
+function applyProperties(node, props, _previous) {
   const namespaced = isNamespaced(node);
-  for (const propName in props) {
-    const propValue = props[propName];
-    if (propValue === undefined)
-      removeProperty(node, propName, previous);
-    else if (propName === "dangerouslySetInnerHTML")
-      node.innerHTML = propValue.__html ?? "";
-    else if (propName === "className")
-      node.setAttribute("class", propValue);
-    else if (namespaced || isHtmlAttribute(propName))
-      node.setAttribute(propName, propValue);
+  for (const name in props)
+    setProp2(node, name, props[name], namespaced);
+}
+function setProp2(node, name, value, namespaced) {
+  if (name === "dangerouslySetInnerHTML") {
+    if (value === undefined)
+      node.replaceChildren();
     else
-      node[propName] = propValue;
-  }
-}
-function removeProperty(node, propName, previous) {
-  const previousValue = previous[propName];
-  if (propName === "dangerouslySetInnerHTML")
-    node.replaceChildren();
-  else if (propName === "className")
-    node.removeAttribute("class");
-  else if (propName === "htmlFor")
-    node.removeAttribute("for");
-  else if (isNamespaced(node) || typeof previousValue === "string" || isHtmlAttribute(propName))
-    node.removeAttribute(propName);
+      node.innerHTML = value.__html ?? "";
+    return;
+  }
+  if (typeof value === "function")
+    return;
+  if (!namespaced && !NEVER_ASSIGN.has(name) && name in node) {
+    try {
+      node[name] = value == null ? "" : value;
+      return;
+    } catch {}
+  }
+  if (value == null || value === false && name[4] !== "-")
+    node.removeAttribute(name);
   else
-    node[propName] = null;
+    node.setAttribute(name, value);
 }
 
 class VBase {
@@ -5548,22 +5561,12 @@ function h(tagName, properties, children, namespace) {
   if (properties) {
     for (const propName in properties) {
       const propVal = properties[propName];
-      switch (propName) {
-        case "key":
-          key = propVal;
-          break;
-        case "namespace":
-          namespace = namespace ?? propVal;
-          break;
-        case "class":
-          props.className = propVal;
-          break;
-        case "for":
-          props.htmlFor = propVal;
-          break;
-        default:
-          props[propName] = isHtmlAttribute(propName) ? String(propVal) : propVal;
-      }
+      if (propName === "key")
+        key = propVal;
+      else if (propName === "namespace")
+        namespace = namespace ?? propVal;
+      else
+        props[propName] = propVal;
     }
   }
   const c = tagName.charCodeAt(0);
@@ -5572,11 +5575,24 @@ function h(tagName, properties, children, namespace) {
   addChild(normalizedChildren, children);
   return new VNode2(tag, props, normalizedChildren, key, namespace);
 }
-var isHtmlAttribute = (propName) => propName[4] === "-" && (propName[0] === "d" || propName[0] === "a"), HTML_NS = "http://www.w3.org/1999/xhtml", isNamespaced = (node) => {
+var HTML_NS = "http://www.w3.org/1999/xhtml", isNamespaced = (node) => {
   const ns = node.namespaceURI;
   return ns !== null && ns !== HTML_NS;
-}, getKey = (child) => child instanceof VNode2 ? child.key : undefined, isIterable = (obj) => obj != null && typeof obj !== "string" && typeof obj[Symbol.iterator] === "function", VText, VComment, VFragment, VNode2;
+}, NEVER_ASSIGN, getKey = (child) => child instanceof VNode2 ? child.key : undefined, isIterable = (obj) => obj != null && typeof obj !== "string" && typeof obj[Symbol.iterator] === "function", VText, VComment, VFragment, VNode2;
 var init_vdom = __esm(() => {
+  NEVER_ASSIGN = new Set([
+    "width",
+    "height",
+    "href",
+    "list",
+    "form",
+    "tabIndex",
+    "download",
+    "rowSpan",
+    "colSpan",
+    "role",
+    "popover"
+  ]);
   VText = class VText extends VBase {
     constructor(text) {
       super();
@@ -6177,6 +6193,7 @@ var init_anode = __esm(() => {
       super(nodeId, val);
       this.viewId = viewId;
     }
+    setDataAttr(_key, _val) {}
   };
   RenderNode = class RenderNode extends RenderViewId {
     render(stack, rx) {
@@ -6249,6 +6266,7 @@ var init_anode = __esm(() => {
     render(stack, _rx) {
       return this.val.eval(stack);
     }
+    setDataAttr(_key, _val) {}
   };
   RenderOnceNode = class RenderOnceNode extends BaseNode {
     constructor(node) {
@@ -8662,6 +8680,7 @@ function classifyBadValue(value) {
 function checkComponent(Comp, lx = new LintContext, { wellKnownExtras = EMPTY_SET2 } = {}) {
   return lx.push({ componentName: Comp.name }, () => {
     checkUnknownSpecKeys(lx, Comp, wellKnownExtras);
+    checkFieldDeclarations(lx, Comp);
     const referencedAlters = new Set;
     const referencedInputs = new Set;
     const referencedDynamics = new Set;
@@ -9056,6 +9075,31 @@ function checkUnknownSpecKeys(lx, Comp, wellKnownExtras) {
     lx.warn(UNKNOWN_COMPONENT_SPEC_KEY, { key }, replaceNameSuggestion(key, candidates));
   }
 }
+function checkFieldDeclarations(lx, Comp) {
+  const fields = Comp.Class?.getMetaClass?.().fields;
+  if (!fields)
+    return;
+  for (const fieldName in fields) {
+    const field = fields[fieldName];
+    if (!Object.hasOwn(field, "args"))
+      continue;
+    if (typeof field.type !== "string") {
+      lx.error(COMP_FIELD_BAD_SHAPE, {
+        fieldName,
+        kind: "component-not-string",
+        got: typeof field.type,
+        gotName: field.type?.name ?? null
+      });
+    }
+    if (field.args == null || field.args.constructor !== Object) {
+      lx.error(COMP_FIELD_BAD_SHAPE, {
+        fieldName,
+        kind: "args-not-object",
+        got: field.args === null ? "null" : typeof field.args
+      });
+    }
+  }
+}
 function checkUnreferencedAlterHandlers(lx, Comp, referencedAlters) {
   for (const name in Comp.alter) {
     if (!referencedAlters.has(name)) {
@@ -9106,7 +9150,7 @@ class LintContext {
     this.reports.push({ id, info, level, context: { ...this.frame }, suggestion });
   }
 }
-var KNOWN_COMPONENT_SPEC_KEYS, EMPTY_SET2, KNOWN_DIRECTIVE_NAMES, ALT_HANDLER_NOT_DEFINED = "ALT_HANDLER_NOT_DEFINED", ALT_HANDLER_NOT_REFERENCED = "ALT_HANDLER_NOT_REFERENCED", DYN_VAL_NOT_DEFINED = "DYN_VAL_NOT_DEFINED", DYN_ALIAS_NOT_REFERENCED = "DYN_ALIAS_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", FIELD_VAL_IS_METHOD = "FIELD_VAL_IS_METHOD", METHOD_VAL_NOT_DEFINED = "METHOD_VAL_NOT_DEFINED", METHOD_VAL_IS_FIELD = "METHOD_VAL_IS_FIELD", DUPLICATE_ATTR_DEFINITION = "DUPLICATE_ATTR_DEFINITION", IF_NO_BRANCH_SET = "IF_NO_BRANCH_SET", 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", UNSUPPORTED_EXPR_SYNTAX = "UNSUPPORTED_EXPR_SYNTAX", REDUNDANT_TEMPLATE_STRING = "REDUNDANT_TEMPLATE_STRING", PLACEHOLDERLESS_TEMPLATE_STRING = "PLACEHOLDERLESS_TEMPLATE_STRING", UNKNOWN_COMPONENT_SPEC_KEY = "UNKNOWN_COMPONENT_SPEC_KEY", PARSE_ISSUE_KIND_TO_LINT_ID, X_KNOWN_OP_NAMES, X_KNOWN_ATTR_NAMES, AT_PREFIX_HINT_KNOWN_BY_KIND, LEVEL_WARN2 = "warn", LEVEL_ERROR2 = "error", LEVEL_HINT = "hint", PARSE_ISSUE_KIND_TO_KNOWN_NAMES, UNSUPPORTED_EXPR_GUIDANCE, HTML_LINT_OPTS, NO_WRAPPERS, KNOWN_HANDLER_NAMES, NODE_KIND_TO_CTX, LintParseContext;
+var KNOWN_COMPONENT_SPEC_KEYS, EMPTY_SET2, KNOWN_DIRECTIVE_NAMES, ALT_HANDLER_NOT_DEFINED = "ALT_HANDLER_NOT_DEFINED", ALT_HANDLER_NOT_REFERENCED = "ALT_HANDLER_NOT_REFERENCED", DYN_VAL_NOT_DEFINED = "DYN_VAL_NOT_DEFINED", DYN_ALIAS_NOT_REFERENCED = "DYN_ALIAS_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", FIELD_VAL_IS_METHOD = "FIELD_VAL_IS_METHOD", METHOD_VAL_NOT_DEFINED = "METHOD_VAL_NOT_DEFINED", METHOD_VAL_IS_FIELD = "METHOD_VAL_IS_FIELD", DUPLICATE_ATTR_DEFINITION = "DUPLICATE_ATTR_DEFINITION", IF_NO_BRANCH_SET = "IF_NO_BRANCH_SET", 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", UNSUPPORTED_EXPR_SYNTAX = "UNSUPPORTED_EXPR_SYNTAX", REDUNDANT_TEMPLATE_STRING = "REDUNDANT_TEMPLATE_STRING", PLACEHOLDERLESS_TEMPLATE_STRING = "PLACEHOLDERLESS_TEMPLATE_STRING", UNKNOWN_COMPONENT_SPEC_KEY = "UNKNOWN_COMPONENT_SPEC_KEY", COMP_FIELD_BAD_SHAPE = "COMP_FIELD_BAD_SHAPE", PARSE_ISSUE_KIND_TO_LINT_ID, X_KNOWN_OP_NAMES, X_KNOWN_ATTR_NAMES, AT_PREFIX_HINT_KNOWN_BY_KIND, LEVEL_WARN2 = "warn", LEVEL_ERROR2 = "error", LEVEL_HINT = "hint", PARSE_ISSUE_KIND_TO_KNOWN_NAMES, UNSUPPORTED_EXPR_GUIDANCE, HTML_LINT_OPTS, NO_WRAPPERS, KNOWN_HANDLER_NAMES, NODE_KIND_TO_CTX, LintParseContext;
 var init_lint_check = __esm(() => {
   init_anode();
   init_htmllinter();
@@ -9406,6 +9450,12 @@ var init_lint_rules = __esm(() => {
       level: "warn",
       group: "Component spec",
       summary: "`component({...})` has an unrecognized key; its value is ignored at runtime."
+    },
+    {
+      code: COMP_FIELD_BAD_SHAPE,
+      level: "error",
+      group: "Component field declarations",
+      summary: "`fields: { x: { component, args } }` shape is wrong: `component` must be a string and `args` must be a plain object."
     }
   ];
 });
@@ -14192,7 +14242,12 @@ class Renderer {
     if (cachedNode)
       return cachedNode;
     const view = viewName ? comp.getView(viewName) : stack.lookupBestView(comp.views, "main");
-    const meta = this._renderMetadata({ $: "Comp", nid: node?.nodeId ?? null });
+    const meta = this._renderMetadata({
+      $: "Comp",
+      nid: node?.nodeId ?? null,
+      cid: comp.id,
+      vid: view.name
+    });
     const dom = new VFragment([meta, this.renderView(view, stack)]);
     this.cache.set(cachePath, cacheKey, dom);
     return dom;