@marko/compiler 5.33.0 → 5.33.2

package/dist/taglib/index.js

@@ -25,19 +25,19 @@ function buildLookup(dirname, requestedTranslator, onError) {
   const translator = (0, _tryLoadTranslator.default)(requestedTranslator);
   if (!translator || !Array.isArray(translator.taglibs)) {
     throw new Error(
-    "@marko/compiler: Invalid translator provided to buildLookup(dir, translator)");
-
+      "@marko/compiler: Invalid translator provided to buildLookup(dir, translator)"
+    );
   }
 
   let taglibsForDir = loadedTranslatorsTaglibs.get(translator);
 
   if (!taglibsForDir) {
     loadedTranslatorsTaglibs.set(
-    translator,
-    taglibsForDir = registeredTaglibs.concat(
-    translator.taglibs.map(([id, props]) => loadTaglib(id, props))));
-
-
+      translator,
+      taglibsForDir = registeredTaglibs.concat(
+        translator.taglibs.map(([id, props]) => loadTaglib(id, props))
+      )
+    );
   }
 
   if (onError) {
@@ -89,8 +89,8 @@ function register(id, props) {
         if (!id.endsWith(".json")) {
           id = _path.default.join(id, "marko.json");
         }
-        break;}
-
+        break;
+    }
     id = _modules.default.require.resolve(id);
     props = _modules.default.require(id);
   }

package/dist/taglib/loader/Taglib.js

@@ -47,8 +47,8 @@ class Taglib {
 
     if (!attribute.pattern && !attribute.name) {
       throw new Error(
-      "Invalid attribute: " + require("util").inspect(attribute));
-
+        "Invalid attribute: " + require("util").inspect(attribute)
+      );
     }
 
     this.attributes[attribute.key] = attribute;

package/dist/taglib/loader/index.js

@@ -27,10 +27,10 @@ function createTaglib(filePath) {
 function loadTag(tagProps, filePath) {
   var tag = new types.Tag(filePath);
   loaders.loadTagFromProps(
-  tag,
-  tagProps,
-  new DependencyChain(filePath ? [filePath] : []));
-
+    tag,
+    tagProps,
+    new DependencyChain(filePath ? [filePath] : [])
+  );
   return tag;
 }
 

package/dist/taglib/loader/json-file-reader.js

@@ -10,7 +10,7 @@ exports.readFileSync = function (path) {
     return taglibProps;
   } catch (e) {
     throw new Error(
-    'Unable to parse JSON file at path "' + path + '". Error: ' + e);
-
+      'Unable to parse JSON file at path "' + path + '". Error: ' + e
+    );
   }
 };

package/dist/taglib/loader/loadAttributeFromProps.js

@@ -223,14 +223,14 @@ function loadAttributeFromProps(attrName, attrProps, dependencyChain) {
     attrLoader.load(attrProps);
   } catch (err) {
     throw createError(
-    'Unable to load attribute "' +
-    attrName +
-    '" (' +
-    dependencyChain +
-    "): " +
-    err,
-    err);
-
+      'Unable to load attribute "' +
+      attrName +
+      '" (' +
+      dependencyChain +
+      "): " +
+      err,
+      err
+    );
   }
 
   return attr;

package/dist/taglib/loader/loadAttributes.js

@@ -8,10 +8,10 @@ module.exports = function loadAttributes(value, parent, dependencyChain) {
   for (const attrName in value) {
     const attrProps = value[attrName];
     var attr = loaders.loadAttributeFromProps(
-    attrName,
-    attrProps,
-    dependencyChain.append("@" + attrName));
-
+      attrName,
+      attrProps,
+      dependencyChain.append("@" + attrName)
+    );
 
     parent.addAttribute(attr);
   }

package/dist/taglib/loader/loadTagFromProps.js

@@ -16,6 +16,24 @@ function resolveRelative(dirname, value) {
   return value[0] === "." ? resolveFrom(dirname, value) : value;
 }
 
