@cuboapp/api-backend 3.0.16 → 4.0.0

package/dist/query/types.d.ts

@@ -0,0 +1,78 @@
+/**
+ * Типизированный query-DSL.
+ *
+ * Поверх «строкового» DSL движка (`status_id=in:1,2`) строится полностью
+ * типизированный слой: операторы (`not/gte/lte/in/between/...`), типизированный
+ * `with` со вложенными связями и типизированные фильтры по вложенным сущностям.
+ *
+ * Сам объект `Query<R>` иммутабелен по построению — он компилируется в новый
+ * plain-object запроса на каждый вызов (см. ./compile).
+ */
+/** Скалярные значения колонок. */
+export type CuboScalar = string | number | boolean | Date | null;
+/** Снимаем массив/optional, чтобы добраться до строки связанной сущности. */
+export type CuboRelatedRow<X> = NonNullable<X> extends (infer U)[] ? U : NonNullable<X>;
+/** Ключи-скаляры (обычные колонки). */
+export type CuboScalarKeys<R> = {
+    [K in keyof R]-?: NonNullable<R[K]> extends CuboScalar ? K : never;
+}[keyof R];
+/** Ключи-связи (объект или массив объектов — связанные сущности). */
+export type CuboRelationKeys<R> = Exclude<keyof R, CuboScalarKeys<R>>;
+/**
+ * Операторы для скалярного поля. Допускается как «короткая» форма (просто
+ * значение = eq), так и объект операторов. `not` — рекурсивный (`not: { in: [...] }`).
+ */
+export type CuboOp<V> = V | {
+    eq?: V;
+    ne?: V;
+    gt?: NonNullable<V>;
+    gte?: NonNullable<V>;
+    lt?: NonNullable<V>;
+    lte?: NonNullable<V>;
+    in?: NonNullable<V>[];
+    nin?: NonNullable<V>[];
+    like?: string;
+    ilike?: string;
+    between?: [NonNullable<V>, NonNullable<V>];
+    isNull?: boolean;
+    not?: CuboOp<V>;
+};
+/**
+ * Условие выборки: скалярные поля принимают операторы, поля-связи —
+ * вложенный `Where` по связанной сущности (типизированно и рекурсивно).
+ */
+export type CuboWhere<R> = {
+    [K in CuboScalarKeys<R>]?: CuboOp<R[K]>;
+} & {
+    [K in CuboRelationKeys<R>]?: CuboWhere<CuboRelatedRow<R[K]>>;
+};
+/** Узел типизированного `with` — список ключей или дерево с вложенными `with`/`where`. */
+export type CuboWithNode<R> = {
+    [K in CuboRelationKeys<R>]?: true | {
+        where?: CuboWhere<CuboRelatedRow<R[K]>>;
+        with?: CuboWith<CuboRelatedRow<R[K]>>;
+    };
+};
+/** Типизированный eager-load: массив ключей связей или дерево. */
+export type CuboWith<R> = (CuboRelationKeys<R> & string)[] | CuboWithNode<R>;
+/** Сортировка: объект `{ field: 'asc' | 'desc' }` или строка `-field`. */
+export type CuboSort<R> = {
+    [K in CuboScalarKeys<R>]?: 'asc' | 'desc';
+} | `${'-' | ''}${CuboScalarKeys<R> & string}`;
+/** Полный типизированный запрос для сущности со строкой `R`. */
+export type CuboQuery<R> = {
+    where?: CuboWhere<R>;
+    with?: CuboWith<R>;
+    sort?: CuboSort<R> | CuboSort<R>[];
+    limit?: number;
+    page?: number;
+    withDeleted?: boolean;
+};
+/** Плоский «строковый» запрос движка (то, что уходит в CuboCrudRequest.query). */
+export type CuboCompiledQuery = Record<string, any> & {
+    with?: string;
+    sort?: string;
+    limit?: number;
+    page?: number;
+};
+//# sourceMappingURL=types.d.ts.map

package/dist/query/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/query/types.ts"],"names":[],"mappings":"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"}

package/dist/types/basic.d.ts

