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

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

@@ -143,87 +143,6 @@ globalThis.__dirname = dirname(__filename);
     }
   );
 }
-function removeAllOptionsFromMastraExcept(result, option, logger) {
-  const t = babel__namespace.default.types;
-  return {
-    name: "remove-all-except-" + option + "-config",
-    visitor: {
-      ExportNamedDeclaration: {
-        // remove all exports
-        exit(path3) {
-          path3.remove();
-        }
-      },
-      NewExpression(path3, state) {
-        const varDeclaratorPath = path3.findParent((path4) => t.isVariableDeclarator(path4.node));
-        if (!varDeclaratorPath) {
-          return;
-        }
-        const parentNode = path3.parentPath.node;
-        if (!t.isVariableDeclarator(parentNode) || !t.isIdentifier(parentNode.id) || parentNode.id.name !== "mastra") {
-          return;
-        }
-        let mastraArgs = t.objectExpression([]);
-        if (t.isObjectExpression(path3.node.arguments[0])) {
-          mastraArgs = path3.node.arguments[0];
-        }
-        let configProperty = mastraArgs.properties.find(
-          // @ts-ignore
-          (prop) => prop.key.name === option
-        );
-        let configValue = t.objectExpression([]);
-        const programPath = path3.scope.getProgramParent().path;
-        if (!programPath) {
-          return;
-        }
-        if (configProperty && t.isObjectProperty(configProperty) && t.isExpression(configProperty.value)) {
-          result.hasCustomConfig = true;
-          configValue = configProperty.value;
-          if (t.isIdentifier(configProperty.value) && configProperty.value.name === option) {
-            const configBinding = state.file.scope.getBinding(option);
-            if (configBinding && t.isVariableDeclarator(configBinding.path.node)) {
-              const id = path3.scope.generateUidIdentifier(option);
-              configBinding.path.replaceWith(t.variableDeclarator(id, configBinding.path.node.init));
-              configValue = id;
-            }
-          }
-        }
-        const exportDeclaration = t.exportNamedDeclaration(
-          t.variableDeclaration("const", [t.variableDeclarator(t.identifier(option), configValue)]),
-          []
-        );
-        programPath.node.body.push(exportDeclaration);
-      },
-      Program: {
-        exit(path3) {
-          const hasExport = path3.node.body.some(
-            (node) => node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration"
-          );
-          if (!hasExport) {
-            if (logger) {
-              logger.warn(`Mastra ${option} config could not be extracted. Please make sure your entry file looks like this:
-export const mastra = new Mastra({
-  ${option}: <value>
-})
-
-`);
-            }
-            const fallbackExportDeclaration = t.exportNamedDeclaration(
-              t.variableDeclaration("const", [t.variableDeclarator(t.identifier(option), t.objectExpression([]))]),
-              []
-            );
-            path3.node.body.push(fallbackExportDeclaration);
-          }
-        }
-      }
-    }
-  };
-}
-
-// src/build/babel/remove-all-options-bundler.ts
-function removeAllOptionsExceptBundler(result, logger) {
-  return removeAllOptionsFromMastraExcept(result, "bundler", logger);
-}
 function esbuild(options = {}) {
   return originalEsbuild__default.default({
     target: "node20",
@@ -441,7 +360,117 @@ function recursiveRemoveNonReferencedNodes(code) {
     );
   });
 }
