ilana-orm 1.0.0 → 1.0.2

package/cli/ilana.js

@@ -30,13 +30,24 @@ const defaultConfig = {
 };
 
 // Load configuration and auto-initialize
-function loadConfig() {
+async function loadConfig() {
   const configPath = path.join(process.cwd(), 'ilana.config.js');
   if (fs.existsSync(configPath)) {
     delete require.cache[configPath];
-    const config = require(configPath);
-    // Config file already initializes database
-    return config;
+    try {
+      const config = require(configPath);
+      // Config file already initializes database
+      return config;
+    } catch (error) {
+      if (error.code === 'ERR_REQUIRE_ESM') {
+        // Handle ES modules
+        const configModule = await import(configPath);
+        const config = configModule.default || configModule;
+        return config;
+      } else {
+        throw error;
+      }
+    }
   }
   // No config file found - don't initialize with hardcoded default
   console.error('No ilana.config.js found. Run "npx ilana setup" first.');
@@ -44,8 +55,8 @@ function loadConfig() {
 }
 
 // Initialize database
-function initializeDatabase() {
-  loadConfig(); // Config handles initialization
+async function initializeDatabase() {
+  await loadConfig(); // Config handles initialization
 }
 
 // Helper functions
@@ -53,6 +64,19 @@ function isTypeScriptProject() {
   return fs.existsSync(path.join(process.cwd(), 'tsconfig.json'));
 }
 
+function isESModuleProject() {
+  const packageJsonPath = path.join(process.cwd(), 'package.json');
+  if (fs.existsSync(packageJsonPath)) {
+    try {
+      const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+      return packageJson.type === 'module';
+    } catch (error) {
+      return false;
+    }
+  }
+  return false;
+}
+
 function getFileExtension() {
   return isTypeScriptProject() ? '.ts' : '.js';
 }
@@ -328,7 +352,69 @@ const commands = {
     // Create config file if it doesn't exist
     const configPath = 'ilana.config.js';
     if (!fs.existsSync(configPath)) {
-      const configTemplate = `require('dotenv').config();
+      const isESModule = isESModuleProject();
+      const configTemplate = isESModule ? getESModuleConfigTemplate() : getCommonJSConfigTemplate();
+
+function getESModuleConfigTemplate() {
+  return `import 'dotenv/config';
+import Database from 'ilana-orm/database/connection';
+
+const config = {
+  default: process.env.DB_CONNECTION || 'mysql',
+  timezone: process.env.DB_TIMEZONE || 'UTC',
+  
+  connections: {
+    sqlite: {
+      client: 'sqlite3',
+      connection: {
+        filename: process.env.DB_FILENAME || './database.sqlite'
+      },
+      useNullAsDefault: true
+    },
+    
+    mysql: {
+      client: 'mysql2',
+      connection: {
+        host: process.env.DB_HOST || 'localhost',
+        port: process.env.DB_PORT || 3306,
+        user: process.env.DB_USERNAME || 'root',
+        password: process.env.DB_PASSWORD || '',
+        database: process.env.DB_DATABASE || 'your_database',
+        timezone: process.env.DB_TIMEZONE || 'UTC'
+      }
+    },
+    
+    postgres: {
+      client: 'pg',
+      connection: {
+        host: process.env.DB_HOST || 'localhost',
+        port: process.env.DB_PORT || 5432,
+        user: process.env.DB_USERNAME || 'postgres',
+        password: process.env.DB_PASSWORD || '',
+        database: process.env.DB_DATABASE || 'your_database'
+      }
+    }
+  },
+  
+  migrations: {
+    directory: './database/migrations',
+    tableName: 'migrations'
+  },
+  
+  seeds: {
+    directory: './database/seeds'
+  }
+};
+
+// Auto-initialize database connections
+Database.configure(config);
+
+export default config;
+`;
+}
+
+function getCommonJSConfigTemplate() {
+  return `require('dotenv').config();
 const Database = require('ilana-orm/database/connection');
 
 const config = {
@@ -383,6 +469,7 @@ Database.configure(config);
 
 module.exports = config;
 `;
+}
       fs.writeFileSync(configPath, configTemplate);
       console.log(`Created config file: ${configPath}`);
     }
@@ -449,7 +536,7 @@ DB_TIMEZONE=UTC
       }
     }
 
-    initializeDatabase();
+    await initializeDatabase();
     const runner = new MigrationRunner();
     runner.generateMigration(name, tableName, isCreate);
   },
@@ -524,14 +611,14 @@ DB_TIMEZONE=UTC
     }
 
     if (options.migration || options.all) {
-      initializeDatabase();
+      await initializeDatabase();
     }
 
     generateModel(name, options);
   },
 
   async migrate(...args) {
-    initializeDatabase();
+    await initializeDatabase();
     const runner = new MigrationRunner();
 
     let connection;
@@ -565,7 +652,7 @@ DB_TIMEZONE=UTC
   },
 
   async 'migrate:fresh'(...args) {
-    initializeDatabase();
+    await initializeDatabase();
     const runner = new MigrationRunner();
 
     let connection;
@@ -591,21 +678,21 @@ DB_TIMEZONE=UTC
   },
 
   async 'migrate:list'(connection) {
-    initializeDatabase();
+    await initializeDatabase();
     const runner = new MigrationRunner();
     await runner.list(connection);
     process.exit(0);
   },
 
   async 'migrate:unlock'(connection) {
-    initializeDatabase();
+    await initializeDatabase();
     const runner = new MigrationRunner();
     await runner.unlock(connection);
     process.exit(0);
   },
 
   async 'migrate:rollback'(...args) {
-    initializeDatabase();
+    await initializeDatabase();
     const runner = new MigrationRunner();
 
     let steps = 1;
@@ -641,28 +728,28 @@ DB_TIMEZONE=UTC
   },
 
   async 'migrate:reset'(connection) {
-    initializeDatabase();
+    await initializeDatabase();
     const runner = new MigrationRunner();
     await runner.reset(connection);
     process.exit(0);
   },
 
   async 'migrate:refresh'(connection) {
-    initializeDatabase();
+    await initializeDatabase();
     const runner = new MigrationRunner();
     await runner.refresh(connection);
     process.exit(0);
   },
 
   async 'migrate:status'(connection) {
-    initializeDatabase();
+    await initializeDatabase();
     const runner = new MigrationRunner();
     await runner.status(connection);
     process.exit(0);
   },
 
   async seed(...args) {
-    initializeDatabase();
+    await initializeDatabase();
 
     let seederName;
     let connection;
@@ -710,7 +797,19 @@ DB_TIMEZONE=UTC
       console.log(`Seeding: ${file}`);
       const filepath = path.join(seedsPath, file);
       delete require.cache[filepath];
-      const seederModule = require(filepath);
+      
+      let seederModule;
+      try {
+        seederModule = require(filepath);
+      } catch (error) {
+        if (error.code === 'ERR_REQUIRE_ESM') {
+          // Handle ES modules
+          seederModule = await import(filepath);
+        } else {
+          throw error;
+        }
+      }
+      
       const SeederClass = seederModule.default || seederModule;
       const seeder = new SeederClass();
 
@@ -734,7 +833,7 @@ DB_TIMEZONE=UTC
   },
 
   async 'db:wipe'(connection) {
-    initializeDatabase();
+    await initializeDatabase();
     const runner = new MigrationRunner();
     await runner.wipe(connection);
     process.exit(0);

package/orm/MigrationRunner.js

@@ -6,11 +6,24 @@ const SchemaBuilder = require('../database/schema-builder');
 let config = {};
 
 // Auto-load configuration on first import
-(function autoLoadConfig() {
+(async function autoLoadConfig() {
   const configPath = path.join(process.cwd(), 'ilana.config.js');
   if (fs.existsSync(configPath)) {
     delete require.cache[configPath];
-    config = require(configPath) || {}; // Config file handles Database.configure()
+    try {
+      config = require(configPath) || {}; // Config file handles Database.configure()
+    } catch (error) {
+      if (error.code === 'ERR_REQUIRE_ESM') {
+        // Handle ES modules
+        const configModule = await import(configPath);
+        config = configModule.default || configModule;
+        if (typeof config.configure === 'function') {
+          config.configure(config);
+        }
+      } else {
+        throw error;
+      }
+    }
   }
 })();
 
@@ -293,7 +306,18 @@ class MigrationRunner {
   async loadMigration(filename) {
     const filepath = path.resolve(this.migrationsPath, filename);
     delete require.cache[filepath];
-    const migrationModule = require(filepath);
+    
+    let migrationModule;
+    try {
+      migrationModule = require(filepath);
+    } catch (error) {
+      if (error.code === 'ERR_REQUIRE_ESM') {
+        // Handle ES modules
+        migrationModule = await import(filepath);
+      } else {
+        throw error;
+      }
+    }
 
     const MigrationClass = migrationModule.default || migrationModule;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilana-orm",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "A fully-featured, Eloquent-style ORM for Node.js with TypeScript support",
   "main": "index.js",
   "bin": {
@@ -32,7 +32,7 @@
     "type": "git",
     "url": "https://github.com/raphyabak/ilana-orm.git"
   },
-  "homepage": "https://github.com/raphyabak/ilana-orm#readme",
+  "homepage": "https://raphwebb.mintlify.com",
   "bugs": {
     "url": "https://github.com/raphyabak/ilana-orm/issues"
   },
@@ -68,4 +68,4 @@
   "engines": {
     "node": ">=16.0.0"
   }
-}
+}