fragment-ts 1.0.44 → 1.0.46

package/src/shared/env.utils.ts

@@ -1,78 +1,50 @@
-import * as fs from "fs";
-import * as path from "path";
-
 export class EnvUtils {
   static getString(key: string, defaultValue?: string): string {
-    return process.env[key] ?? defaultValue ?? "";
+    const value = process.env[key];
+    return value !== undefined ? value : (defaultValue ?? "");
   }
 
-  static getBoolean(key: string, defaultValue = false): boolean {
-    const val = process.env[key];
-    if (val === undefined) return defaultValue;
-    return ["true", "1", "yes", "on"].includes(val.toLowerCase());
+  static getBoolean(key: string, defaultValue: boolean = false): boolean {
+    const value = process.env[key];
+    if (value === undefined) return defaultValue;
+    return ["true", "1", "yes", "on"].includes(value.toLowerCase());
   }
 
-  static getNumber(key: string, defaultValue = 0): number {
-    const val = process.env[key];
-    if (val === undefined) return defaultValue;
-    const num = Number(val);
+  static getNumber(key: string, defaultValue: number = 0): number {
+    const value = process.env[key];
+    if (value === undefined) return defaultValue;
+    const num = Number(value);
     return isNaN(num) ? defaultValue : num;
   }
 
   static getJson<T>(key: string, defaultValue: T): T {
-    const val = process.env[key];
-    if (val === undefined) return defaultValue;
+    const value = process.env[key];
+    if (value === undefined) return defaultValue;
     try {
-      return JSON.parse(val) as T;
+      return JSON.parse(value) as T;
     } catch {
-      console.warn(`⚠️ Invalid JSON in env var ${key}`);
+      console.warn(`⚠️ Invalid JSON in env var ${key}, using default`);
       return defaultValue;
     }
   }
 
   /**
-   * Returns the current environment name based on the active .env file.
-   * - If .env matches .env.prod → returns "prod"
-   * - If .env matches .env.staging → returns "staging"
-   * - If .env is custom or unmatched → returns "local"
-   * - If no .env exists → returns "default"
+   * Check if running in development mode
    */
-  static getEnv(): string {
-    const cwd = process.cwd();
-    const envPath = path.join(cwd, ".env");
-
-    // Fast path: check for .env.mode (written by `fragment env:use`)
-    const modePath = path.join(cwd, ".env.mode");
-    if (fs.existsSync(modePath)) {
-      try {
-        const mode = fs.readFileSync(modePath, "utf8").trim();
-        if (mode) return mode;
-      } catch {
-        // Ignore read errors
-      }
+  static isDevelopmentMode(): boolean {
+    if (process.env.FRAGMENT_DEV_MODE !== undefined) {
+      return process.env.FRAGMENT_DEV_MODE === "true";
     }
-
-    // Fallback: compare .env content with .env.* files
-    if (!fs.existsSync(envPath)) {
-      return "default";
-    }
-
-    const envContent = fs.readFileSync(envPath, "utf8");
-    const files = fs.readdirSync(cwd).filter((f) => /^\.env\..+$/.test(f));
-
-    for (const file of files) {
-      const name = file.replace(/\.env\./, "");
-      const fullPath = path.join(cwd, file);
-      try {
-        const content = fs.readFileSync(fullPath, "utf8");
-        if (content === envContent) {
-          return name;
-        }
-      } catch {
-        // Skip unreadable files
-      }
+    if (process.env.NODE_ENV) {
+      return process.env.NODE_ENV === "development";
     }
+    return false;
+  }
 
-    return "local"; // custom or modified .env
+  /**
+   * Get current environment mode ('development' or 'production')
+   */
+  static getEnvironmentMode(): "development" | "production" {
+    return this.isDevelopmentMode() ? "development" : "production";
   }
 }

package/src/testing/runner.ts

@@ -191,8 +191,17 @@ export class TestRunner {
    * Auto-detect test patterns based on environment and configuration
    */
   getAutoTestPattern(): string {
-    const srcDir = TsConfigUtils.getRootDir();
-    return `${path.relative(process.cwd(), srcDir)}/**/*.spec.ts`;
+    const isDevMode = EnvUtils.isDevelopmentMode();
+
+    if (isDevMode) {
+      // Development mode - use TypeScript
+      const srcDir = TsConfigUtils.getRootDir();
+      return `${path.relative(process.cwd(), srcDir)}/**/*.spec.ts`;
+    } else {
+      // Production mode - use JavaScript
+      const outDir = TsConfigUtils.getOutDir();
+      return `${path.relative(process.cwd(), outDir)}/**/*.spec.js`;
+    }
   }
 }
 

package/src/typeorm/typeorm-module.ts

@@ -749,12 +749,21 @@ export class TypeORMModule {
         fs.readFileSync(configPath, "utf-8"),
       ) as FragmentConfig;
 
-      if (!raw.development) {
-        throw new Error("fragment config not found | Invalid");
+      // Determine environment mode
+      const isDevMode = EnvUtils.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");
       }
-      var dbConfig;
-
-      dbConfig = raw.development.database;
 
       // Interpolate environment variables
       return this.interpolateEnvVars(dbConfig);

package/src/web/application.ts

@@ -90,7 +90,27 @@ export class FragmentWebApplication {
     const distExists = fs.existsSync(path.join(cwd, "dist"));
     const srcExists = fs.existsSync(path.join(cwd, "src"));
 
-    await ComponentScanner.scanSource();
+    console.log(`📁 Current working directory: ${cwd}`);
+    console.log(`📁 dist/ exists: ${distExists}`);
+    console.log(`📁 src/ exists: ${srcExists}`);
+
+    // Use EnvUtils for consistent environment detection
+    const isDevMode = EnvUtils.isDevelopmentMode();
+    console.log(
+      `💻 Running in ${isDevMode ? "development" : "production"} mode`,
+    );
+
+    if (isDevMode && srcExists) {
+      // Development mode: scan TypeScript source files
+      console.log(" 📝 Development mode: scanning TypeScript files");
+      await ComponentScanner.scanSource();
+    } else if (distExists) {
+      // Production mode: scan compiled JavaScript files
+      console.log(" 📦 Production mode: scanning compiled files");
+      await ComponentScanner.scan();
+    } else {
+      console.warn(" ⚠️ Warning: No src/ or dist/ directory found");
+    }
   }
 
   // Remove the old isRunningTypeScript method since we're using EnvUtils