@qoretechnologies/reqraft 0.10.58 → 0.10.59-pr.130.ga79c828

package/dist/helpers/expressions.d.ts

@@ -3,9 +3,18 @@ import { IQorusTypeObject } from '../hooks/useQorusTypes';
 export declare const getArgumentType: (expressions: IExpressionSchema[], arg?: IExpression, schema?: IExpressionSchemaArg) => string;
 export declare const argumentMatchesType: (expressions: IExpressionSchema[], arg: IExpression | undefined, schema: IExpressionSchemaArg) => boolean;
 export declare const areQorusTypesCompatible: (mainType: string | string[], checkType: string | string[], fallbackTypes?: IQorusTypeObject[]) => boolean;
+/**
+ * Whether a type is text, a date or a time: what a condition cannot be. A condition is evaluated by its
+ * truthiness, so a number (0 or not), a list or hash (empty or not), binary data and an untyped result
+ * all decide it; text, dates and times do not say plainly what is meant, and are compared explicitly
+ * instead (`@status == "open"`, `@note != ""`). The Qorus server applies the same rule.
+ */
+export declare const isTextOrDateType: (type: string) => boolean;
+/** Whether a place takes a condition: its result must be true or false (`bool`, or a list of only that). */
+export declare const isConditionType: (returnType: string | string[] | undefined) => boolean;
 /**
  * Whether an operation is offered where its result must be of `returnType`: a condition (`bool`) is
- * built from the operations that give true or false, not from every operation the server has.
+ * built from the operations whose result decides it, which is any result but text, a date or a time.
  *
  * Only a condition narrows the list. Any other type keeps every operation: a value of one type is often
  * made from an operation that gives another (text from rich text, a number from an int), and the

package/dist/helpers/expressions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expressions.d.ts","sourceRoot":"","sources":["../../src/helpers/expressions.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAoC,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE5F,eAAO,MAAM,eAAe,gBACb,iBAAiB,EAAE,QAC1B,WAAW,WACR,oBAAoB,WAS9B,CAAC;AAEF,eAAO,MAAM,mBAAmB,gBACjB,iBAAiB,EAAE,OAC3B,WAAW,GAAG,SAAS,UACpB,oBAAoB,YAgB7B,CAAC;AAgBF,eAAO,MAAM,uBAAuB,aACxB,MAAM,GAAG,MAAM,EAAE,aAChB,MAAM,GAAG,MAAM,EAAE,kBACZ,gBAAgB,EAAE,KACjC,OAmCF,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,wBAAwB,eACvB,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,cAC7B;IAAE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAAE,KACvE,OAWF,CAAC"}
+{"version":3,"file":"expressions.d.ts","sourceRoot":"","sources":["../../src/helpers/expressions.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAoC,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE5F,eAAO,MAAM,eAAe,gBACb,iBAAiB,EAAE,QAC1B,WAAW,WACR,oBAAoB,WAS9B,CAAC;AAEF,eAAO,MAAM,mBAAmB,gBACjB,iBAAiB,EAAE,OAC3B,WAAW,GAAG,SAAS,UACpB,oBAAoB,YAgB7B,CAAC;AAgBF,eAAO,MAAM,uBAAuB,aACxB,MAAM,GAAG,MAAM,EAAE,aAChB,MAAM,GAAG,MAAM,EAAE,kBACZ,gBAAgB,EAAE,KACjC,OAmCF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,SAAU,MAAM,KAAG,OACoC,CAAC;AAErF,4GAA4G;AAC5G,eAAO,MAAM,eAAe,eAAgB,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,KAAG,OAG3E,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,wBAAwB,eACvB,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,cAC7B;IAAE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAAE,KACvE,OASF,CAAC"}

package/dist/helpers/expressions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expressionFitsReturnType = exports.areQorusTypesCompatible = exports.argumentMatchesType = exports.getArgumentType = void 0;
+exports.expressionFitsReturnType = exports.isConditionType = exports.isTextOrDateType = exports.areQorusTypesCompatible = exports.argumentMatchesType = exports.getArgumentType = void 0;
 // Copyright 2026 Qore Technologies, s.r.o.
 // Expression / type-compatibility helpers — ported verbatim from qorus-ide
 // (`src/helpers/expressions.ts` + `areQorusTypesCompatible` from
@@ -89,9 +89,25 @@ var areQorusTypesCompatible = function (mainType, checkType, fallbackTypes) {
     return false;
 };
 exports.areQorusTypesCompatible = areQorusTypesCompatible;
+/**
+ * Whether a type is text, a date or a time: what a condition cannot be. A condition is evaluated by its
+ * truthiness, so a number (0 or not), a list or hash (empty or not), binary data and an untyped result
+ * all decide it; text, dates and times do not say plainly what is meant, and are compared explicitly
+ * instead (`@status == "open"`, `@note != ""`). The Qorus server applies the same rule.
+ */
+var isTextOrDateType = function (type) {
+    return /^(string|richtext|date|time)$/.test(type.replace(/^\*/, '').replace(/^soft/, ''));
+};
+exports.isTextOrDateType = isTextOrDateType;
+/** Whether a place takes a condition: its result must be true or false (`bool`, or a list of only that). */
+var isConditionType = function (returnType) {
+    var types = (0, lodash_1.isArray)(returnType) ? returnType : returnType ? [returnType] : [];
+    return types.length > 0 && types.every(function (type) { return /^\*?(bool|boolean)$/.test(type); });
+};
+exports.isConditionType = isConditionType;
 /**
  * Whether an operation is offered where its result must be of `returnType`: a condition (`bool`) is
- * built from the operations that give true or false, not from every operation the server has.
+ * built from the operations whose result decides it, which is any result but text, a date or a time.
  *
  * Only a condition narrows the list. Any other type keeps every operation: a value of one type is often
  * made from an operation that gives another (text from rich text, a number from an int), and the
@@ -99,16 +115,14 @@ exports.areQorusTypesCompatible = areQorusTypesCompatible;
  * only once it is built (`any`, or the type of its first argument) is offered everywhere.
  */
 var expressionFitsReturnType = function (returnType, expression) {
-    var types = (0, lodash_1.isArray)(returnType) ? returnType : returnType ? [returnType] : [];
-    var condition = types.length > 0 && types.every(function (type) { return /^\*?(bool|boolean)$/.test(type); });
-    if (!condition) {
+    if (!(0, exports.isConditionType)(returnType)) {
         return true;
     }
     var result = expression.ui_return_type;
     if (expression.return_type_first_arg || !result || result === 'any' || result === 'auto') {
         return true;
     }
-    return /^\*?(bool|boolean)$/.test(result);
+    return !(0, exports.isTextOrDateType)(result);
 };
 exports.expressionFitsReturnType = expressionFitsReturnType;
 //# sourceMappingURL=expressions.js.map

package/dist/helpers/expressions.js.map

@@ -1 +1 @@
-{"version":3,"file":"expressions.js","sourceRoot":"","sources":["../../src/helpers/expressions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"expressions.js","sourceRoot":"","sources":["../../src/helpers/expressions.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qoretechnologies/reqraft",
-  "version": "0.10.58",
+  "version": "0.10.59-pr.130.ga79c828",
   "description": "ReQraft is a collection of React components and hooks that are used across Qore Technologies' products made using the ReQore component library from Qore.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/components/form/engine/CompactRow.tsx

@@ -278,6 +278,7 @@ export const CompactRow = memo(
       (v) => v.removeSelectedOption
     );
     const getTypeForOption = useContextSelector(CompactRowContext, (v) => v.getTypeForOption);
+    const isRendererOnly = useContextSelector(CompactRowContext, (v) => v.isRendererOnly);
     const confirmAction = useContextSelector(CompactRowContext, (v) => v.confirmAction);
     const optionActions = useContextSelector(CompactRowContext, (v) => v.optionActions);
     const collapseOptionActions = useContextSelector(
@@ -1227,6 +1228,7 @@ export const CompactRow = memo(
           name: optionName,
           allOptions: availableOptions,
           getType: getTypeForOption,
+          isRendererOnly,
         })
           // The empty required field's value slot already reads "Required — not
           // set", so the plain required message would duplicate it.

package/src/components/form/engine/FormEngine.stories.tsx

@@ -9213,3 +9213,71 @@ export const CompactReadOnlyDataProvider: Story = {
     expect(row('name').querySelector('.options-readfirst-structured')).toBeNull();
   },
 };
+
+/** The AI endpoint's Tools field as the Qorus IDE hands it to the form: a
+ *  `tool-catalog` editor storing tool SELECTORS, with the tool catalogue's
+ *  SOURCES (fetched by its `get_message`) hung on `allowed_values`. */
+const AiEndpointToolsSchema = {
+  tools: {
+    type: 'list',
+    display_name: 'Tools',
+    short_desc: 'Which tools the AI can call during chat',
+    ui_type: 'tool-catalog',
+    element_type: 'string',
+    default_value: { type: 'tool-catalog', value: ['*'] },
+    preselected: true,
+    required: true,
+    get_message: { action: 'creator-get-objects', object_type: 'tool-catalog' },
+    return_message: {
+      action: 'creator-return-objects',
+      object_type: 'tool-catalog',
+      return_value: 'objects',
+    },
+    allowed_values: [
+      { display_name: 'Qorus system tools', value: { type: 'string', value: 'system' } },
+      { display_name: 'salesforce-prod', value: { type: 'string', value: 'salesforce-prod' } },
+    ],
+  },
+  channel: {
+    type: 'string',
+    display_name: 'Channel',
+    required: true,
+    allowed_values: [
+      { display_name: 'Ops', value: { type: 'string', value: 'ops' } },
+      { display_name: 'Dev', value: { type: 'string', value: 'dev' } },
+    ],
+  },
+};
+
+export const ToolSelectorsAreNotJudgedAsChoices: Story = {
+  parameters: {
+    docs: {
+      description: {
+        story:
+          "An AI endpoint's Tools field holds the server's default, `*` (all tools), and needs no attention: its tool-catalog editor stores selectors, and the catalogue sources listed beside it are not choices the value must be one of. The Channel field below has fixed choices and a value that is none of them, so it alone needs attention.",
+      },
+    },
+  },
+  args: {
+    compact: true,
+    minColumnWidth: '360px',
+    options: AiEndpointToolsSchema as IOptionsSchema,
+    value: {
+      tools: { type: 'tool-catalog', value: ['*'] },
+      channel: { type: 'string', value: 'gone' },
+    },
+  },
+  play: async ({ args }) => {
+    await _testsWaitForText('Tools');
+    // The closed-choice field still flags its value...
+    await _testsWaitForText('"gone" is not one of the choices');
+    // ...and the selector is never reported as a value that is not a choice.
+    await _testsWaitForTextToNotExist('"*" is not one of the choices');
+    await waitFor(() => {
+      const calls = (args.onValidityChange as ReturnType<typeof fn>).mock.calls;
+      expect(calls.length).toBeGreaterThan(0);
+      const [, data] = calls[calls.length - 1] as [boolean, IFormValidityData];
+      expect(data.invalidFields.map((field) => field.fieldName)).toEqual(['channel']);
+    });
+  },
+};

package/src/components/form/engine/FormEngine.tsx

@@ -2326,6 +2326,9 @@ const FormEngineImpl = ({
         // The expression flag lives on the field value, not the schema — so an
         // expression value is validated as an expression, not the base type.
         isFunction: (availableOptions?.[optionName] as { is_expression?: boolean })?.is_expression,
+        // A field drawn by a bespoke editor (the consumer's own included) is
+        // not judged against `allowed_values` as fixed choices.
+        hasOwnEditor: isRendererOnly(options?.[optionName]?.ui_type as TQorusType),
       } as any);
     },
     [
@@ -2333,6 +2336,7 @@ const FormEngineImpl = ({
       JSON.stringify(availableOptions),
       JSON.stringify(localValue.fields),
       dependencyLockedNames,
+      isRendererOnly,
     ]
   );
 
@@ -2377,6 +2381,7 @@ const FormEngineImpl = ({
             ...options?.[optionName],
             // The expression flag lives on the field value, not the schema.
             isFunction: (option as { is_expression?: boolean }).is_expression,
+            hasOwnEditor: isRendererOnly(options?.[optionName]?.ui_type as TQorusType),
           } as any);
         }
 
@@ -3154,6 +3159,7 @@ const FormEngineImpl = ({
             name={optionName}
             option={{ type: resolvedType, ...other }}
             getType={getTypeForOption}
+            isRendererOnly={isRendererOnly}
             untouched={!touchedOptionsRef.current.has(optionName)}
           />
           {operators && size(operators) && size(other.op) ?
@@ -3266,6 +3272,7 @@ const FormEngineImpl = ({
       handleOptionLabelClick,
       removeSelectedOption,
       getTypeForOption,
+      isRendererOnly,
       isOptionValid,
       confirmAction,
       optionActions,
@@ -3313,6 +3320,7 @@ const FormEngineImpl = ({
       handleOptionLabelClick,
       removeSelectedOption,
       getTypeForOption,
+      isRendererOnly,
       isOptionValid,
       confirmAction,
       optionActions,

package/src/components/form/engine/OptionFieldMessages.tsx

@@ -326,6 +326,14 @@ export interface IOptionFieldMessagesProps {
   allOptions?: TQorusForm;
   name: string;
   getType: (type: string) => string;
+  /**
+   * Whether a `ui_type` names a bespoke editor, the consumer's own included.
+   *
+   * Such a field's `allowed_values` are not fixed choices (the editor decides
+   * what a value means), so a value is not judged against them. Without it only
+   * reqraft's built-in editors are known.
+   */
+  isRendererOnly?: (type?: any) => boolean;
   /**
    * The reader has not edited this field in this session.
    *
@@ -354,6 +362,7 @@ export const getOptionFieldMessages = ({
   name,
   allOptions,
   getType,
+  isRendererOnly,
   untouched,
 }: IOptionFieldMessagesProps): IReqoreTagProps[] => {
   const optionSchema = schema[name];
@@ -386,6 +395,7 @@ export const getOptionFieldMessages = ({
         // config never reached the validator.
         ...(optionSchema as object),
         optionSchema: schema,
+        hasOwnEditor: !!isRendererOnly?.(optionSchema?.ui_type),
       }
     );
     if (!validationData.isValid) {
@@ -442,11 +452,28 @@ export const OptionFieldMessages = ({
   name,
   allOptions,
   getType,
+  isRendererOnly,
   untouched,
 }: IOptionFieldMessagesProps) => {
   const messages: IReqoreTagProps[] = useMemo(
-    () => getOptionFieldMessages({ schema, option, name, allOptions, getType, untouched }),
-    [JSON.stringify(schema), JSON.stringify(option), JSON.stringify(allOptions), name, untouched]
+    () =>
+      getOptionFieldMessages({
+        schema,
+        option,
+        name,
+        allOptions,
+        getType,
+        isRendererOnly,
+        untouched,
+      }),
+    [
+      JSON.stringify(schema),
+      JSON.stringify(option),
+      JSON.stringify(allOptions),
+      name,
+      isRendererOnly,
+      untouched,
+    ]
   );
 
   if (!size(messages)) {

package/src/components/form/engine/compactRowContext.ts

@@ -98,6 +98,8 @@ export interface ICompactRowContext {
   handleOptionLabelClick: (optionName: string) => void;
   removeSelectedOption: (optionName: string) => void;
   getTypeForOption: (type: string) => string;
+  /** Whether a `ui_type` names a bespoke editor, reqraft's or the consumer's own. */
+  isRendererOnly?: (type?: any) => boolean;
   isOptionValid: (optionName: string, type: any, optionValue: any) => boolean;
   confirmAction: ReturnType<typeof useReqoreProperty<'confirmAction'>>;
 

package/src/components/form/expressions/builder/index.tsx

@@ -28,6 +28,8 @@ import {
   areQorusTypesCompatible,
   expressionFitsReturnType,
   getArgumentType,
+  isConditionType,
+  isTextOrDateType,
 } from '../../../../helpers/expressions';
 import { addMissingExpressionArgs } from '../argumentPresence';
 import { findTemplate } from '../../../../helpers/templates';
@@ -595,13 +597,18 @@ export const Expression = ({
         expressionReturnType === 'any' ||
         areQorusTypesCompatible(returnType, expressionReturnType) ||
         returnType === expressionReturnType ||
-        !returnType);
+        !returnType) ||
+    // a condition is decided by any result but text, a date or a time
+    (isConditionType(returnType as string | string[] | undefined) &&
+      !!expressionReturnType &&
+      !isTextOrDateType(expressionReturnType));
 
   const defaultItems = useMemo(
     () =>
       expressions.value
-        // a condition (a field or an operand that must be true or false) offers the operations that
-        // give true or false; a group's members are its own business, and the operation already chosen
+        // a condition (a field or an operand that must be true or false) offers the operations whose
+        // result decides it - any but text, a date or a time, which are compared explicitly; a group's members
+        // are its own business, and the operation already chosen
         // stays, so a stored mismatch can be seen and fixed
         .filter(
           (exp) =>
@@ -1283,7 +1290,14 @@ export const Expression = ({
             intent='danger'
             size='tiny'
             wrap
-            label={`This expression returns ${types.getTypeDisplayName(expressionReturnType) || 'nothing'} but the expected return type is ${expectedReturnTypeText}. Please select an expression that returns ${expectedReturnTypeText} or wrap this expression inside another one that does.`}
+            label={
+              isConditionType(returnType as string | string[] | undefined) &&
+              !!expressionReturnType &&
+              isTextOrDateType(expressionReturnType)
+                ? // a condition that gives text, a date or a time: say how to make it one
+                  `A condition can't give ${types.getTypeDisplayName(expressionReturnType)}: compare it explicitly, for example @status == "open" or @note != "".`
+                : `This expression returns ${types.getTypeDisplayName(expressionReturnType) || 'nothing'} but the expected return type is ${expectedReturnTypeText}. Please select an expression that returns ${expectedReturnTypeText} or wrap this expression inside another one that does.`
+            }
           />
         </>
       )}

package/src/components/smartEditor/useLspAutocomplete.ts

@@ -496,43 +496,17 @@ export function useLspAutocomplete(
     return () => document.removeEventListener('keydown', handleKeyDown, true);
   }, [isOpen, filteredItems, close, selectItem]);
 
-  const onSlateChangeImpl = useCallback(
-    (
-      editor: BaseEditor & ReactEditor & HistoryEditor,
-      nodes: ISlateElement[]
-    ) => {
-      editorRef.current = editor;
-      if (!editor.selection || !isReady) {
-        // Don't tear down replace mode just because the click that
-        // opened it momentarily left the selection null — clicking a
-        // void inline can do that.
-        if (replacingChipPathRef.current) return;
-        close();
-        return;
-      }
-      // `onChange` fires for content edits AND selection-only changes
-      // (cursor moves, click-to-focus). Only OPEN on content edits — else
-      // clicking after a trigger char (e.g. the space in `/list services `)
-      // pops the dropdown without the user typing. An all-`set_selection`
-      // op batch is selection-only.
-      const isContentChange = editor.operations.some(
-        (op) => op.type !== 'set_selection'
-      );
-      if (!isContentChange) {
-        // Replace mode anchors on a chip; the selection echo from the
-        // opening click must not close it (outside-click handler does).
-        if (isOpen && !replacingChipPathRef.current) {
-          close();
-        }
-        return;
-      }
-      // A content edit in replace mode means the user typed instead of
-      // picking a replacement — fall back to normal flow.
-      if (replacingChipPathRef.current) {
+  /**
+   * Opens, narrows or closes the completions for what the editor holds at its caret, after a content
+   * edit: a trigger character just typed, typing inside a sigil token, narrowing an open list, or
+   * autosuggest inside a bare identifier.
+   */
+  const completeAtCaret = useCallback(
+    (editor: BaseEditor & ReactEditor & HistoryEditor, nodes: ISlateElement[]) => {
+      if (!editor.selection) {
         close();
         return;
       }
-
       const { anchor } = editor.selection;
       const plainText = converter.fromSlateNodes(nodes);
       const cursorOffset = converter.selectionToOffset(
@@ -604,17 +578,70 @@ export function useLspAutocomplete(
 
       close();
     },
-    [
-      isReady,
-      isOpen,
-      close,
-      findTokenStart,
-      positionTrigger,
-      requestCompletions,
-      triggerCharacters,
-      converter,
-    ]
+    [isOpen, close, findTokenStart, positionTrigger, requestCompletions, triggerCharacters, converter]
+  );
+
+  /* An edit made before the session is ready - typing `$` or `@` while the connection is still being
+     made, or its context bound - would otherwise be dropped: the list is closed and nothing asks again,
+     so the trigger the author typed never opens anything. The editor is kept, and once the session is
+     ready the completions are asked for what it holds then, as for a chip click (see
+     `pendingChipRequestRef`). */
+  const pendingTypingRef = useRef<(BaseEditor & ReactEditor & HistoryEditor) | null>(null);
+
+  const onSlateChangeImpl = useCallback(
+    (
+      editor: BaseEditor & ReactEditor & HistoryEditor,
+      nodes: ISlateElement[]
+    ) => {
+      editorRef.current = editor;
+      if (!editor.selection || !isReady) {
+        // Don't tear down replace mode just because the click that
+        // opened it momentarily left the selection null — clicking a
+        // void inline can do that.
+        if (replacingChipPathRef.current) return;
+        // a content edit before the session is ready is answered once it is (see `pendingTypingRef`)
+        if (editor.selection && editor.operations.some((op) => op.type !== 'set_selection')) {
+          pendingTypingRef.current = editor;
+        }
+        close();
+        return;
+      }
+      pendingTypingRef.current = null;
+      // `onChange` fires for content edits AND selection-only changes
+      // (cursor moves, click-to-focus). Only OPEN on content edits — else
+      // clicking after a trigger char (e.g. the space in `/list services `)
+      // pops the dropdown without the user typing. An all-`set_selection`
+      // op batch is selection-only.
+      const isContentChange = editor.operations.some(
+        (op) => op.type !== 'set_selection'
+      );
+      if (!isContentChange) {
+        // Replace mode anchors on a chip; the selection echo from the
+        // opening click must not close it (outside-click handler does).
+        if (isOpen && !replacingChipPathRef.current) {
+          close();
+        }
+        return;
+      }
+      // A content edit in replace mode means the user typed instead of
+      // picking a replacement — fall back to normal flow.
+      if (replacingChipPathRef.current) {
+        close();
+        return;
+      }
+
+      completeAtCaret(editor, nodes);
+    },
+    [isReady, isOpen, close, completeAtCaret]
   );
+
+  // Answer an edit made before the session was ready, for what the editor holds now.
+  useEffect(() => {
+    const editor = pendingTypingRef.current;
+    if (!isReady || !editor) return;
+    pendingTypingRef.current = null;
+    completeAtCaret(editor, editor.children as ISlateElement[]);
+  }, [isReady, completeAtCaret]);
   onSlateChangeImplRef.current = onSlateChangeImpl;
 
   const onItemSelect = useCallback(

package/src/helpers/allowedValues.ts

@@ -9,6 +9,7 @@
  */
 import { TQorusFormFieldSchema } from '@qoretechnologies/ts-toolkit';
 import isEqual from 'lodash/isEqual';
+import { isRendererOnlyUiType } from '../components/form/engine/rendererTypes';
 import { richtextHasTag, richtextToString } from './common';
 import { getListElementValue } from './options';
 import { isValueTemplate } from './templates';
@@ -109,8 +110,32 @@ export interface IChoiceFieldSchema {
   /** Set when the value is an expression, which is resolved at run time. */
   isFunction?: boolean;
   is_expression?: boolean;
+  /** The editor the field is drawn with; see {@link hasOwnEditor}. */
+  ui_type?: string | readonly string[];
+  /**
+   * Set by a form that knows the field is drawn by a bespoke editor of the
+   * consumer's own (one it declared in `rendererOnlyUiTypes`), which reqraft's
+   * built-in list cannot name.
+   */
+  hasOwnEditor?: boolean;
 }
 
+/**
+ * Does a bespoke editor, rather than reqraft's choice picker, draw this field?
+ *
+ * Then the editor alone decides what a value means, and `allowed_values` is not
+ * a closed set of values the field may hold. The AI endpoint's Tools field is
+ * the case that proved it: its `tool-catalog` editor stores SELECTORS -- `*` for
+ * every tool, `system:*`, a connection name, `connection/tool` -- and the host
+ * hangs the tool catalogue's SOURCES on `allowed_values` for the editor to
+ * browse. Judging the selectors against the sources flagged the server's own
+ * default, `["*"]`, as "not one of the choices", so no chat endpoint could be
+ * published with it. The server says the same: a custom `ui_type` "defines its
+ * own value shape".
+ */
+const hasOwnEditor = (field: IChoiceFieldSchema): boolean =>
+  !!field.hasOwnEditor || isRendererOnlyUiType(field.ui_type);
+
 /**
  * The parts of a stored value that are not among the field's fixed choices.
  *
@@ -121,14 +146,22 @@ export interface IChoiceFieldSchema {
  *   all of which are resolved when the interface runs;
  * - `allowed_values: []` — the server has no choices to offer right now, which
  *   is "unknown", not "nothing is allowed";
- * - creatable choices, where any value may be added.
+ * - creatable choices, where any value may be added;
+ * - a field drawn by a bespoke editor (a renderer-only `ui_type` such as
+ *   `tool-catalog`), whose values are whatever that editor says they are.
  *
  * A single-valued field is judged as a whole. A multi-select field, and a list
  * whose elements are constrained by `element_allowed_values`, are judged per
  * element, so the answer names exactly the elements that are not choices.
  */
 export const getUnlistedChoices = (value: unknown, field?: IChoiceFieldSchema): unknown[] => {
-  if (!field || isEmptyChoiceValue(value) || field.isFunction || field.is_expression) {
+  if (
+    !field ||
+    isEmptyChoiceValue(value) ||
+    field.isFunction ||
+    field.is_expression ||
+    hasOwnEditor(field)
+  ) {
     return [];
   }
 

package/src/helpers/expressions.ts

@@ -101,9 +101,24 @@ export const areQorusTypesCompatible = (
   return false;
 };
 
+/**
+ * Whether a type is text, a date or a time: what a condition cannot be. A condition is evaluated by its
+ * truthiness, so a number (0 or not), a list or hash (empty or not), binary data and an untyped result
+ * all decide it; text, dates and times do not say plainly what is meant, and are compared explicitly
+ * instead (`@status == "open"`, `@note != ""`). The Qorus server applies the same rule.
+ */
+export const isTextOrDateType = (type: string): boolean =>
+  /^(string|richtext|date|time)$/.test(type.replace(/^\*/, '').replace(/^soft/, ''));
+
+/** Whether a place takes a condition: its result must be true or false (`bool`, or a list of only that). */
+export const isConditionType = (returnType: string | string[] | undefined): boolean => {
+  const types = isArray(returnType) ? returnType : returnType ? [returnType] : [];
+  return types.length > 0 && types.every((type) => /^\*?(bool|boolean)$/.test(type));
+};
+
 /**
  * Whether an operation is offered where its result must be of `returnType`: a condition (`bool`) is
- * built from the operations that give true or false, not from every operation the server has.
+ * built from the operations whose result decides it, which is any result but text, a date or a time.
  *
  * Only a condition narrows the list. Any other type keeps every operation: a value of one type is often
  * made from an operation that gives another (text from rich text, a number from an int), and the
@@ -114,14 +129,12 @@ export const expressionFitsReturnType = (
   returnType: string | string[] | undefined,
   expression: { ui_return_type?: string; return_type_first_arg?: boolean }
 ): boolean => {
-  const types = isArray(returnType) ? returnType : returnType ? [returnType] : [];
-  const condition = types.length > 0 && types.every((type) => /^\*?(bool|boolean)$/.test(type));
-  if (!condition) {
+  if (!isConditionType(returnType)) {
     return true;
   }
   const result = expression.ui_return_type;
   if (expression.return_type_first_arg || !result || result === 'any' || result === 'auto') {
     return true;
   }
-  return /^\*?(bool|boolean)$/.test(result);
+  return !isTextOrDateType(result);
 };