@coldsmirk/inkstone-sql 0.26.1 → 0.27.0

package/dist/{assist-DTWNM9if.d.ts → assist-BM4bNDhw.d.ts}

@@ -326,9 +326,15 @@ interface SqlCompletionCandidate {
   kind: "keyword" | "function" | "schema" | "table" | "view" | "column" | "snippet";
   insertText: string;
   /**
-   * `insertText` is a snippet (`$0` marks the caret) rather than plain text.
-   */
-  snippet?: boolean;
+   * Where the caret lands once `insertText` is written, as an offset into it — a call's own
+   * parentheses put it between them. Absent, it lands at the end, which is where the next
+   * word goes.
+   *
+   * An offset and not a marker in the text: a marker is an editor's own snippet dialect, and
+   * this half of the package states facts about SQL and nothing about any editor. Spelling
+   * one here once cost every `$`-prefixed key its name, the editor reading it as a variable.
+   */
+  caret?: number;
   /**
    * Characters immediately before the caret that this insert replaces, beyond the partial word
    * the editor already replaces on its own. Only the `*` expansion uses it — it stands in for a

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { C as CatalogTable, S as CatalogFunction, _ as readCall, a as createSqlAssist, b as runnableStatement, c as SqlSource, d as CallRead, f as IdentifierRead, g as TableRef, h as StatementRead, i as SqlSignatureHelp, l as createSqlSchema, m as StatementContext, n as SqlCompletionCandidate, o as SqlCatalog, p as Runnable, r as SqlHoverCard, s as SqlSchema, t as SqlAssist, u as qualifiedName, v as readIdentifier, w as SqlKind, x as CatalogColumn, y as readStatement } from "./assist-DTWNM9if.js";
+import { C as CatalogTable, S as CatalogFunction, _ as readCall, a as createSqlAssist, b as runnableStatement, c as SqlSource, d as CallRead, f as IdentifierRead, g as TableRef, h as StatementRead, i as SqlSignatureHelp, l as createSqlSchema, m as StatementContext, n as SqlCompletionCandidate, o as SqlCatalog, p as Runnable, r as SqlHoverCard, s as SqlSchema, t as SqlAssist, u as qualifiedName, v as readIdentifier, w as SqlKind, x as CatalogColumn, y as readStatement } from "./assist-BM4bNDhw.js";
 //#region src/functions.d.ts
 /**
  * The function vocabulary this bench speaks: the curated floor this project wrote

package/dist/index.js

@@ -1041,11 +1041,12 @@ function createSqlCompletion(kind, schema, functions) {
 		}), ...known.map((entry) => {
 			const name = entry.origin === "curated" ? spell(entry.name) : entry.name;
 			const written = entry.origin === "curated" ? name : spellCallable(kind, name);
+			const call = entry.qualifier === "" ? written : `${spellIdentifier(kind, entry.qualifier)}.${written}`;
 			return {
 				label: name,
 				kind: "function",
-				insertText: `${entry.qualifier === "" ? written : `${spellIdentifier(kind, entry.qualifier)}.${written}`}($0)`,
-				snippet: true,
+				insertText: `${call}()`,
+				caret: call.length + 1,
 				detail: entry.signature,
 				documentation: entry.summary === "" ? void 0 : entry.summary,
 				sortGroup: entry.origin === "builtin" ? RANK_VENDOR : RANK_FUNCTION

package/dist/monaco-DEMsSuzD.js

@@ -0,0 +1,136 @@
+//#region src/snippet.ts
+function asSnippet(text, caret) {
+	return `${literal(text.slice(0, caret))}$0${literal(text.slice(caret))}`;
+}
+function literal(part) {
+	return part.replaceAll(/[$}\\]/gu, String.raw`\$&`);
+}
+//#endregion
+//#region src/monaco.ts
+function itemKinds(monaco) {
+	const kinds = monaco.languages.CompletionItemKind;
+	return {
+		keyword: kinds.Keyword,
+		function: kinds.Function,
+		schema: kinds.Module,
+		table: kinds.Struct,
+		view: kinds.Interface,
+		column: kinds.Field,
+		snippet: kinds.Snippet
+	};
+}
+const FORMATTING_KEY = Symbol.for("coldsmirk.inkstone.sql.formattingRegistry");
+function formattingLedgers(monaco) {
+	const holder = globalThis;
+	const registries = holder[FORMATTING_KEY] ?? /* @__PURE__ */ new WeakMap();
+	holder[FORMATTING_KEY] = registries;
+	const existing = registries.get(monaco);
+	if (existing) return existing;
+	const created = /* @__PURE__ */ new Map();
+	registries.set(monaco, created);
+	return created;
+}
+function registerFormatting(monaco, languageId, modelPath, hooks) {
+	const ledgers = formattingLedgers(monaco);
+	let ledger = ledgers.get(languageId);
+	if (ledger === void 0) {
+		const byPath = /* @__PURE__ */ new Map();
+		ledger = {
+			hooks: byPath,
+			registration: monaco.languages.registerDocumentFormattingEditProvider(languageId, { provideDocumentFormattingEdits: async (model) => {
+				const owner = byPath.get(model.uri.toString());
+				const assist = owner?.assist() ?? null;
+				const text = model.getValue();
+				if (owner === void 0 || assist === null || text.trim() === "") return [];
+				const formatted = await assist.format(text);
+				if (formatted === null) {
+					owner.onFormatRefused();
+					return [];
+				}
+				return formatted === text ? [] : [{
+					range: model.getFullModelRange(),
+					text: formatted
+				}];
+			} })
+		};
+		ledgers.set(languageId, ledger);
+	}
+	const entered = ledger;
+	entered.hooks.set(modelPath, hooks);
+	return { dispose: () => {
+		entered.hooks.delete(modelPath);
+		if (entered.hooks.size === 0) {
+			entered.registration.dispose();
+			ledgers.delete(languageId);
+		}
+	} };
+}
+function registerSqlLanguage(monaco, modelPath, hooks, languageId = "sql") {
+	const kinds = itemKinds(monaco);
+	const path = monaco.Uri.parse(modelPath).toString();
+	const answering = (model) => model.uri.toString() === path ? hooks.assist() : null;
+	return [
+		monaco.languages.registerCompletionItemProvider(languageId, {
+			triggerCharacters: ["."],
+			provideCompletionItems: async (model, position) => {
+				const assist = answering(model);
+				if (assist === null) return { suggestions: [] };
+				const candidates = await assist.complete(model.getValue(), model.getOffsetAt(position));
+				const word = model.getWordUntilPosition(position);
+				return { suggestions: candidates.map((candidate, index) => {
+					return {
+						label: candidate.label,
+						kind: kinds[candidate.kind],
+						insertText: candidate.caret === void 0 ? candidate.insertText : asSnippet(candidate.insertText, candidate.caret),
+						insertTextRules: candidate.caret === void 0 ? void 0 : monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+						detail: candidate.detail,
+						documentation: candidate.documentation,
+						range: new monaco.Range(position.lineNumber, Math.max(1, word.startColumn - (candidate.replace ?? 0)), position.lineNumber, word.endColumn),
+						sortText: `${candidate.sortGroup}:${String(index).padStart(5, "0")}`
+					};
+				}) };
+			}
+		}),
+		monaco.languages.registerHoverProvider(languageId, { provideHover: async (model, position) => {
+			const assist = answering(model);
+			if (assist === null) return null;
+			const card = await assist.hover(model.getValue(), model.getOffsetAt(position));
+			if (card === null) return null;
+			const from = model.getPositionAt(card.from);
+			const to = model.getPositionAt(card.to);
+			return {
+				range: new monaco.Range(from.lineNumber, from.column, to.lineNumber, to.column),
+				contents: card.markdown.map((value) => {
+					return { value };
+				})
+			};
+		} }),
+		monaco.languages.registerSignatureHelpProvider(languageId, {
+			signatureHelpTriggerCharacters: ["(", ","],
+			signatureHelpRetriggerCharacters: [","],
+			provideSignatureHelp: async (model, position) => {
+				const assist = answering(model);
+				if (assist === null) return null;
+				const help = await assist.signature(model.getValue(), model.getOffsetAt(position));
+				if (help === null) return null;
+				return {
+					value: {
+						signatures: [{
+							label: help.label,
+							documentation: help.documentation,
+							parameters: help.parameters.map((span) => {
+								return { label: span };
+							})
+						}],
+						activeSignature: 0,
+						activeParameter: help.active
+					},
+					dispose: () => void 0
+				};
+			}
+		}),
+		registerFormatting(monaco, languageId, path, hooks)
+	];
+}
+//#endregion
+export { registerSqlLanguage as t };

