@hypequery/cli 1.1.2 → 1.2.0

package/README.md

@@ -45,11 +45,18 @@ It will:
 Options:
 
 - `--path <path>`: output directory, default `analytics/`
+- `--style <style>`: `queries` (default) or `datasets`
+- `--auth <mode>`: `none` (default) or `context`
+- `--all-tables`: with `--style datasets`, scaffold every table
+- `--tables <names>`: with `--style datasets`, scaffold these comma-separated tables
+- `--exclude-tables <names>`: with `--style datasets`, exclude these comma-separated tables
 - `--no-example`: skip the example query
 - `--no-interactive`: read connection details from env vars
 - `--force`: overwrite existing scaffold files
 - `--skip-connection`: skip testing the ClickHouse connection before scaffolding
 
+Set `HYPEQUERY_SKIP_INSTALL=1` to skip the automatic dependency install.
+
 ### `hypequery dev`
 
 Runs the local serve runtime with docs and hot reload.
@@ -62,10 +69,9 @@ Options:
 
 - `--port <port>`: default `4000`
 - `--hostname <host>`: default `localhost`
+- `--path <path>`: analytics directory to load (`<path>/api.ts` or `<path>/queries.ts`)
 - `--no-watch`: disable file watching
-- `--cache <provider>`: `memory`, `redis`, or `none`
 - `--open`: open the browser automatically
-- `--cors`: enable CORS
 - `--quiet`: reduce startup output
 
 The CLI understands TypeScript entry files directly, so `analytics/queries.ts` works without an extra runner.
@@ -81,9 +87,27 @@ npx hypequery generate
 Options:
 
 - `--output <path>`: default `analytics/schema.ts`
+- `--path <path>`: analytics directory (derives `<path>/schema.ts`)
 - `--tables <names>`: comma-separated table list
 - `--database <type>`: currently `clickhouse`
 
+`hypequery generate:types` is an alias for `hypequery generate`.
+
+### `hypequery generate:datasets`
+
+Generates dataset (semantic layer) definitions from ClickHouse.
+
+```bash
+npx hypequery generate:datasets
+```
+
+Options:
+
+- `--output <path>`: default `src/datasets/generated.ts`
+- `--path <path>`: analytics directory (derives `<path>/datasets.ts`)
+- `--tables <names>`: comma-separated table list
+- `--exclude-tables <names>`: comma-separated tables to exclude
+
 ## Non-interactive Setup
 
 `hypequery init --no-interactive` reads:

package/dist/bin/cli.js

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

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,QAAA,MAAM,OAAO,SAAgB,CAAC;AAE9B,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;EAKpE;AA6FD,OAAO,EAAE,OAAO,EAAE,CAAC"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,QAAA,MAAM,OAAO,SAAgB,CAAC;AAa9B,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;EAKpE;AAuHD,OAAO,EAAE,OAAO,EAAE,CAAC"}

package/dist/cli.js

@@ -1,95 +1,71 @@
-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 { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
 import { Command } from 'commander';
 import { initCommand } from './commands/init.js';
 import { devCommand } from './commands/dev.js';
 import { generateCommand } from './commands/generate.js';
-var program = new Command();
+import { generateDatasetsCommand } from './commands/generate-datasets.js';
+const program = new Command();
+function getCliVersion() {
+    try {
+        const pkg = JSON.parse(readFileSync(fileURLToPath(new URL('../package.json', import.meta.url)), 'utf8'));
+        return pkg.version ?? '0.0.0';
+    }
+    catch {
+        return '0.0.0';
+    }
+}
 export function normalizeInitOptions(options) {
-    return __assign(__assign({}, options), { noInteractive: options.noInteractive === true || options.interactive === false });
+    return {
+        ...options,
+        noInteractive: options.noInteractive === true || options.interactive === false,
+    };
 }
 program
     .name('hypequery')
     .description('Type-safe analytics layer for ClickHouse')
-    .version('0.0.1');
+    .version(getCliVersion());
+function runCommand(action) {
+    return async (...args) => {
+        try {
+            await action(...args);
+        }
+        catch (error) {
+            console.error(error instanceof Error ? error.message : error);
+            process.exit(1);
+        }
+    };
+}
+function addTypeGenerationOptions(command) {
+    return command
+        .description('Regenerate types from ClickHouse')
+        .option('-o, --output <path>', 'Output file (default: analytics/schema.ts)')
+        .option('--path <path>', 'Analytics directory (derives <path>/schema.ts)')
+        .option('--tables <names>', 'Only generate for specific tables (comma-separated)')
+        .option('--database <type>', 'Database driver to use (default: auto-detect)');
+}
 // Init command
 program
     .command('init')
     .description('Initialize a new hypequery project')
     .option('--path <path>', 'Output directory (default: analytics/)')
+    .option('--style <style>', 'Scaffold style: queries or datasets')
+    .option('--auth <mode>', 'Auth scaffold mode: none or context')
+    .option('--all-tables', 'Generate datasets for all discovered tables when using --style datasets')
+    .option('--tables <names>', 'Generate datasets for specific tables when using --style datasets (comma-separated)')
+    .option('--exclude-tables <names>', 'Exclude tables from dataset generation when using --style datasets (comma-separated)')
     .option('--no-example', 'Skip example query generation')
     .option('--no-interactive', 'Non-interactive mode (use env vars)')
     .option('--force', 'Overwrite existing files')
     .option('--skip-connection', 'Skip database connectivity test')
-    .action(function (options) { return __awaiter(void 0, void 0, void 0, function () {
-    var error_1;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                _a.trys.push([0, 2, , 3]);
-                return [4 /*yield*/, initCommand(normalizeInitOptions(options))];
-            case 1:
-                _a.sent();
-                return [3 /*break*/, 3];
-            case 2:
-                error_1 = _a.sent();
-                console.error(error_1 instanceof Error ? error_1.message : error_1);
-                process.exit(1);
-                return [3 /*break*/, 3];
-            case 3: return [2 /*return*/];
-        }
-    });
-}); });
+    .action(runCommand(async (options) => {
+    await initCommand(normalizeInitOptions(options));
+}));
 // Dev command
 program
     .command('dev [file]')
     .description('Start development server')
