@marko/translator-default 6.0.10 → 6.0.12

package/dist/tag/attribute/directives/class.js

@@ -19,7 +19,7 @@ var _withPreviousLocation = _interopRequireDefault(require("../../../util/with-p
       } else {
         value.parentPath.remove();
       }
-    } else {
+    } else if (!value.isTemplateLiteral()) {
       value.replaceWith(
         (0, _withPreviousLocation.default)(
           _compiler.types.callExpression(

package/dist/tag/attribute/directives/style.js

@@ -19,7 +19,7 @@ var _withPreviousLocation = _interopRequireDefault(require("../../../util/with-p
       } else {
         value.parentPath.remove();
       }
-    } else {
+    } else if (!value.isTemplateLiteral()) {
       value.replaceWith(
         (0, _withPreviousLocation.default)(
           _compiler.types.callExpression(

package/dist/tag/native-tag[html]/attributes.js

@@ -1,6 +1,11 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = _default;var _babelUtils = require("@marko/babel-utils");
+
+
+
+
 var _compiler = require("@marko/compiler");
 var _attr = _interopRequireDefault(require("marko/src/runtime/html/helpers/attr"));
+var _escapeQuotes = require("marko/src/runtime/html/helpers/escape-quotes");
 
 var _util = require("../util");
 
@@ -94,6 +99,32 @@ function _default(path, attrs) {
       }
 
       curString += (0, _attr.default)(name, computed);
+    } else if (value.type === "TemplateLiteral") {
+      curString += " " + name + '="';
+
+      for (let i = 0; i < value.expressions.length; i++) {
+        const quasi = value.quasis[i];
+        const expression = value.expressions[i];
+        curString += (0, _escapeQuotes.d)(quasi.value.cooked);
+        quasis.push(curString);
+        curString = "";
+        expressions.push(
+          _compiler.types.callExpression(
+            (0, _babelUtils.importNamed)(
+              file,
+              "marko/src/runtime/html/helpers/escape-quotes.js",
+              "d",
+              "marko_escape_double_quotes"
+            ),
+            [expression]
+          )
+        );
+      }
+
+      curString +=
+      (0, _escapeQuotes.d)(
+        value.quasis[value.expressions.length].value.cooked
+      ) + '"';
     } else {
       quasis.push(curString);
       curString = "";

package/dist/taglib/core/translate-html-comment.js

@@ -3,8 +3,11 @@
 
 
 
+var _compiler = require("@marko/compiler");
 
 var _htmlOutWrite = _interopRequireDefault(require("../../util/html-out-write"));
+var _vdomOutWrite = _interopRequireDefault(require("../../util/vdom-out-write"));
+var _withPreviousLocation = _interopRequireDefault(require("../../util/with-previous-location"));
 
 function enter(path) {
   (0, _babelUtils.assertNoArgs)(path);
@@ -12,8 +15,38 @@ function enter(path) {
   (0, _babelUtils.assertNoAttributes)(path);
 
   if (path.hub.file.markoOpts.output === "html") {
-    path.replaceWithMultiple([(0, _htmlOutWrite.default)`<!--`, ...path.node.body.body, (0, _htmlOutWrite.default)`-->`]);
+    path.replaceWithMultiple([
+    (0, _htmlOutWrite.default)`<!--`,
+    ...path.node.body.body,
+    (0, _htmlOutWrite.default)`-->`]
+    );
   } else {
-    path.remove();
+    const templateQuasis = [];
+    const templateExpressions = [];
+    let currentQuasi = "";
+    for (const child of path.node.body.body) {
+      if (_compiler.types.isMarkoText(child)) {
+        currentQuasi += child.value;
+      } else if (_compiler.types.isMarkoPlaceholder(child)) {
+        templateQuasis.push(_compiler.types.templateElement({ raw: currentQuasi }));
+        templateExpressions.push(child.value);
+        currentQuasi = "";
+      }
+    }
+
+    let value;
+    if (templateExpressions.length === 0) {
+      value = _compiler.types.stringLiteral(currentQuasi);
+    } else {
+      templateQuasis.push(_compiler.types.templateElement({ raw: currentQuasi }));
+      value = _compiler.types.templateLiteral(templateQuasis, templateExpressions);
+    }
+
+    path.replaceWith(
+      (0, _withPreviousLocation.default)(
+        (0, _vdomOutWrite.default)("comment", value, path.hub.file._componentInstanceIdentifier),
+        path.node
+      )
+    );
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/translator-default",
-  "version": "6.0.10",
+  "version": "6.0.12",
   "description": "Translates Marko templates to the default Marko runtime.",
   "keywords": [
     "babel",
@@ -34,8 +34,8 @@
     "self-closing-tags": "^1.0.1"
   },
   "devDependencies": {
-    "@marko/compiler": "^5.37.8",
-    "marko": "^5.35.12"
+    "@marko/compiler": "^5.37.10",
+    "marko": "^5.35.15"
   },
   "peerDependencies": {
     "@marko/compiler": "^5.16.1",