@questdb/sql-parser 0.1.4 → 0.1.5

package/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
 
+## 0.1.5 - 2026.03.18
+### Fixed
+boost expression operators over clause keywords in WHERE context [#15](https://github.com/questdb/sql-parser/pull/15)
+
+
 ## 0.1.4 - 2026.03.17
 ### Added
 - Compound JOIN suggestions: suggest "LEFT JOIN", "ASOF JOIN" etc. as single completions instead of bare keywords [#13](https://github.com/questdb/sql-parser/pull/13)

package/dist/autocomplete/content-assist.d.ts

@@ -42,6 +42,8 @@ export interface ContentAssistResult {
      * context. Used by the provider to boost tables containing all these columns.
      */
     referencedColumns: Set<string>;
+    /** Whether the cursor is inside a WHERE clause expression */
+    isConditionContext: boolean;
 }
 /**
  * Extract bare column names referenced in expression context from a token list.

package/dist/autocomplete/token-classification.d.ts

@@ -13,9 +13,7 @@ export declare const IDENTIFIER_TOKENS: Set<string>;
  */
 export declare const IDENTIFIER_KEYWORD_TOKENS: Set<string>;
 /**
- * Expression-continuation operators that are valid after any expression but
- * should be deprioritized so clause-level keywords (ASC, DESC, LIMIT, etc.)
- * appear first in the suggestion list.
+ * Expression-level operators and keywords (as opposed to clause-level keywords).
  */
 export declare const EXPRESSION_OPERATORS: Set<string>;
 /**

package/dist/index.cjs

@@ -9210,18 +9210,11 @@ var EXPRESSION_OPERATORS = /* @__PURE__ */ new Set([
   "Like",
   "Ilike",
   "Within",
-  // Subquery/set operators
   "All",
   "Any",
   "Some",
-  // Expression-start keywords that continue an expression context
   "Case",
-  "Cast",
-  // Query connectors — valid after any complete query but should not
-  // overshadow clause-level keywords the user is more likely typing.
-  "Union",
-  "Except",
-  "Intersect"
+  "Cast"
 ]);
 var PUNCTUATION_TOKENS = /* @__PURE__ */ new Set([
   "LParen",
@@ -9742,7 +9735,15 @@ function computeSuggestions(tokens) {
       }
     }
   }
-  return { nextTokenTypes: result, suggestColumns, suggestTables };
+  const isConditionContext = effectiveSuggestions.some(
+    (s) => EXPRESSION_OPERATORS.has(s.nextTokenType.name) && s.ruleStack.includes("whereClause")
+  );
+  return {
+    nextTokenTypes: result,
+    suggestColumns,
+    suggestTables,
+    isConditionContext
+  };
 }
 function inferTableFromQualifiedRef(tokensBefore, isMidWord) {
   const effective = isMidWord ? tokensBefore.slice(0, -1) : tokensBefore;
@@ -9797,7 +9798,8 @@ function getContentAssist(fullSql, cursorOffset) {
         lexErrors: [],
         suggestColumns: false,
         suggestTables: false,
-        referencedColumns: /* @__PURE__ */ new Set()
+        referencedColumns: /* @__PURE__ */ new Set(),
+        isConditionContext: false
       };
     }
   }
