marko 4.24.4 → 4.24.6

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/taglib/taglib-finder/index.js

@@ -4,8 +4,6 @@ var taglibLoader = require("../taglib-loader");
 var nodePath = require("path");
 var lassoPackageRoot = require("lasso-package-root");
 var resolveFrom = require("resolve-from");
-var scanTagsDir = require("../taglib-loader/scanTagsDir");
-var DependencyChain = require("../taglib-loader/DependencyChain");
 var lassoCachingFS = require("lasso-caching-fs");
 
 var findCache = {};
@@ -70,9 +68,6 @@ function find(dirname, registeredTaglibs) {
   var added = {};
 
   var helper = {
-    alreadyAdded: function (taglibId) {
-      return added.hasOwnProperty(taglibId);
-    },
     addTaglib: function (taglib) {
       if (added[taglib.id]) {
         return;
@@ -106,10 +101,8 @@ function find(dirname, registeredTaglibs) {
       if (!taglib || taglib.tagsDir === undefined) {
         let componentsPath = nodePath.join(curDirname, "components");
 
-        if (existsCached(componentsPath) && !excludedDirs[componentsPath] && !helper.alreadyAdded(componentsPath)) {
-          let taglib = taglibLoader.createTaglib(componentsPath);
-          scanTagsDir(componentsPath, nodePath.dirname(componentsPath), "components", taglib, new DependencyChain([componentsPath]));
-          helper.addTaglib(taglib);
+        if (existsCached(componentsPath) && !excludedDirs[componentsPath]) {
+          helper.addTaglib(taglibLoader.loadTaglibFromDir(curDirname));
         }
       }
     }

package/dist/taglib/taglib-loader/index.js

@@ -12,6 +12,10 @@ function loadTaglibFromFile(filePath) {
   return loaders.loadTaglibFromFile(filePath);
 }
 
+function loadTaglibFromDir(filePath) {
+  return loaders.loadTaglibFromDir(filePath);
+}
+
 function clearCache() {
   cache.clear();
 }
@@ -30,4 +34,5 @@ exports.clearCache = clearCache;
 exports.createTaglib = createTaglib;
 exports.loadTaglibFromProps = loadTaglibFromProps;
 exports.loadTaglibFromFile = loadTaglibFromFile;
+exports.loadTaglibFromDir = loadTaglibFromDir;
 exports.loadTag = loadTag;

package/dist/taglib/taglib-loader/loadTaglibFromDir.js

@@ -0,0 +1,26 @@
+var nodePath = require("path");
+var types = require("./types");
+var cache = require("./cache");
+var DependencyChain = require("./DependencyChain");
+var scanTagsDir = require("./scanTagsDir");
+
+var ok = require("assert").ok;
+
+function loadFromDir(dir) {
+  ok(dir, '"dir" is required');
+
+  var componentsPath = nodePath.join(dir, "components");
+  var taglib = cache.get(componentsPath);
+
+  // Only load a taglib once by caching the loaded taglibs using the file
+  // system file path as the key
+  if (!taglib) {
+    taglib = new types.Taglib(componentsPath);
+    cache.put(componentsPath, taglib);
+    scanTagsDir(componentsPath, dir, "components", taglib, new DependencyChain([componentsPath]));
+  }
+
+  return taglib;
+}
+
+module.exports = loadFromDir;

package/dist/taglib/taglib-loader/loaders.js

@@ -18,6 +18,7 @@ exports.loadTagFromProps = require("./loadTagFromProps");
 exports.loadTagFromFile = require("./loadTagFromFile");
 exports.loadTaglibFromProps = require("./loadTaglibFromProps");
 exports.loadTaglibFromFile = require("./loadTaglibFromFile");
+exports.loadTaglibFromDir = require("./loadTaglibFromDir");
 exports.loadAttributes = require("./loadAttributes");
 exports.isSupportedAttributeProperty = isSupportedAttributeProperty;
 exports.isSupportedTagProperty = isSupportedTagProperty;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "marko",
-    "version": "4.24.4",
+    "version": "4.24.6",
     "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/taglib/taglib-finder/index.js

@@ -3,8 +3,6 @@ var taglibLoader = require("../taglib-loader");
 var nodePath = require("path");
 var lassoPackageRoot = require("lasso-package-root");
 var resolveFrom = require("resolve-from");
-var scanTagsDir = require("../taglib-loader/scanTagsDir");
-var DependencyChain = require("../taglib-loader/DependencyChain");
 var lassoCachingFS = require("lasso-caching-fs");
 
 var findCache = {};
@@ -69,9 +67,6 @@ function find(dirname, registeredTaglibs) {
   var added = {};
 
   var helper = {
-    alreadyAdded: function(taglibId) {
-      return added.hasOwnProperty(taglibId);
-    },
     addTaglib: function(taglib) {
       if (added[taglib.id]) {
         return;
@@ -105,20 +100,8 @@ function find(dirname, registeredTaglibs) {
       if (!taglib || taglib.tagsDir === undefined) {
         let componentsPath = nodePath.join(curDirname, "components");
 
-        if (
-          existsCached(componentsPath) &&
-          !excludedDirs[componentsPath] &&
-          !helper.alreadyAdded(componentsPath)
-        ) {
-          let taglib = taglibLoader.createTaglib(componentsPath);
-          scanTagsDir(
-            componentsPath,
-            nodePath.dirname(componentsPath),
-            "components",
-            taglib,
-            new DependencyChain([componentsPath])
-          );
-          helper.addTaglib(taglib);
+        if (existsCached(componentsPath) && !excludedDirs[componentsPath]) {
+          helper.addTaglib(taglibLoader.loadTaglibFromDir(curDirname));
         }
       }
     }

package/src/taglib/taglib-loader/index.js

@@ -12,6 +12,10 @@ function loadTaglibFromFile(filePath) {
   return loaders.loadTaglibFromFile(filePath);
 }
 
+function loadTaglibFromDir(filePath) {
+  return loaders.loadTaglibFromDir(filePath);
+}
+
 function clearCache() {
   cache.clear();
 }
@@ -34,4 +38,5 @@ exports.clearCache = clearCache;
 exports.createTaglib = createTaglib;
 exports.loadTaglibFromProps = loadTaglibFromProps;
 exports.loadTaglibFromFile = loadTaglibFromFile;
+exports.loadTaglibFromDir = loadTaglibFromDir;
 exports.loadTag = loadTag;

package/src/taglib/taglib-loader/loadTaglibFromDir.js

@@ -0,0 +1,32 @@
+var nodePath = require("path");
+var types = require("./types");
+var cache = require("./cache");
+var DependencyChain = require("./DependencyChain");
+var scanTagsDir = require("./scanTagsDir");
+
+var ok = require("assert").ok;
+
+function loadFromDir(dir) {
+  ok(dir, '"dir" is required');
+
+  var componentsPath = nodePath.join(dir, "components");
+  var taglib = cache.get(componentsPath);
+
+  // Only load a taglib once by caching the loaded taglibs using the file
+  // system file path as the key
+  if (!taglib) {
+    taglib = new types.Taglib(componentsPath);
+    cache.put(componentsPath, taglib);
+    scanTagsDir(
+      componentsPath,
+      dir,
+      "components",
+      taglib,
+      new DependencyChain([componentsPath])
+    );
+  }
+
+  return taglib;
+}
+
+module.exports = loadFromDir;

package/src/taglib/taglib-loader/loaders.js

@@ -18,6 +18,7 @@ exports.loadTagFromProps = require("./loadTagFromProps");
 exports.loadTagFromFile = require("./loadTagFromFile");
 exports.loadTaglibFromProps = require("./loadTaglibFromProps");
 exports.loadTaglibFromFile = require("./loadTaglibFromFile");
+exports.loadTaglibFromDir = require("./loadTaglibFromDir");
 exports.loadAttributes = require("./loadAttributes");
 exports.isSupportedAttributeProperty = isSupportedAttributeProperty;
 exports.isSupportedTagProperty = isSupportedTagProperty;