diff --git a/.cursorrules b/.cursorrules new file mode 100644 index 0000000..a167dc3 --- /dev/null +++ b/.cursorrules @@ -0,0 +1,20 @@ +# Principles + +- Follow the project's existing conventions and patterns. +- Prefer strong typing throughout the codebase. +- Avoid using `any` or `unknown` types unless absolutely necessary. +- Do not use type assertions; instead, define or refine types as needed. +- Create and use explicit types or interfaces for complex structures. +- Prefer using node-sql-parser's API and types for SQL parsing and analysis. + +# Code Style + +- Prefer concise code changes and minimal extra explanatory text. +- Keep code changes minimal and focused on the requested functionality. + +# Development Workflow + +- Always use `pnpm test` or its variations to run tests. +- Always use `pnpm lint` to run linting. +- Always use `pnpm typecheck` to run typechecking. +- Ensure all code changes pass tests, linting, and typechecking before merging. diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml index 7c0b895..c8ce21c 100644 --- a/.github/workflows/demo.yml +++ b/.github/workflows/demo.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: ⎔ Setup pnpm uses: pnpm/action-setup@v4 @@ -39,7 +39,7 @@ jobs: uses: actions/configure-pages@v5 - name: 📤 Upload artifact - uses: actions/upload-pages-artifact@v3 + uses: actions/upload-pages-artifact@v4 with: path: './demo/dist' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 365889d..f73dd70 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 0 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ab98c6e..5a20e21 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: pull-requests: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: ⎔ Setup pnpm uses: pnpm/action-setup@v4 @@ -46,7 +46,7 @@ jobs: security: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: 🔍 Run CodeQL uses: github/codeql-action/init@v3 @@ -60,7 +60,7 @@ jobs: spelling: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: 🔍 Spell Check Repo - uses: crate-ci/typos@v1.35.3 + uses: crate-ci/typos@v1.35.5 diff --git a/demo/custom-renderers.ts b/demo/custom-renderers.ts index 1949c20..207d9a6 100644 --- a/demo/custom-renderers.ts +++ b/demo/custom-renderers.ts @@ -30,7 +30,7 @@ interface TableMetadata { indexes: IndexMetadata[]; } -export type Schema = "users" | "posts" | "orders" | "customers" | "categories"; +export type Schema = "users" | "posts" | "orders" | "customers" | "categories" | "Users_Posts"; export const tableTooltipRenderer = (data: NamespaceTooltipData) => { // Show table name, columns, description, primary key, foreign key, index, unique, check, default, comment @@ -292,6 +292,24 @@ function getTableMetadata(tableName: string): TableMetadata { { name: "idx_categories_parent", columns: ["parent_id"], unique: false }, ], }, + Users_Posts: { + description: "User-Post relationships", + rowCount: "1,234", + columns: { + user_id: { type: "INT", notNull: true, foreignKey: true, comment: "User who posted" }, + post_id: { + type: "INT", + notNull: true, + foreignKey: true, + comment: "Post being commented on", + }, + }, + foreignKeys: [ + { column: "user_id", referencedTable: "users", referencedColumn: "id" }, + { column: "post_id", referencedTable: "posts", referencedColumn: "id" }, + ], + indexes: [{ name: "idx_users_posts_user", columns: ["user_id"], unique: false }], + }, }; return ( diff --git a/demo/data.ts b/demo/data.ts new file mode 100644 index 0000000..d0d95c7 --- /dev/null +++ b/demo/data.ts @@ -0,0 +1,81 @@ +import type { Schema } from "./custom-renderers"; + +// Default SQL content for the demo +export const defaultSqlDoc = `-- Welcome to the SQL Editor Demo! +-- Try editing the queries below to see real-time validation + +WITH cte_name AS ( + SELECT * FROM users +) + +-- Valid queries (no errors): +SELECT id, name, email +FROM users +WHERE active = true +ORDER BY created_at DESC; + +SELECT + u.name, + p.title, + p.created_at +FROM users u +JOIN posts p ON u.id = p.user_id +WHERE u.status = 'active' + AND p.published = true +LIMIT 10; + +-- Try editing these to create syntax errors: +-- Uncomment the lines below to see error highlighting + +-- SELECT * FROM; -- Missing table name +-- SELECT * FORM users; -- Typo in FROM keyword +-- INSERT INTO VALUES (1, 2); -- Missing table name +-- UPDATE SET name = 'test'; -- Missing table name + +-- Complex example with subquery: +SELECT + customer_id, + order_date, + total_amount, + (SELECT AVG(total_amount) FROM orders) as avg_order_value +FROM orders +WHERE order_date >= '2024-01-01' + AND total_amount > ( + SELECT AVG(total_amount) * 0.8 + FROM orders + WHERE YEAR(order_date) = 2024 + ) +ORDER BY total_amount DESC; +`; + +export const schema: Record = { + // Users table + users: ["id", "name", "email", "active", "status", "created_at", "updated_at", "profile_id"], + // Posts table + posts: [ + "id", + "title", + "content", + "user_id", + "published", + "created_at", + "updated_at", + "category_id", + ], + // Orders table + orders: [ + "id", + "customer_id", + "order_date", + "total_amount", + "status", + "shipping_address", + "created_at", + ], + // Customers table (additional example) + customers: ["id", "first_name", "last_name", "email", "phone", "address", "city", "country"], + // Categories table + categories: ["id", "name", "description", "parent_id"], + // Users_Posts table + Users_Posts: ["user_id", "post_id"], +}; diff --git a/demo/index.html b/demo/index.html index 0dc206b..b038d16 100644 --- a/demo/index.html +++ b/demo/index.html @@ -34,7 +34,7 @@

SQL Editor with Diagnostics

