@quark-fw/clisma 0.1.8 → 0.1.9

package/dist/build-count-query.d.ts

@@ -1,4 +1,4 @@
-import { TableDefinition } from "./table.js";
+import { AnyTable } from "./table.js";
 import { WhereInput } from "./where.js";
 import { SQLBuildResult } from "./sql-shared.js";
-export declare function buildCountQuery(database: string, tableName: string, table: TableDefinition<any>, where?: WhereInput<any>): SQLBuildResult;
+export declare function buildCountQuery<T>(database: string, tableName: string, table: AnyTable, where?: WhereInput<T>): SQLBuildResult;

package/dist/build-delete-query.d.ts

@@ -1,4 +1,4 @@
-import { TableDefinition } from "./table.js";
+import { AnyTable } from "./table.js";
 import { WhereInput } from "./where.js";
 import { SQLBuildResult } from "./sql-shared.js";
-export declare function buildDeleteQuery(database: string, tableName: string, table: TableDefinition<any>, where?: WhereInput<any>): SQLBuildResult;
+export declare function buildDeleteQuery<T>(database: string, tableName: string, table: AnyTable, where?: WhereInput<T>): SQLBuildResult;

package/dist/build-find-many-query.d.ts

@@ -1,3 +1,3 @@
-import { TableDefinition } from "./table.js";
+import { AnyTable } from "./table.js";
 import { FindManyArgs, SQLBuildResult } from "./sql-shared.js";
-export declare function buildFindManyQuery(database: string, tableName: string, table: TableDefinition<any>, args?: FindManyArgs<any>): SQLBuildResult;
+export declare function buildFindManyQuery<T>(database: string, tableName: string, table: AnyTable, args?: FindManyArgs<T>): SQLBuildResult;

package/dist/build-find-many-query.js

