@hypequery/cli 0.0.1 → 0.0.2

package/README.md

@@ -49,13 +49,7 @@ Or add to your `package.json` scripts:
 
 ## TypeScript Support
 
-If your queries file is TypeScript (`.ts`), the CLI will automatically detect and restart with TypeScript support. Make sure you have `tsx` installed:
-
-```bash
-npm install -D tsx
-```
-
-The CLI will guide you if `tsx` is needed but not installed.
+`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
 
@@ -138,14 +132,7 @@ npx @hypequery/cli dev --cache none
 
 **Common Issues:**
 
-If you see "Unexpected token" errors with TypeScript files:
-```bash
-# Make sure tsx is installed
-npm install -D tsx
-
-# The CLI will automatically restart with TypeScript support
-npx @hypequery/cli dev
-```
+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.
 
 ### `hypequery generate`
 
@@ -159,6 +146,8 @@ npx @hypequery/cli generate
 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.
+
 **What it does:**
 - Connects to ClickHouse
 - Introspects your database schema
@@ -168,7 +157,7 @@ npx hypequery generate
 **Options:**
 - `-o, --output <path>` - Output file (default: `analytics/schema.ts`)
 - `--tables <names>` - Only generate for specific tables (comma-separated)
-- `--watch` - Watch for schema changes and regenerate automatically
+- `--database <type>` - Override detected database (currently only `clickhouse`)
 
 **Example:**
 ```bash
@@ -178,43 +167,8 @@ npx @hypequery/cli generate
 # Generate specific tables
 npx @hypequery/cli generate --tables users,events
 
-# Watch mode for development
-npx @hypequery/cli generate --watch --output src/schema.ts
-```
-
-### `hypequery create-api-types`
-
-Generate a typed client map (perfect for `@hypequery/react`) from your serve export.
-
-```bash
-# Without installation
-npx @hypequery/cli create-api-types
-
-# With installation
-npx hypequery create-api-types
-```
-
-**What it does:**
-- Reads your queries file
-- Extracts all query definitions
-- Generates a TypeScript type map for type-safe client usage
-- Perfect for frontend React hooks with `@hypequery/react`
-
-**Options:**
-- `[file]` - Path to your queries module (default: auto-detected from `analytics/queries.ts`, `src/analytics/queries.ts`, or `hypequery.ts`)
-- `-o, --output <path>` - Output file (default: `<queries-dir>/client.ts`)
-- `-n, --name <type>` - Exported type alias name (default: `HypequeryApi`)
-
-**Example:**
-```bash
-# Auto-detect queries file
-npx @hypequery/cli create-api-types
-
-# Specify custom queries file and output
-npx @hypequery/cli create-api-types src/queries.ts -o src/api-types.ts
-
-# Custom type name
-npx @hypequery/cli create-api-types --name MyApi
+# Custom output path
+npx @hypequery/cli generate --output src/schema.ts
 ```
 
 ## Package Scripts
@@ -226,8 +180,7 @@ Add these to your `package.json` for easy access:
   "scripts": {
     "db:init": "hypequery init",
     "db:dev": "hypequery dev",
-    "db:generate": "hypequery generate",
-    "db:types": "hypequery create-api-types"
+    "db:generate": "hypequery generate"
   }
 }
 ```

package/dist/bin/cli.js

@@ -1,3 +1,86 @@
 #!/usr/bin/env node
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 import { program } from '../cli.js';
-program.parse(process.argv);
+function loadEnv() {
+    return __awaiter(this, void 0, void 0, function () {
+        var dotenvx, _a, config, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _c.trys.push([0, 4, , 5]);
+                    return [4 /*yield*/, import('@dotenvx/dotenvx')];
+                case 1:
+                    dotenvx = _c.sent();
+                    if (!((dotenvx === null || dotenvx === void 0 ? void 0 : dotenvx.config) && typeof dotenvx.config.load === 'function')) return [3 /*break*/, 3];
+                    return [4 /*yield*/, dotenvx.config.load()];
+                case 2:
+                    _c.sent();
+                    return [2 /*return*/];
+                case 3: return [3 /*break*/, 5];
+                case 4:
+                    _a = _c.sent();
+                    return [3 /*break*/, 5];
+                case 5:
+                    _c.trys.push([5, 7, , 8]);
+                    return [4 /*yield*/, import('dotenv')];
+                case 6:
+                    config = (_c.sent()).config;
+                    config();
+                    return [3 /*break*/, 8];
+                case 7:
+                    _b = _c.sent();
+                    return [3 /*break*/, 8];
+                case 8: return [2 /*return*/];
+            }
+        });
+    });
+}
+function main() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, loadEnv()];
+                case 1:
+                    _a.sent();
+                    program.parse(process.argv);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+main();

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;AAMpC,QAAA,MAAM,OAAO,SAAgB,CAAC;AA6G9B,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;AA6F9B,OAAO,EAAE,OAAO,EAAE,CAAC"}

