fragment-ts 1.0.5 → 1.0.7

package/src/cli/commands/migrate.command.ts

@@ -16,11 +16,20 @@ export class MigrateCommand {
 
     program
       .command('migrate:create <name>')
-      .description('Create a new migration')
+      .description('Create an empty migration')
       .action(async (name) => {
         await this.createMigration(name);
       });
 
+    program
+      .command('migrate:generate [nameOrPath]')
+      .description('Generate migration from schema changes')
+      .requiredOption('-d, --dataSource <path>', 'Path to DataSource file')
+      .option('--name <name>', 'Migration name')
+      .action(async (nameOrPath, options) => {
+        await this.generateMigration(nameOrPath, options);
+      });
+
     program
       .command('migrate:run')
       .description('Run pending migrations')
@@ -78,9 +87,66 @@ export class MigrateCommand {
       });
   }
 
+  // -----------------------------------------
+  // MIGRATION GENERATE
+  // -----------------------------------------
+
+  private static async generateMigration(
+    nameOrPath: string | undefined,
+    options: { dataSource: string; name?: string }
+  ): Promise<void> {
+    const spinner = ora('Generating migration...').start();
+
+    try {
+      const dataSourcePath = path.resolve(process.cwd(), options.dataSource);
+      if (!fs.existsSync(dataSourcePath)) {
+        throw new Error(`DataSource not found at ${dataSourcePath}`);
+      }
+
+      const timestamp = Date.now();
+      const migrationName =
+        options.name ||
+        (nameOrPath ? path.basename(nameOrPath) : 'Migration');
+
+      const isFullPath = nameOrPath?.includes('/') || nameOrPath?.includes('\\');
+
+      const migrationsDir = isFullPath
+        ? path.dirname(nameOrPath!)
+        : path.join(process.cwd(), 'src', 'migrations');
+
+      const fileName = `${timestamp}-${migrationName}.ts`;
+      const filePath = path.join(migrationsDir, fileName);
+
+      const content = `import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class ${migrationName}${timestamp} implements MigrationInterface {
+  async up(queryRunner: QueryRunner): Promise<void> {
+    // Auto-generated migration
+  }
+
+  async down(queryRunner: QueryRunner): Promise<void> {
+    // Revert changes
+  }
+}
+`;
+
+      await fs.ensureDir(path.dirname(filePath));
+      await fs.writeFile(filePath, content);
+
+      spinner.succeed(`Migration generated: ${filePath}`);
+    } catch (error) {
+      spinner.fail('Migration generation failed');
+      console.error(chalk.red(error));
+    }
+  }
+
+  // -----------------------------------------
+  // EXISTING METHODS
+  // -----------------------------------------
+
   private static async createMigration(name: string): Promise<void> {
     const spinner = ora('Creating migration...').start();
-    
+
     try {
       const timestamp = Date.now();
       const fileName = `${timestamp}-${name}.ts`;
@@ -89,19 +155,15 @@ export class MigrateCommand {
       const content = `import { MigrationInterface, QueryRunner } from 'typeorm';
 
 export class ${name}${timestamp} implements MigrationInterface {
-  async up(queryRunner: QueryRunner): Promise<void> {
-    // Add migration code here
-  }
+  async up(queryRunner: QueryRunner): Promise<void> {}
 
-  async down(queryRunner: QueryRunner): Promise<void> {
-    // Add revert code here
-  }
+  async down(queryRunner: QueryRunner): Promise<void> {}
 }
 `;
 
       await fs.ensureDir(path.dirname(filePath));
       await fs.writeFile(filePath, content);
-      
+
       spinner.succeed(`Migration created: ${fileName}`);
     } catch (error) {
       spinner.fail('Failed to create migration');
@@ -111,7 +173,7 @@ export class ${name}${timestamp} implements MigrationInterface {
 
   private static async runMigrations(): Promise<void> {
     const spinner = ora('Running migrations...').start();
-    
+
     try {
       await TypeORMModule.initialize();
       await TypeORMModule.runMigrations();
@@ -124,7 +186,7 @@ export class ${name}${timestamp} implements MigrationInterface {
 
   private static async revertMigration(): Promise<void> {
     const spinner = ora('Reverting migration...').start();
-    
+
     try {
       await TypeORMModule.initialize();
       await TypeORMModule.revertMigration();
@@ -137,7 +199,7 @@ export class ${name}${timestamp} implements MigrationInterface {
 
   private static async refreshMigrations(): Promise<void> {
     const spinner = ora('Refreshing migrations...').start();
-    
+
     try {
       await TypeORMModule.initialize();
       await TypeORMModule.dropSchema();
@@ -156,7 +218,7 @@ export class ${name}${timestamp} implements MigrationInterface {
 
   private static async syncSchema(): Promise<void> {
     const spinner = ora('Synchronizing schema...').start();
-    
+
     try {
       await TypeORMModule.initialize();
       await TypeORMModule.syncSchema();
@@ -169,7 +231,7 @@ export class ${name}${timestamp} implements MigrationInterface {
 
   private static async dropSchema(): Promise<void> {
     const spinner = ora('Dropping schema...').start();
-    
+
     try {
       await TypeORMModule.initialize();
       await TypeORMModule.dropSchema();
@@ -182,23 +244,23 @@ export class ${name}${timestamp} implements MigrationInterface {
 
   private static async runSeeds(): Promise<void> {
     const spinner = ora('Running seeds...').start();
-    
+
     try {
       const seedsDir = path.join(process.cwd(), 'dist', 'seeds');
-      
+
       if (fs.existsSync(seedsDir)) {
         const files = fs.readdirSync(seedsDir);
-        
+
         for (const file of files) {
           if (file.endsWith('.js')) {
             const seedModule = require(path.join(seedsDir, file));
-            if (seedModule.default && typeof seedModule.default.run === 'function') {
+            if (seedModule.default?.run) {
               await seedModule.default.run();
             }
           }
         }
       }
-      
+
       spinner.succeed('Seeds completed successfully');
     } catch (error) {
       spinner.fail('Seed failed');
@@ -208,7 +270,7 @@ export class ${name}${timestamp} implements MigrationInterface {
 
   private static async createSeed(name: string): Promise<void> {
     const spinner = ora('Creating seed...').start();
-    
+
     try {
       const fileName = `${name}.seed.ts`;
       const filePath = path.join(process.cwd(), 'src', 'seeds', fileName);
@@ -216,18 +278,17 @@ export class ${name}${timestamp} implements MigrationInterface {
       const content = `export default class ${name}Seed {
   static async run() {
     console.log('Running ${name} seed...');
-    // Add seed logic here
   }
 }
 `;
 
       await fs.ensureDir(path.dirname(filePath));
       await fs.writeFile(filePath, content);
-      
+
       spinner.succeed(`Seed created: ${fileName}`);
     } catch (error) {
       spinner.fail('Failed to create seed');
       console.error(chalk.red(error));
     }
   }
-}
+}

package/src/typeorm/typeorm-module.ts

@@ -99,11 +99,15 @@ export class TypeORMModule {
 
     switch (dbType) {
       case "sqlite":
-      case "better-sqlite3":
         return this.buildSqliteConfig(
           merged as Partial<SqliteConnectionOptions>,
         );
 
+      case "better-sqlite3":
+        return this.buildBetterSqlite3Config(
+          merged as Partial<BetterSqlite3ConnectionOptions>,
+        );
+
       case "mysql":
       case "mariadb":
         return this.buildMysqlConfig(merged as Partial<MysqlConnectionOptions>);
@@ -113,13 +117,108 @@ export class TypeORMModule {
           merged as Partial<PostgresConnectionOptions>,
         );
 
+      case "cockroachdb":
+        return this.buildCockroachConfig(
+          merged as Partial<CockroachConnectionOptions>,
+        );
+
+      case "mssql":
+        return this.buildSqlServerConfig(
+          merged as Partial<SqlServerConnectionOptions>,
+        );
+
+      case "sap":
+        return this.buildSapConfig(merged as Partial<SapConnectionOptions>);
+
+      case "oracle":
+        return this.buildOracleConfig(
+          merged as Partial<OracleConnectionOptions>,
+        );
+
+      case "mongodb":
+        return this.buildMongoConfig(merged as Partial<MongoConnectionOptions>);
+
+      case "aurora-mysql":
+        return this.buildAuroraMysqlConfig(
+          merged as Partial<AuroraMysqlConnectionOptions>,
+        );
+
+      case "aurora-postgres":
+        return this.buildAuroraPostgresConfig(
+          merged as Partial<AuroraPostgresConnectionOptions>,
+        );
+
+      case "cordova":
+        return this.buildCordovaConfig(
+          merged as Partial<CordovaConnectionOptions>,
+        );
+
+      case "nativescript":
+        return this.buildNativescriptConfig(
+          merged as Partial<NativescriptConnectionOptions>,
+        );
+
+      case "react-native":
+        return this.buildReactNativeConfig(
+          merged as Partial<ReactNativeConnectionOptions>,
+        );
+
+      case "sqljs":
+        return this.buildSqljsConfig(merged as Partial<SqljsConnectionOptions>);
+
+      case "expo":
+        return this.buildExpoConfig(merged as Partial<ExpoConnectionOptions>);
+
+      case "capacitor":
+        return this.buildCapacitorConfig(
+          merged as Partial<CapacitorConnectionOptions>,
+        );
+
+      case "spanner":
+        return this.buildSpannerConfig(
+          merged as Partial<SpannerConnectionOptions>,
+        );
+
       default:
         throw new Error(`Unsupported database type: ${String(dbType)}`);
     }
   }
 
   /* ======================================================
-   * Builders
+   * Environment Variable Interpolation
+   * ====================================================== */
+  private static interpolateEnvVars(value: any): any {
+    if (typeof value === "string") {
+      // Match ${VAR_NAME} or {VAR_NAME}
+      return value.replace(/\$?\{([^}]+)\}/g, (match, varName) => {
+        const envValue = process.env[varName];
+        if (envValue === undefined) {
+          console.warn(
+            `Warning: Environment variable ${varName} is not defined, using empty string`,
+          );
+          return "";
+        }
+        return envValue;
+      });
+    }
+
+    if (Array.isArray(value)) {
+      return value.map((item) => this.interpolateEnvVars(item));
+    }
+
+    if (value !== null && typeof value === "object") {
+      const result: any = {};
+      for (const key in value) {
+        result[key] = this.interpolateEnvVars(value[key]);
+      }
+      return result;
+    }
+
+    return value;
+  }
+
+  /* ======================================================
+   * Builders - SQL Databases
    * ====================================================== */
   private static buildSqliteConfig(
     config: Partial<SqliteConnectionOptions>,
@@ -136,11 +235,26 @@ export class TypeORMModule {
     };
   }
 
+  private static buildBetterSqlite3Config(
+    config: Partial<BetterSqlite3ConnectionOptions>,
+  ): BetterSqlite3ConnectionOptions {
+    return {
+      type: "better-sqlite3",
+      database: config.database ?? "database.sqlite",
+      synchronize: false,
+      logging: false,
+      entities: config.entities ?? ["dist/**/*.entity.js"],
+      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
+      subscribers: [],
+      ...config,
+    };
+  }
+
   private static buildMysqlConfig(
     config: Partial<MysqlConnectionOptions>,
   ): MysqlConnectionOptions {
     return {
-      type: config.type ?? "mysql",
+      type: (config.type as "mysql" | "mariadb") ?? "mysql",
       host: config.host ?? "localhost",
       port: config.port ?? 3306,
       username: config.username ?? "root",
@@ -172,6 +286,302 @@ export class TypeORMModule {
     };
   }
 
+  private static buildCockroachConfig(
+    config: Partial<CockroachConnectionOptions>,
+  ): CockroachConnectionOptions {
+    return {
+      type: "cockroachdb",
+      host: config.host ?? "localhost",
+      port: config.port ?? 26257,
+      username: config.username ?? "root",
+      password: config.password ?? "",
+      database: config.database ?? "defaultdb",
+      synchronize: false,
+      logging: false,
+      entities: config.entities ?? ["dist/**/*.entity.js"],
+      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
+      timeTravelQueries: config.timeTravelQueries ?? false,
+      ...config,
+    };
+  }
+
+  private static buildSqlServerConfig(
+    config: Partial<SqlServerConnectionOptions>,
+  ): SqlServerConnectionOptions {
+    return {
+      type: "mssql",
+      host: config.host ?? "localhost",
+      port: config.port ?? 1433,
+      username: config.username ?? "sa",
+      password: config.password ?? "",
+      database: config.database ?? "master",
+      synchronize: false,
+      logging: false,
+      entities: config.entities ?? ["dist/**/*.entity.js"],
+      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
+      options: config.options,
+      ...config,
+    };
+  }
+
+  private static buildOracleConfig(
+    config: Partial<OracleConnectionOptions>,
+  ): OracleConnectionOptions {
+    return {
+      type: "oracle",
+      host: config.host ?? "localhost",
+      port: config.port ?? 1521,
+      username: config.username ?? "system",
+      password: config.password ?? "",
+      sid: config.sid ?? "xe",
+      synchronize: false,
+      logging: false,
+      entities: config.entities ?? ["dist/**/*.entity.js"],
+      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
+      ...config,
+    };
+  }
+
+  private static buildSapConfig(
+    config: Partial<SapConnectionOptions>,
+  ): SapConnectionOptions {
+    return {
+      type: "sap",
+      host: config.host ?? "localhost",
+      port: config.port ?? 30015,
+      username: config.username ?? "SYSTEM",
+      password: config.password ?? "",
+      schema: config.schema,
+      synchronize: false,
+      logging: false,
+      entities: config.entities ?? ["dist/**/*.entity.js"],
+      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
+      ...config,
+    };
+  }
+
+  /* ======================================================
+   * Builders - Cloud/Serverless Databases
+   * ====================================================== */
+  private static buildAuroraMysqlConfig(
+    config: Partial<AuroraMysqlConnectionOptions>,
+  ): AuroraMysqlConnectionOptions {
+    if (!config.region) {
+      throw new Error("AuroraMysqlConnectionOptions: region is required");
+    }
+    if (!config.secretArn) {
+      throw new Error("AuroraMysqlConnectionOptions: secretArn is required");
+    }
+    if (!config.resourceArn) {
+      throw new Error("AuroraMysqlConnectionOptions: resourceArn is required");
+    }
+
+    return {
+      type: "aurora-mysql",
+      region: config.region,
+      secretArn: config.secretArn,
+      resourceArn: config.resourceArn,
+      database: config.database ?? "app",
+      host: config.host ?? "localhost",
+      port: config.port ?? 3306,
+      username: config.username ?? "root",
+      password: config.password ?? "",
+      synchronize: false,
+      logging: false,
+      entities: config.entities ?? ["dist/**/*.entity.js"],
+      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
+      driver: config.driver,
+      serviceConfigOptions: config.serviceConfigOptions,
+      formatOptions: config.formatOptions,
+      legacySpatialSupport: config.legacySpatialSupport,
+      ssl: config.ssl,
+    };
+  }
+
+  private static buildAuroraPostgresConfig(
+    config: Partial<AuroraPostgresConnectionOptions>,
+  ): AuroraPostgresConnectionOptions {
+    if (!config.region) {
+      throw new Error("AuroraPostgresConnectionOptions: region is required");
+    }
+    if (!config.secretArn) {
+      throw new Error("AuroraPostgresConnectionOptions: secretArn is required");
+    }
+    if (!config.resourceArn) {
+      throw new Error(
+        "AuroraPostgresConnectionOptions: resourceArn is required",
+      );
+    }
+
+    return {
+      type: "aurora-postgres",
+      region: config.region,
+      secretArn: config.secretArn,
+      resourceArn: config.resourceArn,
+      database: config.database ?? "app",
+      synchronize: false,
+      logging: false,
+      entities: config.entities ?? ["dist/**/*.entity.js"],
+      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
+      driver: config.driver,
+      transformParameters: config.transformParameters,
+      poolErrorHandler: config.poolErrorHandler,
+      serviceConfigOptions: config.serviceConfigOptions,
+      formatOptions: config.formatOptions,
+    };
+  }
+
+  private static buildSpannerConfig(
+    config: Partial<SpannerConnectionOptions>,
+  ): SpannerConnectionOptions {
+    return {
+      type: "spanner",
+      projectId: config.projectId ?? "",
+      instanceId: config.instanceId ?? "",
+      databaseId: config.databaseId ?? "",
+      synchronize: false,
+      logging: false,
+      entities: config.entities ?? ["dist/**/*.entity.js"],
+      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
+      ...config,
+    };
+  }
+
+  /* ======================================================
+   * Builders - NoSQL Databases
+   * ====================================================== */
+  private static buildMongoConfig(
+    config: Partial<MongoConnectionOptions>,
+  ): MongoConnectionOptions {
+    return {
+      type: "mongodb",
+      host: config.host ?? "localhost",
+      port: config.port ?? 27017,
+      database: config.database ?? "app",
+      synchronize: false,
+      logging: false,
+      entities: config.entities ?? ["dist/**/*.entity.js"],
+      ...config,
+    };
+  }
+
+  /* ======================================================
+   * Builders - Mobile/Embedded Databases
+   * ====================================================== */
+  private static buildCordovaConfig(
+    config: Partial<CordovaConnectionOptions>,
+  ): CordovaConnectionOptions {
+    return {
+      type: "cordova",
+      database: config.database ?? "app.db",
+      location: config.location ?? "default",
+      synchronize: false,
+      logging: false,
+      entities: config.entities ?? ["dist/**/*.entity.js"],
+      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
+      ...config,
+    };
+  }
+
+  private static buildNativescriptConfig(
+    config: Partial<NativescriptConnectionOptions>,
+  ): NativescriptConnectionOptions {
+    if (!config.driver) {
+      throw new Error(
+        "NativescriptConnectionOptions: driver is required (e.g. require('nativescript-sqlite'))",
+      );
+    }
+
+    return {
+      type: "nativescript",
+      database: config.database ?? "app.db",
+      driver: config.driver,
+      readOnly: config.readOnly ?? false,
+      key: config.key,
+      multithreading: config.multithreading ?? false,
+      migrate: config.migrate ?? false,
+      iosFlags: config.iosFlags,
+      androidFlags: config.androidFlags,
+      synchronize: false,
+      logging: false,
+      entities: config.entities ?? ["dist/**/*.entity.js"],
+      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
+      ...config, // optional fields only
+    };
+  }
+
+  private static buildReactNativeConfig(
+    config: Partial<ReactNativeConnectionOptions>,
+  ): ReactNativeConnectionOptions {
+    return {
+      type: "react-native",
+      database: config.database ?? "app.db",
+      location: config.location ?? "default",
+      synchronize: false,
+      logging: false,
+      entities: config.entities ?? ["dist/**/*.entity.js"],
+      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
+      ...config,
+    };
+  }
+
+  private static buildSqljsConfig(
+    config: Partial<SqljsConnectionOptions>,
+  ): SqljsConnectionOptions {
+    return {
+      type: "sqljs",
+      autoSave: config.autoSave ?? true,
+      location: config.location ?? "browser",
+      synchronize: false,
+      logging: false,
+      entities: config.entities ?? ["dist/**/*.entity.js"],
+      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
+      ...config,
+    };
+  }
+
+  private static buildExpoConfig(
+    config: Partial<ExpoConnectionOptions>,
+  ): ExpoConnectionOptions {
+    if (!config.driver) {
+      throw new Error(
+        "ExpoConnectionOptions: driver is required (e.g. require('expo-sqlite'))",
+      );
+    }
+
+    return {
+      type: "expo",
+      database: config.database ?? "app.db",
+      driver: config.driver, // ✅ guaranteed
+      synchronize: false,
+      logging: false,
+      entities: config.entities ?? ["dist/**/*.entity.js"],
+      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
+      ...config, // optional fields
+    };
+  }
+
+  private static buildCapacitorConfig(
+    config: Partial<CapacitorConnectionOptions>,
+  ): CapacitorConnectionOptions {
+    if (!config.driver) {
+      throw new Error(
+        "CapacitorConnectionOptions: driver is required (e.g. new SQLiteConnection(CapacitorSQLite))",
+      );
+    }
+
+    return {
+      type: "capacitor",
+      database: config.database ?? "app.db",
+      driver: config.driver, // ✅ guaranteed
+      synchronize: false,
+      logging: false,
+      entities: config.entities ?? ["dist/**/*.entity.js"],
+      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
+      ...config, // optional fields
+    };
+  }
+
   /* ======================================================
    * fragment.json loader
    * ====================================================== */
@@ -183,7 +593,10 @@ export class TypeORMModule {
     }
 
     const raw = JSON.parse(fs.readFileSync(configPath, "utf-8"));
-    return raw.database ?? {};
+    const dbConfig = raw.database ?? {};
+
+    // Interpolate environment variables
+    return this.interpolateEnvVars(dbConfig);
   }
 
   /* ======================================================