@marko/compiler 5.28.4 → 5.29.0

package/dist/babel-plugin/index.js

@@ -10,7 +10,9 @@ var _transform = require("./plugins/transform");
 var _file = require("./file");
 var _config = _interopRequireDefault(require("../taglib/config"));
 var _tryLoadTranslator = _interopRequireDefault(require("../util/try-load-translator"));
-var _shouldOptimize = _interopRequireDefault(require("../util/should-optimize"));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 _shouldOptimize = _interopRequireDefault(require("../util/should-optimize"));
+var _buildCodeFrame = require("../util/build-code-frame");
+var _mergeErrors = _interopRequireDefault(require("../util/merge-errors"));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;}
 
 const SOURCE_FILES = new WeakMap();var _default =
 
@@ -53,11 +55,12 @@ const SOURCE_FILES = new WeakMap();var _default =
       opts.parserOpts.allowReturnOutsideFunction =
       opts.parserOpts.allowSuperOutsideMethod =
       opts.parserOpts.allowUndeclaredExports =
+      opts.parserOpts.allowNewTargetOutsideFunction =
       true;
       curOpts = opts;
     },
     parserOverride(code) {
-      let prevFS = _config.default.fs;
+      const prevFS = _config.default.fs;
       _config.default.fs = markoOpts.fileSystem;
       try {
         const file = getMarkoFile(code, curOpts, markoOpts);
@@ -69,7 +72,9 @@ const SOURCE_FILES = new WeakMap();var _default =
       }
     },
     pre(file) {
-      let prevFS = _config.default.fs;
+      const { buildError: prevBuildError } = file.hub;
+      const { buildCodeFrameError: prevCodeFrameError } = file;
+      const prevFS = _config.default.fs;
       _config.default.fs = markoOpts.fileSystem;
       curOpts = undefined;
       try {
@@ -84,8 +89,6 @@ const SOURCE_FILES = new WeakMap();var _default =
 
         const taglibLookup = sourceFile.___taglibLookup;
         const rootTranslators = [];
-        const { buildCodeFrameError } = file;
-        const { buildError } = file.hub;
         file.buildCodeFrameError = _file.MarkoFile.prototype.buildCodeFrameError;
         file.hub.buildError = file.buildCodeFrameError.bind(file);
         file.markoOpts = markoOpts;
@@ -105,17 +108,17 @@ const SOURCE_FILES = new WeakMap();var _default =
         rootTranslators.push(translator.translate);
         file.___compileStage = "translate";
         traverseAll(file, rootTranslators);
-        file.buildCodeFrameError = buildCodeFrameError;
-        file.hub.buildError = buildError;
-        file.markoOpts =
-        file.___taglibLookup =
-        file.___getMarkoFile =
-        undefined;
 
         finalizeMeta(metadata.marko);
         file.path.scope.crawl(); // Ensure all scopes are accurate for subsequent babel plugins
       } finally {
         _config.default.fs = prevFS;
+        file.buildCodeFrameError = prevCodeFrameError;
+        file.hub.buildError = prevBuildError;
+        file.markoOpts =
+        file.___taglibLookup =
+        file.___getMarkoFile =
+        undefined;
       }
     },
     visitor:
