ilana-orm 1.0.5 → 1.0.7

package/README.md

@@ -150,10 +150,13 @@ touch ilana.config.js
 
 ### 2. Configure Database
 
-Create `ilana.config.js` in your project root:
+**For CommonJS projects**, create `ilana.config.js` in your project root:
+
+**For ES Module projects** (with `"type": "module"` in package.json), create `ilana.config.mjs`:
 
 ```javascript
-module.exports = {
+// ilana.config.mjs
+export default {
   default: "sqlite",
 
   connections: {
@@ -212,11 +215,18 @@ This creates:
 
 ### 4. Define the Model
 
-**JavaScript:**
+**JavaScript (CommonJS):**
 
 ```javascript
 // models/User.js
 const Model = require("ilana-orm/orm/Model");
+```
+
+**JavaScript (ES Modules):**
+
+```javascript
+// models/User.js
+import Model from "ilana-orm/orm/Model";
 
 class User extends Model {
   static table = "users";
@@ -246,7 +256,8 @@ class User extends Model {
   }
 }
 
-module.exports = User;
+export default User; // For ES modules
+// module.exports = User; // For CommonJS
 ```
 
 **TypeScript (auto-generated when `tsconfig.json` detected):**
@@ -294,8 +305,14 @@ npx ilana migrate
 
 ### 6. Start Using the Model
 
+**CommonJS:**
 ```javascript
 const User = require("./models/User");
