@fluidframework/merge-tree 1.2.1 → 2.0.0-internal.1.0.0

package/src/segmentPropertiesManager.ts

@@ -6,7 +6,7 @@
  /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
 import { assert } from "@fluidframework/common-utils";
-import { UnassignedSequenceNumber } from "./constants";
+import { UnassignedSequenceNumber, UniversalSequenceNumber } from "./constants";
 import { ICombiningOp, IMergeTreeAnnotateMsg } from "./ops";
 import {
     combine,
@@ -15,6 +15,17 @@ import {
     PropertySet,
 } from "./properties";
 
+export enum PropertiesRollback {
+    /** Not in a rollback */
+    None,
+
+    /** Rollback */
+    Rollback,
+
+    /** Rollback of a rewrite */
+    Rewrite,
+}
+
 export class PropertiesManager {
     private pendingKeyUpdateCount: MapLike<number> | undefined;
     private pendingRewriteCount: number;
@@ -24,11 +35,20 @@ export class PropertiesManager {
     }
 
     public ackPendingProperties(annotateOp: IMergeTreeAnnotateMsg) {
-        if (annotateOp.combiningOp && annotateOp.combiningOp.name === "rewrite") {
+        const rewrite = !!annotateOp.combiningOp && annotateOp.combiningOp.name === "rewrite";
+        this.decrementPendingCounts(rewrite, annotateOp.props);
+    }
+
+    private decrementPendingCounts(rewrite: boolean, props: PropertySet) {
+        if (rewrite) {
             this.pendingRewriteCount--;
         }
-        for (const key of Object.keys(annotateOp.props)) {
+        for (const key of Object.keys(props)) {
             if (this.pendingKeyUpdateCount?.[key] !== undefined) {
+                if (rewrite && props[key] === null) {
+                    // We don't track the pending count for this redundant case
+                    continue;
+                }
                 assert(this.pendingKeyUpdateCount[key] > 0,
                     0x05c /* "Trying to update more annotate props than do exist!" */);
                 this.pendingKeyUpdateCount[key]--;
@@ -45,21 +65,35 @@ export class PropertiesManager {
         newProps: PropertySet,
         op?: ICombiningOp,
         seq?: number,
-        collaborating: boolean = false): PropertySet | undefined {
+        collaborating: boolean = false,
+        rollback: PropertiesRollback = PropertiesRollback.None): PropertySet | undefined {
         if (!this.pendingKeyUpdateCount) {
             this.pendingKeyUpdateCount = createMap<number>();
         }
 
         // There are outstanding local rewrites, so block all non-local changes
-        if (this.pendingRewriteCount > 0 && seq !== UnassignedSequenceNumber && collaborating) {
+        if (this.pendingRewriteCount > 0 && seq !== UnassignedSequenceNumber && seq !== UniversalSequenceNumber
+            && collaborating) {
             return undefined;
         }
 
+        // Clean up counts for rolled back edits before modifying oldProps
+        if (collaborating) {
+            if (rollback === PropertiesRollback.Rollback) {
+                this.decrementPendingCounts(false, newProps);
+            } else if (rollback === PropertiesRollback.Rewrite) {
+                // oldProps is the correct props for tracking counts on rewrite because the ones in newProps include
+                // those that were implicitly cleared by the rewrite for which we don't track pending counts.
+                this.decrementPendingCounts(true, oldProps);
+            }
+        }
+
         const rewrite = (op && op.name === "rewrite");
         const combiningOp = !rewrite ? op ? op : undefined : undefined;
 
         const shouldModifyKey = (key: string): boolean => {
             if (seq === UnassignedSequenceNumber
+                || seq === UniversalSequenceNumber
                 || this.pendingKeyUpdateCount?.[key] === undefined
                 || combiningOp) {
                 return true;
@@ -87,6 +121,11 @@ export class PropertiesManager {
         for (const key of Object.keys(newProps)) {
             if (collaborating) {
                 if (seq === UnassignedSequenceNumber) {
+                    if (rewrite && newProps[key] === null) {
+                        // This case has already been handled above and
+                        // we don't want to track the pending count for it in case of rollback
+                        continue;
+                    }
                     if (this.pendingKeyUpdateCount?.[key] === undefined) {
                         this.pendingKeyUpdateCount[key] = 0;
                     }
@@ -97,7 +136,7 @@ export class PropertiesManager {
             }
 
             const previousValue: any = oldProps[key];
-            // The delta should be null if undefined, as thats how we encode delete
+            // The delta should be null if undefined, as that's how we encode delete
             deltas[key] = (previousValue === undefined) ? null : previousValue;
             let newValue: any;
             if (combiningOp) {

package/src/snapshotLoader.ts

@@ -14,7 +14,7 @@ import { ITelemetryLogger } from "@fluidframework/common-definitions";
 import { AttachState } from "@fluidframework/container-definitions";
 import { Client } from "./client";
 import { NonCollabClient, UniversalSequenceNumber } from "./constants";
-import { ISegment, MergeTree } from "./mergeTree";
+import { ISegment } from "./mergeTreeNodes";
 import { IJSONSegment } from "./ops";
 import {
     IJSONSegmentWithMergeInfo,
@@ -23,6 +23,7 @@ import {
 } from "./snapshotChunks";
 import { SnapshotV1 } from "./snapshotV1";
 import { SnapshotLegacy } from "./snapshotlegacy";
+import { MergeTree } from "./mergeTree";
 
 export class SnapshotLoader {
     private readonly logger: ITelemetryLogger;

package/src/snapshotV1.ts

@@ -14,8 +14,7 @@ import { SummaryTreeBuilder } from "@fluidframework/runtime-utils";
 import { UnassignedSequenceNumber } from "./constants";
 import {
     ISegment,
-    MergeTree,
-} from "./mergeTree";
+} from "./mergeTreeNodes";
 import {
     matchProperties,
     PropertySet,
@@ -29,6 +28,7 @@ import {
     serializeAsMaxSupportedVersion,
 } from "./snapshotChunks";
 import { SnapshotLegacy } from "./snapshotlegacy";
+import { MergeTree } from "./mergeTree";
 
 export class SnapshotV1 {
     // Split snapshot into two entries - headers (small) and body (overflow) for faster loading initial content

package/src/snapshotlegacy.ts

@@ -16,14 +16,14 @@ import { SummaryTreeBuilder } from "@fluidframework/runtime-utils";
 import { NonCollabClient, UnassignedSequenceNumber } from "./constants";
 import {
     ISegment,
-    MergeTree,
-} from "./mergeTree";
+} from "./mergeTreeNodes";
 import { IJSONSegment } from "./ops";
 import { matchProperties } from "./properties";
 import {
     MergeTreeChunkLegacy,
     serializeAsMinSupportedVersion,
 } from "./snapshotChunks";
+import { MergeTree } from "./mergeTree";
 
 interface SnapshotHeader {
     chunkCount?: number;
@@ -36,6 +36,10 @@ interface SnapshotHeader {
     minSeq?: number;
 }
 
+/**
+ * @deprecated  for internal use only. public export will be removed.
+ * @internal
+ */
 export class SnapshotLegacy {
     public static readonly header = "header";
     public static readonly body = "body";

package/src/sortedSegmentSet.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { ISegment } from "./mergeTree";
+import { ISegment } from "./mergeTreeNodes";
 
 /**
  * Stores a unique and sorted set of segments, or objects with segments

package/src/textSegment.ts

@@ -3,8 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { IIntegerRange } from "./base";
-import { BaseSegment, ISegment, Marker, MergeTree } from "./mergeTree";
+import { BaseSegment, ISegment, Marker } from "./mergeTreeNodes";
 import { IJSONSegment } from "./ops";
 import { PropertySet } from "./properties";
 import { LocalReferenceCollection } from "./localReference";
@@ -121,159 +120,13 @@ export class TextSegment extends BaseSegment {
     }
 }
 
-interface ITextAccumulator {
-    textSegment: TextSegment;
-    placeholder?: string;
-    parallelArrays?: boolean;
-}
-
-interface ITextAndMarkerAccumulator extends ITextAccumulator {
-    parallelArrays: true;
-    parallelText: string[];
-    parallelMarkers: Marker[];
-    parallelMarkerLabel: string;
-    tagsInProgress: string[];
-}
-
-function isTextAndMarkerAccumulator(accum: ITextAccumulator): accum is ITextAndMarkerAccumulator {
-    return accum.parallelArrays === true;
-}
-
-type ITextAccumulatorType = ITextAccumulator | ITextAndMarkerAccumulator;
-export class MergeTreeTextHelper {
-    constructor(private readonly mergeTree: MergeTree) { }
-
-    public getTextAndMarkers(refSeq: number, clientId: number, label: string, start?: number, end?: number) {
-        const range = this.getValidRange(start, end, refSeq, clientId);
-        const accum: ITextAndMarkerAccumulator = {
-            parallelArrays: true,
-            parallelMarkerLabel: label,
-            parallelMarkers: [],
-            parallelText: [],
-            tagsInProgress: [],
-            textSegment: new TextSegment(""),
-        };
-
-        this.mergeTree.mapRange<ITextAndMarkerAccumulator>(
-            { leaf: this.gatherText },
-            refSeq,
-            clientId,
-            accum,
-            range.start,
-            range.end);
-
-        return { parallelText: accum.parallelText, parallelMarkers: accum.parallelMarkers };
-    }
-
-    public getText(refSeq: number, clientId: number, placeholder = "", start?: number, end?: number) {
-        const range = this.getValidRange(start, end, refSeq, clientId);
-
-        const accum: ITextAccumulator = { textSegment: new TextSegment(""), placeholder };
-
-        this.mergeTree.mapRange<ITextAccumulator>(
-            { leaf: this.gatherText },
-            refSeq,
-            clientId,
-            accum,
-            range.start,
-            range.end);
-        return accum.textSegment.text;
-    }
-
-    private getValidRange(
-        start: number | undefined,
-        end: number | undefined,
-        refSeq: number,
-        clientId: number,
-    ): IIntegerRange {
-        const range: IIntegerRange = {
-            end: end ?? this.mergeTree.getLength(refSeq, clientId),
-            start: start ?? 0,
-        };
-        return range;
-    }
-
-    private readonly gatherText = (segment: ISegment, pos: number, refSeq: number, clientId: number, start: number,
-        end: number, accumText: ITextAccumulatorType) => {
-        let _start = start;
-        if (TextSegment.is(segment)) {
-            let beginTags = "";
-            let endTags = "";
-            if (isTextAndMarkerAccumulator(accumText)) {
-                // TODO: let clients pass in function to get tag
-                const tags = [] as string[];
-                const initTags = [] as string[];
-
-                if (segment.properties?.["font-weight"]) {
-                    tags.push("b");
-                }
-                if (segment.properties?.["text-decoration"]) {
-                    tags.push("u");
-                }
-                const remTags = [] as string[];
-                if (tags.length > 0) {
-                    for (const tag of tags) {
-                        if (!accumText.tagsInProgress.includes(tag)) {
-                            beginTags += `<${tag}>`;
-                            initTags.push(tag);
-                        }
-                    }
-                    for (const accumTag of accumText.tagsInProgress) {
-                        if (!tags.includes(accumTag)) {
-                            endTags += `</${accumTag}>`;
-                            remTags.push(accumTag);
-                        }
-                    }
-                    for (const initTag of initTags.reverse()) {
-                        accumText.tagsInProgress.push(initTag);
-                    }
-                } else {
-                    for (const accumTag of accumText.tagsInProgress) {
-                        endTags += `</${accumTag}>`;
-                        remTags.push(accumTag);
-                    }
-                }
-                for (const remTag of remTags) {
-                    const remdex = accumText.tagsInProgress.indexOf(remTag);
-                    if (remdex >= 0) {
-                        accumText.tagsInProgress.splice(remdex, 1);
-                    }
-                }
-            }
-            accumText.textSegment.text += endTags;
-            accumText.textSegment.text += beginTags;
-            if ((_start <= 0) && (end >= segment.text.length)) {
-                accumText.textSegment.text += segment.text;
-            } else {
-                if (_start < 0) {
-                    _start = 0;
-                }
-                if (end >= segment.text.length) {
-                    accumText.textSegment.text += segment.text.substring(_start);
-                } else {
-                    accumText.textSegment.text += segment.text.substring(_start, end);
-                }
-            }
-        } else {
-            if (accumText.placeholder && (accumText.placeholder.length > 0)) {
-                if (accumText.placeholder === "*") {
-                    const marker = segment as Marker;
-                    accumText.textSegment.text += `\n${marker.toString()}`;
-                } else {
-                    for (let i = 0; i < segment.cachedLength; i++) {
-                        accumText.textSegment.text += accumText.placeholder;
-                    }
-                }
-            } else if (isTextAndMarkerAccumulator(accumText)) {
-                const marker = segment as Marker;
-                if (marker.hasTileLabel(accumText.parallelMarkerLabel)) {
-                    accumText.parallelMarkers.push(marker);
-                    accumText.parallelText.push(accumText.textSegment.text);
-                    accumText.textSegment.text = "";
-                }
-            }
-        }
-
-        return true;
-    };
+export interface IMergeTreeTextHelper{
+    /**
+     * @deprecated - If consuming via sequence, use `getTextAndMarkers` exported from \@fluidframework/sequence.
+     * Otherwise, define your own accumulation model and use `Client.walkSegments`.
+     */
+    getTextAndMarkers(refSeq: number, clientId: number, label: string, start?: number, end?: number): {
+        parallelText: string[];
+        parallelMarkers: Marker[]; };
+    getText(refSeq: number, clientId: number, placeholder: string, start?: number, end?: number): string;
 }

package/dist/collections.d.ts

@@ -1,197 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
-import { ConflictAction, IIntegerRange, KeyComparer, PropertyAction, SortedDictionary } from "./base";
-export declare class Stack<T> {
-    items: T[];
-    push(val: T): void;
-    empty(): boolean;
-    top(): T | undefined;
-    pop(): T | undefined;
-}
-export declare function ListRemoveEntry<U>(entry: List<U>): List<U> | undefined;
-export declare function ListMakeHead<U>(): List<U>;
-export declare class List<T> {
-    isHead: boolean;
-    data: T | undefined;
-    next: List<T>;
-    prev: List<T>;
-    constructor(isHead: boolean, data: T | undefined);
-    clear(): void;
-    private add;
-    dequeue(): T | undefined;
-    enqueue(data: T): List<T>;
-    walk(fn: (data: T, l: List<T>) => void): void;
-    some(fn: (data: T, l: List<T>) => boolean, rev?: boolean): T[];
-    count(): number;
-    first(): T | undefined;
-    last(): T | undefined;
-    empty(): boolean;
-    /**
-     * @deprecated - use unshift
-     */
-    push(data: T): void;
-    unshift(data: T): void;
-    [Symbol.iterator](): IterableIterator<T>;
-}
-export interface Comparer<T> {
-    compare(a: T, b: T): number;
-    min: T;
-}
-export declare class Heap<T> {
-    comp: Comparer<T>;
-    private L;
-    count(): number;
-    constructor(a: T[], comp: Comparer<T>);
-    peek(): T;
-    get(): T;
-    add(x: T): void;
-    private fixup;
-    private fixDown;
-}
-export declare const RBColor: {
-    readonly RED: 0;
-    readonly BLACK: 1;
-};
-export declare type RBColor = typeof RBColor[keyof typeof RBColor];
-export interface RBNode<TKey, TData> {
-    key: TKey;
-    data: TData;
-    left: RBNode<TKey, TData> | undefined;
-    right: RBNode<TKey, TData> | undefined;
-    color: RBColor;
-    size: number;
-}
-export interface IRBAugmentation<TKey, TData> {
-    update(node: RBNode<TKey, TData>): void;
-}
-export interface IRBMatcher<TKey, TData> {
-    continueSubtree(node: RBNode<TKey, TData> | undefined, key: TKey): boolean;
-    matchNode(node: RBNode<TKey, TData> | undefined, key: TKey): boolean;
-}
-export interface RBNodeActions<TKey, TData> {
-    infix?(node: RBNode<TKey, TData>): boolean;
-    pre?(node: RBNode<TKey, TData>): boolean;
-    post?(node: RBNode<TKey, TData>): boolean;
-    showStructure?: boolean;
-}
-export declare class RedBlackTree<TKey, TData> implements SortedDictionary<TKey, TData> {
-    private readonly compareKeys;
-    private readonly aug?;
-    private root;
-    constructor(compareKeys: KeyComparer<TKey>, aug?: IRBAugmentation<TKey, TData> | undefined);
-    private makeNode;
-    private isRed;
-    private nodeSize;
-    size(): number;
-    isEmpty(): boolean;
-    get(key: TKey): RBNode<TKey, TData> | undefined;
-    private nodeGet;
-    private contains;
-    gather(key: TKey, matcher: IRBMatcher<TKey, TData>): RBNode<TKey, TData>[];
-    private nodeGather;
-    walkExactMatchesForward(compareFn: (node: RBNode<TKey, TData>) => number, actionFn: (node: RBNode<TKey, TData>) => void, continueLeftFn: (number: number) => boolean, continueRightFn: (number: number) => boolean): void;
-    private nodeWalkExactMatchesForward;
-    walkExactMatchesBackward(compareFn: (node: RBNode<TKey, TData>) => number, actionFn: (node: RBNode<TKey, TData>) => void, continueLeftFn: (number: number) => boolean, continueRightFn: (number: number) => boolean): void;
-    private nodeWalkExactMatchesBackward;
-    put(key: TKey, data: TData, conflict?: ConflictAction<TKey, TData>): void;
-    private nodePut;
-    private updateLocal;
-    private nodeRemoveMin;
-    remove(key: TKey): void;
-    removeExisting(key: TKey): void;
-    private nodeRemove;
-    floor(key: TKey): RBNode<TKey, TData> | undefined;
-    private nodeFloor;
-    ceil(key: TKey): RBNode<TKey, TData> | undefined;
-    private nodeCeil;
-    min(): RBNode<TKey, TData> | undefined;
-    private nodeMin;
-    max(): RBNode<TKey, TData> | undefined;
-    private nodeMax;
-    private rotateRight;
-    private rotateLeft;
-    private oppositeColor;
-    private flipColors;
-    private moveRedLeft;
-    private moveRedRight;
-    private balance;
-    mapRange<TAccum>(action: PropertyAction<TKey, TData>, accum?: TAccum, start?: TKey, end?: TKey): void;
-    map<TAccum>(action: PropertyAction<TKey, TData>, accum?: TAccum): void;
-    keys(): TKey[];
-    /**
-     * Depth-first traversal with custom action; if action returns
-     * false, traversal is halted.
-     * @param action - action to apply to each node
-     */
-    walk(actions: RBNodeActions<TKey, TData>): void;
-    walkBackward(actions: RBNodeActions<TKey, TData>): void;
-    private nodeWalk;
-    private nodeWalkBackward;
-    private nodeMap;
-}
-export interface AugmentedIntervalNode {
-    minmax: IInterval;
-}
-export declare const integerRangeToString: (range: IIntegerRange) => string;
-export interface IInterval {
-    clone(): IInterval;
-    compare(b: IInterval): number;
-    compareStart(b: IInterval): number;
-    compareEnd(b: IInterval): number;
-    modify(label: string, start: number, end: number, op?: ISequencedDocumentMessage): IInterval | undefined;
-    overlaps(b: IInterval): boolean;
-    union(b: IInterval): IInterval;
-}
-export declare type IntervalNode<T extends IInterval> = RBNode<T, AugmentedIntervalNode>;
-export declare type IntervalConflictResolver<TInterval> = (a: TInterval, b: TInterval) => TInterval;
-export declare class IntervalTree<T extends IInterval> implements IRBAugmentation<T, AugmentedIntervalNode>, IRBMatcher<T, AugmentedIntervalNode> {
-    intervals: RedBlackTree<T, AugmentedIntervalNode>;
-    remove(x: T): void;
-    removeExisting(x: T): void;
-    put(x: T, conflict?: IntervalConflictResolver<T>): void;
-    map(fn: (x: T) => void): void;
-    mapUntil(fn: (X: T) => boolean): void;
-    mapBackward(fn: (x: T) => void): void;
-    match(x: T): RBNode<T, AugmentedIntervalNode>[];
-    matchNode(node: IntervalNode<T> | undefined, key: T): boolean;
-    continueSubtree(node: IntervalNode<T> | undefined, key: T): boolean;
-    update(node: IntervalNode<T>): void;
-}
-export interface TSTResult<T> {
-    key: string;
-    val: T;
-}
-export interface TSTNode<T> {
-    c: string;
-    left?: TSTNode<T>;
-    mid?: TSTNode<T>;
-    right?: TSTNode<T>;
-    val?: T;
-}
-export interface ProxString<T> {
-    text: string;
-    invDistance: number;
-    val: T;
-}
-export declare class TST<T> {
-    private n;
-    private root;
-    size(): number;
-    private contains;
-    get(key: string): T | undefined;
-    private nodeGet;
-    put(key: string, val: T): void;
-    private nodePut;
-    neighbors(text: string, distance?: number): ProxString<T>[];
-    keysWithPrefix(text: string): string[];
-    private collect;
-    private mapNode;
-    map(fn: (key: string, val: T) => void): void;
-    pairsWithPrefix(text: string): TSTResult<T>[];
-    private collectPairs;
-    private nodeProximity;
-}
-//# sourceMappingURL=collections.d.ts.map

package/dist/collections.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"collections.d.ts","sourceRoot":"","sources":["../src/collections.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EACH,cAAc,EACd,aAAa,EACb,WAAW,EACX,cAAc,EACd,gBAAgB,EACnB,MAAM,QAAQ,CAAC;AAEhB,qBAAa,KAAK,CAAC,CAAC;IACT,KAAK,EAAE,CAAC,EAAE,CAAM;IAChB,IAAI,CAAC,GAAG,EAAE,CAAC;IAIX,KAAK;IAIL,GAAG,IAAI,CAAC,GAAG,SAAS;IAIpB,GAAG,IAAI,CAAC,GAAG,SAAS;CAG9B;AAED,wBAAgB,eAAe,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,CAUtE;AAMD,wBAAgB,YAAY,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAEzC;AAED,qBAAa,IAAI,CAAC,CAAC;IAII,MAAM,EAAE,OAAO;IAAS,IAAI,EAAE,CAAC,GAAG,SAAS;IAHvD,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IACd,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;gBAEF,MAAM,EAAE,OAAO,EAAS,IAAI,EAAE,CAAC,GAAG,SAAS;IAKvD,KAAK,IAAI,IAAI;IAOpB,OAAO,CAAC,GAAG;IASJ,OAAO,IAAI,CAAC,GAAG,SAAS;IAQxB,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IAIzB,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI;IAO7C,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE;IAkB9D,KAAK,IAAI,MAAM;IAWf,KAAK,IAAI,CAAC,GAAG,SAAS;IAMtB,IAAI,IAAI,CAAC,GAAG,SAAS;IAMrB,KAAK,IAAI,OAAO;IAIvB;;OAEG;IACI,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI;IAInB,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI;IAUtB,CAAC,MAAM,CAAC,QAAQ,CAAC;CAmB3B;AAED,MAAM,WAAW,QAAQ,CAAC,CAAC;IACvB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;IAC5B,GAAG,EAAE,CAAC,CAAC;CACV;AAED,qBAAa,IAAI,CAAC,CAAC;IAKY,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IAJ5C,OAAO,CAAC,CAAC,CAAM;IACR,KAAK;gBAGA,CAAC,EAAE,CAAC,EAAE,EAAS,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IAMrC,IAAI;IAIJ,GAAG;IAQH,GAAG,CAAC,CAAC,EAAE,CAAC;IAMf,OAAO,CAAC,KAAK;IAUb,OAAO,CAAC,OAAO;CAiBlB;AAED,eAAO,MAAM,OAAO;;;CAGV,CAAC;AACX,oBAAY,OAAO,GAAG,OAAO,OAAO,CAAC,MAAM,OAAO,OAAO,CAAC,CAAC;AAE3D,MAAM,WAAW,MAAM,CAAC,IAAI,EAAE,KAAK;IAC/B,GAAG,EAAE,IAAI,CAAC;IACV,IAAI,EAAE,KAAK,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,SAAS,CAAC;IACtC,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,SAAS,CAAC;IACvC,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,eAAe,CAAC,IAAI,EAAE,KAAK;IACxC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC;CAC3C;AAED,MAAM,WAAW,UAAU,CAAC,IAAI,EAAE,KAAK;IACnC,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,SAAS,EAAE,GAAG,EAAE,IAAI,GAAG,OAAO,CAAC;IAC3E,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,SAAS,EAAE,GAAG,EAAE,IAAI,GAAG,OAAO,CAAC;CACxE;AAED,MAAM,WAAW,aAAa,CAAC,IAAI,EAAE,KAAK;IACtC,KAAK,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC;IAC3C,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC;IACzC,IAAI,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC;IAC1C,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,qBAAa,YAAY,CAAC,IAAI,EAAE,KAAK,CAAE,YAAW,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC;IAIvE,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;IAJzB,OAAO,CAAC,IAAI,CAAkC;gBAGzB,WAAW,EAAE,WAAW,CAAC,IAAI,CAAC,EAC9B,GAAG,CAAC,0CAA8B;IAGvD,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,QAAQ;IAGT,IAAI;IAGJ,OAAO;IAGP,GAAG,CAAC,GAAG,EAAE,IAAI;IAKpB,OAAO,CAAC,OAAO;IAaf,OAAO,CAAC,QAAQ;IAIT,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC;IAQzD,OAAO,CAAC,UAAU;IAkBX,uBAAuB,CAC1B,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,MAAM,EAChD,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,IAAI,EAC7C,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,EAC3C,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO;IAIhD,OAAO,CAAC,2BAA2B;IAqB5B,wBAAwB,CAC3B,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,MAAM,EAChD,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,IAAI,EAC7C,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,EAC3C,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO;IAIhD,OAAO,CAAC,4BAA4B;IAqB7B,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC;IAWzE,OAAO,CAAC,OAAO;IA+Cf,OAAO,CAAC,WAAW;IAcnB,OAAO,CAAC,aAAa;IAad,MAAM,CAAC,GAAG,EAAE,IAAI;IAWhB,cAAc,CAAC,GAAG,EAAE,IAAI;IAW/B,OAAO,CAAC,UAAU;IAmCX,KAAK,CAAC,GAAG,EAAE,IAAI;IAMtB,OAAO,CAAC,SAAS;IAkBV,IAAI,CAAC,GAAG,EAAE,IAAI;IAMrB,OAAO,CAAC,QAAQ;IAkBT,GAAG;IAMV,OAAO,CAAC,OAAO;IAQR,GAAG;IAMV,OAAO,CAAC,OAAO;IAQf,OAAO,CAAC,WAAW;IAgBnB,OAAO,CAAC,UAAU;IAgBlB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,WAAW;IAanB,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,OAAO;IAmBR,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,IAAI;IAI9F,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM;IAK/D,IAAI;IAaX;;;;OAIG;IACI,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC;IAIxC,YAAY,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC;IAIvD,OAAO,CAAC,QAAQ;IA4BhB,OAAO,CAAC,gBAAgB;IA4BxB,OAAO,CAAC,OAAO;CAiClB;AAED,MAAM,WAAW,qBAAqB;IAClC,MAAM,EAAE,SAAS,CAAC;CACrB;AAED,eAAO,MAAM,oBAAoB,UAAW,aAAa,WAAoC,CAAC;AAE9F,MAAM,WAAW,SAAS;IACtB,KAAK,IAAI,SAAS,CAAC;IACnB,OAAO,CAAC,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAC9B,YAAY,CAAC,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACnC,UAAU,CAAC,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACjC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,yBAAyB,GAAG,SAAS,GAAG,SAAS,CAAC;IACzG,QAAQ,CAAC,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC;IAChC,KAAK,CAAC,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;CAClC;AAGD,oBAAY,YAAY,CAAC,CAAC,SAAS,SAAS,IAAI,MAAM,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC;AACjF,oBAAY,wBAAwB,CAAC,SAAS,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,KAAK,SAAS,CAAC;AAE5F,qBAAa,YAAY,CAAC,CAAC,SAAS,SAAS,CAAE,YAAW,eAAe,CAAC,CAAC,EAAE,qBAAqB,CAAC,EAC/F,UAAU,CAAC,CAAC,EAAE,qBAAqB,CAAC;IAC7B,SAAS,yCAAsE;IAE/E,MAAM,CAAC,CAAC,EAAE,CAAC;IAIX,cAAc,CAAC,CAAC,EAAE,CAAC;IAInB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,wBAAwB,CAAC,CAAC,CAAC;IAahD,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI;IAWtB,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO;IAU9B,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI;IAY9B,KAAK,CAAC,CAAC,EAAE,CAAC;IAIV,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,GAAG,EAAE,CAAC;IAInD,eAAe,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,GAAG,EAAE,CAAC;IAIzD,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;CActC;AAED,MAAM,WAAW,SAAS,CAAC,CAAC;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,CAAC,CAAC;CACV;AAED,MAAM,WAAW,OAAO,CAAC,CAAC;IACtB,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACnB,GAAG,CAAC,EAAE,CAAC,CAAC;CACX;AAMD,MAAM,WAAW,UAAU,CAAC,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,CAAC,CAAC;CACV;AAED,qBAAa,GAAG,CAAC,CAAC;IACd,OAAO,CAAC,CAAC,CAAK;IACd,OAAO,CAAC,IAAI,CAAyB;IAE9B,IAAI;IAIX,OAAO,CAAC,QAAQ;IAIT,GAAG,CAAC,GAAG,EAAE,MAAM;IAQtB,OAAO,CAAC,OAAO;IAcR,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IAO9B,OAAO,CAAC,OAAO;IAkBR,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,SAAI;IAOpC,cAAc,CAAC,IAAI,EAAE,MAAM;IAalC,OAAO,CAAC,OAAO;IAYf,OAAO,CAAC,OAAO;IAaR,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK,IAAI;IAIrC,eAAe,CAAC,IAAI,EAAE,MAAM;IAanC,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,aAAa;CAkCxB"}