@tstdl/base 0.92.134 → 0.92.135

package/api/response.js

@@ -35,8 +35,8 @@ export function createErrorResponse(errorOrName, message = '', details) {
                     name: errorOrName.name,
                     message: errorOrName.message,
                     details,
-                    data
-                }
+                    data,
+                },
             };
         }
         else {
@@ -44,8 +44,8 @@ export function createErrorResponse(errorOrName, message = '', details) {
                 error: {
                     name: errorOrName.name,
                     message: errorOrName.message,
-                    details
-                }
+                    details,
+                },
             };
         }
     }
@@ -54,8 +54,8 @@ export function createErrorResponse(errorOrName, message = '', details) {
             error: {
                 name: errorOrName,
                 message,
-                details
-            }
+                details,
+            },
         };
     }
     return response;

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

@@ -102,7 +102,7 @@ let DocumentFileService = DocumentFileService_1 = class DocumentFileService exte
      */
     async initiateUpload({ key }) {
         const id = getRandomString(64, Alphabet.LowerUpperCaseNumbers);
-        const url = await this.#fileUploadObjectStorage.getUploadUrl(id, currentTimestamp() + (5 * millisecondsPerMinute), { metadata: { uploadKey: key } });
+        const url = await this.#fileUploadObjectStorage.getUploadUrl(id, currentTimestamp() + (5 * millisecondsPerMinute), { metadata: { 'upload-key': key } });
         return { uploadId: id, uploadUrl: url };
     }
     async create(content, originalFileName) {
@@ -110,7 +110,7 @@ let DocumentFileService = DocumentFileService_1 = class DocumentFileService exte
         if (isUpload) {
             const object = await this.#fileUploadObjectStorage.getObject(content.uploadId);
             const objectMetadata = await object.getMetadata();
-            if (content.uploadKey != objectMetadata['uploadKey']) {
+            if (content.uploadKey != objectMetadata['upload-key']) {
                 throw new ForbiddenError(`Invalid upload key`);
             }
         }
@@ -133,7 +133,7 @@ let DocumentFileService = DocumentFileService_1 = class DocumentFileService exte
                 await this.#fileUploadObjectStorage.moveObject(content.uploadId, [this.#fileObjectStorage, objectKey]);
                 return [documentFile, contentAsUint8Array];
             }
-            await this.#fileObjectStorage.uploadObject(objectKey, contentAsUint8Array);
+            await this.#fileObjectStorage.uploadObject(objectKey, contentAsUint8Array, { contentLength: contentAsUint8Array.length, contentType: mimeType });
             return documentFile;
         });
     }
@@ -209,7 +209,7 @@ let DocumentFileService = DocumentFileService_1 = class DocumentFileService exte
             })
                 .with('image/*', async () => await imageToPreview(content))
                 .otherwise(() => { throw new NotImplementedError('Preview generation is not implemented for this file type.'); });
