@mantiq/database 0.5.7 → 0.5.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mantiq/database",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "description": "Query builder, ORM, migrations, seeders, factories — with SQLite, Postgres, MySQL and MongoDB support",
   "type": "module",
   "license": "MIT",

package/src/DatabaseServiceProvider.ts

@@ -3,37 +3,25 @@ import { Model } from './orm/Model.ts'
 
 export const DATABASE_MANAGER = Symbol('DatabaseManager')
 
-/**
- * Minimal service provider integration — provides a factory function
- * so @mantiq/database can be used without @mantiq/core if needed.
- *
- * When using with @mantiq/core, extend ServiceProvider and register
- * DatabaseManager as a singleton with your application's config.
- *
- * @example — with @mantiq/core:
- * ```ts
- * import { ServiceProvider } from '@mantiq/core'
- * import { DatabaseManager, Model } from '@mantiq/database'
- *
- * export class DatabaseServiceProvider extends ServiceProvider {
- *   register(): void {
- *     this.app.singleton(DatabaseManager, () => {
- *       const config = this.app.make('config').get('database')
- *       const manager = new DatabaseManager(config)
- *       Model.setConnection(manager.connection())
- *       return manager
- *     })
- *   }
- * }
- * ```
- */
+/** Set the global DatabaseManager reference. */
+export function setManager(manager: DatabaseManager): void {
+  ;(globalThis as any).__mantiq_db_manager = manager
+}
+
+/** Get the global DatabaseManager. */
+export function getManager(): DatabaseManager | undefined {
+  return (globalThis as any).__mantiq_db_manager
+}
+
+/** Set the default connection on all Models. */
+export function setupModels(manager: DatabaseManager, connectionName?: string): void {
+  Model.setConnection(manager.connection(connectionName))
+}
+
+/** Factory function for standalone use (without service provider). */
 export function createDatabaseManager(config: {
   default?: string
   connections: Record<string, any>
 }): DatabaseManager {
   return new DatabaseManager(config)
 }
-
-export function setupModels(manager: DatabaseManager, connectionName?: string): void {
-  Model.setConnection(manager.connection(connectionName))
-}

package/src/orm/Model.ts

@@ -96,7 +96,7 @@ export abstract class Model {
     const conn = this.connection
     if (!conn) throw new Error(`No connection set on model ${this.table}. Call Model.setConnection() first.`)
 
-    const tableName = this.table || snakeCase(this.name)
+    const tableName = this.table || pluralize(snakeCase(this.name))
     const builder = new ModelQueryBuilder<T>(
       conn,
       tableName,
@@ -443,7 +443,7 @@ export abstract class Model {
     // saving (cancellable)
     if (await this.fireModelEvent('saving') === false) return this
 
-    const table = ctor.table || snakeCase(ctor.name)
+    const table = ctor.table || pluralize(snakeCase(ctor.name))
     const now = new Date()
 
     if (this._exists) {
@@ -497,7 +497,7 @@ export abstract class Model {
     // deleting (cancellable)
     if (await this.fireModelEvent('deleting') === false) return false
 
-    const table = ctor.table || snakeCase(ctor.name)
+    const table = ctor.table || pluralize(snakeCase(ctor.name))
 
     if (ctor.softDelete) {
       await ctor.connection.table(table)
@@ -522,7 +522,7 @@ export abstract class Model {
     // forceDeleting (cancellable)
     if (await this.fireModelEvent('forceDeleting') === false) return false
 
-    const table = ctor.table || snakeCase(ctor.name)
+    const table = ctor.table || pluralize(snakeCase(ctor.name))
     await ctor.connection.table(table).where(ctor.primaryKey, this.getKey()).delete()
     this._exists = false
 
@@ -537,7 +537,7 @@ export abstract class Model {
     // restoring (cancellable)
     if (await this.fireModelEvent('restoring') === false) return false
 
-    const table = ctor.table || snakeCase(ctor.name)
+    const table = ctor.table || pluralize(snakeCase(ctor.name))
     await ctor.connection.table(table)
       .where(ctor.primaryKey, this.getKey())
       .update({ [ctor.softDeleteColumn]: null })
@@ -786,3 +786,13 @@ function snakeCase(name: string): string {
     .replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2')
     .toLowerCase()
 }
+
+/** Simple English pluralization for table name derivation. */
+function pluralize(word: string): string {
+  if (word.endsWith('ss') || word.endsWith('sh') || word.endsWith('ch') || word.endsWith('x') || word.endsWith('z')) return word + 'es'
+  if (word.endsWith('y') && !/[aeiou]y$/i.test(word)) return word.slice(0, -1) + 'ies'
+  if (word.endsWith('fe')) return word.slice(0, -2) + 'ves'
+  if (word.endsWith('f')) return word.slice(0, -1) + 'ves'
+  if (word.endsWith('s')) return word
+  return word + 's'
+}