@mastra/deployer 1.0.0-beta.10 → 1.0.0-beta.13

package/dist/{chunk-MUWNMVNL.cjs → chunk-KCGBR2X6.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunk2OTEFUER_cjs = require('./chunk-2OTEFUER.cjs');
+var chunkVA2CSOKJ_cjs = require('./chunk-VA2CSOKJ.cjs');
 var babel = require('@babel/core');
 var fs = require('fs');
 var promises = require('fs/promises');
@@ -20,11 +20,11 @@ var findWorkspaces = require('find-workspaces');
 var logger = require('@mastra/core/logger');
 var virtual = require('@rollup/plugin-virtual');
 var module$1 = require('module');
+var localPkg = require('local-pkg');
 var nodeResolve = require('@rollup/plugin-node-resolve');
 var originalEsmShim = require('@rollup/plugin-esm-shim');
 var posix = require('path/posix');
 var resolve = require('resolve.exports');
-var localPkg = require('local-pkg');
 var error = require('@mastra/core/error');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -129,7 +129,7 @@ globalThis.__dirname = dirname(__filename);
       "--input-type=module",
       "--enable-source-maps",
       "-e",
-      `${prefixCode};import('file://${chunk2OTEFUER_cjs.slash(file)}').catch(err => {
+      `${prefixCode};import('file://${chunkVA2CSOKJ_cjs.slash(file)}').catch(err => {
         ${errorHandler.toString()}
         errorHandler(err);
       })`.replaceAll(/\n/g, "")
@@ -578,7 +578,7 @@ async function getWorkspaceInformation({
   mastraEntryFile
 }) {
   const closestPkgJson = pkg__namespace.up({ cwd: path2.dirname(mastraEntryFile) });
-  const location = closestPkgJson ? path2.dirname(chunk2OTEFUER_cjs.slash(closestPkgJson)) : chunk2OTEFUER_cjs.slash(process.cwd());
+  const location = closestPkgJson ? path2.dirname(chunkVA2CSOKJ_cjs.slash(closestPkgJson)) : chunkVA2CSOKJ_cjs.slash(process.cwd());
   const workspaces = await findWorkspaces.findWorkspaces(dir, { cache: workspacesCache });
   const _workspaceMap = new Map(
     workspaces?.map((workspace) => [
@@ -676,6 +676,25 @@ function removeDeployer2(mastraEntry, options) {
     }
   };
 }
+async function getPackageRootPath(packageName, parentPath) {
+  let rootPath;
+  try {
+    let options = void 0;
+    if (parentPath) {
+      if (!parentPath.startsWith("file://")) {
+        parentPath = url.pathToFileURL(parentPath).href;
+      }
+      options = {
+        paths: [parentPath]
+      };
+    }
+    const pkg2 = await localPkg.getPackageInfo(packageName, options);
+    rootPath = pkg2?.rootPath ?? null;
+  } catch (e) {
+    rootPath = null;
+  }
+  return rootPath;
+}
 
 // src/build/analyze/constants.ts
 var DEPS_TO_IGNORE = ["#tools"];
@@ -694,7 +713,7 @@ var DEPRECATED_EXTERNALS = ["fastembed", "nodemailer", "jsdom", "sqlite3"];
 
 // src/build/analyze/analyzeEntry.ts
 function getInputPlugins({ entry, isVirtualFile }, mastraEntry, { sourcemapEnabled }) {
-  const normalizedMastraEntry = chunk2OTEFUER_cjs.slash(mastraEntry);
+  const normalizedMastraEntry = chunkVA2CSOKJ_cjs.slash(mastraEntry);
   let virtualPlugin = null;
   if (isVirtualFile) {
     virtualPlugin = virtual__default.default({
@@ -713,7 +732,7 @@ function getInputPlugins({ entry, isVirtualFile }, mastraEntry, { sourcemapEnabl
         name: "custom-alias-resolver",
         resolveId(id) {
           if (id === "#server") {
-            return chunk2OTEFUER_cjs.slash(url.fileURLToPath(undefined("@mastra/deployer/server")));
+            return chunkVA2CSOKJ_cjs.slash(url.fileURLToPath(undefined("@mastra/deployer/server")));
           }
           if (id === "#mastra") {
             return normalizedMastraEntry;
@@ -749,20 +768,20 @@ async function captureDependenciesToOptimize(output, workspaceMap, projectRoot,
   }
   let entryRootPath = projectRoot;
   if (!output.facadeModuleId.startsWith("\0virtual:")) {
-    entryRootPath = await chunk2OTEFUER_cjs.getPackageRootPath(output.facadeModuleId) || projectRoot;
+    entryRootPath = await getPackageRootPath(output.facadeModuleId) || projectRoot;
   }
   for (const [dependency, bindings] of Object.entries(output.importedBindings)) {
     if (isNodeBuiltin(dependency) || dependency.startsWith("#")) {
       continue;
     }
-    const pkgName = chunk2OTEFUER_cjs.getPackageName(dependency);
+    const pkgName = chunkVA2CSOKJ_cjs.getPackageName(dependency);
     let rootPath = null;
     let isWorkspace = false;
     if (pkgName) {
-      rootPath = await chunk2OTEFUER_cjs.getPackageRootPath(dependency, entryRootPath);
+      rootPath = await getPackageRootPath(dependency, entryRootPath);
       isWorkspace = workspaceMap.has(pkgName);
     }
-    const normalizedRootPath = rootPath ? chunk2OTEFUER_cjs.slash(rootPath) : null;
+    const normalizedRootPath = rootPath ? chunkVA2CSOKJ_cjs.slash(rootPath) : null;
     depsToOptimize.set(dependency, {
       exports: bindings,
       rootPath: normalizedRootPath,
@@ -959,7 +978,7 @@ function subpathExternalsResolver(externals) {
       if (id.startsWith(".") || id.startsWith("/")) {
         return null;
       }
-      const isPartOfExternals = externals.some((external) => chunk2OTEFUER_cjs.isDependencyPartOfPackage(id, external));
+      const isPartOfExternals = externals.some((external) => chunkVA2CSOKJ_cjs.isDependencyPartOfPackage(id, external));
       if (isPartOfExternals) {
         return {
           id,
@@ -979,7 +998,7 @@ function moduleResolveMap(externals, projectRoot) {
       }
       for (const importedId of info.importedIds) {
         for (const external of externals) {
-          if (chunk2OTEFUER_cjs.isDependencyPartOfPackage(importedId, external)) {
+          if (chunkVA2CSOKJ_cjs.isDependencyPartOfPackage(importedId, external)) {
             importMap.set(external, info.id);
           }
         }
@@ -991,9 +1010,9 @@ function moduleResolveMap(externals, projectRoot) {
         if (chunk.type === "chunk") {
           for (const [external, resolvedFrom] of importMap) {
             if (chunk.moduleIds.includes(resolvedFrom)) {
-              const fullPath = url.pathToFileURL(chunk2OTEFUER_cjs.slash(path2.join(projectRoot, fileName))).toString();
+              const fullPath = url.pathToFileURL(chunkVA2CSOKJ_cjs.slash(path2.join(projectRoot, fileName))).toString();
               const innerMap = resolveMap.get(fullPath) || /* @__PURE__ */ new Map();
-              innerMap.set(external, url.pathToFileURL(chunk2OTEFUER_cjs.slash(resolvedFrom)).toString());
+              innerMap.set(external, url.pathToFileURL(chunkVA2CSOKJ_cjs.slash(resolvedFrom)).toString());
               resolveMap.set(fullPath, innerMap);
             }
           }
@@ -1013,7 +1032,7 @@ function moduleResolveMap(externals, projectRoot) {
 
 // src/build/analyze/bundleExternals.ts
 function prepareEntryFileName(name, rootDir) {
-  return chunk2OTEFUER_cjs.rollupSafeName(name, rootDir);
+  return chunkVA2CSOKJ_cjs.rollupSafeName(name, rootDir);
 }
 function createVirtualDependencies(depsToOptimize, {
   projectRoot,
@@ -1021,7 +1040,7 @@ function createVirtualDependencies(depsToOptimize, {
   outputDir,
   bundlerOptions
 }) {
-  const { isDev = false } = bundlerOptions || {};
+  const { isDev = false, externalsPreset = false } = bundlerOptions || {};
   const fileNameToDependencyMap = /* @__PURE__ */ new Map();
   const optimizedDependencyEntries = /* @__PURE__ */ new Map();
   const rootDir = workspaceRoot || projectRoot;
@@ -1053,7 +1072,7 @@ function createVirtualDependencies(depsToOptimize, {
       virtual: virtualFile.join("\n")
     });
   }
-  if (isDev) {
+  if (isDev || externalsPreset) {
     for (const [dep, { isWorkspace, rootPath }] of depsToOptimize.entries()) {
       if (!isWorkspace || !rootPath || !workspaceRoot) {
         continue;
@@ -1063,7 +1082,7 @@ function createVirtualDependencies(depsToOptimize, {
         continue;
       }
       const fileName = posix.basename(currentDepPath.name);
-      const entryName = prepareEntryFileName(chunk2OTEFUER_cjs.getCompiledDepCachePath(rootPath, fileName), rootDir);
+      const entryName = prepareEntryFileName(chunkVA2CSOKJ_cjs.getCompiledDepCachePath(rootPath, fileName), rootDir);
       fileNameToDependencyMap.set(entryName, dep);
       optimizedDependencyEntries.set(dep, {
         ...currentDepPath,
@@ -1082,9 +1101,9 @@ async function getInputPlugins2(virtualDependencies, {
 }) {
   const transpilePackagesMap = /* @__PURE__ */ new Map();
   for (const pkg2 of transpilePackages) {
-    const dir = await chunk2OTEFUER_cjs.getPackageRootPath(pkg2);
+    const dir = await getPackageRootPath(pkg2);
     if (dir) {
-      transpilePackagesMap.set(pkg2, chunk2OTEFUER_cjs.slash(dir));
+      transpilePackagesMap.set(pkg2, chunkVA2CSOKJ_cjs.slash(dir));
     } else {
       transpilePackagesMap.set(pkg2, workspaceMap.get(pkg2)?.location ?? pkg2);
     }
@@ -1110,7 +1129,7 @@ async function getInputPlugins2(virtualDependencies, {
         }
       })
     }) : null,
-    bundlerOptions.isDev ? {
+    bundlerOptions.noBundling ? {
       name: "alias-optimized-deps",
       async resolveId(id, importer, options) {
         if (!virtualDependencies.has(id)) {
@@ -1140,11 +1159,11 @@ async function getInputPlugins2(virtualDependencies, {
       transformMixedEsModules: true,
       ignoreTryCatch: false
     }),
-    bundlerOptions.isDev ? null : nodeResolve__default.default({
+    bundlerOptions.noBundling ? null : nodeResolve__default.default({
       preferBuiltins: true,
       exportConditions: ["node"]
     }),
-    bundlerOptions.isDev ? esmShim() : null,
+    bundlerOptions.noBundling ? esmShim() : null,
     // hono is imported from deployer, so we need to resolve from here instead of the project root
     aliasHono(),
     json__default.default(),
@@ -1197,6 +1216,16 @@ async function buildExternalDependencies(virtualDependencies, {
   if (virtualDependencies.size === 0) {
     return [];
   }
+  const noBundling = bundlerOptions.isDev || bundlerOptions.externalsPreset;
+  const plugins = await getInputPlugins2(virtualDependencies, {
+    transpilePackages: packagesToTranspile,
+    workspaceMap,
+    bundlerOptions: {
+      noBundling
+    },
+    rootDir,
+    externals
+  });
   const bundler = await rollup.rollup({
     logLevel: process.env.MASTRA_BUNDLER_DEBUG === "true" ? "debug" : "silent",
     input: Array.from(virtualDependencies.entries()).reduce(
@@ -1207,14 +1236,8 @@ async function buildExternalDependencies(virtualDependencies, {
       {}
     ),
     external: externals,
-    treeshake: bundlerOptions.isDev ? false : "safest",
-    plugins: getInputPlugins2(virtualDependencies, {
-      transpilePackages: packagesToTranspile,
-      workspaceMap,
-      bundlerOptions,
-      rootDir,
-      externals
-    })
+    treeshake: noBundling ? false : "safest",
+    plugins
   });
   const outputDirRelative = prepareEntryFileName(outputDir, rootDir);
   const { output } = await bundler.write({
@@ -1228,12 +1251,12 @@ async function buildExternalDependencies(virtualDependencies, {
      * So we want to write them to the `.mastra/output` folder as well.
      */
     chunkFileNames: (chunkInfo) => {
-      if (bundlerOptions.isDev) {
+      if (noBundling) {
         const importedFromPackages = /* @__PURE__ */ new Set();
         for (const moduleId of chunkInfo.moduleIds) {
-          const normalized = chunk2OTEFUER_cjs.slash(moduleId);
+          const normalized = chunkVA2CSOKJ_cjs.slash(moduleId);
           for (const [pkgName, pkgInfo] of workspaceMap.entries()) {
-            const location = chunk2OTEFUER_cjs.slash(pkgInfo.location);
+            const location = chunkVA2CSOKJ_cjs.slash(pkgInfo.location);
             if (normalized.startsWith(location)) {
               importedFromPackages.add(pkgName);
               break;
@@ -1255,7 +1278,7 @@ async function buildExternalDependencies(virtualDependencies, {
         if (importedFromPackages.size === 1) {
           const [pkgName] = importedFromPackages;
           const workspaceLocation = workspaceMap.get(pkgName).location;
-          return prepareEntryFileName(chunk2OTEFUER_cjs.getCompiledDepCachePath(workspaceLocation, "[name].mjs"), rootDir);
+          return prepareEntryFileName(chunkVA2CSOKJ_cjs.getCompiledDepCachePath(workspaceLocation, "[name].mjs"), rootDir);
         }
       }
       return `${outputDirRelative}/[name].mjs`;
@@ -1269,7 +1292,7 @@ async function buildExternalDependencies(virtualDependencies, {
 function findExternalImporter(module, external, allOutputs) {
   const capturedFiles = /* @__PURE__ */ new Set();
   for (const id of module.imports) {
-    if (chunk2OTEFUER_cjs.isDependencyPartOfPackage(id, external)) {
+    if (chunkVA2CSOKJ_cjs.isDependencyPartOfPackage(id, external)) {
       return module;
     } else {
       if (id.endsWith(".mjs")) {
@@ -1290,19 +1313,31 @@ function findExternalImporter(module, external, allOutputs) {
 }
 async function bundleExternals(depsToOptimize, outputDir, options) {
   const { workspaceRoot = null, workspaceMap = /* @__PURE__ */ new Map(), projectRoot = outputDir, bundlerOptions = {} } = options;
-  const {
-    externals: customExternals = [],
-    transpilePackages = [],
-    isDev = false} = bundlerOptions || {};
-  const allExternals = [...GLOBAL_EXTERNALS, ...DEPRECATED_EXTERNALS, ...customExternals];
+  const { externals: customExternals = [], transpilePackages = [], isDev = false } = bundlerOptions || {};
+  let externalsPreset = false;
+  if (customExternals === true) {
+    externalsPreset = true;
+  }
+  const externalsList = Array.isArray(customExternals) ? customExternals : [];
+  const allExternals = [...GLOBAL_EXTERNALS, ...DEPRECATED_EXTERNALS, ...externalsList];
   const workspacePackagesNames = Array.from(workspaceMap.keys());
   const packagesToTranspile = /* @__PURE__ */ new Set([...transpilePackages, ...workspacePackagesNames]);
+  const extractedExternals = /* @__PURE__ */ new Map();
+  if (externalsPreset) {
+    for (const [dep, metadata] of depsToOptimize.entries()) {
+      if (!metadata.isWorkspace) {
+        extractedExternals.set(dep, metadata.rootPath ?? dep);
+        depsToOptimize.delete(dep);
+      }
+    }
+  }
   const { optimizedDependencyEntries, fileNameToDependencyMap } = createVirtualDependencies(depsToOptimize, {
     workspaceRoot,
     outputDir,
     projectRoot,
     bundlerOptions: {
-      isDev
+      isDev,
+      externalsPreset
     }
   });
   const output = await buildExternalDependencies(optimizedDependencyEntries, {
@@ -1312,7 +1347,8 @@ async function bundleExternals(depsToOptimize, outputDir, options) {
     rootDir: workspaceRoot || projectRoot,
     outputDir,
     bundlerOptions: {
-      isDev
+      isDev,
+      externalsPreset
     }
   });
   const moduleResolveMap2 = /* @__PURE__ */ new Map();
@@ -1347,6 +1383,14 @@ async function bundleExternals(depsToOptimize, outputDir, options) {
     }
     usedExternals[fullPath] = innerObj;
   }
+  if (extractedExternals.size > 0) {
+    const syntheticPath = path2__namespace.join(workspaceRoot || projectRoot, "__externals__");
+    const externalsObj = /* @__PURE__ */ Object.create(null);
+    for (const [dep, rootPath] of extractedExternals) {
+      externalsObj[dep] = rootPath;
+    }
+    usedExternals[syntheticPath] = externalsObj;
+  }
   return { output, fileNameToDependencyMap, usedExternals };
 }
 
@@ -1622,7 +1666,7 @@ async function analyzeBundle(entries, mastraEntry, {
   outputDir,
   projectRoot,
   isDev = false,
-  bundlerOptions: _bundlerOptions
+  bundlerOptions: internalBundlerOptions
 }, logger) {
   const mastraConfig = await promises.readFile(mastraEntry, "utf-8");
   const mastraConfigResult = {
@@ -1641,28 +1685,33 @@ export const mastra = new Mastra({
   
 If you think your configuration is valid, please open an issue.`);
   }