-            await this.#filePreviewObjectStorage.uploadObject(key, image, { contentLength: image.length, metadata: { 'Content-Type': 'image/jpeg' } });
+            await this.#filePreviewObjectStorage.uploadObject(key, image, { contentLength: image.length, contentType: 'image/jpeg' });
         }
     }
     async getDocumentFileContentObjectUrl(title, file, download) {

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

@@ -93,7 +93,7 @@ let DocumentManagementAiService = DocumentManagementAiService_1 = class Document
         try {
             const document = await this.#documentRepository.load(documentId);
             const file = await this.#documentFileService.load(document.fileId);
-            const fileContentStream = this.#documentFileService.getContentStream(document.id);
+            const fileContentStream = this.#documentFileService.getContentStream(document.fileId);
             const tmpFile = __addDisposableResource(env_1, await TemporaryFile.from(fileContentStream), true);
             const filePart = await this.#aiService.processFile({ path: tmpFile.path, mimeType: file.mimeType });
             const categories = await this.#documentCategoryTypeService.loadCategoryViews();

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

@@ -6,14 +6,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { Enumerable } from '../../../enumerable/index.js';
 import { inject } from '../../../injector/index.js';
-import { getEntityMap } from '../../../orm/index.js';
 import { Transactional, injectRepository } from '../../../orm/server/index.js';
 import { distinct } from '../../../utils/array/index.js';
 import { compareByValueSelectionToOrder } from '../../../utils/comparison.js';
 import { groupToMap, groupToSingleMap } from '../../../utils/iterable-helpers/index.js';
 import { fromEntries, objectEntries } from '../../../utils/object/index.js';
-import { assertDefinedPass, isNotNull, isNotNullOrUndefined, isNull, isUndefined } from '../../../utils/type-guards.js';
-import { DocumentApproval, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentFile, DocumentRequest, DocumentRequestCollectionAssignment, DocumentRequestTemplate, DocumentRequestsTemplate, DocumentType, DocumentValidationExecution, DocumentWorkflowStep } from '../../models/index.js';
+import { assertDefinedPass, isDefined, isNotNull, isNotNullOrUndefined, isNull, isUndefined } from '../../../utils/type-guards.js';
+import { DocumentApproval, DocumentAssignmentScope, DocumentAssignmentTask, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentFile, DocumentRequest, DocumentRequestCollectionAssignment, DocumentRequestTemplate, DocumentRequestsTemplate, DocumentType, DocumentValidationExecution, DocumentWorkflowStep } from '../../models/index.js';
 import { DocumentCategoryTypeService, enumTypeKey } from './document-category-type.service.js';
 import { DocumentManagementAncillaryService } from './document-management-ancillary.service.js';
 import { DocumentPropertyService } from './document-property.service.js';
@@ -30,6 +29,8 @@ let DocumentManagementService = class DocumentManagementService extends Transact
     #documentService = inject(DocumentService);
     #documentPropertyService = inject(DocumentPropertyService);
     #documentRequestCollectionAssignmentRepository = injectRepository(DocumentRequestCollectionAssignment);
+    #documentAssignmentTaskRepository = injectRepository(DocumentAssignmentTask);
+    #documentAssignmentScopeRepository = injectRepository(DocumentAssignmentScope);
     #documentRequestRepository = injectRepository(DocumentRequest);
     #documentRequestsTemplateRepository = injectRepository(DocumentRequestsTemplate);
     #documentRequestTemplateRepository = injectRepository(DocumentRequestTemplate);
@@ -38,19 +39,25 @@ let DocumentManagementService = class DocumentManagementService extends Transact
     #documentValidationExecutionRepository = injectRepository(DocumentValidationExecution);
     async loadData(collectionIds) {
         return await this.transaction(async (tx) => {
-            const [collections, collectionsMetadataMap, documentAssignments, requestAssignments, categories, types] = await Promise.all([
+            const [collections, collectionsMetadataMap, documentCollectionAssignments, requestAssignments, assignmentScopes, categories, types] = await Promise.all([
                 this.#documentCollectionRepository.withTransaction(tx).loadMany(collectionIds),
                 this.#ancillaryService.resolveMetadataMap(...collectionIds),
                 this.#documentCollectionAssignmentRepository.withTransaction(tx).loadManyByQuery({ collectionId: { $in: collectionIds } }),
                 this.#documentRequestCollectionAssignmentRepository.withTransaction(tx).loadManyByQuery({ collectionId: { $in: collectionIds } }),
+                this.#documentAssignmentScopeRepository.withTransaction(tx).loadManyByQuery({ collectionId: { $in: collectionIds } }),
                 this.#documentCategoryRepository.withTransaction(tx).loadManyByQuery({}, { order: 'label' }),
                 this.#documentTypeRepository.withTransaction(tx).loadManyByQuery({}, { order: 'label' }),
             ]);
             const requestIds = requestAssignments.map((requestCollection) => requestCollection.requestId);
-            const requests = await this.#documentRequestRepository.withTransaction(tx).loadManyByQuery({ id: { $in: requestIds } }, { order: { 'metadata.createTimestamp': 'desc' } });
-            const assignmentDocumentIds = documentAssignments.map((assignment) => assignment.documentId);
+            const taskIds = assignmentScopes.map((scope) => scope.taskId);
+            const [requests, assignmentTasks] = await Promise.all([
+                this.#documentRequestRepository.withTransaction(tx).loadManyByQuery({ id: { $in: requestIds } }, { order: { 'metadata.createTimestamp': 'desc' } }),
+                this.#documentAssignmentTaskRepository.withTransaction(tx).loadMany(taskIds),
+            ]);
+            const assignmentDocumentIds = documentCollectionAssignments.map((assignment) => assignment.documentId);
             const requestDocumentIds = requests.map((request) => request.documentId).filter(isNotNull);
-            const documentIds = distinct([...assignmentDocumentIds, ...requestDocumentIds]);
+            const assignmentTaskDocumentIds = assignmentTasks.map((task) => task.documentId);
+            const documentIds = distinct([...assignmentDocumentIds, ...requestDocumentIds, ...assignmentTaskDocumentIds]);
             const [documents, propertyValues] = await Promise.all([
                 this.#documentService.withTransaction(tx).repository.loadManyByQuery({ id: { $in: documentIds } }, { order: { 'metadata.createTimestamp': 'desc' } }),
                 this.#documentPropertyService.withTransaction(tx).loadDocumentProperties(documentIds),
@@ -61,7 +68,6 @@ let DocumentManagementService = class DocumentManagementService extends Transact
                 this.#documentFileRepository.withTransaction(tx).loadManyByQuery({ id: { $in: documentFileIds } }, { order: { 'metadata.createTimestamp': 'desc' } }),
                 this.#documentWorkflowService.loadLatestWorkflows(workflowRelevantDocumentIds),
             ]);
-            const documentIdMap = getEntityMap(documents);
             const documentWorkflowMap = groupToSingleMap(currentWorkflows, (workflow) => workflow.documentId);
             const valuesMap = Enumerable.from(propertyValues).groupToMap((value) => value.documentId);
             const validationWorkflowIds = currentWorkflows.map((workflow) => (workflow.step == DocumentWorkflowStep.Validation) ? workflow.id : null).filter(isNotNull);
@@ -78,9 +84,16 @@ let DocumentManagementService = class DocumentManagementService extends Transact
             const documentViews = documents.map((document) => {
                 const currentWorkflow = documentWorkflowMap.get(document.id) ?? null;
                 const validations = (isNotNull(currentWorkflow) && (currentWorkflow.step == DocumentWorkflowStep.Validation)) ? workflowValidationMap.get(currentWorkflow.id) ?? [] : null;
+                const assignmentTask = assignmentTasks.find((task) => task.documentId == document.id);
+                const assignmentTaskScope = isDefined(assignmentTask) ? assignmentScopes.filter((scope) => scope.taskId == assignmentTask.id).map((scope) => scope.collectionId) : [];
                 return {
                     ...document,
-                    collectionAssignments: documentAssignments.filter((collectionDocument) => collectionDocument.documentId == document.id),
+                    assignment: {
+                        collections: documentCollectionAssignments.filter((collectionDocument) => collectionDocument.documentId == document.id),
+                        assignmentTask: isDefined(assignmentTask)
+                            ? { target: assignmentTask.target, scope: assignmentTaskScope }
+                            : null,
+                    },
                     properties: valuesMap.get(document.id) ?? [],
                     currentWorkflow,
                     validations,
@@ -88,8 +101,7 @@ let DocumentManagementService = class DocumentManagementService extends Transact
             });
             const requestViews = requests.map((request) => ({
                 ...request,
-                collectionIds: requestAssignments.filter((requestCollection) => requestCollection.requestId == request.id).map((requestCollection) => requestCollection.collectionId),
-                document: isNull(request.documentId) ? null : documentIdMap.get(request.documentId) ?? null,
+                collectionIds: requestAssignments.filter((requestCollection) => requestCollection.requestId == request.id).map((requestCollection) => requestCollection.collectionId)
             }));
             return {
                 collections: collectionViews,

package/document-management/server/services/document-workflow.service.d.ts

@@ -4,6 +4,7 @@ import { afterResolve } from '../../../injector/interfaces.js';
 import { Transactional } from '../../../orm/server/transactional.js';
 export declare class DocumentWorkflowService extends Transactional {
     #private;
+    private readonly documentService;
     readonly repository: import("../../../orm/server/repository.js").EntityRepository<DocumentWorkflow>;
     [afterResolve](_: unknown, { cancellationSignal }: AfterResolveContext<any>): void;
     loadLatestWorkflow(documentId: string): Promise<DocumentWorkflow>;

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

@@ -21,6 +21,8 @@ import { Transactional } from '../../../orm/server/transactional.js';
 import { Queue } from '../../../queue/queue.js';
 import { _throw } from '../../../utils/throw.js';
 import { isNotNull, isNull } from '../../../utils/type-guards.js';
+import { desc, inArray } from 'drizzle-orm';
+import { documentWorkflow } from '../schemas.js';
 import { DocumentCollectionService } from './document-collection.service.js';
 import { DocumentManagementAiService } from './document-management-ai.service.js';
 import { DocumentRequestService } from './document-request.service.js';
@@ -28,13 +30,13 @@ import { DocumentService } from './document.service.js';
 import { DocumentManagementSingleton } from './singleton.js';
 let DocumentWorkflowService = DocumentWorkflowService_1 = class DocumentWorkflowService extends Transactional {
     #documentManagementAiService = inject(DocumentManagementAiService);
-    #documentService = inject(DocumentService);
     #documentCollectionService = inject(DocumentCollectionService);
     #documentRequestService = inject(DocumentRequestService);
     #documentAssignmentTaskRepository = injectRepository(DocumentAssignmentTask);
     #documentAssignmentScopeRepository = injectRepository(DocumentAssignmentScope);
     #queue = inject((Queue), { name: 'DocumentWorkflow', processTimeout: 5 * 60 * 1000, maxTries: 3 });
     #logger = inject(Logger, DocumentWorkflowService_1.name);
+    documentService = inject(DocumentService, undefined, { forwardRef: true });
     repository = injectRepository(DocumentWorkflow).withSession(this.session);
     [afterResolve](_, { cancellationSignal }) {
         if (this.isInTransaction) {
@@ -49,7 +51,16 @@ let DocumentWorkflowService = DocumentWorkflowService_1 = class DocumentWorkflow
         return await this.repository.tryLoadByQuery({ documentId }, { order: { 'metadata.createTimestamp': 'desc' } });
     }
     async loadLatestWorkflows(documentIds) {
-        return await this.repository.loadManyByQuery({ documentId: { $in: documentIds } }, { distinct: ['metadata.createTimestamp', 'documentId'], order: { 'metadata.createTimestamp': 'desc' } });
+        const orderedDocumentWorkflows = this.repository.session.$with('orderedDocumentWorkflows').as((qb) => qb
+            .select()
+            .from(documentWorkflow)
+            .where(inArray(documentWorkflow.documentId, documentIds))
+            .orderBy(desc(documentWorkflow.createTimestamp)));
+        const latestWorkflows = await this.repository.session
+            .with(orderedDocumentWorkflows)
+            .selectDistinctOn([orderedDocumentWorkflows.documentId])
+            .from(orderedDocumentWorkflows);
+        return await this.repository.mapManyToEntity(latestWorkflows);
     }
     async proceedWorkflow(documentId, userId) {
         await this.transaction(async (tx) => {
@@ -104,11 +115,11 @@ let DocumentWorkflowService = DocumentWorkflowService_1 = class DocumentWorkflow
     }
     async processClassificationWorkflow(workflow) {
         const typeId = await this.#documentManagementAiService.classifyDocumentType(workflow.documentId);
-        await this.#documentService.repository.update(workflow.documentId, { typeId, approval: DocumentApproval.Pending });
+        await this.documentService.repository.update(workflow.documentId, { typeId, approval: DocumentApproval.Pending });
     }
     async processExtractionWorkflow(workflow) {
         const extraction = await this.#documentManagementAiService.extractDocumentInformation(workflow.documentId);
-        await this.#documentService.update(workflow.documentId, extraction);
+        await this.documentService.update(workflow.documentId, extraction);
     }
     async processAssignmentWorkflow(workflow) {
         const assignmentTask = await this.#documentAssignmentTaskRepository.loadByQuery({ documentId: workflow.documentId });

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

@@ -29,7 +29,7 @@ import { DocumentManagementSingleton } from './singleton.js';
 let DocumentService = DocumentService_1 = class DocumentService extends Transactional {
     #documentFileService = inject(DocumentFileService);
     #requestService = inject(DocumentRequestService);
-    #workflowService = inject(DocumentWorkflowService, undefined, { forwardRef: true });
+    #workflowService = inject(DocumentWorkflowService);
     #documentPropertyService = inject(DocumentPropertyService);
     #documentCollectionService = inject(DocumentCollectionService);
     #documentAssignmentTaskRepository = injectRepository(DocumentAssignmentTask);

package/document-management/service-models/document-management.view-model.d.ts

@@ -1,4 +1,5 @@
-import { Document, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentFile, DocumentPropertyDataType, DocumentRequest, DocumentType, DocumentValidationExecution, DocumentWorkflow } from '../models/index.js';
+import type { TypedOmit } from '../../types.js';
+import { Document, DocumentAssignmentTarget, DocumentAssignmentTask, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentFile, DocumentPropertyDataType, DocumentRequest, DocumentType, DocumentValidationExecution, DocumentWorkflow } from '../models/index.js';
 export declare class DocumentCollectionView extends DocumentCollection {
     name: string;
     group: string | null;
@@ -10,8 +11,20 @@ export declare class DocumentPropertyValueView {
     dataType: DocumentPropertyDataType;
     value: string | number | boolean | null;
 }
+export declare class DocumentCollectionAssignmentView implements TypedOmit<DocumentCollectionAssignment, 'id' | 'documentId' | 'metadata'> {
+    collectionId: string;
+    archiveTimestamp: number | null;
+}
+export declare class DocumentAssignmentTaskView implements TypedOmit<DocumentAssignmentTask, 'id' | 'documentId' | 'metadata'> {
+    target: DocumentAssignmentTarget;
+    scope: string[];
+}
+export declare class DocumentAssignmentView {
+    collections: DocumentCollectionAssignmentView[];
+    assignmentTask: DocumentAssignmentTaskView | null;
+}
 export declare class DocumentView extends Document {
-    collectionAssignments: DocumentCollectionAssignment[];
+    assignment: DocumentAssignmentView;
     properties: DocumentPropertyValueView[];
     /** available as long as the document is neither approved nor rejected */
     currentWorkflow: DocumentWorkflow | null;
@@ -19,8 +32,6 @@ export declare class DocumentView extends Document {
 }
 export declare class DocumentRequestView extends DocumentRequest {
     collectionIds: string[];
-    /** current approval-pending or approved document */
-    document: Document | null;
 }
 export declare class DocumentManagementData {
     collections: DocumentCollectionView[];

package/document-management/service-models/document-management.view-model.js

@@ -7,8 +7,8 @@ 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 { Array, Enumeration, Property, StringProperty, Union } from '../../schema/index.js';
-import { Document, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentFile, DocumentPropertyDataType, DocumentRequest, DocumentType, DocumentValidationExecution, DocumentWorkflow } from '../models/index.js';
+import { Array, Enumeration, Property, string, StringProperty, Union } from '../../schema/index.js';
+import { Document, DocumentAssignmentTarget, DocumentAssignmentTask, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentFile, DocumentPropertyDataType, DocumentRequest, DocumentType, DocumentValidationExecution, DocumentWorkflow } from '../models/index.js';
 export class DocumentCollectionView extends DocumentCollection {
     name;
     group;
@@ -48,17 +48,53 @@ __decorate([
     Union(String, Number, Boolean, { nullable: true }),
     __metadata("design:type", Object)
 ], DocumentPropertyValueView.prototype, "value", void 0);
+export class DocumentCollectionAssignmentView {
+    collectionId;
+    archiveTimestamp;
+}
+__decorate([
+    StringProperty(),
+    __metadata("design:type", String)
+], DocumentCollectionAssignmentView.prototype, "collectionId", void 0);
+__decorate([
+    StringProperty({ nullable: true }),
+    __metadata("design:type", Object)
+], DocumentCollectionAssignmentView.prototype, "archiveTimestamp", void 0);
+export class DocumentAssignmentTaskView {
+    target;
+    scope;
+}
+__decorate([
+    Enumeration(DocumentAssignmentTarget),
+    __metadata("design:type", String)
+], DocumentAssignmentTaskView.prototype, "target", void 0);
+__decorate([
+    Array(string()),
+    __metadata("design:type", Array)
+], DocumentAssignmentTaskView.prototype, "scope", void 0);
+export class DocumentAssignmentView {
+    collections;
+    assignmentTask;
+}
+__decorate([
+    Array(DocumentCollectionAssignmentView),
+    __metadata("design:type", Array)
+], DocumentAssignmentView.prototype, "collections", void 0);
+__decorate([
+    Property(DocumentAssignmentTaskView, { nullable: true }),
+    __metadata("design:type", Object)
+], DocumentAssignmentView.prototype, "assignmentTask", void 0);
 export class DocumentView extends Document {
-    collectionAssignments;
+    assignment;
     properties;
     /** available as long as the document is neither approved nor rejected */
     currentWorkflow;
     validations;
 }
 __decorate([
-    Array(DocumentCollectionAssignment),
-    __metadata("design:type", Array)
-], DocumentView.prototype, "collectionAssignments", void 0);
+    Property(DocumentAssignmentView),
+    __metadata("design:type", DocumentAssignmentView)
+], DocumentView.prototype, "assignment", void 0);
 __decorate([
     Array(DocumentPropertyValueView),
     __metadata("design:type", Array)
@@ -73,17 +109,11 @@ __decorate([
 ], DocumentView.prototype, "validations", void 0);
 export class DocumentRequestView extends DocumentRequest {
     collectionIds;
-    /** current approval-pending or approved document */
-    document;
 }
 __decorate([
     Array(String),
     __metadata("design:type", Array)
 ], DocumentRequestView.prototype, "collectionIds", void 0);
-__decorate([
-    Property(Document, { nullable: true }),
-    __metadata("design:type", Object)
-], DocumentRequestView.prototype, "document", void 0);
 export class DocumentManagementData {
     collections;
     documents;

package/document-management/service-models/enriched/enriched-document-assignment.view.d.ts

@@ -1,11 +1,20 @@
 import type { TypedOmit } from '../../../types.js';
 import type { DocumentCollectionAssignment } from '../../models/index.js';
+import type { DocumentAssignmentTaskView, DocumentAssignmentView, DocumentCollectionAssignmentView } from '../document-management.view-model.js';
 import type { EnrichedDocumentCollection } from './enriched-document-collection.view.js';
+import type { EnrichedDocumentManagementData } from './enriched-document-management-data.view.js';
 import type { EnrichedDocument } from './enriched-document.view.js';
-export declare class EnrichedDocumentAssignment implements TypedOmit<DocumentCollectionAssignment, 'collectionId' | 'documentId' | 'metadata'> {
-    readonly id: string;
-    readonly collection: EnrichedDocumentCollection;
+export declare class EnrichedDocumentCollectionAssignment implements TypedOmit<DocumentCollectionAssignment, 'id' | 'collectionId' | 'documentId' | 'metadata'> {
+    #private;
+    get collection(): EnrichedDocumentCollection;
     readonly document: EnrichedDocument;
     readonly archiveTimestamp: number | null;
-    constructor(id: string, collection: EnrichedDocumentCollection, document: EnrichedDocument, archiveTimestamp: number | null);
+    constructor(data: EnrichedDocumentManagementData, assignment: DocumentCollectionAssignmentView, document: EnrichedDocument);
+}
+export declare class EnrichedDocumentAssignment implements TypedOmit<DocumentAssignmentView, 'collections' | 'assignmentTask'> {
+    #private;
+    get collections(): EnrichedDocumentCollectionAssignment[];
+    get document(): EnrichedDocument;
+    readonly assignmentTask: DocumentAssignmentTaskView | null;
+    constructor(data: EnrichedDocumentManagementData, document: EnrichedDocument, assignment: DocumentAssignmentView);
 }

package/document-management/service-models/enriched/enriched-document-assignment.view.js

@@ -1,12 +1,34 @@
-export class EnrichedDocumentAssignment {
-    id;
-    collection;
+import { assertDefinedPass } from '../../../utils/type-guards.js';
+export class EnrichedDocumentCollectionAssignment {
+    #data;
+    #assignment;
+    get collection() {
+        return assertDefinedPass(this.#data.maps.collections.get(this.#assignment.collectionId));
+    }
     document;
     archiveTimestamp;
-    constructor(id, collection, document, archiveTimestamp) {
-        this.id = id;
-        this.collection = collection;
+    constructor(data, assignment, document) {
+        this.#data = data;
+        this.#assignment = assignment;
         this.document = document;
-        this.archiveTimestamp = archiveTimestamp;
+        this.archiveTimestamp = assignment.archiveTimestamp;
+    }
+}
+export class EnrichedDocumentAssignment {
+    #data;
+    #collections;
+    #document;
+    get collections() {
+        return this.#collections;
+    }
+    get document() {
+        return this.#document;
+    }
+    assignmentTask;
+    constructor(data, document, assignment) {
+        this.#data = data;
+        this.#document = document;
+        this.#collections = assignment.collections.map((assignment) => new EnrichedDocumentCollectionAssignment(data, assignment, document));
+        this.assignmentTask = assignment.assignmentTask;
     }
 }

package/document-management/service-models/enriched/enriched-document-collection.view.js

@@ -22,7 +22,7 @@ export class EnrichedDocumentCollection {
         return this.children.flatMap((child) => [child, ...child.childrenDeep]);
     }
     get documents() {
-        return this.#data.documents.filter((document) => document.assignments.some((assignment) => assignment.collection.id == this.id));
+        return this.#data.documents.filter((document) => document.assignments.collections.some((assignment) => assignment.collection.id == this.id));
     }
     get documentsDeep() {
         return [...this.documents, ...this.children.flatMap((child) => child.documentsDeep)];

package/document-management/service-models/enriched/enriched-document-request.view.d.ts

@@ -5,7 +5,7 @@ import type { EnrichedDocumentCollection } from './enriched-document-collection.
 import type { EnrichedDocumentManagementData } from './enriched-document-management-data.view.js';
 import type { EnrichedDocumentType } from './enriched-document-type.view.js';
 import type { EnrichedDocument } from './enriched-document.view.js';
-export declare class EnrichedDocumentRequest implements TypedOmit<DocumentRequestView, 'typeId' | 'documentId' | 'document' | 'collectionIds' | 'metadata'> {
+export declare class EnrichedDocumentRequest implements TypedOmit<DocumentRequestView, 'typeId' | 'documentId' | 'collectionIds' | 'metadata'> {
     #private;
     readonly id: string;
     readonly comment: string | null;

package/document-management/service-models/enriched/enriched-document.view.d.ts

@@ -5,7 +5,7 @@ import { EnrichedDocumentAssignment } from './enriched-document-assignment.view.
 import { EnrichedDocumentFile } from './enriched-document-file.view.js';
 import type { EnrichedDocumentManagementData } from './enriched-document-management-data.view.js';
 import type { EnrichedDocumentType } from './enriched-document-type.view.js';
-export declare class EnrichedDocument implements TypedOmit<DocumentView, 'typeId' | 'fileId' | 'collectionAssignments' | 'createUserId' | 'metadata'> {
+export declare class EnrichedDocument implements TypedOmit<DocumentView, 'typeId' | 'fileId' | 'assignment' | 'createUserId' | 'metadata'> {
     #private;
     readonly id: string;
     readonly title: string | null;
@@ -21,6 +21,6 @@ export declare class EnrichedDocument implements TypedOmit<DocumentView, 'typeId
     readonly validations: DocumentValidationExecution[] | null;
     get type(): EnrichedDocumentType | null;
     get file(): EnrichedDocumentFile;
-    get assignments(): EnrichedDocumentAssignment[];
+    get assignments(): EnrichedDocumentAssignment;
     constructor(data: EnrichedDocumentManagementData, document: DocumentView);
 }

package/document-management/service-models/enriched/enriched-document.view.js

@@ -37,11 +37,7 @@ export class EnrichedDocument {
         return new EnrichedDocumentFile(file, this);
     }
     get assignments() {
-        return this.#documentView.collectionAssignments
-            .map((assignment) => {
-            const collection = assertDefinedPass(this.#data.collections.find((collection) => collection.id == assignment.collectionId));
-            return new EnrichedDocumentAssignment(assignment.id, collection, assertDefinedPass(this.#data.documents.find((document) => document.id == this.#documentView.id)), assignment.archiveTimestamp);
-        });
+        return new EnrichedDocumentAssignment(this.#data, this, this.#documentView.assignment);
     }
     constructor(data, document) {
         this.#data = data;
@@ -72,6 +68,6 @@ __decorate([
 ], EnrichedDocument.prototype, "file", null);
 __decorate([
     Memoize(),
-    __metadata("design:type", Array),
+    __metadata("design:type", EnrichedDocumentAssignment),
     __metadata("design:paramtypes", [])
 ], EnrichedDocument.prototype, "assignments", null);

package/examples/document-management/main.js

@@ -22,6 +22,7 @@ import { configureOrm } from '../../orm/server/index.js';
 import { configurePostgresQueue, migratePostgresQueueSchema } from '../../queue/postgres/index.js';
 import { boolean, positiveInteger, string } from '../../utils/config-parser.js';
 import { TstdlCategoryParents, TstdlDocumentCategoryLabels, TstdlDocumentTypeCategories, TstdlDocumentTypeLabels } from './categories-and-types.js';
+import { configureTstdl } from '../../core.js';
 const config = {
     database: {
         host: string('DATABASE_HOST', '127.0.0.1'),
@@ -47,11 +48,12 @@ const config = {
         bucketPerModule: boolean('S3_BUCKET_PER_MODULE', true),
     },
 };
+const userId = crypto.randomUUID();
 let ExampleDocumentManagementAncillaryService = class ExampleDocumentManagementAncillaryService extends DocumentManagementAncillaryService {
     _resolveMetadata(collections) {
         return collections.map((collection) => ({ name: collection.id.split('-')[0], group: null }));
     }
-    getSubject(_token) { return 'user-id'; }
+    getSubject(_token) { return userId; }
     canCreateDocuments(_collectionId, _token) { return true; }
     canUpdateDocuments(_collectionId, _token) { return true; }
     canDeleteDocuments(_collectionId, _token) { return true; }
@@ -72,6 +74,7 @@ ExampleDocumentManagementAncillaryService = __decorate([
 export { ExampleDocumentManagementAncillaryService };
 async function bootstrap() {
     const injector = inject(Injector);
+    configureTstdl();
     configureNodeHttpServer();
     configurePostgresQueue();
     configureLocalMessageBus();

package/object-storage/object-storage.d.ts

@@ -2,6 +2,7 @@ import { resolveArgumentType, type Resolvable } from '../injector/interfaces.js'
 import type { ObjectMetadata, ObjectStorageObject } from './object.js';
 export type UploadObjectOptions = {
     contentLength?: number;
+    contentType?: string;
     metadata?: ObjectMetadata;
 };
 export type UploadUrlOptions = {

package/object-storage/s3/s3.object-storage.d.ts

@@ -13,7 +13,7 @@ export declare class S3ObjectStorage extends ObjectStorage {
     exists(key: string): Promise<boolean>;
     statObject(key: string): Promise<BucketItemStat>;
     uploadObject(key: string, content: Uint8Array | ReadableStream<Uint8Array>, options?: UploadObjectOptions): Promise<void>;
-    copyObject(sourceKey: string, destinationKey: string | [ObjectStorage, string], options?: CopyObjectOptions): Promise<void>;
+    copyObject(source: string, destination: string | [ObjectStorage, string], options?: CopyObjectOptions): Promise<void>;
     moveObject(sourceKey: string, destinationKey: string | [ObjectStorage, string], options?: MoveObjectOptions): Promise<void>;
     getContent(key: string): Promise<Uint8Array>;
     getContentStream(key: string): ReadableStream<Uint8Array>;

package/object-storage/s3/s3.object-storage.js

@@ -120,11 +120,12 @@ let S3ObjectStorage = S3ObjectStorage_1 = class S3ObjectStorage extends ObjectSt
             ]);
         }
     }
-    async copyObject(sourceKey, destinationKey, options) {
-        const sourceBucketKey = this.getBucketKey(sourceKey);
-        const destinationBucket = isString(destinationKey) ? this.bucket : assertInstanceOfPass(destinationKey[0], S3ObjectStorage_1, 'Destination storage is not an S3ObjectStorage').bucket;
-        const destinationBucketKey = isString(destinationKey) ? destinationKey : destinationKey[0].getBucketKey(destinationKey[1]);
-        const sourceObject = await this.getObject(sourceKey);
+    async copyObject(source, destination, options) {
+        const sourceBucketKey = this.getBucketKey(source);
+        const [destinationObjectStorage, destinationKey] = isString(destination) ? [this, destination] : [assertInstanceOfPass(destination[0], S3ObjectStorage_1, 'Destination storage is not an S3ObjectStorage'), destination[1]];
+        const destinationBucket = destinationObjectStorage.bucket;
+        const destinationBucketKey = destinationObjectStorage.getBucketKey(destinationKey);
+        const sourceObject = await this.getObject(source);
         const sourceMetadata = await sourceObject.getMetadata();
         await this.client.copyObject(new CopySourceOptions({ Bucket: this.bucket, Object: sourceBucketKey }), new CopyDestinationOptions({
             Bucket: destinationBucket,
@@ -202,6 +203,7 @@ S3ObjectStorage = S3ObjectStorage_1 = __decorate([
                 return context.resolve(S3ObjectStorageProvider).get(module);
             },
         },
+        argumentIdentityProvider: JSON.stringify,
     }),
     __metadata("design:paramtypes", [Function, String, String, String])
 ], S3ObjectStorage);

package/orm/server/repository.js

@@ -84,7 +84,7 @@ let EntityRepository = class EntityRepository extends Transactional {
      * @returns A promise that resolves to the loaded entity or `undefined` if not found.
      */
     async tryLoad(id) {
-        return this.tryLoadByQuery(eq(this.#table.id, id));
+        return await this.tryLoadByQuery(eq(this.#table.id, id));
     }
     /**
      * Loads a single entity based on a query.
@@ -122,7 +122,7 @@ let EntityRepository = class EntityRepository extends Transactional {
         if (isUndefined(row)) {
             return undefined;
         }
-        return this.mapToEntity(row);
+        return await this.mapToEntity(row);
     }
     /**
      * Loads multiple entities by their IDs.
@@ -131,7 +131,7 @@ let EntityRepository = class EntityRepository extends Transactional {
      * @returns A promise that resolves to an array of loaded entities.
      */
     async loadMany(ids, options) {
-        return this.loadManyByQuery(inArray(this.#table.id, ids), options);
+        return await this.loadManyByQuery(inArray(this.#table.id, ids), options);
     }
     /**
      * Loads multiple entities by their IDs and returns them as an async iterable cursor.
@@ -168,7 +168,7 @@ let EntityRepository = class EntityRepository extends Transactional {
             dbQuery = dbQuery.orderBy(...this.convertOrderBy(options.order));
         }
         const rows = await dbQuery;
-        return this.mapManyToEntity(rows);
+        return await this.mapManyToEntity(rows);
     }
     /**
      * Loads multiple entities based on a query and returns them as an async iterable cursor.
@@ -186,7 +186,7 @@ let EntityRepository = class EntityRepository extends Transactional {
      * @returns A promise that resolves to an array of all entities.
      */
     async loadAll(options) {
-        return this.loadManyByQuery({}, options);
+        return await this.loadManyByQuery({}, options);
     }
     /**
      * Loads all entities of the repository's type and returns them as an async iterable cursor.
@@ -230,7 +230,7 @@ let EntityRepository = class EntityRepository extends Transactional {
      * @returns A promise that resolves to `true` if the entity exists, `false` otherwise.
      */
     async has(id) {
-        return this.hasByQuery(eq(this.#table.id, id));
+        return await this.hasByQuery(eq(this.#table.id, id));
     }
     /**
      * Checks if any entity matches the given query.
@@ -273,7 +273,7 @@ let EntityRepository = class EntityRepository extends Transactional {
         if (isUndefined(row)) {
             return undefined;
         }
-        return this.mapToEntity(row);
+        return await this.mapToEntity(row);
     }
     /**
      * Inserts a new entity into the database.
@@ -286,7 +286,7 @@ let EntityRepository = class EntityRepository extends Transactional {
             .insert(this.#table)
             .values(columns)
             .returning();
-        return this.mapToEntity(row);
+        return await this.mapToEntity(row);
     }
     /**
      * Inserts multiple new entities into the database.
@@ -296,7 +296,7 @@ let EntityRepository = class EntityRepository extends Transactional {
     async insertMany(entities) {
         const columns = await this.mapManyToInsertColumns(entities);
         const rows = await this.session.insert(this.#table).values(columns).returning();
-        return this.mapManyToEntity(rows);
+        return await this.mapManyToEntity(rows);
     }
     /**
      * Inserts an entity or updates it if a conflict occurs based on the target columns.
@@ -317,7 +317,7 @@ let EntityRepository = class EntityRepository extends Transactional {
             set: mappedUpdate,
         })
             .returning();
-        return this.mapToEntity(row);
+        return await this.mapToEntity(row);
     }
     /**
      * Inserts multiple entities or updates them if a conflict occurs based on the target columns.
@@ -343,7 +343,7 @@ let EntityRepository = class EntityRepository extends Transactional {
             set: mappedUpdate,
         })
             .returning();
-        return this.mapManyToEntity(rows);
+        return await this.mapManyToEntity(rows);
     }
     /**
      * Updates an entity by its ID.
@@ -378,7 +378,7 @@ let EntityRepository = class EntityRepository extends Transactional {
         if (isUndefined(row)) {
             return undefined;
         }
-        return this.mapToEntity(row);
+        return await this.mapToEntity(row);
     }
     /**
      * Updates a single entity matching a query.
@@ -413,7 +413,7 @@ let EntityRepository = class EntityRepository extends Transactional {
         if (isUndefined(row)) {
             return undefined;
         }
-        return this.mapToEntity(row);
+        return await this.mapToEntity(row);
     }
     /**
      * Updates multiple entities by their IDs.
@@ -422,7 +422,7 @@ let EntityRepository = class EntityRepository extends Transactional {
      * @returns A promise that resolves to an array of the updated entities.
      */
     async updateMany(ids, update) {
-        return this.updateManyByQuery(inArray(this.#table.id, ids), update);
+        return await this.updateManyByQuery(inArray(this.#table.id, ids), update);
     }
     /**
      * Updates multiple entities matching a query.
@@ -438,7 +438,7 @@ let EntityRepository = class EntityRepository extends Transactional {
             .set(mappedUpdate)
             .where(sqlQuery)
             .returning();
-        return this.mapManyToEntity(rows);
+        return await this.mapManyToEntity(rows);
     }
     /**
      * Deletes an entity by its ID (soft delete if metadata is available).
@@ -464,7 +464,7 @@ let EntityRepository = class EntityRepository extends Transactional {
      */
     async tryDelete(id, metadataUpdate) {
         if (!this.hasMetadata) {
-            return this.tryHardDelete(id);
+            return await this.tryHardDelete(id);
         }
         const sqlQuery = this.convertQuery(eq(this.#table.id, id));
         const [row] = await this.session
@@ -478,7 +478,7 @@ let EntityRepository = class EntityRepository extends Transactional {
         if (isUndefined(row)) {
             return undefined;
         }
-        return this.mapToEntity(row);
+        return await this.mapToEntity(row);
     }
     /**
      * Deletes a single entity matching a query (soft delete if metadata is available).
@@ -504,7 +504,7 @@ let EntityRepository = class EntityRepository extends Transactional {
      */
     async tryDeleteByQuery(query, metadataUpdate) {
         if (!this.hasMetadata) {
-            return this.tryHardDeleteByQuery(query);
+            return await this.tryHardDeleteByQuery(query);
         }
         const idQuery = this.getIdLimitSelect(query);
         const [row] = await this.session
@@ -518,7 +518,7 @@ let EntityRepository = class EntityRepository extends Transactional {
         if (isUndefined(row)) {
             return undefined;
         }
-        return this.mapToEntity(row);
+        return await this.mapToEntity(row);
     }
     /**
      * Deletes multiple entities by their IDs (soft delete if metadata is available).
@@ -527,7 +527,7 @@ let EntityRepository = class EntityRepository extends Transactional {
      * @returns A promise that resolves to an array of the deleted entities.
      */
     async deleteMany(ids, metadataUpdate) {
-        return this.deleteManyByQuery(inArray(this.#table.id, ids), metadataUpdate);
+        return await this.deleteManyByQuery(inArray(this.#table.id, ids), metadataUpdate);
     }
     /**
      * Deletes multiple entities matching a query (soft delete if metadata is available).
@@ -537,7 +537,7 @@ let EntityRepository = class EntityRepository extends Transactional {
      */
     async deleteManyByQuery(query, metadataUpdate) {
         if (!this.hasMetadata) {
-            return this.hardDeleteManyByQuery(query);
+            return await this.hardDeleteManyByQuery(query);
         }
         const sqlQuery = this.convertQuery(query);
         const rows = await this.session
@@ -548,7 +548,7 @@ let EntityRepository = class EntityRepository extends Transactional {
         })
             .where(sqlQuery)
             .returning();
-        return this.mapManyToEntity(rows);
+        return await this.mapManyToEntity(rows);
     }
     /**
      * Hard deletes an entity by its ID (removes from the database).
@@ -579,7 +579,7 @@ let EntityRepository = class EntityRepository extends Transactional {
         if (isUndefined(row)) {
             return undefined;
         }
-        return this.mapToEntity(row);
+        return await this.mapToEntity(row);
     }
     /**
      * Hard deletes a single entity matching a query (removes from the database).
@@ -610,7 +610,7 @@ let EntityRepository = class EntityRepository extends Transactional {
         if (isUndefined(row)) {
             return undefined;
         }
-        return this.mapToEntity(row);
+        return await this.mapToEntity(row);
     }
     /**
      * Hard deletes multiple entities by their IDs (removes from the database).
@@ -618,7 +618,7 @@ let EntityRepository = class EntityRepository extends Transactional {
      * @returns A promise that resolves to an array of the hard deleted entities.
      */
     async hardDeleteMany(ids) {
-        return this.hardDeleteManyByQuery(inArray(this.#table.id, ids));
+        return await this.hardDeleteManyByQuery(inArray(this.#table.id, ids));
     }
     /**
      * Hard deletes multiple entities matching a query (removes from the database).
@@ -631,7 +631,7 @@ let EntityRepository = class EntityRepository extends Transactional {
             .delete(this.#table)
             .where(sqlQuery)
             .returning();
-        return this.mapManyToEntity(rows);
+        return await this.mapManyToEntity(rows);
     }
     /**
      * Retrieves the Drizzle PgColumn for a given object path or column definition.
@@ -693,7 +693,7 @@ let EntityRepository = class EntityRepository extends Transactional {
      */
     async mapManyToEntity(columns) {
         const transformContext = await this.getTransformContext();
-        return this._mapManyToEntity(columns, transformContext);
+        return await this._mapManyToEntity(columns, transformContext);
     }
     /**
      * Maps a single database row to an entity.
@@ -702,7 +702,7 @@ let EntityRepository = class EntityRepository extends Transactional {
      */
     async mapToEntity(columns) {
         const transformContext = await this.getTransformContext();
-        return this._mapToEntity(columns, transformContext);
+        return await this._mapToEntity(columns, transformContext);
     }
     /**
      * Maps multiple entity-like objects to database column values for insertion or update.
@@ -711,7 +711,7 @@ let EntityRepository = class EntityRepository extends Transactional {
      */
     async mapManyToColumns(objects) {
         const transformContext = await this.getTransformContext();
-        return this._mapManyToColumns(objects, transformContext);
+        return await this._mapManyToColumns(objects, transformContext);
     }
     /**
      * Maps a single entity-like object to database column values for insertion or update.
@@ -720,7 +720,7 @@ let EntityRepository = class EntityRepository extends Transactional {
      */
     async mapToColumns(obj) {
         const transformContext = await this.getTransformContext();
-        return this._mapToColumns(obj, transformContext);
+        return await this._mapToColumns(obj, transformContext);
     }
     /**
      * Maps multiple new entity objects to database column values for insertion.
@@ -729,7 +729,7 @@ let EntityRepository = class EntityRepository extends Transactional {
      */
     async mapManyToInsertColumns(objects) {
         const transformContext = await this.getTransformContext();
-        return this._mapManyToInsertColumns(objects, transformContext);
+        return await this._mapManyToInsertColumns(objects, transformContext);
     }
     /**
      * Maps a new entity object to database column values for insertion.
@@ -738,7 +738,7 @@ let EntityRepository = class EntityRepository extends Transactional {
      */
     async mapToInsertColumns(obj) {
         const transformContext = await this.getTransformContext();
-        return this._mapToInsertColumns(obj, transformContext);
+        return await this._mapToInsertColumns(obj, transformContext);
     }
     /**
      * Maps an entity update object to database column values for updating.
@@ -747,7 +747,7 @@ let EntityRepository = class EntityRepository extends Transactional {
      */
     async mapUpdate(update) {
         const transformContext = await this.getTransformContext();
-        return this._mapUpdate(update, transformContext);
+        return await this._mapUpdate(update, transformContext);
     }
     /**
      * Gets a Drizzle select query for the ID of a single entity matching the provided query, limited to 1 result.
@@ -768,7 +768,7 @@ let EntityRepository = class EntityRepository extends Transactional {
         return sql `${this.#tableWithMetadata.attributes} || ${JSON.stringify(attributes)}::jsonb`;
     }
     async _mapManyToEntity(columns, transformContext) {
-        return toArrayAsync(mapAsync(columns, async (column) => this._mapToEntity(column, transformContext)));
+        return await toArrayAsync(mapAsync(columns, async (column) => await this._mapToEntity(column, transformContext)));
     }
     async _mapToEntity(columns, transformContext) {
         const entries = [];
@@ -781,7 +781,7 @@ let EntityRepository = class EntityRepository extends Transactional {
         return Schema.parse(this.type, obj);
     }
     async _mapManyToColumns(objects, transformContext) {
-        return toArrayAsync(mapAsync(objects, async (obj) => this._mapToColumns(obj, transformContext)));
+        return await toArrayAsync(mapAsync(objects, async (obj) => await this._mapToColumns(obj, transformContext)));
     }
     async _mapToColumns(obj, transformContext) {
         const columns = {};
@@ -792,7 +792,7 @@ let EntityRepository = class EntityRepository extends Transactional {
         return columns;
     }
     async _mapManyToInsertColumns(objects, transformContext) {
-        return toArrayAsync(mapAsync(objects, async (obj) => this._mapToInsertColumns(obj, transformContext)));
+        return await toArrayAsync(mapAsync(objects, async (obj) => await this._mapToInsertColumns(obj, transformContext)));
     }
     async _mapToInsertColumns(obj, transformContext) {
         const mapped = await this._mapToColumns(obj, transformContext);
@@ -847,7 +847,7 @@ let EntityRepository = class EntityRepository extends Transactional {
             const transformContext = await this.#transformContext;
             this.#transformContext = transformContext;
         }
-        return this.#transformContext;
+        return await this.#transformContext;
     }
 };
 EntityRepository = __decorate([

package/package.json

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

package/schema/schema.error.js

@@ -8,8 +8,9 @@ export class SchemaError extends CustomError {
     inner;
     innerMessages;
     constructor(message, options, cause) {
-        super({ message, cause: cause ?? options.cause, fast: options.fast });
-        this.path = isString(options.path) ? options.path : options.path.path;
+        const path = isString(options.path) ? options.path : options.path.path;
+        super({ message: `${path}: ${message}`, cause: cause ?? options.cause, fast: options.fast });
+        this.path = path;
         if (isDefined(options.inner) && (!isArray(options.inner) || (options.inner.length > 0))) {
             this.inner = isArray(options.inner)
                 ? (options.inner.length == 1)
@@ -22,7 +23,6 @@ export class SchemaError extends CustomError {
             this.details = options.details;
         }
     }
-    // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
     static expectedButGot(expected, got, path, options) {
         const expectedNames = toArray(expected).map((e) => isFunction(e) ? e.name : e);
         const expectedString = expectedNames.length == 1
@@ -32,7 +32,6 @@ export class SchemaError extends CustomError {
         const message = `Expected ${expectedString} but got ${got}${customMessage}`;
         return new SchemaError(message, { path, ...options });
     }
-    // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
     static couldNotCoerce(expected, got, path, options) {
         const expectedNames = toArray(expected).map((e) => isFunction(e) ? e.name : e);
         const expectedString = expectedNames.length == 1
@@ -43,9 +42,7 @@ export class SchemaError extends CustomError {
         return new SchemaError(errorMessage, { path, ...options });
     }
     getExtraInfo(includeMessage = false) {
-        const obj = {
-            path: this.path
-        };
+        const obj = { path: this.path };
         if (includeMessage) {
             obj['message'] = this.message;
         }