metal-orm 1.1.24 → 1.1.25

package/src/core/dialect/postgres/upsert.ts

@@ -0,0 +1,43 @@
+import type { CompilerContext } from '../abstract.js';
+import type { InsertQueryNode } from '../../ast/query.js';
+import type {
+  UpsertCompilationServices,
+  UpsertStrategy
+} from '../base/upsert-strategy.js';
+
+export class PostgresUpsertStrategy implements UpsertStrategy {
+  compile(
+    ast: InsertQueryNode,
+    ctx: CompilerContext,
+    services: UpsertCompilationServices
+  ): string {
+    if (!ast.onConflict) return '';
+
+    const clause = ast.onConflict;
+    const target = clause.target.constraint
+      ? ` ON CONFLICT ON CONSTRAINT ${services.quoteIdentifier(clause.target.constraint)}`
+      : (() => {
+          if (!clause.target.columns.length) {
+            throw new Error('PostgreSQL ON CONFLICT requires conflict columns or a constraint name.');
+          }
+          const columns = clause.target.columns
+            .map(column => services.quoteIdentifier(column.name))
+            .join(', ');
+          return ` ON CONFLICT (${columns})`;
+        })();
+
+    if (clause.action.type === 'DoNothing') {
+      return `${target} DO NOTHING`;
+    }
+
+    if (!clause.action.set.length) {
+      throw new Error('PostgreSQL ON CONFLICT DO UPDATE requires at least one assignment.');
+    }
+
+    const assignments = services.compileUpdateAssignments(clause.action.set, ast.into, ctx);
+    const where = clause.action.where
+      ? ` WHERE ${services.compileExpression(clause.action.where, ctx)}`
+      : '';
+    return `${target} DO UPDATE SET ${assignments}${where}`;
+  }
+}

package/src/core/dialect/sqlite/index.ts

@@ -1,19 +1,22 @@
-import { CompilerContext } from '../abstract.js';
-import { JsonPathNode, ColumnNode, BitwiseExpressionNode } from '../../ast/expression.js';
-import { InsertQueryNode, TableNode } from '../../ast/query.js';
+import type { BitwiseExpressionNode, ColumnNode, JsonPathNode } from '../../ast/expression.js';
+import type { TableNode } from '../../ast/query.js';
 import { SqlDialectBase } from '../base/sql-dialect.js';
 import { SqliteFunctionStrategy } from './functions.js';
+import { SqliteReturningStrategy } from './returning.js';
+import { SqliteUpsertStrategy } from './upsert.js';
 
