@coldsmirk/inkstone-mongodb 0.26.0 → 0.27.0

package/README.md

@@ -1,6 +1,6 @@
 # @coldsmirk/inkstone-mongodb
 
-MongoDB command editing intelligence for Monaco: a command document in the shell's own spelling (`{ find: "orders", filter: { status: "open" }, limit: 20 }` — keys bare or quoted, `ObjectId("…")`, `ISODate("…")`, `/regex/i`), the database commands and their fields, the query, update and aggregation operators by where the caret stands, collection and database completion, the document read as the engine reads it, markers, and a drop-in React `<MongodbEditor>`.
+MongoDB command editing intelligence for Monaco and CodeMirror: a command document in the shell's own spelling (`{ find: "orders", filter: { status: "open" }, limit: 20 }` — keys bare or quoted, `ObjectId("…")`, `ISODate("…")`, `/regex/i`), the database commands and their fields, the query, update and aggregation operators by where the caret stands, collection and database completion, the document read as the engine reads it, markers, and a drop-in React `<MongodbEditor>`.
 
 Part of [inkstone](https://github.com/coldsmirk/inkstone). Built for the [**polyglot**](https://github.com/coldsmirk/polyglot) sidecar's MongoDB engine, which takes one command document — the command as its first key, `$db` naming the database — and parses it with the driver's own `BsonDocument.parse`.
 
@@ -8,6 +8,7 @@ Part of [inkstone](https://github.com/coldsmirk/inkstone). Built for the [**poly
 
 - **`@coldsmirk/inkstone-mongodb`** — the framework-free core: the document reader, the command table, the operator vocabularies, the assist, the markers. Zero editor dependencies.
 - **`@coldsmirk/inkstone-mongodb/monaco`** — `defineMongodbLanguage(monaco)` (the `mongodb` id with its Monarch grammar, once per monaco module), `registerMongodbLanguage(monaco, modelPath, hooks)` (completion and hover for one model), `setMongodbMarkers`. Peer: `monaco-editor`.
+- **`@coldsmirk/inkstone-mongodb/codemirror`** — the same assist bound to CodeMirror 6: `mongodbCompletion(assist)` and `mongodbFilterCompletion(assist)` (completion sources), `mongodbHover(assist, wording)`, `mongodbDiagnostics(markers, wording)`. No grammar of its own — a filter document 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-mongodb/react`** — `<MongodbEditor>`: a controlled command 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 collection trees, and the markers refreshed on every change. Peers: `monaco-editor`, `react`.
 
 ## The shape

package/dist/codemirror.d.ts

@@ -1,4 +1,4 @@
-import { _ as MongodbFilterAssist, m as MongodbAssist, t as MongodbMarker } from "./markers-DjjkoOJP.js";
+import { _ as MongodbFilterAssist, m as MongodbAssist, t as MongodbMarker } from "./markers-Co8ntyUI.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 = {
@@ -16,7 +15,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) {
@@ -52,7 +51,7 @@ function mongodbDiagnostics(markers, wording) {
 		return {
 			from: marker.from,
 			to: marker.to,
-			severity: marker.severity === "error" ? "error" : "info",
+			severity: marker.severity,
 			message: wording(marker)
 		};
 	});

package/dist/{document-CVB9YunA.js → document-CvsIw1Q8.js}

@@ -299,13 +299,14 @@ function atKey(frame) {
 function valueKey(frame) {
 	return frame !== void 0 && !frame.transparent && !frame.valueStarted ? frame.key : null;
 }
-function keyContext(frames, top, typed, quoted) {
+function keyContext(frames, top, typed, quoted, reach = typed.length) {
 	return {
 		kind: "key",
 		path: pathOf(frames),
 		siblings: top.seen,
 		typed,
-		quoted
+		quoted,
+		reach
 	};
 }
 function valueContext(frames, key, typed, quoted) {
@@ -400,7 +401,10 @@ function caretContext(text, offset) {
 		i++;
 	}
 	const top = frames.at(-1);
-	if (top !== void 0 && atKey(top)) return keyContext(frames, top, "", false);
+	if (top !== void 0 && atKey(top)) {
+		const closed = /"(?<double>(?:[^"\\]|\\.)*)"$|'(?<single>(?:[^'\\]|\\.)*)'$/u.exec(body);
+		return keyContext(frames, top, closed?.groups?.double ?? closed?.groups?.single ?? "", false, closed?.[0].length ?? 0);
+	}
 	const key = valueKey(top);
 	return key === null ? { kind: "none" } : valueContext(frames, key, "", false);
 }

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { A as keysAt, C as MONGO_COMMANDS, D as QUERY_OPERATORS, E as QUERY_HOLDERS, O as STAGES, S as FIELD_OPERATORS, T as PUSH_MODIFIERS, _ as MongodbFilterAssist, a as CaretContext, b as createMongodbFilterAssist, c as LITERALS, d as readDocument, f as runnableDocument, g as MongodbCompletionCandidate, h as MongodbCatalog, i as CONSTRUCTORS, k as UPDATE_OPERATORS, l as RunnableDocument, m as MongodbAssist, n as MongodbMarkerCode, o as DocumentRead, p as CatalogCollection, r as documentMarkers, s as DocumentRefusal, t as MongodbMarker, u as caretContext, v as MongodbHoverCard, w as MongoCommand, x as EXPRESSION_OPERATORS, y as createMongodbAssist } from "./markers-DjjkoOJP.js";
+import { A as keysAt, C as MONGO_COMMANDS, D as QUERY_OPERATORS, E as QUERY_HOLDERS, O as STAGES, S as FIELD_OPERATORS, T as PUSH_MODIFIERS, _ as MongodbFilterAssist, a as CaretContext, b as createMongodbFilterAssist, c as LITERALS, d as readDocument, f as runnableDocument, g as MongodbCompletionCandidate, h as MongodbCatalog, i as CONSTRUCTORS, k as UPDATE_OPERATORS, l as RunnableDocument, m as MongodbAssist, n as MongodbMarkerCode, o as DocumentRead, p as CatalogCollection, r as documentMarkers, s as DocumentRefusal, t as MongodbMarker, u as caretContext, v as MongodbHoverCard, w as MongoCommand, x as EXPRESSION_OPERATORS, y as createMongodbAssist } from "./markers-Co8ntyUI.js";
 export { CONSTRUCTORS, type CaretContext, type CatalogCollection, type DocumentRead, type DocumentRefusal, EXPRESSION_OPERATORS, FIELD_OPERATORS, LITERALS, MONGO_COMMANDS, type MongoCommand, type MongodbAssist, type MongodbCatalog, type MongodbCompletionCandidate, type MongodbFilterAssist, type MongodbHoverCard, type MongodbMarker, type MongodbMarkerCode, PUSH_MODIFIERS, QUERY_HOLDERS, QUERY_OPERATORS, type RunnableDocument, STAGES, UPDATE_OPERATORS, caretContext, createMongodbAssist, createMongodbFilterAssist, documentMarkers, keysAt, readDocument, runnableDocument };

package/dist/index.js

@@ -1,5 +1,5 @@
-import { a as PUSH_MODIFIERS, c as STAGES, i as MONGO_COMMANDS, l as UPDATE_OPERATORS, n as EXPRESSION_OPERATORS, o as QUERY_HOLDERS, r as FIELD_OPERATORS, s as QUERY_OPERATORS, t as documentMarkers, u as keysAt } from "./markers-CbwviTiD.js";
-import { a as runnableDocument, i as readDocument, n as LITERALS, r as caretContext, t as CONSTRUCTORS } from "./document-CVB9YunA.js";
+import { a as PUSH_MODIFIERS, c as STAGES, i as MONGO_COMMANDS, l as UPDATE_OPERATORS, n as EXPRESSION_OPERATORS, o as QUERY_HOLDERS, r as FIELD_OPERATORS, s as QUERY_OPERATORS, t as documentMarkers, u as keysAt } from "./markers-30Z4EFiH.js";
+import { a as runnableDocument, i as readDocument, n as LITERALS, r as caretContext, t as CONSTRUCTORS } from "./document-CvsIw1Q8.js";
 //#region src/assist.ts
 const NO_CATALOG = { collections: () => [] };
 function createMongodbFilterAssist(fields = () => []) {
@@ -13,9 +13,8 @@ function createMongodbFilterAssist(fields = () => []) {
 			return {
 				label: key,
 				kind: key.startsWith("$") ? "operator" : "field",
-				insertText: context.quoted ? key : `"${key}": $0`,
-				...!context.quoted && { snippet: true },
-				replace: context.typed.length,
+				insertText: context.quoted ? key : `"${key}": `,
+				replace: context.reach,
 				sortGroup: key.startsWith("$") ? 1 : 0
 			};
 		});
@@ -50,9 +49,8 @@ function createMongodbAssist(catalog = NO_CATALOG, commands = MONGO_COMMANDS) {
 					return {
 						label: key,
 						kind,
-						insertText: context.quoted ? key : `"${key}": $0`,
-						...!context.quoted && { snippet: true },
-						replace: context.typed.length,
+						insertText: context.quoted ? key : `"${key}": `,
+						replace: context.reach,
 						...named !== void 0 && !commanding && { detail: named },
 						...command !== void 0 && { documentation: documentationOf(command) },
 						sortGroup: kind === "command" || kind === "field" ? 0 : 1

package/dist/{markers-CbwviTiD.js → markers-30Z4EFiH.js}

@@ -1,4 +1,4 @@
-import { i as readDocument } from "./document-CVB9YunA.js";
+import { i as readDocument } from "./document-CvsIw1Q8.js";
 //#region src/commands.ts
 const COMMON = ["comment", "maxTimeMS"];
 const MONGO_COMMANDS = [
@@ -982,12 +982,12 @@ function keysAt(path, siblings, commands = MONGO_COMMANDS) {
 		if (command === void 0) return [...commands.map((candidate) => candidate.name), "$db"];
 		return [...command.fields, "$db"].filter((key) => !siblings.includes(key));
 	}
+	const parent = path.at(-2);
+	if (!last.startsWith("$") && parent !== void 0 && QUERY_HOLDERS.has(parent)) return FIELD_OPERATORS;
 	if (QUERY_HOLDERS.has(last)) return QUERY_OPERATORS;
 	if (UPDATE_HOLDERS.has(last)) return UPDATE_OPERATORS;
 	if (PIPELINE_HOLDERS.has(last)) return STAGES;
 	if (last.startsWith("$")) return STAGE_KEYS[last] ?? FIELD_KEYS[last] ?? [];
-	const parent = path.at(-2);
-	if (parent !== void 0 && QUERY_HOLDERS.has(parent)) return FIELD_OPERATORS;
 	if (parent === "$push" || parent === "$addToSet") return PUSH_MODIFIERS;
 	if (parent === "$group") return EXPRESSION_OPERATORS;
 	return FIELD_KEYS[last] ?? [];

package/dist/{markers-DjjkoOJP.d.ts → markers-Co8ntyUI.d.ts}

@@ -28,9 +28,6 @@ declare const UPDATE_OPERATORS: string[];
 declare const PUSH_MODIFIERS: string[];
 declare const STAGES: string[];
 declare const EXPRESSION_OPERATORS: string[];
-/**
- * The keys whose value is a query: a filter, and every logical operator's branches.
- */
 /**
  * The keys whose value is a query document: what is under one is a field name or a logical
  * operator, and what is under a *field* of one is a comparison operator. Exported because a
@@ -67,11 +64,11 @@ interface MongodbCatalog {
 interface MongodbCompletionCandidate {
   label: string;
   kind: "command" | "field" | "operator" | "stage" | "collection" | "database";
-  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 key or the name typed so
    * far, bare or inside its quote.
@@ -207,6 +204,16 @@ type CaretContext = {
    * Whether the caret is inside an opened quote.
    */
   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 — `{ "status"`, the caret after the quote, no
+   * colon yet — has six characters typed and eight to reach back over, and reaching over
+   * none wrote the completion *after* the key: `{ "status""status": `.
+   */
+  reach: number;
 } | {
   kind: "value";
   path: string[];

package/dist/monaco.d.ts

@@ -1,4 +1,4 @@
-import { m as MongodbAssist, t as MongodbMarker } from "./markers-DjjkoOJP.js";
+import { m as MongodbAssist, t as MongodbMarker } from "./markers-Co8ntyUI.js";
 import * as monacoEditor from "monaco-editor";
 import { IDisposable, editor } from "monaco-editor";
 //#region src/monaco.d.ts

package/dist/monaco.js

@@ -1,4 +1,4 @@
-import { n as LITERALS, t as CONSTRUCTORS } from "./document-CVB9YunA.js";
+import { n as LITERALS, t as CONSTRUCTORS } from "./document-CvsIw1Q8.js";
 //#region src/monaco.ts
 const MONGODB_LANGUAGE_ID = "mongodb";
 const LANGUAGES_KEY = Symbol.for("coldsmirk.inkstone.mongodb.languages");
@@ -127,7 +127,6 @@ function registerMongodbLanguage(monaco, modelPath, hooks, languageId = MONGODB_
 					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 { m as MongodbAssist, t as MongodbMarker } from "./markers-DjjkoOJP.js";
+import { m as MongodbAssist, t as MongodbMarker } from "./markers-Co8ntyUI.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 documentMarkers } from "./markers-CbwviTiD.js";
+import { t as documentMarkers } from "./markers-30Z4EFiH.js";
 import { MONGODB_LANGUAGE_ID, defineMongodbLanguage, registerMongodbLanguage, setMongodbMarkers } 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-mongodb",
-  "version": "0.26.0",
-  "description": "MongoDB command editing intelligence for Monaco: a command document in the shell's own spelling, the database commands and their fields, query, update and aggregation operators by context, collection completion, markers, and a drop-in React command editor.",
+  "version": "0.27.0",
+  "description": "MongoDB command editing intelligence for Monaco and CodeMirror: a command document in the shell's own spelling, the database commands and their fields, query, update and aggregation operators by context — a bare filter document included — collection completion, markers, and a drop-in React command editor.",
   "keywords": [
     "mongodb",
     "monaco",
+    "codemirror",
     "completion",
     "editor",
     "autocomplete",
@@ -28,15 +29,19 @@
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
+    "./codemirror": {
+      "types": "./dist/codemirror.d.ts",
+      "default": "./dist/codemirror.js"
+    },
     "./monaco": {
       "types": "./dist/monaco.d.ts",
       "default": "./dist/monaco.js"
     },
+    "./package.json": "./package.json",
     "./react": {
       "types": "./dist/react.d.ts",
       "default": "./dist/react.js"
-    },
-    "./package.json": "./package.json"
+    }
   },
   "types": "./dist/index.d.ts",
   "files": [
@@ -50,7 +55,7 @@
     "monaco-editor": "^0.56.0",
     "react": "^19.2.8",
     "react-dom": "^19.2.8",
-    "@coldsmirk/inkstone-react": "^0.26.0"
+    "@coldsmirk/inkstone-react": "^0.27.0"
   },
   "peerDependencies": {
     "@codemirror/autocomplete": "^6.20.3",
@@ -59,7 +64,7 @@
     "@codemirror/view": "^6.43.0",
     "monaco-editor": "^0.56.0",
     "react": ">=19",
-    "@coldsmirk/inkstone-react": "^0.26.0"
+    "@coldsmirk/inkstone-react": "^0.27.0"
   },
   "peerDependenciesMeta": {
     "@codemirror/autocomplete": {