marko 4.24.2 → 4.24.5

package/dist/compiler/Normalizer.js

@@ -104,8 +104,16 @@ class Normalizer {
     try {
       if (elNode.rawTagNameExpression) {
         tagName = builder.parseExpression(elNode.rawTagNameExpression);
-      } else if (context.ignoreUnrecognizedTags && !elNode.parentNode.tagDef && !elNode.parentNode.rawTagNameExpression) {
-        tagName = tagName.replace(/^@/, "at_"); // escapes @tags inside unrecognized tags
+      } else if (context.ignoreUnrecognizedTags && tagName[0] === "@") {
+        let owner = elNode.parentNode;
+
+        while (owner && /^(?:for|while|if|else(?:-if))$/.test(owner.tagName)) {
+          owner = owner.parentNode;
+        }
+
+        if (!owner || !(owner.rawTagNameExpression || owner.tagDef)) {
+          tagName = "at_" + tagName.slice(1); // escapes @tags inside unrecognized tags
+        }
       }
     } catch (e) {
       const type = elNode.rawTagNameExpression === "()" ? "Missing" : "Invalid";

package/dist/runtime/components/event-delegation.js

@@ -74,16 +74,6 @@ function addDelegatedEventHandlerToDoc(eventType, doc) {
   var listeners = doc[listenersAttachedKey] = doc[listenersAttachedKey] || {};
   if (!listeners[eventType]) {
     body.addEventListener(eventType, listeners[eventType] = function (event) {
-      var propagationStopped = false;
-
-      // Monkey-patch to fix #97
-      var oldStopPropagation = event.stopPropagation;
-
-      event.stopPropagation = function () {
-        oldStopPropagation.call(event);
-        propagationStopped = true;
-      };
-
       var curNode = event.target;
       if (!curNode) {
         return;
@@ -106,15 +96,29 @@ function addDelegatedEventHandlerToDoc(eventType, doc) {
       // Attributes will have the following form:
       // on<event_type>("<target_method>|<component_id>")
 
-      do {
-        if (target = getEventFromEl(curNode, propName)) {
-          delegateEvent(curNode, propName, target, event);
+      if (event.bubbles) {
+        var propagationStopped = false;
+
+        // Monkey-patch to fix #97
+        var oldStopPropagation = event.stopPropagation;
 
-          if (propagationStopped) {
-            break;
+        event.stopPropagation = function () {
+          oldStopPropagation.call(event);
+          propagationStopped = true;
+        };
+
+        do {
+          if (target = getEventFromEl(curNode, propName)) {
+            delegateEvent(curNode, propName, target, event);
+
+            if (propagationStopped) {
+              break;
+            }
           }
-        }
-      } while ((curNode = curNode.parentNode) && curNode.getAttribute);
+        } while ((curNode = curNode.parentNode) && curNode.getAttribute);
+      } else if (target = getEventFromEl(curNode, propName)) {
+        delegateEvent(curNode, propName, target, event);
+      }
     }, true);
   }
 }

package/dist/runtime/html/AsyncStream.js

@@ -211,7 +211,7 @@ var proto = AsyncStream.prototype = {
       timeout = AsyncStream.DEFAULT_TIMEOUT;
     }
 
-    newStream._stack = AsyncStream.INCLUDE_STACK ? getNonMarkoStack(new Error()) : null;
+    newStream._stack = AsyncStream.INCLUDE_STACK ? new Error() : null;
     newStream.name = name;
 
     if (timeout > 0) {
@@ -437,6 +437,7 @@ var proto = AsyncStream.prototype = {
   error: function (e) {
     var name = this.name;
     var stack = this._stack;
+    if (stack) stack = getNonMarkoStack(stack);
 
     if (!(e instanceof Error)) {
       e = new Error(JSON.stringify(e));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "marko",
-    "version": "4.24.2",
+    "version": "4.24.5",
     "license": "MIT",
     "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
     "dependencies": {

package/src/compiler/Normalizer.js

@@ -122,12 +122,16 @@ class Normalizer {
     try {
       if (elNode.rawTagNameExpression) {
         tagName = builder.parseExpression(elNode.rawTagNameExpression);
-      } else if (
-        context.ignoreUnrecognizedTags &&
-        !elNode.parentNode.tagDef &&
-        !elNode.parentNode.rawTagNameExpression
-      ) {
-        tagName = tagName.replace(/^@/, "at_"); // escapes @tags inside unrecognized tags
+      } else if (context.ignoreUnrecognizedTags && tagName[0] === "@") {
+        let owner = elNode.parentNode;
+
+        while (owner && /^(?:for|while|if|else(?:-if))$/.test(owner.tagName)) {
+          owner = owner.parentNode;
+        }
+
+        if (!owner || !(owner.rawTagNameExpression || owner.tagDef)) {
+          tagName = "at_" + tagName.slice(1); // escapes @tags inside unrecognized tags
+        }
       }
     } catch (e) {
       const type = elNode.rawTagNameExpression === "()" ? "Missing" : "Invalid";

package/src/runtime/components/event-delegation.js

@@ -79,16 +79,6 @@ function addDelegatedEventHandlerToDoc(eventType, doc) {
     body.addEventListener(
       eventType,
       (listeners[eventType] = function(event) {
-        var propagationStopped = false;
-
-        // Monkey-patch to fix #97
-        var oldStopPropagation = event.stopPropagation;
-
-        event.stopPropagation = function() {
-          oldStopPropagation.call(event);
-          propagationStopped = true;
-        };
-
         var curNode = event.target;
         if (!curNode) {
           return;
@@ -111,15 +101,29 @@ function addDelegatedEventHandlerToDoc(eventType, doc) {
         // Attributes will have the following form:
         // on<event_type>("<target_method>|<component_id>")
 
-        do {
-          if ((target = getEventFromEl(curNode, propName))) {
-            delegateEvent(curNode, propName, target, event);
+        if (event.bubbles) {
+          var propagationStopped = false;
+
+          // Monkey-patch to fix #97
+          var oldStopPropagation = event.stopPropagation;
 
-            if (propagationStopped) {
-              break;
+          event.stopPropagation = function() {
+            oldStopPropagation.call(event);
+            propagationStopped = true;
+          };
+
+          do {
+            if ((target = getEventFromEl(curNode, propName))) {
+              delegateEvent(curNode, propName, target, event);
+
+              if (propagationStopped) {
+                break;
+              }
             }
-          }
-        } while ((curNode = curNode.parentNode) && curNode.getAttribute);
+          } while ((curNode = curNode.parentNode) && curNode.getAttribute);
+        } else if ((target = getEventFromEl(curNode, propName))) {
+          delegateEvent(curNode, propName, target, event);
+        }
       }),
       true
     );

package/src/runtime/html/AsyncStream.js

@@ -215,9 +215,7 @@ var proto = (AsyncStream.prototype = {
       timeout = AsyncStream.DEFAULT_TIMEOUT;
     }
 
-    newStream._stack = AsyncStream.INCLUDE_STACK
-      ? getNonMarkoStack(new Error())
-      : null;
+    newStream._stack = AsyncStream.INCLUDE_STACK ? new Error() : null;
     newStream.name = name;
 
     if (timeout > 0) {
@@ -451,6 +449,7 @@ var proto = (AsyncStream.prototype = {
   error: function(e) {
     var name = this.name;
     var stack = this._stack;
+    if (stack) stack = getNonMarkoStack(stack);
 
     if (!(e instanceof Error)) {
       e = new Error(JSON.stringify(e));