marko 4.26.5 → 4.28.0

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

@@ -78,7 +78,7 @@ function addTransformer(tagLoader, value) {
             properties[k] = value[k];
           }
         }
-      }
+      },
     },
     tagLoader.dependencyChain.append("transformer")
   );
@@ -113,8 +113,8 @@ class TagLoader {
         "*": {
           type: "string",
           targetProperty: null,
-          preserveName: false
-        }
+          preserveName: false,
+        },
       };
     }
 
@@ -128,7 +128,7 @@ class TagLoader {
 
     if (typeof value === "string") {
       nestedVariable = {
-        name: value
+        name: value,
       };
     } else {
       nestedVariable = {};
@@ -142,7 +142,7 @@ class TagLoader {
 
           nameFromAttribute: function (value) {
             nestedVariable.nameFromAttribute = value;
-          }
+          },
         },
         dependencyChain.toString()
       );
@@ -255,15 +255,15 @@ class TagLoader {
     } else if (typeof value === "string") {
       if (hasNestedTag && hasAttr) {
         tagProps = attrProps = {
-          type: value
+          type: value,
         };
       } else if (hasNestedTag) {
         tagProps = {
-          type: value
+          type: value,
         };
       } else {
         attrProps = {
-          type: value
+          type: value,
         };
       }
     }
