@hypequery/cli 1.1.0 → 1.1.2

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-api.d.ts

@@ -1,2 +1,3 @@
 export declare function loadApiModule(modulePath: string): Promise<any>;
+export declare function loadModule(modulePath: string): Promise<any>;
 //# sourceMappingURL=load-api.d.ts.map

package/dist/utils/load-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load-api.d.ts","sourceRoot":"","sources":["../../src/utils/load-api.ts"],"names":[],"mappings":"AAaA,wBAAsB,aAAa,CAAC,UAAU,EAAE,MAAM,gBA0ErD"}
+{"version":3,"file":"load-api.d.ts","sourceRoot":"","sources":["../../src/utils/load-api.ts"],"names":[],"mappings":"AAaA,wBAAsB,aAAa,CAAC,UAAU,EAAE,MAAM,gBAkDrD;AAED,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,gBAkClD"}

package/dist/utils/load-api.js

@@ -47,92 +47,116 @@ var TYPESCRIPT_EXTENSIONS = new Set(['.ts', '.tsx', '.mts', '.cts']);
 var tsconfigCache = new Map();
 export function loadApiModule(modulePath) {
     return __awaiter(this, void 0, void 0, function () {
-        var resolved, _a, relativePath, extension, isTypeScript, moduleUrl, _b, mod, importOverride, _c, error_1, relativePath, api, relativePath, availableExports;
-        var _d;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        var resolved, mod, error_1, relativePath, api, relativePath, availableExports;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     resolved = path.resolve(process.cwd(), modulePath);
-                    _e.label = 1;
+                    _b.label = 1;
                 case 1:
-                    _e.trys.push([1, 3, , 4]);
+                    _b.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, loadModule(modulePath)];
+                case 2:
+                    mod = _b.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    error_1 = _b.sent();
+                    if (error_1 instanceof Error && error_1.message.startsWith('File not found:')) {
+                        relativePath = path.relative(process.cwd(), resolved);
+                        throw new Error("File not found: ".concat(relativePath, "\n\n") +
+                            "Make sure the file exists and the path is correct.\n" +
+                            "You can specify a different file with:\n" +
+                            "  hypequery dev path/to/your/queries.ts");
+                    }
+                    throw error_1;
+                case 4:
+                    api = (_a = mod.api) !== null && _a !== void 0 ? _a : mod.default;
+                    if (!api || typeof api.handler !== 'function') {
+                        relativePath = path.relative(process.cwd(), resolved);
+                        availableExports = Object.keys(mod).filter(function (key) { return key !== '__esModule'; });
+                        throw new Error("Invalid API module: ".concat(relativePath, "\n\n") +
+                            "The module must export a 'defineServe' result as 'api'.\n\n" +
+                            (availableExports.length > 0
+                                ? "Found exports: ".concat(availableExports.join(', '), "\n\n")
+                                : "No exports found in the module.\n\n") +
+                            "Expected format:\n\n" +
+                            "  import { initServe } from '@hypequery/serve';\n" +
+                            "  \n" +
+                            "  const { define, queries, query } = initServe({\n" +
+                            "    context: () => ({ db }),\n" +
+                            "  });\n" +
+                            "  \n" +
+                            "  export const api = define({\n" +
+                            "    queries: queries({\n" +
+                            "      myQuery: query.query(async ({ ctx }) => {\n" +
+                            "        // ...\n" +
+                            "      }),\n" +
+                            "    }),\n" +
+                            "  });\n");
+                    }
+                    return [2 /*return*/, api];
+            }
+        });
+    });
+}
+export function loadModule(modulePath) {
+    return __awaiter(this, void 0, void 0, function () {
+        var resolved, _a, relativePath, extension, isTypeScript, moduleUrl, _b, importOverride, _c, error_2, relativePath;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    resolved = path.resolve(process.cwd(), modulePath);
+                    _d.label = 1;
+                case 1:
+                    _d.trys.push([1, 3, , 4]);
                     return [4 /*yield*/, access(resolved)];
                 case 2:
-                    _e.sent();
+                    _d.sent();
                     return [3 /*break*/, 4];
                 case 3:
-                    _a = _e.sent();
+                    _a = _d.sent();
                     relativePath = path.relative(process.cwd(), resolved);
-                    throw new Error("File not found: ".concat(relativePath, "\n\n") +
-                        "Make sure the file exists and the path is correct.\n" +
-                        "You can specify a different file with:\n" +
-                        "  hypequery dev path/to/your/queries.ts");
+                    throw new Error("File not found: ".concat(relativePath));
                 case 4:
                     extension = path.extname(resolved).toLowerCase();
                     isTypeScript = TYPESCRIPT_EXTENSIONS.has(extension);
                     if (!isTypeScript) return [3 /*break*/, 6];
                     return [4 /*yield*/, bundleTypeScriptModule(resolved)];
                 case 5:
-                    _b = _e.sent();
+                    _b = _d.sent();
                     return [3 /*break*/, 7];
                 case 6:
                     _b = "".concat(pathToFileURL(resolved).href, "?t=").concat(Date.now());
-                    _e.label = 7;
+                    _d.label = 7;
                 case 7:
                     moduleUrl = _b;
-                    _e.label = 8;
+                    _d.label = 8;
                 case 8:
-                    _e.trys.push([8, 13, , 14]);
+                    _d.trys.push([8, 13, , 14]);
                     importOverride = globalState.__hypequeryCliImportOverride;
                     if (!importOverride) return [3 /*break*/, 10];
                     return [4 /*yield*/, importOverride(moduleUrl)];
                 case 9:
-                    _c = _e.sent();
+                    _c = _d.sent();
                     return [3 /*break*/, 12];
                 case 10: return [4 /*yield*/, import(/* @vite-ignore */ moduleUrl)];
                 case 11:
-                    _c = _e.sent();
-                    _e.label = 12;
-                case 12:
-                    mod = _c;
-                    return [3 /*break*/, 14];
+                    _c = _d.sent();
+                    _d.label = 12;
+                case 12: return [2 /*return*/, _c];
                 case 13:
-                    error_1 = _e.sent();
+                    error_2 = _d.sent();
                     relativePath = path.relative(process.cwd(), resolved);
                     throw new Error("Failed to load module: ".concat(relativePath, "\n\n") +
-                        "Error: ".concat(error_1.message, "\n\n") +
-                        (error_1.code === 'ERR_MODULE_NOT_FOUND'
+                        "Error: ".concat(error_2.message, "\n\n") +
+                        (error_2.code === 'ERR_MODULE_NOT_FOUND'
                             ? "This usually means:\n" +
                                 "  \u2022 A dependency is missing (run 'npm install')\n" +
                                 "  \u2022 An import path is incorrect\n"
                             : "") +
-                        (error_1.stack ? "\nStack trace:\n".concat(error_1.stack, "\n") : ''));
-                case 14:
-                    api = (_d = mod.api) !== null && _d !== void 0 ? _d : mod.default;
-                    if (!api || typeof api.handler !== 'function') {
-                        relativePath = path.relative(process.cwd(), resolved);
-                        availableExports = Object.keys(mod).filter(function (key) { return key !== '__esModule'; });
-                        throw new Error("Invalid API module: ".concat(relativePath, "\n\n") +
-                            "The module must export a 'defineServe' result as 'api'.\n\n" +
-                            (availableExports.length > 0
-                                ? "Found exports: ".concat(availableExports.join(', '), "\n\n")
-                                : "No exports found in the module.\n\n") +
-                            "Expected format:\n\n" +
-                            "  import { initServe } from '@hypequery/serve';\n" +
-                            "  \n" +
-                            "  const { define, queries, query } = initServe({\n" +
-                            "    context: () => ({ db }),\n" +
-                            "  });\n" +
-                            "  \n" +
-                            "  export const api = define({\n" +
-                            "    queries: queries({\n" +
-                            "      myQuery: query.query(async ({ ctx }) => {\n" +
-                            "        // ...\n" +
-                            "      }),\n" +
-                            "    }),\n" +
-                            "  });\n");
-                    }
-                    return [2 /*return*/, api];
+                        (error_2.stack ? "\nStack trace:\n".concat(error_2.stack, "\n") : ''));
+                case 14: return [2 /*return*/];
             }
         });
     });
