@qoretechnologies/reqraft 0.10.62 → 0.10.63-pr.142.g0b675cd

package/dist/components/form/expressions/renderExpressionToText.js

@@ -1,6 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderExpressionToText = void 0;
+exports.renderExpressionToText = exports.EXPRESSION_HOLE = void 0;
+// Copyright 2026 Qore Technologies, s.r.o.
+// Client-side expression renderer — an approximation of an expression AST for
+// the read-first row summaries, which must render synchronously. Nothing that
+// can wait uses it: Explain and the Text view's Preview wait for the server's
+// `dpql/renderExpression` (see `useRenderExpression`). Pure: no
+// transport/socket import, so it stays out of the LSP/nanoid dependency graph.
+var expressionOperands_1 = require("./expressionOperands");
+/** How a part not filled in yet is written: an operation not chosen, a value not given. */
+exports.EXPRESSION_HOLE = '…';
 /** A symbol made only of non-word characters renders infix (`a == b`). */
 var isOperatorSymbol = function (symbol) {
     return !!symbol && /^[^\w\s]+$/.test(symbol);
@@ -43,6 +52,11 @@ var PREC_LOOSEST = 7;
  * parentheses would not be a cosmetic simplification.
  */
 var ASSOCIATIVE = new Set(['&&', '||']);
+/**
+ * Operators written infix with any number of operands - `DpqlSerializer`'s `NaryOperators`. Another
+ * operator holding more than two is refused as text by the server, and is written as a call here.
+ */
+var N_ARY = new Set(['+', '*']);
 var precedenceOf = function (exp) { var _a; return (_a = PRECEDENCE[exp !== null && exp !== void 0 ? exp : '']) !== null && _a !== void 0 ? _a : PREC_PRIMARY; };
 /**
  * The context an operator's argument is rendered in — the same rule as
@@ -95,19 +109,31 @@ var renderInContext = function (value, expressions, contextPrec) {
     var args = (_d = value.args) !== null && _d !== void 0 ? _d : [];
     // Logical group (subtype 2) → join with the symbol.
     var isLogicalGroup = (schema === null || schema === void 0 ? void 0 : schema.subtype) === 2 || value.exp === '&&' || value.exp === '||';
-    // Binary operator → infix. Everything else renders as a call, whose own
-    // parentheses and commas already delimit its arguments.
-    var isInfix = isLogicalGroup || (args.length === 2 && isOperatorSymbol(symbol));
-    var parts = args.map(function (arg, argn) {
+    // Binary operator → infix, as is `+` or `*` holding more operands. Everything else renders as a call,
+    // whose own parentheses and commas already delimit its arguments.
+    var isInfix = isLogicalGroup ||
+        (isOperatorSymbol(symbol) &&
+            (args.length === 2 || (args.length > 2 && N_ARY.has(value.exp))));
+    /* Each operand as what it holds (expressionOperands): a custom Text value is the
+       template or the words in it, and one not filled in yet - an operation not chosen,
+       a value not given - is a hole, not `null` and not the editor's rich-text document. */
+    var parts = args.map(function (raw, argn) {
         var _a;
-        return (arg === null || arg === void 0 ? void 0 : arg.is_expression) && ((_a = arg.value) === null || _a === void 0 ? void 0 : _a.exp)
-            ? renderInContext(arg.value, expressions, isInfix ? argumentContext(value.exp, argn) : PREC_LOOSEST)
-            : renderLiteral(arg === null || arg === void 0 ? void 0 : arg.value);
+        var arg = (0, expressionOperands_1.expressionOperand)(raw);
+        if (arg === undefined)
+            return exports.EXPRESSION_HOLE;
+        if ((arg === null || arg === void 0 ? void 0 : arg.is_expression) && ((_a = arg.value) === null || _a === void 0 ? void 0 : _a.exp)) {
+            return renderInContext(arg.value, expressions, isInfix ? argumentContext(value.exp, argn) : PREC_LOOSEST);
+        }
+        if (arg && typeof arg === 'object' && 'exp' in arg) {
+            return renderInContext(arg, expressions, isInfix ? argumentContext(value.exp, argn) : PREC_LOOSEST);
+        }
+        return renderLiteral(arg && typeof arg === 'object' && 'value' in arg ? arg.value : arg);
     });
     if (!isInfix) {
         return "".concat(symbol, "(").concat(parts.join(', '), ")");
     }
-    var text = isLogicalGroup ? parts.join(" ".concat(symbol, " ")) : "".concat(parts[0], " ").concat(symbol, " ").concat(parts[1]);
+    var text = parts.join(" ".concat(symbol, " "));
     return precedenceOf(value.exp) > contextPrec ? "(".concat(text, ")") : text;
 };
 /**

package/dist/components/form/expressions/renderExpressionToText.js.map

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

package/dist/components/form/expressions/textOfExpression.d.ts

@@ -0,0 +1,18 @@
+import { expressionOperand } from './expressionOperands';
+import { EXPRESSION_HOLE } from './renderExpressionToText';
+import { IExpressionSchema, IExpressionValue } from './types';
+export { EXPRESSION_HOLE };
+/**
+ * The expression as `dpql/serialize` can write it, or `undefined` when part of it
+ * is not filled in yet (an operation not chosen, an operand left empty).
+ */
+export declare const serializableExpression: (value: IExpressionValue | undefined) => IExpressionValue | undefined;
+/**
+ * An expression that is not filled in yet, as text: what is there, and a
+ * {@link EXPRESSION_HOLE} for each part that is not - `… > …` for a comparison
+ * whose values are not chosen, as the read-first row writes it. Not DPQL; the
+ * Text view shows it until the author writes the rest.
+ */
+export declare const incompleteExpressionText: (value: IExpressionValue | undefined, expressions?: IExpressionSchema[]) => string;
+export { expressionOperand };
+//# sourceMappingURL=textOfExpression.d.ts.map

