@qoretechnologies/reqraft 0.10.55-pr.124.g77dd26c → 0.10.55

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

@@ -0,0 +1,217 @@
+"use strict";
+// Copyright 2026 Qore Technologies, s.r.o.
+/**
+ * Is this expression argument SUPPLIED, or is it still missing?
+ *
+ * DPQL has a null literal: `null` parses to `{exp: "value", args: [null]}` and
+ * round-trips, and an author writing it in the text editor means *"this is the
+ * value — nothing"*. It is the only way to assert that a call returned no
+ * value, which is how it was reported.
+ *
+ * The rule, stated once here because three different places had drawn it
+ * differently: **an argument that is explicitly null is supplied; one that is
+ * absent or `undefined` is still missing.**
+ *
+ * The builder used to ask `size(arg) === 0`, and lodash answers `0` for `null`
+ * as readily as for `{}`. So an explicit null was read as a missing argument
+ * and reset from the catalogue's declaration — which is how a saved draft ended
+ * up holding `{"type": "any", "required": true}`, an argument DEFINITION where
+ * its value should be, with the author's `null` gone and `required` (a schema
+ * key, never a value key) left behind to give it away.
+ */
+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);
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addMissingExpressionArgs = exports.shouldMarkAsExpression = exports.looksLikeExpressionAst = exports.asExpressionArgumentEnvelope = exports.isExpressionArgumentMissing = void 0;
+/**
+ * True when `arg` carries no value yet — `undefined`, the `{}` the builder
+ * writes when a type change resets an argument, or any envelope with no
+ * `value` in it.
+ *
+ * `null` is NOT missing: it is the null literal.
+ *
+ * The rule used to be "an object with no keys at all", which let an envelope
+ * holding nothing but SCHEMA keys pass as a supplied value. That is how a saved
+ * draft kept `{type: 'any', required: true}` — an argument DEFINITION where the
+ * author's value belonged — and why re-opening the expression never repaired
+ * it: the builder looked at those two keys, concluded the argument was already
+ * supplied, and left the definition in place as data. `required` is a schema
+ * key; nothing ever reads it back off a stored value.
+ *
+ * Asking for the `value` instead makes the question the one that was always
+ * meant: has the author put something here?
+ *
+ * @param arg one entry of an expression's `args`
+ */
+var isExpressionArgumentMissing = function (arg) {
+    if (arg === null) {
+        return false;
+    }
+    if (arg === undefined) {
+        return true;
+    }
+    if (typeof arg !== 'object') {
+        // a raw scalar argument — `0`, `false` and `''` are values too
+        return false;
+    }
+    return arg.value === undefined;
+};
+exports.isExpressionArgumentMissing = isExpressionArgumentMissing;
+/**
+ * The shape the builder stores an argument in: `{type, value}`.
+ *
+ * A parse result carries its arguments RAW — `args: [null]`, `args: [3]` —
+ * because that is what the grammar produced. The builder's editors read
+ * `arg.value`, so a raw argument has to be widened before it is stored, and
+ * widening `null` is the whole point: dropped instead, the author's null
+ * becomes an argument with no `value` key at all, which every later reader
+ * treats as an empty field.
+ *
+ * An argument that is already an envelope is returned untouched.
+ *
+ * @param arg one entry of an expression's `args`
+ * @param uiType the type the catalogue declares for that position
+ */
+var asExpressionArgumentEnvelope = function (arg, uiType) {
+    if (arg !== null && (arg === undefined || typeof arg === 'object')) {
+        return arg;
+    }
+    return __assign({ value: arg }, (uiType ? { type: uiType } : {}));
+};
+exports.asExpressionArgumentEnvelope = asExpressionArgumentEnvelope;
+/**
+ * Does this value still look like an expression AST?
+ *
+ * `{exp, args}` is the shape the builder and `dpql/parse` both produce. The
+ * check is structural on purpose: the flag that marks an option as holding an
+ * expression describes its VALUE, so the value is what should decide whether
+ * the flag survives a change that said nothing about it.
+ */
+var looksLikeExpressionAst = function (value) {
+    return !!value &&
+        typeof value === 'object' &&
+        !Array.isArray(value) &&
+        typeof value.exp === 'string';
+};
+exports.looksLikeExpressionAst = looksLikeExpressionAst;
+/**
+ * Whether an option should still be marked as holding an expression.
+ *
+ * The form engine used to delete the flag on ANY change that did not re-assert
+ * it, and most changes do not: an editor re-mounting, a revert, a validation
+ * pass. The value stayed the AST while the flag went, so the option degraded
+ * into a plain hash — which is how an assertion's Expected Value came back
+ * from a saved draft as a two-field object showing `exp` and `args`, and why
+ * `encodeTestValue` then stored it with `source: "literal"`.
+ *
+ * @param isFunction what the caller said: `true` sets the flag, `false` clears
+ * it deliberately (choosing a concrete type does this), `undefined` is no
+ * opinion at all
+ * @param value the option's new value
+ * @param wasExpression whether the option was marked before this change
+ */
+var shouldMarkAsExpression = function (isFunction, value, wasExpression) {
+    if (isFunction === true) {
+        return true;
+    }
+    if (isFunction === false) {
+        return false;
+    }
+    // No opinion: the flag belongs to the value, so it survives exactly as long
+    // as the value is still an expression.
+    return !!wasExpression && (0, exports.looksLikeExpressionAst)(value);
+};
+exports.shouldMarkAsExpression = shouldMarkAsExpression;
+/**
+ * Fill in an expression's missing arguments, leaving the supplied ones alone.
+ *
+ * Extracted from the builder so the decision it makes can be tested directly:
+ * a component test of the same behaviour passed just as happily with the defect
+ * in place, because the builder normalises on an interaction the harness never
+ * performed. A test that cannot fail is worse than none.
+ *
+ * @param expressions the served expression catalogue
+ * @param expression the chosen expression's `name`
+ * @param args the arguments so far — raw from a parse, or envelopes from the
+ * builder's own editors
+ */
+/**
+ * An argument slot with nothing in it yet: the catalogue's default when it has
+ * one, otherwise an envelope typed for the editors that need a type to mount.
+ * `false`, `0` and `''` are defaults too — a truthiness test dropped them.
+ */
+var emptyArgumentSlot = function (arg) {
+    return (arg === null || arg === void 0 ? void 0 : arg.default_value) != null ?
+        { value: arg.default_value, type: arg.ui_type }
+        : {
+            type: (arg === null || arg === void 0 ? void 0 : arg.ui_type) === 'richtext' || (arg === null || arg === void 0 ? void 0 : arg.ui_type) === 'number' || (arg === null || arg === void 0 ? void 0 : arg.ui_type) === 'bool' ?
+                arg.ui_type
+                : undefined,
+        };
+};
+var addMissingExpressionArgs = function (expressions, expression, args) {
+    var _a, _b;
+    if (args === void 0) { args = []; }
+    var newArgs = __spreadArray([], args, true);
+    var selected = expressions === null || expressions === void 0 ? void 0 : expressions.find(function (exp) { return (exp === null || exp === void 0 ? void 0 : exp.name) === expression; });
+    if (!selected) {
+        return newArgs;
+    }
+    if (selected.varargs) {
+        if (selected.subtype === 2) {
+            newArgs.push({ is_expression: true, value: { args: [] } });
+            return newArgs;
+        }
+        /* Every operand follows the one schema argument. Slots are added up to
+           `min_args`, and EVERY missing one is filled, not only the new ones: the
+           builder leaves an empty slot behind for each argument the previous value
+           had no operand for (a fresh builder has none), and an operand editor or
+           the validator reading such a slot for its `type` crashed the builder. A
+           raw operand from a parse is a value, so it is left alone. */
+        var schema_1 = ((_a = selected.args) !== null && _a !== void 0 ? _a : [])[0];
+        newArgs.push.apply(newArgs, Array.from({ length: ((_b = selected.min_args) !== null && _b !== void 0 ? _b : 1) - 1 }, function () { return undefined; }));
+        newArgs.forEach(function (slot, index) {
+            if ((0, exports.isExpressionArgumentMissing)(slot)) {
+                newArgs[index] = emptyArgumentSlot(schema_1);
+            }
+        });
+        return newArgs;
+    }
+    selected.args.forEach(function (arg, index) {
+        /* A RAW argument, as `dpql/parse` produces it — `args: [null]`, `args: [3]`
+           — is widened into the `{type, value}` envelope the editors read. Widening
+           the null is the point: dropped instead, the author's `null` became an
+           argument with no `value` key, and the branch below then filled the gap
+           from the catalogue's DECLARATION, which is how a saved draft came back
+           holding `{type: "any", required: true}` where its value belonged. */
+        newArgs[index] = (0, exports.asExpressionArgumentEnvelope)(newArgs[index], arg.ui_type);
+        /* "Missing" already means "carries no value", so an argument waiting for
+           its catalogue default is simply a missing one — it needs no separate
+           test. */
+        if (!(0, exports.isExpressionArgumentMissing)(newArgs[index])) {
+            return;
+        }
+        newArgs[index] = emptyArgumentSlot(arg);
+    });
+    return newArgs;
+};
+exports.addMissingExpressionArgs = addMissingExpressionArgs;
+//# sourceMappingURL=argumentPresence.js.map

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

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

