@marko/compiler 5.27.9 → 5.28.0

package/config.d.ts

@@ -1,5 +1,7 @@
-const Config: {
+declare const Config: {
   output?: "html" | "dom" | "hydrate" | "migrate" | "source";
+  errorRecovery?: boolean;
+  applyFixes?: Map<number, unknown>;
   stripTypes?: boolean;
   runtimeId?: string | null;
   ast?: boolean;
@@ -13,7 +15,7 @@ const Config: {
   resolveVirtualDependency?:
     | ((
         filename: string,
-        dep: { virtualPath: string; code: string; map?: SourceMap }
+        dep: { virtualPath: string; code: string; map?: any }
       ) => string)
     | null;
   hydrateIncludeImports?: RegExp | ((request: string) => boolean);

package/dist/babel-plugin/file.js

@@ -1,48 +1,18 @@
-"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.MarkoFile = void 0;var _path = _interopRequireDefault(require("path"));
-var _core = require("@babel/core");
-var _codeFrame = require("@babel/code-frame");
-const CWD = process.cwd();
+"use strict";exports.__esModule = true;exports.MarkoFile = void 0;var _core = require("@babel/core");
+var _buildCodeFrame = require("../util/build-code-frame");
 
 class MarkoFile extends _core.File {
   addHelper() {
     throw new Error("addHelper is not supported during a Marko transform");
   }
 
-  buildCodeFrameError(node, msg, Error = SyntaxError) {
-    const { loc } = node;
-    const frame =
-    loc &&
-    (0, _codeFrame.codeFrameColumns)(
+  buildCodeFrameError(node, msg, Error) {
+    return (0, _buildCodeFrame.buildCodeFrameError)(
+    this.opts.filename,
     this.code,
-    {
-      start: {
-        line: loc.start.line,
-        column: loc.start.column + 1
-      },
-      end:
-      loc.end && loc.start.line === loc.end.line ?
-      {
-        line: loc.end.line,
-        column: loc.end.column + 1
-      } :
-      undefined
-    },
-    { highlightCode: true });
+    node.loc,
+    msg,
+    Error);
 
-
-    const finalMsg = `${_path.default.relative(CWD, this.opts.filename)}${
-    loc ? `(${loc.start.line},${loc.start.column + 1})` : ""
-    }: ${msg}\n${frame || ""}`;
-
-    const err = new Error();
-
-    // Prevent babel from changing our error message.
-    Object.defineProperty(err, "message", {
-      get() {
-        return finalMsg;
-      },
-      set() {}
-    });
-    return err;
   }
 }exports.MarkoFile = MarkoFile;

package/dist/babel-plugin/index.js

@@ -73,17 +73,19 @@ const SOURCE_FILES = new WeakMap();var _default =
       _config.default.fs = markoOpts.fileSystem;
       curOpts = undefined;
       try {
+        const { ast, metadata } = file;
+        const sourceFile = SOURCE_FILES.get(ast);
+        metadata.marko = shallowClone(sourceFile.metadata.marko);
+
         if (isMarkoOutput(markoOpts.output)) {
-          return file;
+          finalizeMeta(metadata.marko);
+          return;
         }
 
-        const { ast, metadata } = file;
-        const sourceFile = SOURCE_FILES.get(ast);
         const taglibLookup = sourceFile.___taglibLookup;
         const rootTranslators = [];
         const { buildCodeFrameError } = file;
         const { buildError } = file.hub;
-        metadata.marko = shallowClone(sourceFile.metadata.marko);
         file.buildCodeFrameError = _file.MarkoFile.prototype.buildCodeFrameError;
         file.hub.buildError = file.buildCodeFrameError.bind(file);
         file.markoOpts = markoOpts;
@@ -101,6 +103,7 @@ const SOURCE_FILES = new WeakMap();var _default =
         }
 
         rootTranslators.push(translator.translate);
+        file.___compileStage = "translate";
         traverseAll(file, rootTranslators);
         file.buildCodeFrameError = buildCodeFrameError;
         file.hub.buildError = buildError;
@@ -109,7 +112,7 @@ const SOURCE_FILES = new WeakMap();var _default =
         file.___getMarkoFile =
         undefined;
 
-        metadata.marko.watchFiles = metadata.marko.watchFiles.filter(unique);
+        finalizeMeta(metadata.marko);
         file.path.scope.crawl(); // Ensure all scopes are accurate for subsequent babel plugins
       } finally {
         _config.default.fs = prevFS;
@@ -202,13 +205,15 @@ function getMarkoFile(code, fileOpts, markoOpts) {
     macros: {},
     deps: [],
     tags: [],
-    watchFiles: []
+    watchFiles: [],
+    diagnostics: []
   };
 
   file.markoOpts = markoOpts;
   file.___taglibLookup = taglibLookup;
   file.___getMarkoFile = getMarkoFile;
 
+  file.___compileStage = "parse";
   (0, _parser.parseMarko)(file);
 
   if (isSource) {
@@ -225,8 +230,29 @@ function getMarkoFile(code, fileOpts, markoOpts) {
   }
 
   rootMigrators.push(_migrate.visitor);
+  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;
   }
@@ -239,6 +265,7 @@ function getMarkoFile(code, fileOpts, markoOpts) {
   }
 
   rootTransformers.push(_transform.visitor);
+  file.___compileStage = "transform";
   traverseAll(file, rootTransformers);
 
   for (const taglibId in taglibLookup.taglibsById) {
@@ -260,6 +287,7 @@ function getMarkoFile(code, fileOpts, markoOpts) {
 
   if (translator.analyze) {
     try {
+      file.___compileStage = "analyze";
       traverseAll(file, translator.analyze);
     } catch (e) {
       compileCache.delete(cacheKey);
@@ -351,10 +379,35 @@ function addPlugin(meta, arr, plugin) {
   }
 }
 
-function unique(item, i, list) {
-  return list.indexOf(item) === i;
-}
-
 function isMarkoOutput(output) {
   return output === "source" || output === "migrate";
+}
+
+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/config.js

@@ -134,6 +134,19 @@ var _lassoPackageRoot = require("lasso-package-root");
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -198,4 +211,12 @@ var _config = _interopRequireDefault(require("./taglib/config"));const config =
    * A regexp or function that receives an import path that matches file types known to be client side assets.
    */hydrateIncludeImports: /\.(css|less|s[ac]ss|styl|png|jpe?g|gif|svg|ico|webp|avif|mp4|webm|ogg|mp3|wav|flac|aac|woff2?|eot|ttf|otf)$/, /**
    * Set to true in order to bring in the hot module replacement runtime.
-   */hot: false };if (process.env.MARKO_CONFIG) {Object.assign(config, JSON.parse(process.env.MARKO_CONFIG));}var _default = config;exports.default = _default;_config.default.fs = config.fileSystem;
+   */hot: false, /**
+   * Wether error diagnostics should be thrown as errors
+   * before the compile result is returned.
+   *
+   * Note that the compiler can still throw errors even when true.
+   * When the errorRecovery is true, any recoverable errors will be
+   * returned in the `meta.diagnostics` property of the compile result.
+   */errorRecovery: false, // When supplied, any diagnostics which have a fix specified in the lookup will be applied to the source code.
+  applyFixes: undefined };if (process.env.MARKO_CONFIG) {Object.assign(config, JSON.parse(process.env.MARKO_CONFIG));}var _default = config;exports.default = _default;_config.default.fs = config.fileSystem;

package/dist/index.js

@@ -1,14 +1,17 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports._clearDefaults = _clearDefaults;exports.compile = compile;exports.compileFile = compileFile;exports.compileFileSync = compileFileSync;exports.compileSync = compileSync;exports.configure = configure;exports.getRuntimeEntryFiles = getRuntimeEntryFiles;exports.types = exports.taglib = void 0;var _types = _interopRequireWildcard(require("./babel-types"));exports.types = _types;
 var _path = _interopRequireDefault(require("path"));
+var _kleur = _interopRequireDefault(require("kleur"));
 var babel = _interopRequireWildcard(require("@babel/core"));
 var _pluginTransformModulesCommonjs = _interopRequireDefault(require("@babel/plugin-transform-modules-commonjs"));
 var _pluginSyntaxTypescript = _interopRequireDefault(require("@babel/plugin-syntax-typescript"));
 var _pluginTransformTypescript = _interopRequireDefault(require("@babel/plugin-transform-typescript"));
+var _babelUtils = require("@marko/babel-utils");
 var _babelPlugin = _interopRequireDefault(require("./babel-plugin"));
 var _config = _interopRequireDefault(require("./config"));
 var taglib = _interopRequireWildcard(require("./taglib"));exports.taglib = taglib;
 var _shouldOptimize = _interopRequireDefault(require("./util/should-optimize"));
-var _tryLoadTranslator = _interopRequireDefault(require("./util/try-load-translator"));function _getRequireWildcardCache(nodeInterop) {if (typeof WeakMap !== "function") return null;var cacheBabelInterop = new WeakMap();var cacheNodeInterop = new WeakMap();return (_getRequireWildcardCache = function (nodeInterop) {return nodeInterop ? cacheNodeInterop : cacheBabelInterop;})(nodeInterop);}function _interopRequireWildcard(obj, nodeInterop) {if (!nodeInterop && obj && obj.__esModule) {return obj;}if (obj === null || typeof obj !== "object" && typeof obj !== "function") {return { default: obj };}var cache = _getRequireWildcardCache(nodeInterop);if (cache && cache.has(obj)) {return cache.get(obj);}var newObj = {};var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;for (var key in obj) {if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;if (desc && (desc.get || desc.set)) {Object.defineProperty(newObj, key, desc);} else {newObj[key] = obj[key];}}}newObj.default = obj;if (cache) {cache.set(obj, newObj);}return newObj;}
+var _tryLoadTranslator = _interopRequireDefault(require("./util/try-load-translator"));
+var _buildCodeFrame = require("./util/build-code-frame");function _getRequireWildcardCache(nodeInterop) {if (typeof WeakMap !== "function") return null;var cacheBabelInterop = new WeakMap();var cacheNodeInterop = new WeakMap();return (_getRequireWildcardCache = function (nodeInterop) {return nodeInterop ? cacheNodeInterop : cacheBabelInterop;})(nodeInterop);}function _interopRequireWildcard(obj, nodeInterop) {if (!nodeInterop && obj && obj.__esModule) {return obj;}if (obj === null || typeof obj !== "object" && typeof obj !== "function") {return { default: obj };}var cache = _getRequireWildcardCache(nodeInterop);if (cache && cache.has(obj)) {return cache.get(obj);}var newObj = {};var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;for (var key in obj) {if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;if (desc && (desc.get || desc.set)) {Object.defineProperty(newObj, key, desc);} else {newObj[key] = obj[key];}}}newObj.default = obj;if (cache) {cache.set(obj, newObj);}return newObj;}
 
 
 let globalConfig = { ..._config.default };
@@ -17,17 +20,19 @@ function configure(newConfig) {
 }
 
 async function compile(src, filename, config) {
-  const babelConfig = loadBabelConfig(filename, config);
+  const markoConfig = loadMarkoConfig(config);
+  const babelConfig = loadBabelConfig(filename, markoConfig);
   const babelResult = await babel.transformAsync(src, babelConfig);
-  scheduleDefaultClear(config);
-  return buildResult(babelResult);
+  scheduleDefaultClear(markoConfig);
+  return buildResult(src, filename, markoConfig.errorRecovery, babelResult);
 }
 
 function compileSync(src, filename, config) {
-  const babelConfig = loadBabelConfig(filename, config);
+  const markoConfig = loadMarkoConfig(config);
+  const babelConfig = loadBabelConfig(filename, markoConfig);
   const babelResult = babel.transformSync(src, babelConfig);
-  scheduleDefaultClear(config);
-  return buildResult(babelResult);
+  scheduleDefaultClear(markoConfig);
+  return buildResult(src, filename, markoConfig.errorRecovery, babelResult);
 }
 
 async function compileFile(filename, config) {
@@ -56,14 +61,18 @@ function getRuntimeEntryFiles(output, requestedTranslator) {
   return [];
 }
 
-function loadBabelConfig(filename, config) {
-  const markoConfig = { ...globalConfig, ...config, babelConfig: undefined };
+function loadMarkoConfig(config) {
+  const markoConfig = { ...globalConfig, ...config };
 
   if (markoConfig.stripTypes === undefined) {
     markoConfig.stripTypes =
     markoConfig.output !== "source" && markoConfig.output !== "migrate";
   }
 
+  return markoConfig;
+}
+
+function loadBabelConfig(filename, { babelConfig, ...markoConfig }) {
   const requiredPlugins = [
   [_babelPlugin.default, markoConfig],
   [
@@ -83,7 +92,7 @@ function loadBabelConfig(filename, config) {
     _path.default.relative(process.cwd(), filename) :
     undefined,
     sourceFileName: filename ? _path.default.basename(filename) : undefined,
-    ...(config && config.babelConfig),
+    ...babelConfig,
     filename,
     sourceType: "module",
     sourceMaps: markoConfig.sourceMaps,
@@ -102,13 +111,52 @@ function loadBabelConfig(filename, config) {
   return babel.loadPartialConfig(baseBabelConfig).options;
 }
 
-function buildResult(babelResult) {
+function buildResult(src, filename, errorRecovery, babelResult) {
   const {
     ast,
     map,
     code,
     metadata: { marko: meta }
   } = babelResult;
+
+  if (!errorRecovery) {
+    const errors = [];
+
+    for (const diag of meta.diagnostics) {
+      if (diag.type === _babelUtils.DiagnosticType.Error) {
+        errors.push(diag);
+      }
+    }
+
+    switch (errors.length) {
+      case 0:
+        break;
+      case 1:{
+          const [diag] = errors;
+          throw (0, _buildCodeFrame.buildCodeFrameError)(filename, src, diag.loc, diag.label);
+        }
+      default:{
+          let err;
+          const message = `${_kleur.default.red("AggregationError:")}\n${errors.
+          map((diag) => (0, _buildCodeFrame.buildCodeFrame)(filename, src, diag.loc, diag.label)).
+          join("\n\n").
+          replace(/^(?!\s*$)/gm, "\t")}\n`;
+
+          if (typeof AggregateError === "function") {
+            err = new AggregateError(errors, message);
+          } else {
+            err = new Error(message);
+            err.name = "AggregateError";
+            err.errors = errors;
+          }
+
+          // Remove the stack trace from the error since it is not useful.
+          err.stack = "";
+          throw err;
+        }}
+
+  }
+
   return { ast, map, code, meta };
 }
 

package/dist/traverse.d.ts

@@ -1203,12 +1203,7 @@ export interface BabelFile {
     code: string,
     opts: Record<string, unknown>,
     metadata: Record<string, unknown> & {
-      marko: {
-        id: string,
-        tags: string[],
-        deps: Array<string | { type: string, code: string, path: string, virtualPath: string, [x:string]: unknown }>,
-        watchFiles: string[]
-      }
+      marko: import("@marko/compiler").MarkoMeta
     },
     markoOpts: Required<import('@marko/compiler').Config>
 }

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

@@ -0,0 +1,56 @@
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.buildCodeFrame = buildCodeFrame;exports.buildCodeFrameError = buildCodeFrameError;var _path = _interopRequireDefault(require("path"));
+var _kleur = _interopRequireDefault(require("kleur"));
+var _codeFrame = require("@babel/code-frame");
+const CWD = process.cwd();
+
+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${
+  loc ?
+  (0, _codeFrame.codeFrameColumns)(
+  code,
+  {
+    start: {
+      line: loc.start.line,
+      column: loc.start.column + 1
+    },
+    end:
+    loc.end && loc.start.line === loc.end.line ?
+    {
+      line: loc.end.line,
+      column: loc.end.column + 1
+    } :
+    undefined
+  },
+  { highlightCode: true, 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/index.d.ts

@@ -1,5 +1,5 @@
 import { SourceMap } from "magic-string";
-import { TaglibLookup } from "@marko/babel-utils";
+import { TaglibLookup, Diagnostic } from "@marko/babel-utils";
 import * as types from "./babel-types";
 export { types };
 
@@ -22,6 +22,7 @@ export type MarkoMeta = {
   watchFiles: string[];
   tags?: string[];
   deps: Array<string | Dep>;
+  diagnostics: Diagnostic[];
 };
 
 export type CompileResult = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/compiler",
   "description": "Marko template to JS compiler.",
-  "version": "5.27.9",
+  "version": "5.28.0",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md",
   "dependencies": {
@@ -15,11 +15,12 @@
     "@babel/runtime": "^7.16.0",
     "@babel/traverse": "^7.16.0",
     "@babel/types": "^7.16.0",
-    "@marko/babel-utils": "^5.21.4",
+    "@marko/babel-utils": "^5.22.0",
     "complain": "^1.6.0",
     "he": "^1.2.0",
     "htmljs-parser": "^5.4.3",
     "jsesc": "^3.0.2",
+    "kleur": "^4.1.5",
     "lasso-package-root": "^1.0.1",
     "raptor-regexp": "^1.0.1",
     "raptor-util": "^3.2.0",
@@ -29,7 +30,7 @@
     "strip-json-comments": "^3.1.1"
   },
   "devDependencies": {
-    "@marko/translator-default": "^5.25.8"
+    "@marko/translator-default": "^5.26.0"
   },
   "files": [
     "dist",