@marko/compiler 5.30.1 → 5.30.3

package/dist/babel-plugin/file.js

@@ -6,13 +6,7 @@ class MarkoFile extends _core.File {
     throw new Error("addHelper is not supported during a Marko transform");
   }
 
-  buildCodeFrameError(node, msg, Error) {
-    return (0, _buildCodeFrame.buildCodeFrameError)(
-    this.opts.filename,
-    this.code,
-    node.loc,
-    msg,
-    Error);
-
+  buildCodeFrameError(node, msg) {
+    return (0, _buildCodeFrame.buildCodeFrameError)(this.opts.filename, this.code, node.loc, msg);
   }
 }exports.MarkoFile = MarkoFile;

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

@@ -2,38 +2,61 @@
 var _kleur = _interopRequireDefault(require("kleur"));
 var _codeFrame = require("@babel/code-frame");
 const CWD = process.cwd();
+const indent = "    ";
 
-function buildCodeFrameError(
-filename,
-code,
-loc,
-message,
-Error = SyntaxError)
-{
-  const err = new Error();
-  const codeFrame = buildCodeFrame(filename, code, loc, message);
+class CompileError extends Error {
+  constructor(filename, code, loc, message) {
+    super();
+    const prettyMessage = buildMessage(code, loc, message);
+    const prettyFileName = buildFileName(filename, loc);
+    this.stack = loc ?
+    `CompileError\n${indent}at ${prettyFileName}\n${prettyMessage.replace(
+    /^/gm,
+    indent)
+    }` :
+    `CompileError: ${prettyMessage}\n${indent}at ${prettyFileName}`;
 
-  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() {}
-  });
+    Object.defineProperties(this, {
+      loc: {
+        value: loc,
+        enumerable: false,
+        writable: true,
+        configurable: true
+      },
+      label: {
+        value: message,
+        enumerable: false,
+        writable: true,
+        configurable: true
+      },
+      // Ignore some mutations from Babel.
+      code: {
+        enumerable: false,
+        configurable: true,
+        get() {
+          return undefined;
+        },
+        set() {}
+      },
+      message: {
+        configurable: true,
+        enumerable: false,
+        get() {
+          return `${prettyFileName}: ${message}`;
+        },
+        set() {}
+      }
+    });
+  }
+}
 
-  return err;
+function buildCodeFrameError(filename, code, loc, message) {
+  return new CompileError(filename, code, loc, message);
 }
 
-function buildCodeFrame(filename, code, loc, message) {
-  return `${_kleur.default.cyan(_path.default.relative(CWD, filename))}${
-  loc ?
-  `:${_kleur.default.yellow(loc.start.line)}:${_kleur.default.yellow(
-  loc.start.column + 1)
-  }\n\n${(0, _codeFrame.codeFrameColumns)(
+function buildMessage(code, loc, message) {
+  return loc ?
+  (0, _codeFrame.codeFrameColumns)(
   code,
   {
     start: {
@@ -48,8 +71,15 @@ function buildCodeFrame(filename, code, loc, message) {
     } :
     undefined
   },
-  { highlightCode: true, message })
-  }` :
-  `: ${message}`
+  { highlightCode: true, message }) :
+
+  message;
+}
+
+function buildFileName(filename, loc) {
+  return `${_kleur.default.cyan(_path.default.relative(CWD, filename))}${
+  loc ?
+  `:${_kleur.default.yellow(loc.start.line)}:${_kleur.default.yellow(loc.start.column + 1)}` :
+  ""
   }`;
 }

package/dist/util/merge-errors.js

@@ -1,5 +1,6 @@
-"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = throwAggregateError;var _kleur = _interopRequireDefault(require("kleur"));
-
+"use strict";exports.__esModule = true;exports.default = throwAggregateError;const indent = "    ";
+const compileErrorPrefix = `SyntaxError\n`;
+const compileErrorStackTracePrefix = `${compileErrorPrefix + indent}at `;
 function throwAggregateError(errors) {
   switch (errors.length) {
     case 0:
@@ -8,21 +9,20 @@ function throwAggregateError(errors) {
       throw errors[0];}
 
 
-  let err;
-  const message = `${_kleur.default.red("AggregationError:")}\n${errors.
-  map((err) => err.message).
-  join("\n\n").
-  replace(/^(?!\s*$)/gm, "\t")}\n`;
+  throw new CompileErrors(errors);
+}
 
-  if (typeof AggregateError === "function") {
-    err = new AggregateError(errors, message);
-  } else {
-    err = new Error(message);
-    err.name = "AggregateError";
-    err.errors = errors;
+class CompileErrors extends Error {
+  constructor(errors) {
+    super();
+    this.errors = errors;
+    this.stack = `CompileErrors\n${errors.
+    map(({ stack }) => {
+      if (stack.startsWith(compileErrorStackTracePrefix)) {
+        return stack.slice(compileErrorPrefix.length);
+      }
+      return stack.replace(/^(?!\s*$)/gm, "    ");
+    }).
+    join("\n\n")}`;
   }
-
-  // Remove the stack trace from the error since it is not useful.
-  err.stack = "";
-  throw err;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/compiler",
   "description": "Marko template to JS compiler.",
-  "version": "5.30.1",
+  "version": "5.30.3",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md",
   "dependencies": {
@@ -30,7 +30,7 @@
     "strip-json-comments": "^3.1.1"
   },
   "devDependencies": {
-    "@marko/translator-default": "^5.28.1"
+    "@marko/translator-default": "^5.28.3"
   },
   "files": [
     "dist",