@@ -0,0 +1,60 @@
+import { type Transaction } from '@cuboapp/database';
+import { CuboEntity, CuboEntityField } from '@cuboapp/types';
+import { CUBO_CRUD_ACTION } from '../constants';
+export type CuboCrudAction = (typeof CUBO_CRUD_ACTION)[number];
+export type CuboCrudWith = {
+    entity: CuboEntity | {
+        id: undefined;
+        alias: string;
+        fields: CuboEntityField[];
+    };
+    key: string;
+    full_key: string;
+    table_name: string;
+};
+export type CuboCrudQueryDefaults = {
+    query?: string;
+    sort?: string;
+    limit?: number;
+    page?: number;
+};
+export type CuboCrudRequest = {
+    headers?: Record<string, any>;
+    query?: Record<string, any>;
+    params?: Record<string, any>;
+    body?: any;
+};
+export type CuboCrudOptions = {
+    performer_id?: string;
+    transaction?: Transaction;
+};
+export type CuboCrudDto = {
+    entity: CuboEntity;
+    request: CuboCrudRequest;
+    options: CuboCrudOptions;
+    state: any;
+};
+export type CuboCrudFindQuery = {
+    selects: string[];
+    conditions: string[];
+    havings: string[];
+    replacements: Record<string, any>;
+    sorts: string[];
+    groupBy: string[];
+    offset: number;
+    limit: number;
+    joins: string[];
+    withes: CuboCrudWith[];
+    withDeleted?: boolean;
+    withCrdt?: boolean;
+    is_count: boolean;
+    sql: string;
+};
+export type CuboCrudGetManyResponse<T, E extends object = object> = {
+    rows: T[];
+    totals: {
+        count: number;
+    };
+    extra?: E;
+};
+//# sourceMappingURL=basic.d.ts.map

package/dist/types/basic.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"basic.d.ts","sourceRoot":"","sources":["../../src/types/basic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAE5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE/C,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAA;AAE9D,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,UAAU,GAAG;QAAE,EAAE,EAAE,SAAS,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,eAAe,EAAE,CAAA;KAAE,CAAA;IAChF,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC5B,IAAI,CAAC,EAAE,GAAG,CAAA;CACX,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,UAAU,CAAA;IAClB,OAAO,EAAE,eAAe,CAAA;IACxB,OAAO,EAAE,eAAe,CAAA;IACxB,KAAK,EAAE,GAAG,CAAA;CACX,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACjC,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IAEb,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,MAAM,EAAE,YAAY,EAAE,CAAA;IAEtB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,EAAE,OAAO,CAAA;IACjB,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,uBAAuB,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI;IAClE,IAAI,EAAE,CAAC,EAAE,CAAA;IACT,MAAM,EAAE;QACN,KAAK,EAAE,MAAM,CAAA;KACd,CAAA;IACD,KAAK,CAAC,EAAE,CAAC,CAAA;CACV,CAAA"}

package/dist/types/db.d.ts

