@qoretechnologies/reqraft 0.10.64 → 0.10.65-pr.137.g62fcecc

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

@@ -0,0 +1,97 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isExpressionComplete = exports.expressionWithOperands = exports.expressionOperand = void 0;
+// Copyright 2026 Qore Technologies, s.r.o.
+// The operands of an expression as the Visual view stores them, read as what they hold.
+//
+// The Visual view stores operands in the shapes its editors produce, and two of
+// them are not values at all:
+//
+// - an operand switched to "Use Expression" whose operation is not chosen yet
+//   (`{ is_expression: true, value: { args } }`, no `exp`), and an operand not
+//   filled in (`{}`, `{ type }`): there is nothing in them yet;
+// - a custom Text value, which is a rich-text document (a list of Slate nodes),
+//   not a string.
+//
+// Everything that writes an expression as text reads its operands here - the
+// Text view's `dpql/serialize`, the read-first row summary, and an application's
+// own summaries - so none of them prints a hash or `[object Object]` for them.
+// Pure: no transport/socket import.
+var common_1 = require("../../../helpers/common");
+var isObject = function (value) {
+    return !!value && typeof value === 'object' && !Array.isArray(value);
+};
+/** A rich-text value as the operand it holds, or `undefined` when it is empty. */
+var richtextOperand = function (value) {
+    var segments = (0, common_1.richtextToSegments)(value).filter(function (segment) { return segment.kind === 'tag' || segment.text.trim(); });
+    if (!segments.length)
+        return undefined;
+    // a single template is that template, as a template picked from the list is
+    if (segments.length === 1 && segments[0].kind === 'tag') {
+        return { type: 'auto', value: segments[0].value };
+    }
+    return { type: 'string', value: (0, common_1.richtextToString)(value) };
+};
+/**
+ * One operand as what it holds: a literal, a `{ type, value }`, or a nested
+ * expression whose own operands are read the same way; `undefined` when it is
+ * not filled in yet (an operation not chosen, a value not given).
+ *
+ * A nested expression whose operation is chosen but whose operands are not all
+ * filled in is kept, with its missing operands as `undefined`, so a summary can
+ * write what is there.
+ */
+var expressionOperand = function (arg) {
+    if (arg === undefined || arg === null)
+        return undefined;
+    if (!isObject(arg))
+        return arg;
+    if (arg.is_expression) {
+        if (!isObject(arg.value) || !arg.value.exp)
+            return undefined;
+        return __assign(__assign({}, arg), { value: (0, exports.expressionWithOperands)(arg.value) });
+    }
+    if ('exp' in arg)
+        return arg.exp ? (0, exports.expressionWithOperands)(arg) : undefined;
+    if (!('value' in arg) || arg.value === undefined)
+        return undefined;
+    if (arg.type === 'richtext')
+        return richtextOperand(arg.value);
+    return arg;
+};
+exports.expressionOperand = expressionOperand;
+/** The expression with each operand read as what it holds (`undefined` where none is given yet). */
+var expressionWithOperands = function (value) {
+    var _a;
+    return (__assign(__assign({}, value), { args: ((_a = value.args) !== null && _a !== void 0 ? _a : []).map(exports.expressionOperand) }));
+};
+exports.expressionWithOperands = expressionWithOperands;
+/** Whether every part of the expression is filled in: an operation, and each of its operands. */
+var isExpressionComplete = function (value) {
+    var _a;
+    if (!(value === null || value === void 0 ? void 0 : value.exp))
+        return false;
+    return ((_a = value.args) !== null && _a !== void 0 ? _a : []).every(function (arg) {
+        var operand = (0, exports.expressionOperand)(arg);
+        if (operand === undefined)
+            return false;
+        if (isObject(operand) && operand.is_expression)
+            return (0, exports.isExpressionComplete)(operand.value);
+        if (isObject(operand) && 'exp' in operand)
+            return (0, exports.isExpressionComplete)(operand);
+        return true;
+    });
+};
+exports.isExpressionComplete = isExpressionComplete;
+//# sourceMappingURL=expressionOperands.js.map

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

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

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

