@hypequery/cli 1.12.1 → 1.13.0

package/README.md

@@ -42,6 +42,15 @@ Scaffolds the standard hypequery setup.
 npx hypequery init
 ```
 
+Interactive setup asks which database driver to use, whether to include
+request-context authentication scaffolding, where to write the generated
+files, and which API style to create. Selecting chDB replaces the remote
+credential questions with an embedded-storage choice.
+
+Run `init` from the project directory that contains `package.json`. If no
+package manifest is found, interactive setup asks for confirmation before
+writing files and dependency installation must be completed manually.
+
 It will:
 
 - connect to ClickHouse or start an embedded chDB session

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAIA,OAAO,EAWL,KAAK,SAAS,EACf,MAAM,qBAAqB,CAAC;AAe7B,OAAO,EAA2B,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAQzF,MAAM,WAAW,WAAW;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,IAAI,CAAC,EAAE,gBAAgB,CAAC;CACzB;AA4JD,wBAAsB,WAAW,CAAC,OAAO,GAAE,WAAgB,iBAyZ1D"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAIA,OAAO,EAcL,KAAK,SAAS,EACf,MAAM,qBAAqB,CAAC;AAe7B,OAAO,EAA2B,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAQzF,MAAM,WAAW,WAAW;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,IAAI,CAAC,EAAE,gBAAgB,CAAC;CACzB;AAqKD,wBAAsB,WAAW,CAAC,OAAO,GAAE,WAAgB,iBAya1D"}

package/dist/commands/init.js

@@ -2,7 +2,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 { promptClickHouseConnection, promptChdbStorage, promptOutputDirectory, promptInitStyle, promptGenerateExample, promptTableSelection, promptDatasetTableSelection, confirmOverwrite, promptRetry, promptContinueWithoutDb, } from '../utils/prompts.js';
+import { promptClickHouseConnection, promptInitDatabase, promptChdbStorage, promptOutputDirectory, promptInitStyle, promptInitAuthMode, promptGenerateExample, promptTableSelection, promptDatasetTableSelection, confirmWithoutPackageJson, confirmOverwrite, promptRetry, promptContinueWithoutDb, } from '../utils/prompts.js';
 import { validateConnection, getTableCount, getTables, } from '../utils/detect-database.js';
 import { ChdbNotInstalledError, ensureChdbInstalled, getChdbTypeGenerationClient, } from '../utils/chdb-client.js';
 import { hasEnvFile, hasGitignore } from '../utils/find-files.js';
@@ -78,6 +78,15 @@ async function resolveConnectionConfig(options) {
     }
     return promptClickHouseConnection();
 }
+async function hasProjectPackageJson() {
+    try {
+        await readFile(path.join(process.cwd(), 'package.json'), 'utf8');
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 async function testChdbConnection(chdbPath) {
     const spinner = ora('Starting embedded chDB...').start();
     try {
@@ -134,9 +143,18 @@ async function testConnection(connectionConfig) {
 }
 export async function initCommand(options = {}) {
     const noInteractive = options.noInteractive === true || options.interactive === false;
-    const database = normalizeInitDatabase(options.database);
     logger.newline();
     logger.header('Welcome to hypequery!');
+    if (!noInteractive && !(await hasProjectPackageJson())) {
+        logger.warn(`package.json not found in ${process.cwd()}`);
+        const shouldContinue = await confirmWithoutPackageJson(process.cwd());
+        if (!shouldContinue) {
+            logger.info('Setup cancelled. Run init from your project directory.');
+            return;
+        }
+        logger.newline();
+    }
+    const database = normalizeInitDatabase(options.database ?? (noInteractive ? undefined : await promptInitDatabase()));
     logger.info(database === 'chdb'
         ? "Let's set up your analytics layer on embedded ClickHouse (chDB)."
         : "Let's set up your analytics layer.");
@@ -173,7 +191,7 @@ export async function initCommand(options = {}) {
                 }
                 const retry = await promptRetry('Try again?');
                 if (retry) {
-                    return initCommand(options);
+                    return initCommand({ ...options, database });
                 }
                 const continueWithout = await promptContinueWithoutDb();
                 if (!continueWithout) {
@@ -198,10 +216,13 @@ export async function initCommand(options = {}) {
     }
     const resolvedOutputDir = path.resolve(process.cwd(), outputDir);
     let style = normalizeInitStyle(options.style);
-    const auth = normalizeAuthMode(options.auth);
     if (!options.style && !noInteractive) {
         style = await promptInitStyle();
     }
+    let auth = normalizeAuthMode(options.auth);
+    if (!options.auth && !noInteractive) {
+        auth = normalizeAuthMode(await promptInitAuthMode());
+    }
     // Step 5: Check for existing files
     const filesToCreate = [
         path.join(resolvedOutputDir, 'client.ts'),

package/dist/generators/chdb.js

@@ -1,4 +1,4 @@
-import { generateTypes } from '@hypequery/clickhouse/cli';
+import { generateTypes } from '../typegen/index.js';
 import { getChdbTypeGenerationClient } from '../utils/chdb-client.js';
 /**
  * Same generator as ClickHouse — the introspection SQL (SHOW TABLES,

package/dist/generators/clickhouse.d.ts

@@ -1,4 +1,4 @@
-import { clickhouseToTsType } from '@hypequery/clickhouse/cli';
+import { clickhouseToTsType } from '../typegen/index.js';
 export interface ClickHouseGeneratorOptions {
     outputPath: string;
     includeTables?: string[];

package/dist/generators/clickhouse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clickhouse.d.ts","sourceRoot":"","sources":["../../src/generators/clickhouse.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGnB,MAAM,2BAA2B,CAAC;AAGnC,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAE9B,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,0BAA0B,iBAUhF"}
+{"version":3,"file":"clickhouse.d.ts","sourceRoot":"","sources":["../../src/generators/clickhouse.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGnB,MAAM,qBAAqB,CAAC;AAG7B,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAE9B,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,0BAA0B,iBAUhF"}

package/dist/generators/clickhouse.js

@@ -1,4 +1,4 @@
-import { clickhouseToTsType, generateTypes, } from '@hypequery/clickhouse/cli';
+import { clickhouseToTsType, generateTypes, } from '../typegen/index.js';
 import { getClickHouseClient } from '../utils/clickhouse-client.js';
 export { clickhouseToTsType };
 export async function generateClickHouseTypes(options) {

package/dist/generators/dataset-generator.d.ts

@@ -4,7 +4,7 @@
  * Generates dataset DSL code from ClickHouse schema introspection.
  * This reduces quickstart friction by auto-scaffolding dataset definitions.
  */
-import type { TypeGenerationClickHouseClient } from '@hypequery/clickhouse/cli';
+import type { TypeGenerationClickHouseClient } from '../typegen/index.js';
 export interface DatasetGeneratorOptions {
     outputPath: string;
     includeTables?: string[];

package/dist/generators/dataset-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataset-generator.d.ts","sourceRoot":"","sources":["../../src/generators/dataset-generator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAGhF,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,MAAM,CAAC,EAAE,8BAA8B,CAAC;CACzC;AAuPD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,iBAyDtE"}
+{"version":3,"file":"dataset-generator.d.ts","sourceRoot":"","sources":["../../src/generators/dataset-generator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AAG1E,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,MAAM,CAAC,EAAE,8BAA8B,CAAC;CACzC;AAuPD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,iBAyDtE"}

package/dist/generators/index.js

@@ -1,7 +1,7 @@
-// Loaded on demand. Both generators pull in `@hypequery/clickhouse/cli`, and importing
-// that eagerly puts it on the module graph of every command — a resolution failure there
-// took down even `hypequery --help`. Deferring it keeps the blast radius on the commands
-// that actually generate types.
+// Loaded on demand. The generator itself is local now, but it still reaches for a driver —
+// `@clickhouse/client` for one, the native `chdb` package for the other — and importing
+// those eagerly puts them on the module graph of every command. Deferring keeps the blast
+// radius on the commands that actually generate types, including `hypequery --help`.
 const generators = {
     clickhouse: async (options) => {
         const { generateClickHouseTypes } = await import('./clickhouse.js');

package/dist/typegen/generate-types.d.ts

@@ -0,0 +1,46 @@
+/**
+ * ClickHouse schema introspection to TypeScript types.
+ *
+ * Ported from `@hypequery/clickhouse/src/cli` so the CLI no longer has to
+ * depend on the whole query-builder package to generate types. The copy over
+ * there still backs the legacy `hypequery-generate-types` bin and the
+ * `@hypequery/clickhouse/cli` subpath; this one is the living version.
+ *
+ * The one deliberate difference: there is no `ClickHouseConnection` fallback.
+ * A client is always supplied by the caller, which is what let the query
+ * builder drop off the CLI's module graph in the first place.
+ */
+/**
+ * Minimal ClickHouse client surface the type generator needs. Both the HTTP
+ * client and the embedded chDB session satisfy it.
+ */
+export interface TypeGenerationClickHouseClient {
+    query(options: {
+        query: string;
+        format: 'JSONEachRow';
+    }): Promise<{
+        json(): Promise<Array<Record<string, string>>>;
+    }>;
+}
+export interface GenerateTypesOptions {
+    /** Only introspect these tables. Defaults to every table in the database. */
+    includeTables?: string[];
+    /** Skip these tables. Applied after `includeTables`. */
+    excludeTables?: string[];
+    /** Client used for introspection. */
+    client: TypeGenerationClickHouseClient;
+    /** Package name written into the generated file header. */
+    generatedBy?: string;
+    /** Append the historical usage-example comment block. */
+    includeUsageExample?: boolean;
+}
+/**
+ * Generates the TypeScript type definition source from a ClickHouse client.
+ */
+export declare function generateTypeDefinitions(client: TypeGenerationClickHouseClient, options?: Omit<GenerateTypesOptions, 'client'>): Promise<string>;
+/**
+ * Generates TypeScript type definitions from the ClickHouse database schema and
+ * writes them to `outputPath`, creating the containing directory if needed.
+ */
+export declare function generateTypes(outputPath: string, options: GenerateTypesOptions): Promise<void>;
+//# sourceMappingURL=generate-types.d.ts.map

package/dist/typegen/generate-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-types.d.ts","sourceRoot":"","sources":["../../src/typegen/generate-types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAMH;;;GAGG;AACH,MAAM,WAAW,8BAA8B;IAC7C,KAAK,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,aAAa,CAAA;KAAE,GAAG,OAAO,CAAC;QAChE,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;KAChD,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,oBAAoB;IACnC,6EAA6E;IAC7E,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,wDAAwD;IACxD,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,qCAAqC;IACrC,MAAM,EAAE,8BAA8B,CAAC;IACvC,2DAA2D;IAC3D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yDAAyD;IACzD,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAqBD;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,8BAA8B,EACtC,OAAO,GAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAM,GACjD,OAAO,CAAC,MAAM,CAAC,CAsFjB;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAUpG"}

package/dist/typegen/generate-types.js

@@ -0,0 +1,115 @@
+/**
+ * ClickHouse schema introspection to TypeScript types.
+ *
+ * Ported from `@hypequery/clickhouse/src/cli` so the CLI no longer has to
+ * depend on the whole query-builder package to generate types. The copy over
+ * there still backs the legacy `hypequery-generate-types` bin and the
+ * `@hypequery/clickhouse/cli` subpath; this one is the living version.
+ *
+ * The one deliberate difference: there is no `ClickHouseConnection` fallback.
+ * A client is always supplied by the caller, which is what let the query
+ * builder drop off the CLI's module graph in the first place.
+ */
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { clickhouseToTsType } from './type-parsing.js';
+/**
+ * Capitalize the first letter of a string.
+ */
+function capitalizeFirstLetter(str) {
+    return str.charAt(0).toUpperCase() + str.slice(1);
+}
+async function describeTable(client, tableName) {
+    const columnsQuery = await client.query({
+        query: `DESCRIBE TABLE ${tableName}`,
+        format: 'JSONEachRow',
+    });
+    return columnsQuery.json();
+}
+/**
+ * Generates the TypeScript type definition source from a ClickHouse client.
+ */
+export async function generateTypeDefinitions(client, options = {}) {
+    const { includeTables = [], excludeTables = [], generatedBy = 'hypequery', includeUsageExample = true, } = options;
+    // Get all tables
+    const tablesQuery = await client.query({
+        query: 'SHOW TABLES',
+        format: 'JSONEachRow',
+    });
+    let tables = await tablesQuery.json();
+    // Filter tables if includeTables or excludeTables are specified
+    if (includeTables.length > 0) {
+        tables = tables.filter((table) => includeTables.includes(table.name));
+    }
+    if (excludeTables.length > 0) {
+        tables = tables.filter((table) => !excludeTables.includes(table.name));
+    }
+    // If no tables remain after filtering, log a warning
+    if (tables.length === 0) {
+        console.warn('Warning: No tables match the filter criteria. Check your include/exclude options.');
+    }
+    let typeDefinitions = `// Generated by ${generatedBy}
+// This file defines TypeScript types based on your ClickHouse database schema
+
+/**
+ * Schema interface for use with createQueryBuilder<IntrospectedSchema>()
+ * The string literals represent ClickHouse data types for each column
+ */
+export interface IntrospectedSchema {`;
+    // Get columns for each table
+    for (const table of tables) {
+        const columns = await describeTable(client, table.name);
+        typeDefinitions += `\n  ${table.name}: {`;
+        for (const column of columns) {
+            const clickHouseType = column.type.replace(/'/g, "\\'"); // Escape single quotes, e.g. `DateTime('UTC')`
+            typeDefinitions += `\n    '${column.name}': '${clickHouseType}';`;
+        }
+        typeDefinitions += '\n  };';
+    }
+    typeDefinitions += '\n}\n';
+    // Also generate a type-safe record type for each table
+    typeDefinitions += `\n// Type-safe record types for each table\n`;
+    for (const table of tables) {
+        const columns = await describeTable(client, table.name);
+        typeDefinitions += `export interface ${capitalizeFirstLetter(table.name)}Record {`;
+        for (const column of columns) {
+            const tsType = clickhouseToTsType(column.type).replace(/'/g, '');
+            typeDefinitions += `\n  '${column.name}': ${tsType};`;
+        }
+        typeDefinitions += '\n}\n\n';
+    }
+    if (includeUsageExample) {
+        typeDefinitions += `
+/**
+ * Usage example:
+ *
+ * import { createQueryBuilder } from '@hypequery/clickhouse';
+ * import { IntrospectedSchema } from './path-to-this-file';
+ *
+ * // Create a type-safe query builder
+ * const db = createQueryBuilder<IntrospectedSchema>();
+ *
+ * // Now you have full type safety and autocomplete
+ * const results = await db
+ *   .table('${tables.length > 0 ? tables[0].name : 'table_name'}')
+ *   .select(['column1', 'column2'])
+ *   .where('column1', 'eq', 'value')
+ *   .execute();
+ */
+`;
+    }
+    return typeDefinitions;
+}
+/**
+ * Generates TypeScript type definitions from the ClickHouse database schema and
+ * writes them to `outputPath`, creating the containing directory if needed.
+ */
+export async function generateTypes(outputPath, options) {
+    const { client, ...definitionOptions } = options;
+    const typeDefinitions = await generateTypeDefinitions(client, definitionOptions);
+    // Ensure the output directory exists
+    const outputDir = path.dirname(path.resolve(outputPath));
+    await fs.mkdir(outputDir, { recursive: true });
+    // Write the file
+    await fs.writeFile(path.resolve(outputPath), typeDefinitions);
+}

package/dist/typegen/index.d.ts

@@ -0,0 +1,3 @@
+export { generateTypeDefinitions, generateTypes, type GenerateTypesOptions, type TypeGenerationClickHouseClient, } from './generate-types.js';
+export { clickhouseToTsType } from './type-parsing.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/typegen/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/typegen/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,aAAa,EACb,KAAK,oBAAoB,EACzB,KAAK,8BAA8B,GACpC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC"}

package/dist/typegen/index.js

@@ -0,0 +1,2 @@
+export { generateTypeDefinitions, generateTypes, } from './generate-types.js';
+export { clickhouseToTsType } from './type-parsing.js';

package/dist/typegen/type-parsing.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Converts a ClickHouse type string, as returned by `DESCRIBE TABLE`, into the
+ * equivalent TypeScript type string.
+ */
+export declare const clickhouseToTsType: (type: string) => string;
+//# sourceMappingURL=type-parsing.d.ts.map

package/dist/typegen/type-parsing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-parsing.d.ts","sourceRoot":"","sources":["../../src/typegen/type-parsing.ts"],"names":[],"mappings":"AAuGA;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,MAAM,KAAG,MAsCjD,CAAC"}

package/dist/typegen/type-parsing.js

@@ -0,0 +1,139 @@
+function splitTopLevelArgs(value) {
+    const parts = [];
+    let current = '';
+    let depth = 0;
+    for (const char of value) {
+        if (char === '(') {
+            depth += 1;
+            current += char;
+            continue;
+        }
+        if (char === ')') {
+            depth -= 1;
+            current += char;
+            continue;
+        }
+        if (char === ',' && depth === 0) {
+            parts.push(current.trim());
+            current = '';
+            continue;
+        }
+        current += char;
+    }
+    if (current.trim()) {
+        parts.push(current.trim());
+    }
+    return parts;
+}
+function unwrapType(type, wrapperName) {
+    // Trim whitespace and handle case-insensitive matching
+    const trimmedType = type.trim();
+    const lowerType = trimmedType.toLowerCase();
+    const lowerWrapper = wrapperName.toLowerCase();
+    const prefix = `${lowerWrapper}(`;
+    if (lowerType.startsWith(prefix) && trimmedType.endsWith(')')) {
+        // Extract inner type, preserving original case
+        const innerStart = trimmedType.indexOf('(') + 1;
+        const innerEnd = trimmedType.lastIndexOf(')');
+        return trimmedType.slice(innerStart, innerEnd).trim();
+    }
+    return null;
+}
+function getPrimitiveTsType(type) {
+    const lowerType = type.toLowerCase();
+    switch (lowerType) {
+        case 'string':
+        case 'uuid':
+        case 'ipv4':
+        case 'ipv6':
+            return 'string';
+        case 'int8':
+        case 'int16':
+        case 'int32':
+        case 'uint8':
+        case 'uint16':
+        case 'uint32':
+            return 'number';
+        case 'int64':
+        case 'uint64':
+        case 'uint128':
+        case 'uint256':
+        case 'int128':
+        case 'int256':
+            return 'string';
+        case 'float32':
+        case 'float64':
+        case 'decimal':
+            return 'number';
+        case 'datetime':
+        case 'datetime64':
+        case 'date':
+        case 'date32':
+            return 'string';
+        case 'bool':
+        case 'boolean':
+            return 'boolean';
+        case 'json':
+            return 'unknown';
+        default:
+            if (type.startsWith('FixedString('))
+                return 'string';
+            if (type.startsWith('Decimal('))
+                return 'number';
+            if (type.startsWith('Decimal32('))
+                return 'number';
+            if (type.startsWith('Decimal64('))
+                return 'number';
+            if (type.startsWith('Decimal128('))
+                return 'number';
+            if (type.startsWith('Decimal256('))
+                return 'number';
+            if (type.startsWith('DateTime64('))
+                return 'string';
+            if (type.startsWith('DateTime('))
+                return 'string';
+            if (type.startsWith('Enum8('))
+                return 'string';
+            if (type.startsWith('Enum16('))
+                return 'string';
+            return null;
+    }
+}
+/**
+ * Converts a ClickHouse type string, as returned by `DESCRIBE TABLE`, into the
+ * equivalent TypeScript type string.
+ */
+export const clickhouseToTsType = (type) => {
+    const wrappedArrayType = unwrapType(type, 'Array');
+    if (wrappedArrayType) {
+        return `Array<${clickhouseToTsType(wrappedArrayType)}>`;
+    }
+    const wrappedNullableType = unwrapType(type, 'Nullable');
+    if (wrappedNullableType) {
+        return `${clickhouseToTsType(wrappedNullableType)} | null`;
+    }
+    const wrappedLowCardinalityType = unwrapType(type, 'LowCardinality');
+    if (wrappedLowCardinalityType) {
+        return clickhouseToTsType(wrappedLowCardinalityType);
+    }
+    const wrappedTupleType = unwrapType(type, 'Tuple');
+    if (wrappedTupleType) {
+        const tupleParts = splitTopLevelArgs(wrappedTupleType);
+        return `[${tupleParts.map((part) => clickhouseToTsType(part)).join(', ')}]`;
+    }
+    const wrappedMapType = unwrapType(type, 'Map');
+    if (wrappedMapType) {
+        const mapParts = splitTopLevelArgs(wrappedMapType);
+        if (mapParts.length === 2) {
+            const [, valueType] = mapParts;
+            // JSON object keys are strings even when ClickHouse map keys are numeric.
+            return `Record<string, ${clickhouseToTsType(valueType)}>`;
+        }
+        return 'Record<string, unknown>';
+    }
+    const primitiveType = getPrimitiveTsType(type);
+    if (primitiveType)
+        return primitiveType;
+    // Unsupported or more complex ClickHouse types currently preserve the historical fallback.
+    return 'string';
+};

package/dist/utils/chdb-client.d.ts

@@ -1,4 +1,4 @@
-import type { TypeGenerationClickHouseClient } from '@hypequery/clickhouse/cli';
+import type { TypeGenerationClickHouseClient } from '../typegen/index.js';
 interface ChdbSession {
     queryAsync(sql: string, options?: {
         format?: string;

package/dist/utils/chdb-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chdb-client.d.ts","sourceRoot":"","sources":["../../src/utils/chdb-client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAYhF,UAAU,WAAW;IACnB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,IAAI,IAAI,MAAM,CAAA;KAAE,CAAC,CAAC;IACpF,KAAK,IAAI,IAAI,CAAC;CACf;AAKD,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,QAAQ,CAAC,IAAI,wBAAwB;;CAQtC;AA6CD;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAY1E;AAYD;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,8BAA8B,CAQ3F;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAEzD;AAED,wBAAsB,YAAY,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOpE;AAED,wBAAsB,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAOtE;AAED,wBAAsB,0BAA0B,kBAM/C"}
+{"version":3,"file":"chdb-client.d.ts","sourceRoot":"","sources":["../../src/utils/chdb-client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AAY1E,UAAU,WAAW;IACnB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,IAAI,IAAI,MAAM,CAAA;KAAE,CAAC,CAAC;IACpF,KAAK,IAAI,IAAI,CAAC;CACf;AAKD,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,QAAQ,CAAC,IAAI,wBAAwB;;CAQtC;AA6CD;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAY1E;AAYD;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,8BAA8B,CAQ3F;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAEzD;AAED,wBAAsB,YAAY,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOpE;AAED,wBAAsB,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAOtE;AAED,wBAAsB,0BAA0B,kBAM/C"}

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":"AAWA,KAAK,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC;AAC5C,KAAK,gBAAgB,GAAG,YAAY,GAAG,MAAM,CAAC;AA0F9C,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,KAAK,GAAE,aAAyB,EAChC,QAAQ,GAAE,gBAA+B,GACxC,MAAM,EAAE,CAmBV;AAsBD,wBAAsB,2BAA2B,CAC/C,KAAK,GAAE,aAAyB,EAChC,QAAQ,GAAE,gBAA+B,iBAkD1C;AAED,eAAO,MAAM,wBAAwB,oCAA8B,CAAC"}
+{"version":3,"file":"dependency-installer.d.ts","sourceRoot":"","sources":["../../src/utils/dependency-installer.ts"],"names":[],"mappings":"AAWA,KAAK,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC;AAC5C,KAAK,gBAAgB,GAAG,YAAY,GAAG,MAAM,CAAC;AA0F9C,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,KAAK,GAAE,aAAyB,EAChC,QAAQ,GAAE,gBAA+B,GACxC,MAAM,EAAE,CAmBV;AAsBD,wBAAsB,2BAA2B,CAC/C,KAAK,GAAE,aAAyB,EAChC,QAAQ,GAAE,gBAA+B,iBAwD1C;AAED,eAAO,MAAM,wBAAwB,oCAA8B,CAAC"}

package/dist/utils/dependency-installer.js

@@ -126,8 +126,14 @@ export async function installScaffoldDependencies(style = 'queries', database =
         readCliPackageJson(),
     ]);
     if (!pkgJson) {
-        const extra = style === 'datasets' ? ', @hypequery/datasets' : '';
-        logger.warn(`package.json not found. Install @hypequery/clickhouse, @hypequery/serve${extra}, and zod manually.`);
+        const packages = [
+            '@hypequery/clickhouse',
+            '@hypequery/serve',
+            ...(style === 'datasets' ? ['@hypequery/datasets'] : []),
+            'zod',
+            ...(database === 'chdb' ? ['chdb'] : []),
+        ];
+        logger.warn(`package.json not found. Install ${packages.join(', ')} manually.`);
         return;
     }
     const requestedPackages = resolveScaffoldPackages(cliPkgJson?.version, style, database);

package/dist/utils/prompts.d.ts

@@ -7,6 +7,11 @@ export declare function promptClickHouseConnection(): Promise<{
     username: string;
     password: string;
 } | null>;
+export type InitDatabase = 'clickhouse' | 'chdb';
+/**
+ * Choose between a remote ClickHouse server and embedded chDB.
+ */
+export declare function promptInitDatabase(): Promise<InitDatabase>;
 /**
  * Prompt for embedded chDB storage: ephemeral in-memory session, or an
  * on-disk directory that persists between runs. Returns the session path,
@@ -19,6 +24,15 @@ export declare function promptChdbStorage(): Promise<string | undefined>;
 export declare function promptOutputDirectory(): Promise<string>;
 export type InitStyle = 'queries' | 'datasets';
 export declare function promptInitStyle(): Promise<InitStyle>;
+export type InitAuthMode = 'none' | 'context';
+/**
+ * Choose whether generated routes include request-context auth scaffolding.
+ */
+export declare function promptInitAuthMode(): Promise<InitAuthMode>;
+/**
+ * Confirm scaffolding when init is run outside a Node project.
+ */
+export declare function confirmWithoutPackageJson(directory: string): Promise<boolean>;
 /**
  * Prompt for example query generation
  */

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

@@ -1 +1 @@
-{"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;;;;GAIG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA4BrE;AAED;;GAEG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CA6B7D;AAED,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,UAAU,CAAC;AAE/C,wBAAsB,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,CAa1D;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,2BAA2B,CAC/C,MAAM,EAAE,MAAM,EAAE,EAChB,aAAa,GAAE,MAAM,EAAO,GAC3B,OAAO,CAAC,MAAM,EAAE,CAAC,CA2BnB;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,CAyCR;AAED,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG,MAAM,CAAC;AAEjD;;GAEG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,YAAY,CAAC,CAahE;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA4BrE;AAED;;GAEG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CA6B7D;AAED,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,UAAU,CAAC;AAE/C,wBAAsB,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,CAa1D;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,SAAS,CAAC;AAE9C;;GAEG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,YAAY,CAAC,CAahE;AAED;;GAEG;AACH,wBAAsB,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CASnF;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,2BAA2B,CAC/C,MAAM,EAAE,MAAM,EAAE,EAChB,aAAa,GAAE,MAAM,EAAO,GAC3B,OAAO,CAAC,MAAM,EAAE,CAAC,CA2BnB;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

@@ -7,13 +7,18 @@ prompts.override({ onCancel: noop });
  * Prompt for ClickHouse connection details
  */
 export async function promptClickHouseConnection() {
-    const response = await prompts([
-        {
-            type: 'text',
-            name: 'host',
-            message: 'ClickHouse URL (or skip to configure later):',
-            initial: process.env.CLICKHOUSE_URL ?? process.env.CLICKHOUSE_HOST ?? '',
-        },
+    const hostResponse = await prompts({
+        type: 'text',
+        name: 'host',
+        message: 'ClickHouse URL (or skip to configure later):',
+        initial: process.env.CLICKHOUSE_URL ?? process.env.CLICKHOUSE_HOST ?? '',
+    });
+    // Do not ask for credentials when the user has chosen to configure the
+    // connection later.
+    if (!hostResponse.host) {
+        return null;
+    }
+    const credentials = await prompts([
         {
             type: 'text',
             name: 'database',
@@ -33,11 +38,28 @@ export async function promptClickHouseConnection() {
             initial: process.env.CLICKHOUSE_PASSWORD ?? '',
         },
     ]);
-    // If user cancelled or skipped
-    if (!response.host) {
-        return null;
-    }
-    return response;
+    return {
+        host: hostResponse.host,
+        database: credentials.database ?? '',
+        username: credentials.username ?? '',
+        password: credentials.password ?? '',
+    };
+}
+/**
+ * Choose between a remote ClickHouse server and embedded chDB.
+ */
+export async function promptInitDatabase() {
+    const response = await prompts({
+        type: 'select',
+        name: 'database',
+        message: 'Choose your database',
+        choices: [
+            { title: 'ClickHouse server or Cloud', value: 'clickhouse' },
+            { title: 'chDB (embedded, no server)', value: 'chdb' },
+        ],
+        initial: 0,
+    });
+    return response.database ?? 'clickhouse';
 }
 /**
  * Prompt for embedded chDB storage: ephemeral in-memory session, or an
@@ -112,6 +134,34 @@ export async function promptInitStyle() {
     });
     return response.style ?? 'queries';
 }
+/**
+ * Choose whether generated routes include request-context auth scaffolding.
+ */
+export async function promptInitAuthMode() {
+    const response = await prompts({
+        type: 'select',
+        name: 'auth',
+        message: 'Choose authentication scaffolding',
+        choices: [
+            { title: 'None (add later)', value: 'none' },
+            { title: 'Request context authentication', value: 'context' },
+        ],
+        initial: 0,
+    });
+    return response.auth ?? 'none';
+}
+/**
+ * Confirm scaffolding when init is run outside a Node project.
+ */
+export async function confirmWithoutPackageJson(directory) {
+    const response = await prompts({
+        type: 'confirm',
+        name: 'continue',
+        message: `package.json was not found in ${directory}. Continue scaffolding here?`,
+        initial: false,
+    });
+    return response.continue ?? false;
+}
 /**
  * Prompt for example query generation
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypequery/cli",
-  "version": "1.12.1",
+  "version": "1.13.0",
   "description": "Command-line interface for hypequery",
   "license": "Apache-2.0",
   "type": "module",
@@ -20,8 +20,7 @@
     "ora": "^8.0.1",
     "prompts": "^2.4.2",
     "@hypequery/deployment": "0.6.0",
-    "@hypequery/protocol": "0.9.0",
-    "@hypequery/clickhouse": "2.5.2"
+    "@hypequery/protocol": "0.9.0"
   },
   "optionalDependencies": {
     "@napi-rs/keyring": "1.3.0"