@marko/compiler 5.39.4 → 5.39.6

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

@@ -204,7 +204,17 @@ Object.assign(_printer.default.prototype, {
       if (attributes.length) {
         if (tagName === "script") {
           for (let i = attributes.length; i--;) {
-            if (attributes[i].value.fromBody) {
+            const attr = attributes[i];
+            if (
+            attr.name === "value" && (
+            attr.value.type === "ArrowFunctionExpression" ||
+            attr.value.type === "FunctionExpression") &&
+            !(
+            attr.value.generator ||
+            attr.value.returnType ||
+            attr.value.typeParameters))
+
+            {
               bodyOverride = attributes[i].value.body.body;
               attributes = toSpliced(attributes, i);
               break;

package/dist/babel-utils/parse.js

@@ -75,7 +75,7 @@ function parseTemplateLiteral(file, str, sourceStart, sourceEnd) {
   );
 
   if (parsed.type === "TemplateLiteral") {
-    return parsed;
+    return _compiler.types.templateLiteral(parsed.quasis, parsed.expressions);
   }
 
   return ensureParseError(file, parsed, sourceStart, sourceEnd);
@@ -119,11 +119,19 @@ sourceOffset)
   const { parserOpts } = file.opts;
 
   if (typeof sourceStart === "number") {
-    const startIndex = sourceStart - (sourceOffset || 0);
-    const startLoc = (0, _loc.getLoc)(file, startIndex);
+    const startLoc = (0, _loc.getLoc)(file, sourceStart);
+    const startLine = startLoc.line;
+    let startIndex = sourceStart;
+    let startColumn = startLoc.column;
+
+    if (sourceOffset) {
+      startIndex -= sourceOffset;
+      startColumn -= sourceOffset;
+    }
+
+    parserOpts.startLine = startLine;
     parserOpts.startIndex = startIndex;
-    parserOpts.startColumn = startLoc.column;
-    parserOpts.startLine = startLoc.line;
+    parserOpts.startColumn = startColumn;
 
     try {
       return isExpression ?

package/dist/babel-utils/tags.js

@@ -319,7 +319,7 @@ function resolveMarkoFile(file, filename) {
 const idCache = new WeakMap();
 const templateIdHashOpts = { outputLength: 5 };
 function getTemplateId(opts, request, child) {
-  const id = (0, _path.relative)(ROOT, request);
+  const id = (0, _path.relative)(ROOT, request).replace(/[^a-zA-Z0-9_$./-]/g, "/");
   const optimize = typeof opts === "object" ? opts.optimize : opts;
 
   if (optimize) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.39.4",
+  "version": "5.39.6",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",
@@ -86,7 +86,7 @@
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
-    "marko": "^5.37.4"
+    "marko": "^5.37.7"
   },
   "publishConfig": {
     "access": "public"