@qoretechnologies/reqraft 0.10.65 → 0.10.66-pr.137.ga1983bf

package/dist/components/dpqlEditor/dpqlInserter.js

@@ -9,23 +9,36 @@ var slate_1 = require("slate");
 var slate_react_1 = require("slate-react");
 var helpers_1 = require("../smartEditor/helpers");
 var dpqlHelpers_1 = require("./dpqlHelpers");
+var templateCompletions_1 = require("../smartEditor/templateCompletions");
+/** The word typed before the caret: a sigil (`@`, `$`) and what a name or a template goes on with after it. */
+var TYPED_WORD = /[@$]?[\w.:{}-]*$/;
 /**
- * Walk back from the cursor to find the start of the partial token the
- * user typed. Matches the same heuristic the generic
- * `useLspAutocomplete.findTokenStart` uses internally — duplicated here
- * because the inserter runs at completion-accept time and needs to slice
- * the partial token before inserting the chosen completion.
+ * What is typed before the caret in the text it is in: what a pick may take the place of. Never anything across a
+ * chip: read from the whole text, the word before a caret just after a chip was the chip's own text
+ * (`$record:{pos}`), and a pick deleted the chip - an operator picked after `pos` took its place (qorus#646,
+ * David's review).
  */
-function findTokenStart(plainText, cursorOffset) {
-    var i = cursorOffset - 1;
-    while (i >= 0 && /[\w.:{}-]/.test(plainText[i])) {
-        i--;
+var typedBeforeCaret = function (editor) {
+    var _a;
+    var at = (_a = editor.selection) === null || _a === void 0 ? void 0 : _a.anchor;
+    if (!at) {
+        return '';
     }
-    if (i >= 0 && /[@$]/.test(plainText[i])) {
-        i--;
+    try {
+        var node = slate_1.Editor.node(editor, at.path)[0];
+        return typeof node.text === 'string' ?
+            node.text.slice(0, at.offset)
+            : '';
+    }
+    catch (_b) {
+        // a path the editor no longer has: nothing was typed there
+        return '';
     }
-    return i + 1;
-}
+};
+/** An operator that joins two values (`==`, `&&`, `between`): written with a space on each side. */
+var isJoiningOperator = function (item) {
+    return (item.kind === 14 || item.kind === 24) && !!item.label && !/^[[{.(!]/.test(item.label);
+};
 /**
  * DPQL completion inserter. For tag completions (`@field` / `$template:…`),
  * inserts a Slate tag element so the value renders as an interactive chip.
@@ -37,7 +50,7 @@ function findTokenStart(plainText, cursorOffset) {
  * spec). Without `textEdit`, fall back to the find-token-start heuristic.
  */
 var dpqlCompletionInserter = function (item, editor, ctx) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     var ed = editor;
     var rawValue = (_c = (_b = (_a = item.textEdit) === null || _a === void 0 ? void 0 : _a.newText) !== null && _b !== void 0 ? _b : item.insertText) !== null && _c !== void 0 ? _c : item.label;
     // Expand LSP snippets (`insertTextFormat === 2`) so function templates
@@ -72,7 +85,7 @@ var dpqlCompletionInserter = function (item, editor, ctx) {
         try {
             slate_react_1.ReactEditor.focus(ed);
         }
-        catch (_d) {
+        catch (_f) {
             // Editor may not be focusable in this render cycle.
         }
         return;
@@ -82,20 +95,23 @@ var dpqlCompletionInserter = function (item, editor, ctx) {
     // inserting at the cursor.
     if (!ed.selection)
         return;
-    var charsToDelete;
-    if (item.textEdit) {
-        var startOffset = (0, helpers_1.lspPositionToOffset)(ctx.plainText, item.textEdit.range.start);
-        charsToDelete = Math.max(0, ctx.cursorOffset - startOffset);
-    }
-    else {
-        // Heuristic fallback — same logic the old DPQL inserter used.
-        var tokenStart = findTokenStart(ctx.plainText, ctx.cursorOffset);
-        charsToDelete = Math.max(0, ctx.cursorOffset - tokenStart);
+    // what the pick takes the place of: what was typed for it, in the text the caret is in
+    var typed = typedBeforeCaret(ed);
+    var charsToDelete = Math.min(typed.length, item.textEdit ?
+        Math.max(0, ctx.cursorOffset - (0, helpers_1.lspPositionToOffset)(ctx.plainText, item.textEdit.range.start))
+        : ((_e = (_d = TYPED_WORD.exec(typed)) === null || _d === void 0 ? void 0 : _d[0].length) !== null && _e !== void 0 ? _e : 0));
+    /* A reference picked after a chip it goes on from (`$data:receive_order` and `.` typed after it) is the one
+       reference: it takes the chip's place as well as what was typed (`chipExtendedBy`). */
+    var extended = (0, dpqlHelpers_1.isTagCompletion)(insertValue) ? (0, templateCompletions_1.chipExtendedBy)(ed, typed, insertValue) : undefined;
+    var deleted = extended ? typed.length : charsToDelete;
+    if (deleted > 0) {
+        var at = ed.selection.anchor;
+        slate_1.Transforms.delete(ed, {
+            at: { anchor: { path: at.path, offset: at.offset - deleted }, focus: at },
+        });
     }
-    if (charsToDelete > 0) {
-        for (var i = 0; i < charsToDelete; i++) {
-            slate_1.Editor.deleteBackward(ed, { unit: 'character' });
-        }
+    if (extended) {
+        slate_1.Transforms.removeNodes(ed, { at: extended });
     }
     if ((0, dpqlHelpers_1.isTagCompletion)(insertValue)) {
         var tagElement = {
@@ -107,15 +123,37 @@ var dpqlCompletionInserter = function (item, editor, ctx) {
         slate_1.Transforms.insertNodes(ed, tagElement);
         slate_1.Transforms.move(ed);
     }
+    else if (isJoiningOperator(item)) {
+        // an operator after a value is written apart from it, and from the value that follows it: `pos == `
+        var before = typedBeforeCaret(ed);
+        var joined = /\s$/.test(before) || (!before && !hasChipBefore(ed)) ? '' : ' ';
+        slate_1.Transforms.insertText(ed, "".concat(joined).concat(insertValue, " "));
+    }
     else {
         slate_1.Transforms.insertText(ed, insertValue);
     }
     try {
         slate_react_1.ReactEditor.focus(ed);
     }
-    catch (_e) {
+    catch (_g) {
         // Editor may not be focused.
     }
 };
 exports.dpqlCompletionInserter = dpqlCompletionInserter;
+/** Whether a chip is just before the caret, in the text the caret starts: a value an operator is written apart from. */
+var hasChipBefore = function (editor) {
+    var _a, _b;
+    var at = (_a = editor.selection) === null || _a === void 0 ? void 0 : _a.anchor;
+    if (!at || at.offset !== 0) {
+        return false;
+    }
+    try {
+        var previous = slate_1.Editor.previous(editor, { at: at.path });
+        return ((_b = previous === null || previous === void 0 ? void 0 : previous[0]) === null || _b === void 0 ? void 0 : _b.type) === 'tag';
+    }
+    catch (_c) {
+        // nothing before it
+        return false;
+    }
+};
 //# sourceMappingURL=dpqlInserter.js.map

package/dist/components/dpqlEditor/dpqlInserter.js.map

@@ -1 +1 @@
-{"version":3,"file":"dpqlInserter.js","sourceRoot":"","sources":["../../../src/components/dpqlEditor/dpqlInserter.ts"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,uEAAuE;AACvE,yEAAyE;AACzE,sEAAsE;;;AAEtE,+BAAuD;AAEvD,2CAA0C;AAC1C,kDAA4E;AAE5E,6CAA6D;AAE7D;;;;;;GAMG;AACH,SAAS,cAAc,CAAC,SAAiB,EAAE,YAAoB;IAC7D,IAAI,CAAC,GAAG,YAAY,GAAG,CAAC,CAAC;IACzB,OAAO,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,CAAC,EAAE,CAAC;IACN,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACxC,CAAC,EAAE,CAAC;IACN,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAED;;;;;;;;;GASG;AACI,IAAM,sBAAsB,GAAwB,UAAC,IAAI,EAAE,MAAM,EAAE,GAAG;;IAC3E,IAAM,EAAE,GAAG,MAAkD,CAAC;IAC9D,IAAM,QAAQ,GAAG,MAAA,MAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,OAAO,mCAAI,IAAI,CAAC,UAAU,mCAAI,IAAI,CAAC,KAAK,CAAC;IACzE,uEAAuE;IACvE,iEAAiE;IACjE,qEAAqE;IACrE,uEAAuE;IACvE,IAAM,WAAW,GACf,IAAI,CAAC,gBAAgB,KAAK,CAAC,CAAC,CAAC,CAAC,IAAA,uBAAa,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAEnE,oEAAoE;IACpE,qEAAqE;IACrE,sEAAsE;IACtE,iEAAiE;IACjE,IAAI,GAAG,CAAC,eAAe,EAAE,CAAC;QACxB,IAAM,MAAI,GAAG,GAAG,CAAC,eAAe,CAAC;QACjC,cAAM,CAAC,kBAAkB,CAAC,EAAE,EAAE;YAC5B,kBAAU,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,MAAI,EAAE,CAAC,CAAC;YACzC,IAAI,IAAA,6BAAe,EAAC,WAAW,CAAC,EAAE,CAAC;gBACjC,IAAM,UAAU,GAAkB;oBAChC,IAAI,EAAE,KAAK;oBACX,KAAK,EAAE,WAAW;oBAClB,KAAK,EAAE,IAAA,yBAAW,EAAC,WAAW,CAAC;oBAC/B,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;iBACzB,CAAC;gBACF,kBAAU,CAAC,WAAW,CAAC,EAAE,EAAE,UAAiB,EAAE,EAAE,EAAE,EAAE,MAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5E,CAAC;iBAAM,CAAC;gBACN,kBAAU,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAQ,EAAE;oBACzD,EAAE,EAAE,MAAI;oBACR,MAAM,EAAE,IAAI;iBACb,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC;YACH,yBAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACxB,CAAC;QAAC,WAAM,CAAC;YACP,oDAAoD;QACtD,CAAC;QACD,OAAO;IACT,CAAC;IAED,kEAAkE;IAClE,8DAA8D;IAC9D,2BAA2B;IAC3B,IAAI,CAAC,EAAE,CAAC,SAAS;QAAE,OAAO;IAE1B,IAAI,aAAqB,CAAC;IAC1B,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,IAAM,WAAW,GAAG,IAAA,6BAAmB,EAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAClF,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,YAAY,GAAG,WAAW,CAAC,CAAC;IAC9D,CAAC;SAAM,CAAC;QACN,8DAA8D;QAC9D,IAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;QACnE,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,YAAY,GAAG,UAAU,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;QACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,cAAM,CAAC,cAAc,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;IAED,IAAI,IAAA,6BAAe,EAAC,WAAW,CAAC,EAAE,CAAC;QACjC,IAAM,UAAU,GAAkB;YAChC,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE,IAAA,yBAAW,EAAC,WAAW,CAAC;YAC/B,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;SACzB,CAAC;QACF,kBAAU,CAAC,WAAW,CAAC,EAAE,EAAE,UAAiB,CAAC,CAAC;QAC9C,kBAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACtB,CAAC;SAAM,CAAC;QACN,kBAAU,CAAC,UAAU,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;IACzC,CAAC;IAED,IAAI,CAAC;QACH,yBAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;IAAC,WAAM,CAAC;QACP,6BAA6B;IAC/B,CAAC;AACH,CAAC,CAAC;AAhFW,QAAA,sBAAsB,0BAgFjC"}
+{"version":3,"file":"dpqlInserter.js","sourceRoot":"","sources":["../../../src/components/dpqlEditor/dpqlInserter.ts"],"names":[],"mappings":"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"}

package/dist/components/dpqlEditor/dpqlTags.d.ts

@@ -1,5 +1,7 @@
 import { IReqoreTagProps } from '@qoretechnologies/reqore/dist/components/Tag';
 import { IReqoreFormTemplates } from '@qoretechnologies/reqore/dist/components/Textarea';
+import { IDescriptionTooltipOptions } from '../../helpers/descriptionTooltip';
+import { TTypeSentenceForm } from '../../helpers/qorusTypeCatalogue';
 import { ISlateElement } from '../smartEditor/types';
 import { IDpqlFieldMeta } from './useDpqlSession';
 /** Color scheme for tag rendering, keyed by template prefix. */
@@ -21,13 +23,11 @@ export declare const FIELD_REF_COLOR: {
 export declare const getTemplatePrefixColor: (value: string) => string;
 export interface IDpqlTagRendererOptions {
     /**
-     * Color template (`$…`) tags with the `info` intent instead of the per-prefix
-     * palette. For read-only render surfaces (the Explain panel) that mirror
-     * qorus-ide, where template tags are uniformly `info`. The server's
-     * `renderExpression` carries no built-in / event-trigger metadata (verified
-     * against the live LSP), so `info` is the whole scheme here — there's nothing
-     * to promote to qorus purple / success. The editable editor omits this and
-     * keeps the per-prefix palette for telling prefixes apart at a glance.
+     * Draw a template (`$…`) chip as every other template chip is drawn - in a value's text, a template field, a
+     * read row (`getTemplateTagStyle`): `info`, or the catalogue entry's built-in (`custom1`) or event-trigger
+     * (`success`) intent. The default (qorus#646, David's review: a template picked on a value's Value tab was blue
+     * there and gray on its Expression tab). `false` keeps the per-prefix palette (`TEMPLATE_COLORS`), which drew a
+     * prefix it did not list (`$record:`) gray.
      */
     templateTagsUseIntent?: boolean;
     /**
@@ -37,6 +37,16 @@ export interface IDpqlTagRendererOptions {
      * that is not found keeps its path.
      */
     templates?: IReqoreFormTemplates;
+    /**
+     * How the editor shows a description's card (`useDescriptionTooltips`): a field's and a template's
+     * description is markdown, drawn as the template list draws it, and opened by a tap on a touch screen.
+     */
+    descriptions?: IDescriptionTooltipOptions;
+    /**
+     * What a type is called inside a sentence (`useQorusTypes().getTypeSentenceForm`): a field's and a template's
+     * hover says its type in words with it. Without it, the built-in catalogue's words.
+     */
+    typeSentenceForm?: TTypeSentenceForm;
 }
 /**
  * Build the `tagRenderer` callback for DpqlEditor. Closes over the live

package/dist/components/dpqlEditor/dpqlTags.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dpqlTags.d.ts","sourceRoot":"","sources":["../../../src/components/dpqlEditor/dpqlTags.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AAEzF,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,gEAAgE;AAChE,eAAO,MAAM,eAAe,EAAE,MAAM,CAClC,MAAM,EACN;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAe3C,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;CAIlC,CAAC;AAEF,eAAO,MAAM,eAAe;;;;CAI3B,CAAC;AAEF,eAAO,MAAM,sBAAsB,UAAW,MAAM,KAAG,MAItD,CAAC;AAEF,MAAM,WAAW,uBAAuB;IACtC;;;;;;;;OAQG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,oBAAoB,CAAC;CAClC;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,EACzC,OAAO,GAAE,uBAA4B,SAExB,aAAa,KAAG,eAAe,CAoC7C"}
+{"version":3,"file":"dpqlTags.d.ts","sourceRoot":"","sources":["../../../src/components/dpqlEditor/dpqlTags.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,EAAsB,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAClG,OAAO,EAA2B,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAW9F,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,gEAAgE;AAChE,eAAO,MAAM,eAAe,EAAE,MAAM,CAClC,MAAM,EACN;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAe3C,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;CAIlC,CAAC;AAEF,eAAO,MAAM,eAAe;;;;CAI3B,CAAC;AAEF,eAAO,MAAM,sBAAsB,UAAW,MAAM,KAAG,MAItD,CAAC;AAEF,MAAM,WAAW,uBAAuB;IACtC;;;;;;OAMG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,oBAAoB,CAAC;IACjC;;;OAGG;IACH,YAAY,CAAC,EAAE,0BAA0B,CAAC;IAC1C;;;OAGG;IACH,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;CACtC;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,EACzC,OAAO,GAAE,uBAA4B,SAqCxB,aAAa,KAAG,eAAe,CA4C7C"}

package/dist/components/dpqlEditor/dpqlTags.js

@@ -15,7 +15,13 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeDpqlTagRenderer = exports.getTemplatePrefixColor = exports.FIELD_REF_COLOR = exports.DEFAULT_TEMPLATE_COLOR = exports.TEMPLATE_COLORS = void 0;
+var noDescription_1 = require("../../helpers/noDescription");
+var descriptionTooltip_1 = require("../../helpers/descriptionTooltip");
+var qorusTypeCatalogue_1 = require("../../helpers/qorusTypeCatalogue");
 var templates_1 = require("../../helpers/templates");
+var recordFieldReference_1 = require("../../helpers/recordFieldReference");
+var templateText_1 = require("../../helpers/templateText");
+var dpqlHelpers_1 = require("./dpqlHelpers");
 /** Color scheme for tag rendering, keyed by template prefix. */
 exports.TEMPLATE_COLORS = {
     data: { bg: 'rgba(56, 132, 244, 0.22)', border: 'rgba(56, 132, 244, 0.55)', fg: '#7bb8ff' },
@@ -55,31 +61,52 @@ exports.getTemplatePrefixColor = getTemplatePrefixColor;
  */
 function makeDpqlTagRenderer(fieldMeta, options) {
     if (options === void 0) { options = {}; }
-    return function (tag) {
+    /**
+     * A template's chip, as every view draws it: its catalogue name and description, else `<key>: <path>`. A field
+     * gives its own hover (`field`): the record's description of it, or none, so that the server's hover is the one
+     * shown and the chip's text is not repeated as its tooltip.
+     */
+    var templateChip = function (template, field) {
         var _a, _b;
+        var named = options.templates && (0, templates_1.describeTemplateReference)(options.templates, template);
+        return __assign(__assign(__assign(__assign(__assign({}, templates_1.REFERENCE_CHIP_PROPS), { icon: 'ExchangeDollarLine' }), ((named === null || named === void 0 ? void 0 : named.item) ? { label: named.label }
+            : field ? { label: (0, templateText_1.templateChipLabel)(options.templates, template) }
+                : {})), ((named === null || named === void 0 ? void 0 : named.item) ?
+            {
+                tooltip: (0, templates_1.templateTooltip)(options.templates, template, (_a = options.descriptions) !== null && _a !== void 0 ? _a : {}, options.typeSentenceForm),
+            }
+            : field ? { tooltip: field.tooltip }
+                : {})), (options.templateTagsUseIntent === false ?
+            { color: (0, exports.getTemplatePrefixColor)(template) }
+            : (0, templates_1.getTemplateTagStyle)((_b = named === null || named === void 0 ? void 0 : named.item) === null || _b === void 0 ? void 0 : _b.metadata)));
+    };
+    return function (tag) {
+        var _a, _b, _c, _d, _e;
         var tagValue = (_a = tag.value) === null || _a === void 0 ? void 0 : _a.toString();
         if (!tagValue)
             return {};
-        if (tagValue.startsWith('@')) {
-            var fieldName = tagValue.slice(1);
+        /* A field, `@name`, quoted `@"order-id"` or with its accessors `@orders[*].id`, is a field of the record: the
+           same record field a value holds as `$record:{orders[*].id}`, and drawn as that chip - its color, its icon
+           and its label, `record: orders[*].id` (qorus#646, David: one chip for one record field). The record's own
+           description of the field is its hover where the catalogue does not describe it. */
+        var fieldName = (0, dpqlHelpers_1.dpqlFieldName)(tagValue);
+        if (fieldName !== undefined) {
             var meta = fieldMeta[fieldName];
-            var tooltip = meta
-                ? "".concat(meta.display_name || fieldName).concat(((_b = meta.type) === null || _b === void 0 ? void 0 : _b.name) ? " (".concat(meta.type.name, ")") : '').concat(meta.short_desc ? "\n".concat(meta.short_desc) : '')
+            /* the field's name heads the card, and under it what kind of value it is, in words, and its description:
+               its type was said raw, "Order ID (int)" (qorus#646) */
+            var typeSentenceForm = (_b = options.typeSentenceForm) !== null && _b !== void 0 ? _b : qorusTypeCatalogue_1.builtInTypeSentenceForm;
+            var tooltip = meta ?
+                (0, descriptionTooltip_1.descriptionTooltip)(
+                // what the field is, or why nothing says so (qorus#646)
+                (0, templates_1.describedWithType)(((_c = meta.short_desc) === null || _c === void 0 ? void 0 : _c.trim()) ? meta.short_desc : noDescription_1.NO_FIELD_DESCRIPTION, typeSentenceForm((_d = meta.type) === null || _d === void 0 ? void 0 : _d.name)), (_e = options.descriptions) !== null && _e !== void 0 ? _e : {}, meta.display_name || fieldName)
                 : undefined;
-            return {
-                icon: 'Database2Line',
-                color: exports.FIELD_REF_COLOR.fg,
-                tooltip: tooltip,
-                label: (meta === null || meta === void 0 ? void 0 : meta.display_name) || fieldName,
-            };
+            var template = (0, recordFieldReference_1.recordTemplateOfReference)(tagValue);
+            return template ?
+                templateChip(template, { tooltip: tooltip })
+                : __assign(__assign(__assign({}, templates_1.REFERENCE_CHIP_PROPS), { icon: 'ExchangeDollarLine', label: fieldName, tooltip: tooltip }), (0, templates_1.getTemplateTagStyle)(undefined));
         }
         if (tagValue.startsWith('$')) {
-            var named = options.templates && (0, templates_1.describeTemplateReference)(options.templates, tagValue);
-            return __assign(__assign({ icon: 'ExchangeDollarLine' }, ((named === null || named === void 0 ? void 0 : named.item) ?
-                { label: named.label, tooltip: (0, templates_1.templateTooltip)(options.templates, tagValue) }
-                : {})), (options.templateTagsUseIntent
-                ? { intent: 'info' }
-                : { color: (0, exports.getTemplatePrefixColor)(tagValue) }));
+            return templateChip(tagValue);
         }
         return {};
     };

package/dist/components/dpqlEditor/dpqlTags.js.map

@@ -1 +1 @@
-{"version":3,"file":"dpqlTags.js","sourceRoot":"","sources":["../../../src/components/dpqlEditor/dpqlTags.ts"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,wEAAwE;AACxE,mDAAmD;;;;;;;;;;;;;;AAInD,qDAAqF;AAIrF,gEAAgE;AACnD,QAAA,eAAe,GAGxB;IACF,IAAI,EAAS,EAAE,EAAE,EAAE,0BAA0B,EAAE,MAAM,EAAE,0BAA0B,EAAE,EAAE,EAAE,SAAS,EAAE;IAClG,KAAK,EAAQ,EAAE,EAAE,EAAE,0BAA0B,EAAE,MAAM,EAAE,0BAA0B,EAAE,EAAE,EAAE,SAAS,EAAE;IAClG,SAAS,EAAI,EAAE,EAAE,EAAE,0BAA0B,EAAE,MAAM,EAAE,0BAA0B,EAAE,EAAE,EAAE,SAAS,EAAE;IAClG,MAAM,EAAO,EAAE,EAAE,EAAE,0BAA0B,EAAE,MAAM,EAAE,0BAA0B,EAAE,EAAE,EAAE,SAAS,EAAE;IAClG,OAAO,EAAM,EAAE,EAAE,EAAE,0BAA0B,EAAE,MAAM,EAAE,0BAA0B,EAAE,EAAE,EAAE,SAAS,EAAE;IAClG,SAAS,EAAI,EAAE,EAAE,EAAE,0BAA0B,EAAE,MAAM,EAAE,0BAA0B,EAAE,EAAE,EAAE,SAAS,EAAE;IAClG,QAAQ,EAAK,EAAE,EAAE,EAAE,0BAA0B,EAAE,MAAM,EAAE,0BAA0B,EAAE,EAAE,EAAE,SAAS,EAAE;IAClG,OAAO,EAAM,EAAE,EAAE,EAAE,0BAA0B,EAAE,MAAM,EAAE,0BAA0B,EAAE,EAAE,EAAE,SAAS,EAAE;IAClG,MAAM,EAAO,EAAE,EAAE,EAAE,0BAA0B,EAAE,MAAM,EAAE,0BAA0B,EAAE,EAAE,EAAE,SAAS,EAAE;IAClG,IAAI,EAAS,EAAE,EAAE,EAAE,0BAA0B,EAAE,MAAM,EAAE,0BAA0B,EAAE,EAAE,EAAE,SAAS,EAAE;IAClG,IAAI,EAAS,EAAE,EAAE,EAAE,0BAA0B,EAAE,MAAM,EAAE,0BAA0B,EAAE,EAAE,EAAE,SAAS,EAAE;IAClG,OAAO,EAAM,EAAE,EAAE,EAAE,0BAA0B,EAAE,MAAM,EAAE,0BAA0B,EAAE,EAAE,EAAE,SAAS,EAAE;IAClG,GAAG,EAAU,EAAE,EAAE,EAAE,0BAA0B,EAAE,MAAM,EAAE,0BAA0B,EAAE,EAAE,EAAE,SAAS,EAAE;CACnG,CAAC;AAEW,QAAA,sBAAsB,GAAG;IACpC,EAAE,EAAE,2BAA2B;IAC/B,MAAM,EAAE,2BAA2B;IACnC,EAAE,EAAE,SAAS;CACd,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,EAAE,EAAE,0BAA0B;IAC9B,MAAM,EAAE,0BAA0B;IAClC,EAAE,EAAE,SAAS;CACd,CAAC;AAEK,IAAM,sBAAsB,GAAG,UAAC,KAAa;IAClD,IAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACpC,IAAM,MAAM,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1E,OAAO,CAAC,uBAAe,CAAC,MAAM,CAAC,IAAI,8BAAsB,CAAC,CAAC,EAAE,CAAC;AAChE,CAAC,CAAC;AAJW,QAAA,sBAAsB,0BAIjC;AAsBF;;;;GAIG;AACH,SAAgB,mBAAmB,CACjC,SAAyC,EACzC,OAAqC;IAArC,wBAAA,EAAA,YAAqC;IAErC,OAAO,UAAC,GAAkB;;QACxB,IAAM,QAAQ,GAAG,MAAA,GAAG,CAAC,KAAK,0CAAE,QAAQ,EAAE,CAAC;QACvC,IAAI,CAAC,QAAQ;YAAE,OAAO,EAAE,CAAC;QAEzB,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7B,IAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACpC,IAAM,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;YAClC,IAAM,OAAO,GAAG,IAAI;gBAClB,CAAC,CAAC,UAAG,IAAI,CAAC,YAAY,IAAI,SAAS,SAC/B,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,IAAI,EAAC,CAAC,CAAC,YAAK,IAAI,CAAC,IAAI,CAAC,IAAI,MAAG,CAAC,CAAC,CAAC,EAAE,SAC5C,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,YAAK,IAAI,CAAC,UAAU,CAAE,CAAC,CAAC,CAAC,EAAE,CAAE;gBACpD,CAAC,CAAC,SAAS,CAAC;YAEd,OAAO;gBACL,IAAI,EAAE,eAAe;gBACrB,KAAK,EAAE,uBAAe,CAAC,EAAkB;gBACzC,OAAO,SAAA;gBACP,KAAK,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY,KAAI,SAAS;aACvC,CAAC;QACJ,CAAC;QAED,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7B,IAAM,KAAK,GAAG,OAAO,CAAC,SAAS,IAAI,IAAA,qCAAyB,EAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAC1F,2BACE,IAAI,EAAE,oBAAoB,IACvB,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,EAAC,CAAC;gBACf,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,IAAA,2BAAe,EAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE;gBAC/E,CAAC,CAAC,EAAE,CAAC,GACF,CAAC,OAAO,CAAC,qBAAqB;gBAC/B,CAAC,CAAC,EAAE,MAAM,EAAE,MAAe,EAAE;gBAC7B,CAAC,CAAC,EAAE,KAAK,EAAE,IAAA,8BAAsB,EAAC,QAAQ,CAAiB,EAAE,CAAC,EAChE;QACJ,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;AACJ,CAAC;AAxCD,kDAwCC"}
+{"version":3,"file":"dpqlTags.js","sourceRoot":"","sources":["../../../src/components/dpqlEditor/dpqlTags.ts"],"names":[],"mappings":"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"}

package/dist/components/dpqlEditor/types.d.ts

@@ -1,5 +1,9 @@
 /// <reference types="react" />
 import { IReqoreFormTemplates } from '@qoretechnologies/reqore/dist/components/Textarea';
+import { TSizes } from '@qoretechnologies/reqore/dist/constants/sizes';
+import type { ITemplateCatalogue, ITemplateFieldContext } from '../../helpers/templateCatalogue';
+import type { ILspDiagnostic } from '../../utils/lspClient.types';
+import type { ISmartEditorDiagnosticAction } from '../smartEditor/types';
 export type { ISlateElement, ISlateText, TSlateNode, } from '../smartEditor/types';
 /** Result of a `dpql/parse` request — DPQL-specific custom LSP method. */
 export interface IDpqlParseResult {
@@ -26,6 +30,22 @@ export interface IDpqlParseResult {
         text: string;
         description?: string;
     };
+    /**
+     * How the server reads the expression as a condition, when the request asked (`condition: true`):
+     * `condition` (it gives true or false), `truthiness` (a number, a list, a hash: true unless it is zero or
+     * empty), `not_a_condition` (text, a date or a time), `unknown` (a result it cannot tell). A server that
+     * does not know the question leaves it out.
+     */
+    condition_reading?: 'condition' | 'truthiness' | 'not_a_condition' | 'unknown';
+    /**
+     * With `condition`: each part of the expression's `&&`, `||` and `!`, at any depth, with the type it gives
+     * and how a condition reads it - in the server's walk order (qorus#646). `condition_reading` is the worst of
+     * the expression's own reading and its parts'.
+     */
+    parts?: Array<{
+        type: string;
+        reading: 'condition' | 'truthiness' | 'not_a_condition' | 'unknown';
+    }>;
     diagnostics: Array<{
         range: {
             start: {
@@ -43,6 +63,14 @@ export interface IDpqlParseResult {
         source?: string;
     }>;
 }
+/** What else a `dpql/parse` asks. */
+export interface IDpqlParseOptions {
+    /**
+     * The expression is a condition: ask how the server reads it as one (`condition: true`) instead of
+     * whether it fits a type; the target type is not sent.
+     */
+    condition?: boolean;
+}
 /** A record's fields for `dpql/setContext`: each field's type (or types) and an optional description. */
 export type TDpqlFields = Record<string, {
     type: string | string[];
@@ -84,28 +112,39 @@ export interface IDpqlEditorProps {
      * fields); pass e.g. `'200px'` for a taller multi-line code editor.
      */
     height?: string;
+    /**
+     * The size the text is drawn at, as a field of that size draws it - and the chips in it with it. A host
+     * drawing the same value as another field (an expression's Value and Expression tabs) gives both one size,
+     * so a reference is the same chip in either (qorus#646). The editor's own when not given.
+     */
+    size?: TSizes;
     /** Read-only mode. */
     readOnly?: boolean;
+    /** `off`: a line does not wrap; the text scrolls sideways inside its box. Default `on`. */
+    wordWrap?: 'on' | 'off';
+    /** The tallest the text's box grows; the text scrolls within it past that. Unlimited when not given. */
+    maxHeight?: string;
+    /** Each line's number before it, as a code editor shows them. Default off. */
+    lineNumbers?: boolean;
     /**
      * Whether to render diagnostic underlines. Default `true`. Set `false`
      * for display-only surfaces whose text is not valid DPQL — e.g. the
      * expression "Explain" panel (server rendering shown through the editor
-     * for template chips + LSP token colours). See `ISmartEditorProps`.
+     * for template chips + LSP token colors). See `ISmartEditorProps`.
      */
     showDiagnostics?: boolean;
     /** Whether to show hover popovers (`textDocument/hover`). Default `true`. */
     enableHover?: boolean;
     /**
-     * Color template (`$…`) tags with the `info` intent instead of the per-prefix
-     * palette — for read-only render surfaces (the Explain panel) that mirror
-     * qorus-ide's uniform `info` template styling. Default `false` (per-prefix
-     * palette, the editor's at-a-glance prefix coloring).
+     * Draw a template (`$…`) chip as every other template chip is drawn (`getTemplateTagStyle`: `info`, or the
+     * catalogue entry's built-in or event-trigger intent). Default `true` (qorus#646): a template was blue in a
+     * value's text and gray in an expression's. `false` keeps the per-prefix palette (`TEMPLATE_COLORS`).
      */
     templateTagsUseIntent?: boolean;
     /**
      * The overlay shown while the language server connects. Forwarded to
      * `SmartEditor`; pass `null` to show the text without one — a read-only
-     * rendering already has its text, and only its colours wait for the server.
+     * rendering already has its text, and only its colors wait for the server.
      */
     loadingIndicator?: React.ReactNode;
     /**
@@ -113,8 +152,50 @@ export interface IDpqlEditorProps {
      * is labelled by its catalogue name. See `IDpqlTagRendererOptions.templates`.
      */
     templates?: IReqoreFormTemplates;
+    /**
+     * The field's template catalogue (qorus#646): the template contexts it can use, each with its keys and whether it
+     * can be used whole. Asked of the language server (`dpql/templateCatalogue`) when not given; a server that does
+     * not know the request leaves the field with its own templates.
+     */
+    templateCatalogue?: ITemplateCatalogue;
+    /**
+     * Where the field is (`field_context`): its interface, its Qog and state, its record. Sent with the document's
+     * context and its catalogue request, so the server offers only the templates valid there.
+     */
+    fieldContext?: ITemplateFieldContext;
+    /**
+     * What can be done about one of the server's diagnostics, where the host can do it: a button beside what is said
+     * of it (a Qog's "Declare it" for a variable it does not declare, `qog_variable_undeclared`).
+     */
+    diagnosticAction?: (diagnostic: ILspDiagnostic) => ISmartEditorDiagnosticAction | undefined;
+    /**
+     * Whether the field's templates can be browsed as their catalogue nests them - their groups, a record's members -
+     * in the template picker, from a button beside the text (qorus#646, David's review: a DPQL field offered no
+     * hierarchy). A template chosen there is put in at the caret, where a value can go. On by default where the
+     * editor has templates and can be edited. A click in the empty text, a click on a chip and a group's row in the
+     * completion list open the same picker.
+     */
+    browseTemplates?: boolean;
     /** Called when the editor loses focus. */
     onBlur?: () => void;
+    /**
+     * Called once when there is no language server to talk to (connecting failed): the editor can show the
+     * text but not parse, serialize or complete it, so a host that needs those offers what works without it.
+     */
+    onUnavailable?: () => void;
+    /**
+     * Called once the language server can parse and write this editor's text: its session is connected and
+     * its context bound. A host that parses or serializes through the editor's ref waits for this rather
+     * than asking earlier, when the answer is "nothing parsed".
+     */
+    onReady?: () => void;
+    /**
+     * A click, a tap or Tab into the text asks what can be written at the caret, and the one completion list
+     * opens there: the server's completion, with the field's templates where a value can be written (qorus#646,
+     * David's decision). On by default where the editor has templates; an expression's Text view turns it on
+     * always.
+     */
+    completeOnClick?: boolean;
     /**
      * Opt-in to server-driven plain-text → Slate parsing via the LSP's
      * `dpql/toRichtext` custom method. When `true`, the editor calls
@@ -210,9 +291,14 @@ export interface IDpqlEditorRef {
      * `targetType` asks the server, in the same round trip, whether the
      * expression's result can satisfy that type — see `coercion_may_fail` on
      * the result. Omit it to ask only whether the text parses.
+     *
+     * `condition` asks instead how the server reads the expression as a condition (`condition_reading`).
+     */
+    parse: (text: string, targetType?: string, options?: IDpqlParseOptions) => Promise<IDpqlParseResult>;
+    /**
+     * Serialize an expression AST back to DPQL text via `dpql/serialize`: '' while the session has no client,
+     * and rejected, with the server's reason, when the server refuses to write the value.
      */
-    parse: (text: string, targetType?: string) => Promise<IDpqlParseResult>;
-    /** Serialize an expression AST back to DPQL text via `dpql/serialize`. */
     serialize: (expression: Record<string, any>) => Promise<string>;
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/components/dpqlEditor/types.d.ts.map

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

package/dist/components/dpqlEditor/useDpqlSession.d.ts

@@ -1,15 +1,20 @@
 import { ILspDiagnostic } from '../../utils/lspClient.types';
 import { IUseLspSessionResult } from '../smartEditor/useLspSession';
-import { IDpqlParseResult, TDpqlFields, TDpqlFsmContext } from './types';
+import { IDpqlParseOptions, IDpqlParseResult, TDpqlFields, TDpqlFsmContext } from './types';
+import type { ITemplateFieldContext } from '../../helpers/templateCatalogue';
 export interface IDpqlFieldMeta {
     display_name?: string;
     short_desc?: string;
     desc?: string;
+    /** Its type's name, and the fields of a field that is a record of its own (`@contact.email`). */
     type?: {
         name?: string;
+        fields?: Record<string, IDpqlFieldMeta>;
     };
 }
 export interface IUseDpqlSessionOptions {
+    /** Where the field is (`field_context`), sent with each context binding (qorus#646). */
+    fieldContext?: ITemplateFieldContext;
     /** Provider spec — `@<app>/<action>`, `datasource:name`, `connection:name`, or factory string. */
     provider?: string;
     /** Record type — `'record'` (default), `'create'`, or `'update'`. */
@@ -47,7 +52,7 @@ export interface IUseDpqlSessionResult {
      * `dpql/parse` — DPQL text → expression AST, and, when `targetType` is
      * given, whether that result can satisfy the type the field declares.
      */
-    parse: (text: string, targetType?: string) => Promise<IDpqlParseResult>;
+    parse: (text: string, targetType?: string, options?: IDpqlParseOptions) => Promise<IDpqlParseResult>;
     /** `dpql/serialize` — expression AST → DPQL text. */
     serialize: (expression: Record<string, any>) => Promise<string>;
     /**

package/dist/components/dpqlEditor/useDpqlSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDpqlSession.d.ts","sourceRoot":"","sources":["../../../src/components/dpqlEditor/useDpqlSession.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAiB,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAEzE,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1B;AAED,MAAM,WAAW,sBAAsB;IACrC,kGAAkG;IAClG,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qEAAqE;IACrE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mEAAmE;IACnE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,mEAAmE;IACnE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yFAAyF;IACzF,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,2CAA2C;IAC3C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;OAGG;IACH,UAAU,CAAC,EAAE,eAAe,CAAC;CAC9B;AAED,MAAM,WAAW,qBAAqB;IACpC,sEAAsE;IACtE,OAAO,EAAE,oBAAoB,CAAC;IAC9B,oEAAoE;IACpE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC1C,wCAAwC;IACxC,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B;;;OAGG;IACH,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACxE,qDAAqD;IACrD,SAAS,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAChE;;;OAGG;IACH,QAAQ,EAAE,MAAM,OAAO,CAAC;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,KAAK,CAAC;YAAE,OAAO,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAC,CAAC;CAClF;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,sBAAsB,GAC3B,qBAAqB,CAoVvB"}
+{"version":3,"file":"useDpqlSession.d.ts","sourceRoot":"","sources":["../../../src/components/dpqlEditor/useDpqlSession.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAiB,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACnF,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC5F,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAE7E,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iGAAiG;IACjG,IAAI,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;KAAE,CAAC;CACnE;AA4BD,MAAM,WAAW,sBAAsB;IACrC,wFAAwF;IACxF,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,kGAAkG;IAClG,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qEAAqE;IACrE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mEAAmE;IACnE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,mEAAmE;IACnE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yFAAyF;IACzF,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,2CAA2C;IAC3C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;OAGG;IACH,UAAU,CAAC,EAAE,eAAe,CAAC;CAC9B;AAED,MAAM,WAAW,qBAAqB;IACpC,sEAAsE;IACtE,OAAO,EAAE,oBAAoB,CAAC;IAC9B,oEAAoE;IACpE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC1C,wCAAwC;IACxC,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B;;;OAGG;IACH,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACrG,qDAAqD;IACrD,SAAS,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAChE;;;OAGG;IACH,QAAQ,EAAE,MAAM,OAAO,CAAC;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,KAAK,CAAC;YAAE,OAAO,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAC,CAAC;CAClF;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,sBAAsB,GAC3B,qBAAqB,CA2WvB"}