harden parser/autocomplete and add npm-ready build + CI setup

Author: emrberk

.github/workflows/ci.yml

@@ -0,0 +1,26 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: yarn
+
+      - run: yarn
+
+      - run: yarn build
+
+      - run: yarn lint
+
+      - run: yarn test

CHANGELOG.md

@@ -0,0 +1,4 @@
+# Changelog
+
+## 0.1.0
+- Initial release

README.md

@@ -1,4 +1,4 @@
-# questdb-sql-parser
+# @questdb/questdb-sql-parser
 
 A production-ready SQL parser for [QuestDB](https://questdb.io/) syntax, built with [Chevrotain](https://chevrotain.io/). Parses SQL into a fully typed AST, converts AST back to SQL, and provides context-aware autocomplete — all in a single package.
 
@@ -17,7 +17,7 @@ A production-ready SQL parser for [QuestDB](https://questdb.io/) syntax, built w
 ### Parse SQL to AST
 
 ```typescript
-import { parseToAst } from "questdb-sql-parser";
+import { parseToAst } from "@questdb/questdb-sql-parser";
 
 const result = parseToAst("SELECT * FROM trades WHERE symbol = 'BTC-USD'");
 
@@ -39,7 +39,7 @@ if (result.errors.length === 0) {
 ### Convert AST back to SQL
 
 ```typescript
-import { parseToAst, toSql } from "questdb-sql-parser";
+import { parseToAst, toSql } from "@questdb/questdb-sql-parser";
 
 const result = parseToAst("SELECT avg(price) FROM trades SAMPLE BY 1h FILL(PREV)");
 const sql = toSql(result.ast);
@@ -49,7 +49,7 @@ const sql = toSql(result.ast);
 ### Parse a single statement
 
 ```typescript
-import { parseOne } from "questdb-sql-parser";
+import { parseOne } from "@questdb/questdb-sql-parser";
 
 const stmt = parseOne("INSERT INTO trades VALUES (now(), 'BTC', 42000.50)");
 console.log(stmt.type); // "insert"
@@ -58,7 +58,7 @@ console.log(stmt.type); // "insert"
 ### Parse multiple statements
 
 ```typescript
-import { parseStatements } from "questdb-sql-parser";
+import { parseStatements } from "@questdb/questdb-sql-parser";
 
 const statements = parseStatements(`
   SELECT * FROM trades
@@ -72,7 +72,7 @@ console.log(statements.length); // 3
 ### Autocomplete
 
 ```typescript
-import { createAutocompleteProvider } from "questdb-sql-parser";
+import { createAutocompleteProvider } from "@questdb/questdb-sql-parser";
 
 const provider = createAutocompleteProvider({
   tables: [
@@ -204,7 +204,7 @@ The parser uses Chevrotain's [CST pattern](https://chevrotain.io/docs/guide/conc
 Arrays of keywords, functions, data types, operators, and constants for syntax highlighting integration:
 
 ```typescript
-import { keywords, functions, dataTypes, operators, constants } from "questdb-sql-parser";
+import { keywords, functions, dataTypes, operators, constants } from "@questdb/questdb-sql-parser/grammar";
 ```
 
 ## Development

eslint.config.ts

@@ -7,7 +7,7 @@ import { Linter } from "eslint"
 
 export default [
   {
-    ignores: ["dist/", "node_modules/", "eslint.config.ts", "src/parser/cst-types.d.ts"],
+    ignores: ["dist/", "node_modules/", "eslint.config.ts", "tsup.config.ts", "src/parser/cst-types.d.ts"],
   },
   {
     files: ["**/*.{js,ts}"],
@@ -27,11 +27,11 @@ export default [
     },
   },
   {
-    files: ["src/**/*.ts"],
+    files: ["src/**/*.ts", "tests/**/*.ts"],
     languageOptions: {
       parser: tseslint.parser,
       parserOptions: {
-        project: "./tsconfig.json",
+        projectService: true,
         tsconfigRootDir: import.meta.dirname,
       },
     },
@@ -81,6 +81,14 @@ export default [
       "no-shadow-restricted-names": "off",
     },
   },
+  {
+    files: ["tests/**/*.ts"],
+    languageOptions: {
+      globals: {
+        ...globals.vitest,
+      },
+    },
+  },
 
   prettierConfig,
 ] satisfies Linter.Config[]

package.json

@@ -3,23 +3,43 @@
   "version": "0.1.0",
   "description": "SQL parser for QuestDB syntax using Chevrotain",
   "type": "module",
-  "main": "dist/index.js",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
+  "sideEffects": false,
   "exports": {
     ".": {
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.cjs"
+      }
+    },
+    "./grammar": {
+      "import": {
+        "types": "./dist/grammar/index.d.ts",
+        "default": "./dist/grammar/index.js"
+      },
+      "require": {
+        "types": "./dist/grammar/index.d.ts",
+        "default": "./dist/grammar/index.cjs"
+      }
     }
   },
   "packageManager": "yarn@4.9.1",
   "scripts": {
-    "build": "tsc",
+    "build": "tsup && tsc -p tsconfig.build.json",
+    "typecheck": "tsc --noEmit",
     "test": "vitest run",
     "test:watch": "vitest",
     "test:coverage": "vitest run --coverage",
     "clean": "rm -rf dist coverage",
-    "lint": "eslint src/",
-    "lint:fix": "eslint src/ --fix"
+    "lint": "eslint src/ tests/",
+    "lint:fix": "eslint src/ tests/ --fix",
+    "prepublishOnly": "yarn clean && yarn build"
   },
   "keywords": [
     "questdb",
@@ -31,27 +51,34 @@
   "files": [
     "dist",
     "README.md",
+    "CHANGELOG.md",
     "LICENSE"
   ],
+  "engines": {
+    "node": ">=18.18.0"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/questdb/questdb-sql-parser.git"
   },
   "homepage": "https://questdb.com",
+  "bugs": {
+    "url": "https://github.com/questdb/questdb-sql-parser/issues"
+  },
   "license": "Apache-2.0",
   "dependencies": {
     "chevrotain": "^11.1.1"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@types/jest": "^30.0.0",
     "@types/node": "^25.2.0",
     "eslint": "^10.0.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.5",
     "globals": "^17.3.0",
     "jiti": "^2.6.1",
     "prettier": "^3.8.1",
+    "tsup": "^8.5.1",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.55.0",
     "vitest": "^4.0.18"

src/autocomplete/content-assist.ts

@@ -1,7 +1,8 @@
 import { type ILexingError, IToken, TokenType } from "chevrotain"
-import { parser } from "../parser/parser"
+import { parser, parse as parseRaw } from "../parser/parser"
+import { visitor } from "../parser/visitor"
 import { QuestDBLexer } from "../parser/lexer"
-import { parseToAst } from "../index"
+import type { Statement } from "../parser/ast"
 import { IDENTIFIER_KEYWORD_TOKENS } from "./token-classification"
 
 // =============================================================================
@@ -47,7 +48,11 @@ function normalizeTableName(value: unknown): string | undefined {
   if (typeof value === "object" && value !== null) {
     const obj = value as Record<string, unknown>
     if (Array.isArray(obj.parts)) {
-      return (obj.parts as string[]).join(".")
+      // Use only the last part (table name) for schema lookup.
+      // Schema-qualified names like "public.trades" should resolve to "trades"
+      // since the schema columns map is keyed by bare table name.
+      const parts = obj.parts as string[]
+      return parts[parts.length - 1]
     }
     if (typeof obj.name === "string") return obj.name
   }
@@ -66,7 +71,7 @@ function extractTablesFromAst(ast: unknown): TableRef[] {
     const n = node as Record<string, unknown>
 
     // Handle table references in FROM clause
-    if (n.type === "table_ref" || n.type === "tableRef") {
+    if (n.type === "tableRef") {
       const tableName = normalizeTableName(n.table ?? n.name)
       if (tableName) {
         tables.push({
@@ -151,12 +156,13 @@ function extractTablesFromAst(ast: unknown): TableRef[] {
 function extractTables(fullSql: string, tokens: IToken[]): TableRef[] {
   // First, try to parse and extract from AST
   try {
-    const result = parseToAst(fullSql)
-    if (result.ast && result.ast.length > 0) {
-      return extractTablesFromAst(result.ast)
+    const { cst } = parseRaw(fullSql)
+    const ast = visitor.visit(cst) as Statement[]
+    if (ast && ast.length > 0) {
+      return extractTablesFromAst(ast)
     }
-  } catch (e) {
-    // Parsing failed, fall through to token-based extraction
+  } catch {
+    // Parsing or visitor failed, fall through to token-based extraction
   }
 
   // Fallback: extract from tokens by looking for table name patterns
@@ -194,7 +200,9 @@ function extractTables(fullSql: string, tokens: IToken[]): TableRef[] {
       i += 2
     }
 
-    return { name: parts.join("."), nextIndex: i }
+    // Use only the last part (table name) for schema lookup.
+    // Schema-qualified names like "metrics.trades" resolve to "trades".
+    return { name: parts[parts.length - 1], nextIndex: i }
   }
 
   for (let i = 0; i < tokens.length; i++) {

src/autocomplete/index.ts

@@ -30,7 +30,4 @@ export {
 } from "./token-classification"
 
 // Suggestion building (for advanced use cases)
-export {
-  buildSuggestions,
-  buildFallbackSuggestions,
-} from "./suggestion-builder"
+export { buildSuggestions } from "./suggestion-builder"

src/autocomplete/suggestion-builder.ts

@@ -138,7 +138,7 @@ export function buildSuggestions(
       label: keyword,
       kind,
       insertText: keyword,
-      filterText: name.toLowerCase(),
+      filterText: keyword.toLowerCase(),
       priority,
     })
   }
@@ -223,43 +223,11 @@ export function buildSuggestions(
         label: display,
         kind: SuggestionKind.Keyword,
         insertText: display,
-        filterText: name.toLowerCase(),
+        filterText: display.toLowerCase(),
         priority: SuggestionPriority.Low,
       })
     }
   }
 
   return suggestions
 }
-
-/**
- * Build fallback suggestions when parser can't determine valid tokens.
- * Returns all columns and tables as a generic fallback.
- */
-export function buildFallbackSuggestions(schema: SchemaInfo): Suggestion[] {
-  const suggestions: Suggestion[] = []
-
-  // Add all columns
-  const allColumns = getAllColumns(schema)
-  for (const col of allColumns) {
-    suggestions.push({
-      label: col.name,
-      kind: SuggestionKind.Column,
-      insertText: col.name,
-      detail: `${col.tableName}.${col.name} (${col.type})`,
-      priority: SuggestionPriority.High,
-    })
-  }
-
-  // Add all tables
-  for (const table of schema.tables) {
-    suggestions.push({
-      label: table.name,
-      kind: SuggestionKind.Table,
-      insertText: table.name,
-      priority: SuggestionPriority.MediumLow,
-    })
-  }
-
-  return suggestions
-}