@hypequery/cli 1.13.0 → 1.13.1

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAyBpC,QAAA,MAAM,OAAO,SAAgB,CAAC;AAa9B,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;EAKpE;AAsND,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;AA0BpC,QAAA,MAAM,OAAO,SAAgB,CAAC;AAa9B,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;EAKpE;AA4ND,OAAO,EAAE,OAAO,EAAE,CAAC"}

package/dist/cli.js

@@ -9,6 +9,7 @@ import { generateManifestCommand } from './commands/generate-manifest.js';
 import { buildDeploymentCommand, prepareDeploymentReleaseCommand, validateDeploymentCommand, } from './commands/deployment.js';
 import { deployCommand, submitDeploymentCommand, } from './commands/deploy.js';
 import { loginCommand, logoutCommand, } from './commands/login.js';
+import { isPromptCancelled } from './utils/prompts.js';
 const program = new Command();
 function getCliVersion() {
     try {
@@ -48,6 +49,12 @@ function runCommand(action) {
             await action(...args);
         }
         catch (error) {
+            // Ctrl+C at a prompt is a deliberate abort, not a failure: report it as
+            // the interrupt it is instead of dumping an error and exiting 1.
+            if (isPromptCancelled(error)) {
+                console.log('\nCancelled.');
+                process.exit(130);
+            }
             console.error(error instanceof Error ? error.message : error);
             process.exit(1);
         }

package/dist/utils/dependency-installer.d.ts

@@ -1,5 +1,6 @@
 type ScaffoldStyle = 'queries' | 'datasets';
 type ScaffoldDatabase = 'clickhouse' | 'chdb';
+export declare function isCanaryVersion(version: string | undefined): boolean;
 export declare function resolveScaffoldPackages(cliVersion: string | undefined, style?: ScaffoldStyle, database?: ScaffoldDatabase): string[];
 export declare function installScaffoldDependencies(style?: ScaffoldStyle, database?: ScaffoldDatabase): Promise<void>;
 export declare const installServeDependencies: typeof installScaffoldDependencies;

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":"AAWA,KAAK,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC;AAC5C,KAAK,gBAAgB,GAAG,YAAY,GAAG,MAAM,CAAC;AA0F9C,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,KAAK,GAAE,aAAyB,EAChC,QAAQ,GAAE,gBAA+B,GACxC,MAAM,EAAE,CAmBV;AAsBD,wBAAsB,2BAA2B,CAC/C,KAAK,GAAE,aAAyB,EAChC,QAAQ,GAAE,gBAA+B,iBAwD1C;AAED,eAAO,MAAM,wBAAwB,oCAA8B,CAAC"}
+{"version":3,"file":"dependency-installer.d.ts","sourceRoot":"","sources":["../../src/utils/dependency-installer.ts"],"names":[],"mappings":"AAWA,KAAK,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC;AAC5C,KAAK,gBAAgB,GAAG,YAAY,GAAG,MAAM,CAAC;AAwE9C,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAEpE;AAqCD,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,KAAK,GAAE,aAAyB,EAChC,QAAQ,GAAE,gBAA+B,GACxC,MAAM,EAAE,CAmBV;AAsBD,wBAAsB,2BAA2B,CAC/C,KAAK,GAAE,aAAyB,EAChC,QAAQ,GAAE,gBAA+B,iBAyD1C;AAED,eAAO,MAAM,wBAAwB,oCAA8B,CAAC"}

package/dist/utils/dependency-installer.js

@@ -68,26 +68,44 @@ function detectPackageManager(pkgJson) {
         return 'bun';
     return 'npm';
 }
-function getInstallArgs(manager, packages) {
+export function isCanaryVersion(version) {
+    return version?.includes('canary') === true;
+}
+/**
+ * Canary builds pin every hypequery package to a `0.0.0-canary-*` version, which
+ * sorts below every published semver range. Any third-party peer range on a
+ * hypequery package is therefore unsatisfiable — `chdb` declares
+ * `peerOptional @hypequery/clickhouse@">=2.1.2"` — and npm aborts the whole
+ * install with ERESOLVE, leaving the scaffold without its dependencies.
+ *
+ * Only npm needs this: pnpm (strict-peer-dependencies defaults to false), yarn
+ * and bun all install through peer conflicts rather than failing. Stable
+ * installs keep strict peer checking on every manager.
+ */
+function getPeerRelaxFlags(manager, canary) {
+    return canary && manager === 'npm' ? ['--legacy-peer-deps'] : [];
+}
+function getInstallArgs(manager, packages, canary = false) {
+    const relaxFlags = getPeerRelaxFlags(manager, canary);
     switch (manager) {
         case 'pnpm':
-            return ['add', ...packages];
+            return ['add', ...relaxFlags, ...packages];
         case 'yarn':
-            return ['add', ...packages];
+            return ['add', ...relaxFlags, ...packages];
         case 'bun':
-            return ['add', ...packages];
+            return ['add', ...relaxFlags, ...packages];
         case 'npm':
         default:
-            return ['install', ...packages];
+            return ['install', ...relaxFlags, ...packages];
     }
 }
-function formatManualCommand(manager, packages) {
-    return `${MANUAL_COMMANDS[manager]} ${packages.join(' ')}`;
+function formatManualCommand(manager, packages, canary = false) {
+    return [MANUAL_COMMANDS[manager], ...getPeerRelaxFlags(manager, canary), ...packages].join(' ');
 }
 export function resolveScaffoldPackages(cliVersion, style = 'queries', database = 'clickhouse') {
     const includeDatasets = style === 'datasets';
     const includeChdb = database === 'chdb';
-    if (cliVersion?.includes('canary')) {
+    if (isCanaryVersion(cliVersion)) {
         return [
             `@hypequery/clickhouse@${cliVersion}`,
             `@hypequery/serve@${cliVersion}`,
@@ -141,9 +159,10 @@ export async function installScaffoldDependencies(style = 'queries', database =
     if (missing.length === 0) {
         return;
     }
+    const canary = isCanaryVersion(cliPkgJson?.version);
     const manager = detectPackageManager(pkgJson);
     const command = manager === 'npm' ? 'npm' : manager;
-    const args = getInstallArgs(manager, missing);
+    const args = getInstallArgs(manager, missing, canary);
     logger.info(`Installing ${missing.join(', ')} with ${manager}...`);
     try {
         await new Promise((resolve, reject) => {
@@ -165,7 +184,7 @@ export async function installScaffoldDependencies(style = 'queries', database =
     }
     catch (error) {
         logger.warn('Failed to install hypequery packages automatically.');
-        logger.info(`Run manually: ${formatManualCommand(manager, missing)}`);
+        logger.info(`Run manually: ${formatManualCommand(manager, missing, canary)}`);
         if (error instanceof Error && error.message) {
             logger.info(error.message);
         }

package/dist/utils/prompts.d.ts

@@ -1,3 +1,10 @@
+/**
+ * Raised when the user aborts a prompt with Ctrl+C or Esc.
+ */
+export declare class PromptCancelledError extends Error {
+    constructor();
+}
+export declare function isPromptCancelled(error: unknown): error is PromptCancelledError;
 /**
  * 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":"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,CAyCR;AAED,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG,MAAM,CAAC;AAEjD;;GAEG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,YAAY,CAAC,CAahE;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA4BrE;AAED;;GAEG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CA6B7D;AAED,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,UAAU,CAAC;AAE/C,wBAAsB,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,CAa1D;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,SAAS,CAAC;AAE9C;;GAEG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,YAAY,CAAC,CAahE;AAED;;GAEG;AACH,wBAAsB,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CASnF;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,2BAA2B,CAC/C,MAAM,EAAE,MAAM,EAAE,EAChB,aAAa,GAAE,MAAM,EAAO,GAC3B,OAAO,CAAC,MAAM,EAAE,CAAC,CA2BnB;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":"AAGA;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,KAAK;;CAK9C;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,oBAAoB,CAE/E;AA8BD;;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,CAyCR;AAED,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG,MAAM,CAAC;AAEjD;;GAEG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,YAAY,CAAC,CAahE;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA4BrE;AAED;;GAEG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CA6B7D;AAED,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,UAAU,CAAC;AAE/C,wBAAsB,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,CAa1D;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,SAAS,CAAC;AAE9C;;GAEG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,YAAY,CAAC,CAahE;AAED;;GAEG;AACH,wBAAsB,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CASnF;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,2BAA2B,CAC/C,MAAM,EAAE,MAAM,EAAE,EAChB,aAAa,GAAE,MAAM,EAAO,GAC3B,OAAO,CAAC,MAAM,EAAE,CAAC,CA2BnB;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

@@ -1,13 +1,44 @@
 import prompts from 'prompts';
 import { logger } from './logger.js';
-const noop = () => undefined;
-// Configure prompts to not exit on cancel
-prompts.override({ onCancel: noop });
+/**
+ * Raised when the user aborts a prompt with Ctrl+C or Esc.
+ */
+export class PromptCancelledError extends Error {
+    constructor() {
+        super('Prompt cancelled');
+        this.name = 'PromptCancelledError';
+    }
+}
+export function isPromptCancelled(error) {
+    return error instanceof PromptCancelledError;
+}
+/**
+ * Ask a question and turn an aborted prompt into a thrown PromptCancelledError.
+ *
+ * `prompts` only reports cancellation through the `onCancel` callback passed as
+ * its second argument — the resolved answers simply omit the cancelled key. So
+ * without this wrapper Ctrl+C is indistinguishable from an unanswered question,
+ * and each caller's `?? default` silently answers on the user's behalf.
+ */
+async function ask(questions) {
+    let cancelled = false;
+    const answers = await prompts(questions, {
+        onCancel: () => {
+            cancelled = true;
+            // Returning false stops any remaining questions in the same chain.
+            return false;
+        },
+    });
+    if (cancelled) {
+        throw new PromptCancelledError();
+    }
+    return answers;
+}
 /**
  * Prompt for ClickHouse connection details
  */
 export async function promptClickHouseConnection() {
-    const hostResponse = await prompts({
+    const hostResponse = await ask({
         type: 'text',
         name: 'host',
         message: 'ClickHouse URL (or skip to configure later):',
@@ -18,7 +49,7 @@ export async function promptClickHouseConnection() {
     if (!hostResponse.host) {
         return null;
     }
-    const credentials = await prompts([
+    const credentials = await ask([
         {
             type: 'text',
             name: 'database',
@@ -49,7 +80,7 @@ export async function promptClickHouseConnection() {
  * Choose between a remote ClickHouse server and embedded chDB.
  */
 export async function promptInitDatabase() {
-    const response = await prompts({
+    const response = await ask({
         type: 'select',
         name: 'database',
         message: 'Choose your database',
@@ -67,7 +98,7 @@ export async function promptInitDatabase() {
  * or undefined for in-memory.
  */
 export async function promptChdbStorage() {
-    const response = await prompts({
+    const response = await ask({
         type: 'select',
         name: 'storage',
         message: 'Where should embedded chDB store data?',
@@ -82,7 +113,7 @@ export async function promptChdbStorage() {
         return undefined;
     }
     if (response.storage === 'custom') {
-        const customResponse = await prompts({
+        const customResponse = await ask({
             type: 'text',
             name: 'path',
             message: 'Enter chDB data directory:',
@@ -96,7 +127,7 @@ export async function promptChdbStorage() {
  * Prompt for output directory
  */
 export async function promptOutputDirectory() {
-    const response = await prompts({
+    const response = await ask({
         type: 'select',
         name: 'directory',
         message: 'Where should we create your analytics files?',
@@ -111,7 +142,7 @@ export async function promptOutputDirectory() {
         return 'analytics'; // Default fallback
     }
     if (response.directory === 'custom') {
-        const customResponse = await prompts({
+        const customResponse = await ask({
             type: 'text',
             name: 'path',
             message: 'Enter custom path:',
@@ -122,7 +153,7 @@ export async function promptOutputDirectory() {
     return response.directory;
 }
 export async function promptInitStyle() {
-    const response = await prompts({
+    const response = await ask({
         type: 'select',
         name: 'style',
         message: 'Choose your dev API style',
@@ -138,7 +169,7 @@ export async function promptInitStyle() {
  * Choose whether generated routes include request-context auth scaffolding.
  */
 export async function promptInitAuthMode() {
-    const response = await prompts({
+    const response = await ask({
         type: 'select',
         name: 'auth',
         message: 'Choose authentication scaffolding',
@@ -154,7 +185,7 @@ export async function promptInitAuthMode() {
  * Confirm scaffolding when init is run outside a Node project.
  */
 export async function confirmWithoutPackageJson(directory) {
-    const response = await prompts({
+    const response = await ask({
         type: 'confirm',
         name: 'continue',
         message: `package.json was not found in ${directory}. Continue scaffolding here?`,
@@ -166,7 +197,7 @@ export async function confirmWithoutPackageJson(directory) {
  * Prompt for example query generation
  */
 export async function promptGenerateExample() {
-    const response = await prompts({
+    const response = await ask({
         type: 'confirm',
         name: 'generate',
         message: 'Generate an example query?',
@@ -191,7 +222,7 @@ export async function promptTableSelection(tables) {
         ...tables.slice(0, 10).map(table => ({ title: table, value: table })),
         { title: 'Skip example', value: null },
     ];
-    const response = await prompts({
+    const response = await ask({
         type: 'select',
         name: 'table',
         message: 'Which table should we use for the example?',
@@ -214,7 +245,7 @@ export async function promptDatasetTableSelection(tables, defaultTables = []) {
         logger.newline();
     }
     const defaults = new Set(defaultTables);
-    const response = await prompts({
+    const response = await ask({
         type: 'multiselect',
         name: 'tables',
         message: 'Which tables should we scaffold as datasets?',
@@ -232,7 +263,7 @@ export async function promptDatasetTableSelection(tables, defaultTables = []) {
  * Confirm overwrite of existing files
  */
 export async function confirmOverwrite(files) {
-    const response = await prompts({
+    const response = await ask({
         type: 'confirm',
         name: 'overwrite',
         message: `The following files will be overwritten:\n${files.map(f => `  • ${f}`).join('\n')}\n\nContinue?`,
@@ -244,7 +275,7 @@ export async function confirmOverwrite(files) {
  * Retry prompt for failed operations
  */
 export async function promptRetry(message) {
-    const response = await prompts({
+    const response = await ask({
         type: 'confirm',
         name: 'retry',
         message,
@@ -256,7 +287,7 @@ export async function promptRetry(message) {
  * Ask if user wants to continue without DB connection
  */
 export async function promptContinueWithoutDb() {
-    const response = await prompts({
+    const response = await ask({
         type: 'confirm',
         name: 'continue',
         message: 'Continue setup without database connection?',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypequery/cli",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "Command-line interface for hypequery",
   "license": "Apache-2.0",
   "type": "module",
@@ -19,8 +19,8 @@
     "open": "^10.0.0",
     "ora": "^8.0.1",
     "prompts": "^2.4.2",
-    "@hypequery/deployment": "0.6.0",
-    "@hypequery/protocol": "0.9.0"
+    "@hypequery/protocol": "0.9.0",
+    "@hypequery/deployment": "0.6.0"
   },
   "optionalDependencies": {
     "@napi-rs/keyring": "1.3.0"