@hypequery/cli 1.1.2 → 1.2.0

package/dist/utils/detect-database.js

@@ -1,224 +1,113 @@
-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 { access } from 'node:fs/promises';
 import path from 'node:path';
 import { getClickHouseClient } from './clickhouse-client.js';
 /**
  * Auto-detect database type from environment or config files
  */
-export function detectDatabase() {
-    return __awaiter(this, void 0, void 0, function () {
-        var envPath, readFile, envContent, _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    // Check environment variables
-                    if (process.env.CLICKHOUSE_HOST ||
-                        process.env.CLICKHOUSE_URL ||
-                        process.env.CLICKHOUSE_DATABASE) {
-                        return [2 /*return*/, 'clickhouse'];
-                    }
-                    if (process.env.BIGQUERY_PROJECT_ID || process.env.GOOGLE_APPLICATION_CREDENTIALS) {
-                        return [2 /*return*/, 'bigquery'];
-                    }
-                    _b.label = 1;
-                case 1:
-                    _b.trys.push([1, 5, , 6]);
-                    envPath = path.join(process.cwd(), '.env');
-                    return [4 /*yield*/, access(envPath)];
-                case 2:
-                    _b.sent();
-                    return [4 /*yield*/, import('node:fs/promises')];
-                case 3:
-                    readFile = (_b.sent()).readFile;
-                    return [4 /*yield*/, readFile(envPath, 'utf-8')];
-                case 4:
-                    envContent = _b.sent();
-                    if (envContent.includes('CLICKHOUSE_') ||
-                        envContent.includes('CLICKHOUSE_HOST')) {
-                        return [2 /*return*/, 'clickhouse'];
-                    }
-                    if (envContent.includes('BIGQUERY_') ||
-                        envContent.includes('GOOGLE_APPLICATION_CREDENTIALS')) {
-                        return [2 /*return*/, 'bigquery'];
-                    }
-                    return [3 /*break*/, 6];
-                case 5:
-                    _a = _b.sent();
-                    return [3 /*break*/, 6];
-                case 6: return [2 /*return*/, 'unknown'];
-            }
-        });
-    });
+export async function detectDatabase() {
+    // Check environment variables
+    if (process.env.CLICKHOUSE_HOST ||
+        process.env.CLICKHOUSE_URL ||
+        process.env.CLICKHOUSE_DATABASE) {
+        return 'clickhouse';
+    }
+    if (process.env.BIGQUERY_PROJECT_ID || process.env.GOOGLE_APPLICATION_CREDENTIALS) {
+        return 'bigquery';
+    }
+    // Check for .env file and parse it
+    try {
+        const envPath = path.join(process.cwd(), '.env');
+        await access(envPath);
+        const { readFile } = await import('node:fs/promises');
+        const envContent = await readFile(envPath, 'utf-8');
+        if (envContent.includes('CLICKHOUSE_') ||
+            envContent.includes('CLICKHOUSE_HOST')) {
+            return 'clickhouse';
+        }
+        if (envContent.includes('BIGQUERY_') ||
+            envContent.includes('GOOGLE_APPLICATION_CREDENTIALS')) {
+            return 'bigquery';
+        }
+    }
+    catch {
+        // .env doesn't exist, continue
+    }
+    return 'unknown';
 }
 /**
  * Validate database connection
  */
-export function validateConnection(dbType) {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (dbType) {
-                case 'clickhouse':
-                    return [2 /*return*/, validateClickHouse()];
-                case 'bigquery':
-                    return [2 /*return*/, validateBigQuery()];
-                default:
-                    return [2 /*return*/, false];
-            }
-            return [2 /*return*/];
-        });
-    });
+export async function validateConnection(dbType) {
+    switch (dbType) {
+        case 'clickhouse':
+            return validateClickHouse();
+        case 'bigquery':
+            return validateBigQuery();
+        default:
+            return false;
+    }
 }
