@mastra/deployer 1.67.0 → 1.68.0-alpha.5

package/dist/_types/@hono_node-server/package.json

@@ -0,0 +1 @@
+{"type":"module"}

package/dist/_types/@mastra_hono/package.json

@@ -0,0 +1 @@
+{"type":"module"}

package/dist/{analyze-hp4aHpms.cjs → analyze-BC22OIkc.cjs}

@@ -1,8 +1,7 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.cjs");
-const require_utils = require("./utils-7WDNT3Ca.cjs");
-const require_services = require("./services-BLvNG7v7.cjs");
-const require_bundler = require("./bundler-BKf2S2r_.cjs");
-let child_process = require("child_process");
+const require_utils = require("./utils-Bsr_sEcH.cjs");
+const require_services = require("./services-Beob47UW.cjs");
+const require_bundler = require("./bundler-I4HUeik1.cjs");
 let fs = require("fs");
 let fs_promises = require("fs/promises");
 let path = require("path");
@@ -13,20 +12,19 @@ _rollup_plugin_virtual = require_rolldown_runtime.__toESM(_rollup_plugin_virtual
 let empathic_package = require("empathic/package");
 empathic_package = require_rolldown_runtime.__toESM(empathic_package, 1);
 let _babel_core = require("@babel/core");
-let _sindresorhus_slugify = require("@sindresorhus/slugify");
-_sindresorhus_slugify = require_rolldown_runtime.__toESM(_sindresorhus_slugify, 1);
 let find_workspaces = require("find-workspaces");
 let fs_extra = require("fs-extra");
+let child_process = require("child_process");
 let url = require("url");
 let _rollup_plugin_commonjs = require("@rollup/plugin-commonjs");
 _rollup_plugin_commonjs = require_rolldown_runtime.__toESM(_rollup_plugin_commonjs, 1);
 let _rollup_plugin_json = require("@rollup/plugin-json");
 _rollup_plugin_json = require_rolldown_runtime.__toESM(_rollup_plugin_json, 1);
+let local_pkg = require("local-pkg");
 let rollup = require("rollup");
 let _optimize_lodash_rollup_plugin = require("@optimize-lodash/rollup-plugin");
 let _rollup_plugin_node_resolve = require("@rollup/plugin-node-resolve");
 _rollup_plugin_node_resolve = require_rolldown_runtime.__toESM(_rollup_plugin_node_resolve, 1);
-let local_pkg = require("local-pkg");
 let path_posix = require("path/posix");
 let resolve_exports = require("resolve.exports");
 resolve_exports = require_rolldown_runtime.__toESM(resolve_exports, 1);
@@ -127,24 +125,6 @@ var require_stack_trace_parser_cjs = /* @__PURE__ */ require_rolldown_runtime.__
 //#endregion
 //#region src/bundler/workspaceDependencies.ts
 var import_stack_trace_parser_cjs = /* @__PURE__ */ require_rolldown_runtime.__toESM(require_stack_trace_parser_cjs(), 1);
-const isExportTargetImportable = (target) => {
-	if (!target) return false;
-	if (typeof target === "string") return true;
-	if (Array.isArray(target)) return target.some(isExportTargetImportable);
-	if (typeof target !== "object") return false;
-	return Object.values(target).some(isExportTargetImportable);
-};
-const hasRootExport = (exportsField) => {
-	if (exportsField === void 0) return true;
-	if (typeof exportsField === "string" || Array.isArray(exportsField)) return isExportTargetImportable(exportsField);
-	if (!exportsField || typeof exportsField !== "object") return false;
-	const exportMap = exportsField;
-	const exportKeys = Object.keys(exportMap);
-	if (exportKeys.length === 0) return false;
-	if (Object.prototype.hasOwnProperty.call(exportMap, ".")) return isExportTargetImportable(exportMap["."]);
-	if (exportKeys.some((key) => key.startsWith("./"))) return false;
-	return isExportTargetImportable(exportMap);
-};
 /**
 * Create a shared cache for find-workspaces
 */
@@ -181,7 +161,7 @@ async function getWorkspaceInformation({ dir = process.cwd(), mastraEntryFile })
 /**
 * Collects all transitive workspace dependencies and their TGZ paths
 */
-const collectTransitiveWorkspaceDependencies = ({ workspaceMap, initialDependencies, logger }) => {
+const collectTransitiveWorkspaceDependencies = async ({ workspaceMap, initialDependencies, logger }) => {
 	const usedWorkspacePackages = /* @__PURE__ */ new Set();
 	const queue = Array.from(initialDependencies);
 	const resolutions = {};
@@ -196,7 +176,8 @@ const collectTransitiveWorkspaceDependencies = ({ workspaceMap, initialDependenc
 			if (!root) throw new Error("Could not find workspace root");
 			const depsService = new require_services.DepsService(root.location);
 			depsService.__setLogger(logger);
-			const sanitizedName = (0, _sindresorhus_slugify.default)(pkgName);
+			const slugify = (await import("@sindresorhus/slugify")).default;
+			const sanitizedName = slugify(pkgName);
 			resolutions[pkgName] = depsService.getWorkspaceDependencyPath({
 				pkgName: sanitizedName,
 				version: dep.version
@@ -219,6 +200,7 @@ const packWorkspaceDependencies = async ({ workspaceMap, usedWorkspacePackages,
 	const depsService = new require_services.DepsService(root.location);
 	depsService.__setLogger(logger);
 	if (usedWorkspacePackages.size > 0) {
+		const slugify = (await import("@sindresorhus/slugify")).default;
 		const workspaceDirPath = (0, path.join)(bundleOutputDir, "workspace-module");
 		await (0, fs_extra.ensureDir)(workspaceDirPath);
 		logger.info("Packaging workspace dependencies", { count: usedWorkspacePackages.size });
@@ -229,7 +211,7 @@ const packWorkspaceDependencies = async ({ workspaceMap, usedWorkspacePackages,
 			logger.info(`Packaging batch ${Math.floor(i / batchSize) + 1}/${Math.ceil(packages.length / batchSize)}: ${batch.join(", ")}`);
 			await Promise.all(batch.map(async (pkgName) => {
 				const dep = workspaceMap.get(pkgName);
-				const sanitizedName = (0, _sindresorhus_slugify.default)(pkgName);
+				const sanitizedName = slugify(pkgName);
 				if (!dep) return;
 				await depsService.pack({
 					dir: dep.location,
@@ -393,7 +375,7 @@ function getInputPlugins$1({ entry, isVirtualFile }, mastraEntry, { sourcemapEna
 * Analyzes both static imports and dynamic imports while filtering out Node.js built-ins and ignored dependencies.
 * Identifies workspace packages and resolves package root paths for proper bundling optimization.
 */
-async function captureDependenciesToOptimize(output, workspaceMap, projectRoot, { logger, shouldCheckTransitiveDependencies }) {
+async function captureDependenciesToOptimize(output, workspaceMap, projectRoot, { logger, mastraEntry, shouldCheckTransitiveDependencies, analyzeCache, activeEntries }) {
 	const depsToOptimize = /* @__PURE__ */ new Map();
 	if (!output.facadeModuleId) throw new Error("Something went wrong, we could not find the package name of the entry file. Please open an issue.");
 	let entryRootPath = projectRoot;
@@ -421,47 +403,55 @@ async function captureDependenciesToOptimize(output, workspaceMap, projectRoot,
 			packageSpec
 		});
 	}
-	const processedWorkspaceDeps = /* @__PURE__ */ new Set();
+	const processedWorkspaceEntries = /* @__PURE__ */ new Set();
 	/**
 	* Recursively discovers transitive workspace dependencies from package manifests.
 	*/
-	function checkTransitiveDependencies(maxDepth = 10, currentDepth = 0) {
-		if (currentDepth >= maxDepth) {
-			logger.warn("Maximum dependency depth reached while checking transitive dependencies.");
-			return;
-		}
+	async function checkTransitiveDependencies() {
 		const depsSnapshot = new Map(depsToOptimize);
-		let hasAddedDeps = false;
 		for (const [dep, meta] of depsSnapshot) {
-			const pkgName = require_utils.getPackageName(dep);
-			if (!pkgName || !meta.isWorkspace || processedWorkspaceDeps.has(pkgName)) continue;
-			processedWorkspaceDeps.add(pkgName);
-			const workspaceInfo = workspaceMap.get(pkgName);
-			if (!workspaceInfo?.dependencies) continue;
-			for (const [innerDep, _innerDepVersion] of Object.entries(workspaceInfo.dependencies)) {
-				const innerWorkspaceInfo = workspaceMap.get(innerDep);
-				if (!innerWorkspaceInfo) continue;
-				if (!hasRootExport(innerWorkspaceInfo.exports)) continue;
+			if (!require_utils.getPackageName(dep) || !meta.isWorkspace) continue;
+			const importerPath = (0, url.pathToFileURL)(output.facadeModuleId.startsWith("\0virtual:") ? mastraEntry || projectRoot : output.facadeModuleId).href;
+			const resolvedPath = (0, local_pkg.resolveModule)(dep, { paths: [importerPath] });
+			if (!resolvedPath) {
+				logger.warn("Could not resolve path for workspace dependency", { dep });
+				continue;
+			}
+			const resolvedEntry = require_utils.slash(resolvedPath);
+			if (processedWorkspaceEntries.has(resolvedEntry) || activeEntries.has(resolvedEntry)) continue;
+			processedWorkspaceEntries.add(resolvedEntry);
+			const analysis = await analyzeEntry({
+				entry: resolvedPath,
+				isVirtualFile: false
+			}, mastraEntry, {
+				workspaceMap,
+				projectRoot,
+				logger,
+				sourcemapEnabled: false,
+				shouldCheckTransitiveDependencies: true,
+				analyzeCache,
+				activeEntries
+			});
+			if (!analysis?.dependencies) continue;
+			for (const [innerDep, innerMeta] of analysis.dependencies) {
+				if (!innerMeta.isWorkspace) continue;
 				const existingMeta = depsToOptimize.get(innerDep);
 				if (existingMeta) {
 					depsToOptimize.set(innerDep, {
 						...existingMeta,
-						exports: existingMeta.exports.includes("*") ? existingMeta.exports : [...existingMeta.exports, "*"]
+						exports: [.../* @__PURE__ */ new Set([...existingMeta.exports, ...innerMeta.exports])]
 					});
 					continue;
-				}
-				depsToOptimize.set(innerDep, {
-					exports: ["*"],
-					rootPath: require_utils.slash(innerWorkspaceInfo.location),
+				} else depsToOptimize.set(innerDep, {
+					exports: innerMeta.exports,
+					rootPath: require_utils.slash(innerMeta.rootPath || ""),
 					isWorkspace: true,
-					version: innerWorkspaceInfo.version
+					version: innerMeta.version
 				});
-				hasAddedDeps = true;
 			}
 		}
-		if (hasAddedDeps) checkTransitiveDependencies(maxDepth, currentDepth + 1);
 	}
-	if (shouldCheckTransitiveDependencies) checkTransitiveDependencies();
+	if (shouldCheckTransitiveDependencies) await checkTransitiveDependencies();
 	const dynamicImports = output.dynamicImports.filter((d) => !DEPS_TO_IGNORE.includes(d));
 	if (dynamicImports.length) {
 		for (const dynamicImport of dynamicImports) if (!depsToOptimize.has(dynamicImport) && require_utils.isBareModuleSpecifier(dynamicImport)) {
@@ -486,37 +476,54 @@ async function captureDependenciesToOptimize(output, workspaceMap, projectRoot,
 	}
 	return depsToOptimize;
 }
-async function analyzeEntry({ entry, isVirtualFile }, mastraEntry, { logger, sourcemapEnabled, workspaceMap, projectRoot, shouldCheckTransitiveDependencies = false, analyzeCache }) {
-	const cacheKey = isVirtualFile ? void 0 : require_utils.slash(entry);
-	if (cacheKey && analyzeCache?.has(cacheKey)) return analyzeCache.get(cacheKey);
-	const optimizerBundler = await (0, rollup.rollup)({
-		logLevel: process.env.MASTRA_BUNDLER_DEBUG === "true" ? "debug" : "silent",
-		input: isVirtualFile ? "#entry" : entry,
-		treeshake: false,
-		preserveSymlinks: true,
-		plugins: getInputPlugins$1({
-			entry,
-			isVirtualFile
-		}, mastraEntry, { sourcemapEnabled }),
-		external: DEPS_TO_IGNORE
-	});
-	const { output } = await optimizerBundler.generate({
-		format: "esm",
-		inlineDynamicImports: true
-	});
-	await optimizerBundler.close();
-	const result = {
-		dependencies: await captureDependenciesToOptimize(output[0], workspaceMap, projectRoot, {
-			logger,
-			shouldCheckTransitiveDependencies
-		}),
-		output: {
-			code: output[0].code,
-			map: output[0].map
-		}
-	};
-	if (cacheKey && analyzeCache) analyzeCache.set(cacheKey, result);
-	return result;
+async function analyzeEntry({ entry, isVirtualFile }, mastraEntry, { logger, sourcemapEnabled, workspaceMap, projectRoot, shouldCheckTransitiveDependencies = false, analyzeCache, activeEntries: providedActiveEntries }) {
+	const resolvedEntry = isVirtualFile ? void 0 : require_utils.slash(entry);
+	const effectiveAnalyzeCache = analyzeCache ?? /* @__PURE__ */ new Map();
+	const cacheKey = resolvedEntry ? `${resolvedEntry}:${shouldCheckTransitiveDependencies ? "transitive" : "direct"}` : void 0;
+	if (cacheKey && effectiveAnalyzeCache.has(cacheKey)) return effectiveAnalyzeCache.get(cacheKey);
+	const activeEntries = providedActiveEntries ?? /* @__PURE__ */ new Set();
+	const shouldTrackEntry = Boolean(resolvedEntry && !activeEntries.has(resolvedEntry));
+	if (resolvedEntry && shouldTrackEntry) activeEntries.add(resolvedEntry);
+	try {
+		const optimizerBundler = await (0, rollup.rollup)({
+			logLevel: process.env.MASTRA_BUNDLER_DEBUG === "true" ? "debug" : "silent",
+			input: isVirtualFile ? "#entry" : entry,
+			treeshake: false,
+			preserveSymlinks: true,
+			plugins: getInputPlugins$1({
+				entry,
+				isVirtualFile
+			}, mastraEntry, { sourcemapEnabled }),
+			external: DEPS_TO_IGNORE
+		});
+		const { output } = await (async () => {
+			try {
+				return await optimizerBundler.generate({
+					format: "esm",
+					inlineDynamicImports: true
+				});
+			} finally {
+				await optimizerBundler.close();
+			}
+		})();
+		const result = {
+			dependencies: await captureDependenciesToOptimize(output[0], workspaceMap, projectRoot, {
+				logger,
+				mastraEntry,
+				shouldCheckTransitiveDependencies,
+				analyzeCache: effectiveAnalyzeCache,
+				activeEntries
+			}),
+			output: {
+				code: output[0].code,
+				map: output[0].map
+			}
+		};
+		if (cacheKey) effectiveAnalyzeCache.set(cacheKey, result);
+		return result;
+	} finally {
+		if (resolvedEntry && shouldTrackEntry) activeEntries.delete(resolvedEntry);
+	}
 }
 //#endregion
 //#region src/build/plugins/hono-alias.ts
@@ -641,7 +648,7 @@ function createVirtualDependencies(depsToOptimize, { projectRoot, workspaceRoot,
 * Configures and returns Rollup plugins for bundling external dependencies.
 * Sets up virtual modules, TypeScript compilation, CommonJS transformation, and workspace resolution.
 */
-async function getInputPlugins(virtualDependencies, { transpilePackages, workspaceMap, bundlerOptions, rootDir, externals, platform }) {
+async function getInputPlugins(virtualDependencies, { transpilePackages, workspaceMap, bundlerOptions, projectRoot, rootDir, externals, platform }) {
 	const transpilePackagesMap = /* @__PURE__ */ new Map();
 	for (const pkg of transpilePackages) {
 		const dir = await require_bundler.getPackageRootPath(pkg);
@@ -653,7 +660,7 @@ async function getInputPlugins(virtualDependencies, { transpilePackages, workspa
 			acc[`#virtual-${dep}`] = virtualDep.virtual;
 			return acc;
 		}, {})),
-		require_bundler.tsConfigPaths(),
+		require_bundler.tsConfigPaths({ cwd: projectRoot }),
 		require_bundler.protocolExternalResolver(),
 		require_bundler.subpathExternalsResolver(externals),
 		transpilePackagesMap.size ? require_bundler.esbuild({
@@ -688,7 +695,11 @@ async function getInputPlugins(virtualDependencies, { transpilePackages, workspa
 			transformMixedEsModules: true,
 			ignoreTryCatch: false
 		}),
-		bundlerOptions.noBundling ? null : (0, _rollup_plugin_node_resolve.default)(require_utils.getNodeResolveOptions(platform)),
+		bundlerOptions.noBundling ? null : (0, _rollup_plugin_node_resolve.default)({
+			...require_utils.getNodeResolveOptions(platform),
+			rootDir: projectRoot,
+			modulePaths: [path.join(rootDir, "node_modules")]
+		}),
 		bundlerOptions.noBundling ? require_bundler.esmShim() : null,
 		aliasHono(),
 		(0, _rollup_plugin_json.default)(),
@@ -701,7 +712,7 @@ async function getInputPlugins(virtualDependencies, { transpilePackages, workspa
 				async handler(id, importer) {
 					if (!importer) return null;
 					if (!id.endsWith(".node")) return null;
-					const packageName = (await (0, local_pkg.getPackageInfo)(importer))?.packageJson?.name || id;
+					const packageName = (await require_bundler.getPackageInfo(importer))?.packageJson?.name || id;
 					throw new _mastra_core_error.MastraBaseError({
 						id: "DEPLOYER_BUNDLE_EXTERNALS_MISSING_NATIVE_BUILD",
 						domain: _mastra_core_error.ErrorDomain.DEPLOYER,
@@ -729,7 +740,7 @@ export const mastra = new Mastra({
 * Executes the Rollup build process for virtual dependencies using configured plugins.
 * Bundles all virtual dependency modules into optimized ESM files with proper external handling.
 */
-async function buildExternalDependencies(virtualDependencies, { externals, packagesToTranspile, workspaceMap, rootDir, outputDir, bundlerOptions, platform }) {
+async function buildExternalDependencies(virtualDependencies, { externals, packagesToTranspile, workspaceMap, projectRoot, rootDir, outputDir, bundlerOptions, platform }) {
 	/**
 	* If there are no virtual dependencies to bundle, return an empty array to avoid Rollup errors.
 	*/
@@ -739,6 +750,7 @@ async function buildExternalDependencies(virtualDependencies, { externals, packa
 		transpilePackages: packagesToTranspile,
 		workspaceMap,
 		bundlerOptions: { noBundling },
+		projectRoot,
 		rootDir,
 		externals,
 		platform
@@ -861,6 +873,7 @@ async function bundleExternals(depsToOptimize, outputDir, options) {
 		externals: mergedExternals,
 		packagesToTranspile,
 		workspaceMap,
+		projectRoot,
 		rootDir: workspaceRoot || projectRoot,
 		outputDir,
 		bundlerOptions: {
@@ -912,13 +925,13 @@ async function bundleExternals(depsToOptimize, outputDir, options) {
 //#endregion
 //#region src/build/analyze/externals.ts
 function normalizeExternals(externals) {
-	const userExternals = Array.isArray(externals) ? externals : [];
+	const explicitExternals = Array.isArray(externals) ? externals : [];
 	return {
 		externalsPreset: externals === true,
 		mergedExternals: [...new Set([
 			...GLOBAL_EXTERNALS,
 			...DEPRECATED_EXTERNALS,
-			...userExternals
+			...explicitExternals
 		].filter(Boolean))]
 	};
 }
@@ -1260,6 +1273,7 @@ async function analyzeBundle(entries, mastraEntry, { outputDir, projectRoot, pla
 	logger.info("Analyzing dependencies...");
 	const allUsedExternals = /* @__PURE__ */ new Map();
 	const analyzeCache = /* @__PURE__ */ new Map();
+	const activeAnalyzeEntries = /* @__PURE__ */ new Set();
 	for (const entry of entries) {
 		const analyzeResult = await analyzeEntry({
 			entry,
@@ -1270,7 +1284,8 @@ async function analyzeBundle(entries, mastraEntry, { outputDir, projectRoot, pla
 			workspaceMap,
 			projectRoot,
 			shouldCheckTransitiveDependencies: true,
-			analyzeCache
+			analyzeCache,
+			activeEntries: activeAnalyzeEntries
 		});
 		(0, _babel_core.transformSync)(analyzeResult.output.code, {
 			filename: "pino-detection.js",
@@ -1435,4 +1450,4 @@ Object.defineProperty(exports, "packWorkspaceDependencies", {
 	}
 });
 
-//# sourceMappingURL=analyze-hp4aHpms.cjs.map
+//# sourceMappingURL=analyze-BC22OIkc.cjs.map