vr-migrations 1.0.31 → 1.0.32

package/dist/cli.js

@@ -14,27 +14,77 @@ const create_migration_1 = require("./create-migration");
 const create_seeder_1 = require("./create-seeder");
 const db_1 = require("./db");
 const dotenv_1 = __importDefault(require("dotenv"));
-dotenv_1.default.config();
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+// Load environment variables - try multiple sources
+function loadEnv() {
+    const envFile = process.env.NODE_ENV === "test"
+        ? ".env.test"
+        : `.env.${process.env.NODE_ENV || "development"}`;
+    const envPath = path_1.default.resolve(process.cwd(), envFile);
+    // Try environment-specific file first
+    if (fs_1.default.existsSync(envPath)) {
+        dotenv_1.default.config({ path: envPath });
+        console.log(`📄 Loaded env from: ${envFile}`);
+    }
+    // Also load default .env as fallback
+    dotenv_1.default.config({ path: path_1.default.resolve(process.cwd(), ".env") });
+}
+loadEnv();
 exports.program = new commander_1.Command();
-exports.program
-    .name("vr-migrate") //
-    .description("CENTRALIZED VR Migration Tool") //
-    .version("1.0.0")
-    .hook("preAction", async () => {
-    const sequelize = await (0, db_1.initializeDatabase)({
+// Helper to get database configuration supporting both URL and individual params
+function getDatabaseConfig() {
+    // Priority: DATABASE_URL > individual params
+    const databaseUrl = process.env.DATABASE_URL;
+    if (databaseUrl) {
+        // Parse DATABASE_URL to extract components
+        try {
+            const url = new URL(databaseUrl);
+            return {
+                DB_HOST: url.hostname,
+                DB_PORT: parseInt(url.port || "5432"),
+                DB_USER: decodeURIComponent(url.username),
+                DB_PASSWORD: decodeURIComponent(url.password),
+                DB_NAME: url.pathname.slice(1),
+                NODE_ENV: process.env.NODE_ENV,
+                DATABASE_URL: databaseUrl, // Pass through for SSL detection
+            };
+        }
+        catch (error) {
+            console.error("❌ Failed to parse DATABASE_URL:", error);
+            throw error;
+        }
+    }
+    // Fallback to individual params
+    return {
         DB_HOST: process.env.DB_HOST,
         DB_PORT: parseInt(process.env.DB_PORT || "5432"),
         DB_USER: process.env.DB_USER,
         DB_PASSWORD: process.env.DB_PASSWORD,
         DB_NAME: process.env.DB_NAME,
         NODE_ENV: process.env.NODE_ENV,
-    });
+    };
+}
+exports.program
+    .name("vr-migrate")
+    .description("CENTRALIZED VR Migration Tool")
+    .version("1.0.0")
+    .hook("preAction", async () => {
+    const config = getDatabaseConfig();
+    // Validate required fields
+    if (!config.DB_HOST || !config.DB_USER || !config.DB_NAME) {
+        console.error("❌ Missing database configuration. Please set DATABASE_URL or DB_HOST, DB_USER, DB_NAME");
+        process.exit(1);
+    }
+    console.log(`🔌 Connecting to database: ${config.DB_HOST}:${config.DB_PORT}/${config.DB_NAME}`);
+    const sequelize = await (0, db_1.initializeDatabase)(config);
     await sequelize.authenticate();
+    console.log("✅ Database connection established");
 });
 // Centralized Commands (No path overrides allowed)
 exports.program
     .command("migrate")
-    .description("Run CENTRALIZED migrations from vr-migrations package") //
+    .description("Run CENTRALIZED migrations from vr-migrations package")
     .action(async () => await (0, migrate_1.migrate)());
 exports.program
     .command("rollback")
@@ -51,10 +101,10 @@ exports.program
     .action(async () => await (0, reset_1.reset)());
 exports.program
     .command("create:migration <name>")
-    .description("Create new migration in vr-migrations package") //
+    .description("Create new migration in vr-migrations package")
     .action((name) => (0, create_migration_1.createMigration)(name));
 exports.program
     .command("create:seeder <name>")
-    .description("Create new seeder in vr-migrations package") //
+    .description("Create new seeder in vr-migrations package")
     .action((name) => (0, create_seeder_1.createSeeder)(name));
 exports.program.parse(process.argv);

package/dist/db.d.ts

@@ -7,14 +7,6 @@ export interface DatabaseConfig {
     DB_NAME?: string;
     DATABASE_URL?: string;
     NODE_ENV?: string;
-    pool?: {
-        max?: number;
-        min?: number;
-        acquire?: number;
-        idle?: number;
-    };
-    logging?: boolean | ((sql: string, timing?: number) => void);
-    dialectOptions?: any;
 }
 export declare function getSequelize(): Sequelize;
 export declare function initializeDatabase(config: DatabaseConfig): Promise<Sequelize>;

package/dist/db.js

@@ -4,7 +4,7 @@ exports.Op = exports.DataTypes = exports.Model = void 0;
 exports.getSequelize = getSequelize;
 exports.initializeDatabase = initializeDatabase;
 exports.closeDatabase = closeDatabase;
-// Updated vr-migrations/index.ts
+// vr-migrations/src/db.ts
 const sequelize_1 = require("sequelize");
 let _sequelize = null;
 let _isInitialized = false;
@@ -17,65 +17,43 @@ function getSequelize() {
 async function initializeDatabase(config) {
     if (_isInitialized)
         return _sequelize;
-    const isProduction = config.NODE_ENV === "production";
-    const isStaging = config.NODE_ENV === "staging";
-    // Determine if we should use SSL (Neon requires SSL)
-    const shouldUseSSL = isProduction || isStaging || config.DATABASE_URL?.includes("neon.tech");
-    // Default pool configuration
-    const poolConfig = config.pool || {
-        max: 20,
-        min: 2,
-        acquire: 120000,
-        idle: 10000,
-    };
-    // Default dialect options
-    let dialectOptions = config.dialectOptions || {};
-    // Add SSL for production/staging/Neon
+    // Detect if we need SSL (Neon or production/staging)
+    const isNeon = config.DATABASE_URL?.includes("neon.tech") ||
+        config.DB_HOST?.includes("neon.tech");
+    const isProduction = config.NODE_ENV === "production" || config.NODE_ENV === "staging";
+    const shouldUseSSL = isNeon || isProduction;
+    // Configure dialect options for SSL
+    const dialectOptions = {};
     if (shouldUseSSL) {
-        dialectOptions = {
-            ...dialectOptions,
-            ssl: {
-                require: true,
-                rejectUnauthorized: false, // Required for Neon
-            },
+        dialectOptions.ssl = {
+            require: true,
+            rejectUnauthorized: false,
         };
+        console.log("🔒 SSL enabled for database connection");
     }
-    // Option 1: Use DATABASE_URL if provided
-    if (config.DATABASE_URL) {
-        console.log(`📊 Initializing database with connection URL for ${config.NODE_ENV || "default"} environment`);
-        _sequelize = new sequelize_1.Sequelize(config.DATABASE_URL, {
-            dialect: "postgres",
-            logging: config.logging !== undefined ? config.logging : false,
-            pool: poolConfig,
-            dialectOptions,
-        });
-    }
-    // Option 2: Use individual connection parameters
-    else if (config.DB_HOST && config.DB_USER && config.DB_NAME) {
-        console.log(`📊 Initializing database with connection parameters for ${config.NODE_ENV || "default"} environment`);
-        _sequelize = new sequelize_1.Sequelize({
-            dialect: "postgres",
-            host: config.DB_HOST,
-            port: config.DB_PORT || 5432,
-            username: config.DB_USER,
-            password: config.DB_PASSWORD,
-            database: config.DB_NAME,
-            logging: config.logging !== undefined ? config.logging : false,
-            pool: poolConfig,
-            dialectOptions,
-        });
-    }
-    else {
-        throw new Error("Invalid database configuration. Provide either DATABASE_URL or (DB_HOST, DB_USER, DB_NAME)");
-    }
+    _sequelize = new sequelize_1.Sequelize({
+        dialect: "postgres",
+        host: config.DB_HOST,
+        port: config.DB_PORT,
+        username: config.DB_USER,
+        password: config.DB_PASSWORD,
+        database: config.DB_NAME,
+        logging: false,
+        pool: {
+            max: 20,
+            min: 2,
+            acquire: 120000,
+            idle: 10000,
+        },
+        dialectOptions,
+    });
     try {
         await _sequelize.authenticate();
-        console.log(`✅ Database connection established successfully`);
         _isInitialized = true;
         return _sequelize;
     }
     catch (error) {
-        console.error("❌ Database connection failed:", error);
+        console.error("❌ Database authentication failed:", error);
         throw error;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vr-migrations",
-  "version": "1.0.31",
+  "version": "1.0.32",
   "description": "Database migration and seeding package for VR applications",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",