-function validateClickHouse() {
-    return __awaiter(this, void 0, void 0, function () {
-        var client, result, _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    _b.trys.push([0, 3, , 4]);
-                    client = getClickHouseClient();
-                    return [4 /*yield*/, client.query({
-                            query: 'SELECT 1',
-                            format: 'JSONEachRow',
-                        })];
-                case 1:
-                    result = _b.sent();
-                    return [4 /*yield*/, result.json()];
-                case 2:
-                    _b.sent();
-                    return [2 /*return*/, true];
-                case 3:
-                    _a = _b.sent();
-                    return [2 /*return*/, false];
-                case 4: return [2 /*return*/];
-            }
+async function validateClickHouse() {
+    try {
+        const client = getClickHouseClient();
+        const result = await client.query({
+            query: 'SELECT 1',
+            format: 'JSONEachRow',
         });
-    });
+        await result.json();
+        return true;
+    }
+    catch {
+        return false;
+    }
 }
-function validateBigQuery() {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            // TODO: Implement when BigQuery support is added
-            return [2 /*return*/, false];
-        });
-    });
+async function validateBigQuery() {
+    // TODO: Implement when BigQuery support is added
+    return false;
 }
 /**
  * Get table count from database
  */
-export function getTableCount(dbType) {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (dbType) {
-                case 'clickhouse':
-                    return [2 /*return*/, getClickHouseTableCount()];
-                default:
-                    return [2 /*return*/, 0];
-            }
-            return [2 /*return*/];
-        });
-    });
+export async function getTableCount(dbType) {
+    switch (dbType) {
+        case 'clickhouse':
+            return getClickHouseTableCount();
+        default:
+            return 0;
+    }
 }
 /**
  * Generic helper to execute ClickHouse queries with consistent error handling
  */
-function executeClickHouseQuery(query, defaultValue) {
-    return __awaiter(this, void 0, void 0, function () {
-        var client, result, _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    _b.trys.push([0, 3, , 4]);
-                    client = getClickHouseClient();
-                    return [4 /*yield*/, client.query({
-                            query: query,
-                            format: 'JSONEachRow',
-                        })];
-                case 1:
-                    result = _b.sent();
-                    return [4 /*yield*/, result.json()];
-                case 2: return [2 /*return*/, (_b.sent())];
-                case 3:
-                    _a = _b.sent();
-                    return [2 /*return*/, defaultValue];
-                case 4: return [2 /*return*/];
-            }
+async function executeClickHouseQuery(query, defaultValue) {
+    try {
+        const client = getClickHouseClient();
+        const result = await client.query({
+            query,
+            format: 'JSONEachRow',
         });
-    });
+        return (await result.json());
+    }
+    catch {
+        return defaultValue;
+    }
 }
-function getClickHouseTableCount() {
-    return __awaiter(this, void 0, void 0, function () {
-        var tables;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, executeClickHouseQuery('SHOW TABLES', [])];
-                case 1:
-                    tables = _a.sent();
-                    return [2 /*return*/, Array.isArray(tables) ? tables.length : 0];
-            }
-        });
-    });
+async function getClickHouseTableCount() {
+    const tables = await executeClickHouseQuery('SHOW TABLES', []);
+    return Array.isArray(tables) ? tables.length : 0;
 }
 /**
  * Get list of tables from database
  */
-export function getTables(dbType) {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (dbType) {
-                case 'clickhouse':
-                    return [2 /*return*/, getClickHouseTables()];
-                default:
-                    return [2 /*return*/, []];
-            }
-            return [2 /*return*/];
-        });
-    });
+export async function getTables(dbType) {
+    switch (dbType) {
+        case 'clickhouse':
+            return getClickHouseTables();
+        default:
+            return [];
+    }
 }
-function getClickHouseTables() {
-    return __awaiter(this, void 0, void 0, function () {
-        var tables;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, executeClickHouseQuery('SHOW TABLES', [])];
-                case 1:
-                    tables = _a.sent();
-                    return [2 /*return*/, tables.map(function (t) { return t.name; })];
-            }
-        });
-    });
+async function getClickHouseTables() {
+    const tables = await executeClickHouseQuery('SHOW TABLES', []);
+    return tables.map(t => t.name);
 }