-  const { enableEsmShim = true } = _bundlerOptions || {};
-  const bundlerOptions = await getBundlerOptions(mastraEntry, outputDir);
+  const { externals: _bundlerExternals = [] } = internalBundlerOptions || {};
+  const userBundlerOptions = await getBundlerOptions(mastraEntry, outputDir);
   const { workspaceMap, workspaceRoot } = await getWorkspaceInformation({ mastraEntryFile: mastraEntry });
+  let externalsPreset = false;
+  if (userBundlerOptions?.externals === true) {
+    externalsPreset = true;
+  }
   let index = 0;
   const depsToOptimize = /* @__PURE__ */ new Map();
-  const { externals: customExternals = [] } = bundlerOptions || {};
-  const allExternals = [...GLOBAL_EXTERNALS, ...customExternals];
+  const bundlerExternals = Array.isArray(_bundlerExternals) ? _bundlerExternals : [];
+  const userExternals = Array.isArray(userBundlerOptions?.externals) ? userBundlerOptions?.externals : [];
+  const allExternals = [...GLOBAL_EXTERNALS, ...bundlerExternals, ...userExternals];
   logger.info("Analyzing dependencies...");
   const allUsedExternals = /* @__PURE__ */ new Set();
   for (const entry of entries) {
     const isVirtualFile = entry.includes("\n") || !fs.existsSync(entry);
     const analyzeResult = await analyzeEntry({ entry, isVirtualFile }, mastraEntry, {
       logger,
-      sourcemapEnabled: bundlerOptions?.sourcemap ?? false,
+      sourcemapEnabled: userBundlerOptions?.sourcemap ?? false,
       workspaceMap,
       projectRoot,
-      shouldCheckTransitiveDependencies: isDev
+      shouldCheckTransitiveDependencies: isDev || externalsPreset
     });
     await promises.writeFile(path2.join(outputDir, `entry-${index++}.mjs`), analyzeResult.output.code);
     for (const [dep, metadata] of analyzeResult.dependencies.entries()) {
-      const isPartOfExternals = allExternals.some((external) => chunk2OTEFUER_cjs.isDependencyPartOfPackage(dep, external));
-      if (isPartOfExternals) {
+      const isPartOfExternals = allExternals.some((external) => chunkVA2CSOKJ_cjs.isDependencyPartOfPackage(dep, external));
+      if (isPartOfExternals || externalsPreset && !metadata.isWorkspace) {
         allUsedExternals.add(dep);
         continue;
       }
@@ -1677,7 +1726,7 @@ If you think your configuration is valid, please open an issue.`);
       }
     }
   }
-  if (isDev) {
+  if (isDev || externalsPreset) {
     for (const [dep, metadata] of depsToOptimize.entries()) {
       if (!metadata.isWorkspace) {
         depsToOptimize.delete(dep);
@@ -1689,15 +1738,37 @@ If you think your configuration is valid, please open an issue.`);
   logger.debug(`${sortedDeps.map((key) => `- ${key}`).join("\n")}`);
   const { output, fileNameToDependencyMap, usedExternals } = await bundleExternals(depsToOptimize, outputDir, {
     bundlerOptions: {
-      ...bundlerOptions,
-      externals: allExternals,
-      enableEsmShim,
+      ...userBundlerOptions,
+      externals: userBundlerOptions?.externals ?? allExternals,
       isDev
     },
     projectRoot,
     workspaceRoot,
     workspaceMap
   });
+  const relativeWorkspaceFolderPaths = Array.from(workspaceMap.values()).map(
+    (pkgInfo) => path2.relative(workspaceRoot || projectRoot, pkgInfo.location)
+  );
+  for (const o of output) {
+    if (o.type === "asset") {
+      continue;
+    }
+    for (const i of o.imports) {
+      if (chunkVA2CSOKJ_cjs.isBuiltinModule(i)) {
+        continue;
+      }
+      if (i.startsWith(".") || i.startsWith("/")) {
+        continue;
+      }
+      if (relativeWorkspaceFolderPaths.some((workspacePath) => i.startsWith(workspacePath))) {
+        continue;
+      }
+      const pkgName = chunkVA2CSOKJ_cjs.getPackageName(i);
+      if (pkgName) {
+        allUsedExternals.add(pkgName);
+      }
+    }
+  }
   const result = await validateOutput(
     {
       output,
@@ -1721,10 +1792,11 @@ exports.esbuild = esbuild;
 exports.esmShim = esmShim;
 exports.extractMastraOption = extractMastraOption;
 exports.getBundlerOptions = getBundlerOptions;
+exports.getPackageRootPath = getPackageRootPath;
 exports.getWorkspaceInformation = getWorkspaceInformation;
 exports.removeAllOptionsFromMastraExcept = removeAllOptionsFromMastraExcept;
 exports.removeDeployer = removeDeployer2;
 exports.subpathExternalsResolver = subpathExternalsResolver;
 exports.tsConfigPaths = tsConfigPaths;
-//# sourceMappingURL=chunk-MUWNMVNL.cjs.map
-//# sourceMappingURL=chunk-MUWNMVNL.cjs.map
+//# sourceMappingURL=chunk-KCGBR2X6.cjs.map
+//# sourceMappingURL=chunk-KCGBR2X6.cjs.map