package/dist/components/form/expressions/textOfExpression.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"textOfExpression.d.ts","sourceRoot":"","sources":["../../../../src/components/form/expressions/textOfExpression.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,iBAAiB,EAAgD,MAAM,sBAAsB,CAAC;AACvG,OAAO,EAAE,eAAe,EAA0B,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE9D,OAAO,EAAE,eAAe,EAAE,CAAC;AAE3B;;;GAGG;AACH,eAAO,MAAM,sBAAsB,UAC1B,gBAAgB,GAAG,SAAS,KAClC,gBAAgB,GAAG,SAAuF,CAAC;AAE9G;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,UAC5B,gBAAgB,GAAG,SAAS,gBACtB,iBAAiB,EAAE,KAC/B,MAKkB,CAAC;AAEtB,OAAO,EAAE,iBAAiB,EAAE,CAAC"}

package/dist/components/form/expressions/textOfExpression.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.expressionOperand = exports.incompleteExpressionText = exports.serializableExpression = exports.EXPRESSION_HOLE = void 0;
+// Copyright 2026 Qore Technologies, s.r.o.
+// What the Text view is given for an expression built in the Visual view.
+//
+// `dpql/serialize` was handed the AST as the Visual view stores it, and wrote what
+// it could of operands that are not DPQL (see expressionOperands): the server
+// `{args=(null)} > {type=int}`, a stand-in `undefined([object Object]) > [object Object]`.
+// The Text view serializes only an expression that is filled in, with its operands
+// read as what they hold, and shows one that is not with a hole for each missing part.
+var expressionOperands_1 = require("./expressionOperands");
+Object.defineProperty(exports, "expressionOperand", { enumerable: true, get: function () { return expressionOperands_1.expressionOperand; } });
+var renderExpressionToText_1 = require("./renderExpressionToText");
+Object.defineProperty(exports, "EXPRESSION_HOLE", { enumerable: true, get: function () { return renderExpressionToText_1.EXPRESSION_HOLE; } });
+/**
+ * The expression as `dpql/serialize` can write it, or `undefined` when part of it
+ * is not filled in yet (an operation not chosen, an operand left empty).
+ */
+var serializableExpression = function (value) { return ((0, expressionOperands_1.isExpressionComplete)(value) ? (0, expressionOperands_1.expressionWithOperands)(value) : undefined); };
+exports.serializableExpression = serializableExpression;
+/**
+ * An expression that is not filled in yet, as text: what is there, and a
+ * {@link EXPRESSION_HOLE} for each part that is not - `… > …` for a comparison
+ * whose values are not chosen, as the read-first row writes it. Not DPQL; the
+ * Text view shows it until the author writes the rest.
+ */
+var incompleteExpressionText = function (value, expressions) {
+    if (expressions === void 0) { expressions = []; }
+    return (value === null || value === void 0 ? void 0 : value.exp)
+        ? (0, renderExpressionToText_1.renderExpressionToText)(value, expressions)
+            // a field of the record, as DPQL names it
+            .replace(/"\$record:\{([^}]+)\}"/g, '@$1')
+        : renderExpressionToText_1.EXPRESSION_HOLE;
+};
+exports.incompleteExpressionText = incompleteExpressionText;
+//# sourceMappingURL=textOfExpression.js.map

