@tstdl/base 0.92.150 → 0.92.151

package/ai/ai-file.service.d.ts

@@ -1,6 +1,6 @@
 import type { Resolvable, resolveArgumentType } from '../injector/interfaces.js';
 import type { AiServiceOptions } from './ai.service.js';
-import type { FileContentPart, FileInput } from './types.js';
+import { type FileContentPart, type FileInput } from './types.js';
 /**
  * Options for {@link AiFileService}.
  */
@@ -48,6 +48,8 @@ export declare class AiFileService implements Resolvable<AiFileServiceArgument>
     private getFile;
     private getFiles;
     private uploadFile;
+    private uploadFileVertex;
+    private uploadFileGenAi;
     private getBucket;
     private waitForFileActive;
     private waitForFilesActive;

package/ai/ai-file.service.js

@@ -4,7 +4,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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;
 };
-import { openAsBlob } from 'node:fs';
+import { createReadStream } from 'node:fs';
+import { stat } from 'node:fs/promises';
 import { Readable } from 'node:stream';
 import { ReadableStream as NodeReadableStream } from 'node:stream/web';
 import { Storage } from '@google-cloud/storage';
@@ -18,7 +19,9 @@ import { Logger } from '../logger/logger.js';
 import { createArray } from '../utils/array/array.js';
 import { backoffGenerator } from '../utils/backoff.js';
 import { formatBytes } from '../utils/format.js';
+import { readBinaryStream } from '../utils/stream/stream-reader.js';
 import { assertDefinedPass, isBlob, isDefined, isUndefined } from '../utils/type-guards.js';
+import { isPathFileInput } from './types.js';
 /**
  * Manages file uploads and state for use with AI models.
  * Handles both Google Generative AI File API and Google Cloud Storage for Vertex AI.
@@ -103,24 +106,67 @@ let AiFileService = class AiFileService {
         return files;
     }
     async uploadFile(fileInput, id) {
-        const inputIsBlob = isBlob(fileInput);
-        const blob = inputIsBlob
-            ? fileInput
-            : await openAsBlob(fileInput.path, { type: fileInput.mimeType });
-        this.#logger.verbose(`Uploading file "${id}" (${formatBytes(blob.size)})...`);
         if (isDefined(this.#storage)) {
-            const bucket = await this.getBucket();
-            const file = bucket.file(id);
-            const blobStream = Readable.fromWeb(blob.stream());
-            await file.save(blobStream, { contentType: blob.type, resumable: false });
-            return {
-                id,
-                name: id, // For Vertex, name is the GCS object id
-                uri: `gs://${bucket.name}/${file.name}`,
-                mimeType: blob.type,
-            };
+            return await this.uploadFileVertex(fileInput, id);
         }
-        const response = await this.#genAI.files.upload({ file: blob, config: { mimeType: blob.type } });
+        return await this.uploadFileGenAi(fileInput, id);
+    }
+    async uploadFileVertex(fileInput, id) {
+        const bucket = await this.getBucket();
+        const file = bucket.file(id);
+        let stream;
+        let contentType;
+        let size;
+        if (isBlob(fileInput)) {
+            stream = Readable.fromWeb(fileInput.stream());
+            contentType = fileInput.type;
+            size = fileInput.size;
+        }
+        else if (isPathFileInput(fileInput)) {
+            const stats = await stat(fileInput.path);
+            stream = createReadStream(fileInput.path);
+            contentType = fileInput.mimeType;
+            size = stats.size;
+        }
+        else {
+            stream = Readable.fromWeb(fileInput.stream);
+            contentType = fileInput.mimeType;
+            size = fileInput.size;
+        }
+        this.#logger.verbose(`Uploading file "${id}"${isDefined(size) ? ` (${formatBytes(size)})` : ''}...`);
+        await file.save(stream, { contentType, resumable: false });
+        return {
+            id,
+            name: id,
+            uri: `gs://${bucket.name}/${file.name}`,
+            mimeType: contentType,
+        };
+    }
+    async uploadFileGenAi(fileInput, id) {
+        let uploadData;
+        let contentType;
+        let size;
+        if (isBlob(fileInput)) {
+            uploadData = fileInput;
+            contentType = fileInput.type;
+            size = fileInput.size;
+        }
+        else if (isPathFileInput(fileInput)) {
+            const fileState = await stat(fileInput.path);
+            uploadData = fileInput.path;
+            contentType = fileInput.mimeType;
+            size = fileState.size;
+        }
+        else {
+            const fileBytes = await readBinaryStream(fileInput.stream);
+            const blob = new Blob([fileBytes], { type: fileInput.mimeType });
+            uploadData = blob;
+            contentType = blob.type;
+            size = blob.size;
+        }
+        this.#logger.verbose(`Uploading file "${id}" (${formatBytes(size)}) via GenAI API...`);
+        // upload supports paths and blobs, but not streams (yet)
+        const response = await this.#genAI.files.upload({ file: uploadData, config: { mimeType: contentType } });
         return {
             id,
             name: assertDefinedPass(response.name, 'Missing file name'),

package/ai/types.d.ts

@@ -8,6 +8,10 @@ import type { ResolvedValueOrProvider, ValueOrAsyncProvider } from '../utils/val
 export type FileInput = {
     path: string;
     mimeType: string;
+} | {
+    stream: ReadableStream<Uint8Array>;
+    mimeType: string;
+    size?: number;
 } | Blob;
 /**
  * A record of named function declarations, where each key is the function name.
@@ -202,3 +206,12 @@ export declare function defineFunction<P extends Record, T extends SchemaFunctio
  * @returns `true` if the declaration has a `handler` property, `false` otherwise.
  */
 export declare function isSchemaFunctionDeclarationWithHandler(declaration: SchemaFunctionDeclaration): declaration is SchemaFunctionDeclarationWithHandler;
