fragment-ts 1.0.33 → 1.0.35

package/src/typeorm/typeorm-module.ts

@@ -70,6 +70,16 @@ type SupportedDatabaseConfig =
   | Partial<CapacitorConnectionOptions>
   | Partial<SpannerConnectionOptions>;
 
+// New interface for the fragment.json structure
+interface FragmentConfig {
+  development?: {
+    database?: SupportedDatabaseConfig;
+  };
+  production?: {
+    database?: SupportedDatabaseConfig;
+  };
+}
+
 export class TypeORMModule {
   private static dataSource: DataSource;
 
@@ -276,10 +286,16 @@ export class TypeORMModule {
       database: config.database ?? "database.sqlite",
       synchronize: config.synchronize ?? false,
       logging: config.logging ?? false,
-      entities: config.entities ?? ["dist/**/*.entity.js"],
-      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
-      subscribers: config.subscribers ?? [],
-      ...config,
+      ...(config.entities !== undefined ? { entities: config.entities } : {}),
+      ...(config.migrations !== undefined
+        ? { migrations: config.migrations }
+        : {}),
+      ...(config.subscribers !== undefined
+        ? { subscribers: config.subscribers }
+        : {}),
+      ...(config.maxQueryExecutionTime !== undefined
+        ? { maxQueryExecutionTime: config.maxQueryExecutionTime }
+        : {}),
     };
   }
 
@@ -291,10 +307,13 @@ export class TypeORMModule {
       database: config.database ?? "database.sqlite",
       synchronize: config.synchronize ?? false,
       logging: config.logging ?? false,
-      entities: config.entities ?? ["dist/**/*.entity.js"],
-      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
-      subscribers: config.subscribers ?? [],
-      ...config,
+      ...(config.entities !== undefined ? { entities: config.entities } : {}),
+      ...(config.migrations !== undefined
+        ? { migrations: config.migrations }
+        : {}),
+      ...(config.subscribers !== undefined
+        ? { subscribers: config.subscribers }
+        : {}),
     };
   }
 
@@ -310,10 +329,16 @@ export class TypeORMModule {
       database: config.database ?? "app",
       synchronize: config.synchronize ?? false,
       logging: config.logging ?? false,
-      entities: config.entities ?? ["dist/**/*.entity.js"],
-      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
-      subscribers: config.subscribers ?? [],
-      ...config,
+      ...(config.entities !== undefined ? { entities: config.entities } : {}),
+      ...(config.migrations !== undefined
+        ? { migrations: config.migrations }
+        : {}),
+      ...(config.subscribers !== undefined
+        ? { subscribers: config.subscribers }
+        : {}),
+      ...(config.maxQueryExecutionTime !== undefined
+        ? { maxQueryExecutionTime: config.maxQueryExecutionTime }
+        : {}),
     };
   }
 
@@ -329,10 +354,16 @@ export class TypeORMModule {
       database: config.database ?? "app",
       synchronize: config.synchronize ?? false,
       logging: config.logging ?? false,
-      entities: config.entities ?? ["dist/**/*.entity.js"],
-      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
-      subscribers: config.subscribers ?? [],
-      ...config,
+      ...(config.entities !== undefined ? { entities: config.entities } : {}),
+      ...(config.migrations !== undefined
+        ? { migrations: config.migrations }
+        : {}),
+      ...(config.subscribers !== undefined
+        ? { subscribers: config.subscribers }
+        : {}),
+      ...(config.maxQueryExecutionTime !== undefined
+        ? { maxQueryExecutionTime: config.maxQueryExecutionTime }
+        : {}),
     };
   }
 
@@ -348,11 +379,14 @@ export class TypeORMModule {
       database: config.database ?? "defaultdb",
       synchronize: config.synchronize ?? false,
       logging: config.logging ?? false,
-      entities: config.entities ?? ["dist/**/*.entity.js"],
-      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
-      subscribers: config.subscribers ?? [],
       timeTravelQueries: config.timeTravelQueries ?? false,
-      ...config,
+      ...(config.entities !== undefined ? { entities: config.entities } : {}),
+      ...(config.migrations !== undefined
+        ? { migrations: config.migrations }
+        : {}),
+      ...(config.subscribers !== undefined
+        ? { subscribers: config.subscribers }
+        : {}),
     };
   }
 
