@qoretechnologies/reqraft 0.10.53 → 0.10.54-pr.115.g9bc96ed

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

@@ -1,91 +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.startDpqlMockLsp = void 0;
+exports.startDpqlMockLsp = exports.startDpqlMockLspServer = exports.dpqlMockParseCalls = void 0;
 // Copyright 2026 Qore Technologies, s.r.o.
-// A compact mock LSP for ExpressionField Text-mode stories. Registers just
-// enough of the DPQL contract on the shared harness plumbing
-// (`smartEditor/__fixtures__/mockLspServer`) to exercise the parse/serialize
-// boundary glue: `dpql/parse` echoes the typed text into an expression AST,
-// `dpql/serialize` reconstructs a string. (The DpqlEditor's own stories
-// carry the full mock; this is the minimal subset.)
+// The DPQL language server every story talks to unless it brings its own.
+//
+// `.storybook/preview.tsx` starts it before each story, so an expression field,
+// a Preview or an Explain panel finds a server on the endpoint whatever story it
+// sits in — the same way `GLOBAL_STORY_MOCK_DATA` answers the REST requests
+// components make on their own. A story that needs different handlers starts
+// its own server on the URL and replaces this one (see `createMockLspServer`).
+// The answers come from `dpqlMockLanguage`, which follows the real server.
 var mockLspServer_1 = require("../../smartEditor/__fixtures__/mockLspServer");