@@ -0,0 +1,24 @@
+import { IExpression, IExpressionValue } from './types';
+/** The accessor operations a field path is written with, as Qore's DataProvider names them. */
+export declare const FIELD_PATH_OPERATIONS: {
+    readonly listWildcard: "list_wildcard";
+    readonly hashWildcard: "hash_wildcard";
+    readonly wildcardItem: "wildcard_item";
+    readonly index: "index";
+    readonly key: "key";
+};
+/**
+ * The field path an expression is, as written - `orders[*].id`, `prices{*}`, `items[0].id` - when it is made only of
+ * record fields and the accessor operations over them (and holds at least one); otherwise undefined, and it is
+ * drawn as the operation it is. A record field alone is not a path: it is the field.
+ */
+export declare const fieldPathOf: (expression?: IExpression | IExpressionValue) => string | undefined;
+/** The template a field path is drawn as: the same chip a record field operand is, `$record:{orders[*].id}`. */
+export declare const fieldPathTemplate: (path: string) => string;
+/**
+ * The expression with each field path in it written as the reference it reads as - `$record:{orders[*].id}` - for
+ * a rendering to draw it as the Visual tab does: the path's chip, not the accessor operations. What is stored is
+ * not changed; this is only what is shown.
+ */
+export declare const withFieldPathsAsReferences: (value: IExpressionValue) => IExpressionValue;
+//# sourceMappingURL=fieldPath.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"fieldPath.d.ts","sourceRoot":"","sources":["../../../../src/components/form/expressions/fieldPath.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAExD,+FAA+F;AAC/F,eAAO,MAAM,qBAAqB;;;;;;CAMxB,CAAC;AA+FX;;;;GAIG;AACH,eAAO,MAAM,WAAW,gBAAiB,WAAW,GAAG,gBAAgB,KAAG,MAAM,GAAG,SAUlF,CAAC;AAEF,gHAAgH;AAChH,eAAO,MAAM,iBAAiB,SAAU,MAAM,KAAG,MAA6B,CAAC;AAE/E;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,UAAW,gBAAgB,KAAG,gBAWnE,CAAC"}

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