@@ -368,11 +402,14 @@ export class TypeORMModule {
       database: config.database ?? "master",
       synchronize: config.synchronize ?? false,
       logging: config.logging ?? false,
-      entities: config.entities ?? ["dist/**/*.entity.js"],
-      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
-      subscribers: config.subscribers ?? [],
-      options: config.options,
-      ...config,
+      ...(config.entities !== undefined ? { entities: config.entities } : {}),
+      ...(config.migrations !== undefined
+        ? { migrations: config.migrations }
+        : {}),
+      ...(config.subscribers !== undefined
+        ? { subscribers: config.subscribers }
+        : {}),
+      ...(config.options !== undefined ? { options: config.options } : {}),
     };
   }
 
@@ -388,10 +425,13 @@ export class TypeORMModule {
       sid: config.sid ?? "xe",
       synchronize: config.synchronize ?? false,
       logging: config.logging ?? false,
-      entities: config.entities ?? ["dist/**/*.entity.js"],
-      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
-      subscribers: config.subscribers ?? [],
-      ...config,
+      ...(config.entities !== undefined ? { entities: config.entities } : {}),
+      ...(config.migrations !== undefined
+        ? { migrations: config.migrations }
+        : {}),
+      ...(config.subscribers !== undefined
+        ? { subscribers: config.subscribers }
+        : {}),
     };
   }
 
@@ -404,13 +444,16 @@ export class TypeORMModule {
       port: config.port ?? 30015,
       username: config.username ?? "SYSTEM",
       password: config.password ?? "",
-      schema: config.schema,
       synchronize: config.synchronize ?? false,
       logging: config.logging ?? false,
-      entities: config.entities ?? ["dist/**/*.entity.js"],
-      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
-      subscribers: config.subscribers ?? [],
-      ...config,
+      ...(config.schema !== undefined ? { schema: config.schema } : {}),
+      ...(config.entities !== undefined ? { entities: config.entities } : {}),
+      ...(config.migrations !== undefined
+        ? { migrations: config.migrations }
+        : {}),
+      ...(config.subscribers !== undefined
+        ? { subscribers: config.subscribers }
+        : {}),
     };
   }
 
@@ -442,14 +485,24 @@ export class TypeORMModule {
       password: config.password ?? "",
       synchronize: config.synchronize ?? false,
       logging: config.logging ?? false,
-      entities: config.entities ?? ["dist/**/*.entity.js"],
-      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
-      subscribers: config.subscribers ?? [],
-      driver: config.driver,
-      serviceConfigOptions: config.serviceConfigOptions,
-      formatOptions: config.formatOptions,
-      legacySpatialSupport: config.legacySpatialSupport,
-      ssl: config.ssl,
+      ...(config.entities !== undefined ? { entities: config.entities } : {}),
+      ...(config.migrations !== undefined
+        ? { migrations: config.migrations }
+        : {}),
+      ...(config.subscribers !== undefined
+        ? { subscribers: config.subscribers }
+        : {}),
+      ...(config.driver !== undefined ? { driver: config.driver } : {}),
+      ...(config.serviceConfigOptions !== undefined
+        ? { serviceConfigOptions: config.serviceConfigOptions }
+        : {}),
+      ...(config.formatOptions !== undefined
+        ? { formatOptions: config.formatOptions }
+        : {}),
+      ...(config.legacySpatialSupport !== undefined
+        ? { legacySpatialSupport: config.legacySpatialSupport }
+        : {}),
+      ...(config.ssl !== undefined ? { ssl: config.ssl } : {}),
     };
   }
 
@@ -476,14 +529,26 @@ export class TypeORMModule {
       database: config.database ?? "app",
       synchronize: config.synchronize ?? false,
       logging: config.logging ?? false,
-      entities: config.entities ?? ["dist/**/*.entity.js"],
-      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
-      subscribers: config.subscribers ?? [],
-      driver: config.driver,
-      transformParameters: config.transformParameters,
-      poolErrorHandler: config.poolErrorHandler,
-      serviceConfigOptions: config.serviceConfigOptions,
-      formatOptions: config.formatOptions,
+      ...(config.entities !== undefined ? { entities: config.entities } : {}),
+      ...(config.migrations !== undefined
+        ? { migrations: config.migrations }
+        : {}),
+      ...(config.subscribers !== undefined
+        ? { subscribers: config.subscribers }
+        : {}),
+      ...(config.driver !== undefined ? { driver: config.driver } : {}),
+      ...(config.transformParameters !== undefined
+        ? { transformParameters: config.transformParameters }
+        : {}),
+      ...(config.poolErrorHandler !== undefined
+        ? { poolErrorHandler: config.poolErrorHandler }
+        : {}),
+      ...(config.serviceConfigOptions !== undefined
+        ? { serviceConfigOptions: config.serviceConfigOptions }
+        : {}),
+      ...(config.formatOptions !== undefined
+        ? { formatOptions: config.formatOptions }
+        : {}),
     };
   }
 
