@hypequery/cli 1.0.0 → 1.1.1

package/README.md

@@ -4,7 +4,14 @@ Command-line interface for Hypequery - the type-safe analytics layer for ClickHo
 
 ## Quick Start
 
-**No installation required!** Use `npx` to run commands directly:
+The CLI scaffolds and runs the main hypequery path:
+
+1. Generate schema types from ClickHouse
+2. Build queries with the typed query builder
+3. Wrap reusable queries with `query({ ... })`
+4. Add `serve({ queries })` when you want HTTP routes and docs
+
+Use `npx` to run commands directly:
 
 ```bash
 # Initialize a new project
@@ -68,7 +75,7 @@ npx hypequery init
 **What it does:**
 - Connects to your ClickHouse database
 - Generates TypeScript types from your schema
-- Creates client, queries, and config files
+- Creates the client, query, and serve files for the main path
 - Sets up `.env` with connection details
 - Updates `.gitignore` to protect secrets
 
@@ -192,7 +199,12 @@ npm run db:dev
 
 ## Documentation
 
-Visit [hypequery.com/docs](https://hypequery.com/docs) for full documentation.
+Visit the main docs flow:
+
+- [Quick Start](https://hypequery.com/docs/quick-start)
+- [Core Concepts](https://hypequery.com/docs/core-concepts)
+- [Query Building](https://hypequery.com/docs/query-building/basics)
+- [Serve Runtime Reference](https://hypequery.com/docs/reference/runtime)
 
 ## License
 

package/dist/generators/clickhouse.d.ts

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

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

@@ -1 +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"}
+{"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;AAmGD,QAAA,MAAM,kBAAkB,GAAI,MAAM,MAAM,KAAG,MAsC1C,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAgC9B,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,0BAA0B,iBA0ChF"}

package/dist/generators/clickhouse.js

@@ -39,57 +39,53 @@ import path from 'node:path';
 import { getClickHouseClient } from '../utils/clickhouse-client.js';
 var DEFAULT_WARNING = 'Warning: No tables match the filter criteria. Check your include/exclude options.';
 var capitalizeFirstLetter = function (value) { return value.charAt(0).toUpperCase() + value.slice(1); };
-var clickhouseToTsType = function (type) {
-    if (type.startsWith('Array(')) {
-        var innerType = type.slice(6, -1);
-        return "Array<".concat(clickhouseToTsType(innerType), ">");
-    }
-    if (type.startsWith('Nullable(')) {
-        var innerType = type.slice(9, -1);
-        return "".concat(clickhouseToTsType(innerType), " | null");
-    }
-    if (type.startsWith('Map(')) {
-        var mapContent = type.slice(4, -1);
-        var commaIndex = mapContent.lastIndexOf(',');
-        if (commaIndex !== -1) {
-            var keyType = mapContent.substring(0, commaIndex).trim();
-            var valueType = mapContent.substring(commaIndex + 1).trim();
-            var keyTsType = 'string';
-            if (keyType === 'LowCardinality(String)') {
-                keyTsType = 'string';
-            }
-            else if (keyType.includes('Int') || keyType.includes('UInt')) {
-                keyTsType = 'number';
-            }
-            var valueTsType = 'unknown';
-            if (valueType.startsWith('Array(')) {
-                var innerType = valueType.slice(6, -1);
-                valueTsType = "Array<".concat(clickhouseToTsType(innerType), ">");
-            }
-            else if (valueType.startsWith('Nullable(')) {
-                var innerType = valueType.slice(9, -1);
-                valueTsType = "".concat(clickhouseToTsType(innerType), " | null");
-            }
-            else {
-                valueTsType = clickhouseToTsType(valueType);
-            }
-            return "Record<".concat(keyTsType, ", ").concat(valueTsType, ">");
+function splitTopLevelArgs(value) {
+    var parts = [];
+    var current = '';
+    var depth = 0;
+    for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
+        var char = value_1[_i];
+        if (char === '(') {
+            depth += 1;
+            current += char;
+            continue;
         }
-        return 'Record<string, unknown>';
+        if (char === ')') {
+            depth -= 1;
+            current += char;
+            continue;
+        }
+        if (char === ',' && depth === 0) {
+            parts.push(current.trim());
+            current = '';
+            continue;
+        }
+        current += char;
     }
-    switch (type.toLowerCase()) {
+    if (current.trim()) {
+        parts.push(current.trim());
+    }
+    return parts;
+}
+function unwrapType(type, wrapperName) {
+    var prefix = "".concat(wrapperName, "(");
+    return type.startsWith(prefix) && type.endsWith(')') ? type.slice(prefix.length, -1) : null;
+}
+function getPrimitiveTsType(type) {
+    var lowerType = type.toLowerCase();
+    switch (lowerType) {
         case 'string':
-        case 'fixedstring':
+        case 'uuid':
             return 'string';
         case 'int8':
         case 'int16':
         case 'int32':
         case 'uint8':
-        case 'int64':
         case 'uint16':
         case 'uint32':
-        case 'uint64':
             return 'number';
+        case 'int64':
+        case 'uint64':
         case 'uint128':
         case 'uint256':
         case 'int128':
@@ -108,9 +104,56 @@ var clickhouseToTsType = function (type) {
         case 'boolean':
             return 'boolean';
         default:
-            return 'string';
+            if (type.startsWith('FixedString('))
+                return 'string';
+            if (type.startsWith('Decimal('))
+                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;
+    }
+}
+var clickhouseToTsType = function (type) {
+    var wrappedArrayType = unwrapType(type, 'Array');
+    if (wrappedArrayType) {
+        return "Array<".concat(clickhouseToTsType(wrappedArrayType), ">");
+    }
+    var wrappedNullableType = unwrapType(type, 'Nullable');
+    if (wrappedNullableType) {
+        return "".concat(clickhouseToTsType(wrappedNullableType), " | null");
+    }
+    var wrappedLowCardinalityType = unwrapType(type, 'LowCardinality');
+    if (wrappedLowCardinalityType) {
+        return clickhouseToTsType(wrappedLowCardinalityType);
+    }
+    var wrappedTupleType = unwrapType(type, 'Tuple');
+    if (wrappedTupleType) {
+        var tupleParts = splitTopLevelArgs(wrappedTupleType);
+        return "[".concat(tupleParts.map(clickhouseToTsType).join(', '), "]");
+    }
+    var wrappedMapType = unwrapType(type, 'Map');
+    if (wrappedMapType) {
+        var mapParts = splitTopLevelArgs(wrappedMapType);
+        if (mapParts.length === 2) {
+            var valueType = mapParts[1];
+            // JSON object keys are strings even when ClickHouse map keys are numeric.
+            return "Record<string, ".concat(clickhouseToTsType(valueType), ">");
+        }
+        return 'Record<string, unknown>';
     }
+    var primitiveType = getPrimitiveTsType(type);
+    if (primitiveType)
+        return primitiveType;
+    // Unsupported or more complex ClickHouse types currently preserve the historical fallback.
+    return 'string';
 };
+export { clickhouseToTsType };
 function fetchTables(includeTables, excludeTables) {
     return __awaiter(this, void 0, void 0, function () {
         var client, tablesQuery, tables;

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,CA6DT"}
+{"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"}

package/dist/templates/queries.js

@@ -5,14 +5,14 @@ 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 serve = initServe({\n  context: () => ({ db }),\n});\nconst { query } = serve;\n\nexport const api = serve.define({\n  queries: serve.queries({";
+    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";
     if (hasExample && tableName) {
-        template += "\n    ".concat(camelCase(tableName), "Query: query\n      .describe('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      ),");
+        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 += "\n    exampleMetric: query\n      .describe('Example metric that returns a simple value')\n      .output(z.object({ ok: z.boolean() }))\n      .query(async () => ({ ok: true })),";
+        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 += "\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\n */\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");
     return template;
 }
 /**

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;;;EAe9B"}
+{"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"}

package/dist/test-utils.js

@@ -142,7 +142,6 @@ export function mockProcessExit() {
     var exitMock = vi.fn(function (code) {
         throw new ProcessExitError(code !== null && code !== void 0 ? code : 0);
     });
-    // @ts-ignore
     process.exit = exitMock;
     return {
         exitMock: exitMock,

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,gBAuErD"}
+{"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

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var _a, _b, _c, _d;
 import { pathToFileURL } from 'node:url';
-import { access, mkdtemp, writeFile, rm, mkdir } from 'node:fs/promises';
+import { access, mkdtemp, rm, mkdir, writeFile } from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import { build } from 'esbuild';
@@ -47,8 +47,62 @@ 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, error_1, relativePath, api, relativePath, availableExports;
-        var _c;
+        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);
+                    _b.label = 1;
+                case 1:
+                    _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:
@@ -63,10 +117,7 @@ export function loadApiModule(modulePath) {
                 case 3:
                     _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);
@@ -82,48 +133,30 @@ export function loadApiModule(modulePath) {
                     moduleUrl = _b;
                     _d.label = 8;
                 case 8:
-                    _d.trys.push([8, 10, , 11]);
-                    return [4 /*yield*/, import(moduleUrl)];
+                    _d.trys.push([8, 13, , 14]);
+                    importOverride = globalState.__hypequeryCliImportOverride;
+                    if (!importOverride) return [3 /*break*/, 10];
+                    return [4 /*yield*/, importOverride(moduleUrl)];
                 case 9:
-                    mod = _d.sent();
-                    return [3 /*break*/, 11];
-                case 10:
-                    error_1 = _d.sent();
+                    _c = _d.sent();
+                    return [3 /*break*/, 12];
+                case 10: return [4 /*yield*/, import(/* @vite-ignore */ moduleUrl)];
+                case 11:
+                    _c = _d.sent();
+                    _d.label = 12;
+                case 12: return [2 /*return*/, _c];
+                case 13:
+                    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 11:
-                    api = (_c = mod.api) !== null && _c !== void 0 ? _c : 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*/];
             }
         });
     });
@@ -285,7 +318,7 @@ function installCleanupHooks() {
 }
 function bundleTypeScriptModule(entryPath) {
     return __awaiter(this, void 0, void 0, function () {
-        var relativePath, tsconfigPath, result, output, contents, tempDir, tempFile, 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) {
@@ -322,20 +355,23 @@ function bundleTypeScriptModule(entryPath) {
                     if (!output) {
                         throw new Error('esbuild produced no output');
                     }
-                    contents = "".concat(output.text, "\n//# sourceURL=").concat(pathToFileURL(entryPath).href);
                     return [4 /*yield*/, ensureTempDir()];
                 case 4:
                     tempDir = _e.sent();
-                    tempFile = path.join(tempDir, "".concat(path.basename(entryPath).replace(/[^a-zA-Z0-9_-]/g, '_'), "-").concat(Date.now(), "-").concat(Math.random().toString(36).slice(2), ".mjs"));
+                    timestamp = Date.now();
+                    tempFile = path.join(tempDir, "".concat(path.basename(entryPath, path.extname(entryPath)), "-").concat(timestamp, ".mjs"));
+                    contents = "".concat(output.text, "\n") +
+                        "//# sourceURL=".concat(pathToFileURL(entryPath).href, "\n") +
+                        "//# hypequery-ts-bundle=".concat(timestamp);
                     return [4 /*yield*/, writeFile(tempFile, contents, 'utf8')];
                 case 5:
                     _e.sent();
                     tempFiles.add(tempFile);
-                    return [2 /*return*/, "".concat(pathToFileURL(tempFile).href, "?t=").concat(Date.now())];
+                    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*/];
             }
         });
@@ -386,14 +422,14 @@ function findNearestTsconfig(filePath) {
                     };
                     _b.label = 1;
                 case 1:
-                    if (!true) return [3 /*break*/, 3];
+                    if (!dir) return [3 /*break*/, 3];
                     return [5 /*yield**/, _loop_1()];
                 case 2:
                     state_1 = _b.sent();
                     if (typeof state_1 === "object")
                         return [2 /*return*/, state_1.value];
                     return [3 /*break*/, 1];
-                case 3: return [2 /*return*/];
+                case 3: return [2 /*return*/, null];
             }
         });
     });

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

@@ -0,0 +1,7 @@
+import type { ResolvedHypequeryClickHouseConfig } from '@hypequery/clickhouse';
+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,uBAAuB,CAAC;AAG/B,eAAO,MAAM,6BAA6B,wBAAwB,CAAC;AACnE,eAAO,MAAM,0BAA0B,iBAAiB,CAAC;AACzD,eAAO,MAAM,wBAAwB,0BAA0B,CAAC;AAChE,eAAO,MAAM,yBAAyB,EAAG,WAAoB,CAAC;AAE9D,wBAAsB,mBAAmB,CACvC,UAAU,SAAgC,GACzC,OAAO,CAAC,iCAAiC,CAAC,CA0C5C"}

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.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;AAMzD;;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":"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"}

package/dist/utils/prompts.js

@@ -45,8 +45,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import prompts from 'prompts';
 import { logger } from './logger.js';
+var noop = function () { return undefined; };
 // Configure prompts to not exit on cancel
-prompts.override({ onCancel: function () { } });
+prompts.override({ onCancel: noop });
 /**
  * Prompt for database type selection
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypequery/cli",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "Command-line interface for hypequery",
   "license": "Apache-2.0",
   "type": "module",
@@ -15,7 +15,7 @@
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "dotenv": "^16.4.7",
-    "esbuild": "^0.24.0",
+    "esbuild": "^0.25.0",
     "open": "^10.0.0",
     "ora": "^8.0.1",
     "prompts": "^2.4.2"
@@ -35,8 +35,16 @@
     "@vitest/coverage-v8": "^2.1.6",
     "typescript": "^5.7.3",
     "vitest": "^2.1.6",
-    "@hypequery/serve": "0.1.1",
-    "@hypequery/clickhouse": "1.6.0"
+    "@hypequery/clickhouse": "1.6.2",
+    "@hypequery/serve": "0.2.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/hypequery/hypequery.git"
+  },
+  "homepage": "https://www.hypequery.com",
+  "bugs": {
+    "url": "https://github.com/hypequery/hypequery/issues"
   },
   "publishConfig": {
     "access": "public"