@@ -0,0 +1,58 @@
+import type { CuboCrdtServerDocumentOrigin } from '@cuboapp/crdt';
+import { type Transaction } from '@cuboapp/database';
+import { CuboHookName } from '../hooks/constants';
+/**
+ * Опции запроса. Формируются заново на каждый CRUD-вызов и иммутабельно
+ * мёржатся с патчами `before*`-хуков (см. hooks/types). `raw` — escape-hatch
+ * для произвольных условий/реплейсментов, которые нельзя выразить типизированным
+ * query-DSL.
+ */
+export type CuboCrudQueryOptions = {
+    selects: string[];
+    conditions: string[];
+    havings: string[];
+    replacements: Record<string, any>;
+    joins: string[];
+    withes: string[];
+    sorts: string[];
+    groupBy: string[];
+    withDeleted?: boolean;
+    withCrdt?: boolean;
+    /** Произвольные сырые условия и реплейсменты (escape-hatch для query-DSL). */
+    raw?: {
+        conditions?: string[];
+        havings?: string[];
+        replacements?: Record<string, any>;
+    };
+    extra?: any;
+};
+/**
+ * Вход для query-опций: всё опционально. Публичный API (CuboCrudMethodOptions,
+ * before*-хуки) принимает частичный объект, который доводится до полного
+ * `CuboCrudQueryOptions` через {@link normalizeCuboCrudQueryOptions}.
+ */
+export type CuboCrudQueryOptionsInput = Partial<CuboCrudQueryOptions>;
+/** Дефолты query-опций — единственный источник правды для пустых значений. */
+export declare const createDefaultCuboCrudQueryOptions: () => CuboCrudQueryOptions;
+/**
+ * Приводит частичный вход к полному `CuboCrudQueryOptions`: подставляет дефолты
+ * для отсутствующих ключей и делает глубокую копию (чтобы before*-хуки могли
+ * безопасно мутировать рабочую копию, не затрагивая переданный объект). Убирает
+ * необходимость в ручном `queryOptions?.selects || []` на каждом call-site.
+ */
+export declare const normalizeCuboCrudQueryOptions: (input?: CuboCrudQueryOptionsInput | null) => CuboCrudQueryOptions;
+export type CuboCrudMethodOptions<E extends object = {}> = {
+    transaction?: Transaction;
+    performer_id?: string;
+    auth?: any;
+    extra?: any;
+    debounce?: number;
+    /** Имена хуков, которые нужно пропустить (источник правды — CUBO_HOOKS). */
+    excludeHooks?: CuboHookName[];
+    log?: boolean;
+    replace?: boolean;
+    crdt?: CuboCrdtServerDocumentOrigin;
+    queryOptions?: CuboCrudQueryOptionsInput;
+} & E;
+export type CuboBackendApiDbConnectionType = 'read' | 'write';
+//# sourceMappingURL=db.d.ts.map

package/dist/types/db.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/types/db.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,eAAe,CAAA;AACjE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAGpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACjC,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAElB,8EAA8E;IAC9E,GAAG,CAAC,EAAE;QACJ,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;QACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KACnC,CAAA;IAED,KAAK,CAAC,EAAE,GAAG,CAAA;CACZ,CAAA;AAED;;;;GAIG;AACH,MAAM,MAAM,yBAAyB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAErE,8EAA8E;AAC9E,eAAO,MAAM,iCAAiC,QAAO,oBAUnD,CAAA;AAEF;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,GAAI,QAAQ,yBAAyB,GAAG,IAAI,KAAG,oBAgBxF,CAAA;AAED,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,MAAM,GAAG,EAAE,IAAI;IACzD,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,IAAI,CAAC,EAAE,GAAG,CAAA;IACV,KAAK,CAAC,EAAE,GAAG,CAAA;IACX,QAAQ,CAAC,EAAE,MAAM,CAAA;IAEjB,4EAA4E;IAC5E,YAAY,CAAC,EAAE,YAAY,EAAE,CAAA;IAE7B,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,4BAA4B,CAAA;IAEnC,YAAY,CAAC,EAAE,yBAAyB,CAAA;CACzC,GAAG,CAAC,CAAA;AAEL,MAAM,MAAM,8BAA8B,GAAG,MAAM,GAAG,OAAO,CAAA"}

package/dist/types/index.d.ts

