ilana-orm 1.0.1 → 1.0.3

package/cli/ilana.js

@@ -64,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';
 }
@@ -118,8 +131,8 @@ function generateModel(name, options = {}) {
 
 function getModelTemplate(className, tableName) {
   if (isTypeScriptProject()) {
-    return `import Model from 'ilana-orm/orm/Model';
-// import { MoneyCast, EncryptedCast } from 'ilana-orm/orm/CustomCasts';
+    return `import Model from 'ilana-orm/orm/Model.js';
+// import { MoneyCast, EncryptedCast } from 'ilana-orm/orm/CustomCasts.js';
 
 export default class ${className} extends Model {
   protected static table = '${tableName}';
@@ -210,7 +223,7 @@ module.exports = ${className};
 
 function getPivotModelTemplate(className, tableName) {
   if (isTypeScriptProject()) {
-    return `import Model from 'ilana-orm/orm/Model';
+    return `import Model from 'ilana-orm/orm/Model.js';
 
 export default class ${className} extends Model {
   protected static table = '${tableName}';
@@ -247,8 +260,8 @@ function generateFactory(className) {
   }
 
   const template = isTypeScriptProject() ?
-    `import { defineFactory } from 'ilana-orm/orm/Factory';
-import ${className} from '../../models/${className}';
+    `import { defineFactory } from 'ilana-orm/orm/Factory.js';
+import ${className} from '../../models/${className}.js';
 
 export default defineFactory(${className}, (faker) => ({
   // Define your factory attributes here
@@ -285,9 +298,9 @@ function generateSeeder(className) {
   }
 
   const template = isTypeScriptProject() ?
-    `import Seeder from 'ilana-orm/orm/Seeder';
-import ${className} from '../../models/${className}';
-import '../factories/${className}Factory';
+    `import Seeder from 'ilana-orm/orm/Seeder.js';
+import ${className} from '../../models/${className}.js';
+import '../factories/${className}Factory.js';
 
 export default class ${className}Seeder extends Seeder {
   async run(): Promise<void> {
@@ -339,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.js';
+
+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 = {
@@ -394,6 +469,7 @@ Database.configure(config);
 
 module.exports = config;
 `;
+}
       fs.writeFileSync(configPath, configTemplate);
       console.log(`Created config file: ${configPath}`);
     }
@@ -787,7 +863,7 @@ DB_TIMEZONE=UTC
     }
 
     const template = isTypeScriptProject() ?
-      `${modelName ? `import ${modelName} from '../models/${modelName}';\n\n` : ''}export default class ${className}Observer {
+      `${modelName ? `import ${modelName} from '../models/${modelName}.js';\n\n` : ''}export default class ${className}Observer {
   async creating(model: ${modelName || 'any'}): Promise<void> {}
   async created(model: ${modelName || 'any'}): Promise<void> {}
   async updating(model: ${modelName || 'any'}): Promise<void> {}
@@ -835,7 +911,7 @@ module.exports = ${className}Observer;
     }
 
     const template = isTypeScriptProject() ?
-      `import { CustomCast } from 'ilana-orm/orm/Model';
+      `import { CustomCast } from 'ilana-orm/orm/Model.js';
 
 export default class ${className}Cast implements CustomCast {
   get(value: any): any {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilana-orm",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "A fully-featured, Eloquent-style ORM for Node.js with TypeScript support",
   "main": "index.js",
   "bin": {