tutuca 0.9.65 → 0.9.67

package/dist/tutuca-dev.js

@@ -7935,49 +7935,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;
@@ -7991,19 +8009,17 @@ class Path {
     return Path.fromNodeAndEventName(target, type3, rNode, maxDepth, comps, stopOnNoEvent);
   }
 }
-var EMPTY_META = {};
-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) {
@@ -8824,40 +8840,49 @@ class RequestHandler {
 }
 
 // src/vdom.js
-var isHtmlAttribute = (propName) => propName[4] === "-" && (propName[0] === "d" || propName[0] === "a");
 var HTML_NS = "http://www.w3.org/1999/xhtml";
 var isNamespaced = (node) => {
   const ns = node.namespaceURI;
   return ns !== null && ns !== HTML_NS;
 };
-function applyProperties(node, props, previous) {
+var NEVER_ASSIGN = new Set([
+  "width",
+  "height",
+  "href",
+  "list",
+  "form",
+  "tabIndex",
+  "download",
+  "rowSpan",
+  "colSpan",
+  "role",
+  "popover"
+]);
+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 {
@@ -9129,22 +9154,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);
@@ -9499,6 +9514,7 @@ class RenderViewId extends ANode {
     super(nodeId, val);
     this.viewId = viewId;
   }
+  setDataAttr(_key, _val) {}
 }
 
 class RenderNode extends RenderViewId {
@@ -9575,6 +9591,7 @@ class RenderTextNode extends ANode {
   render(stack, _rx) {
     return this.val.eval(stack);
   }
+  setDataAttr(_key, _val) {}
 }
 
 class RenderOnceNode extends BaseNode {
@@ -12257,6 +12274,7 @@ var UNSUPPORTED_EXPR_SYNTAX = "UNSUPPORTED_EXPR_SYNTAX";
 var REDUNDANT_TEMPLATE_STRING = "REDUNDANT_TEMPLATE_STRING";
 var PLACEHOLDERLESS_TEMPLATE_STRING = "PLACEHOLDERLESS_TEMPLATE_STRING";
 var UNKNOWN_COMPONENT_SPEC_KEY = "UNKNOWN_COMPONENT_SPEC_KEY";
+var COMP_FIELD_BAD_SHAPE = "COMP_FIELD_BAD_SHAPE";
 var PARSE_ISSUE_KIND_TO_LINT_ID = {
   "unknown-directive": UNKNOWN_DIRECTIVE,
   "unknown-x-op": UNKNOWN_X_OP,
@@ -12341,6 +12359,7 @@ var UNSUPPORTED_EXPR_GUIDANCE = {
 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;
@@ -12769,6 +12788,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)) {
@@ -14930,7 +14974,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;
@@ -15564,6 +15613,7 @@ export {
   ComponentList,
   ComponentDocs,
   Collection,
+  COMP_FIELD_BAD_SHAPE,
   BAD_VALUE,
   ALT_HANDLER_NOT_REFERENCED,
   ALT_HANDLER_NOT_DEFINED