@marko/compiler 5.39.8 → 5.39.9

package/dist/babel-plugin/parser.js

@@ -1,4 +1,4 @@
-"use strict";exports.__esModule = true;exports.parseMarko = parseMarko;var _babelUtils = require("@marko/compiler/babel-utils");
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.parseMarko = parseMarko;var _babelUtils = require("@marko/compiler/babel-utils");
 
 
 
@@ -11,7 +11,9 @@
 
 var _htmljsParser = require("htmljs-parser");
 
-var t = _interopRequireWildcard(require("../babel-types"));function _getRequireWildcardCache(e) {if ("function" != typeof WeakMap) return null;var r = new WeakMap(),t = new WeakMap();return (_getRequireWildcardCache = function (e) {return e ? t : r;})(e);}function _interopRequireWildcard(e, r) {if (!r && e && e.__esModule) return e;if (null === e || "object" != typeof e && "function" != typeof e) return { default: e };var t = _getRequireWildcardCache(r);if (t && t.has(e)) return t.get(e);var n = { __proto__: null },a = Object.defineProperty && Object.getOwnPropertyDescriptor;for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) {var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u];}return n.default = e, t && t.set(e, n), n;}
+var t = _interopRequireWildcard(require("../babel-types"));
+var _buildCodeFrame = require("../util/build-code-frame");
+var _mergeErrors = _interopRequireDefault(require("../util/merge-errors"));function _getRequireWildcardCache(e) {if ("function" != typeof WeakMap) return null;var r = new WeakMap(),t = new WeakMap();return (_getRequireWildcardCache = function (e) {return e ? t : r;})(e);}function _interopRequireWildcard(e, r) {if (!r && e && e.__esModule) return e;if (null === e || "object" != typeof e && "function" != typeof e) return { default: e };var t = _getRequireWildcardCache(r);if (t && t.has(e)) return t.get(e);var n = { __proto__: null },a = Object.defineProperty && Object.getOwnPropertyDescriptor;for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) {var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u];}return n.default = e, t && t.set(e, n), n;}
 
 const noop = () => {};
 const emptyRange = (part) => part.start === part.end;
@@ -124,7 +126,33 @@ function parseMarko(file) {
 
   const parser = (0, _htmljsParser.createParser)({
     onError(part) {
-      throw file.buildCodeFrameError({ loc: locationAt(part) }, part.message);
+      const err = (0, _buildCodeFrame.buildCodeFrameError)(
+        file.opts.filename,
+        file.code,
+        locationAt(part),
+        part.message
+      );
+
+      if (!file.___hasParseErrors) {
+        throw err;
+      }
+
+      const 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
+            )
+          );
+        }
+      });
+
+      errors.push(err);
+      (0, _mergeErrors.default)(errors);
     },
     onText(part) {
       const rawValue = parser.read(part);

package/dist/taglib/loader/loadTagFromProps.js

@@ -13,7 +13,7 @@ var types = require("./types");
 var hasOwnProperty = Object.prototype.hasOwnProperty;
 
 function resolveRelative(dirname, value) {
-  return value[0] === "." ? resolveFrom(dirname, value) : value;
+  return value[0] === "." ? resolveFrom(dirname, value) || value : value;
 }
 
 function resolveWithMarkoExt(dirname, value) {
@@ -25,7 +25,7 @@ function resolveWithMarkoExt(dirname, value) {
   {
     markoModules.require.extensions[".marko"] = undefined;
     try {
-      return resolveFrom(dirname, value);
+      return resolveFrom(dirname, value) || value;
     } finally {
       delete markoModules.require.extensions[".marko"];
     }

package/dist/taglib/loader/loadTaglibFromProps.js

@@ -15,7 +15,7 @@ var types = require("./types");
 var hasOwnProperty = Object.prototype.hasOwnProperty;
 
 function resolveRelative(dirname, value) {
-  return value[0] === "." ? resolveFrom(dirname, value) : value;
+  return value[0] === "." ? resolveFrom(dirname, value) || value : value;
 }
 
 function normalizeHook(dirname, value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.39.8",
+  "version": "5.39.9",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",
@@ -86,7 +86,7 @@
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
-    "marko": "^5.37.9"
+    "marko": "^5.37.10"
   },
   "engines": {
     "node": "18 || 20 || >=22"