+function resolveWithMarkoExt(dirname, value) {
+  if (value[0] !== ".") return value;
+
+  if (
+  markoModules.require.extensions &&
+  !(".marko" in markoModules.require.extensions))
+  {
+    markoModules.require.extensions[".marko"] = undefined;
+    try {
+      return resolveFrom(dirname, value);
+    } finally {
+      delete markoModules.require.extensions[".marko"];
+    }
+  }
+
+  return resolveFrom(dirname, value);
+}
+
 function removeDashes(str) {
   return str.replace(/-([a-z])/g, function (match, lower) {
     return lower.toUpperCase();
@@ -95,25 +113,25 @@ class TagLoader {
       nestedVariable = {};
 
       propertyHandlers(
-      value,
-      {
-        name: function (value) {
-          nestedVariable.name = value;
+        value,
+        {
+          name: function (value) {
+            nestedVariable.name = value;
+          },
+
+          nameFromAttribute: function (value) {
+            nestedVariable.nameFromAttribute = value;
+          }
         },
-
-        nameFromAttribute: function (value) {
-          nestedVariable.nameFromAttribute = value;
-        }
-      },
-      dependencyChain.toString());
-
+        dependencyChain.toString()
+      );
 
       if (!nestedVariable.name && !nestedVariable.nameFromAttribute) {
         throw new Error(
-        'The "name" or "name-from-attribute" attribute is required for a nested variable (' +
-        dependencyChain +
-        ")");
-
+          'The "name" or "name-from-attribute" attribute is required for a nested variable (' +
+          dependencyChain +
+          ")"
+        );
       }
     }
 
@@ -203,8 +221,8 @@ class TagLoader {
       // with the user's taglib.
       if (!isObjectEmpty(value)) {
         throw new Error(
-        "Unsupported properties of [" + Object.keys(value).join(", ") + "]");
-
+          "Unsupported properties of [" + Object.keys(value).join(", ") + "]"
+        );
       }
 
       var type = attrProps.type;
@@ -238,10 +256,10 @@ class TagLoader {
         var attrName = part.substring(1);
 
         var attr = loaders.loadAttributeFromProps(
-        attrName,
-        attrProps,
-        dependencyChain.append(part));
-
+          attrName,
+          attrProps,
+          dependencyChain.append(part)
+        );
 
         tag.addAttribute(attr);
       } else if (part.startsWith("<")) {
@@ -269,10 +287,10 @@ class TagLoader {
 
         if (!nestedTag.isRepeated) {
           let attr = loaders.loadAttributeFromProps(
-          nestedTag.targetProperty,
-          { type: "object" },
-          dependencyChain.append(part));
-
+            nestedTag.targetProperty,
+            { type: "object" },
+            dependencyChain.append(part)
+          );
 
           tag.addAttribute(attr);
         }
@@ -300,7 +318,7 @@ class TagLoader {
    * @param {String} value The renderer path
    */
   renderer(value) {
-    this.tag.renderer = resolveRelative(this.dirname, value);
+    this.tag.renderer = resolveWithMarkoExt(this.dirname, value);
   }
 
   /**
@@ -347,10 +365,10 @@ class TagLoader {
     var tag = this.tag;
 
     loaders.loadAttributes(
-    value,
-    tag,
-    this.dependencyChain.append("attributes"));
-
+      value,
+      tag,
+      this.dependencyChain.append("attributes")
+    );
   }
 
   /**
@@ -474,24 +492,21 @@ class TagLoader {
     for (const nestedTagName in value) {
       const nestedTagDef = value[nestedTagName];
       var dependencyChain = this.dependencyChain.append(
-      `nestedTags["${nestedTagName}"]`);
-
+        `nestedTags["${nestedTagName}"]`
+      );
       var nestedTag = new types.Tag(filePath);
 
       loadTagFromProps(nestedTag, nestedTagDef, dependencyChain);
 
       nestedTag.name = nestedTagName;
       tag.addNestedTag(nestedTag);
-
-      if (!nestedTag.isRepeated) {
-        let attr = loaders.loadAttributeFromProps(
-        nestedTag.targetProperty,
-        { type: "object" },
-        dependencyChain);
-
-
-        tag.addAttribute(attr);
-      }
+      tag.addAttribute(
+        loaders.loadAttributeFromProps(
+          nestedTag.targetProperty,
+          { type: "expression" },
+          dependencyChain
+        )
+      );
     }
   }
 
@@ -555,9 +570,9 @@ function loadTagFromProps(tag, tagProps, dependencyChain) {
     tagLoader.load(tagProps);
   } catch (err) {
     throw createError(
-    "Unable to load tag (" + dependencyChain + "): " + err,
-    err);
-
+      "Unable to load tag (" + dependencyChain + "): " + err,
+      err
+    );
   }
 
   return tag;

package/dist/taglib/loader/loadTaglibFromDir.js

@@ -18,12 +18,12 @@ function loadFromDir(dir) {
     taglib = new types.Taglib(componentsPath);
     cache.put(componentsPath, taglib);
     scanTagsDir(
-    componentsPath,
-    dir,
-    "components",
-    taglib,
-    new DependencyChain([componentsPath]));
-
+      componentsPath,
+      dir,
+      "components",
+      taglib,
+      new DependencyChain([componentsPath])
+    );
   }
 
   return taglib;

package/dist/taglib/loader/loadTaglibFromProps.js

@@ -43,9 +43,9 @@ function normalizeHook(dirname, value) {
 class TaglibLoader {
   constructor(taglib, dependencyChain) {
     ok(
-    dependencyChain instanceof DependencyChain,
-    '"dependencyChain" is not valid');
-
+      dependencyChain instanceof DependencyChain,
+      '"dependencyChain" is not valid'
+    );
 
     this.dependencyChain = dependencyChain;
 
@@ -101,12 +101,12 @@ class TaglibLoader {
         taglibFS.fs.statSync(tagFilePath);
       } catch (_) {
         throw new Error(
-        'Tag at path "' +
-        tagFilePath +
-        '" does not exist. (' +
-        dependencyChain +
-        ")");
-
+          'Tag at path "' +
+          tagFilePath +
+          '" does not exist. (' +
+          dependencyChain +
+          ")"
+        );
       }
 
       tag = new types.Tag(tagFilePath);
@@ -140,10 +140,10 @@ class TaglibLoader {
       var attrKey = name.substring(1);
 
       var attr = loaders.loadAttributeFromProps(
-      attrKey,
-      value,
-      this.dependencyChain.append("@" + attrKey));
-
+        attrKey,
+        value,
+        this.dependencyChain.append("@" + attrKey)
+      );
 
       attr.filePath = filePath;
       attr.key = attrKey;
@@ -174,10 +174,10 @@ class TaglibLoader {
       var attrDef = value[attrName];
 
       var attr = loaders.loadAttributeFromProps(
-      attrName,
-      attrDef,
-      this.dependencyChain.append("@" + attrName));
-
+        attrName,
+        attrDef,
+        this.dependencyChain.append("@" + attrName)
+      );
 
       attr.key = attrName;
 
@@ -203,10 +203,10 @@ class TaglibLoader {
     for (var tagName in tags) {
       if (hasOwnProperty.call(tags, tagName)) {
         this._handleTag(
-        tagName,
-        tags[tagName],
-        this.dependencyChain.append("tags." + tagName));
-
+          tagName,
+          tags[tagName],
+          this.dependencyChain.append("tags." + tagName)
+        );
       }
     }
   }
@@ -233,21 +233,21 @@ class TaglibLoader {
       if (Array.isArray(dir)) {
         for (var i = 0; i < dir.length; i++) {
           scanTagsDir(
-          path,
-          dirname,
-          dir[i],
-          taglib,
-          this.dependencyChain.append(`tags-dir[${i}]`));
-
+            path,
+            dirname,
+            dir[i],
+            taglib,
+            this.dependencyChain.append(`tags-dir[${i}]`)
+          );
         }
       } else {
         scanTagsDir(
-        path,
-        dirname,
-        dir,
-        taglib,
-        this.dependencyChain.append(`tags-dir`));
-
+          path,
+          dirname,
+          dir,
+          taglib,
+          this.dependencyChain.append(`tags-dir`)
+        );
       }
     }
   }
@@ -281,9 +281,9 @@ class TaglibLoader {
                 var dependencyName = dependencyNames[j];
 
                 importPath = resolveFrom(
-                packageDir,
-                nodePath.join(dependencyName, "marko.json"));
-
+                  packageDir,
+                  nodePath.join(dependencyName, "marko.json")
+                );
 
                 if (importPath) {
                   taglib.addImport(importPath);
@@ -296,8 +296,8 @@ class TaglibLoader {
               taglib.addImport(importPath);
             } else {
               throw new Error(
-              "Import not found: " + curImport + " (from " + dirname + ")");
-
+                "Import not found: " + curImport + " (from " + dirname + ")"
+              );
             }
           }
         }
@@ -379,10 +379,10 @@ class TaglibLoader {
         var rawAttrDef = rawAttrGroup[attrName];
 
         let attr = loaders.loadAttributeFromProps(
-        attrName,
-        rawAttrDef,
-        attrGroupDependencyChain.append("@" + attrName));
-
+          attrName,
+          rawAttrDef,
+          attrGroupDependencyChain.append("@" + attrName)
+        );
 
         attrGroup[attrName] = attr;
       });
@@ -405,9 +405,9 @@ function loadTaglibFromProps(taglib, taglibProps, dependencyChain) {
     taglibLoader.load(taglibProps);
   } catch (err) {
     throw createError(
-    "Unable to load taglib (" + dependencyChain + "): " + err,
-    err);
-
+      "Unable to load taglib (" + dependencyChain + "): " + err,
+      err
+    );
   }
 
   return taglib;

package/dist/taglib/loader/property-handlers.js

@@ -54,11 +54,11 @@ module.exports = function invokeHandlers(config, handlers, path) {
           badProperty += "/" + JSON.stringify(keyNoDashes);
         }
         error(
-        "Invalid option of " +
-        badProperty +
-        ". Allowed: " +
-        Object.keys(handlers).join(", "));
-
+          "Invalid option of " +
+          badProperty +
+          ". Allowed: " +
+          Object.keys(handlers).join(", ")
+        );
       }
 
       try {

package/dist/taglib/loader/scanTagsDir.js

@@ -176,11 +176,11 @@ dependencyChain)
         if (!fileWasSet) {
           if (hasTagJson) {
             throw new Error(
-            "Invalid tag file: " +
-            tagJsonPath +
-            ". Neither a renderer or a template was found for tag. " +
-            JSON.stringify(tagDef, null, 2));
-
+              "Invalid tag file: " +
+              tagJsonPath +
+              ". 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;