@@ -0,0 +1,37 @@
+import { Database, DatabaseOptions, Options } from '@cuboapp/database';
+import { CuboApiEntitiesMap, CuboAuthTokenType, CuboEntity } from '@cuboapp/types';
+import type { WsServer } from '@cuboapp/ws';
+import { CuboAugmentationsStore } from '../hooks/types';
+import { CuboCrudMethodOptions } from './db';
+export * from './basic';
+export * from './db';
+export type CuboBackendApiOptions<T extends CuboApiEntitiesMap<T>, A> = {
+    api?: {
+        base_url?: string;
+        headers: Partial<Record<`cubo-${CuboAuthTokenType}`, string>> & Record<string, any>;
+    };
+    entities?: CuboEntity[];
+    db?: {
+        connection?: Database;
+        options?: Options & DatabaseOptions;
+    };
+    /**
+     * Встроенная поддержка cubo-crdt «из коробки». Если передан ws-сервер —
+     * сущности с флагом `entity.crdt === true` автоматически получают CRDT-доки,
+     * подписки и проброс create/update/delete без ручной обвязки.
+     */
+    crdt?: {
+        ws: WsServer;
+        debug?: boolean;
+    };
+    hooks?: {
+        onAfterCreate?: <K extends Extract<keyof T, string>>(entity: CuboEntity, row: T[K], opts: CuboCrudMethodOptions) => void | Promise<void>;
+        onAfterUpdate?: <K extends Extract<keyof T, string>>(entity: CuboEntity, row: T[K], oldRow: T[K], opts: CuboCrudMethodOptions) => void | Promise<void>;
+        onAfterDelete?: <K extends Extract<keyof T, string>>(entity: CuboEntity, row: T[K], opts: CuboCrudMethodOptions) => void | Promise<void>;
+    };
+    augmentations?: Partial<CuboAugmentationsStore<T, A>>;
+};
+export type CuboBackendApiAuth = {
+    variables: Record<string, any>;
+};
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AACtE,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAClF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAE3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AAEvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,MAAM,CAAA;AAE5C,cAAc,SAAS,CAAA;AACvB,cAAc,MAAM,CAAA;AAEpB,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI;IACtE,GAAG,CAAC,EAAE;QACJ,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KACpF,CAAA;IAED,QAAQ,CAAC,EAAE,UAAU,EAAE,CAAA;IAEvB,EAAE,CAAC,EAAE;QACH,UAAU,CAAC,EAAE,QAAQ,CAAA;QACrB,OAAO,CAAC,EAAE,OAAO,GAAG,eAAe,CAAA;KACpC,CAAA;IAED;;;;OAIG;IACH,IAAI,CAAC,EAAE;QACL,EAAE,EAAE,QAAQ,CAAA;QACZ,KAAK,CAAC,EAAE,OAAO,CAAA;KAChB,CAAA;IAED,KAAK,CAAC,EAAE;QACN,aAAa,CAAC,EAAE,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,qBAAqB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;QACxI,aAAa,CAAC,EAAE,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,EACjD,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EACT,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EACZ,IAAI,EAAE,qBAAqB,KACxB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;QACzB,aAAa,CAAC,EAAE,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,qBAAqB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KACzI,CAAA;IAED,aAAa,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;CACtD,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC/B,CAAA"}

package/package.json

@@ -1,23 +1,37 @@
 {
   "name": "@cuboapp/api-backend",
-  "version": "3.0.16",
-  "description": "Backend Api for CuboApp",
-  "main": "src/index.ts",
-  "repository": "git@github.com:cuboapp/api-backend.git",
-  "author": "CuboSoft",
+  "version": "4.0.0",
+  "description": "Metadata-driven CRUD engine (vendored — README §5; patched for uuid pk_type:'string').",
   "license": "MIT",
   "type": "module",
+  "main": "src/index.ts",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./src/index.ts"
+    }
+  },
+  "files": [
+    "dist",
+    "src"
+  ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "typecheck": "echo \"vendored @cuboapp — typecheck via emitted d.ts\"",
+    "test": "vitest run",
+    "lint": "echo \"no lint\""
+  },
   "dependencies": {
-    "@cuboapp/constants": "2.0.8",
-    "@cuboapp/database": "1.0.7",
-    "@cuboapp/types": "2.0.14",
-    "@cuboapp/utils": "1.0.12"
+    "@cuboapp/constants": "^3.0.0",
+    "@cuboapp/database": "^2.0.0",
+    "@cuboapp/types": "^3.0.0",
+    "@cuboapp/utils": "^1.0.12"
   },
   "peerDependencies": {
-    "@cuboapp/crdt": "1.0.27",
-    "@cuboapp/ws": "1.0.10",
-    "mysql2": "3.22.5",
-    "pg": "8.22.0",
+    "@cuboapp/crdt": "^2.0.0",
+    "@cuboapp/ws": "^2.0.0",
+    "pg": "^8.13.1",
     "yjs": "^13.6.31"
   },
   "peerDependenciesMeta": {
@@ -27,9 +41,6 @@
     "@cuboapp/ws": {
       "optional": true
     },
-    "mysql2": {
-      "optional": true
-    },
     "pg": {
       "optional": true
     },
@@ -38,10 +49,9 @@
     }
   },
   "devDependencies": {
-    "@cuboapp/crdt": "1.0.27",
-    "@cuboapp/ws": "1.0.10",
-    "@types/node": "^26.0.0",
-    "pg": "^8.22.0",
-    "typescript": "^6.0.3"
+    "@cuboapp/crdt": "^2.0.0",
+    "@cuboapp/ws": "^2.0.0",
+    "@types/node": "^22.10.5",
+    "typescript": "^5.8.3"
   }
 }

