@marko/compiler 5.39.19 → 5.39.21

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

@@ -282,7 +282,14 @@ function expressionCouldHaveUnenclosedWhitespace(node) {
   }
 }
 
+/**
+ * @param {import("@marko/compiler").types.Expression} node
+ */
 function statementCouldHaveUnenclosedNewline(node) {
+  if (node.leadingComments?.length || node.trailingComments?.length) {
+    return true;
+  }
+
   switch (node.type) {
     case "VariableDeclaration":
       return node.declarations.length > 1;

package/dist/babel-utils/tags.js

@@ -1,8 +1,8 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.findAttributeTags = findAttributeTags;exports.findParentTag = findParentTag;exports.getArgOrSequence = getArgOrSequence;exports.getFullyResolvedTagName = getFullyResolvedTagName;exports.getMacroIdentifier = getMacroIdentifier;exports.getMacroIdentifierForName = getMacroIdentifierForName;exports.getTagDef = getTagDef;exports.getTagTemplate = getTagTemplate;exports.getTemplateId = getTemplateId;exports.hasMacro = hasMacro;exports.isAttributeTag = isAttributeTag;exports.isDynamicTag = isDynamicTag;exports.isLoopTag = isLoopTag;exports.isMacroTag = isMacroTag;exports.isNativeTag = isNativeTag;exports.isTransparentTag = isTransparentTag;exports.loadFileForImport = loadFileForImport;exports.loadFileForTag = loadFileForTag;exports.registerMacro = registerMacro;exports.resolveTagImport = resolveTagImport;var _compiler = require("@marko/compiler");
+var _modules = _interopRequireDefault(require("@marko/compiler/modules"));
 var _crypto = require("crypto");
 var _lassoPackageRoot = require("lasso-package-root");
 var _path = require("path");
-var _resolveFrom = _interopRequireDefault(require("resolve-from"));
 
 var _diagnostics = require("./diagnostics");
 var _imports = require("./imports");
@@ -281,7 +281,7 @@ function loadFileForImport(file, request) {
     const filename =
     relativeRequest[0] === "." ?
     (0, _path.resolve)(file.opts.filename, "..", relativeRequest) :
-    (0, _resolveFrom.default)((0, _path.dirname)(file.opts.filename), relativeRequest);
+    _modules.default.resolve(relativeRequest, (0, _path.dirname)(file.opts.filename));
     const markoMeta = file.metadata.marko;
     const { analyzedTags } = markoMeta;
     if (analyzedTags) {

package/dist/index.js

@@ -6,6 +6,7 @@ var _pluginTransformTypescript = _interopRequireDefault(require("@babel/plugin-t
 var _babelUtils = require("@marko/compiler/babel-utils");
 var _path = _interopRequireDefault(require("path"));
 
+var _modules = _interopRequireDefault(require("../modules"));
 var _babelPlugin = _interopRequireDefault(require("./babel-plugin"));
 var _config = _interopRequireDefault(require("./config"));
 var taglib = _interopRequireWildcard(require("./taglib"));exports.taglib = taglib;
@@ -15,8 +16,6 @@ var _shouldOptimize = _interopRequireDefault(require("./util/should-optimize"));
 var _tryLoadTranslator = _interopRequireDefault(require("./util/try-load-translator"));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 CWD = process.cwd();
-
 let globalConfig = exports.globalConfig = { ..._config.default };
 function configure(newConfig) {
   exports.globalConfig = globalConfig = { ..._config.default, ...newConfig };
@@ -103,7 +102,9 @@ function getBaseBabelConfig(filename, { babelConfig, ...markoConfig }) {
 
 
   const baseBabelConfig = {
-    filenameRelative: filename ? _path.default.relative(CWD, filename) : undefined,
+    filenameRelative: filename ?
+    _path.default.relative(_modules.default.cwd, filename) :
+    undefined,
     sourceRoot: filename ? _path.default.dirname(filename) : undefined,
     sourceFileName: filename ? _path.default.basename(filename) : undefined,
     configFile: isTranslated,

package/dist/taglib/finder/index.js

@@ -1,7 +1,7 @@
 "use strict";
 var nodePath = require("path");
 var lassoPackageRoot = require("lasso-package-root");
-var resolveFrom = require("resolve-from").silent;
+var markoModules = require("../../../modules");
 var taglibConfig = require("../config");
 var taglibLoader = require("../loader");
 var findCache = {};
@@ -119,9 +119,9 @@ function find(dirname, registeredTaglibs, tagDiscoveryDirs) {
     // Now look for `marko.json` from installed packages
     getAllDependencyNames(rootPkg).forEach((name) => {
       if (!excludedPackages[name]) {
-        let taglibPath = resolveFrom(
-          rootPkg.__dirname,
-          nodePath.join(name, "marko.json")
+        let taglibPath = markoModules.tryResolve(
+          nodePath.join(name, "marko.json"),
+          rootPkg.__dirname
         );
         if (taglibPath) {
           var taglib = taglibLoader.loadTaglibFromFile(taglibPath, true);

package/dist/taglib/index.js

@@ -139,7 +139,7 @@ function resolveTaglib(id) {
       break;
   }
 
-  const resolved = _modules.default.require.resolve(id);
+  const resolved = _modules.default.resolve(id);
   return [resolved, _modules.default.require(resolved)];
 }
 

package/dist/taglib/loader/loadTagFromProps.js

@@ -4,7 +4,6 @@ var ok = require("assert").ok;
 var nodePath = require("path");
 var createError = require("raptor-util/createError");
 var isObjectEmpty = require("raptor-util/isObjectEmpty");
-var resolveFrom = require("resolve-from").silent;
 var markoModules = require("../../../modules");
 var taglibConfig = require("../config");
 var loaders = require("./loaders");
@@ -13,7 +12,9 @@ var types = require("./types");
 var hasOwnProperty = Object.prototype.hasOwnProperty;
 
 function resolveRelative(dirname, value) {
-  return value[0] === "." ? resolveFrom(dirname, value) || value : value;
+  return value[0] === "." ?
+  markoModules.tryResolve(value, dirname) || value :
+  value;
 }
 
 function resolveWithMarkoExt(dirname, value) {
@@ -25,13 +26,13 @@ function resolveWithMarkoExt(dirname, value) {
   {
     markoModules.require.extensions[".marko"] = undefined;
     try {
-      return resolveFrom(dirname, value) || value;
+      return markoModules.tryResolve(value, dirname) || value;
     } finally {
       delete markoModules.require.extensions[".marko"];
     }
   }
 
-  return resolveFrom(dirname, value);
+  return markoModules.tryResolve(value, dirname) || value;
 }
 
 function removeDashes(str) {

package/dist/taglib/loader/loadTaglibFromProps.js

@@ -3,7 +3,6 @@
 var ok = require("assert").ok;
 var nodePath = require("path");
 var createError = require("raptor-util/createError");
-var resolveFrom = require("resolve-from").silent;
 var markoModules = require("../../../modules");
 var taglibFS = require("../config");
 var DependencyChain = require("./DependencyChain");
@@ -15,7 +14,9 @@ var types = require("./types");
 var hasOwnProperty = Object.prototype.hasOwnProperty;
 
 function resolveRelative(dirname, value) {
-  return value[0] === "." ? resolveFrom(dirname, value) || value : value;
+  return value[0] === "." ?
+  markoModules.tryResolve(value, dirname) || value :
+  value;
 }
 
 function normalizeHook(dirname, value) {
@@ -289,7 +290,7 @@ class TaglibLoader {
         if (typeof curImport === "string") {
           var basename = nodePath.basename(curImport);
           if (basename === "package.json") {
-            var packagePath = resolveFrom(dirname, curImport);
+            var packagePath = markoModules.tryResolve(curImport, dirname);
             var packageDir = nodePath.dirname(packagePath);
             var pkg = jsonFileReader.readFileSync(packagePath);
             var dependencies = pkg.dependencies;
@@ -298,9 +299,9 @@ class TaglibLoader {
               for (var j = 0; j < dependencyNames.length; j++) {
                 var dependencyName = dependencyNames[j];
 
-                importPath = resolveFrom(
-                  packageDir,
-                  nodePath.join(dependencyName, "marko.json")
+                importPath = markoModules.tryResolve(
+                  nodePath.join(dependencyName, "marko.json"),
+                  packageDir
                 );
 
                 if (importPath) {
@@ -309,7 +310,7 @@ class TaglibLoader {
               }
             }
           } else {
-            importPath = resolveFrom(dirname, curImport);
+            importPath = markoModules.tryResolve(curImport, dirname);
             if (importPath) {
               taglib.addImport(importPath);
             } else {

package/dist/util/try-load-translator.js

@@ -1,11 +1,11 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = _default;var _modules = _interopRequireDefault(require("../../modules"));
-var _config = _interopRequireDefault(require("../config"));
 const cache = {};
 
-function _default(requested = _config.default.translator) {
+function _default(requested) {
   if (typeof requested === "string") {
     return (
-      cache[requested] || (cache[requested] = _modules.default.require(requested)));
+      cache[requested] || (
+      cache[requested] = _modules.default.require(_modules.default.resolve(requested))));
 
   }
 

package/modules.js

@@ -1,4 +1,28 @@
 "use strict";
 
-exports.require =
-  process.env.BUNDLE || typeof document === "object" ? undefined : require;
+if (process.env.BUNDLE || typeof document === "object") {
+  exports.cwd = "/";
+  exports.root = "/";
+  exports.require = undefined;
+  exports.resolve = undefined;
+  exports.tryResolve = undefined;
+} else {
+  const resolveFrom = require("resolve-from");
+  const cwd = process.cwd();
+  const root = (() => {
+    try {
+      return require("lasso-package-root").getRootDir(cwd) || cwd;
+    } catch {
+      return cwd;
+    }
+  })();
+  exports.cwd = cwd;
+  exports.root = root;
+  exports.require = require;
+  exports.resolve = (id, from) => {
+    return resolveFrom(from || root, id);
+  };
+  exports.tryResolve = (id, from) => {
+    return resolveFrom.silent(from || root, id);
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.39.19",
+  "version": "5.39.21",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",
@@ -87,7 +87,7 @@
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
-    "marko": "^5.37.29"
+    "marko": "^5.37.32"
   },
   "engines": {
     "node": "18 || 20 || >=22"