@@ -444,14 +444,14 @@ class TagLoader {
       // so treat the value as the path to the JS
       // module for the transformer
       value = {
-        path: value
+        path: value,
       };
 
       addTransformer(this, value);
     } else if (Array.isArray(value)) {
-      value.forEach(transformerPath => {
+      value.forEach((transformerPath) => {
         value = {
-          path: transformerPath
+          path: transformerPath,
         };
 
         addTransformer(this, value);
@@ -480,7 +480,7 @@ class TagLoader {
    */
   var(value) {
     complain("var is deprecated. Use tag parameters instead.", {
-      location: this.filePath
+      location: this.filePath,
     });
     this._handleVar(value, this.dependencyChain.append("var"));
   }
@@ -491,7 +491,7 @@ class TagLoader {
    */
   vars(value) {
     complain("vars is deprecated. Use tag parameters instead.", {
-      location: this.filePath
+      location: this.filePath,
     });
     if (value) {
       value.forEach((v, i) => {
@@ -510,6 +510,10 @@ class TagLoader {
    * - "body-function": "_handleBody(param1, param2, param3)"
    */
   bodyFunction(value) {
+    complain("body-function is deprecated.", {
+      location: this.filePath,
+    });
+
     var tag = this.tag;
     var parts = bodyFunctionRegExp.exec(value);
     if (!parts) {
@@ -557,10 +561,14 @@ class TagLoader {
    * }
    */
   importVar(value) {
+    complain("import-var is deprecated.", {
+      location: this.filePath,
+    });
+
     var tag = this.tag;
     forEachEntry(value, (varName, varValue) => {
       var importedVar = {
-        targetProperty: varName
+        targetProperty: varName,
       };
 
       var expression = varValue;
@@ -644,6 +652,10 @@ class TagLoader {
    * DEPRECATED
    */
   escapeXmlBody(value) {
+    complain("escape-xml-body is deprecated.", {
+      location: this.filePath,
+    });
+
     if (value === false) {
       this.tag.escapeXmlBody = false;
     }
@@ -724,6 +736,9 @@ class TagLoader {
   }
 
   featureFlags(value) {
+    complain("feature-flags is deprecated.", {
+      location: this.filePath,
+    });
     this.tag.featureFlags = value;
   }
 }

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

@@ -5,7 +5,7 @@ var loaders = require("./loaders");
 
 var ok = require("assert").ok;
 
-function loadFromFile(filePath) {
+function loadFromFile(filePath, isFromPackageJson) {
   ok(filePath, '"filePath" is required');
 
   var taglib = cache.get(filePath);
@@ -13,7 +13,7 @@ function loadFromFile(filePath) {
   // 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(filePath);
+    taglib = new types.Taglib(filePath, isFromPackageJson);
     cache.put(filePath, taglib);
 
     var taglibProps = jsonFileReader.readFileSync(filePath);

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

@@ -35,7 +35,7 @@ function addTransformer(taglibLoader, value) {
       path(value) {
         const path = markoModules.resolveFrom(dirname, value);
         transformer.path = path;
-      }
+      },
     },
     taglibLoader.dependencyChain.append("transformer").toString()
   );
@@ -182,7 +182,7 @@ class TaglibLoader {
     // }
     var taglib = this.taglib;
 
-    Object.keys(value).forEach(attrName => {
+    Object.keys(value).forEach((attrName) => {
       var attrDef = value[attrName];
 
       var attr = loaders.loadAttributeFromProps(
@@ -258,6 +258,24 @@ class TaglibLoader {
     }
   }
 
+  exports(dir) {
+    var taglib = this.taglib;
+    var path = this.filePath;
+    var dirname = this.dirname;
+
+    if (taglib.isFromPackageJson) {
+      taglib.tagsDir = false;
+
+      scanTagsDir(
+        path,
+        dirname,
+        dir,
+        taglib,
+        this.dependencyChain.append(`exports`)
+      );
+    }
+  }
+
   taglibImports(imports) {
     if (!resolveFrom) {
       return;
@@ -336,7 +354,7 @@ class TaglibLoader {
 
     if (typeof value === "string") {
       value = {
-        path: value
+        path: value,
       };
     }
 
@@ -346,7 +364,7 @@ class TaglibLoader {
         path(value) {
           var path = markoModules.resolveFrom(dirname, value);
           transformer.path = path;
-        }
+        },
       },
       this.dependencyChain.append("textTransformer").toString()
     );
@@ -381,14 +399,14 @@ class TaglibLoader {
       // so treat the value as the path to the JS
       // module for the transformer
       value = {
-        path: value
+        path: value,
       };
 
       addTransformer(this, value);
     } else if (Array.isArray(value)) {
-      value.forEach(transformerPath => {
+      value.forEach((transformerPath) => {
         value = {
-          path: transformerPath
+          path: transformerPath,
         };
 
         addTransformer(this, value);
@@ -404,13 +422,13 @@ class TaglibLoader {
       taglib.attributeGroups || (taglib.attributeGroups = {});
     let dependencyChain = this.dependencyChain.append("attribute-groups");
 
-    Object.keys(value).forEach(attrGroupName => {
+    Object.keys(value).forEach((attrGroupName) => {
       let attrGroup = (attributeGroups[attrGroupName] = {});
       let attrGroupDependencyChain = dependencyChain.append(attrGroupName);
 
       let rawAttrGroup = value[attrGroupName];
 
-      Object.keys(rawAttrGroup).forEach(attrName => {
+      Object.keys(rawAttrGroup).forEach((attrName) => {
         var rawAttrDef = rawAttrGroup[attrName];
 
         let attr = loaders.loadAttributeFromProps(

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

@@ -14,7 +14,7 @@ const tagFileTypes = [
   "renderer",
   "transformer",
   "code-generator",
-  "node-factory"
+  "node-factory",
 ];
 
 const searchFiles = [
@@ -25,7 +25,7 @@ const searchFiles = [
   { name: "template.html", type: "template" },
   { name: "code-generator", type: "code-generator" },
   { name: "node-factory", type: "node-factory" },
-  { name: "transformer", type: "transformer" }
+  { name: "transformer", type: "transformer" },
 ];
 
 function createDefaultTagDef() {
@@ -34,9 +34,9 @@ function createDefaultTagDef() {
       "*": {
         type: "string",
         targetProperty: null,
-        preserveName: false
-      }
-    }
+        preserveName: false,
+      },
+    },
   };
 }
 
@@ -44,7 +44,7 @@ function getFileMap(dirname) {
   let fileMap = {};
   let files = fs.readdirSync(dirname);
 
-  files.forEach(file => {
+  files.forEach((file) => {
     let extName = nodePath.extname(file);
     let baseName = file.slice(0, -1 * extName.length);
     let fullPath = nodePath.join(dirname, file);

package/src/taglib/taglib-lookup/TaglibLookup.js

@@ -76,7 +76,7 @@ function merge(target, source) {
 class TaglibLookup {
   constructor() {
     this.merged = {
-      attributeGroups: {}
+      attributeGroups: {},
     };
     this.taglibsById = {};
     this._inputFiles = null;
@@ -136,7 +136,7 @@ class TaglibLookup {
       textTransformers: taglib.textTransformers,
       attributes: taglib.attributes,
       patternAttributes: taglib.patternAttributes,
-      attributeGroups: taglib.attributeGroups || {}
+      attributeGroups: taglib.attributeGroups || {},
     });
 
     this._mergeNestedTags(taglib);
@@ -147,7 +147,7 @@ class TaglibLookup {
 
     if (sortedTags === undefined) {
       sortedTags = this._sortedTags = [];
-      this.forEachTag(tag => {
+      this.forEachTag((tag) => {
         sortedTags.push(tag);
       });
       sortedTags.sort(TAG_COMPARATOR);
@@ -228,7 +228,7 @@ class TaglibLookup {
   getTag(element) {
     if (typeof element === "string") {
       element = {
-        tagName: element
+        tagName: element,
       };
     }
     var tags = this.merged.tags;
@@ -243,13 +243,13 @@ class TaglibLookup {
   getAttribute(element, attr) {
     if (typeof element === "string") {
       element = {
-        tagName: element
+        tagName: element,
       };
     }
 
     if (typeof attr === "string") {
       attr = {
-        name: attr
+        name: attr,
       };
     }
 
@@ -332,7 +332,7 @@ class TaglibLookup {
   forEachTagMigrator(element, callback, thisObj) {
     if (typeof element === "string") {
       element = {
-        tagName: element
+        tagName: element,
       };
     }
 
@@ -394,7 +394,7 @@ class TaglibLookup {
   forEachTagTransformer(element, callback, thisObj) {
     if (typeof element === "string") {
       element = {
-        tagName: element
+        tagName: element,
       };
     }