package/src/constants/index.ts

@@ -1,10 +1,26 @@
 import { CUBO_ENTITY_FIELD_TYPE } from '@cuboapp/constants'
 import { CuboEntityField } from '@cuboapp/types'
 
-export const CUBO_CRUD_QUERY_KEY_REGEX = /[^a-zA-Z\.\_]/g
+// `|` is part of a key, not noise: a key may name SEVERAL fields to be OR-ed (see
+// CUBO_CRUD_QUERY_SYMBOL_OR). Stripping it here would silently glue two field names into one.
+export const CUBO_CRUD_QUERY_KEY_REGEX = /[^a-zA-Z\.\_\|]/g
 
 export const CUBO_CRUD_QUERY_SYMBOL_NOT = 'not'
 
+/**
+ * Separates the field names in an ANY-OF query key: `?a|b=<value>` means "`a` matches OR `b` matches".
+ *
+ * Every other condition in a query is AND-ed, which is right for filtering — each parameter narrows
+ * the result. But some questions are genuinely about a row's relationship to a value regardless of
+ * WHICH column records it: a document involving an organization has it as either the sender or the
+ * receiver, and asking for both as separate parameters would return the documents where it is both.
+ *
+ * One condition, several columns — not a general boolean expression language. That keeps the query
+ * string readable and keeps the SQL to a single parenthesised OR, so it still AND-s with everything
+ * else exactly as a plain key does.
+ */
+export const CUBO_CRUD_QUERY_SYMBOL_OR = '|'
+
 export const CUBO_CRUD_DEFAULT_PAGE_LIMIT = 25
 export const CUBO_CRUD_MAX_PAGE_LIMIT = 500
 
@@ -26,11 +42,11 @@ export const CUBO_CRUD_QUERY_CONDITION = {
 
 export const CUBO_CRUD_DEFAULT_FIELDS: Pick<CuboEntityField, 'type' | 'alias' | 'extra'>[] = [
   {
-    type: CUBO_ENTITY_FIELD_TYPE.NUMBER,
+    // PATCH (uuid pk_type:'string'): the platform PK is uuid, so the default `id`
+    // field is TEXT — otherwise filter/getOne by uuid fails the NUMBER allow-list check.
+    type: CUBO_ENTITY_FIELD_TYPE.TEXT,
     alias: 'id',
-    extra: {
-      number_subtype: 'int'
-    }
+    extra: {}
   },
   {
     type: CUBO_ENTITY_FIELD_TYPE.TIMESTAMP,
@@ -38,12 +54,12 @@ export const CUBO_CRUD_DEFAULT_FIELDS: Pick<CuboEntityField, 'type' | 'alias' |
     extra: {}
   },
   {
-    type: CUBO_ENTITY_FIELD_TYPE.SELECT,
+    // PATCH (uuid): user audit columns are uuid TEXT, not numeric SELECT — otherwise
+    // convert.prepareFieldValue parseInt()s the uuid (README PK rule). `with`-join logic
+    // still resolves the user relation from the raw column value.
+    type: CUBO_ENTITY_FIELD_TYPE.TEXT,
     alias: 'created_by',
-    extra: {
-      select_subtype: 'user',
-      select_entity_key: 'created_by'
-    }
+    extra: { select_subtype: 'user', select_entity_key: 'created_by' }
   },
   {
     type: CUBO_ENTITY_FIELD_TYPE.TIMESTAMP,
@@ -51,12 +67,9 @@ export const CUBO_CRUD_DEFAULT_FIELDS: Pick<CuboEntityField, 'type' | 'alias' |
     extra: {}
   },
   {
-    type: CUBO_ENTITY_FIELD_TYPE.SELECT,
+    type: CUBO_ENTITY_FIELD_TYPE.TEXT,
     alias: 'modified_by',
-    extra: {
-      select_subtype: 'user',
-      select_entity_key: 'modified_by'
-    }
+    extra: { select_subtype: 'user', select_entity_key: 'modified_by' }
   },
   {
     type: CUBO_ENTITY_FIELD_TYPE.TIMESTAMP,
@@ -64,12 +77,9 @@ export const CUBO_CRUD_DEFAULT_FIELDS: Pick<CuboEntityField, 'type' | 'alias' |
     extra: {}
   },
   {
-    type: CUBO_ENTITY_FIELD_TYPE.SELECT,
+    type: CUBO_ENTITY_FIELD_TYPE.TEXT,
     alias: 'deleted_by',
-    extra: {
-      select_subtype: 'user',
-      select_entity_key: 'modified_by'
-    }
+    extra: { select_subtype: 'user', select_entity_key: 'deleted_by' }
   }
 ]
 

package/src/core/index.ts

@@ -260,7 +260,7 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>, A extends unknown =
       if (result) queryOptions = normalizeCuboCrudQueryOptions(result)
     }
 
