@quark-fw/clisma 0.1.13 → 0.1.15

package/dist/table.d.ts

@@ -1,15 +1,37 @@
 import { Column } from "./column.js";
+import type { EngineSpec } from "./engine.js";
+import type { KeyPart } from "./expr.js";
 import { Simplify } from "./types.js";
 export type MutationStrategy = "alter" | "lightweight" | "replacing";
+export type IndexType = "bloom_filter" | "set" | "minmax" | "tokenbf_v1" | "ngrambf_v1";
+export type IndexDefinition = {
+    name: string;
+    expr: KeyPart;
+    type: IndexType;
+    args?: (number | string)[];
+    granularity?: number;
+};
 export type TableDefinition<TColumns extends Record<string, Column<unknown>>> = {
-    engine: string;
-    orderBy: string[];
+    engine: string | EngineSpec;
+    replication?: {
+        path: string;
+        replica: string;
+    };
+    orderBy: KeyPart[];
+    primaryKey?: KeyPart[];
+    partitionBy?: KeyPart;
+    sampleBy?: KeyPart;
+    indexes?: IndexDefinition[];
+    ttl?: string;
+    settings?: Record<string, string | number>;
+    comment?: string;
     mutations?: MutationStrategy;
     columns: 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<{
+export type InferColumns<TColumns extends Record<string, Column<unknown>>> = Simplify<{
     [K in keyof TColumns]: TColumns[K] extends Column<infer T> ? T : never;
-}> : never;
+}>;
+export type InferRow<TTable> = TTable extends TableDefinition<infer TColumns> ? InferColumns<TColumns> : never;

package/dist/table.js

@@ -1,9 +1,30 @@
 // src/table.ts
+import { collapsingOf, isReplacingEngine, keyColumns } from "./ddl-shared.js";
+const INTEGER_TYPE = /^(U?Int(8|16|32|64))$/;
 export function table(def) {
-    if (def.mutations === "replacing" &&
-        !def.engine.includes("ReplacingMergeTree")) {
+    if (def.mutations === "replacing" && !isReplacingEngine(def.engine)) {
         throw new Error(`mutations: "replacing" requires a ReplacingMergeTree engine ` +
-            `(got "${def.engine}")`);
+            `(got "${typeof def.engine === "string" ? def.engine : def.engine.family}")`);
+    }
+    // коллапс работает только с целочисленным знаком и версией — ошибка
+    // схемы должна всплыть при объявлении, а не при первом INSERT
+    const collapsing = collapsingOf(def.engine);
+    if (collapsing) {
+        const sign = def.columns[collapsing.sign];
+        if (!sign || sign.clickhouseType !== "Int8") {
+            throw new Error(`Collapsing engine requires sign column "${collapsing.sign}" of type Int8`);
+        }
+        if (collapsing.version) {
+            const version = def.columns[collapsing.version];
+            if (!version || !INTEGER_TYPE.test(version.clickhouseType)) {
+                throw new Error(`VersionedCollapsingMergeTree requires integer version column "${collapsing.version}"`);
+            }
+        }
+    }
+    for (const key of keyColumns([...def.orderBy, ...(def.primaryKey ?? [])])) {
+        if (!def.columns[key]) {
+            throw new Error(`Key column "${key}" is not declared in columns`);
+        }
     }
     return def;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@quark-fw/clisma",
-	"version": "0.1.13",
+	"version": "0.1.15",
 	"description": "Prisma-like typed client and schema migrator for ClickHouse",
 	"keywords": [
 		"clickhouse",
@@ -32,7 +32,7 @@
 		"build": "tsc -p tsconfig.build.json",
 		"typecheck": "tsc --noEmit",
 		"test": "tsx --env-file=./src/test/.env ./src/test/index.ts",
-		"test:unit": "tsx --test src/test/unit.test.ts",
+		"test:unit": "tsx --test src/test/unit.test.ts src/test/ddl.test.ts",
 		"prepublishOnly": "npm run typecheck && npm run test:unit && npm run build"
 	},
 	"dependencies": {