@coldsmirk/inkstone-codemirror 0.33.0 → 0.34.1

package/README.md

@@ -9,10 +9,10 @@ Part of [inkstone](https://github.com/coldsmirk/inkstone). For a drop-in React c
 - **`ControlledEditorHost`** — the controlled-editor lifecycle solved once: the view is created once, external value changes reconcile into the document without resetting cursor/undo, and theme/extension swaps happen in place.
 - **`ControlledMergeHost`** — the same discipline for [`@codemirror/merge`](https://github.com/codemirror/merge)'s side-by-side `MergeView`: both documents reconcile per side without caret resets or callback echo, dynamic extensions swap in place on both editors, and every merge-level option (`orientation`, `revertControls`, `collapseUnchanged`, …) passes straight through. Policy-free — pin either side read-only via `originalExtensions` / `modifiedExtensions` to match how your documents are controlled.
 - **`documentExtensions(options)`** — the standard document editing bundle (history, brackets, completion UI, optional line numbers / wrapping / search), so hosts start from working defaults instead of a bare `EditorState`.
-- **`codeMirrorLanguages` / `loadLanguage(language)`** — the supported `CodeMirrorLanguage` names and their lazy loaders: one dynamic `import()` per grammar, so only the selected language is fetched, never the whole catalog. Two tiers back the ids: the official `@codemirror/lang-*` (Lezer) parsers where upstream ships one, plus the full [`@codemirror/legacy-modes`](https://github.com/codemirror/legacy-modes) catalog (stream-mode highlighting) for everything upstream never wrote a Lezer grammar for — `shell`, `dockerfile`, `ini` / `env` / `properties`, `toml`, `nginx`, `powershell`, `lua`, and a hundred more.
-- **MiniJinja** — `language: "minijinja"` for standalone templates, or `minijinja-<host>` mixed variants (`minijinja-html`, `-xml`, `-json`, `-yaml`, `-css`, `-scss`, `-sass`, `-less`, `-markdown`; the SQL family — `-sql` plus every dialect id: `-mysql`, `-pgsql`, `-sqlite`, `-mssql`, `-mariadb`, `-plsql`, `-cassandra`, `-hive`, `-sparksql`, `-gql`, `-gpsql`, `-esper`; and the config/deploy hosts `-toml`, `-ini`, `-env`, `-shell`, `-dockerfile`, `-nginx`) that overlay MiniJinja tooling on the host grammar. A parser adapter supports MiniJinja whitespace control, dotted namespace assignments, and comma-separated `set` assignments beyond the upstream Jinja grammar; a linter flags non-MiniJinja tags, and autocomplete is restricted to MiniJinja's real tags / filters / tests / functions.
+- **`codeMirrorLanguages` / `loadLanguage(language)`** — the supported `CodeMirrorLanguage` names and their lazy loaders: one dynamic `import()` per grammar, so only the selected language is fetched, never the whole catalog. Two tiers back the ids: the official `@codemirror/lang-*` (Lezer) parsers where upstream ships one — with `clickhouse` a dialect of the package's own over `lang-sql`'s parser, since upstream ships none for ClickHouse — plus the full [`@codemirror/legacy-modes`](https://github.com/codemirror/legacy-modes) catalog (stream-mode highlighting) for everything upstream never wrote a Lezer grammar for — `shell`, `dockerfile`, `ini` / `env` / `properties`, `toml`, `nginx`, `powershell`, `lua`, and a hundred more.
+- **MiniJinja** — `language: "minijinja"` for standalone templates, or `minijinja-<host>` mixed variants (`minijinja-html`, `-xml`, `-json`, `-yaml`, `-css`, `-scss`, `-sass`, `-less`, `-markdown`; the SQL family — `-sql` plus every dialect id: `-mysql`, `-pgsql`, `-sqlite`, `-mssql`, `-mariadb`, `-plsql`, `-cassandra`, `-clickhouse`, `-hive`, `-sparksql`, `-gql`, `-gpsql`, `-esper`; and the config/deploy hosts `-toml`, `-ini`, `-env`, `-shell`, `-dockerfile`, `-nginx`) that overlay MiniJinja tooling on the host grammar. A parser adapter supports MiniJinja whitespace control, dotted namespace assignments, and comma-separated `set` assignments beyond the upstream Jinja grammar; a linter flags non-MiniJinja tags, and autocomplete is restricted to MiniJinja's real tags / filters / tests / functions.
 - **Context completion** — `normalizeContext({ schema })` (JSON Schema) or `normalizeContext({ sample })` (representative value) builds an `EditorContext`; dispatch it with `setMinijinjaContext` to make `{{ }}` / `{% if %}` / `{% for %}` complete the render context's variables and walk member access (`user.address.city`). `minijinjaContextField`, `resolveMembers`, and `typeAtPath` expose the underlying pieces.
-- **SQL schema completion** — dispatch `setSqlSchema.of({ tables })` for dialect-aware table and column completion in the Lezer-backed `sql`, `mysql`, `pgsql`, `sqlite`, `mssql`, `mariadb`, `plsql`, and `cassandra` languages plus their `minijinja-*` variants. Legacy stream-mode SQL languages do not consume schemas. Install `sqlSchemaField` in your static extensions to dispatch the schema before the lazy grammar arrives.
+- **SQL schema completion** — dispatch `setSqlSchema.of({ tables })` for dialect-aware table and column completion in the Lezer-backed `sql`, `mysql`, `pgsql`, `sqlite`, `mssql`, `mariadb`, `plsql`, `cassandra`, and `clickhouse` languages plus their `minijinja-*` variants. Legacy stream-mode SQL languages do not consume schemas. Install `sqlSchemaField` in your static extensions to dispatch the schema before the lazy grammar arrives.
 - **Catppuccin theming** — `defaultThemeExtensions(dark, height?, width?, fontSize?, lineHeight?)`, the latte/macchiato flavor pair plus chrome polish (completion tooltip, icons, hover/lint tooltips, search panel) and sizing. The polish paints the roles a consumer configured through `@coldsmirk/inkstone-core`'s `configureEditorColors` — background and gutter, the current line and its number, caret, selection, scrollbars, the tooltip and panel chrome and its text, the accent, and the diagnostic severities, which color every mark `@codemirror/lint` draws (squiggle, point, gutter marker) and the severity's mark that leads its message — and reads the host's `--inkstone-radius-*` / `--inkstone-shadow-*` tokens for corners and elevation, each falling back to its own look; `mergeTheme(dark)` / `installDiffChrome(root)` / `diffChromeColor(dark)` / `installDiffControlKeyboardSupport(container)` extend it to `@codemirror/merge`'s diff surfaces (see the `merge-chrome` module docs for the assembly). This is the identity `@coldsmirk/inkstone-react`'s components ship by default.
 - **`searchPhrasesZhCn`** — an opt-in `EditorState.phrases` table localizing the search panel to Simplified Chinese.
 

package/dist/clickhouse-sql-DyQWxgBC.js

@@ -0,0 +1,12 @@
+import { SQLDialect, sql } from "@codemirror/lang-sql";
+//#region src/clickhouse-sql.ts
+const ClickHouse = SQLDialect.define({
+	backslashEscapes: true,
+	hashComments: true,
+	identifierQuotes: "`\""
+});
+function clickhouse() {
+	return sql({ dialect: ClickHouse });
+}
+//#endregion
+export { ClickHouse, clickhouse };

package/dist/index.d.ts

@@ -213,9 +213,10 @@ export declare function documentExtensions({ placeholder, lineWrapping, showLine
 type LanguageLoader = () => Promise<Extension>;
 /**
  * Language id → lazy loader. Two tiers back the catalog: the official `@codemirror/lang-*`
- * (Lezer) parsers where upstream ships one, and the full `@codemirror/legacy-modes` catalog
- * for every language upstream never wrote a Lezer grammar for — where a language exists in
- * both, the Lezer parser wins. Ids follow Monaco's spelling where they overlap, but the two
+ * (Lezer) parsers where upstream ships one — ClickHouse a `lang-sql` dialect of this package's
+ * own (`clickhouse-sql.ts`) — and the full `@codemirror/legacy-modes` catalog for every language
+ * upstream never wrote a Lezer grammar for — where a language exists in both, the Lezer parser
+ * wins. Ids follow Monaco's spelling where they overlap, but the two
  * editors expose independent language types — {@link CodeMirrorLanguage} is exactly this set.
  */
 declare const loaders: {
@@ -318,6 +319,9 @@ declare const loaders: {
   cassandra: () => Promise<{
     extension: Extension;
   } | readonly Extension[] | LanguageSupport>;
+  clickhouse: () => Promise<{
+    extension: Extension;
+  } | readonly Extension[] | LanguageSupport>;
   apl: LanguageLoader;
   asciiarmor: LanguageLoader;
   asn1: LanguageLoader;
@@ -492,6 +496,9 @@ declare const loaders: {
   "minijinja-cassandra": () => Promise<{
     extension: Extension;
   } | readonly Extension[] | LanguageSupport>;
+  "minijinja-clickhouse": () => Promise<{
+    extension: Extension;
+  } | readonly Extension[] | LanguageSupport>;
   "minijinja-hive": () => Promise<{
     extension: Extension;
   } | readonly Extension[] | LanguageSupport>;

package/dist/index.js

@@ -187,6 +187,7 @@ const loaders = {
 	mariadb: () => Promise.all([import("./sql-support-Gk7Wv9Kj.js"), import("@codemirror/lang-sql")]).then(([schema, mod]) => schema.withSqlSchema(mod.sql({ dialect: mod.MariaSQL }), mod.MariaSQL)),
 	plsql: () => Promise.all([import("./sql-support-Gk7Wv9Kj.js"), import("@codemirror/lang-sql")]).then(([schema, mod]) => schema.withSqlSchema(mod.sql({ dialect: mod.PLSQL }), mod.PLSQL)),
 	cassandra: () => Promise.all([import("./sql-support-Gk7Wv9Kj.js"), import("@codemirror/lang-sql")]).then(([schema, mod]) => schema.withSqlSchema(mod.sql({ dialect: mod.Cassandra }), mod.Cassandra)),
+	clickhouse: () => Promise.all([import("./sql-support-Gk7Wv9Kj.js"), import("./clickhouse-sql-DyQWxgBC.js")]).then(([schema, mod]) => schema.withSqlSchema(mod.clickhouse(), mod.ClickHouse)),
 	apl: legacy(() => import("@codemirror/legacy-modes/mode/apl").then((mod) => mod.apl)),
 	asciiarmor: legacy(() => import("@codemirror/legacy-modes/mode/asciiarmor").then((mod) => mod.asciiArmor)),
 	asn1: legacy(() => import("@codemirror/legacy-modes/mode/asn1").then((mod) => mod.asn1({}))),
@@ -357,6 +358,11 @@ const loaders = {
 		import("./sql-support-Gk7Wv9Kj.js"),
 		import("@codemirror/lang-sql")
 	]).then(([mj, schema, mod]) => mj.minijinja({ base: schema.withSqlSchema(mod.sql({ dialect: mod.Cassandra }), mod.Cassandra) })),
+	"minijinja-clickhouse": () => Promise.all([
+		import("./minijinja-D5ANOjtx.js"),
+		import("./sql-support-Gk7Wv9Kj.js"),
+		import("./clickhouse-sql-DyQWxgBC.js")
+	]).then(([mj, schema, mod]) => mj.minijinja({ base: schema.withSqlSchema(mod.clickhouse(), mod.ClickHouse) })),
 	"minijinja-hive": () => Promise.all([import("./minijinja-D5ANOjtx.js"), import("@codemirror/legacy-modes/mode/sql")]).then(([mj, mod]) => mj.minijinja({ base: new LanguageSupport(StreamLanguage.define(mod.hive)) })),
 	"minijinja-sparksql": () => Promise.all([import("./minijinja-D5ANOjtx.js"), import("@codemirror/legacy-modes/mode/sql")]).then(([mj, mod]) => mj.minijinja({ base: new LanguageSupport(StreamLanguage.define(mod.sparkSQL)) })),
 	"minijinja-gql": () => Promise.all([import("./minijinja-D5ANOjtx.js"), import("@codemirror/legacy-modes/mode/sql")]).then(([mj, mod]) => mj.minijinja({ base: new LanguageSupport(StreamLanguage.define(mod.gql)) })),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coldsmirk/inkstone-codemirror",
-  "version": "0.33.0",
+  "version": "0.34.1",
   "description": "Framework-agnostic CodeMirror 6 plumbing: a controlled editor host (create-once, external-value reconcile, in-place theme swap), the standard document extension bundle, and the editors' catppuccin theming.",
   "keywords": [
     "codemirror",
@@ -62,7 +62,7 @@
     "@codemirror/lint": "^6.9.7",
     "@codemirror/merge": "^6.12.2",
     "@lezer/common": "^1.5.3",
-    "@coldsmirk/inkstone-core": "^0.33.0"
+    "@coldsmirk/inkstone-core": "^0.34.1"
   },
   "devDependencies": {
     "@codemirror/autocomplete": "^6.20.3",