@hypequery/cli 1.1.1 → 1.1.2

package/README.md

@@ -1,211 +1,109 @@
 # @hypequery/cli
 
-Command-line interface for Hypequery - the type-safe analytics layer for ClickHouse.
+CLI for scaffolding and running the main hypequery path.
 
-## Quick Start
+Use it to:
 
-The CLI scaffolds and runs the main hypequery path:
+- generate schema types from ClickHouse
+- scaffold `analytics/` files
+- run the local dev server with docs
 
-1. Generate schema types from ClickHouse
-2. Build queries with the typed query builder
-3. Wrap reusable queries with `query({ ... })`
-4. Add `serve({ queries })` when you want HTTP routes and docs
+## Quick Start
 
-Use `npx` to run commands directly:
+Run it directly:
 
 ```bash
-# Initialize a new project
 npx @hypequery/cli init
-
-# Start development server
 npx @hypequery/cli dev
-
-# Generate types from database
 npx @hypequery/cli generate
 ```
 
-## Installation (Optional)
-
-For frequent use, install as a dev dependency:
+Or install it once:
 
 ```bash
 npm install -D @hypequery/cli
-# or
-pnpm add -D @hypequery/cli
-# or
-yarn add -D @hypequery/cli
 ```
 
-Then use the shorter `hypequery` command:
-
-```bash
-npx hypequery dev
-```
-
-Or add to your `package.json` scripts:
-
-```json
-{
-  "scripts": {
-    "hypequery:init": "hypequery init",
-    "hypequery:dev": "hypequery dev",
-    "hypequery:generate": "hypequery generate"
-  }
-}
-```
-
-## TypeScript Support
-
-`hypequery dev` bundles a TypeScript runtime (powered by `tsx`), so pointing it at `analytics/queries.ts` or any `.ts/.tsx` file just works—no extra install or custom runner required. If your project already compiles to JavaScript you can keep targeting the generated `.js` file instead.
-
 ## Commands
 
 ### `hypequery init`
 
-Interactive setup wizard that scaffolds a new Hypequery project.
+Scaffolds the standard hypequery setup.
 
 ```bash
-# Without installation
-npx @hypequery/cli init
-
-# With installation
 npx hypequery init
 ```
 
-**What it does:**
-- Connects to your ClickHouse database
-- Generates TypeScript types from your schema
-- Creates the client, query, and serve files for the main path
-- Sets up `.env` with connection details
-- Updates `.gitignore` to protect secrets
-
-**Options:**
-- `--database <type>` - Database type (currently only `clickhouse`)
-- `--path <path>` - Output directory (default: `analytics/`)
-- `--no-example` - Skip example query generation
-- `--no-interactive` - Non-interactive mode (uses environment variables)
-- `--force` - Overwrite existing files without confirmation
-
-**Example:**
-```bash
-# Interactive mode (recommended)
-npx @hypequery/cli init
+It will:
 
-# Non-interactive with custom path
-npx @hypequery/cli init --path src/analytics --no-interactive
-```
+- generate schema types
+- create client and query files
+- write `.env` values
+- update `.gitignore`
+- install scaffold dependencies, including `zod`
+
+Options:
+
+- `--path <path>`: output directory, default `analytics/`
+- `--no-example`: skip the example query
+- `--no-interactive`: read connection details from env vars
+- `--force`: overwrite existing scaffold files
+- `--skip-connection`: skip testing the ClickHouse connection before scaffolding
 
 ### `hypequery dev`
 
-Start development server with live reload and query playground.
+Runs the local serve runtime with docs and hot reload.
 
 ```bash
-# Without installation
-npx @hypequery/cli dev
-
-# With installation
 npx hypequery dev
-
-# With TypeScript file
-npx @hypequery/cli dev src/analytics/queries.ts
 ```
 
-**What it does:**
-- Starts a local HTTP server for your queries
-- Provides interactive API documentation at `/docs`
-- Auto-reloads on file changes
-- Displays query execution stats
-
-**Options:**
-- `-p, --port <port>` - Port number (default: `4000`)
-- `-h, --hostname <host>` - Hostname to bind (default: `localhost`)
-- `--no-watch` - Disable file watching
-- `--cache <provider>` - Cache provider (`memory` | `redis` | `none`)
-- `--open` - Open browser automatically
-- `--cors` - Enable CORS
-- `-q, --quiet` - Suppress startup messages
-
-**Example:**
-```bash
-# Basic usage
-npx @hypequery/cli dev
+Options:
 
-# Custom port with browser auto-open
-npx @hypequery/cli dev --port 3000 --open
+- `--port <port>`: default `4000`
+- `--hostname <host>`: default `localhost`
+- `--no-watch`: disable file watching
+- `--cache <provider>`: `memory`, `redis`, or `none`
+- `--open`: open the browser automatically
+- `--cors`: enable CORS
+- `--quiet`: reduce startup output
 
-# Disable caching for debugging
-npx @hypequery/cli dev --cache none
-```
-
-**Common Issues:**
-
-If you see "Unexpected token" errors while loading your queries, double-check that you're pointing the CLI at the TypeScript source file (e.g. `analytics/queries.ts`). The CLI bundles the loader and should not require additional dependencies.
+The CLI understands TypeScript entry files directly, so `analytics/queries.ts` works without an extra runner.
 
 ### `hypequery generate`
 
-Regenerate TypeScript types from ClickHouse schema.
+Regenerates schema types from ClickHouse.
 
 ```bash
-# Without installation
-npx @hypequery/cli generate
-
-# With installation
 npx hypequery generate
 ```
 
-The CLI bundles the ClickHouse driver directly, so you can run this command without installing `@hypequery/clickhouse`. Specify `--database <type>` once additional drivers become available.
+Options:
 
-**What it does:**
-- Connects to ClickHouse
-- Introspects your database schema
-- Generates TypeScript interfaces for all tables
-- Updates your schema file with type-safe definitions
+- `--output <path>`: default `analytics/schema.ts`
+- `--tables <names>`: comma-separated table list
+- `--database <type>`: currently `clickhouse`
 
-**Options:**
-- `-o, --output <path>` - Output file (default: `analytics/schema.ts`)
-- `--tables <names>` - Only generate for specific tables (comma-separated)
-- `--database <type>` - Override detected database (currently only `clickhouse`)
+## Non-interactive Setup
 
-**Example:**
-```bash
-# Generate all tables
-npx @hypequery/cli generate
-
-# Generate specific tables
-npx @hypequery/cli generate --tables users,events
-
-# Custom output path
-npx @hypequery/cli generate --output src/schema.ts
-```
+`hypequery init --no-interactive` reads:
 
-## Package Scripts
+- `CLICKHOUSE_URL` or deprecated `CLICKHOUSE_HOST`
+- `CLICKHOUSE_DATABASE`
+- `CLICKHOUSE_USERNAME` or `CLICKHOUSE_USER`
+- `CLICKHOUSE_PASSWORD`
 
-Add these to your `package.json` for easy access:
-
-```json
-{
-  "scripts": {
-    "db:init": "hypequery init",
-    "db:dev": "hypequery dev",
-    "db:generate": "hypequery generate"
-  }
-}
-```
-
-Then run with:
-```bash
-npm run db:dev
-```
+## Notes
 