-function extractMastraOptionBundler(name, entryFile, transformer, result, logger) {
+function removeAllOptionsFromMastraExcept(result, option, logger) {
+  const t = babel__namespace.default.types;
+  return {
+    name: "remove-all-except-" + option + "-config",
+    visitor: {
+      ExportNamedDeclaration: {
+        // remove all exports
+        exit(path3) {
+          path3.remove();
+        }
+      },
+      NewExpression(path3, state) {
+        const varDeclaratorPath = path3.findParent((path4) => t.isVariableDeclarator(path4.node));
+        if (!varDeclaratorPath) {
+          return;
+        }
+        const parentNode = path3.parentPath.node;
+        if (!t.isVariableDeclarator(parentNode) || !t.isIdentifier(parentNode.id) || parentNode.id.name !== "mastra") {
+          return;
+        }
+        let mastraArgs = t.objectExpression([]);
+        if (t.isObjectExpression(path3.node.arguments[0])) {
+          mastraArgs = path3.node.arguments[0];
+        }
+        let configProperty = mastraArgs.properties.find(
+          (prop) => t.isObjectProperty(prop) && t.isIdentifier(prop.key) && prop.key.name === option
+        );
+        let configValue = t.objectExpression([]);
+        const programPath = path3.scope.getProgramParent().path;
+        if (!programPath) {
+          return;
+        }
+        if (configProperty && t.isObjectProperty(configProperty) && t.isExpression(configProperty.value)) {
+          result.hasCustomConfig = true;
+          configValue = configProperty.value;
+          if (t.isIdentifier(configProperty.value) && configProperty.value.name === option) {
+            const configBinding = state.file.scope.getBinding(option);
+            if (configBinding && t.isVariableDeclarator(configBinding.path.node)) {
+              const id = path3.scope.generateUidIdentifier(option);
+              configBinding.path.replaceWith(t.variableDeclarator(id, configBinding.path.node.init));
+              configValue = id;
+            }
+          }
+        }
+        const exportDeclaration = t.exportNamedDeclaration(
+          t.variableDeclaration("const", [t.variableDeclarator(t.identifier(option), configValue)]),
+          []
+        );
+        programPath.node.body.push(exportDeclaration);
+      },
+      Program: {
+        exit(path3) {
+          const hasExport = path3.node.body.some(
+            (node) => node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration"
+          );
+          if (!hasExport) {
+            if (logger) {
+              logger.warn(`Mastra ${option} config could not be extracted. Please make sure your entry file looks like this:
+export const mastra = new Mastra({
+  ${option}: <value>
+})
+
+`);
+            }
+            const fallbackExportDeclaration = t.exportNamedDeclaration(
+              t.variableDeclaration("const", [t.variableDeclarator(t.identifier(option), t.objectExpression([]))]),
+              []
+            );
+            path3.node.body.push(fallbackExportDeclaration);
+          }
+        }
+      }
+    }
+  };
+}
+
+// src/build/plugins/remove-all-except.ts
+function removeAllOptionsFromMastraExceptPlugin(mastraEntry, name, result, options) {
+  return {
+    name: `remove-${name}`,
+    transform(code, id) {
+      if (id !== mastraEntry) {
+        return;
+      }
+      return new Promise((resolve2, reject) => {
+        babel__namespace.transform(
+          code,
+          {
+            babelrc: false,
+            configFile: false,
+            filename: id,
+            plugins: [removeAllOptionsFromMastraExcept(result, name, options?.logger)],
+            sourceMaps: options?.sourcemap
+          },
+          (err, result2) => {
+            if (err) {
+              return reject(err);
+            }
+            resolve2({
+              code: result2.code,
+              map: result2.map
+            });
+          }
+        );
+      });
+    }
+  };
+}
+
+// src/build/shared/extract-mastra-option.ts
+function extractMastraOptionBundler(name, entryFile, result, logger) {
   return rollup.rollup({
     logLevel: "silent",
     input: {
@@ -462,34 +491,7 @@ function extractMastraOptionBundler(name, entryFile, transformer, result, logger
         ignoreTryCatch: false
       }),
       json__default.default(),
-      {
-        name: `extract-${name}-config`,
-        transform(code, id) {
-          if (id !== entryFile) {
-            return;
-          }
-          return new Promise((resolve2, reject) => {
-            babel__namespace.transform(
-              code,
-              {
-                babelrc: false,
-                configFile: false,
-                filename: id,
-                plugins: [transformer(result, logger)]
-              },
-              (err, result2) => {
-                if (err) {
-                  return reject(err);
-                }
-                resolve2({
-                  code: result2.code,
-                  map: result2.map
-                });
-              }
-            );
-          });
-        }
-      },
+      removeAllOptionsFromMastraExceptPlugin(entryFile, name, result, { logger }),
       // let esbuild remove all unused imports
       esbuild(),
       {
@@ -506,11 +508,11 @@ function extractMastraOptionBundler(name, entryFile, transformer, result, logger
     ]
   });
 }
-async function extractMastraOption(name, entryFile, transformer, outputDir, logger) {
+async function extractMastraOption(name, entryFile, outputDir, logger) {
   const result = {
     hasCustomConfig: false
   };
-  const bundler = await extractMastraOptionBundler(name, entryFile, transformer, result, logger);
+  const bundler = await extractMastraOptionBundler(name, entryFile, result, logger);
   const output = await bundler.write({
     dir: outputDir,
     format: "es",
@@ -528,13 +530,7 @@ async function extractMastraOption(name, entryFile, transformer, outputDir, logg
 
 // src/build/bundlerOptions.ts
 async function getBundlerOptions(entryFile, outputDir, logger) {
-  const result = await extractMastraOption(
-    "bundler",
-    entryFile,
-    removeAllOptionsExceptBundler,
-    outputDir,
-    logger
-  );
+  const result = await extractMastraOption("bundler", entryFile, outputDir, logger);
   if (!result) {
     return null;
   }
@@ -603,8 +599,57 @@ function isNodeBuiltin(dep) {
   const [pkg2] = dep.split("/");
   return dep.startsWith("node:") || module$1.builtinModules.includes(dep) || module$1.builtinModules.includes(pkg2);
 }
+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"];
+var GLOBAL_EXTERNALS = [
+  "pino",
+  "pino-pretty",
+  "@libsql/client",
+  "pg",
+  "libsql",
+  "#tools",
+  "typescript",
+  "undici",
+  "readable-stream"
+];
+var DEPRECATED_EXTERNALS = ["fastembed", "nodemailer", "jsdom", "sqlite3"];
 function removeDeployer() {
   const t = babel__namespace.default.types;
+  function removeDeployerFromObject(objectExpr, scope) {
+    const deployerProp = objectExpr.properties.find(
+      (prop) => t.isObjectProperty(prop) && t.isIdentifier(prop.key) && prop.key.name === "deployer"
+    );
+    if (deployerProp) {
+      objectExpr.properties = objectExpr.properties.filter((prop) => prop !== deployerProp);
+      if (t.isIdentifier(deployerProp.value)) {
+        const deployerBinding = scope.getBinding(deployerProp.value.name);
+        if (deployerBinding) {
+          deployerBinding.path?.parentPath?.remove();
+        }
+      }
+    }
+    return deployerProp;
+  }
   return {
     name: "remove-deployer",
     visitor: {
@@ -620,23 +665,30 @@ function removeDeployer() {
         if (!state.hasReplaced) {
           state.hasReplaced = true;
           const newMastraObj = t.cloneNode(path3.node);
-          if (t.isObjectExpression(newMastraObj.arguments[0]) && newMastraObj.arguments[0].properties?.[0]) {
-            const deployer = newMastraObj.arguments[0].properties.find(
-              (prop) => t.isObjectProperty(prop) && t.isIdentifier(prop.key) && prop.key.name === "deployer"
-            );
-            if (!deployer) {
-              return;
+          if (t.isObjectExpression(newMastraObj.arguments[0]) && newMastraObj.arguments[0].properties?.length) {
+            const objectArg = newMastraObj.arguments[0];
+            let foundDeployer = false;
+            const directDeployer = removeDeployerFromObject(objectArg, state.file.scope);
+            if (directDeployer) {
+              foundDeployer = true;
             }
-            newMastraObj.arguments[0].properties = newMastraObj.arguments[0].properties.filter(
-              (prop) => prop !== deployer
-            );
-            if (t.isObjectProperty(deployer) && t.isIdentifier(deployer.value)) {
-              const deployerBinding = state.file.scope.getBinding(deployer.value.name);
-              if (deployerBinding) {
-                deployerBinding?.path?.parentPath?.remove();
+            for (const prop of objectArg.properties) {
+              if (t.isSpreadElement(prop) && t.isIdentifier(prop.argument)) {
+                const spreadBinding = state.file.scope.getBinding(prop.argument.name);
+                if (spreadBinding?.path && t.isVariableDeclarator(spreadBinding.path.node)) {
+                  const init = spreadBinding.path.node.init;
+                  if (t.isObjectExpression(init)) {
+                    const spreadDeployer = removeDeployerFromObject(init, state.file.scope);
+                    if (spreadDeployer) {
+                      foundDeployer = true;
+                    }
+                  }
+                }
               }
             }
-            path3.replaceWith(newMastraObj);
+            if (foundDeployer) {
+              path3.replaceWith(newMastraObj);
+            }
           }
         }
       }
@@ -676,40 +728,6 @@ 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"];
-var GLOBAL_EXTERNALS = [
-  "pino",
-  "pino-pretty",
-  "@libsql/client",
-  "pg",
-  "libsql",
-  "#tools",
-  "typescript",
-  "undici",
-  "readable-stream"
-];
-var DEPRECATED_EXTERNALS = ["fastembed", "nodemailer", "jsdom", "sqlite3"];
 
 // src/build/analyze/analyzeEntry.ts
 function getInputPlugins({ entry, isVirtualFile }, mastraEntry, { sourcemapEnabled }) {
@@ -750,7 +768,9 @@ function getInputPlugins({ entry, isVirtualFile }, mastraEntry, { sourcemapEnabl
         transformMixedEsModules: true,
         extensions: [".js", ".ts"]
       }),
-      removeDeployer2(mastraEntry, { sourcemap: sourcemapEnabled }),
+      removeDeployer2(mastraEntry, {
+        sourcemap: sourcemapEnabled
+      }),
       esbuild()
     ]
   );
@@ -1666,7 +1686,7 @@ async function analyzeBundle(entries, mastraEntry, {
   outputDir,
   projectRoot,
   isDev = false,
-  bundlerOptions: internalBundlerOptions
+  bundlerOptions
 }, logger) {
   const mastraConfig = await promises.readFile(mastraEntry, "utf-8");
   const mastraConfigResult = {
@@ -1685,25 +1705,22 @@ export const mastra = new Mastra({
   
 If you think your configuration is valid, please open an issue.`);
   }
-  const { externals: _bundlerExternals = [] } = internalBundlerOptions || {};
-  const userBundlerOptions = await getBundlerOptions(mastraEntry, outputDir);
   const { workspaceMap, workspaceRoot } = await getWorkspaceInformation({ mastraEntryFile: mastraEntry });
   let externalsPreset = false;
-  if (userBundlerOptions?.externals === true) {
+  const userExternals = Array.isArray(bundlerOptions?.externals) ? bundlerOptions?.externals : [];
+  if (bundlerOptions?.externals === true) {
     externalsPreset = true;
   }
   let index = 0;
   const depsToOptimize = /* @__PURE__ */ new Map();
-  const bundlerExternals = Array.isArray(_bundlerExternals) ? _bundlerExternals : [];
-  const userExternals = Array.isArray(userBundlerOptions?.externals) ? userBundlerOptions?.externals : [];
-  const allExternals = [...GLOBAL_EXTERNALS, ...bundlerExternals, ...userExternals];
+  const allExternals = [...GLOBAL_EXTERNALS, ...userExternals].filter(Boolean);
   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: userBundlerOptions?.sourcemap ?? false,
+      sourcemapEnabled: bundlerOptions?.enableSourcemap ?? false,
       workspaceMap,
       projectRoot,
       shouldCheckTransitiveDependencies: isDev || externalsPreset
@@ -1738,8 +1755,8 @@ 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: {
-      ...userBundlerOptions,
-      externals: userBundlerOptions?.externals ?? allExternals,
+      ...bundlerOptions,
+      externals: bundlerOptions?.externals ?? allExternals,
       isDev
     },
     projectRoot,
@@ -1794,9 +1811,8 @@ 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-KCGBR2X6.cjs.map
-//# sourceMappingURL=chunk-KCGBR2X6.cjs.map
+//# sourceMappingURL=chunk-CRIOGWZD.cjs.map
+//# sourceMappingURL=chunk-CRIOGWZD.cjs.map