@tstdl/base 0.92.90 → 0.92.92

package/ai/ai-file.service.js

@@ -4,64 +4,13 @@ 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;
 };
-var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
-    if (value !== null && value !== void 0) {
-        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
-        var dispose, inner;
-        if (async) {
-            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
-            dispose = value[Symbol.asyncDispose];
-        }
-        if (dispose === void 0) {
-            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
-            dispose = value[Symbol.dispose];
-            if (async) inner = dispose;
-        }
-        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
-        if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
-        env.stack.push({ value: value, dispose: dispose, async: async });
-    }
-    else if (async) {
-        env.stack.push({ async: true });
-    }
-    return value;
-};
-var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
-    return function (env) {
-        function fail(e) {
-            env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
-            env.hasError = true;
-        }
-        var r, s = 0;
-        function next() {
-            while (r = env.stack.pop()) {
-                try {
-                    if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
-                    if (r.dispose) {
-                        var result = r.dispose.call(r.value);
-                        if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
-                    }
-                    else s |= 1;
-                }
-                catch (e) {
-                    fail(e);
-                }
-            }
-            if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
-            if (env.hasError) throw env.error;
-        }
-        return next();
-    };
-})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-});
 import '../polyfills.js';
+import { readFile } from 'node:fs/promises';
 import { Storage } from '@google-cloud/storage';
 import { FileState, GoogleAIFileManager } from '@google/generative-ai/server';
 import { AsyncEnumerable } from '../enumerable/async-enumerable.js';
 import { DetailsError } from '../errors/details.error.js';
-import { TemporaryFile } from '../file/temporary-file.js';
+import { NotImplementedError } from '../errors/not-implemented.error.js';
 import { Singleton } from '../injector/decorators.js';
 import { inject, injectArgument } from '../injector/inject.js';
 import { Logger } from '../logger/logger.js';
