@geekmidas/cli 9.0.2 → 10.0.0-alpha.0

package/dist/workspace-8acupeaI.cjs

@@ -0,0 +1,9 @@
+require('./discover-DTmFeloL.cjs');
+require('./config-DbPE1KXF.cjs');
+require('./workspace-XvqO9jIv.cjs');
+const require_credentials = require('./credentials-K961ThG3.cjs');
+require('./generator-CNzBw7g5.cjs');
+require('./storage-BJmzYxt8.cjs');
+
+exports.derivedContainers = require_credentials.derivedContainers;
+exports.reconcileWorkspace = require_credentials.reconcileWorkspace;

package/dist/{workspace-CQTT7HJQ.cjs → workspace-XvqO9jIv.cjs}

@@ -3547,8 +3547,39 @@ const MailServiceConfigSchema = ServiceImageConfigSchema.extend({ smtp: object({
 */
 const ServicesConfigSchema = object({
 	db: union([boolean(), ServiceImageConfigSchema]).optional(),
-	cache: union([boolean(), ServiceImageConfigSchema]).optional(),
-	mail: union([boolean(), MailServiceConfigSchema]).optional()
+	cache: union([
+		boolean(),
+		ServiceImageConfigSchema,
+		_enum([
+			"upstash",
+			"elasticache",
+			"db"
+		])
+	]).optional(),
+	mail: union([
+		boolean(),
+		MailServiceConfigSchema,
+		_enum([
+			"resend",
+			"ses",
+			"smtp"
+		])
+	]).optional(),
+	storage: union([
+		boolean(),
+		ServiceImageConfigSchema,
+		_enum([
+			"minio",
+			"s3",
+			"r2"
+		])
+	]).optional(),
+	events: _enum([
+		"pgboss",
+		"sns",
+		"rabbitmq"
+	]).optional(),
+	trustLocalCa: boolean().optional()
 });
 /**
 * Dokploy workspace configuration schema.
@@ -3802,9 +3833,12 @@ const AppConfigSchema = object({
 	port: number().int().positive("Port must be a positive integer"),
 	dependencies: array(string()).optional(),
 	deploy: DeployTargetSchema.optional(),
+	constructs: RoutesSchema.optional(),
 	routes: RoutesSchema.optional(),
 	functions: RoutesSchema.optional(),
 	crons: RoutesSchema.optional(),
+	queues: RoutesSchema.optional(),
+	topics: RoutesSchema.optional(),
 	subscribers: RoutesSchema.optional(),
 	envParser: string().optional(),
 	logger: string().optional(),
@@ -3850,21 +3884,22 @@ const AppConfigSchema = object({
 */
 const WorkspaceConfigSchema = object({
 	name: string().optional(),
-	apps: record(string(), AppConfigSchema).refine((apps) => Object.keys(apps).length > 0, { message: "At least one app must be defined" }),
+	constructs: RoutesSchema.optional(),
+	apps: record(string(), AppConfigSchema).optional(),
 	shared: SharedConfigSchema.optional(),
 	deploy: DeployConfigSchema.optional(),
 	services: ServicesConfigSchema.optional(),
 	secrets: SecretsConfigSchema.optional(),
 	state: StateConfigSchema.optional()
 }).refine((data) => {
-	const appNames = Object.keys(data.apps);
-	for (const [appName, app] of Object.entries(data.apps)) for (const dep of app.dependencies ?? []) {
+	const appNames = Object.keys(data.apps ?? {});
+	for (const [appName, app] of Object.entries(data.apps ?? {})) for (const dep of app.dependencies ?? []) {
 		if (!appNames.includes(dep)) return false;
 		if (dep === appName) return false;
 	}
 	return true;
 }, { message: "App dependencies must reference existing apps and cannot be self-referential" }).refine((data) => {
-	const appNames = Object.keys(data.apps);
+	const appNames = Object.keys(data.apps ?? {});
 	const visited = /* @__PURE__ */ new Set();
 	const recStack = /* @__PURE__ */ new Set();
 	function hasCycle(app) {
@@ -3872,7 +3907,7 @@ const WorkspaceConfigSchema = object({
 		if (visited.has(app)) return false;
 		visited.add(app);
 		recStack.add(app);
-		const deps = data.apps[app]?.dependencies ?? [];
+		const deps = data.apps?.[app]?.dependencies ?? [];
 		for (const dep of deps) if (hasCycle(dep)) return true;
 		recStack.delete(app);
 		return false;
@@ -3893,7 +3928,7 @@ const WorkspaceConfigSchema = object({
 		});
 		return;
 	}
-	for (const [appName, app] of Object.entries(data.apps)) if (app.deploy && !isDeployTargetSupported(app.deploy)) {
+	for (const [appName, app] of Object.entries(data.apps ?? {})) if (app.deploy && !isDeployTargetSupported(app.deploy)) {
 		ctx.addIssue({
 			code: "custom",
 			message: getDeployTargetError(app.deploy, appName),
@@ -3958,7 +3993,9 @@ function formatValidationErrors(error) {
 * ```
 */
 function isWorkspaceConfig(config$1) {
-	return typeof config$1 === "object" && config$1 !== null && "apps" in config$1 && typeof config$1.apps === "object";
+	if (typeof config$1 !== "object" || config$1 === null) return false;
+	if ("apps" in config$1 && typeof config$1.apps === "object") return true;
+	return "constructs" in config$1 && !("routes" in config$1) && !("envParser" in config$1);
 }
 
 //#endregion
@@ -4017,7 +4054,7 @@ function validateDependencies(apps) {
 * ```
 */
 function defineWorkspace(config$1) {
-	validateDependencies(config$1.apps);
+	if (config$1.apps) validateDependencies(config$1.apps);
 	const result = safeValidateWorkspaceConfig(config$1);
 	if (!result.success && result.error) throw new Error(formatValidationErrors(result.error));
 	return config$1;
@@ -4040,10 +4077,11 @@ function normalizeWorkspace(config$1, cwd) {
 	const name = config$1.name ?? getPackageName(cwd) ?? (0, node_path.basename)(cwd);
 	const defaultTarget = config$1.deploy?.default ?? "dokploy";
 	const normalizedApps = {};
-	for (const [appName, app] of Object.entries(config$1.apps)) normalizedApps[appName] = normalizeAppConfig(app, defaultTarget);
+	for (const [appName, app] of Object.entries(config$1.apps ?? {})) normalizedApps[appName] = normalizeAppConfig(app, defaultTarget);
 	return {
 		name,
 		root: cwd,
+		...config$1.constructs ? { constructs: config$1.constructs } : {},
 		apps: normalizedApps,
 		services: config$1.services ?? {},
 		deploy: config$1.deploy ?? { default: "dokploy" },
@@ -4072,26 +4110,20 @@ function normalizeAppConfig(app, defaultTarget) {
 * This allows existing single-app configs to work seamlessly.
 */
 function wrapSingleAppAsWorkspace(config$1, cwd) {
-	const name = getPackageName(cwd) ?? (0, node_path.basename)(cwd);
-	const services = config$1.docker?.compose?.services;
-	const normalizedServices = {};
-	if (services) if (Array.isArray(services)) for (const svc of services) {
-		if (svc === "postgres") normalizedServices.db = true;
-		if (svc === "redis") normalizedServices.cache = true;
-	}
-	else {
-		if (services.postgres) normalizedServices.db = services.postgres;
-		if (services.redis) normalizedServices.cache = services.redis;
-	}
-	const apiApp = {
+	const name = config$1.name ?? getPackageName(cwd) ?? (0, node_path.basename)(cwd);
+	const normalizedServices = { ...config$1.services ?? {} };
+	const app = {
 		type: "backend",
 		path: ".",
-		port: 3e3,
+		port: (typeof config$1.providers?.server === "object" ? config$1.providers.server.port : void 0) ?? 3e3,
 		dependencies: [],
-		resolvedDeployTarget: "dokploy",
+		resolvedDeployTarget: config$1.deploy?.default ?? "dokploy",
+		constructs: config$1.constructs,
 		routes: config$1.routes,
 		functions: config$1.functions,
 		crons: config$1.crons,
+		queues: config$1.queues,
+		topics: config$1.topics,
 		subscribers: config$1.subscribers,
 		envParser: config$1.envParser,
 		logger: config$1.logger,
@@ -4106,9 +4138,12 @@ function wrapSingleAppAsWorkspace(config$1, cwd) {
 	return {
 		name,
 		root: cwd,
-		apps: { api: apiApp },
+		apps: { api: app },
 		services: normalizedServices,
-		deploy: { default: "dokploy" },
+		deploy: {
+			default: "dokploy",
+			...config$1.deploy
+		},
 		shared: { packages: [] },
 		secrets: {}
 	};
@@ -4134,6 +4169,54 @@ function processConfig(config$1, cwd) {
 	};
 }
 /**
+* The workspace's own constructs globs, absolute.
+*
+* Infrastructure two apps share is a fact about the product, and declaring it
+* inside one of them makes moving that app a change to the other's database.
+*/
+function workspaceConstructGlobs(workspace) {
+	return constructPatterns(workspace.constructs).map((pattern) => (0, node_path.isAbsolute)(pattern) ? pattern : (0, node_path.join)(workspace.root, pattern));
+}
+/**
+* Every constructs glob an app can see, absolute.
+*
+* The workspace's own first, then the app's. Absolute because the app builds
+* from its own directory while the workspace's constructs live above it —
+* a relative glob resolved from the app would look for the product's
+* infrastructure inside one of its consumers and find nothing.
+*
+* Additive, not overriding: an app that declares its own constructs still sees
+* the ones the workspace declared for everybody.
+*/
+function appConstructGlobs(workspace, appName) {
+	const globs = workspaceConstructGlobs(workspace);
+	const app = workspace.apps[appName];
+	if (app) {
+		const root = (0, node_path.isAbsolute)(app.path) ? app.path : (0, node_path.join)(workspace.root, app.path);
+		for (const pattern of constructPatterns(app.constructs)) globs.push((0, node_path.isAbsolute)(pattern) ? pattern : (0, node_path.join)(root, pattern));
+	}
+	return globs;
+}
+/**
+* Every constructs glob in the workspace: its own, plus each app's.
+*
+* One list, so what a deploy provisions and what an app's entry point
+* registers drivers for are read off the same globs.
+*/
+function allConstructGlobs(workspace) {
+	const globs = [...workspaceConstructGlobs(workspace), ...Object.keys(workspace.apps).flatMap((appName) => appConstructGlobs(workspace, appName))];
+	return [...new Set(globs)];
+}
+/** A `Routes` in any of its accepted shapes, as a flat list of patterns. */
+function constructPatterns(routes) {
+	if (!routes) return [];
+	if (typeof routes === "string") return [routes];
+	if (Array.isArray(routes)) return routes;
+	const paths = routes.paths;
+	if (!paths) return [];
+	return Array.isArray(paths) ? paths : [paths];
+}
+/**
 * Get the GkmConfig for a specific app in a workspace.
 * Useful for running existing single-app commands on a specific app.
 */
@@ -4141,9 +4224,13 @@ function getAppGkmConfig(workspace, appName) {
 	const app = workspace.apps[appName];
 	if (!app || app.type !== "backend") return void 0;
 	return {
+		services: workspace.services,
+		constructs: appConstructGlobs(workspace, appName),
 		routes: app.routes ?? "",
 		functions: app.functions,
 		crons: app.crons,
+		queues: app.queues,
+		topics: app.topics,
 		subscribers: app.subscribers,
 		envParser: app.envParser ?? "",
 		logger: app.logger ?? "",
@@ -4256,6 +4343,24 @@ Object.defineProperty(exports, 'WorkspaceConfigSchema', {
     return WorkspaceConfigSchema;
   }
 });
+Object.defineProperty(exports, 'allConstructGlobs', {
+  enumerable: true,
+  get: function () {
+    return allConstructGlobs;
+  }
+});
+Object.defineProperty(exports, 'appConstructGlobs', {
+  enumerable: true,
+  get: function () {
+    return appConstructGlobs;
+  }
+});
+Object.defineProperty(exports, 'constructPatterns', {
+  enumerable: true,
+  get: function () {
+    return constructPatterns;
+  }
+});
 Object.defineProperty(exports, 'defineWorkspace', {
   enumerable: true,
   get: function () {
@@ -4352,10 +4457,16 @@ Object.defineProperty(exports, 'validateWorkspaceConfig', {
     return validateWorkspaceConfig;
   }
 });
+Object.defineProperty(exports, 'workspaceConstructGlobs', {
+  enumerable: true,
+  get: function () {
+    return workspaceConstructGlobs;
+  }
+});
 Object.defineProperty(exports, 'wrapSingleAppAsWorkspace', {
   enumerable: true,
   get: function () {
     return wrapSingleAppAsWorkspace;
   }
 });
-//# sourceMappingURL=workspace-CQTT7HJQ.cjs.map
+//# sourceMappingURL=workspace-XvqO9jIv.cjs.map