@@ -497,10 +562,13 @@ export class TypeORMModule {
       databaseId: config.databaseId ?? "",
       synchronize: config.synchronize ?? false,
       logging: config.logging ?? false,
-      entities: config.entities ?? ["dist/**/*.entity.js"],
-      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
-      subscribers: config.subscribers ?? [],
-      ...config,
+      ...(config.entities !== undefined ? { entities: config.entities } : {}),
+      ...(config.migrations !== undefined
+        ? { migrations: config.migrations }
+        : {}),
+      ...(config.subscribers !== undefined
+        ? { subscribers: config.subscribers }
+        : {}),
     };
   }
 
@@ -517,8 +585,7 @@ export class TypeORMModule {
       database: config.database ?? "app",
       synchronize: config.synchronize ?? false,
       logging: config.logging ?? false,
-      entities: config.entities ?? ["dist/**/*.entity.js"],
-      ...config,
+      ...(config.entities !== undefined ? { entities: config.entities } : {}),
     };
   }
 
@@ -534,10 +601,13 @@ export class TypeORMModule {
       location: config.location ?? "default",
       synchronize: config.synchronize ?? false,
       logging: config.logging ?? false,
-      entities: config.entities ?? ["dist/**/*.entity.js"],
-      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
-      subscribers: config.subscribers ?? [],
-      ...config,
+      ...(config.entities !== undefined ? { entities: config.entities } : {}),
+      ...(config.migrations !== undefined
+        ? { migrations: config.migrations }
+        : {}),
+      ...(config.subscribers !== undefined
+        ? { subscribers: config.subscribers }
+        : {}),
     };
   }
 
@@ -555,17 +625,22 @@ export class TypeORMModule {
       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: config.synchronize ?? false,
       logging: config.logging ?? false,
-      entities: config.entities ?? ["dist/**/*.entity.js"],
-      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
-      subscribers: config.subscribers ?? [],
-      ...config,
+      ...(config.key !== undefined ? { key: config.key } : {}),
+      ...(config.iosFlags !== undefined ? { iosFlags: config.iosFlags } : {}),
+      ...(config.androidFlags !== undefined
+        ? { androidFlags: config.androidFlags }
+        : {}),
+      ...(config.entities !== undefined ? { entities: config.entities } : {}),
+      ...(config.migrations !== undefined
+        ? { migrations: config.migrations }
+        : {}),
+      ...(config.subscribers !== undefined
+        ? { subscribers: config.subscribers }
+        : {}),
     };
   }
 
@@ -578,10 +653,13 @@ export class TypeORMModule {
       location: config.location ?? "default",
       synchronize: config.synchronize ?? false,
       logging: config.logging ?? false,
-      entities: config.entities ?? ["dist/**/*.entity.js"],
-      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
-      subscribers: config.subscribers ?? [],
-      ...config,
+      ...(config.entities !== undefined ? { entities: config.entities } : {}),
+      ...(config.migrations !== undefined
+        ? { migrations: config.migrations }
+        : {}),
+      ...(config.subscribers !== undefined
+        ? { subscribers: config.subscribers }
+        : {}),
     };
   }
 
@@ -594,10 +672,13 @@ export class TypeORMModule {
       location: config.location ?? "browser",
       synchronize: config.synchronize ?? false,
       logging: config.logging ?? false,
-      entities: config.entities ?? ["dist/**/*.entity.js"],
-      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
-      subscribers: config.subscribers ?? [],
-      ...config,
+      ...(config.entities !== undefined ? { entities: config.entities } : {}),
+      ...(config.migrations !== undefined
+        ? { migrations: config.migrations }
+        : {}),
+      ...(config.subscribers !== undefined
+        ? { subscribers: config.subscribers }
+        : {}),
     };
   }
 
@@ -616,10 +697,13 @@ export class TypeORMModule {
       driver: config.driver,
       synchronize: config.synchronize ?? false,
       logging: config.logging ?? false,
-      entities: config.entities ?? ["dist/**/*.entity.js"],
-      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
-      subscribers: config.subscribers ?? [],
-      ...config,
+      ...(config.entities !== undefined ? { entities: config.entities } : {}),
+      ...(config.migrations !== undefined
+        ? { migrations: config.migrations }
+        : {}),
+      ...(config.subscribers !== undefined
+        ? { subscribers: config.subscribers }
+        : {}),
     };
   }
 
