ilana-orm 1.0.17 → 1.0.19

package/cli/ilana.js

@@ -127,7 +127,10 @@ import Database from 'ilana-orm/database/connection.js';
 const config = {
   default: process.env.DB_CONNECTION || 'mysql',
   timezone: process.env.DB_TIMEZONE || 'UTC',
-  
+
+  // Set to true (or use process.env.NODE_ENV === 'development') to log all SQL queries
+  logging: false,
+
   connections: {
     sqlite: {
       client: 'sqlite3',
@@ -136,7 +139,7 @@ const config = {
       },
       useNullAsDefault: true
     },
-    
+
     mysql: {
       client: 'mysql2',
       connection: {
@@ -148,7 +151,7 @@ const config = {
         timezone: process.env.DB_TIMEZONE || 'UTC'
       }
     },
-    
+
     postgres: {
       client: 'pg',
       connection: {
@@ -160,12 +163,12 @@ const config = {
       }
     }
   },
-  
+
   migrations: {
     directory: './${structure.databaseDir}/migrations',
     tableName: 'migrations'
   },
-  
+
   seeds: {
     directory: './${structure.databaseDir}/seeds'
   }
@@ -186,7 +189,10 @@ const Database = require('ilana-orm/database/connection');
 const config = {
   default: process.env.DB_CONNECTION || 'mysql',
   timezone: process.env.DB_TIMEZONE || 'UTC',
-  
+
+  // Set to true (or use process.env.NODE_ENV === 'development') to log all SQL queries
+  logging: false,
+
   connections: {
     sqlite: {
       client: 'sqlite3',
@@ -195,7 +201,7 @@ const config = {
       },
       useNullAsDefault: true
     },
-    
+
     mysql: {
       client: 'mysql2',
       connection: {
@@ -207,7 +213,7 @@ const config = {
         timezone: process.env.DB_TIMEZONE || 'UTC'
       }
     },
-    
+
     postgres: {
       client: 'pg',
       connection: {
@@ -219,12 +225,12 @@ const config = {
       }
     }
   },
-  
+
   migrations: {
     directory: './${structure.databaseDir}/migrations',
     tableName: 'migrations'
   },
-  
+
   seeds: {
     directory: './${structure.databaseDir}/seeds'
   }
@@ -277,90 +283,20 @@ function getModelTemplate(className, tableName) {
 
   if (isTypeScriptProject()) {
     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}';
-  protected static timestamps = true;
-  protected static softDeletes = false;
-  
-  // For UUID primary keys, uncomment:
-  // protected static keyType = 'string' as const;
-  // protected static incrementing = false;
-
-  protected fillable: string[] = [];
-  protected hidden: string[] = [];
-  protected appends: string[] = [];
-  protected casts = {
-    // Basic casts
-    // is_active: 'boolean' as const,
-    // metadata: 'json' as const,
-    // tags: 'array' as const,
-    
-    // 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: any) {
-  //   query.where('is_active', true);
-  // }
-  
-  // Register for polymorphic relationships
-  // static {
-  //   this.register();
-  // }
+  protected static fillable: string[] = [];
 }
 `;
   }
 
   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();
-  // }
+  static fillable = [];
 }
 
 export default ${className};
@@ -368,45 +304,10 @@ export default ${className};
   }
 
   return `const Model = require('ilana-orm/orm/Model');
-// const { MoneyCast, EncryptedCast } = require('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();
-  // }
+  static fillable = [];
 }
 
 module.exports = ${className};
@@ -421,11 +322,7 @@ function getPivotModelTemplate(className, tableName) {
 
 export default class ${className} extends Model {
   protected static table = '${tableName}';
-  protected static timestamps = true;
-  
-  protected fillable: string[] = [];
-
-  // Define pivot relationships here
+  protected static fillable: string[] = [];
 }
 `;
   }
@@ -435,11 +332,7 @@ export default class ${className} extends Model {
 
 class ${className} extends Model {
   static table = '${tableName}';
-  static timestamps = true;
-  
-  fillable = [];
-
-  // Define pivot relationships here
+  static fillable = [];
 }
 
 export default ${className};
@@ -450,11 +343,7 @@ export default ${className};
 
 class ${className} extends Model {
   static table = '${tableName}';
-  static timestamps = true;
-  
-  fillable = [];
-
-  // Define pivot relationships here
+  static fillable = [];
 }
 
 module.exports = ${className};
@@ -471,29 +360,27 @@ function generateFactory(className) {
   }
 
   const modelPath = structure.hasSrc ? `../models/${className}.js` : `../../models/${className}.js`;
+  const isESModule = isESModuleProject();
   const template = isTypeScriptProject() ?
     `import { defineFactory } from 'ilana-orm/orm/Factory.js';
 import ${className} from '${modelPath}';
 
 export default defineFactory(${className}, (faker) => ({
-  // Define your factory attributes here
   // name: faker.person.fullName(),
-  // email: faker.internet.email(),
-}))
-.state('example', (faker) => ({
-  // Define state modifications here
+}));
+` : isESModule ?
+    `import { defineFactory } from 'ilana-orm/orm/Factory';
+import ${className} from '${modelPath}';
+
+export default defineFactory(${className}, (faker) => ({
+  // name: faker.person.fullName(),
 }));
 ` :
     `const { defineFactory } = require('ilana-orm/orm/Factory');
 const ${className} = require('${modelPath.replace('.js', '')}');
 
 module.exports = defineFactory(${className}, (faker) => ({
-  // Define your factory attributes here
   // name: faker.person.fullName(),
-  // email: faker.internet.email(),
-}))
-.state('example', (faker) => ({
-  // Define state modifications here
 }));
 `;
 
@@ -511,34 +398,38 @@ function generateSeeder(className) {
   }
 
   const modelPath = structure.hasSrc ? `../models/${className}.js` : `../../models/${className}.js`;
+  const isESModule = isESModuleProject();
   const template = isTypeScriptProject() ?
     `import Seeder from 'ilana-orm/orm/Seeder.js';
+import { factory } from 'ilana-orm/orm/Factory.js';
 import ${className} from '${modelPath}';
 import '../factories/${className}Factory.js';
 
 export default class ${className}Seeder extends Seeder {
   async run(): Promise<void> {
-    console.log('Seeding ${className.toLowerCase()}s...');
-
-    // Create sample data
-    await ${className}.factory().times(10).create();
+    await factory(${className}).times(10).create();
+  }
+}
+` : isESModule ?
+    `import Seeder from 'ilana-orm/orm/Seeder';
+import { factory } from 'ilana-orm/orm/Factory';
+import ${className} from '${modelPath}';
+import '../factories/${className}Factory.js';
 
-    console.log('${className}s seeded successfully');
+export default class ${className}Seeder extends Seeder {
+  async run() {
+    await factory(${className}).times(10).create();
   }
 }
 ` :
     `const Seeder = require('ilana-orm/orm/Seeder');
+const { factory } = require('ilana-orm/orm/Factory');
 const ${className} = require('${modelPath.replace('.js', '')}');
 require('../factories/${className}Factory');
 
 class ${className}Seeder extends Seeder {
   async run() {
-    console.log('Seeding ${className.toLowerCase()}s...');
-
-    // Create sample data
-    await ${className}.factory().times(10).create();
-
-    console.log('${className}s seeded successfully');
+    await factory(${className}).times(10).create();
   }
 }
 
@@ -823,13 +714,13 @@ function parseMigrationsForTable(tableName, migrationsDir) {
 
       // Match column definitions: table.string('col'), table.integer('col').nullable(), etc.
       const colRegex = new RegExp(
-        `${alias}\\.(\\w+)\\s*\\(\\s*['"]([^'"]+)['"](?:[^)]*)?\\)([^;\\n]*)`,
+        `${alias}\\.(\\w+)\\s*\\(\\s*['"]([^'"]+)['"]([^)]*)\\)([^;\\n]*)`,
         'g'
       );
 
       let colMatch;
       while ((colMatch = colRegex.exec(block)) !== null) {
-        const [, method, colName, rest] = colMatch;
+        const [, method, colName, args, rest] = colMatch;
         const knexDef = KNEX_COLUMN_MAP[method];
         if (!knexDef) continue;
 
@@ -837,7 +728,17 @@ function parseMigrationsForTable(tableName, migrationsDir) {
         const isNotNullable = /\.notNullable\(\)/.test(rest);
         const nullable = isNullable ? true : isNotNullable ? false : knexDef.nullable;
 
-        columns[colName] = { type: knexDef.type, nullable };
+        // For enum columns, extract the values array and build a union type
+        let tsType = knexDef.type;
+        if (method === 'enum') {
+          const valuesMatch = args.match(/\[([^\]]+)\]/);
+          if (valuesMatch) {
+            const values = [...valuesMatch[1].matchAll(/['"]([^'"]+)['"]/g)].map(m => `'${m[1]}'`);
+            if (values.length) tsType = values.join(' | ');
+          }
+        }
+
+        columns[colName] = { type: tsType, nullable };
       }
     }
   }
@@ -1574,4 +1475,5 @@ if (require.main === module) {
   main();
 }
 
-module.exports = commands;
+module.exports = commands;
+module.exports._templates = { getModelTemplate, getPivotModelTemplate };

package/database/connection.d.ts

@@ -2,6 +2,7 @@ import { Knex } from 'knex';
 
 export interface DatabaseConfig {
   default: string;
+  logging?: boolean;
   connections: {
     [name: string]: Knex.Config;
   };
@@ -27,6 +28,8 @@ export default class Database {
   private static _currentTransaction: Knex.Transaction | null;
 
   static configure(config: DatabaseConfig): void;
+  static enableLogging(): void;
+  static disableLogging(): void;
   static connection(name?: string): Knex;
   static getDefaultConnection(): string;
   static hasConnection(name: string): boolean;

package/database/connection.js

@@ -3,11 +3,33 @@ const knex = require('knex');
 class Database {
   static connections = new Map();
   static _currentTransaction = null;
+  static _logging = false;
+
+  static enableLogging() {
+    this._logging = true;
+  }
+
+  static disableLogging() {
+    this._logging = false;
+  }
+
+  static _log(sql, bindings, ms) {
+    if (!this._logging) return;
+    const bound = sql.replace(/\?/g, () => {
+      const val = bindings?.shift();
+      if (val === null || val === undefined) return 'NULL';
+      if (typeof val === 'string') return `'${val}'`;
+      return val;
+    });
+    const time = ms !== undefined ? ` \x1b[90m— ${ms}ms\x1b[0m` : '';
+    console.log(`\x1b[36m[IlanaORM]\x1b[0m ${bound}${time}`);
+  }
 
   static configure(config) {
     this.config = config;
     this.defaultConnection = config.default;
-    
+    if (config.logging) this._logging = true;
+
     // Initialize all configured connections
     for (const [name, connConfig] of Object.entries(config.connections)) {
       try {
@@ -21,6 +43,23 @@ class Database {
             directory: './seeds'
           }
         });
+
+        // Attach query logger
+        connection.on('query', (query) => {
+          this._queryStart = Date.now();
+          this._pendingQuery = query.sql;
+          this._pendingBindings = [...(query.bindings || [])];
+        });
+        connection.on('query-response', (response, query) => {
+          const ms = Date.now() - (this._queryStart || Date.now());
+          this._log(query.sql, [...(query.bindings || [])], ms);
+        });
+        connection.on('query-error', (error, query) => {
+          if (this._logging) {
+            console.error(`\x1b[36m[IlanaORM]\x1b[0m \x1b[31mERROR\x1b[0m ${query.sql}`);
+          }
+        });
+
         this.connections.set(name, connection);
       } catch (error) {
         if (error.code === 'MODULE_NOT_FOUND' && error.message.includes(connConfig.client)) {

package/database/schema-builder.js

@@ -207,6 +207,10 @@ class SchemaBuilder {
     return Promise.resolve();
   }
 
+  enableVectorExtension() {
+    return this.knex.raw('CREATE EXTENSION IF NOT EXISTS vector');
+  }
+
   createEnum(name, values) {
     if (this.knex.client.config.client === 'pg') {
       return this.knex.raw(`CREATE TYPE ${name} AS ENUM (${values.map(v => `'${v}'`).join(', ')})`);

package/ilana.config.js

@@ -1,4 +1,4 @@
-const Database = require('ilana/database/connection').default;
+const Database = require('./database/connection');
 
 const config = {
   default: 'sqlite',

package/index.d.ts

@@ -5,5 +5,22 @@ export { default as Database } from './database/connection';
 export * from './orm/Relation';
 export * from './orm/CustomCasts';
 
+export declare class FExpression {
+  constructor(column: string);
+  plus(n: number): any;
+  minus(n: number): any;
+  times(n: number): any;
+  divide(n: number): any;
+}
+export declare function F(column: string): FExpression;
+
+export declare class ModelNotFoundException extends Error {
+  name: 'ModelNotFoundException';
+  model: string;
+  id?: any;
+  constructor(model: string, id?: any);
+  toResponse(): { status: 404; message: string };
+}
+
 // Default export
 export { default } from './orm/Model';

package/index.edge.js

@@ -0,0 +1,10 @@
+// Edge runtime entry point — no auto-loading of ilana.config.js.
+// Use this when running in Cloudflare Workers, Deno, Bun, or Next.js edge routes.
+// You must call Database.configure(config) explicitly before using any models.
+//
+// import { Model, Database } from 'ilana-orm/edge';
+// Database.configure({ default: 'pg', connections: { pg: { ... } } });
+
+'use strict';
+global.__ILANA_EDGE__ = true;
+module.exports = require('./index.js');

package/index.edge.mjs

@@ -0,0 +1,37 @@
+// Edge runtime entry point — ESM wrapper.
+// Sets __ILANA_EDGE__ before any model is loaded so the auto-loader is skipped.
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
+globalThis.__ILANA_EDGE__ = true;
+const exports = require('./index.js');
+
+export const {
+  Model,
+  QueryBuilder,
+  Collection,
+  Database,
+  DB,
+  SchemaBuilder,
+  MigrationRunner,
+  Seeder,
+  Factory,
+  defineFactory,
+  ModelNotFoundException,
+  F,
+  HasOne,
+  HasMany,
+  BelongsTo,
+  BelongsToMany,
+  HasManyThrough,
+  MorphTo,
+  MorphOne,
+  MorphMany,
+  MoneyCast,
+  EncryptedCast,
+  JsonCast,
+  ArrayCast,
+  DateCast,
+} = exports;
+
+export default exports.Model;

package/index.js

@@ -10,6 +10,8 @@ const Seeder = require('./orm/Seeder');
 const Factory = require('./orm/Factory');
 const Relation = require('./orm/Relation');
 const CustomCasts = require('./orm/CustomCasts');
+const { ModelNotFoundException } = require('./orm/Errors');
+const { F } = require('./orm/F');
 
 module.exports = {
   Model,
@@ -22,11 +24,13 @@ module.exports = {
   Seeder,
   Factory: Factory.Factory,
   defineFactory: Factory.defineFactory,
-  
+  ModelNotFoundException,
+  F,
+
   // Relationships
   MorphOne: Relation.MorphOne,
   ...Relation,
-  
+
   // Custom Casts
   ...CustomCasts
 };

package/index.mjs

@@ -15,6 +15,8 @@ export const {
   Seeder,
   Factory,
   defineFactory,
+  ModelNotFoundException,
+  F,
   Relation,
   HasOne,
   HasMany,

package/jest.config.js

@@ -0,0 +1,4 @@
+module.exports = {
+  testEnvironment: 'node',
+  setupFiles: ['<rootDir>/tests/setup.js'],
+};

package/orm/Errors.js

@@ -0,0 +1,18 @@
+class ModelNotFoundException extends Error {
+  constructor(model, id) {
+    const message = id !== undefined
+      ? `${model} with id ${id} not found`
+      : `${model} not found`;
+    super(message);
+    this.name = 'ModelNotFoundException';
+    this.model = model;
+    this.id = id;
+    if (Error.captureStackTrace) Error.captureStackTrace(this, ModelNotFoundException);
+  }
+
+  toResponse() {
+    return { status: 404, message: this.message };
+  }
+}
+
+module.exports = { ModelNotFoundException };

package/orm/F.js

@@ -0,0 +1,22 @@
+const Database = require('../database/connection');
+
+class FExpression {
+  constructor(column) {
+    this.column = column;
+  }
+
+  _raw(op, n) {
+    return Database.raw(`?? ${op} ?`, [this.column, n]);
+  }
+
+  plus(n)   { return this._raw('+', n); }
+  minus(n)  { return this._raw('-', n); }
+  times(n)  { return this._raw('*', n); }
+  divide(n) { return this._raw('/', n); }
+}
+
+function F(column) {
+  return new FExpression(column);
+}
+
+module.exports = { F, FExpression };