@@ -113,43 +62,33 @@ let AiFileService = class AiFileService {
         return files;
     }
     async uploadFile(fileInput, id) {
-        const env_1 = { stack: [], error: void 0, hasError: false };
-        try {
-            const inputIsBlob = isBlob(fileInput);
-            const tmpFile = __addDisposableResource(env_1, inputIsBlob
-                ? await TemporaryFile.from(fileInput.stream())
-                : undefined, true);
-            const path = inputIsBlob ? tmpFile.path : fileInput.path;
-            const mimeType = inputIsBlob ? fileInput.type : fileInput.mimeType;
-            const fileSize = inputIsBlob ? fileInput.size : await tmpFile.size();
-            this.#logger.verbose(`Uploading file "${id}" (${formatBytes(fileSize)})...`);
-            if (isDefined(this.#storage)) {
-                const bucket = await this.getBucket();
-                const [file] = await bucket.upload(path, { destination: id, contentType: mimeType });
-                return {
-                    id,
-                    name: id,
-                    uri: file.cloudStorageURI.toString(),
-                    mimeType
-                };
-            }
-            const response = await this.#fileManager.uploadFile(path, { mimeType });
+        const inputIsBlob = isBlob(fileInput);
+        const buffer = inputIsBlob
+            ? await fileInput.bytes()
+            : await readFile(fileInput.path);
+        const mimeType = inputIsBlob ? fileInput.type : fileInput.mimeType;
+        this.#logger.verbose(`Uploading file "${id}" (${formatBytes(buffer.length)})...`);
+        if (isDefined(this.#storage)) {
+            throw new NotImplementedError();
+            /*
+            const bucket = await this.getBucket();
+            const [file] = await bucket.upload(path, { destination: id, contentType: mimeType });
+      
             return {
-                id,
-                name: response.file.name,
-                uri: response.file.uri,
-                mimeType: response.file.mimeType
+              id,
+              name: id,
+              uri: file.cloudStorageURI.toString(),
+              mimeType
             };
+            */
         }
-        catch (e_1) {
-            env_1.error = e_1;
-            env_1.hasError = true;
-        }
-        finally {
-            const result_1 = __disposeResources(env_1);
-            if (result_1)
-                await result_1;
-        }
+        const response = await this.#fileManager.uploadFile(buffer, { mimeType });
+        return {
+            id,
+            name: response.file.name,
+            uri: response.file.uri,
+            mimeType: response.file.mimeType
+        };
     }
     async getBucket() {
         if (isUndefined(this.#options.vertex)) {

package/orm/query.d.ts

@@ -1,12 +1,12 @@
 import type { SQLWrapper } from 'drizzle-orm';
 import type { Flatten, Record } from '../types.js';
 import type { Geometry } from '../types/geo-json.js';
-import type { Untagged } from '../types/tagged.js';
+import type { UntaggedDeep } from '../types/tagged.js';
 export type LogicalQuery<T = any> = LogicalAndQuery<T> | LogicalOrQuery<T> | LogicalNorQuery<T>;
 export type LogicalQueryTypes = keyof (LogicalAndQuery & LogicalOrQuery & LogicalNorQuery);
 export declare const allLogicalQueryTypes: LogicalQueryTypes[];
 export type ComparisonQueryBody<T = any> = {
-    [P in keyof T]?: ComparisonQueryOrValue<T[P]>;
+    [P in keyof T]?: T[P] extends Record ? ComparisonQueryBody<T[P]> : ComparisonQueryOrValue<T[P]>;
 } & Record<ComparisonQueryOrValue>;
 export type ComparisonQueryOrValue<T = any> = ComparisonQuery<T> | ComparisonValue<T>;
 export type ComparisonQuery<T = any> = Partial<ComparisonNotQuery<T> & ComparisonEqualsQuery<T> & ComparisonNotEqualsQuery<T> & ComparisonExistsQuery & ComparisonItemQuery<T> & ComparisonInQuery<T> & ComparisonNotInQuery<T> & ComparisonAllQuery<T> & ComparisonGreaterThanQuery<T> & ComparisonGreaterThanOrEqualsQuery<T> & ComparisonLessThanQuery<T> & ComparisonLessThanOrEqualsQuery<T> & ComparisonRegexQuery & ComparisonTextQuery & ComparisonGeoShapeQuery & ComparisonGeoDistanceQuery>;
@@ -15,7 +15,7 @@ export declare const allComparisonQueryTypes: ComparisonQueryTypes[];
 export type SpecialQuery<T = any> = Partial<TextSpanQuery<T>>;
 export type SpecialQueryTypes = keyof SpecialQuery;
 export declare const allSpecialQueryTypes: SpecialQueryTypes[];
-export type Query<T = any> = SQLWrapper | QueryObject<T>;
+export type Query<T = any> = SQLWrapper | QueryObject<UntaggedDeep<T>>;
 export type QueryObject<T> = LogicalQuery<T> | (ComparisonQueryBody<T> & SpecialQuery<T>);
 export type QueryTypes = LogicalQueryTypes | ComparisonQueryTypes | SpecialQueryTypes;
 export declare const allQueryTypes: ("$and" | "$or" | "$nor" | "$not" | "$eq" | "$neq" | "$exists" | "$item" | "$in" | "$nin" | "$all" | "$gt" | "$gte" | "$lt" | "$lte" | "$regex" | "$text" | "$geoShape" | "$geoDistance" | "$textSpan")[];
@@ -30,7 +30,7 @@ export type LogicalOrQuery<T = any> = {
 export type LogicalNorQuery<T = any> = {
     $nor: readonly Query<T>[];
 };
-export type ComparisonValue<T> = Untagged<T | Flatten<T>> | SQLWrapper;
+export type ComparisonValue<T> = T | Flatten<T> | SQLWrapper;
 export type ComparisonValueWithRegex<T> = T extends string ? ComparisonValue<T | RegExp> : T extends readonly string[] ? ComparisonValue<readonly (Flatten<T> | RegExp)[]> : (T | Flatten<T>);
 export type ComparisonNotQuery<T = any> = {
     $not: ComparisonQuery<T>;

package/orm/server/repository.d.ts

@@ -75,8 +75,8 @@ export declare class EntityRepository<T extends Entity | EntityWithoutMetadata =
     tryHardDeleteByQuery(query: Query<T>): Promise<T | undefined>;
     hardDeleteMany(ids: string[]): Promise<T[]>;
     hardDeleteManyByQuery(query: Query<T>): Promise<T[]>;
-    $getColumn(pathOrColumn: Paths<UntaggedDeep<T>> | ColumnDefinition): PgColumn;
-    $convertOrderBy(orderBy: Order<T>): SQL<unknown>[];
+    getColumn(pathOrColumn: Paths<UntaggedDeep<T>> | ColumnDefinition): PgColumn;
+    convertOrderBy(orderBy: Order<T>): SQL<unknown>[];
     convertQuery(query: Query<T>): SQL;
     mapManyToEntity(columns: InferSelect[]): Promise<T[]>;
     mapToEntity(columns: InferSelect): Promise<T>;

package/orm/server/repository.js

@@ -125,7 +125,7 @@ let EntityRepository = class EntityRepository {
             .offset(options?.offset)
             .$dynamic();
         if (isDefined(options?.order)) {
-            dbQuery = dbQuery.orderBy(...this.$convertOrderBy(options.order));
+            dbQuery = dbQuery.orderBy(...this.convertOrderBy(options.order));
         }
         const [row] = await dbQuery;
         if (isUndefined(row)) {
@@ -150,7 +150,7 @@ let EntityRepository = class EntityRepository {
             .limit(options?.limit)
             .$dynamic();
         if (isDefined(options?.order)) {
-            dbQuery = dbQuery.orderBy(...this.$convertOrderBy(options.order));
+            dbQuery = dbQuery.orderBy(...this.convertOrderBy(options.order));
         }
         const rows = await dbQuery;
         return this.mapManyToEntity(rows);
@@ -230,7 +230,7 @@ let EntityRepository = class EntityRepository {
         return this.mapManyToEntity(rows);
     }
     async upsert(target, entity, update) {
-        const targetColumns = toArray(target).map((path) => this.$getColumn(path));
+        const targetColumns = toArray(target).map((path) => this.getColumn(path));
         const columns = await this.mapToInsertColumns(entity);
         const mappedUpdate = await this.mapUpdate(update ?? entity);
         const [row] = await this.session
@@ -244,12 +244,12 @@ let EntityRepository = class EntityRepository {
         return this.mapToEntity(row);
     }
     async upsertMany(target, entities, update) {
-        const targetColumns = toArray(target).map((path) => this.$getColumn(path));
+        const targetColumns = toArray(target).map((path) => this.getColumn(path));
         const columns = await this.mapManyToInsertColumns(entities);
         const mappedUpdate = isDefined(update)
             ? await this.mapUpdate(update)
             : {
-                ...fromEntries(this.#columnDefinitions.map((column) => [column.name, sql `excluded.${sql.identifier(this.$getColumn(column).name)}`])),
+                ...fromEntries(this.#columnDefinitions.map((column) => [column.name, sql `excluded.${sql.identifier(this.getColumn(column).name)}`])),
                 ...this._getMetadataUpdate(update)
             };
         const rows = await this.session
@@ -427,26 +427,26 @@ let EntityRepository = class EntityRepository {
             .returning();
         return this.mapManyToEntity(rows);
     }
-    $getColumn(pathOrColumn) {
+    getColumn(pathOrColumn) {
         if (isString(pathOrColumn)) {
             const columnName = assertDefinedPass(this.#columnDefinitionsMap.get(pathOrColumn), `Could not map ${pathOrColumn} to column.`).name;
             return this.#table[columnName];
         }
         return this.#table[pathOrColumn.name];
     }
-    $convertOrderBy(orderBy) {
+    convertOrderBy(orderBy) {
         if (isArray(orderBy)) {
             return orderBy.map((item) => {
                 const itemIsArray = isArray(item);
                 const target = itemIsArray ? item[0] : item;
-                const column = isSQLWrapper(target) ? target : this.$getColumn(target);
+                const column = isSQLWrapper(target) ? target : this.getColumn(target);
                 const direction = itemIsArray ? item[1] : 'asc';
                 return direction == 'asc' ? asc(column) : desc(column);
             });
         }
         return objectEntries(orderBy)
             .map(([path, direction]) => {
-            const column = this.$getColumn(path);
+            const column = this.getColumn(path);
             return direction == 'asc' ? asc(column) : desc(column);
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.92.90",
+  "version": "0.92.92",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -93,6 +93,7 @@
     "./promise": "./promise/index.js",
     "./queue": "./queue/index.js",
     "./queue/mongo": "./queue/mongo/index.js",
+    "./queue/postgres": "./queue/postgres/index.js",
     "./random": "./random/index.js",
     "./reflection": "./reflection/index.js",
     "./rpc": "./rpc/index.js",
@@ -159,7 +160,7 @@
   },
   "peerDependencies": {
     "@elastic/elasticsearch": "^8.17",
-    "@google/generative-ai": "^0.23",
+    "@google/generative-ai": "^0.24",
     "@tstdl/angular": "^0.92",
     "@zxcvbn-ts/core": "^3.0",
     "@zxcvbn-ts/language-common": "^3.0",

package/queue/postgres/queue.js

@@ -139,6 +139,7 @@ let PostgresQueue = class PostgresQueue extends Queue {
 };
 PostgresQueue = __decorate([
     Singleton({
+        argumentIdentityProvider: JSON.stringify,
         providers: [
             provide(EntityRepositoryConfig, { useValue: { schema: 'queue' } }),
             provide(DatabaseConfig, { useFactory: (_, context) => context.resolve(PostgresQueueModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) })