@magnet-cms/adapter-db-drizzle 2.0.0 → 3.0.0

package/dist/index.js

@@ -1,12 +1,12 @@
 import { __commonJS, __name, __require, __toESM, __export } from './chunk-AAIPPTI5.js';
 import 'reflect-metadata';
-import { QueryBuilder, DatabaseAdapter, getModelToken, setDatabaseAdapter, getSchemaOptions, Model, DatabaseError, fromDrizzleError, DocumentNotFoundError } from '@magnet-cms/common';
+import { QueryBuilder, DatabaseAdapter, getModelToken, setDatabaseAdapter, registerDatabaseAdapterSingletonForFeature, Model, DatabaseError, fromDrizzleError, DocumentNotFoundError, getSchemaOptions } from '@magnet-cms/common';
 import { Logger, Module, Injectable, Inject } from '@nestjs/common';
-import { createHash, randomUUID } from 'node:crypto';
-import { toSnakeCase, toCamelCase, pluralize } from '@magnet-cms/utils';
 import { and, or, eq, desc, asc, sql, isNotNull, isNull, ilike, like, notInArray, inArray, lte, lt, gte, gt, ne } from 'drizzle-orm';
-import { getTableConfig, varchar, timestamp, uuid, pgTable, uniqueIndex, index, text, doublePrecision, boolean, jsonb } from 'drizzle-orm/pg-core';
 import { drizzle } from 'drizzle-orm/node-postgres';
+import { getTableConfig, varchar, timestamp, uuid, pgTable, uniqueIndex, index, text, doublePrecision, boolean, jsonb } from 'drizzle-orm/pg-core';
+import { createHash, randomUUID } from 'node:crypto';
+import { toSnakeCase, toCamelCase, pluralize } from '@magnet-cms/utils';
 import { readdir, mkdir, writeFile, readFile } from 'node:fs/promises';
 import { join } from 'node:path';
 
@@ -5249,189 +5249,19 @@ var require_lib2 = __commonJS({
   }
 });
 
