@mastra/deployer 0.2.1-alpha.1 → 0.2.1

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

@@ -195,7 +195,7 @@ function removeAllExceptTelemetryConfig(result) {
           path2.remove();
         }
       },
-      NewExpression(path2) {
+      NewExpression(path2, state) {
         const varDeclaratorPath = path2.findParent((path3) => t.isVariableDeclarator(path3.node));
         if (!varDeclaratorPath) {
           return;
@@ -204,23 +204,32 @@ function removeAllExceptTelemetryConfig(result) {
         if (!t.isVariableDeclarator(parentNode) || !t.isIdentifier(parentNode.id) || parentNode.id.name !== "mastra") {
           return;
         }
-        let telemetry = path2.node.arguments[0]?.properties?.find(
+        if (!t.isObjectExpression(path2.node.arguments[0]) || !path2.node.arguments[0].properties?.[0]) {
+          return;
+        }
+        let telemetry = path2.node.arguments[0].properties.find(
           // @ts-ignore
           (prop) => prop.key.name === "telemetry"
         );
+        let telemetryValue = t.objectExpression([]);
         const programPath = path2.scope.getProgramParent().path;
         if (!programPath) {
           return;
         }
-        if (telemetry) {
+        if (telemetry && t.isObjectProperty(telemetry) && t.isExpression(telemetry.value)) {
           result.hasCustomConfig = true;
-        } else {
-          telemetry = {
-            value: t.objectExpression([])
-          };
+          telemetryValue = telemetry.value;
+          if (t.isIdentifier(telemetry.value) && telemetry.value.name === "telemetry") {
+            const telemetryBinding = state.file.scope.getBinding("telemetry");
+            if (telemetryBinding && t.isVariableDeclarator(telemetryBinding.path.node)) {
+              const id = path2.scope.generateUidIdentifier("telemetry");
+              telemetryBinding.path.replaceWith(t.variableDeclarator(id, telemetryBinding.path.node.init));
+              telemetryValue = id;
+            }
+          }
         }
         const exportDeclaration = t.exportNamedDeclaration(
-          t.variableDeclaration("const", [t.variableDeclarator(t.identifier("telemetry"), telemetry.value)]),
+          t.variableDeclaration("const", [t.variableDeclarator(t.identifier("telemetry"), telemetryValue)]),
           []
         );
         programPath.node.body.push(exportDeclaration);
@@ -228,11 +237,9 @@ function removeAllExceptTelemetryConfig(result) {
     }
   };
 }
-async function writeTelemetryConfig(entryFile, outputDir) {
-  const result = {
-    hasCustomConfig: false
-  };
-  const bundle = await rollup({
+function getTelemetryBundler(entryFile, result) {
+  return rollup({
+    logLevel: "silent",
     input: {
       "telemetry-config": entryFile
     },
@@ -286,6 +293,12 @@ async function writeTelemetryConfig(entryFile, outputDir) {
       })
     ]
   });
+}
+async function writeTelemetryConfig(entryFile, outputDir) {
+  const result = {
+    hasCustomConfig: false
+  };
+  const bundle = await getTelemetryBundler(entryFile, result);
   await bundle.write({
     dir: outputDir,
     format: "es",

package/dist/{chunk-72GFPLLU.js → chunk-DZ4D3KXZ.js}

@@ -1,6 +1,6 @@
-import { aliasHono } from './chunk-TQSSPVHI.js';
-import { getInputOptions, telemetryFix, libSqlFix } from './chunk-AC67BJSW.js';
-import { removeDeployer } from './chunk-PT5XTSU2.js';
+import { aliasHono } from './chunk-JNF4CXZJ.js';
+import { getInputOptions } from './chunk-XO6KJHXC.js';
+import { removeDeployer } from './chunk-JNNKML56.js';
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import json from '@rollup/plugin-json';
@@ -144,7 +144,7 @@ function getOptions(inputOptions, platform, root) {
   return {
     logLevel: "silent",
     ...inputOptions,
-    treeshake: false,
+    treeshake: "smallest",
     preserveSymlinks: true,
     external: [
       ...nodeBuiltins,
@@ -153,7 +153,6 @@ function getOptions(inputOptions, platform, root) {
     ],
     plugins: [
       ...inputOptions.plugins ?? [],
-      telemetryFix(),
       alias({
         entries: [
           {
@@ -179,7 +178,6 @@ function getOptions(inputOptions, platform, root) {
         transformMixedEsModules: true
         // dynamicRequireTargets: ['node_modules/**/@libsql+win32-*/*'],
       }),
-      libSqlFix(),
       // for debugging
       // {
       //   name: 'logger',

package/dist/{chunk-YLIG5BNH.cjs → chunk-GLTC4BEQ.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunk4LYFNYJ4_cjs = require('./chunk-4LYFNYJ4.cjs');
+var chunkJSFQUYK4_cjs = require('./chunk-JSFQUYK4.cjs');
 var commonjs = require('@rollup/plugin-commonjs');
 var json = require('@rollup/plugin-json');
 var nodeResolve = require('@rollup/plugin-node-resolve');
@@ -10,6 +10,8 @@ var url = require('url');
 var rollup = require('rollup');
 var esbuild = require('rollup-plugin-esbuild');
 var module$1 = require('module');
+var path = require('path');
+var child_process = require('child_process');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -35,81 +37,40 @@ function aliasHono() {
     }
   };
 }
-
-// src/build/plugins/pino.ts
-function pino() {
-  const workerFiles = [
-    {
-      id: "thread-stream-worker",
-      file: "pino-thread-stream-worker"
-    },
-    {
-      id: "pino-worker",
-      file: "pino-worker"
-    },
-    {
-      id: "pino/file",
-      file: "pino-file"
-    },
-    {
-      id: "pino-pretty",
-      file: "pino-pretty"
-    }
-  ];
-  const fileReferences = /* @__PURE__ */ new Map();
-  return {
-    name: "rollup-plugin-pino",
-    async resolveId(id, importee) {
-      if (id === "pino") {
-        const resolvedPino = await this.resolve(id, importee);
-        if (resolvedPino) {
-          await Promise.all(
-            workerFiles.map(async (file) => {
-              const resolvedEntry = await this.resolve(file.id, resolvedPino.id);
-              if (!resolvedEntry) {
-                return null;
-              }
-              const reference = this.emitFile({
-                type: "chunk",
-                id: resolvedEntry.id,
-                name: `${file.file}`
-              });
-              fileReferences.set(file.id, reference);
-            })
-          );
-        }
-      }
-    },
-    renderChunk(code, chunk) {
-      if (chunk.type === "chunk" && chunk.isEntry && fileReferences.size && chunk.name === "index") {
-        const importRegex = /^(?:import(?:["'\s]*[\w*${}\n\r\t, ]+from\s*)?["'\s].+[;"'\s]*)$/gm;
-        const codeToInject = `globalThis.__bundlerPathsOverrides = {
-            ${Array.from(fileReferences.entries()).map(([key, file]) => {
-          return '"' + key + '": import.meta.ROLLUP_FILE_URL_' + file;
-        }).join(",\n")}
-            };`;
-        const matches = Array.from(code.matchAll(importRegex));
-        if (matches.length > 0) {
-          const lastImport = matches[matches.length - 1];
-          const lastImportEnd = lastImport.index + lastImport[0].length;
-          const newCode = code.slice(0, lastImportEnd) + "\n\n" + codeToInject + "\n\n" + code.slice(lastImportEnd);
-          return {
-            code: newCode,
-            map: null
-          };
-        }
-        return {
-          code: `${codeToInject}
-
-${code}`,
-          map: null
-        };
+function spawn(command, args = [], options = {}) {
+  return new Promise((resolve, reject) => {
+    const childProcess = child_process.spawn(command, args, {
+      // stdio: 'inherit',
+      ...options
+    });
+    childProcess.on("error", (error) => {
+      reject(error);
+    });
+    let stderr = "";
+    childProcess.stderr?.on("data", (message) => {
+      stderr += message;
+    });
+    childProcess.on("close", (code) => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject(new Error(stderr));
       }
-    }
-  };
+    });
+  });
+}
+function validate(file) {
+  return spawn("node", [
+    "--import",
+    undefined("@mastra/deployer/loader"),
+    "--input-type=module",
+    "-e",
+    `import('file://${file.replaceAll("\\", "/")}')`
+  ]);
 }
 
 // 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;
@@ -119,10 +80,11 @@ async function analyze(entry, mastraEntry, isVirtualFile, platform, logger) {
     });
     entry = "#entry";
   }
+  const normalizedMastraEntry = mastraEntry.replaceAll("\\", "/");
   const optimizerBundler = await rollup.rollup({
     logLevel: process.env.MASTRA_BUNDLER_DEBUG === "true" ? "debug" : "silent",
     input: isVirtualFile ? "#entry" : entry,
-    treeshake: true,
+    treeshake: "smallest",
     preserveSymlinks: true,
     plugins: [
       virtualPlugin,
@@ -133,7 +95,7 @@ async function analyze(entry, mastraEntry, isVirtualFile, platform, logger) {
             return url.fileURLToPath(undefined("@mastra/deployer/server")).replaceAll("\\", "/");
           }
           if (id === "#mastra") {
-            return mastraEntry.replaceAll("\\", "/");
+            return normalizedMastraEntry;
           }
         }
       },
@@ -149,7 +111,7 @@ async function analyze(entry, mastraEntry, isVirtualFile, platform, logger) {
         transformMixedEsModules: true,
         extensions: [".js", ".ts"]
       }),
-      chunk4LYFNYJ4_cjs.removeDeployer(mastraEntry),
+      chunkJSFQUYK4_cjs.removeDeployer(normalizedMastraEntry),
       esbuild__default.default({
         target: "node20",
         platform,
@@ -210,7 +172,7 @@ 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"],
+    external: ["jsdom", ...globalExternals],
     treeshake: "smallest",
     preserveSymlinks: true,
     plugins: [
@@ -223,7 +185,6 @@ async function bundleExternals(depsToOptimize, outputDir, logger) {
           {}
         )
       ),
-      pino(),
       commonjs__default.default({
         strictRequires: "strict",
         transformMixedEsModules: true,
@@ -254,6 +215,7 @@ async function validateOutput(output, reverseVirtualReferenceMap, outputDir, log
     dependencies: /* @__PURE__ */ new Map(),
     externalDependencies: /* @__PURE__ */ new Set()
   };
+  globalExternals.forEach((dep) => result.externalDependencies.add(dep));
   for (const file of output) {
     if (file.type === "asset") {
       continue;
@@ -263,7 +225,9 @@ async function validateOutput(output, reverseVirtualReferenceMap, outputDir, log
       if (file.isEntry && reverseVirtualReferenceMap.has(file.name)) {
         result.dependencies.set(reverseVirtualReferenceMap.get(file.name), file.fileName);
       }
-      await import(`file:${outputDir}/${file.fileName}`);
+      if (!file.isDynamicEntry && file.isEntry) {
+        await validate(path.join(outputDir, file.fileName));
+      }
     } catch (err) {
       result.invalidChunks.add(file.fileName);
       if (file.isEntry && reverseVirtualReferenceMap.has(file.name)) {

package/dist/{chunk-J2F3DJTF.cjs → chunk-HLGZCQQW.cjs}

@@ -1,22 +1,22 @@
 'use strict';
 
-var chunkVPP5727D_cjs = require('./chunk-VPP5727D.cjs');
-var chunkYLIG5BNH_cjs = require('./chunk-YLIG5BNH.cjs');
-var chunkQFYK5AS3_cjs = require('./chunk-QFYK5AS3.cjs');
+var chunkPRZC7CEM_cjs = require('./chunk-PRZC7CEM.cjs');
+var chunkGLTC4BEQ_cjs = require('./chunk-GLTC4BEQ.cjs');
+var chunk3H66SAKS_cjs = require('./chunk-3H66SAKS.cjs');
 var fs = require('fs');
 var promises = require('fs/promises');
 var path = require('path');
 var url = require('url');
 var bundler = require('@mastra/core/bundler');
 var virtual = require('@rollup/plugin-virtual');
-var fsExtra$1 = require('fs-extra');
-var fsExtra = require('fs-extra/esm');
+var esm = require('fs-extra/esm');
+var resolveFrom = require('resolve-from');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var virtual__default = /*#__PURE__*/_interopDefault(virtual);
-var fsExtra__default = /*#__PURE__*/_interopDefault(fsExtra);
+var resolveFrom__default = /*#__PURE__*/_interopDefault(resolveFrom);
 
 var Bundler = class extends bundler.MastraBundler {
   analyzeOutputDir = ".build";
@@ -25,18 +25,18 @@ var Bundler = class extends bundler.MastraBundler {
     super({ name, component });
   }
   async prepare(outputDirectory) {
-    await fsExtra__default.default.emptyDir(outputDirectory);
-    await fsExtra$1.ensureDir(path.join(outputDirectory, this.analyzeOutputDir));
-    await fsExtra$1.ensureDir(path.join(outputDirectory, this.outputDir));
+    await esm.emptyDir(outputDirectory);
+    await esm.ensureDir(path.join(outputDirectory, this.analyzeOutputDir));
+    await esm.ensureDir(path.join(outputDirectory, this.outputDir));
   }
   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-J2F3DJTF.cjs', document.baseURI).href))));
-    await fsExtra$1.copy(path.join(__dirname, "templates", "instrumentation-template.js"), instrumentationFile);
+    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-HLGZCQQW.cjs', document.baseURI).href))));
+    await esm.copy(path.join(__dirname, "templates", "instrumentation-template.js"), instrumentationFile);
   }
   async writePackageJson(outputDirectory, dependencies) {
     this.logger.debug(`Writing project's package.json`);
-    await fsExtra$1.ensureDir(outputDirectory);
+    await esm.ensureDir(outputDirectory);
     const pkgPath = path.join(outputDirectory, "package.json");
     const dependenciesMap = /* @__PURE__ */ new Map();
     for (const [key, value] of dependencies.entries()) {
@@ -70,35 +70,50 @@ var Bundler = class extends bundler.MastraBundler {
     );
   }
   createBundler(inputOptions, outputOptions) {
-    return chunkQFYK5AS3_cjs.createBundler(inputOptions, outputOptions);
+    return chunk3H66SAKS_cjs.createBundler(inputOptions, outputOptions);
   }
   async analyze(entry, mastraFile, outputDirectory) {
-    return await chunkYLIG5BNH_cjs.analyzeBundle(entry, mastraFile, path.join(outputDirectory, this.analyzeOutputDir), "node", this.logger);
+    return await chunkGLTC4BEQ_cjs.analyzeBundle(entry, mastraFile, path.join(outputDirectory, this.analyzeOutputDir), "node", this.logger);
   }
   async installDependencies(outputDirectory, rootDir = process.cwd()) {
-    const deps = new chunkVPP5727D_cjs.Deps(rootDir);
+    const deps = new chunkPRZC7CEM_cjs.Deps(rootDir);
     deps.__setLogger(this.logger);
     await deps.install({ dir: path.join(outputDirectory, this.outputDir) });
   }
+  async copyPublic(mastraDir, outputDirectory) {
+    const publicDir = path.join(mastraDir, "public");
+    try {
+      await promises.stat(publicDir);
+    } catch {
+      return;
+    }
+    await esm.copy(publicDir, path.join(outputDirectory, this.outputDir));
+  }
   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 chunkYLIG5BNH_cjs.analyzeBundle(
+    const analyzedBundleInfo = await chunkGLTC4BEQ_cjs.analyzeBundle(
       serverFile,
       mastraEntryFile,
       path.join(outputDirectory, this.analyzeOutputDir),
       "node",
       this.logger
     );
-    await chunkVPP5727D_cjs.writeTelemetryConfig(mastraEntryFile, path.join(outputDirectory, this.outputDir));
-    const dependenciesToInstall = Array.from(analyzedBundleInfo.externalDependencies).reduce((acc, dep) => {
-      acc.set(dep, "latest");
-      return acc;
-    }, /* @__PURE__ */ new Map());
+    await chunkPRZC7CEM_cjs.writeTelemetryConfig(mastraEntryFile, path.join(outputDirectory, this.outputDir));
+    const dependenciesToInstall = /* @__PURE__ */ new Map();
+    for (const dep of analyzedBundleInfo.externalDependencies) {
+      try {
+        const pkgPath = resolveFrom__default.default(mastraEntryFile, `${dep}/package.json`);
+        const pkg = await esm.readJSON(pkgPath);
+        dependenciesToInstall.set(dep, pkg.version);
+      } catch {
+        dependenciesToInstall.set(dep, "latest");
+      }
+    }
     await this.writePackageJson(path.join(outputDirectory, this.outputDir), dependenciesToInstall);
     await this.writeInstrumentationFile(path.join(outputDirectory, this.outputDir));
     this.logger.info("Bundling Mastra application");
-    const inputOptions = await chunkQFYK5AS3_cjs.getInputOptions(mastraEntryFile, analyzedBundleInfo, "node");
+    const inputOptions = await chunk3H66SAKS_cjs.getInputOptions(mastraEntryFile, analyzedBundleInfo, "node");
     if (isVirtual) {
       inputOptions.input = { index: "#entry" };
       if (Array.isArray(inputOptions.plugins)) {
@@ -112,6 +127,9 @@ var Bundler = class extends bundler.MastraBundler {
     const bundler = await this.createBundler(inputOptions, { dir: bundleLocation });
     await bundler.write();
     this.logger.info("Bundling Mastra done");
+    this.logger.info("Copying public files");
+    await this.copyPublic(path.dirname(mastraEntryFile), outputDirectory);
+    this.logger.info("Done copying public files");
     this.logger.info("Installing dependencies");
     await this.installDependencies(outputDirectory);
     this.logger.info("Done installing dependencies");

package/dist/{chunk-VPY2RQUP.js → chunk-HRR4D2GM.js}

@@ -1,14 +1,14 @@
-import { Deps, writeTelemetryConfig } from './chunk-SL5KZNFT.js';
-import { analyzeBundle } from './chunk-TQSSPVHI.js';
-import { createBundler, getInputOptions } from './chunk-AC67BJSW.js';
+import { Deps, writeTelemetryConfig } from './chunk-7XQJJPRM.js';
+import { analyzeBundle } from './chunk-JNF4CXZJ.js';
+import { createBundler, getInputOptions } from './chunk-XO6KJHXC.js';
 import { existsSync } from 'node:fs';
-import { writeFile } from 'node:fs/promises';
+import { writeFile, stat } from 'node:fs/promises';
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { MastraBundler } from '@mastra/core/bundler';
 import virtual from '@rollup/plugin-virtual';
-import { ensureDir, copy } from 'fs-extra';
-import fsExtra from 'fs-extra/esm';
+import { emptyDir, ensureDir, copy, readJSON } from 'fs-extra/esm';
+import resolveFrom from 'resolve-from';
 
 var Bundler = class extends MastraBundler {
   analyzeOutputDir = ".build";
@@ -17,7 +17,7 @@ var Bundler = class extends MastraBundler {
     super({ name, component });
   }
   async prepare(outputDirectory) {
-    await fsExtra.emptyDir(outputDirectory);
+    await emptyDir(outputDirectory);
     await ensureDir(join(outputDirectory, this.analyzeOutputDir));
     await ensureDir(join(outputDirectory, this.outputDir));
   }
@@ -72,6 +72,15 @@ var Bundler = class extends MastraBundler {
     deps.__setLogger(this.logger);
     await deps.install({ dir: join(outputDirectory, this.outputDir) });
   }
+  async copyPublic(mastraDir, outputDirectory) {
+    const publicDir = join(mastraDir, "public");
+    try {
+      await stat(publicDir);
+    } catch {
+      return;
+    }
+    await copy(publicDir, join(outputDirectory, this.outputDir));
+  }
   async _bundle(serverFile, mastraEntryFile, outputDirectory, bundleLocation = join(outputDirectory, this.outputDir)) {
     this.logger.info("Start bundling Mastra");
     const isVirtual = serverFile.includes("\n") || existsSync(serverFile);
@@ -83,10 +92,16 @@ var Bundler = class extends MastraBundler {
       this.logger
     );
     await writeTelemetryConfig(mastraEntryFile, join(outputDirectory, this.outputDir));
-    const dependenciesToInstall = Array.from(analyzedBundleInfo.externalDependencies).reduce((acc, dep) => {
-      acc.set(dep, "latest");
-      return acc;
-    }, /* @__PURE__ */ new Map());
+    const dependenciesToInstall = /* @__PURE__ */ new Map();
+    for (const dep of analyzedBundleInfo.externalDependencies) {
+      try {
+        const pkgPath = resolveFrom(mastraEntryFile, `${dep}/package.json`);
+        const pkg = await readJSON(pkgPath);
+        dependenciesToInstall.set(dep, pkg.version);
+      } catch {
+        dependenciesToInstall.set(dep, "latest");
+      }
+    }
     await this.writePackageJson(join(outputDirectory, this.outputDir), dependenciesToInstall);
     await this.writeInstrumentationFile(join(outputDirectory, this.outputDir));
     this.logger.info("Bundling Mastra application");
@@ -104,6 +119,9 @@ var Bundler = class extends MastraBundler {
     const bundler = await this.createBundler(inputOptions, { dir: bundleLocation });
     await bundler.write();
     this.logger.info("Bundling Mastra done");
+    this.logger.info("Copying public files");
+    await this.copyPublic(dirname(mastraEntryFile), outputDirectory);
+    this.logger.info("Done copying public files");
     this.logger.info("Installing dependencies");
     await this.installDependencies(outputDirectory);
     this.logger.info("Done installing dependencies");