@geekmidas/cli 1.10.28 → 1.10.29

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { __require } from "./chunk-Duj1WY3L.mjs";
 import { getAppBuildOrder, getDependencyEnvVars, getDeployTargetError, isDeployTargetSupported } from "./workspace-D4z4A4cq.mjs";
 import { getAppNameFromCwd, loadAppConfig, loadConfig, loadWorkspaceAppInfo, loadWorkspaceConfig, parseModuleConfig } from "./config-jsRYHOHU.mjs";
 import { getCredentialsPath, getDokployCredentials, getDokployRegistryId, getDokployToken, removeDokployCredentials, storeDokployCredentials, storeDokployRegistryId } from "./credentials-s1kLcIzK.mjs";
-import { createStageSecrets, generateConnectionUrls, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, generateLocalStackCredentials, generatePgBossUrl, generateSecurePassword, generateServiceCredentials, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-BDE7Sk93.mjs";
+import { createStageSecrets, generateConnectionUrls, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, generateLocalStackCredentials, generatePgBossUrl, generateSecurePassword, generateServiceCredentials, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-P84v8zWn.mjs";
 import { getKeyPath, maskPassword, readStageSecrets, secretsExist, setCustomSecret, toEmbeddableSecrets, writeStageSecrets } from "./storage-dbb9RyBl.mjs";
 import { ConstructGenerator, EndpointGenerator, OPENAPI_OUTPUT_PATH, generateOpenApi, isPartitionedRoutes, normalizeRoutes, openapiCommand, resolveOpenApiConfig } from "./openapi-CQCoLuzh.mjs";
 import { DokployApi } from "./dokploy-api-BIT0683o.mjs";
@@ -35,7 +35,7 @@ import prompts from "prompts";
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "1.10.27";
+var version = "1.10.28";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -9107,6 +9107,7 @@ function generatePackageJson(options, template) {
 		devDependencies$1["@types/pg"] = "~8.15.0";
 		devDependencies$1["@geekmidas/testkit"] = GEEKMIDAS_VERSIONS["@geekmidas/testkit"];
 		devDependencies$1["@faker-js/faker"] = "~9.8.0";
+		devDependencies$1["kysely-ctl"] = "~0.10.0";
 		devDependencies$1["vite-tsconfig-paths"] = "~5.1.0";
 	}
 	if (monorepo) {
@@ -9161,6 +9162,29 @@ function generateSourceFiles(options, template) {
 function generateTestFiles(options, _template) {
 	if (!options.database) return [];
 	return [
+		{
+			path: "kysely.config.ts",
+			content: `import { Credentials } from '@geekmidas/envkit/credentials';
+import { PostgresDialect } from 'kysely';
+import { defineConfig } from 'kysely-ctl';
+import pg from 'pg';
+
+export default defineConfig({
+  dialect: new PostgresDialect({
+    pool: new pg.Pool({
+      password: Credentials.POSTGRES_PASSWORD,
+      user: Credentials.POSTGRES_USER,
+      database: Credentials.POSTGRES_DB,
+      port: Number(Credentials.POSTGRES_PORT),
+      host: Credentials.POSTGRES_HOST,
+    }),
+  }),
+  migrations: {
+    migrationFolder: './src/db/migrations',
+  },
+});
+`
+		},
 		{
 			path: "test/config.ts",
 			content: `import { it as itVitest } from 'vitest';
@@ -9182,30 +9206,52 @@ export const it = wrapVitestKyselyTransaction<Database>(itVitest, {
 		},
 		{
 			path: "test/globalSetup.ts",
-			content: `import { Kysely, PostgresDialect } from 'kysely';
-import pg from 'pg';
+			content: `import fs from 'node:fs/promises';
+import path from 'node:path';
+import { Credentials } from '@geekmidas/envkit/credentials';
 import { PostgresKyselyMigrator } from '@geekmidas/testkit/kysely';
-import type { Database } from '~/services/database.ts';
+import { runInitScript } from '@geekmidas/testkit/postgres';
+import { FileMigrationProvider, Kysely, PostgresDialect } from 'kysely';
+import pg from 'pg';
 
-export async function setup() {
-  const testUrl = process.env.DATABASE_URL;
-  if (!testUrl) throw new Error('DATABASE_URL is required for tests');
+export default async function globalSetup() {
+  const databaseUrl = Credentials.DATABASE_URL!;
+  const migrationFolder = path.resolve(import.meta.dirname, '../db/migrations');
 
-  // Run migrations on the test database
-  // (gkm test already rewrites DATABASE_URL to point to the _test database)
-  const db = new Kysely<Database>({
+  const db = new Kysely({
     dialect: new PostgresDialect({
-      pool: new pg.Pool({ connectionString: testUrl }),
+      pool: new pg.Pool({ connectionString: databaseUrl }),
     }),
   });
 
   const migrator = new PostgresKyselyMigrator({
+    uri: databaseUrl,
     db,
-    migrationsPath: './src/migrations',
+    afterCreate: async (uri) => {
+      const initScriptPath = path.resolve(process.cwd(), 'docker/postgres/init.sh');
+      const dbUrl = new URL(Credentials.DATABASE_URL!);
+      const apiUrl = new URL(Credentials.API_DATABASE_URL!);
+      const authUrl = new URL(Credentials.AUTH_DATABASE_URL!);
+
+      const env = {
+        POSTGRES_USER: dbUrl.username,
+        POSTGRES_DB: dbUrl.pathname.slice(1),
+        API_DB_PASSWORD: decodeURIComponent(apiUrl.password),
+        AUTH_DB_PASSWORD: decodeURIComponent(authUrl.password),
+        PGBOSS_DB_PASSWORD: Credentials.PGBOSS_DB_PASSWORD ?? 'pgboss-dev-password',
+      };
+
+      await runInitScript(initScriptPath, uri, env);
+    },
+    provider: new FileMigrationProvider({
+      fs,
+      path,
+      migrationFolder,
+    }),
   });
 
-  await migrator.migrateToLatest();
-  await db.destroy();
+  const teardown = await migrator.start();
+  return teardown;
 }
 `
 		},
@@ -12384,7 +12430,7 @@ program.command("secrets:push").description("Push secrets to remote provider (SS
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
 		const { pushSecrets: pushSecrets$1 } = await import("./sync-COnAugP-.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile-BjWhjfSp.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-DAAKa0YR.mjs");
 		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-Cs4WBsc4.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		const secrets = await readStageSecrets$1(options.stage, workspace.root);
@@ -12410,7 +12456,7 @@ program.command("secrets:pull").description("Pull secrets from remote provider (
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
 		const { pullSecrets: pullSecrets$1 } = await import("./sync-COnAugP-.mjs");
 		const { writeStageSecrets: writeStageSecrets$1 } = await import("./storage-Cs4WBsc4.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile-BjWhjfSp.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-DAAKa0YR.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		let secrets = await pullSecrets$1(options.stage, workspace);
 		if (!secrets) {
@@ -12435,7 +12481,7 @@ program.command("secrets:reconcile").description("Backfill missing custom secret
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile-BjWhjfSp.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-DAAKa0YR.mjs");
 		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-Cs4WBsc4.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		const secrets = await readStageSecrets$1(options.stage, workspace.root);