package/dist/utils/find-files.d.ts

@@ -2,10 +2,12 @@
  * Find the queries file in the project
  */
 export declare function findQueriesFile(customPath?: string): Promise<string | null>;
+export declare function findApiFileForPath(directory: string): Promise<string | null>;
 /**
  * Find the schema file (generated types)
  */
-export declare function findSchemaFile(): Promise<string | null>;
+export declare function findSchemaFile(directory?: string): Promise<string | null>;
+export declare function findDatasetsFile(directory?: string): Promise<string | null>;
 /**
  * Find the client file
  */

package/dist/utils/find-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find-files.d.ts","sourceRoot":"","sources":["../../src/utils/find-files.ts"],"names":[],"mappings":"AA+BA;;GAEG;AACH,wBAAsB,eAAe,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAcjF;AAED;;GAEG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAO7D;AAED;;GAEG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAO7D;AAED;;GAEG;AACH,wBAAsB,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,CAOnD;AAED;;GAEG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC,CAOrD"}
+{"version":3,"file":"find-files.d.ts","sourceRoot":"","sources":["../../src/utils/find-files.ts"],"names":[],"mappings":"AAmCA;;GAEG;AACH,wBAAsB,eAAe,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAcjF;AAED,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAKlF;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAW/E;AAED,wBAAsB,gBAAgB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAYjF;AAED;;GAEG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAO7D;AAED;;GAEG;AACH,wBAAsB,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,CAOnD;AAED;;GAEG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC,CAOrD"}

package/dist/utils/find-files.js

@@ -1,79 +1,30 @@
-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 { access } from 'node:fs/promises';
 import path from 'node:path';
 /**
  * Generic helper to find a file from a list of candidate paths
  */
-function findFile(candidates) {
-    return __awaiter(this, void 0, void 0, function () {
-        var _i, candidates_1, candidate, resolved, _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    _i = 0, candidates_1 = candidates;
-                    _b.label = 1;
-                case 1:
-                    if (!(_i < candidates_1.length)) return [3 /*break*/, 6];
-                    candidate = candidates_1[_i];
-                    resolved = path.resolve(process.cwd(), candidate);
-                    _b.label = 2;
-                case 2:
-                    _b.trys.push([2, 4, , 5]);
-                    return [4 /*yield*/, access(resolved)];
-                case 3:
-                    _b.sent();
-                    return [2 /*return*/, resolved];
-                case 4:
-                    _a = _b.sent();
-                    return [3 /*break*/, 5];
-                case 5:
-                    _i++;
-                    return [3 /*break*/, 1];
-                case 6: return [2 /*return*/, null];
-            }
-        });
-    });
+async function findFile(candidates) {
+    for (const candidate of candidates) {
+        const resolved = path.resolve(process.cwd(), candidate);
+        try {
+            await access(resolved);
+            return resolved;
+        }
+        catch {
+            // Continue checking
+        }
+    }
+    return null;
 }
 /**
  * Common query file locations to check
  */
-var DEFAULT_QUERY_PATHS = [
+const DEFAULT_API_PATHS = [
     'hypequery.ts',
+    'analytics/api.ts',
+    'src/analytics/api.ts',
+    'api.ts',
+    'src/api.ts',
     'analytics/queries.ts',
     'src/analytics/queries.ts',
     'queries.ts',
@@ -82,102 +33,85 @@ var DEFAULT_QUERY_PATHS = [
 /**
  * Find the queries file in the project
  */
-export function findQueriesFile(customPath) {
-    return __awaiter(this, void 0, void 0, function () {
-        var resolved, _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    if (!customPath) return [3 /*break*/, 4];
-                    resolved = path.resolve(process.cwd(), customPath);
-                    _b.label = 1;
-                case 1:
-                    _b.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, access(resolved)];
-                case 2:
-                    _b.sent();
-                    return [2 /*return*/, resolved];
-                case 3:
-                    _a = _b.sent();
-                    return [2 /*return*/, null];
-                case 4: 
-                // Check default locations
-                return [2 /*return*/, findFile(DEFAULT_QUERY_PATHS)];
-            }
-        });
-    });
+export async function findQueriesFile(customPath) {
+    // If custom path provided, check only that
+    if (customPath) {
+        const resolved = path.resolve(process.cwd(), customPath);
+        try {
+            await access(resolved);
+            return resolved;
+        }
+        catch {
+            return null;
+        }
+    }
+    // Check default locations
+    return findFile(DEFAULT_API_PATHS);
+}
+export async function findApiFileForPath(directory) {
+    return findFile([
+        path.join(directory, 'api.ts'),
+        path.join(directory, 'queries.ts'),
+    ]);
 }
 /**
  * Find the schema file (generated types)
  */