package/dist/components/form/expressions/textOfExpression.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"textOfExpression.js","sourceRoot":"","sources":["../../../../src/components/form/expressions/textOfExpression.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAC3C,0EAA0E;AAC1E,EAAE;AACF,mFAAmF;AACnF,8EAA8E;AAC9E,2FAA2F;AAC3F,mFAAmF;AACnF,uFAAuF;AACvF,2DAAuG;AA8B9F,kGA9BA,sCAAiB,OA8BA;AA7B1B,mEAAmF;AAG1E,gGAHA,wCAAe,OAGA;AAExB;;;GAGG;AACI,IAAM,sBAAsB,GAAG,UACpC,KAAmC,IACF,OAAA,CAAC,IAAA,yCAAoB,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAA,2CAAsB,EAAC,KAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,EAA1E,CAA0E,CAAC;AAFjG,QAAA,sBAAsB,0BAE2E;AAE9G;;;;;GAKG;AACI,IAAM,wBAAwB,GAAG,UACtC,KAAmC,EACnC,WAAqC;IAArC,4BAAA,EAAA,gBAAqC;IAErC,OAAA,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,GAAG;QACR,CAAC,CAAC,IAAA,+CAAsB,EAAC,KAAK,EAAE,WAAW,CAAC;YACxC,0CAA0C;aACzC,OAAO,CAAC,yBAAyB,EAAE,KAAK,CAAC;QAC9C,CAAC,CAAC,wCAAe;AAJnB,CAImB,CAAC;AART,QAAA,wBAAwB,4BAQf"}

package/dist/components/form/expressions/useExpressionType.d.ts

@@ -0,0 +1,26 @@
+import { IExpressionValue } from './types';
+/** The type an expression gives, as the server names it. */
+export interface IExpressionType {
+    /** The type's name, as `dpql/parse` gives it (`float`, `*int`, `hash<auto>`); `auto` when not known. */
+    inferred_type: string;
+    /** The type as the UI names it, as the catalogue's `ui_return_type` does (`number`, `richtext`, `any`). */
+    ui_type: string;
+    /** `true` when the type is known before the expression is evaluated. */
+    known: boolean;
+}
+/**
+ * The type the server gave for an expression, if it has given it — for the
+ * readers that cannot wait (an argument's label, the check of the arguments
+ * that are kept when the operation changes). `undefined` when not known yet.
+ */
+export declare const getCachedExpressionType: (value: IExpressionValue | undefined) => IExpressionType | undefined;
+/** Asks the server for an expression's type; `null` when it cannot say. */
+export declare const fetchExpressionType: (value: IExpressionValue) => Promise<IExpressionType | null>;
+/** @internal Test hook — drop the module-level client, the cache and the health state. */
+export declare const _resetExpressionTypeTransportForTests: () => void;
+/**
+ * The type an expression gives, from the server; `undefined` until the server
+ * has answered, and when it cannot say.
+ */
+export declare const useExpressionType: (value: IExpressionValue | undefined) => IExpressionType | undefined;
+//# sourceMappingURL=useExpressionType.d.ts.map

