@marko/compiler 5.33.7 → 5.34.0

package/dist/babel-plugin/index.js

@@ -396,4 +396,7 @@ function isMarkoOutput(output) {
 
 function finalizeMeta(meta) {
   meta.watchFiles = [...new Set(meta.watchFiles)];
+  if (meta.analyzedTags) {
+    meta.analyzedTags = [...new Set(meta.analyzedTags)];
+  }
 }

package/dist/babel-plugin/parser.js

@@ -208,7 +208,7 @@ function parseMarko(file) {
       );
     },
     onTagTypeParams(part) {
-      currentTag.node.typeParameters = (0, _babelUtils.parseTypeParams)(
+      currentBody.node.typeParameters = (0, _babelUtils.parseTypeParams)(
         file,
         parser.read(part.value),
         part.start,

package/dist/babel-types/generator/patch.js

@@ -193,12 +193,12 @@ Object.assign(_printer.default.prototype, {
       }
 
       if (node.body.params.length) {
-        if (node.typeParameters) {
+        if (node.body.typeParameters) {
           if (!node.typeArguments) {
             this.token(" ");
           }
           this.token("<");
-          this.printList(node.typeParameters.params, node);
+          this.printList(node.body.typeParameters.params, node);
           this.token(">");
         }
         this.token("|");

package/dist/babel-types/types/definitions.js

@@ -147,7 +147,7 @@ const MarkoDefinitions = {
   MarkoTagBody: {
     aliases: ["Marko", "BlockParent", "Scope"],
     builder: ["body", "params"],
-    visitor: ["params", "body"],
+    visitor: ["typeParameters", "params", "body"],
     fields: {
       params: {
         validate: (0, _utils.chain)(
@@ -156,6 +156,10 @@ const MarkoDefinitions = {
         ),
         default: []
       },
+      typeParameters: {
+        validate: (0, _utils.assertNodeType)("TSTypeParameterDeclaration"),
+        optional: true
+      },
       body: {
         validate: (0, _utils.arrayOfType)([
         "MarkoTag",
@@ -173,7 +177,14 @@ const MarkoDefinitions = {
   MarkoTag: {
     aliases: ["Marko", "Statement"],
     builder: ["name", "attributes", "body", "arguments", "var"],
-    visitor: ["name", "attributes", "body", "arguments", "var"],
+    visitor: [
+    "name",
+    "typeArguments",
+    "attributes",
+    "body",
+    "arguments",
+    "var"],
+
     fields: {
       name: {
         validate: (0, _utils.assertNodeType)("Expression")
@@ -193,17 +204,7 @@ const MarkoDefinitions = {
         optional: true
       },
       typeArguments: {
-        validate: (0, _utils.chain)(
-          (0, _utils.assertValueType)("array"),
-          (0, _utils.assertEach)((0, _utils.assertNodeType)("TypeAnnotation"))
-        ),
-        optional: true
-      },
-      typeParameters: {
-        validate: (0, _utils.chain)(
-          (0, _utils.assertValueType)("array"),
-          (0, _utils.assertEach)((0, _utils.assertNodeType)("TypeAnnotation"))
-        ),
+        validate: (0, _utils.assertNodeType)("TSTypeParameterInstantiation"),
         optional: true
       },
       rawValue: {

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/dist/types.d.ts

@@ -1720,6 +1720,7 @@ export interface MarkoTagBody extends BaseNode {
   type: "MarkoTagBody";
   body: Array<MarkoTag | MarkoCDATA | MarkoText | MarkoPlaceholder | MarkoScriptlet | MarkoComment>;
   params: Array<Identifier | Pattern | RestElement>;
+  typeParameters: TSTypeParameterDeclaration | null;
 }
 
 export interface MarkoTag extends BaseNode {
@@ -1730,8 +1731,7 @@ export interface MarkoTag extends BaseNode {
   arguments: Array<Expression | SpreadElement> | null;
   var: LVal | null;
   rawValue: string | null;
-  typeArguments: Array<TypeAnnotation> | null;
-  typeParameters: Array<TypeAnnotation> | null;
+  typeArguments: TSTypeParameterInstantiation | null;
 }
 
 /**

package/index.d.ts

@@ -26,6 +26,7 @@ export interface MarkoMeta {
   watchFiles: string[];
   tags?: string[];
   deps: Array<string | Dep | VirtualDep>;
+  analyzedTags?: [string, ...string[]];
   diagnostics: Diagnostic[];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.33.7",
+  "version": "5.34.0",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",
@@ -45,7 +45,7 @@
     "@babel/runtime": "^7.16.0",
     "@babel/traverse": "^7.16.0",
     "@babel/types": "^7.16.0",
-    "@marko/babel-utils": "^6.3.3",
+    "@marko/babel-utils": "^6.3.4",
     "complain": "^1.6.0",
     "he": "^1.2.0",
     "htmljs-parser": "^5.4.3",
@@ -61,7 +61,7 @@
     "strip-json-comments": "^3.1.1"
   },
   "devDependencies": {
-    "@marko/translator-default": "^5.31.7"
+    "@marko/translator-default": "^5.31.8"
   },
   "publishConfig": {
     "access": "public"