+```
+
+**ES Modules:**
+```javascript
+import User from "./models/User.js";
 
 // Create user
 const user = await User.create({

package/cli/ilana.js

@@ -31,26 +31,39 @@ const defaultConfig = {
 
 // Load configuration and auto-initialize
 async function loadConfig() {
-  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);
+      const config = configModule.default || configModule;
+      return config;
+    } catch (error) {
+      console.error('Error loading ilana.config.mjs:', error.message);
+      process.exit(1);
+    }
+  }
+  
+  // Try .js (CommonJS)
+  if (fs.existsSync(configPathJs)) {
+    delete require.cache[configPathJs];
     try {
-      const config = require(configPath);
-      // Config file already initializes database
+      const config = require(configPathJs);
       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;
+        console.error('Found ilana.config.js but project uses ES modules. Rename to ilana.config.mjs');
+        process.exit(1);
       } 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.');
+  
+  // No config file found
+  console.error('No ilana.config.js or ilana.config.mjs found. Run "npx ilana setup" first.');
   process.exit(1);
 }
 
@@ -130,9 +143,11 @@ function generateModel(name, options = {}) {
 }
 
 function getModelTemplate(className, tableName) {
+  const isESModule = isESModuleProject();
+  
   if (isTypeScriptProject()) {
-    return `import Model from 'ilana-orm/orm/Model.js';
-// import { MoneyCast, EncryptedCast } from 'ilana-orm/orm/CustomCasts.js';
+    return `import Model from 'ilana-orm/orm/Model';
+// import { MoneyCast, EncryptedCast } from 'ilana-orm/orm/CustomCasts';
 
 export default class ${className} extends Model {
   protected static table = '${tableName}';
@@ -175,6 +190,53 @@ export default class ${className} extends Model {
 `;
   }
   
+  if (isESModule) {
+    return `import Model from 'ilana-orm/orm/Model';
+// import { MoneyCast, EncryptedCast } from 'ilana-orm/orm/CustomCasts';
+
+class ${className} extends Model {
+  static table = '${tableName}';
+  static timestamps = true;
+  static softDeletes = false;
+  
+  // For UUID primary keys, uncomment:
+  // static keyType = 'string';
+  // static incrementing = false;
+
+  fillable = [];
+  hidden = [];
+  appends = [];
+  casts = {
+    // Basic casts
+    // is_active: 'boolean',
+    // metadata: 'json',
+    // tags: 'array',
+    
+    // Custom casts
+    // price: new MoneyCast(),
+    // secret: new EncryptedCast('your-key'),
+  };
+
+  // Define relationships here
+  // example() {
+  //   return this.hasMany(RelatedModel, 'foreign_key');
+  // }
+
+  // Define scopes here
+  // static scopeActive(query) {
+  //   query.where('is_active', true);
+  // }
+  
+  // Register for polymorphic relationships
+  // static {
+  //   this.register();
+  // }
+}
+
+export default ${className};
+`;
+  }
+  
   return `const Model = require('ilana-orm/orm/Model');
 // const { MoneyCast, EncryptedCast } = require('ilana-orm/orm/CustomCasts');
 
@@ -222,8 +284,10 @@ module.exports = ${className};
 }
 
 function getPivotModelTemplate(className, tableName) {
+  const isESModule = isESModuleProject();
+  
   if (isTypeScriptProject()) {
-    return `import Model from 'ilana-orm/orm/Model.js';
+    return `import Model from 'ilana-orm/orm/Model';
 
 export default class ${className} extends Model {
   protected static table = '${tableName}';
@@ -236,6 +300,22 @@ export default class ${className} extends Model {
 `;
   }
   
+  if (isESModule) {
+    return `import Model from 'ilana-orm/orm/Model';
+
+class ${className} extends Model {
+  static table = '${tableName}';
+  static timestamps = true;
+  
+  fillable = [];
+
+  // Define pivot relationships here
+}
+
+export default ${className};
+`;
+  }
+  
   return `const Model = require('ilana-orm/orm/Model');
 
 class ${className} extends Model {
@@ -350,10 +430,16 @@ const commands = {
     }
 
     // Create config file if it doesn't exist
-    const configPath = 'ilana.config.js';
+    const isESModule = isESModuleProject();
+    const configPath = isESModule ? 'ilana.config.mjs' : 'ilana.config.js';
+    
     if (!fs.existsSync(configPath)) {
-      const isESModule = isESModuleProject();
       const configTemplate = isESModule ? getESModuleConfigTemplate() : getCommonJSConfigTemplate();
+      fs.writeFileSync(configPath, configTemplate);
+      console.log(`Created config file: ${configPath}`);
+    }
+  },
+};
 
 function getESModuleConfigTemplate() {
   return `import 'dotenv/config';
@@ -470,9 +556,6 @@ Database.configure(config);
 module.exports = config;
 `;
 }
-      fs.writeFileSync(configPath, configTemplate);
-      console.log(`Created config file: ${configPath}`);
-    }
 
     // Create .env file if it doesn't exist
     const envPath = '.env';

package/database/connection.mjs

@@ -0,0 +1,7 @@
+// connection.mjs - ES Module wrapper
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
+const Database = require('./connection.js');
+
+export default Database;

package/example.config.mjs

@@ -0,0 +1,44 @@
+// ilana.config.mjs - ES Module config example
+export default {
+  default: "sqlite",
+
+  connections: {
+    sqlite: {
+      client: "sqlite3",
+      connection: {
+        filename: "./database.sqlite",
+      },
+    },
+
+    mysql: {
+      client: "mysql2",
+      connection: {
+        host: "localhost",
+        port: 3306,
+        user: "your_username",
+        password: "your_password",
+        database: "your_database",
+      },
+    },
+
+    postgres: {
+      client: "pg",
+      connection: {
+        host: "localhost",
+        port: 5432,
+        user: "your_username",
+        password: "your_password",
+        database: "your_database",
+      },
+    },
+  },
+
+  migrations: {
+    directory: "./migrations",
+    tableName: "migrations",
+  },
+
+  seeds: {
+    directory: "./seeds",
+  },
+};

package/index.mjs

@@ -0,0 +1,33 @@
+// index.mjs - ES Module wrapper
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
+const exports = require('./index.js');
+
+export const {
+  Model,
+  QueryBuilder,
+  Collection,
+  Database,
+  DB,
+  SchemaBuilder,
+  MigrationRunner,
+  Seeder,
+  Factory,
+  defineFactory,
+  Relation,
+  HasOne,
+  HasMany,
+  BelongsTo,
+  BelongsToMany,
+  HasManyThrough,
+  MorphTo,
+  MorphMany,
+  MoneyCast,
+  EncryptedCast,
+  JsonCast,
+  ArrayCast,
+  DateCast
+} = exports;
+
+export default exports.Model;

package/orm/Collection.mjs

@@ -0,0 +1,7 @@
+// Collection.mjs - ES Module wrapper
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
+const Collection = require('./Collection.js');
+
+export default Collection;

package/orm/Model.js

@@ -8,10 +8,14 @@ const Database = require('../database/connection');
 (function autoLoadConfig() {
   const fs = require('fs');
   const path = require('path');
-  const configPath = path.join(process.cwd(), 'ilana.config.js');
-  if (fs.existsSync(configPath)) {
-    delete require.cache[configPath];
-    require(configPath);
+  const configPathJs = path.join(process.cwd(), 'ilana.config.js');
+  const configPathMjs = path.join(process.cwd(), 'ilana.config.mjs');
+  
+  if (fs.existsSync(configPathJs)) {
+    delete require.cache[configPathJs];
+    require(configPathJs);
+  } else if (fs.existsSync(configPathMjs)) {
+    // For ES modules, we'll handle this in the _getConfig method
   }
 })();
 
@@ -371,9 +375,19 @@ class Model {
   _getConfig() {
     try {
       const path = require('path');
-      const configPath = path.join(process.cwd(), 'ilana.config.js');
-      delete require.cache[configPath];
-      return require(configPath);
+      const fs = require('fs');
+      const configPathJs = path.join(process.cwd(), 'ilana.config.js');
+      const configPathMjs = path.join(process.cwd(), 'ilana.config.mjs');
+      
+      if (fs.existsSync(configPathJs)) {
+        delete require.cache[configPathJs];
+        return require(configPathJs);
+      } else if (fs.existsSync(configPathMjs)) {
+        // For ES modules, return a promise or handle async import
+        // For now, return null and let the caller handle it
+        return null;
+      }
+      return null;
     } catch (e) {
       return null;
     }

package/orm/Model.mjs

@@ -0,0 +1,7 @@
+// Model.mjs - ES Module wrapper
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
+const Model = require('./Model.js');
+
+export default Model;

package/orm/ModelRegistry.mjs

@@ -0,0 +1,7 @@
+// ModelRegistry.mjs - ES Module wrapper
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
+const ModelRegistry = require('./ModelRegistry.js');
+
+export default ModelRegistry;

package/orm/QueryBuilder.mjs

@@ -0,0 +1,7 @@
+// QueryBuilder.mjs - ES Module wrapper
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
+const QueryBuilder = require('./QueryBuilder.js');
+
+export default QueryBuilder;

package/orm/Relation.mjs

@@ -0,0 +1,7 @@
+// Relation.mjs - ES Module wrapper
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
+const Relations = require('./Relation.js');
+
+export const { Relation, HasOne, HasMany, BelongsTo, BelongsToMany, HasManyThrough, MorphTo, MorphMany } = Relations;

package/package.json

@@ -1,9 +1,36 @@
 {
   "name": "ilana-orm",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "A fully-featured, Eloquent-style ORM for Node.js with TypeScript support",
   "main": "index.js",
   "types": "index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./index.mjs",
+      "require": "./index.js",
+      "types": "./index.d.ts"
+    },
+    "./orm/Model": {
+      "import": "./orm/Model.mjs",
+      "require": "./orm/Model.js",
+      "types": "./orm/Model.d.ts"
+    },
+    "./orm/QueryBuilder": {
+      "import": "./orm/QueryBuilder.mjs",
+      "require": "./orm/QueryBuilder.js",
+      "types": "./orm/QueryBuilder.d.ts"
+    },
+    "./orm/Collection": {
+      "import": "./orm/Collection.mjs",
+      "require": "./orm/Collection.js",
+      "types": "./orm/Collection.d.ts"
+    },
+    "./database/connection": {
+      "import": "./database/connection.mjs",
+      "require": "./database/connection.js",
+      "types": "./database/connection.d.ts"
+    }
+  },
   "bin": {
     "ilana": "cli/ilana.js"
   },
@@ -39,11 +66,14 @@
   },
   "files": [
     "*.js",
+    "*.mjs",
     "*.d.ts",
     "cli/**/*.js",
     "database/**/*.js",
+    "database/**/*.mjs",
     "database/**/*.d.ts",
     "orm/**/*.js",
+    "orm/**/*.mjs",
     "orm/**/*.d.ts",
     "README.md",
     "LICENSE",