package/dist/components/form/expressions/useExpressionType.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useExpressionType.d.ts","sourceRoot":"","sources":["../../../../src/components/form/expressions/useExpressionType.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAK3C,4DAA4D;AAC5D,MAAM,WAAW,eAAe;IAC9B,wGAAwG;IACxG,aAAa,EAAE,MAAM,CAAC;IACtB,2GAA2G;IAC3G,OAAO,EAAE,MAAM,CAAC;IAChB,wEAAwE;IACxE,KAAK,EAAE,OAAO,CAAC;CAChB;AAsBD;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,UAC3B,gBAAgB,GAAG,SAAS,KAClC,eAAe,GAAG,SAAsE,CAAC;AAE5F,2EAA2E;AAC3E,eAAO,MAAM,mBAAmB,UACvB,gBAAgB,KACtB,QAAQ,eAAe,GAAG,IAAI,CAgChC,CAAC;AAEF,0FAA0F;AAC1F,eAAO,MAAM,qCAAqC,QAAO,IAKxD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,UACrB,gBAAgB,GAAG,SAAS,KAClC,eAAe,GAAG,SAiCpB,CAAC"}

package/dist/components/form/expressions/useExpressionType.js

@@ -0,0 +1,181 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useExpressionType = exports._resetExpressionTypeTransportForTests = exports.fetchExpressionType = exports.getCachedExpressionType = void 0;
+// Copyright 2026 Qore Technologies, s.r.o.
+// The type an expression gives, as the server works it out.
+//
+// An expression has one type everywhere in Qorus (qoretechnologies/qorus#713):
+// the server's expression type rules decide it for DPQL validation, the
+// language server, evaluation and the editors alike. The builder used to work
+// out its own type from the catalogue's `ui_return_type` one level deep, which
+// disagreed with the server (`1 + 2.5` was "any" here and a float there), so it
+// now asks the server, over the LSP custom method `dpql/expressionType` (next
+// to `dpql/renderExpression` in `QorusLspWebSocketHandler.qc`), on the same
+// shared connection as the rendering.
+//
+// There is no client-side stand-in: until the server answers, or when it
+// cannot (it predates the method, or the connection gave up), the type is not
+// known and nothing is judged by it.
+var nanoid_1 = require("nanoid");
+var react_1 = require("react");
+var lspClient_1 = require("../../../utils/lspClient");
+/** Coalesce rapid changes per consumer (live editing) — trailing edge. */
+var TYPE_DEBOUNCE_MS = 300;
+var typeClient = null;
+/** Set after a `-32601 method not found` — the server predates the method. */
+var methodUnsupported = false;
+/** The types the server gave, by the expression's JSON, for the synchronous readers. */
+var typeCache = new Map();
+var getTypeClient = function () {
+    if (!typeClient) {
+        typeClient = new lspClient_1.ReqraftLspClient({
+            languageId: 'dpql',
+            // Opaque per-load URI; `dpql/expressionType` is stateless (no `didOpen`
+            // needed), the URI only identifies the client locally.
+            uri: "inmemory://reqraft/expression-type/".concat((0, nanoid_1.nanoid)()),
+        });
+    }
+    return typeClient;
+};
+var cacheKey = function (value) { return JSON.stringify(value); };
+/**
+ * The type the server gave for an expression, if it has given it — for the
+ * readers that cannot wait (an argument's label, the check of the arguments
+ * that are kept when the operation changes). `undefined` when not known yet.
+ */
+var getCachedExpressionType = function (value) { return ((value === null || value === void 0 ? void 0 : value.exp) ? typeCache.get(cacheKey(value)) : undefined); };
+exports.getCachedExpressionType = getCachedExpressionType;
+/** Asks the server for an expression's type; `null` when it cannot say. */
+var fetchExpressionType = function (value) { return __awaiter(void 0, void 0, void 0, function () {
+    var key, cached, client, result, type, err_1;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                if (!(value === null || value === void 0 ? void 0 : value.exp) || methodUnsupported)
+                    return [2 /*return*/, null];
+                key = cacheKey(value);
+                cached = typeCache.get(key);
+                if (cached)
+                    return [2 /*return*/, cached];
+                client = getTypeClient();
+                _a.label = 1;
+            case 1:
+                _a.trys.push([1, 4, , 5]);
+                // Waits as long as the connection does: it has its own reconnect schedule
+                // and rejects once it gives up, so this never outlives a dead socket.
+                return [4 /*yield*/, client.connect()];
+            case 2:
+                // Waits as long as the connection does: it has its own reconnect schedule
+                // and rejects once it gives up, so this never outlives a dead socket.
+                _a.sent();
+                return [4 /*yield*/, client.customRequest('dpql/expressionType', {
+                        // The server accepts both the bare `{exp, args}` AST and the
+                        // `{is_expression, value}` wrapper, as `dpql/renderExpression` does.
+                        expression: value,
+                    })];
+            case 3:
+                result = _a.sent();
+                if (typeof (result === null || result === void 0 ? void 0 : result.inferred_type) !== 'string' || typeof (result === null || result === void 0 ? void 0 : result.ui_type) !== 'string') {
+                    return [2 /*return*/, null];
+                }
+                type = {
+                    inferred_type: result.inferred_type,
+                    ui_type: result.ui_type,
+                    known: !!result.known,
+                };
+                typeCache.set(key, type);
+                return [2 /*return*/, type];
+            case 4:
+                err_1 = _a.sent();
+                // `ReqraftLspClient` rejections are `Error('<code>: <message>')`.
+                if (err_1 instanceof Error && err_1.message.startsWith('-32601')) {
+                    methodUnsupported = true;
+                }
+                return [2 /*return*/, null];
+            case 5: return [2 /*return*/];
+        }
+    });
+}); };
+exports.fetchExpressionType = fetchExpressionType;
+/** @internal Test hook — drop the module-level client, the cache and the health state. */
+var _resetExpressionTypeTransportForTests = function () {
+    typeClient === null || typeClient === void 0 ? void 0 : typeClient.disconnect();
+    typeClient = null;
+    methodUnsupported = false;
+    typeCache.clear();
+};
+exports._resetExpressionTypeTransportForTests = _resetExpressionTypeTransportForTests;
+/**
+ * The type an expression gives, from the server; `undefined` until the server
+ * has answered, and when it cannot say.
+ */
+var useExpressionType = function (value) {
+    var key = (value === null || value === void 0 ? void 0 : value.exp) ? cacheKey(value) : undefined;
+    var _a = (0, react_1.useState)(function () {
+        return (0, exports.getCachedExpressionType)(value);
+    }), type = _a[0], setType = _a[1];
+    (0, react_1.useEffect)(function () {
+        if (!key) {
+            setType(undefined);
+            return undefined;
+        }
+        var cached = typeCache.get(key);
+        if (cached) {
+            setType(cached);
+            return undefined;
+        }
+        // the type of the previous expression is not this one's
+        setType(undefined);
+        var current = true;
+        var timer = setTimeout(function () {
+            void (0, exports.fetchExpressionType)(JSON.parse(key)).then(function (served) {
+                if (current) {
+                    setType(served !== null && served !== void 0 ? served : undefined);
+                }
+            });
+        }, TYPE_DEBOUNCE_MS);
+        return function () {
+            current = false;
+            clearTimeout(timer);
+        };
+    }, [key]);
+    return type;
+};
+exports.useExpressionType = useExpressionType;
+//# sourceMappingURL=useExpressionType.js.map

