@tstdl/base 0.92.56 → 0.92.58

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})`);

package/orm/types.d.ts

@@ -3,7 +3,7 @@ import type { boolean, date, doublePrecision, integer, jsonb, PgColumnBuilder, P
 import { Array, Integer } from '../schema/index.js';
 import type { AbstractConstructor, EnumerationObject, EnumerationValue, ObjectLiteral, UnionToTuple } from '../types.js';
 import type { GetTagMetadata, HasTag, Tagged, UnwrapTagged } from '../types/index.js';
-import { Column, Embedded, Index, PrimaryKey, References, Unique } from './decorators.js';
+import { Column, Embedded, Encrypted, Index, PrimaryKey, References, Unique } from './decorators.js';
 import { Json, NumericDate, Timestamp, Uuid } from './schemas/index.js';
 import type { bytea } from './server/data-types/index.js';
 export type ColumnTypeTag = 'column';
@@ -27,4 +27,4 @@ export type NumericDate = Tagged<number, ColumnTypeTag, ReturnType<typeof date>>
 export type Timestamp = Tagged<number, ColumnTypeTag, ReturnType<typeof timestamp>>;
 export type Bytea = Tagged<Uint8Array, ColumnTypeTag, ReturnType<typeof bytea>>;
 export type Encrypted<T> = Tagged<T, ColumnTypeTag, ReturnType<typeof bytea>>;
-export { Array, Column, Embedded, Index, Integer, Json, NumericDate, PrimaryKey, References, Timestamp, Unique, Uuid };
+export { Array, Column, Embedded, Encrypted, Index, Integer, Json, NumericDate, PrimaryKey, References, Timestamp, Unique, Uuid };

package/orm/types.js

@@ -1,4 +1,4 @@
 import { Array, Integer } from '../schema/index.js';
-import { Column, Embedded, Index, PrimaryKey, References, Unique } from './decorators.js';
+import { Column, Embedded, Encrypted, Index, PrimaryKey, References, Unique } from './decorators.js';
 import { Json, NumericDate, Timestamp, Uuid } from './schemas/index.js';
-export { Array, Column, Embedded, Index, Integer, Json, NumericDate, PrimaryKey, References, Timestamp, Unique, Uuid };
+export { Array, Column, Embedded, Encrypted, Index, Integer, Json, NumericDate, PrimaryKey, References, Timestamp, Unique, Uuid };

package/package.json

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