fragment-ts 1.0.45 → 1.0.47

package/src/shared/config.utils.ts

@@ -4,7 +4,8 @@ import * as fs from "fs";
 import * as path from "path";
 import { EnvUtils } from "./env.utils";
 
-interface FragmentDatabaseConfig {
+// Flat structure only
+export interface FragmentDatabaseConfig {
   type?: string;
   host?: string;
   port?: number;
@@ -22,7 +23,7 @@ interface FragmentDatabaseConfig {
 }
 
 // Only support flat structure now
-interface FragmentConfig {
+export interface FragmentConfig {
   database?: FragmentDatabaseConfig;
 }
 
@@ -41,9 +42,7 @@ export class ConfigUtils {
     try {
       const raw = fs.readFileSync(configPath, "utf-8");
       this.configCache = JSON.parse(raw) || {};
-      if (!this.configCache) {
-        return {};
-      }
+      if (!this.configCache) return {};
       return this.configCache;
     } catch (error) {
       console.error("❌ Error loading fragment.json:", error);
@@ -74,7 +73,7 @@ export class ConfigUtils {
     return value;
   }
 
-  // Always return the single database config
+  // ✅ ONLY use top-level `database`
   static getDatabaseConfig(): FragmentDatabaseConfig {
     const config = this.loadConfig();
     if (config.database) {

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

@@ -24,7 +24,7 @@ import { BetterSqlite3ConnectionOptions } from "typeorm/driver/better-sqlite3/Be
 import { CapacitorConnectionOptions } from "typeorm/driver/capacitor/CapacitorConnectionOptions";
 import { SpannerConnectionOptions } from "typeorm/driver/spanner/SpannerConnectionOptions";
 import { EnvUtils } from "../shared/env.utils";
-import { ConfigUtils } from "../shared/config.utils";
+import { ConfigUtils, FragmentConfig } from "../shared/config.utils";
 
 /* ======================================================
  * Concrete configs TypeORM accepts
@@ -72,16 +72,6 @@ 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;
 
@@ -749,14 +739,10 @@ export class TypeORMModule {
         fs.readFileSync(configPath, "utf-8"),
       ) as FragmentConfig;
 
-      if (!raw.development) {
-        throw new Error("fragment config not found | Invalid");
-      }
-      var dbConfig;
-
-      dbConfig = raw.development.database;
+      // Simply use the top-level `database` object
+      const dbConfig = raw.database || {};
 
-      // Interpolate environment variables
+      // Interpolate environment variables like ${DB_HOST}
       return this.interpolateEnvVars(dbConfig);
     } catch (error) {
       console.error(`Error loading fragment.json: ${error}`);

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