@tstdl/base 0.92.135 → 0.92.137

package/document-management/api/document-management.api.d.ts

@@ -74,6 +74,9 @@ export declare const documentManagementApiDefinition: {
         initiateDocumentUpload: {
             resource: string;
             method: "POST";
+            parameters: import("../../schema/index.js").ObjectSchema<{
+                contentLength: number;
+            }>;
             result: import("../../schema/index.js").ObjectSchema<{
                 uploadId: string;
                 uploadUrl: string;
@@ -92,7 +95,7 @@ export declare const documentManagementApiDefinition: {
                 tags?: string[] | null | undefined;
                 comment?: string | null | undefined;
                 approval?: import("../models/document.model.js").DocumentApproval | undefined;
-                originalFileName: string | null;
+                originalFileName?: string | null | undefined;
                 assignment: {
                     collections: string | string[];
                 } | {
@@ -282,15 +285,18 @@ export declare const documentManagementApiDefinition: {
             parameters: import("../../schema/index.js").ObjectSchema<{
                 id: import("../../orm/types.js").IsPrimaryKey<import("../../orm/types.js").HasDefault<import("../../orm/schemas/uuid.js").Uuid>>;
                 date?: import("../../orm/types.js").NumericDate | null | undefined;
+                size?: number | undefined;
+                hash?: string | undefined;
                 summary?: string | null | undefined;
                 title?: string | null | undefined;
+                mimeType?: string | undefined;
                 typeId?: import("../../orm/types.js").Uuid | null | undefined;
                 subtitle?: string | null | undefined;
                 tags?: string[] | null | undefined;
                 comment?: string | null | undefined;
-                fileId?: import("../../orm/types.js").Uuid | undefined;
                 pages?: number | null | undefined;
                 approval?: import("../models/document.model.js").DocumentApproval | undefined;
+                originalFileName?: string | null | undefined;
                 createUserId?: import("../../orm/types.js").Uuid | null | undefined;
                 properties?: {
                     propertyId: import("../../orm/schemas/uuid.js").Uuid;
@@ -381,6 +387,9 @@ declare const _DocumentManagementApi: import("../../api/client/index.js").ApiCli
         initiateDocumentUpload: {
             resource: string;
             method: "POST";
+            parameters: import("../../schema/index.js").ObjectSchema<{
+                contentLength: number;
+            }>;
             result: import("../../schema/index.js").ObjectSchema<{
                 uploadId: string;
                 uploadUrl: string;
@@ -399,7 +408,7 @@ declare const _DocumentManagementApi: import("../../api/client/index.js").ApiCli
                 tags?: string[] | null | undefined;
                 comment?: string | null | undefined;
                 approval?: import("../models/document.model.js").DocumentApproval | undefined;
-                originalFileName: string | null;
+                originalFileName?: string | null | undefined;
                 assignment: {
                     collections: string | string[];
                 } | {
@@ -589,15 +598,18 @@ declare const _DocumentManagementApi: import("../../api/client/index.js").ApiCli
             parameters: import("../../schema/index.js").ObjectSchema<{
                 id: import("../../orm/types.js").IsPrimaryKey<import("../../orm/types.js").HasDefault<import("../../orm/schemas/uuid.js").Uuid>>;
                 date?: import("../../orm/types.js").NumericDate | null | undefined;
+                size?: number | undefined;
+                hash?: string | undefined;
                 summary?: string | null | undefined;
                 title?: string | null | undefined;
+                mimeType?: string | undefined;
                 typeId?: import("../../orm/types.js").Uuid | null | undefined;
                 subtitle?: string | null | undefined;
                 tags?: string[] | null | undefined;
                 comment?: string | null | undefined;
-                fileId?: import("../../orm/types.js").Uuid | undefined;
                 pages?: number | null | undefined;
                 approval?: import("../models/document.model.js").DocumentApproval | undefined;
+                originalFileName?: string | null | undefined;
                 createUserId?: import("../../orm/types.js").Uuid | null | undefined;
                 properties?: {
                     propertyId: import("../../orm/schemas/uuid.js").Uuid;

package/document-management/api/document-management.api.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { compileClient } from '../../api/client/index.js';
 import { defineApi } from '../../api/index.js';
 import { ReplaceClass } from '../../injector/decorators.js';
-import { array, boolean, literal, object, optional, string } from '../../schema/index.js';
+import { array, boolean, literal, number, object, optional, string } from '../../schema/index.js';
 import { Document, DocumentCategory, DocumentRequest, DocumentRequestsTemplate, DocumentRequestTemplate, DocumentType } from '../models/index.js';
 import { addOrArchiveDocumentToOrFromCollectionParametersSchema, applyDocumentRequestsTemplateParametersSchema, createDocumentCategoryParametersSchema, createDocumentParametersSchema, createDocumentRequestParametersSchema, createDocumentRequestsTemplateParametersSchema, createDocumentRequestTemplateParametersSchema, createDocumentTypeParametersSchema, deleteDocumentRequestParametersSchema, deleteDocumentRequestsTemplateParametersSchema, deleteDocumentRequestTemplateParametersSchema, DocumentCategoryView, DocumentManagementData, DocumentRequestsTemplateData, loadDataParametersSchema, updateDocumentParametersSchema, updateDocumentRequestParametersSchema, updateDocumentRequestsTemplateParametersSchema, updateDocumentRequestTemplateParametersSchema } from '../service-models/index.js';
 export const documentManagementApiDefinition = defineApi({
@@ -69,6 +69,9 @@ export const documentManagementApiDefinition = defineApi({
         initiateDocumentUpload: {
             resource: 'document-uploads',
             method: 'POST',
+            parameters: object({
+                contentLength: number(),
+            }),
             result: object({
                 uploadId: string(),
                 uploadUrl: string(),

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

@@ -10,7 +10,6 @@ export type DocumentApproval = EnumType<typeof DocumentApproval>;
 export type UpdatableDocumentProperties = keyof Pick<Document, 'typeId' | 'title' | 'subtitle' | 'date' | 'summary' | 'tags' | 'comment'>;
 export declare class Document extends Entity {
     static readonly entityName: 'Document';
-    fileId: Uuid;
     typeId: Uuid | null;
     title: string | null;
     subtitle: string | null;
@@ -20,5 +19,9 @@ export declare class Document extends Entity {
     tags: string[] | null;
     approval: DocumentApproval;
     comment: string | null;
+    originalFileName: string | null;
+    mimeType: string;
+    hash: string;
+    size: number;
     createUserId: Uuid | null;
 }

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

@@ -12,7 +12,6 @@ import { References } from '../../orm/decorators.js';
 import { Entity } from '../../orm/entity.js';
 import { NumericDate, Uuid } from '../../orm/types.js';
 import { Array, Enumeration, Integer, string, StringProperty } from '../../schema/index.js';
-import { DocumentFile } from './document-file.model.js';
 import { DocumentManagementTable } from './document-management-table.js';
 import { DocumentType } from './document-type.model.js';
 export const DocumentApproval = defineEnum('DocumentApproval', {
@@ -21,7 +20,6 @@ export const DocumentApproval = defineEnum('DocumentApproval', {
     Rejected: 'rejected',
 });
 let Document = class Document extends Entity {
-    fileId;
     typeId;
     title;
     subtitle;
@@ -31,13 +29,12 @@ let Document = class Document extends Entity {
     tags;
     approval;
     comment;
+    originalFileName;
+    mimeType;
+    hash;
+    size;
     createUserId;
 };
-__decorate([
-    Uuid(),
-    References(() => DocumentFile),
-    __metadata("design:type", String)
-], Document.prototype, "fileId", void 0);
 __decorate([
     Uuid({ nullable: true }),
     References(() => DocumentType),
@@ -75,6 +72,22 @@ __decorate([
     StringProperty({ nullable: true }),
     __metadata("design:type", Object)
 ], Document.prototype, "comment", void 0);
+__decorate([
+    StringProperty({ nullable: true }),
+    __metadata("design:type", Object)
+], Document.prototype, "originalFileName", void 0);
+__decorate([
+    StringProperty(),
+    __metadata("design:type", String)
+], Document.prototype, "mimeType", void 0);
+__decorate([
+    StringProperty(),
+    __metadata("design:type", String)
+], Document.prototype, "hash", void 0);
+__decorate([
+    Integer(),
+    __metadata("design:type", Number)
+], Document.prototype, "size", void 0);
 __decorate([
     Uuid({ nullable: true }),
     __metadata("design:type", Object)

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

@@ -3,7 +3,6 @@ export * from './document-assignment-task.model.js';
 export * from './document-category.model.js';
 export * from './document-collection-assignment.model.js';
 export * from './document-collection.model.js';
-export * from './document-file.model.js';
 export * from './document-management-table.js';
 export * from './document-property-value.model.js';
 export * from './document-property.model.js';

package/document-management/models/index.js

@@ -3,7 +3,6 @@ export * from './document-assignment-task.model.js';
 export * from './document-category.model.js';
 export * from './document-collection-assignment.model.js';
 export * from './document-collection.model.js';
-export * from './document-file.model.js';
 export * from './document-management-table.js';
 export * from './document-property-value.model.js';
 export * from './document-property.model.js';

package/document-management/server/api/document-management.api.js

@@ -58,7 +58,7 @@ let DocumentManagementApiController = DocumentManagementApiController_1 = class
         const token = await context.getToken();
         const allowed = await this.#documentManagementAncillaryService.canReadDocument(context.parameters.id, token);
         if (!allowed) {
-            throw new ForbiddenError(`You are not allowed to load content for file ${context.parameters.id}.`);
+            throw new ForbiddenError(`You are not allowed to load content for document ${context.parameters.id}.`);
         }
         const url = await this.#documentService.getContentUrl(context.parameters.id, context.parameters.download);
         return HttpServerResponse.fromObject({
@@ -72,7 +72,7 @@ let DocumentManagementApiController = DocumentManagementApiController_1 = class
         const token = await context.getToken();
         const allowed = await this.#documentManagementAncillaryService.canReadDocument(context.parameters.id, token);
         if (!allowed) {
-            throw new ForbiddenError(`You are not allowed to get content URL for file ${context.parameters.id}.`);
+            throw new ForbiddenError(`You are not allowed to get content URL for document ${context.parameters.id}.`);
         }
         return await this.#documentService.getContentUrl(context.parameters.id, context.parameters.download);
     }
@@ -95,7 +95,7 @@ let DocumentManagementApiController = DocumentManagementApiController_1 = class
     async initiateDocumentUpload(context) {
         const token = await context.getToken();
         const subject = await this.#ancillaryService.getSubject(token);
-        return await this.#documentFileService.initiateUpload({ key: subject });
+        return await this.#documentFileService.initiateUpload({ key: subject, contentLength: context.parameters.contentLength });
     }
     async createDocument(context) {
         const token = await context.getToken();

package/document-management/server/module.d.ts

@@ -8,6 +8,7 @@ export declare class DocumentManagementConfig {
     fileUploadObjectStorageModule: string;
     filePreviewObjectStorageModule: string;
     database?: DatabaseConfig;
+    maxFileSize?: number;
 }
 export declare function configureDocumentManagement(config: DocumentManagementConfig): void;
 export declare function migrateDocumentManagementSchema(): Promise<void>;

package/document-management/server/module.js

@@ -8,6 +8,7 @@ export class DocumentManagementConfig {
     fileUploadObjectStorageModule;
     filePreviewObjectStorageModule;
     database;
+    maxFileSize;
 }
 ;
 export function configureDocumentManagement(config) {

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

@@ -1,4 +1,4 @@
-import { Document, DocumentAssignmentScope, DocumentAssignmentTask, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentFile, DocumentProperty, DocumentPropertyValue, DocumentRequest, DocumentRequestCollectionAssignment, DocumentRequestsTemplate, DocumentRequestSubmission, DocumentRequestTemplate, DocumentType, DocumentTypeProperty, DocumentTypeValidation, DocumentValidationDefinition, DocumentValidationExecution, DocumentValidationExecutionRelatedDocument, DocumentWorkflow } from '../models/index.js';
+import { Document, DocumentAssignmentScope, DocumentAssignmentTask, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentProperty, DocumentPropertyValue, DocumentRequest, DocumentRequestCollectionAssignment, DocumentRequestsTemplate, DocumentRequestSubmission, DocumentRequestTemplate, DocumentType, DocumentTypeProperty, DocumentTypeValidation, DocumentValidationDefinition, DocumentValidationExecution, DocumentValidationExecutionRelatedDocument, DocumentWorkflow } from '../models/index.js';
 export declare const documentManagementSchema: import("../../orm/server/database-schema.js").DatabaseSchema<"document_management">;
 export declare const aocumentApproval: import("drizzle-orm/pg-core").PgEnum<["pending", "approved", "rejected"]>;
 export declare const documentAssignmentCollectionTarget: import("drizzle-orm/pg-core").PgEnum<["request", "collection"]>;
@@ -15,7 +15,6 @@ export declare const documentAssignmentTask: import("../../orm/server/types.js")
 export declare const documentCategory: import("../../orm/server/types.js").PgTableFromType<typeof DocumentCategory, "document_management">;
 export declare const documentCollection: import("../../orm/server/types.js").PgTableFromType<typeof DocumentCollection, "document_management">;
 export declare const documentCollectionAssignment: import("../../orm/server/types.js").PgTableFromType<typeof DocumentCollectionAssignment, "document_management">;
-export declare const documentFile: import("../../orm/server/types.js").PgTableFromType<typeof DocumentFile, "document_management">;
 export declare const documentProperty: import("../../orm/server/types.js").PgTableFromType<typeof DocumentProperty, "document_management">;
 export declare const documentPropertyValue: import("../../orm/server/types.js").PgTableFromType<typeof DocumentPropertyValue, "document_management">;
 export declare const documentRequest: import("../../orm/server/types.js").PgTableFromType<typeof DocumentRequest, "document_management">;

package/document-management/server/schemas.js

@@ -1,5 +1,5 @@
 import { databaseSchema } from '../../orm/server/database-schema.js';
-import { Document, DocumentApproval, DocumentAssignmentScope, DocumentAssignmentTarget, DocumentAssignmentTask, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentFile, DocumentProperty, DocumentPropertyDataType, DocumentPropertyValue, DocumentRequest, DocumentRequestCollectionAssignment, DocumentRequestState, DocumentRequestsTemplate, DocumentRequestSubmission, DocumentRequestTemplate, DocumentType, DocumentTypeProperty, DocumentTypeValidation, DocumentValidationDefinition, DocumentValidationExecution, DocumentValidationExecutionRelatedDocument, DocumentValidationExecutionState, DocumentValidationResultStatus, DocumentWorkflow, DocumentWorkflowFailReason, DocumentWorkflowState, DocumentWorkflowStep } from '../models/index.js';
+import { Document, DocumentApproval, DocumentAssignmentScope, DocumentAssignmentTarget, DocumentAssignmentTask, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentProperty, DocumentPropertyDataType, DocumentPropertyValue, DocumentRequest, DocumentRequestCollectionAssignment, DocumentRequestState, DocumentRequestsTemplate, DocumentRequestSubmission, DocumentRequestTemplate, DocumentType, DocumentTypeProperty, DocumentTypeValidation, DocumentValidationDefinition, DocumentValidationExecution, DocumentValidationExecutionRelatedDocument, DocumentValidationExecutionState, DocumentValidationResultStatus, DocumentWorkflow, DocumentWorkflowFailReason, DocumentWorkflowState, DocumentWorkflowStep } from '../models/index.js';
 export const documentManagementSchema = databaseSchema('document_management');
 export const aocumentApproval = documentManagementSchema.getEnum(DocumentApproval);
 export const documentAssignmentCollectionTarget = documentManagementSchema.getEnum(DocumentAssignmentTarget);
@@ -16,7 +16,6 @@ export const documentAssignmentTask = documentManagementSchema.getTable(Document
 export const documentCategory = documentManagementSchema.getTable(DocumentCategory);
 export const documentCollection = documentManagementSchema.getTable(DocumentCollection);
 export const documentCollectionAssignment = documentManagementSchema.getTable(DocumentCollectionAssignment);
-export const documentFile = documentManagementSchema.getTable(DocumentFile);
 export const documentProperty = documentManagementSchema.getTable(DocumentProperty);
 export const documentPropertyValue = documentManagementSchema.getTable(DocumentPropertyValue);
 export const documentRequest = documentManagementSchema.getTable(DocumentRequest);

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

@@ -1,29 +1,33 @@
 import type { FileContentPart } from '../../../ai/types.js';
 import { Transactional } from '../../../orm/server/index.js';
-import { DocumentFile } from '../../models/index.js';
+export type DocumentFileMetadata = {
+    mimeType: string;
+    size: number;
+    hash: string;
+};
 export declare class DocumentFileService extends Transactional {
     #private;
-    load(id: string): Promise<DocumentFile>;
     /**
      * Initiates a file upload
-     * @param key - key which can be used to authorize the creation of the file. Same key must be provided to {@link create} method, or it will throw an error.
+     * @param key - key which can be used to authorize the creation of the file. Same key must be provided to {@link store} method, or it will throw an error.
      * The key could be the user id from the request token. This ensures that the file can only be created by the user who initiated the upload.
      * @returns upload information
      */
-    initiateUpload({ key }: {
+    initiateUpload({ key, contentLength }: {
         key: string;
+        contentLength: number;
     }): Promise<{
         uploadId: string;
         uploadUrl: string;
     }>;
-    create(content: Uint8Array | ReadableStream<Uint8Array>, originalFileName: string | null): Promise<DocumentFile>;
-    create(content: {
+    store(documentId: string, content: Uint8Array | ReadableStream<Uint8Array>): Promise<DocumentFileMetadata>;
+    store(documentId: string, content: {
         uploadId: string;
         uploadKey: string;
-    }, originalFileName: string | null): Promise<[DocumentFile, Uint8Array]>;
+    }): Promise<[DocumentFileMetadata, Uint8Array]>;
     getContent(fileId: string): Promise<Uint8Array>;
     getContentStream(fileId: string): ReadableStream<Uint8Array>;
-    getContentUrl(fileId: string, title: string | null, download?: boolean): Promise<string>;
+    getContentUrl(documentId: string, title: string | null, download?: boolean): Promise<string>;
     getPreview(fileId: string, page?: number): Promise<Uint8Array>;
     getPreviewStream(fileId: string, page?: number): ReadableStream<Uint8Array>;
     getPreviewUrl(fileId: string, page?: number): Promise<string>;

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

@@ -78,12 +78,11 @@ import { getRandomString } from '../../../utils/random.js';
 import { readableStreamFromPromise, readBinaryStream } from '../../../utils/stream/index.js';
 import { isDefined, isNotReadableStream, isNotUint8Array, isUint8Array } from '../../../utils/type-guards.js';
 import { millisecondsPerMinute, secondsPerMinute } from '../../../utils/units.js';
-import { Document, DocumentFile } from '../../models/index.js';
+import { Document } from '../../models/index.js';
 import { DocumentManagementConfig } from '../module.js';
 import { DocumentManagementSingleton } from './singleton.js';
 let DocumentFileService = DocumentFileService_1 = class DocumentFileService extends Transactional {
     #config = inject(DocumentManagementConfig);
-    #documentFileRepository = injectRepository(DocumentFile);
     #documentRepository = injectRepository(Document);
     #aiService = inject(AiService);
     #fileObjectStorage = inject(ObjectStorage, this.#config.fileObjectStorageModule);
@@ -91,78 +90,78 @@ let DocumentFileService = DocumentFileService_1 = class DocumentFileService exte
     #fileUploadObjectStorage = inject(ObjectStorage, { module: this.#config.fileUploadObjectStorageModule, configuration: { lifecycle: { expiration: { after: 5 * secondsPerMinute } } } });
     #logger = inject(Logger, DocumentFileService_1.name);
     #aiFilePartCache = new Map();
-    async load(id) {
-        return await this.#documentFileRepository.load(id);
-    }
     /**
      * Initiates a file upload
-     * @param key - key which can be used to authorize the creation of the file. Same key must be provided to {@link create} method, or it will throw an error.
+     * @param key - key which can be used to authorize the creation of the file. Same key must be provided to {@link store} method, or it will throw an error.
      * The key could be the user id from the request token. This ensures that the file can only be created by the user who initiated the upload.
      * @returns upload information
      */
-    async initiateUpload({ key }) {
+    async initiateUpload({ key, contentLength }) {
+        if (contentLength > (this.#config.maxFileSize ?? Number.POSITIVE_INFINITY)) {
+            throw new ForbiddenError(`Content length exceeds the maximum limit of ${this.#config.maxFileSize} bytes.`);
+        }
         const id = getRandomString(64, Alphabet.LowerUpperCaseNumbers);
-        const url = await this.#fileUploadObjectStorage.getUploadUrl(id, currentTimestamp() + (5 * millisecondsPerMinute), { metadata: { 'upload-key': key } });
+        const url = await this.#fileUploadObjectStorage.getUploadUrl(id, currentTimestamp() + (5 * millisecondsPerMinute), { contentLength, metadata: { 'upload-key': key } });
         return { uploadId: id, uploadUrl: url };
     }
-    async create(content, originalFileName) {
+    async store(documentId, content) {
         const isUpload = isNotUint8Array(content) && isNotReadableStream(content);
         if (isUpload) {
             const object = await this.#fileUploadObjectStorage.getObject(content.uploadId);
             const objectMetadata = await object.getMetadata();
+            const objectContentLength = await object.getContentLength();
             if (content.uploadKey != objectMetadata['upload-key']) {
                 throw new ForbiddenError(`Invalid upload key`);
             }
+            if (objectContentLength > (this.#config.maxFileSize ?? Number.POSITIVE_INFINITY)) {
+                await this.#fileUploadObjectStorage.deleteObject(object.key);
+                throw new ForbiddenError(`Content length exceeds the maximum limit of ${this.#config.maxFileSize} bytes.`);
+            }
         }
         const contentAsUint8Array = isUpload
             ? await this.#fileUploadObjectStorage.getContent(content.uploadId)
             : (isUint8Array(content) ? content : await readBinaryStream(content));
         const hash = await digest('SHA-256', contentAsUint8Array).toHex();
         const mimeType = await getMimeType(contentAsUint8Array);
-        return await this.transaction(async (tx) => {
-            const documentFile = await this.#documentFileRepository
-                .withTransaction(tx)
-                .insert({
-                originalFileName,
-                mimeType,
-                hash,
-                size: contentAsUint8Array.length,
-            });
-            const objectKey = getDocumentFileKey(documentFile.id);
-            if (isUpload) {
-                await this.#fileUploadObjectStorage.moveObject(content.uploadId, [this.#fileObjectStorage, objectKey]);
-                return [documentFile, contentAsUint8Array];
-            }
-            await this.#fileObjectStorage.uploadObject(objectKey, contentAsUint8Array, { contentLength: contentAsUint8Array.length, contentType: mimeType });
-            return documentFile;
-        });
+        const metadata = {
+            mimeType,
+            size: contentAsUint8Array.length,
+            hash,
+        };
+        const objectKey = getObjectKey(documentId);
+        if (isUpload) {
+            await this.#fileUploadObjectStorage.moveObject(content.uploadId, [this.#fileObjectStorage, objectKey]);
+            return [metadata, contentAsUint8Array];
+        }
+        await this.#fileObjectStorage.uploadObject(objectKey, contentAsUint8Array, { contentLength: contentAsUint8Array.length, contentType: mimeType });
+        return metadata;
     }
     async getContent(fileId) {
-        const objectKey = getDocumentFileKey(fileId);
+        const objectKey = getObjectKey(fileId);
         return await this.#fileObjectStorage.getContent(objectKey);
     }
     getContentStream(fileId) {
-        const objectKey = getDocumentFileKey(fileId);
+        const objectKey = getObjectKey(fileId);
         return this.#fileObjectStorage.getContentStream(objectKey);
     }
-    async getContentUrl(fileId, title, download = false) {
-        const file = await this.#documentFileRepository.load(fileId);
-        return await this.getDocumentFileContentObjectUrl(title ?? fileId, file, download);
+    async getContentUrl(documentId, title, download = false) {
+        const document = await this.#documentRepository.load(documentId);
+        return await this.getDocumentFileContentObjectUrl(document, title ?? documentId, download);
     }
     async getPreview(fileId, page = 1) {
-        const objectKey = getDocumentFileKey(fileId);
+        const objectKey = getObjectKey(fileId);
         await this.createPreviewIfNotExists(fileId, page);
         return await this.#filePreviewObjectStorage.getContent(objectKey);
     }
     getPreviewStream(fileId, page = 1) {
         return readableStreamFromPromise(async () => {
-            const objectKey = getDocumentFileKey(fileId);
+            const objectKey = getObjectKey(fileId);
             await this.createPreviewIfNotExists(fileId, page);
             return this.#filePreviewObjectStorage.getContentStream(objectKey);
         });
     }
     async getPreviewUrl(fileId, page = 1) {
-        const objectKey = getDocumentFileKey(fileId);
+        const objectKey = getObjectKey(fileId);
         await this.createPreviewIfNotExists(fileId, page);
         return await this.#filePreviewObjectStorage.getDownloadUrl(objectKey, currentTimestamp() + (5 * millisecondsPerMinute), {
             'Response-Content-Type': 'image/jpeg',
@@ -172,18 +171,17 @@ let DocumentFileService = DocumentFileService_1 = class DocumentFileService exte
         const env_1 = { stack: [], error: void 0, hasError: false };
         try {
             const document = await this.#documentRepository.load(documentId);
-            const cachedAiFilePart = this.#aiFilePartCache.get(document.fileId);
+            const cachedAiFilePart = this.#aiFilePartCache.get(document.id);
             if (isDefined(cachedAiFilePart)) {
                 if (cachedAiFilePart.timestamp > (currentTimestamp() - (5 * millisecondsPerMinute))) {
                     return cachedAiFilePart.part;
                 }
-                this.#aiFilePartCache.delete(documentId);
+                this.#aiFilePartCache.delete(document.id);
             }
-            const file = await this.load(document.fileId);
             const fileContentStream = this.getContentStream(document.id);
             const tmpFile = __addDisposableResource(env_1, await TemporaryFile.from(fileContentStream), true);
-            const filePart = await this.#aiService.processFile({ path: tmpFile.path, mimeType: file.mimeType });
-            this.#aiFilePartCache.set(document.fileId, { part: filePart, timestamp: currentTimestamp() });
+            const filePart = await this.#aiService.processFile({ path: tmpFile.path, mimeType: document.mimeType });
+            this.#aiFilePartCache.set(document.id, { part: filePart, timestamp: currentTimestamp() });
             return filePart;
         }
         catch (e_1) {
@@ -196,13 +194,13 @@ let DocumentFileService = DocumentFileService_1 = class DocumentFileService exte
                 await result_1;
         }
     }
-    async createPreviewIfNotExists(fileId, page = 1) {
-        const key = getDocumentFileKey(fileId);
+    async createPreviewIfNotExists(documentId, page = 1) {
+        const key = getObjectKey(documentId);
         const hasPreview = await this.#filePreviewObjectStorage.exists(key);
         if (!hasPreview) {
-            const file = await this.#documentFileRepository.load(fileId);
+            const document = await this.#documentRepository.load(documentId);
             const content = await this.#fileObjectStorage.getContent(key);
-            const image = await match(file.mimeType)
+            const image = await match(document.mimeType)
                 .with('application/pdf', async () => {
                 const imageBytes = await pdfToImage(content, page, 768, 'jpeg');
                 return await imageToPreview(imageBytes);
@@ -212,13 +210,13 @@ let DocumentFileService = DocumentFileService_1 = class DocumentFileService exte
             await this.#filePreviewObjectStorage.uploadObject(key, image, { contentLength: image.length, contentType: 'image/jpeg' });
         }
     }
-    async getDocumentFileContentObjectUrl(title, file, download) {
-        const key = getDocumentFileKey(file.id);
-        const fileExtension = getMimeTypeExtensions(file.mimeType)[0] ?? 'bin';
+    async getDocumentFileContentObjectUrl(document, title, download) {
+        const key = getObjectKey(document.id);
+        const fileExtension = getMimeTypeExtensions(document.mimeType)[0] ?? 'bin';
         const disposition = download ? 'attachment' : 'inline';
         const filename = `${title}.${fileExtension}`;
         return await this.#fileObjectStorage.getDownloadUrl(key, currentTimestamp() + (5 * millisecondsPerMinute), {
-            'Response-Content-Type': file.mimeType,
+            'Response-Content-Type': document.mimeType,
             'Response-Content-Disposition': `${disposition}; filename = "${encodeURIComponent(filename)}"`,
         });
     }
@@ -227,8 +225,8 @@ DocumentFileService = DocumentFileService_1 = __decorate([
     DocumentManagementSingleton()
 ], DocumentFileService);
 export { DocumentFileService };
-function getDocumentFileKey(id) {
-    return `${id.slice(0, 2)}/${id.slice(0, 4)}/${id}`;
+function getObjectKey(documentId) {
+    return `${documentId.slice(0, 2)}/${documentId.slice(0, 4)}/${documentId}`;
 }
 async function imageToPreview(input) {
     return await sharp(input)

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

@@ -78,6 +78,7 @@ import { DocumentFileService } from './document-file.service.js';
 import { DocumentManagementAncillaryService } from './document-management-ancillary.service.js';
 import { DocumentPropertyService } from './document-property.service.js';
 import { DocumentManagementSingleton } from './singleton.js';
+const MODEL = 'gemini-2.5-flash-preview-05-20';
 let DocumentManagementAiService = DocumentManagementAiService_1 = class DocumentManagementAiService {
     #documentManagementAncillaryService = inject(DocumentManagementAncillaryService);
     #documentCategoryTypeService = inject(DocumentCategoryTypeService);
@@ -92,16 +93,15 @@ let DocumentManagementAiService = DocumentManagementAiService_1 = class Document
         const env_1 = { stack: [], error: void 0, hasError: false };
         try {
             const document = await this.#documentRepository.load(documentId);
-            const file = await this.#documentFileService.load(document.fileId);
-            const fileContentStream = this.#documentFileService.getContentStream(document.fileId);
+            const fileContentStream = this.#documentFileService.getContentStream(document.id);
             const tmpFile = __addDisposableResource(env_1, await TemporaryFile.from(fileContentStream), true);
-            const filePart = await this.#aiService.processFile({ path: tmpFile.path, mimeType: file.mimeType });
+            const filePart = await this.#aiService.processFile({ path: tmpFile.path, mimeType: document.mimeType });
             const categories = await this.#documentCategoryTypeService.loadCategoryViews();
             const typeLabelEntries = getDescriptiveTypeLabels(categories);
             const typeLabels = typeLabelEntries.map(({ label }) => label);
             this.#logger.trace(`Classifying document ${document.id}`);
             const documentTypeGeneration = await this.#aiService.generate({
-                model: 'gemini-2.5-flash-preview-04-17',
+                model: MODEL,
                 generationOptions: {
                     maxOutputTokens: 128,
                     temperature: 0.1,
@@ -140,10 +140,9 @@ let DocumentManagementAiService = DocumentManagementAiService_1 = class Document
         const env_2 = { stack: [], error: void 0, hasError: false };
         try {
             const document = await this.#documentRepository.load(documentId);
-            const file = await this.#documentFileService.load(document.fileId);
-            const fileContentStream = this.#documentFileService.getContentStream(document.fileId);
+            const fileContentStream = this.#documentFileService.getContentStream(document.id);
             const tmpFile = __addDisposableResource(env_2, await TemporaryFile.from(fileContentStream), true);
-            const filePart = await this.#aiService.processFile({ path: tmpFile.path, mimeType: file.mimeType });
+            const filePart = await this.#aiService.processFile({ path: tmpFile.path, mimeType: document.mimeType });
             if (isNull(document.typeId)) {
                 throw new Error(`Document ${document.id} has no type`);
             }
@@ -172,7 +171,7 @@ let DocumentManagementAiService = DocumentManagementAiService_1 = class Document
             });
             this.#logger.trace(`Extracting document ${document.id}`);
             const { json: extraction } = await this.#aiService.generate({
-                model: 'gemini-2.5-flash-preview-04-17',
+                model: MODEL,
                 generationOptions: {
                     maxOutputTokens: 2048,
                     temperature: 0.2,
@@ -254,7 +253,7 @@ Antworte auf deutsch.`,
             collections,
         };
         const result = await this.#aiService.generate({
-            model: 'gemini-2.5-flash-preview-04-17',
+            model: MODEL,
             generationOptions: {
                 maxOutputTokens: 100,
                 temperature: 0,
@@ -317,7 +316,7 @@ Ordne das Dokument unter "document" einer oder mehreren passenden Collection unt
             requests,
         };
         const result = await this.#aiService.generate({
-            model: 'gemini-2.5-flash-preview-04-17',
+            model: MODEL,
             generationOptions: {
                 maxOutputTokens: 100,
                 temperature: 0,

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

@@ -12,7 +12,7 @@ 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, 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 { DocumentApproval, DocumentAssignmentScope, DocumentAssignmentTask, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, 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';
@@ -25,7 +25,6 @@ let DocumentManagementService = class DocumentManagementService extends Transact
     #documentCollectionRepository = injectRepository(DocumentCollection);
     #documentCategoryRepository = injectRepository(DocumentCategory);
     #documentCollectionAssignmentRepository = injectRepository(DocumentCollectionAssignment);
-    #documentFileRepository = injectRepository(DocumentFile);
     #documentService = inject(DocumentService);
     #documentPropertyService = inject(DocumentPropertyService);
     #documentRequestCollectionAssignmentRepository = injectRepository(DocumentRequestCollectionAssignment);
@@ -62,12 +61,8 @@ let DocumentManagementService = class DocumentManagementService extends Transact
                 this.#documentService.withTransaction(tx).repository.loadManyByQuery({ id: { $in: documentIds } }, { order: { 'metadata.createTimestamp': 'desc' } }),
                 this.#documentPropertyService.withTransaction(tx).loadDocumentProperties(documentIds),
             ]);
-            const documentFileIds = documents.map((document) => document.fileId);
             const workflowRelevantDocumentIds = documents.map((document) => (document.approval == DocumentApproval.Pending) ? document.id : null).filter(isNotNull);
-            const [files, currentWorkflows] = await Promise.all([
-                this.#documentFileRepository.withTransaction(tx).loadManyByQuery({ id: { $in: documentFileIds } }, { order: { 'metadata.createTimestamp': 'desc' } }),
-                this.#documentWorkflowService.loadLatestWorkflows(workflowRelevantDocumentIds),
-            ]);
+            const currentWorkflows = await this.#documentWorkflowService.loadLatestWorkflows(workflowRelevantDocumentIds);
             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);
@@ -107,7 +102,6 @@ let DocumentManagementService = class DocumentManagementService extends Transact
                 collections: collectionViews,
                 documents: documentViews,
                 requests: requestViews,
-                files,
                 categories,
                 types,
             };

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

@@ -39,24 +39,33 @@ let DocumentService = DocumentService_1 = class DocumentService extends Transact
     async create({ typeId, title, subtitle, date, summary, tags, approval, comment, originalFileName, assignment, properties, metadata }, contentSource, { createUserId }) {
         const document = await this.transaction(async (tx) => {
             const isUpload = isNotUint8Array(contentSource) && isNotReadableStream(contentSource);
-            const [documentFile, content] = isUpload
-                ? await this.#documentFileService.withTransaction(tx).create(contentSource, originalFileName)
-                : [await this.#documentFileService.withTransaction(tx).create(contentSource, originalFileName), contentSource];
-            const pages = documentFile.mimeType.includes('pdf') ? await tryIgnoreLogAsync(this.#logger, async () => await getPdfPageCount(content), null) : null;
             const document = await this.repository.withTransaction(tx).insert({
-                fileId: documentFile.id,
                 typeId: typeId ?? null,
                 title: title ?? null,
                 subtitle: subtitle ?? null,
-                pages,
+                pages: -1,
                 date: date ?? null,
                 summary: summary ?? null,
                 tags: tags ?? null,
                 approval: approval ?? DocumentApproval.Pending,
                 comment: comment ?? null,
                 createUserId: createUserId ?? null,
+                originalFileName: originalFileName ?? null,
+                mimeType: 'pending',
+                hash: 'pending',
+                size: -1,
                 metadata,
             });
+            const [documentMetadata, content] = isUpload
+                ? await this.#documentFileService.withTransaction(tx).store(document.id, contentSource)
+                : [await this.#documentFileService.withTransaction(tx).store(document.id, contentSource), contentSource];
+            const pages = documentMetadata.mimeType.includes('pdf') ? await tryIgnoreLogAsync(this.#logger, async () => await getPdfPageCount(content), null) : null;
+            await this.repository.withTransaction(tx).update(document.id, {
+                mimeType: documentMetadata.mimeType,
+                hash: documentMetadata.hash,
+                size: documentMetadata.size,
+                pages,
+            });
             if (isDefined(properties)) {
                 await this.#documentPropertyService.withTransaction(tx).setPropertyValues(document.id, properties);
             }
@@ -83,37 +92,37 @@ let DocumentService = DocumentService_1 = class DocumentService extends Transact
     }
     async getContent(documentOrId) {
         const document = isString(documentOrId) ? await this.repository.load(documentOrId) : documentOrId;
-        return await this.#documentFileService.getContent(document.fileId);
+        return await this.#documentFileService.getContent(document.id);
     }
     getContentStream(documentOrId) {
         return readableStreamFromPromise(async () => {
             const document = isString(documentOrId) ? await this.repository.load(documentOrId) : documentOrId;
-            return this.#documentFileService.getContentStream(document.fileId);
+            return this.#documentFileService.getContentStream(document.id);
         });
     }
     async getContentUrl(documentOrId, download = false) {
         const document = isString(documentOrId) ? await this.repository.load(documentOrId) : documentOrId;
-        return await this.#documentFileService.getContentUrl(document.fileId, document.title, download);
+        return await this.#documentFileService.getContentUrl(document.id, document.title, download);
     }
     async getPreview(documentOrId, page = 1) {
         const document = isString(documentOrId) ? await this.repository.load(documentOrId) : documentOrId;
-        return await this.#documentFileService.getPreview(document.fileId, page);
+        return await this.#documentFileService.getPreview(document.id, page);
     }
     getPreviewStream(documentOrId, page = 1) {
         return readableStreamFromPromise(async () => {
             const document = isString(documentOrId) ? await this.repository.load(documentOrId) : documentOrId;
-            return this.#documentFileService.getPreviewStream(document.fileId, page);
+            return this.#documentFileService.getPreviewStream(document.id, page);
         });
     }
     async getPreviewUrl(documentOrId, page = 1) {
         const document = isString(documentOrId) ? await this.repository.load(documentOrId) : documentOrId;
-        return await this.#documentFileService.getPreviewUrl(document.fileId, page);
+        return await this.#documentFileService.getPreviewUrl(document.id, page);
     }
     /**
      * @returns collectionIds from either direct assignment or automatic assignment scope
      */
     async createAssignment(documentId, assignment, transaction) {
-        return await match(assignment)
+        await match(assignment)
             .with({ collections: P.select() }, async (collectionIds) => {
             const collectionIdsArray = toArray(collectionIds);
             await this.#documentCollectionService.withTransaction(transaction).assignDocument(documentId, collectionIdsArray);

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

@@ -1,5 +1,5 @@
 import type { TypedOmit } from '../../types.js';
-import { Document, DocumentAssignmentTarget, DocumentAssignmentTask, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentFile, DocumentPropertyDataType, DocumentRequest, DocumentType, DocumentValidationExecution, DocumentWorkflow } from '../models/index.js';
+import { Document, DocumentAssignmentTarget, DocumentAssignmentTask, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentPropertyDataType, DocumentRequest, DocumentType, DocumentValidationExecution, DocumentWorkflow } from '../models/index.js';
 export declare class DocumentCollectionView extends DocumentCollection {
     name: string;
     group: string | null;
@@ -37,7 +37,6 @@ export declare class DocumentManagementData {
     collections: DocumentCollectionView[];
     documents: DocumentView[];
     requests: DocumentRequestView[];
-    files: DocumentFile[];
     categories: DocumentCategory[];
     types: DocumentType[];
 }

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

@@ -8,7 +8,7 @@ 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, string, StringProperty, Union } from '../../schema/index.js';
-import { Document, DocumentAssignmentTarget, DocumentAssignmentTask, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentFile, DocumentPropertyDataType, DocumentRequest, DocumentType, DocumentValidationExecution, DocumentWorkflow } from '../models/index.js';
+import { Document, DocumentAssignmentTarget, DocumentAssignmentTask, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentPropertyDataType, DocumentRequest, DocumentType, DocumentValidationExecution, DocumentWorkflow } from '../models/index.js';
 export class DocumentCollectionView extends DocumentCollection {
     name;
     group;
@@ -118,7 +118,6 @@ export class DocumentManagementData {
     collections;
     documents;
     requests;
-    files;
     categories;
     types;
 }
@@ -134,10 +133,6 @@ __decorate([
     Array(DocumentRequestView),
     __metadata("design:type", Array)
 ], DocumentManagementData.prototype, "requests", void 0);
-__decorate([
-    Array(DocumentFile),
-    __metadata("design:type", Array)
-], DocumentManagementData.prototype, "files", void 0);
 __decorate([
     Array(DocumentCategory),
     __metadata("design:type", Array)

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

@@ -23,7 +23,7 @@ export declare const createDocumentParametersSchema: import("../../schema/index.
     tags?: string[] | null | undefined;
     comment?: string | null | undefined;
     approval?: import("../models/document.model.js").DocumentApproval | undefined;
-    originalFileName: string | null;
+    originalFileName?: string | null | undefined;
     assignment: {
         collections: string | string[];
     } | {
@@ -49,15 +49,18 @@ export declare const createDocumentParametersSchema: import("../../schema/index.
 export declare const updateDocumentParametersSchema: import("../../schema/index.js").ObjectSchema<{
     id: import("../../orm/types.js").IsPrimaryKey<import("../../orm/types.js").HasDefault<import("../../orm/schemas/uuid.js").Uuid>>;
     date?: import("../../orm/types.js").NumericDate | null | undefined;
+    size?: number | undefined;
+    hash?: string | undefined;
     summary?: string | null | undefined;
     title?: string | null | undefined;
+    mimeType?: string | undefined;
     typeId?: import("../../orm/types.js").Uuid | null | undefined;
     subtitle?: string | null | undefined;
     tags?: string[] | null | undefined;
     comment?: string | null | undefined;
-    fileId?: import("../../orm/types.js").Uuid | undefined;
     pages?: number | null | undefined;
     approval?: import("../models/document.model.js").DocumentApproval | undefined;
+    originalFileName?: string | null | undefined;
     createUserId?: import("../../orm/types.js").Uuid | null | undefined;
     properties?: {
         propertyId: import("../../orm/schemas/uuid.js").Uuid;

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

@@ -1,10 +1,10 @@
 import { EntityMetadata } from '../../orm/entity.js';
 import { array, assign, boolean, enumeration, never, nullable, number, object, omit, oneOrMany, optional, partial, pick, string, union } from '../../schema/index.js';
-import { Document, DocumentAssignmentTarget, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentFile, DocumentProperty, DocumentPropertyValue, DocumentRequest, DocumentRequestsTemplate, DocumentRequestTemplate, DocumentType, DocumentTypeProperty } from '../models/index.js';
+import { Document, DocumentAssignmentTarget, DocumentCategory, DocumentCollection, DocumentCollectionAssignment, DocumentProperty, DocumentPropertyValue, DocumentRequest, DocumentRequestsTemplate, DocumentRequestTemplate, DocumentType, DocumentTypeProperty } from '../models/index.js';
 export const metadataParameterSchema = optional(partial(pick(EntityMetadata, 'attributes')));
 export const metadataParameterObjectSchema = object({ metadata: metadataParameterSchema });
 export const setDocumentPropertyParametersSchema = assign(pick(DocumentPropertyValue, ['propertyId']), object({ value: union(string(), number(), boolean(), nullable(never())) }), metadataParameterObjectSchema);
-export const createDocumentParametersSchema = assign(partial(pick(Document, ['typeId', 'title', 'subtitle', 'date', 'summary', 'tags', 'approval', 'comment'])), pick(DocumentFile, ['originalFileName']), object({
+export const createDocumentParametersSchema = assign(partial(pick(Document, ['typeId', 'title', 'subtitle', 'date', 'summary', 'tags', 'approval', 'comment', 'originalFileName'])), object({
     uploadId: string(),
     assignment: union(object({ collections: oneOrMany(string(), { minimum: 1 }) }), object({ request: string() }), object({
         automatic: object({

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

@@ -17,7 +17,6 @@ export declare class EnrichedDocumentManagementData {
         collections: Map<string, import("../document-management.view-model.js").DocumentCollectionView>;
         documents: Map<string, import("../document-management.view-model.js").DocumentView>;
         requests: Map<string, import("../document-management.view-model.js").DocumentRequestView>;
-        files: Map<string, import("../../index.js").DocumentFile>;
         categories: Map<string, import("../../index.js").DocumentCategory>;
         types: Map<string, import("../../index.js").DocumentType>;
     };

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

@@ -40,7 +40,6 @@ export class EnrichedDocumentManagementData {
         collections: () => getEntityMap(this.rawData.collections),
         documents: () => getEntityMap(this.rawData.documents),
         requests: () => getEntityMap(this.rawData.requests),
-        files: () => getEntityMap(this.rawData.files),
         categories: () => getEntityMap(this.rawData.categories),
         types: () => getEntityMap(this.rawData.types),
     });

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

@@ -2,10 +2,9 @@ import type { TypedOmit } from '../../../types.js';
 import type { DocumentApproval, DocumentValidationExecution, DocumentWorkflow } from '../../models/index.js';
 import type { DocumentPropertyValueView, DocumentView } from '../document-management.view-model.js';
 import { EnrichedDocumentAssignment } from './enriched-document-assignment.view.js';
-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' | 'assignment' | 'createUserId' | 'metadata'> {
+export declare class EnrichedDocument implements TypedOmit<DocumentView, 'typeId' | 'assignment' | 'createUserId' | 'metadata'> {
     #private;
     readonly id: string;
     readonly title: string | null;
@@ -16,11 +15,14 @@ export declare class EnrichedDocument implements TypedOmit<DocumentView, 'typeId
     readonly tags: string[] | null;
     readonly approval: DocumentApproval;
     readonly comment: string | null;
+    readonly originalFileName: string | null;
+    readonly mimeType: string;
+    readonly hash: string;
+    readonly size: number;
     readonly properties: DocumentPropertyValueView[];
     readonly currentWorkflow: DocumentWorkflow | null;
     readonly validations: DocumentValidationExecution[] | null;
     get type(): EnrichedDocumentType | null;
-    get file(): EnrichedDocumentFile;
     get assignments(): EnrichedDocumentAssignment;
     constructor(data: EnrichedDocumentManagementData, document: DocumentView);
 }

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

@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 import { Memoize } from '../../../utils/function/memoize.js';
 import { assertDefinedPass, isNull } from '../../../utils/type-guards.js';
 import { EnrichedDocumentAssignment } from './enriched-document-assignment.view.js';
-import { EnrichedDocumentFile } from './enriched-document-file.view.js';
 export class EnrichedDocument {
     #data;
     #documentView;
@@ -23,6 +22,10 @@ export class EnrichedDocument {
     tags;
     approval;
     comment;
+    originalFileName;
+    mimeType;
+    hash;
+    size;
     properties;
     currentWorkflow;
     validations;
@@ -32,10 +35,6 @@ export class EnrichedDocument {
         }
         return assertDefinedPass(this.#data.maps.types.get(this.#documentView.typeId));
     }
-    get file() {
-        const file = assertDefinedPass(this.#data.rawDataMaps.files.get(this.#documentView.fileId));
-        return new EnrichedDocumentFile(file, this);
-    }
     get assignments() {
         return new EnrichedDocumentAssignment(this.#data, this, this.#documentView.assignment);
     }
@@ -51,6 +50,10 @@ export class EnrichedDocument {
         this.tags = document.tags;
         this.approval = document.approval;
         this.comment = document.comment;
+        this.originalFileName = document.originalFileName;
+        this.mimeType = document.mimeType;
+        this.hash = document.hash;
+        this.size = document.size;
         this.properties = document.properties;
         this.currentWorkflow = document.currentWorkflow;
         this.validations = document.validations;
@@ -61,11 +64,6 @@ __decorate([
     __metadata("design:type", Object),
     __metadata("design:paramtypes", [])
 ], EnrichedDocument.prototype, "type", null);
-__decorate([
-    Memoize(),
-    __metadata("design:type", EnrichedDocumentFile),
-    __metadata("design:paramtypes", [])
-], EnrichedDocument.prototype, "file", null);
 __decorate([
     Memoize(),
     __metadata("design:type", EnrichedDocumentAssignment),

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

@@ -1,7 +1,6 @@
 export * from './enriched-document-assignment.view.js';
 export * from './enriched-document-category.view.js';
 export * from './enriched-document-collection.view.js';
-export * from './enriched-document-file.view.js';
 export * from './enriched-document-management-data.view.js';
 export * from './enriched-document-request.view.js';
 export * from './enriched-document-type.view.js';

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

@@ -1,7 +1,6 @@
 export * from './enriched-document-assignment.view.js';
 export * from './enriched-document-category.view.js';
 export * from './enriched-document-collection.view.js';
-export * from './enriched-document-file.view.js';
 export * from './enriched-document-management-data.view.js';
 export * from './enriched-document-request.view.js';
 export * from './enriched-document-type.view.js';

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

@@ -6,6 +6,8 @@ export type UploadObjectOptions = {
     metadata?: ObjectMetadata;
 };
 export type UploadUrlOptions = {
+    contentLength?: number;
+    contentType?: string;
     metadata?: ObjectMetadata;
 };
 export type CopyObjectOptions = {

package/orm/sqls.d.ts

@@ -1,9 +1,3 @@
-/**
- * @module
- * Provides utility SQL functions and constants for use with Drizzle ORM,
- * simplifying common SQL operations like generating UUIDs, working with intervals,
- * and aggregating data.
- */
 import { type AnyColumn, type Column, type SQL } from 'drizzle-orm';
 import type { GetSelectTableSelection, SelectResultField, TableLike } from 'drizzle-orm/query-builders/select.types';
 import type { Uuid } from './types.js';
@@ -72,3 +66,5 @@ export declare function numNulls(...columns: Column[]): SQL<number>;
  * @returns A Drizzle SQL object representing the count of non-nulls.
  */
 export declare function numNonNulls(...columns: Column[]): SQL<number>;
+export declare function least<T extends (Column | SQL | number)>(...values: T[]): SQL<SelectResultField<T>>;
+export declare function greatest<T extends (Column | SQL | number)>(...values: T[]): SQL<SelectResultField<T>>;

package/orm/sqls.js

@@ -4,6 +4,7 @@
  * simplifying common SQL operations like generating UUIDs, working with intervals,
  * and aggregating data.
  */
+import { isNumber } from '../utils/type-guards.js';
 import { sql, Table } from 'drizzle-orm';
 /** Drizzle SQL helper for getting the current transaction's timestamp. Returns a Date object. */
 export const TRANSACTION_TIMESTAMP = sql `transaction_timestamp()`;
@@ -86,3 +87,11 @@ export function numNulls(...columns) {
 export function numNonNulls(...columns) {
     return sql `num_nonnulls(${sql.join(columns, sql.raw(', '))})`;
 }
+export function least(...values) {
+    const sqlValues = values.map((value) => isNumber(value) ? sql.raw(String(value)) : value);
+    return sql `least(${sql.join(sqlValues, sql.raw(', '))})`;
+}
+export function greatest(...values) {
+    const sqlValues = values.map((value) => isNumber(value) ? sql.raw(String(value)) : value);
+    return sql `greatest(${sql.join(sqlValues, sql.raw(', '))})`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.92.135",
+  "version": "0.92.137",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -171,7 +171,7 @@
     }
   },
   "devDependencies": {
-    "@stylistic/eslint-plugin": "4.2",
+    "@stylistic/eslint-plugin": "4.4",
     "@types/chroma-js": "2.4",
     "@types/koa__router": "12.0",
     "@types/luxon": "3.6",

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

@@ -1,7 +0,0 @@
-import { Entity } from '../../orm/entity.js';
-export declare class DocumentFile extends Entity {
-    originalFileName: string | null;
-    mimeType: string;
-    hash: string;
-    size: number;
-}

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

@@ -1,38 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { Entity } from '../../orm/entity.js';
-import { Integer, StringProperty } from '../../schema/index.js';
-import { DocumentManagementTable } from './document-management-table.js';
-let DocumentFile = class DocumentFile extends Entity {
-    originalFileName;
-    mimeType;
-    hash;
-    size;
-};
-__decorate([
-    StringProperty({ nullable: true }),
-    __metadata("design:type", Object)
-], DocumentFile.prototype, "originalFileName", void 0);
-__decorate([
-    StringProperty(),
-    __metadata("design:type", String)
-], DocumentFile.prototype, "mimeType", void 0);
-__decorate([
-    StringProperty(),
-    __metadata("design:type", String)
-], DocumentFile.prototype, "hash", void 0);
-__decorate([
-    Integer(),
-    __metadata("design:type", Number)
-], DocumentFile.prototype, "size", void 0);
-DocumentFile = __decorate([
-    DocumentManagementTable()
-], DocumentFile);
-export { DocumentFile };

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

@@ -1,12 +0,0 @@
-import type { TypedOmit } from '../../../types.js';
-import type { DocumentFile } from '../../models/index.js';
-import type { EnrichedDocument } from './enriched-document.view.js';
-export declare class EnrichedDocumentFile implements TypedOmit<DocumentFile, 'metadata'> {
-    readonly id: string;
-    readonly originalFileName: string | null;
-    readonly mimeType: string;
-    readonly hash: string;
-    readonly size: number;
-    readonly document: EnrichedDocument;
-    constructor(file: DocumentFile, document: EnrichedDocument);
-}

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

@@ -1,16 +0,0 @@
-export class EnrichedDocumentFile {
-    id;
-    originalFileName;
-    mimeType;
-    hash;
-    size;
-    document;
-    constructor(file, document) {
-        this.id = file.id;
-        this.originalFileName = file.originalFileName;
-        this.mimeType = file.mimeType;
-        this.hash = file.hash;
-        this.size = file.size;
-        this.document = document;
-    }
-}