@tstdl/base 0.92.52 → 0.92.54

package/authentication/server/authentication.service.js

@@ -96,24 +96,26 @@ let AuthenticationService = class AuthenticationService {
         const actualSubject = await this.resolveSubject(subject);
         const now = currentTimestamp();
         const end = now + this.refreshTokenTimeToLive;
-        const session = await this.sessionRepository.insert({
-            subject: actualSubject,
-            begin: now,
-            end,
-            refreshTokenHashVersion: 0,
-            refreshTokenSalt: new Uint8Array(),
-            refreshTokenHash: new Uint8Array()
-        });
-        const tokenPayload = await this.authenticationAncillaryService?.getTokenPayload(actualSubject, authenticationData, { action: GetTokenPayloadContextAction.GetToken });
-        const { token, jsonToken } = await this.createToken({ additionalTokenPayload: tokenPayload, subject: actualSubject, impersonator, sessionId: session.id, refreshTokenExpiration: end, timestamp: now });
-        const refreshToken = await this.createRefreshToken(actualSubject, session.id, end, { impersonator });
-        await this.sessionRepository.update(session.id, {
-            end,
-            refreshTokenHashVersion: 1,
-            refreshTokenSalt: refreshToken.salt,
-            refreshTokenHash: refreshToken.hash
+        return this.sessionRepository.transaction(async (sessionRepository) => {
+            const session = await sessionRepository.insert({
+                subject: actualSubject,
+                begin: now,
+                end,
+                refreshTokenHashVersion: 0,
+                refreshTokenSalt: new Uint8Array(),
+                refreshTokenHash: new Uint8Array()
+            });
+            const tokenPayload = await this.authenticationAncillaryService?.getTokenPayload(actualSubject, authenticationData, { action: GetTokenPayloadContextAction.GetToken });
+            const { token, jsonToken } = await this.createToken({ additionalTokenPayload: tokenPayload, subject: actualSubject, impersonator, sessionId: session.id, refreshTokenExpiration: end, timestamp: now });
+            const refreshToken = await this.createRefreshToken(actualSubject, session.id, end, { impersonator });
+            await sessionRepository.update(session.id, {
+                end,
+                refreshTokenHashVersion: 1,
+                refreshTokenSalt: refreshToken.salt,
+                refreshTokenHash: refreshToken.hash
+            });
+            return { token, jsonToken, refreshToken: refreshToken.token };
         });
-        return { token, jsonToken, refreshToken: refreshToken.token };
     }
     async endSession(sessionId) {
         const now = currentTimestamp();

package/document-management/models/document-property.model.d.ts

@@ -1,10 +1,12 @@
+import { type EnumType } from '../../enumeration/enumeration.js';
 import { Entity } from '../../orm/entity.js';
-export declare enum DocumentPropertyDataType {
-    Text = 0,
-    Integer = 1,
-    Decimal = 2,
-    Boolean = 3
-}
+export declare const DocumentPropertyDataType: {
+    readonly Text: "text";
+    readonly Integer: "integer";
+    readonly Decimal: "decimal";
+    readonly Boolean: "boolean";
+};
+export type DocumentPropertyDataType = EnumType<typeof DocumentPropertyDataType>;
 export declare class DocumentProperty extends Entity {
     label: string;
     dataType: DocumentPropertyDataType;

package/document-management/models/document-property.model.js

@@ -7,15 +7,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+import { defineEnum } from '../../enumeration/enumeration.js';
 import { Entity } from '../../orm/entity.js';
 import { Enumeration, StringProperty } from '../../schema/index.js';
-export var DocumentPropertyDataType;
-(function (DocumentPropertyDataType) {
-    DocumentPropertyDataType[DocumentPropertyDataType["Text"] = 0] = "Text";
-    DocumentPropertyDataType[DocumentPropertyDataType["Integer"] = 1] = "Integer";
-    DocumentPropertyDataType[DocumentPropertyDataType["Decimal"] = 2] = "Decimal";
-    DocumentPropertyDataType[DocumentPropertyDataType["Boolean"] = 3] = "Boolean";
-})(DocumentPropertyDataType || (DocumentPropertyDataType = {}));
+export const DocumentPropertyDataType = defineEnum('DocumentPropertyDataType', {
+    Text: 'text',
+    Integer: 'integer',
+    Decimal: 'decimal',
+    Boolean: 'boolean'
+});
 export class DocumentProperty extends Entity {
     label;
     dataType;
@@ -26,5 +26,5 @@ __decorate([
 ], DocumentProperty.prototype, "label", void 0);
 __decorate([
     Enumeration(DocumentPropertyDataType),
-    __metadata("design:type", Number)
+    __metadata("design:type", String)
 ], DocumentProperty.prototype, "dataType", void 0);

package/document-management/models/schemas.d.ts

@@ -13,7 +13,7 @@ import { DocumentTypeProperty } from './document-type-property.model.js';
 import { DocumentType } from './document-type.model.js';
 import { Document } from './document.model.js';
 export declare const documentManagementSchema: import("../../orm/server/database-schema.js").DatabaseSchema<"document_management">;
-export declare const dataType: import("drizzle-orm/pg-core").PgEnum<["0", "1", "3", "2"]>;
+export declare const dataType: import("drizzle-orm/pg-core").PgEnum<["boolean", "decimal", "text", "integer"]>;
 export declare const documentCategory: import("../../orm/server/drizzle/schema-converter.js").PgTableFromType<"document_management", typeof DocumentCategory>;
 export declare const documentCollectionDocument: import("../../orm/server/drizzle/schema-converter.js").PgTableFromType<"document_management", typeof DocumentCollectionDocument>;
 export declare const documentCollection: import("../../orm/server/drizzle/schema-converter.js").PgTableFromType<"document_management", typeof DocumentCollection>;

package/document-management/server/services/document-management.service.js

@@ -371,6 +371,6 @@ const validators = {
 function validatePropertyValue(propertyId, dataType, value) {
     const valid = validators[dataType](value);
     if (!valid) {
-        throw new BadRequestError(`Invalid value for data type ${DocumentPropertyDataType[dataType]} for property ${propertyId}.`);
+        throw new BadRequestError(`Invalid value for data type ${dataType} for property ${propertyId}.`);
     }
 }

package/orm/server/database-schema.d.ts

@@ -1,11 +1,11 @@
 import type { PgEnum } from 'drizzle-orm/pg-core';
 import type { Enumeration, EnumerationValue, UnionToTuple } from '../../types.js';
-import { type PgTableFromType } from './drizzle/schema-converter.js';
 import type { EntityType } from '../entity.js';
+import { type PgTableFromType } from './drizzle/schema-converter.js';
 export declare class DatabaseSchema<Name extends string> {
     readonly name: Name;
     constructor(name: Name);
     getTable<T extends EntityType>(type: T): PgTableFromType<Name, T>;
-    getEnum<T extends Enumeration>(enumeration: T, name: string): PgEnum<UnionToTuple<`${EnumerationValue<T>}`> extends [string, ...string[]] ? UnionToTuple<`${EnumerationValue<T>}`> : never>;
+    getEnum<T extends Enumeration>(enumeration: T, name?: string): PgEnum<UnionToTuple<`${EnumerationValue<T>}`> extends [string, ...string[]] ? UnionToTuple<`${EnumerationValue<T>}`> : never>;
 }
 export declare function databaseSchema<Name extends string>(name: Name): DatabaseSchema<Name>;

package/orm/server/database-schema.js

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

package/orm/server/repository.d.ts

@@ -30,6 +30,7 @@ export declare class EntityRepositoryConfig {
     schema: string;
 }
 export type TransactionHandler<T extends Entity, R> = (repository: EntityRepository<T>, transaction: Transaction) => Promise<R>;
+export declare const ENTITY_TYPE: import("../../injector/token.js").InjectionToken<EntityType<any>, never>;
 export declare class EntityRepository<T extends Entity = Entity> implements Resolvable<EntityType<T>> {
     #private;
     readonly type: EntityType<T>;
@@ -38,7 +39,6 @@ export declare class EntityRepository<T extends Entity = Entity> implements Reso
     readonly columnDefinitionsMap: Map<string, ColumnDefinition>;
     readonly session: Database | PgTransaction;
     readonly isInTransaction: boolean;
-    get tx(): PgTransaction;
     readonly [resolveArgumentType]: EntityType<T>;
     constructor(type?: EntityType<T>, table?: PgTableFromType<string, EntityType>, columnDefinitions?: ColumnDefinition[], columnDefinitionsMap?: Map<string, ColumnDefinition>, session?: Database | PgTransaction);
     withOptionalTransaction(transaction: Transaction | undefined): EntityRepository<T>;
@@ -109,5 +109,5 @@ export declare class EntityRepository<T extends Entity = Entity> implements Reso
     protected getAttributesUpdate(attributes: EntityMetadataAttributes | undefined): SQL<unknown> | undefined;
 }
 export declare function injectRepository<T extends Entity>(type: EntityType<T>): EntityRepository<T>;
-export declare function getRepository<T extends Entity>(type: EntityType<T>, config: EntityRepositoryConfig): Type<EntityRepository<T>>;
+export declare function getRepository<T extends Entity>(type: EntityType<T>, config?: EntityRepositoryConfig): Type<EntityRepository<T>>;
 export {};

package/orm/server/repository.js

@@ -14,6 +14,7 @@ import { NotFoundError } from '../../errors/not-found.error.js';
 import { Singleton } from '../../injector/decorators.js';
 import { inject, injectArgument } from '../../injector/inject.js';
 import { resolveArgumentType } from '../../injector/interfaces.js';
+import { injectionToken } from '../../injector/token.js';
 import { Schema } from '../../schema/schema.js';
 import { toArray } from '../../utils/array/array.js';
 import { fromDeepObjectEntries } from '../../utils/object/object.js';
@@ -26,6 +27,7 @@ export const repositoryType = Symbol('repositoryType');
 export class EntityRepositoryConfig {
     schema;
 }
+export const ENTITY_TYPE = injectionToken('EntityType');
 const TRANSACTION_TIMESTAMP = sql `transaction_timestamp()`;
 let EntityRepository = class EntityRepository {
     #repositoryConstructor;
@@ -36,12 +38,9 @@ let EntityRepository = class EntityRepository {
     columnDefinitionsMap;
     session;
     isInTransaction;
-    get tx() {
-        return this.session;
-    }
     constructor(type, table, columnDefinitions, columnDefinitionsMap, session) {
         this.#repositoryConstructor = new.target;
-        this.type = type ?? injectArgument(this);
+        this.type = type ?? injectArgument(this, { optional: true }) ?? inject(ENTITY_TYPE);
         this.table = table ?? getDrizzleTableFromType(this.type, inject(EntityRepositoryConfig).schema);
         this.columnDefinitions = columnDefinitions ?? getColumnDefinitions(this.table);
         this.columnDefinitionsMap = columnDefinitionsMap ?? new Map(this.columnDefinitions.map((column) => [column.objectPath.path, column]));
@@ -425,7 +424,7 @@ export function getRepository(type, config) {
         [className]: class extends EntityRepository {
         }
     }[className];
-    const injectorDecorator = Singleton({ providers: [{ provide: EntityRepositoryConfig, useValue: config }] });
+    const injectorDecorator = Singleton({ providers: [{ provide: ENTITY_TYPE, useValue: type }, { provide: EntityRepositoryConfig, useValue: config }] });
     injectorDecorator(entityRepositoryClass);
     return entityRepositoryClass;
 }

package/package.json

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