@marko/compiler 5.34.4 → 5.34.6

package/dist/babel-plugin/index.js

@@ -132,11 +132,13 @@ const SOURCE_FILES = new WeakMap();var _default =
       },
       ExportNamedDeclaration: {
         exit(path) {
+          const { node } = path;
           // The babel typescript plugin will add an empty export declaration
           // if there are no other imports/exports in the file.
           // This is not needed for Marko file outputs since there is always
           // a default export.
-          if (path.node.specifiers.length === 0) path.remove();
+          if (!(node.declaration || node.specifiers.length))
+          path.remove();
         }
       }
     } :

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

@@ -1,21 +1,25 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.buildCodeFrameError = buildCodeFrameError;var _path = _interopRequireDefault(require("path"));
 var _codeFrame = require("@babel/code-frame");
 var _kleur = _interopRequireDefault(require("kleur"));
+var _stripAnsi = require("./strip-ansi");
 const CWD = process.cwd();
 const indent = "    ";
 
 class CompileError extends Error {
-  constructor(filename, code, loc, message) {
-    super();
-    const prettyMessage = buildMessage(code, loc, message);
+  constructor(filename, code, loc, label) {
+    const prettyMessage = buildMessage(code, loc, label);
     const prettyFileName = buildFileName(filename, loc);
-    this.stack = loc ?
-    `CompileError\n${indent}at ${prettyFileName}\n${prettyMessage.replace(
+    const message = loc ?
+    `\n${indent}at ${prettyFileName}\n${prettyMessage.replace(
       /^/gm,
       indent
     )}` :
-    `CompileError: ${prettyMessage}\n${indent}at ${prettyFileName}`;
-
+    `${prettyMessage}\n${indent}at ${prettyFileName}`;
+    const { stackTraceLimit } = Error;
+    Error.stackTraceLimit = 0;
+    super(message);
+    this.name = "CompileError";
+    Error.stackTraceLimit = stackTraceLimit;
     Object.defineProperties(this, {
       loc: {
         value: loc,
@@ -24,7 +28,7 @@ class CompileError extends Error {
         configurable: true
       },
       label: {
-        value: message,
+        value: label,
         enumerable: false,
         writable: true,
         configurable: true
@@ -33,25 +37,38 @@ class CompileError extends Error {
       code: {
         enumerable: false,
         configurable: true,
-        get() {
-          return undefined;
-        },
-        set() {}
+        get: noop,
+        set: noop
       },
       message: {
+        enumerable: true,
         configurable: true,
-        enumerable: false,
         get() {
-          return `${prettyFileName}: ${message}`;
+          return message;
         },
-        set() {}
+        set() {
+          Object.defineProperty(this, "message", {
+            value: message,
+            enumerable: true,
+            writable: true,
+            configurable: true
+          });
+        }
       }
     });
   }
+
+  toJSON() {
+    return this.toString();
+  }
+
+  toString() {
+    return `${this.name}: ${(0, _stripAnsi.stripAnsi)(this.message)}`;
+  }
 }
 
-function buildCodeFrameError(filename, code, loc, message) {
-  return new CompileError(filename, code, loc, message);
+function buildCodeFrameError(filename, code, loc, label) {
+  return new CompileError(filename, code, loc, label);
 }
 
 function buildMessage(code, loc, message) {
@@ -82,4 +99,6 @@ function buildFileName(filename, loc) {
   `:${_kleur.default.yellow(loc.start.line)}:${_kleur.default.yellow(loc.start.column + 1)}` :
   ""
   }`;
-}
+}
+
+function noop() {}

package/dist/util/merge-errors.js

@@ -1,5 +1,7 @@
-"use strict";exports.__esModule = true;exports.default = throwAggregateError;const indent = "    ";
-const compileErrorPrefix = `SyntaxError\n`;
+"use strict";exports.__esModule = true;exports.default = throwAggregateError;var _stripAnsi = require("./strip-ansi");
+
+const indent = "    ";
+const compileErrorPrefix = `CompileError: \n`;
 const compileErrorStackTracePrefix = `${compileErrorPrefix + indent}at `;
 function throwAggregateError(errors) {
   switch (errors.length) {
@@ -14,9 +16,7 @@ function throwAggregateError(errors) {
 
 class CompileErrors extends Error {
   constructor(errors) {
-    super();
-    this.errors = errors;
-    this.stack = `CompileErrors\n${errors.
+    const message = `\n${errors.
     map(({ stack }) => {
       if (stack.startsWith(compileErrorStackTracePrefix)) {
         return stack.slice(compileErrorPrefix.length);
@@ -24,5 +24,19 @@ class CompileErrors extends Error {
       return stack.replace(/^(?!\s*$)/gm, "    ");
     }).
     join("\n\n")}`;
+    const { stackTraceLimit } = Error;
+    Error.stackTraceLimit = 0;
+    super(message);
+    this.name = "CompileErrors";
+    this.errors = errors;
+    Error.stackTraceLimit = stackTraceLimit;
+  }
+
+  toJSON() {
+    return this.toString();
+  }
+
+  toString() {
+    return `${this.name}: ${(0, _stripAnsi.stripAnsi)(this.message)}`;
   }
 }

package/dist/util/strip-ansi.js

@@ -0,0 +1,7 @@
+"use strict";exports.__esModule = true;exports.stripAnsi = stripAnsi;const ansiReg =
+// eslint-disable-next-line no-control-regex
+/([\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><])/g;
+
+function stripAnsi(str) {
+  return str.replace(ansiReg, "");
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.34.4",
+  "version": "5.34.6",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",
@@ -60,7 +60,7 @@
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
-    "@marko/translator-default": "^5.31.11"
+    "@marko/translator-default": "^5.31.13"
   },
   "publishConfig": {
     "access": "public"