diff --git a/package-lock.json b/package-lock.json index f52a5298..bfb5e372 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,15 +10,15 @@ "license": "MIT", "dependencies": { "@lit-labs/observers": "^2.0.2", - "@malloydata/db-bigquery": "0.0.169", - "@malloydata/db-duckdb": "0.0.169", - "@malloydata/db-postgres": "0.0.169", - "@malloydata/db-snowflake": "0.0.169", - "@malloydata/db-trino": "0.0.169", - "@malloydata/malloy": "0.0.169", - "@malloydata/malloy-sql": "0.0.169", - "@malloydata/render": "0.0.169", - "@malloydata/syntax-highlight": "0.0.169", + "@malloydata/db-bigquery": "0.0.176", + "@malloydata/db-duckdb": "0.0.176", + "@malloydata/db-postgres": "0.0.176", + "@malloydata/db-snowflake": "0.0.176", + "@malloydata/db-trino": "0.0.176", + "@malloydata/malloy": "0.0.176", + "@malloydata/malloy-sql": "0.0.176", + "@malloydata/render": "0.0.176", + "@malloydata/syntax-highlight": "0.0.176", "@vscode/webview-ui-toolkit": "^1.2.1", "duckdb": "1.0.0", "lit": "^3.0.2", @@ -3994,14 +3994,14 @@ } }, "node_modules/@malloydata/db-bigquery": { - "version": "0.0.169", - "resolved": "https://registry.npmjs.org/@malloydata/db-bigquery/-/db-bigquery-0.0.169.tgz", - "integrity": "sha512-NfIbkhn3+iZPiogTK7v4DMEgq1Xwt3UE1DISxpd49dYh/30PfcaC72O62pHBw0mCovp71mIL+iLrgP95hvrgQA==", + "version": "0.0.176", + "resolved": "https://registry.npmjs.org/@malloydata/db-bigquery/-/db-bigquery-0.0.176.tgz", + "integrity": "sha512-Gk/ul5dgpkrZy7WNZqraJARpWRr8Y4eC12CSsJWxPtMe4nR4MRSL6eDa4qXhENWrsq7vXx+ICs+yMEFbbNmuoQ==", "dependencies": { "@google-cloud/bigquery": "^7.3.0", "@google-cloud/common": "^5.0.1", "@google-cloud/paginator": "^5.0.0", - "@malloydata/malloy": "^0.0.169", + "@malloydata/malloy": "^0.0.176", "gaxios": "^4.2.0" }, "engines": { @@ -4009,12 +4009,12 @@ } }, "node_modules/@malloydata/db-duckdb": { - "version": "0.0.169", - "resolved": "https://registry.npmjs.org/@malloydata/db-duckdb/-/db-duckdb-0.0.169.tgz", - "integrity": "sha512-PmNl2Pn+CMOko6JZwgX0p2b+0H/qSKMHC4ELPP+ohFxA0qUBveD8NjK+H+t8raf1NkaywFUcvB8UNR+pQAp8Iw==", + "version": "0.0.176", + "resolved": "https://registry.npmjs.org/@malloydata/db-duckdb/-/db-duckdb-0.0.176.tgz", + "integrity": "sha512-Nyq8U1qyfknW8hGwaaWsldDAknQ2WldkGy6Nufc1QW586ltQdTBq9mAyeuM5m8vJI09DUCcuEQ3w+CjSTv8TuQ==", "dependencies": { "@duckdb/duckdb-wasm": "1.28.1-dev242.0", - "@malloydata/malloy": "^0.0.169", + "@malloydata/malloy": "^0.0.176", "@motherduck/wasm-client": "^0.6.3", "apache-arrow": "^16.0.0", "duckdb": "1.0.0", @@ -4025,11 +4025,11 @@ } }, "node_modules/@malloydata/db-postgres": { - "version": "0.0.169", - "resolved": "https://registry.npmjs.org/@malloydata/db-postgres/-/db-postgres-0.0.169.tgz", - "integrity": "sha512-0YM3VP5+Bj3Lrnr+V6iEyR8mJlzJfUaT6UliLKR8Vx/AUM8jXngMcfiFEHLCjrOIcW+7rFShyPF0ww8Xq1LfPQ==", + "version": "0.0.176", + "resolved": "https://registry.npmjs.org/@malloydata/db-postgres/-/db-postgres-0.0.176.tgz", + "integrity": "sha512-phaXCnATEOIUFPZR3nBWSDDBkEdYzBDhpCJAJlpsuJ6Z4VZsKx5Js9zYZZq8qPSF7qhLTE/4/Hibccpd3ltCiA==", "dependencies": { - "@malloydata/malloy": "^0.0.169", + "@malloydata/malloy": "^0.0.176", "@types/pg": "^8.6.1", "pg": "^8.7.1", "pg-query-stream": "4.2.3" @@ -4039,11 +4039,11 @@ } }, "node_modules/@malloydata/db-snowflake": { - "version": "0.0.169", - "resolved": "https://registry.npmjs.org/@malloydata/db-snowflake/-/db-snowflake-0.0.169.tgz", - "integrity": "sha512-A8aHujXWQ0yyO4isMk18hQY2fK+WDtjT7JHn5XsI2FCWjB/TTWaJQTPPtBmo47mfi1210KRUQMsr7s50205WKA==", + "version": "0.0.176", + "resolved": "https://registry.npmjs.org/@malloydata/db-snowflake/-/db-snowflake-0.0.176.tgz", + "integrity": "sha512-KTvtOpyL4V0PHkOI3LxJxf4/qE+WbdM2VTY25/OlYk2AY9roGU7kZxtxIgFnFfy8FOUqI/y8Lx5UQcVScrHUsA==", "dependencies": { - "@malloydata/malloy": "^0.0.169", + "@malloydata/malloy": "^0.0.176", "@types/snowflake-sdk": "^1.6.16", "generic-pool": "^3.9.0", "snowflake-sdk": "1.10.0", @@ -4054,11 +4054,11 @@ } }, "node_modules/@malloydata/db-trino": { - "version": "0.0.169", - "resolved": "https://registry.npmjs.org/@malloydata/db-trino/-/db-trino-0.0.169.tgz", - "integrity": "sha512-IO2uAk+yv5qikwH9WSq/PsAK3LL0ZW13PE3dvtLKxIXSvpdz85T2OMGs1YVs6nuFBsdGzC843E0aZ48m20YULw==", + "version": "0.0.176", + "resolved": "https://registry.npmjs.org/@malloydata/db-trino/-/db-trino-0.0.176.tgz", + "integrity": "sha512-G8gf3gOl0SLV19is+SGqmz7dEdukzKaSuBtEtqK3JQsUrHfcElemn0jFS41wljsuwNGjZ2sD6d1lqkzTuH3FaQ==", "dependencies": { - "@malloydata/malloy": "^0.0.169", + "@malloydata/malloy": "^0.0.176", "@prestodb/presto-js-client": "^1.0.0", "gaxios": "^4.2.0", "trino-client": "^0.2.2" @@ -4068,9 +4068,9 @@ } }, "node_modules/@malloydata/malloy": { - "version": "0.0.169", - "resolved": "https://registry.npmjs.org/@malloydata/malloy/-/malloy-0.0.169.tgz", - "integrity": "sha512-9ucWdtfATRYSs4dO/cH21ggEBNIn/Lywsgn66YCVGM2ZprAvwjpw5wakQRTjI4Dmn/Jx3TRjwpCASXHtClEOew==", + "version": "0.0.176", + "resolved": "https://registry.npmjs.org/@malloydata/malloy/-/malloy-0.0.176.tgz", + "integrity": "sha512-7JtdI0np+8iF0H1uhP2bmuC4Zcna2ONv9k59d7+3SGIBhKiKifima6+n6skoKW0seoolbe6QR+mo3F7H1+uhwQ==", "dependencies": { "antlr4ts": "^0.5.0-alpha.4", "assert": "^2.0.0", @@ -4084,22 +4084,23 @@ } }, "node_modules/@malloydata/malloy-sql": { - "version": "0.0.169", - "resolved": "https://registry.npmjs.org/@malloydata/malloy-sql/-/malloy-sql-0.0.169.tgz", - "integrity": "sha512-pnqBcoR/QIrUOH4iYmggfBE6EzQ44Pd9Opbb9Z+mmwCvyL+I9bZKswsbZNF8+BKMbFQFdkZFiB/U4tOrpH4YDw==", + "version": "0.0.176", + "resolved": "https://registry.npmjs.org/@malloydata/malloy-sql/-/malloy-sql-0.0.176.tgz", + "integrity": "sha512-hkl5v5HLCfR3X6Mp6okXYBb0bwOTFBj9pM2tl7NwOhfQaL9ec7bfNLY/Ee8LYYQ6hYeekxzzGA9aJGlvDv2VUw==", "dependencies": { - "@malloydata/malloy": "^0.0.169" + "@malloydata/malloy": "^0.0.176" }, "engines": { "node": ">=18" } }, "node_modules/@malloydata/render": { - "version": "0.0.169", - "resolved": "https://registry.npmjs.org/@malloydata/render/-/render-0.0.169.tgz", - "integrity": "sha512-NpGBDtwyeq/2FrWcdD4plgJaOLPdLOu2+gkUV0HDyxxK7cipAozCqp3Yd26OVO1MHS8T/NTtU3ftg3Eutmo1EA==", + "version": "0.0.176", + "resolved": "https://registry.npmjs.org/@malloydata/render/-/render-0.0.176.tgz", + "integrity": "sha512-mS6/tkor1KVsaZ0/lMJThlmY0qAXWptzDcOS5yRkizx/Aag1A0eK+vU6U8uANDHzlyKUACUiWPlmTW4npiVbnA==", "dependencies": { - "@malloydata/malloy": "^0.0.169", + "@malloydata/malloy": "^0.0.176", + "@tanstack/solid-virtual": "^3.10.4", "@types/luxon": "^2.4.0", "component-register": "^0.8.6", "lodash": "^4.17.20", @@ -4118,9 +4119,9 @@ } }, "node_modules/@malloydata/syntax-highlight": { - "version": "0.0.169", - "resolved": "https://registry.npmjs.org/@malloydata/syntax-highlight/-/syntax-highlight-0.0.169.tgz", - "integrity": "sha512-iTOtgCR6/9p9JKp1aTz76mFVDMdcvKDdnXiAGOf6n3xIYVP1fQwv468pUQjhb2mAFuGTxIudVQEE8Rkgzcxqmw==", + "version": "0.0.176", + "resolved": "https://registry.npmjs.org/@malloydata/syntax-highlight/-/syntax-highlight-0.0.176.tgz", + "integrity": "sha512-SNLDjoWbNVVpa9s3tzW0zlW7Nh4scysfwRT/ZnrZxXfZIvooxuKbtTu0oVO1v33QaA+NxfYlGB5ymUWaxlmg3w==", "engines": { "node": ">=18" } @@ -5625,6 +5626,30 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, + "node_modules/@tanstack/solid-virtual": { + "version": "3.10.5", + "resolved": "https://registry.npmjs.org/@tanstack/solid-virtual/-/solid-virtual-3.10.5.tgz", + "integrity": "sha512-A5pvOGZYFawsmSL18jNephLdUmPohsGcfoJWW8wefUKbL6YOsD25fCy5FPrP8vcfQfGy47+r+FkREE2TkSle2w==", + "dependencies": { + "@tanstack/virtual-core": "3.10.5" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + }, + "peerDependencies": { + "solid-js": "^1.3.0" + } + }, + "node_modules/@tanstack/virtual-core": { + "version": "3.10.5", + "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.10.5.tgz", + "integrity": "sha512-WlJp8CipNzBz8Q4g159uMfswYHZ8p1+xJwLBdnbBTcSSu0zVoY6i27Suw5J0Y88YBnJ9jHR8jJMH/qSuZWWfNw==", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + } + }, "node_modules/@techteamer/ocsp": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@techteamer/ocsp/-/ocsp-1.0.1.tgz", diff --git a/package.json b/package.json index 89f6b130..523ee6a2 100644 --- a/package.json +++ b/package.json @@ -588,15 +588,15 @@ }, "dependencies": { "@lit-labs/observers": "^2.0.2", - "@malloydata/db-bigquery": "0.0.169", - "@malloydata/db-duckdb": "0.0.169", - "@malloydata/db-postgres": "0.0.169", - "@malloydata/db-snowflake": "0.0.169", - "@malloydata/db-trino": "0.0.169", - "@malloydata/malloy": "0.0.169", - "@malloydata/malloy-sql": "0.0.169", - "@malloydata/render": "0.0.169", - "@malloydata/syntax-highlight": "0.0.169", + "@malloydata/db-bigquery": "0.0.176", + "@malloydata/db-duckdb": "0.0.176", + "@malloydata/db-postgres": "0.0.176", + "@malloydata/db-snowflake": "0.0.176", + "@malloydata/db-trino": "0.0.176", + "@malloydata/malloy": "0.0.176", + "@malloydata/malloy-sql": "0.0.176", + "@malloydata/render": "0.0.176", + "@malloydata/syntax-highlight": "0.0.176", "@vscode/webview-ui-toolkit": "^1.2.1", "duckdb": "1.0.0", "lit": "^3.0.2", diff --git a/src/server/connections/browser/connection_factory.ts b/src/server/connections/browser/connection_factory.ts index b3e701ed..ba56695b 100644 --- a/src/server/connections/browser/connection_factory.ts +++ b/src/server/connections/browser/connection_factory.ts @@ -28,7 +28,7 @@ import { ConnectionBackend, ConnectionConfig, } from '../../../common/types/connection_manager_types'; -import {createDuckDbWasmConnection} from '../duckdb_wasm_connection'; +import {createDuckDbWasmConnection} from './duckdb_wasm_connection'; import {DuckDBWASMConnection} from '@malloydata/db-duckdb/wasm'; import {GenericConnection} from '../../../common/types/worker_message_types'; import {errorMessage} from '../../../common/errors'; diff --git a/src/server/connections/duckdb_wasm_connection.ts b/src/server/connections/browser/duckdb_wasm_connection.ts similarity index 95% rename from src/server/connections/duckdb_wasm_connection.ts rename to src/server/connections/browser/duckdb_wasm_connection.ts index 18cca903..0da20cb8 100644 --- a/src/server/connections/duckdb_wasm_connection.ts +++ b/src/server/connections/browser/duckdb_wasm_connection.ts @@ -25,8 +25,8 @@ import {DuckDBWASMConnection} from '@malloydata/db-duckdb/wasm'; import { ConfigOptions, DuckDBConnectionConfig, -} from '../../common/types/connection_manager_types'; -import {GenericConnection} from '../../common/types/worker_message_types'; +} from '../../../common/types/connection_manager_types'; +import {GenericConnection} from '../../../common/types/worker_message_types'; export const createDuckDbWasmConnection = async ( client: GenericConnection, diff --git a/src/server/connections/bigquery_connection.ts b/src/server/connections/node/bigquery_connection.ts similarity index 94% rename from src/server/connections/bigquery_connection.ts rename to src/server/connections/node/bigquery_connection.ts index f16c2ddf..3cbc8d2d 100644 --- a/src/server/connections/bigquery_connection.ts +++ b/src/server/connections/node/bigquery_connection.ts @@ -25,8 +25,8 @@ import {BigQueryConnection} from '@malloydata/db-bigquery'; import { ConfigOptions, BigQueryConnectionConfig, -} from '../../common/types/connection_manager_types'; -import {convertToBytes} from '../../common/convert_to_bytes'; +} from '../../../common/types/connection_manager_types'; +import {convertToBytes} from '../../../common/convert_to_bytes'; export const createBigQueryConnection = async ( connectionConfig: BigQueryConnectionConfig, diff --git a/src/server/connections/node/connection_factory.ts b/src/server/connections/node/connection_factory.ts index 1858afe4..d0e86751 100644 --- a/src/server/connections/node/connection_factory.ts +++ b/src/server/connections/node/connection_factory.ts @@ -28,16 +28,16 @@ import { ConnectionBackend, ConnectionConfig, } from '../../../common/types/connection_manager_types'; -import {createBigQueryConnection} from '../bigquery_connection'; -import {createDuckDbConnection} from '../duckdb_connection'; -import {createPostgresConnection} from '../postgres_connection'; -import {createSnowflakeConnection} from '../snowflake_connection'; -import {createTrinoConnection} from '../trino_connection'; +import {createBigQueryConnection} from './bigquery_connection'; +import {createDuckDbConnection} from './duckdb_connection'; +import {createPostgresConnection} from './postgres_connection'; +import {createSnowflakeConnection} from './snowflake_connection'; +import {createTrinoConnection} from './trino_connection'; import {fileURLToPath} from 'url'; import {GenericConnection} from '../../../common/types/worker_message_types'; import {TrinoExecutor} from '@malloydata/db-trino'; -import {createPrestoConnection} from '../presto_connection'; +import {createPrestoConnection} from './presto_connection'; export class NodeConnectionFactory implements ConnectionFactory { connectionCache: Record = {}; diff --git a/src/server/connections/duckdb_connection.ts b/src/server/connections/node/duckdb_connection.ts similarity index 92% rename from src/server/connections/duckdb_connection.ts rename to src/server/connections/node/duckdb_connection.ts index b4439bb6..3a313497 100644 --- a/src/server/connections/duckdb_connection.ts +++ b/src/server/connections/node/duckdb_connection.ts @@ -25,9 +25,9 @@ import {DuckDBConnection} from '@malloydata/db-duckdb'; import { ConfigOptions, DuckDBConnectionConfig, -} from '../../common/types/connection_manager_types'; -import {isDuckDBAvailable} from '../../common/duckdb_availability'; -import {GenericConnection} from '../../common/types/worker_message_types'; +} from '../../../common/types/connection_manager_types'; +import {isDuckDBAvailable} from '../../../common/duckdb_availability'; +import {GenericConnection} from '../../../common/types/worker_message_types'; export const createDuckDbConnection = async ( client: GenericConnection, diff --git a/src/server/connections/postgres_connection.ts b/src/server/connections/node/postgres_connection.ts similarity index 94% rename from src/server/connections/postgres_connection.ts rename to src/server/connections/node/postgres_connection.ts index f4775cd5..32eba56e 100644 --- a/src/server/connections/postgres_connection.ts +++ b/src/server/connections/node/postgres_connection.ts @@ -25,8 +25,8 @@ import {PostgresConnection} from '@malloydata/db-postgres'; import { PostgresConnectionConfig, ConfigOptions, -} from '../../common/types/connection_manager_types'; -import {GenericConnection} from '../../common/types/worker_message_types'; +} from '../../../common/types/connection_manager_types'; +import {GenericConnection} from '../../../common/types/worker_message_types'; export const createPostgresConnection = async ( client: GenericConnection, diff --git a/src/server/connections/presto_connection.ts b/src/server/connections/node/presto_connection.ts similarity index 100% rename from src/server/connections/presto_connection.ts rename to src/server/connections/node/presto_connection.ts diff --git a/src/server/connections/snowflake_connection.ts b/src/server/connections/node/snowflake_connection.ts similarity index 94% rename from src/server/connections/snowflake_connection.ts rename to src/server/connections/node/snowflake_connection.ts index 71aa4ea2..31064513 100644 --- a/src/server/connections/snowflake_connection.ts +++ b/src/server/connections/node/snowflake_connection.ts @@ -25,8 +25,8 @@ import {SnowflakeConnection} from '@malloydata/db-snowflake'; import { ConfigOptions, SnowflakeConnectionConfig, -} from '../../common/types/connection_manager_types'; -import {GenericConnection} from '../../common/types/worker_message_types'; +} from '../../../common/types/connection_manager_types'; +import {GenericConnection} from '../../../common/types/worker_message_types'; export const createSnowflakeConnection = async ( client: GenericConnection, diff --git a/src/server/connections/trino_connection.ts b/src/server/connections/node/trino_connection.ts similarity index 100% rename from src/server/connections/trino_connection.ts rename to src/server/connections/node/trino_connection.ts