@@ -9810,11 +9812,13 @@ function getContentAssist(fullSql, cursorOffset) {
   let nextTokenTypes = [];
   let suggestColumns = false;
   let suggestTables = false;
+  let isConditionContext = false;
   try {
     const computed = computeSuggestions(tokensForAssist);
     nextTokenTypes = computed.nextTokenTypes;
     suggestColumns = computed.suggestColumns;
     suggestTables = computed.suggestTables;
+    isConditionContext = computed.isConditionContext;
   } catch (e) {
   }
   const { tables: tablesInScope, cteColumns } = extractTables(
@@ -9868,7 +9872,8 @@ function getContentAssist(fullSql, cursorOffset) {
     qualifiedTableRef: qualifiedRef?.table,
     suggestColumns,
     suggestTables,
-    referencedColumns
+    referencedColumns,
+    isConditionContext
   };
 }
 function getNextValidTokens(sql) {
@@ -10349,13 +10354,12 @@ function buildSuggestions(tokenTypes, schema, tablesInScope, options) {
     }
     seenKeywords.add(keyword);
     const kind = "keyword" /* Keyword */;
-    const priority = EXPRESSION_OPERATORS.has(name) ? 3 /* MediumLow */ : 2 /* Medium */;
     suggestions.push({
       label: keyword,
       kind,
       insertText: keyword,
       filterText: keyword.toLowerCase(),
-      priority
+      priority: 2 /* Medium */
     });
   }
   if (expectsIdentifier) {
@@ -10465,6 +10469,20 @@ function buildSuggestions(tokenTypes, schema, tablesInScope, options) {
 }
 
 // src/autocomplete/provider.ts
+var EXPRESSION_OPERATOR_LABELS = new Set(
+  [...EXPRESSION_OPERATORS].map(tokenNameToKeyword)
+);
+function isSchemaColumn(image, tablesInScope, schema) {
+  const nameLower = image.toLowerCase();
+  for (const ref of tablesInScope) {
+    const cols = schema.columns[ref.table.toLowerCase()];
+    if (cols?.some((c) => c.name.toLowerCase() === nameLower)) return true;
+  }
+  for (const cols of Object.values(schema.columns)) {
+    if (cols.some((c) => c.name.toLowerCase() === nameLower)) return true;
+  }
+  return false;
+}
 var TABLE_NAME_TOKENS = /* @__PURE__ */ new Set([
   "From",
   "Join",
@@ -10541,7 +10559,8 @@ function createAutocompleteProvider(schema) {
         qualifiedTableRef,
         suggestColumns,
         suggestTables,
-        referencedColumns
+        referencedColumns,
+        isConditionContext
       } = getContentAssist(query, cursorOffset);
       const effectiveSchema = Object.keys(cteColumns).length > 0 ? {
         ...normalizedSchema,
@@ -10582,6 +10601,30 @@ function createAutocompleteProvider(schema) {
         if (suggestTables) {
           rankTableSuggestions(suggestions, referencedColumns, columnIndex);
         }
+        if (isConditionContext) {
+          const hasExpressionOperators = nextTokenTypes.some(
+            (t) => EXPRESSION_OPERATORS.has(t.name)
+          );
+          if (hasExpressionOperators) {
+            const effectiveTokens = isMidWord && tokensBefore.length > 0 ? tokensBefore.slice(0, -1) : tokensBefore;
+            const lastToken = effectiveTokens[effectiveTokens.length - 1];
+            const lastTokenName = lastToken?.tokenType?.name;
+            if (lastTokenName && !SKIP_TOKENS.has(lastTokenName) && !PUNCTUATION_TOKENS.has(lastTokenName) && isSchemaColumn(
+              lastToken.image,
+              effectiveTablesInScope,
+              effectiveSchema
+            )) {
+              for (const s of suggestions) {
+                if (s.kind !== "keyword" /* Keyword */) continue;
+                if (s.label === "IN") {
+                  s.priority = 1 /* High */;
+                } else if (!EXPRESSION_OPERATOR_LABELS.has(s.label)) {
+                  s.priority = 3 /* MediumLow */;
+                }
+              }
+            }
+          }
+        }
         return suggestions;
       }
       const fallbackTokens = isMidWord && tokensBefore.length > 0 ? tokensBefore.slice(0, -1) : tokensBefore;

package/dist/index.js

@@ -9150,18 +9150,11 @@ var EXPRESSION_OPERATORS = /* @__PURE__ */ new Set([
   "Like",
   "Ilike",
   "Within",
-  // Subquery/set operators
   "All",
   "Any",
   "Some",
-  // Expression-start keywords that continue an expression context
   "Case",
-  "Cast",
-  // Query connectors — valid after any complete query but should not
-  // overshadow clause-level keywords the user is more likely typing.
-  "Union",
-  "Except",
-  "Intersect"
+  "Cast"
 ]);
 var PUNCTUATION_TOKENS = /* @__PURE__ */ new Set([
   "LParen",
@@ -9682,7 +9675,15 @@ function computeSuggestions(tokens) {
       }
     }
   }
-  return { nextTokenTypes: result, suggestColumns, suggestTables };
+  const isConditionContext = effectiveSuggestions.some(
+    (s) => EXPRESSION_OPERATORS.has(s.nextTokenType.name) && s.ruleStack.includes("whereClause")
+  );
+  return {
+    nextTokenTypes: result,
+    suggestColumns,
+    suggestTables,
+    isConditionContext
+  };
 }
 function inferTableFromQualifiedRef(tokensBefore, isMidWord) {
   const effective = isMidWord ? tokensBefore.slice(0, -1) : tokensBefore;
@@ -9737,7 +9738,8 @@ function getContentAssist(fullSql, cursorOffset) {
         lexErrors: [],
         suggestColumns: false,
         suggestTables: false,
-        referencedColumns: /* @__PURE__ */ new Set()
+        referencedColumns: /* @__PURE__ */ new Set(),
+        isConditionContext: false
       };
     }
   }
@@ -9750,11 +9752,13 @@ function getContentAssist(fullSql, cursorOffset) {
   let nextTokenTypes = [];
   let suggestColumns = false;
   let suggestTables = false;
+  let isConditionContext = false;
   try {
     const computed = computeSuggestions(tokensForAssist);
     nextTokenTypes = computed.nextTokenTypes;
     suggestColumns = computed.suggestColumns;
     suggestTables = computed.suggestTables;
+    isConditionContext = computed.isConditionContext;
   } catch (e) {
   }
   const { tables: tablesInScope, cteColumns } = extractTables(
@@ -9808,7 +9812,8 @@ function getContentAssist(fullSql, cursorOffset) {
     qualifiedTableRef: qualifiedRef?.table,
     suggestColumns,
     suggestTables,
-    referencedColumns
+    referencedColumns,
+    isConditionContext
   };
 }
 function getNextValidTokens(sql) {
@@ -10289,13 +10294,12 @@ function buildSuggestions(tokenTypes, schema, tablesInScope, options) {
     }
     seenKeywords.add(keyword);
     const kind = "keyword" /* Keyword */;
-    const priority = EXPRESSION_OPERATORS.has(name) ? 3 /* MediumLow */ : 2 /* Medium */;
     suggestions.push({
       label: keyword,
       kind,
       insertText: keyword,
       filterText: keyword.toLowerCase(),
-      priority
+      priority: 2 /* Medium */
     });
   }
   if (expectsIdentifier) {
@@ -10405,6 +10409,20 @@ function buildSuggestions(tokenTypes, schema, tablesInScope, options) {
 }
 
 // src/autocomplete/provider.ts
+var EXPRESSION_OPERATOR_LABELS = new Set(
+  [...EXPRESSION_OPERATORS].map(tokenNameToKeyword)
+);
+function isSchemaColumn(image, tablesInScope, schema) {
+  const nameLower = image.toLowerCase();
+  for (const ref of tablesInScope) {
+    const cols = schema.columns[ref.table.toLowerCase()];
+    if (cols?.some((c) => c.name.toLowerCase() === nameLower)) return true;
+  }
+  for (const cols of Object.values(schema.columns)) {
+    if (cols.some((c) => c.name.toLowerCase() === nameLower)) return true;
+  }
+  return false;
+}
 var TABLE_NAME_TOKENS = /* @__PURE__ */ new Set([
   "From",
   "Join",
@@ -10481,7 +10499,8 @@ function createAutocompleteProvider(schema) {
         qualifiedTableRef,
         suggestColumns,
         suggestTables,
-        referencedColumns
+        referencedColumns,
+        isConditionContext
       } = getContentAssist(query, cursorOffset);
       const effectiveSchema = Object.keys(cteColumns).length > 0 ? {
         ...normalizedSchema,
@@ -10522,6 +10541,30 @@ function createAutocompleteProvider(schema) {
         if (suggestTables) {
           rankTableSuggestions(suggestions, referencedColumns, columnIndex);
         }
+        if (isConditionContext) {
+          const hasExpressionOperators = nextTokenTypes.some(
+            (t) => EXPRESSION_OPERATORS.has(t.name)
+          );
+          if (hasExpressionOperators) {
+            const effectiveTokens = isMidWord && tokensBefore.length > 0 ? tokensBefore.slice(0, -1) : tokensBefore;
+            const lastToken = effectiveTokens[effectiveTokens.length - 1];
+            const lastTokenName = lastToken?.tokenType?.name;
+            if (lastTokenName && !SKIP_TOKENS.has(lastTokenName) && !PUNCTUATION_TOKENS.has(lastTokenName) && isSchemaColumn(
+              lastToken.image,
+              effectiveTablesInScope,
+              effectiveSchema
+            )) {
+              for (const s of suggestions) {
+                if (s.kind !== "keyword" /* Keyword */) continue;
+                if (s.label === "IN") {
+                  s.priority = 1 /* High */;
+                } else if (!EXPRESSION_OPERATOR_LABELS.has(s.label)) {
+                  s.priority = 3 /* MediumLow */;
+                }
+              }
+            }
+          }
+        }
         return suggestions;
       }
       const fallbackTokens = isMidWord && tokensBefore.length > 0 ? tokensBefore.slice(0, -1) : tokensBefore;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@questdb/sql-parser",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "SQL parser for QuestDB syntax using Chevrotain",
   "type": "module",
   "main": "dist/index.cjs",