-## Documentation
+- generated scaffold files use NodeNext-safe local `.js` imports
+- `CLICKHOUSE_URL` is now the preferred connection variable
+- the CLI bundles the ClickHouse driver for schema generation
 
-Visit the main docs flow:
+## Docs
 
-- [Quick Start](https://hypequery.com/docs/quick-start)
-- [Core Concepts](https://hypequery.com/docs/core-concepts)
-- [Query Building](https://hypequery.com/docs/query-building/basics)
-- [Serve Runtime Reference](https://hypequery.com/docs/reference/runtime)
+- [Quick start](https://hypequery.com/docs/quick-start)
+- [CLI reference](https://hypequery.com/docs/reference/api/cli)
 
 ## License
 
-Apache-2.0
+Apache-2.0.

package/dist/cli.d.ts

@@ -1,4 +1,7 @@
 import { Command } from 'commander';
 declare const program: Command;
+export declare function normalizeInitOptions(options: Record<string, unknown>): {
+    noInteractive: boolean;
+};
 export { program };
 //# sourceMappingURL=cli.d.ts.map

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,QAAA,MAAM,OAAO,SAAgB,CAAC;AA8F9B,OAAO,EAAE,OAAO,EAAE,CAAC"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,QAAA,MAAM,OAAO,SAAgB,CAAC;AAE9B,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;EAKpE;AA6FD,OAAO,EAAE,OAAO,EAAE,CAAC"}

package/dist/cli.js

@@ -1,3 +1,14 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -39,6 +50,9 @@ import { initCommand } from './commands/init.js';
 import { devCommand } from './commands/dev.js';
 import { generateCommand } from './commands/generate.js';
 var program = new Command();
+export function normalizeInitOptions(options) {
+    return __assign(__assign({}, options), { noInteractive: options.noInteractive === true || options.interactive === false });
+}
 program
     .name('hypequery')
     .description('Type-safe analytics layer for ClickHouse')
@@ -47,7 +61,6 @@ program
 program
     .command('init')
     .description('Initialize a new hypequery project')
-    .option('--database <type>', 'Database type (clickhouse|bigquery)')
     .option('--path <path>', 'Output directory (default: analytics/)')
     .option('--no-example', 'Skip example query generation')
     .option('--no-interactive', 'Non-interactive mode (use env vars)')
@@ -59,7 +72,7 @@ program
         switch (_a.label) {
             case 0:
                 _a.trys.push([0, 2, , 3]);
-                return [4 /*yield*/, initCommand(options)];
+                return [4 /*yield*/, initCommand(normalizeInitOptions(options))];
             case 1:
                 _a.sent();
                 return [3 /*break*/, 3];

package/dist/commands/generate.js

@@ -118,7 +118,7 @@ export function generateCommand() {
                             logger.indent('• Firewall blocking connection');
                             logger.newline();
                             logger.info('Check your configuration:');
-                            logger.indent('CLICKHOUSE_HOST=' + (process.env.CLICKHOUSE_HOST || 'not set'));
+                            logger.indent('CLICKHOUSE_URL=' + (process.env.CLICKHOUSE_URL || process.env.CLICKHOUSE_HOST || 'not set'));
                             logger.newline();
                             logger.info('Docs: https://hypequery.com/docs/troubleshooting#connection-errors');
                         }

package/dist/commands/init.d.ts

@@ -1,5 +1,4 @@
 export interface InitOptions {
-    database?: string;
     path?: string;
     noExample?: boolean;
     noInteractive?: boolean;

package/dist/commands/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AA4BA,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAgFD,wBAAsB,WAAW,CAAC,OAAO,GAAE,WAAgB,iBAoO1D"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AA0BA,MAAM,WAAW,WAAW;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAiED,wBAAsB,WAAW,CAAC,OAAO,GAAE,WAAgB,iBAwO1D"}

package/dist/commands/init.js

@@ -38,7 +38,7 @@ import { mkdir, writeFile, readFile, access } from 'node:fs/promises';
 import path from 'node:path';
 import ora from 'ora';
 import { logger } from '../utils/logger.js';
-import { promptDatabaseType, promptClickHouseConnection, promptOutputDirectory, promptGenerateExample, promptTableSelection, confirmOverwrite, promptRetry, promptContinueWithoutDb, } from '../utils/prompts.js';
+import { promptClickHouseConnection, promptOutputDirectory, promptGenerateExample, promptTableSelection, confirmOverwrite, promptRetry, promptContinueWithoutDb, } from '../utils/prompts.js';
 import { validateConnection, getTableCount, getTables, } from '../utils/detect-database.js';
 import { hasEnvFile, hasGitignore } from '../utils/find-files.js';
 import { generateEnvTemplate, appendToEnv } from '../templates/env.js';
@@ -46,53 +46,25 @@ import { generateClientTemplate } from '../templates/client.js';
 import { generateQueriesTemplate } from '../templates/queries.js';
 import { appendToGitignore } from '../templates/gitignore.js';
 import { getTypeGenerator } from '../generators/index.js';
-import { installServeDependencies } from '../utils/dependency-installer.js';
-function determineDatabase(options) {
-    return __awaiter(this, void 0, void 0, function () {
-        var dbType, _a;
-        var _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    if (!((_b = options.database) !== null && _b !== void 0)) return [3 /*break*/, 1];
-                    _a = _b;
-                    return [3 /*break*/, 3];
-                case 1: return [4 /*yield*/, promptDatabaseType()];
-                case 2:
-                    _a = (_c.sent());
-                    _c.label = 3;
-                case 3:
-                    dbType = _a;
-                    if (!dbType) {
-                        logger.info('Setup cancelled');
-                        process.exit(0);
-                    }
-                    if (dbType !== 'clickhouse') {
-                        logger.error("".concat(dbType, " is not yet supported. Only ClickHouse is available."));
-                        process.exit(1);
-                    }
-                    return [2 /*return*/, dbType];
-            }
-        });
-    });
-}
+import { installScaffoldDependencies } from '../utils/dependency-installer.js';
 function resolveConnectionConfig(options) {
     return __awaiter(this, void 0, void 0, function () {
         var required;
         var _a;
         return __generator(this, function (_b) {
             if (options.noInteractive) {
-                required = function (key) {
-                    var value = process.env[key];
+                required = function (keys) {
+                    var values = Array.isArray(keys) ? keys : [keys];
+                    var value = values.map(function (key) { return process.env[key]; }).find(Boolean);
                     if (!value) {
-                        throw new Error("Missing ".concat(key, ". Provide ClickHouse connection info via environment variables when using --no-interactive."));
+                        throw new Error("Missing ".concat(values.join(' or '), ". Provide ClickHouse connection info via environment variables when using --no-interactive."));
                     }
                     return value;
                 };
                 return [2 /*return*/, {
-                        host: required('CLICKHOUSE_HOST'),
+                        host: required(['CLICKHOUSE_URL', 'CLICKHOUSE_HOST']),
                         database: required('CLICKHOUSE_DATABASE'),
-                        username: required('CLICKHOUSE_USERNAME'),
+                        username: required(['CLICKHOUSE_USERNAME', 'CLICKHOUSE_USER']),
                         password: (_a = process.env.CLICKHOUSE_PASSWORD) !== null && _a !== void 0 ? _a : '',
                     }];
             }
@@ -100,18 +72,19 @@ function resolveConnectionConfig(options) {
         });
     });
 }
-function testConnection(connectionConfig, dbType) {
+function testConnection(connectionConfig) {
     return __awaiter(this, void 0, void 0, function () {
         var spinner, isValid, tableCount;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     spinner = ora('Testing connection...').start();
+                    process.env.CLICKHOUSE_URL = connectionConfig.host;
                     process.env.CLICKHOUSE_HOST = connectionConfig.host;
                     process.env.CLICKHOUSE_DATABASE = connectionConfig.database;
                     process.env.CLICKHOUSE_USERNAME = connectionConfig.username;
                     process.env.CLICKHOUSE_PASSWORD = connectionConfig.password;
-                    return [4 /*yield*/, validateConnection(dbType)];
+                    return [4 /*yield*/, validateConnection('clickhouse')];
                 case 1:
                     isValid = _a.sent();
                     if (!isValid) {
@@ -127,7 +100,7 @@ function testConnection(connectionConfig, dbType) {
                         logger.newline();
                         return [2 /*return*/, { hasValidConnection: false, tableCount: 0 }];
                     }
-                    return [4 /*yield*/, getTableCount(dbType)];
+                    return [4 /*yield*/, getTableCount('clickhouse')];
                 case 2:
                     tableCount = _a.sent();
                     spinner.succeed("Connected successfully (".concat(tableCount, " tables found)"));
@@ -139,47 +112,48 @@ function testConnection(connectionConfig, dbType) {
 }
 export function initCommand() {
     return __awaiter(this, arguments, void 0, function (options) {
-        var dbType, connectionConfig, hasValidConnection, tableCount, _a, valid, count, retry, continueWithout, outputDir, resolvedOutputDir, filesToCreate, existingFiles, _i, filesToCreate_1, file, _b, shouldOverwrite, generateExample, selectedTable, tables, envPath, envExists, existingEnv, newEnv, envPath, envExists, placeholderConfig, schemaPath, typeSpinner, generator, error_1, clientPath, queriesPath, gitignorePath, gitignoreExists, existingGitignore, newGitignore, exampleQueryKey;
+        var noInteractive, connectionConfig, hasValidConnection, tableCount, _a, valid, count, retry, continueWithout, outputDir, resolvedOutputDir, filesToCreate, existingFiles, _i, filesToCreate_1, file, _b, shouldOverwrite, _c, generateExample, selectedTable, tables, envPath, envExists, existingEnv, newEnv, envPath, envExists, placeholderConfig, schemaPath, typeSpinner, generator, error_1, clientPath, queriesPath, gitignorePath, gitignoreExists, existingGitignore, newGitignore, exampleQueryKey;
         if (options === void 0) { options = {}; }
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
+                    noInteractive = options.noInteractive === true || options.interactive === false;
                     logger.newline();
                     logger.header('Welcome to hypequery!');
                     logger.info("Let's set up your analytics layer.");
                     logger.newline();
-                    return [4 /*yield*/, determineDatabase(options)];
-                case 1:
-                    dbType = _c.sent();
                     return [4 /*yield*/, resolveConnectionConfig(options)];
-                case 2:
-                    connectionConfig = _c.sent();
+                case 1:
+                    connectionConfig = _d.sent();
                     hasValidConnection = false;
                     tableCount = 0;
-                    if (!!connectionConfig) return [3 /*break*/, 3];
+                    if (!!connectionConfig) return [3 /*break*/, 2];
                     logger.info('Skipping database connection for now.');
                     logger.newline();
-                    return [3 /*break*/, 8];
-                case 3:
-                    if (!options.skipConnection) return [3 /*break*/, 4];
+                    return [3 /*break*/, 7];
+                case 2:
+                    if (!options.skipConnection) return [3 /*break*/, 3];
                     logger.info('Skipping database connection test (requested).');
                     logger.newline();
-                    return [3 /*break*/, 8];
-                case 4: return [4 /*yield*/, testConnection(connectionConfig, dbType)];
-                case 5:
-                    _a = _c.sent(), valid = _a.hasValidConnection, count = _a.tableCount;
+                    return [3 /*break*/, 7];
+                case 3: return [4 /*yield*/, testConnection(connectionConfig)];
+                case 4:
+                    _a = _d.sent(), valid = _a.hasValidConnection, count = _a.tableCount;
                     hasValidConnection = valid;
                     tableCount = count;
-                    if (!!hasValidConnection) return [3 /*break*/, 8];
+                    if (!!hasValidConnection) return [3 /*break*/, 7];
+                    if (noInteractive) {
+                        throw new Error('Failed to connect to ClickHouse in non-interactive mode. Check your environment variables or use interactive setup.');
+                    }
                     return [4 /*yield*/, promptRetry('Try again?')];
-                case 6:
-                    retry = _c.sent();
+                case 5:
+                    retry = _d.sent();
                     if (retry) {
                         return [2 /*return*/, initCommand(options)];
                     }
                     return [4 /*yield*/, promptContinueWithoutDb()];
-                case 7:
-                    continueWithout = _c.sent();
+                case 6:
+                    continueWithout = _d.sent();
                     if (!continueWithout) {
                         logger.info('Setup cancelled');
                         process.exit(0);
@@ -189,20 +163,20 @@ export function initCommand() {
                     logger.info('You can configure the connection later in .env');
                     logger.newline();
                     connectionConfig = null;
-                    _c.label = 8;
-                case 8:
+                    _d.label = 7;
+                case 7:
                     outputDir = options.path;
-                    if (!(!outputDir && !options.noInteractive)) return [3 /*break*/, 10];
+                    if (!(!outputDir && !noInteractive)) return [3 /*break*/, 9];
                     return [4 /*yield*/, promptOutputDirectory()];
+                case 8:
+                    outputDir = _d.sent();
+                    return [3 /*break*/, 10];
                 case 9:
-                    outputDir = _c.sent();
-                    return [3 /*break*/, 11];
-                case 10:
                     if (!outputDir) {
                         outputDir = 'analytics';
                     }
-                    _c.label = 11;
-                case 11:
+                    _d.label = 10;
+                case 10:
                     resolvedOutputDir = path.resolve(process.cwd(), outputDir);
                     filesToCreate = [
                         path.join(resolvedOutputDir, 'client.ts'),
@@ -211,170 +185,176 @@ export function initCommand() {
                     ];
                     existingFiles = [];
                     _i = 0, filesToCreate_1 = filesToCreate;
-                    _c.label = 12;
-                case 12:
-                    if (!(_i < filesToCreate_1.length)) return [3 /*break*/, 17];
+                    _d.label = 11;
+                case 11:
+                    if (!(_i < filesToCreate_1.length)) return [3 /*break*/, 16];
                     file = filesToCreate_1[_i];
-                    _c.label = 13;
-                case 13:
-                    _c.trys.push([13, 15, , 16]);
+                    _d.label = 12;
+                case 12:
+                    _d.trys.push([12, 14, , 15]);
                     return [4 /*yield*/, access(file)];
-                case 14:
-                    _c.sent();
+                case 13:
+                    _d.sent();
                     existingFiles.push(path.relative(process.cwd(), file));
-                    return [3 /*break*/, 16];
+                    return [3 /*break*/, 15];
+                case 14:
+                    _b = _d.sent();
+                    return [3 /*break*/, 15];
                 case 15:
-                    _b = _c.sent();
-                    return [3 /*break*/, 16];
-                case 16:
                     _i++;
-                    return [3 /*break*/, 12];
-                case 17:
-                    if (!(existingFiles.length > 0 && !options.force)) return [3 /*break*/, 19];
+                    return [3 /*break*/, 11];
+                case 16:
+                    if (!(existingFiles.length > 0 && !options.force)) return [3 /*break*/, 20];
                     logger.warn('Files already exist');
                     logger.newline();
-                    return [4 /*yield*/, confirmOverwrite(existingFiles)];
+                    if (!noInteractive) return [3 /*break*/, 17];
+                    _c = false;
+                    return [3 /*break*/, 19];
+                case 17: return [4 /*yield*/, confirmOverwrite(existingFiles)];
                 case 18:
-                    shouldOverwrite = _c.sent();
+                    _c = _d.sent();
+                    _d.label = 19;
+                case 19:
+                    shouldOverwrite = _c;
                     if (!shouldOverwrite) {
                         logger.info('Setup cancelled');
                         process.exit(0);
                     }
                     logger.newline();
-                    _c.label = 19;
-                case 19:
+                    _d.label = 20;
+                case 20:
                     generateExample = !options.noExample && hasValidConnection;
                     selectedTable = null;
-                    if (!(generateExample && !options.noInteractive && hasValidConnection)) return [3 /*break*/, 23];
+                    if (!(generateExample && !noInteractive && hasValidConnection)) return [3 /*break*/, 24];
                     return [4 /*yield*/, promptGenerateExample()];
-                case 20:
-                    generateExample = _c.sent();
-                    if (!generateExample) return [3 /*break*/, 23];
-                    return [4 /*yield*/, getTables(dbType)];
                 case 21:
-                    tables = _c.sent();
-                    return [4 /*yield*/, promptTableSelection(tables)];
+                    generateExample = _d.sent();
+                    if (!generateExample) return [3 /*break*/, 24];
+                    return [4 /*yield*/, getTables('clickhouse')];
                 case 22:
-                    selectedTable = _c.sent();
-                    generateExample = selectedTable !== null;
-                    _c.label = 23;
+                    tables = _d.sent();
+                    return [4 /*yield*/, promptTableSelection(tables)];
                 case 23:
+                    selectedTable = _d.sent();
+                    generateExample = selectedTable !== null;
+                    _d.label = 24;
+                case 24:
                     logger.newline();
                     // Step 7: Create directory
                     return [4 /*yield*/, mkdir(resolvedOutputDir, { recursive: true })];
-                case 24:
+                case 25:
                     // Step 7: Create directory
-                    _c.sent();
-                    if (!connectionConfig) return [3 /*break*/, 31];
+                    _d.sent();
+                    if (!connectionConfig) return [3 /*break*/, 32];
                     envPath = path.join(process.cwd(), '.env');
                     return [4 /*yield*/, hasEnvFile()];
-                case 25:
-                    envExists = _c.sent();
-                    if (!envExists) return [3 /*break*/, 28];
-                    return [4 /*yield*/, readFile(envPath, 'utf-8')];
                 case 26:
-                    existingEnv = _c.sent();
+                    envExists = _d.sent();
+                    if (!envExists) return [3 /*break*/, 29];
+                    return [4 /*yield*/, readFile(envPath, 'utf-8')];
+                case 27:
+                    existingEnv = _d.sent();
                     newEnv = appendToEnv(existingEnv, generateEnvTemplate(connectionConfig));
                     return [4 /*yield*/, writeFile(envPath, newEnv)];
-                case 27:
-                    _c.sent();
+                case 28:
+                    _d.sent();
                     logger.success('Updated .env');
-                    return [3 /*break*/, 30];
-                case 28: return [4 /*yield*/, writeFile(envPath, generateEnvTemplate(connectionConfig))];
-                case 29:
-                    _c.sent();
+                    return [3 /*break*/, 31];
+                case 29: return [4 /*yield*/, writeFile(envPath, generateEnvTemplate(connectionConfig))];
+                case 30:
+                    _d.sent();
                     logger.success('Created .env');
-                    _c.label = 30;
-                case 30: return [3 /*break*/, 34];
-                case 31:
+                    _d.label = 31;
+                case 31: return [3 /*break*/, 35];
+                case 32:
                     envPath = path.join(process.cwd(), '.env');
                     return [4 /*yield*/, hasEnvFile()];
-                case 32:
-                    envExists = _c.sent();
+                case 33:
+                    envExists = _d.sent();
                     placeholderConfig = {
-                        host: 'YOUR_CLICKHOUSE_HOST',
+                        url: 'YOUR_CLICKHOUSE_URL',
                         database: 'YOUR_DATABASE',
                         username: 'YOUR_USERNAME',
                         password: 'YOUR_PASSWORD',
                     };
-                    if (!!envExists) return [3 /*break*/, 34];
+                    if (!!envExists) return [3 /*break*/, 35];
                     return [4 /*yield*/, writeFile(envPath, generateEnvTemplate(placeholderConfig))];
-                case 33:
-                    _c.sent();
-                    logger.success('Created .env (configure your credentials)');
-                    _c.label = 34;
                 case 34:
+                    _d.sent();
+                    logger.success('Created .env (configure your credentials)');
+                    _d.label = 35;
+                case 35:
                     schemaPath = path.join(resolvedOutputDir, 'schema.ts');
-                    if (!hasValidConnection) return [3 /*break*/, 39];
+                    if (!hasValidConnection) return [3 /*break*/, 40];
                     typeSpinner = ora('Generating TypeScript types...').start();
-                    _c.label = 35;
-                case 35:
-                    _c.trys.push([35, 37, , 38]);
+                    _d.label = 36;
+                case 36:
+                    _d.trys.push([36, 38, , 39]);
                     generator = getTypeGenerator('clickhouse');
                     return [4 /*yield*/, generator({ outputPath: schemaPath })];
-                case 36:
-                    _c.sent();
-                    typeSpinner.succeed("Generated TypeScript types (".concat(path.relative(process.cwd(), schemaPath), ")"));
-                    return [3 /*break*/, 38];
                 case 37:
-                    error_1 = _c.sent();
+                    _d.sent();
+                    typeSpinner.succeed("Generated TypeScript types (".concat(path.relative(process.cwd(), schemaPath), ")"));
+                    return [3 /*break*/, 39];
+                case 38:
+                    error_1 = _d.sent();
                     typeSpinner.fail('Failed to generate types');
                     logger.error(error_1 instanceof Error ? error_1.message : String(error_1));
                     process.exit(1);
-                    return [3 /*break*/, 38];
-                case 38: return [3 /*break*/, 41];
-                case 39: 
+                    return [3 /*break*/, 39];
+                case 39: return [3 /*break*/, 42];
+                case 40: 
                 // Create placeholder schema file
                 return [4 /*yield*/, writeFile(schemaPath, "// Generated by hypequery\n// Run 'npx hypequery generate' after configuring your database connection\n\nexport interface IntrospectedSchema {\n  // Your table types will appear here after generation\n}\n")];
-                case 40:
+                case 41:
                     // Create placeholder schema file
-                    _c.sent();
+                    _d.sent();
                     logger.success("Created placeholder schema (".concat(path.relative(process.cwd(), schemaPath), ")"));
-                    _c.label = 41;
-                case 41:
+                    _d.label = 42;
+                case 42:
                     clientPath = path.join(resolvedOutputDir, 'client.ts');
                     return [4 /*yield*/, writeFile(clientPath, generateClientTemplate())];
-                case 42:
-                    _c.sent();
+                case 43:
+                    _d.sent();
                     logger.success("Created ClickHouse client (".concat(path.relative(process.cwd(), clientPath), ")"));
                     queriesPath = path.join(resolvedOutputDir, 'queries.ts');
                     return [4 /*yield*/, writeFile(queriesPath, generateQueriesTemplate({
                             hasExample: generateExample,
                             tableName: selectedTable || undefined,
                         }))];
-                case 43:
-                    _c.sent();
+                case 44:
+                    _d.sent();
                     logger.success("Created queries file (".concat(path.relative(process.cwd(), queriesPath), ")"));
                     if (generateExample && selectedTable) {
                         logger.success("Created example query using '".concat(selectedTable, "' table"));
                     }
                     gitignorePath = path.join(process.cwd(), '.gitignore');
                     return [4 /*yield*/, hasGitignore()];
-                case 44:
-                    gitignoreExists = _c.sent();
-                    if (!gitignoreExists) return [3 /*break*/, 48];
-                    return [4 /*yield*/, readFile(gitignorePath, 'utf-8')];
                 case 45:
-                    existingGitignore = _c.sent();
+                    gitignoreExists = _d.sent();
+                    if (!gitignoreExists) return [3 /*break*/, 49];
+                    return [4 /*yield*/, readFile(gitignorePath, 'utf-8')];
+                case 46:
+                    existingGitignore = _d.sent();
                     newGitignore = appendToGitignore(existingGitignore);
-                    if (!(newGitignore !== existingGitignore)) return [3 /*break*/, 47];
+                    if (!(newGitignore !== existingGitignore)) return [3 /*break*/, 48];
                     return [4 /*yield*/, writeFile(gitignorePath, newGitignore)];
-                case 46:
-                    _c.sent();
+                case 47:
+                    _d.sent();
                     logger.success('Updated .gitignore');
-                    _c.label = 47;
-                case 47: return [3 /*break*/, 50];
-                case 48: return [4 /*yield*/, writeFile(gitignorePath, appendToGitignore(''))];
-                case 49:
-                    _c.sent();
+                    _d.label = 48;
+                case 48: return [3 /*break*/, 51];
+                case 49: return [4 /*yield*/, writeFile(gitignorePath, appendToGitignore(''))];
+                case 50:
+                    _d.sent();
                     logger.success('Created .gitignore');
-                    _c.label = 50;
-                case 50: 
+                    _d.label = 51;
+                case 51: 
                 // Step 13: Ensure required hypequery packages are installed
-                return [4 /*yield*/, installServeDependencies()];
-                case 51:
+                return [4 /*yield*/, installScaffoldDependencies()];
+                case 52:
                     // Step 13: Ensure required hypequery packages are installed
-                    _c.sent();
+                    _d.sent();
                     // Step 14: Success message
                     logger.newline();
                     logger.header('Setup complete!');

package/dist/generators/index.js

@@ -6,7 +6,7 @@ export function getTypeGenerator(dbType) {
     var generator = generators[dbType];
     if (!generator) {
         throw new Error(dbType === 'unknown'
-            ? 'Unable to detect database type. Re-run `hypequery init --database <type>` or pass `--database` explicitly.'
+            ? 'Unable to detect database type. Re-run `hypequery generate --database <type>` or pass `--database` explicitly.'
             : "Type generation for ".concat(dbType, " is not supported yet."));
     }
     return generator;

package/dist/templates/client.js

@@ -2,5 +2,5 @@
  * Generate client.ts file for ClickHouse
  */
 export function generateClientTemplate() {
-    return "import { createQueryBuilder } from '@hypequery/clickhouse';\nimport type { IntrospectedSchema } from './schema';\n\nexport const db = createQueryBuilder<IntrospectedSchema>({\n  host: process.env.CLICKHOUSE_HOST!,\n  database: process.env.CLICKHOUSE_DATABASE!,\n  username: process.env.CLICKHOUSE_USERNAME!,\n  password: process.env.CLICKHOUSE_PASSWORD,\n});\n";
+    return "import { createQueryBuilder } from '@hypequery/clickhouse';\nimport type { IntrospectedSchema } from './schema.js';\n\nexport const db = createQueryBuilder<IntrospectedSchema>({\n  url: process.env.CLICKHOUSE_URL ?? process.env.CLICKHOUSE_HOST!,\n  database: process.env.CLICKHOUSE_DATABASE!,\n  username: process.env.CLICKHOUSE_USERNAME!,\n  password: process.env.CLICKHOUSE_PASSWORD,\n});\n";
 }

package/dist/templates/env.d.ts

@@ -2,7 +2,8 @@
  * Generate .env file content for ClickHouse
  */
 export declare function generateEnvTemplate(config: {
-    host: string;
+    host?: string;
+    url?: string;
     database: string;
     username: string;
     password: string;

package/dist/templates/env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/templates/env.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CAoBT;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,eAAe,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CA4B/E"}
+{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/templates/env.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE;IAC1C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CAqBT;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,eAAe,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CA4B/E"}

package/dist/templates/env.js

@@ -2,11 +2,13 @@
  * Generate .env file content for ClickHouse
  */
 export function generateEnvTemplate(config) {
-    var isPlaceholder = config.host.includes('YOUR_');
+    var _a, _b;
+    var connectionUrl = (_b = (_a = config.url) !== null && _a !== void 0 ? _a : config.host) !== null && _b !== void 0 ? _b : '';
+    var isPlaceholder = connectionUrl.includes('YOUR_');
     if (isPlaceholder) {
-        return "# Hypequery Configuration\n# Replace these placeholder values with your actual ClickHouse credentials\n\nCLICKHOUSE_HOST=".concat(config.host, "\nCLICKHOUSE_DATABASE=").concat(config.database, "\nCLICKHOUSE_USERNAME=").concat(config.username, "\nCLICKHOUSE_PASSWORD=").concat(config.password, "\n");
+        return "# Hypequery Configuration\n# Replace these placeholder values with your actual ClickHouse credentials\n\nCLICKHOUSE_URL=".concat(connectionUrl, "\nCLICKHOUSE_DATABASE=").concat(config.database, "\nCLICKHOUSE_USERNAME=").concat(config.username, "\nCLICKHOUSE_PASSWORD=").concat(config.password, "\n");
     }
-    return "# Hypequery Configuration\nCLICKHOUSE_HOST=".concat(config.host, "\nCLICKHOUSE_DATABASE=").concat(config.database, "\nCLICKHOUSE_USERNAME=").concat(config.username, "\nCLICKHOUSE_PASSWORD=").concat(config.password, "\n");
+    return "# Hypequery Configuration\nCLICKHOUSE_URL=".concat(connectionUrl, "\nCLICKHOUSE_DATABASE=").concat(config.database, "\nCLICKHOUSE_USERNAME=").concat(config.username, "\nCLICKHOUSE_PASSWORD=").concat(config.password, "\n");
 }
 /**
  * Append to existing .env file

package/dist/templates/queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../../src/templates/queries.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAC/C,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,MAAM,CA+DT"}
+{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../../src/templates/queries.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAC/C,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,MAAM,CAiET"}

package/dist/templates/queries.js

@@ -5,14 +5,15 @@ export function generateQueriesTemplate(options) {
     var hasExample = options.hasExample, tableName = options.tableName;
     var metricKey = hasExample && tableName ? "".concat(camelCase(tableName), "Query") : 'exampleMetric';
     var typeAlias = "".concat(pascalCase(metricKey), "Result");
-    var template = "import { initServe } from '@hypequery/serve';\nimport type { InferApiType } from '@hypequery/serve';\nimport { z } from 'zod';\nimport { db } from './client';\n\nconst { query, serve } = initServe({\n  context: () => ({ db }),\n});\n\n";
+    var routePath = "/metrics/".concat(metricKey);
+    var template = "import { initServe } from '@hypequery/serve';\nimport type { InferApiType } from '@hypequery/serve';\nimport { z } from 'zod';\nimport { db } from './client.js';\n\nconst { query, serve } = initServe({\n  context: () => ({ db }),\n});\n\n";
     if (hasExample && tableName) {
         template += "\nconst ".concat(camelCase(tableName), "Query = query({\n  description: 'Example query using the ").concat(tableName, " table',\n  query: async ({ ctx }) =>\n    ctx.db\n      .table('").concat(tableName, "')\n      .select('*')\n      .limit(10)\n      .execute(),\n});");
     }
     else {
         template += "\nconst exampleMetric = query({\n  description: 'Example metric that returns a simple value',\n  output: z.object({ ok: z.boolean() }),\n  query: async () => ({ ok: true }),\n});";
     }
-    template += "\nexport const api = serve({\n  queries: {\n    ".concat(metricKey, ",\n  },\n});\n\nexport type ApiDefinition = InferApiType<typeof api>;\n\n/**\n * Inline usage example:\n *\n * const result = await api.execute('").concat(metricKey, "');\n * console.log(result);\n *\n * // import type { InferQueryResult } from '@hypequery/serve';\n * type ").concat(typeAlias, " = InferQueryResult<typeof api, '").concat(metricKey, "'>;\n *\n * // Register HTTP route:\n * api.route('/metrics/").concat(metricKey, "', api.queries.").concat(metricKey, ");\n *\n * Dev server:\n * npx hypequery dev analytics/queries.ts\n */\n");
+    template += "\nexport const api = serve({\n  queries: {\n    ".concat(metricKey, ",\n  },\n});\napi.route('").concat(routePath, "', api.queries.").concat(metricKey, ");\n\nexport type ApiDefinition = InferApiType<typeof api>;\n\n/**\n * Inline usage example:\n *\n * const result = await api.execute('").concat(metricKey, "');\n * console.log(result);\n *\n * // import type { InferQueryResult } from '@hypequery/serve';\n * type ").concat(typeAlias, " = InferQueryResult<typeof api, '").concat(metricKey, "'>;\n *\n * HTTP route:\n * ").concat(routePath, "\n *\n * Dev server:\n * npx hypequery dev analytics/queries.ts\n */\n");
     return template;
 }
 /**

package/dist/test-utils.d.ts

@@ -3,7 +3,6 @@ import type { Mock } from 'vitest';
  * Mock prompts module for testing
  */
 export declare function createMockPrompts(): {
-    promptDatabaseType: Mock<(...args: any[]) => any>;
     promptClickHouseConnection: Mock<(...args: any[]) => any>;
     promptOutputDirectory: Mock<(...args: any[]) => any>;
     promptGenerateExample: Mock<(...args: any[]) => any>;

package/dist/test-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../src/test-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEnC;;GAEG;AACH,wBAAgB,iBAAiB;;;;;;;;;EAWhC;AAED;;GAEG;AACH,wBAAgB,uBAAuB;;;;EAMtC;AAED;;GAEG;AACH,wBAAgB,mBAAmB;;;;;EAOlC;AAED;;GAEG;AACH,wBAAgB,gBAAgB;;;;;;;;;;;;EAc/B;AAED;;GAEG;AACH,wBAAgB,iBAAiB;;;;;GAQhC;AAED;;GAEG;AACH,wBAAgB,YAAY;;;;;EAO3B;AAED;;GAEG;AACH,wBAAgB,cAAc;;;;EAuB7B;AAED;;;GAGG;AACH,qBAAa,gBAAiB,SAAQ,KAAK;IACtB,IAAI,EAAE,MAAM;gBAAZ,IAAI,EAAE,MAAM;CAIhC;AAED,wBAAgB,eAAe;;;EAc9B"}
+{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../src/test-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEnC;;GAEG;AACH,wBAAgB,iBAAiB;;;;;;;;EAUhC;AAED;;GAEG;AACH,wBAAgB,uBAAuB;;;;EAMtC;AAED;;GAEG;AACH,wBAAgB,mBAAmB;;;;;EAOlC;AAED;;GAEG;AACH,wBAAgB,gBAAgB;;;;;;;;;;;;EAc/B;AAED;;GAEG;AACH,wBAAgB,iBAAiB;;;;;GAQhC;AAED;;GAEG;AACH,wBAAgB,YAAY;;;;;EAO3B;AAED;;GAEG;AACH,wBAAgB,cAAc;;;;EAuB7B;AAED;;;GAGG;AACH,qBAAa,gBAAiB,SAAQ,KAAK;IACtB,IAAI,EAAE,MAAM;gBAAZ,IAAI,EAAE,MAAM;CAIhC;AAED,wBAAgB,eAAe;;;EAc9B"}

package/dist/test-utils.js

@@ -19,7 +19,6 @@ import { vi } from 'vitest';
  */
 export function createMockPrompts() {
     return {
-        promptDatabaseType: vi.fn(),
         promptClickHouseConnection: vi.fn(),
         promptOutputDirectory: vi.fn(),
         promptGenerateExample: vi.fn(),

package/dist/utils/clickhouse-client.js

@@ -57,7 +57,7 @@ export function getClickHouseClient() {
     if (!client) {
         var config = getClickHouseConfigFromEnv();
         if (!config) {
-            throw new Error('ClickHouse connection details are missing. Set CLICKHOUSE_HOST (or CLICKHOUSE_URL), CLICKHOUSE_DATABASE, CLICKHOUSE_USERNAME, and CLICKHOUSE_PASSWORD.');
+            throw new Error('ClickHouse connection details are missing. Set CLICKHOUSE_URL (or CLICKHOUSE_HOST), CLICKHOUSE_DATABASE, CLICKHOUSE_USERNAME, and CLICKHOUSE_PASSWORD.');
         }
         client = createClient({
             url: config.url,

package/dist/utils/dependency-installer.d.ts

@@ -1,2 +1,4 @@
-export declare function installServeDependencies(): Promise<void>;
+export declare function resolveScaffoldPackages(cliVersion: string | undefined): string[];
+export declare function installScaffoldDependencies(): Promise<void>;
+export declare const installServeDependencies: typeof installScaffoldDependencies;
 //# sourceMappingURL=dependency-installer.d.ts.map

package/dist/utils/dependency-installer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dependency-installer.d.ts","sourceRoot":"","sources":["../../src/utils/dependency-installer.ts"],"names":[],"mappings":"AAyEA,wBAAsB,wBAAwB,kBA4C7C"}
+{"version":3,"file":"dependency-installer.d.ts","sourceRoot":"","sources":["../../src/utils/dependency-installer.ts"],"names":[],"mappings":"AAkGA,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,EAAE,CAUhF;AAsBD,wBAAsB,2BAA2B,kBAgDhD;AAED,eAAO,MAAM,wBAAwB,oCAA8B,CAAC"}

package/dist/utils/dependency-installer.js

@@ -47,17 +47,28 @@ import { existsSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import path from 'node:path';
 import { spawn } from 'node:child_process';
+import { fileURLToPath } from 'node:url';
 import { logger } from './logger.js';
-var REQUIRED_PACKAGES = ['@hypequery/clickhouse', '@hypequery/serve'];
+var ZOD_SCAFFOLD_VERSION = '^3.23.8';
+var STABLE_SCAFFOLD_PACKAGES = ['@hypequery/clickhouse', '@hypequery/serve', "zod@".concat(ZOD_SCAFFOLD_VERSION)];
+var CLI_PACKAGE_PATH = fileURLToPath(new URL('../../package.json', import.meta.url));
 var MANUAL_COMMANDS = {
     pnpm: 'pnpm add',
     yarn: 'yarn add',
     npm: 'npm install',
     bun: 'bun add',
 };
-function hasDependency(pkg, name) {
+function getDependencyVersion(pkg, name) {
     var _a, _b, _c;
-    return Boolean((_b = (_a = pkg.dependencies) === null || _a === void 0 ? void 0 : _a[name]) !== null && _b !== void 0 ? _b : (_c = pkg.devDependencies) === null || _c === void 0 ? void 0 : _c[name]);
+    return (_b = (_a = pkg.dependencies) === null || _a === void 0 ? void 0 : _a[name]) !== null && _b !== void 0 ? _b : (_c = pkg.devDependencies) === null || _c === void 0 ? void 0 : _c[name];
+}
+function packageNameFromSpecifier(specifier) {
+    if (!specifier.startsWith('@')) {
+        var atIndex = specifier.lastIndexOf('@');
+        return atIndex > 0 ? specifier.slice(0, atIndex) : specifier;
+    }
+    var separatorIndex = specifier.indexOf('@', specifier.indexOf('/') + 1);
+    return separatorIndex === -1 ? specifier : specifier.slice(0, separatorIndex);
 }
 function readProjectPackageJson() {
     return __awaiter(this, void 0, void 0, function () {
@@ -78,6 +89,25 @@ function readProjectPackageJson() {
         });
     });
 }
+function readCliPackageJson() {
+    return __awaiter(this, void 0, void 0, function () {
+        var file, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _b.trys.push([0, 2, , 3]);
+                    return [4 /*yield*/, readFile(CLI_PACKAGE_PATH, 'utf8')];
+                case 1:
+                    file = _b.sent();
+                    return [2 /*return*/, JSON.parse(file)];
+                case 2:
+                    _a = _b.sent();
+                    return [2 /*return*/, null];
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
 function detectPackageManager(pkgJson) {
     var _a, _b;
     var userAgent = (_a = process.env.npm_config_user_agent) !== null && _a !== void 0 ? _a : '';
@@ -119,23 +149,52 @@ function getInstallArgs(manager, packages) {
 function formatManualCommand(manager, packages) {
     return "".concat(MANUAL_COMMANDS[manager], " ").concat(packages.join(' '));
 }
-export function installServeDependencies() {
+export function resolveScaffoldPackages(cliVersion) {
+    if (cliVersion === null || cliVersion === void 0 ? void 0 : cliVersion.includes('canary')) {
+        return [
+            "@hypequery/clickhouse@".concat(cliVersion),
+            "@hypequery/serve@".concat(cliVersion),
+            "zod@".concat(ZOD_SCAFFOLD_VERSION),
+        ];
+    }
+    return __spreadArray([], STABLE_SCAFFOLD_PACKAGES, true);
+}
+function shouldInstallPackage(pkgJson, specifier) {
+    var name = packageNameFromSpecifier(specifier);
+    var existingVersion = getDependencyVersion(pkgJson, name);
+    if (!existingVersion) {
+        return true;
+    }
+    var desiredHasPinnedVersion = specifier.startsWith('@')
+        ? specifier.indexOf('@', specifier.indexOf('/') + 1) !== -1
+        : specifier.includes('@');
+    if (!desiredHasPinnedVersion) {
+        return false;
+    }
+    var desiredVersion = specifier.slice(name.length + 1);
+    return existingVersion !== desiredVersion;
+}
+export function installScaffoldDependencies() {
     return __awaiter(this, void 0, void 0, function () {
-        var pkgJson, missing, manager, command, args, error_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var _a, pkgJson, cliPkgJson, requestedPackages, missing, manager, command, args, error_1;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     if (process.env.HYPEQUERY_SKIP_INSTALL === '1') {
                         return [2 /*return*/];
                     }
-                    return [4 /*yield*/, readProjectPackageJson()];
+                    return [4 /*yield*/, Promise.all([
+                            readProjectPackageJson(),
+                            readCliPackageJson(),
+                        ])];
                 case 1:
-                    pkgJson = _a.sent();
+                    _a = _b.sent(), pkgJson = _a[0], cliPkgJson = _a[1];
                     if (!pkgJson) {
-                        logger.warn('package.json not found. Install @hypequery/clickhouse and @hypequery/serve manually.');
+                        logger.warn('package.json not found. Install @hypequery/clickhouse, @hypequery/serve, and zod manually.');
                         return [2 /*return*/];
                     }
-                    missing = REQUIRED_PACKAGES.filter(function (pkg) { return !hasDependency(pkgJson, pkg); });
+                    requestedPackages = resolveScaffoldPackages(cliPkgJson === null || cliPkgJson === void 0 ? void 0 : cliPkgJson.version);
+                    missing = requestedPackages.filter(function (pkg) { return shouldInstallPackage(pkgJson, pkg); });
                     if (missing.length === 0) {
                         return [2 /*return*/];
                     }
@@ -143,9 +202,9 @@ export function installServeDependencies() {
                     command = manager === 'npm' ? 'npm' : manager;
                     args = getInstallArgs(manager, missing);
                     logger.info("Installing ".concat(missing.join(', '), " with ").concat(manager, "..."));
-                    _a.label = 2;
+                    _b.label = 2;
                 case 2:
-                    _a.trys.push([2, 4, , 5]);
+                    _b.trys.push([2, 4, , 5]);
                     return [4 /*yield*/, new Promise(function (resolve, reject) {
                             var child = spawn(command, args, {
                                 cwd: process.cwd(),
@@ -162,11 +221,11 @@ export function installServeDependencies() {
                             });
                         })];
                 case 3:
-                    _a.sent();
+                    _b.sent();
                     logger.success("Installed ".concat(missing.join(', ')));
                     return [3 /*break*/, 5];
                 case 4:
-                    error_1 = _a.sent();
+                    error_1 = _b.sent();
                     logger.warn('Failed to install hypequery packages automatically.');
                     logger.info("Run manually: ".concat(formatManualCommand(manager, missing)));
                     if (error_1 instanceof Error && error_1.message) {
@@ -178,3 +237,4 @@ export function installServeDependencies() {
         });
     });
 }
+export var installServeDependencies = installScaffoldDependencies;

package/dist/utils/load-hypequery-config.d.ts

@@ -1,4 +1,4 @@
-import type { ResolvedHypequeryClickHouseConfig } from '@hypequery/clickhouse';
+import type { ResolvedHypequeryClickHouseConfig } from '@hypequery/schema';
 export declare const DEFAULT_HYPEQUERY_CONFIG_PATH = "hypequery.config.ts";
 export declare const DEFAULT_MIGRATIONS_OUT_DIR = "./migrations";
 export declare const DEFAULT_MIGRATIONS_TABLE = "_hypequery_migrations";

package/dist/utils/load-hypequery-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load-hypequery-config.d.ts","sourceRoot":"","sources":["../../src/utils/load-hypequery-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,iCAAiC,EAClC,MAAM,uBAAuB,CAAC;AAG/B,eAAO,MAAM,6BAA6B,wBAAwB,CAAC;AACnE,eAAO,MAAM,0BAA0B,iBAAiB,CAAC;AACzD,eAAO,MAAM,wBAAwB,0BAA0B,CAAC;AAChE,eAAO,MAAM,yBAAyB,EAAG,WAAoB,CAAC;AAE9D,wBAAsB,mBAAmB,CACvC,UAAU,SAAgC,GACzC,OAAO,CAAC,iCAAiC,CAAC,CA0C5C"}
+{"version":3,"file":"load-hypequery-config.d.ts","sourceRoot":"","sources":["../../src/utils/load-hypequery-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,iCAAiC,EAClC,MAAM,mBAAmB,CAAC;AAG3B,eAAO,MAAM,6BAA6B,wBAAwB,CAAC;AACnE,eAAO,MAAM,0BAA0B,iBAAiB,CAAC;AACzD,eAAO,MAAM,wBAAwB,0BAA0B,CAAC;AAChE,eAAO,MAAM,yBAAyB,EAAG,WAAoB,CAAC;AAE9D,wBAAsB,mBAAmB,CACvC,UAAU,SAAgC,GACzC,OAAO,CAAC,iCAAiC,CAAC,CA0C5C"}

package/dist/utils/prompts.d.ts

@@ -1,8 +1,3 @@
-import type { DatabaseType } from './detect-database.js';
-/**
- * Prompt for database type selection
- */
-export declare function promptDatabaseType(): Promise<DatabaseType | null>;
 /**
  * Prompt for ClickHouse connection details
  */

package/dist/utils/prompts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../src/utils/prompts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAQzD;;GAEG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAavE;AAED;;GAEG;AACH,wBAAsB,0BAA0B,IAAI,OAAO,CAAC;IAC1D,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,IAAI,CAAC,CAkCR;AAED;;GAEG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CA6B7D;AAED;;GAEG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC,CAS9D;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA0BnF;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CASxE;AAED;;GAEG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CASnE;AAED;;GAEG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,OAAO,CAAC,CAShE"}
+{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../src/utils/prompts.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,wBAAsB,0BAA0B,IAAI,OAAO,CAAC;IAC1D,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,IAAI,CAAC,CAkCR;AAED;;GAEG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CA6B7D;AAED;;GAEG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC,CAS9D;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA0BnF;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CASxE;AAED;;GAEG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CASnE;AAED;;GAEG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,OAAO,CAAC,CAShE"}

package/dist/utils/prompts.js

@@ -48,68 +48,43 @@ import { logger } from './logger.js';
 var noop = function () { return undefined; };
 // Configure prompts to not exit on cancel
 prompts.override({ onCancel: noop });
-/**
- * Prompt for database type selection
- */
-export function promptDatabaseType() {
-    return __awaiter(this, void 0, void 0, function () {
-        var response;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, prompts({
-                        type: 'select',
-                        name: 'database',
-                        message: 'Which database are you using?',
-                        choices: [
-                            { title: 'ClickHouse', value: 'clickhouse' },
-                            { title: 'BigQuery (coming soon)', value: 'bigquery', disabled: true },
-                        ],
-                        initial: 0,
-                    })];
-                case 1:
-                    response = _a.sent();
-                    return [2 /*return*/, response.database || null];
-            }
-        });
-    });
-}
 /**
  * Prompt for ClickHouse connection details
  */
 export function promptClickHouseConnection() {
     return __awaiter(this, void 0, void 0, function () {
         var response;
-        var _a, _b, _c, _d;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        var _a, _b, _c, _d, _e;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0: return [4 /*yield*/, prompts([
                         {
                             type: 'text',
                             name: 'host',
-                            message: 'ClickHouse host (or skip to configure later):',
-                            initial: (_a = process.env.CLICKHOUSE_HOST) !== null && _a !== void 0 ? _a : '',
+                            message: 'ClickHouse URL (or skip to configure later):',
+                            initial: (_b = (_a = process.env.CLICKHOUSE_URL) !== null && _a !== void 0 ? _a : process.env.CLICKHOUSE_HOST) !== null && _b !== void 0 ? _b : '',
                         },
                         {
                             type: 'text',
                             name: 'database',
                             message: 'Database:',
-                            initial: (_b = process.env.CLICKHOUSE_DATABASE) !== null && _b !== void 0 ? _b : '',
+                            initial: (_c = process.env.CLICKHOUSE_DATABASE) !== null && _c !== void 0 ? _c : '',
                         },
                         {
                             type: 'text',
                             name: 'username',
                             message: 'Username:',
-                            initial: (_c = process.env.CLICKHOUSE_USERNAME) !== null && _c !== void 0 ? _c : '',
+                            initial: (_d = process.env.CLICKHOUSE_USERNAME) !== null && _d !== void 0 ? _d : '',
                         },
                         {
                             type: 'password',
                             name: 'password',
                             message: 'Password:',
-                            initial: (_d = process.env.CLICKHOUSE_PASSWORD) !== null && _d !== void 0 ? _d : '',
+                            initial: (_e = process.env.CLICKHOUSE_PASSWORD) !== null && _e !== void 0 ? _e : '',
                         },
                     ])];
                 case 1:
-                    response = _e.sent();
+                    response = _f.sent();
                     // If user cancelled or skipped
                     if (!response.host) {
                         return [2 /*return*/, null];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypequery/cli",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Command-line interface for hypequery",
   "license": "Apache-2.0",
   "type": "module",
@@ -11,7 +11,7 @@
     "dist"
   ],
   "dependencies": {
-    "@clickhouse/client": "^1.16.0",
+    "@clickhouse/client": "^1.18.3",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "dotenv": "^16.4.7",
@@ -22,11 +22,15 @@
   },
   "peerDependencies": {
     "@hypequery/clickhouse": "*",
+    "@hypequery/schema": "*",
     "@hypequery/serve": "*"
   },
   "peerDependenciesMeta": {
     "@hypequery/clickhouse": {
       "optional": true
+    },
+    "@hypequery/schema": {
+      "optional": true
     }
   },
   "devDependencies": {
@@ -35,8 +39,9 @@
     "@vitest/coverage-v8": "^2.1.6",
     "typescript": "^5.7.3",
     "vitest": "^2.1.6",
-    "@hypequery/clickhouse": "1.6.2",
-    "@hypequery/serve": "0.2.0"
+    "@hypequery/schema": "0.0.0",
+    "@hypequery/serve": "0.2.0",
+    "@hypequery/clickhouse": "2.0.0"
   },
   "repository": {
     "type": "git",