package/dist/monaco.d.ts

@@ -1,4 +1,4 @@
-import { t as SqlAssist } from "./assist-DTWNM9if.js";
+import { t as SqlAssist } from "./assist-BM4bNDhw.js";
 import * as monacoEditor from "monaco-editor";
 import { IDisposable } from "monaco-editor";
 //#region src/monaco.d.ts

package/dist/monaco.js

@@ -1,128 +1,2 @@
-//#region src/monaco.ts
-function itemKinds(monaco) {
-	const kinds = monaco.languages.CompletionItemKind;
-	return {
-		keyword: kinds.Keyword,
-		function: kinds.Function,
-		schema: kinds.Module,
-		table: kinds.Struct,
-		view: kinds.Interface,
-		column: kinds.Field,
-		snippet: kinds.Snippet
-	};
-}
-const FORMATTING_KEY = Symbol.for("coldsmirk.inkstone.sql.formattingRegistry");
-function formattingLedgers(monaco) {
-	const holder = globalThis;
-	const registries = holder[FORMATTING_KEY] ?? /* @__PURE__ */ new WeakMap();
-	holder[FORMATTING_KEY] = registries;
-	const existing = registries.get(monaco);
-	if (existing) return existing;
-	const created = /* @__PURE__ */ new Map();
-	registries.set(monaco, created);
-	return created;
-}
-function registerFormatting(monaco, languageId, modelPath, hooks) {
-	const ledgers = formattingLedgers(monaco);
-	let ledger = ledgers.get(languageId);
-	if (ledger === void 0) {
-		const byPath = /* @__PURE__ */ new Map();
-		ledger = {
-			hooks: byPath,
-			registration: monaco.languages.registerDocumentFormattingEditProvider(languageId, { provideDocumentFormattingEdits: async (model) => {
-				const owner = byPath.get(model.uri.toString());
-				const assist = owner?.assist() ?? null;
-				const text = model.getValue();
-				if (owner === void 0 || assist === null || text.trim() === "") return [];
-				const formatted = await assist.format(text);
-				if (formatted === null) {
-					owner.onFormatRefused();
-					return [];
-				}
-				return formatted === text ? [] : [{
-					range: model.getFullModelRange(),
-					text: formatted
-				}];
-			} })
-		};
-		ledgers.set(languageId, ledger);
-	}
-	const entered = ledger;
-	entered.hooks.set(modelPath, hooks);
-	return { dispose: () => {
-		entered.hooks.delete(modelPath);
-		if (entered.hooks.size === 0) {
-			entered.registration.dispose();
-			ledgers.delete(languageId);
-		}
-	} };
-}
-function registerSqlLanguage(monaco, modelPath, hooks, languageId = "sql") {
-	const kinds = itemKinds(monaco);
-	const path = monaco.Uri.parse(modelPath).toString();
-	const answering = (model) => model.uri.toString() === path ? hooks.assist() : null;
-	return [
-		monaco.languages.registerCompletionItemProvider(languageId, {
-			triggerCharacters: ["."],
-			provideCompletionItems: async (model, position) => {
-				const assist = answering(model);
-				if (assist === null) return { suggestions: [] };
-				const candidates = await assist.complete(model.getValue(), model.getOffsetAt(position));
-				const word = model.getWordUntilPosition(position);
-				return { suggestions: candidates.map((candidate, index) => {
-					return {
-						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, word.startColumn - (candidate.replace ?? 0)), position.lineNumber, word.endColumn),
-						sortText: `${candidate.sortGroup}:${String(index).padStart(5, "0")}`
-					};
-				}) };
-			}
-		}),
-		monaco.languages.registerHoverProvider(languageId, { provideHover: async (model, position) => {
-			const assist = answering(model);
-			if (assist === null) return null;
-			const card = await assist.hover(model.getValue(), model.getOffsetAt(position));
-			if (card === null) return null;
-			const from = model.getPositionAt(card.from);
-			const to = model.getPositionAt(card.to);
-			return {
-				range: new monaco.Range(from.lineNumber, from.column, to.lineNumber, to.column),
-				contents: card.markdown.map((value) => {
-					return { value };
-				})
-			};
-		} }),
-		monaco.languages.registerSignatureHelpProvider(languageId, {
-			signatureHelpTriggerCharacters: ["(", ","],
-			signatureHelpRetriggerCharacters: [","],
-			provideSignatureHelp: async (model, position) => {
-				const assist = answering(model);
-				if (assist === null) return null;
-				const help = await assist.signature(model.getValue(), model.getOffsetAt(position));
-				if (help === null) return null;
-				return {
-					value: {
-						signatures: [{
-							label: help.label,
-							documentation: help.documentation,
-							parameters: help.parameters.map((span) => {
-								return { label: span };
-							})
-						}],
-						activeSignature: 0,
-						activeParameter: help.active
-					},
-					dispose: () => void 0
-				};
-			}
-		}),
-		registerFormatting(monaco, languageId, path, hooks)
-	];
-}
-//#endregion
+import { t as registerSqlLanguage } from "./monaco-DEMsSuzD.js";
 export { registerSqlLanguage };