-// src/decorators/schema.decorator.ts
-var DRIZZLE_SCHEMA_KEY = "drizzle:schema";
-function Schema(options) {
-  return (target) => {
-    Reflect.defineMetadata(DRIZZLE_SCHEMA_KEY, {
-      name: target.name,
-      tableName: `${target.name.toLowerCase()}s`,
-      i18n: options?.i18n ?? true,
-      versioning: options?.versioning ?? true
-    }, target);
-  };
-}
-__name(Schema, "Schema");
-function getDrizzleSchemaMetadata(target) {
-  return Reflect.getMetadata(DRIZZLE_SCHEMA_KEY, target) || null;
-}
-__name(getDrizzleSchemaMetadata, "getDrizzleSchemaMetadata");
-
-// src/decorators/prop.decorator.ts
-var DRIZZLE_PROPS_KEY = "drizzle:props";
-function Prop(options) {
-  return (target, propertyKey) => {
-    const existingProps = Reflect.getMetadata(DRIZZLE_PROPS_KEY, target.constructor) || /* @__PURE__ */ new Map();
-    existingProps.set(propertyKey, {
-      ...options,
-      type: options?.type || Reflect.getMetadata("design:type", target, propertyKey)
-    });
-    Reflect.defineMetadata(DRIZZLE_PROPS_KEY, existingProps, target.constructor);
-  };
-}
-__name(Prop, "Prop");
-function getDrizzlePropsMetadata(target) {
-  return Reflect.getMetadata(DRIZZLE_PROPS_KEY, target) || /* @__PURE__ */ new Map();
-}
-__name(getDrizzlePropsMetadata, "getDrizzlePropsMetadata");
-function InjectModel(schema) {
-  return Inject(getModelToken(schema));
-}
-__name(InjectModel, "InjectModel");
-var DOCUMENT_STATUS = {
-  DRAFT: "draft",
-  PUBLISHED: "published",
-  ARCHIVED: "archived"
-};
-var DEFAULT_LOCALE = "en";
-function applyDocumentColumns(options) {
-  const columns = {};
-  if (options.hasI18n || options.hasVersioning) {
-    columns.documentId = varchar("document_id", {
-      length: 36
-    }).notNull();
-    columns.locale = varchar("locale", {
-      length: 10
-    }).notNull().default(DEFAULT_LOCALE);
-    columns.status = varchar("status", {
-      length: 20
-    }).notNull().default(DOCUMENT_STATUS.DRAFT);
-    columns.publishedAt = timestamp("published_at");
-  }
-  return columns;
-}
-__name(applyDocumentColumns, "applyDocumentColumns");
-function isDraft(record) {
-  return record.status === DOCUMENT_STATUS.DRAFT;
-}
-__name(isDraft, "isDraft");
-function isPublished(record) {
-  return record.status === DOCUMENT_STATUS.PUBLISHED;
-}
-__name(isPublished, "isPublished");
-
-// src/schema/schema.generator.ts
-var schemaRegistry = /* @__PURE__ */ new Map();
-function getOrGenerateSchema(schemaClass) {
-  const className = schemaClass.name;
-  if (schemaRegistry.has(className)) {
-    return schemaRegistry.get(className);
-  }
-  const generated = generateSchema(schemaClass);
-  schemaRegistry.set(className, generated);
-  return generated;
-}
-__name(getOrGenerateSchema, "getOrGenerateSchema");
-function generateSchema(schemaClass) {
-  const schemaOptions = getSchemaOptions(schemaClass);
-  const propsMetadata = getDrizzlePropsMetadata(schemaClass);
-  const tableName = pluralize(schemaClass.name.toLowerCase());
-  const hasI18n = schemaOptions.i18n !== false;
-  const hasVersioning = schemaOptions.versioning !== false;
-  let hasIntlProps = false;
-  propsMetadata.forEach((options) => {
-    if (options.intl) {
-      hasIntlProps = true;
-    }
-  });
-  const columns = {
-    // Primary key - always UUID
-    // $defaultFn generates UUIDs in JS (works on all dialects: PostgreSQL, MySQL, SQLite)
-    // Note: SQL .default(gen_random_uuid()) is intentionally omitted because it conflicts
-    // with $defaultFn when using pg-core types on non-PostgreSQL drivers.
-    // The createTableFromConfig() method adds dialect-appropriate SQL DEFAULT for direct inserts.
-    id: uuid("id").primaryKey().$defaultFn(() => randomUUID())
-  };
-  if (hasI18n || hasVersioning || hasIntlProps) {
-    const docOptions = {
-      hasI18n: hasI18n || hasIntlProps,
-      hasVersioning
-    };
-    Object.assign(columns, applyDocumentColumns(docOptions));
-  }
-  propsMetadata.forEach((options, propertyKey) => {
-    const columnName = String(propertyKey);
-    const column = generateColumn(columnName, options);
-    if (column) {
-      columns[columnName] = column;
-    }
-  });
-  columns.createdAt = timestamp("created_at").notNull();
-  columns.updatedAt = timestamp("updated_at").notNull();
-  const table = pgTable(tableName, columns, (table2) => {
-    const tableIndexes = {};
-    const t = table2;
-    if (hasI18n || hasIntlProps) {
-      tableIndexes.documentLocaleStatusIdx = uniqueIndex(`${tableName}_document_locale_status_idx`).on(t.documentId, t.locale, t.status);
-      tableIndexes.documentLocaleIdx = index(`${tableName}_document_locale_idx`).on(t.documentId, t.locale);
-      tableIndexes.statusLocaleIdx = index(`${tableName}_status_locale_idx`).on(t.status, t.locale);
-    }
-    propsMetadata.forEach((options, propertyKey) => {
-      if (options.unique) {
-        const columnName = String(propertyKey);
-        if (hasI18n || hasIntlProps) {
-          const whereCondition = and(eq(t.locale, "en"), eq(t.status, "draft"));
-          tableIndexes[`${columnName}UniqueI18n`] = uniqueIndex(`${tableName}_${columnName}_unique_i18n`).on(t[columnName]).where(whereCondition);
-        } else {
-          tableIndexes[`${columnName}Unique`] = uniqueIndex(`${tableName}_${columnName}_unique`).on(t[columnName]);
-        }
-      }
-    });
-    return tableIndexes;
-  });
-  return {
-    table,
-    tableName
-  };
-}
-__name(generateSchema, "generateSchema");
-function generateColumn(columnName, options) {
-  const snakeCaseName = toSnakeCase(columnName);
-  let column;
-  const type = options.type;
-  if (type === String || type === void 0) {
-    column = text(snakeCaseName);
-  } else if (type === Number) {
-    column = doublePrecision(snakeCaseName);
-  } else if (type === Boolean) {
-    column = boolean(snakeCaseName);
-  } else if (type === Date) {
-    column = timestamp(snakeCaseName);
-  } else if (Array.isArray(type) || type === Array) {
-    column = jsonb(snakeCaseName);
-  } else if (typeof type === "object") {
-    column = jsonb(snakeCaseName);
-  } else if (options.ref) {
-    column = uuid(snakeCaseName);
-  } else {
-    column = text(snakeCaseName);
-  }
-  if (options.default !== void 0) {
-    if (Array.isArray(options.default) && options.default.length === 0) ; else {
-      column = column.default(options.default);
-    }
-  }
-  return column;
-}
-__name(generateColumn, "generateColumn");
-function getRegisteredSchemas() {
-  return schemaRegistry;
-}
-__name(getRegisteredSchemas, "getRegisteredSchemas");
-function clearSchemaRegistry() {
-  schemaRegistry.clear();
-}
-__name(clearSchemaRegistry, "clearSchemaRegistry");
+// ../../../node_modules/pg/esm/index.mjs
+var import_lib = __toESM(require_lib2(), 1);
+import_lib.default.Client;
+var Pool = import_lib.default.Pool;
+import_lib.default.Connection;
+import_lib.default.types;
+import_lib.default.Query;
+import_lib.default.DatabaseError;
+import_lib.default.escapeIdentifier;
+import_lib.default.escapeLiteral;
+import_lib.default.Result;
+import_lib.default.TypeOverrides;
+import_lib.default.defaults;
 
 // src/dialects/neon.ts
 async function createNeonConnection(config) {
@@ -5475,19 +5305,23 @@ async function createNeonWebSocketConnection(config) {
 }
 __name(createNeonWebSocketConnection, "createNeonWebSocketConnection");
 
-// ../../../node_modules/pg/esm/index.mjs
-var import_lib = __toESM(require_lib2(), 1);
-import_lib.default.Client;
-var Pool = import_lib.default.Pool;
-import_lib.default.Connection;
-import_lib.default.types;
-import_lib.default.Query;
-import_lib.default.DatabaseError;
-import_lib.default.escapeIdentifier;
-import_lib.default.escapeLiteral;
-import_lib.default.Result;
-import_lib.default.TypeOverrides;
-import_lib.default.defaults;
+// src/decorators/prop.decorator.ts
+var DRIZZLE_PROPS_KEY = "drizzle:props";
+function Prop(options) {
+  return (target, propertyKey) => {
+    const existingProps = Reflect.getMetadata(DRIZZLE_PROPS_KEY, target.constructor) || /* @__PURE__ */ new Map();
+    existingProps.set(propertyKey, {
+      ...options,
+      type: options?.type || Reflect.getMetadata("design:type", target, propertyKey)
+    });
+    Reflect.defineMetadata(DRIZZLE_PROPS_KEY, existingProps, target.constructor);
+  };
+}
+__name(Prop, "Prop");
+function getDrizzlePropsMetadata(target) {
+  return Reflect.getMetadata(DRIZZLE_PROPS_KEY, target) || /* @__PURE__ */ new Map();
+}
+__name(getDrizzlePropsMetadata, "getDrizzlePropsMetadata");
 var LazyQueryBuilder = class extends QueryBuilder {
   static {
     __name(this, "LazyQueryBuilder");
@@ -5910,6 +5744,37 @@ var DrizzleQueryBuilder = class extends QueryBuilder {
     return result;
   }
 };
+var DOCUMENT_STATUS = {
+  DRAFT: "draft",
+  PUBLISHED: "published",
+  ARCHIVED: "archived"
+};
+var DEFAULT_LOCALE = "en";
+function applyDocumentColumns(options) {
+  const columns = {};
+  if (options.hasI18n || options.hasVersioning) {
+    columns.documentId = varchar("document_id", {
+      length: 36
+    }).notNull();
+    columns.locale = varchar("locale", {
+      length: 10
+    }).notNull().default(DEFAULT_LOCALE);
+    columns.status = varchar("status", {
+      length: 20
+    }).notNull().default(DOCUMENT_STATUS.DRAFT);
+    columns.publishedAt = timestamp("published_at");
+  }
+  return columns;
+}
+__name(applyDocumentColumns, "applyDocumentColumns");
+function isDraft(record) {
+  return record.status === DOCUMENT_STATUS.DRAFT;
+}
+__name(isDraft, "isDraft");
+function isPublished(record) {
+  return record.status === DOCUMENT_STATUS.PUBLISHED;
+}
+__name(isPublished, "isPublished");
 
 // src/drizzle.model.ts
 function isSQLiteDriver(db) {
@@ -6863,6 +6728,119 @@ var MigrationRunner = class {
     };
   }
 };
+var schemaRegistry = /* @__PURE__ */ new Map();
+function getOrGenerateSchema(schemaClass) {
+  const className = schemaClass.name;
+  if (schemaRegistry.has(className)) {
+    return schemaRegistry.get(className);
+  }
+  const generated = generateSchema(schemaClass);
+  schemaRegistry.set(className, generated);
+  return generated;
+}
+__name(getOrGenerateSchema, "getOrGenerateSchema");
+function generateSchema(schemaClass) {
+  const schemaOptions = getSchemaOptions(schemaClass);
+  const propsMetadata = getDrizzlePropsMetadata(schemaClass);
+  const tableName = pluralize(schemaClass.name.toLowerCase());
+  const hasI18n = schemaOptions.i18n !== false;
+  const hasVersioning = schemaOptions.versioning !== false;
+  let hasIntlProps = false;
+  propsMetadata.forEach((options) => {
+    if (options.intl) {
+      hasIntlProps = true;
+    }
+  });
+  const columns = {
+    // Primary key - always UUID
+    // $defaultFn generates UUIDs in JS (works on all dialects: PostgreSQL, MySQL, SQLite)
+    // Note: SQL .default(gen_random_uuid()) is intentionally omitted because it conflicts
+    // with $defaultFn when using pg-core types on non-PostgreSQL drivers.
+    // The createTableFromConfig() method adds dialect-appropriate SQL DEFAULT for direct inserts.
+    id: uuid("id").primaryKey().$defaultFn(() => randomUUID())
+  };
+  if (hasI18n || hasVersioning || hasIntlProps) {
+    const docOptions = {
+      hasI18n: hasI18n || hasIntlProps,
+      hasVersioning
+    };
+    Object.assign(columns, applyDocumentColumns(docOptions));
+  }
+  propsMetadata.forEach((options, propertyKey) => {
+    const columnName = String(propertyKey);
+    const column = generateColumn(columnName, options);
+    if (column) {
+      columns[columnName] = column;
+    }
+  });
+  columns.createdAt = timestamp("created_at").notNull();
+  columns.updatedAt = timestamp("updated_at").notNull();
+  const table = pgTable(tableName, columns, (table2) => {
+    const tableIndexes = {};
+    const t = table2;
+    if (hasI18n || hasIntlProps) {
+      tableIndexes.documentLocaleStatusIdx = uniqueIndex(`${tableName}_document_locale_status_idx`).on(t.documentId, t.locale, t.status);
+      tableIndexes.documentLocaleIdx = index(`${tableName}_document_locale_idx`).on(t.documentId, t.locale);
+      tableIndexes.statusLocaleIdx = index(`${tableName}_status_locale_idx`).on(t.status, t.locale);
+    }
+    propsMetadata.forEach((options, propertyKey) => {
+      if (options.unique) {
+        const columnName = String(propertyKey);
+        if (hasI18n || hasIntlProps) {
+          const whereCondition = and(eq(t.locale, "en"), eq(t.status, "draft"));
+          tableIndexes[`${columnName}UniqueI18n`] = uniqueIndex(`${tableName}_${columnName}_unique_i18n`).on(t[columnName]).where(whereCondition);
+        } else {
+          tableIndexes[`${columnName}Unique`] = uniqueIndex(`${tableName}_${columnName}_unique`).on(t[columnName]);
+        }
+      }
+    });
+    return tableIndexes;
+  });
+  return {
+    table,
+    tableName
+  };
+}
+__name(generateSchema, "generateSchema");
+function generateColumn(columnName, options) {
+  const snakeCaseName = toSnakeCase(columnName);
+  let column;
+  const type = options.type;
+  if (type === String || type === void 0) {
+    column = text(snakeCaseName);
+  } else if (type === Number) {
+    column = doublePrecision(snakeCaseName);
+  } else if (type === Boolean) {
+    column = boolean(snakeCaseName);
+  } else if (type === Date) {
+    column = timestamp(snakeCaseName);
+  } else if (Array.isArray(type) || type === Array) {
+    column = jsonb(snakeCaseName);
+  } else if (typeof type === "object") {
+    column = jsonb(snakeCaseName);
+  } else if (options.ref) {
+    column = uuid(snakeCaseName);
+  } else {
+    column = text(snakeCaseName);
+  }
+  if (options.default !== void 0) {
+    if (Array.isArray(options.default) && options.default.length === 0) ; else {
+      column = column.default(options.default);
+    }
+  }
+  return column;
+}
+__name(generateColumn, "generateColumn");
+function getRegisteredSchemas() {
+  return schemaRegistry;
+}
+__name(getRegisteredSchemas, "getRegisteredSchemas");
+function clearSchemaRegistry() {
+  schemaRegistry.clear();
+}
+__name(clearSchemaRegistry, "clearSchemaRegistry");
+
+// src/migrations/schema-bridge.ts
 function sanitizeExecutableMigrationSql(dialect, statement) {
   if (dialect !== "postgresql") return statement;
   if (!statement.includes("$")) return statement;
@@ -7766,6 +7744,28 @@ DrizzleDatabaseAdapter = _ts_decorate([
 ], DrizzleDatabaseAdapter);
 var Adapter = DrizzleDatabaseAdapter.getInstance();
 
+// src/decorators/schema.decorator.ts
+var DRIZZLE_SCHEMA_KEY = "drizzle:schema";
+function Schema(options) {
+  return (target) => {
+    Reflect.defineMetadata(DRIZZLE_SCHEMA_KEY, {
+      name: target.name,
+      tableName: `${target.name.toLowerCase()}s`,
+      i18n: options?.i18n ?? true,
+      versioning: options?.versioning ?? true
+    }, target);
+  };
+}
+__name(Schema, "Schema");
+function getDrizzleSchemaMetadata(target) {
+  return Reflect.getMetadata(DRIZZLE_SCHEMA_KEY, target) || null;
+}
+__name(getDrizzleSchemaMetadata, "getDrizzleSchemaMetadata");
+function InjectModel(schema) {
+  return Inject(getModelToken(schema));
+}
+__name(InjectModel, "InjectModel");
+
 // src/migrations/sql-generators/index.ts
 var sql_generators_exports = {};
 __export(sql_generators_exports, {
@@ -7930,5 +7930,6 @@ __name(dropIndex3, "dropIndex");
 
 // src/index.ts
 setDatabaseAdapter("drizzle");
+registerDatabaseAdapterSingletonForFeature(() => DrizzleDatabaseAdapter.getInstance());
 
 export { Adapter, AutoMigration, DEFAULT_LOCALE, DEFAULT_MIGRATION_CONFIG, DOCUMENT_STATUS, DRIZZLE_CONFIG, DRIZZLE_DB, DrizzleDatabaseAdapter, DrizzleQueryBuilder, InjectModel, LazyQueryBuilder, MigrationChecksumError, MigrationError, MigrationGenerator, MigrationHistory, MigrationLock, MigrationLockError, MigrationRunner, Prop, SNAPSHOT_FILENAME, Schema, SchemaBridge, SchemaDiff, applyDocumentColumns, clearSchemaRegistry, createNeonConnection, createNeonWebSocketConnection, generateSchema, getDrizzleModelToken, getDrizzlePropsMetadata, getDrizzleSchemaMetadata, getOrGenerateSchema, getRegisteredSchemas, isDraft, isPublished, sanitizeExecutableMigrationSql, sql_generators_exports as sqlGenerators };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magnet-cms/adapter-db-drizzle",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Drizzle ORM database adapter for Magnet CMS - supports PostgreSQL, MySQL, and SQLite",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -42,7 +42,7 @@
     "reflect-metadata": "0.2.2"
   },
   "peerDependencies": {
-    "@magnet-cms/common": "^0.2.0",
+    "@magnet-cms/common": "^0.3.0",
     "@magnet-cms/utils": "^0.1.1",
     "@nestjs/common": "^11.1.12",
     "drizzle-orm": "^0.38.0",