- diff --git a/demo/index.ts b/demo/index.ts index 96be798..bedebc2 100644 --- a/demo/index.ts +++ b/demo/index.ts @@ -1,6 +1,6 @@ import { acceptCompletion } from "@codemirror/autocomplete"; -import { PostgreSQL, sql } from "@codemirror/lang-sql"; -import { type EditorState, StateEffect, StateField } from "@codemirror/state"; +import { PostgreSQL, type SQLDialect, sql } from "@codemirror/lang-sql"; +import { Compartment, type EditorState, StateEffect, StateField } from "@codemirror/state"; import { keymap } from "@codemirror/view"; import { basicSetup, EditorView } from "codemirror"; import { @@ -11,85 +11,9 @@ import { type SupportedDialects, sqlExtension, } from "../src/index.js"; -import { type Schema, tableTooltipRenderer } from "./custom-renderers.js"; - -// Default SQL content for the demo -const defaultSqlDoc = `-- Welcome to the SQL Editor Demo! --- Try editing the queries below to see real-time validation - -WITH cte_name AS ( - SELECT * FROM users -) - --- Valid queries (no errors): -SELECT id, name, email -FROM users -WHERE active = true -ORDER BY created_at DESC; - -SELECT - u.name, - p.title, - p.created_at -FROM users u -JOIN posts p ON u.id = p.user_id -WHERE u.status = 'active' - AND p.published = true -LIMIT 10; - --- Try editing these to create syntax errors: --- Uncomment the lines below to see error highlighting - --- SELECT * FROM; -- Missing table name --- SELECT * FORM users; -- Typo in FROM keyword --- INSERT INTO VALUES (1, 2); -- Missing table name --- UPDATE SET name = 'test'; -- Missing table name - --- Complex example with subquery: -SELECT - customer_id, - order_date, - total_amount, - (SELECT AVG(total_amount) FROM orders) as avg_order_value -FROM orders -WHERE order_date >= '2024-01-01' - AND total_amount > ( - SELECT AVG(total_amount) * 0.8 - FROM orders - WHERE YEAR(order_date) = 2024 - ) -ORDER BY total_amount DESC; -`; - -const schema: Record = { - // Users table - users: ["id", "name", "email", "active", "status", "created_at", "updated_at", "profile_id"], - // Posts table - posts: [ - "id", - "title", - "content", - "user_id", - "published", - "created_at", - "updated_at", - "category_id", - ], - // Orders table - orders: [ - "id", - "customer_id", - "order_date", - "total_amount", - "status", - "shipping_address", - "created_at", - ], - // Customers table (additional example) - customers: ["id", "first_name", "last_name", "email", "phone", "address", "city", "country"], - // Categories table - categories: ["id", "name", "description", "parent_id"], -}; +import { tableTooltipRenderer } from "./custom-renderers.js"; +import { defaultSqlDoc, schema } from "./data.js"; +import { guessSqlDialect } from "./utils.js"; let editor: EditorView; @@ -104,7 +28,7 @@ const completionKindStyles = { height: "12px", }; -const dialect = PostgreSQL; +const defaultDialect = PostgreSQL; const defaultKeymap = [ { @@ -148,7 +72,6 @@ const getKeywordDocs = async () => { }; const setDatabase = StateEffect.define(); - const databaseField = StateField.define({ create: () => "PostgreSQL", update: (prevValue, transaction) => { @@ -161,13 +84,45 @@ const databaseField = StateField.define({ }, }); +// Allows us to reconfigure the base sql extension without reloading the editor +const baseSqlCompartment = new Compartment(); + +const baseSqlExtension = (dialect: SQLDialect) => { + return sql({ + dialect: dialect, + // Example schema for autocomplete + schema: schema, + // Enable uppercase keywords for more traditional SQL style + upperCaseKeywords: true, + keywordCompletion: (label, _type) => { + return { + label, + keyword: label, + info: async () => { + const dom = document.createElement("div"); + const keywordDocs = await getKeywordDocs(); + const description = keywordDocs[label.toLocaleLowerCase()]; + if (!description) { + return null; + } + dom.innerHTML = DefaultSqlTooltipRenders.keyword({ + keyword: label, + info: description, + }); + return dom; + }, + }; + }, + }); +}; + // Initialize the SQL editor function initializeEditor() { // Use the same parser const parser = new NodeSqlParser({ getParserOptions: (state: EditorState) => { return { - database: getDialect(state), + database: getDatabase(state), }; }, }); @@ -177,32 +132,7 @@ function initializeEditor() { EditorView.lineWrapping, keymap.of(defaultKeymap), databaseField, - sql({ - dialect: dialect, - // Example schema for autocomplete - schema: schema, - // Enable uppercase keywords for more traditional SQL style - upperCaseKeywords: true, - keywordCompletion: (label, _type) => { - return { - label, - keyword: label, - info: async () => { - const dom = document.createElement("div"); - const keywordDocs = await getKeywordDocs(); - const description = keywordDocs[label.toLocaleLowerCase()]; - if (!description) { - return null; - } - dom.innerHTML = DefaultSqlTooltipRenders.keyword({ - keyword: label, - info: description, - }); - return dom; - }, - }; - }, - }), + baseSqlCompartment.of(baseSqlExtension(defaultDialect)), sqlExtension({ // Linter extension configuration linterConfig: { @@ -237,7 +167,7 @@ function initializeEditor() { parser, }, }), - dialect.language.data.of({ + defaultDialect.language.data.of({ autocomplete: cteCompletionSource, }), // Custom theme for better SQL editing @@ -339,15 +269,16 @@ function setupExampleButtons() { }); } -function getDialect(state: EditorState): SupportedDialects { +function getDatabase(state: EditorState): SupportedDialects { return state.field(databaseField); } -function setupDialectSelect() { - const select = document.querySelector("#dialect-select"); +function setupDatabaseSelect() { + const select = document.querySelector("#database-select"); if (select) { select.addEventListener("change", (e) => { const value = (e.target as HTMLSelectElement).value as SupportedDialects; + updateSqlDialect(editor, guessSqlDialect(value)); editor.dispatch({ effects: [setDatabase.of(value)], }); @@ -355,11 +286,17 @@ function setupDialectSelect() { } } +function updateSqlDialect(view: EditorView, dialect: SQLDialect) { + view.dispatch({ + effects: [baseSqlCompartment.reconfigure(baseSqlExtension(dialect))], + }); +} + // Initialize everything when the page loads document.addEventListener("DOMContentLoaded", () => { initializeEditor(); setupExampleButtons(); - setupDialectSelect(); + setupDatabaseSelect(); console.log("SQL Editor Demo initialized!"); console.log("Features:"); diff --git a/demo/utils.ts b/demo/utils.ts new file mode 100644 index 0000000..be0d14a --- /dev/null +++ b/demo/utils.ts @@ -0,0 +1,19 @@ +import { MySQL, PostgreSQL, type SQLDialect, SQLite } from "@codemirror/lang-sql"; +import { DuckDBDialect } from "../src/dialects/duckdb/duckdb"; +import type { SupportedDialects } from "../src/sql/parser"; + +export function guessSqlDialect(dialect: SupportedDialects): SQLDialect { + // Other supported dialects: Cassandra, MSSQL, MariaSQL, MySQL, PLSQL, PostgreSQL + switch (dialect) { + case "PostgreSQL": + return PostgreSQL; + case "DuckDB": + return DuckDBDialect; + case "MySQL": + return MySQL; + case "Sqlite": + return SQLite; + default: + return PostgreSQL; + } +} diff --git a/package.json b/package.json index ca94dac..e523308 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package.json", "name": "@marimo-team/codemirror-sql", - "version": "0.1.3", + "version": "0.2.0", "publishConfig": { "access": "public" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7a0b047..ad06bae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -23,7 +23,7 @@ importers: devDependencies: '@biomejs/biome': specifier: ^2.1.3 - version: 2.1.4 + version: 2.2.2 '@codemirror/lang-sql': specifier: ^6.9.1 version: 6.9.1 @@ -44,7 +44,7 @@ importers: version: 5.9.2 vite: specifier: ^7.0.6 - version: 7.1.1(@types/node@22.13.1)(yaml@2.8.0) + version: 7.1.3(@types/node@22.13.1)(yaml@2.8.0) vitest: specifier: ^3.2.4 version: 3.2.4(@types/node@22.13.1)(happy-dom@15.11.7)(jsdom@26.1.0)(yaml@2.8.0) @@ -79,55 +79,55 @@ packages: resolution: {integrity: sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==} engines: {node: '>=18'} - '@biomejs/biome@2.1.4': - resolution: {integrity: sha512-QWlrqyxsU0FCebuMnkvBIkxvPqH89afiJzjMl+z67ybutse590jgeaFdDurE9XYtzpjRGTI1tlUZPGWmbKsElA==} + '@biomejs/biome@2.2.2': + resolution: {integrity: sha512-j1omAiQWCkhuLgwpMKisNKnsM6W8Xtt1l0WZmqY/dFj8QPNkIoTvk4tSsi40FaAAkBE1PU0AFG2RWFBWenAn+w==} engines: {node: '>=14.21.3'} hasBin: true - '@biomejs/cli-darwin-arm64@2.1.4': - resolution: {integrity: sha512-sCrNENE74I9MV090Wq/9Dg7EhPudx3+5OiSoQOkIe3DLPzFARuL1dOwCWhKCpA3I5RHmbrsbNSRfZwCabwd8Qg==} + '@biomejs/cli-darwin-arm64@2.2.2': + resolution: {integrity: sha512-6ePfbCeCPryWu0CXlzsWNZgVz/kBEvHiPyNpmViSt6A2eoDf4kXs3YnwQPzGjy8oBgQulrHcLnJL0nkCh80mlQ==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [darwin] - '@biomejs/cli-darwin-x64@2.1.4': - resolution: {integrity: sha512-gOEICJbTCy6iruBywBDcG4X5rHMbqCPs3clh3UQ+hRKlgvJTk4NHWQAyHOXvaLe+AxD1/TNX1jbZeffBJzcrOw==} + '@biomejs/cli-darwin-x64@2.2.2': + resolution: {integrity: sha512-Tn4JmVO+rXsbRslml7FvKaNrlgUeJot++FkvYIhl1OkslVCofAtS35MPlBMhXgKWF9RNr9cwHanrPTUUXcYGag==} engines: {node: '>=14.21.3'} cpu: [x64] os: [darwin] - '@biomejs/cli-linux-arm64-musl@2.1.4': - resolution: {integrity: sha512-nYr7H0CyAJPaLupFE2cH16KZmRC5Z9PEftiA2vWxk+CsFkPZQ6dBRdcC6RuS+zJlPc/JOd8xw3uCCt9Pv41WvQ==} + '@biomejs/cli-linux-arm64-musl@2.2.2': + resolution: {integrity: sha512-/MhYg+Bd6renn6i1ylGFL5snYUn/Ct7zoGVKhxnro3bwekiZYE8Kl39BSb0MeuqM+72sThkQv4TnNubU9njQRw==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] - '@biomejs/cli-linux-arm64@2.1.4': - resolution: {integrity: sha512-juhEkdkKR4nbUi5k/KRp1ocGPNWLgFRD4NrHZSveYrD6i98pyvuzmS9yFYgOZa5JhaVqo0HPnci0+YuzSwT2fw==} + '@biomejs/cli-linux-arm64@2.2.2': + resolution: {integrity: sha512-JfrK3gdmWWTh2J5tq/rcWCOsImVyzUnOS2fkjhiYKCQ+v8PqM+du5cfB7G1kXas+7KQeKSWALv18iQqdtIMvzw==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] - '@biomejs/cli-linux-x64-musl@2.1.4': - resolution: {integrity: sha512-lvwvb2SQQHctHUKvBKptR6PLFCM7JfRjpCCrDaTmvB7EeZ5/dQJPhTYBf36BE/B4CRWR2ZiBLRYhK7hhXBCZAg==} + '@biomejs/cli-linux-x64-musl@2.2.2': + resolution: {integrity: sha512-ZCLXcZvjZKSiRY/cFANKg+z6Fhsf9MHOzj+NrDQcM+LbqYRT97LyCLWy2AS+W2vP+i89RyRM+kbGpUzbRTYWig==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] - '@biomejs/cli-linux-x64@2.1.4': - resolution: {integrity: sha512-Eoy9ycbhpJVYuR+LskV9s3uyaIkp89+qqgqhGQsWnp/I02Uqg2fXFblHJOpGZR8AxdB9ADy87oFVxn9MpFKUrw==} + '@biomejs/cli-linux-x64@2.2.2': + resolution: {integrity: sha512-Ogb+77edO5LEP/xbNicACOWVLt8mgC+E1wmpUakr+O4nKwLt9vXe74YNuT3T1dUBxC/SnrVmlzZFC7kQJEfquQ==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] - '@biomejs/cli-win32-arm64@2.1.4': - resolution: {integrity: sha512-3WRYte7orvyi6TRfIZkDN9Jzoogbv+gSvR+b9VOXUg1We1XrjBg6WljADeVEaKTvOcpVdH0a90TwyOQ6ue4fGw==} + '@biomejs/cli-win32-arm64@2.2.2': + resolution: {integrity: sha512-wBe2wItayw1zvtXysmHJQoQqXlTzHSpQRyPpJKiNIR21HzH/CrZRDFic1C1jDdp+zAPtqhNExa0owKMbNwW9cQ==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [win32] - '@biomejs/cli-win32-x64@2.1.4': - resolution: {integrity: sha512-tBc+W7anBPSFXGAoQW+f/+svkpt8/uXfRwDzN1DvnatkRMt16KIYpEi/iw8u9GahJlFv98kgHcIrSsZHZTR0sw==} + '@biomejs/cli-win32-x64@2.2.2': + resolution: {integrity: sha512-DAuHhHekGfiGb6lCcsT4UyxQmVwQiBCBUMwVra/dcOSs9q8OhfaZgey51MlekT3p8UwRqtXQfFuEJBhJNdLZwg==} engines: {node: '>=14.21.3'} cpu: [x64] os: [win32] @@ -184,158 +184,158 @@ packages: resolution: {integrity: sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==} engines: {node: '>=18'} - '@esbuild/aix-ppc64@0.25.8': - resolution: {integrity: sha512-urAvrUedIqEiFR3FYSLTWQgLu5tb+m0qZw0NBEasUeo6wuqatkMDaRT+1uABiGXEu5vqgPd7FGE1BhsAIy9QVA==} + '@esbuild/aix-ppc64@0.25.9': + resolution: {integrity: sha512-OaGtL73Jck6pBKjNIe24BnFE6agGl+6KxDtTfHhy1HmhthfKouEcOhqpSL64K4/0WCtbKFLOdzD/44cJ4k9opA==} engines: {node: '>=18'} cpu: [ppc64] os: [aix] - '@esbuild/android-arm64@0.25.8': - resolution: {integrity: sha512-OD3p7LYzWpLhZEyATcTSJ67qB5D+20vbtr6vHlHWSQYhKtzUYrETuWThmzFpZtFsBIxRvhO07+UgVA9m0i/O1w==} + '@esbuild/android-arm64@0.25.9': + resolution: {integrity: sha512-IDrddSmpSv51ftWslJMvl3Q2ZT98fUSL2/rlUXuVqRXHCs5EUF1/f+jbjF5+NG9UffUDMCiTyh8iec7u8RlTLg==} engines: {node: '>=18'} cpu: [arm64] os: [android] - '@esbuild/android-arm@0.25.8': - resolution: {integrity: sha512-RONsAvGCz5oWyePVnLdZY/HHwA++nxYWIX1atInlaW6SEkwq6XkP3+cb825EUcRs5Vss/lGh/2YxAb5xqc07Uw==} + '@esbuild/android-arm@0.25.9': + resolution: {integrity: sha512-5WNI1DaMtxQ7t7B6xa572XMXpHAaI/9Hnhk8lcxF4zVN4xstUgTlvuGDorBguKEnZO70qwEcLpfifMLoxiPqHQ==} engines: {node: '>=18'} cpu: [arm] os: [android] - '@esbuild/android-x64@0.25.8': - resolution: {integrity: sha512-yJAVPklM5+4+9dTeKwHOaA+LQkmrKFX96BM0A/2zQrbS6ENCmxc4OVoBs5dPkCCak2roAD+jKCdnmOqKszPkjA==} + '@esbuild/android-x64@0.25.9': + resolution: {integrity: sha512-I853iMZ1hWZdNllhVZKm34f4wErd4lMyeV7BLzEExGEIZYsOzqDWDf+y082izYUE8gtJnYHdeDpN/6tUdwvfiw==} engines: {node: '>=18'} cpu: [x64] os: [android] - '@esbuild/darwin-arm64@0.25.8': - resolution: {integrity: sha512-Jw0mxgIaYX6R8ODrdkLLPwBqHTtYHJSmzzd+QeytSugzQ0Vg4c5rDky5VgkoowbZQahCbsv1rT1KW72MPIkevw==} + '@esbuild/darwin-arm64@0.25.9': + resolution: {integrity: sha512-XIpIDMAjOELi/9PB30vEbVMs3GV1v2zkkPnuyRRURbhqjyzIINwj+nbQATh4H9GxUgH1kFsEyQMxwiLFKUS6Rg==} engines: {node: '>=18'} cpu: [arm64] os: [darwin] - '@esbuild/darwin-x64@0.25.8': - resolution: {integrity: sha512-Vh2gLxxHnuoQ+GjPNvDSDRpoBCUzY4Pu0kBqMBDlK4fuWbKgGtmDIeEC081xi26PPjn+1tct+Bh8FjyLlw1Zlg==} + '@esbuild/darwin-x64@0.25.9': + resolution: {integrity: sha512-jhHfBzjYTA1IQu8VyrjCX4ApJDnH+ez+IYVEoJHeqJm9VhG9Dh2BYaJritkYK3vMaXrf7Ogr/0MQ8/MeIefsPQ==} engines: {node: '>=18'} cpu: [x64] os: [darwin] - '@esbuild/freebsd-arm64@0.25.8': - resolution: {integrity: sha512-YPJ7hDQ9DnNe5vxOm6jaie9QsTwcKedPvizTVlqWG9GBSq+BuyWEDazlGaDTC5NGU4QJd666V0yqCBL2oWKPfA==} + '@esbuild/freebsd-arm64@0.25.9': + resolution: {integrity: sha512-z93DmbnY6fX9+KdD4Ue/H6sYs+bhFQJNCPZsi4XWJoYblUqT06MQUdBCpcSfuiN72AbqeBFu5LVQTjfXDE2A6Q==} engines: {node: '>=18'} cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-x64@0.25.8': - resolution: {integrity: sha512-MmaEXxQRdXNFsRN/KcIimLnSJrk2r5H8v+WVafRWz5xdSVmWLoITZQXcgehI2ZE6gioE6HirAEToM/RvFBeuhw==} + '@esbuild/freebsd-x64@0.25.9': + resolution: {integrity: sha512-mrKX6H/vOyo5v71YfXWJxLVxgy1kyt1MQaD8wZJgJfG4gq4DpQGpgTB74e5yBeQdyMTbgxp0YtNj7NuHN0PoZg==} engines: {node: '>=18'} cpu: [x64] os: [freebsd] - '@esbuild/linux-arm64@0.25.8': - resolution: {integrity: sha512-WIgg00ARWv/uYLU7lsuDK00d/hHSfES5BzdWAdAig1ioV5kaFNrtK8EqGcUBJhYqotlUByUKz5Qo6u8tt7iD/w==} + '@esbuild/linux-arm64@0.25.9': + resolution: {integrity: sha512-BlB7bIcLT3G26urh5Dmse7fiLmLXnRlopw4s8DalgZ8ef79Jj4aUcYbk90g8iCa2467HX8SAIidbL7gsqXHdRw==} engines: {node: '>=18'} cpu: [arm64] os: [linux] - '@esbuild/linux-arm@0.25.8': - resolution: {integrity: sha512-FuzEP9BixzZohl1kLf76KEVOsxtIBFwCaLupVuk4eFVnOZfU+Wsn+x5Ryam7nILV2pkq2TqQM9EZPsOBuMC+kg==} + '@esbuild/linux-arm@0.25.9': + resolution: {integrity: sha512-HBU2Xv78SMgaydBmdor38lg8YDnFKSARg1Q6AT0/y2ezUAKiZvc211RDFHlEZRFNRVhcMamiToo7bDx3VEOYQw==} engines: {node: '>=18'} cpu: [arm] os: [linux] - '@esbuild/linux-ia32@0.25.8': - resolution: {integrity: sha512-A1D9YzRX1i+1AJZuFFUMP1E9fMaYY+GnSQil9Tlw05utlE86EKTUA7RjwHDkEitmLYiFsRd9HwKBPEftNdBfjg==} + '@esbuild/linux-ia32@0.25.9': + resolution: {integrity: sha512-e7S3MOJPZGp2QW6AK6+Ly81rC7oOSerQ+P8L0ta4FhVi+/j/v2yZzx5CqqDaWjtPFfYz21Vi1S0auHrap3Ma3A==} engines: {node: '>=18'} cpu: [ia32] os: [linux] - '@esbuild/linux-loong64@0.25.8': - resolution: {integrity: sha512-O7k1J/dwHkY1RMVvglFHl1HzutGEFFZ3kNiDMSOyUrB7WcoHGf96Sh+64nTRT26l3GMbCW01Ekh/ThKM5iI7hQ==} + '@esbuild/linux-loong64@0.25.9': + resolution: {integrity: sha512-Sbe10Bnn0oUAB2AalYztvGcK+o6YFFA/9829PhOCUS9vkJElXGdphz0A3DbMdP8gmKkqPmPcMJmJOrI3VYB1JQ==} engines: {node: '>=18'} cpu: [loong64] os: [linux] - '@esbuild/linux-mips64el@0.25.8': - resolution: {integrity: sha512-uv+dqfRazte3BzfMp8PAQXmdGHQt2oC/y2ovwpTteqrMx2lwaksiFZ/bdkXJC19ttTvNXBuWH53zy/aTj1FgGw==} + '@esbuild/linux-mips64el@0.25.9': + resolution: {integrity: sha512-YcM5br0mVyZw2jcQeLIkhWtKPeVfAerES5PvOzaDxVtIyZ2NUBZKNLjC5z3/fUlDgT6w89VsxP2qzNipOaaDyA==} engines: {node: '>=18'} cpu: [mips64el] os: [linux] - '@esbuild/linux-ppc64@0.25.8': - resolution: {integrity: sha512-GyG0KcMi1GBavP5JgAkkstMGyMholMDybAf8wF5A70CALlDM2p/f7YFE7H92eDeH/VBtFJA5MT4nRPDGg4JuzQ==} + '@esbuild/linux-ppc64@0.25.9': + resolution: {integrity: sha512-++0HQvasdo20JytyDpFvQtNrEsAgNG2CY1CLMwGXfFTKGBGQT3bOeLSYE2l1fYdvML5KUuwn9Z8L1EWe2tzs1w==} engines: {node: '>=18'} cpu: [ppc64] os: [linux] - '@esbuild/linux-riscv64@0.25.8': - resolution: {integrity: sha512-rAqDYFv3yzMrq7GIcen3XP7TUEG/4LK86LUPMIz6RT8A6pRIDn0sDcvjudVZBiiTcZCY9y2SgYX2lgK3AF+1eg==} + '@esbuild/linux-riscv64@0.25.9': + resolution: {integrity: sha512-uNIBa279Y3fkjV+2cUjx36xkx7eSjb8IvnL01eXUKXez/CBHNRw5ekCGMPM0BcmqBxBcdgUWuUXmVWwm4CH9kg==} engines: {node: '>=18'} cpu: [riscv64] os: [linux] - '@esbuild/linux-s390x@0.25.8': - resolution: {integrity: sha512-Xutvh6VjlbcHpsIIbwY8GVRbwoviWT19tFhgdA7DlenLGC/mbc3lBoVb7jxj9Z+eyGqvcnSyIltYUrkKzWqSvg==} + '@esbuild/linux-s390x@0.25.9': + resolution: {integrity: sha512-Mfiphvp3MjC/lctb+7D287Xw1DGzqJPb/J2aHHcHxflUo+8tmN/6d4k6I2yFR7BVo5/g7x2Monq4+Yew0EHRIA==} engines: {node: '>=18'} cpu: [s390x] os: [linux] - '@esbuild/linux-x64@0.25.8': - resolution: {integrity: sha512-ASFQhgY4ElXh3nDcOMTkQero4b1lgubskNlhIfJrsH5OKZXDpUAKBlNS0Kx81jwOBp+HCeZqmoJuihTv57/jvQ==} + '@esbuild/linux-x64@0.25.9': + resolution: {integrity: sha512-iSwByxzRe48YVkmpbgoxVzn76BXjlYFXC7NvLYq+b+kDjyyk30J0JY47DIn8z1MO3K0oSl9fZoRmZPQI4Hklzg==} engines: {node: '>=18'} cpu: [x64] os: [linux] - '@esbuild/netbsd-arm64@0.25.8': - resolution: {integrity: sha512-d1KfruIeohqAi6SA+gENMuObDbEjn22olAR7egqnkCD9DGBG0wsEARotkLgXDu6c4ncgWTZJtN5vcgxzWRMzcw==} + '@esbuild/netbsd-arm64@0.25.9': + resolution: {integrity: sha512-9jNJl6FqaUG+COdQMjSCGW4QiMHH88xWbvZ+kRVblZsWrkXlABuGdFJ1E9L7HK+T0Yqd4akKNa/lO0+jDxQD4Q==} engines: {node: '>=18'} cpu: [arm64] os: [netbsd] - '@esbuild/netbsd-x64@0.25.8': - resolution: {integrity: sha512-nVDCkrvx2ua+XQNyfrujIG38+YGyuy2Ru9kKVNyh5jAys6n+l44tTtToqHjino2My8VAY6Lw9H7RI73XFi66Cg==} + '@esbuild/netbsd-x64@0.25.9': + resolution: {integrity: sha512-RLLdkflmqRG8KanPGOU7Rpg829ZHu8nFy5Pqdi9U01VYtG9Y0zOG6Vr2z4/S+/3zIyOxiK6cCeYNWOFR9QP87g==} engines: {node: '>=18'} cpu: [x64] os: [netbsd] - '@esbuild/openbsd-arm64@0.25.8': - resolution: {integrity: sha512-j8HgrDuSJFAujkivSMSfPQSAa5Fxbvk4rgNAS5i3K+r8s1X0p1uOO2Hl2xNsGFppOeHOLAVgYwDVlmxhq5h+SQ==} + '@esbuild/openbsd-arm64@0.25.9': + resolution: {integrity: sha512-YaFBlPGeDasft5IIM+CQAhJAqS3St3nJzDEgsgFixcfZeyGPCd6eJBWzke5piZuZ7CtL656eOSYKk4Ls2C0FRQ==} engines: {node: '>=18'} cpu: [arm64] os: [openbsd] - '@esbuild/openbsd-x64@0.25.8': - resolution: {integrity: sha512-1h8MUAwa0VhNCDp6Af0HToI2TJFAn1uqT9Al6DJVzdIBAd21m/G0Yfc77KDM3uF3T/YaOgQq3qTJHPbTOInaIQ==} + '@esbuild/openbsd-x64@0.25.9': + resolution: {integrity: sha512-1MkgTCuvMGWuqVtAvkpkXFmtL8XhWy+j4jaSO2wxfJtilVCi0ZE37b8uOdMItIHz4I6z1bWWtEX4CJwcKYLcuA==} engines: {node: '>=18'} cpu: [x64] os: [openbsd] - '@esbuild/openharmony-arm64@0.25.8': - resolution: {integrity: sha512-r2nVa5SIK9tSWd0kJd9HCffnDHKchTGikb//9c7HX+r+wHYCpQrSgxhlY6KWV1nFo1l4KFbsMlHk+L6fekLsUg==} + '@esbuild/openharmony-arm64@0.25.9': + resolution: {integrity: sha512-4Xd0xNiMVXKh6Fa7HEJQbrpP3m3DDn43jKxMjxLLRjWnRsfxjORYJlXPO4JNcXtOyfajXorRKY9NkOpTHptErg==} engines: {node: '>=18'} cpu: [arm64] os: [openharmony] - '@esbuild/sunos-x64@0.25.8': - resolution: {integrity: sha512-zUlaP2S12YhQ2UzUfcCuMDHQFJyKABkAjvO5YSndMiIkMimPmxA+BYSBikWgsRpvyxuRnow4nS5NPnf9fpv41w==} + '@esbuild/sunos-x64@0.25.9': + resolution: {integrity: sha512-WjH4s6hzo00nNezhp3wFIAfmGZ8U7KtrJNlFMRKxiI9mxEK1scOMAaa9i4crUtu+tBr+0IN6JCuAcSBJZfnphw==} engines: {node: '>=18'} cpu: [x64] os: [sunos] - '@esbuild/win32-arm64@0.25.8': - resolution: {integrity: sha512-YEGFFWESlPva8hGL+zvj2z/SaK+pH0SwOM0Nc/d+rVnW7GSTFlLBGzZkuSU9kFIGIo8q9X3ucpZhu8PDN5A2sQ==} + '@esbuild/win32-arm64@0.25.9': + resolution: {integrity: sha512-mGFrVJHmZiRqmP8xFOc6b84/7xa5y5YvR1x8djzXpJBSv/UsNK6aqec+6JDjConTgvvQefdGhFDAs2DLAds6gQ==} engines: {node: '>=18'} cpu: [arm64] os: [win32] - '@esbuild/win32-ia32@0.25.8': - resolution: {integrity: sha512-hiGgGC6KZ5LZz58OL/+qVVoZiuZlUYlYHNAmczOm7bs2oE1XriPFi5ZHHrS8ACpV5EjySrnoCKmcbQMN+ojnHg==} + '@esbuild/win32-ia32@0.25.9': + resolution: {integrity: sha512-b33gLVU2k11nVx1OhX3C8QQP6UHQK4ZtN56oFWvVXvz2VkDoe6fbG8TOgHFxEvqeqohmRnIHe5A1+HADk4OQww==} engines: {node: '>=18'} cpu: [ia32] os: [win32] - '@esbuild/win32-x64@0.25.8': - resolution: {integrity: sha512-cn3Yr7+OaaZq1c+2pe+8yxC8E144SReCQjN6/2ynubzYjvyqZjTXfQJpAcQpsdJq3My7XADANiYGHoFC69pLQw==} + '@esbuild/win32-x64@0.25.9': + resolution: {integrity: sha512-PPOl1mi6lpLNQxnGoyAfschAodRFYXJ+9fs6WHXz7CSWKbOqiMZsubC+BQsVKuul+3vKLuwTHsS2c2y9EoKwxQ==} engines: {node: '>=18'} cpu: [x64] os: [win32] @@ -377,103 +377,103 @@ packages: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} - '@rollup/rollup-android-arm-eabi@4.46.2': - resolution: {integrity: sha512-Zj3Hl6sN34xJtMv7Anwb5Gu01yujyE/cLBDB2gnHTAHaWS1Z38L7kuSG+oAh0giZMqG060f/YBStXtMH6FvPMA==} + '@rollup/rollup-android-arm-eabi@4.46.3': + resolution: {integrity: sha512-UmTdvXnLlqQNOCJnyksjPs1G4GqXNGW1LrzCe8+8QoaLhhDeTXYBgJ3k6x61WIhlHX2U+VzEJ55TtIjR/HTySA==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.46.2': - resolution: {integrity: sha512-nTeCWY83kN64oQ5MGz3CgtPx8NSOhC5lWtsjTs+8JAJNLcP3QbLCtDDgUKQc/Ro/frpMq4SHUaHN6AMltcEoLQ==} + '@rollup/rollup-android-arm64@4.46.3': + resolution: {integrity: sha512-8NoxqLpXm7VyeI0ocidh335D6OKT0UJ6fHdnIxf3+6oOerZZc+O7r+UhvROji6OspyPm+rrIdb1gTXtVIqn+Sg==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.46.2': - resolution: {integrity: sha512-HV7bW2Fb/F5KPdM/9bApunQh68YVDU8sO8BvcW9OngQVN3HHHkw99wFupuUJfGR9pYLLAjcAOA6iO+evsbBaPQ==} + '@rollup/rollup-darwin-arm64@4.46.3': + resolution: {integrity: sha512-csnNavqZVs1+7/hUKtgjMECsNG2cdB8F7XBHP6FfQjqhjF8rzMzb3SLyy/1BG7YSfQ+bG75Ph7DyedbUqwq1rA==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.46.2': - resolution: {integrity: sha512-SSj8TlYV5nJixSsm/y3QXfhspSiLYP11zpfwp6G/YDXctf3Xkdnk4woJIF5VQe0of2OjzTt8EsxnJDCdHd2xMA==} + '@rollup/rollup-darwin-x64@4.46.3': + resolution: {integrity: sha512-r2MXNjbuYabSIX5yQqnT8SGSQ26XQc8fmp6UhlYJd95PZJkQD1u82fWP7HqvGUf33IsOC6qsiV+vcuD4SDP6iw==} cpu: [x64] os: [darwin] - '@rollup/rollup-freebsd-arm64@4.46.2': - resolution: {integrity: sha512-ZyrsG4TIT9xnOlLsSSi9w/X29tCbK1yegE49RYm3tu3wF1L/B6LVMqnEWyDB26d9Ecx9zrmXCiPmIabVuLmNSg==} + '@rollup/rollup-freebsd-arm64@4.46.3': + resolution: {integrity: sha512-uluObTmgPJDuJh9xqxyr7MV61Imq+0IvVsAlWyvxAaBSNzCcmZlhfYcRhCdMaCsy46ccZa7vtDDripgs9Jkqsw==} cpu: [arm64] os: [freebsd] - '@rollup/rollup-freebsd-x64@4.46.2': - resolution: {integrity: sha512-pCgHFoOECwVCJ5GFq8+gR8SBKnMO+xe5UEqbemxBpCKYQddRQMgomv1104RnLSg7nNvgKy05sLsY51+OVRyiVw==} + '@rollup/rollup-freebsd-x64@4.46.3': + resolution: {integrity: sha512-AVJXEq9RVHQnejdbFvh1eWEoobohUYN3nqJIPI4mNTMpsyYN01VvcAClxflyk2HIxvLpRcRggpX1m9hkXkpC/A==} cpu: [x64] os: [freebsd] - '@rollup/rollup-linux-arm-gnueabihf@4.46.2': - resolution: {integrity: sha512-EtP8aquZ0xQg0ETFcxUbU71MZlHaw9MChwrQzatiE8U/bvi5uv/oChExXC4mWhjiqK7azGJBqU0tt5H123SzVA==} + '@rollup/rollup-linux-arm-gnueabihf@4.46.3': + resolution: {integrity: sha512-byyflM+huiwHlKi7VHLAYTKr67X199+V+mt1iRgJenAI594vcmGGddWlu6eHujmcdl6TqSNnvqaXJqZdnEWRGA==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.46.2': - resolution: {integrity: sha512-qO7F7U3u1nfxYRPM8HqFtLd+raev2K137dsV08q/LRKRLEc7RsiDWihUnrINdsWQxPR9jqZ8DIIZ1zJJAm5PjQ==} + '@rollup/rollup-linux-arm-musleabihf@4.46.3': + resolution: {integrity: sha512-aLm3NMIjr4Y9LklrH5cu7yybBqoVCdr4Nvnm8WB7PKCn34fMCGypVNpGK0JQWdPAzR/FnoEoFtlRqZbBBLhVoQ==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.46.2': - resolution: {integrity: sha512-3dRaqLfcOXYsfvw5xMrxAk9Lb1f395gkoBYzSFcc/scgRFptRXL9DOaDpMiehf9CO8ZDRJW2z45b6fpU5nwjng==} + '@rollup/rollup-linux-arm64-gnu@4.46.3': + resolution: {integrity: sha512-VtilE6eznJRDIoFOzaagQodUksTEfLIsvXymS+UdJiSXrPW7Ai+WG4uapAc3F7Hgs791TwdGh4xyOzbuzIZrnw==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.46.2': - resolution: {integrity: sha512-fhHFTutA7SM+IrR6lIfiHskxmpmPTJUXpWIsBXpeEwNgZzZZSg/q4i6FU4J8qOGyJ0TR+wXBwx/L7Ho9z0+uDg==} + '@rollup/rollup-linux-arm64-musl@4.46.3': + resolution: {integrity: sha512-dG3JuS6+cRAL0GQ925Vppafi0qwZnkHdPeuZIxIPXqkCLP02l7ka+OCyBoDEv8S+nKHxfjvjW4OZ7hTdHkx8/w==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-loongarch64-gnu@4.46.2': - resolution: {integrity: sha512-i7wfGFXu8x4+FRqPymzjD+Hyav8l95UIZ773j7J7zRYc3Xsxy2wIn4x+llpunexXe6laaO72iEjeeGyUFmjKeA==} + '@rollup/rollup-linux-loongarch64-gnu@4.46.3': + resolution: {integrity: sha512-iU8DxnxEKJptf8Vcx4XvAUdpkZfaz0KWfRrnIRrOndL0SvzEte+MTM7nDH4A2Now4FvTZ01yFAgj6TX/mZl8hQ==} cpu: [loong64] os: [linux] - '@rollup/rollup-linux-ppc64-gnu@4.46.2': - resolution: {integrity: sha512-B/l0dFcHVUnqcGZWKcWBSV2PF01YUt0Rvlurci5P+neqY/yMKchGU8ullZvIv5e8Y1C6wOn+U03mrDylP5q9Yw==} + '@rollup/rollup-linux-ppc64-gnu@4.46.3': + resolution: {integrity: sha512-VrQZp9tkk0yozJoQvQcqlWiqaPnLM6uY1qPYXvukKePb0fqaiQtOdMJSxNFUZFsGw5oA5vvVokjHrx8a9Qsz2A==} cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.46.2': - resolution: {integrity: sha512-32k4ENb5ygtkMwPMucAb8MtV8olkPT03oiTxJbgkJa7lJ7dZMr0GCFJlyvy+K8iq7F/iuOr41ZdUHaOiqyR3iQ==} + '@rollup/rollup-linux-riscv64-gnu@4.46.3': + resolution: {integrity: sha512-uf2eucWSUb+M7b0poZ/08LsbcRgaDYL8NCGjUeFMwCWFwOuFcZ8D9ayPl25P3pl+D2FH45EbHdfyUesQ2Lt9wA==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-riscv64-musl@4.46.2': - resolution: {integrity: sha512-t5B2loThlFEauloaQkZg9gxV05BYeITLvLkWOkRXogP4qHXLkWSbSHKM9S6H1schf/0YGP/qNKtiISlxvfmmZw==} + '@rollup/rollup-linux-riscv64-musl@4.46.3': + resolution: {integrity: sha512-7tnUcDvN8DHm/9ra+/nF7lLzYHDeODKKKrh6JmZejbh1FnCNZS8zMkZY5J4sEipy2OW1d1Ncc4gNHUd0DLqkSg==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.46.2': - resolution: {integrity: sha512-YKjekwTEKgbB7n17gmODSmJVUIvj8CX7q5442/CK80L8nqOUbMtf8b01QkG3jOqyr1rotrAnW6B/qiHwfcuWQA==} + '@rollup/rollup-linux-s390x-gnu@4.46.3': + resolution: {integrity: sha512-MUpAOallJim8CsJK+4Lc9tQzlfPbHxWDrGXZm2z6biaadNpvh3a5ewcdat478W+tXDoUiHwErX/dOql7ETcLqg==} cpu: [s390x] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.46.2': - resolution: {integrity: sha512-Jj5a9RUoe5ra+MEyERkDKLwTXVu6s3aACP51nkfnK9wJTraCC8IMe3snOfALkrjTYd2G1ViE1hICj0fZ7ALBPA==} + '@rollup/rollup-linux-x64-gnu@4.46.3': + resolution: {integrity: sha512-F42IgZI4JicE2vM2PWCe0N5mR5vR0gIdORPqhGQ32/u1S1v3kLtbZ0C/mi9FFk7C5T0PgdeyWEPajPjaUpyoKg==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.46.2': - resolution: {integrity: sha512-7kX69DIrBeD7yNp4A5b81izs8BqoZkCIaxQaOpumcJ1S/kmqNFjPhDu1LHeVXv0SexfHQv5cqHsxLOjETuqDuA==} + '@rollup/rollup-linux-x64-musl@4.46.3': + resolution: {integrity: sha512-oLc+JrwwvbimJUInzx56Q3ujL3Kkhxehg7O1gWAYzm8hImCd5ld1F2Gry5YDjR21MNb5WCKhC9hXgU7rRlyegQ==} cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.46.2': - resolution: {integrity: sha512-wiJWMIpeaak/jsbaq2HMh/rzZxHVW1rU6coyeNNpMwk5isiPjSTx0a4YLSlYDwBH/WBvLz+EtsNqQScZTLJy3g==} + '@rollup/rollup-win32-arm64-msvc@4.46.3': + resolution: {integrity: sha512-lOrQ+BVRstruD1fkWg9yjmumhowR0oLAAzavB7yFSaGltY8klttmZtCLvOXCmGE9mLIn8IBV/IFrQOWz5xbFPg==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.46.2': - resolution: {integrity: sha512-gBgaUDESVzMgWZhcyjfs9QFK16D8K6QZpwAaVNJxYDLHWayOta4ZMjGm/vsAEy3hvlS2GosVFlBlP9/Wb85DqQ==} + '@rollup/rollup-win32-ia32-msvc@4.46.3': + resolution: {integrity: sha512-vvrVKPRS4GduGR7VMH8EylCBqsDcw6U+/0nPDuIjXQRbHJc6xOBj+frx8ksfZAh6+Fptw5wHrN7etlMmQnPQVg==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.46.2': - resolution: {integrity: sha512-CvUo2ixeIQGtF6WvuB87XWqPQkoFAFqW+HUo/WzHwuHDvIwZCtjdWXoYCcr06iKGydiqTclC4jU/TNObC/xKZg==} + '@rollup/rollup-win32-x64-msvc@4.46.3': + resolution: {integrity: sha512-fi3cPxCnu3ZeM3EwKZPgXbWoGzm2XHgB/WShKI81uj8wG0+laobmqy5wbgEwzstlbLu4MyO8C19FyhhWseYKNQ==} cpu: [x64] os: [win32] @@ -640,8 +640,8 @@ packages: es-module-lexer@1.7.0: resolution: {integrity: sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==} - esbuild@0.25.8: - resolution: {integrity: sha512-vVC0USHGtMi8+R4Kz8rt6JhEWLxsv9Rnu/lGYbPR8u47B+DCBksq9JarW0zOO7bs37hyOK1l2/oqtbciutL5+Q==} + esbuild@0.25.9: + resolution: {integrity: sha512-CRbODhYyQx3qp7ZEwzxOk4JBqmD/seJrzPa/cGjY1VtIn5E09Oi9/dB4JwctnfZ8Q8iT7rioVv5k/FNT/uf54g==} engines: {node: '>=18'} hasBin: true @@ -652,8 +652,9 @@ packages: resolution: {integrity: sha512-JhFGDVJ7tmDJItKhYgJCGLOWjuK9vPxiXoUFLwLDc99NlmklilbiQJwoctZtt13+xMw91MCk/REan6MWHqDjyA==} engines: {node: '>=12.0.0'} - fdir@6.4.6: - resolution: {integrity: sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==} + fdir@6.5.0: + resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==} + engines: {node: '>=12.0.0'} peerDependencies: picomatch: ^3 || ^4 peerDependenciesMeta: @@ -816,8 +817,8 @@ packages: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} - rollup@4.46.2: - resolution: {integrity: sha512-WMmLFI+Boh6xbop+OAGo9cQ3OgX9MIg7xOQjn+pTCwOkk+FNDAeAemXkJ3HzDJrVXleLOFVa1ipuc1AmEx1Dwg==} + rollup@4.46.3: + resolution: {integrity: sha512-RZn2XTjXb8t5g13f5YclGoilU/kwT696DIkY3sywjdZidNSi3+vseaQov7D7BZXVJCPv3pDWUN69C78GGbXsKw==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true @@ -944,8 +945,8 @@ packages: engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true - vite@7.1.1: - resolution: {integrity: sha512-yJ+Mp7OyV+4S+afWo+QyoL9jFWD11QFH0i5i7JypnfTcA1rmgxCbiA8WwAICDEtZ1Z1hzrVhN8R8rGTqkTY8ZQ==} + vite@7.1.3: + resolution: {integrity: sha512-OOUi5zjkDxYrKhTV3V7iKsoS37VUM7v40+HuwEmcrsf11Cdx9y3DIr2Px6liIcZFwt3XSRpQvFpL3WVy7ApkGw==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: @@ -1111,39 +1112,39 @@ snapshots: '@bcoe/v8-coverage@1.0.2': {} - '@biomejs/biome@2.1.4': + '@biomejs/biome@2.2.2': optionalDependencies: - '@biomejs/cli-darwin-arm64': 2.1.4 - '@biomejs/cli-darwin-x64': 2.1.4 - '@biomejs/cli-linux-arm64': 2.1.4 - '@biomejs/cli-linux-arm64-musl': 2.1.4 - '@biomejs/cli-linux-x64': 2.1.4 - '@biomejs/cli-linux-x64-musl': 2.1.4 - '@biomejs/cli-win32-arm64': 2.1.4 - '@biomejs/cli-win32-x64': 2.1.4 - - '@biomejs/cli-darwin-arm64@2.1.4': + '@biomejs/cli-darwin-arm64': 2.2.2 + '@biomejs/cli-darwin-x64': 2.2.2 + '@biomejs/cli-linux-arm64': 2.2.2 + '@biomejs/cli-linux-arm64-musl': 2.2.2 + '@biomejs/cli-linux-x64': 2.2.2 + '@biomejs/cli-linux-x64-musl': 2.2.2 + '@biomejs/cli-win32-arm64': 2.2.2 + '@biomejs/cli-win32-x64': 2.2.2 + + '@biomejs/cli-darwin-arm64@2.2.2': optional: true - '@biomejs/cli-darwin-x64@2.1.4': + '@biomejs/cli-darwin-x64@2.2.2': optional: true - '@biomejs/cli-linux-arm64-musl@2.1.4': + '@biomejs/cli-linux-arm64-musl@2.2.2': optional: true - '@biomejs/cli-linux-arm64@2.1.4': + '@biomejs/cli-linux-arm64@2.2.2': optional: true - '@biomejs/cli-linux-x64-musl@2.1.4': + '@biomejs/cli-linux-x64-musl@2.2.2': optional: true - '@biomejs/cli-linux-x64@2.1.4': + '@biomejs/cli-linux-x64@2.2.2': optional: true - '@biomejs/cli-win32-arm64@2.1.4': + '@biomejs/cli-win32-arm64@2.2.2': optional: true - '@biomejs/cli-win32-x64@2.1.4': + '@biomejs/cli-win32-x64@2.2.2': optional: true '@codemirror/autocomplete@6.18.6': @@ -1221,82 +1222,82 @@ snapshots: '@csstools/css-tokenizer@3.0.4': {} - '@esbuild/aix-ppc64@0.25.8': + '@esbuild/aix-ppc64@0.25.9': optional: true - '@esbuild/android-arm64@0.25.8': + '@esbuild/android-arm64@0.25.9': optional: true - '@esbuild/android-arm@0.25.8': + '@esbuild/android-arm@0.25.9': optional: true - '@esbuild/android-x64@0.25.8': + '@esbuild/android-x64@0.25.9': optional: true - '@esbuild/darwin-arm64@0.25.8': + '@esbuild/darwin-arm64@0.25.9': optional: true - '@esbuild/darwin-x64@0.25.8': + '@esbuild/darwin-x64@0.25.9': optional: true - '@esbuild/freebsd-arm64@0.25.8': + '@esbuild/freebsd-arm64@0.25.9': optional: true - '@esbuild/freebsd-x64@0.25.8': + '@esbuild/freebsd-x64@0.25.9': optional: true - '@esbuild/linux-arm64@0.25.8': + '@esbuild/linux-arm64@0.25.9': optional: true - '@esbuild/linux-arm@0.25.8': + '@esbuild/linux-arm@0.25.9': optional: true - '@esbuild/linux-ia32@0.25.8': + '@esbuild/linux-ia32@0.25.9': optional: true - '@esbuild/linux-loong64@0.25.8': + '@esbuild/linux-loong64@0.25.9': optional: true - '@esbuild/linux-mips64el@0.25.8': + '@esbuild/linux-mips64el@0.25.9': optional: true - '@esbuild/linux-ppc64@0.25.8': + '@esbuild/linux-ppc64@0.25.9': optional: true - '@esbuild/linux-riscv64@0.25.8': + '@esbuild/linux-riscv64@0.25.9': optional: true - '@esbuild/linux-s390x@0.25.8': + '@esbuild/linux-s390x@0.25.9': optional: true - '@esbuild/linux-x64@0.25.8': + '@esbuild/linux-x64@0.25.9': optional: true - '@esbuild/netbsd-arm64@0.25.8': + '@esbuild/netbsd-arm64@0.25.9': optional: true - '@esbuild/netbsd-x64@0.25.8': + '@esbuild/netbsd-x64@0.25.9': optional: true - '@esbuild/openbsd-arm64@0.25.8': + '@esbuild/openbsd-arm64@0.25.9': optional: true - '@esbuild/openbsd-x64@0.25.8': + '@esbuild/openbsd-x64@0.25.9': optional: true - '@esbuild/openharmony-arm64@0.25.8': + '@esbuild/openharmony-arm64@0.25.9': optional: true - '@esbuild/sunos-x64@0.25.8': + '@esbuild/sunos-x64@0.25.9': optional: true - '@esbuild/win32-arm64@0.25.8': + '@esbuild/win32-arm64@0.25.9': optional: true - '@esbuild/win32-ia32@0.25.8': + '@esbuild/win32-ia32@0.25.9': optional: true - '@esbuild/win32-x64@0.25.8': + '@esbuild/win32-x64@0.25.9': optional: true '@isaacs/cliui@8.0.2': @@ -1339,64 +1340,64 @@ snapshots: '@pkgjs/parseargs@0.11.0': optional: true - '@rollup/rollup-android-arm-eabi@4.46.2': + '@rollup/rollup-android-arm-eabi@4.46.3': optional: true - '@rollup/rollup-android-arm64@4.46.2': + '@rollup/rollup-android-arm64@4.46.3': optional: true - '@rollup/rollup-darwin-arm64@4.46.2': + '@rollup/rollup-darwin-arm64@4.46.3': optional: true - '@rollup/rollup-darwin-x64@4.46.2': + '@rollup/rollup-darwin-x64@4.46.3': optional: true - '@rollup/rollup-freebsd-arm64@4.46.2': + '@rollup/rollup-freebsd-arm64@4.46.3': optional: true - '@rollup/rollup-freebsd-x64@4.46.2': + '@rollup/rollup-freebsd-x64@4.46.3': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.46.2': + '@rollup/rollup-linux-arm-gnueabihf@4.46.3': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.46.2': + '@rollup/rollup-linux-arm-musleabihf@4.46.3': optional: true - '@rollup/rollup-linux-arm64-gnu@4.46.2': + '@rollup/rollup-linux-arm64-gnu@4.46.3': optional: true - '@rollup/rollup-linux-arm64-musl@4.46.2': + '@rollup/rollup-linux-arm64-musl@4.46.3': optional: true - '@rollup/rollup-linux-loongarch64-gnu@4.46.2': + '@rollup/rollup-linux-loongarch64-gnu@4.46.3': optional: true - '@rollup/rollup-linux-ppc64-gnu@4.46.2': + '@rollup/rollup-linux-ppc64-gnu@4.46.3': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.46.2': + '@rollup/rollup-linux-riscv64-gnu@4.46.3': optional: true - '@rollup/rollup-linux-riscv64-musl@4.46.2': + '@rollup/rollup-linux-riscv64-musl@4.46.3': optional: true - '@rollup/rollup-linux-s390x-gnu@4.46.2': + '@rollup/rollup-linux-s390x-gnu@4.46.3': optional: true - '@rollup/rollup-linux-x64-gnu@4.46.2': + '@rollup/rollup-linux-x64-gnu@4.46.3': optional: true - '@rollup/rollup-linux-x64-musl@4.46.2': + '@rollup/rollup-linux-x64-musl@4.46.3': optional: true - '@rollup/rollup-win32-arm64-msvc@4.46.2': + '@rollup/rollup-win32-arm64-msvc@4.46.3': optional: true - '@rollup/rollup-win32-ia32-msvc@4.46.2': + '@rollup/rollup-win32-ia32-msvc@4.46.3': optional: true - '@rollup/rollup-win32-x64-msvc@4.46.2': + '@rollup/rollup-win32-x64-msvc@4.46.3': optional: true '@types/chai@5.2.2': @@ -1441,13 +1442,13 @@ snapshots: chai: 5.2.1 tinyrainbow: 2.0.0 - '@vitest/mocker@3.2.4(vite@7.1.1(@types/node@22.13.1)(yaml@2.8.0))': + '@vitest/mocker@3.2.4(vite@7.1.3(@types/node@22.13.1)(yaml@2.8.0))': dependencies: '@vitest/spy': 3.2.4 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: - vite: 7.1.1(@types/node@22.13.1)(yaml@2.8.0) + vite: 7.1.3(@types/node@22.13.1)(yaml@2.8.0) '@vitest/pretty-format@3.2.4': dependencies: @@ -1570,34 +1571,34 @@ snapshots: es-module-lexer@1.7.0: {} - esbuild@0.25.8: + esbuild@0.25.9: optionalDependencies: - '@esbuild/aix-ppc64': 0.25.8 - '@esbuild/android-arm': 0.25.8 - '@esbuild/android-arm64': 0.25.8 - '@esbuild/android-x64': 0.25.8 - '@esbuild/darwin-arm64': 0.25.8 - '@esbuild/darwin-x64': 0.25.8 - '@esbuild/freebsd-arm64': 0.25.8 - '@esbuild/freebsd-x64': 0.25.8 - '@esbuild/linux-arm': 0.25.8 - '@esbuild/linux-arm64': 0.25.8 - '@esbuild/linux-ia32': 0.25.8 - '@esbuild/linux-loong64': 0.25.8 - '@esbuild/linux-mips64el': 0.25.8 - '@esbuild/linux-ppc64': 0.25.8 - '@esbuild/linux-riscv64': 0.25.8 - '@esbuild/linux-s390x': 0.25.8 - '@esbuild/linux-x64': 0.25.8 - '@esbuild/netbsd-arm64': 0.25.8 - '@esbuild/netbsd-x64': 0.25.8 - '@esbuild/openbsd-arm64': 0.25.8 - '@esbuild/openbsd-x64': 0.25.8 - '@esbuild/openharmony-arm64': 0.25.8 - '@esbuild/sunos-x64': 0.25.8 - '@esbuild/win32-arm64': 0.25.8 - '@esbuild/win32-ia32': 0.25.8 - '@esbuild/win32-x64': 0.25.8 + '@esbuild/aix-ppc64': 0.25.9 + '@esbuild/android-arm': 0.25.9 + '@esbuild/android-arm64': 0.25.9 + '@esbuild/android-x64': 0.25.9 + '@esbuild/darwin-arm64': 0.25.9 + '@esbuild/darwin-x64': 0.25.9 + '@esbuild/freebsd-arm64': 0.25.9 + '@esbuild/freebsd-x64': 0.25.9 + '@esbuild/linux-arm': 0.25.9 + '@esbuild/linux-arm64': 0.25.9 + '@esbuild/linux-ia32': 0.25.9 + '@esbuild/linux-loong64': 0.25.9 + '@esbuild/linux-mips64el': 0.25.9 + '@esbuild/linux-ppc64': 0.25.9 + '@esbuild/linux-riscv64': 0.25.9 + '@esbuild/linux-s390x': 0.25.9 + '@esbuild/linux-x64': 0.25.9 + '@esbuild/netbsd-arm64': 0.25.9 + '@esbuild/netbsd-x64': 0.25.9 + '@esbuild/openbsd-arm64': 0.25.9 + '@esbuild/openbsd-x64': 0.25.9 + '@esbuild/openharmony-arm64': 0.25.9 + '@esbuild/sunos-x64': 0.25.9 + '@esbuild/win32-arm64': 0.25.9 + '@esbuild/win32-ia32': 0.25.9 + '@esbuild/win32-x64': 0.25.9 estree-walker@3.0.3: dependencies: @@ -1605,7 +1606,7 @@ snapshots: expect-type@1.2.2: {} - fdir@6.4.6(picomatch@4.0.3): + fdir@6.5.0(picomatch@4.0.3): optionalDependencies: picomatch: 4.0.3 @@ -1785,30 +1786,30 @@ snapshots: punycode@2.3.1: {} - rollup@4.46.2: + rollup@4.46.3: dependencies: '@types/estree': 1.0.8 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.46.2 - '@rollup/rollup-android-arm64': 4.46.2 - '@rollup/rollup-darwin-arm64': 4.46.2 - '@rollup/rollup-darwin-x64': 4.46.2 - '@rollup/rollup-freebsd-arm64': 4.46.2 - '@rollup/rollup-freebsd-x64': 4.46.2 - '@rollup/rollup-linux-arm-gnueabihf': 4.46.2 - '@rollup/rollup-linux-arm-musleabihf': 4.46.2 - '@rollup/rollup-linux-arm64-gnu': 4.46.2 - '@rollup/rollup-linux-arm64-musl': 4.46.2 - '@rollup/rollup-linux-loongarch64-gnu': 4.46.2 - '@rollup/rollup-linux-ppc64-gnu': 4.46.2 - '@rollup/rollup-linux-riscv64-gnu': 4.46.2 - '@rollup/rollup-linux-riscv64-musl': 4.46.2 - '@rollup/rollup-linux-s390x-gnu': 4.46.2 - '@rollup/rollup-linux-x64-gnu': 4.46.2 - '@rollup/rollup-linux-x64-musl': 4.46.2 - '@rollup/rollup-win32-arm64-msvc': 4.46.2 - '@rollup/rollup-win32-ia32-msvc': 4.46.2 - '@rollup/rollup-win32-x64-msvc': 4.46.2 + '@rollup/rollup-android-arm-eabi': 4.46.3 + '@rollup/rollup-android-arm64': 4.46.3 + '@rollup/rollup-darwin-arm64': 4.46.3 + '@rollup/rollup-darwin-x64': 4.46.3 + '@rollup/rollup-freebsd-arm64': 4.46.3 + '@rollup/rollup-freebsd-x64': 4.46.3 + '@rollup/rollup-linux-arm-gnueabihf': 4.46.3 + '@rollup/rollup-linux-arm-musleabihf': 4.46.3 + '@rollup/rollup-linux-arm64-gnu': 4.46.3 + '@rollup/rollup-linux-arm64-musl': 4.46.3 + '@rollup/rollup-linux-loongarch64-gnu': 4.46.3 + '@rollup/rollup-linux-ppc64-gnu': 4.46.3 + '@rollup/rollup-linux-riscv64-gnu': 4.46.3 + '@rollup/rollup-linux-riscv64-musl': 4.46.3 + '@rollup/rollup-linux-s390x-gnu': 4.46.3 + '@rollup/rollup-linux-x64-gnu': 4.46.3 + '@rollup/rollup-linux-x64-musl': 4.46.3 + '@rollup/rollup-win32-arm64-msvc': 4.46.3 + '@rollup/rollup-win32-ia32-msvc': 4.46.3 + '@rollup/rollup-win32-x64-msvc': 4.46.3 fsevents: 2.3.3 rrweb-cssom@0.8.0: {} @@ -1881,7 +1882,7 @@ snapshots: tinyglobby@0.2.14: dependencies: - fdir: 6.4.6(picomatch@4.0.3) + fdir: 6.5.0(picomatch@4.0.3) picomatch: 4.0.3 tinypool@1.1.1: {} @@ -1915,7 +1916,7 @@ snapshots: debug: 4.4.1 es-module-lexer: 1.7.0 pathe: 2.0.3 - vite: 7.1.1(@types/node@22.13.1)(yaml@2.8.0) + vite: 7.1.3(@types/node@22.13.1)(yaml@2.8.0) transitivePeerDependencies: - '@types/node' - jiti @@ -1930,13 +1931,13 @@ snapshots: - tsx - yaml - vite@7.1.1(@types/node@22.13.1)(yaml@2.8.0): + vite@7.1.3(@types/node@22.13.1)(yaml@2.8.0): dependencies: - esbuild: 0.25.8 - fdir: 6.4.6(picomatch@4.0.3) + esbuild: 0.25.9 + fdir: 6.5.0(picomatch@4.0.3) picomatch: 4.0.3 postcss: 8.5.6 - rollup: 4.46.2 + rollup: 4.46.3 tinyglobby: 0.2.14 optionalDependencies: '@types/node': 22.13.1 @@ -1947,7 +1948,7 @@ snapshots: dependencies: '@types/chai': 5.2.2 '@vitest/expect': 3.2.4 - '@vitest/mocker': 3.2.4(vite@7.1.1(@types/node@22.13.1)(yaml@2.8.0)) + '@vitest/mocker': 3.2.4(vite@7.1.3(@types/node@22.13.1)(yaml@2.8.0)) '@vitest/pretty-format': 3.2.4 '@vitest/runner': 3.2.4 '@vitest/snapshot': 3.2.4 @@ -1965,7 +1966,7 @@ snapshots: tinyglobby: 0.2.14 tinypool: 1.1.1 tinyrainbow: 2.0.0 - vite: 7.1.1(@types/node@22.13.1)(yaml@2.8.0) + vite: 7.1.3(@types/node@22.13.1)(yaml@2.8.0) vite-node: 3.2.4(@types/node@22.13.1)(yaml@2.8.0) why-is-node-running: 2.3.0 optionalDependencies: diff --git a/src/__tests__/index.test.ts b/src/__tests__/index.test.ts index 8f5a058..4ce21fa 100644 --- a/src/__tests__/index.test.ts +++ b/src/__tests__/index.test.ts @@ -41,6 +41,7 @@ describe("dialects.ts exports", () => { const sortedExports = Object.keys(dialects).sort(); expect(sortedExports).toMatchInlineSnapshot(` [ + "BigQueryDialect", "DuckDBDialect", ] `); diff --git a/src/dialects/bigquery.ts b/src/dialects/bigquery.ts new file mode 100644 index 0000000..f1209c4 --- /dev/null +++ b/src/dialects/bigquery.ts @@ -0,0 +1,14 @@ +import { PostgreSQL, SQLDialect, type SQLDialectSpec } from "@codemirror/lang-sql"; + +/** + * There is no custom BigQuery dialect at the moment, + * but we want to provide a light wrapper around PostgreSQL + */ + +const BigQuery: SQLDialectSpec = { + ...PostgreSQL, + caseInsensitiveIdentifiers: true, // Case-insensitive completes + identifierQuotes: "`", // BigQuery uses backticks for identifiers +}; + +export const BigQueryDialect = SQLDialect.define(BigQuery); diff --git a/src/dialects/duckdb/duckdb.ts b/src/dialects/duckdb/duckdb.ts index 81d1aaa..08410c6 100644 --- a/src/dialects/duckdb/duckdb.ts +++ b/src/dialects/duckdb/duckdb.ts @@ -13,7 +13,8 @@ const DuckDBDialectSpec: SQLDialectSpec = { hashComments: false, spaceAfterDashes: false, specialVar: "@?", - identifierQuotes: "`", + identifierQuotes: "'", + caseInsensitiveIdentifiers: true, keywords: `${otherFunctions} !__postfix !~~ !~~* % & && * ** + - ->> / // <-> << <=> <@ >> @ @> Calendar JSON TimeZone ^ ^@ abort abs absolute access access_mode acos acosh action add add_parquet_key admin after age aggregate alias all all_profiling_output allow_community_extensions allow_extensions_metadata_mismatch allow_persistent_secrets allow_unredacted_secrets allow_unsigned_extensions allowed_directories allowed_paths also alter always analyse analyze and anti any any_value apply approx_count_distinct approx_quantile approx_top_k arbitrary arg_max arg_max_null arg_min arg_min_null argmax argmin array array_agg array_aggr array_aggregate array_append array_apply array_cat array_concat array_contains array_cosine_distance array_cosine_similarity array_cross_product array_distance array_distinct array_dot_product array_extract array_filter array_grade_up array_has array_has_all array_has_any array_indexof array_inner_product array_intersect array_length array_negative_dot_product array_negative_inner_product array_pop_back array_pop_front array_position array_prepend array_push_back array_push_front array_reduce array_resize array_reverse array_reverse_sort array_select array_slice array_sort array_to_json array_to_string array_to_string_comma_default array_transform array_unique array_value array_where array_zip arrow_large_buffer_size arrow_lossless_conversion arrow_output_list_view arrow_output_version arrow_scan arrow_scan_dumb as asc ascii asin asinh asof asof_loop_join_threshold assertion assignment asymmetric at atan atan2 atanh attach attribute authorization autoinstall_extension_repository autoinstall_known_extensions autoload_known_extensions avg backward bar base64 before begin between bigint bin binary binary_as_string bit bit_and bit_count bit_length bit_or bit_position bit_xor bitstring bitstring_agg blob bool bool_and bool_or boolean both bpchar by bytea cache call called can_cast_implicitly cardinality cascade cascaded case cast cast_to_type catalog catalog_error_max_schemas cbrt ceil ceiling centuries century chain char char_length character character_length characteristics check checkpoint checkpoint_threshold chr class close cluster coalesce col_description collate collation collations column columns combine comment comments commit committed compression concat concat_ws concurrently configuration conflict connection constant_or_null constraint constraints contains content continue conversion copy copy_database corr cos cosh cost cot count count_if count_star countif covar_pop covar_samp create create_sort_key cross csv cube current current_catalog current_connection_id current_database current_date current_localtime current_localtimestamp current_query current_query_id current_role current_schema current_schemas current_setting current_transaction_id current_user currval cursor custom_extension_repository custom_profiling_settings custom_user_agent cycle damerau_levenshtein data database database_list database_size date date_add date_diff date_part date_sub date_trunc datediff datepart datesub datetime datetrunc day dayname dayofmonth dayofweek dayofyear days deallocate debug_asof_iejoin debug_checkpoint_abort debug_force_external debug_force_no_cross_product debug_skip_checkpoint_on_commit debug_verify_vector debug_window_mode dec decade decades decimal declare decode default default_block_size default_collation default_null_order default_order default_secret_storage defaults deferrable deferred definer degrees delete delimiter delimiters depends desc describe detach dictionary disable disable_checkpoint_on_shutdown disable_logging disable_object_cache disable_optimizer disable_parquet_prefetching disable_print_progress_bar disable_profile disable_profiling disable_progress_bar disable_timestamptz_casts disable_verification disable_verify_external disable_verify_fetch_row disable_verify_parallelism disable_verify_serializer disabled_compression_methods disabled_filesystems disabled_log_types disabled_optimizers discard distinct divide do document domain double drop duckdb_api duckdb_columns duckdb_constraints duckdb_databases duckdb_dependencies duckdb_extensions duckdb_external_file_cache duckdb_functions duckdb_indexes duckdb_keywords duckdb_log_contexts duckdb_logs duckdb_logs_parsed duckdb_memory duckdb_optimizers duckdb_prepared_statements duckdb_schemas duckdb_secret_types duckdb_secrets duckdb_sequences duckdb_settings duckdb_table_sample duckdb_tables duckdb_temporary_files duckdb_types duckdb_variables duckdb_views dynamic_or_filter_threshold each editdist3 element_at else enable enable_checkpoint_on_shutdown enable_external_access enable_external_file_cache enable_fsst_vectors enable_geoparquet_conversion enable_http_logging enable_http_metadata_cache enable_logging enable_macro_dependencies enable_object_cache enable_optimizer enable_print_progress_bar enable_profile enable_profiling enable_progress_bar enable_progress_bar_print enable_verification enable_view_dependencies enabled_log_types encode encoding encrypted end ends_with entropy enum enum_code enum_first enum_last enum_range enum_range_boundary epoch epoch_ms epoch_ns epoch_us equi_width_bins era error errors_as_json escape even event except exclude excluding exclusive execute exists exp explain explain_output export export_state extension extension_directory extension_versions extensions external external_threads extract factorial false family favg fdiv fetch file_search_path filter finalize first flatten float float4 float8 floor fmod following for force force_bitpacking_mode force_checkpoint force_compression foreign format formatReadableDecimalSize formatReadableSize format_bytes format_pg_type format_type forward freeze from from_base64 from_binary from_hex from_json from_json_strict fsum full function functions gamma gcd gen_random_uuid generate_series generate_subscripts generated geomean geometric_mean get_bit get_block_size get_current_time get_current_timestamp getvariable glob global grade_up grant granted greatest greatest_common_divisor group group_concat grouping grouping_id groups guid hamming handler having header hex histogram histogram_exact histogram_values hold home_directory hour hours http_logging_output http_proxy http_proxy_password http_proxy_username hugeint identity ieee_floating_point_ops if ignore ilike ilike_escape immediate immediate_transaction_mode immutable implicit import import_database in in_search_path include including increment index index_scan_max_count index_scan_percentage indexes inet_client_addr inet_client_port inet_server_addr inet_server_port inherit inherits initially inline inner inout input insensitive insert install instead instr int int1 int128 int16 int2 int32 int4 int64 int8 integer integer_division integral intersect interval into invoker is is_histogram_other_bin isfinite isinf isnan isnull isodow isolation isoyear jaccard jaro_similarity jaro_winkler_similarity join json json_array json_array_length json_contains json_deserialize_sql json_each json_execute_serialized_sql json_exists json_extract json_extract_path json_extract_path_text json_extract_string json_group_array json_group_object json_group_structure json_keys json_merge_patch json_object json_pretty json_quote json_serialize_plan json_serialize_sql json_structure json_transform json_transform_strict json_tree json_type json_valid json_value julian kahan_sum key kurtosis kurtosis_pop label lambda lambda_syntax language large last last_day late_materialization_max_rows lateral lcase lcm leading leakproof least least_common_multiple left left_grapheme len length length_grapheme level levenshtein lgamma like like_escape limit list list_aggr list_aggregate list_any_value list_append list_apply list_approx_count_distinct list_avg list_bit_and list_bit_or list_bit_xor list_bool_and list_bool_or list_cat list_concat list_contains list_cosine_distance list_cosine_similarity list_count list_distance list_distinct list_dot_product list_element list_entropy list_extract list_filter list_first list_grade_up list_has list_has_all list_has_any list_histogram list_indexof list_inner_product list_intersect list_kurtosis list_kurtosis_pop list_last list_mad list_max list_median list_min list_mode list_negative_dot_product list_negative_inner_product list_pack list_position list_prepend list_product list_reduce list_resize list_reverse list_reverse_sort list_select list_sem list_skewness list_slice list_sort list_stddev_pop list_stddev_samp list_string_agg list_sum list_transform list_unique list_value list_var_pop list_var_samp list_where list_zip listagg listen ln load local location lock lock_configuration locked log log10 log2 log_query_path logged logging_level logging_mode logging_storage logical long lower lpad ltrim macro mad make_date make_time make_timestamp make_timestamp_ns make_timestamptz map map_concat map_contains map_contains_entry map_contains_value map_entries map_extract map_extract_value map_from_entries map_keys map_to_pg_oid map_values mapping match materialized max max_by max_expression_depth max_memory max_temp_directory_size max_vacuum_tasks maxvalue md5 md5_number md5_number_lower md5_number_upper mean median memory_limit merge_join_threshold metadata_info method microsecond microseconds millennia millennium millisecond milliseconds min min_by minute minutes minvalue mismatches mod mode month monthname months move multiply name names nanosecond national natural nchar nested_loop_join_threshold new next nextafter nextval nfc_normalize no none normalized_interval not not_ilike_escape not_like_escape nothing notify notnull now nowait null null_order nullif nulls numeric nvarchar obj_description object octet_length of off offset oid oids old old_implicit_casting on only operator option options or ord order order_by_non_integer_literal ordered_aggregate_threshold ordinality others out outer over overlaps overlay overriding owned owner pandas_analyze_sample pandas_scan parallel parquet_bloom_probe parquet_file_metadata parquet_kv_metadata parquet_metadata parquet_metadata_cache parquet_scan parquet_schema parse_dirname parse_dirpath parse_duckdb_log_message parse_filename parse_path parser partial partition partitioned partitioned_write_flush_threshold partitioned_write_max_open_files passing password percent perfect_ht_threshold persistent pi pivot pivot_filter_threshold pivot_limit pivot_longer pivot_wider placing plans platform policy position positional pow power pragma pragma_collations pragma_database_size pragma_metadata_info pragma_platform pragma_show pragma_storage_info pragma_table_info pragma_user_agent pragma_version preceding precision prefer_range_joins prefetch_all_parquet_files prefix prepare prepared preserve preserve_identifier_case preserve_insertion_order primary printf prior privileges procedural procedure produce_arrow_string_view product profile_output profiling_mode profiling_output program progress_bar_time publication python_enable_replacements python_map_function python_scan_all_frames qualify quantile quantile_cont quantile_disc quarter quarters query query_table quote radians random range read read_blob read_csv read_csv_auto read_json read_json_auto read_json_objects read_json_objects_auto read_ndjson read_ndjson_auto read_ndjson_objects read_parquet read_text real reassign recheck recursive reduce ref references referencing refresh regexp_escape regexp_extract regexp_extract_all regexp_full_match regexp_matches regexp_replace regexp_split_to_array regexp_split_to_table regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release remap_struct rename repeat repeat_row repeatable replace replica reservoir_quantile reset respect restart restrict returning returns reverse revoke right right_grapheme role rollback rollup round round_even roundbankers row row_to_json rows rpad rtrim rule sample savepoint scalar_subquery_error_on_multiple_rows scheduler_process_partial schema schemas scope scroll search search_path second seconds secret secret_directory security select sem semi seq_scan sequence sequences serializable server session session_user set set_bit setof sets setseed sha1 sha256 share shobj_description short show show_databases show_tables show_tables_expanded sign signbit signed similar simple sin sinh skewness skip smallint snapshot sniff_csv some sorted split split_part sql sqrt stable standalone start starts_with statement statistics stats stddev stddev_pop stddev_samp stdin stdout storage storage_compatibility_version storage_info stored str_split str_split_regex streaming_buffer_size strftime strict string string_agg string_split string_split_regex string_to_array strip strip_accents strlen strpos strptime struct struct_concat struct_extract struct_extract_at struct_insert struct_pack subscription substr substring substring_grapheme subtract suffix sum sum_no_overflow sumkahan summarize summary symmetric sysid system table table_info tables tablesample tablespace tan tanh temp temp_directory template temporary test_all_types test_vector_types text then threads ties time time_bucket timestamp timestamp_ms timestamp_ns timestamp_s timestamp_us timestamptz timetz timetz_byte_comparable timezone timezone_hour timezone_minute tinyint to to_base to_base64 to_binary to_centuries to_days to_decades to_hex to_hours to_json to_microseconds to_millennia to_milliseconds to_minutes to_months to_quarters to_seconds to_timestamp to_weeks to_years today trailing transaction transaction_timestamp transform translate treat trigger trim true trunc truncate truncate_duckdb_logs trusted try_cast try_strptime txid_current type typeof types ubigint ucase uhugeint uint128 uint16 uint32 uint64 uint8 uinteger unbin unbounded uncommitted unencrypted unhex unicode union union_extract union_tag union_value unique unknown unlisten unlogged unnest unpack unpivot unpivot_list until update upper url_decode url_encode use user user_agent username using usmallint utinyint uuid uuid_extract_timestamp uuid_extract_version uuidv4 uuidv7 vacuum valid validate validator value values var_pop var_samp varbinary varchar variable variadic variance varint varying vector_type verbose verify_external verify_fetch_row verify_parallelism verify_serializer version view views virtual volatile wal_autocheckpoint wavg week weekday weekofyear weeks weighted_avg when where which_secret whitespace window with within without work worker_threads wrapper write write_log xml xmlattributes xmlconcat xmlelement xmlexists xmlforest xmlnamespaces xmlparse xmlpi xmlroot xmlserialize xmltable xor year years yearweek yes zone zstd_min_string_length | || ~ ~~ ~~* ~~~`, types: "JSON bigint binary bit bitstring blob bool boolean bpchar bytea char date datetime dec decimal double enum float float4 float8 guid hugeint int int1 int128 int16 int2 int32 int4 int64 int8 integer integral interval list logical long map null numeric nvarchar oid real row short signed smallint string struct text time timestamp timestamp_ms timestamp_ns timestamp_s timestamp_us timestamptz timetz tinyint ubigint uhugeint uint128 uint16 uint32 uint64 uint8 uinteger union usmallint utinyint uuid varbinary varchar varint", diff --git a/src/dialects/index.ts b/src/dialects/index.ts index c45977f..c03ed93 100644 --- a/src/dialects/index.ts +++ b/src/dialects/index.ts @@ -1 +1,2 @@ +export { BigQueryDialect } from "./bigquery.js"; export { DuckDBDialect } from "./duckdb/duckdb.js"; diff --git a/src/sql/__tests__/parser.test.ts b/src/sql/__tests__/parser.test.ts index 7f2d361..524b70d 100644 --- a/src/sql/__tests__/parser.test.ts +++ b/src/sql/__tests__/parser.test.ts @@ -1,6 +1,6 @@ import { EditorState } from "@codemirror/state"; import { describe, expect, it, vi } from "vitest"; -import { NodeSqlParser } from "../parser.js"; +import { exportedForTesting, NodeSqlParser } from "../parser.js"; describe("SqlParser", () => { const parser = new NodeSqlParser(); @@ -112,18 +112,15 @@ describe("SqlParser", () => { }); describe("DuckDB dialect support", () => { - it("should accept DuckDB-specific syntax without parsing", async () => { + it("should accept FROM queries syntax without parsing", async () => { const duckdbParser = new NodeSqlParser({ getParserOptions: () => ({ database: "DuckDB", }), }); - const state = EditorState.create({ - doc: "from nyc.rideshare select * limit 100", - }); - - const result = await duckdbParser.parse("from nyc.rideshare select * limit 100", { state }); + const sql = "from nyc.rideshare select * limit 100"; + const result = await duckdbParser.parse(sql, { state }); expect(result.success).toBe(true); expect(result.errors).toHaveLength(0); @@ -147,43 +144,235 @@ describe("SqlParser", () => { expect(result.errors).toHaveLength(0); }); - it("should accept complex DuckDB queries without parsing", async () => { + it("should treat CREATE OR REPLACE TABLE as a normal SQL query", async () => { + const duckdbParser = new NodeSqlParser({ + getParserOptions: () => ({ + database: "DuckDB", + }), + }); + + const queries = [ + "CREATE OR REPLACE TABLE users (id INT, name VARCHAR(255))", + "create or replace VIEW v1 AS SELECT 1", + ]; + + for (const sql of queries) { + const state = EditorState.create({ + doc: sql, + }); + const result = await duckdbParser.parse(sql, { state }); + expect(result.success).toBe(true); + expect(result.errors).toHaveLength(0); + expect(result.ast).toBeDefined(); + } + }); + + it("should handle error offsets correctly when replacing CREATE OR REPLACE TABLE", async () => { const duckdbParser = new NodeSqlParser({ getParserOptions: () => ({ database: "DuckDB", }), }); + // This SQL has a syntax error at the end - missing closing parenthesis + const sql = "CREATE OR REPLACE TABLE users (id INT, name VARCHAR(255), invalid_syntax"; + const state = EditorState.create({ - doc: "from nyc.rideshare select pickup_datetime, dropoff_datetime limit 50", + doc: sql, }); - const result = await duckdbParser.parse( - "from nyc.rideshare select pickup_datetime, dropoff_datetime limit 50", - { state }, - ); + const result = await duckdbParser.parse(sql, { state }); + expect(result.success).toBe(false); + expect(result.errors).toHaveLength(1); - expect(result.success).toBe(true); - expect(result.errors).toHaveLength(0); - expect(result.ast).toBeUndefined(); + const error = result.errors[0]; + + // The offset should be at the original position of the error + const expectedColumn = sql.length; + expect(error.column).toBe(expectedColumn); }); - it("should accept DuckDB queries with semicolons without parsing", async () => { + it("should be successful with macro keyword", async () => { const duckdbParser = new NodeSqlParser({ getParserOptions: () => ({ database: "DuckDB", }), }); + const queries = ["CREATE macro test1(a) as 1"]; + + for (const sql of queries) { + const state = EditorState.create({ + doc: sql, + }); + const result = await duckdbParser.parse(sql, { state }); + expect(result.success).toBe(true); + expect(result.errors).toHaveLength(0); + } + }); + + it("should quote {} in quotes", async () => { + const duckdbParser = new NodeSqlParser({ + getParserOptions: () => ({ + database: "DuckDB", + ignoreBrackets: true, + }), + }); + const state = EditorState.create({ - doc: "from posts select title, name;", + doc: "SELECT {id} FROM users WHERE id = {id} and name = {name}", }); - const result = await duckdbParser.parse("from posts select title, name;", { state }); + const sql = "SELECT {id} FROM users WHERE id = {id} and name = {name}"; + const result = await duckdbParser.parse(sql, { state }); expect(result.success).toBe(true); expect(result.errors).toHaveLength(0); - expect(result.ast).toBeUndefined(); }); }); }); + +const { removeCommentsFromStart, replaceBracketsWithQuotes } = exportedForTesting; + +describe("removeComments", () => { + it("should remove comments from the start of the query", () => { + const sql = "/* comment */ SELECT * FROM users"; + const result = removeCommentsFromStart(sql).trim(); + expect(result).toBe("SELECT * FROM users"); + }); + + it("should remove comments from the start of the query with multiple lines", () => { + const sql = ` + /* comment */ + SELECT * FROM users + `; + const result = removeCommentsFromStart(sql).trim(); + expect(result).toBe("SELECT * FROM users"); + }); + + it("should remove single line comments", () => { + const sql = ` + -- comment + SELECT * FROM users + `; + const result2 = removeCommentsFromStart(sql).trim(); + expect(result2).toBe("SELECT * FROM users"); + }); + + it("should remove comments from the start of the query with multiple lines and single line comments", () => { + const sql = ` + /* comment */ + -- comment + SELECT * FROM users + + `; + const result = removeCommentsFromStart(sql).trim(); + expect(result).toBe("SELECT * FROM users"); + }); +}); + +describe("replaceBracketsWithQuotes", () => { + it("should replace brackets with quotes", () => { + const sql = "SELECT {id} FROM users WHERE id = {id}"; + const result = replaceBracketsWithQuotes(sql); + expect(result.sql).toBe("SELECT '{id}' FROM users WHERE id = '{id}'"); + expect(result.offsetRecord).toEqual({ 7: 2, 34: 2 }); + }); + + it("should not replace brackets that are already inside quotes", () => { + const sql = "SELECT '{id}' FROM users WHERE id = '{id}'"; + const result = replaceBracketsWithQuotes(sql); + expect(result.sql).toBe("SELECT '{id}' FROM users WHERE id = '{id}'"); + expect(result.offsetRecord).toEqual({}); + }); + + it("should replace multiple brackets", () => { + const sql = "SELECT {id} FROM users WHERE id = {id} and name = {name}"; + const result = replaceBracketsWithQuotes(sql); + expect(result.sql).toBe("SELECT '{id}' FROM users WHERE id = '{id}' and name = '{name}'"); + expect(result.offsetRecord).toEqual({ 50: 2, 7: 2, 34: 2 }); + }); + + it("should not replace multiple brackets that are already inside quotes", () => { + const sql = "SELECT '{id}' FROM users WHERE id = '{id}' and name = '{name}'"; + const result = replaceBracketsWithQuotes(sql); + expect(result.sql).toBe("SELECT '{id}' FROM users WHERE id = '{id}' and name = '{name}'"); + expect(result.offsetRecord).toEqual({}); + }); + + it("should handle multiple brackets in quotes", () => { + const sql = "SELECT '{id} {name}' FROM users WHERE id = '{id} {name}'"; + const result = replaceBracketsWithQuotes(sql); + expect(result.sql).toBe("SELECT '{id} {name}' FROM users WHERE id = '{id} {name}'"); + expect(result.offsetRecord).toEqual({}); + }); + + it("should handle mixed quotes", () => { + const sql = "SELECT '{id}' FROM users WHERE id = \"{id}\""; + const result = replaceBracketsWithQuotes(sql); + expect(result.sql).toBe("SELECT '{id}' FROM users WHERE id = \"{id}\""); + expect(result.offsetRecord).toEqual({}); + }); + + it( + "should handle escaped quotes", + () => { + const sql = "SELECT \\'{id}\\' FROM users WHERE id = \\'{id}\\'"; + const result = replaceBracketsWithQuotes(sql); + expect(result.sql).toBe("SELECT \\'{id}\\' FROM users WHERE id = \\'{id}\\'"); + }, + { fails: true }, // We don't support escaped quotes yet + ); + + it("should handle brackets at the beginning of string", () => { + const sql = "{id} FROM users"; + const result = replaceBracketsWithQuotes(sql); + expect(result.sql).toBe("'{id}' FROM users"); + expect(result.offsetRecord).toEqual({ 0: 2 }); + }); + + it("should handle brackets at the end of string", () => { + const sql = "SELECT * FROM users WHERE id = {id}"; + const result = replaceBracketsWithQuotes(sql); + expect(result.sql).toBe("SELECT * FROM users WHERE id = '{id}'"); + }); + + it("should handle empty brackets", () => { + const sql = "SELECT {} FROM users"; + const result = replaceBracketsWithQuotes(sql); + expect(result.sql).toBe("SELECT '{}' FROM users"); + }); + + it("should handle brackets with spaces", () => { + const sql = "SELECT { user id } FROM users WHERE id = { user id }"; + const result = replaceBracketsWithQuotes(sql); + expect(result.sql).toBe("SELECT '{ user id }' FROM users WHERE id = '{ user id }'"); + }); + + it("should handle complex nested structures", () => { + const sql = + "SELECT {user.profile.name} FROM users WHERE id = '{user.id}' AND name = \"{user.name}\""; + const result = replaceBracketsWithQuotes(sql); + expect(result.sql).toBe( + "SELECT '{user.profile.name}' FROM users WHERE id = '{user.id}' AND name = \"{user.name}\"", + ); + }); + + it("should handle unclosed brackets", () => { + const sql = "SELECT {id FROM users"; + const result = replaceBracketsWithQuotes(sql); + expect(result.sql).toBe("SELECT {id FROM users"); + }); + + it("should handle multiple unquoted brackets in sequence", () => { + const sql = "SELECT {id}{name}{email} FROM users"; + const result = replaceBracketsWithQuotes(sql); + expect(result.sql).toBe("SELECT '{id}''{name}''{email}' FROM users"); + }); + + it("should handle brackets inside string literals with escaped quotes", () => { + const sql = "SELECT 'user\\'s {id}' FROM users"; + const result = replaceBracketsWithQuotes(sql); + expect(result.sql).toBe("SELECT 'user\\'s {id}' FROM users"); + }); +}); diff --git a/src/sql/parser.ts b/src/sql/parser.ts index 2604d01..e61afdf 100644 --- a/src/sql/parser.ts +++ b/src/sql/parser.ts @@ -6,6 +6,18 @@ import type { SqlParseError, SqlParseResult, SqlParser } from "./types.js"; interface ParserOption extends Option { database: SupportedDialects; + /** + * If true, the parser will quote brackets in the SQL query which will satisfy the parser. + * This is useful if you want to interpolate variables in f-strings. + * + * @example + * ```sql + * SELECT {id} -> SELECT '{id}' + * ``` + * + * @experimental This is an experimental feature and may break parsing. + */ + ignoreBrackets?: boolean; } interface NodeSqlParserOptions { @@ -38,6 +50,9 @@ export class NodeSqlParser implements SqlParser { private opts: NodeSqlParserOptions; private parser: Parser | null = null; + // Record the column number to the offset amount + private offsetRecord: Record = {}; + constructor(opts: NodeSqlParserOptions = {}) { this.opts = opts; } @@ -57,16 +72,21 @@ export class NodeSqlParser implements SqlParser { }); async parse(sql: string, opts: { state: EditorState }): Promise { + // Reset the offset map on each parse + this.offsetRecord = {}; + + const parserOptions = this.opts.getParserOptions?.(opts.state); + const sanitizedSql = await this.sanitizeSql(sql, parserOptions); + try { - const parserOptions = this.opts.getParserOptions?.(opts.state); const parser = await this.getParser(); // Check if this is DuckDB dialect and apply custom processing if (parserOptions?.database === "DuckDB") { - return this.parseWithDuckDBSupport(sql, parserOptions); + return this.parseWithDuckDBSupport(sanitizedSql, parserOptions); } - const ast = parser.astify(sql, parserOptions); + const ast = parser.astify(sanitizedSql, parserOptions); return { success: true, @@ -74,7 +94,7 @@ export class NodeSqlParser implements SqlParser { ast, }; } catch (error: unknown) { - const parseError = this.extractErrorInfo(error, sql); + const parseError = this.extractErrorInfo(error, sanitizedSql); return { success: false, errors: [parseError], @@ -82,8 +102,18 @@ export class NodeSqlParser implements SqlParser { } } + async sanitizeSql(sql: string, parserOptions?: ParserOption): Promise { + if (parserOptions?.ignoreBrackets) { + const { sql: replacedSql, offsetRecord } = replaceBracketsWithQuotes(sql); + this.offsetRecord = offsetRecord; + return replacedSql; + } + return sql; + } + /** - * Parse SQL with DuckDB-specific syntax support + * Parse SQL with DuckDB syntax support + * This is not robust, we catch main cases. */ private async parseWithDuckDBSupport( sql: string, @@ -91,35 +121,42 @@ export class NodeSqlParser implements SqlParser { ): Promise { const parser = await this.getParser(); - // If the query starts with "from", it's DuckDB-specific syntax - // Just return success without parsing to avoid errors - if (sql.trim().toLowerCase().startsWith("from")) { - debug("From syntax is not supported"); - return { - success: true, - errors: [], - }; + // Remove comments and normalize for pattern checking + const sqlToCheck = removeCommentsFromStart(sql).trimStart().toLowerCase(); + + // Handle unsupported DuckDB syntax patterns + if (sqlToCheck.startsWith("from") || sqlToCheck.includes("macro")) { + debug("Unsupported DuckDB syntax"); + return { success: true, errors: [] }; } - // Otherwise, try standard parsing with PostgreSQL dialect + let modifiedSql = sql; + // Postgres does not support `CREATE OR REPLACE` for tables + if (sqlToCheck.includes("create or replace table")) { + const offset = "create or replace table".length - "create table".length; + this.offsetRecord[sql.indexOf("create or replace table")] = -offset; + modifiedSql = sql.replace(/create or replace table/i, "create table"); + } + + // Try standard parsing with PostgreSQL dialect try { const postgresOptions = { ...parserOptions, database: "PostgreSQL" }; - const ast = parser.astify(sql, postgresOptions); - return { - success: true, - errors: [], - ast, - }; + const ast = parser.astify(modifiedSql, postgresOptions); + return { success: true, errors: [], ast }; } catch (error) { + // Use the original sql since we manually apply the offset const parseError = this.extractErrorInfo(error, sql); - return { - success: false, - errors: [parseError], - }; + return { success: false, errors: [parseError] }; } } - private extractErrorInfo(error: unknown, _sql: string): SqlParseError { + /** + * @param error - The error object + * @param sql - The SQL string + * @param offset - The offset to add to the column position. Default is 0. + * @returns The parsed error information + */ + private extractErrorInfo(error: unknown, sql: string): SqlParseError { let line = 1; let column = 1; const message = (error as Error)?.message || "SQL parsing error"; @@ -146,10 +183,33 @@ export class NodeSqlParser implements SqlParser { } } + /** + * Add offset to the column position to get the correct position of the error + * SELECT {id} FRO users + * ^ error position should be here + * + * SELECT {id} FRO users + * ^ user sees this + * So in this case, we subtract the offset from the column position. + * + * If the error is before the brackets, we don't need to add the offset because it just increases the string length + * Column position will be the same as the user sees. + */ + for (const [position, offset] of Object.entries(this.offsetRecord)) { + if (column > parseInt(position, 10)) { + column -= offset; + } + } + + // Ensure we don't exceed the sql length + if (column > sql.length) { + column = sql.length; + } + return { message: this.cleanErrorMessage(message), line: Math.max(1, line), - column: Math.max(1, column), + column: column, severity: "error" as const, }; } @@ -209,6 +269,81 @@ export class NodeSqlParser implements SqlParser { } } +type CommentType = "--" | "/*"; + +function removeCommentsFromStart(sql: string, commentTypes: CommentType[] = ["/*", "--"]): string { + const regexPatterns: string[] = []; + + // Multi-line comments + if (commentTypes.includes("/*")) { + regexPatterns.push("\/\\*[\\s\\S]*?\\*\/"); + } + // Single-line comments + if (commentTypes.includes("--")) { + regexPatterns.push("--[^\\n]*"); + } + + if (regexPatterns.length === 0) return sql; + + const commentRegex = new RegExp(`^\\s*(${regexPatterns.join("|")})\\s*`, ""); + + // Keep removing comments from the start until no more are found + let result = sql; + let prevResult = ""; + + while (result !== prevResult) { + prevResult = result; + result = result.replace(commentRegex, ""); + } + + return result; +} + +const QUOTE_LENGTH = "''".length; + +/** + * Replaces unquoted curly bracket expressions (e.g., {id}) with quoted strings (e.g., '{id}'), + * ignoring brackets already inside single or double quotes. + * + * Returns the modified SQL and a record mapping the index of each replaced bracket to the + * number of characters added (for offset tracking). + * + * @example + * replaceBracketsWithQuotes("SELECT {id}, '{name}' FROM users"); + * // => { + * // sql: "SELECT '{id}', '{name}' FROM users", + * // offsetRecord: { 7: 2 } + * // } + */ +function replaceBracketsWithQuotes(sql: string): { + sql: string; + offsetRecord: Record; +} { + const offsetRecord: Record = {}; + + const replacedSql = sql.replace( + /("(?:[^"\\]|\\.)*")|('(?:[^'\\]|\\.)*')|(\{[^}]*\})/g, + (match, doubleQuoted, singleQuoted, bracket, offset) => { + // If it's a quoted string, return it as-is + if (doubleQuoted || singleQuoted) { + return match; + } + + // If it's a bracket, quote it and record the offset + if (bracket) { + offsetRecord[offset] = QUOTE_LENGTH; + return `'${bracket}'`; + } + + return match; + }, + ); + + return { sql: replacedSql, offsetRecord }; +} + +export const exportedForTesting = { replaceBracketsWithQuotes, removeCommentsFromStart }; + /** * https://github.com/taozhi8833998/node-sql-parser?tab=readme-ov-file#supported-database-sql-syntax * While DuckDB is not supported in the library, we perform some special handling for it and treat it as PostgreSQL.