@coldsmirk/inkstone-sql 0.33.0 → 0.34.0

package/README.md

@@ -41,7 +41,7 @@ Everything the intelligence answers goes through one lexical reader taken under
 
 ## The mirror invariant
 
-`noise.ts` (which runs of a statement are strings / comments / quoted names, per kind) and the marker grammar mirror [**polyglot's engine scanner**](https://github.com/coldsmirk/polyglot) (`sql/Placeholders`, over its profiles in `kinds/Dialect`) flag for flag, each kind under the two lexicons the sidecar reads it by: the database's own says where a statement ends and what is prose, and the one the kind's driver finds a `?` by says where the markers are — SQL Server nests a block comment, but Microsoft's driver ends one at its first close and binds a `?` past it. The scanner decides what actually binds; a reader that diverged would prompt for a parameter the engine refuses, or send a statement short of one it binds. **A scanner change requires a matching release of this package**, and the per-kind cases in `reader.test.ts` are the invariant's guard.
+`noise.ts` (which runs of a statement are strings / comments / quoted names, per kind) and the marker grammar mirror [**polyglot's engine scanner**](https://github.com/coldsmirk/polyglot) (`sql/Placeholders`, over its profiles in `kinds/Dialect`) flag for flag, each kind under the two lexicons the sidecar reads it by: the database's own says where a statement ends and what is prose, and the one the kind's driver finds a `?` by says where the markers are — SQL Server nests a block comment, but Microsoft's driver ends one at its first close and binds a `?` past it; ClickHouse's driver reads a `?` as the conditional operator `a ? b : c` where a lone `:` follows it before any other `?`, and binds nothing through that `:` (`conditional.ts`). The scanner decides what actually binds; a reader that diverged would prompt for a parameter the engine refuses, or send a statement short of one it binds. **A scanner change requires a matching release of this package**, and the per-kind cases in `reader.test.ts` are the invariant's guard.
 
 ## Structured refusals
 

package/dist/index.d.ts

@@ -152,9 +152,10 @@ export declare function joinGuesses(kind: SqlKind, target: SqlSource, others: Sq
  * has no placeholder in it. Blanking is the reader's job because the reader already owns what is
  * prose and what is SQL for this page, and it takes that decision under the data source's own
  * lexical profile (`noise.ts`), mode for mode with the scanner — MySQL's `#` comments and
- * backslash escapes, Postgres's `$tag$` bodies, Oracle's `q'…'`, every kind's quoted names, and
- * SQL Server's block comments as its driver ends them — so what reaches this file is exactly the
- * text the engine would mint markers from.
+ * backslash escapes, Postgres's `$tag$` bodies, Oracle's `q'…'`, every kind's quoted names,
+ * SQL Server's block comments as its driver ends them, and ClickHouse's conditional operator as
+ * its driver crosses it — so what reaches this file is exactly the text the engine would mint
+ * markers from.
  */
 /**
  * The binding form a statement's markers suggest.
@@ -166,8 +167,8 @@ type MarkerForm = "none" | "positional" | "named";
  *
  * - `"mixed-forms"` — the statement writes both `?` and `:name`; the scanner binds neither.
  * - `"question-escape-unsupported"` — `??` on a kind whose native form is itself `?` (MySQL,
- * 达梦, ClickHouse): the escape has no rendering that survives, and none of them has a `?`
- * operator to escape in the first place.
+ * 达梦, ClickHouse): the escape has no rendering that survives, and none is needed — MySQL and
+ * 达梦 have no `?` operator, and ClickHouse's one, the conditional `a ? b : c`, is read as one.
  * - `"native-marker-collision"` — a marker hand-written in the kind's own bind form (`$1`,
  * `:1`, `@p1`) beside a `?`/`:name` the scanner would mint: both would bind the same slot.
  */

package/dist/index.js

@@ -181,7 +181,7 @@ const MYSQL = dialect([
 	fn("group_concat", "group_concat(expr)", "Aggregate: joins each row's value into one string; takes `separator '…'`."),
 	fn("json_extract", "json_extract(json, path)", "Reads a JSON path, as in `'$.id'`.")
 ]);
-const CLICKHOUSE = {
+const CLICKHOUSE$1 = {
 	...dialect([
 		"final",
 		"prewhere",
@@ -280,7 +280,7 @@ const SQL_DIALECTS = {
 		fn("string_agg", "string_agg(expr, delimiter)", "Aggregate: joins each row's value with a delimiter.")
 	]),
 	dm: ORACLE$1,
-	clickhouse: CLICKHOUSE
+	clickhouse: CLICKHOUSE$1
 };
 function signatureParameters(signature) {
 	const open = signature.indexOf("(");
@@ -494,6 +494,67 @@ function joinGuesses(kind, target, others) {
 	return [...found.values()];
 }
 //#endregion
+//#region src/conditional.ts
+function conditionalEnd(text, at) {
+	let index = at + 2;
+	while (index >= 0 && index < text.length) {
+		const ch = text[index];
+		if (ch === "?" || ch === ":") return ch === ":" && index + 1 < text.length && text[index + 1] !== ":" && text[index - 1] !== ":" ? index + 1 : -1;
+		index = skipped(text, index);
+	}
+	return -1;
+}
+function skipped(text, at) {
+	const ch = text[at];
+	if (ch === "'" || ch === "\"" || ch === "`") return quoted(text, at);
+	if (ch === "(" || ch === "[" || ch === "{") return group(text, at);
+	if (ch === "-" && text[at + 1] === "-") return lineEnd(text, at + 2);
+	if (ch === "/" && text[at + 1] === "*") return blockEnd(text, at + 2);
+	return at + 1;
+}
+function quoted(text, open) {
+	const quote = text[open];
+	for (let index = open + 1; index < text.length; index += 1) {
+		const ch = text[index];
+		if (ch === "\\") index += 1;
+		else if (ch === quote) {
+			if (text[index + 1] !== quote) return index + 1;
+			index += 1;
+		}
+	}
+	return -1;
+}
+const CLOSERS = {
+	"(": ")",
+	"[": "]",
+	"{": "}"
+};
+function group(text, open) {
+	const close = CLOSERS[text[open]];
+	let index = open + 1;
+	while (index >= 0 && index < text.length) {
+		if (text[index] === close) return index + 1;
+		index = skipped(text, index);
+	}
+	return -1;
+}
+function lineEnd(text, from) {
+	const end = text.indexOf("\n", from);
+	return end > from ? end + 1 : text.length;
+}
+function blockEnd(text, from) {
+	let depth = 1;
+	for (let index = from; index + 1 < text.length; index += 1) if (text[index] === "/" && text[index + 1] === "*") {
+		depth += 1;
+		index += 1;
+	} else if (text[index] === "*" && text[index + 1] === "/") {
+		depth -= 1;
+		index += 1;
+		if (depth === 0) return index + 1;
+	}
+	return -1;
+}
+//#endregion
 //#region src/noise.ts
 const BASE = {
 	backslashEscapes: false,
@@ -505,13 +566,23 @@ const BASE = {
 	dollarQuoting: false,
 	escapeStrings: false,
 	nestedBlockComments: false,
-	alternativeQuoting: false
+	alternativeQuoting: false,
+	backslashInBackticks: false,
+	conditionalOperator: false
 };
 const SQLSERVER = {
 	...BASE,
 	bracketIdentifiers: true,
 	nestedBlockComments: true
 };
+const CLICKHOUSE = {
+	...BASE,
+	backslashEscapes: true,
+	hashLineComments: true,
+	backtickIdentifiers: true,
+	nestedBlockComments: true,
+	backslashInBackticks: true
+};
 const NOISE_PROFILES = {
 	postgres: {
 		...BASE,
@@ -547,17 +618,18 @@ const NOISE_PROFILES = {
 		nestedBlockComments: true,
 		dollarQuoting: true
 	},
+	clickhouse: CLICKHOUSE
+};
+const DRIVER_PROFILES = {
+	sqlserver: {
+		...SQLSERVER,
+		nestedBlockComments: false
+	},
 	clickhouse: {
-		...BASE,
-		backslashEscapes: true,
-		hashLineComments: true,
-		backtickIdentifiers: true
+		...CLICKHOUSE,
+		conditionalOperator: true
 	}
 };
-const DRIVER_PROFILES = { sqlserver: {
-	...SQLSERVER,
-	nestedBlockComments: false
-} };
 const WORD_START = /[a-z_\u{0080}-\u{FFFF}]/iu;
 const WORD_BYTE = /[\w$\u{0080}-\u{FFFF}]/u;
 const NAME_BYTE = /\w/;
@@ -689,11 +761,18 @@ function blankNoise(text, kind, lexicon = "database") {
 		const ch = text[at];
 		if (ch === "'") skip(closeDelimited(text, at + 1, "'", profile.backslashEscapes), false);
 		else if (ch === "\"") skip(closeDelimited(text, at + 1, "\"", profile.backslashEscapes), !profile.doubleQuotedStrings);
-		else if (ch === "`" && profile.backtickIdentifiers) skip(closeDelimited(text, at + 1, "`", false), true);
+		else if (ch === "`" && profile.backtickIdentifiers) skip(closeDelimited(text, at + 1, "`", profile.backslashInBackticks), true);
 		else if (ch === "[" && profile.bracketIdentifiers) skip(closeBracket(text, at + 1), true);
 		else if (opensLineComment(text, at, profile)) skip(closeLine(text, at), false);
 		else if (ch === "/" && text[at + 1] === "*") skip(closeBlock(text, at + 2, profile.nestedBlockComments), false);
-		else if (ch === "$" && profile.dollarQuoting) {
+		else if (ch === "?" && profile.conditionalOperator) {
+			const end = conditionalEnd(text, at);
+			if (end < 0) at += text[at + 1] === "?" ? 2 : 1;
+			else skip({
+				end,
+				sealed: true
+			}, false);
+		} else if (ch === "$" && profile.dollarQuoting) {
 			const quoted = closeDollarQuoted(text, at);
 			if (quoted === null) at += 1;
 			else skip(quoted, false);
@@ -1517,7 +1596,7 @@ function createSqlAssist(kind, catalog) {
 }
 //#endregion
 //#region src/markers.ts
-const SCAN = /[A-Z_\u0080-\uFFFF][\w$\u0080-\uFFFF]*|(?<qq>\?\?)|::|(?<q>\?)|:(?<name>[A-Z_]\w*)|(?<colonDigits>:\d+)|(?<dollarDigits>\$\d+)|(?<atDigits>@P\d+)/gi;
+const SCAN = /[A-Z_\u0080-\uFFFF][\w$\u0080-\uFFFF]*|(?<qq>\?\?)|::|(?<q>\?)|(?<!\.):(?<name>[A-Z_]\w*)|(?<colonDigits>:\d+)|(?<dollarDigits>\$\d+)|(?<atDigits>@P\d+)/gi;
 const QUESTION_IS_NATIVE = /* @__PURE__ */ new Set([
 	"mysql",
 	"dm",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coldsmirk/inkstone-sql",
-  "version": "0.33.0",
+  "version": "0.34.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",
@@ -48,12 +48,12 @@
   "devDependencies": {
     "monaco-editor": "^0.57.0",
     "react": "^19.3.0",
-    "@coldsmirk/inkstone-react": "^0.33.0"
+    "@coldsmirk/inkstone-react": "^0.34.0"
   },
   "peerDependencies": {
     "monaco-editor": "^0.57.0",
     "react": ">=19",
-    "@coldsmirk/inkstone-react": "^0.33.0"
+    "@coldsmirk/inkstone-react": "^0.34.0"
   },
   "peerDependenciesMeta": {
     "@coldsmirk/inkstone-react": {