package/dist/components/form/expressions/builder/argumentLabel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"argumentLabel.d.ts","sourceRoot":"","sources":["../../../../../src/components/form/expressions/builder/argumentLabel.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhF,MAAM,WAAW,oCAAoC;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,WAAW,CAAC;IAClB,WAAW,EAAE,iBAAiB,EAAE,CAAC;IACjC,MAAM,CAAC,EAAE,oBAAoB,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,8BAA8B,+CAMxC,oCAAoC,4CAsHtC,CAAC"}
+{"version":3,"file":"argumentLabel.d.ts","sourceRoot":"","sources":["../../../../../src/components/form/expressions/builder/argumentLabel.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhF,MAAM,WAAW,oCAAoC;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,WAAW,CAAC;IAClB,WAAW,EAAE,iBAAiB,EAAE,CAAC;IACjC,MAAM,CAAC,EAAE,oBAAoB,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,8BAA8B,+CAMxC,oCAAoC,4CA4HtC,CAAC"}

package/dist/components/form/expressions/builder/argumentLabel.js

@@ -34,9 +34,14 @@ var ExpressionBuilderArgumentLabel = function (_a) {
         types.getExactMatches(schema.ui_type).includes('any') ||
         type === 'any';
     var acceptedTypes = (0, lodash_1.uniq)(__spreadArray(__spreadArray([], types.getExactMatches(schema.ui_type), true), types.getAcceptedTypes(schema.ui_type), true));
-    var _c = arg.is_expression
-        ? (0, validations_1.validateFieldWithResult)('expression', arg, { expressions: expressions })
-        : (0, validations_1.validateFieldWithResult)(argumentType, arg.value, schema, !schema.required), isValid = _c.isValid, reason = _c.reason;
+    /* `arg` is optional — an operand the author has not filled in yet has no
+       entry at all, and a literal carried straight from a parse can be the null
+       literal itself. Both were dereferenced unguarded here, which took the whole
+       expression editor down to its error boundary rather than drawing an empty
+       argument. */
+    var _c = (arg === null || arg === void 0 ? void 0 : arg.is_expression) ?
+        (0, validations_1.validateFieldWithResult)('expression', arg, { expressions: expressions })
+        : (0, validations_1.validateFieldWithResult)(argumentType, arg === null || arg === void 0 ? void 0 : arg.value, schema, !schema.required), isValid = _c.isValid, reason = _c.reason;
     return ((0, jsx_runtime_1.jsxs)(reqore_1.ReqoreP, { size: 'tiny', effect: {
             uppercase: true,
             spaced: 1,
@@ -52,7 +57,7 @@ var ExpressionBuilderArgumentLabel = function (_a) {
                     italic: true,
                     weight: 'light',
                     opacity: 0.5,
-                }, children: ['[', types.getTypeDisplayName(schema.ui_type)] }), !matchesType ? ((0, jsx_runtime_1.jsx)(reqore_1.ReqoreIcon, { icon: 'ErrorWarningLine', color: 'warning', size: '10px', margin: 'both' })) : null, (argumentType || (arg.is_expression && ((_b = arg.value) === null || _b === void 0 ? void 0 : _b.exp))) &&
+                }, children: ['[', types.getTypeDisplayName(schema.ui_type)] }), !matchesType ? ((0, jsx_runtime_1.jsx)(reqore_1.ReqoreIcon, { icon: 'ErrorWarningLine', color: 'warning', size: '10px', margin: 'both' })) : null, (argumentType || ((arg === null || arg === void 0 ? void 0 : arg.is_expression) && ((_b = arg.value) === null || _b === void 0 ? void 0 : _b.exp))) &&
                 types.getTypeDisplayName(argumentType) !== types.getTypeDisplayName(schema.ui_type) &&
                 !matchesTypeExactly ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [matchesType ? ((0, jsx_runtime_1.jsx)(reqore_1.ReqoreIcon, { icon: 'CheckLine', color: 'pending', size: '10px', margin: 'both', tooltip: 'Type matches, but a transformation may be applied' })) : null, (0, jsx_runtime_1.jsx)(reqore_1.ReqoreSpan, { effect: {
                             italic: true,

package/dist/components/form/expressions/builder/argumentLabel.js.map

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

package/dist/components/form/expressions/builder/index.d.ts

@@ -1,6 +1,7 @@
 import { IReqorePanelAction } from '@qoretechnologies/reqore/dist/components/Panel';
 import { IReqoreFormTemplates } from '@qoretechnologies/reqore/dist/components/Textarea';
 import { TQorusType } from '@qoretechnologies/ts-toolkit';
+import React from 'react';
 import { IExpression, IExpressionSchema, TExpressionReorder } from '../types';
 export interface IExpressionBuilderProps {
     localTemplates?: IReqoreFormTemplates;
@@ -21,6 +22,18 @@ export interface IExpressionBuilderProps {
     expressions?: IExpressionSchema[];
     expressionsUrl?: string;
     serverHandled?: boolean;
+    /**
+     * SEAM (reqraft): the host's per-`ui_type` editors, forwarded to the operand
+     * fields below.
+     *
+     * Without them an operand whose type is one of the CONSUMER's own ui_types
+     * falls through `AutoFormField`'s switch to the literal "Unknown type!" tag.
+     * That is what an assertion's `Value` did the moment it was turned into an
+     * expression: the field is `test-reference`, an IDE ui_type whose editor the
+     * IDE registers through `componentOverrides`, and the builder rendered its
+     * operands without them.
+     */
+    componentOverrides?: Record<string, React.FC<any>>;
     size?: string;
     /**
      * SEAM (reqraft): extra hover actions prepended to each expression card —
@@ -40,6 +53,6 @@ export interface IExpressionBuilderProps {
 }
 export interface IExpressionProps extends IExpressionBuilderProps {
 }
-export declare const Expression: ({ localTemplates, value, isChild, index, type, level, path, onValueChange, group, returnType, readOnly, id, expressionsUrl, serverHandled, extraActions, ...props }: IExpressionProps) => import("react/jsx-runtime").JSX.Element;
-export declare const ExpressionBuilder: ({ localTemplates, value, isChild, level, index, path, type, returnType, group, onChange, onValueChange, readOnly, expressions, expressionsUrl, serverHandled, extraActions, reorder, }: IExpressionBuilderProps) => import("react/jsx-runtime").JSX.Element;
+export declare const Expression: ({ localTemplates, value, isChild, index, type, level, path, onValueChange, group, returnType, readOnly, id, expressionsUrl, serverHandled, extraActions, componentOverrides, ...props }: IExpressionProps) => import("react/jsx-runtime").JSX.Element;
+export declare const ExpressionBuilder: ({ localTemplates, value, isChild, level, index, path, type, returnType, group, onChange, onValueChange, readOnly, expressions, expressionsUrl, serverHandled, extraActions, componentOverrides, reorder, }: IExpressionBuilderProps) => import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=index.d.ts.map

package/dist/components/form/expressions/builder/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/form/expressions/builder/index.tsx"],"names":[],"mappings":"AAgBA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAGpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAoB1D,OAAO,EAEL,WAAW,EACX,iBAAiB,EAEjB,kBAAkB,EAEnB,MAAM,UAAU,CAAC;AAelB,MAAM,WAAW,uBAAuB;IACtC,cAAc,CAAC,EAAE,oBAAoB,CAAC;IACtC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,UAAU,GAAG,UAAU,EAAE,CAAC;IACvC,KAAK,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAC1D,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7E,6FAA6F;IAC7F,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;;;;;;;OAUG;IACH,YAAY,CAAC,EACT,kBAAkB,EAAE,GACpB,CAAC,CAAC,OAAO,EAAE;QACT,kBAAkB,CAAC,EAAE,iBAAiB,CAAC;QACvC,KAAK,CAAC,EAAE,WAAW,CAAC;KACrB,KAAK,kBAAkB,EAAE,CAAC,CAAC;CACjC;AAiBD,MAAM,WAAW,gBAAiB,SAAQ,uBAAuB;CAAG;AAEpE,eAAO,MAAM,UAAU,wKAiBpB,gBAAgB,4CA+qClB,CAAC;AAEF,eAAO,MAAM,iBAAiB,2LAkB3B,uBAAuB,4CA2LzB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/form/expressions/builder/index.tsx"],"names":[],"mappings":"AAgBA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAGpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAG1D,OAAO,KAA4D,MAAM,OAAO,CAAC;AAkBjF,OAAO,EAEL,WAAW,EACX,iBAAiB,EAEjB,kBAAkB,EAEnB,MAAM,UAAU,CAAC;AAelB,MAAM,WAAW,uBAAuB;IACtC,cAAc,CAAC,EAAE,oBAAoB,CAAC;IACtC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,UAAU,GAAG,UAAU,EAAE,CAAC;IACvC,KAAK,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAC1D,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7E,6FAA6F;IAC7F,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;;;;;;;OAUG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACnD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;;;;;;;OAUG;IACH,YAAY,CAAC,EACT,kBAAkB,EAAE,GACpB,CAAC,CAAC,OAAO,EAAE;QACT,kBAAkB,CAAC,EAAE,iBAAiB,CAAC;QACvC,KAAK,CAAC,EAAE,WAAW,CAAC;KACrB,KAAK,kBAAkB,EAAE,CAAC,CAAC;CACjC;AAiBD,MAAM,WAAW,gBAAiB,SAAQ,uBAAuB;CAAG;AAEpE,eAAO,MAAM,UAAU,4LAkBpB,gBAAgB,4CAinClB,CAAC;AAEF,eAAO,MAAM,iBAAiB,+MAmB3B,uBAAuB,4CAgMzB,CAAC"}

package/dist/components/form/expressions/builder/index.js

@@ -70,6 +70,7 @@ var react_1 = __importStar(require("react"));
 var styled_components_1 = __importDefault(require("styled-components"));
 var common_1 = require("../../../../helpers/common");
 var expressions_1 = require("../../../../helpers/expressions");
+var argumentPresence_1 = require("../argumentPresence");
 var templates_1 = require("../../../../helpers/templates");
 var validations_1 = require("../../../../helpers/validations");
 var useQorusTypes_1 = require("../../../../hooks/useQorusTypes");
@@ -99,7 +100,7 @@ var noopUseRegisterHintView = function () {
 var StyledExpressionItemLabel = styled_components_1.default.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  position: absolute;\n  text-orientation: upright;\n  writing-mode: vertical-rl;\n  top: calc(50%);\n  transform: translateY(-50%);\n  white-space: nowrap;\n  height: calc(100% - 24px);\n  // Centered flex\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid ", ";\n"], ["\n  position: absolute;\n  text-orientation: upright;\n  writing-mode: vertical-rl;\n  top: calc(50%);\n  transform: translateY(-50%);\n  white-space: nowrap;\n  height: calc(100% - 24px);\n  // Centered flex\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid ", ";\n"])), function () { return (0, polished_1.rgba)('#fff', 0.3); });
 var Expression = function (_a) {
     var _b, _c, _d, _f, _g, _h, _j, _k, _l, _m, _o;
-    var localTemplates = _a.localTemplates, _p = _a.value, value = _p === void 0 ? types_1.ExpressionDefaultValue : _p, isChild = _a.isChild, index = _a.index, type = _a.type, level = _a.level, path = _a.path, onValueChange = _a.onValueChange, group = _a.group, returnType = _a.returnType, readOnly = _a.readOnly, id = _a.id, expressionsUrl = _a.expressionsUrl, serverHandled = _a.serverHandled, extraActions = _a.extraActions, props = __rest(_a, ["localTemplates", "value", "isChild", "index", "type", "level", "path", "onValueChange", "group", "returnType", "readOnly", "id", "expressionsUrl", "serverHandled", "extraActions"]);
+    var localTemplates = _a.localTemplates, _p = _a.value, value = _p === void 0 ? types_1.ExpressionDefaultValue : _p, isChild = _a.isChild, index = _a.index, type = _a.type, level = _a.level, path = _a.path, onValueChange = _a.onValueChange, group = _a.group, returnType = _a.returnType, readOnly = _a.readOnly, id = _a.id, expressionsUrl = _a.expressionsUrl, serverHandled = _a.serverHandled, extraActions = _a.extraActions, componentOverrides = _a.componentOverrides, props = __rest(_a, ["localTemplates", "value", "isChild", "index", "type", "level", "path", "onValueChange", "group", "returnType", "readOnly", "id", "expressionsUrl", "serverHandled", "extraActions", "componentOverrides"]);
     var types = (0, useQorusTypes_1.useQorusTypes)();
     var _q = (0, react_1.useState)(false), showSummary = _q[0], setShowSummary = _q[1];
     var _r = (0, react_1.useState)(undefined), confirmDialogData = _r[0], setConfirmDialogData = _r[1];
@@ -172,59 +173,8 @@ var Expression = function (_a) {
         }, path);
     }, [onValueChange, JSON.stringify(value), path]);
     var addMissingArgs = (0, react_1.useCallback)(function (expression, args) {
-        var _a;
         if (args === void 0) { args = []; }
-        var newArgs = __spreadArray([], args, true);
-        // Check if this expression has variable arguments
-        var selectedExpression = (_a = expressions.value) === null || _a === void 0 ? void 0 : _a.find(function (exp) { return exp.name === expression; });
-        // An operand slot with nothing in it yet: the schema's default value
-        // when it has one, otherwise an envelope typed after the schema for
-        // the editors that need a type to mount. `updateExp` leaves such a
-        // slot behind for every catalogue argument the previous value had no
-        // operand for (a fresh builder has none), so every branch below has
-        // to fill them — an `undefined` operand that reaches the validator or
-        // an operand editor is read for its `type` and crashes the builder.
-        var isEmptySlot = function (slot, arg) {
-            return slot === undefined || (0, lodash_1.size)(slot) === 0 || (arg.default_value && !('value' in slot));
-        };
-        var emptySlot = function (arg) {
-            return arg.default_value
-                ? { value: arg.default_value, type: arg.ui_type }
-                : {
-                    type: arg.ui_type === 'richtext' || arg.ui_type === 'number' || arg.ui_type === 'bool'
-                        ? arg.ui_type
-                        : undefined,
-                };
-        };
-        if (selectedExpression.varargs) {
-            if (selectedExpression.subtype === 2) {
-                newArgs.push({
-                    is_expression: true,
-                    value: {
-                        args: [],
-                    },
-                });
-            }
-            else {
-                // Every operand follows the one schema argument; add slots up to
-                // min_args and fill the empty ones.
-                var schema_1 = selectedExpression.args[0];
-                newArgs.push.apply(newArgs, Array.from({ length: selectedExpression.min_args - 1 }, function () { return emptySlot(schema_1); }));
-                newArgs.forEach(function (slot, index) {
-                    if (isEmptySlot(slot, schema_1)) {
-                        newArgs[index] = emptySlot(schema_1);
-                    }
-                });
-            }
-        }
-        else {
-            selectedExpression.args.forEach(function (arg, index) {
-                if (isEmptySlot(newArgs[index], arg)) {
-                    newArgs[index] = emptySlot(arg);
-                }
-            });
-        }
-        return newArgs;
+        return (0, argumentPresence_1.addMissingExpressionArgs)(expressions.value, expression, args);
     }, [JSON.stringify(expressions.value)]);
     var updateExp = (0, react_1.useCallback)(function (val) {
         var _a;
@@ -331,7 +281,7 @@ var Expression = function (_a) {
     var updateMultipleArgs = (0, react_1.useCallback)(function (args) {
         onValueChange(__assign(__assign({}, value), { value: __assign(__assign({}, value.value), { args: addMissingArgs(value.value.exp, args) }) }), path);
     }, [onValueChange, JSON.stringify(value), path, addMissingArgs]);
-    var updateArg = (0, react_1.useCallback)(function (val, index, type, isFunction, isRequired) {
+    var updateArg = (0, react_1.useCallback)(function (val, index, type, isFunction) {
         var _a;
         if (index === void 0) { index = 0; }
         var args = (0, lodash_1.clone)(value.value.args);
@@ -339,7 +289,14 @@ var Expression = function (_a) {
         if (newVal === null || newVal === void 0 ? void 0 : newVal.exp) {
             newVal.args = addMissingArgs(newVal.exp, newVal.args);
         }
-        args[index] = __assign(__assign({}, args[index]), { value: newVal, type: !isFunction ? type || ((_a = args[index]) === null || _a === void 0 ? void 0 : _a.type) : undefined, is_expression: isFunction, required: isRequired });
+        /* `required` is NOT written here. It is a schema key — it describes the
+           catalogue's declaration of the argument, not the author's value, and
+           nothing reads it back off a stored argument (validation takes it from
+           the schema). Persisting it made a cleared argument indistinguishable
+           from real data: the value dropped out as `undefined`, `required: true`
+           stayed, and what was saved to the draft was `{type, required}` — an
+           argument DEFINITION sitting where its value should be. */
+        args[index] = __assign(__assign({}, args[index]), { value: newVal, type: !isFunction ? type || ((_a = args[index]) === null || _a === void 0 ? void 0 : _a.type) : undefined, is_expression: isFunction });
         onValueChange(__assign(__assign({}, value), { value: __assign(__assign({}, value.value), { args: args }) }), path);
     }, [addMissingArgs, onValueChange, JSON.stringify(value), path]);
     var handleRemoveClick = (0, react_1.useCallback)(function () {
@@ -511,11 +468,10 @@ var Expression = function (_a) {
         updateType(value === 'context' ? undefined : value, true);
     }, [updateType]);
     var handleFirstParamChange = (0, react_1.useCallback)(function (_name, value, type, isFunction) {
-        var _a, _b;
         if (isFunction || (type !== 'any' && type !== 'auto')) {
-            updateArg(value, 0, isFunction ? undefined : type, isFunction, (_b = (_a = selectedExpression === null || selectedExpression === void 0 ? void 0 : selectedExpression.args) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.required);
+            updateArg(value, 0, isFunction ? undefined : type, isFunction);
         }
-    }, [updateArg, JSON.stringify(selectedExpression)]);
+    }, [updateArg]);
     var buildCustomTemplateItems = (0, react_1.useCallback)(function (arg, onClick) {
         var _a, _b;
         // If the argument has allowed values or element allowed values, do not allow type changing
@@ -713,13 +669,13 @@ var Expression = function (_a) {
                             setConfirmDialogData(undefined);
                         },
                     },
-                ], children: confirmDialogData.children })), showSummary && (0, jsx_runtime_1.jsx)(renderTemplate_1.ExpressionRenderTemplate, { exp: value, expressions: expressions.value }), !selectedExpression && !serverExpression && !(firstArgument === null || firstArgument === void 0 ? void 0 : firstArgument.value) && level === 0 ? ((0, jsx_runtime_1.jsx)(reqore_1.ReqoreMessage, { size: 'small', opaque: false, intent: 'info', children: "Select an operation to start building your expression" })) : ((0, jsx_runtime_1.jsxs)(reqore_1.ReqoreControlGroup
+                ], children: confirmDialogData.children })), showSummary && ((0, jsx_runtime_1.jsx)(renderTemplate_1.ExpressionRenderTemplate, { exp: value, expressions: expressions.value, templates: localTemplates })), !selectedExpression && !serverExpression && !(firstArgument === null || firstArgument === void 0 ? void 0 : firstArgument.value) && level === 0 ? ((0, jsx_runtime_1.jsx)(reqore_1.ReqoreMessage, { size: 'small', opaque: false, intent: 'info', children: "Select an operation to start building your expression" })) : ((0, jsx_runtime_1.jsxs)(reqore_1.ReqoreControlGroup
             // On a phone every operand is a full-width row, so the group spans
             // the panel; on desktop it hugs its content and wraps.
             , { 
                 // On a phone every operand is a full-width row, so the group spans
                 // the panel; on desktop it hugs its content and wraps.
-                fluid: phone, style: { maxWidth: '100%' }, wrap: true, verticalAlign: 'flex-start', size: 'normal', gapSize: 'big', children: [(firstArgSchema === null || firstArgSchema === void 0 ? void 0 : firstArgSchema.label_before) && ((0, jsx_runtime_1.jsx)(argumentDetail_1.ExpressionArgumentDetail, { label: firstArgSchema.label_before })), (0, jsx_runtime_1.jsx)(argumentWrapper_1.ExpressionBuilderArgumentWrapper, { expressions: expressions.value, arg: firstArgument, schema: firstArgSchema, onTypeChange: handleUpdateTypeChange, onRemoveArgClick: handleRemoveFirstArg, hasMultipleArgs: removeArgInline, fluid: phone, readOnly: readOnly, reorder: argReorderSurfaces, argIndex: 0, argCount: argCount, dragOver: isDragOverArg(0), onMoveArg: moveVarArg, onArgDragStart: handleArgDragStart, onArgDragOver: handleArgDragOver, onArgDrop: handleArgDrop, onArgDragEnd: handleArgDragEnd, children: (0, jsx_runtime_1.jsx)(TemplateField_1.TemplateField, { component: AutoFormField_1.AutoFormField, 
+                fluid: phone, style: { maxWidth: '100%' }, wrap: true, verticalAlign: 'flex-start', size: 'normal', gapSize: 'big', children: [(firstArgSchema === null || firstArgSchema === void 0 ? void 0 : firstArgSchema.label_before) && ((0, jsx_runtime_1.jsx)(argumentDetail_1.ExpressionArgumentDetail, { label: firstArgSchema.label_before })), (0, jsx_runtime_1.jsx)(argumentWrapper_1.ExpressionBuilderArgumentWrapper, { expressions: expressions.value, arg: firstArgument, schema: firstArgSchema, onTypeChange: handleUpdateTypeChange, onRemoveArgClick: handleRemoveFirstArg, hasMultipleArgs: removeArgInline, fluid: phone, readOnly: readOnly, reorder: argReorderSurfaces, argIndex: 0, argCount: argCount, dragOver: isDragOverArg(0), onMoveArg: moveVarArg, onArgDragStart: handleArgDragStart, onArgDragOver: handleArgDragOver, onArgDrop: handleArgDrop, onArgDragEnd: handleArgDragEnd, children: (0, jsx_runtime_1.jsx)(TemplateField_1.TemplateField, { component: AutoFormField_1.AutoFormField, componentOverrides: componentOverrides, 
                             // SEAM (reqraft): an operand that becomes an expression mounts
                             // its own builder through this TemplateField — hand the host's
                             // actions on, or nesting silently drops them (the group
@@ -759,7 +715,7 @@ var Expression = function (_a) {
                                             updateArg(undefined, index + 1, value === 'context' ? undefined : value);
                                         }, onRemoveArgClick: function () {
                                             removeVarArg(index + 1);
-                                        }, hasMultipleArgs: removeArgInline, fluid: phone, reorder: argReorderSurfaces, argIndex: index + 1, argCount: argCount, dragOver: isDragOverArg(index + 1), onMoveArg: moveVarArg, onArgDragStart: handleArgDragStart, onArgDragOver: handleArgDragOver, onArgDrop: handleArgDrop, onArgDragEnd: handleArgDragEnd, children: (0, jsx_runtime_1.jsx)(TemplateField_1.TemplateField, { minimal: true, component: AutoFormField_1.AutoFormField, 
+                                        }, hasMultipleArgs: removeArgInline, fluid: phone, reorder: argReorderSurfaces, argIndex: index + 1, argCount: argCount, dragOver: isDragOverArg(index + 1), onMoveArg: moveVarArg, onArgDragStart: handleArgDragStart, onArgDragOver: handleArgDragOver, onArgDrop: handleArgDrop, onArgDragEnd: handleArgDragEnd, children: (0, jsx_runtime_1.jsx)(TemplateField_1.TemplateField, { minimal: true, component: AutoFormField_1.AutoFormField, componentOverrides: componentOverrides, 
                                             // SEAM (reqraft): same as the first operand above.
                                             extraActions: extraActions, noSoft: true, level: level + 1, allowFunctions: !(arg === null || arg === void 0 ? void 0 : arg.allowed_values) && !(arg === null || arg === void 0 ? void 0 : arg.element_allowed_values), isFunction: (_a = rest[index]) === null || _a === void 0 ? void 0 : _a.is_expression, 
                                             // An empty argument has no value to take a type from; fall
@@ -776,7 +732,7 @@ var Expression = function (_a) {
                                                 !!arg.element_allowed_values ||
                                                 !!((_h = rest[index]) === null || _h === void 0 ? void 0 : _h.type) ||
                                                 !!arg.default_value, onChange: (function (_name, value, type, isFunction) {
-                                                updateArg(value, index + 1, isFunction ? undefined : type, isFunction, arg.required);
+                                                updateArg(value, index + 1, isFunction ? undefined : type, isFunction);
                                             }), fluid: phone, fixed: !phone, disableManagement: true, disabled: readOnly, menuItems: buildCustomTemplateItems(arg, function (type, removeTemplate) {
                                                 removeTemplate === null || removeTemplate === void 0 ? void 0 : removeTemplate();
                                                 updateArg(undefined, index + 1, type.name === 'context' ? undefined : type.name);
@@ -787,7 +743,7 @@ var Expression = function (_a) {
 exports.Expression = Expression;
 var ExpressionBuilder = function (_a) {
     var _b, _c, _d;
-    var localTemplates = _a.localTemplates, _f = _a.value, value = _f === void 0 ? types_1.ExpressionDefaultValue : _f, isChild = _a.isChild, _g = _a.level, level = _g === void 0 ? 0 : _g, _h = _a.index, index = _h === void 0 ? 0 : _h, path = _a.path, type = _a.type, returnType = _a.returnType, group = _a.group, onChange = _a.onChange, onValueChange = _a.onValueChange, readOnly = _a.readOnly, expressions = _a.expressions, expressionsUrl = _a.expressionsUrl, serverHandled = _a.serverHandled, extraActions = _a.extraActions, reorder = _a.reorder;
+    var localTemplates = _a.localTemplates, _f = _a.value, value = _f === void 0 ? types_1.ExpressionDefaultValue : _f, isChild = _a.isChild, _g = _a.level, level = _g === void 0 ? 0 : _g, _h = _a.index, index = _h === void 0 ? 0 : _h, path = _a.path, type = _a.type, returnType = _a.returnType, group = _a.group, onChange = _a.onChange, onValueChange = _a.onValueChange, readOnly = _a.readOnly, expressions = _a.expressions, expressionsUrl = _a.expressionsUrl, serverHandled = _a.serverHandled, extraActions = _a.extraActions, componentOverrides = _a.componentOverrides, reorder = _a.reorder;
     var templates = (0, useTemplates_1.useTemplates)(!isChild, localTemplates);
     var theme = (0, reqore_1.useReqoreTheme)();
     var _j = (0, react_1.useState)(false), showSummary = _j[0], setShowSummary = _j[1];
@@ -866,11 +822,11 @@ var ExpressionBuilder = function (_a) {
                             : 'Show explanation of this expression',
                         fixed: true,
                     },
-                ], children: (0, jsx_runtime_1.jsxs)(reqore_1.ReqoreControlGroup, { vertical: true, fluid: true, size: 'normal', style: { position: 'relative' }, wrap: true, children: [showSummary && ((0, jsx_runtime_1.jsx)(renderTemplate_1.ExpressionRenderTemplate, { exp: value, expressions: _expressions.expressions })), (0, jsx_runtime_1.jsx)(StyledExpressionItemLabel, { as: reqore_1.ReqoreP, color: 'transparent', className: 'expression-operator' }), (_d = value.value.args) === null || _d === void 0 ? void 0 : _d.map(function (arg, index) { return ((0, jsx_runtime_1.jsxs)(react_1.default.Fragment, { children: [(0, jsx_runtime_1.jsx)(exports.ExpressionBuilder, { value: arg, localTemplates: templates.value, isChild: true, path: "".concat(path ? "".concat(path, ".") : '', "value.args.").concat(index), level: level + 1, index: index, type: type, onValueChange: handleChange, returnType: 'bool', group: value.value.exp, readOnly: readOnly, expressions: expressions, expressionsUrl: expressionsUrl, serverHandled: serverHandled, extraActions: extraActions, reorder: reorder }), index < (0, lodash_1.size)(value.value.args) - 1 && ((0, jsx_runtime_1.jsx)(argumentDetail_1.ExpressionArgumentDetail, { label: value.value.exp === '||' ? 'OR' : 'AND', align: 'left', style: {
+                ], children: (0, jsx_runtime_1.jsxs)(reqore_1.ReqoreControlGroup, { vertical: true, fluid: true, size: 'normal', style: { position: 'relative' }, wrap: true, children: [showSummary && ((0, jsx_runtime_1.jsx)(renderTemplate_1.ExpressionRenderTemplate, { exp: value, expressions: _expressions.expressions, templates: localTemplates })), (0, jsx_runtime_1.jsx)(StyledExpressionItemLabel, { as: reqore_1.ReqoreP, color: 'transparent', className: 'expression-operator' }), (_d = value.value.args) === null || _d === void 0 ? void 0 : _d.map(function (arg, index) { return ((0, jsx_runtime_1.jsxs)(react_1.default.Fragment, { children: [(0, jsx_runtime_1.jsx)(exports.ExpressionBuilder, { value: arg, localTemplates: templates.value, isChild: true, path: "".concat(path ? "".concat(path, ".") : '', "value.args.").concat(index), level: level + 1, index: index, type: type, onValueChange: handleChange, returnType: 'bool', group: value.value.exp, readOnly: readOnly, expressions: expressions, expressionsUrl: expressionsUrl, serverHandled: serverHandled, extraActions: extraActions, reorder: reorder }), index < (0, lodash_1.size)(value.value.args) - 1 && ((0, jsx_runtime_1.jsx)(argumentDetail_1.ExpressionArgumentDetail, { label: value.value.exp === '||' ? 'OR' : 'AND', align: 'left', style: {
                                         marginLeft: 10,
                                     } }))] }, index)); })] }) }) }));
     }
-    return ((0, jsx_runtime_1.jsx)(reqore_1.ReqoreErrorBoundary, { children: (0, jsx_runtime_1.jsx)(exports.Expression, { localTemplates: templates.value, value: value, isChild: isChild, type: type, returnType: returnType, level: level, path: path, index: index, onValueChange: handleChange, group: group, readOnly: readOnly, expressions: expressions, expressionsUrl: expressionsUrl, id: level === 0 && index === 0 ? 'expression-builder' : undefined, serverHandled: serverHandled, extraActions: extraActions, reorder: reorder }) }));
+    return ((0, jsx_runtime_1.jsx)(reqore_1.ReqoreErrorBoundary, { children: (0, jsx_runtime_1.jsx)(exports.Expression, { localTemplates: templates.value, value: value, isChild: isChild, type: type, returnType: returnType, level: level, path: path, index: index, onValueChange: handleChange, group: group, readOnly: readOnly, expressions: expressions, expressionsUrl: expressionsUrl, id: level === 0 && index === 0 ? 'expression-builder' : undefined, serverHandled: serverHandled, extraActions: extraActions, componentOverrides: componentOverrides, reorder: reorder }) }));
 };
 exports.ExpressionBuilder = ExpressionBuilder;
 var templateObject_1;