@marko/compiler 5.39.66 → 5.40.0

package/dist/taglib/loader/loadTaglibFromProps.js

@@ -220,9 +220,8 @@ class TaglibLoader {
     // The "tags-dir" property is used to supporting scanning
     // of a directory to discover custom tags. Scanning a directory
     // is a much simpler way for a developer to create custom tags.
-    // Only one tag is allowed per directory and the directory name
-    // corresponds to the tag name. We only search for directories
-    // one level deep.
+    // Each tag is a file or directory named after the tag; non-tag
+    // directories are scanned one level deep for nested tags.
     var taglib = this.taglib;
     var path = this.filePath;
     var dirname = this.dirname;

package/dist/taglib/loader/scanTagsDir.js

@@ -33,6 +33,11 @@ const searchFiles = [
 { name: "transform", type: "transform" }];
 
 
+// Directories skipped when crawling groups for nested tags: dot-directories
+// (e.g. `.git`) and discovery-root folders (`tags`/`components`), which stay
+// private to their location (e.g. a nested `tags/tags`).
+const ignoredDirName = /^(?:\.|components$|tags$)/;
+
 function createDefaultTagDef() {
   return {
     attributes: {
@@ -106,6 +111,14 @@ function hasFile(tagDef) {
   return false;
 }
 
+function isDirectory(path) {
+  try {
+    return taglibConfig.fs.statSync(path).isDirectory();
+  } catch (_) {
+    return false;
+  }
+}
+
 /**
  * @param {String} tagsConfigPath path to tag definition file
  * @param {String} tagsConfigDirname path to directory of tags config file (should be path.dirname(tagsConfigPath))
@@ -120,9 +133,11 @@ taglib,
 dependencyChain)
 {
   let prefix;
+  let nested;
 
   if (typeof dir === "object") {
     prefix = dir.prefix;
+    nested = dir.nested;
     dir = dir.path;
   }
 
@@ -181,10 +196,26 @@ dependencyChain)
               ". Neither a renderer or a template was found for tag. " +
               JSON.stringify(tagDef, null, 2)
             );
-          } else {
-            // Skip this directory... there doesn't appear to be anything in it
-            continue;
           }
+
+          // Not a tag itself: crawl one level into grouping directories for
+          // nested tags. Dot-directories and `tags`/`components` folders are
+          // skipped so they stay private to their location.
+          if (
+          !nested &&
+          !ignoredDirName.test(childFilename) &&
+          isDirectory(tagDirname))
+          {
+            scanTagsDir(
+              tagsConfigPath,
+              tagsConfigDirname,
+              { path: tagDirname, prefix, nested: true },
+              taglib,
+              dependencyChain.append(childFilename)
+            );
+          }
+
+          continue;
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.39.66",
+  "version": "5.40.0",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",