@tstdl/base 0.93.130 → 0.93.132

package/ai/parser/parser.d.ts

@@ -1,7 +1,7 @@
 /**
  * AIs sometimes return the string "null" instead of an actual null value. This function converts such strings to null, while leaving other strings unchanged.
  */
-export declare function parseAiNullableText(text: string | null): string | null;
+export declare function parseAiNullableText(text: string | null | undefined): string | null;
 /**
  * Convert the output of AIs that is supposed to be a date into a numeric date (days since epoch). If the input is invalid, returns null (if allowNull is true) or the fallback value (if provided), or throws an error otherwise.
  * @param dateOrString

package/ai/parser/parser.js

@@ -1,13 +1,14 @@
 import { dateToNumericDate } from '../../utils/date-time.js';
-import { isDate } from '../../utils/type-guards.js';
+import { isDate, isUndefined } from '../../utils/type-guards.js';
 /**
  * AIs sometimes return the string "null" instead of an actual null value. This function converts such strings to null, while leaving other strings unchanged.
  */
 export function parseAiNullableText(text) {
-    if (text == 'null') {
+    const trimmed = text?.trim();
+    if (isUndefined(trimmed) || (trimmed == 'null')) {
         return null;
     }
-    return text;
+    return trimmed;
 }
 export function parseAiDateToNumericDate(dateOrString, allowNull = true, fallback) {
     if (isDate(dateOrString)) {

package/document-management/models/ai-configuration.d.ts

@@ -11,7 +11,7 @@ export type InstructionOverride = string | {
     /**
      * Advanced way: Provide full custom instructions.
      */
-    content?: string;
+    content?: string | Instructions;
     /**
      * Strategy for 'content'. Defaults to 'append'.
      */

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

@@ -9,7 +9,7 @@ var DocumentManagementAiService_1;
 import { and, isNull as drizzleIsNull, eq, inArray } from 'drizzle-orm';
 import { P, match } from 'ts-pattern';
 import { genkitGenerationOptions, injectGenkit, injectModel } from '../../../ai/genkit/index.js';
-import { buildPrompts, jsonOutputInstructions, orderedList } from '../../../ai/prompts/index.js';
+import { buildPrompts, formatInstructions, jsonOutputInstructions, orderedList } from '../../../ai/prompts/index.js';
 import { inject } from '../../../injector/inject.js';
 import { Logger } from '../../../logger/logger.js';
 import { arrayAgg } from '../../../orm/index.js';
@@ -497,11 +497,12 @@ export function mergeInstructions(base, overrides, options = {}) {
         }
         if (isDefined(override.content)) {
             const strategy = override.strategy ?? 'append';
+            const content = isString(override.content) ? override.content : formatInstructions(override.content);
             if (strategy == 'replace') {
-                result = override.content;
+                result = content;
             }
             else {
-                result = `${result}\n\n${override.content}`;
+                result = `${result}\n\n${content}`;
             }
         }
     }

package/document-management/tests/ai-config-merge.test.js

@@ -35,4 +35,12 @@ describe('AI Instruction Merging', () => {
         const result = mergeInstructions(base, overrides);
         expect(result).toContain('[ID] - [Name]');
     });
+    test('should handle Instructions in content', () => {
+        const base = 'Base';
+        const overrides = [{ content: { Detail: 'More info' }, strategy: 'append' }];
+        const result = mergeInstructions(base, overrides);
+        expect(result).toContain('Base');
+        expect(result).toContain('# Detail');
+        expect(result).toContain('More info');
+    });
 });

package/orm/sqls/sqls.js

@@ -79,7 +79,9 @@ export function exclusiveColumn(enumeration, discriminator, conditionMapping) {
         }
         const requiredColumns = toArray(value).filter((value) => isInstanceOf(value, Column));
         const nullColumns = participatingColumns.filter((column) => !requiredColumns.includes(column));
-        const customConditions = toArray(value).filter((val) => !isInstanceOf(val, Column)).map((condition) => isBoolean(condition) ? (condition ? SQL_TRUE : SQL_FALSE) : condition);
+        const customConditions = toArray(value)
+            .filter((val) => !isInstanceOf(val, Column) && (val !== true))
+            .map((condition) => isBoolean(condition) ? (condition ? SQL_TRUE : SQL_FALSE) : condition);
         const condition = and(...requiredColumns.map((col) => sqlIsNotNull(col)), ...nullColumns.map((col) => sqlIsNull(col)), ...customConditions);
         return [key, condition];
     });

package/package.json

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