-/** Start the mock LSP; returns a teardown function. */
-var startDpqlMockLsp = function () {
+var dpqlMockLanguage_1 = require("./dpqlMockLanguage");
+exports.dpqlMockParseCalls = [];
+/** The template namespaces the server offers after a `$`. */
+var DPQL_MOCK_TEMPLATE_ITEMS = [
+    { label: '$data:', insertText: '$data:', kind: 1, detail: 'template' },
+    { label: '$config:', insertText: '$config:', kind: 1, detail: 'template' },
+    { label: '$static:', insertText: '$static:', kind: 1, detail: 'template' },
+    { label: '$timestamp:', insertText: '$timestamp:', kind: 1, detail: 'template' },
+];
+/** The record fields the server offers after an `@`. */
+var DPQL_MOCK_FIELD_ITEMS = [
+    { label: '@name', insertText: '@name', kind: 5, detail: 'string' },
+    { label: '@status', insertText: '@status', kind: 5, detail: 'string' },
+];
+var DPQL_MOCK_HANDLERS = {
+    /* Position-aware, as the real server is: `$` opens the template
+       namespaces, `@` the record fields. Answering the same list whatever
+       precedes the cursor would make a story asserting the `$` menu pass
+       for a shell that asked in the wrong context — which is the only thing
+       such a story is there to catch. (`DpqlEditor`'s own stories carry the
+       full catalogue; this is the minimal subset.) */
+    'textDocument/completion': function (msg, server) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var position = (_b = (_a = msg.params) === null || _a === void 0 ? void 0 : _a.position) !== null && _b !== void 0 ? _b : { line: 0, character: 0 };
+        var line = (_e = server.textOf((_d = (_c = msg.params) === null || _c === void 0 ? void 0 : _c.textDocument) === null || _d === void 0 ? void 0 : _d.uri).split('\n')[position.line]) !== null && _e !== void 0 ? _e : '';
+        var head = line.slice(0, position.character);
+        var sigil = (_h = (_g = (_f = head.match(/[@$][\w:.{}]*$/)) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g[0]) !== null && _h !== void 0 ? _h : '';
+        if (sigil === '$') {
+            return { isIncomplete: false, items: DPQL_MOCK_TEMPLATE_ITEMS };
+        }
+        if (sigil === '@') {
+            return { isIncomplete: false, items: DPQL_MOCK_FIELD_ITEMS };
+        }
+        return { isIncomplete: false, items: [] };
+    },
+    'textDocument/semanticTokens/full': function (msg, server) {
+        var _a, _b;
+        return ({
+            data: (0, dpqlMockLanguage_1.mockTokenizeDpql)(server.textOf((_b = (_a = msg.params) === null || _a === void 0 ? void 0 : _a.textDocument) === null || _b === void 0 ? void 0 : _b.uri)),
+        });
+    },
+    'dpql/setContext': function () { return ({ fields: {} }); },
+    'dpql/parse': function (msg) {
+        var _a, _b, _c;
+        var text = String((_b = (_a = msg.params) === null || _a === void 0 ? void 0 : _a.text) !== null && _b !== void 0 ? _b : '');
+        var target = (_c = msg.params) === null || _c === void 0 ? void 0 : _c.target_type;
+        exports.dpqlMockParseCalls.push({ text: text.trim(), target: target, analysed: !!target });
+        return (0, dpqlMockLanguage_1.mockParseDpql)(text, target);
+    },
+    'dpql/serialize': function (msg) { var _a; return (0, dpqlMockLanguage_1.mockSerializeDpql)((_a = msg.params) === null || _a === void 0 ? void 0 : _a.expression); },
+    'dpql/validate': function () { return ({ diagnostics: [] }); },
+    'dpql/renderExpression': function (msg) { var _a; return (0, dpqlMockLanguage_1.mockRenderDpql)((_a = msg.params) === null || _a === void 0 ? void 0 : _a.expression); },
+};
+/** Start the mock DPQL language server; returns the server and a teardown. */
+var startDpqlMockLspServer = function (options) {
+    if (options === void 0) { options = {}; }
+    exports.dpqlMockParseCalls.length = 0;
     var lsp = (0, mockLspServer_1.createMockLspServer)(mockLspServer_1.MOCK_LSP_URL, {
-        capabilities: {
-            textDocumentSync: { openClose: true, change: 2 },
-            completionProvider: { triggerCharacters: ['@', '$', '.', ':'] },
-        },
+        capabilities: __assign(__assign({}, mockLspServer_1.DEFAULT_LSP_CAPABILITIES), { textDocumentSync: { openClose: true, change: 2 }, completionProvider: { triggerCharacters: ['@', '$', '.', ':'] } }),
         // Unknown requests get an empty success so nothing hangs.
         defaultResult: {},
-        handlers: {
-            'textDocument/completion': function () { return ({ isIncomplete: false, items: [] }); },
-            'textDocument/semanticTokens/full': function () { return ({ data: [] }); },
-            'dpql/setContext': function () { return ({ fields: {} }); },
-            // Echo the typed text into an `==` expression so the AST is
-            // deterministic and verifiable.
-            'dpql/parse': function (msg) {
-                var _a, _b;
-                var text = ((_b = (_a = msg.params) === null || _a === void 0 ? void 0 : _a.text) !== null && _b !== void 0 ? _b : '').trim();
-                return {
-                    success: true,
-                    expression: {
-                        is_expression: true,
-                        value: {
-                            exp: '==',
-                            args: [
-                                { type: 'string', value: text || 'x' },
-                                { type: 'string', value: '' },
-                            ],
-                        },
-                    },
-                    diagnostics: [],
-                };
-            },
-            'dpql/serialize': function (msg) {
-                var _a, _b, _c, _d, _e, _f, _g, _h;
-                var expr = (_a = msg.params) === null || _a === void 0 ? void 0 : _a.expression;
-                var args = (_d = (_b = expr === null || expr === void 0 ? void 0 : expr.args) !== null && _b !== void 0 ? _b : (_c = expr === null || expr === void 0 ? void 0 : expr.value) === null || _c === void 0 ? void 0 : _c.args) !== null && _d !== void 0 ? _d : [];
-                var left = (_f = (_e = args[0]) === null || _e === void 0 ? void 0 : _e.value) !== null && _f !== void 0 ? _f : '';
-                var right = (_h = (_g = args[1]) === null || _g === void 0 ? void 0 : _g.value) !== null && _h !== void 0 ? _h : '';
-                return { dpql: "".concat(left, " == ").concat(right).trim() };
-            },
-            'dpql/validate': function () { return ({ diagnostics: [] }); },
-            // Mirrors the server contract: accepts the bare `{exp, args}` AST
-            // or the `{is_expression, value}` wrapper; returns `{ rendered,
-            // richtext }` where `rendered` is the human-readable form.
-            'dpql/renderExpression': function (msg) {
-                var _a;
-                var input = (_a = msg.params) === null || _a === void 0 ? void 0 : _a.expression;
-                var root = (input === null || input === void 0 ? void 0 : input.value) && !(input === null || input === void 0 ? void 0 : input.exp) ? input.value : input;
-                var renderNode = function (node) {
-                    var _a;
-                    if (!(node === null || node === void 0 ? void 0 : node.exp))
-                        return '';
-                    var args = ((_a = node.args) !== null && _a !== void 0 ? _a : []).map(function (arg) {
-                        var _a;
-                        return (arg === null || arg === void 0 ? void 0 : arg.is_expression) && ((_a = arg.value) === null || _a === void 0 ? void 0 : _a.exp)
-                            ? "(".concat(renderNode(arg.value), ")")
-                            : typeof (arg === null || arg === void 0 ? void 0 : arg.value) === 'string'
-                                ? JSON.stringify(arg.value)
-                                : String(arg === null || arg === void 0 ? void 0 : arg.value);
-                    });
-                    return /^[^\w\s]+$/.test(node.exp)
-                        ? args.join(" ".concat(node.exp, " "))
-                        : "".concat(node.exp, "(").concat(args.join(', '), ")");
-                };
-                var rendered = renderNode(root);
-                return {
-                    rendered: rendered,
-                    richtext: {
-                        type: 'richtext',
-                        value: [{ type: 'paragraph', children: [{ text: rendered }] }],
-                    },
-                };
-            },
-        },
+        delays: options.delays,
+        handlers: __assign(__assign({}, DPQL_MOCK_HANDLERS), options.handlers),
     });
-    return function () { return lsp.close(); };
+    return { lsp: lsp, stop: function () { return lsp.close(); } };
+};
+exports.startDpqlMockLspServer = startDpqlMockLspServer;
+/** Start the mock DPQL language server; returns a teardown function. */
+var startDpqlMockLsp = function (options) {
+    return (0, exports.startDpqlMockLspServer)(options).stop;
 };
 exports.startDpqlMockLsp = startDpqlMockLsp;
 //# sourceMappingURL=dpqlMockLsp.js.map

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

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

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,EAmR9C,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;AA+B5C,eAAO,MAAM,eAAe,EAAE,iBAAiB,EAuR9C,CAAC"}

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

@@ -109,7 +109,8 @@ exports.mockExpressions = [
         return_type: 'bool',
         ui_return_type: 'bool',
         varargs: false,
-        groups: ['String'],
+        groups: ['Comparison'],
+        render_template: '$arg[0] contains $arg[1]${arg[2] ? (ignore case):}',
         args: stringArgs('Substring', 'contains'),
     },
     {
@@ -123,7 +124,8 @@ exports.mockExpressions = [
         return_type: 'bool',
         ui_return_type: 'bool',
         varargs: false,
-        groups: ['String'],
+        groups: ['Comparison'],
+        render_template: '$arg[0].startsWith($arg[1], $arg[2])',
         args: stringArgs('Start String', 'starts with'),
     },
     {
@@ -137,7 +139,8 @@ exports.mockExpressions = [
         return_type: 'bool',
         ui_return_type: 'bool',
         varargs: false,
-        groups: ['String'],
+        groups: ['Comparison'],
+        render_template: '$arg[0].endsWith($arg[1], $arg[2])',
         args: stringArgs('End String', 'ends with'),
     },
     // --- Varargs (int) -------------------------------------------------------
@@ -232,7 +235,8 @@ exports.mockExpressions = [
         return_type: 'bool',
         ui_return_type: 'bool',
         varargs: false,
-        groups: ['String'],
+        groups: ['Comparison'],
+        render_template: '$arg[0] =~ /$arg[1]/$arg[2]',
         args: [
             { name: 'softstring', display_name: 'String Value', ui_type: 'richtext', required: true },
             { name: 'string', display_name: 'Regular Expression', ui_type: 'string', required: true },

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,7 +1,7 @@
 import { IExpressionSchema, IExpressionValue } from './types';
 /**
  * Recursively render an expression AST to readable text — the client-side
- * approximation, used as the fallback when the LSP is unreachable.
+ * approximation a read-first row summary shows.
  */
 export declare const renderExpressionToText: (value: IExpressionValue | undefined, expressions?: IExpressionSchema[]) => string;
 //# sourceMappingURL=renderExpressionToText.d.ts.map

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;AAa3E;;;GAGG;AACH,eAAO,MAAM,sBAAsB,UAC1B,gBAAgB,GAAG,SAAS,gBACtB,iBAAiB,EAAE,KAC/B,MAoBF,CAAC"}
+{"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"}

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

@@ -5,6 +5,63 @@ exports.renderExpressionToText = void 0;
 var isOperatorSymbol = function (symbol) {
     return !!symbol && /^[^\w\s]+$/.test(symbol);
 };
+/**
+ * Operator precedence, lower binds tighter.
+ *
+ * Mirrors `DpqlOperatorPrecedence` in the Qore DataProvider module, which is
+ * the source of truth — the server renders the same ASTs through
+ * `DataProvider::renderExpression`, and a row summary that parenthesised
+ * differently would make the same expression read two ways depending on
+ * whether it was collapsed or open. (It does not model the catalogue's
+ * `render_template`s, so `contains` still reads as a call here.)
+ */
+var PRECEDENCE = {
+    '*': 1,
+    '/': 1,
+    '%': 1,
+    '+': 2,
+    '-': 2,
+    '!': 3,
+    '==': 4,
+    '!=': 4,
+    '<': 4,
+    '<=': 4,
+    '>': 4,
+    '>=': 4,
+    '&&': 5,
+    '||': 6,
+};
+/** Anything that is not an operator; nothing binds tighter. */
+var PREC_PRIMARY = 0;
+/** Looser than every operator, so a value rendered in it is never wrapped. */
+var PREC_LOOSEST = 7;
+/**
+ * Operators whose grouping cannot change the result.
+ *
+ * `+` is deliberately absent: it concatenates when an operand is a string, so
+ * `1 + (2 + "a")` is `"12a"` where `1 + 2 + "a"` is `"3a"`. Dropping its
+ * parentheses would not be a cosmetic simplification.
+ */
+var ASSOCIATIVE = 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
+ * `DpqlSerializer::getArgumentContext()`.
+ *
+ * The first argument is where left-associative parsing puts a same-precedence
+ * child back, so it needs no parentheses; a later one does, or `1 - (2 - 3)`
+ * reads as `1 - 2 - 3`, which is a different expression.
+ */
+var argumentContext = function (exp, argn) {
+    var prec = precedenceOf(exp);
+    return !argn || ASSOCIATIVE.has(exp) ? prec : prec - 1;
+};
+/** An argument reaches this as a bare value or as a `{type, value}` envelope. */
+var readArgValue = function (arg) {
+    return arg !== null && typeof arg === 'object' && 'value' in arg
+        ? arg.value
+        : arg;
+};
 var renderLiteral = function (value) {
     if (value === undefined || value === null)
         return 'null';
@@ -14,33 +71,52 @@ var renderLiteral = function (value) {
         return JSON.stringify(value);
     return String(value);
 };
-/**
- * Recursively render an expression AST to readable text — the client-side
- * approximation, used as the fallback when the LSP is unreachable.
- */
-var renderExpressionToText = function (value, expressions) {
-    var _a, _b;
-    if (expressions === void 0) { expressions = []; }
+/** Renders `value` and wraps it only if it binds looser than `contextPrec`. */
+var renderInContext = function (value, expressions, contextPrec) {
+    var _a, _b, _c, _d;
     if (!(value === null || value === void 0 ? void 0 : value.exp))
         return '';
+    /* A `value` expression IS its literal.
+    
+       It is the wrapper the parser puts around a bare literal — typing `null`,
+       or `42`, into the text editor produces one — and it carries no symbol, so
+       rendering it through the generic paths printed the wrapper instead of the
+       value: `value(42)` with a catalogue that names it, `(42)` with one that
+       supplies its empty symbol. The server renders the literal alone, and a
+       summary that disagrees with the preview beside it is worse than either. */
+    if (value.exp === 'value' && ((_a = value.args) !== null && _a !== void 0 ? _a : []).length === 1) {
+        var only = ((_b = value.args) !== null && _b !== void 0 ? _b : [])[0];
+        if (!(only === null || only === void 0 ? void 0 : only.is_expression)) {
+            return renderLiteral(readArgValue(only));
+        }
+    }
     var schema = expressions.find(function (e) { return e.name === value.exp; });
-    var symbol = (_a = schema === null || schema === void 0 ? void 0 : schema.symbol) !== null && _a !== void 0 ? _a : value.exp;
-    var args = ((_b = value.args) !== null && _b !== void 0 ? _b : []).map(function (arg) {
+    var symbol = (_c = schema === null || schema === void 0 ? void 0 : schema.symbol) !== null && _c !== void 0 ? _c : value.exp;
+    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) {
         var _a;
         return (arg === null || arg === void 0 ? void 0 : arg.is_expression) && ((_a = arg.value) === null || _a === void 0 ? void 0 : _a.exp)
-            ? "(".concat((0, exports.renderExpressionToText)(arg.value, expressions), ")")
+            ? renderInContext(arg.value, expressions, isInfix ? argumentContext(value.exp, argn) : PREC_LOOSEST)
             : renderLiteral(arg === null || arg === void 0 ? void 0 : arg.value);
     });
-    // Logical group (subtype 2) → join with the symbol.
-    if ((schema === null || schema === void 0 ? void 0 : schema.subtype) === 2 || value.exp === '&&' || value.exp === '||') {
-        return args.join(" ".concat(symbol, " "));
-    }
-    // Binary operator → infix.
-    if (args.length === 2 && isOperatorSymbol(symbol)) {
-        return "".concat(args[0], " ").concat(symbol, " ").concat(args[1]);
+    if (!isInfix) {
+        return "".concat(symbol, "(").concat(parts.join(', '), ")");
     }
-    // Otherwise function form.
-    return "".concat(symbol, "(").concat(args.join(', '), ")");
+    var text = isLogicalGroup ? parts.join(" ".concat(symbol, " ")) : "".concat(parts[0], " ").concat(symbol, " ").concat(parts[1]);
+    return precedenceOf(value.exp) > contextPrec ? "(".concat(text, ")") : text;
+};
+/**
+ * Recursively render an expression AST to readable text — the client-side
+ * approximation a read-first row summary shows.
+ */
+var renderExpressionToText = function (value, expressions) {
+    if (expressions === void 0) { expressions = []; }
+    return renderInContext(value, expressions, PREC_LOOSEST);
 };
 exports.renderExpressionToText = renderExpressionToText;
 //# sourceMappingURL=renderExpressionToText.js.map

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,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;;;GAGG;AACI,IAAM,sBAAsB,GAAG,UACpC,KAAmC,EACnC,WAAqC;;IAArC,4BAAA,EAAA,gBAAqC;IAErC,IAAI,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,GAAG,CAAA;QAAE,OAAO,EAAE,CAAC;IAC3B,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,CAAC,MAAA,KAAK,CAAC,IAAI,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,UAAC,GAAgB;;QACnD,OAAA,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,aAAa,MAAI,MAAA,GAAG,CAAC,KAAK,0CAAE,GAAG,CAAA;YAClC,CAAC,CAAC,WAAI,IAAA,8BAAsB,EAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,MAAG;YACvD,CAAC,CAAC,aAAa,CAAC,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,CAAC,CAAA;KAAA,CAC9B,CAAC;IAEF,oDAAoD;IACpD,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,MAAK,CAAC,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;QACtE,OAAO,IAAI,CAAC,IAAI,CAAC,WAAI,MAAM,MAAG,CAAC,CAAC;IAClC,CAAC;IACD,2BAA2B;IAC3B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,OAAO,UAAG,IAAI,CAAC,CAAC,CAAC,cAAI,MAAM,cAAI,IAAI,CAAC,CAAC,CAAC,CAAE,CAAC;IAC3C,CAAC;IACD,2BAA2B;IAC3B,OAAO,UAAG,MAAM,cAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAG,CAAC;AACzC,CAAC,CAAC;AAvBW,QAAA,sBAAsB,0BAuBjC"}
+{"version":3,"file":"renderExpressionToText.js","sourceRoot":"","sources":["../../../../src/components/form/expressions/renderExpressionToText.ts"],"names":[],"mappings":"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"}

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

@@ -56,6 +56,13 @@ export interface IExpressionSchema {
     return_type: TQorusType;
     ui_return_type: string;
     symbol: string;
+    /**
+     * How the server's readable rendering (`dpql/renderExpression`) spells this
+     * expression, when not by its symbol: `$arg[n]` is an argument, `$symbol` the
+     * symbol, `$args` all arguments, and `${arg[n] ? set : unset}` reads the
+     * argument or its `default_value` — e.g. `$arg[0].startsWith($arg[1], $arg[2])`.
+     */
+    render_template?: string;
     /** Server type code (operator/function); not a reliable infix discriminator. */
     type: number;
     /** `1` normal, `2` logical group (AND/OR). */

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/components/form/expressions/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,0DAA0D;AAC1D,MAAM,WAAW,gBAAgB;IAC/B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC;CACtB;AAED;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,EAAE,gBAAgB,GAAG,GAAG,CAAC;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,2EAA2E;IAC3E,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,6CAA6C;AAC7C,eAAO,MAAM,sBAAsB,EAAE,WAGpC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,0DAA0D;IAC1D,OAAO,EAAE,MAAM,CAAC;IAChB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC;IACvB,sBAAsB,CAAC,EAAE,GAAG,EAAE,CAAC;IAC/B,2CAA2C;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,0CAA0C;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,UAAU,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,gFAAgF;IAChF,IAAI,EAAE,MAAM,CAAC;IACb,8CAA8C;IAC9C,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;IACf,IAAI,EAAE,oBAAoB,EAAE,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,+EAA+E;IAC/E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;CACrC;AAED,4DAA4D;AAC5D,MAAM,MAAM,yBAAyB,GAAG,cAAc,GAAG,YAAY,GAAG,gBAAgB,CAAC;AAEzF;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,yBAAyB,EAAE,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/components/form/expressions/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,0DAA0D;AAC1D,MAAM,WAAW,gBAAgB;IAC/B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC;CACtB;AAED;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,EAAE,gBAAgB,GAAG,GAAG,CAAC;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,2EAA2E;IAC3E,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,6CAA6C;AAC7C,eAAO,MAAM,sBAAsB,EAAE,WAGpC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,0DAA0D;IAC1D,OAAO,EAAE,MAAM,CAAC;IAChB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC;IACvB,sBAAsB,CAAC,EAAE,GAAG,EAAE,CAAC;IAC/B,2CAA2C;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,0CAA0C;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,UAAU,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gFAAgF;IAChF,IAAI,EAAE,MAAM,CAAC;IACb,8CAA8C;IAC9C,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;IACf,IAAI,EAAE,oBAAoB,EAAE,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,+EAA+E;IAC/E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;CACrC;AAED,4DAA4D;AAC5D,MAAM,MAAM,yBAAyB,GAAG,cAAc,GAAG,YAAY,GAAG,gBAAgB,CAAC;AAEzF;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,yBAAyB,EAAE,CAAC"}

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

@@ -1,4 +1,4 @@
-import { IExpressionSchema, IExpressionValue } from './types';
+import { IExpressionValue } from './types';
 export { renderExpressionToText } from './renderExpressionToText';
 /** One rendered expression — what `renderRich` resolves with. */
 export interface IRenderedExpression {
@@ -6,30 +6,21 @@ export interface IRenderedExpression {
     text: string;
     /**
      * The server's richtext form — template references arrive as `tag` nodes
-     * (the IDE renders them as chips). `null` on the client-side fallback.
-     * Convert with `richtextResponseToSlate` for `RichTextFormField`.
+     * (the IDE renders them as chips). Convert with `richtextResponseToSlate`.
      */
     richtext: unknown | null;
-    /** `true` when the server `dpql/renderExpression` produced this result. */
-    server: boolean;
 }
 /** @internal Test hook — drop the module-level client + cached health state. */
 export declare const _resetRenderExpressionTransportForTests: () => void;
 export interface IUseRenderExpressionResult {
-    /** Render an expression AST to a readable string. */
-    render: (value: IExpressionValue, expressions?: IExpressionSchema[]) => Promise<string>;
+    /** The readable rendering of an expression AST, or `null` when the server cannot render. */
+    render: (value: IExpressionValue) => Promise<string | null>;
     /**
      * Like `render`, but also resolves the server's richtext form (template
-     * references as `tag` nodes — chips) and which path served. For consumers
-     * that style the rendering, e.g. the builder's Explain panel.
+     * references as `tag` nodes — chips). `null` when there is nothing to render
+     * or the server cannot render it.
      */
-    renderRich: (value: IExpressionValue, expressions?: IExpressionSchema[]) => Promise<IRenderedExpression>;
-    /**
-     * `true` when the server `dpql/renderExpression` path served the last
-     * render; `false` while on the client-side approximation (LSP unreachable
-     * or the server predates the method).
-     */
-    serverRendering: boolean;
+    renderRich: (value: IExpressionValue) => Promise<IRenderedExpression | null>;
 }
 export declare const useRenderExpression: () => IUseRenderExpressionResult;
 //# sourceMappingURL=useRenderExpression.d.ts.map

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":"AAiBA,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAqElE,iEAAiE;AACjE,MAAM,WAAW,mBAAmB;IAClC,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,2EAA2E;IAC3E,MAAM,EAAE,OAAO,CAAC;CACjB;AA4BD,gFAAgF;AAChF,eAAO,MAAM,uCAAuC,QAAO,IAM1D,CAAC;AAQF,MAAM,WAAW,0BAA0B;IACzC,qDAAqD;IACrD,MAAM,EAAE,CAAC,KAAK,EAAE,gBAAgB,EAAE,WAAW,CAAC,EAAE,iBAAiB,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACxF;;;;OAIG;IACH,UAAU,EAAE,CACV,KAAK,EAAE,gBAAgB,EACvB,WAAW,CAAC,EAAE,iBAAiB,EAAE,KAC9B,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAClC;;;;OAIG;IACH,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,eAAO,MAAM,mBAAmB,QAAO,0BAqFtC,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;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"}