-export function findSchemaFile() {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            return [2 /*return*/, findFile([
-                    'analytics/schema.ts',
-                    'src/analytics/schema.ts',
-                    'schema.ts',
-                    'src/schema.ts',
-                ])];
-        });
-    });
+export async function findSchemaFile(directory) {
+    if (directory) {
+        return path.resolve(process.cwd(), directory, 'schema.ts');
+    }
+    return findFile([
+        'analytics/schema.ts',
+        'src/analytics/schema.ts',
+        'schema.ts',
+        'src/schema.ts',
+    ]);
+}
+export async function findDatasetsFile(directory) {
+    if (directory) {
+        return path.resolve(process.cwd(), directory, 'datasets.ts');
+    }
+    return findFile([
+        'analytics/datasets.ts',
+        'src/analytics/datasets.ts',
+        'datasets.ts',
+        'src/datasets.ts',
+        'src/datasets/generated.ts',
+    ]);
 }
 /**
  * Find the client file
  */
-export function findClientFile() {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            return [2 /*return*/, findFile([
-                    'analytics/client.ts',
-                    'src/analytics/client.ts',
-                    'client.ts',
-                    'src/client.ts',
-                ])];
-        });
-    });
+export async function findClientFile() {
+    return findFile([
+        'analytics/client.ts',
+        'src/analytics/client.ts',
+        'client.ts',
+        'src/client.ts',
+    ]);
 }
 /**
  * Check if .env file exists
  */
-export function hasEnvFile() {
-    return __awaiter(this, void 0, void 0, function () {
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    _b.trys.push([0, 2, , 3]);
-                    return [4 /*yield*/, access(path.join(process.cwd(), '.env'))];
-                case 1:
-                    _b.sent();
-                    return [2 /*return*/, true];
-                case 2:
-                    _a = _b.sent();
-                    return [2 /*return*/, false];
-                case 3: return [2 /*return*/];
-            }
-        });
-    });
+export async function hasEnvFile() {
+    try {
+        await access(path.join(process.cwd(), '.env'));
+        return true;
+    }
+    catch {
+        return false;
+    }
 }
 /**
  * Check if .gitignore exists
  */
-export function hasGitignore() {
-    return __awaiter(this, void 0, void 0, function () {
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    _b.trys.push([0, 2, , 3]);
-                    return [4 /*yield*/, access(path.join(process.cwd(), '.gitignore'))];
-                case 1:
-                    _b.sent();
-                    return [2 /*return*/, true];
-                case 2:
-                    _a = _b.sent();
-                    return [2 /*return*/, false];
-                case 3: return [2 /*return*/];
-            }
-        });
-    });
+export async function hasGitignore() {
+    try {
+        await access(path.join(process.cwd(), '.gitignore'));
+        return true;
+    }
+    catch {
+        return false;
+    }
 }

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,gBAkDrD;AAED,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,gBAkClD"}
+{"version":3,"file":"load-api.d.ts","sourceRoot":"","sources":["../../src/utils/load-api.ts"],"names":[],"mappings":"AAaA,wBAAsB,aAAa,CAAC,UAAU,EAAE,MAAM,gBA2DrD;AAED,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,gBAkClD"}