package/dist/components/form/expressions/useExpressionType.js.map

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

package/dist/components/form/expressions/useRenderExpression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useRenderExpression.d.ts","sourceRoot":"","sources":["../../../../src/components/form/expressions/useRenderExpression.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAI3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAqBlE,iEAAiE;AACjE,MAAM,WAAW,mBAAmB;IAClC,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAC;CAC1B;AA2BD,gFAAgF;AAChF,eAAO,MAAM,uCAAuC,QAAO,IAI1D,CAAC;AAOF,MAAM,WAAW,0BAA0B;IACzC,4FAA4F;IAC5F,MAAM,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC5D;;;;OAIG;IACH,UAAU,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC;CAC9E;AAED,eAAO,MAAM,mBAAmB,QAAO,0BA2DtC,CAAC"}
+{"version":3,"file":"useRenderExpression.d.ts","sourceRoot":"","sources":["../../../../src/components/form/expressions/useRenderExpression.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAK3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAqBlE,iEAAiE;AACjE,MAAM,WAAW,mBAAmB;IAClC,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAC;CAC1B;AA2BD,gFAAgF;AAChF,eAAO,MAAM,uCAAuC,QAAO,IAI1D,CAAC;AAOF,MAAM,WAAW,0BAA0B;IACzC,4FAA4F;IAC5F,MAAM,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC5D;;;;OAIG;IACH,UAAU,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC;CAC9E;AAED,eAAO,MAAM,mBAAmB,QAAO,0BAkEtC,CAAC"}

package/dist/components/form/expressions/useRenderExpression.js

@@ -67,6 +67,7 @@ exports.useRenderExpression = exports._resetRenderExpressionTransportForTests =
 var nanoid_1 = require("nanoid");
 var react_1 = require("react");
 var lspClient_1 = require("../../../utils/lspClient");
+var expressionOperands_1 = require("./expressionOperands");
 /* The synchronous summary a collapsed row prints — see `readFirst.ts`. It is
    not a stand-in for this rendering and is never shown in its place. */
 var renderExpressionToText_1 = require("./renderExpressionToText");
@@ -158,23 +159,22 @@ var useRenderExpression = function () {
             };
             var run = function () { return __awaiter(void 0, void 0, void 0, function () {
                 var job, outcome, _a;
-                var _b;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             job = pendingRef.current;
                             pendingRef.current = null;
                             if (!job)
                                 return [2 /*return*/];
                             lastRunRef.current = Date.now();
-                            if (!((_b = job.value) === null || _b === void 0 ? void 0 : _b.exp)) return [3 /*break*/, 2];
-                            return [4 /*yield*/, renderViaServer(job.value)];
+                            if (!(0, expressionOperands_1.isExpressionComplete)(job.value)) return [3 /*break*/, 2];
+                            return [4 /*yield*/, renderViaServer((0, expressionOperands_1.expressionWithOperands)(job.value))];
                         case 1:
-                            _a = _c.sent();
+                            _a = _b.sent();
                             return [3 /*break*/, 3];
                         case 2:
                             _a = null;
-                            _c.label = 3;
+                            _b.label = 3;
                         case 3:
                             outcome = _a;
                             job.resolvers.forEach(function (r) { return r(outcome); });

package/dist/components/form/expressions/useRenderExpression.js.map

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

package/dist/components/form/fields/Field.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Field.d.ts","sourceRoot":"","sources":["../../../../src/components/form/fields/Field.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAIlB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAE7E,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAK/G,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAc1E,OAAO,EAIL,gCAAgC,EAChC,iCAAiC,EAElC,MAAM,2BAA2B,CAAC;AA0CnC,YAAY,EAAE,kBAAkB,EAAE,CAAC;AAEnC;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,oBAAqB,SAAQ,kBAAkB;IAC9D,qFAAqF;IACrF,UAAU,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,CAAC;IACnC,wDAAwD;IACxD,OAAO,CAAC,EAAE,iCAAiC,CAAC;IAC5C,sFAAsF;IACtF,aAAa,CAAC,EAAE,gCAAgC,EAAE,CAAC;CACpD;AAED,MAAM,WAAW,eAAe,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,CAAE,SAAQ,IAAI,CACtF,yBAAyB,EACzB,OAAO,GAAG,eAAe,GAAG,YAAY,GAAG,cAAc,GAAG,iBAAiB,CAC9E,EAAE,eAAe;IAChB,IAAI,CAAC,EAAE,CAAC,CAAC;IACT,KAAK,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC;IAC9B,QAAQ,EAAE,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAEnE,mDAAmD;IACnD,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAE9C,wFAAwF;IACxF,UAAU,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACvC,gDAAgD;IAChD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,0CAA0C;IAC1C,sBAAsB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC9C,gCAAgC,CAAC,EAAE,OAAO,CAAC;IAE3C,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEjC,KAAK,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACnC,aAAa,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;CACrD;AAED,eAAO,MAAM,SAAS,gTAwBnB,gBAAgB,CAAC,CAAC,4CAmkBpB,CAAC"}
+{"version":3,"file":"Field.d.ts","sourceRoot":"","sources":["../../../../src/components/form/fields/Field.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAIlB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAE7E,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAQ/G,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAc1E,OAAO,EAIL,gCAAgC,EAChC,iCAAiC,EAElC,MAAM,2BAA2B,CAAC;AA0CnC,YAAY,EAAE,kBAAkB,EAAE,CAAC;AAEnC;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,oBAAqB,SAAQ,kBAAkB;IAC9D,qFAAqF;IACrF,UAAU,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,CAAC;IACnC,wDAAwD;IACxD,OAAO,CAAC,EAAE,iCAAiC,CAAC;IAC5C,sFAAsF;IACtF,aAAa,CAAC,EAAE,gCAAgC,EAAE,CAAC;CACpD;AAED,MAAM,WAAW,eAAe,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,CAAE,SAAQ,IAAI,CACtF,yBAAyB,EACzB,OAAO,GAAG,eAAe,GAAG,YAAY,GAAG,cAAc,GAAG,iBAAiB,CAC9E,EAAE,eAAe;IAChB,IAAI,CAAC,EAAE,CAAC,CAAC;IACT,KAAK,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC;IAC9B,QAAQ,EAAE,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAEnE,mDAAmD;IACnD,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAE9C,wFAAwF;IACxF,UAAU,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACvC,gDAAgD;IAChD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,0CAA0C;IAC1C,sBAAsB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC9C,gCAAgC,CAAC,EAAE,OAAO,CAAC;IAE3C,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEjC,KAAK,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACnC,aAAa,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;CACrD;AAED,eAAO,MAAM,SAAS,gTAwBnB,gBAAgB,CAAC,CAAC,4CAglBpB,CAAC"}

package/dist/components/form/fields/Field.js

@@ -39,7 +39,10 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 var reqore_1 = require("@qoretechnologies/reqore");
 var lodash_1 = require("lodash");
 var react_1 = require("react");
+var useReadableOpacity_1 = require("../../../hooks/useReadableOpacity");
 var common_1 = require("../../../helpers/common");
+var descriptionTooltip_1 = require("../../../helpers/descriptionTooltip");
+var describedControl_1 = require("../../Description/describedControl");
 var useArgSchema_1 = require("../../../hooks/useArgSchema");
 var Boolean_1 = __importDefault(require("./boolean/Boolean"));
 var Color_1 = __importDefault(require("./color/Color"));
@@ -111,8 +114,12 @@ var FormField = function (_a) {
     tags = _a.tags, // eslint-disable-line @typescript-eslint/no-unused-vars
     options = _a.options, // eslint-disable-line @typescript-eslint/no-unused-vars
     rest = __rest(_a, ["type", "onChange", "value", "fieldProps", "label", "labelPosition", "allowed_values", "allowed_values_creatable", "arg_schema", "element_type", "ui_element_type", "element_allowed_values", "element_allowed_values_creatable", "name", "display_name", "readonly", "size", "tags", "options"]);
+    // an item that cannot be picked is dimmed, as far as its name still reads (qorus#646)
+    var unavailableOpacity = (0, useReadableOpacity_1.useReadableOpacity)(0.55);
     var id = (0, react_1.useId)();
     var _c = (0, useArgSchema_1.useArgSchema)(arg_schema), finalArgSchema = _c.schema, argSchemaLoading = _c.loading;
+    // a choice's description card: drawn as markdown, opened by a tap on touch (`descriptionTooltip`)
+    var descriptions = (0, descriptionTooltip_1.useDescriptionTooltips)();
     var handleChange = function (value, event) {
         onChange(value, event);
     };
@@ -153,9 +160,9 @@ var FormField = function (_a) {
                         handleChange(value);
                     }, id: id })));
             case 'rgbcolor':
-                return ((0, jsx_runtime_1.jsx)(Color_1.default, __assign({}, rest, fieldProps, { value: value, onChange: function (color) {
+                return ((0, jsx_runtime_1.jsx)(Color_1.default, __assign({}, fieldProps, { value: value, onChange: function (color) {
                         handleChange(color);
-                    } })));
+                    }, disabled: rest.disabled, readOnly: readonly })));
             case 'long-string':
             case 'binary':
                 return ((0, jsx_runtime_1.jsx)(LongString_1.default, __assign({}, rest, fieldProps, { value: value, onChange: function (selected) {
@@ -225,12 +232,15 @@ var FormField = function (_a) {
                                 var _a, _b;
                                 var itemValue = (_a = item.value) === null || _a === void 0 ? void 0 : _a.value;
                                 var checked = serverValue_1.some(function (v) { return (0, lodash_1.isEqual)(v, itemValue); });
-                                return ((0, jsx_runtime_1.jsx)(reqore_1.ReqoreCheckbox, { margin: 'right', label: (_b = item.display_name) !== null && _b !== void 0 ? _b : String(itemValue), tooltip: item.short_desc || item.desc, checked: checked, intent: checked ? 'info' : undefined, onClick: function () {
+                                var label = (_b = item.display_name) !== null && _b !== void 0 ? _b : String(itemValue);
+                                // with a mouse, the hover; on a touch screen, an ⓘ beside the box, whose tap only ticks it
+                                var described = (0, describedControl_1.describedControl)(item.short_desc || item.desc, descriptions, label);
+                                return (0, describedControl_1.besideItsInfo)((0, jsx_runtime_1.jsx)(reqore_1.ReqoreCheckbox, { margin: 'right', label: label, tooltip: described.tooltip, checked: checked, intent: checked ? 'info' : undefined, onClick: function () {
                                         var next = checked ?
                                             serverValue_1.filter(function (v) { return !(0, lodash_1.isEqual)(v, itemValue); })
                                             : __spreadArray(__spreadArray([], serverValue_1, true), [itemValue], false);
                                         handleChange(formatToServer_1(next));
-                                    } }, index));
+                                    } }), described.info, index);
                             }) }));
                     }
                     return ((0, jsx_runtime_1.jsx)(MultiSelectFormField_1.MultiSelectFormField, { items: element_allowed_values, value: serverValue_1, onChange: function (selected) {
@@ -339,7 +349,10 @@ var FormField = function (_a) {
                         var checked = (0, lodash_1.isEqual)(value, itemValue);
                         var mapped = mapAllowedValue(item, index);
                         var unavailable = (0, SelectCollection_1.getSelectItemUnavailability)(mapped);
-                        return ((0, jsx_runtime_1.jsx)(reqore_1.ReqoreCheckbox, { margin: 'right', label: (_b = item.display_name) !== null && _b !== void 0 ? _b : JSON.stringify(itemValue), tooltip: (0, SelectCollection_1.getSelectItemShortDescription)(mapped), 
+                        var label = (_b = item.display_name) !== null && _b !== void 0 ? _b : JSON.stringify(itemValue);
+                        // with a mouse, the hover; on a touch screen, an ⓘ beside the box, whose tap only ticks it
+                        var described = (0, describedControl_1.describedControl)((0, SelectCollection_1.getSelectItemShortDescription)(mapped), descriptions, label);
+                        return (0, describedControl_1.besideItsInfo)((0, jsx_runtime_1.jsx)(reqore_1.ReqoreCheckbox, { margin: 'right', label: label, tooltip: described.tooltip, 
                             /* The reason is IN the row, not only on its hover: a checkbox
                                has no body to bury it in, and a hover is the one affordance
                                a touch screen and a keyboard never reach. */
@@ -356,13 +369,13 @@ var FormField = function (_a) {
                                never appeared at all. And the NAME is the right thing to
                                dim: `description` carries the reason, and a reason has to
                                stay readable. Same rule the collection rows follow. */
-                            labelEffect: unavailable ? { opacity: 0.55 } : undefined, 
+                            labelEffect: unavailable ? { opacity: unavailableOpacity } : undefined, 
                             /* `cursor: not-allowed` from reqore's own `ReadOnlyElement`
                                rather than a hand-rolled inline style. It leaves the
                                pointer events intact, which is what the tooltip is read
                                through; it does NOT withhold `onClick`, but this row
                                already withholds it below, so it is purely additive. */
-                            readOnly: !!unavailable, uncheckedIcon: unavailable ? 'LockLine' : undefined, checked: checked, intent: checked ? 'info' : undefined, onClick: unavailable ? undefined : (function () { return handleChange((checked ? undefined : itemValue)); }) }, index));
+                            readOnly: !!unavailable, uncheckedIcon: unavailable ? 'LockLine' : undefined, checked: checked, intent: checked ? 'info' : undefined, onClick: unavailable ? undefined : (function () { return handleChange((checked ? undefined : itemValue)); }) }), described.info, index);
                     })] }));
         }
         // Non-creatable >3: dropdown that tracks the current value