@marko/compiler 5.28.2 → 5.28.4

package/dist/babel-plugin/index.js

@@ -233,26 +233,6 @@ function getMarkoFile(code, fileOpts, markoOpts) {
   file.___compileStage = "migrate";
   traverseAll(file, rootMigrators);
 
-  const { applyFixes } = markoOpts;
-  if (applyFixes) {
-    for (let i = 0; i < meta.diagnostics.length; i++) {
-      const diag = meta.diagnostics[i];
-      if (diag.fix) {
-        if (applyFixes.has(i)) {
-          (typeof diag.fix === "function" ? diag.fix : diag.fix.apply)(
-          applyFixes.get(i));
-
-        }
-      }
-    }
-  } else {
-    for (const diag of meta.diagnostics) {
-      if (diag.fix) {
-        (typeof diag.fix === "function" ? diag.fix : diag.fix.apply)(undefined);
-      }
-    }
-  }
-
   if (isMigrate) {
     return file;
   }
@@ -385,29 +365,4 @@ function isMarkoOutput(output) {
 
 function finalizeMeta(meta) {
   meta.watchFiles = [...new Set(meta.watchFiles)];
-  meta.diagnostics = meta.diagnostics.map(
-  ({ type, label, loc, fix: rawFix }) => {
-    let fix = false;
-
-    switch (typeof rawFix) {
-      case "function":
-        fix = true;
-        break;
-      case "object":
-        // strip off the apply function.
-        ({
-          // eslint-disable-next-line no-empty-pattern
-          apply: {},
-          ...fix
-        } = rawFix);
-        break;}
-
-    return {
-      type,
-      label,
-      loc,
-      fix
-    };
-  });
-
 }

package/dist/index.js

@@ -124,7 +124,7 @@ function buildResult(src, filename, errorRecovery, babelResult) {
 
     for (const diag of meta.diagnostics) {
       if (diag.type === _babelUtils.DiagnosticType.Error) {
-        errors.push(diag);
+        errors.push((0, _buildCodeFrame.buildCodeFrameError)(filename, src, diag.loc, diag.label));
       }
     }
 
@@ -132,13 +132,12 @@ function buildResult(src, filename, errorRecovery, babelResult) {
       case 0:
         break;
       case 1:{
-          const [diag] = errors;
-          throw (0, _buildCodeFrame.buildCodeFrameError)(filename, src, diag.loc, diag.label);
+          throw errors[0];
         }
       default:{
           let err;
           const message = `${_kleur.default.red("AggregationError:")}\n${errors.
-          map((diag) => (0, _buildCodeFrame.buildCodeFrame)(filename, src, diag.loc, diag.label)).
+          map((err) => err.message).
           join("\n\n").
           replace(/^(?!\s*$)/gm, "\t")}\n`;
 

package/dist/util/build-code-frame.js

@@ -1,8 +1,33 @@
-"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.buildCodeFrame = buildCodeFrame;exports.buildCodeFrameError = buildCodeFrameError;var _path = _interopRequireDefault(require("path"));
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.buildCodeFrameError = buildCodeFrameError;var _path = _interopRequireDefault(require("path"));
 var _kleur = _interopRequireDefault(require("kleur"));
 var _codeFrame = require("@babel/code-frame");
 const CWD = process.cwd();
 
+function buildCodeFrameError(
+filename,
+code,
+loc,
+message,
+Error = SyntaxError)
+{
+  const err = new Error();
+  const codeFrame = buildCodeFrame(filename, code, loc, message);
+
+  err.loc = loc;
+  err.label = message;
+  err.stack = ""; // Avoid showing the stack trace for this error.
+
+  // Prevent babel from changing our error message.
+  Object.defineProperty(err, "message", {
+    get() {
+      return codeFrame;
+    },
+    set() {}
+  });
+
+  return err;
+}
+
 function buildCodeFrame(filename, code, loc, message) {
   return `${_kleur.default.cyan(_path.default.relative(CWD, filename))}${
   loc ?
@@ -27,28 +52,4 @@ function buildCodeFrame(filename, code, loc, message) {
   }` :
   `: ${message}`
   }`;
-}
-
-function buildCodeFrameError(
-filename,
-code,
-loc,
-message,
-Error = SyntaxError)
-{
-  const err = new Error();
-  const codeFrame = buildCodeFrame(filename, code, loc, message);
-
-  // Avoid showing the stack trace for this error.
-  err.stack = "";
-
-  // Prevent babel from changing our error message.
-  Object.defineProperty(err, "message", {
-    get() {
-      return codeFrame;
-    },
-    set() {}
-  });
-
-  return err;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/compiler",
   "description": "Marko template to JS compiler.",
-  "version": "5.28.2",
+  "version": "5.28.4",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md",
   "dependencies": {
@@ -15,7 +15,7 @@
     "@babel/runtime": "^7.16.0",
     "@babel/traverse": "^7.16.0",
     "@babel/types": "^7.16.0",
-    "@marko/babel-utils": "^5.22.0",
+    "@marko/babel-utils": "^5.22.1",
     "complain": "^1.6.0",
     "he": "^1.2.0",
     "htmljs-parser": "^5.4.3",
@@ -30,7 +30,7 @@
     "strip-json-comments": "^3.1.1"
   },
   "devDependencies": {
-    "@marko/translator-default": "^5.26.2"
+    "@marko/translator-default": "^5.26.4"
   },
   "files": [
     "dist",