@syncular/server-plugin-yjs 0.0.0 → 0.0.6-165

package/README.md

@@ -1,4 +1,4 @@
-# @syncular/server-plugin-crdt-yjs
+# @syncular/server-plugin-yjs
 
 Yjs-first server integration helpers for Syncular.
 
@@ -19,7 +19,7 @@ Implemented:
 ## Example
 
 ```ts
-import { createYjsServerModule } from '@syncular/server-plugin-crdt-yjs';
+import { createYjsServerModule } from '@syncular/server-plugin-yjs';
 
 const yjs = createYjsServerModule({
   rules: [

package/dist/index.d.ts

@@ -0,0 +1,91 @@
+import { type SyncServerPushPlugin } from '@syncular/server';
+export declare const YJS_PAYLOAD_KEY = "__yjs";
+export type YjsFieldKind = 'text' | 'xml-fragment' | 'prosemirror';
+export interface YjsServerFieldRule {
+    table: string;
+    field: string;
+    /**
+     * Column that stores canonical serialized Yjs state.
+     * Example: "content_yjs_state"
+     */
+    stateColumn: string;
+    /**
+     * Container key inside the Yjs document. Defaults to `field`.
+     */
+    containerKey?: string;
+    /**
+     * Snapshot row id column. Defaults to `id`.
+     */
+    rowIdField?: string;
+    /**
+     * CRDT container type.
+     */
+    kind?: YjsFieldKind;
+}
+export interface YjsServerUpdateEnvelope {
+    updateId: string;
+    updateBase64: string;
+}
+export type YjsServerUpdateInput = YjsServerUpdateEnvelope | readonly YjsServerUpdateEnvelope[];
+export interface YjsServerPayloadEnvelope {
+    [field: string]: YjsServerUpdateInput;
+}
+export interface BuildYjsTextUpdateArgs {
+    previousStateBase64?: string | Uint8Array | null;
+    nextText: string;
+    containerKey?: string;
+    updateId?: string;
+}
+export interface BuildYjsTextUpdateResult {
+    update: YjsServerUpdateEnvelope;
+    nextStateBase64: string;
+    nextText: string;
+}
+export interface ApplyYjsTextUpdatesArgs {
+    previousStateBase64?: string | Uint8Array | null;
+    updates: readonly YjsServerUpdateEnvelope[];
+    containerKey?: string;
+}
+export interface ApplyYjsTextUpdatesResult {
+    nextStateBase64: string;
+    text: string;
+}
+export interface CreateYjsServerModuleOptions {
+    name?: string;
+    rules: readonly YjsServerFieldRule[];
+    envelopeKey?: string;
+    /**
+     * Throw when envelope payload references fields without matching rules.
+     * @default true
+     */
+    strict?: boolean;
+    /**
+     * Remove the Yjs envelope key from processed payload/rows.
+     * @default true
+     */
+    stripEnvelope?: boolean;
+}
+export interface CreateYjsServerPushPluginOptions extends CreateYjsServerModuleOptions {
+    priority?: number;
+}
+export interface YjsServerApplyPayloadArgs {
+    table: string;
+    rowId: string;
+    payload: Record<string, unknown>;
+    existingRow?: Record<string, unknown> | null;
+}
+export interface YjsServerMaterializeRowArgs {
+    table: string;
+    row: Record<string, unknown>;
+}
+export interface YjsServerModule {
+    name: string;
+    rules: readonly YjsServerFieldRule[];
+    envelopeKey: string;
+    applyPayload(args: YjsServerApplyPayloadArgs): Promise<Record<string, unknown>>;
+    materializeRow(args: YjsServerMaterializeRowArgs): Promise<Record<string, unknown>>;
+}
+export declare function buildYjsTextUpdate(args: BuildYjsTextUpdateArgs): Promise<BuildYjsTextUpdateResult>;
+export declare function createYjsServerModule(options: CreateYjsServerModuleOptions): YjsServerModule;
+export declare function createYjsServerPushPlugin(options: CreateYjsServerPushPluginOptions): SyncServerPushPlugin;
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -0,0 +1,492 @@
+import { ServerPushPluginPriority, } from '@syncular/server';
+import { sql } from 'kysely';
+import * as Y from 'yjs';
+export const YJS_PAYLOAD_KEY = '__yjs';
+const BASE64_PATTERN = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/;
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function readString(value) {
+    return typeof value === 'string' && value.length > 0 ? value : null;
+}
+function bytesToBase64(bytes) {
+    if (typeof Buffer !== 'undefined') {
+        return Buffer.from(bytes).toString('base64');
+    }
+    let binary = '';
+    for (const byte of bytes) {
+        binary += String.fromCharCode(byte);
+    }
+    return btoa(binary);
+}
+function tryReadBase64TextFromBytes(bytes) {
+    if (bytes.length === 0)
+        return null;
+    try {
+        const decoded = new TextDecoder().decode(bytes).trim();
+        if (!decoded || !BASE64_PATTERN.test(decoded))
+            return null;
+        return decoded;
+    }
+    catch {
+        return null;
+    }
+}
+function base64ToBytes(base64) {
+    if (!BASE64_PATTERN.test(base64)) {
+        throw new Error('Invalid base64 string');
+    }
+    if (typeof Buffer !== 'undefined') {
+        return new Uint8Array(Buffer.from(base64, 'base64'));
+    }
+    const binary = atob(base64);
+    const out = new Uint8Array(binary.length);
+    for (let i = 0; i < binary.length; i++) {
+        out[i] = binary.charCodeAt(i);
+    }
+    return out;
+}
+function stateValueToBytes(value) {
+    if (value instanceof Uint8Array) {
+        const encoded = tryReadBase64TextFromBytes(value);
+        if (encoded)
+            return base64ToBytes(encoded);
+        return value;
+    }
+    const str = readString(value);
+    if (!str)
+        return null;
+    return base64ToBytes(str);
+}
+function stateValueToBase64(value) {
+    const str = readString(value);
+    if (str)
+        return str;
+    if (value instanceof Uint8Array) {
+        const encoded = tryReadBase64TextFromBytes(value);
+        if (encoded)
+            return encoded;
+        return bytesToBase64(value);
+    }
+    return null;
+}
+function createDocFromState(stateValue) {
+    const doc = new Y.Doc();
+    const bytes = stateValueToBytes(stateValue);
+    if (bytes && bytes.length > 0) {
+        Y.applyUpdate(doc, bytes);
+    }
+    return doc;
+}
+function exportSnapshotBase64(doc) {
+    return bytesToBase64(Y.encodeStateAsUpdate(doc));
+}
+function ensureTextContainer(doc, containerKey) {
+    return doc.getText(containerKey).toString();
+}
+function ensureXmlFragmentContainer(doc, containerKey) {
+    return doc.getXmlFragment(containerKey).toString();
+}
+function replaceText(doc, containerKey, nextText) {
+    const text = doc.getText(containerKey);
+    const currentLength = text.length;
+    doc.transact(() => {
+        if (currentLength > 0) {
+            text.delete(0, currentLength);
+        }
+        if (nextText.length > 0) {
+            text.insert(0, nextText);
+        }
+    });
+}
+function patchText(doc, containerKey, nextText) {
+    const text = doc.getText(containerKey);
+    const currentText = text.toString();
+    if (currentText === nextText)
+        return;
+    const minLength = Math.min(currentText.length, nextText.length);
+    let prefixLength = 0;
+    while (prefixLength < minLength &&
+        currentText.charCodeAt(prefixLength) === nextText.charCodeAt(prefixLength)) {
+        prefixLength += 1;
+    }
+    let currentSuffixStart = currentText.length;
+    let nextSuffixStart = nextText.length;
+    while (currentSuffixStart > prefixLength &&
+        nextSuffixStart > prefixLength &&
+        currentText.charCodeAt(currentSuffixStart - 1) ===
+            nextText.charCodeAt(nextSuffixStart - 1)) {
+        currentSuffixStart -= 1;
+        nextSuffixStart -= 1;
+    }
+    const deleteLength = currentSuffixStart - prefixLength;
+    const insertSegment = nextText.slice(prefixLength, nextSuffixStart);
+    doc.transact(() => {
+        if (deleteLength > 0) {
+            text.delete(prefixLength, deleteLength);
+        }
+        if (insertSegment.length > 0) {
+            text.insert(prefixLength, insertSegment);
+        }
+    });
+}
+function materializeRuleValue(doc, rule) {
+    if (rule.kind === 'text') {
+        return ensureTextContainer(doc, rule.containerKey);
+    }
+    return ensureXmlFragmentContainer(doc, rule.containerKey);
+}
+function seedRuleValueFromPayload(doc, rule, source) {
+    if (rule.kind !== 'text')
+        return;
+    const initialText = readString(source[rule.field]);
+    if (initialText) {
+        replaceText(doc, rule.containerKey, initialText);
+    }
+}
+function createUpdateId() {
+    const randomUUID = globalThis.crypto?.randomUUID;
+    if (typeof randomUUID === 'function') {
+        return randomUUID.call(globalThis.crypto);
+    }
+    const ts = Date.now().toString(36);
+    const rnd = Math.random().toString(36).slice(2, 12);
+    return `yjs-${ts}-${rnd}`;
+}
+function buildRuleIndex(rules) {
+    const index = new Map();
+    const normalizedRules = [];
+    const seen = new Set();
+    for (const rule of rules) {
+        if (!rule.table.trim()) {
+            throw new Error('YjsServerFieldRule.table cannot be empty');
+        }
+        if (!rule.field.trim()) {
+            throw new Error('YjsServerFieldRule.field cannot be empty');
+        }
+        if (!rule.stateColumn.trim()) {
+            throw new Error('YjsServerFieldRule.stateColumn cannot be empty');
+        }
+        const key = `${rule.table}\u001f${rule.field}`;
+        if (seen.has(key)) {
+            throw new Error(`Duplicate Yjs server rule for table "${rule.table}", field "${rule.field}"`);
+        }
+        seen.add(key);
+        const resolved = {
+            ...rule,
+            containerKey: rule.containerKey ?? rule.field,
+            rowIdField: rule.rowIdField ?? 'id',
+            kind: rule.kind ?? 'text',
+        };
+        normalizedRules.push(resolved);
+        const tableRules = index.get(resolved.table) ?? new Map();
+        tableRules.set(resolved.field, resolved);
+        index.set(resolved.table, tableRules);
+    }
+    return { index, normalizedRules };
+}
+function normalizeUpdateEnvelope(value, context) {
+    if (!isRecord(value)) {
+        throw new Error(`${context} must be an object`);
+    }
+    const updateId = readString(value.updateId);
+    const updateBase64 = readString(value.updateBase64);
+    if (!updateId) {
+        throw new Error(`${context}.updateId must be a non-empty string`);
+    }
+    if (!updateBase64) {
+        throw new Error(`${context}.updateBase64 must be a non-empty base64 string`);
+    }
+    return { updateId, updateBase64 };
+}
+function normalizeUpdateEnvelopes(value, context) {
+    if (Array.isArray(value)) {
+        return value.map((entry, i) => normalizeUpdateEnvelope(entry, `${context}[${i}]`));
+    }
+    return [normalizeUpdateEnvelope(value, context)];
+}
+/*async function applyYjsTextUpdates(
+  args: ApplyYjsTextUpdatesArgs
+): Promise<ApplyYjsTextUpdatesResult> {
+  const containerKey = args.containerKey ?? 'text';
+  const doc = createDocFromState(args.previousStateBase64);
+  try {
+    for (const update of args.updates) {
+      Y.applyUpdate(doc, base64ToBytes(update.updateBase64));
+    }
+    const text = ensureTextContainer(doc, containerKey);
+    const nextStateBase64 = exportSnapshotBase64(doc);
+    return { nextStateBase64, text };
+  } finally {
+    doc.destroy();
+  }
+}*/
+export async function buildYjsTextUpdate(args) {
+    const containerKey = args.containerKey ?? 'text';
+    const doc = createDocFromState(args.previousStateBase64);
+    try {
+        const from = Y.encodeStateVector(doc);
+        patchText(doc, containerKey, args.nextText);
+        const update = bytesToBase64(Y.encodeStateAsUpdate(doc, from));
+        const nextText = ensureTextContainer(doc, containerKey);
+        const nextStateBase64 = exportSnapshotBase64(doc);
+        return {
+            update: {
+                updateId: args.updateId ?? createUpdateId(),
+                updateBase64: update,
+            },
+            nextStateBase64,
+            nextText,
+        };
+    }
+    finally {
+        doc.destroy();
+    }
+}
+async function materializeRowFromState(args) {
+    const tableRules = args.index.get(args.table);
+    if (!tableRules) {
+        if (args.stripEnvelope && args.envelopeKey in args.row) {
+            const next = { ...args.row };
+            delete next[args.envelopeKey];
+            return next;
+        }
+        return args.row;
+    }
+    let nextRow = null;
+    const ensureRow = () => {
+        if (nextRow)
+            return nextRow;
+        nextRow = { ...args.row };
+        return nextRow;
+    };
+    for (const rule of tableRules.values()) {
+        const source = nextRow ?? args.row;
+        const stateBase64 = stateValueToBase64(source[rule.stateColumn]);
+        if (!stateBase64)
+            continue;
+        const doc = createDocFromState(stateBase64);
+        try {
+            const nextValue = materializeRuleValue(doc, rule);
+            if (source[rule.field] !== nextValue) {
+                ensureRow()[rule.field] = nextValue;
+            }
+        }
+        finally {
+            doc.destroy();
+        }
+    }
+    if (args.stripEnvelope) {
+        const source = nextRow ?? args.row;
+        if (args.envelopeKey in source) {
+            const target = ensureRow();
+            delete target[args.envelopeKey];
+        }
+    }
+    return nextRow ?? args.row;
+}
+async function applyYjsEnvelopeToPayload(args) {
+    const tableRules = args.index.get(args.table);
+    const rawEnvelope = args.payload[args.envelopeKey];
+    if (!tableRules) {
+        if (rawEnvelope !== undefined && args.strict) {
+            throw new Error(`Yjs envelope provided for table "${args.table}" without matching rules`);
+        }
+        if (args.stripEnvelope && rawEnvelope !== undefined) {
+            const next = { ...args.payload };
+            delete next[args.envelopeKey];
+            return next;
+        }
+        return args.payload;
+    }
+    let nextPayload = null;
+    const ensurePayload = () => {
+        if (nextPayload)
+            return nextPayload;
+        nextPayload = { ...args.payload };
+        return nextPayload;
+    };
+    const sourceEnvelope = rawEnvelope;
+    if (sourceEnvelope !== undefined && !isRecord(sourceEnvelope)) {
+        throw new Error(`Yjs payload key "${args.envelopeKey}" must be an object for table "${args.table}"`);
+    }
+    if (sourceEnvelope) {
+        for (const [field, rawUpdateInput] of Object.entries(sourceEnvelope)) {
+            const rule = tableRules.get(field);
+            if (!rule) {
+                if (args.strict) {
+                    throw new Error(`No Yjs rule found for envelope field "${field}" on table "${args.table}"`);
+                }
+                continue;
+            }
+            const updates = normalizeUpdateEnvelopes(rawUpdateInput, `yjs.${args.table}.${field}`);
+            const source = nextPayload ?? args.payload;
+            const existingSource = args.existingRow ?? null;
+            const baseState = (existingSource
+                ? stateValueToBase64(existingSource[rule.stateColumn])
+                : null) ??
+                stateValueToBase64(source[rule.stateColumn]) ??
+                null;
+            const doc = createDocFromState(baseState);
+            try {
+                if (!baseState) {
+                    seedRuleValueFromPayload(doc, rule, source);
+                }
+                for (const update of updates) {
+                    Y.applyUpdate(doc, base64ToBytes(update.updateBase64));
+                }
+                const nextValue = materializeRuleValue(doc, rule);
+                const nextStateBase64 = exportSnapshotBase64(doc);
+                const target = ensurePayload();
+                target[rule.field] = nextValue;
+                target[rule.stateColumn] = nextStateBase64;
+            }
+            finally {
+                doc.destroy();
+            }
+        }
+    }
+    if (args.stripEnvelope) {
+        const source = nextPayload ?? args.payload;
+        if (args.envelopeKey in source) {
+            const target = ensurePayload();
+            delete target[args.envelopeKey];
+        }
+    }
+    return nextPayload ?? args.payload;
+}
+export function createYjsServerModule(options) {
+    if (options.rules.length === 0) {
+        throw new Error('createYjsServerModule requires at least one table/field rule');
+    }
+    const envelopeKey = options.envelopeKey ?? YJS_PAYLOAD_KEY;
+    const strict = options.strict ?? true;
+    const stripEnvelope = options.stripEnvelope ?? true;
+    const { index } = buildRuleIndex(options.rules);
+    return {
+        name: options.name ?? 'crdt-yjs-server',
+        rules: options.rules,
+        envelopeKey,
+        async applyPayload(args) {
+            return await applyYjsEnvelopeToPayload({
+                table: args.table,
+                payload: args.payload,
+                existingRow: args.existingRow,
+                index,
+                envelopeKey,
+                stripEnvelope,
+                strict,
+            });
+        },
+        async materializeRow(args) {
+            return await materializeRowFromState({
+                table: args.table,
+                row: args.row,
+                index,
+                envelopeKey,
+                stripEnvelope,
+            });
+        },
+    };
+}
+function buildTableRowIdFieldIndex(rules) {
+    const tableRowIdFields = new Map();
+    for (const rule of rules) {
+        const rowIdField = rule.rowIdField ?? 'id';
+        const existing = tableRowIdFields.get(rule.table);
+        if (existing && existing !== rowIdField) {
+            throw new Error(`Yjs rules for table "${rule.table}" must use a single rowIdField`);
+        }
+        tableRowIdFields.set(rule.table, rowIdField);
+    }
+    return tableRowIdFields;
+}
+async function materializeAppliedResult(yjsModule, opTable, applied) {
+    let nextResult = applied.result;
+    let resultChanged = false;
+    if (nextResult.status === 'conflict' && isRecord(nextResult.server_row)) {
+        const materializedServerRow = await yjsModule.materializeRow({
+            table: opTable,
+            row: nextResult.server_row,
+        });
+        if (materializedServerRow !== nextResult.server_row) {
+            nextResult = {
+                ...nextResult,
+                server_row: materializedServerRow,
+            };
+            resultChanged = true;
+        }
+    }
+    let emittedChanged = false;
+    const nextEmitted = [];
+    for (const emitted of applied.emittedChanges) {
+        if (emitted.op !== 'upsert' || !isRecord(emitted.row_json)) {
+            nextEmitted.push(emitted);
+            continue;
+        }
+        const materializedRow = await yjsModule.materializeRow({
+            table: emitted.table,
+            row: emitted.row_json,
+        });
+        if (materializedRow !== emitted.row_json) {
+            emittedChanged = true;
+            nextEmitted.push({
+                ...emitted,
+                row_json: materializedRow,
+            });
+            continue;
+        }
+        nextEmitted.push(emitted);
+    }
+    if (!resultChanged && !emittedChanged) {
+        return applied;
+    }
+    return {
+        result: nextResult,
+        emittedChanges: emittedChanged ? nextEmitted : applied.emittedChanges,
+    };
+}
+export function createYjsServerPushPlugin(options) {
+    const yjsModule = createYjsServerModule(options);
+    const tableRowIdFields = buildTableRowIdFieldIndex(options.rules);
+    return {
+        name: options.name ?? yjsModule.name,
+        priority: options.priority ?? ServerPushPluginPriority.CRDT,
+        async beforeApplyOperation(args) {
+            const op = args.op;
+            if (op.op !== 'upsert' || !isRecord(op.payload)) {
+                return op;
+            }
+            const rowIdField = tableRowIdFields.get(op.table);
+            let existingRow = null;
+            if (rowIdField) {
+                const loadedRows = await sql `
+          select *
+          from ${sql.table(op.table)}
+          where ${sql.ref(rowIdField)} = ${sql.val(op.row_id)}
+          limit ${sql.val(1)}
+        `.execute(args.ctx.trx);
+                const loadedRow = loadedRows.rows[0];
+                if (loadedRow && isRecord(loadedRow)) {
+                    existingRow = loadedRow;
+                }
+            }
+            const nextPayload = await yjsModule.applyPayload({
+                table: op.table,
+                rowId: op.row_id,
+                payload: op.payload,
+                existingRow,
+            });
+            if (nextPayload === op.payload)
+                return op;
+            return {
+                ...op,
+                payload: nextPayload,
+            };
+        },
+        async afterApplyOperation(args) {
+            return await materializeAppliedResult(yjsModule, args.op.table, args.applied);
+        },
+    };
+}
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,wBAAwB,GAEzB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAEzB,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC;AAEvC,MAAM,cAAc,GAClB,kEAAkE,CAAC;AAoHrE,SAAS,QAAQ,CAAC,KAAc,EAAoC;IAClE,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAAA,CAC7E;AAED,SAAS,UAAU,CAAC,KAAc,EAAiB;IACjD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;AAAA,CACrE;AAED,SAAS,aAAa,CAAC,KAAiB,EAAU;IAChD,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC;AAAA,CACrB;AAED,SAAS,0BAA0B,CAAC,KAAiB,EAAiB;IACpE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACpC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;QACvD,IAAI,CAAC,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC;YAAE,OAAO,IAAI,CAAC;QAC3D,OAAO,OAAO,CAAC;IACjB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AAAA,CACF;AAED,SAAS,aAAa,CAAC,MAAc,EAAc;IACjD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC1C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,GAAG,CAAC;AAAA,CACZ;AAED,SAAS,iBAAiB,CAAC,KAAc,EAAqB;IAC5D,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,0BAA0B,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,OAAO;YAAE,OAAO,aAAa,CAAC,OAAO,CAAC,CAAC;QAC3C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IAC9B,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACtB,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC;AAAA,CAC3B;AAED,SAAS,kBAAkB,CAAC,KAAc,EAAiB;IACzD,MAAM,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IAC9B,IAAI,GAAG;QAAE,OAAO,GAAG,CAAC;IACpB,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,0BAA0B,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,OAAO;YAAE,OAAO,OAAO,CAAC;QAC5B,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IACD,OAAO,IAAI,CAAC;AAAA,CACb;AAED,SAAS,kBAAkB,CAAC,UAAmB,EAAS;IACtD,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC;IACxB,MAAM,KAAK,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAC5C,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,GAAG,CAAC;AAAA,CACZ;AAED,SAAS,oBAAoB,CAAC,GAAU,EAAU;IAChD,OAAO,aAAa,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;AAAA,CAClD;AAED,SAAS,mBAAmB,CAAC,GAAU,EAAE,YAAoB,EAAU;IACrE,OAAO,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC;AAAA,CAC7C;AAED,SAAS,0BAA0B,CAAC,GAAU,EAAE,YAAoB,EAAU;IAC5E,OAAO,GAAG,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC;AAAA,CACpD;AAED,SAAS,WAAW,CAAC,GAAU,EAAE,YAAoB,EAAE,QAAgB,EAAQ;IAC7E,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACvC,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC;IAClC,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACjB,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC3B,CAAC;IAAA,CACF,CAAC,CAAC;AAAA,CACJ;AAED,SAAS,SAAS,CAAC,GAAU,EAAE,YAAoB,EAAE,QAAgB,EAAQ;IAC3E,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACvC,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IACpC,IAAI,WAAW,KAAK,QAAQ;QAAE,OAAO;IAErC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAChE,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,OACE,YAAY,GAAG,SAAS;QACxB,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,EAC1E,CAAC;QACD,YAAY,IAAI,CAAC,CAAC;IACpB,CAAC;IAED,IAAI,kBAAkB,GAAG,WAAW,CAAC,MAAM,CAAC;IAC5C,IAAI,eAAe,GAAG,QAAQ,CAAC,MAAM,CAAC;IACtC,OACE,kBAAkB,GAAG,YAAY;QACjC,eAAe,GAAG,YAAY;QAC9B,WAAW,CAAC,UAAU,CAAC,kBAAkB,GAAG,CAAC,CAAC;YAC5C,QAAQ,CAAC,UAAU,CAAC,eAAe,GAAG,CAAC,CAAC,EAC1C,CAAC;QACD,kBAAkB,IAAI,CAAC,CAAC;QACxB,eAAe,IAAI,CAAC,CAAC;IACvB,CAAC;IAED,MAAM,YAAY,GAAG,kBAAkB,GAAG,YAAY,CAAC;IACvD,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;IAEpE,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACjB,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QAC3C,CAAC;IAAA,CACF,CAAC,CAAC;AAAA,CACJ;AAED,SAAS,oBAAoB,CAC3B,GAAU,EACV,IAAgC,EACvB;IACT,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACzB,OAAO,mBAAmB,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACrD,CAAC;IACD,OAAO,0BAA0B,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;AAAA,CAC3D;AAED,SAAS,wBAAwB,CAC/B,GAAU,EACV,IAAgC,EAChC,MAA+B,EACzB;IACN,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM;QAAE,OAAO;IACjC,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACnD,IAAI,WAAW,EAAE,CAAC;QAChB,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IACnD,CAAC;AAAA,CACF;AAED,SAAS,cAAc,GAAW;IAChC,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC;IACjD,IAAI,OAAO,UAAU,KAAK,UAAU,EAAE,CAAC;QACrC,OAAO,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IACD,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACnC,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACpD,OAAO,OAAO,EAAE,IAAI,GAAG,EAAE,CAAC;AAAA,CAC3B;AAED,SAAS,cAAc,CAAC,KAAoC,EAG1D;IACA,MAAM,KAAK,GAAc,IAAI,GAAG,EAAE,CAAC;IACnC,MAAM,eAAe,GAAiC,EAAE,CAAC;IACzD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAE/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC9D,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC9D,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,EAAE,CAAC;QAC/C,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CACb,wCAAwC,IAAI,CAAC,KAAK,aAAa,IAAI,CAAC,KAAK,GAAG,CAC7E,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEd,MAAM,QAAQ,GAA+B;YAC3C,GAAG,IAAI;YACP,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,KAAK;YAC7C,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,IAAI;YACnC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,MAAM;SAC1B,CAAC;QACF,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE/B,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;QAC1D,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACzC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC;AAAA,CACnC;AAED,SAAS,uBAAuB,CAC9B,KAAc,EACd,OAAe,EACU;IACzB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,oBAAoB,CAAC,CAAC;IAClD,CAAC;IACD,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACpD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,sCAAsC,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CACb,GAAG,OAAO,iDAAiD,CAC5D,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;AAAA,CACnC;AAED,SAAS,wBAAwB,CAC/B,KAAc,EACd,OAAe,EACY;IAC3B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAC5B,uBAAuB,CAAC,KAAK,EAAE,GAAG,OAAO,IAAI,CAAC,GAAG,CAAC,CACnD,CAAC;IACJ,CAAC;IACD,OAAO,CAAC,uBAAuB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;AAAA,CAClD;AAED;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAA4B,EACO;IACnC,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,MAAM,CAAC;IACjD,MAAM,GAAG,GAAG,kBAAkB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACzD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACtC,SAAS,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;QAC/D,MAAM,QAAQ,GAAG,mBAAmB,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QACxD,MAAM,eAAe,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;QAElD,OAAO;YACL,MAAM,EAAE;gBACN,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,cAAc,EAAE;gBAC3C,YAAY,EAAE,MAAM;aACrB;YACD,eAAe;YACf,QAAQ;SACT,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,GAAG,CAAC,OAAO,EAAE,CAAC;IAChB,CAAC;AAAA,CACF;AAED,KAAK,UAAU,uBAAuB,CAAC,IAMtC,EAAoC;IACnC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9C,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACvD,MAAM,IAAI,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC9B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;IAED,IAAI,OAAO,GAAmC,IAAI,CAAC;IACnD,MAAM,SAAS,GAAG,GAA4B,EAAE,CAAC;QAC/C,IAAI,OAAO;YAAE,OAAO,OAAO,CAAC;QAC5B,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,OAAO,OAAO,CAAC;IAAA,CAChB,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC;QACnC,MAAM,WAAW,GAAG,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW;YAAE,SAAS;QAE3B,MAAM,GAAG,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAC5C,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,oBAAoB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAClD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE,CAAC;gBACrC,SAAS,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;YACtC,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC;IACH,CAAC;IAED,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC;QACnC,IAAI,IAAI,CAAC,WAAW,IAAI,MAAM,EAAE,CAAC;YAC/B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;YAC3B,OAAO,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,OAAO,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC;AAAA,CAC5B;AAED,KAAK,UAAU,yBAAyB,CAAC,IAQxC,EAAoC;IACnC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAEnD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,IAAI,WAAW,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CACb,oCAAoC,IAAI,CAAC,KAAK,0BAA0B,CACzE,CAAC;QACJ,CAAC;QACD,IAAI,IAAI,CAAC,aAAa,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YACpD,MAAM,IAAI,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC9B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,IAAI,WAAW,GAAmC,IAAI,CAAC;IACvD,MAAM,aAAa,GAAG,GAA4B,EAAE,CAAC;QACnD,IAAI,WAAW;YAAE,OAAO,WAAW,CAAC;QACpC,WAAW,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAClC,OAAO,WAAW,CAAC;IAAA,CACpB,CAAC;IAEF,MAAM,cAAc,GAAG,WAAW,CAAC;IACnC,IAAI,cAAc,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC9D,MAAM,IAAI,KAAK,CACb,oBAAoB,IAAI,CAAC,WAAW,kCAAkC,IAAI,CAAC,KAAK,GAAG,CACpF,CAAC;IACJ,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,KAAK,MAAM,CAAC,KAAK,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;YACrE,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;oBAChB,MAAM,IAAI,KAAK,CACb,yCAAyC,KAAK,eAAe,IAAI,CAAC,KAAK,GAAG,CAC3E,CAAC;gBACJ,CAAC;gBACD,SAAS;YACX,CAAC;YAED,MAAM,OAAO,GAAG,wBAAwB,CACtC,cAAc,EACd,OAAO,IAAI,CAAC,KAAK,IAAI,KAAK,EAAE,CAC7B,CAAC;YAEF,MAAM,MAAM,GAAG,WAAW,IAAI,IAAI,CAAC,OAAO,CAAC;YAC3C,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC;YAChD,MAAM,SAAS,GACb,CAAC,cAAc;gBACb,CAAC,CAAC,kBAAkB,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACtD,CAAC,CAAC,IAAI,CAAC;gBACT,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAC5C,IAAI,CAAC;YAEP,MAAM,GAAG,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;YAC1C,IAAI,CAAC;gBACH,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,wBAAwB,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;gBAC9C,CAAC;gBAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;oBAC7B,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;gBACzD,CAAC;gBAED,MAAM,SAAS,GAAG,oBAAoB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBAClD,MAAM,eAAe,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;gBAClD,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;gBAC/B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;gBAC/B,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,eAAe,CAAC;YAC7C,CAAC;oBAAS,CAAC;gBACT,GAAG,CAAC,OAAO,EAAE,CAAC;YAChB,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,WAAW,IAAI,IAAI,CAAC,OAAO,CAAC;QAC3C,IAAI,IAAI,CAAC,WAAW,IAAI,MAAM,EAAE,CAAC;YAC/B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;YAC/B,OAAO,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,OAAO,WAAW,IAAI,IAAI,CAAC,OAAO,CAAC;AAAA,CACpC;AAED,MAAM,UAAU,qBAAqB,CACnC,OAAqC,EACpB;IACjB,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,eAAe,CAAC;IAC3D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC;IACtC,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,IAAI,CAAC;IACpD,MAAM,EAAE,KAAK,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhD,OAAO;QACL,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,iBAAiB;QACvC,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,WAAW;QAEX,KAAK,CAAC,YAAY,CAAC,IAAI,EAAoC;YACzD,OAAO,MAAM,yBAAyB,CAAC;gBACrC,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,KAAK;gBACL,WAAW;gBACX,aAAa;gBACb,MAAM;aACP,CAAC,CAAC;QAAA,CACJ;QAED,KAAK,CAAC,cAAc,CAAC,IAAI,EAAoC;YAC3D,OAAO,MAAM,uBAAuB,CAAC;gBACnC,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,KAAK;gBACL,WAAW;gBACX,aAAa;aACd,CAAC,CAAC;QAAA,CACJ;KACF,CAAC;AAAA,CACH;AAED,SAAS,yBAAyB,CAChC,KAAoC,EACf;IACrB,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEnD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC;QAC3C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,QAAQ,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CACb,wBAAwB,IAAI,CAAC,KAAK,gCAAgC,CACnE,CAAC;QACJ,CAAC;QACD,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,gBAAgB,CAAC;AAAA,CACzB;AAED,KAAK,UAAU,wBAAwB,CACrC,SAA0B,EAC1B,OAAe,EACf,OAA6B,EACE;IAC/B,IAAI,UAAU,GAAmC,OAAO,CAAC,MAAM,CAAC;IAChE,IAAI,aAAa,GAAG,KAAK,CAAC;IAE1B,IAAI,UAAU,CAAC,MAAM,KAAK,UAAU,IAAI,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QACxE,MAAM,qBAAqB,GAAG,MAAM,SAAS,CAAC,cAAc,CAAC;YAC3D,KAAK,EAAE,OAAO;YACd,GAAG,EAAE,UAAU,CAAC,UAAU;SAC3B,CAAC,CAAC;QACH,IAAI,qBAAqB,KAAK,UAAU,CAAC,UAAU,EAAE,CAAC;YACpD,UAAU,GAAG;gBACX,GAAG,UAAU;gBACb,UAAU,EAAE,qBAAqB;aAClC,CAAC;YACF,aAAa,GAAG,IAAI,CAAC;QACvB,CAAC;IACH,CAAC;IAED,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,MAAM,WAAW,GAA2C,EAAE,CAAC;IAC/D,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;QAC7C,IAAI,OAAO,CAAC,EAAE,KAAK,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3D,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,SAAS;QACX,CAAC;QAED,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,cAAc,CAAC;YACrD,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,GAAG,EAAE,OAAO,CAAC,QAAQ;SACtB,CAAC,CAAC;QACH,IAAI,eAAe,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC;YACzC,cAAc,GAAG,IAAI,CAAC;YACtB,WAAW,CAAC,IAAI,CAAC;gBACf,GAAG,OAAO;gBACV,QAAQ,EAAE,eAAe;aAC1B,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QAED,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI,CAAC,aAAa,IAAI,CAAC,cAAc,EAAE,CAAC;QACtC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,cAAc,EAAE,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc;KACtE,CAAC;AAAA,CACH;AAED,MAAM,UAAU,yBAAyB,CACvC,OAAyC,EACnB;IACtB,MAAM,SAAS,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,gBAAgB,GAAG,yBAAyB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAElE,OAAO;QACL,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI;QACpC,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,wBAAwB,CAAC,IAAI;QAE3D,KAAK,CAAC,oBAAoB,CAAC,IAAI,EAAE;YAC/B,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;YACnB,IAAI,EAAE,CAAC,EAAE,KAAK,QAAQ,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBAChD,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,MAAM,UAAU,GAAG,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;YAClD,IAAI,WAAW,GAAmC,IAAI,CAAC;YAEvD,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,UAAU,GAAG,MAAM,GAAG,CAAyB;;iBAE5C,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC;kBAClB,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC;kBAC3C,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SACnB,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACxB,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACrC,IAAI,SAAS,IAAI,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;oBACrC,WAAW,GAAG,SAAS,CAAC;gBAC1B,CAAC;YACH,CAAC;YAED,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,YAAY,CAAC;gBAC/C,KAAK,EAAE,EAAE,CAAC,KAAK;gBACf,KAAK,EAAE,EAAE,CAAC,MAAM;gBAChB,OAAO,EAAE,EAAE,CAAC,OAAO;gBACnB,WAAW;aACZ,CAAC,CAAC;YAEH,IAAI,WAAW,KAAK,EAAE,CAAC,OAAO;gBAAE,OAAO,EAAE,CAAC;YAC1C,OAAO;gBACL,GAAG,EAAE;gBACL,OAAO,EAAE,WAAW;aACrB,CAAC;QAAA,CACH;QAED,KAAK,CAAC,mBAAmB,CAAC,IAAI,EAAE;YAC9B,OAAO,MAAM,wBAAwB,CACnC,SAAS,EACT,IAAI,CAAC,EAAE,CAAC,KAAK,EACb,IAAI,CAAC,OAAO,CACb,CAAC;QAAA,CACH;KACF,CAAC;AAAA,CACH"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syncular/server-plugin-yjs",
-  "version": "0.0.0",
+  "version": "0.0.6-165",
   "description": "Yjs CRDT server integration primitives for Syncular handlers",
   "license": "Apache-2.0",
   "author": "Benjamin Kniffler",
@@ -51,7 +51,7 @@
     "src"
   ],
   "dependencies": {
-    "@syncular/server": "0.0.0",
+    "@syncular/server": "0.0.6-165",
     "kysely": "^0.28.11",
     "yjs": "^13.6.29"
   }

package/src/index.test.ts

@@ -61,7 +61,50 @@ function createXmlInsert(
   };
 }
 
+function applyTextUpdates(args: {
+  previousStateBase64?: string;
+  updates: readonly YjsServerUpdateEnvelope[];
+  containerKey?: string;
+}): string {
+  const doc = new Y.Doc();
+  if (args.previousStateBase64) {
+    Y.applyUpdate(
+      doc,
+      new Uint8Array(Buffer.from(args.previousStateBase64, 'base64'))
+    );
+  }
+  for (const update of args.updates) {
+    Y.applyUpdate(
+      doc,
+      new Uint8Array(Buffer.from(update.updateBase64, 'base64'))
+    );
+  }
+  const text = doc.getText(args.containerKey ?? 'content').toString();
+  doc.destroy();
+  return text;
+}
+
 describe('@syncular/server-plugin-crdt-yjs', () => {
+  it('buildYjsTextUpdate merges concurrent prepend and append without duplication', async () => {
+    const base = await createUpdate('123');
+    const prepend = await createUpdate('0123', base.state);
+    const append = await createUpdate('1234', base.state);
+
+    const mergedForward = applyTextUpdates({
+      previousStateBase64: base.state,
+      updates: [prepend.update, append.update],
+      containerKey: 'content',
+    });
+    const mergedReverse = applyTextUpdates({
+      previousStateBase64: base.state,
+      updates: [append.update, prepend.update],
+      containerKey: 'content',
+    });
+
+    expect(mergedForward).toBe('01234');
+    expect(mergedReverse).toBe('01234');
+  });
+
   it('applies Yjs envelopes against existing row state and strips envelope key', async () => {
     const module = createYjsServerModule({
       rules: [

package/src/index.ts

@@ -229,6 +229,45 @@ function replaceText(doc: Y.Doc, containerKey: string, nextText: string): void {
   });
 }
 
+function patchText(doc: Y.Doc, containerKey: string, nextText: string): void {
+  const text = doc.getText(containerKey);
+  const currentText = text.toString();
+  if (currentText === nextText) return;
+
+  const minLength = Math.min(currentText.length, nextText.length);
+  let prefixLength = 0;
+  while (
+    prefixLength < minLength &&
+    currentText.charCodeAt(prefixLength) === nextText.charCodeAt(prefixLength)
+  ) {
+    prefixLength += 1;
+  }
+
+  let currentSuffixStart = currentText.length;
+  let nextSuffixStart = nextText.length;
+  while (
+    currentSuffixStart > prefixLength &&
+    nextSuffixStart > prefixLength &&
+    currentText.charCodeAt(currentSuffixStart - 1) ===
+      nextText.charCodeAt(nextSuffixStart - 1)
+  ) {
+    currentSuffixStart -= 1;
+    nextSuffixStart -= 1;
+  }
+
+  const deleteLength = currentSuffixStart - prefixLength;
+  const insertSegment = nextText.slice(prefixLength, nextSuffixStart);
+
+  doc.transact(() => {
+    if (deleteLength > 0) {
+      text.delete(prefixLength, deleteLength);
+    }
+    if (insertSegment.length > 0) {
+      text.insert(prefixLength, insertSegment);
+    }
+  });
+}
+
 function materializeRuleValue(
   doc: Y.Doc,
   rule: ResolvedYjsServerFieldRule
@@ -360,7 +399,7 @@ export async function buildYjsTextUpdate(
   const doc = createDocFromState(args.previousStateBase64);
   try {
     const from = Y.encodeStateVector(doc);
-    replaceText(doc, containerKey, args.nextText);
+    patchText(doc, containerKey, args.nextText);
     const update = bytesToBase64(Y.encodeStateAsUpdate(doc, from));
     const nextText = ensureTextContainer(doc, containerKey);
     const nextStateBase64 = exportSnapshotBase64(doc);