@marko/compiler 5.33.4 → 5.33.5

package/dist/babel-plugin/parser.js

@@ -1,6 +1,6 @@
 "use strict";exports.__esModule = true;exports.parseMarko = parseMarko;var _htmljsParser = require("htmljs-parser");
 var t = _interopRequireWildcard(require("../babel-types"));
-var _babelUtils = require("@marko/babel-utils");function _getRequireWildcardCache(nodeInterop) {if (typeof WeakMap !== "function") return null;var cacheBabelInterop = new WeakMap();var cacheNodeInterop = new WeakMap();return (_getRequireWildcardCache = function (nodeInterop) {return nodeInterop ? cacheNodeInterop : cacheBabelInterop;})(nodeInterop);}function _interopRequireWildcard(obj, nodeInterop) {if (!nodeInterop && obj && obj.__esModule) {return obj;}if (obj === null || typeof obj !== "object" && typeof obj !== "function") {return { default: obj };}var cache = _getRequireWildcardCache(nodeInterop);if (cache && cache.has(obj)) {return cache.get(obj);}var newObj = {};var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;for (var key in obj) {if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;if (desc && (desc.get || desc.set)) {Object.defineProperty(newObj, key, desc);} else {newObj[key] = obj[key];}}}newObj.default = obj;if (cache) {cache.set(obj, newObj);}return newObj;}
+var _babelUtils = require("@marko/babel-utils");
 
 
 
@@ -9,6 +9,7 @@ var _babelUtils = require("@marko/babel-utils");function _getRequireWildcardCach
 
 
 
+var _parse = require("@marko/babel-utils/src/parse");function _getRequireWildcardCache(nodeInterop) {if (typeof WeakMap !== "function") return null;var cacheBabelInterop = new WeakMap();var cacheNodeInterop = new WeakMap();return (_getRequireWildcardCache = function (nodeInterop) {return nodeInterop ? cacheNodeInterop : cacheBabelInterop;})(nodeInterop);}function _interopRequireWildcard(obj, nodeInterop) {if (!nodeInterop && obj && obj.__esModule) {return obj;}if (obj === null || typeof obj !== "object" && typeof obj !== "function") {return { default: obj };}var cache = _getRequireWildcardCache(nodeInterop);if (cache && cache.has(obj)) {return cache.get(obj);}var newObj = {};var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;for (var key in obj) {if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;if (desc && (desc.get || desc.set)) {Object.defineProperty(newObj, key, desc);} else {newObj[key] = obj[key];}}}newObj.default = obj;if (cache) {cache.set(obj, newObj);}return newObj;}
 
 const noop = () => {};
 const emptyRange = (part) => part.start === part.end;
@@ -197,6 +198,22 @@ function parseMarko(file) {
     onComment(part) {
       pushContent(withLoc(t.markoComment(parser.read(part.value)), part));
     },
+    onTagTypeArgs(part) {
+      currentTag.node.typeArguments = (0, _parse.parseTypeArgs)(
+        file,
+        parser.read(part.value),
+        part.start,
+        part.end
+      );
+    },
+    onTagTypeParams(part) {
+      currentTag.node.typeParameters = (0, _parse.parseTypeParams)(
+        file,
+        parser.read(part.value),
+        part.start,
+        part.end
+      );
+    },
     onPlaceholder(part) {
       pushContent(
         withLoc(

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

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

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

@@ -192,6 +192,20 @@ 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"))
+        ),
+        optional: true
+      },
       rawValue: {
         validate: (0, _utils.assertValueType)("string"),
         optional: true

package/dist/types.d.ts

@@ -1730,6 +1730,8 @@ export interface MarkoTag extends BaseNode {
   arguments: Array<Expression | SpreadElement> | null;
   var: LVal | null;
   rawValue: string | null;
+  typeArguments: Array<TypeAnnotation> | null;
+  typeParameters: Array<TypeAnnotation> | null;
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.33.4",
+  "version": "5.33.5",
   "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.0",
+    "@marko/babel-utils": "^6.3.2",
     "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.4"
+    "@marko/translator-default": "^5.31.5"
   },
   "publishConfig": {
     "access": "public"