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

package/dist/components/dpqlEditor/DpqlEditor.js

@@ -67,7 +67,11 @@ var SmartEditor_1 = require("../smartEditor/SmartEditor");
 var dpqlHelpers_1 = require("./dpqlHelpers");
 var dpqlInserter_1 = require("./dpqlInserter");
 var dpqlTags_1 = require("./dpqlTags");
+var dpqlCompletions_1 = require("./dpqlCompletions");
 var useDpqlSession_1 = require("./useDpqlSession");
+var useTemplateTags_1 = require("../form/fields/rich-text/useTemplateTags");
+var descriptionTooltip_1 = require("../../helpers/descriptionTooltip");
+var typeSentenceForm_1 = require("../form/typeSentenceForm");
 // Trigger characters that open the autocomplete on typing. Space is
 // deliberately NOT in the set — typing a space after a chip (or after a
 // keyword like `==`) shouldn't pop the dropdown. Sigils (`@`, `$`) and
@@ -75,7 +79,7 @@ var useDpqlSession_1 = require("./useDpqlSession");
 // of completion is handled by typing inside an already-open token.
 var DPQL_TRIGGERS = new Set(['@', '$', '.', ':']);
 exports.DpqlEditor = (0, react_1.forwardRef)(function (_a, ref) {
-    var value = _a.value, onChange = _a.onChange, provider = _a.provider, recordType = _a.recordType, options = _a.options, actionCode = _a.actionCode, height = _a.height, _b = _a.readOnly, readOnly = _b === void 0 ? false : _b, _c = _a.showDiagnostics, showDiagnostics = _c === void 0 ? true : _c, _d = _a.enableHover, enableHover = _d === void 0 ? true : _d, _e = _a.templateTagsUseIntent, templateTagsUseIntent = _e === void 0 ? false : _e, loadingIndicator = _a.loadingIndicator, templates = _a.templates, onBlur = _a.onBlur, _f = _a.useServerParse, useServerParse = _f === void 0 ? false : _f, fields = _a.fields, _g = _a.alertPayloadContext, alertPayloadContext = _g === void 0 ? false : _g, fsmContext = _a.fsmContext;
+    var value = _a.value, onChange = _a.onChange, provider = _a.provider, recordType = _a.recordType, options = _a.options, actionCode = _a.actionCode, height = _a.height, size = _a.size, _b = _a.readOnly, readOnly = _b === void 0 ? false : _b, _c = _a.showDiagnostics, showDiagnostics = _c === void 0 ? true : _c, _d = _a.enableHover, enableHover = _d === void 0 ? true : _d, _e = _a.templateTagsUseIntent, templateTagsUseIntent = _e === void 0 ? true : _e, loadingIndicator = _a.loadingIndicator, templates = _a.templates, onBlur = _a.onBlur, _f = _a.useServerParse, useServerParse = _f === void 0 ? false : _f, fields = _a.fields, _g = _a.alertPayloadContext, alertPayloadContext = _g === void 0 ? false : _g, fsmContext = _a.fsmContext, onUnavailable = _a.onUnavailable, onReady = _a.onReady, _h = _a.completeOnClick, completeOnClick = _h === void 0 ? !!templates : _h;
     var dpql = (0, useDpqlSession_1.useDpqlSession)({
         provider: provider,
         recordType: recordType,
@@ -93,9 +97,9 @@ exports.DpqlEditor = (0, react_1.forwardRef)(function (_a, ref) {
     // reuse it without another roundtrip. `null` until the first
     // response arrives (or when the request errored — caller falls
     // back to the client-side regex parser via `dpqlSlateConverter`).
-    var _h = (0, react_1.useState)(null), serverParsedNodes = _h[0], setServerParsedNodes = _h[1];
-    var _j = (0, react_1.useState)(null), serverParsedFor = _j[0], setServerParsedFor = _j[1];
-    var _k = (0, react_1.useState)(false), isParsing = _k[0], setIsParsing = _k[1];
+    var _j = (0, react_1.useState)(null), serverParsedNodes = _j[0], setServerParsedNodes = _j[1];
+    var _k = (0, react_1.useState)(null), serverParsedFor = _k[0], setServerParsedFor = _k[1];
+    var _l = (0, react_1.useState)(false), isParsing = _l[0], setIsParsing = _l[1];
     // Tracks the most recent in-flight request so a slow response
     // can't overwrite a newer one (the user typed faster than the
     // server replied).
@@ -174,14 +178,39 @@ exports.DpqlEditor = (0, react_1.forwardRef)(function (_a, ref) {
         if (!useServerParse)
             return dpqlHelpers_1.dpqlSlateConverter;
         return __assign(__assign({}, dpqlHelpers_1.dpqlSlateConverter), { toSlateNodes: function (text) {
-                if (text === serverParsedFor &&
-                    serverParsedNodes) {
+                if (text === serverParsedFor && serverParsedNodes) {
                     return serverParsedNodes;
                 }
                 return dpqlHelpers_1.dpqlSlateConverter.toSlateNodes(text);
             } });
     }, [useServerParse, serverParsedFor, serverParsedNodes]);
-    var tagRenderer = (0, react_1.useMemo)(function () { return (0, dpqlTags_1.makeDpqlTagRenderer)(dpql.fieldMeta, { templateTagsUseIntent: templateTagsUseIntent, templates: templates }); }, [dpql.fieldMeta, templateTagsUseIntent, templates]);
+    // no language server to talk to: said once, for the host to show what works without one
+    var unavailable = dpql.session.isUnavailable;
+    (0, react_1.useEffect)(function () {
+        if (unavailable)
+            onUnavailable === null || onUnavailable === void 0 ? void 0 : onUnavailable();
+    }, [unavailable]);
+    // the language server can now parse and write the text: said once, as the session says it
+    var ready = dpql.session.isReady && dpql.session.isContextReady;
+    (0, react_1.useEffect)(function () {
+        if (ready)
+            onReady === null || onReady === void 0 ? void 0 : onReady();
+    }, [ready]);
+    /* The field's templates: listed in the one completion list where a value can be written (`dpqlCompletionsWith`)
+       - or, where the editor does not complete on a click, in the list its text is browsed in (`tags`). */
+    var templateTags = (0, useTemplateTags_1.useTemplateTags)(templates, !readOnly && !completeOnClick);
+    var completionsWith = (0, react_1.useMemo)(function () { return (0, dpqlCompletions_1.dpqlCompletionsWith)(templates); }, [templates]);
+    var descriptions = (0, descriptionTooltip_1.useDescriptionTooltips)();
+    // a chip's hover says its type in the server's words for it
+    var typeSentenceForm = (0, typeSentenceForm_1.useTypeSentenceForm)();
+    var tagRenderer = (0, react_1.useMemo)(function () {
+        return (0, dpqlTags_1.makeDpqlTagRenderer)(dpql.fieldMeta, {
+            templateTagsUseIntent: templateTagsUseIntent,
+            templates: templates,
+            descriptions: descriptions,
+            typeSentenceForm: typeSentenceForm,
+        });
+    }, [dpql.fieldMeta, templateTagsUseIntent, templates, descriptions, typeSentenceForm]);
     (0, react_1.useImperativeHandle)(ref, function () { return ({
         format: function () { return __awaiter(void 0, void 0, void 0, function () {
             var formatted;
@@ -201,7 +230,11 @@ exports.DpqlEditor = (0, react_1.forwardRef)(function (_a, ref) {
         parse: dpql.parse,
         serialize: dpql.serialize,
     }); }, [dpql, value, onChange]);
-    return ((0, jsx_runtime_1.jsx)(SmartEditor_1.SmartEditor, { session: dpql.session, value: value, onChange: onChange, tagRenderer: tagRenderer, triggerCharacters: DPQL_TRIGGERS, converter: converter, completionInserter: dpqlInserter_1.dpqlCompletionInserter, height: height, readOnly: readOnly, showDiagnostics: showDiagnostics, enableHover: enableHover, onBlur: onBlur, isLoading: isParsing, loadingIndicator: loadingIndicator }));
+    return ((0, jsx_runtime_1.jsx)(SmartEditor_1.SmartEditor, { session: dpql.session, value: value, onChange: onChange, tagRenderer: tagRenderer, triggerCharacters: DPQL_TRIGGERS, converter: converter, completionInserter: dpqlInserter_1.dpqlCompletionInserter, height: height, size: size, readOnly: readOnly, showDiagnostics: showDiagnostics, enableHover: enableHover, onBlur: onBlur, 
+        // the templates it labels chips with are the ones it lists when clicked or tabbed into (qorus#646)
+        tags: templateTags, completeOnClick: completeOnClick, completionsWith: completionsWith, 
+        // "No record fields here" is the server's to say: with none, there may be a record it would know
+        emptyCompletionMessage: dpql.session.isUnavailable ? undefined : dpqlCompletions_1.dpqlEmptyCompletionMessage, presentDiagnostics: dpqlCompletions_1.presentDpqlDiagnostics, isLoading: isParsing, loadingIndicator: loadingIndicator }));
 });
 exports.DpqlEditor.displayName = 'DpqlEditor';
 //# sourceMappingURL=DpqlEditor.js.map

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

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

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

@@ -0,0 +1,35 @@
+import { IReqoreFormTemplates } from '@qoretechnologies/reqore/dist/components/Textarea';
+import { ILspCompletionItem, ILspDiagnostic } from '../../utils/lspClient.types';
+import { ICompletionContext } from '../smartEditor/types';
+/**
+ * Whether a value can be written at the end of `textBefore`, as far as the text tells: nothing written yet, an
+ * operator, an opening bracket or a comma before it, or a reference being written there. Asked where the server
+ * cannot be: there is none, or the document is empty, which it answers nothing for.
+ */
+export declare const dpqlExpectsValue: (textBefore: string) => boolean;
+/**
+ * What the list offers at the caret: the server's answer, and the field's templates where a value can be written
+ * there - where the server offers values (anything but keywords and operators), or, where it offers nothing or
+ * cannot be asked, where the text says one can go (`dpqlExpectsValue`). A pick is then always a value where one
+ * can stand: after `12` the server offers operators, and no template is offered (`12 pos` is refused).
+ *
+ * After an `@`, only the templates that are the record's fields. A field the server offers that a template names
+ * already is listed once, as the template, with its group and type in its detail line. A template's context alone
+ * (`$data:`) is not offered (`BARE_CONTEXT`).
+ */
+export declare const dpqlCompletionsWith: (templates?: IReqoreFormTemplates) => ({ plainText, offset, serverItems }: ICompletionContext) => ILspCompletionItem[];
+/**
+ * What the list says where it offers nothing at the caret (qorus#646): after an `@`, that there is no record; after
+ * a `$`, that there are no templates here.
+ */
+export declare const dpqlEmptyCompletionMessage: (plainText: string, offset: number) => string | undefined;
+/** What is said of the placeholders an unfinished expression is written with, for each part not chosen yet. */
+export declare const UNFINISHED_PARTS_MESSAGE = "Fill in each \u2026 (the parts not chosen yet).";
+/**
+ * The server's diagnostics as a DPQL editor says them. The Text view writes an unfinished expression with a
+ * placeholder for each part not chosen yet (`… > …`), and the server refuses each: "Unexpected character '…'",
+ * twice, of text the author did not write (qorus#646, David's decision). Those are said once, as what to do; what
+ * the server says of anything else is said as it says it.
+ */
+export declare const presentDpqlDiagnostics: (diagnostics: ILspDiagnostic[], plainText: string) => ILspDiagnostic[];
+//# sourceMappingURL=dpqlCompletions.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"dpqlCompletions.d.ts","sourceRoot":"","sources":["../../../src/components/dpqlEditor/dpqlCompletions.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAGjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAoB1D;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,eAAgB,MAAM,KAAG,OAMrD,CAAC;AAQF;;;;;;;;;GASG;AACH,eAAO,MAAM,mBAAmB,eACjB,oBAAoB,0CACI,kBAAkB,KAAG,kBAAkB,EAsB3E,CAAC;AAEJ;;;GAGG;AACH,eAAO,MAAM,0BAA0B,cAC1B,MAAM,UACT,MAAM,KACb,MAAM,GAAG,SAOX,CAAC;AAEF,+GAA+G;AAC/G,eAAO,MAAM,wBAAwB,oDAAgE,CAAC;AAEtG;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,gBACpB,cAAc,EAAE,aAClB,MAAM,KAChB,cAAc,EAkBhB,CAAC"}

package/dist/components/dpqlEditor/dpqlCompletions.js

@@ -0,0 +1,122 @@
+"use strict";
+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.presentDpqlDiagnostics = exports.UNFINISHED_PARTS_MESSAGE = exports.dpqlEmptyCompletionMessage = exports.dpqlCompletionsWith = exports.dpqlExpectsValue = void 0;
+var renderExpressionToText_1 = require("../form/expressions/renderExpressionToText");
+var templateCompletions_1 = require("../smartEditor/templateCompletions");
+var dpqlHelpers_1 = require("./dpqlHelpers");
+/** LSP completion kinds that write no value: a keyword and an operator (what the server offers after a value). */
+var NO_VALUE_KINDS = new Set([14, 24]);
+/** A record's field as a template: `$record:{name}`. */
+var RECORD_FIELD = /^\$record:\{(.+)\}$/;
+/** An `@` and the field name typed after it, at the end of a text. */
+var FIELD_BEING_ASKED = /@[\p{L}\p{M}\p{N}_.]*$/u;
+/**
+ * A template's context alone (`$data:`, `$qore-expr:`): the server offers each where a value can go, "requires
+ * argument", and picked it is no value - nothing more is offered after it, and the server refuses it ("Incomplete
+ * template reference: expected value after ':'", professor's `/lsp`). Not offered: a pick makes a value, and an
+ * author works with the field's templates and fields, not with how they are written (qorus#646, David's review).
+ */
+var BARE_CONTEXT = /^\$[\w-]+:$/;
+/** What a value cannot follow - so it can be written next: an operator, an opening bracket, a comma. */
+var BEFORE_A_VALUE = /[-+*/%<>=!&|,([?:]$/;
+/**
+ * Whether a value can be written at the end of `textBefore`, as far as the text tells: nothing written yet, an
+ * operator, an opening bracket or a comma before it, or a reference being written there. Asked where the server
+ * cannot be: there is none, or the document is empty, which it answers nothing for.
+ */
+var dpqlExpectsValue = function (textBefore) {
+    if ((0, dpqlHelpers_1.dpqlReferenceBeingWritten)(textBefore) > 0) {
+        return true;
+    }
+    var written = textBefore.trimEnd();
+    return !written || BEFORE_A_VALUE.test(written);
+};
+exports.dpqlExpectsValue = dpqlExpectsValue;
+/** Whether an `@` asks for a field at the end of `textBefore`: typed as written, not in a string. */
+var asksForAField = function (textBefore) {
+    var match = FIELD_BEING_ASKED.exec(textBefore);
+    return !!match && !(0, dpqlHelpers_1.stringOpenAt)(textBefore.slice(0, match.index));
+};
+/**
+ * What the list offers at the caret: the server's answer, and the field's templates where a value can be written
+ * there - where the server offers values (anything but keywords and operators), or, where it offers nothing or
+ * cannot be asked, where the text says one can go (`dpqlExpectsValue`). A pick is then always a value where one
+ * can stand: after `12` the server offers operators, and no template is offered (`12 pos` is refused).
+ *
+ * After an `@`, only the templates that are the record's fields. A field the server offers that a template names
+ * already is listed once, as the template, with its group and type in its detail line. A template's context alone
+ * (`$data:`) is not offered (`BARE_CONTEXT`).
+ */
+var dpqlCompletionsWith = function (templates) {
+    return function (_a) {
+        var plainText = _a.plainText, offset = _a.offset, serverItems = _a.serverItems;
+        var server = (serverItems !== null && serverItems !== void 0 ? serverItems : []).filter(function (item) { var _a; return !BARE_CONTEXT.test((_a = item.insertText) !== null && _a !== void 0 ? _a : item.label); });
+        var before = plainText.slice(0, offset);
+        var valueHere = (serverItems === null || serverItems === void 0 ? void 0 : serverItems.length) ?
+            serverItems.some(function (item) { var _a; return !NO_VALUE_KINDS.has((_a = item.kind) !== null && _a !== void 0 ? _a : 0); })
+            : (0, exports.dpqlExpectsValue)(before);
+        var offered = valueHere ? (0, templateCompletions_1.templateCompletionItems)(templates) : [];
+        var ours = asksForAField(before) ?
+            offered.filter(function (item) { var _a; return RECORD_FIELD.test((_a = item.insertText) !== null && _a !== void 0 ? _a : ''); })
+            : offered;
+        if (!ours.length) {
+            return server;
+        }
+        var named = new Set(ours.map(function (item) { var _a, _b; return (_b = RECORD_FIELD.exec((_a = item.insertText) !== null && _a !== void 0 ? _a : '')) === null || _b === void 0 ? void 0 : _b[1]; }));
+        return __spreadArray(__spreadArray([], ours, true), server.filter(function (item) { return !(item.kind === 5 && named.has(item.label.replace(/^@/, ''))); }), true);
+    };
+};
+exports.dpqlCompletionsWith = dpqlCompletionsWith;
+/**
+ * What the list says where it offers nothing at the caret (qorus#646): after an `@`, that there is no record; after
+ * a `$`, that there are no templates here.
+ */
+var dpqlEmptyCompletionMessage = function (plainText, offset) {
+    var before = plainText.slice(0, offset);
+    if (asksForAField(before)) {
+        return 'No record fields here';
+    }
+    var written = (0, dpqlHelpers_1.dpqlReferenceBeingWritten)(before);
+    return written && before[before.length - written] === '$' ? 'No templates here' : undefined;
+};
+exports.dpqlEmptyCompletionMessage = dpqlEmptyCompletionMessage;
+/** What is said of the placeholders an unfinished expression is written with, for each part not chosen yet. */
+exports.UNFINISHED_PARTS_MESSAGE = "Fill in each ".concat(renderExpressionToText_1.EXPRESSION_HOLE, " (the parts not chosen yet).");
+/**
+ * The server's diagnostics as a DPQL editor says them. The Text view writes an unfinished expression with a
+ * placeholder for each part not chosen yet (`… > …`), and the server refuses each: "Unexpected character '…'",
+ * twice, of text the author did not write (qorus#646, David's decision). Those are said once, as what to do; what
+ * the server says of anything else is said as it says it.
+ */
+var presentDpqlDiagnostics = function (diagnostics, plainText) {
+    var lines = plainText.split('\n');
+    var atPlaceholder = function (_a) {
+        var _b;
+        var _c = _a.range, start = _c.start, end = _c.end;
+        return start.line === end.line &&
+            ((_b = lines[start.line]) === null || _b === void 0 ? void 0 : _b.slice(start.character, end.character)) === renderExpressionToText_1.EXPRESSION_HOLE;
+    };
+    var placeholders = diagnostics.filter(atPlaceholder);
+    if (!placeholders.length) {
+        return diagnostics;
+    }
+    return __spreadArray([
+        {
+            range: placeholders[0].range,
+            severity: 2,
+            source: placeholders[0].source,
+            message: exports.UNFINISHED_PARTS_MESSAGE,
+        }
+    ], diagnostics.filter(function (diagnostic) { return !atPlaceholder(diagnostic); }), true);
+};
+exports.presentDpqlDiagnostics = presentDpqlDiagnostics;
+//# sourceMappingURL=dpqlCompletions.js.map

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

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

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

@@ -1,15 +1,26 @@
-import { ISlateConverter, ISlateElement } from '../smartEditor/types';
+import { ISlateConverter, ISlateElement, TSlateNode } from '../smartEditor/types';
 /**
- * Convert plain DPQL text to Slate elements. Parses `$prefix:{value}` and
- * `@field` patterns into tag elements; everything else becomes text nodes.
+ * Convert plain DPQL text to Slate elements: each reference (`$prefix:value`, `$prefix:{value}`, `@field`,
+ * `@"field"`) is a tag element whose value is its text exactly, and everything else is text.
  */
 export declare function plainTextToSlate(text: string): ISlateElement[];
 /**
  * `text` as a DPQL editor draws it: a reference is its chip, so the quotes a
  * chip is drawn over do not show. `"$local:name" == "John"` and
- * `$local:name == "John"` read the same.
+ * `$local:name == "John"` read the same. A record field is drawn as the chip of
+ * the template it stands for (`makeDpqlTagRenderer`), so it reads as that
+ * template: `@pos + 1` and `$record:{pos} + 1` read the same (qorus#646).
  */
 export declare function dpqlDisplayedText(text: string): string;
+/**
+ * `children` with a text node on each side of every chip, as Slate requires of
+ * an inline void: adjacent text nodes are left as they are, and an empty
+ * paragraph gets one empty text node. The server's `dpql/toRichtext` writes a
+ * chip that starts or ends a line without the empty text beside it, and a
+ * document loaded that way is never normalised, so the caret a click puts
+ * after such a chip lands back inside it, where typing does nothing.
+ */
+export declare function withTextAroundTags(children: TSlateNode[]): TSlateNode[];
 /** Convert Slate elements back to plain DPQL text. */
 export declare function slateToPlainText(elements: ISlateElement[]): string;
 /**
@@ -21,8 +32,39 @@ export declare function slateToPlainText(elements: ISlateElement[]): string;
 export declare function slateSelectionToOffset(elements: ISlateElement[], anchorPath: number[], anchorOffset: number): number;
 /** Should a completion be inserted as a Slate tag element vs plain text? */
 export declare function isTagCompletion(insertText: string): boolean;
-/** Display label for a completion being inserted as a tag. */
+/**
+ * The name of the field a field reference stands for - `@name` is `name`, and the quoted `@"order-id"` is
+ * `order-id`, unescaped as the server reads it - or undefined when `value` is not a field reference.
+ */
+export declare const dpqlFieldName: (value: string) => string | undefined;
+/**
+ * What a reference's chip says: a field's name (`dpqlFieldName`), or a template's prefix and value
+ * (`$local:{a.b}` is `local: a.b`).
+ */
 export declare function getTagLabel(value: string): string;
+/**
+ * Whether a character ends the DPQL reference it follows: anything that cannot go on to make a field name or a
+ * template path longer - not a letter, a mark, a digit or `_`, nor a `.` (a sub-field), a `[` or a `{` (an accessor:
+ * `[*]`, `[0]`, `{*}`, `{"key"}`) or a `:` (a template's path).
+ */
+export declare const endsDpqlReference: (char: string) => boolean;
+/** The quote of the string literal open at the end of `text`, which may have opened on a line before; or none. */
+export declare const stringOpenAt: (text: string) => string | undefined;
+/**
+ * How much of the end of `textBefore` (the DPQL text before the caret) is a reference still being written - a `$`
+ * or an `@` with no more than part of a name after it: the `$` typed to ask for a template, `$rec`, `$record:{po`.
+ * A template picked there takes its place, as one picked from the completion list does: left in front of the chip,
+ * it made `pos + 1 + $pos`, which the server refuses (qorus#646, David's review). 0 when there is none: after a
+ * whole reference (`$record:{pos}`, `@pos`), which is a value already, and after an `@` in a string, which is text
+ * there - a template in a string is still one (`readReferences`).
+ */
+export declare const dpqlReferenceBeingWritten: (textBefore: string) => number;
+/**
+ * Where the server says something of a part of a reference's chip (its text, as written): the field at its start,
+ * and after it the `*` of each wildcard, each name after a dot and each key in braces - not an index, which the
+ * server calls a number. A template is one part.
+ */
+export declare const dpqlHoverOffsets: (value: string) => number[];
 /** DPQL converter — handed to `SmartEditor` via the `converter` prop. */
 export declare const dpqlSlateConverter: ISlateConverter;
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"dpqlHelpers.d.ts","sourceRoot":"","sources":["../../../src/components/dpqlEditor/dpqlHelpers.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,EAAE,aAAa,EAA0B,MAAM,sBAAsB,CAAC;AAsB9F;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,EAAE,CA6D9D;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQtD;AAgBD,sDAAsD;AACtD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,MAAM,CAElE;AAgBD;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,aAAa,EAAE,EACzB,UAAU,EAAE,MAAM,EAAE,EACpB,YAAY,EAAE,MAAM,GACnB,MAAM,CAyCR;AAED,4EAA4E;AAC5E,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAE3D;AAED,8DAA8D;AAC9D,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAgBjD;AAED,yEAAyE;AACzE,eAAO,MAAM,kBAAkB,EAAE,eAIhC,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,OAAO,GAChB,aAAa,EAAE,GAAG,IAAI,CAuCxB"}
+{"version":3,"file":"dpqlHelpers.d.ts","sourceRoot":"","sources":["../../../src/components/dpqlEditor/dpqlHelpers.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAc,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAmN9F;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,EAAE,CAsB9D;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAYtD;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAYvE;AAgBD,sDAAsD;AACtD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,MAAM,CAElE;AAgBD;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,aAAa,EAAE,EACzB,UAAU,EAAE,MAAM,EAAE,EACpB,YAAY,EAAE,MAAM,GACnB,MAAM,CAyCR;AAED,4EAA4E;AAC5E,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAE3D;AA0BD;;;GAGG;AACH,eAAO,MAAM,aAAa,UAAW,MAAM,KAAG,MAAM,GAAG,SAStD,CAAC;AAEF;;;GAGG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAiBjD;AAED;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,SAAU,MAAM,KAAG,OACE,CAAC;AAEpD,kHAAkH;AAClH,eAAO,MAAM,YAAY,SAAU,MAAM,KAAG,MAAM,GAAG,SAMpD,CAAC;AAKF;;;;;;;GAOG;AACH,eAAO,MAAM,yBAAyB,eAAgB,MAAM,KAAG,MAkB9D,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,UAAW,MAAM,KAAG,MAAM,EA4BtD,CAAC;AAEF,yEAAyE;AACzE,eAAO,MAAM,kBAAkB,EAAE,eAOhC,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,OAAO,GAChB,aAAa,EAAE,GAAG,IAAI,CAsCxB"}