@questdb/sql-parser 0.1.1 → 0.1.2

package/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
 
-## 0.1.1 - 2026.02.23
+## 0.1.2 - 2026.02.25
+### Fixed
+- Prioritize tables with mentioned columns in the suggestions [#6](https://github.com/questdb/sql-parser/pull/6)
 
+
+## 0.1.1 - 2026.02.23
 ### Fixed
 - grammar-level table/column classification, join-specific suggestions [#2](https://github.com/questdb/sql-parser/pull/2)
 

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

@@ -37,7 +37,30 @@ export interface ContentAssistResult {
     suggestColumns: boolean;
     /** Whether the grammar context expects table names (tableName positions, or expression context) */
     suggestTables: boolean;
+    /**
+     * Bare column names (lowercase) referenced before the cursor in expression
+     * context. Used by the provider to boost tables containing all these columns.
+     */
+    referencedColumns: Set<string>;
 }
+/**
+ * Extract bare column names referenced in expression context from a token list.
+ *
+ * Scans the tokens and collects identifier names that are likely column
+ * references, excluding:
+ * - Qualified identifiers (followed by a Dot token — table/alias qualifiers)
+ * - Middle segments of multi-part names (preceded AND followed by a Dot)
+ * - Known table names and aliases (matched against tableAndAliasSet)
+ * - Function calls (followed by a left-parenthesis token)
+ *
+ * @param tokens - Tokens to scan
+ * @param tableAndAliasSet - Lowercase table names and aliases already in scope
+ *   (built from tablesInScope by the caller). Identifiers matching any of these
+ *   are excluded because they are table/alias references, not column names.
+ *
+ * Returns a Set of lowercase column names for efficient lookup.
+ */
+export declare function extractReferencedColumns(tokens: IToken[], tableAndAliasSet: Set<string>): Set<string>;
 /**
  * Get content assist suggestions for a SQL string at a given cursor position
  *

package/dist/index.cjs

@@ -9630,6 +9630,32 @@ function inferTableFromQualifiedRef(tokensBefore, isMidWord) {
   const table = tableToken.tokenType.name === "QuotedIdentifier" ? tableToken.image.slice(1, -1) : tableToken.image;
   return { table };
 }
+function extractReferencedColumns(tokens, tableAndAliasSet) {
+  const result = /* @__PURE__ */ new Set();
+  for (let i = 0; i < tokens.length; i++) {
+    const token = tokens[i];
+    const name = token.tokenType.name;
+    if (name !== "Identifier" && name !== "QuotedIdentifier" && !IDENTIFIER_KEYWORD_TOKENS.has(name)) {
+      continue;
+    }
+    if (i + 1 < tokens.length && tokens[i + 1].tokenType.name === "Dot") {
+      continue;
+    }
+    if (i > 0 && tokens[i - 1].tokenType.name === "Dot" && i + 1 < tokens.length && tokens[i + 1].tokenType.name === "Dot") {
+      continue;
+    }
+    if (i + 1 < tokens.length && tokens[i + 1].tokenType.name === "LParen") {
+      continue;
+    }
+    const image = name === "QuotedIdentifier" ? token.image.slice(1, -1) : token.image;
+    const lower = image.toLowerCase();
+    if (tableAndAliasSet.has(lower)) {
+      continue;
+    }
+    result.add(lower);
+  }
+  return result;
+}
 function getContentAssist(fullSql, cursorOffset) {
   const fullTokens = QuestDBLexer.tokenize(fullSql).tokens;
   for (const token of fullTokens) {
@@ -9646,7 +9672,8 @@ function getContentAssist(fullSql, cursorOffset) {
         isMidWord: true,
         lexErrors: [],
         suggestColumns: false,
-        suggestTables: false
+        suggestTables: false,
+        referencedColumns: /* @__PURE__ */ new Set()
       };
     }
   }
@@ -9698,6 +9725,15 @@ function getContentAssist(fullSql, cursorOffset) {
   if (tablesInScope.length === 0 && qualifiedRef) {
     tablesInScope.push(qualifiedRef);
   }
+  const tableAndAliasSet = /* @__PURE__ */ new Set();
+  for (const t of tablesInScope) {
+    tableAndAliasSet.add(t.table.toLowerCase());
+    if (t.alias) tableAndAliasSet.add(t.alias.toLowerCase());
+  }
+  const referencedColumns = extractReferencedColumns(
+    tokensForAssist,
+    tableAndAliasSet
+  );
   return {
     nextTokenTypes,
     tablesInScope,
@@ -9707,7 +9743,8 @@ function getContentAssist(fullSql, cursorOffset) {
     lexErrors: lexResult.errors,
     qualifiedTableRef: qualifiedRef?.table,
     suggestColumns,
-    suggestTables
+    suggestTables,
+    referencedColumns
   };
 }
 function getNextValidTokens(sql) {
@@ -10287,6 +10324,35 @@ var TABLE_NAME_TOKENS = /* @__PURE__ */ new Set([
   "Table",
   "View"
 ]);
+function buildColumnIndex(schema) {
+  const index = /* @__PURE__ */ new Map();
+  for (const table of schema.tables) {
+    const key = table.name.toLowerCase();
+    const cols = schema.columns[key];
+    if (cols) {
+      index.set(key, new Set(cols.map((c) => c.name.toLowerCase())));
+    }
+  }
+  return index;
+}
+function rankTableSuggestions(suggestions, referencedColumns, columnIndex) {
+  if (referencedColumns.size === 0) return;
+  const scores = /* @__PURE__ */ new Map();
+  for (const [tableName, colNames] of columnIndex) {
+    let count = 0;
+    for (const ref of referencedColumns) {
+      if (colNames.has(ref)) count++;
+    }
+    if (count > 0) scores.set(tableName, count);
+  }
+  if (scores.size === 0) return;
+  for (const s of suggestions) {
+    if (s.kind !== "table" /* Table */) continue;
+    const score = scores.get(s.label.toLowerCase());
+    if (score === void 0) continue;
+    s.priority = score === referencedColumns.size ? 1 /* High */ : 2 /* Medium */;
+  }
+}
 function getLastSignificantTokens(tokens) {
   const result = [];
   for (let i = tokens.length - 1; i >= 0; i--) {
@@ -10310,6 +10376,7 @@ function createAutocompleteProvider(schema) {
       ])
     )
   };
+  const columnIndex = buildColumnIndex(normalizedSchema);
   return {
     getSuggestions(query, cursorOffset) {
       const {
@@ -10320,7 +10387,8 @@ function createAutocompleteProvider(schema) {
         isMidWord,
         qualifiedTableRef,
         suggestColumns,
-        suggestTables
+        suggestTables,
+        referencedColumns
       } = getContentAssist(query, cursorOffset);
       const effectiveSchema = Object.keys(cteColumns).length > 0 ? {
         ...normalizedSchema,
@@ -10348,7 +10416,7 @@ function createAutocompleteProvider(schema) {
         }
       }
       if (nextTokenTypes.length > 0) {
-        return buildSuggestions(
+        const suggestions = buildSuggestions(
           nextTokenTypes,
           effectiveSchema,
           effectiveTablesInScope,
@@ -10358,6 +10426,10 @@ function createAutocompleteProvider(schema) {
             isMidWord
           }
         );
+        if (suggestTables) {
+          rankTableSuggestions(suggestions, referencedColumns, columnIndex);
+        }
+        return suggestions;
       }
       const fallbackTokens = isMidWord && tokensBefore.length > 0 ? tokensBefore.slice(0, -1) : tokensBefore;
       const [lastFallback] = getLastSignificantTokens(fallbackTokens);
@@ -10386,6 +10458,7 @@ function createAutocompleteProvider(schema) {
             });
           }
         }
+        rankTableSuggestions(suggestions, referencedColumns, columnIndex);
         return suggestions;
       }
       return [];

package/dist/index.js

@@ -9570,6 +9570,32 @@ function inferTableFromQualifiedRef(tokensBefore, isMidWord) {
   const table = tableToken.tokenType.name === "QuotedIdentifier" ? tableToken.image.slice(1, -1) : tableToken.image;
   return { table };
 }
+function extractReferencedColumns(tokens, tableAndAliasSet) {
+  const result = /* @__PURE__ */ new Set();
+  for (let i = 0; i < tokens.length; i++) {
+    const token = tokens[i];
+    const name = token.tokenType.name;
+    if (name !== "Identifier" && name !== "QuotedIdentifier" && !IDENTIFIER_KEYWORD_TOKENS.has(name)) {
+      continue;
+    }
+    if (i + 1 < tokens.length && tokens[i + 1].tokenType.name === "Dot") {
+      continue;
+    }
+    if (i > 0 && tokens[i - 1].tokenType.name === "Dot" && i + 1 < tokens.length && tokens[i + 1].tokenType.name === "Dot") {
+      continue;
+    }
+    if (i + 1 < tokens.length && tokens[i + 1].tokenType.name === "LParen") {
+      continue;
+    }
+    const image = name === "QuotedIdentifier" ? token.image.slice(1, -1) : token.image;
+    const lower = image.toLowerCase();
+    if (tableAndAliasSet.has(lower)) {
+      continue;
+    }
+    result.add(lower);
+  }
+  return result;
+}
 function getContentAssist(fullSql, cursorOffset) {
   const fullTokens = QuestDBLexer.tokenize(fullSql).tokens;
   for (const token of fullTokens) {
@@ -9586,7 +9612,8 @@ function getContentAssist(fullSql, cursorOffset) {
         isMidWord: true,
         lexErrors: [],
         suggestColumns: false,
-        suggestTables: false
+        suggestTables: false,
+        referencedColumns: /* @__PURE__ */ new Set()
       };
     }
   }
@@ -9638,6 +9665,15 @@ function getContentAssist(fullSql, cursorOffset) {
   if (tablesInScope.length === 0 && qualifiedRef) {
     tablesInScope.push(qualifiedRef);
   }
+  const tableAndAliasSet = /* @__PURE__ */ new Set();
+  for (const t of tablesInScope) {
+    tableAndAliasSet.add(t.table.toLowerCase());
+    if (t.alias) tableAndAliasSet.add(t.alias.toLowerCase());
+  }
+  const referencedColumns = extractReferencedColumns(
+    tokensForAssist,
+    tableAndAliasSet
+  );
   return {
     nextTokenTypes,
     tablesInScope,
@@ -9647,7 +9683,8 @@ function getContentAssist(fullSql, cursorOffset) {
     lexErrors: lexResult.errors,
     qualifiedTableRef: qualifiedRef?.table,
     suggestColumns,
-    suggestTables
+    suggestTables,
+    referencedColumns
   };
 }
 function getNextValidTokens(sql) {
@@ -10227,6 +10264,35 @@ var TABLE_NAME_TOKENS = /* @__PURE__ */ new Set([
   "Table",
   "View"
 ]);
+function buildColumnIndex(schema) {
+  const index = /* @__PURE__ */ new Map();
+  for (const table of schema.tables) {
+    const key = table.name.toLowerCase();
+    const cols = schema.columns[key];
+    if (cols) {
+      index.set(key, new Set(cols.map((c) => c.name.toLowerCase())));
+    }
+  }
+  return index;
+}
+function rankTableSuggestions(suggestions, referencedColumns, columnIndex) {
+  if (referencedColumns.size === 0) return;
+  const scores = /* @__PURE__ */ new Map();
+  for (const [tableName, colNames] of columnIndex) {
+    let count = 0;
+    for (const ref of referencedColumns) {
+      if (colNames.has(ref)) count++;
+    }
+    if (count > 0) scores.set(tableName, count);
+  }
+  if (scores.size === 0) return;
+  for (const s of suggestions) {
+    if (s.kind !== "table" /* Table */) continue;
+    const score = scores.get(s.label.toLowerCase());
+    if (score === void 0) continue;
+    s.priority = score === referencedColumns.size ? 1 /* High */ : 2 /* Medium */;
+  }
+}
 function getLastSignificantTokens(tokens) {
   const result = [];
   for (let i = tokens.length - 1; i >= 0; i--) {
@@ -10250,6 +10316,7 @@ function createAutocompleteProvider(schema) {
       ])
     )
   };
+  const columnIndex = buildColumnIndex(normalizedSchema);
   return {
     getSuggestions(query, cursorOffset) {
       const {
@@ -10260,7 +10327,8 @@ function createAutocompleteProvider(schema) {
         isMidWord,
         qualifiedTableRef,
         suggestColumns,
-        suggestTables
+        suggestTables,
+        referencedColumns
       } = getContentAssist(query, cursorOffset);
       const effectiveSchema = Object.keys(cteColumns).length > 0 ? {
         ...normalizedSchema,
@@ -10288,7 +10356,7 @@ function createAutocompleteProvider(schema) {
         }
       }
       if (nextTokenTypes.length > 0) {
-        return buildSuggestions(
+        const suggestions = buildSuggestions(
           nextTokenTypes,
           effectiveSchema,
           effectiveTablesInScope,
@@ -10298,6 +10366,10 @@ function createAutocompleteProvider(schema) {
             isMidWord
           }
         );
+        if (suggestTables) {
+          rankTableSuggestions(suggestions, referencedColumns, columnIndex);
+        }
+        return suggestions;
       }
       const fallbackTokens = isMidWord && tokensBefore.length > 0 ? tokensBefore.slice(0, -1) : tokensBefore;
       const [lastFallback] = getLastSignificantTokens(fallbackTokens);
@@ -10326,6 +10398,7 @@ function createAutocompleteProvider(schema) {
             });
           }
         }
+        rankTableSuggestions(suggestions, referencedColumns, columnIndex);
         return suggestions;
       }
       return [];

package/package.json

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