ilana-orm 1.0.8 → 1.0.9

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.8",
+  "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"
   }
-}
+}