@@ -0,0 +1,152 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withFieldPathsAsReferences = exports.fieldPathTemplate = exports.fieldPathOf = exports.FIELD_PATH_OPERATIONS = void 0;
+// Copyright 2026 Qore Technologies, s.r.o.
+// A field path written with accessors (qorus#646): `@orders[*].id`, `@prices{*}.amount`, `@items[0].id`. The
+// server reads one into accessor operations - `list_wildcard`, `hash_wildcard`, `wildcard_item`, `index` and `key` -
+// over record fields, and an expression made only of those is drawn as the path it is, not as an operation with
+// operands: the `@value` in `hash_wildcard(prices, value)` is the item's value, not a record field, and drawn as an
+// operand it read "record: value".
+var templates_1 = require("../../../helpers/templates");
+/** The accessor operations a field path is written with, as Qore's DataProvider names them. */
+exports.FIELD_PATH_OPERATIONS = {
+    listWildcard: 'list_wildcard',
+    hashWildcard: 'hash_wildcard',
+    wildcardItem: 'wildcard_item',
+    index: 'index',
+    key: 'key',
+};
+/**
+ * A key a path writes after a dot. The path is a test path - what `$record:{…}` holds - where a dot, a bracket, a
+ * brace or a backslash in a key would read as part of the path; a key holding one is not written as a path here.
+ */
+var PATH_KEY = /^[^.[\]{}\\]+$/;
+/** The operation an operand is, when it is one: its `{ exp, args }`. */
+var operationOf = function (arg) {
+    return (arg === null || arg === void 0 ? void 0 : arg.is_expression) && arg.value && typeof arg.value === 'object' ? arg.value : undefined;
+};
+/** The record field an operand names, when it is a field: `$record:{orders}` is `orders`. */
+var recordFieldOf = function (arg) {
+    if (!arg || arg.is_expression || typeof arg.value !== 'string') {
+        return undefined;
+    }
+    return (0, templates_1.recordFieldOfTemplate)(arg.value);
+};
+/**
+ * The path an operand is, or undefined when it is anything else. `relative`: it is a wildcard's body, read from the
+ * item (`wildcard_item`, which is nothing written) - a field there is written after a dot (`[*].id`).
+ */
+var pathOfOperand = function (arg, relative) {
+    var field = recordFieldOf(arg);
+    if (field !== undefined) {
+        return (field === '' ? undefined
+            : relative ? ".".concat(field)
+                : field);
+    }
+    var operation = operationOf(arg);
+    return operation ? pathOfOperation(operation, relative) : undefined;
+};
+/** A hash wildcard's body: read from the value (`@value`), which is not written - `{*}.amount`, `{*}`. */
+var hashBodyOf = function (arg) {
+    var body = pathOfOperand(arg, true);
+    if (body === undefined) {
+        return undefined;
+    }
+    if (body === '.value') {
+        return '';
+    }
+    return /^\.value[.[{]/.test(body) ? body.slice('.value'.length) : undefined;
+};
+/** A literal operand's value: what `index` and `key` take. */
+var literalOf = function (arg) {
+    return arg && !arg.is_expression && !(typeof arg.value === 'string' && arg.value.startsWith('$')) ?
+        arg.value
+        : undefined;
+};
+var pathOfOperation = function (operation, relative) {
+    var _a, _b, _c;
+    var _d = (_a = operation.args) !== null && _a !== void 0 ? _a : [], source = _d[0], second = _d[1];
+    var count = (_c = (_b = operation.args) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0;
+    switch (operation.exp) {
+        case exports.FIELD_PATH_OPERATIONS.wildcardItem:
+            // the item of the enclosing [*]: nothing written, and only inside a wildcard
+            return relative && count === 0 ? '' : undefined;
+        case exports.FIELD_PATH_OPERATIONS.listWildcard:
+        case exports.FIELD_PATH_OPERATIONS.hashWildcard: {
+            if (count !== 2) {
+                return undefined;
+            }
+            var from = pathOfOperand(source, relative);
+            var isList = operation.exp === exports.FIELD_PATH_OPERATIONS.listWildcard;
+            var body = isList ? pathOfOperand(second, true) : hashBodyOf(second);
+            return from === undefined || body === undefined ?
+                undefined
+                : "".concat(from).concat(isList ? '[*]' : '{*}').concat(body);
+        }
+        case exports.FIELD_PATH_OPERATIONS.index: {
+            var from = pathOfOperand(source, relative);
+            var at = literalOf(second);
+            return count === 2 && from !== undefined && typeof at === 'number' && Number.isInteger(at) ?
+                "".concat(from, "[").concat(at, "]")
+                : undefined;
+        }
+        case exports.FIELD_PATH_OPERATIONS.key: {
+            var from = pathOfOperand(source, relative);
+            var key = literalOf(second);
+            if (count !== 2 || from === undefined || typeof key !== 'string') {
+                return undefined;
+            }
+            return PATH_KEY.test(key) ? "".concat(from, ".").concat(key) : undefined;
+        }
+        default:
+            return undefined;
+    }
+};
+/**
+ * The field path an expression is, as written - `orders[*].id`, `prices{*}`, `items[0].id` - when it is made only of
+ * record fields and the accessor operations over them (and holds at least one); otherwise undefined, and it is
+ * drawn as the operation it is. A record field alone is not a path: it is the field.
+ */
+var fieldPathOf = function (expression) {
+    var operation = expression && 'is_expression' in expression ?
+        operationOf(expression)
+        : expression;
+    if (!(operation === null || operation === void 0 ? void 0 : operation.exp)) {
+        return undefined;
+    }
+    var path = pathOfOperation(operation, false);
+    return path === '' ? undefined : path;
+};
+exports.fieldPathOf = fieldPathOf;
+/** The template a field path is drawn as: the same chip a record field operand is, `$record:{orders[*].id}`. */
+var fieldPathTemplate = function (path) { return "$record:{".concat(path, "}"); };
+exports.fieldPathTemplate = fieldPathTemplate;
+/**
+ * The expression with each field path in it written as the reference it reads as - `$record:{orders[*].id}` - for
+ * a rendering to draw it as the Visual tab does: the path's chip, not the accessor operations. What is stored is
+ * not changed; this is only what is shown.
+ */
+var withFieldPathsAsReferences = function (value) {
+    var _a;
+    return (__assign(__assign({}, value), { args: (_a = value.args) === null || _a === void 0 ? void 0 : _a.map(function (arg) {
+            var _a;
+            var path = (arg === null || arg === void 0 ? void 0 : arg.is_expression) ? (0, exports.fieldPathOf)(arg) : undefined;
+            if (path !== undefined) {
+                return { type: 'auto', value: (0, exports.fieldPathTemplate)(path) };
+            }
+            return (arg === null || arg === void 0 ? void 0 : arg.is_expression) && ((_a = arg.value) === null || _a === void 0 ? void 0 : _a.exp) ? __assign(__assign({}, arg), { value: (0, exports.withFieldPathsAsReferences)(arg.value) }) : arg;
+        }) }));
+};
+exports.withFieldPathsAsReferences = withFieldPathsAsReferences;
+//# sourceMappingURL=fieldPath.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"fieldPath.js","sourceRoot":"","sources":["../../../../src/components/form/expressions/fieldPath.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAA2C;AAC3C,6GAA6G;AAC7G,qHAAqH;AACrH,gHAAgH;AAChH,oHAAoH;AACpH,mCAAmC;AACnC,wDAAmE;AAGnE,+FAA+F;AAClF,QAAA,qBAAqB,GAAG;IACnC,YAAY,EAAE,eAAe;IAC7B,YAAY,EAAE,eAAe;IAC7B,YAAY,EAAE,eAAe;IAC7B,KAAK,EAAE,OAAO;IACd,GAAG,EAAE,KAAK;CACF,CAAC;AAEX;;;GAGG;AACH,IAAM,QAAQ,GAAG,gBAAgB,CAAC;AAElC,wEAAwE;AACxE,IAAM,WAAW,GAAG,UAAC,GAAiB;IACpC,OAAA,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,aAAa,KAAI,GAAG,CAAC,KAAK,IAAI,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;AAAxF,CAAwF,CAAC;AAE3F,6FAA6F;AAC7F,IAAM,aAAa,GAAG,UAAC,GAAiB;IACtC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,aAAa,IAAI,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC/D,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,IAAA,iCAAqB,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC1C,CAAC,CAAC;AAEF;;;GAGG;AACH,IAAM,aAAa,GAAG,UAAC,GAA4B,EAAE,QAAiB;IACpE,IAAM,KAAK,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,CACL,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS;YACxB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAI,KAAK,CAAE;gBACxB,CAAC,CAAC,KAAK,CACR,CAAC;IACJ,CAAC;IACD,IAAM,SAAS,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;IACnC,OAAO,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACtE,CAAC,CAAC;AAEF,0GAA0G;AAC1G,IAAM,UAAU,GAAG,UAAC,GAAiB;IACnC,IAAM,IAAI,GAAG,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACtC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC9E,CAAC,CAAC;AAEF,8DAA8D;AAC9D,IAAM,SAAS,GAAG,UAAC,GAAiB;IAClC,OAAA,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,IAAI,CAAC,CAAC,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC1F,GAAG,CAAC,KAAK;QACX,CAAC,CAAC,SAAS;AAFX,CAEW,CAAC;AAEd,IAAM,eAAe,GAAG,UAAC,SAA2B,EAAE,QAAiB;;IAC/D,IAAA,KAAmB,MAAA,SAAS,CAAC,IAAI,mCAAI,EAAE,EAAtC,MAAM,QAAA,EAAE,MAAM,QAAwB,CAAC;IAC9C,IAAM,KAAK,GAAG,MAAA,MAAA,SAAS,CAAC,IAAI,0CAAE,MAAM,mCAAI,CAAC,CAAC;IAE1C,QAAQ,SAAS,CAAC,GAAG,EAAE,CAAC;QACtB,KAAK,6BAAqB,CAAC,YAAY;YACrC,6EAA6E;YAC7E,OAAO,QAAQ,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAClD,KAAK,6BAAqB,CAAC,YAAY,CAAC;QACxC,KAAK,6BAAqB,CAAC,YAAY,CAAC,CAAC,CAAC;YACxC,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;gBAChB,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,IAAM,IAAI,GAAG,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC7C,IAAM,MAAM,GAAG,SAAS,CAAC,GAAG,KAAK,6BAAqB,CAAC,YAAY,CAAC;YACpE,IAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACvE,OAAO,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS,CAAC,CAAC;gBAC7C,SAAS;gBACX,CAAC,CAAC,UAAG,IAAI,SAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,SAAG,IAAI,CAAE,CAAC;QAChD,CAAC;QACD,KAAK,6BAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;YACjC,IAAM,IAAI,GAAG,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC7C,IAAM,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;YAC7B,OAAO,KAAK,KAAK,CAAC,IAAI,IAAI,KAAK,SAAS,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;gBACxF,UAAG,IAAI,cAAI,EAAE,MAAG;gBAClB,CAAC,CAAC,SAAS,CAAC;QAChB,CAAC;QACD,KAAK,6BAAqB,CAAC,GAAG,CAAC,CAAC,CAAC;YAC/B,IAAM,IAAI,GAAG,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC7C,IAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;YAC9B,IAAI,KAAK,KAAK,CAAC,IAAI,IAAI,KAAK,SAAS,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;gBACjE,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAG,IAAI,cAAI,GAAG,CAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3D,CAAC;QACD;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC,CAAC;AAEF;;;;GAIG;AACI,IAAM,WAAW,GAAG,UAAC,UAA2C;IACrE,IAAM,SAAS,GACb,UAAU,IAAI,eAAe,IAAI,UAAU,CAAC,CAAC;QAC3C,WAAW,CAAC,UAAyB,CAAC;QACxC,CAAC,CAAE,UAA+B,CAAC;IACrC,IAAI,CAAC,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG,CAAA,EAAE,CAAC;QACpB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAM,IAAI,GAAG,eAAe,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAC/C,OAAO,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;AACxC,CAAC,CAAC;AAVW,QAAA,WAAW,eAUtB;AAEF,gHAAgH;AACzG,IAAM,iBAAiB,GAAG,UAAC,IAAY,IAAa,OAAA,mBAAY,IAAI,MAAG,EAAnB,CAAmB,CAAC;AAAlE,QAAA,iBAAiB,qBAAiD;AAE/E;;;;GAIG;AACI,IAAM,0BAA0B,GAAG,UAAC,KAAuB;;IAAuB,OAAA,uBACpF,KAAK,KACR,IAAI,EAAE,MAAA,KAAK,CAAC,IAAI,0CAAE,GAAG,CAAC,UAAC,GAAG;;YACxB,IAAM,IAAI,GAAG,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,aAAa,EAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC/D,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACvB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAA,yBAAiB,EAAC,IAAI,CAAC,EAAE,CAAC;YAC1D,CAAC;YACD,OAAO,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,aAAa,MAAI,MAAA,GAAG,CAAC,KAAK,0CAAE,GAAG,CAAA,CAAC,CAAC,uBACpC,GAAG,KAAE,KAAK,EAAE,IAAA,kCAA0B,EAAC,GAAG,CAAC,KAAK,CAAC,IACxD,CAAC,CAAC,GAAG,CAAC;QACV,CAAC,CAAC,IACF,CAAA;CAAA,CAAC;AAXU,QAAA,0BAA0B,8BAWpC"}

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

@@ -1 +1 @@
-{"version":3,"file":"mockExpressions.d.ts","sourceRoot":"","sources":["../../../../src/components/form/expressions/mockExpressions.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AA+B5C,eAAO,MAAM,eAAe,EAAE,iBAAiB,EAuR9C,CAAC"}
+{"version":3,"file":"mockExpressions.d.ts","sourceRoot":"","sources":["../../../../src/components/form/expressions/mockExpressions.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AA4B5C,eAAO,MAAM,eAAe,EAAE,iBAAiB,EAwS9C,CAAC"}

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

@@ -26,6 +26,21 @@ var comparatorArgs = function (operatorWord) { return [
     { name: 'any', display_name: 'Value', ui_type: 'any', required: true },
 ]; };
 exports.mockExpressions = [
+    // As the server defines it (qorus Classes/QorusExpressions.qc QO_VALUE): what a value written alone parses
+    // into, so a value the Visual view starts from is shown as itself.
+    {
+        name: 'value',
+        display_name: 'Value',
+        short_desc: 'Evaluates and returns a field reference value',
+        desc: 'Evaluates the given field reference and returns its value; this allows field references to be used as standalone expressions',
+        symbol: '',
+        type: 1,
+        subtype: 1,
+        return_type: 'any',
+        ui_return_type: 'any',
+        varargs: false,
+        args: [{ name: 'any', display_name: 'Value', ui_type: 'any', required: true }],
+    },
     {
         name: '==',
         display_name: 'Logical Equals',
@@ -72,7 +87,7 @@ exports.mockExpressions = [
         name: '&&',
         display_name: 'Logical And',
         short_desc: 'Returns True if all arguments are True with logic short-circuiting',
-        desc: 'Logical AND of all arguments, with short-circuiting.',
+        desc: 'Logical AND of all arguments, with short-circuiting. Each argument is read as true or false as a condition is: a number is true unless it is zero, a list or a hash unless it is empty; compare a value explicitly to say what is meant.',
         symbol: '&&',
         type: 1,
         subtype: 2,
@@ -81,13 +96,14 @@ exports.mockExpressions = [
         varargs: true,
         min_args: 1,
         groups: ['Logic'],
-        args: [{ name: 'bool', display_name: 'Value', ui_type: 'bool', required: true }],
+        // any value: each part is read as a condition is, not required to be a bool (qorus#646)
+        args: [{ name: 'any', display_name: 'Value', ui_type: 'any', required: true }],
     },
     {
         name: '||',
         display_name: 'Logical Or',
         short_desc: 'Returns True if at least one argument is True with logic short-circuiting',
-        desc: 'Logical OR of all arguments, with short-circuiting.',
+        desc: 'Logical OR of all arguments, with short-circuiting. Each argument is read as true or false as a condition is: a number is true unless it is zero, a list or a hash unless it is empty; compare a value explicitly to say what is meant.',
         symbol: '||',
         type: 1,
         subtype: 2,
@@ -96,7 +112,8 @@ exports.mockExpressions = [
         varargs: true,
         min_args: 1,
         groups: ['Logic'],
-        args: [{ name: 'bool', display_name: 'Value', ui_type: 'bool', required: true }],
+        // any value: each part is read as a condition is, not required to be a bool (qorus#646)
+        args: [{ name: 'any', display_name: 'Value', ui_type: 'any', required: true }],
     },
     {
         name: 'contains',
@@ -185,7 +202,7 @@ exports.mockExpressions = [
     // boolean-returning op with one operand ("Value To Convert").
     {
         name: 'convert-to-boolean',
-        display_name: 'Convert to Boolean',
+        display_name: 'Convert to true or false',
         short_desc: 'Converts the given value to a boolean',
         desc: 'Converts the given value to a boolean value.',
         symbol: 'boolean',

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

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

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

@@ -1,4 +1,6 @@
 import { IExpressionSchema, IExpressionValue } from './types';
+/** How a part not filled in yet is written: an operation not chosen, a value not given. */
+export declare const EXPRESSION_HOLE = "\u2026";
 /**
  * Recursively render an expression AST to readable text — the client-side
  * approximation a read-first row summary shows.

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

@@ -1 +1 @@
-{"version":3,"file":"renderExpressionToText.d.ts","sourceRoot":"","sources":["../../../../src/components/form/expressions/renderExpressionToText.ts"],"names":[],"mappings":"AAMA,OAAO,EAAe,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AA2H3E;;;GAGG;AACH,eAAO,MAAM,sBAAsB,UAC1B,gBAAgB,GAAG,SAAS,gBACtB,iBAAiB,EAAE,KAC/B,MAA2D,CAAC"}
+{"version":3,"file":"renderExpressionToText.d.ts","sourceRoot":"","sources":["../../../../src/components/form/expressions/renderExpressionToText.ts"],"names":[],"mappings":"AAQA,OAAO,EAAe,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE3E,2FAA2F;AAC3F,eAAO,MAAM,eAAe,WAAM,CAAC;AAoJnC;;;GAGG;AACH,eAAO,MAAM,sBAAsB,UAC1B,gBAAgB,GAAG,SAAS,gBACtB,iBAAiB,EAAE,KAC/B,MAA2D,CAAC"}

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

@@ -1,6 +1,16 @@
 "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");
+var fieldPath_1 = require("./fieldPath");
+/** 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 +53,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
@@ -76,6 +91,10 @@ var renderInContext = function (value, expressions, contextPrec) {
     var _a, _b, _c, _d;
     if (!(value === null || value === void 0 ? void 0 : value.exp))
         return '';
+    // a field path reads as the path, the reference a record field operand is (fieldPath, qorus#646)
+    var path = (0, fieldPath_1.fieldPathOf)(value);
+    if (path !== undefined)
+        return renderLiteral((0, fieldPath_1.fieldPathTemplate)(path));
     /* A `value` expression IS its literal.
     
        It is the wrapper the parser puts around a bare literal — typing `null`,
@@ -95,19 +114,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":";;;AAQA,0EAA0E;AAC1E,IAAM,gBAAgB,GAAG,UAAC,MAAe;IACvC,OAAA,CAAC,CAAC,MAAM,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC;AAArC,CAAqC,CAAC;AAExC;;;;;;;;;GASG;AACH,IAAM,UAAU,GAA2B;IACzC,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,CAAC;IACN,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,GAAG,EAAE,CAAC;IACN,IAAI,EAAE,CAAC;IACP,GAAG,EAAE,CAAC;IACN,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;CACR,CAAC;AAEF,+DAA+D;AAC/D,IAAM,YAAY,GAAG,CAAC,CAAC;AACvB,8EAA8E;AAC9E,IAAM,YAAY,GAAG,CAAC,CAAC;AAEvB;;;;;;GAMG;AACH,IAAM,WAAW,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AAE1C,IAAM,YAAY,GAAG,UAAC,GAAY,YAAa,OAAA,MAAA,UAAU,CAAC,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,EAAE,CAAC,mCAAI,YAAY,CAAA,EAAA,CAAC;AAErF;;;;;;;GAOG;AACH,IAAM,eAAe,GAAG,UAAC,GAAW,EAAE,IAAY;IAChD,IAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IAC/B,OAAO,CAAC,IAAI,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC;AACzD,CAAC,CAAC;AAEF,iFAAiF;AACjF,IAAM,YAAY,GAAG,UAAC,GAAY;IAChC,OAAA,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,IAAK,GAAc;QACnE,CAAC,CAAE,GAA0B,CAAC,KAAK;QACnC,CAAC,CAAC,GAAG;AAFP,CAEO,CAAC;AAEV,IAAM,aAAa,GAAG,UAAC,KAAc;IACnC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC;IACzD,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC5D,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC5D,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC,CAAC;AAEF,+EAA+E;AAC/E,IAAM,eAAe,GAAG,UACtB,KAAmC,EACnC,WAAgC,EAChC,WAAmB;;IAEnB,IAAI,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,GAAG,CAAA;QAAE,OAAO,EAAE,CAAC;IAC3B;;;;;;;iFAO6E;IAC7E,IAAI,KAAK,CAAC,GAAG,KAAK,OAAO,IAAI,CAAC,MAAA,KAAK,CAAC,IAAI,mCAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7D,IAAM,IAAI,GAAG,CAAC,MAAA,KAAK,CAAC,IAAI,mCAAI,EAAE,CAAC,CAAC,CAAC,CAAgB,CAAC;QAClD,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,aAAa,CAAA,EAAE,CAAC;YACzB,OAAO,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IACD,IAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,GAAG,EAApB,CAAoB,CAAC,CAAC;IAC7D,IAAM,MAAM,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,mCAAI,KAAK,CAAC,GAAG,CAAC;IAC3C,IAAM,IAAI,GAAG,MAAA,KAAK,CAAC,IAAI,mCAAI,EAAE,CAAC;IAC9B,oDAAoD;IACpD,IAAM,cAAc,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,MAAK,CAAC,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC;IACzF,wEAAwE;IACxE,wDAAwD;IACxD,IAAM,OAAO,GAAG,cAAc,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;IAElF,IAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,UAAC,GAAgB,EAAE,IAAY;;QACpD,OAAA,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,aAAa,MAAI,MAAA,GAAG,CAAC,KAAK,0CAAE,GAAG,CAAA;YAClC,CAAC,CAAC,eAAe,CACb,GAAG,CAAC,KAAK,EACT,WAAW,EACX,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,GAAa,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CACpE;YACH,CAAC,CAAC,aAAa,CAAC,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,CAAC,CAAA;KAAA,CAC9B,CAAC;IAEF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,UAAG,MAAM,cAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAG,CAAC;IAC1C,CAAC;IAED,IAAM,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,WAAI,MAAM,MAAG,CAAC,CAAC,CAAC,CAAC,UAAG,KAAK,CAAC,CAAC,CAAC,cAAI,MAAM,cAAI,KAAK,CAAC,CAAC,CAAC,CAAE,CAAC;IAC9F,OAAO,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,WAAI,IAAI,MAAG,CAAC,CAAC,CAAC,IAAI,CAAC;AACpE,CAAC,CAAC;AAEF;;;GAGG;AACI,IAAM,sBAAsB,GAAG,UACpC,KAAmC,EACnC,WAAqC;IAArC,4BAAA,EAAA,gBAAqC;IAC1B,OAAA,eAAe,CAAC,KAAK,EAAE,WAAW,EAAE,YAAY,CAAC;AAAjD,CAAiD,CAAC;AAHlD,QAAA,sBAAsB,0BAG4B"}
+{"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":"AASA,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,MAC4F,CAAC;AAiBhG,OAAO,EAAE,iBAAiB,EAAE,CAAC"}

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

@@ -0,0 +1,49 @@
+"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 templates_1 = require("../../../helpers/templates");
+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) ? recordFieldsAsDpql((0, renderExpressionToText_1.renderExpressionToText)(value, expressions)) : renderExpressionToText_1.EXPRESSION_HOLE;
+};
+exports.incompleteExpressionText = incompleteExpressionText;
+/** Each quoted record field in `text` as DPQL names it: `"$record:{orders[*].id}"` is `@orders[*].id`. Read as
+ *  templates are, so a path with braces in it (`prices{*}`) is one field, not cut at its first `}`. */
+var recordFieldsAsDpql = function (text) {
+    var out = '';
+    var last = 0;
+    (0, templates_1.templateTokenSpans)(text).forEach(function (_a) {
+        var start = _a[0], end = _a[1];
+        var field = (0, templates_1.recordFieldOfTemplate)(text.slice(start, end));
+        if (field && text[start - 1] === '"' && text[end] === '"') {
+            out += "".concat(text.slice(last, start - 1), "@").concat(field);
+            last = end + 1;
+        }
+    });
+    return out + text.slice(last);
+};
+//# 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,wDAAuF;AACvF,2DAAuG;AAyC9F,kGAzCA,sCAAiB,OAyCA;AAxC1B,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,EAAC,CAAC,CAAC,kBAAkB,CAAC,IAAA,+CAAsB,EAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,wCAAe;AAA7F,CAA6F,CAAC;AAJnF,QAAA,wBAAwB,4BAI2D;AAEhG;uGACuG;AACvG,IAAM,kBAAkB,GAAG,UAAC,IAAY;IACtC,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAC,EAAY;YAAX,KAAK,QAAA,EAAE,GAAG,QAAA;QAC3C,IAAM,KAAK,GAAG,IAAA,iCAAqB,EAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QAC5D,IAAI,KAAK,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC;YAC1D,GAAG,IAAI,UAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,cAAI,KAAK,CAAE,CAAC;YACjD,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC;QACjB,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC"}

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

@@ -85,7 +85,14 @@ export interface IExpressionSchema {
     from_both?: boolean;
     return_type_first_arg?: boolean;
     return_type_arg_priority?: string[];
+    /**
+     * Never offered for picking: the operation is drawn only inside the construct that makes it - `wildcard_item`,
+     * the item of a `[*]` wildcard, which DPQL does not write (qorus#646). The operation pickers leave it out.
+     */
+    internal?: boolean;
 }
+/** Whether a catalogue entry is offered in the operation pickers: any not flagged `internal`. */
+export declare const isOfferedForPicking: (schema: Pick<IExpressionSchema, 'internal'>) => boolean;
 /** Where a varargs expression offers operand reordering. */
 export type TExpressionReorderSurface = 'overflowMenu' | 'dragHandle' | 'positionPicker';
 /**