+export declare function isPathFileInput(input: FileInput): input is {
+    path: string;
+    mimeType: string;
+};
+export declare function isStreamFileInput(input: FileInput): input is {
+    stream: ReadableStream<Uint8Array>;
+    mimeType: string;
+    size?: number;
+};

package/ai/types.js

@@ -1,4 +1,5 @@
 import { hasOwnProperty } from '../utils/object/object.js';
+import { isBlob } from '../utils/type-guards.js';
 /**
  * A helper function to define a set of function declarations with strong type inference.
  * @param declarations A record of function declarations.
@@ -24,3 +25,9 @@ export function defineFunction(declaration) {
 export function isSchemaFunctionDeclarationWithHandler(declaration) {
     return hasOwnProperty(declaration, 'handler');
 }
+export function isPathFileInput(input) {
+    return !isBlob(input) && hasOwnProperty(input, 'path');
+}
+export function isStreamFileInput(input) {
+    return !isBlob(input) && hasOwnProperty(input, 'stream');
+}

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

@@ -86,8 +86,8 @@ export declare const documentManagementApiDefinition: {
             resource: string;
             method: "POST";
             parameters: import("../../schema/index.js").ObjectSchema<{
-                label: string;
                 parentId: import("../../orm/schemas/uuid.js").Uuid | null;
+                label: string;
                 metadata?: Partial<{
                     attributes: import("../../orm/types.js").HasDefault<import("../../orm/schemas/json.js").Json<import("../../orm/entity.js").EntityMetadataAttributes>>;
                 }> | undefined;
@@ -125,10 +125,10 @@ export declare const documentManagementApiDefinition: {
             method: "POST";
             parameters: import("../../schema/index.js").ObjectSchema<{
                 date?: import("../../orm/types.js").NumericDate | null | undefined;
-                summary?: string | null | undefined;
-                title?: string | null | undefined;
                 typeId?: import("../../orm/types.js").Uuid | null | undefined;
+                title?: string | null | undefined;
                 subtitle?: string | null | undefined;
+                summary?: string | null | undefined;
                 comment?: string | null | undefined;
                 approval?: import("../models/document.model.js").DocumentApproval | undefined;
                 originalFileName?: string | null | undefined;
@@ -177,8 +177,8 @@ 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>>;
                 description?: string | null | undefined;
-                label?: string | undefined;
                 tenantId?: string | null | undefined;
+                label?: string | undefined;
                 metadata?: Partial<{
                     attributes: import("../../orm/types.js").HasDefault<import("../../orm/schemas/json.js").Json<import("../../orm/entity.js").EntityMetadataAttributes>>;
                 }> | undefined;
@@ -324,8 +324,8 @@ 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;
-                title?: string | null | undefined;
                 typeId?: import("../../orm/types.js").Uuid | null | undefined;
+                title?: string | null | undefined;
                 subtitle?: string | null | undefined;
                 comment?: string | null | undefined;
                 properties?: {
@@ -483,8 +483,8 @@ declare const _DocumentManagementApi: import("../../api/client/index.js").ApiCli
             resource: string;
             method: "POST";
             parameters: import("../../schema/index.js").ObjectSchema<{
-                label: string;
                 parentId: import("../../orm/schemas/uuid.js").Uuid | null;
+                label: string;
                 metadata?: Partial<{
                     attributes: import("../../orm/types.js").HasDefault<import("../../orm/schemas/json.js").Json<import("../../orm/entity.js").EntityMetadataAttributes>>;
                 }> | undefined;
@@ -522,10 +522,10 @@ declare const _DocumentManagementApi: import("../../api/client/index.js").ApiCli
             method: "POST";
             parameters: import("../../schema/index.js").ObjectSchema<{
                 date?: import("../../orm/types.js").NumericDate | null | undefined;
-                summary?: string | null | undefined;
-                title?: string | null | undefined;
                 typeId?: import("../../orm/types.js").Uuid | null | undefined;
+                title?: string | null | undefined;
                 subtitle?: string | null | undefined;
+                summary?: string | null | undefined;
                 comment?: string | null | undefined;
                 approval?: import("../models/document.model.js").DocumentApproval | undefined;
                 originalFileName?: string | null | undefined;
@@ -574,8 +574,8 @@ 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>>;
                 description?: string | null | undefined;
-                label?: string | undefined;
                 tenantId?: string | null | undefined;
+                label?: string | undefined;
                 metadata?: Partial<{
                     attributes: import("../../orm/types.js").HasDefault<import("../../orm/schemas/json.js").Json<import("../../orm/entity.js").EntityMetadataAttributes>>;
                 }> | undefined;
@@ -721,8 +721,8 @@ 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;
-                title?: string | null | undefined;
                 typeId?: import("../../orm/types.js").Uuid | null | undefined;
+                title?: string | null | undefined;
                 subtitle?: string | null | undefined;
                 comment?: string | null | undefined;
                 properties?: {

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

@@ -20,10 +20,10 @@ export declare const updateDocumentCollectionsParametersSchema: import("../../sc
 }>;
 export declare const createDocumentParametersSchema: import("../../schema/index.js").ObjectSchema<{
     date?: import("../../orm/types.js").NumericDate | null | undefined;
-    summary?: string | null | undefined;
-    title?: string | null | undefined;
     typeId?: import("../../orm/types.js").Uuid | null | undefined;
+    title?: string | null | undefined;
     subtitle?: string | null | undefined;
+    summary?: string | null | undefined;
     comment?: string | null | undefined;
     approval?: import("../models/document.model.js").DocumentApproval | undefined;
     originalFileName?: string | null | undefined;
@@ -53,8 +53,8 @@ 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;
-    title?: string | null | undefined;
     typeId?: import("../../orm/types.js").Uuid | null | undefined;
+    title?: string | null | undefined;
     subtitle?: string | null | undefined;
     comment?: string | null | undefined;
     properties?: {
@@ -97,8 +97,8 @@ export declare const createDocumentRequestsTemplateParametersSchema: import("../
 export declare const updateDocumentRequestsTemplateParametersSchema: import("../../schema/index.js").ObjectSchema<{
     id: import("../../orm/types.js").IsPrimaryKey<import("../../orm/types.js").HasDefault<import("../../orm/schemas/uuid.js").Uuid>>;
     description?: string | null | undefined;
-    label?: string | undefined;
     tenantId?: string | null | undefined;
+    label?: string | undefined;
     metadata?: Partial<{
         attributes: import("../../orm/types.js").HasDefault<import("../../orm/schemas/json.js").Json<import("../../orm/entity.js").EntityMetadataAttributes>>;
     }> | undefined;
@@ -181,8 +181,8 @@ export declare const setDocumentPropertiesParametersSchema: import("../../schema
     documentId: string;
 }>;
 export declare const createDocumentCategoryParametersSchema: import("../../schema/index.js").ObjectSchema<{
-    label: string;
     parentId: import("../../orm/schemas/uuid.js").Uuid | null;
+    label: string;
     metadata?: Partial<{
         attributes: import("../../orm/types.js").HasDefault<import("../../orm/schemas/json.js").Json<import("../../orm/entity.js").EntityMetadataAttributes>>;
     }> | undefined;
@@ -212,8 +212,8 @@ export declare const rejectDocumentRequestParametersSchema: import("../../schema
     }> | undefined;
 }>;
 export declare const createDocumentPropertyParametersSchema: import("../../schema/index.js").ObjectSchema<{
-    label: string;
     dataType: import("../../orm/types.js").Enum<import("../models/document-property.model.js").DocumentPropertyDataType>;
+    label: string;
     metadata?: Partial<{
         attributes: import("../../orm/types.js").HasDefault<import("../../orm/schemas/json.js").Json<import("../../orm/entity.js").EntityMetadataAttributes>>;
     }> | undefined;

package/image-service/imgproxy/imgproxy-image-service.d.ts

@@ -1,7 +1,6 @@
 import { resolveArgumentType } from '../../injector/index.js';
 import type { Resolvable } from '../../injector/interfaces.js';
-import type { ImageOptions } from '../image-service.js';
-import { ImageService } from '../image-service.js';
+import { ImageService, type ImageOptions } from '../image-service.js';
 export type ImgproxyImageServiceConfig = {
     endpoint: string;
     key: string;

package/image-service/imgproxy/imgproxy-image-service.js

@@ -17,7 +17,7 @@ import { concatArrayBufferViews } from '../../utils/binary.js';
 import { importHmacKey, sign } from '../../utils/cryptography.js';
 import { decodeHex, encodeUtf8 } from '../../utils/encoding.js';
 import { isDefined } from '../../utils/type-guards.js';
-import { ImageService } from '../image-service.js';
+import { ImageOrigin, ImageService } from '../image-service.js';
 export const IMGPROXY_IMAGE_SERVICE_CONFIG = injectionToken('ImgproxyImageServiceConfig');
 let ImgproxyImageService = class ImgproxyImageService extends ImageService {
     #keyBytes;
@@ -75,16 +75,16 @@ async function signString(keyBytes, saltBytes, target, size = 32) {
 }
 function convertOrigin(origin) {
     switch (origin) {
-        case 'center': return 'ce';
-        case 'smart': return 'sm';
-        case 'top': return 'no';
-        case 'left': return 'we';
-        case 'right': return 'ea';
-        case 'bottom': return 'so';
-        case 'topleft': return 'nowe';
-        case 'topright': return 'noea';
-        case 'bottomleft': return 'sowe';
-        case 'bottomright': return 'soea';
+        case ImageOrigin.Center: return 'ce';
+        case ImageOrigin.Smart: return 'sm';
+        case ImageOrigin.Top: return 'no';
+        case ImageOrigin.Left: return 'we';
+        case ImageOrigin.Right: return 'ea';
+        case ImageOrigin.Bottom: return 'so';
+        case ImageOrigin.TopLeft: return 'nowe';
+        case ImageOrigin.TopRight: return 'noea';
+        case ImageOrigin.BottomLeft: return 'sowe';
+        case ImageOrigin.BottomRight: return 'soea';
         default: throw new Error();
     }
 }

package/package.json

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

package/utils/binary.d.ts

@@ -1,4 +1,4 @@
-import type { BinaryData, Type } from '../types/index.js';
+import type { BinaryData } from '../types/index.js';
 /**
  * Get ArrayBuffer from binary data
  * @param data data to get ArrayBuffer from
@@ -11,6 +11,5 @@ export declare function toArrayBuffer(data: BinaryData, clone?: boolean): ArrayB
  * @param clone whether to clone buffer or not
  */
 export declare function toUint8Array(data: BinaryData, clone?: boolean): Uint8Array;
