@hypequery/cli 1.16.4 → 1.18.0

package/dist/bin/cli.js

@@ -1,11 +1,14 @@
 #!/usr/bin/env node
 import { program } from '../cli.js';
+import { envFiles } from '../utils/env-files.js';
 async function loadEnv() {
     try {
         const dotenvx = await import('@dotenvx/dotenvx');
         if (dotenvx?.config && typeof dotenvx.config.load === 'function') {
             await dotenvx.config.load();
-            return;
+            // Deliberately falls through to the dotenv cascade below. dotenvx has
+            // already set whatever it found, and dotenv will not overwrite it, so this
+            // only fills in files dotenvx does not read (notably `.env.local`).
         }
     }
     catch {
@@ -13,7 +16,10 @@ async function loadEnv() {
     }
     try {
         const { config } = await import('dotenv');
-        config();
+        for (const path of envFiles(process.env.NODE_ENV)) {
+            // Missing files are a no-op.
+            config({ path });
+        }
     }
     catch {
         // dotenv is optional; continue if not available

package/dist/cli.js

@@ -138,7 +138,7 @@ addTypeGenerationOptions(program.command('generate:types'))
 program
     .command('generate:datasets')
     .description('Generate dataset definitions from ClickHouse schema')
-    .option('-o, --output <path>', 'Output file (default: src/datasets/generated.ts)')
+    .option('-o, --output <path>', 'Output file (default: analytics/datasets.ts)')
     .option('--path <path>', 'Analytics directory (derives <path>/datasets.ts)')
     .option('--tables <names>', 'Only generate for specific tables (comma-separated)')
     .option('--exclude-tables <names>', 'Exclude specific tables (comma-separated)')

package/dist/commands/generate-datasets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-datasets.d.ts","sourceRoot":"","sources":["../../src/commands/generate-datasets.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AASH,MAAM,WAAW,uBAAuB;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAWD,wBAAsB,uBAAuB,CAAC,OAAO,GAAE,uBAA4B,iBA0FlF"}
+{"version":3,"file":"generate-datasets.d.ts","sourceRoot":"","sources":["../../src/commands/generate-datasets.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AASH,MAAM,WAAW,uBAAuB;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAqBD,wBAAsB,uBAAuB,CAAC,OAAO,GAAE,uBAA4B,iBA0GlF"}

package/dist/commands/generate-datasets.js

@@ -10,6 +10,15 @@ import { logger } from '../utils/logger.js';
 import { getTableCount } from '../utils/detect-database.js';
 import { generateDatasets } from '../generators/dataset-generator.js';
 import { redactConnectionUrl } from '../utils/redact-connection-url.js';
+/**
+ * Turns the written path into something pasteable into an import statement:
+ * strips the `.ts` extension and makes it explicitly relative.
+ */
+function toImportSpecifier(relativePath) {
+    const withoutExtension = relativePath.replace(/\.tsx?$/, '');
+    const normalized = withoutExtension.split(path.sep).join('/');
+    return normalized.startsWith('.') ? normalized : `./${normalized}`;
+}
 function parseTableList(value) {
     const parsed = value
         ?.split(',')
@@ -27,8 +36,9 @@ export async function generateDatasetsCommand(options = {}) {
         outputPath = path.resolve(process.cwd(), options.path, 'datasets.ts');
     }
     else {
-        // Default to src/datasets/generated.ts
-        outputPath = path.join(process.cwd(), 'src', 'datasets', 'generated.ts');
+        // Sibling of `hypequery generate`, which writes analytics/schema.ts. Keeping
+        // both commands in one directory is what the docs have always described.
+        outputPath = path.join(process.cwd(), 'analytics', 'datasets.ts');
     }
     const parsedTables = parseTableList(options.tables);
     const excludedTables = parseTableList(options.excludeTables);
@@ -39,30 +49,38 @@ export async function generateDatasetsCommand(options = {}) {
         // Get table count
         const tableCount = await getTableCount('clickhouse');
         spinner.succeed('Connected to ClickHouse');
-        logger.success(`Found ${tableCount} tables`);
+        logger.success(parsedTables
+            ? `Found ${tableCount} tables, filtering to ${parsedTables.length}`
+            : `Found ${tableCount} tables`);
         // Generate datasets
         const datasetSpinner = ora('Generating dataset definitions...').start();
-        await generateDatasets({
+        const generated = await generateDatasets({
             outputPath,
             includeTables: parsedTables,
             excludeTables: excludedTables,
         });
-        datasetSpinner.succeed(`Generated dataset definitions for ${parsedTables?.length || tableCount} tables`);
-        logger.success(`Created ${path.relative(process.cwd(), outputPath)}`);
+        const generatedTables = generated?.tables ?? parsedTables ?? [];
+        const generatedCount = generatedTables.length || tableCount;
+        datasetSpinner.succeed(`Generated dataset definitions for ${generatedCount} ${generatedCount === 1 ? 'table' : 'tables'}`);
+        const relativeOutput = path.relative(process.cwd(), outputPath);
+        logger.success(`Created ${relativeOutput}`);
         logger.newline();
         logger.header('Next steps:');
         logger.indent('1. Review and customize the generated datasets');
         logger.indent('2. Import datasets in your application code');
         logger.indent('3. Create an analytics client and start querying!');
         logger.newline();
+        // Built from what was actually written, so the snippet can be pasted as-is.
+        const importPath = toImportSpecifier(relativeOutput);
+        const firstTable = generatedTables[0] ?? 'orders';
         logger.info('Example usage:');
-        logger.indent('import { datasets } from \'./datasets/generated\';');
+        logger.indent(`import { datasets } from '${importPath}';`);
         logger.indent('import { createDatasetClient } from \'@hypequery/datasets\';');
         logger.indent('import { createQueryBuilder } from \'@hypequery/clickhouse\';');
         logger.indent('');
         logger.indent('const db = createQueryBuilder({ url, username, password, database });');
         logger.indent('const analytics = createDatasetClient({ queryBuilder: db });');
-        logger.indent('const rowCount = datasets.orders.metric(\'rowCount\', { measure: \'totalCount\' });');
+        logger.indent(`const rowCount = datasets['${firstTable}'].metric('rowCount', { measure: 'totalCount' });`);
         logger.indent('const result = await analytics.execute(rowCount);');
         logger.newline();
     }

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

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiC,KAAK,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAK/F,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAsB,eAAe,CAAC,OAAO,GAAE,eAAoB,iBAoJlE"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiC,KAAK,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAK/F,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAsB,eAAe,CAAC,OAAO,GAAE,eAAoB,iBA6JlE"}

package/dist/commands/generate.js

@@ -57,17 +57,22 @@ export async function generateCommand(options = {}) {
         // Get table count
         const tableCount = await getTableCount(dbType, { chdbPath });
         spinner.succeed(`Connected to ${dbType === 'clickhouse' ? 'ClickHouse' : dbType === 'chdb' ? 'embedded chDB' : dbType}`);
-        logger.success(`Found ${tableCount} tables`);
+        logger.success(parsedTables
+            ? `Found ${tableCount} tables, applying --tables filter`
+            : `Found ${tableCount} tables`);
         // Generate types
         const typeSpinner = ora('Generating types...').start();
         activeSpinner = typeSpinner;
         failureMessage = 'Failed to generate types';
-        await generator({
+        const generatedTables = await generator({
             outputPath,
             includeTables: parsedTables,
             chdbPath,
         });
-        typeSpinner.succeed(`Generated types for ${tableCount} tables`);
+        // The generator returns what it actually wrote after applying filters.
+        // Requested names may contain duplicates or tables that do not exist.
+        const generatedCount = generatedTables.length;
+        typeSpinner.succeed(`Generated types for ${generatedCount} ${generatedCount === 1 ? 'table' : 'tables'}`);
         logger.success(`Updated ${path.relative(process.cwd(), outputPath)}`);
         logger.newline();
         logger.header('Types regenerated successfully!');

package/dist/generators/chdb.d.ts

@@ -9,5 +9,5 @@ export interface ChdbGeneratorOptions {
  * DESCRIBE TABLE) is identical on the embedded engine — but the client seam
  * is backed by a chDB session instead of an HTTP connection.
  */
-export declare function generateChdbTypes(options: ChdbGeneratorOptions): Promise<void>;
+export declare function generateChdbTypes(options: ChdbGeneratorOptions): Promise<string[]>;
 //# sourceMappingURL=chdb.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"chdb.d.ts","sourceRoot":"","sources":["../../src/generators/chdb.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,oBAAoB,iBAUpE"}
+{"version":3,"file":"chdb.d.ts","sourceRoot":"","sources":["../../src/generators/chdb.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,oBAAoB,qBAUpE"}

package/dist/generators/chdb.js

@@ -13,5 +13,5 @@ export async function generateChdbTypes(options) {
         ...(options.includeTables ? { includeTables: options.includeTables } : {}),
         ...(options.excludeTables ? { excludeTables: options.excludeTables } : {}),
     };
-    await generateTypes(options.outputPath, generatorOptions);
+    return generateTypes(options.outputPath, generatorOptions);
 }

package/dist/generators/clickhouse.d.ts

@@ -5,5 +5,5 @@ export interface ClickHouseGeneratorOptions {
     excludeTables?: string[];
 }
 export { clickhouseToTsType };
-export declare function generateClickHouseTypes(options: ClickHouseGeneratorOptions): Promise<void>;
+export declare function generateClickHouseTypes(options: ClickHouseGeneratorOptions): Promise<string[]>;
 //# 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":"AAAA,OAAO,EACL,kBAAkB,EAGnB,MAAM,qBAAqB,CAAC;AAG7B,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAE9B,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,0BAA0B,iBAUhF"}
+{"version":3,"file":"clickhouse.d.ts","sourceRoot":"","sources":["../../src/generators/clickhouse.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGnB,MAAM,qBAAqB,CAAC;AAG7B,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAE9B,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,0BAA0B,qBAUhF"}

package/dist/generators/clickhouse.js

@@ -9,5 +9,5 @@ export async function generateClickHouseTypes(options) {
         ...(options.includeTables ? { includeTables: options.includeTables } : {}),
         ...(options.excludeTables ? { excludeTables: options.excludeTables } : {}),
     };
-    await generateTypes(options.outputPath, generatorOptions);
+    return generateTypes(options.outputPath, generatorOptions);
 }

package/dist/generators/dataset-generator.d.ts

@@ -14,5 +14,11 @@ export interface DatasetGeneratorOptions {
 /**
  * Generate dataset definitions from ClickHouse schema
  */
-export declare function generateDatasets(options: DatasetGeneratorOptions): Promise<void>;
+export declare function generateDatasets(options: DatasetGeneratorOptions): Promise<{
+    tables: string[];
+    exports: {
+        table: string;
+        exportName: string;
+    }[];
+}>;
 //# sourceMappingURL=dataset-generator.d.ts.map

package/dist/generators/dataset-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataset-generator.d.ts","sourceRoot":"","sources":["../../src/generators/dataset-generator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AAG1E,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,MAAM,CAAC,EAAE,8BAA8B,CAAC;CACzC;AAuPD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,iBAyDtE"}
+{"version":3,"file":"dataset-generator.d.ts","sourceRoot":"","sources":["../../src/generators/dataset-generator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AAG1E,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,MAAM,CAAC,EAAE,8BAA8B,CAAC;CACzC;AAuPD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,uBAAuB;;;;;;GAmEtE"}

package/dist/generators/dataset-generator.js

@@ -243,4 +243,13 @@ ${tables.map((table) => `  ${table.name}: ${tableToPascalCase(table.name)}Datase
     await fs.mkdir(outputDir, { recursive: true });
     // Write the file
     await fs.writeFile(path.resolve(options.outputPath), output);
+    // Returned so the CLI can report what it actually generated, and print an
+    // example that matches the file rather than a hardcoded placeholder.
+    return {
+        tables: tables.map((table) => table.name),
+        exports: tables.map((table) => ({
+            table: table.name,
+            exportName: `${tableToPascalCase(table.name)}Dataset`,
+        })),
+    };
 }

package/dist/generators/index.d.ts

@@ -2,7 +2,7 @@ import type { DatabaseType } from '../utils/detect-database.js';
 import type { ClickHouseGeneratorOptions } from './clickhouse.js';
 import type { ChdbGeneratorOptions } from './chdb.js';
 export type TypeGeneratorOptions = ClickHouseGeneratorOptions & ChdbGeneratorOptions;
-type GeneratorFn = (options: TypeGeneratorOptions) => Promise<void>;
+type GeneratorFn = (options: TypeGeneratorOptions) => Promise<string[]>;
 export declare function getTypeGenerator(dbType: DatabaseType): GeneratorFn;
 export {};
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/generators/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAEtD,MAAM,MAAM,oBAAoB,GAAG,0BAA0B,GAAG,oBAAoB,CAAC;AAErF,KAAK,WAAW,GAAG,CAAC,OAAO,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAiBpE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,WAAW,CAYlE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/generators/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAEtD,MAAM,MAAM,oBAAoB,GAAG,0BAA0B,GAAG,oBAAoB,CAAC;AAErF,KAAK,WAAW,GAAG,CAAC,OAAO,EAAE,oBAAoB,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;AAiBxE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,WAAW,CAYlE"}

package/dist/generators/index.js

@@ -5,11 +5,11 @@
 const generators = {
     clickhouse: async (options) => {
         const { generateClickHouseTypes } = await import('./clickhouse.js');
-        await generateClickHouseTypes(options);
+        return generateClickHouseTypes(options);
     },
     chdb: async (options) => {
         const { generateChdbTypes } = await import('./chdb.js');
-        await generateChdbTypes(options);
+        return generateChdbTypes(options);
     },
 };
 export function getTypeGenerator(dbType) {

package/dist/typegen/generate-types.d.ts

@@ -41,6 +41,7 @@ export declare function generateTypeDefinitions(client: TypeGenerationClickHouse
 /**
  * Generates TypeScript type definitions from the ClickHouse database schema and
  * writes them to `outputPath`, creating the containing directory if needed.
+ * Returns the names of the tables represented in the generated file.
  */
-export declare function generateTypes(outputPath: string, options: GenerateTypesOptions): Promise<void>;
+export declare function generateTypes(outputPath: string, options: GenerateTypesOptions): Promise<string[]>;
 //# sourceMappingURL=generate-types.d.ts.map

package/dist/typegen/generate-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-types.d.ts","sourceRoot":"","sources":["../../src/typegen/generate-types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAMH;;;GAGG;AACH,MAAM,WAAW,8BAA8B;IAC7C,KAAK,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,aAAa,CAAA;KAAE,GAAG,OAAO,CAAC;QAChE,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;KAChD,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,oBAAoB;IACnC,6EAA6E;IAC7E,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,wDAAwD;IACxD,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,qCAAqC;IACrC,MAAM,EAAE,8BAA8B,CAAC;IACvC,2DAA2D;IAC3D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yDAAyD;IACzD,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAqBD;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,8BAA8B,EACtC,OAAO,GAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAM,GACjD,OAAO,CAAC,MAAM,CAAC,CAsFjB;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAUpG"}
+{"version":3,"file":"generate-types.d.ts","sourceRoot":"","sources":["../../src/typegen/generate-types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAMH;;;GAGG;AACH,MAAM,WAAW,8BAA8B;IAC7C,KAAK,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,aAAa,CAAA;KAAE,GAAG,OAAO,CAAC;QAChE,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;KAChD,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,oBAAoB;IACnC,6EAA6E;IAC7E,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,wDAAwD;IACxD,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,qCAAqC;IACrC,MAAM,EAAE,8BAA8B,CAAC;IACvC,2DAA2D;IAC3D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yDAAyD;IACzD,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AA0HD;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,8BAA8B,EACtC,OAAO,GAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAM,GACjD,OAAO,CAAC,MAAM,CAAC,CAGjB;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,MAAM,EAAE,CAAC,CAYnB"}

package/dist/typegen/generate-types.js

@@ -29,7 +29,7 @@ async function describeTable(client, tableName) {
 /**
  * Generates the TypeScript type definition source from a ClickHouse client.
  */
-export async function generateTypeDefinitions(client, options = {}) {
+async function buildTypeDefinitions(client, options = {}) {
     const { includeTables = [], excludeTables = [], generatedBy = 'hypequery', includeUsageExample = true, } = options;
     // Get all tables
     const tablesQuery = await client.query({
@@ -61,8 +61,7 @@ export interface IntrospectedSchema {`;
         const columns = await describeTable(client, table.name);
         typeDefinitions += `\n  ${table.name}: {`;
         for (const column of columns) {
-            const clickHouseType = column.type.replace(/'/g, "\\'"); // Escape single quotes, e.g. `DateTime('UTC')`
-            typeDefinitions += `\n    '${column.name}': '${clickHouseType}';`;
+            typeDefinitions += `\n    '${column.name}': ${JSON.stringify(column.type)};`;
         }
         typeDefinitions += '\n  };';
     }
@@ -73,7 +72,7 @@ export interface IntrospectedSchema {`;
         const columns = await describeTable(client, table.name);
         typeDefinitions += `export interface ${capitalizeFirstLetter(table.name)}Record {`;
         for (const column of columns) {
-            const tsType = clickhouseToTsType(column.type).replace(/'/g, '');
+            const tsType = clickhouseToTsType(column.type);
             typeDefinitions += `\n  '${column.name}': ${tsType};`;
         }
         typeDefinitions += '\n}\n\n';
@@ -98,18 +97,30 @@ export interface IntrospectedSchema {`;
  */
 `;
     }
-    return typeDefinitions;
+    return {
+        contents: typeDefinitions,
+        tableNames: tables.map((table) => table.name),
+    };
+}
+/**
+ * Generates the TypeScript type definition source from a ClickHouse client.
+ */
+export async function generateTypeDefinitions(client, options = {}) {
+    const generated = await buildTypeDefinitions(client, options);
+    return generated.contents;
 }
 /**
  * Generates TypeScript type definitions from the ClickHouse database schema and
  * writes them to `outputPath`, creating the containing directory if needed.
+ * Returns the names of the tables represented in the generated file.
  */
 export async function generateTypes(outputPath, options) {
     const { client, ...definitionOptions } = options;
-    const typeDefinitions = await generateTypeDefinitions(client, definitionOptions);
+    const generated = await buildTypeDefinitions(client, definitionOptions);
     // Ensure the output directory exists
     const outputDir = path.dirname(path.resolve(outputPath));
     await fs.mkdir(outputDir, { recursive: true });
     // Write the file
-    await fs.writeFile(path.resolve(outputPath), typeDefinitions);
+    await fs.writeFile(path.resolve(outputPath), generated.contents);
+    return generated.tableNames;
 }

package/dist/typegen/type-parsing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type-parsing.d.ts","sourceRoot":"","sources":["../../src/typegen/type-parsing.ts"],"names":[],"mappings":"AAuGA;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,MAAM,KAAG,MAsCjD,CAAC"}
+{"version":3,"file":"type-parsing.d.ts","sourceRoot":"","sources":["../../src/typegen/type-parsing.ts"],"names":[],"mappings":"AAwLA;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,MAAM,KAAG,MA6CjD,CAAC"}

package/dist/typegen/type-parsing.js

@@ -2,7 +2,27 @@ function splitTopLevelArgs(value) {
     const parts = [];
     let current = '';
     let depth = 0;
+    let quote = null;
+    let escaped = false;
     for (const char of value) {
+        if (quote) {
+            current += char;
+            if (escaped) {
+                escaped = false;
+            }
+            else if (char === '\\') {
+                escaped = true;
+            }
+            else if (char === quote) {
+                quote = null;
+            }
+            continue;
+        }
+        if (char === "'" || char === '"' || char === '`') {
+            quote = char;
+            current += char;
+            continue;
+        }
         if (char === '(') {
             depth += 1;
             current += char;
@@ -25,6 +45,50 @@ function splitTopLevelArgs(value) {
     }
     return parts;
 }
+function decodeClickHouseEscape(char) {
+    switch (char) {
+        case 'b': return '\b';
+        case 'f': return '\f';
+        case 'n': return '\n';
+        case 'r': return '\r';
+        case 't': return '\t';
+        case '0': return '\0';
+        default: return char;
+    }
+}
+function parseBacktickTuplePart(part) {
+    let name = '';
+    let escaped = false;
+    for (let index = 1; index < part.length; index += 1) {
+        const char = part[index];
+        if (escaped) {
+            name += decodeClickHouseEscape(char);
+            escaped = false;
+            continue;
+        }
+        if (char === '\\') {
+            escaped = true;
+            continue;
+        }
+        if (char === '`') {
+            const type = part.slice(index + 1);
+            return /^\s+\S/s.test(type) ? { name, type: type.trim() } : null;
+        }
+        name += char;
+    }
+    return null;
+}
+function parseNamedTuplePart(value) {
+    const part = value.trim();
+    if (part.startsWith('`')) {
+        return parseBacktickTuplePart(part);
+    }
+    const match = /^([A-Za-z_][A-Za-z0-9_]*)\s+(.+)$/s.exec(part);
+    return match ? { name: match[1], type: match[2].trim() } : null;
+}
+function formatTypeScriptProperty(name) {
+    return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(name) ? name : JSON.stringify(name);
+}
 function unwrapType(type, wrapperName) {
     // Trim whitespace and handle case-insensitive matching
     const trimmedType = type.trim();
@@ -104,24 +168,31 @@ function getPrimitiveTsType(type) {
  * equivalent TypeScript type string.
  */
 export const clickhouseToTsType = (type) => {
-    const wrappedArrayType = unwrapType(type, 'Array');
+    const normalizedType = type.trim();
+    const wrappedArrayType = unwrapType(normalizedType, 'Array');
     if (wrappedArrayType) {
         return `Array<${clickhouseToTsType(wrappedArrayType)}>`;
     }
-    const wrappedNullableType = unwrapType(type, 'Nullable');
+    const wrappedNullableType = unwrapType(normalizedType, 'Nullable');
     if (wrappedNullableType) {
         return `${clickhouseToTsType(wrappedNullableType)} | null`;
     }
-    const wrappedLowCardinalityType = unwrapType(type, 'LowCardinality');
+    const wrappedLowCardinalityType = unwrapType(normalizedType, 'LowCardinality');
     if (wrappedLowCardinalityType) {
         return clickhouseToTsType(wrappedLowCardinalityType);
     }
-    const wrappedTupleType = unwrapType(type, 'Tuple');
+    const wrappedTupleType = unwrapType(normalizedType, 'Tuple');
     if (wrappedTupleType) {
         const tupleParts = splitTopLevelArgs(wrappedTupleType);
+        const namedParts = tupleParts.map(parseNamedTuplePart);
+        if (namedParts.length > 0 && namedParts.every((part) => part !== null)) {
+            return `{ ${namedParts
+                .map((part) => `${formatTypeScriptProperty(part.name)}: ${clickhouseToTsType(part.type)}`)
+                .join('; ')} }`;
+        }
         return `[${tupleParts.map((part) => clickhouseToTsType(part)).join(', ')}]`;
     }
-    const wrappedMapType = unwrapType(type, 'Map');
+    const wrappedMapType = unwrapType(normalizedType, 'Map');
     if (wrappedMapType) {
         const mapParts = splitTopLevelArgs(wrappedMapType);
         if (mapParts.length === 2) {
@@ -131,7 +202,7 @@ export const clickhouseToTsType = (type) => {
         }
         return 'Record<string, unknown>';
     }
-    const primitiveType = getPrimitiveTsType(type);
+    const primitiveType = getPrimitiveTsType(normalizedType);
     if (primitiveType)
         return primitiveType;
     // Unsupported or more complex ClickHouse types currently preserve the historical fallback.

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

@@ -0,0 +1,13 @@
+/**
+ * Env files the CLI loads, in precedence order, most specific first.
+ *
+ * This mirrors the cascade Next.js and Vite use. `dotenv` never overwrites a
+ * variable that is already set, so loading in this order means earlier entries
+ * win, and a real `process.env` value beats every file.
+ *
+ * `.env.local` matters in particular: it is the file those frameworks read, so
+ * without it a project could have working app credentials and a CLI that could
+ * not connect — with an error that never mentions the env file.
+ */
+export declare function envFiles(nodeEnv: string | undefined): string[];
+//# sourceMappingURL=env-files.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"env-files.d.ts","sourceRoot":"","sources":["../../src/utils/env-files.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,EAAE,CAO9D"}

package/dist/utils/env-files.js

@@ -0,0 +1,19 @@
+/**
+ * Env files the CLI loads, in precedence order, most specific first.
+ *
+ * This mirrors the cascade Next.js and Vite use. `dotenv` never overwrites a
+ * variable that is already set, so loading in this order means earlier entries
+ * win, and a real `process.env` value beats every file.
+ *
+ * `.env.local` matters in particular: it is the file those frameworks read, so
+ * without it a project could have working app credentials and a CLI that could
+ * not connect — with an error that never mentions the env file.
+ */
+export function envFiles(nodeEnv) {
+    return [
+        ...(nodeEnv ? [`.env.${nodeEnv}.local`] : []),
+        '.env.local',
+        ...(nodeEnv ? [`.env.${nodeEnv}`] : []),
+        '.env',
+    ];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypequery/cli",
-  "version": "1.16.4",
+  "version": "1.18.0",
   "description": "CLI for scaffolding type-safe ClickHouse analytics, semantic datasets, React manifests, and deployments",
   "keywords": [
     "clickhouse",
@@ -45,7 +45,7 @@
     "@vitest/coverage-v8": "^3.2.6",
     "typescript": "^5.7.3",
     "vitest": "^3.2.6",
-    "@hypequery/serve": "0.15.3"
+    "@hypequery/serve": "0.16.0"
   },
   "repository": {
     "type": "git",