@tstdl/base 0.92.57 → 0.92.59

package/orm/server/database-schema.js

@@ -1,4 +1,4 @@
-import { getEnumName } from '../../enumeration/enumeration.js';
+import { isDefined } from '../../utils/type-guards.js';
 import { getDrizzleTableFromType, getPgEnum, registerEnum } from './drizzle/schema-converter.js';
 export class DatabaseSchema {
     name;
@@ -8,8 +8,10 @@ export class DatabaseSchema {
     getTable(type) {
         return getDrizzleTableFromType(type, this.name);
     }
-    getEnum(enumeration, name = getEnumName(enumeration)) {
-        registerEnum(enumeration, name);
+    getEnum(enumeration, name) {
+        if (isDefined(name)) {
+            registerEnum(enumeration, name);
+        }
         return getPgEnum(this.name, enumeration); // eslint-disable-line @typescript-eslint/no-unsafe-return
     }
 }

package/orm/server/drizzle/schema-converter.js

@@ -1,6 +1,7 @@
 import { toCamelCase, toSnakeCase } from 'drizzle-orm/casing';
 import { boolean, date, doublePrecision, index, integer, jsonb, pgSchema, text, timestamp, unique, uniqueIndex, uuid } from 'drizzle-orm/pg-core';
 import { MultiKeyMap } from '../../../data-structures/multi-key-map.js';
+import { tryGetEnumName } from '../../../enumeration/enumeration.js';
 import { NotSupportedError } from '../../../errors/not-supported.error.js';
 import { JsonPath } from '../../../json-path/json-path.js';
 import { reflectionRegistry } from '../../../reflection/registry.js';
@@ -198,7 +199,7 @@ export function registerEnum(enumeration, name) {
 }
 export function getPgEnum(schema, enumeration, context) {
     const dbSchema = isString(schema) ? getDbSchema(schema) : schema;
-    const enumName = enumNames.get(enumeration);
+    const enumName = enumNames.get(enumeration) ?? tryGetEnumName(enumeration);
     if (isUndefined(enumName)) {
         if (isDefined(context)) {
             throw new Error(`Enum is not registered. (type: ${context.type.name}, property: ${context.property})`);
@@ -207,7 +208,7 @@ export function getPgEnum(schema, enumeration, context) {
     }
     const values = (isArray(enumeration) ? enumeration : enumValues(enumeration))
         .map((value) => value.toString());
-    const dbEnum = dbSchema.enum(enumName, values);
+    const dbEnum = dbSchema.enum(toSnakeCase(enumName), values);
     if (enums.has([dbSchema.schemaName, enumeration])) {
         enums.set([dbSchema.schemaName, enumeration], dbEnum);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.92.57",
+  "version": "0.92.59",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"