-    .option('-p, --port <port>', 'Port number', function (val) { return parseInt(val, 10); })
+    .option('-p, --port <port>', 'Port number', (val) => parseInt(val, 10))
     .option('-h, --hostname <host>', 'Host to bind (default: localhost)')
     .option('--no-watch', 'Disable file watching')
     .option('--no-cache', 'Disable caching')
@@ -97,64 +73,42 @@ program
     .option('--redis-url <url>', 'Redis connection URL')
     .option('--open', 'Open browser automatically')
     .option('--cors', 'Enable CORS')
+    .option('--path <path>', 'Analytics directory (loads <path>/api.ts or <path>/queries.ts)')
     .option('-q, --quiet', 'Suppress startup messages')
-    .action(function (file, options) { return __awaiter(void 0, void 0, void 0, function () {
-    var error_2;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                _a.trys.push([0, 2, , 3]);
-                return [4 /*yield*/, devCommand(file, options)];
-            case 1:
-                _a.sent();
-                return [3 /*break*/, 3];
-            case 2:
-                error_2 = _a.sent();
-                console.error(error_2 instanceof Error ? error_2.message : error_2);
-                process.exit(1);
-                return [3 /*break*/, 3];
-            case 3: return [2 /*return*/];
-        }
-    });
-}); });
+    .action(runCommand(async (file, options) => {
+    await devCommand(file, options);
+}));
 // Generate command
+addTypeGenerationOptions(program.command('generate'))
+    .action(runCommand(async (options) => {
+    await generateCommand(options);
+}));
+addTypeGenerationOptions(program.command('generate:types'))
+    .action(runCommand(async (options) => {
+    await generateCommand({ ...options, commandName: 'hypequery generate:types' });
+}));
 program
-    .command('generate')
-    .description('Regenerate types from ClickHouse')
-    .option('-o, --output <path>', 'Output file (default: analytics/schema.ts)')
+    .command('generate:datasets')
+    .description('Generate dataset definitions from ClickHouse schema')
+    .option('-o, --output <path>', 'Output file (default: src/datasets/generated.ts)')
+    .option('--path <path>', 'Analytics directory (derives <path>/datasets.ts)')
     .option('--tables <names>', 'Only generate for specific tables (comma-separated)')
-    .option('--database <type>', 'Database driver to use (default: auto-detect)')
-    .action(function (options) { return __awaiter(void 0, void 0, void 0, function () {
-    var error_3;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                _a.trys.push([0, 2, , 3]);
-                return [4 /*yield*/, generateCommand(options)];
-            case 1:
-                _a.sent();
-                return [3 /*break*/, 3];
-            case 2:
-                error_3 = _a.sent();
-                console.error(error_3 instanceof Error ? error_3.message : error_3);
-                process.exit(1);
-                return [3 /*break*/, 3];
-            case 3: return [2 /*return*/];
-        }
-    });
-}); });
+    .option('--exclude-tables <names>', 'Exclude specific tables (comma-separated)')
+    .action(runCommand(async (options) => {
+    await generateDatasetsCommand(options);
+}));
 // Help command
 program
     .command('help [command]')
     .description('Show help for command')
-    .action(function (command) {
+    .action((command) => {
     if (command) {
-        var cmd = program.commands.find(function (c) { return c.name() === command; });
+        const cmd = program.commands.find((c) => c.name() === command);
         if (cmd) {
             cmd.help();
         }
         else {
-            console.error("Unknown command: ".concat(command));
+            console.error(`Unknown command: ${command}`);
             process.exit(1);
         }
     }
@@ -163,13 +117,15 @@ program
     }
 });
 // Custom help
-program.on('--help', function () {
+program.on('--help', () => {
     console.log('');
     console.log('Examples:');
     console.log('  hypequery init');
     console.log('  hypequery dev');
     console.log('  hypequery dev --port 3000');
     console.log('  hypequery generate --output analytics/schema.ts');
+    console.log('  hypequery generate:types --output analytics/schema.ts');
+    console.log('  hypequery generate:datasets');
     console.log('');
     console.log('Docs: https://hypequery.com/docs');
 });

package/dist/commands/dev.d.ts

@@ -7,6 +7,7 @@ export interface DevOptions {
     redisUrl?: string;
     open?: boolean;
     cors?: boolean;
+    path?: string;
 }
 export declare function devCommand(file?: string, options?: DevOptions): Promise<void>;
 //# sourceMappingURL=dev.d.ts.map

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

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