@@ -294,7 +318,7 @@ function installCleanupHooks() {
 }
 function bundleTypeScriptModule(entryPath) {
     return __awaiter(this, void 0, void 0, function () {
-        var relativePath, tsconfigPath, result, output, tempDir, timestamp, tempFile, contents, error_2;
+        var relativePath, tsconfigPath, result, output, tempDir, timestamp, tempFile, contents, error_3;
         var _a, _b, _c, _d;
         return __generator(this, function (_e) {
             switch (_e.label) {
@@ -345,9 +369,9 @@ function bundleTypeScriptModule(entryPath) {
                     tempFiles.add(tempFile);
                     return [2 /*return*/, "".concat(pathToFileURL(tempFile).href, "?t=").concat(timestamp)];
                 case 6:
-                    error_2 = _e.sent();
+                    error_3 = _e.sent();
                     throw new Error("Failed to compile ".concat(relativePath, " with esbuild.\n") +
-                        "Original error: ".concat((_d = error_2 === null || error_2 === void 0 ? void 0 : error_2.message) !== null && _d !== void 0 ? _d : error_2));
+                        "Original error: ".concat((_d = error_3 === null || error_3 === void 0 ? void 0 : error_3.message) !== null && _d !== void 0 ? _d : error_3));
                 case 7: return [2 /*return*/];
             }
         });

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

@@ -0,0 +1,7 @@
+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";
+export declare const DEFAULT_MIGRATIONS_PREFIX: "timestamp";
+export declare function loadHypequeryConfig(configPath?: string): Promise<ResolvedHypequeryClickHouseConfig>;
+//# sourceMappingURL=load-hypequery-config.d.ts.map

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

@@ -0,0 +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,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/load-hypequery-config.js

@@ -0,0 +1,89 @@
+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) {
+        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 { loadModule } from './load-api.js';
+export var DEFAULT_HYPEQUERY_CONFIG_PATH = 'hypequery.config.ts';
+export var DEFAULT_MIGRATIONS_OUT_DIR = './migrations';
+export var DEFAULT_MIGRATIONS_TABLE = '_hypequery_migrations';
+export var DEFAULT_MIGRATIONS_PREFIX = 'timestamp';
+export function loadHypequeryConfig() {
+    return __awaiter(this, arguments, void 0, function (configPath) {
+        var mod, candidate, config;
+        var _a, _b, _c, _d, _e, _f, _g;
+        if (configPath === void 0) { configPath = DEFAULT_HYPEQUERY_CONFIG_PATH; }
+        return __generator(this, function (_h) {
+            switch (_h.label) {
+                case 0: return [4 /*yield*/, loadModule(configPath)];
+                case 1:
+                    mod = _h.sent();
+                    candidate = (_a = mod.default) !== null && _a !== void 0 ? _a : mod.config;
+                    if (!candidate || typeof candidate !== 'object') {
+                        throw new Error("Invalid hypequery config: ".concat(configPath, "\n\n") +
+                            "The config module must export a ClickHouse config as the default export.");
+                    }
+                    config = candidate;
+                    if (config.dialect !== 'clickhouse') {
+                        throw new Error("Invalid hypequery config: ".concat(configPath, "\n\n") +
+                            "Expected \"dialect\" to be \"clickhouse\".");
+                    }
+                    if (typeof config.schema !== 'string' || config.schema.length === 0) {
+                        throw new Error("Invalid hypequery config: ".concat(configPath, "\n\n") +
+                            "Expected \"schema\" to be a non-empty string.");
+                    }
+                    if (!config.dbCredentials || typeof config.dbCredentials !== 'object') {
+                        throw new Error("Invalid hypequery config: ".concat(configPath, "\n\n") +
+                            "Expected \"dbCredentials\" to be defined.");
+                    }
+                    return [2 /*return*/, __assign(__assign({}, config), { migrations: {
+                                out: (_c = (_b = config.migrations) === null || _b === void 0 ? void 0 : _b.out) !== null && _c !== void 0 ? _c : DEFAULT_MIGRATIONS_OUT_DIR,
+                                table: (_e = (_d = config.migrations) === null || _d === void 0 ? void 0 : _d.table) !== null && _e !== void 0 ? _e : DEFAULT_MIGRATIONS_TABLE,
+                                prefix: (_g = (_f = config.migrations) === null || _f === void 0 ? void 0 : _f.prefix) !== null && _g !== void 0 ? _g : DEFAULT_MIGRATIONS_PREFIX,
+                            } })];
+            }
+        });
+    });
+}

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"}