@@ -5,7 +5,8 @@ export function buildFindManyQuery(database, tableName, table, args = {}) {
     // SELECT
     let selectSQL = "*";
     if (args.select) {
-        const keys = Object.keys(args.select).filter((k) => args.select[k] === true);
+        const select = args.select;
+        const keys = Object.keys(select).filter((k) => select[k] === true);
         if (keys.length) {
             selectSQL = keys.map(ctx.colRef).join(", ");
         }

package/dist/build-lightweight-delete-query.d.ts

@@ -1,4 +1,4 @@
-import { TableDefinition } from "./table.js";
+import { AnyTable } from "./table.js";
 import { WhereInput } from "./where.js";
 import { SQLBuildResult } from "./sql-shared.js";
-export declare function buildLightweightDeleteQuery(database: string, tableName: string, table: TableDefinition<any>, where?: WhereInput<any>): SQLBuildResult;
+export declare function buildLightweightDeleteQuery<T>(database: string, tableName: string, table: AnyTable, where?: WhereInput<T>): SQLBuildResult;

package/dist/build-update-query.d.ts

@@ -1,4 +1,4 @@
-import { TableDefinition } from "./table.js";
+import { AnyTable } from "./table.js";
 import { WhereInput } from "./where.js";
 import { SQLBuildResult } from "./sql-shared.js";
-export declare function buildUpdateQuery(database: string, tableName: string, table: TableDefinition<any>, where: WhereInput<any> | undefined, data: Record<string, any>): SQLBuildResult;
+export declare function buildUpdateQuery<T>(database: string, tableName: string, table: AnyTable, where: WhereInput<T> | undefined, data: Record<string, unknown>): SQLBuildResult;

package/dist/client.d.ts

@@ -1,5 +1,5 @@
 import { TableClient } from "./table-client.js";
-import { InferRow } from "./table.js";
+import { AnyTable, InferRow } from "./table.js";
 import { MigrationPlan } from "./migrate.js";
 type ClientOptions = {
     url: string;
@@ -10,7 +10,7 @@ type ClientOptions = {
 };
 export declare function createClient<TSchema extends {
     database?: string;
-    tables: Record<string, any>;
+    tables: Record<string, AnyTable>;
 }>(schema: TSchema, options: ClientOptions): { [K in keyof TSchema["tables"]]: TableClient<InferRow<TSchema["tables"][K]>>; } & {
     $init(): Promise<void>;
     $migrate(): Promise<MigrationPlan>;

package/dist/column.d.ts

@@ -3,7 +3,7 @@ export type Column<T> = {
     nullable: boolean;
     __type?: T;
 };
-type NullableColumn<C extends Column<any>> = C extends Column<infer T> ? Column<T | null> : never;
+type NullableColumn<C extends Column<unknown>> = C extends Column<infer T> ? Column<T | null> : never;
 export declare const t: {
     string: () => Column<string>;
     uint8: () => Column<number>;
@@ -11,7 +11,7 @@ export declare const t: {
     int32: () => Column<number>;
     boolean: () => Column<boolean>;
     datetime: () => Column<Date>;
-    nullable<C extends Column<any>>(col: C): NullableColumn<C>;
-    array<C extends Column<any>>(col: C): Column<C extends Column<infer T> ? T[] : never>;
+    nullable<C extends Column<unknown>>(col: C): NullableColumn<C>;
+    array<C extends Column<unknown>>(col: C): Column<C extends Column<infer T> ? T[] : never>;
 };
 export {};

package/dist/ddl.d.ts

@@ -1,2 +1,2 @@
-import { TableDefinition } from "./table.js";
-export declare function buildCreateTableSQL(database: string, tableName: string, table: TableDefinition<any>): string;
+import { AnyTable } from "./table.js";
+export declare function buildCreateTableSQL(database: string, tableName: string, table: AnyTable): string;

package/dist/ddl.js

@@ -2,9 +2,7 @@
 import { escapeId } from "./sql.js";
 export function buildCreateTableSQL(database, tableName, table) {
     const columnsSQL = Object.entries(table.columns)
-        .map(([name, col]) => {
-        return `${escapeId(name)} ${col.clickhouseType}`;
-    })
+        .map(([name, col]) => `${escapeId(name)} ${col.clickhouseType}`)
         .join(",\n");
     return `
     CREATE TABLE IF NOT EXISTS ${escapeId(database)}.${escapeId(tableName)}

package/dist/migrate.d.ts

@@ -1,4 +1,4 @@
-import { TableDefinition } from "./table.js";
+import { AnyTable } from "./table.js";
 export type DbColumn = {
     table: string;
     name: string;
@@ -8,4 +8,4 @@ export type MigrationPlan = {
     statements: string[];
     warnings: string[];
 };
-export declare function buildMigrationPlan(database: string, tables: Record<string, TableDefinition<any>>, existing: DbColumn[]): MigrationPlan;
+export declare function buildMigrationPlan(database: string, tables: Record<string, AnyTable>, existing: DbColumn[]): MigrationPlan;

package/dist/rows.d.ts

@@ -1,2 +1,2 @@
-import { Column } from "./column.js";
-export declare function deserializeRows<T>(rows: any[], columns: Record<string, Column<any>>): T[];
+import { AnyColumns } from "./table.js";
+export declare function deserializeRows<T>(rows: Record<string, unknown>[], columns: AnyColumns): T[];

package/dist/schema.d.ts

@@ -1,5 +1,6 @@
-export type ClismaSchema<TTables extends Record<string, any>> = {
+import { AnyTable } from "./table.js";
+export type ClismaSchema<TTables extends Record<string, AnyTable>> = {
     database?: string;
     tables: TTables;
 };
-export declare function createClisma<TTables extends Record<string, any>>(schema: ClismaSchema<TTables>): ClismaSchema<TTables>;
+export declare function createClisma<TTables extends Record<string, AnyTable>>(schema: ClismaSchema<TTables>): ClismaSchema<TTables>;

package/dist/sql-shared.d.ts

@@ -1,9 +1,8 @@
-import { Column } from "./column.js";
-import { TableDefinition } from "./table.js";
+import { AnyColumns, AnyTable } from "./table.js";
 import { WhereInput } from "./where.js";
 export type SQLBuildResult = {
     sql: string;
-    params: Record<string, any>;
+    params: Record<string, unknown>;
 };
 export type OrderByInput<T> = {
     [K in keyof T]?: "asc" | "desc";
@@ -19,13 +18,13 @@ export type FindManyArgs<T> = {
 };
 export declare function escapeId(name: string): string;
 export declare const NO_LIMIT = "18446744073709551615";
-export declare function createBuildContext(tableName: string, columns: Record<string, Column<any>>): {
-    params: Record<string, any>;
+export declare function createBuildContext(tableName: string, columns: AnyColumns): {
+    params: Record<string, unknown>;
     colRef: (key: string) => string;
     baseType: (key: string) => string;
-    addParam: (value: any, type: string) => string;
-    whereSQL: (where: any) => string;
+    addParam: (value: unknown, type: string) => string;
+    whereSQL: (where: Record<string, unknown>) => string;
 };
-export declare function tableRef(database: string, tableName: string, table: TableDefinition<any>): string;
-export declare function checkPagination(name: string, value: any): void;
-export declare function validateUpdateData(table: TableDefinition<any>, tableName: string, data: Record<string, any>): string[];
+export declare function tableRef(database: string, tableName: string, table: AnyTable): string;
+export declare function checkPagination(name: string, value: number): void;
+export declare function validateUpdateData(table: AnyTable, tableName: string, data: Record<string, unknown>): string[];

package/dist/sql-shared.js

@@ -99,7 +99,7 @@ export function createBuildContext(tableName, columns) {
             if (value === undefined)
                 continue;
             if (key === "AND") {
-                const list = Array.isArray(value) ? value : [value];
+                const list = (Array.isArray(value) ? value : [value]);
                 for (const w of list) {
                     const c = whereSQL(w);
                     if (c)
@@ -115,7 +115,7 @@ export function createBuildContext(tableName, columns) {
                     parts.push(`(${conds.join(" OR ")})`);
             }
             else if (key === "NOT") {
-                const list = Array.isArray(value) ? value : [value];
+                const list = (Array.isArray(value) ? value : [value]);
                 for (const w of list) {
                     const c = whereSQL(w);
                     if (c)

package/dist/table-client.d.ts

@@ -1,5 +1,5 @@
 import type { ClickHouseClient } from "@clickhouse/client";
-import { TableDefinition } from "./table.js";
+import { AnyTable } from "./table.js";
 import { Simplify } from "./types.js";
 import { WhereInput } from "./where.js";
 import { FindManyArgs } from "./sql.js";
@@ -15,12 +15,12 @@ type OptionalCreateKeys<T> = NullableKeys<T> | ("id" & keyof T);
 export type CreateData<T> = Simplify<Omit<T, OptionalCreateKeys<T>> & {
     [K in OptionalCreateKeys<T>]?: T[K];
 }>;
-export declare class TableClient<T> {
+export declare class TableClient<T extends Record<string, unknown>> {
     private database;
     private tableName;
     private table;
     private client;
-    constructor(database: string, tableName: string, table: TableDefinition<any>, client: ClickHouseClient);
+    constructor(database: string, tableName: string, table: AnyTable, client: ClickHouseClient);
     private get tableRef();
     private runQuery;
     findMany<A extends FindManyArgs<T>>(args?: A): Promise<FindManyResult<T, A>[]>;

package/dist/table-client.js

@@ -42,7 +42,10 @@ export class TableClient {
         return deserializeRows(rows, this.table.columns);
     }
     async findFirst(args) {
-        const rows = await this.findMany({ ...args, take: 1 });
+        const rows = await this.findMany({
+            ...args,
+            take: 1,
+        });
         return rows[0] ?? null;
     }
     async count(args) {
@@ -70,7 +73,8 @@ export class TableClient {
                     full[colName] = null;
                 }
                 else if (full[colName] instanceof Date) {
-                    full[colName] = new Date(Math.floor(full[colName].getTime() / 1000) * 1000);
+                    full[colName] = new Date(Math.floor(full[colName].getTime() / 1000) *
+                        1000);
                 }
             }
             const obj = {};

package/dist/table.d.ts

@@ -1,13 +1,15 @@
 import { Column } from "./column.js";
 import { Simplify } from "./types.js";
 export type MutationStrategy = "alter" | "lightweight" | "replacing";
-export type TableDefinition<TColumns extends Record<string, Column<any>>> = {
+export type TableDefinition<TColumns extends Record<string, Column<unknown>>> = {
     engine: string;
     orderBy: string[];
     mutations?: MutationStrategy;
     columns: TColumns;
 };
-export declare function table<TColumns extends Record<string, Column<any>>>(def: TableDefinition<TColumns>): TableDefinition<TColumns>;
+export type AnyColumns = Record<string, Column<unknown>>;
+export type AnyTable = TableDefinition<AnyColumns>;
+export declare function table<TColumns extends Record<string, Column<unknown>>>(def: TableDefinition<TColumns>): TableDefinition<TColumns>;
 export type InferRow<TTable> = TTable extends TableDefinition<infer TColumns> ? Simplify<{
     [K in keyof TColumns]: TColumns[K] extends Column<infer T> ? T : never;
 }> : never;

package/dist/where.d.ts

@@ -14,11 +14,11 @@ export type ScalarFilter<T> = {
     not?: T | null;
     in?: T[];
     notIn?: T[];
-} & (T extends number | bigint | Date | string ? ComparableFilter<T> : {}) & (T extends string ? StringFilter : {});
+} & (T extends number | bigint | Date | string ? ComparableFilter<T> : unknown) & (T extends string ? StringFilter : unknown);
 export type WhereInput<T> = {
     AND?: WhereInput<T> | WhereInput<T>[];
     OR?: WhereInput<T>[];
     NOT?: WhereInput<T> | WhereInput<T>[];
 } & {
-    [K in keyof T]?: T[K] extends readonly any[] ? never : T[K] | ScalarFilter<NonNullable<T[K]>> | null;
+    [K in keyof T]?: T[K] extends readonly unknown[] ? never : T[K] | ScalarFilter<NonNullable<T[K]>> | null;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@quark-fw/clisma",
-	"version": "0.1.8",
+	"version": "0.1.9",
 	"description": "Prisma-like typed client and schema migrator for ClickHouse",
 	"keywords": [
 		"clickhouse",