@marko/compiler 5.33.8 → 5.34.1

package/dist/babel-plugin/parser.js

@@ -203,16 +203,16 @@ function parseMarko(file) {
       currentTag.node.typeArguments = (0, _babelUtils.parseTypeArgs)(
         file,
         parser.read(part.value),
-        part.start,
-        part.end
+        part.value.start,
+        part.value.end
       );
     },
     onTagTypeParams(part) {
       currentBody.node.typeParameters = (0, _babelUtils.parseTypeParams)(
         file,
         parser.read(part.value),
-        part.start,
-        part.end
+        part.value.start,
+        part.value.end
       );
     },
     onPlaceholder(part) {

package/dist/taglib/finder/index.js

@@ -120,7 +120,7 @@ function find(dirname, registeredTaglibs) {
           nodePath.join(name, "marko.json")
         );
         if (taglibPath) {
-          var taglib = taglibLoader.loadTaglibFromFile(taglibPath);
+          var taglib = taglibLoader.loadTaglibFromFile(taglibPath, true);
           helper.addTaglib(taglib);
         }
       }

package/dist/taglib/loader/Taglib.js

@@ -26,9 +26,10 @@ function handleImport(taglib, importedTaglib) {
 }
 
 class Taglib {
-  constructor(filePath) {
+  constructor(filePath, isFromPackageJson) {
     ok(filePath, '"filePath" expected');
     this.filePath = this.path /* deprecated */ = this.id = filePath;
+    this.isFromPackageJson = isFromPackageJson === true;
     this.dirname = path.dirname(this.filePath);
     this.scriptLang = undefined;
     this.tags = {};

package/dist/taglib/loader/index.js

@@ -8,8 +8,8 @@ function loadTaglibFromProps(taglib, taglibProps) {
   return loaders.loadTaglibFromProps(taglib, taglibProps);
 }
 
-function loadTaglibFromFile(filePath) {
-  return loaders.loadTaglibFromFile(filePath);
+function loadTaglibFromFile(filePath, isFromPackageJson) {
+  return loaders.loadTaglibFromFile(filePath, isFromPackageJson);
 }
 
 function loadTaglibFromDir(filePath) {

package/dist/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/dist/taglib/loader/loadTaglibFromProps.js

@@ -252,6 +252,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) {
     // The "taglib-imports" property allows another taglib to be imported
     // into this taglib so that the tags defined in the imported taglib

package/package.json

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