-export declare function concatArrayBuffers(buffers: ArrayBufferLike[]): ArrayBufferLike;
-export declare function concatArrayBufferViews<T extends ArrayBufferView>(arrays: T[], totalLength?: number): T;
-export declare function concatArrayBufferViews<T extends ArrayBufferView>(arrays: ArrayBufferView[], targetType: Type<T, [ArrayBufferLike, number, number]>, totalLength?: number): T;
+export declare function concatArrayBuffers(buffers: readonly ArrayBufferLike[]): ArrayBuffer;
+export declare function concatArrayBufferViews(arrays: readonly ArrayBufferView[], totalLength?: number): Uint8Array<ArrayBuffer>;

package/utils/binary.js

@@ -1,6 +1,5 @@
 import { supportsBuffer } from '../supports.js';
-import { typeExtends } from './index.js';
-import { assert, isArrayBuffer, isFunction, isNumber } from './type-guards.js';
+import { assert, isArrayBuffer, isUint8Array } from './type-guards.js';
 /**
  * Get ArrayBuffer from binary data
  * @param data data to get ArrayBuffer from
@@ -36,13 +35,10 @@ export function concatArrayBuffers(buffers) {
     const bytes = concatArrayBufferViews(arrays);
     return bytes.buffer;
 }
-export function concatArrayBufferViews(arrays, totalLengthOrTargetType, totalLengthOrNothing) {
+export function concatArrayBufferViews(arrays, totalLength) {
     assert(arrays.length > 0, 'No array provided.');
-    const totalLength = isNumber(totalLengthOrTargetType) ? totalLengthOrTargetType : totalLengthOrNothing;
-    const type = isFunction(totalLengthOrTargetType) ? totalLengthOrTargetType : arrays[0].constructor;
-    if (supportsBuffer && typeExtends(type, Uint8Array)) {
-        const merged = Buffer.concat(arrays, totalLength);
-        return new type(merged.buffer, merged.byteOffset, merged.byteLength);
+    if (supportsBuffer && arrays.every((array) => isUint8Array(array))) {
+        return Buffer.concat(arrays, totalLength);
     }
     const totalBytes = totalLength ?? arrays.reduce((sum, array) => sum + array.byteLength, 0);
     const merged = new Uint8Array(totalBytes);
@@ -52,5 +48,5 @@ export function concatArrayBufferViews(arrays, totalLengthOrTargetType, totalLen
         merged.set(uint8Array, currentIndex);
         currentIndex += uint8Array.byteLength;
     }
-    return new type(merged.buffer, merged.byteOffset, merged.byteLength);
+    return merged;
 }

package/utils/stream/stream-reader.d.ts

@@ -6,5 +6,5 @@ export type ReadBinaryStreamOptions = {
     /** Action if source stream has less bytes than provided length */
     onLengthSubceed?: 'error' | 'close' | 'leave-open';
 };
-export declare function readBinaryStream(iterableOrStream: AnyIterable<ArrayBufferView> | ReadableStream<ArrayBufferView>, { length, onLengthExceed, onLengthSubceed }?: ReadBinaryStreamOptions): Promise<Uint8Array>;
+export declare function readBinaryStream(iterableOrStream: AnyIterable<ArrayBufferView> | ReadableStream<ArrayBufferView>, { length, onLengthExceed, onLengthSubceed }?: ReadBinaryStreamOptions): Promise<Uint8Array<ArrayBuffer>>;
 export declare function readTextStream(iterableOrStream: AsyncIterable<string> | ReadableStream<string>): Promise<string>;

package/utils/stream/stream-reader.js

@@ -114,7 +114,7 @@ export async function readBinaryStream(iterableOrStream, { length, onLengthExcee
     if (views.length == 0) {
         return new Uint8Array(0);
     }
-    return concatArrayBufferViews(views, Uint8Array, totalLength);
+    return concatArrayBufferViews(views, totalLength);
 }
 export async function readTextStream(iterableOrStream) {
     const iterable = isAsyncIterable(iterableOrStream) ? iterableOrStream : getReadableStreamIterable(iterableOrStream);