package/dist/react.d.ts

@@ -1,4 +1,4 @@
-import { t as SqlAssist } from "./assist-DTWNM9if.js";
+import { t as SqlAssist } from "./assist-BM4bNDhw.js";
 import { MonacoModule } from "./monaco.js";
 import { ReactNode } from "react";
 import { editor } from "monaco-editor";

package/dist/react.js

@@ -1,4 +1,4 @@
-import { registerSqlLanguage } from "./monaco.js";
+import { t as registerSqlLanguage } from "./monaco-DEMsSuzD.js";
 import { MonacoEditor } from "@coldsmirk/inkstone-react/monaco";
 import { useEffect, useInsertionEffect, useRef, useState } from "react";
 import { jsx } from "react/jsx-runtime";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coldsmirk/inkstone-sql",
-  "version": "0.26.1",
+  "version": "0.27.0",
   "description": "Schema-aware SQL editing intelligence for Monaco: lexical statement reading under per-dialect noise profiles, catalog-driven completion/hover/signature help, unified-placeholder awareness, formatting, and a drop-in React SQL editor.",
   "keywords": [
     "sql",
@@ -49,12 +49,12 @@
     "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.0"
   },
   "peerDependencies": {
     "monaco-editor": "^0.56.0",
     "react": ">=19",
-    "@coldsmirk/inkstone-react": "^0.26.1"
+    "@coldsmirk/inkstone-react": "^0.27.0"
   },
   "peerDependenciesMeta": {
     "@coldsmirk/inkstone-react": {