@marko/compiler 5.34.0 → 5.34.2

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/babel-types/generator/patch.js

@@ -4,16 +4,6 @@ var t = _interopRequireWildcard(require("@babel/types"));
 var _selfClosingTags = _interopRequireDefault(require("self-closing-tags"));
 var _printer = _interopRequireDefault(require("@babel/generator/lib/printer"));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 UNENCLOSED_WHITESPACE_TYPES = [
-"LogicalExpression",
-"AssignmentExpression",
-"ConditionalExpression",
-"BinaryExpression",
-"NewExpression",
-"Function",
-"AssignmentExpression"];
-
-
 Object.assign(_printer.default.prototype, {
   MarkoParseError(node) {
     this.token(node.source);
@@ -61,7 +51,10 @@ Object.assign(_printer.default.prototype, {
 
     this.token(`${node.static ? "static" : "$"} `);
 
-    if (node.body.length === 1) {
+    if (
+    node.body.length === 1 &&
+    !statementCouldHaveUnenclosedNewline(node.body[0]))
+    {
       // TODO should determine if node has unenclosed newlines.
       this.print(node.body[0], node);
     } else {
@@ -242,7 +235,7 @@ function spaceSeparator() {
 }
 
 function printWithParansIfNeeded(value, parent) {
-  const needsParans = hasUnenclosedWhitespace(value);
+  const needsParans = expressionCouldHaveUnenclosedWhitespace(value);
 
   if (needsParans) {
     this.token("(");
@@ -255,6 +248,25 @@ function printWithParansIfNeeded(value, parent) {
   }
 }
 
-function hasUnenclosedWhitespace(node) {
-  return UNENCLOSED_WHITESPACE_TYPES.includes(node.type);
+function expressionCouldHaveUnenclosedWhitespace(node) {
+  switch (node.type) {
+    case "AssignmentExpression":
+    case "BinaryExpression":
+    case "ConditionalExpression":
+    case "Function":
+    case "LogicalExpression":
+    case "NewExpression":
+      return true;
+    default:
+      return false;
+  }
+}
+
+function statementCouldHaveUnenclosedNewline(node) {
+  switch (node.type) {
+    case "VariableDeclaration":
+      return node.declarations.length > 1;
+    default:
+      return false;
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.34.0",
+  "version": "5.34.2",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",
@@ -61,7 +61,7 @@
     "strip-json-comments": "^3.1.1"
   },
   "devDependencies": {
-    "@marko/translator-default": "^5.31.8"
+    "@marko/translator-default": "^5.31.9"
   },
   "publishConfig": {
     "access": "public"