@marko/compiler 5.39.47 → 5.39.49

package/dist/babel-utils/tags.js

@@ -1,6 +1,5 @@
 "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 _lassoPackageRoot = require("lasso-package-root");
 var _path = require("path");
 
 var _quickHash = require("../util/quick-hash");
@@ -255,35 +254,17 @@ function loadFileForTag(tag) {
   const filename = def && def.template;
 
   if (filename) {
-    const markoMeta = file.metadata.marko;
-    const relativeFileName = (0, _imports.resolveRelativePath)(file, filename);
-    const { analyzedTags } = markoMeta;
-    if (analyzedTags) {
-      analyzedTags.add(relativeFileName);
-    } else {
-      markoMeta.analyzedTags = new Set([relativeFileName]);
-    }
-
     return resolveMarkoFile(file, filename);
   }
 }
 
 function loadFileForImport(file, request) {
   const relativeRequest = resolveTagImport(file.path, request);
-
   if (relativeRequest) {
     const filename =
     relativeRequest[0] === "." ?
     (0, _path.resolve)(file.opts.filename, "..", relativeRequest) :
     _modules.default.resolve(relativeRequest, (0, _path.dirname)(file.opts.filename));
-    const markoMeta = file.metadata.marko;
-    const { analyzedTags } = markoMeta;
-    if (analyzedTags) {
-      analyzedTags.add(relativeRequest);
-    } else {
-      markoMeta.analyzedTags = new Set([relativeRequest]);
-    }
-
     return resolveMarkoFile(file, filename);
   }
 }
@@ -298,11 +279,14 @@ function resolveMarkoFile(file, filename) {
   }
 
   try {
-    return file.___getMarkoFile(
+    const childFile = file.___getMarkoFile(
       file.markoOpts.fileSystem.readFileSync(filename).toString("utf-8"),
       createNewFileOpts(file.opts, filename),
       file.markoOpts
     );
+
+    (file.metadata.marko.analyzedTags ||= new Set()).add(filename);
+    return childFile;
   } catch (_) {
 
     // ignore
@@ -311,10 +295,11 @@ function resolveMarkoFile(file, filename) {
 const idCache = new WeakMap();
 const templateIdHashOpts = { outputLength: 5 };
 function getTemplateId(opts, request, child) {
+  if (!child && opts.getTemplateId) return opts.getTemplateId(request);
+
   const id = (0, _path.relative)(root, request).replace(/[^a-zA-Z0-9_$./-]/g, "/");
-  const optimize = typeof opts === "object" ? opts.optimize : opts;
 
-  if (optimize) {
+  if (opts.optimize) {
     const optimizeKnownTemplates =
     typeof opts === "object" && opts.optimizeKnownTemplates;
     const knownTemplatesSize = optimizeKnownTemplates?.length || 0;

package/dist/taglib/index.js

@@ -1,5 +1,4 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports._loader = exports._finder = void 0;exports.buildLookup = buildLookup;exports.clearCaches = clearCaches;exports.excludePackage = exports.excludeDir = void 0;exports.register = register;exports.resolveOptionalTaglibs = resolveOptionalTaglibs;var _modules = _interopRequireDefault(require("@marko/compiler/modules"));
-var _lassoPackageRoot = require("lasso-package-root");
 var _path = _interopRequireDefault(require("path"));
 
 var _tryLoadTranslator = _interopRequireDefault(require("../util/try-load-translator"));

package/package.json

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