ilana-orm 1.0.7 → 1.0.9

package/cli/ilana.js

@@ -108,6 +108,122 @@ function pluralize(str) {
   return str + 's';
 }
 
+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 = {
+  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);
+
+module.exports = config;
+`;
+}
+
 function generateModel(name, options = {}) {
   const className = toPascalCase(name);
   const tableName = pluralize(toSnakeCase(name));
@@ -438,124 +554,6 @@ const commands = {
       fs.writeFileSync(configPath, configTemplate);
       console.log(`Created config file: ${configPath}`);
     }
-  },
-};
-
-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 = {
-  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);
-
-module.exports = config;
-`;
-}
 
     // Create .env file if it doesn't exist
     const envPath = '.env';
@@ -600,6 +598,7 @@ DB_TIMEZONE=UTC
     console.log('2. Run: ilana make:model User -m');
     console.log('3. Run: ilana migrate');
   },
+
   async 'make:migration'(name, ...flags) {
     if (!name) {
       console.error('Migration name is required');
@@ -700,329 +699,6 @@ DB_TIMEZONE=UTC
     generateModel(name, options);
   },
 
-  async migrate(...args) {
-    await initializeDatabase();
-    const runner = new MigrationRunner();
-
-    let connection;
-    let onlyFile;
-    let toFile;
-
-    for (let i = 0; i < args.length; i++) {
-      const arg = args[i];
-      if (arg === '--connection' && args[i + 1]) {
-        connection = args[i + 1];
-        i++;
-      } else if (arg.startsWith('--connection=')) {
-        connection = arg.split('=')[1];
-      } else if (arg === '--only' && args[i + 1]) {
-        onlyFile = args[i + 1];
-        i++;
-      } else if (arg.startsWith('--only=')) {
-        onlyFile = arg.split('=')[1];
-      } else if (arg === '--to' && args[i + 1]) {
-        toFile = args[i + 1];
-        i++;
-      } else if (arg.startsWith('--to=')) {
-        toFile = arg.split('=')[1];
-      } else if (!arg.startsWith('--')) {
-        connection = arg;
-      }
-    }
-
-    await runner.migrate(connection, onlyFile, toFile);
-    process.exit(0);
-  },
-
-  async 'migrate:fresh'(...args) {
-    await initializeDatabase();
-    const runner = new MigrationRunner();
-
-    let connection;
-    let withSeed = false;
-
-    for (const arg of args) {
-      if (arg === '--seed') {
-        withSeed = true;
-      } else if (arg.startsWith('--connection=')) {
-        connection = arg.split('=')[1];
-      } else if (!arg.startsWith('--')) {
-        connection = arg;
-      }
-    }
-
-    await runner.fresh(connection);
-
-    if (withSeed) {
-      await commands.seed();
-    }
-
-    process.exit(0);
-  },
-
-  async 'migrate:list'(connection) {
-    await initializeDatabase();
-    const runner = new MigrationRunner();
-    await runner.list(connection);
-    process.exit(0);
-  },
-
-  async 'migrate:unlock'(connection) {
-    await initializeDatabase();
-    const runner = new MigrationRunner();
-    await runner.unlock(connection);
-    process.exit(0);
-  },
-
-  async 'migrate:rollback'(...args) {
-    await initializeDatabase();
-    const runner = new MigrationRunner();
-
-    let steps = 1;
-    let connection;
-    let toFile;
-
-    for (let i = 0; i < args.length; i++) {
-      const arg = args[i];
-      if (arg === '--step' && args[i + 1]) {
-        steps = parseInt(args[i + 1]);
-        i++;
-      } else if (arg.startsWith('--step=')) {
-        steps = parseInt(arg.split('=')[1]);
-      } else if (arg === '--connection' && args[i + 1]) {
-        connection = args[i + 1];
-        i++;
-      } else if (arg.startsWith('--connection=')) {
-        connection = arg.split('=')[1];
-      } else if (arg === '--to' && args[i + 1]) {
-        toFile = args[i + 1];
-        i++;
-      } else if (arg.startsWith('--to=')) {
-        toFile = arg.split('=')[1];
-      } else if (!isNaN(parseInt(arg))) {
-        steps = parseInt(arg);
-      } else if (!arg.startsWith('--')) {
-        connection = arg;
-      }
-    }
-
-    await runner.rollback(steps, connection, toFile);
-    process.exit(0);
-  },
-
-  async 'migrate:reset'(connection) {
-    await initializeDatabase();
-    const runner = new MigrationRunner();
-    await runner.reset(connection);
-    process.exit(0);
-  },
-
-  async 'migrate:refresh'(connection) {
-    await initializeDatabase();
-    const runner = new MigrationRunner();
-    await runner.refresh(connection);
-    process.exit(0);
-  },
-
-  async 'migrate:status'(connection) {
-    await initializeDatabase();
-    const runner = new MigrationRunner();
-    await runner.status(connection);
-    process.exit(0);
-  },
-
-  async seed(...args) {
-    await initializeDatabase();
-
-    let seederName;
-    let connection;
-
-    for (let i = 0; i < args.length; i++) {
-      const arg = args[i];
-      if (arg === '--class' && args[i + 1]) {
-        seederName = args[i + 1];
-        i++;
-      } else if (arg.startsWith('--class=')) {
-        seederName = arg.split('=')[1];
-      } else if (arg === '--connection' && args[i + 1]) {
-        connection = args[i + 1];
-        i++;
-      } else if (arg.startsWith('--connection=')) {
-        connection = arg.split('=')[1];
-      } else if (!arg.startsWith('--')) {
-        if (!seederName) seederName = arg;
-        else connection = arg;
-      }
-    }
-
-    const seedsPath = path.join(process.cwd(), 'database/seeds');
-    if (!fs.existsSync(seedsPath)) {
-      console.log('No seeds directory found');
-      process.exit(0);
-    }
-
-    const seedFiles = fs.readdirSync(seedsPath)
-      .filter(file => file.endsWith('.ts') || file.endsWith('.js'))
-      .sort();
-
-    if (seedFiles.length === 0) {
-      console.log('No seed files found');
-      process.exit(0);
-    }
-
-    const filesToRun = seederName
-      ? seedFiles.filter(file => file.includes(seederName))
-      : seedFiles;
-
-    console.log(`Running ${filesToRun.length} seeders...`);
-
-    for (const file of filesToRun) {
-      console.log(`Seeding: ${file}`);
-      const filepath = path.join(seedsPath, file);
-      delete require.cache[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();
-
-      if (connection) {
-        seeder.connection = connection;
-      }
-
-      if (typeof seeder.run === 'function') {
-        await seeder.run();
-      }
-
-      console.log(`Seeded: ${file}`);
-    }
-
-    console.log('Seeding completed');
-    process.exit(0);
-  },
-
-  async 'db:seed'(seederName) {
-    return commands.seed(seederName);
-  },
-
-  async 'db:wipe'(connection) {
-    await initializeDatabase();
-    const runner = new MigrationRunner();
-    await runner.wipe(connection);
-    process.exit(0);
-  },
-
-  async 'make:observer'(name, ...flags) {
-    if (!name) {
-      console.error('Observer name is required');
-      console.log('Usage: ilana make:observer <ObserverName> [--model=ModelName]');
-      process.exit(1);
-    }
-
-    let modelName = '';
-
-    for (const flag of flags) {
-      if (flag.startsWith('--model=')) {
-        modelName = flag.split('=')[1];
-      }
-    }
-
-    const className = toPascalCase(name.replace('Observer', ''));
-    const fileName = `${className}Observer${getFileExtension()}`;
-    const filePath = path.join(process.cwd(), 'observers', fileName);
-
-    if (!fs.existsSync(path.dirname(filePath))) {
-      fs.mkdirSync(path.dirname(filePath), { recursive: true });
-    }
-
-    const template = isTypeScriptProject() ?
-      `${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> {}
-  async updated(model: ${modelName || 'any'}): Promise<void> {}
-  async saving(model: ${modelName || 'any'}): Promise<void> {}
-  async saved(model: ${modelName || 'any'}): Promise<void> {}
-  async deleting(model: ${modelName || 'any'}): Promise<void> {}
-  async deleted(model: ${modelName || 'any'}): Promise<void> {}
-}
-` :
-      `${modelName ? `const ${modelName} = require('../models/${modelName}');\n\n` : ''}class ${className}Observer {
-  async creating(model) {}
-  async created(model) {}
-  async updating(model) {}
-  async updated(model) {}
-  async saving(model) {}
-  async saved(model) {}
-  async deleting(model) {}
-  async deleted(model) {}
-}
-
-module.exports = ${className}Observer;
-`;
-
-    fs.writeFileSync(filePath, template);
-    console.log(`Created observer: observers/${fileName}`);
-
-    if (modelName) {
-      console.log(`Observer configured for model: ${modelName}`);
-    }
-  },
-
-  async 'make:cast'(name) {
-    if (!name) {
-      console.error('Cast name is required');
-      process.exit(1);
-    }
-
-    const className = toPascalCase(name.replace('Cast', ''));
-    const fileName = `${className}Cast${getFileExtension()}`;
-    const filePath = path.join(process.cwd(), 'casts', fileName);
-
-    if (!fs.existsSync(path.dirname(filePath))) {
-      fs.mkdirSync(path.dirname(filePath), { recursive: true });
-    }
-
-    const template = isTypeScriptProject() ?
-      `import { CustomCast } from 'ilana-orm/orm/Model.js';
-
-export default class ${className}Cast implements CustomCast {
-  get(value: any): any {
-    return value;
-  }
-
-  set(value: any): any {
-    return value;
-  }
-}
-` :
-      `class ${className}Cast {
-  get(value) {
-    return value;
-  }
-
-  set(value) {
-    return value;
-  }
-}
-
-module.exports = ${className}Cast;
-`;
-
-    fs.writeFileSync(filePath, template);
-    console.log(`Created cast: casts/${fileName}`);
-  },
-
   help() {
     console.log(`
 Ilana ORM CLI
@@ -1039,13 +715,6 @@ Available commands:
     -mfs                     Generate model + migration + factory + seeder
   
   make:migration <name>        Create a new migration file
-  migrate [connection]         Run all pending migrations
-  migrate:rollback [steps] [connection]  Rollback the last batch of migrations
-  migrate:reset [connection]   Rollback all migrations
-  migrate:refresh [connection] Reset and re-run all migrations
-  migrate:status [connection]  Show migration status
-  seed [name]                  Run database seeders
-  db:seed [name]               Alias for seed command
   help                         Show this help message
 
 Examples:
@@ -1056,10 +725,6 @@ Examples:
   ilana make:model Permission --all
   ilana make:model UserPost --pivot
   ilana make:migration create_users_table
-  ilana migrate
-  ilana migrate mysql
-  ilana migrate:rollback 2 postgres
-  ilana seed UserSeeder
 `);
   }
 };

package/orm/CustomCasts.mjs

@@ -0,0 +1,7 @@
+// CustomCasts.mjs - ES Module wrapper
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
+const CustomCasts = require('./CustomCasts.js');
+
+export const { MoneyCast, EncryptedCast, JsonCast, ArrayCast, DateCast } = CustomCasts;

package/orm/MigrationRunner.js

@@ -7,19 +7,27 @@ let config = {};
 
 // Auto-load configuration on first import
 (async function autoLoadConfig() {
-  const configPath = path.join(process.cwd(), 'ilana.config.js');
-  if (fs.existsSync(configPath)) {
-    delete require.cache[configPath];
+  const configPathJs = path.join(process.cwd(), 'ilana.config.js');
+  const configPathMjs = path.join(process.cwd(), 'ilana.config.mjs');
+  
+  // Try .mjs first (ES modules)
+  if (fs.existsSync(configPathMjs)) {
+    try {
+      const configModule = await import(configPathMjs);
+      config = configModule.default || configModule;
+    } catch (error) {
+      console.error('Error loading ilana.config.mjs:', error.message);
+    }
+  }
+  // Try .js (CommonJS)
+  else if (fs.existsSync(configPathJs)) {
+    delete require.cache[configPathJs];
     try {
-      config = require(configPath) || {}; // Config file handles Database.configure()
+      config = require(configPathJs) || {};
     } catch (error) {
       if (error.code === 'ERR_REQUIRE_ESM') {
-        // Handle ES modules
-        const configModule = await import(configPath);
+        const configModule = await import(configPathJs);
         config = configModule.default || configModule;
-        if (typeof config.configure === 'function') {
-          config.configure(config);
-        }
       } else {
         throw error;
       }
@@ -347,7 +355,7 @@ class MigrationRunner {
 
     if (isCreate || name.includes('create_')) {
       return isTS ?
-        `import SchemaBuilder from 'ilana-orm/database/schema-builder';
+        `import type { SchemaBuilder } from 'ilana-orm';
 
 export default class ${className} {
   // connection = 'mysql'; // Uncomment to use specific connection
@@ -364,7 +372,7 @@ export default class ${className} {
   }
 }
 ` :
-        `const SchemaBuilder = require('ilana-orm/database/schema-builder');
+        `const { SchemaBuilder } = require('ilana-orm');
 
 class ${className} {
   // connection = 'mysql'; // Uncomment to use specific connection
@@ -385,7 +393,7 @@ module.exports = ${className};
 `;
     } else if (tableName) {
       return isTS ?
-        `import SchemaBuilder from 'ilana-orm/database/schema-builder';
+        `import type { SchemaBuilder } from 'ilana-orm';
 
 export default class ${className} {
   // connection = 'mysql'; // Uncomment to use specific connection
@@ -405,7 +413,7 @@ export default class ${className} {
   }
 }
 ` :
-        `const SchemaBuilder = require('ilana-orm/database/schema-builder');
+        `const { SchemaBuilder } = require('ilana-orm');
 
 class ${className} {
   // connection = 'mysql'; // Uncomment to use specific connection
@@ -430,7 +438,7 @@ module.exports = ${className};
     }
 
     return isTS ?
-      `import SchemaBuilder from 'ilana-orm/database/schema-builder';
+      `import type { SchemaBuilder } from 'ilana-orm';
 
 export default class ${className} {
   // connection = 'mysql'; // Uncomment to use specific connection
@@ -444,7 +452,7 @@ export default class ${className} {
   }
 }
 ` :
-      `const SchemaBuilder = require('ilana-orm/database/schema-builder');
+      `const { SchemaBuilder } = require('ilana-orm');
 
 class ${className} {
   // connection = 'mysql'; // Uncomment to use specific connection

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilana-orm",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "A fully-featured, Eloquent-style ORM for Node.js with TypeScript support",
   "main": "index.js",
   "types": "index.d.ts",
@@ -25,6 +25,11 @@
       "require": "./orm/Collection.js",
       "types": "./orm/Collection.d.ts"
     },
+    "./orm/CustomCasts": {
+      "import": "./orm/CustomCasts.mjs",
+      "require": "./orm/CustomCasts.js",
+      "types": "./orm/CustomCasts.d.ts"
+    },
     "./database/connection": {
       "import": "./database/connection.mjs",
       "require": "./database/connection.js",
@@ -105,4 +110,4 @@
   "engines": {
     "node": ">=16.0.0"
   }
-}
+}