@tstdl/base 0.93.46 → 0.93.48

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

@@ -1,10 +1,10 @@
 import type { Resolvable, resolveArgumentType } from '../injector/interfaces.js';
-import type { AiServiceOptions } from './ai.service.js';
+import { AiModuleOptions } from './module.js';
 import { type FileContentPart, type FileInput } from './types.js';
 /**
  * Options for {@link AiFileService}.
  */
-export type AiFileServiceOptions = Pick<AiServiceOptions, 'apiKey' | 'keyFile' | 'vertex'>;
+export type AiFileServiceOptions = Pick<AiModuleOptions, 'apiKey' | 'keyFile' | 'vertex'>;
 export type AiFileServiceArgument = AiFileServiceOptions;
 type File = {
     id: string;

package/ai/ai-file.service.js

@@ -21,13 +21,14 @@ 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 { AiModuleOptions } from './module.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.
  */
 let AiFileService = class AiFileService {
-    #options = injectArgument(this);
+    #options = injectArgument(this, { optional: true }) ?? inject(AiModuleOptions);
     #genAI = new GoogleGenAI({
         vertexai: isDefined(this.#options.vertex?.project),
         project: this.#options.vertex?.project,

package/ai/ai.service.d.ts

@@ -2,6 +2,7 @@ import type { Resolvable, resolveArgumentType } from '../injector/interfaces.js'
 import { type SchemaTestable } from '../schema/index.js';
 import type { Enumeration as EnumerationType, EnumerationValue } from '../types/index.js';
 import { AiSession } from './ai-session.js';
+import { AiModuleOptions } from './module.js';
 import { type AiModel, type FileContentPart, type FileInput, type GenerationOptions, type GenerationRequest, type GenerationResult, type SchemaFunctionDeclarations, type SchemaFunctionDeclarationsResult } from './types.js';
 /**
  * A generation result that includes a specialized, typed result alongside the raw generation data.
@@ -20,27 +21,7 @@ export type SpecializedGenerationResult<T> = {
 export type SpecializedGenerationResultGenerator<T> = AsyncGenerator<T> & {
     raw: Promise<GenerationResult>;
 };
-/**
- * Options for configuring the {@link AiService}.
- */
-export declare class AiServiceOptions {
-    /** Google AI API key. */
-    apiKey?: string;
-    /** Path to the Google Cloud credentials file. */
-    keyFile?: string;
-    /** Vertex AI specific options. If provided, the service will use Vertex AI endpoints. */
-    vertex?: {
-        project: string;
-        location: string;
-        bucket?: string;
-    };
-    /**
-     * The default model to use for generation requests.
-     * @default 'small'
-     */
-    defaultModel?: AiModel;
-}
-export type AiServiceArgument = AiServiceOptions;
+export type AiServiceArgument = AiModuleOptions;
 export type ClassificationResult<T extends EnumerationType> = {
     types: {
         type: EnumerationValue<T>;

package/ai/ai.service.js

@@ -27,24 +27,8 @@ import { assertDefinedPass, isDefined, isError, isNotNull, isNull, isUndefined }
 import { resolveValueOrAsyncProvider } from '../utils/value-or-provider.js';
 import { AiFileService } from './ai-file.service.js';
 import { AiSession } from './ai-session.js';
+import { AiModuleOptions } from './module.js';
 import { isSchemaFunctionDeclarationWithHandler } from './types.js';
-/**
- * Options for configuring the {@link AiService}.
- */
-export class AiServiceOptions {
-    /** Google AI API key. */
-    apiKey;
-    /** Path to the Google Cloud credentials file. */
-    keyFile;
-    /** Vertex AI specific options. If provided, the service will use Vertex AI endpoints. */
-    vertex;
-    /**
-     * The default model to use for generation requests.
-     * @default 'small'
-     */
-    defaultModel;
-}
-;
 const functionCallingModeMap = {
     auto: GoogleFunctionCallingMode.AUTO,
     force: GoogleFunctionCallingMode.ANY,
@@ -58,7 +42,7 @@ let generationCounter = 0;
  * supporting both standard Google AI and Vertex AI endpoints.
  */
 let AiService = AiService_1 = class AiService {
-    #options = injectArgument(this, { optional: true }) ?? inject(AiServiceOptions);
+    #options = injectArgument(this, { optional: true }) ?? inject(AiModuleOptions);
     #fileService = inject(AiFileService, this.#options);
     #logger = inject(Logger, AiService_1.name);
     #cancellationSignal = inject(CancellationSignal);
@@ -81,7 +65,7 @@ let AiService = AiService_1 = class AiService {
     /**
      * The default AI model to use for requests if not specified otherwise.
      */
-    defaultModel = this.#options.defaultModel ?? 'gemini-flash-lite-latest';
+    defaultModel = this.#options.defaultModel ?? 'gemini-2.5-flash-lite';
     /**
      * Creates a new {@link AiSession} for managing conversational history.
      */
@@ -437,8 +421,8 @@ let AiService = AiService_1 = class AiService {
     }
     mapModel(model) {
         return match(model)
-            .with('small', () => 'gemini-flash-lite-latest')
-            .with('medium', () => 'gemini-flash-latest')
+            .with('small', () => 'gemini-2.5-flash-lite')
+            .with('medium', () => 'gemini-2.5-flash')
             .with('large', () => 'gemini-2.5-pro')
             .otherwise(() => model ?? this.defaultModel);
     }

package/ai/module.d.ts

@@ -1,11 +1,26 @@
-import { AiServiceOptions } from './ai.service.js';
+import type { AiModel } from './types.js';
 /**
- * Options for configuring the AI module.
- * @see {@link AiServiceOptions}
+ * Options for configuring the AI Module.
  */
-export type ApiModuleOptions = AiServiceOptions;
+export declare class AiModuleOptions {
+    /** Google AI API key. */
+    apiKey?: string;
+    /** Path to the Google Cloud credentials file. */
+    keyFile?: string;
+    /** Vertex AI specific options. If provided, the service will use Vertex AI endpoints. */
+    vertex?: {
+        project: string;
+        location: string;
+        bucket?: string;
+    };
+    /**
+     * The default model to use for generation requests.
+     * @default 'small'
+     */
+    defaultModel?: AiModel;
+}
 /**
  * Configures the {@link AiService}.
  * @param options The configuration options for the AI services.
  */
-export declare function configureAiService(options: ApiModuleOptions): void;
+export declare function configureAiService(options: AiModuleOptions): void;

package/ai/module.js

@@ -1,9 +1,25 @@
 import { Injector } from '../injector/injector.js';
-import { AiServiceOptions } from './ai.service.js';
+/**
+ * Options for configuring the AI Module.
+ */
+export class AiModuleOptions {
+    /** Google AI API key. */
+    apiKey;
+    /** Path to the Google Cloud credentials file. */
+    keyFile;
+    /** Vertex AI specific options. If provided, the service will use Vertex AI endpoints. */
+    vertex;
+    /**
+     * The default model to use for generation requests.
+     * @default 'small'
+     */
+    defaultModel;
+}
+;
 /**
  * Configures the {@link AiService}.
  * @param options The configuration options for the AI services.
  */
 export function configureAiService(options) {
-    Injector.register(AiServiceOptions, { useValue: options });
+    Injector.register(AiModuleOptions, { useValue: options });
 }

package/orm/sqls.d.ts

@@ -62,13 +62,12 @@ export type TsHeadlineOptions = {
 };
 export declare function enumValue<T extends EnumerationObject>(enumeration: T, dbEnum: PgEnumFromEnumeration<T> | string | null, value: EnumerationValue<T>): SQL<string>;
 /**
- *
- * Generates a SQL condition that ensures exactly one of the specified columns is non-null and allows for custom conditions.
+ * Generates a SQL condition that ensures exactly one of the specified columns is non-null and optional custom conditions.
  * @param enumeration The enumeration object
  * @param discriminator The column used to discriminate between different enumeration values
  * @param conditionMapping An object mapping enumeration values to columns and conditions
  */
-export declare function exclusiveReference<T extends EnumerationObject>(enumeration: T, discriminator: Column, conditionMapping: Record<EnumerationValue<T>, Column | [Column, condition: boolean | SQL]>): SQL;
+export declare function exclusiveReference<T extends EnumerationObject>(enumeration: T, discriminator: Column, conditionMapping: Record<EnumerationValue<T>, Column | [Column, condition: boolean | SQL] | null>): SQL;
 export declare function exclusiveNotNull(...columns: Column[]): SQL;
 /**
  * Generates a SQL `CASE ... WHEN ... END` statement for dynamic condition mapping based on an enumeration.

package/orm/sqls.js

@@ -7,7 +7,7 @@
 import { and, Column, eq, sql, isNotNull as sqlIsNotNull, Table } from 'drizzle-orm';
 import { match, P } from 'ts-pattern';
 import { mapObjectValues, objectEntries, objectValues } from '../utils/object/object.js';
-import { assertDefined, isDefined, isInstanceOf, isNull, isNumber, isString } from '../utils/type-guards.js';
+import { assertDefined, isDefined, isInstanceOf, isNotNull, isNull, isNumber, isString } from '../utils/type-guards.js';
 import { getEnumName } from './enums.js';
 /** Drizzle SQL helper for getting the current transaction's timestamp. Returns a Date object. */
 export const TRANSACTION_TIMESTAMP = sql `transaction_timestamp()`;
@@ -25,18 +25,20 @@ export function enumValue(enumeration, dbEnum, value) {
     return sql `'${sql.raw(String(value))}'::${enumType}`;
 }
 /**
- *
- * Generates a SQL condition that ensures exactly one of the specified columns is non-null and allows for custom conditions.
+ * Generates a SQL condition that ensures exactly one of the specified columns is non-null and optional custom conditions.
  * @param enumeration The enumeration object
  * @param discriminator The column used to discriminate between different enumeration values
  * @param conditionMapping An object mapping enumeration values to columns and conditions
  */
 export function exclusiveReference(enumeration, discriminator, conditionMapping) {
-    const columns = objectValues(conditionMapping).map((value) => isInstanceOf(value, Column) ? value : value[0]);
+    const columns = objectValues(conditionMapping).filter(isNotNull).map((value) => isInstanceOf(value, Column) ? value : value[0]);
     const mapping = mapObjectValues(conditionMapping, (value) => {
         if (isInstanceOf(value, Column)) {
             return value;
         }
+        if (isNull(value)) {
+            return sql `FALSE`;
+        }
         return value[1];
     });
     return and(exclusiveNotNull(...columns), enumerationCaseWhen(enumeration, discriminator, mapping));

package/package.json

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