@coldsmirk/inkstone-elasticsearch 0.26.1 → 0.27.1

package/README.md

@@ -1,6 +1,6 @@
 # @coldsmirk/inkstone-elasticsearch
 
-Elasticsearch request editing intelligence for Monaco: requests in Kibana's console spelling (`GET /orders/_search` on the first line, the body after), endpoint and index completion on the path, body keys by where the caret stands (the query DSL's clauses under `query`, a `bool`'s clauses, the aggregation types, a mapping's field options …), the request read as the engine reads it, markers, and a drop-in React `<ElasticsearchEditor>`.
+Elasticsearch request editing intelligence for Monaco and CodeMirror: requests in Kibana's console spelling (`GET /orders/_search` on the first line, the body after), endpoint and index completion on the path, body keys by where the caret stands (the query DSL's clauses under `query`, a `bool`'s clauses, the aggregation types, a mapping's field options …), the request read as the engine reads it, markers, and a drop-in React `<ElasticsearchEditor>`.
 
 Part of [inkstone](https://github.com/coldsmirk/inkstone). Built for the [**polyglot**](https://github.com/coldsmirk/polyglot) sidecar's Elasticsearch engine, which takes one request in this very spelling.
 
@@ -8,6 +8,7 @@ Part of [inkstone](https://github.com/coldsmirk/inkstone). Built for the [**poly
 
 - **`@coldsmirk/inkstone-elasticsearch`** — the framework-free core: the request reader, the endpoint table, the body vocabulary, the assist, the markers. Zero editor dependencies.
 - **`@coldsmirk/inkstone-elasticsearch/monaco`** — `defineElasticsearchLanguage(monaco)` (the `elasticsearch` id with its Monarch grammar, once per monaco module), `registerElasticsearchLanguage(monaco, modelPath, hooks)` (completion and hover for one model), `setElasticsearchMarkers`. Peer: `monaco-editor`.
+- **`@coldsmirk/inkstone-elasticsearch/codemirror`** — the same assist bound to CodeMirror 6: `elasticsearchCompletion(assist)` and `elasticsearchBodyCompletion(assist)` (completion sources), `elasticsearchHover(assist, wording)`, `elasticsearchDiagnostics(markers, wording)`. No grammar of its own — a body is JSON, so pair it with `@codemirror/lang-json`; it does not close brackets or quotes either, so add `closeBrackets()` where a key's own quotes matter. Peers: `@codemirror/autocomplete`, `@codemirror/view`.
 - **`@coldsmirk/inkstone-elasticsearch/react`** — `<ElasticsearchEditor>`: a controlled request editor built on `@coldsmirk/inkstone-react`'s `<MonacoEditor>`, with a run key (Ctrl/Cmd-Enter handing over the live caret), caret tracking, an insert handle for index trees, and the markers refreshed on every change. Peers: `monaco-editor`, `react`.
 
 ## The shape

package/dist/codemirror.d.ts

@@ -1,4 +1,4 @@
-import { a as ElasticsearchAssist, o as ElasticsearchBodyAssist, t as ElasticsearchMarker } from "./markers-DnaVJoMY.js";
+import { a as ElasticsearchAssist, o as ElasticsearchBodyAssist, t as ElasticsearchMarker } from "./markers-CCVlVnBt.js";
 import { CompletionSource } from "@codemirror/autocomplete";
 import { Diagnostic } from "@codemirror/lint";
 import { Extension } from "@codemirror/state";

package/dist/codemirror.js

@@ -1,4 +1,3 @@
-import { snippet } from "@codemirror/autocomplete";
 import { hoverTooltip } from "@codemirror/view";
 //#region src/codemirror.ts
 const TYPES = {
@@ -15,7 +14,7 @@ function completion(candidate, at) {
 		detail: candidate.detail,
 		info: candidate.documentation,
 		boost: -candidate.sortGroup * 10 - at / 1e3,
-		apply: candidate.snippet === true ? snippet(candidate.insertText) : candidate.insertText
+		apply: candidate.insertText
 	};
 }
 function resultOf(candidates, pos) {
@@ -51,7 +50,7 @@ function elasticsearchDiagnostics(markers, wording) {
 		return {
 			from: marker.from,
 			to: marker.to,
-			severity: marker.severity === "error" ? "error" : marker.severity === "warning" ? "warning" : "info",
+			severity: marker.severity,
 			message: wording(marker)
 		};
 	});

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { A as runnableRequest, C as RequestRefusal, D as readRequest, E as keyPosition, O as requestAt, S as RequestRead, T as caretContext, _ as endpointOf, a as ElasticsearchAssist, b as REQUEST_METHODS, c as ElasticsearchCompletionCandidate, d as createElasticsearchBodyAssist, f as API_ENDPOINTS, g as bodyKindOf, h as bodyKeys, i as CatalogIndex, j as takesLines, k as requestSpans, l as ElasticsearchHoverCard, m as BodyKind, n as ElasticsearchMarkerCode, o as ElasticsearchBodyAssist, p as ApiEndpoint, r as requestMarkers, s as ElasticsearchCatalog, t as ElasticsearchMarker, u as createElasticsearchAssist, v as CaretContext, w as RunnableRequest, x as RequestMethod, y as KeyPosition } from "./markers-DnaVJoMY.js";
+import { A as runnableRequest, C as RequestRefusal, D as readRequest, E as keyPosition, O as requestAt, S as RequestRead, T as caretContext, _ as endpointOf, a as ElasticsearchAssist, b as REQUEST_METHODS, c as ElasticsearchCompletionCandidate, d as createElasticsearchBodyAssist, f as API_ENDPOINTS, g as bodyKindOf, h as bodyKeys, i as CatalogIndex, j as takesLines, k as requestSpans, l as ElasticsearchHoverCard, m as BodyKind, n as ElasticsearchMarkerCode, o as ElasticsearchBodyAssist, p as ApiEndpoint, r as requestMarkers, s as ElasticsearchCatalog, t as ElasticsearchMarker, u as createElasticsearchAssist, v as CaretContext, w as RunnableRequest, x as RequestMethod, y as KeyPosition } from "./markers-CCVlVnBt.js";
 export { API_ENDPOINTS, type ApiEndpoint, type BodyKind, type CaretContext, type CatalogIndex, type ElasticsearchAssist, type ElasticsearchBodyAssist, type ElasticsearchCatalog, type ElasticsearchCompletionCandidate, type ElasticsearchHoverCard, type ElasticsearchMarker, type ElasticsearchMarkerCode, type KeyPosition, REQUEST_METHODS, type RequestMethod, type RequestRead, type RequestRefusal, type RunnableRequest, bodyKeys, bodyKindOf, caretContext, createElasticsearchAssist, createElasticsearchBodyAssist, endpointOf, keyPosition, readRequest, requestAt, requestMarkers, requestSpans, runnableRequest, takesLines };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { a as readRequest, c as runnableRequest, d as bodyKeys, f as bodyKindOf, i as keyPosition, l as takesLines, n as REQUEST_METHODS, o as requestAt, p as endpointOf, r as caretContext, s as requestSpans, t as requestMarkers, u as API_ENDPOINTS } from "./markers-DwYWlWEq.js";
+import { a as readRequest, c as runnableRequest, d as bodyKeys, f as bodyKindOf, i as keyPosition, l as takesLines, n as REQUEST_METHODS, o as requestAt, p as endpointOf, r as caretContext, s as requestSpans, t as requestMarkers, u as API_ENDPOINTS } from "./markers-DDAAW21w.js";
 //#region src/assist.ts
 const NO_CATALOG = { indices: () => [] };
 function createElasticsearchBodyAssist(kind) {
@@ -15,14 +15,13 @@ function keyCandidates(kind, at) {
 		label: key,
 		kind: "key",
 		insertText: key,
-		replace: at.typed.length,
+		replace: at.reach,
 		sortGroup: 0
 	} : {
 		label: key,
 		kind: "key",
-		insertText: `"${key}": $0`,
-		snippet: true,
-		replace: 0,
+		insertText: `"${key}": `,
+		replace: at.reach,
 		sortGroup: 0
 	});
 }

package/dist/{markers-DnaVJoMY.d.ts → markers-CCVlVnBt.d.ts}

@@ -119,6 +119,10 @@ type CaretContext = {
    * The key's characters typed before the caret, inside an opened quote where one stands.
    */
   typed: string;
+  /**
+   * How many characters before the caret a completion replaces (`KeyPosition.reach`).
+   */
+  reach: number;
   /**
    * Whether the caret is inside an opened quote.
    */
@@ -146,6 +150,16 @@ interface KeyPosition {
    * whether a completion inserts the name alone or the whole `"key": ` around it.
    */
   quoted: boolean;
+  /**
+   * How many characters before the caret a completion replaces: what the reader has already
+   * put where the key goes, quotes included where they typed them.
+   *
+   * Stated rather than derived from `typed`, because the two part company exactly where it
+   * matters. A key the reader has closed — `{"query"`, the caret after the quote, no colon
+   * yet — has five characters typed and seven to reach back over, and reaching over none
+   * wrote the completion *after* the key: `{"query""aggs": `.
+   */
+  reach: number;
 }
 /**
  * Whether the end of `body` — the text before the caret — is a key position in an object, and
@@ -210,11 +224,11 @@ interface ElasticsearchCatalog {
 interface ElasticsearchCompletionCandidate {
   label: string;
   kind: "method" | "endpoint" | "index" | "alias" | "key";
-  insertText: string;
   /**
-   * `insertText` is a snippet (`$0` marks the caret) rather than plain text.
+   * What the editor writes in place of what `replace` reaches back over. Plain text: the
+   * caret lands at its end, which is where a key's value goes.
    */
-  snippet?: boolean;
+  insertText: string;
   /**
    * How many characters before the caret the insert replaces — the segment or the key typed
    * so far, which the editor's own word rules do not see whole (a path segment holds `_` and

package/dist/{markers-DwYWlWEq.js → markers-DDAAW21w.js}

@@ -618,7 +618,6 @@ const FIELD_KEYS = [
 	"similarity",
 	"term_vector",
 	"norms",
-	"index_options",
 	"eager_global_ordinals",
 	"meta",
 	"dims",
@@ -1088,7 +1087,8 @@ function caretContext(text, offset) {
 		path: [],
 		request,
 		typed: "",
-		quoted: false
+		quoted: false,
+		reach: 0
 	} : { kind: "none" };
 	const bodyFrom = span.from + request.bodySpan.from;
 	const position = keyPosition(text.slice(bodyFrom, offset));
@@ -1146,7 +1146,8 @@ function keyPosition(body) {
 			if (end === -1) return atKey(frames) ? {
 				path: pathOf(frames),
 				typed: body.slice(i + 1),
-				quoted: true
+				quoted: true,
+				reach: body.length - (i + 1)
 			} : null;
 			pending = body.slice(i + 1, end);
 			i = end + 1;
@@ -1155,11 +1156,14 @@ function keyPosition(body) {
 		structure(frames, c, pending);
 		i++;
 	}
-	return atKey(frames) ? {
+	if (!atKey(frames)) return null;
+	const written = /"(?<quoted>(?:[^"\\]|\\.)*)"$|(?<bare>[\w.*@$-]+)$/u.exec(body);
+	return {
 		path: pathOf(frames),
-		typed: "",
-		quoted: false
-	} : null;
+		typed: written?.groups?.quoted ?? written?.groups?.bare ?? "",
+		quoted: false,
+		reach: written?.[0].length ?? 0
+	};
 }
 function closingQuote(body, from) {
 	let i = from;

package/dist/monaco.d.ts

@@ -1,4 +1,4 @@
-import { a as ElasticsearchAssist, t as ElasticsearchMarker } from "./markers-DnaVJoMY.js";
+import { a as ElasticsearchAssist, t as ElasticsearchMarker } from "./markers-CCVlVnBt.js";
 import * as monacoEditor from "monaco-editor";
 import { IDisposable, editor } from "monaco-editor";
 //#region src/monaco.d.ts

package/dist/monaco.js

@@ -102,7 +102,6 @@ function registerElasticsearchLanguage(monaco, modelPath, hooks, languageId = EL
 					label: candidate.label,
 					kind: kinds[candidate.kind],
 					insertText: candidate.insertText,
-					insertTextRules: candidate.snippet ? monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet : void 0,
 					detail: candidate.detail,
 					documentation: candidate.documentation,
 					range: new monaco.Range(position.lineNumber, Math.max(1, position.column - candidate.replace), position.lineNumber, position.column),

package/dist/react.d.ts

@@ -1,4 +1,4 @@
-import { a as ElasticsearchAssist, t as ElasticsearchMarker } from "./markers-DnaVJoMY.js";
+import { a as ElasticsearchAssist, t as ElasticsearchMarker } from "./markers-CCVlVnBt.js";
 import { MonacoModule } from "./monaco.js";
 import { ReactNode } from "react";
 import { editor } from "monaco-editor";

package/dist/react.js

@@ -1,4 +1,4 @@
-import { t as requestMarkers } from "./markers-DwYWlWEq.js";
+import { t as requestMarkers } from "./markers-DDAAW21w.js";
 import { ELASTICSEARCH_LANGUAGE_ID, defineElasticsearchLanguage, registerElasticsearchLanguage, setElasticsearchMarkers } from "./monaco.js";
 import { MonacoEditor } from "@coldsmirk/inkstone-react/monaco";
 import { useEffect, useInsertionEffect, useRef, useState } from "react";

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@coldsmirk/inkstone-elasticsearch",
-  "version": "0.26.1",
-  "description": "Elasticsearch request editing intelligence for Monaco: the console spelling (a method and a path, the body after), endpoint and index completion, body keys by context, request markers, and a drop-in React request editor.",
+  "version": "0.27.1",
+  "description": "Elasticsearch request editing intelligence for Monaco and CodeMirror: the console spelling (a method and a path, the body after), endpoint and index completion, body keys by context — a bare `_search` body included — request markers, and a drop-in React request editor.",
   "keywords": [
     "elasticsearch",
     "monaco",
+    "codemirror",
     "completion",
     "editor",
     "autocomplete",
@@ -54,7 +55,7 @@
     "monaco-editor": "^0.56.0",
     "react": "^19.2.8",
     "react-dom": "^19.2.8",
-    "@coldsmirk/inkstone-react": "^0.26.1"
+    "@coldsmirk/inkstone-react": "^0.27.1"
   },
   "peerDependencies": {
     "@codemirror/autocomplete": "^6.20.3",
@@ -63,7 +64,7 @@
     "@codemirror/view": "^6.43.0",
     "monaco-editor": "^0.56.0",
     "react": ">=19",
-    "@coldsmirk/inkstone-react": "^0.26.1"
+    "@coldsmirk/inkstone-react": "^0.27.1"
   },
   "peerDependenciesMeta": {
     "@codemirror/autocomplete": {