-/**
- * SQLite dialect implementation
- */
+/** SQLite dialect assembled from reusable compiler components. */
 export class SqliteDialect extends SqlDialectBase {
   protected readonly dialect = 'sqlite';
-  /**
-   * Creates a new SqliteDialect instance
-   */
+
   public constructor() {
-    super(new SqliteFunctionStrategy());
+    super({
+      functionStrategy: new SqliteFunctionStrategy(),
+      returningStrategy: new SqliteReturningStrategy(),
+      upsertStrategy: new SqliteUpsertStrategy(),
+      supportsDmlReturning: true
+    });
+
     this.registerExpressionCompiler('BitwiseExpression', (node: BitwiseExpressionNode, ctx) => {
       const left = this.compileOperand(node.left, ctx);
       const right = this.compileOperand(node.right, ctx);
@@ -32,75 +35,17 @@ export class SqliteDialect extends SqlDialectBase {
     });
   }
 
-  /**
-   * Quotes an identifier using SQLite double-quote syntax
-   * @param id - Identifier to quote
-   * @returns Quoted identifier
-   */
   quoteIdentifier(id: string): string {
     return `"${id}"`;
   }
 
-  /**
-   * Compiles JSON path expression using SQLite syntax
-   * @param node - JSON path node
-   * @returns SQLite JSON path expression
-   */
   protected compileJsonPath(node: JsonPathNode): string {
-    const col = `${this.quoteIdentifier(node.column.table)}.${this.quoteIdentifier(node.column.name)}`;
-    // SQLite uses json_extract(col, '$.path')
-    return `json_extract(${col}, '${node.path}')`;
+    const column = `${this.quoteIdentifier(node.column.table)}.${this.quoteIdentifier(node.column.name)}`;
+    return `json_extract(${column}, '${node.path}')`;
   }
 
   protected compileQualifiedColumn(column: ColumnNode, _table: TableNode): string {
     void _table;
     return this.quoteIdentifier(column.name);
   }
-
-  protected compileReturning(returning: ColumnNode[] | undefined, ctx: CompilerContext): string {
-    void ctx;
-    if (!returning || returning.length === 0) return '';
-    const columns = this.formatReturningColumns(returning);
-    return ` RETURNING ${columns}`;
-  }
-
-  protected formatReturningColumns(returning: ColumnNode[]): string {
-    return returning
-      .map(column => {
-        const alias = column.alias ? ` AS ${this.quoteIdentifier(column.alias)}` : '';
-        return `${this.quoteIdentifier(column.name)}${alias}`;
-      })
-      .join(', ');
-  }
-
-  protected compileUpsertClause(ast: InsertQueryNode, ctx: CompilerContext): string {
-    if (!ast.onConflict) return '';
-
-    const clause = ast.onConflict;
-    if (clause.target.constraint) {
-      throw new Error('SQLite ON CONFLICT does not support named constraints.');
-    }
-    this.ensureConflictColumns(clause, 'SQLite ON CONFLICT requires conflict columns.');
-
-    const cols = clause.target.columns.map(col => this.quoteIdentifier(col.name)).join(', ');
-    const target = ` ON CONFLICT (${cols})`;
-
-    if (clause.action.type === 'DoNothing') {
-      return `${target} DO NOTHING`;
-    }
-
-    if (!clause.action.set.length) {
-      throw new Error('SQLite ON CONFLICT DO UPDATE requires at least one assignment.');
-    }
-
-    const assignments = this.compileUpdateAssignments(clause.action.set, ast.into, ctx);
-    const where = clause.action.where
-      ? ` WHERE ${this.compileExpression(clause.action.where, ctx)}`
-      : '';
-    return `${target} DO UPDATE SET ${assignments}${where}`;
-  }
-
-  supportsDmlReturningClause(): boolean {
-    return true;
-  }
 }

package/src/core/dialect/sqlite/returning.ts

@@ -0,0 +1,30 @@
+import type { ColumnNode } from '../../ast/expression.js';
+import type { CompilerContext } from '../abstract.js';
+import type {
+  QuoteIdentifier,
+  ReturningStrategy
+} from '../base/returning-strategy.js';
+
+export class SqliteReturningStrategy implements ReturningStrategy {
+  compileReturning(
+    returning: ColumnNode[] | undefined,
+    _ctx: CompilerContext,
+    quoteIdentifier: QuoteIdentifier
+  ): string {
+    void _ctx;
+    if (!returning || returning.length === 0) return '';
+    return ` RETURNING ${this.formatReturningColumns(returning, quoteIdentifier)}`;
+  }
+
+  formatReturningColumns(
+    returning: ColumnNode[],
+    quoteIdentifier: QuoteIdentifier
+  ): string {
+    return returning
+      .map(column => {
+        const alias = column.alias ? ` AS ${quoteIdentifier(column.alias)}` : '';
+        return `${quoteIdentifier(column.name)}${alias}`;
+      })
+      .join(', ');
+  }
+}

package/src/core/dialect/sqlite/upsert.ts

@@ -0,0 +1,43 @@
+import type { CompilerContext } from '../abstract.js';
+import type { InsertQueryNode } from '../../ast/query.js';
+import type {
+  UpsertCompilationServices,
+  UpsertStrategy
+} from '../base/upsert-strategy.js';
+
+export class SqliteUpsertStrategy implements UpsertStrategy {
+  compile(
+    ast: InsertQueryNode,
+    ctx: CompilerContext,
+    services: UpsertCompilationServices
+  ): string {
+    if (!ast.onConflict) return '';
+
+    const clause = ast.onConflict;
+    if (clause.target.constraint) {
+      throw new Error('SQLite ON CONFLICT does not support named constraints.');
+    }
+    if (!clause.target.columns.length) {
+      throw new Error('SQLite ON CONFLICT requires conflict columns.');
+    }
+
+    const columns = clause.target.columns
+      .map(column => services.quoteIdentifier(column.name))
+      .join(', ');
+    const target = ` ON CONFLICT (${columns})`;
+
+    if (clause.action.type === 'DoNothing') {
+      return `${target} DO NOTHING`;
+    }
+
+    if (!clause.action.set.length) {
+      throw new Error('SQLite ON CONFLICT DO UPDATE requires at least one assignment.');
+    }
+
+    const assignments = services.compileUpdateAssignments(clause.action.set, ast.into, ctx);
+    const where = clause.action.where
+      ? ` WHERE ${services.compileExpression(clause.action.where, ctx)}`
+      : '';
+    return `${target} DO UPDATE SET ${assignments}${where}`;
+  }
+}

package/src/index.ts

@@ -20,16 +20,37 @@ export * from './core/hydration/types.js';
 export * from './core/dialect/abstract.js';
 export * from './core/dialect/dialect-factory.js';
 export * from './core/dialect/capabilities/procedure-compiler.js';
+export * from './core/dialect/base/sql-dialect.js';
+export * from './core/dialect/base/sql-compiler-set.js';
+export * from './core/dialect/base/upsert-strategy.js';
+export * from './core/dialect/base/returning-strategy.js';
+export * from './core/dialect/base/pagination-strategy.js';
 export * from './core/dialect/base/standard-sql-services.js';
 export * from './core/dialect/base/standard-sql-source-compiler.js';
 export * from './core/dialect/base/standard-select-compiler.js';
 export * from './core/dialect/base/standard-insert-compiler.js';
 export * from './core/dialect/base/standard-update-compiler.js';
 export * from './core/dialect/base/standard-delete-compiler.js';
+export * from './core/functions/table-types.js';
+export * from './core/functions/standard-table-strategy.js';
 export * from './core/dialect/mysql/index.js';
+export * from './core/dialect/mysql/upsert.js';
+export * from './core/dialect/mysql/procedure-compiler.js';
 export * from './core/dialect/mssql/index.js';
+export * from './core/dialect/mssql/compiler-factory.js';
+export * from './core/dialect/mssql/select-compiler.js';
+export * from './core/dialect/mssql/insert-compiler.js';
+export * from './core/dialect/mssql/update-compiler.js';
+export * from './core/dialect/mssql/delete-compiler.js';
+export * from './core/dialect/mssql/output.js';
+export * from './core/dialect/mssql/procedure-compiler.js';
 export * from './core/dialect/sqlite/index.js';
+export * from './core/dialect/sqlite/upsert.js';
+export * from './core/dialect/sqlite/returning.js';
 export * from './core/dialect/postgres/index.js';
+export * from './core/dialect/postgres/upsert.js';
+export * from './core/dialect/postgres/returning.js';
+export * from './core/dialect/postgres/procedure-compiler.js';
 export * from './core/ddl/schema-generator.js';
 export * from './core/ddl/schema-types.js';
 export * from './core/ddl/schema-diff.js';
@@ -71,7 +92,7 @@ export * from './orm/jsonify.js';
 export * from './orm/save-graph-types.js';
 export * from './decorators/index.js';
 
-// NEW: execution abstraction + helpers
+// Execution abstraction + helpers
 export * from './core/execution/db-executor.js';
 export * from './core/execution/pooling/pool-types.js';
 export * from './core/execution/pooling/pool.js';
@@ -81,17 +102,8 @@ export * from './core/execution/executors/sqlite-executor.js';
 export * from './core/execution/executors/better-sqlite3-executor.js';
 export * from './core/execution/executors/mssql-executor.js';
 
-// NEW: first-class pooling integration
 export * from './orm/pooled-executor-factory.js';
-
-// DTO module for REST API integration
 export * from './dto/index.js';
-
-// Tree behavior (Nested Set / MPTT)
 export * from './tree/index.js';
-
-// Cache module
 export * from './cache/index.js';
-
-// Bulk operations module
 export * from './bulk/index.js';