package/dist/cli.js

@@ -38,7 +38,6 @@ import { Command } from 'commander';
 import { initCommand } from './commands/init.js';
 import { devCommand } from './commands/dev.js';
 import { generateCommand } from './commands/generate.js';
-import { createApiTypesCommand } from './commands/create-api-types.js';
 var program = new Command();
 program
     .name('hypequery')
@@ -110,7 +109,7 @@ program
     .description('Regenerate types from ClickHouse')
     .option('-o, --output <path>', 'Output file (default: analytics/schema.ts)')
     .option('--tables <names>', 'Only generate for specific tables (comma-separated)')
-    .option('--watch', 'Watch for schema changes')
+    .option('--database <type>', 'Database driver to use (default: auto-detect)')
     .action(function (options) { return __awaiter(void 0, void 0, void 0, function () {
     var error_3;
     return __generator(this, function (_a) {
@@ -130,31 +129,6 @@ program
         }
     });
 }); });
-// create-api-types command
-program
-    .command('create-api-types [file]')
-    .description('Generate a typed client map for serve APIs')
-    .option('-o, --output <path>', 'Output file (default: <queries-dir>/client.ts)')
-    .option('-n, --name <typeName>', 'Exported type name (default: HypequeryApi)')
-    .action(function (file, options) { return __awaiter(void 0, void 0, void 0, function () {
-    var error_4;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                _a.trys.push([0, 2, , 3]);
-                return [4 /*yield*/, createApiTypesCommand(file, options)];
-            case 1:
-                _a.sent();
-                return [3 /*break*/, 3];
-            case 2:
-                error_4 = _a.sent();
-                console.error(error_4 instanceof Error ? error_4.message : error_4);
-                process.exit(1);
-                return [3 /*break*/, 3];
-            case 3: return [2 /*return*/];
-        }
-    });
-}); });
 // Help command
 program
     .command('help [command]')
@@ -182,7 +156,6 @@ program.on('--help', function () {
     console.log('  hypequery dev');
     console.log('  hypequery dev --port 3000');
     console.log('  hypequery generate --watch');
-    console.log('  hypequery create-api-types');
     console.log('');
     console.log('Docs: https://hypequery.com/docs');
 });

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

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,GAAE,UAAe,iBA0KvE"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,GAAE,UAAe,iBAqKvE"}

package/dist/commands/dev.js