@@ -233,6 +236,35 @@ function getMarkoFile(code, fileOpts, markoOpts) {
   file.___compileStage = "migrate";
   traverseAll(file, rootMigrators);
 
+  if (file.___hasParseErrors) {
+    if (markoOpts.errorRecovery) {
+      t.traverseFast(file.path.node, (node) => {
+        if (node.type === "MarkoParseError") {
+          (0, _babelUtils.diagnosticError)(file.path, {
+            label: node.label,
+            loc: node.errorLoc || node.loc
+          });
+        }
+      });
+    } else {
+      let errors = [];
+      t.traverseFast(file.path.node, (node) => {
+        if (node.type === "MarkoParseError") {
+          errors.push(
+          (0, _buildCodeFrame.buildCodeFrameError)(
+          file.opts.filename,
+          file.code,
+          node.errorLoc || node.loc,
+          node.label));
+
+
+        }
+      });
+
+      (0, _mergeErrors.default)(errors);
+    }
+  }
+
   if (isMigrate) {
     return file;
   }

package/dist/babel-plugin/parser.js

@@ -6,6 +6,10 @@ var _babelUtils = require("@marko/babel-utils");function _getRequireWildcardCach
 
 
 
+
+
+
+
 const noop = () => {};
 const emptyRange = (part) => part.start === part.end;
 const isAttrTag = (tag) => {var _tag$name$value;return ((_tag$name$value = tag.name.value) == null ? void 0 : _tag$name$value[0]) === "@";};
@@ -65,7 +69,12 @@ function parseMarko(file) {
       case 1:{
           if (emptyRange(quasis[0]) && emptyRange(quasis[1])) {
             const [{ value }] = expressions;
-            const result = (0, _babelUtils.parseExpression)(file, parser.read(value), value.start);
+            const result = (0, _babelUtils.parseExpression)(
+            file,
+            parser.read(value),
+            value.start,
+            value.end);
+
             if (t.isStringLiteral(result)) {
               // convert to template literal just so that we don't mistake it for a native tag if this is a tag name.
               return t.templateLiteral(
@@ -86,11 +95,7 @@ function parseMarko(file) {
 
     const [{ start }] = quasis;
     const end = quasis[quasis.length - 1].end;
-    return (0, _babelUtils.parseExpression)(
-    file,
-    `\`${parser.read({ start, end })}\``,
-    start - 1);
-
+    return (0, _babelUtils.parseTemplateLiteral)(file, parser.read({ start, end }), start, end);
   };
 
   const parser = (0, _htmljsParser.createParser)({
@@ -196,7 +201,12 @@ function parseMarko(file) {
       pushContent(
       withLoc(
       t.markoPlaceholder(
-      (0, _babelUtils.parseExpression)(file, parser.read(part.value), part.value.start),
+      (0, _babelUtils.parseExpression)(
+      file,
+      parser.read(part.value),
+      part.value.start,
+      part.value.end),
+
       part.escape),
 
       part));
@@ -207,7 +217,12 @@ function parseMarko(file) {
       pushContent(
       withLoc(
       t.markoScriptlet(
-      (0, _babelUtils.parseScript)(file, parser.read(part.value), part.value.start).body),
+      (0, _babelUtils.parseStatements)(
+      file,
+      parser.read(part.value),
+      part.value.start,
+      part.value.end)),
+
 
       part));
 
@@ -264,28 +279,31 @@ function parseMarko(file) {
       }
     },
 
-    onTagVar(part) {
-      currentTag.node.var = (0, _babelUtils.parseExpression)(
+    onTagVar({ value }) {
+      currentTag.node.var = (0, _babelUtils.parseVar)(
       file,
-      `(${parser.read(part.value)})=>{}`,
-      part.value.start - 1).
-      params[0];
+      parser.read(value),
+      value.start,
+      value.end);
+
     },
 
-    onTagParams(part) {
-      currentTag.node.body.params = (0, _babelUtils.parseExpression)(
+    onTagParams({ value }) {
+      currentTag.node.body.params = (0, _babelUtils.parseParams)(
       file,
-      `(${parser.read(part.value)})=>{}`,
-      part.start).
-      params;
+      parser.read(value),
+      value.start,
+      value.end);
+
     },
 
-    onTagArgs(part) {
-      currentTag.node.arguments = (0, _babelUtils.parseExpression)(
+    onTagArgs({ value }) {
+      currentTag.node.arguments = (0, _babelUtils.parseArgs)(
       file,
-      `_${parser.read(part)}`,
-      part.start - 1).
-      arguments;
+      parser.read(value),
+      value.start,
+      value.end);
+
     },
 
     onAttrName(part) {
@@ -305,13 +323,15 @@ function parseMarko(file) {
       currentAttr.end = part.end;
     },
 
-    onAttrArgs(part) {
-      currentAttr.arguments = (0, _babelUtils.parseExpression)(
+    onAttrArgs({ value, end }) {
+      currentAttr.arguments = (0, _babelUtils.parseArgs)(
       file,
-      `_${parser.read(part)}`,
-      part.start - 1).
-      arguments;
-      currentAttr.end = part.end;
+      parser.read(value),
+      value.start,
+      value.end);
+
+
+      currentAttr.end = end;
     },
 
     onAttrValue(part) {
@@ -329,16 +349,20 @@ function parseMarko(file) {
       currentAttr.value = withLoc(
       t.functionExpression(
       undefined,
-      (0, _babelUtils.parseExpression)(
+      (0, _babelUtils.parseParams)(
       file,
-      `${parser.read(part.params)}=>{}`,
-      part.params.start).
-      params,
-      (0, _babelUtils.parseExpression)(
+      parser.read(part.params.value),
+      part.params.value.start,
+      part.params.value.end),
+
+      t.blockStatement(
+      (0, _babelUtils.parseStatements)(
       file,
-      `()=>${parser.read(part.body)}`,
-      part.body.start - 4).
-      body),
+      parser.read(part.body.value),
+      part.body.value.start,
+      part.body.value.end))),
+
+
 
       part);
 

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

@@ -15,6 +15,9 @@ const UNENCLOSED_WHITESPACE_TYPES = [
 
 
 Object.assign(_printer.default.prototype, {
+  MarkoParseError(node) {
+    this.token(node.source);
+  },
   MarkoDocumentType(node) {
     this.token("<!");
     this.token(node.value);

package/dist/babel-types/types/definitions.js

@@ -13,6 +13,22 @@ const valueFieldCommon = {
 };
 
 const MarkoDefinitions = {
+  MarkoParseError: {
+    aliases: ["Marko", "Expression", "Statement"],
+    builder: ["source", "label", "errorLoc"],
+    fields: {
+      source: {
+        validate: (0, _utils.assertValueType)("string")
+      },
+      label: {
+        validate: (0, _utils.assertValueType)("string")
+      },
+      errorLoc: {
+        optional: true,
+        validate: (0, _utils.assertValueType)("object")
+      }
+    }
+  },
   MarkoDocumentType: {
     aliases: ["Marko", "Statement"],
     builder: ["value"],

package/dist/index.js

@@ -1,6 +1,5 @@
 "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"));
@@ -11,7 +10,8 @@ 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"));
-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;}
+var _buildCodeFrame = require("./util/build-code-frame");
+var _mergeErrors = _interopRequireDefault(require("./util/merge-errors"));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 };
@@ -65,14 +65,14 @@ function loadMarkoConfig(config) {
   const markoConfig = { ...globalConfig, ...config };
 
   if (markoConfig.stripTypes === undefined) {
-    markoConfig.stripTypes =
-    markoConfig.output !== "source" && markoConfig.output !== "migrate";
+    markoConfig.stripTypes = isTranslatedOutput(markoConfig.output);
   }
 
   return markoConfig;
 }
 
 function loadBabelConfig(filename, { babelConfig, ...markoConfig }) {
+  const isTranslated = isTranslatedOutput(markoConfig.output);
   const requiredPlugins = [
   [_babelPlugin.default, markoConfig],
   [
@@ -92,23 +92,29 @@ function loadBabelConfig(filename, { babelConfig, ...markoConfig }) {
     _path.default.relative(process.cwd(), filename) :
     undefined,
     sourceFileName: filename ? _path.default.basename(filename) : undefined,
+    configFile: isTranslated,
+    babelrc: isTranslated,
     ...babelConfig,
     filename,
     sourceType: "module",
     sourceMaps: markoConfig.sourceMaps,
     code: markoConfig.code,
-    ast: markoConfig.ast
+    ast: markoConfig.ast,
+    plugins:
+    babelConfig && babelConfig.plugins ?
+    requiredPlugins.concat(babelConfig.plugins) :
+    requiredPlugins
   };
 
-  if (markoConfig.modules === "cjs") {
-    requiredPlugins.push([_pluginTransformModulesCommonjs.default, { loose: true }]);
-  }
-
-  baseBabelConfig.plugins = requiredPlugins.concat(
-  baseBabelConfig.plugins || []);
+  if (isTranslated) {
+    if (markoConfig.modules === "cjs") {
+      baseBabelConfig.plugins.push([_pluginTransformModulesCommonjs.default, { loose: true }]);
+    }
 
+    return babel.loadPartialConfig(baseBabelConfig).options;
+  }
 
-  return babel.loadPartialConfig(baseBabelConfig).options;
+  return baseBabelConfig;
 }
 
 function buildResult(src, filename, errorRecovery, babelResult) {
@@ -128,32 +134,7 @@ function buildResult(src, filename, errorRecovery, babelResult) {
       }
     }
 
-    switch (errors.length) {
-      case 0:
-        break;
-      case 1:{
-          throw errors[0];
-        }
-      default:{
-          let err;
-          const message = `${_kleur.default.red("AggregationError:")}\n${errors.
-          map((err) => err.message).
-          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;
-        }}
-
+    (0, _mergeErrors.default)(errors);
   }
 
   return { ast, map, code, meta };
@@ -180,4 +161,8 @@ function isDefaultCache(config) {
 
 function getFs(config) {
   return config.fileSystem || globalConfig.fileSystem;
+}
+
+function isTranslatedOutput(output) {
+  return output !== "source" && output !== "migrate";
 }

package/dist/traverse.d.ts

@@ -592,6 +592,7 @@ export class NodePath<T = Node> {
     //#endregion
 
     //#region ------------------------- isXXX -------------------------
+    isMarkoParseError(props?: object | null): this is NodePath<t.MarkoParseError>;
     isMarkoDocumentType(props?: object | null): this is NodePath<t.MarkoDocumentType>;
     isMarkoDeclaration(props?: object | null): this is NodePath<t.MarkoDeclaration>;
     isMarkoCDATA(props?: object | null): this is NodePath<t.MarkoCDATA>;
@@ -895,6 +896,7 @@ export class NodePath<T = Node> {
     //#endregion
 
     //#region ------------------------- assertXXX -------------------------
+    assertMarkoParseError(props?: object | null): void;
     assertMarkoDocumentType(props?: object | null): void;
     assertMarkoDeclaration(props?: object | null): void;
     assertMarkoCDATA(props?: object | null): void;

package/dist/types.d.ts

@@ -42,7 +42,7 @@ interface BaseNode {
   extra?: Record<string, unknown>;
 }
 
-export type Node = Accessor | AnyTypeAnnotation | ArgumentPlaceholder | ArrayExpression | ArrayPattern | ArrayTypeAnnotation | ArrowFunctionExpression | AssignmentExpression | AssignmentPattern | AwaitExpression | BigIntLiteral | Binary | BinaryExpression | BindExpression | Block | BlockParent | BlockStatement | BooleanLiteral | BooleanLiteralTypeAnnotation | BooleanTypeAnnotation | BreakStatement | CallExpression | CatchClause | Class | ClassAccessorProperty | ClassBody | ClassDeclaration | ClassExpression | ClassImplements | ClassMethod | ClassPrivateMethod | ClassPrivateProperty | ClassProperty | CompletionStatement | Conditional | ConditionalExpression | ContinueStatement | DebuggerStatement | DecimalLiteral | Declaration | DeclareClass | DeclareExportAllDeclaration | DeclareExportDeclaration | DeclareFunction | DeclareInterface | DeclareModule | DeclareModuleExports | DeclareOpaqueType | DeclareTypeAlias | DeclareVariable | DeclaredPredicate | Decorator | Directive | DirectiveLiteral | DoExpression | DoWhileStatement | EmptyStatement | EmptyTypeAnnotation | EnumBody | EnumBooleanBody | EnumBooleanMember | EnumDeclaration | EnumDefaultedMember | EnumMember | EnumNumberBody | EnumNumberMember | EnumStringBody | EnumStringMember | EnumSymbolBody | ExistsTypeAnnotation | ExportAllDeclaration | ExportDeclaration | ExportDefaultDeclaration | ExportDefaultSpecifier | ExportNamedDeclaration | ExportNamespaceSpecifier | ExportSpecifier | Expression | ExpressionStatement | ExpressionWrapper | File | Flow | FlowBaseAnnotation | FlowDeclaration | FlowPredicate | FlowType | For | ForInStatement | ForOfStatement | ForStatement | ForXStatement | Function | FunctionDeclaration | FunctionExpression | FunctionParent | FunctionTypeAnnotation | FunctionTypeParam | GenericTypeAnnotation | Identifier | IfStatement | Immutable | Import | ImportAttribute | ImportDeclaration | ImportDefaultSpecifier | ImportNamespaceSpecifier | ImportSpecifier | IndexedAccessType | InferredPredicate | InterfaceDeclaration | InterfaceExtends | InterfaceTypeAnnotation | InterpreterDirective | IntersectionTypeAnnotation | JSX | JSXAttribute | JSXClosingElement | JSXClosingFragment | JSXElement | JSXEmptyExpression | JSXExpressionContainer | JSXFragment | JSXIdentifier | JSXMemberExpression | JSXNamespacedName | JSXOpeningElement | JSXOpeningFragment | JSXSpreadAttribute | JSXSpreadChild | JSXText | LVal | LabeledStatement | Literal | LogicalExpression | Loop | Marko | MarkoAttribute | MarkoCDATA | MarkoClass | MarkoComment | MarkoDeclaration | MarkoDocumentType | MarkoPlaceholder | MarkoScriptlet | MarkoSpreadAttribute | MarkoTag | MarkoTagBody | MarkoText | MemberExpression | MetaProperty | Method | Miscellaneous | MixedTypeAnnotation | ModuleDeclaration | ModuleExpression | ModuleSpecifier | NewExpression | Noop | NullLiteral | NullLiteralTypeAnnotation | NullableTypeAnnotation | NumberLiteral | NumberLiteralTypeAnnotation | NumberTypeAnnotation | NumericLiteral | ObjectExpression | ObjectMember | ObjectMethod | ObjectPattern | ObjectProperty | ObjectTypeAnnotation | ObjectTypeCallProperty | ObjectTypeIndexer | ObjectTypeInternalSlot | ObjectTypeProperty | ObjectTypeSpreadProperty | OpaqueType | OptionalCallExpression | OptionalIndexedAccessType | OptionalMemberExpression | ParenthesizedExpression | Pattern | PatternLike | PipelineBareFunction | PipelinePrimaryTopicReference | PipelineTopicExpression | Placeholder | Private | PrivateName | Program | Property | Pureish | QualifiedTypeIdentifier | RecordExpression | RegExpLiteral | RegexLiteral | RestElement | RestProperty | ReturnStatement | Scopable | Scope | SequenceExpression | SpreadElement | SpreadProperty | Standardized | Statement | StaticBlock | StringLiteral | StringLiteralTypeAnnotation | StringTypeAnnotation | Super | SwitchCase | SwitchStatement | SymbolTypeAnnotation | TSAnyKeyword | TSArrayType | TSAsExpression | TSBaseType | TSBigIntKeyword | TSBooleanKeyword | TSCallSignatureDeclaration | TSConditionalType | TSConstructSignatureDeclaration | TSConstructorType | TSDeclareFunction | TSDeclareMethod | TSEntityName | TSEnumDeclaration | TSEnumMember | TSExportAssignment | TSExpressionWithTypeArguments | TSExternalModuleReference | TSFunctionType | TSImportEqualsDeclaration | TSImportType | TSIndexSignature | TSIndexedAccessType | TSInferType | TSInstantiationExpression | TSInterfaceBody | TSInterfaceDeclaration | TSIntersectionType | TSIntrinsicKeyword | TSLiteralType | TSMappedType | TSMethodSignature | TSModuleBlock | TSModuleDeclaration | TSNamedTupleMember | TSNamespaceExportDeclaration | TSNeverKeyword | TSNonNullExpression | TSNullKeyword | TSNumberKeyword | TSObjectKeyword | TSOptionalType | TSParameterProperty | TSParenthesizedType | TSPropertySignature | TSQualifiedName | TSRestType | TSSatisfiesExpression | TSStringKeyword | TSSymbolKeyword | TSThisType | TSTupleType | TSType | TSTypeAliasDeclaration | TSTypeAnnotation | TSTypeAssertion | TSTypeElement | TSTypeLiteral | TSTypeOperator | TSTypeParameter | TSTypeParameterDeclaration | TSTypeParameterInstantiation | TSTypePredicate | TSTypeQuery | TSTypeReference | TSUndefinedKeyword | TSUnionType | TSUnknownKeyword | TSVoidKeyword | TaggedTemplateExpression | TemplateElement | TemplateLiteral | Terminatorless | ThisExpression | ThisTypeAnnotation | ThrowStatement | TopicReference | TryStatement | TupleExpression | TupleTypeAnnotation | TypeAlias | TypeAnnotation | TypeCastExpression | TypeParameter | TypeParameterDeclaration | TypeParameterInstantiation | TypeScript | TypeofTypeAnnotation | UnaryExpression | UnaryLike | UnionTypeAnnotation | UpdateExpression | UserWhitespacable | V8IntrinsicIdentifier | VariableDeclaration | VariableDeclarator | Variance | VoidTypeAnnotation | While | WhileStatement | WithStatement | YieldExpression;
+export type Node = Accessor | AnyTypeAnnotation | ArgumentPlaceholder | ArrayExpression | ArrayPattern | ArrayTypeAnnotation | ArrowFunctionExpression | AssignmentExpression | AssignmentPattern | AwaitExpression | BigIntLiteral | Binary | BinaryExpression | BindExpression | Block | BlockParent | BlockStatement | BooleanLiteral | BooleanLiteralTypeAnnotation | BooleanTypeAnnotation | BreakStatement | CallExpression | CatchClause | Class | ClassAccessorProperty | ClassBody | ClassDeclaration | ClassExpression | ClassImplements | ClassMethod | ClassPrivateMethod | ClassPrivateProperty | ClassProperty | CompletionStatement | Conditional | ConditionalExpression | ContinueStatement | DebuggerStatement | DecimalLiteral | Declaration | DeclareClass | DeclareExportAllDeclaration | DeclareExportDeclaration | DeclareFunction | DeclareInterface | DeclareModule | DeclareModuleExports | DeclareOpaqueType | DeclareTypeAlias | DeclareVariable | DeclaredPredicate | Decorator | Directive | DirectiveLiteral | DoExpression | DoWhileStatement | EmptyStatement | EmptyTypeAnnotation | EnumBody | EnumBooleanBody | EnumBooleanMember | EnumDeclaration | EnumDefaultedMember | EnumMember | EnumNumberBody | EnumNumberMember | EnumStringBody | EnumStringMember | EnumSymbolBody | ExistsTypeAnnotation | ExportAllDeclaration | ExportDeclaration | ExportDefaultDeclaration | ExportDefaultSpecifier | ExportNamedDeclaration | ExportNamespaceSpecifier | ExportSpecifier | Expression | ExpressionStatement | ExpressionWrapper | File | Flow | FlowBaseAnnotation | FlowDeclaration | FlowPredicate | FlowType | For | ForInStatement | ForOfStatement | ForStatement | ForXStatement | Function | FunctionDeclaration | FunctionExpression | FunctionParent | FunctionTypeAnnotation | FunctionTypeParam | GenericTypeAnnotation | Identifier | IfStatement | Immutable | Import | ImportAttribute | ImportDeclaration | ImportDefaultSpecifier | ImportNamespaceSpecifier | ImportSpecifier | IndexedAccessType | InferredPredicate | InterfaceDeclaration | InterfaceExtends | InterfaceTypeAnnotation | InterpreterDirective | IntersectionTypeAnnotation | JSX | JSXAttribute | JSXClosingElement | JSXClosingFragment | JSXElement | JSXEmptyExpression | JSXExpressionContainer | JSXFragment | JSXIdentifier | JSXMemberExpression | JSXNamespacedName | JSXOpeningElement | JSXOpeningFragment | JSXSpreadAttribute | JSXSpreadChild | JSXText | LVal | LabeledStatement | Literal | LogicalExpression | Loop | Marko | MarkoAttribute | MarkoCDATA | MarkoClass | MarkoComment | MarkoDeclaration | MarkoDocumentType | MarkoParseError | MarkoPlaceholder | MarkoScriptlet | MarkoSpreadAttribute | MarkoTag | MarkoTagBody | MarkoText | MemberExpression | MetaProperty | Method | Miscellaneous | MixedTypeAnnotation | ModuleDeclaration | ModuleExpression | ModuleSpecifier | NewExpression | Noop | NullLiteral | NullLiteralTypeAnnotation | NullableTypeAnnotation | NumberLiteral | NumberLiteralTypeAnnotation | NumberTypeAnnotation | NumericLiteral | ObjectExpression | ObjectMember | ObjectMethod | ObjectPattern | ObjectProperty | ObjectTypeAnnotation | ObjectTypeCallProperty | ObjectTypeIndexer | ObjectTypeInternalSlot | ObjectTypeProperty | ObjectTypeSpreadProperty | OpaqueType | OptionalCallExpression | OptionalIndexedAccessType | OptionalMemberExpression | ParenthesizedExpression | Pattern | PatternLike | PipelineBareFunction | PipelinePrimaryTopicReference | PipelineTopicExpression | Placeholder | Private | PrivateName | Program | Property | Pureish | QualifiedTypeIdentifier | RecordExpression | RegExpLiteral | RegexLiteral | RestElement | RestProperty | ReturnStatement | Scopable | Scope | SequenceExpression | SpreadElement | SpreadProperty | Standardized | Statement | StaticBlock | StringLiteral | StringLiteralTypeAnnotation | StringTypeAnnotation | Super | SwitchCase | SwitchStatement | SymbolTypeAnnotation | TSAnyKeyword | TSArrayType | TSAsExpression | TSBaseType | TSBigIntKeyword | TSBooleanKeyword | TSCallSignatureDeclaration | TSConditionalType | TSConstructSignatureDeclaration | TSConstructorType | TSDeclareFunction | TSDeclareMethod | TSEntityName | TSEnumDeclaration | TSEnumMember | TSExportAssignment | TSExpressionWithTypeArguments | TSExternalModuleReference | TSFunctionType | TSImportEqualsDeclaration | TSImportType | TSIndexSignature | TSIndexedAccessType | TSInferType | TSInstantiationExpression | TSInterfaceBody | TSInterfaceDeclaration | TSIntersectionType | TSIntrinsicKeyword | TSLiteralType | TSMappedType | TSMethodSignature | TSModuleBlock | TSModuleDeclaration | TSNamedTupleMember | TSNamespaceExportDeclaration | TSNeverKeyword | TSNonNullExpression | TSNullKeyword | TSNumberKeyword | TSObjectKeyword | TSOptionalType | TSParameterProperty | TSParenthesizedType | TSPropertySignature | TSQualifiedName | TSRestType | TSSatisfiesExpression | TSStringKeyword | TSSymbolKeyword | TSThisType | TSTupleType | TSType | TSTypeAliasDeclaration | TSTypeAnnotation | TSTypeAssertion | TSTypeElement | TSTypeLiteral | TSTypeOperator | TSTypeParameter | TSTypeParameterDeclaration | TSTypeParameterInstantiation | TSTypePredicate | TSTypeQuery | TSTypeReference | TSUndefinedKeyword | TSUnionType | TSUnknownKeyword | TSVoidKeyword | TaggedTemplateExpression | TemplateElement | TemplateLiteral | Terminatorless | ThisExpression | ThisTypeAnnotation | ThrowStatement | TopicReference | TryStatement | TupleExpression | TupleTypeAnnotation | TypeAlias | TypeAnnotation | TypeCastExpression | TypeParameter | TypeParameterDeclaration | TypeParameterInstantiation | TypeScript | TypeofTypeAnnotation | UnaryExpression | UnaryLike | UnionTypeAnnotation | UpdateExpression | UserWhitespacable | V8IntrinsicIdentifier | VariableDeclaration | VariableDeclarator | Variance | VoidTypeAnnotation | While | WhileStatement | WithStatement | YieldExpression;
 
 export interface ArrayExpression extends BaseNode {
   type: "ArrayExpression";
@@ -1650,6 +1650,13 @@ export interface TSTypeParameter extends BaseNode {
   out: boolean | null;
 }
 
+export interface MarkoParseError extends BaseNode {
+  type: "MarkoParseError";
+  source: string;
+  label: string;
+  errorLoc: object | null;
+}
+
 export interface MarkoDocumentType extends BaseNode {
   type: "MarkoDocumentType";
   value: string;
@@ -1744,12 +1751,12 @@ export type RestProperty = RestElement;
 export type SpreadProperty = SpreadElement;
 
 export type Standardized = ArrayExpression | AssignmentExpression | BinaryExpression | InterpreterDirective | Directive | DirectiveLiteral | BlockStatement | BreakStatement | CallExpression | CatchClause | ConditionalExpression | ContinueStatement | DebuggerStatement | DoWhileStatement | EmptyStatement | ExpressionStatement | File | ForInStatement | ForStatement | FunctionDeclaration | FunctionExpression | Identifier | IfStatement | LabeledStatement | StringLiteral | NumericLiteral | NullLiteral | BooleanLiteral | RegExpLiteral | LogicalExpression | MemberExpression | NewExpression | Program | ObjectExpression | ObjectMethod | ObjectProperty | RestElement | ReturnStatement | SequenceExpression | ParenthesizedExpression | SwitchCase | SwitchStatement | ThisExpression | ThrowStatement | TryStatement | UnaryExpression | UpdateExpression | VariableDeclaration | VariableDeclarator | WhileStatement | WithStatement | AssignmentPattern | ArrayPattern | ArrowFunctionExpression | ClassBody | ClassExpression | ClassDeclaration | ExportAllDeclaration | ExportDefaultDeclaration | ExportNamedDeclaration | ExportSpecifier | ForOfStatement | ImportDeclaration | ImportDefaultSpecifier | ImportNamespaceSpecifier | ImportSpecifier | MetaProperty | ClassMethod | ObjectPattern | SpreadElement | Super | TaggedTemplateExpression | TemplateElement | TemplateLiteral | YieldExpression | AwaitExpression | Import | BigIntLiteral | ExportNamespaceSpecifier | OptionalMemberExpression | OptionalCallExpression | ClassProperty | ClassAccessorProperty | ClassPrivateProperty | ClassPrivateMethod | PrivateName | StaticBlock;
-export type Expression = ArrayExpression | AssignmentExpression | BinaryExpression | CallExpression | ConditionalExpression | FunctionExpression | Identifier | StringLiteral | NumericLiteral | NullLiteral | BooleanLiteral | RegExpLiteral | LogicalExpression | MemberExpression | NewExpression | ObjectExpression | SequenceExpression | ParenthesizedExpression | ThisExpression | UnaryExpression | UpdateExpression | ArrowFunctionExpression | ClassExpression | MetaProperty | Super | TaggedTemplateExpression | TemplateLiteral | YieldExpression | AwaitExpression | Import | BigIntLiteral | OptionalMemberExpression | OptionalCallExpression | TypeCastExpression | JSXElement | JSXFragment | BindExpression | DoExpression | RecordExpression | TupleExpression | DecimalLiteral | ModuleExpression | TopicReference | PipelineTopicExpression | PipelineBareFunction | PipelinePrimaryTopicReference | TSInstantiationExpression | TSAsExpression | TSSatisfiesExpression | TSTypeAssertion | TSNonNullExpression;
+export type Expression = ArrayExpression | AssignmentExpression | BinaryExpression | CallExpression | ConditionalExpression | FunctionExpression | Identifier | StringLiteral | NumericLiteral | NullLiteral | BooleanLiteral | RegExpLiteral | LogicalExpression | MemberExpression | NewExpression | ObjectExpression | SequenceExpression | ParenthesizedExpression | ThisExpression | UnaryExpression | UpdateExpression | ArrowFunctionExpression | ClassExpression | MetaProperty | Super | TaggedTemplateExpression | TemplateLiteral | YieldExpression | AwaitExpression | Import | BigIntLiteral | OptionalMemberExpression | OptionalCallExpression | TypeCastExpression | JSXElement | JSXFragment | BindExpression | DoExpression | RecordExpression | TupleExpression | DecimalLiteral | ModuleExpression | TopicReference | PipelineTopicExpression | PipelineBareFunction | PipelinePrimaryTopicReference | TSInstantiationExpression | TSAsExpression | TSSatisfiesExpression | TSTypeAssertion | TSNonNullExpression | MarkoParseError;
 export type Binary = BinaryExpression | LogicalExpression;
 export type Scopable = BlockStatement | CatchClause | DoWhileStatement | ForInStatement | ForStatement | FunctionDeclaration | FunctionExpression | Program | ObjectMethod | SwitchStatement | WhileStatement | ArrowFunctionExpression | ClassExpression | ClassDeclaration | ForOfStatement | ClassMethod | ClassPrivateMethod | StaticBlock | TSModuleBlock;
 export type BlockParent = BlockStatement | CatchClause | DoWhileStatement | ForInStatement | ForStatement | FunctionDeclaration | FunctionExpression | Program | ObjectMethod | SwitchStatement | WhileStatement | ArrowFunctionExpression | ForOfStatement | ClassMethod | ClassPrivateMethod | StaticBlock | TSModuleBlock | MarkoTagBody;
 export type Block = BlockStatement | Program | TSModuleBlock;
-export type Statement = BlockStatement | BreakStatement | ContinueStatement | DebuggerStatement | DoWhileStatement | EmptyStatement | ExpressionStatement | ForInStatement | ForStatement | FunctionDeclaration | IfStatement | LabeledStatement | ReturnStatement | SwitchStatement | ThrowStatement | TryStatement | VariableDeclaration | WhileStatement | WithStatement | ClassDeclaration | ExportAllDeclaration | ExportDefaultDeclaration | ExportNamedDeclaration | ForOfStatement | ImportDeclaration | DeclareClass | DeclareFunction | DeclareInterface | DeclareModule | DeclareModuleExports | DeclareTypeAlias | DeclareOpaqueType | DeclareVariable | DeclareExportDeclaration | DeclareExportAllDeclaration | InterfaceDeclaration | OpaqueType | TypeAlias | EnumDeclaration | TSDeclareFunction | TSInterfaceDeclaration | TSTypeAliasDeclaration | TSEnumDeclaration | TSModuleDeclaration | TSImportEqualsDeclaration | TSExportAssignment | TSNamespaceExportDeclaration | MarkoDocumentType | MarkoDeclaration | MarkoCDATA | MarkoComment | MarkoText | MarkoPlaceholder | MarkoScriptlet | MarkoClass | MarkoTag;
+export type Statement = BlockStatement | BreakStatement | ContinueStatement | DebuggerStatement | DoWhileStatement | EmptyStatement | ExpressionStatement | ForInStatement | ForStatement | FunctionDeclaration | IfStatement | LabeledStatement | ReturnStatement | SwitchStatement | ThrowStatement | TryStatement | VariableDeclaration | WhileStatement | WithStatement | ClassDeclaration | ExportAllDeclaration | ExportDefaultDeclaration | ExportNamedDeclaration | ForOfStatement | ImportDeclaration | DeclareClass | DeclareFunction | DeclareInterface | DeclareModule | DeclareModuleExports | DeclareTypeAlias | DeclareOpaqueType | DeclareVariable | DeclareExportDeclaration | DeclareExportAllDeclaration | InterfaceDeclaration | OpaqueType | TypeAlias | EnumDeclaration | TSDeclareFunction | TSInterfaceDeclaration | TSTypeAliasDeclaration | TSEnumDeclaration | TSModuleDeclaration | TSImportEqualsDeclaration | TSExportAssignment | TSNamespaceExportDeclaration | MarkoParseError | MarkoDocumentType | MarkoDeclaration | MarkoCDATA | MarkoComment | MarkoText | MarkoPlaceholder | MarkoScriptlet | MarkoClass | MarkoTag;
 export type Terminatorless = BreakStatement | ContinueStatement | ReturnStatement | ThrowStatement | YieldExpression | AwaitExpression;
 export type CompletionStatement = BreakStatement | ContinueStatement | ReturnStatement | ThrowStatement;
 export type Conditional = ConditionalExpression | IfStatement;
@@ -1792,7 +1799,7 @@ export type TypeScript = TSParameterProperty | TSDeclareFunction | TSDeclareMeth
 export type TSTypeElement = TSCallSignatureDeclaration | TSConstructSignatureDeclaration | TSPropertySignature | TSMethodSignature | TSIndexSignature;
 export type TSType = TSAnyKeyword | TSBooleanKeyword | TSBigIntKeyword | TSIntrinsicKeyword | TSNeverKeyword | TSNullKeyword | TSNumberKeyword | TSObjectKeyword | TSStringKeyword | TSSymbolKeyword | TSUndefinedKeyword | TSUnknownKeyword | TSVoidKeyword | TSThisType | TSFunctionType | TSConstructorType | TSTypeReference | TSTypePredicate | TSTypeQuery | TSTypeLiteral | TSArrayType | TSTupleType | TSOptionalType | TSRestType | TSUnionType | TSIntersectionType | TSConditionalType | TSInferType | TSParenthesizedType | TSTypeOperator | TSIndexedAccessType | TSMappedType | TSLiteralType | TSExpressionWithTypeArguments | TSImportType;
 export type TSBaseType = TSAnyKeyword | TSBooleanKeyword | TSBigIntKeyword | TSIntrinsicKeyword | TSNeverKeyword | TSNullKeyword | TSNumberKeyword | TSObjectKeyword | TSStringKeyword | TSSymbolKeyword | TSUndefinedKeyword | TSUnknownKeyword | TSVoidKeyword | TSThisType | TSLiteralType;
-export type Marko = MarkoDocumentType | MarkoDeclaration | MarkoCDATA | MarkoComment | MarkoText | MarkoPlaceholder | MarkoScriptlet | MarkoClass | MarkoAttribute | MarkoSpreadAttribute | MarkoTagBody | MarkoTag;
+export type Marko = MarkoParseError | MarkoDocumentType | MarkoDeclaration | MarkoCDATA | MarkoComment | MarkoText | MarkoPlaceholder | MarkoScriptlet | MarkoClass | MarkoAttribute | MarkoSpreadAttribute | MarkoTagBody | MarkoTag;
 export type Scope = MarkoTagBody;
 
 export interface Aliases {
@@ -2100,6 +2107,7 @@ export function tsTypeAnnotation(typeAnnotation: TSType): TSTypeAnnotation;
 export function tsTypeParameterInstantiation(params: Array<TSType>): TSTypeParameterInstantiation;
 export function tsTypeParameterDeclaration(params: Array<TSTypeParameter>): TSTypeParameterDeclaration;
 export function tsTypeParameter(constraint: TSType | null | undefined, _default: TSType | null | undefined, name: string): TSTypeParameter;
+export function markoParseError(source: string, label: string, errorLoc?: object | null): MarkoParseError;
 export function markoDocumentType(value: string): MarkoDocumentType;
 export function markoDeclaration(value: string): MarkoDeclaration;
 export function markoCDATA(value: string): MarkoCDATA;
@@ -2396,6 +2404,8 @@ export function isMarkoDeclaration(node: object | null | undefined, opts?: objec
 export function assertMarkoDeclaration(node: object | null | undefined, opts?: object | null): void;
 export function isMarkoDocumentType(node: object | null | undefined, opts?: object | null): node is MarkoDocumentType;
 export function assertMarkoDocumentType(node: object | null | undefined, opts?: object | null): void;
+export function isMarkoParseError(node: object | null | undefined, opts?: object | null): node is MarkoParseError;
+export function assertMarkoParseError(node: object | null | undefined, opts?: object | null): void;
 export function isMarkoPlaceholder(node: object | null | undefined, opts?: object | null): node is MarkoPlaceholder;
 export function assertMarkoPlaceholder(node: object | null | undefined, opts?: object | null): void;
 export function isMarkoScriptlet(node: object | null | undefined, opts?: object | null): node is MarkoScriptlet;

package/dist/util/merge-errors.js

@@ -0,0 +1,28 @@
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = throwAggregateError;var _kleur = _interopRequireDefault(require("kleur"));
+
+function throwAggregateError(errors) {
+  switch (errors.length) {
+    case 0:
+      return;
+    case 1:
+      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`;
+
+  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;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/compiler",
   "description": "Marko template to JS compiler.",
-  "version": "5.28.4",
+  "version": "5.29.0",
   "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.1",
+    "@marko/babel-utils": "^6.0.0",
     "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.4"
+    "@marko/translator-default": "^5.27.0"
   },
   "files": [
     "dist",