@@ -638,15 +722,18 @@ export class TypeORMModule {
       driver: config.driver,
       synchronize: config.synchronize ?? false,
       logging: config.logging ?? false,
-      entities: config.entities ?? ["dist/**/*.entity.js"],
-      migrations: config.migrations ?? ["dist/migrations/**/*.js"],
-      subscribers: config.subscribers ?? [],
-      ...config,
+      ...(config.entities !== undefined ? { entities: config.entities } : {}),
+      ...(config.migrations !== undefined
+        ? { migrations: config.migrations }
+        : {}),
+      ...(config.subscribers !== undefined
+        ? { subscribers: config.subscribers }
+        : {}),
     };
   }
 
   /* ======================================================
-   * fragment.json loader
+   * fragment.json loader - UPDATED FOR NEW STRUCTURE
    * ====================================================== */
   private static loadFileConfig(): SupportedDatabaseConfig {
     const configPath = path.join(process.cwd(), "fragment.json");
@@ -656,8 +743,25 @@ export class TypeORMModule {
     }
 
     try {
-      const raw = JSON.parse(fs.readFileSync(configPath, "utf-8"));
-      const dbConfig = raw.database ?? {};
+      const raw = JSON.parse(
+        fs.readFileSync(configPath, "utf-8"),
+      ) as FragmentConfig;
+
+      // Determine environment mode
+      const isDevMode = this.isDevelopmentMode();
+      console.log(`Detected ${isDevMode ? "development" : "production"} mode`);
+
+      // Get the appropriate config section
+      let dbConfig = {};
+      if (isDevMode && raw.development?.database) {
+        dbConfig = raw.development.database;
+      } else if (!isDevMode && raw.production?.database) {
+        dbConfig = raw.production.database;
+      } else if (raw.development?.database) {
+        // Fallback to development if production not found
+        dbConfig = raw.development.database;
+        console.warn("Production config not found, using development config");
+      }
 
       // Interpolate environment variables
       return this.interpolateEnvVars(dbConfig);
@@ -667,6 +771,25 @@ export class TypeORMModule {
     }
   }
 
+  /* ======================================================
+   * Environment detection
+   * ====================================================== */
+  private static isDevelopmentMode(): boolean {
+    // Check explicit environment variable
+    if (process.env.FRAGMENT_DEV_MODE !== undefined) {
+      return process.env.FRAGMENT_DEV_MODE === "true";
+    }
+
+    // Check NODE_ENV
+    if (process.env.NODE_ENV) {
+      return process.env.NODE_ENV === "development";
+    }
+
+    // Check if we're running TypeScript files directly (dev mode)
+    const mainFile = require.main?.filename || "";
+    return mainFile.includes(".ts") || mainFile.includes("ts-node");
+  }
+
   /* ======================================================
    * Utilities
    * ====================================================== */

package/src/web/application.ts

@@ -19,6 +19,7 @@ import {
   Interceptor,
   ExceptionFilter,
 } from "./interfaces";
+import { EnvUtils } from "../shared/env.utils";
 
 export class FragmentWebApplication {
   private app: Express;
@@ -93,8 +94,8 @@ export class FragmentWebApplication {
     console.log(`📁 dist/ exists: ${distExists}`);
     console.log(`📁 src/ exists: ${srcExists}`);
 
-    // Determine if we're running TypeScript directly (dev) or compiled JS (prod)
-    const isDevMode = this.isRunningTypeScript();
+    // Use EnvUtils for consistent environment detection
+    const isDevMode = EnvUtils.isDevelopmentMode();
     console.log(
       `💻 Running in ${isDevMode ? "development" : "production"} mode`,
     );
@@ -112,37 +113,7 @@ export class FragmentWebApplication {
     }
   }
 
-  private isRunningTypeScript(): boolean {
-    // Check if ts-node is in require.extensions
-    if (require.extensions[".ts"]) {
-      return true;
-    }
-
-    // Check if process is running with ts-node or tsx
-    const execPath = process.argv[0];
-    const scriptPath = process.argv[1] || "";
-
-    if (
-      execPath.includes("ts-node") ||
-      execPath.includes("tsx") ||
-      scriptPath.includes("ts-node") ||
-      scriptPath.includes("tsx")
-    ) {
-      return true;
-    }
-
-    // Check if main module has .ts extension
-    if (require.main?.filename.endsWith(".ts")) {
-      return true;
-    }
-
-    // Check NODE_ENV or explicit flag
-    if (process.env.FRAGMENT_DEV_MODE === "true") {
-      return true;
-    }
-
-    return false;
-  }
+  // Remove the old isRunningTypeScript method since we're using EnvUtils
 
   private discoverAndRegisterComponents(): void {
     const classes = this.metadataStorage.getAllClasses();