@hypequery/clickhouse 1.2.3 → 1.2.5

package/dist/cli/generate-types.js

@@ -118,7 +118,7 @@ export interface IntrospectedSchema {`;
     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}': '${clickHouseType}';`;
     }
     typeDefinitions += '\n  };';
   }
@@ -137,7 +137,7 @@ export interface IntrospectedSchema {`;
     typeDefinitions += `export interface ${capitalizeFirstLetter(table.name)}Record {`;
     for (const column of columns) {
       const tsType = clickhouseToTsType(column.type).replace(/'/g, '');
-      typeDefinitions += `\n  ${column.name}: ${tsType};`;
+      typeDefinitions += `\n  '${column.name}': ${tsType};`;
     }
     typeDefinitions += '\n}\n\n';
   }
@@ -148,7 +148,7 @@ export interface IntrospectedSchema {`;
  * Usage example:
  * 
  * import { createQueryBuilder } from '@hypequery/clickhouse';
- * import { IntrospectedSchema } from './path-to-this-file.js';
+ * import { IntrospectedSchema } from './path-to-this-file';
  * 
  * // Create a type-safe query builder
  * const db = createQueryBuilder<IntrospectedSchema>();

package/dist/cli/index.d.ts

@@ -1,2 +1,2 @@
 // CLI module type declarations
-export { generateTypes } from './generate-types'; 
+export { generateTypes } from './generate-types.js'; 

package/dist/core/connection.d.ts

@@ -1,7 +1,7 @@
 import type { ClickHouseSettings } from '@clickhouse/client-common';
 import type { ClickHouseClient as NodeClickHouseClient } from '@clickhouse/client';
 import type { ClickHouseClient as WebClickHouseClient } from '@clickhouse/client-web';
-import type { ClickHouseConfig } from './query-builder';
+import type { ClickHouseConfig } from './query-builder.js';
 type ClickHouseClient = NodeClickHouseClient | WebClickHouseClient;
 /**
  * The main entry point for connecting to a ClickHouse database.

package/dist/core/connection.js

@@ -1,5 +1,5 @@
 import { createClient as createNodeClient } from '@clickhouse/client';
-import { isClientConfig } from './query-builder.js';
+import { isClientConfig } from './query-builder';
 // Function to synchronously get the appropriate client
 function getClickHouseClientSync() {
     const isDev = process.env.NODE_ENV === 'development';

package/dist/core/cross-filter.js

@@ -1,4 +1,4 @@
-import { FilterValidator } from './validators/filter-validator.js';
+import { FilterValidator } from './validators/filter-validator';
 /**
  * A type-safe filter builder supporting both simple conditions and complex nested groups.
  * @template Schema - The full database schema type

package/dist/core/features/executor.js

@@ -1,6 +1,6 @@
-import { ClickHouseConnection } from '../connection.js';
-import { substituteParameters } from '../utils.js';
-import { logger } from '../utils/logger.js';
+import { ClickHouseConnection } from '../connection';
+import { substituteParameters } from '../utils';
+import { logger } from '../utils/logger';
 export class ExecutorFeature {
     constructor(builder) {
         this.builder = builder;

package/dist/core/query-builder.d.ts

@@ -1,8 +1,8 @@
-import { CrossFilter } from './cross-filter';
+import { CrossFilter } from './cross-filter.js';
 import { ColumnType, FilterOperator, OrderDirection, TableColumn, AggregationType, QueryConfig, OperatorValueMap, InferColumnType, PaginationOptions, PaginatedResult } from '../types';
-import { SQLFormatter } from './formatters/sql-formatter';
-import { JoinRelationships, JoinPathOptions } from './join-relationships';
-import { SqlExpression } from './utils/sql-expressions';
+import { SQLFormatter } from './formatters/sql-formatter.js';
+import { JoinRelationships, JoinPathOptions } from './join-relationships.js';
+import { SqlExpression } from './utils/sql-expressions.js';
 import type { ClickHouseSettings, BaseClickHouseClientConfigOptions } from '@clickhouse/client-common';
 import type { ClickHouseClient as NodeClickHouseClient } from '@clickhouse/client';
 import type { ClickHouseClient as WebClickHouseClient } from '@clickhouse/client-web';

package/dist/core/query-builder.js

@@ -1,14 +1,14 @@
-import { ClickHouseConnection } from './connection.js';
-import { SQLFormatter } from './formatters/sql-formatter.js';
-import { AggregationFeature } from './features/aggregations.js';
-import { JoinFeature } from './features/joins.js';
-import { FilteringFeature } from './features/filtering.js';
-import { AnalyticsFeature } from './features/analytics.js';
-import { ExecutorFeature } from './features/executor.js';
-import { QueryModifiersFeature } from './features/query-modifiers.js';
-import { FilterValidator } from './validators/filter-validator.js';
-import { PaginationFeature } from './features/pagination.js';
-import { CrossFilteringFeature } from './features/cross-filtering.js';
+import { ClickHouseConnection } from './connection';
+import { SQLFormatter } from './formatters/sql-formatter';
+import { AggregationFeature } from './features/aggregations';
+import { JoinFeature } from './features/joins';
+import { FilteringFeature } from './features/filtering';
+import { AnalyticsFeature } from './features/analytics';
+import { ExecutorFeature } from './features/executor';
+import { QueryModifiersFeature } from './features/query-modifiers';
+import { FilterValidator } from './validators/filter-validator';
+import { PaginationFeature } from './features/pagination';
+import { CrossFilteringFeature } from './features/cross-filtering';
 /**
  * Type guard to check if a config is a client-based configuration.
  */

package/dist/core/tests/index.d.ts

@@ -1,2 +1,2 @@
-export * from './test-utils';
+export * from './test-utils.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/core/tests/integration/setup.js

@@ -1,9 +1,9 @@
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { ClickHouseConnection } from '../../connection.js';
+import { ClickHouseConnection } from '../../connection';
 import { exec } from 'child_process';
 import { promisify } from 'util';
-import { logger as hypeQueryLogger } from '../../utils/logger.js';
+import { logger as hypeQueryLogger } from '../../utils/logger';
 // Disable the hypequery logger to prevent "logs after tests" errors
 // This must be done early in the setup, before any queries run
 hypeQueryLogger.configure({ enabled: false });

package/dist/core/tests/test-utils.js

@@ -1,4 +1,4 @@
-import { QueryBuilder } from '../query-builder.js';
+import { QueryBuilder } from '../query-builder';
 // Test data
 export const TEST_SCHEMAS = {
     test_table: {

package/dist/core/validators/filter-validator.js

@@ -1,4 +1,4 @@
-import { ValueValidator } from './value-validator.js';
+import { ValueValidator } from './value-validator';
 export class FilterValidator {
     static validateFilterCondition(condition, columnType, options = {}) {
         const { column, operator, value } = condition;

package/dist/index.d.ts

@@ -1,14 +1,14 @@
-export { createQueryBuilder, QueryBuilder } from './core/query-builder';
-export { ClickHouseConnection } from './core/connection';
-export { JoinRelationships } from './core/join-relationships';
-export type { ClickHouseConfig, ClickHouseClientConfig } from './core/query-builder';
-export { isClientConfig } from './core/query-builder';
-export type { TableSchema, QueryConfig, ColumnType, WhereExpression, GroupByExpression, TableRecord, DatabaseSchema, PaginatedResult, PageInfo, PaginationOptions } from './types/base';
-export type { JoinPath, JoinPathOptions } from './core/join-relationships';
-export { CrossFilter } from './core/cross-filter';
-export { logger } from './core/utils/logger';
-export { raw, rawAs, toDateTime, formatDateTime, toStartOfInterval, datePart, FormatDateTimeOptions } from './core/utils/sql-expressions';
-export type { SqlExpression, AliasedExpression } from './core/utils/sql-expressions';
+export { createQueryBuilder, QueryBuilder } from './core/query-builder.js';
+export { ClickHouseConnection } from './core/connection.js';
+export { JoinRelationships } from './core/join-relationships.js';
+export type { ClickHouseConfig, ClickHouseClientConfig } from './core/query-builder.js';
+export { isClientConfig } from './core/query-builder.js';
+export type { TableSchema, QueryConfig, ColumnType, WhereExpression, GroupByExpression, TableRecord, DatabaseSchema, PaginatedResult, PageInfo, PaginationOptions } from './types/base.js';
+export type { JoinPath, JoinPathOptions } from './core/join-relationships.js';
+export { CrossFilter } from './core/cross-filter.js';
+export { logger } from './core/utils/logger.js';
+export { raw, rawAs, toDateTime, formatDateTime, toStartOfInterval, datePart, FormatDateTimeOptions } from './core/utils/sql-expressions.js';
+export type { SqlExpression, AliasedExpression } from './core/utils/sql-expressions.js';
 //# sourceMappingURL=index.d.ts.map
 
 /**

package/dist/types/base.d.ts

@@ -1,5 +1,5 @@
-import { ClickHouseType, InferClickHouseType } from "./clickhouse-types";
-import { FilterOperator } from "./filters";
+import { ClickHouseType, InferClickHouseType } from "./clickhouse-types.js";
+import { FilterOperator } from "./filters.js";
 export interface QueryConfig<T, Schema> {
     select?: Array<keyof T | string>;
     where?: WhereCondition[];

package/dist/types/filters.d.ts

@@ -1,4 +1,4 @@
-import { TableColumn } from "./base";
+import { TableColumn } from "./base.js";
 export type FilterValue<T> = T extends Date ? Date | string : T extends number ? number : T extends string ? string : T extends boolean ? boolean : never;
 export type FilterCondition<T> = {
     eq: FilterValue<T>;

package/dist/types/index.d.ts

@@ -1,3 +1,3 @@
-export * from './base';
-export * from './filters';
+export * from './base.js';
+export * from './filters.js';
 //# sourceMappingURL=index.d.ts.map

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@hypequery/clickhouse",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "ClickHouse typescript query builder",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
   "license": "Apache-2.0",
   "scripts": {
-    "build": "npm run build:main && npm run build:cli && npm run fix-typedefs && npm run fix-esm-imports && npm run verify-build || npm run diagnose-ci",
+    "build": "npm run build:main && npm run build:cli && npm run fix-typedefs && npm run fix-dts-imports && npm run verify-build || npm run diagnose-ci",
     "build:main": "tsc --project tsconfig.json",
     "build:cli": "node scripts/ensure-core-files.js && node scripts/handle-cli-files.js",
-    "build:ci": "npm run build:main && node scripts/ensure-core-files.js && node scripts/handle-cli-files.js && npm run fix-typedefs && npm run fix-esm-imports && npm run verify-build || npm run diagnose-ci",
+    "build:ci": "npm run build:main && node scripts/ensure-core-files.js && node scripts/handle-cli-files.js && npm run fix-typedefs && npm run fix-dts-imports && npm run verify-build || npm run diagnose-ci",
     "fix-typedefs": "node scripts/fix-typedefs.js",
-    "fix-esm-imports": "node scripts/fix-esm-imports.js",
+    "fix-dts-imports": "node scripts/fix-dts-imports.js",
     "verify-build": "node scripts/verify-build.js",
     "diagnose-ci": "node scripts/diagnose-ci.js",
     "dev": "tsc --watch",
@@ -60,6 +60,7 @@
     "@semantic-release/release-notes-generator": "^12.1.0",
     "@types/jest": "^29.5.11",
     "@types/node": "^18.19.80",
+    "glob": "^11.0.3",
     "jest": "^29.7.0",
     "jest-esbuild": "^0.3.0",
     "semantic-release": "^23.0.2",