-    const dto = this.helpers.data.prepare('create', entity.fields, req.body, opts.performer_id || 0)
+    const dto = this.helpers.data.prepare('create', entity.fields, req.body, opts.performer_id)
     if (!Object.keys(dto).length) {
       throw { status: 400, text: 'No keys to create' }
     }
@@ -357,7 +357,7 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>, A extends unknown =
       }
     }
 
-    const dto = this.helpers.data.prepare('update', entity.fields, req.body, opts.performer_id || 0)
+    const dto = this.helpers.data.prepare('update', entity.fields, req.body, opts.performer_id)
     if (!Object.keys(dto).length) {
       throw { status: 400, text: 'No keys to update' }
     }
@@ -469,7 +469,7 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>, A extends unknown =
     if (!rows.length) return []
 
     const entity = await this.getEntity(entityAlias)
-    const dtos = rows.map((row) => this.helpers.data.prepare('create', entity.fields, row, opts!.performer_id || 0))
+    const dtos = rows.map((row) => this.helpers.data.prepare('create', entity.fields, row, opts!.performer_id))
 
     const run = async (tx: any): Promise<T[K][]> => {
       const ids = await this.insertMany(entity, dtos, { transaction: tx, log: opts!.log })
@@ -507,7 +507,7 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>, A extends unknown =
     const ids = items.map((r: any) => r.id)
     if (!ids.length) return []
 
-    const dto = this.helpers.data.prepare('update', entity.fields, req.body, opts.performer_id || 0)
+    const dto = this.helpers.data.prepare('update', entity.fields, req.body, opts.performer_id)
     if (!Object.keys(dto).length) {
       throw { status: 400, text: 'No keys to update' }
     }
@@ -734,7 +734,8 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>, A extends unknown =
     const res: any = await db.connection.query(sql, { type: QueryTypes.INSERT, replacements, transaction: opts.transaction })
 
     if (dialect.supportsReturning) {
-      return (res?.[0] || []).map((r: any) => +r[this.pkKey])
+      // PATCH (uuid pk_type:'string'): return the raw pk, do NOT coerce to number (+uuid = NaN).
+      return (res?.[0] || []).map((r: any) => (this.pkType === 'number' ? +r[this.pkKey] : r[this.pkKey]))
     }
 
     // MySQL: query() возвращает [insertId, affectedRows]; строки получают последовательные id

package/src/crdt/index.ts

@@ -7,11 +7,24 @@ import type {
 import { CuboApiEntitiesMap, CuboEntity } from '@cuboapp/types'
 import type { WsServer, WsServerSocket } from '@cuboapp/ws'
 
+import { CUBO_CRUD_MAX_PAGE_LIMIT } from '../constants'
 import type { CuboBackendApi } from '../core'
 
 /** Тип фабрики, импортируемый только как тип (рантайм-зависимость опциональна). */
 type CreateCrdtServer = typeof import('@cuboapp/crdt')['createCrdtServer']
 
+/**
+ * Engine rows carry `Date` objects for timestamptz columns; Yjs can't encode a Date (it round-trips
+ * as `{}`), so coerce top-level Dates to ISO strings before they enter a CRDT document — they then
+ * survive sync identically to the REST/JSON path. (Patched alongside the uuid-pk fixes.)
+ */
+function normalizeCrdtRow<R>(row: R): R {
+  if (!row || typeof row !== 'object') return row
+  const out: Record<string, unknown> = { ...(row as Record<string, unknown>) }
+  for (const key of Object.keys(out)) if (out[key] instanceof Date) out[key] = (out[key] as Date).toISOString()
+  return out as R
+}
+
 /**
  * Встроенный адаптер cubo-crdt. Инкапсулирует всю обвязку, которую раньше
  * приходилось писать в каждом приложении руками (old.ts):
@@ -28,7 +41,7 @@ export class CuboCrdtAdapter<T extends CuboApiEntitiesMap<T>, A> {
 
   constructor(
     private api: CuboBackendApi<T, A>,
-    ws: WsServer,
+    private ws: WsServer,
     createCrdtServer: CreateCrdtServer,
     private debug = false
   ) {
@@ -39,16 +52,34 @@ export class CuboCrdtAdapter<T extends CuboApiEntitiesMap<T>, A> {
       entities,
       debug: this.debug,
 
-      // подписка -> строки из БД (хуки CRUD пропускаем, чтобы не зациклить)
+      // подписка -> строки из БД (хуки CRUD пропускаем, чтобы не зациклить).
+      // A CRDT subscription must hold the FULL live list, but getMany defaults to
+      // CUBO_CRUD_DEFAULT_PAGE_LIMIT (25) and caps at CUBO_CRUD_MAX_PAGE_LIMIT (500) — so page through
+      // until every row is loaded. Without this the document only ever holds the first 25 rows and
+      // clients see a truncated set (e.g. an account with 200+ entities_fields shows a handful).
       fetchRows: async (client, subscribe: CuboCrdtServerSubscribe) => {
-        const { rows, totals } = await this.api.getMany(subscribe.entity as Extract<keyof T, string>, { query: subscribe.filters }, {
-          auth: (client as CuboCrdtSocketClient<A>).auth,
-          excludeHooks: ['afterCrdtCreate', 'afterCrdtUpdate']
-        })
+        const auth = (client as CuboCrdtSocketClient<A>).auth
+        const baseFilters = subscribe.filters || {}
+        const collected: T[Extract<keyof T, string>][] = []
+        // Upstream issues ONE getMany and returns its page. Kept paging: a subscription must hold the
+        // whole live list, and one call stops at CUBO_CRUD_DEFAULT_PAGE_LIMIT.
+        let lastTotals: Awaited<ReturnType<typeof this.api.getMany>>['totals'] | undefined
+        for (let page = 1; page <= 1000; page++) {
+          const { rows, totals } = await this.api.getMany(
+            subscribe.entity as Extract<keyof T, string>,
+            { query: { ...baseFilters, limit: CUBO_CRUD_MAX_PAGE_LIMIT, page } },
+            { auth, excludeHooks: ['afterCrdtCreate', 'afterCrdtUpdate'] }
+          )
+          lastTotals = totals
+          collected.push(...(rows as T[Extract<keyof T, string>][]))
+          if (rows.length < CUBO_CRUD_MAX_PAGE_LIMIT || collected.length >= (totals?.count ?? 0)) break
+        }
 
+        // `{ rows, totals }` is upstream's shape — `fetchRows` accepts either, and the totals let a
+        // paginated subscription report the true count rather than what this page happened to hold.
         return {
-          rows: rows as T[Extract<keyof T, string>][],
-          totals
+          rows: collected.map(normalizeCrdtRow) as T[Extract<keyof T, string>][],
+          totals: lastTotals
         }
       },
 
@@ -75,13 +106,27 @@ export class CuboCrdtAdapter<T extends CuboApiEntitiesMap<T>, A> {
       checkRowIsSutable: (base, { entity, subscribe, row }) => {
         const augmentation = this.api.options.augmentations?.[entity as Extract<keyof T, string>]
         if (augmentation?.filterRowForCrdtEvent) {
-          return augmentation.filterRowForCrdtEvent(row, subscribe.filters || {})
+          return augmentation.filterRowForCrdtEvent(row, subscribe.filters || {}, this.authOf(subscribe.client_id))
         }
         return base
       }
     })
   }
 
+  /**
+   * Авторизация клиента, владеющего подпиской.
+   *
+   * `checkRowIsSutable` получает только подписку (в ней есть client_id), а права живут на сокете —
+   * поэтому ищем сокет в реестре ws. Нужно для аугментаций, которые прячут строки по правам: гидрация
+   * подписки идёт через getMany с auth и такие строки не отдаст, а живой пуш без этого отдал бы.
+   */
+  private authOf(clientId: string): A | undefined {
+    for (const client of this.ws.clients) {
+      if (client.id === clientId) return (client as WsServerSocket<{ auth?: A }>).auth
+    }
+    return undefined
+  }
+
   public async init() {
     await this.server.init()
   }
@@ -108,17 +153,26 @@ export class CuboCrdtAdapter<T extends CuboApiEntitiesMap<T>, A> {
   public pushCreate(entity: CuboEntity, row: any) {
     if (!entity.crdt) return
     const alias = entity.alias as Extract<keyof T, string>
-    this.server.ensureDocument(alias, row)
-    this.server.notifyMutation(alias, { action: 'create', row })
+    // `normalizeCrdtRow` is ours and upstream still lacks it: a Date reaches Yjs as an object it
+    // cannot encode, and the column renders empty. Normalise once and use it for both the document
+    // and the mutation notice, so subscribers and refreshes agree on what the row says.
+    const normalized = normalizeCrdtRow(row)
+    this.server.ensureDocument(alias, normalized)
+    this.server.notifyMutation(alias, { action: 'create', row: normalized })
   }
 
   public pushUpdate(entity: CuboEntity, row: any, previousRow?: any, changedKeys?: string[]) {
     if (!entity.crdt) return
     const alias = entity.alias as Extract<keyof T, string>
-    this.server.ensureDocument(alias, row)
+    // We used to reach past `ensureDocument` and write the row into the live Y.Map by hand, because
+    // it only ever wrote on FIRST creation and server-side edits therefore never reached subscribers.
+    // 1.0.27 does that itself — `ensureDocument` now calls `document.write()` when the document
+    // already exists — so the hand-rolled path is gone and only the normalisation is still ours.
+    const normalized = normalizeCrdtRow(row)
+    this.server.ensureDocument(alias, normalized)
     this.server.notifyMutation(alias, {
       action: 'update',
-      row,
+      row: normalized,
       previousRow,
       changedKeys
     })

package/src/helpers/data.ts

@@ -2,8 +2,10 @@ import { CUBO_ENTITY_FIELD_TYPE } from '@cuboapp/constants'
 import { CuboApiEntitiesMap, CuboEntityField } from '@cuboapp/types'
 import { keyBy } from '@cuboapp/utils'
 
+import { CUBO_CRUD_DEFAULT_FIELDS_ALIASES } from '../constants'
+
 export class ApiHelpersData<T extends CuboApiEntitiesMap<T>> {
-  public prepare(type: 'create' | 'update' | 'delete', fields: CuboEntityField[], dto?: any, performer_id?: number) {
+  public prepare(type: 'create' | 'update' | 'delete', fields: CuboEntityField[], dto?: any, performer_id?: string) {
     const fieldsByAlias = keyBy(fields, (i) => i.alias)
 
     const errors: string[] = []
@@ -33,7 +35,12 @@ export class ApiHelpersData<T extends CuboApiEntitiesMap<T>> {
 
     for (const key in dto || {}) {
       if (!fieldsByAlias[key]) {
-        errors.push(`"${key}": unknown field`)
+        // PATCH (README §7): default fields (id/created_*/deleted_* — e.g. deleted_at on
+        // restore) are handled above / stamped by the engine, so skip them silently.
+        // Any OTHER unknown field is REJECTED (the allow-list is the SQL-injection boundary).
+        if (!CUBO_CRUD_DEFAULT_FIELDS_ALIASES.includes(key)) {
+          errors.push(`"${key}": unknown field`)
+        }
       } else {
         const value = dto[key]
         const tval = typeof value
@@ -137,6 +144,11 @@ export class ApiHelpersData<T extends CuboApiEntitiesMap<T>> {
       }
     }
 
+    // PATCH (README §7): reject on any validation error instead of silently dropping.
+    if (errors.length) {
+      throw { status: 400, text: `Validation failed: ${errors.join('; ')}` }
+    }
+
     return prepared
   }
 }