@@ -60,7 +60,7 @@ export function devCommand(file_1) {
                     currentServer = null;
                     shouldWatch = options.watch !== false;
                     startServer = function () { return __awaiter(_this, void 0, void 0, function () {
-                        var api, tableCount, error_1, queryCount, cacheType, serveDev, address, port, hostname, baseUrl, open_1, _a, error_2;
+                        var api, tableCount, error_1, queryCount, serveDev, address, port, hostname, baseUrl, open_1, _a, error_2;
                         return __generator(this, function (_b) {
                             switch (_b.label) {
                                 case 0:
@@ -91,10 +91,6 @@ export function devCommand(file_1) {
                                         logger.success("Schema loaded from ClickHouse (".concat(tableCount, " tables)"));
                                     }
                                     logger.success("Registered ".concat(queryCount, " ").concat(queryCount === 1 ? 'query' : 'queries'));
-                                    if (options.cache !== 'none') {
-                                        cacheType = options.cache || 'memory';
-                                        logger.success("Caching enabled (".concat(cacheType, ")"));
-                                    }
                                     logger.newline();
                                     return [4 /*yield*/, import('@hypequery/serve')];
                                 case 6:

package/dist/commands/generate.d.ts

@@ -1,7 +1,8 @@
+import { type DatabaseType } from '../utils/detect-database.js';
 export interface GenerateOptions {
     output?: string;
     tables?: string;
-    watch?: boolean;
+    database?: DatabaseType;
 }
 export declare function generateCommand(options?: GenerateOptions): Promise<void>;
 //# sourceMappingURL=generate.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,wBAAsB,eAAe,CAAC,OAAO,GAAE,eAAoB,iBA6IlE"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiC,KAAK,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAG/F,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB;AAED,wBAAsB,eAAe,CAAC,OAAO,GAAE,eAAoB,iBAwHlE"}

package/dist/commands/generate.js

@@ -38,21 +38,21 @@ import path from 'node:path';
 import ora from 'ora';
 import { logger } from '../utils/logger.js';
 import { findSchemaFile } from '../utils/find-files.js';
-import { getTableCount } from '../utils/detect-database.js';
+import { detectDatabase, getTableCount } from '../utils/detect-database.js';
+import { getTypeGenerator } from '../generators/index.js';
 export function generateCommand() {
     return __awaiter(this, arguments, void 0, function (options) {
-        var outputPath, existingSchema, spinner, tableCount, typeSpinner, generateTypes_1, lastTableCount_1, error_1;
-        var _this = this;
+        var outputPath, existingSchema, parsedTables, requestedDbType, dbType, _a, spinner, generator, tableCount, typeSpinner, error_1;
         if (options === void 0) { options = {}; }
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     if (!options.output) return [3 /*break*/, 1];
                     outputPath = path.resolve(process.cwd(), options.output);
                     return [3 /*break*/, 3];
                 case 1: return [4 /*yield*/, findSchemaFile()];
                 case 2:
-                    existingSchema = _a.sent();
+                    existingSchema = _b.sent();
                     if (existingSchema) {
                         outputPath = existingSchema;
                     }
@@ -60,69 +60,51 @@ export function generateCommand() {
                         // Default to analytics/schema.ts
                         outputPath = path.join(process.cwd(), 'analytics', 'schema.ts');
                     }
-                    _a.label = 3;
+                    _b.label = 3;
                 case 3:
+                    parsedTables = options.tables
+                        ? options.tables
+                            .split(',')
+                            .map(function (table) { return table.trim(); })
+                            .filter(Boolean)
+                        : undefined;
+                    requestedDbType = options.database;
+                    if (!(requestedDbType !== null && requestedDbType !== void 0)) return [3 /*break*/, 4];
+                    _a = requestedDbType;
+                    return [3 /*break*/, 6];
+                case 4: return [4 /*yield*/, detectDatabase()];
+                case 5:
+                    _a = (_b.sent());
+                    _b.label = 6;
+                case 6:
+                    dbType = _a;
                     logger.newline();
                     logger.header('hypequery generate');
-                    spinner = ora('Connecting to ClickHouse...').start();
-                    _a.label = 4;
-                case 4:
-                    _a.trys.push([4, 8, , 9]);
-                    return [4 /*yield*/, getTableCount('clickhouse')];
-                case 5:
-                    tableCount = _a.sent();
-                    spinner.succeed("Connected to ClickHouse");
+                    spinner = ora("Connecting to ".concat(dbType, "...")).start();
+                    _b.label = 7;
+                case 7:
+                    _b.trys.push([7, 10, , 11]);
+                    generator = getTypeGenerator(dbType);
+                    return [4 /*yield*/, getTableCount(dbType)];
+                case 8:
+                    tableCount = _b.sent();
+                    spinner.succeed("Connected to ".concat(dbType === 'clickhouse' ? 'ClickHouse' : dbType));
                     logger.success("Found ".concat(tableCount, " tables"));
                     typeSpinner = ora('Generating types...').start();
-                    return [4 /*yield*/, import('@hypequery/clickhouse/cli')];
-                case 6:
-                    generateTypes_1 = (_a.sent()).generateTypes;
-                    return [4 /*yield*/, generateTypes_1(outputPath)];
-                case 7:
-                    _a.sent();
+                    return [4 /*yield*/, generator({
+                            outputPath: outputPath,
+                            includeTables: parsedTables,
+                        })];
+                case 9:
+                    _b.sent();
                     typeSpinner.succeed("Generated types for ".concat(tableCount, " tables"));
                     logger.success("Updated ".concat(path.relative(process.cwd(), outputPath)));
                     logger.newline();
                     logger.header('Types regenerated successfully!');
                     logger.newline();
-                    // Watch mode
-                    if (options.watch) {
-                        logger.info('Watching ClickHouse schema for changes...');
-                        logger.newline();
-                        lastTableCount_1 = tableCount;
-                        setInterval(function () { return __awaiter(_this, void 0, void 0, function () {
-                            var currentTableCount, regenerateSpinner;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, getTableCount('clickhouse')];
-                                    case 1:
-                                        currentTableCount = _a.sent();
-                                        if (!(currentTableCount !== lastTableCount_1)) return [3 /*break*/, 3];
-                                        logger.newline();
-                                        logger.reload("Schema changed (".concat(Math.abs(currentTableCount - lastTableCount_1), " ").concat(currentTableCount > lastTableCount_1 ? 'new' : 'removed', " tables)"));
-                                        regenerateSpinner = ora('Regenerating types...').start();
-                                        return [4 /*yield*/, generateTypes_1(outputPath)];
-                                    case 2:
-                                        _a.sent();
-                                        regenerateSpinner.succeed('Regenerated types');
-                                        logger.success("Updated ".concat(path.relative(process.cwd(), outputPath)));
-                                        logger.newline();
-                                        lastTableCount_1 = currentTableCount;
-                                        _a.label = 3;
-                                    case 3: return [2 /*return*/];
-                                }
-                            });
-                        }); }, 30000); // Check every 30 seconds
-                        // Keep process alive
-                        process.on('SIGINT', function () {
-                            logger.newline();
-                            logger.info('Stopping watch mode...');
-                            process.exit(0);
-                        });
-                    }
-                    return [3 /*break*/, 9];
-                case 8:
-                    error_1 = _a.sent();
+                    return [3 /*break*/, 11];
+                case 10:
+                    error_1 = _b.sent();
                     spinner.fail('Failed to generate types');
                     logger.newline();
                     if (error_1 instanceof Error) {
@@ -185,8 +167,8 @@ export function generateCommand() {
                     }
                     logger.newline();
                     process.exit(1);
-                    return [3 /*break*/, 9];
-                case 9: return [2 /*return*/];
+                    return [3 /*break*/, 11];
+                case 11: return [2 /*return*/];
             }
         });
     });

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;CACjB;AAED,wBAAsB,WAAW,CAAC,OAAO,GAAE,WAAgB,iBA2R1D"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AA6BA,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;CACjB;AAED,wBAAsB,WAAW,CAAC,OAAO,GAAE,WAAgB,iBA2R1D"}

package/dist/commands/init.js

@@ -45,9 +45,10 @@ import { generateEnvTemplate, appendToEnv } from '../templates/env.js';
 import { generateClientTemplate } from '../templates/client.js';
 import { generateQueriesTemplate } from '../templates/queries.js';
 import { appendToGitignore } from '../templates/gitignore.js';
+import { getTypeGenerator } from '../generators/index.js';
 export function initCommand() {
     return __awaiter(this, arguments, void 0, function (options) {
-        var dbType, connectionConfig, hasValidConnection, tableCount, required, spinner, isValid, retry, continueWithout, outputDir, resolvedOutputDir, filesToCreate, existingFiles, _i, filesToCreate_1, file, _a, shouldOverwrite, generateExample, selectedTable, tables, envPath, envExists, existingEnv, newEnv, envPath, envExists, placeholderConfig, schemaPath, typeSpinner, generateTypes, error_1, clientPath, queriesPath, gitignorePath, gitignoreExists, existingGitignore, newGitignore, exampleQueryKey;
+        var dbType, connectionConfig, hasValidConnection, tableCount, required, spinner, isValid, retry, continueWithout, outputDir, resolvedOutputDir, filesToCreate, existingFiles, _i, filesToCreate_1, file, _a, shouldOverwrite, generateExample, selectedTable, tables, envPath, envExists, existingEnv, newEnv, envPath, envExists, placeholderConfig, schemaPath, typeSpinner, generator, error_1, clientPath, queriesPath, gitignorePath, gitignoreExists, existingGitignore, newGitignore, exampleQueryKey;
         var _b;
         if (options === void 0) { options = {}; }
         return __generator(this, function (_c) {
@@ -263,38 +264,36 @@ export function initCommand() {
                     _c.label = 38;
                 case 38:
                     schemaPath = path.join(resolvedOutputDir, 'schema.ts');
-                    if (!hasValidConnection) return [3 /*break*/, 44];
+                    if (!hasValidConnection) return [3 /*break*/, 43];
                     typeSpinner = ora('Generating TypeScript types...').start();
                     _c.label = 39;
                 case 39:
-                    _c.trys.push([39, 42, , 43]);
-                    return [4 /*yield*/, import('@hypequery/clickhouse/cli')];
+                    _c.trys.push([39, 41, , 42]);
+                    generator = getTypeGenerator('clickhouse');
+                    return [4 /*yield*/, generator({ outputPath: schemaPath })];
                 case 40:
-                    generateTypes = (_c.sent()).generateTypes;
-                    return [4 /*yield*/, generateTypes(schemaPath)];
-                case 41:
                     _c.sent();
                     typeSpinner.succeed("Generated TypeScript types (".concat(path.relative(process.cwd(), schemaPath), ")"));
-                    return [3 /*break*/, 43];
-                case 42:
+                    return [3 /*break*/, 42];
+                case 41:
                     error_1 = _c.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*/, 43];
-                case 43: return [3 /*break*/, 46];
-                case 44: 
+                    return [3 /*break*/, 42];
+                case 42: return [3 /*break*/, 45];
+                case 43: 
                 // Create placeholder schema file
-                return [4 /*yield*/, writeFile(schemaPath, "// Generated by @hypequery/clickhouse\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 45:
+                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 44:
                     // Create placeholder schema file
                     _c.sent();
                     logger.success("Created placeholder schema (".concat(path.relative(process.cwd(), schemaPath), ")"));
-                    _c.label = 46;
-                case 46:
+                    _c.label = 45;
+                case 45:
                     clientPath = path.join(resolvedOutputDir, 'client.ts');
                     return [4 /*yield*/, writeFile(clientPath, generateClientTemplate())];
-                case 47:
+                case 46:
                     _c.sent();
                     logger.success("Created ClickHouse client (".concat(path.relative(process.cwd(), clientPath), ")"));
                     queriesPath = path.join(resolvedOutputDir, 'queries.ts');
@@ -302,7 +301,7 @@ export function initCommand() {
                             hasExample: generateExample,
                             tableName: selectedTable || undefined,
                         }))];
-                case 48:
+                case 47:
                     _c.sent();
                     logger.success("Created queries file (".concat(path.relative(process.cwd(), queriesPath), ")"));
                     if (generateExample && selectedTable) {
@@ -310,26 +309,26 @@ export function initCommand() {
                     }
                     gitignorePath = path.join(process.cwd(), '.gitignore');
                     return [4 /*yield*/, hasGitignore()];
-                case 49:
+                case 48:
                     gitignoreExists = _c.sent();
-                    if (!gitignoreExists) return [3 /*break*/, 53];
+                    if (!gitignoreExists) return [3 /*break*/, 52];
                     return [4 /*yield*/, readFile(gitignorePath, 'utf-8')];
-                case 50:
+                case 49:
                     existingGitignore = _c.sent();
                     newGitignore = appendToGitignore(existingGitignore);
-                    if (!(newGitignore !== existingGitignore)) return [3 /*break*/, 52];
+                    if (!(newGitignore !== existingGitignore)) return [3 /*break*/, 51];
                     return [4 /*yield*/, writeFile(gitignorePath, newGitignore)];
-                case 51:
+                case 50:
                     _c.sent();
                     logger.success('Updated .gitignore');
-                    _c.label = 52;
-                case 52: return [3 /*break*/, 55];
-                case 53: return [4 /*yield*/, writeFile(gitignorePath, appendToGitignore(''))];
-                case 54:
+                    _c.label = 51;
+                case 51: return [3 /*break*/, 54];
+                case 52: return [4 /*yield*/, writeFile(gitignorePath, appendToGitignore(''))];
+                case 53:
                     _c.sent();
                     logger.success('Created .gitignore');
-                    _c.label = 55;
-                case 55:
+                    _c.label = 54;
+                case 54:
                     // Step 13: Success message
                     logger.newline();
                     logger.header('Setup complete!');

package/dist/generators/clickhouse.d.ts

@@ -0,0 +1,7 @@
+export interface ClickHouseGeneratorOptions {
+    outputPath: string;
+    includeTables?: string[];
+    excludeTables?: string[];
+}
+export declare function generateClickHouseTypes(options: ClickHouseGeneratorOptions): Promise<void>;
+//# sourceMappingURL=clickhouse.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"clickhouse.d.ts","sourceRoot":"","sources":["../../src/generators/clickhouse.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AA4HD,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,0BAA0B,iBA0ChF"}