@mastra/deployer 0.2.3 → 0.2.4-alpha.0

package/dist/_tsup-dts-rollup.d.cts

@@ -335,6 +335,11 @@ export declare type PluginOptions = Omit<RegisterOptions, 'loggerID'>;
 
 export declare function queryVectors(c: Context): Promise<Response>;
 
+export declare function recursiveRemoveNonReferencedNodes(code: string): Promise<{
+    code: string;
+    map: any;
+}>;
+
 export declare function removeAllExceptDeployer(): babel_2.PluginObj;
 
 export declare function removeAllExceptTelemetryConfig(result: {
@@ -345,6 +350,8 @@ export declare function removeDeployer(): babel_2.PluginObj;
 
 export declare function removeDeployer_alias_1(mastraEntry: string): Plugin;
 
+export declare function removeNonReferencedNodes(): babel_2.PluginObj;
+
 export declare function resolve(specifier: string, context: ResolveHookContext, nextResolve: (specifier: string, context: ResolveHookContext) => Promise<{
     url: string;
 }>): Promise<{

package/dist/_tsup-dts-rollup.d.ts

@@ -335,6 +335,11 @@ export declare type PluginOptions = Omit<RegisterOptions, 'loggerID'>;
 
 export declare function queryVectors(c: Context): Promise<Response>;
 
+export declare function recursiveRemoveNonReferencedNodes(code: string): Promise<{
+    code: string;
+    map: any;
+}>;
+
 export declare function removeAllExceptDeployer(): babel_2.PluginObj;
 
 export declare function removeAllExceptTelemetryConfig(result: {
@@ -345,6 +350,8 @@ export declare function removeDeployer(): babel_2.PluginObj;
 
 export declare function removeDeployer_alias_1(mastraEntry: string): Plugin;
 
+export declare function removeNonReferencedNodes(): babel_2.PluginObj;
+
 export declare function resolve(specifier: string, context: ResolveHookContext, nextResolve: (specifier: string, context: ResolveHookContext) => Promise<{
     url: string;
 }>): Promise<{

package/dist/build/analyze.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
-var chunkKNO7RCEZ_cjs = require('../chunk-KNO7RCEZ.cjs');
+var chunkQVHMDKNM_cjs = require('../chunk-QVHMDKNM.cjs');
 
 
 
 Object.defineProperty(exports, "analyzeBundle", {
   enumerable: true,
-  get: function () { return chunkKNO7RCEZ_cjs.analyzeBundle; }
+  get: function () { return chunkQVHMDKNM_cjs.analyzeBundle; }
 });

package/dist/build/analyze.js

@@ -1 +1 @@
-export { analyzeBundle } from '../chunk-T23IXDLE.js';
+export { analyzeBundle } from '../chunk-ARY7G5XC.js';

package/dist/build/index.cjs

@@ -1,43 +1,43 @@
 'use strict';
 
-var chunkFVHOV5SC_cjs = require('../chunk-FVHOV5SC.cjs');
-var chunkPRZC7CEM_cjs = require('../chunk-PRZC7CEM.cjs');
-var chunkKNO7RCEZ_cjs = require('../chunk-KNO7RCEZ.cjs');
+var chunkAXUXJ2OU_cjs = require('../chunk-AXUXJ2OU.cjs');
+var chunkKFOGAPGX_cjs = require('../chunk-KFOGAPGX.cjs');
+var chunkQVHMDKNM_cjs = require('../chunk-QVHMDKNM.cjs');
 var chunkOT6UKL2S_cjs = require('../chunk-OT6UKL2S.cjs');
 
 
 
 Object.defineProperty(exports, "FileService", {
   enumerable: true,
-  get: function () { return chunkFVHOV5SC_cjs.FileService; }
+  get: function () { return chunkAXUXJ2OU_cjs.FileService; }
 });
 Object.defineProperty(exports, "createWatcher", {
   enumerable: true,
-  get: function () { return chunkFVHOV5SC_cjs.createWatcher; }
+  get: function () { return chunkAXUXJ2OU_cjs.createWatcher; }
 });
 Object.defineProperty(exports, "getBundler", {
   enumerable: true,
-  get: function () { return chunkFVHOV5SC_cjs.getBundler; }
+  get: function () { return chunkAXUXJ2OU_cjs.getBundler; }
 });
 Object.defineProperty(exports, "getWatcher", {
   enumerable: true,
-  get: function () { return chunkFVHOV5SC_cjs.getWatcher; }
+  get: function () { return chunkAXUXJ2OU_cjs.getWatcher; }
 });
 Object.defineProperty(exports, "getWatcherInputOptions", {
   enumerable: true,
-  get: function () { return chunkFVHOV5SC_cjs.getInputOptions; }
+  get: function () { return chunkAXUXJ2OU_cjs.getInputOptions; }
 });
 Object.defineProperty(exports, "Deps", {
   enumerable: true,
-  get: function () { return chunkPRZC7CEM_cjs.Deps; }
+  get: function () { return chunkKFOGAPGX_cjs.Deps; }
 });
 Object.defineProperty(exports, "writeTelemetryConfig", {
   enumerable: true,
-  get: function () { return chunkPRZC7CEM_cjs.writeTelemetryConfig; }
+  get: function () { return chunkKFOGAPGX_cjs.writeTelemetryConfig; }
 });
 Object.defineProperty(exports, "analyzeBundle", {
   enumerable: true,
-  get: function () { return chunkKNO7RCEZ_cjs.analyzeBundle; }
+  get: function () { return chunkQVHMDKNM_cjs.analyzeBundle; }
 });
 Object.defineProperty(exports, "createBundler", {
   enumerable: true,

package/dist/build/index.js

@@ -1,4 +1,4 @@
-export { FileService, createWatcher, getBundler, getWatcher, getInputOptions as getWatcherInputOptions } from '../chunk-UKRVXD63.js';
-export { Deps, writeTelemetryConfig } from '../chunk-7XQJJPRM.js';
-export { analyzeBundle } from '../chunk-T23IXDLE.js';
+export { FileService, createWatcher, getBundler, getWatcher, getInputOptions as getWatcherInputOptions } from '../chunk-YE3YSKC6.js';
+export { Deps, writeTelemetryConfig } from '../chunk-ZAXXMFXX.js';
+export { analyzeBundle } from '../chunk-ARY7G5XC.js';
 export { createBundler, getInputOptions as getBundlerInputOptions } from '../chunk-XEFBJH3T.js';

package/dist/bundler/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
-var chunkXZSN3YN6_cjs = require('../chunk-XZSN3YN6.cjs');
+var chunkHBJIG6EL_cjs = require('../chunk-HBJIG6EL.cjs');
 
 
 
 Object.defineProperty(exports, "Bundler", {
   enumerable: true,
-  get: function () { return chunkXZSN3YN6_cjs.Bundler; }
+  get: function () { return chunkHBJIG6EL_cjs.Bundler; }
 });

package/dist/bundler/index.js

@@ -1 +1 @@
-export { Bundler } from '../chunk-IGPSPQAD.js';
+export { Bundler } from '../chunk-7J2ZTGHM.js';

package/dist/{chunk-IGPSPQAD.js → chunk-7J2ZTGHM.js}

@@ -1,5 +1,5 @@
-import { Deps, writeTelemetryConfig } from './chunk-7XQJJPRM.js';
-import { analyzeBundle } from './chunk-T23IXDLE.js';
+import { Deps, writeTelemetryConfig } from './chunk-ZAXXMFXX.js';
+import { analyzeBundle } from './chunk-ARY7G5XC.js';
 import { createBundler, getInputOptions } from './chunk-XEFBJH3T.js';
 import { existsSync } from 'node:fs';
 import { writeFile, stat } from 'node:fs/promises';

package/dist/{chunk-T23IXDLE.js → chunk-ARY7G5XC.js}

@@ -8,8 +8,9 @@ import { fileURLToPath } from 'node:url';
 import { rollup } from 'rollup';
 import esbuild from 'rollup-plugin-esbuild';
 import { builtinModules } from 'node:module';
-import { join } from 'node:path';
+import { join, dirname } from 'node:path';
 import { spawn as spawn$1 } from 'node:child_process';
+import { writeFile } from 'node:fs/promises';
 
 function isNodeBuiltin(dep) {
   const [pkg] = dep.split("/");
@@ -50,17 +51,40 @@ function spawn(command, args = [], options = {}) {
   });
 }
 function validate(file) {
-  return spawn("node", [
-    "--import",
-    import.meta.resolve("@mastra/deployer/loader"),
-    "--input-type=module",
-    "-e",
-    `import('file://${file.replaceAll("\\", "/")}')`
-  ]);
+  return spawn(
+    "node",
+    [
+      "--import",
+      import.meta.resolve("@mastra/deployer/loader"),
+      "--input-type=module",
+      "-e",
+      `import('file://${file.replaceAll("\\", "/")}')`
+    ],
+    {
+      cwd: dirname(file)
+    }
+  );
+}
+var globalExternals = ["pino", "pino-pretty", "@libsql/client", "pg", "libsql", "jsdom", "sqlite3"];
+function findExternalImporter(module, external, allOutputs) {
+  const capturedFiles = /* @__PURE__ */ new Set();
+  for (const id of module.imports) {
+    if (id === external) {
+      return module;
+    } else {
+      if (id.endsWith(".mjs")) {
+        capturedFiles.add(id);
+      }
+    }
+  }
+  for (const file of capturedFiles) {
+    const nextModule = allOutputs.find((o) => o.fileName === file);
+    if (nextModule) {
+      return findExternalImporter(nextModule, external, allOutputs);
+    }
+  }
+  return null;
 }
-
-// src/build/analyze.ts
-var globalExternals = ["pino", "pino-pretty", "@libsql/client"];
 async function analyze(entry, mastraEntry, isVirtualFile, platform, logger) {
   logger.info("Analyzing dependencies...");
   let virtualPlugin = null;
@@ -163,9 +187,8 @@ async function bundleExternals(depsToOptimize, outputDir, logger) {
     ),
     // this dependency breaks the build, so we need to exclude it
     // TODO actually fix this so we don't need to exclude it
-    external: ["jsdom", ...globalExternals],
+    external: globalExternals,
     treeshake: "smallest",
-    preserveSymlinks: true,
     plugins: [
       virtual(
         Array.from(virtualDependencies.entries()).reduce(
@@ -195,18 +218,43 @@ async function bundleExternals(depsToOptimize, outputDir, logger) {
     format: "esm",
     dir: outputDir,
     entryFileNames: "[name].mjs",
-    chunkFileNames: "[name].mjs"
+    chunkFileNames: "[name].mjs",
+    hoistTransitiveImports: false
   });
+  const moduleResolveMap = {};
+  const filteredChunks = output.filter((o) => o.type === "chunk");
+  for (const o of filteredChunks.filter((o2) => o2.isEntry || o2.isDynamicEntry)) {
+    for (const external of globalExternals) {
+      const importer = findExternalImporter(o, external, filteredChunks);
+      if (importer) {
+        const fullPath = join(outputDir, importer.fileName);
+        moduleResolveMap[fullPath] = moduleResolveMap[fullPath] || {};
+        if (importer.moduleIds.length > 1) {
+          moduleResolveMap[fullPath][external] = importer.moduleIds.slice(-2, -1)[0];
+        }
+      }
+    }
+  }
+  await writeFile(join(outputDir, "module-resolve-map.json"), JSON.stringify(moduleResolveMap, null, 2));
   await bundler.close();
-  return { output, reverseVirtualReferenceMap };
+  return { output, reverseVirtualReferenceMap, usedExternals: moduleResolveMap };
 }
-async function validateOutput(output, reverseVirtualReferenceMap, outputDir, logger) {
+async function validateOutput({
+  output,
+  reverseVirtualReferenceMap,
+  usedExternals,
+  outputDir
+}, logger) {
   const result = {
     invalidChunks: /* @__PURE__ */ new Set(),
     dependencies: /* @__PURE__ */ new Map(),
     externalDependencies: /* @__PURE__ */ new Set()
   };
-  globalExternals.forEach((dep) => result.externalDependencies.add(dep));
+  for (const deps of Object.values(usedExternals)) {
+    for (const dep of Object.keys(deps)) {
+      result.externalDependencies.add(dep);
+    }
+  }
   for (const file of output) {
     if (file.type === "asset") {
       continue;
@@ -231,8 +279,12 @@ async function validateOutput(output, reverseVirtualReferenceMap, outputDir, log
 async function analyzeBundle(entry, mastraEntry, outputDir, platform, logger) {
   const isVirtualFile = entry.includes("\n") || !existsSync(entry);
   const depsToOptimize = await analyze(entry, mastraEntry, isVirtualFile, platform, logger);
-  const { output, reverseVirtualReferenceMap } = await bundleExternals(depsToOptimize, outputDir, logger);
-  const result = await validateOutput(output, reverseVirtualReferenceMap, outputDir, logger);
+  const { output, reverseVirtualReferenceMap, usedExternals } = await bundleExternals(
+    depsToOptimize,
+    outputDir,
+    logger
+  );
+  const result = await validateOutput({ output, reverseVirtualReferenceMap, usedExternals, outputDir }, logger);
   return result;
 }
 

package/dist/{chunk-FVHOV5SC.cjs → chunk-AXUXJ2OU.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkKNO7RCEZ_cjs = require('./chunk-KNO7RCEZ.cjs');
+var chunkQVHMDKNM_cjs = require('./chunk-QVHMDKNM.cjs');
 var chunkOT6UKL2S_cjs = require('./chunk-OT6UKL2S.cjs');
 var chunk54KOF3NB_cjs = require('./chunk-54KOF3NB.cjs');
 var alias = require('@rollup/plugin-alias');
@@ -116,7 +116,7 @@ var FileService = class {
    * @returns
    */
   async copyStarterFile(inputFile, outputFilePath, replaceIfExists) {
-    const __filename = url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-FVHOV5SC.cjs', document.baseURI).href)));
+    const __filename = url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-AXUXJ2OU.cjs', document.baseURI).href)));
     const __dirname = path__default.default.dirname(__filename);
     const filePath = path__default.default.resolve(__dirname, "..", "starter-files", inputFile);
     const fileString = fs2__namespace.default.readFileSync(filePath, "utf8");
@@ -262,7 +262,7 @@ async function getInputOptions2(entryFile, platform) {
       // @ts-ignore
       (plugin) => !plugin || !plugin?.name || plugin.name !== "node-resolve"
     );
-    inputOptions.plugins.push(chunkKNO7RCEZ_cjs.aliasHono());
+    inputOptions.plugins.push(chunkQVHMDKNM_cjs.aliasHono());
   }
   return inputOptions;
 }

package/dist/{chunk-XZSN3YN6.cjs → chunk-HBJIG6EL.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunkPRZC7CEM_cjs = require('./chunk-PRZC7CEM.cjs');
-var chunkKNO7RCEZ_cjs = require('./chunk-KNO7RCEZ.cjs');
+var chunkKFOGAPGX_cjs = require('./chunk-KFOGAPGX.cjs');
+var chunkQVHMDKNM_cjs = require('./chunk-QVHMDKNM.cjs');
 var chunkOT6UKL2S_cjs = require('./chunk-OT6UKL2S.cjs');
 var fs = require('fs');
 var promises = require('fs/promises');
@@ -31,7 +31,7 @@ var Bundler = class extends bundler.MastraBundler {
   }
   async writeInstrumentationFile(outputDirectory) {
     const instrumentationFile = path.join(outputDirectory, "instrumentation.mjs");
-    const __dirname = path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-XZSN3YN6.cjs', document.baseURI).href))));
+    const __dirname = path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-HBJIG6EL.cjs', document.baseURI).href))));
     await esm.copy(path.join(__dirname, "templates", "instrumentation-template.js"), instrumentationFile);
   }
   async writePackageJson(outputDirectory, dependencies) {
@@ -73,10 +73,10 @@ var Bundler = class extends bundler.MastraBundler {
     return chunkOT6UKL2S_cjs.createBundler(inputOptions, outputOptions);
   }
   async analyze(entry, mastraFile, outputDirectory) {
-    return await chunkKNO7RCEZ_cjs.analyzeBundle(entry, mastraFile, path.join(outputDirectory, this.analyzeOutputDir), "node", this.logger);
+    return await chunkQVHMDKNM_cjs.analyzeBundle(entry, mastraFile, path.join(outputDirectory, this.analyzeOutputDir), "node", this.logger);
   }
   async installDependencies(outputDirectory, rootDir = process.cwd()) {
-    const deps = new chunkPRZC7CEM_cjs.Deps(rootDir);
+    const deps = new chunkKFOGAPGX_cjs.Deps(rootDir);
     deps.__setLogger(this.logger);
     await deps.install({ dir: path.join(outputDirectory, this.outputDir) });
   }
@@ -92,14 +92,14 @@ var Bundler = class extends bundler.MastraBundler {
   async _bundle(serverFile, mastraEntryFile, outputDirectory, bundleLocation = path.join(outputDirectory, this.outputDir)) {
     this.logger.info("Start bundling Mastra");
     const isVirtual = serverFile.includes("\n") || fs.existsSync(serverFile);
-    const analyzedBundleInfo = await chunkKNO7RCEZ_cjs.analyzeBundle(
+    const analyzedBundleInfo = await chunkQVHMDKNM_cjs.analyzeBundle(
       serverFile,
       mastraEntryFile,
       path.join(outputDirectory, this.analyzeOutputDir),
       "node",
       this.logger
     );
-    await chunkPRZC7CEM_cjs.writeTelemetryConfig(mastraEntryFile, path.join(outputDirectory, this.outputDir));
+    await chunkKFOGAPGX_cjs.writeTelemetryConfig(mastraEntryFile, path.join(outputDirectory, this.outputDir));
     const dependenciesToInstall = /* @__PURE__ */ new Map();
     for (const dep of analyzedBundleInfo.externalDependencies) {
       try {

package/dist/{chunk-PRZC7CEM.cjs → chunk-KFOGAPGX.cjs}

@@ -199,7 +199,7 @@ var Deps = class extends base.MastraBase {
     }
   }
   async getPackageVersion() {
-    const __filename = url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-PRZC7CEM.cjs', document.baseURI).href)));
+    const __filename = url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-KFOGAPGX.cjs', document.baseURI).href)));
     const __dirname = path.dirname(__filename);
     const pkgJsonPath = path__default.default.join(__dirname, "..", "..", "package.json");
     const content = await fsExtra__default.default.readJSON(pkgJsonPath);
@@ -234,10 +234,11 @@ function removeAllExceptTelemetryConfig(result) {
         if (!t.isVariableDeclarator(parentNode) || !t.isIdentifier(parentNode.id) || parentNode.id.name !== "mastra") {
           return;
         }
-        if (!t.isObjectExpression(path2.node.arguments[0]) || !path2.node.arguments[0].properties?.[0]) {
-          return;
+        let mastraArgs = t.objectExpression([]);
+        if (t.isObjectExpression(path2.node.arguments[0])) {
+          mastraArgs = path2.node.arguments[0];
         }
-        let telemetry = path2.node.arguments[0].properties.find(
+        let telemetry = mastraArgs.properties.find(
           // @ts-ignore
           (prop) => prop.key.name === "telemetry"
         );
@@ -267,6 +268,79 @@ function removeAllExceptTelemetryConfig(result) {
     }
   };
 }
+function removeNonReferencedNodes() {
+  const t = babel__namespace.default.types;
+  return {
+    name: "remove-non-referenced-nodes",
+    visitor: {
+      Program(path2) {
+        const scope = path2.scope;
+        const currentBody = path2.get("body");
+        const filteredBody = currentBody.filter((childPath) => {
+          if (childPath.isExportDeclaration()) {
+            return true;
+          }
+          if (childPath.isVariableDeclaration()) {
+            return childPath.node.declarations.some((decl) => {
+              if (!t.isIdentifier(decl.id)) {
+                return false;
+              }
+              const name = decl.id.name;
+              const binding = scope.getBinding(name);
+              return binding && (binding.referenced || binding.referencePaths.length > 0);
+            });
+          }
+          if (childPath.isFunctionDeclaration() || childPath.isClassDeclaration()) {
+            if (!t.isIdentifier(childPath.node.id)) {
+              return false;
+            }
+            const name = childPath.node.id.name;
+            const binding = scope.getBinding(name);
+            return binding && (binding.referenced || binding.referencePaths.length > 0);
+          }
+          if (childPath.isImportDeclaration()) {
+            return childPath.node.specifiers.some((specifier) => {
+              const importedName = specifier.local.name;
+              const binding = scope.getBinding(importedName);
+              return binding && (binding.referenced || binding.referencePaths.length > 0);
+            });
+          }
+          return false;
+        });
+        path2.set(
+          "body",
+          filteredBody.map((p) => p.node)
+        );
+      }
+    }
+  };
+}
+function recursiveRemoveNonReferencedNodes(code) {
+  return new Promise(async (resolve, reject) => {
+    babel__namespace.transform(
+      code,
+      {
+        babelrc: false,
+        configFile: false,
+        plugins: [removeNonReferencedNodes()]
+      },
+      (err, result) => {
+        if (err) {
+          return reject(err);
+        }
+        if (result && result.code !== code) {
+          return recursiveRemoveNonReferencedNodes(result.code).then(resolve, reject);
+        }
+        resolve({
+          code: result.code,
+          map: result.map
+        });
+      }
+    );
+  });
+}
+
+// src/build/telemetry.ts
 function getTelemetryBundler(entryFile, result) {
   return rollup.rollup({
     logLevel: "silent",
@@ -316,6 +390,21 @@ function getTelemetryBundler(entryFile, result) {
         }
       },
       // let esbuild remove all unused imports
+      esbuild__default.default({
+        target: "node20",
+        platform: "node",
+        minify: false
+      }),
+      {
+        name: "cleanup",
+        transform(code, id) {
+          if (id !== entryFile) {
+            return;
+          }
+          return recursiveRemoveNonReferencedNodes(code);
+        }
+      },
+      // let esbuild remove all unused imports
       esbuild__default.default({
         target: "node20",
         platform: "node",
@@ -340,4 +429,5 @@ async function writeTelemetryConfig(entryFile, outputDir) {
 exports.Deps = Deps;
 exports.createChildProcessLogger = createChildProcessLogger;
 exports.createPinoStream = createPinoStream;
+exports.recursiveRemoveNonReferencedNodes = recursiveRemoveNonReferencedNodes;
 exports.writeTelemetryConfig = writeTelemetryConfig;

package/dist/{chunk-KNO7RCEZ.cjs → chunk-QVHMDKNM.cjs}

@@ -12,6 +12,7 @@ var esbuild = require('rollup-plugin-esbuild');
 var module$1 = require('module');
 var path = require('path');
 var child_process = require('child_process');
+var promises = require('fs/promises');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -60,17 +61,40 @@ function spawn(command, args = [], options = {}) {
   });
 }
 function validate(file) {
-  return spawn("node", [
-    "--import",
-    undefined("@mastra/deployer/loader"),
-    "--input-type=module",
-    "-e",
-    `import('file://${file.replaceAll("\\", "/")}')`
-  ]);
+  return spawn(
+    "node",
+    [
+      "--import",
+      undefined("@mastra/deployer/loader"),
+      "--input-type=module",
+      "-e",
+      `import('file://${file.replaceAll("\\", "/")}')`
+    ],
+    {
+      cwd: path.dirname(file)
+    }
+  );
+}
+var globalExternals = ["pino", "pino-pretty", "@libsql/client", "pg", "libsql", "jsdom", "sqlite3"];
+function findExternalImporter(module, external, allOutputs) {
+  const capturedFiles = /* @__PURE__ */ new Set();
+  for (const id of module.imports) {
+    if (id === external) {
+      return module;
+    } else {
+      if (id.endsWith(".mjs")) {
+        capturedFiles.add(id);
+      }
+    }
+  }
+  for (const file of capturedFiles) {
+    const nextModule = allOutputs.find((o) => o.fileName === file);
+    if (nextModule) {
+      return findExternalImporter(nextModule, external, allOutputs);
+    }
+  }
+  return null;
 }
-
-// src/build/analyze.ts
-var globalExternals = ["pino", "pino-pretty", "@libsql/client"];
 async function analyze(entry, mastraEntry, isVirtualFile, platform, logger) {
   logger.info("Analyzing dependencies...");
   let virtualPlugin = null;
@@ -173,9 +197,8 @@ async function bundleExternals(depsToOptimize, outputDir, logger) {
     ),
     // this dependency breaks the build, so we need to exclude it
     // TODO actually fix this so we don't need to exclude it
-    external: ["jsdom", ...globalExternals],
+    external: globalExternals,
     treeshake: "smallest",
-    preserveSymlinks: true,
     plugins: [
       virtual__default.default(
         Array.from(virtualDependencies.entries()).reduce(
@@ -205,18 +228,43 @@ async function bundleExternals(depsToOptimize, outputDir, logger) {
     format: "esm",
     dir: outputDir,
     entryFileNames: "[name].mjs",
-    chunkFileNames: "[name].mjs"
+    chunkFileNames: "[name].mjs",
+    hoistTransitiveImports: false
   });
+  const moduleResolveMap = {};
+  const filteredChunks = output.filter((o) => o.type === "chunk");
+  for (const o of filteredChunks.filter((o2) => o2.isEntry || o2.isDynamicEntry)) {
+    for (const external of globalExternals) {
+      const importer = findExternalImporter(o, external, filteredChunks);
+      if (importer) {
+        const fullPath = path.join(outputDir, importer.fileName);
+        moduleResolveMap[fullPath] = moduleResolveMap[fullPath] || {};
+        if (importer.moduleIds.length > 1) {
+          moduleResolveMap[fullPath][external] = importer.moduleIds.slice(-2, -1)[0];
+        }
+      }
+    }
+  }
+  await promises.writeFile(path.join(outputDir, "module-resolve-map.json"), JSON.stringify(moduleResolveMap, null, 2));
   await bundler.close();
-  return { output, reverseVirtualReferenceMap };
+  return { output, reverseVirtualReferenceMap, usedExternals: moduleResolveMap };
 }
-async function validateOutput(output, reverseVirtualReferenceMap, outputDir, logger) {
+async function validateOutput({
+  output,
+  reverseVirtualReferenceMap,
+  usedExternals,
+  outputDir
+}, logger) {
   const result = {
     invalidChunks: /* @__PURE__ */ new Set(),
     dependencies: /* @__PURE__ */ new Map(),
     externalDependencies: /* @__PURE__ */ new Set()
   };
-  globalExternals.forEach((dep) => result.externalDependencies.add(dep));
+  for (const deps of Object.values(usedExternals)) {
+    for (const dep of Object.keys(deps)) {
+      result.externalDependencies.add(dep);
+    }
+  }
   for (const file of output) {
     if (file.type === "asset") {
       continue;
@@ -241,8 +289,12 @@ async function validateOutput(output, reverseVirtualReferenceMap, outputDir, log
 async function analyzeBundle(entry, mastraEntry, outputDir, platform, logger) {
   const isVirtualFile = entry.includes("\n") || !fs.existsSync(entry);
   const depsToOptimize = await analyze(entry, mastraEntry, isVirtualFile, platform, logger);
-  const { output, reverseVirtualReferenceMap } = await bundleExternals(depsToOptimize, outputDir, logger);
-  const result = await validateOutput(output, reverseVirtualReferenceMap, outputDir, logger);
+  const { output, reverseVirtualReferenceMap, usedExternals } = await bundleExternals(
+    depsToOptimize,
+    outputDir,
+    logger
+  );
+  const result = await validateOutput({ output, reverseVirtualReferenceMap, usedExternals, outputDir }, logger);
   return result;
 }
 

package/dist/{chunk-UKRVXD63.js → chunk-YE3YSKC6.js}

@@ -1,4 +1,4 @@
-import { aliasHono } from './chunk-T23IXDLE.js';
+import { aliasHono } from './chunk-ARY7G5XC.js';
 import { getInputOptions } from './chunk-XEFBJH3T.js';
 import { removeDeployer } from './chunk-WVBUOQT6.js';
 import alias from '@rollup/plugin-alias';

package/dist/{chunk-7XQJJPRM.js → chunk-ZAXXMFXX.js}

@@ -204,10 +204,11 @@ function removeAllExceptTelemetryConfig(result) {
         if (!t.isVariableDeclarator(parentNode) || !t.isIdentifier(parentNode.id) || parentNode.id.name !== "mastra") {
           return;
         }
-        if (!t.isObjectExpression(path2.node.arguments[0]) || !path2.node.arguments[0].properties?.[0]) {
-          return;
+        let mastraArgs = t.objectExpression([]);
+        if (t.isObjectExpression(path2.node.arguments[0])) {
+          mastraArgs = path2.node.arguments[0];
         }
-        let telemetry = path2.node.arguments[0].properties.find(
+        let telemetry = mastraArgs.properties.find(
           // @ts-ignore
           (prop) => prop.key.name === "telemetry"
         );
@@ -237,6 +238,79 @@ function removeAllExceptTelemetryConfig(result) {
     }
   };
 }
+function removeNonReferencedNodes() {
+  const t = babel__default.types;
+  return {
+    name: "remove-non-referenced-nodes",
+    visitor: {
+      Program(path2) {
+        const scope = path2.scope;
+        const currentBody = path2.get("body");
+        const filteredBody = currentBody.filter((childPath) => {
+          if (childPath.isExportDeclaration()) {
+            return true;
+          }
+          if (childPath.isVariableDeclaration()) {
+            return childPath.node.declarations.some((decl) => {
+              if (!t.isIdentifier(decl.id)) {
+                return false;
+              }
+              const name = decl.id.name;
+              const binding = scope.getBinding(name);
+              return binding && (binding.referenced || binding.referencePaths.length > 0);
+            });
+          }
+          if (childPath.isFunctionDeclaration() || childPath.isClassDeclaration()) {
+            if (!t.isIdentifier(childPath.node.id)) {
+              return false;
+            }
+            const name = childPath.node.id.name;
+            const binding = scope.getBinding(name);
+            return binding && (binding.referenced || binding.referencePaths.length > 0);
+          }
+          if (childPath.isImportDeclaration()) {
+            return childPath.node.specifiers.some((specifier) => {
+              const importedName = specifier.local.name;
+              const binding = scope.getBinding(importedName);
+              return binding && (binding.referenced || binding.referencePaths.length > 0);
+            });
+          }
+          return false;
+        });
+        path2.set(
+          "body",
+          filteredBody.map((p) => p.node)
+        );
+      }
+    }
+  };
+}
+function recursiveRemoveNonReferencedNodes(code) {
+  return new Promise(async (resolve, reject) => {
+    babel.transform(
+      code,
+      {
+        babelrc: false,
+        configFile: false,
+        plugins: [removeNonReferencedNodes()]
+      },
+      (err, result) => {
+        if (err) {
+          return reject(err);
+        }
+        if (result && result.code !== code) {
+          return recursiveRemoveNonReferencedNodes(result.code).then(resolve, reject);
+        }
+        resolve({
+          code: result.code,
+          map: result.map
+        });
+      }
+    );
+  });
+}
+
+// src/build/telemetry.ts
 function getTelemetryBundler(entryFile, result) {
   return rollup({
     logLevel: "silent",
@@ -286,6 +360,21 @@ function getTelemetryBundler(entryFile, result) {
         }
       },
       // let esbuild remove all unused imports
+      esbuild({
+        target: "node20",
+        platform: "node",
+        minify: false
+      }),
+      {
+        name: "cleanup",
+        transform(code, id) {
+          if (id !== entryFile) {
+            return;
+          }
+          return recursiveRemoveNonReferencedNodes(code);
+        }
+      },
+      // let esbuild remove all unused imports
       esbuild({
         target: "node20",
         platform: "node",
@@ -307,4 +396,4 @@ async function writeTelemetryConfig(entryFile, outputDir) {
   return result;
 }
 
-export { Deps, createChildProcessLogger, createPinoStream, writeTelemetryConfig };
+export { Deps, createChildProcessLogger, createPinoStream, recursiveRemoveNonReferencedNodes, writeTelemetryConfig };

package/dist/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
-var chunkFVHOV5SC_cjs = require('./chunk-FVHOV5SC.cjs');
-var chunkXZSN3YN6_cjs = require('./chunk-XZSN3YN6.cjs');
-var chunkPRZC7CEM_cjs = require('./chunk-PRZC7CEM.cjs');
+var chunkAXUXJ2OU_cjs = require('./chunk-AXUXJ2OU.cjs');
+var chunkHBJIG6EL_cjs = require('./chunk-HBJIG6EL.cjs');
+var chunkKFOGAPGX_cjs = require('./chunk-KFOGAPGX.cjs');
 var babel = require('@babel/core');
 var rollup = require('rollup');
 var esbuild = require('rollup-plugin-esbuild');
@@ -33,8 +33,8 @@ var esbuild__default = /*#__PURE__*/_interopDefault(esbuild);
 var commonjs__default = /*#__PURE__*/_interopDefault(commonjs);
 
 // src/deploy/base.ts
-var Deployer = class extends chunkXZSN3YN6_cjs.Bundler {
-  deps = new chunkPRZC7CEM_cjs.Deps();
+var Deployer = class extends chunkHBJIG6EL_cjs.Bundler {
+  deps = new chunkKFOGAPGX_cjs.Deps();
   constructor(args) {
     super(args.name, "DEPLOYER");
     this.deps.__setLogger(this.logger);
@@ -42,7 +42,7 @@ var Deployer = class extends chunkXZSN3YN6_cjs.Bundler {
   getEnvFiles() {
     const possibleFiles = [".env.production", ".env.local", ".env"];
     try {
-      const fileService = new chunkFVHOV5SC_cjs.FileService();
+      const fileService = new chunkAXUXJ2OU_cjs.FileService();
       const envFile = fileService.getFirstExistingFile(possibleFiles);
       return Promise.resolve([envFile]);
     } catch {
@@ -136,6 +136,21 @@ function getDeployerBundler(entryFile) {
         }
       },
       // let esbuild remove all unused imports
+      esbuild__default.default({
+        target: "node20",
+        platform: "node",
+        minify: false
+      }),
+      {
+        name: "cleanup-nodes",
+        transform(code, id) {
+          if (id !== entryFile) {
+            return;
+          }
+          return chunkKFOGAPGX_cjs.recursiveRemoveNonReferencedNodes(code);
+        }
+      },
+      // let esbuild remove all unused imports
       esbuild__default.default({
         target: "node20",
         platform: "node",
@@ -156,19 +171,19 @@ async function getDeployer(entryFile, outputDir) {
 
 Object.defineProperty(exports, "FileService", {
   enumerable: true,
-  get: function () { return chunkFVHOV5SC_cjs.FileService; }
+  get: function () { return chunkAXUXJ2OU_cjs.FileService; }
 });
 Object.defineProperty(exports, "Deps", {
   enumerable: true,
-  get: function () { return chunkPRZC7CEM_cjs.Deps; }
+  get: function () { return chunkKFOGAPGX_cjs.Deps; }
 });
 Object.defineProperty(exports, "createChildProcessLogger", {
   enumerable: true,
-  get: function () { return chunkPRZC7CEM_cjs.createChildProcessLogger; }
+  get: function () { return chunkKFOGAPGX_cjs.createChildProcessLogger; }
 });
 Object.defineProperty(exports, "createPinoStream", {
   enumerable: true,
-  get: function () { return chunkPRZC7CEM_cjs.createPinoStream; }
+  get: function () { return chunkKFOGAPGX_cjs.createPinoStream; }
 });
 exports.Deployer = Deployer;
 exports.getDeployer = getDeployer;

package/dist/index.js

@@ -1,8 +1,8 @@
-import { FileService } from './chunk-UKRVXD63.js';
-export { FileService } from './chunk-UKRVXD63.js';
-import { Bundler } from './chunk-IGPSPQAD.js';
-import { Deps } from './chunk-7XQJJPRM.js';
-export { Deps, createChildProcessLogger, createPinoStream } from './chunk-7XQJJPRM.js';
+import { FileService } from './chunk-YE3YSKC6.js';
+export { FileService } from './chunk-YE3YSKC6.js';
+import { Bundler } from './chunk-7J2ZTGHM.js';
+import { Deps, recursiveRemoveNonReferencedNodes } from './chunk-ZAXXMFXX.js';
+export { Deps, createChildProcessLogger, createPinoStream } from './chunk-ZAXXMFXX.js';
 import * as babel from '@babel/core';
 import babel__default from '@babel/core';
 import { rollup } from 'rollup';
@@ -113,6 +113,21 @@ function getDeployerBundler(entryFile) {
         }
       },
       // let esbuild remove all unused imports
+      esbuild({
+        target: "node20",
+        platform: "node",
+        minify: false
+      }),
+      {
+        name: "cleanup-nodes",
+        transform(code, id) {
+          if (id !== entryFile) {
+            return;
+          }
+          return recursiveRemoveNonReferencedNodes(code);
+        }
+      },
+      // let esbuild remove all unused imports
       esbuild({
         target: "node20",
         platform: "node",

package/dist/server/index.cjs

@@ -3723,7 +3723,7 @@ async function speakHandler(c2) {
     const { input, options } = await c2.req.json();
     await validateBody({ input });
     const audioStream = await agent.voice.speak(input, options);
-    c2.header("Content-Type", `audio/${options.filetype ?? "mp3"}`);
+    c2.header("Content-Type", `audio/${options?.filetype ?? "mp3"}`);
     c2.header("Transfer-Encoding", "chunked");
     return c2.body(audioStream);
   } catch (error) {
@@ -4750,7 +4750,7 @@ async function createHonoServer(mastra, options = {}) {
             schema: {
               type: "object",
               properties: {
-                text: {
+                input: {
                   type: "string",
                   description: "Text to convert to speech"
                 },

package/dist/server/index.js

@@ -3717,7 +3717,7 @@ async function speakHandler(c2) {
     const { input, options } = await c2.req.json();
     await validateBody({ input });
     const audioStream = await agent.voice.speak(input, options);
-    c2.header("Content-Type", `audio/${options.filetype ?? "mp3"}`);
+    c2.header("Content-Type", `audio/${options?.filetype ?? "mp3"}`);
     c2.header("Transfer-Encoding", "chunked");
     return c2.body(audioStream);
   } catch (error) {
@@ -4744,7 +4744,7 @@ async function createHonoServer(mastra, options = {}) {
             schema: {
               type: "object",
               properties: {
-                text: {
+                input: {
                   type: "string",
                   description: "Text to convert to speech"
                 },

package/dist/validator/custom-resolver.cjs

@@ -1,16 +1,35 @@
 'use strict';
 
+var promises = require('fs/promises');
 var module$1 = require('module');
+var path = require('path');
 var url = require('url');
-var resolveFrom = require('resolve-from');
 
 // src/validator/custom-resolver.ts
+var cache = /* @__PURE__ */ new Map();
 function isBuiltinModule(specifier) {
   return module$1.builtinModules.includes(specifier) || specifier.startsWith("node:") || module$1.builtinModules.includes(specifier.replace(/^node:/, ""));
 }
 function isRelativePath(specifier) {
   return specifier.startsWith("./") || specifier.startsWith("../") || specifier.startsWith("/") || /^[a-zA-Z]:\\/.test(specifier);
 }
+async function getParentPath(specifier, url$1) {
+  if (!cache.size) {
+    const moduleResolveMap = JSON.parse(
+      // cwd refers to the output/build directory
+      await promises.readFile(path.join(process.cwd(), "module-resolve-map.json"), "utf-8")
+    );
+    for (const [id, rest] of Object.entries(moduleResolveMap)) {
+      cache.set(url.pathToFileURL(id).toString(), rest);
+    }
+  }
+  const importers = cache.get(url$1);
+  if (!importers || !importers[specifier]) {
+    return null;
+  }
+  const specifierParent = importers[specifier];
+  return url.pathToFileURL(specifierParent).toString();
+}
 async function resolve(specifier, context, nextResolve) {
   if (isBuiltinModule(specifier)) {
     return nextResolve(specifier, context);
@@ -18,12 +37,12 @@ async function resolve(specifier, context, nextResolve) {
   if (isRelativePath(specifier)) {
     return nextResolve(specifier, context);
   }
-  if (specifier === "pino" || specifier === "pino-pretty") {
-    const pkgPackagePath = resolveFrom.silent(process.cwd(), "@mastra/core/package.json");
-    if (pkgPackagePath) {
+  if (context.parentURL) {
+    const parentPath = await getParentPath(specifier, context.parentURL);
+    if (parentPath) {
       return nextResolve(specifier, {
         ...context,
-        parentURL: url.pathToFileURL(pkgPackagePath).toString()
+        parentURL: parentPath
       });
     }
   }

package/dist/validator/custom-resolver.js

@@ -1,14 +1,33 @@
+import { readFile } from 'node:fs/promises';
 import { builtinModules } from 'node:module';
+import { join } from 'node:path';
 import { pathToFileURL } from 'node:url';
-import { silent } from 'resolve-from';
 
 // src/validator/custom-resolver.ts
+var cache = /* @__PURE__ */ new Map();
 function isBuiltinModule(specifier) {
   return builtinModules.includes(specifier) || specifier.startsWith("node:") || builtinModules.includes(specifier.replace(/^node:/, ""));
 }
 function isRelativePath(specifier) {
   return specifier.startsWith("./") || specifier.startsWith("../") || specifier.startsWith("/") || /^[a-zA-Z]:\\/.test(specifier);
 }
+async function getParentPath(specifier, url) {
+  if (!cache.size) {
+    const moduleResolveMap = JSON.parse(
+      // cwd refers to the output/build directory
+      await readFile(join(process.cwd(), "module-resolve-map.json"), "utf-8")
+    );
+    for (const [id, rest] of Object.entries(moduleResolveMap)) {
+      cache.set(pathToFileURL(id).toString(), rest);
+    }
+  }
+  const importers = cache.get(url);
+  if (!importers || !importers[specifier]) {
+    return null;
+  }
+  const specifierParent = importers[specifier];
+  return pathToFileURL(specifierParent).toString();
+}
 async function resolve(specifier, context, nextResolve) {
   if (isBuiltinModule(specifier)) {
     return nextResolve(specifier, context);
@@ -16,12 +35,12 @@ async function resolve(specifier, context, nextResolve) {
   if (isRelativePath(specifier)) {
     return nextResolve(specifier, context);
   }
-  if (specifier === "pino" || specifier === "pino-pretty") {
-    const pkgPackagePath = silent(process.cwd(), "@mastra/core/package.json");
-    if (pkgPackagePath) {
+  if (context.parentURL) {
+    const parentPath = await getParentPath(specifier, context.parentURL);
+    if (parentPath) {
       return nextResolve(specifier, {
         ...context,
-        parentURL: pathToFileURL(pkgPackagePath).toString()
+        parentURL: parentPath
       });
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/deployer",
-  "version": "0.2.3",
+  "version": "0.2.4-alpha.0",
   "description": "",
   "type": "module",
   "files": [
@@ -95,7 +95,7 @@
     "rollup-plugin-node-externals": "^8.0.0",
     "typescript-paths": "^1.5.1",
     "zod": "^3.24.2",
-    "@mastra/core": "^0.6.3"
+    "@mastra/core": "^0.6.4-alpha.0"
   },
   "devDependencies": {
     "@hono/node-server": "^1.13.8",