@marko/compiler 5.39.44 → 5.39.46

package/babel-utils.d.ts

@@ -85,6 +85,8 @@ export interface TaglibLookup {
     tagName: string,
     callback: (attr: AttributeDefinition, tag: TagDefinition) => void,
   ): void;
+  exclusiveTagDiscoveryDirs: undefined | false | string;
+  manualTagsDirs: undefined | Set<string>;
 }
 
 export interface Attribute {

package/dist/babel-plugin/index.js

@@ -220,7 +220,8 @@ function getMarkoFile(code, fileOpts, markoOpts) {
       deps: [],
       tags: [],
       watchFiles: [],
-      diagnostics: []
+      diagnostics: [],
+      api: translator.preferAPI
     };
 
     (0, _parser.parseMarko)(file);

package/dist/taglib/finder/index.js

@@ -51,27 +51,13 @@ function getAllDependencyNames(pkg) {
 }
 
 function find(dirname, registeredTaglibs, tagDiscoveryDirs) {
-  var found = findCache[dirname];
-  if (found) {
-    return found;
+  var cached = findCache[dirname];
+  if (cached) {
+    return cached.taglibs;
   }
 
-  found = [];
-
-  var added = {};
-
-  var helper = {
-    addTaglib: function (taglib) {
-      if (added[taglib.id]) {
-        return;
-      }
-
-      added[taglib.id] = true;
-      found.push(taglib);
-    },
-    foundTaglibPackages: {}
-  };
-
+  var taglibs = [];
+  var added = new Set();
   var rootDirname = markoModules.cwd; // Don't search up past this directory
   var rootPkg = getModuleRootPackage(dirname);
   if (rootPkg) {
@@ -80,27 +66,41 @@ function find(dirname, registeredTaglibs, tagDiscoveryDirs) {
 
   // First walk up the directory tree looking for marko.json files or components/ directories
   let curDirname = dirname;
+  // exclusiveTagDiscoveryDirs is used for the interop to detect if `tags` directories are used exclusively when finding tags
+  let exclusiveTagDiscoveryDirs = undefined;
 
   while (true) {
     if (!excludedDirs[curDirname]) {
       let taglibPath = nodePath.join(curDirname, "marko.json");
       let taglib;
+      let manualTagsDir;
 
       if (existsSync(taglibPath)) {
         taglib = taglibLoader.loadTaglibFromFile(taglibPath);
-        helper.addTaglib(taglib);
+        manualTagsDir = taglib.tagsDir;
+        addTaglib(taglib);
       }
 
-      if (!taglib || taglib.tagsDir === undefined) {
+      if (manualTagsDir === undefined) {
         for (const tagDiscoveryDir of tagDiscoveryDirs) {
           const componentsPath = nodePath.join(curDirname, tagDiscoveryDir);
 
           if (existsSync(componentsPath) && !excludedDirs[componentsPath]) {
-            helper.addTaglib(
+            if (exclusiveTagDiscoveryDirs !== false) {
+              if (exclusiveTagDiscoveryDirs === undefined) {
+                exclusiveTagDiscoveryDirs = tagDiscoveryDir;
+              } else if (exclusiveTagDiscoveryDirs !== tagDiscoveryDir) {
+                exclusiveTagDiscoveryDirs = false;
+              }
+            }
+
+            addTaglib(
               taglibLoader.loadTaglibFromDir(curDirname, tagDiscoveryDir)
             );
           }
         }
+      } else if (manualTagsDir) {
+        exclusiveTagDiscoveryDirs = false;
       }
     }
 
@@ -120,26 +120,41 @@ function find(dirname, registeredTaglibs, tagDiscoveryDirs) {
     getAllDependencyNames(rootPkg).forEach((name) => {
       if (!excludedPackages[name]) {
         let taglibPath = markoModules.tryResolve(
-          nodePath.join(name, "marko.json"),
+          name + "/marko.json",
           rootPkg.__dirname
         );
         if (taglibPath) {
           var taglib = taglibLoader.loadTaglibFromFile(taglibPath, true);
-          helper.addTaglib(taglib);
+          addTaglib(taglib);
         }
       }
     });
   }
 
   for (let i = registeredTaglibs.length; i--;) {
-    helper.addTaglib(registeredTaglibs[i]);
+    addTaglib(registeredTaglibs[i]);
   }
 
-  findCache[dirname] = found;
+  findCache[dirname] = { exclusiveTagDiscoveryDirs, taglibs };
+  return taglibs;
 
-  return found;
+  function addTaglib(taglib) {
+    if (!added.has(taglib.id)) {
+      added.add(taglib.id);
+      taglibs.push(taglib);
+    }
+  }
 }
 
+find._withMeta = function findWithMeta(
+dirname,
+registeredTaglibs,
+tagDiscoveryDirs)
+{
+  find(dirname, registeredTaglibs, tagDiscoveryDirs);
+  return findCache[dirname];
+};
+
 function clearCache() {
   findCache = {};
 }

package/dist/taglib/index.js

@@ -32,6 +32,7 @@ function buildLookup(dirname, requestedTranslator, onError) {
   }
 
   let taglibsForDir = loadedTranslatorsTaglibs.get(translator);
+  let exclusiveTagDiscoveryDirs = undefined;
 
   if (!taglibsForDir) {
     loadedTranslatorsTaglibs.set(
@@ -45,11 +46,13 @@ function buildLookup(dirname, requestedTranslator, onError) {
   }
 
   runAndCatchErrors(() => {
-    taglibsForDir = _finder2.default.find(
+    const foundMeta = _finder2.default.find._withMeta(
       dirname,
       taglibsForDir,
       translator.tagDiscoveryDirs
     );
+    taglibsForDir = foundMeta.taglibs;
+    exclusiveTagDiscoveryDirs = foundMeta.exclusiveTagDiscoveryDirs;
   }, onError);
 
   const cacheKey = taglibsForDir.
@@ -60,6 +63,7 @@ function buildLookup(dirname, requestedTranslator, onError) {
 
   if (!lookup) {
     lookup = lookupCache[cacheKey] = new _lookup.default();
+    lookup.exclusiveTagDiscoveryDirs = exclusiveTagDiscoveryDirs;
     for (let i = taglibsForDir.length; i--;) {
       const taglib = taglibsForDir[i];
       lookup.addTaglib(taglib);

package/dist/taglib/loader/Taglib.js

@@ -39,6 +39,7 @@ class Taglib {
     this.patternAttributes = [];
     this.imports = null;
     this.importsLookup = null;
+    this.tagsDir = undefined;
   }
 
   addAttribute(attribute) {

package/dist/taglib/lookup/index.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var nodePath = require("path");
 var ok = require("assert").ok;
 var extend = require("raptor-util/extend");
 var taglibTypes = require("../loader/types");
@@ -51,6 +52,8 @@ class TaglibLookup {
     this.taglibsById = {};
 
     this._sortedTags = undefined;
+    this.exclusiveTagDiscoveryDirs = undefined;
+    this.manualTagsDirs = undefined;
   }
 
   hasTaglib(taglib) {
@@ -96,6 +99,16 @@ class TaglibLookup {
       return;
     }
 
+    if (
+    taglib.dirname &&
+    typeof taglib.tagsDir === "string" &&
+    /[/\\]tags[/\\]?$/.test(taglib.tagsDir))
+    {
+      (this.manualTagsDirs || (this.manualTagsDirs = new Set())).add(
+        nodePath.resolve(taglib.dirname, taglib.tagsDir)
+      );
+    }
+
     // console.log("TAGLIB:", taglib);
 
     this._sortedTags = undefined;

package/index.d.ts

@@ -29,6 +29,7 @@ export interface MarkoMeta {
   deps: Array<string | Dep | VirtualDep>;
   analyzedTags?: [string, ...string[]];
   diagnostics: Diagnostic[];
+  api: undefined | string;
 }
 
 export interface CompileResult {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.39.44",
+  "version": "5.39.46",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",
@@ -87,7 +87,7 @@
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
-    "marko": "^5.38.0"
+    "marko": "^5.38.1"
   },
   "engines": {
     "node": "18 || 20 || >=22"
@@ -112,7 +112,10 @@
       "types": "./register.d.ts",
       "default": "./src/register.js"
     },
-    "./modules": "./modules.js",
+    "./modules": {
+      "types": "./modules.d.ts",
+      "default": "./modules.js"
+    },
     "./babel-types": "./babel-types.d.ts",
     "./dist/types": "./dist/types.d.ts",
     "./package": "./package.json",