@fiduswriter/editor 0.1.0

package/dist/collab/merge/recreate_transform.js

@@ -0,0 +1,259 @@
+// See https://gitlab.com/mpapp-public/prosemirror-recreate-steps/blob/master/src/recreate.js
+// We only need this file from the prosemirror-recreate-steps (apache) project, so it's copied
+// in here.
+import { diffChars, diffWordsWithSpace } from "diff";
+import { ReplaceStep, Transform } from "prosemirror-transform";
+import { applyPatch, createPatch } from "rfc6902";
+function getReplaceStep(fromDoc, toDoc) {
+    let start = toDoc.content.findDiffStart(fromDoc.content);
+    if (start === null) {
+        return false;
+    }
+    let { a: endA, b: endB } = toDoc.content.findDiffEnd(fromDoc.content);
+    const overlap = start - Math.min(endA, endB);
+    if (overlap > 0) {
+        if (
+        // If there is an overlap, there is some freedom of choise in how to calculate the start/end boundary.
+        // for an inserted/removed slice. We choose the extreme with the lowest depth value.
+        fromDoc.resolve(start - overlap).depth <
+            toDoc.resolve(endA + overlap).depth) {
+            start -= overlap;
+        }
+        else {
+            endA += overlap;
+            endB += overlap;
+        }
+    }
+    return new ReplaceStep(start, endB, toDoc.slice(start, endA));
+}
+class RecreateTransform {
+    constructor(fromDoc, toDoc, complexSteps, wordDiffs) {
+        this.fromDoc = fromDoc;
+        this.toDoc = toDoc;
+        this.complexSteps = complexSteps; // Whether to return steps other than ReplaceSteps
+        this.wordDiffs = wordDiffs; // Whether to make text diffs cover entire words
+        this.schema = fromDoc.type.schema;
+        this.tr = new Transform(fromDoc);
+    }
+    init() {
+        if (this.complexSteps) {
+            // For First steps: we create versions of the documents without marks as
+            // these will only confuse the diffing mechanism and marks won't cause
+            // any mapping changes anyway.
+            this.currentJSON = this.marklessDoc(this.fromDoc).toJSON();
+            this.finalJSON = this.marklessDoc(this.toDoc).toJSON();
+            this.ops = createPatch(this.currentJSON, this.finalJSON);
+            this.recreateChangeContentSteps();
+            this.recreateChangeMarkSteps();
+        }
+        else {
+            // We don't differentiate between mark changes and other changes.
+            this.currentJSON = this.fromDoc.toJSON();
+            this.finalJSON = this.toDoc.toJSON();
+            this.ops = createPatch(this.currentJSON, this.finalJSON);
+            this.recreateChangeContentSteps();
+        }
+        this.simplifyTr();
+        return this.tr;
+    }
+    recreateChangeContentSteps() {
+        // First step: find content changing steps.
+        let ops = [], afterStepJSON = JSON.parse(JSON.stringify(this.currentJSON));
+        while (this.ops.length) {
+            let op = this.ops.shift(), toDoc = false;
+            const pathParts = op.path.split("/");
+            ops.push(op);
+            while (!toDoc) {
+                applyPatch(afterStepJSON, [op]);
+                try {
+                    toDoc = this.schema.nodeFromJSON(afterStepJSON);
+                    toDoc.check();
+                }
+                catch (error) {
+                    toDoc = false;
+                    if (this.ops.length) {
+                        op = this.ops.shift();
+                        ops.push(op);
+                    }
+                    else {
+                        throw error;
+                    }
+                }
+            }
+            if (this.complexSteps &&
+                ops.length === 1 &&
+                (pathParts.includes("attrs") || pathParts.includes("type"))) {
+                // Node markup is changing
+                this.addSetNodeMarkup();
+                ops = [];
+                afterStepJSON = JSON.parse(JSON.stringify(this.currentJSON));
+            }
+            else if (ops.length === 1 &&
+                op.op === "replace" &&
+                pathParts[pathParts.length - 1] === "text") {
+                // Text is being replaced, we apply text diffing to find the smallest possible diffs.
+                this.addReplaceTextSteps(op, afterStepJSON);
+                ops = [];
+                afterStepJSON = JSON.parse(JSON.stringify(this.currentJSON));
+            }
+            else {
+                if (this.addReplaceStep(toDoc, afterStepJSON)) {
+                    ops = [];
+                    afterStepJSON = JSON.parse(JSON.stringify(this.currentJSON));
+                }
+            }
+        }
+    }
+    recreateChangeMarkSteps() {
+        // Now the documents should be the same, except their marks, so everything should map 1:1.
+        // Second step: Iterate through the toDoc and make sure all marks are the same in tr.doc
+        this.toDoc.descendants((tNode, tPos) => {
+            if (!tNode.isInline) {
+                return true;
+            }
+            this.tr.doc.nodesBetween(tPos, tPos + tNode.nodeSize, (fNode, fPos) => {
+                if (!fNode.isInline) {
+                    return true;
+                }
+                const from = Math.max(tPos, fPos), to = Math.min(tPos + tNode.nodeSize, fPos + fNode.nodeSize);
+                fNode.marks.forEach(nodeMark => {
+                    if (!nodeMark.isInSet(tNode.marks)) {
+                        this.tr.removeMark(from, to, nodeMark);
+                    }
+                });
+                tNode.marks.forEach(nodeMark => {
+                    if (!nodeMark.isInSet(fNode.marks)) {
+                        this.tr.addMark(from, to, nodeMark);
+                    }
+                });
+            });
+        });
+    }
+    marklessDoc(doc) {
+        const tr = new Transform(doc);
+        tr.removeMark(0, doc.nodeSize - 2);
+        return tr.doc;
+    }
+    // From http://prosemirror.net/examples/footnote/
+    addReplaceStep(toDoc, afterStepJSON) {
+        const fromDoc = this.schema.nodeFromJSON(this.currentJSON), step = getReplaceStep(fromDoc, toDoc);
+        if (!step) {
+            return false;
+        }
+        else if (!this.tr.maybeStep(step).failed) {
+            this.currentJSON = afterStepJSON;
+            return true;
+        }
+        else {
+            throw new Error("No valid step found.");
+        }
+    }
+    addSetNodeMarkup() {
+        const fromDoc = this.schema.nodeFromJSON(this.currentJSON), toDoc = this.schema.nodeFromJSON(this.finalJSON);
+        let updatedSettings = false;
+        Object.entries(fromDoc.attrs).forEach(([key, value]) => {
+            if (toDoc.attrs[key] !== value) {
+                this.tr.setDocAttribute(key, toDoc.attrs[key]);
+                updatedSettings = true;
+            }
+        });
+        if (updatedSettings) {
+            this.currentJSON = this.marklessDoc(this.tr.doc).toJSON();
+            this.ops = createPatch(this.currentJSON, this.finalJSON);
+        }
+        const start = toDoc.content.findDiffStart(fromDoc.content);
+        if (start !== null) {
+            const fromNode = fromDoc.nodeAt(start), toNode = toDoc.nodeAt(start);
+            try {
+                this.tr.setNodeMarkup(start, fromNode.type === toNode.type ? null : toNode.type, toNode.attrs, toNode.marks);
+            }
+            catch (_error) {
+                return;
+            }
+            this.currentJSON = this.marklessDoc(this.tr.doc).toJSON();
+            // Setting the node markup may have invalidated more ops, so we calculate them again.
+            this.ops = createPatch(this.currentJSON, this.finalJSON);
+        }
+    }
+    addReplaceTextSteps(op, afterStepJSON) {
+        // We find the position number of the first character in the string
+        const op1 = Object.assign({}, op, { value: "xx" }), op2 = Object.assign({}, op, { value: "yy" });
+        const afterOP1JSON = JSON.parse(JSON.stringify(this.currentJSON)), afterOP2JSON = JSON.parse(JSON.stringify(this.currentJSON)), pathParts = op.path.split("/");
+        let obj = this.currentJSON;
+        applyPatch(afterOP1JSON, [op1]);
+        applyPatch(afterOP2JSON, [op2]);
+        const op1Doc = this.schema.nodeFromJSON(afterOP1JSON), op2Doc = this.schema.nodeFromJSON(afterOP2JSON);
+        let offset = op1Doc.content.findDiffStart(op2Doc.content);
+        const marks = op1Doc.resolve(offset + 1).marks();
+        pathParts.shift();
+        while (pathParts.length) {
+            const pathPart = pathParts.shift();
+            obj = obj[pathPart];
+        }
+        const finalText = op.value, currentText = obj;
+        const textDiffs = this.wordDiffs
+            ? diffWordsWithSpace(currentText, finalText)
+            : diffChars(currentText, finalText);
+        while (textDiffs.length) {
+            const diff = textDiffs.shift();
+            if (diff.added) {
+                if (textDiffs[0]?.removed) {
+                    const nextDiff = textDiffs.shift();
+                    this.tr.replaceWith(offset, offset + nextDiff.value.length, this.schema
+                        .nodeFromJSON({ type: "text", text: diff.value })
+                        .mark(marks));
+                }
+                else {
+                    this.tr.insert(offset, this.schema
+                        .nodeFromJSON({ type: "text", text: diff.value })
+                        .mark(marks));
+                }
+                offset += diff.value.length;
+            }
+            else if (diff.removed) {
+                if (textDiffs[0]?.added) {
+                    const nextDiff = textDiffs.shift();
+                    this.tr.replaceWith(offset, offset + diff.value.length, this.schema
+                        .nodeFromJSON({ type: "text", text: nextDiff.value })
+                        .mark(marks));
+                    offset += nextDiff.value.length;
+                }
+                else {
+                    this.tr.delete(offset, offset + diff.value.length);
+                }
+            }
+            else {
+                offset += diff.value.length;
+            }
+        }
+        this.currentJSON = afterStepJSON;
+    }
+    // join adjacent ReplaceSteps
+    simplifyTr() {
+        if (!this.tr.steps.length) {
+            return;
+        }
+        const newTr = new Transform(this.tr.docs[0]), oldSteps = this.tr.steps.slice();
+        while (oldSteps.length) {
+            let step = oldSteps.shift();
+            while (oldSteps.length && step.merge(oldSteps[0])) {
+                const addedStep = oldSteps.shift();
+                if (step instanceof ReplaceStep &&
+                    addedStep instanceof ReplaceStep) {
+                    step =
+                        getReplaceStep(newTr.doc, addedStep.apply(step.apply(newTr.doc).doc).doc) || step.merge(addedStep);
+                }
+                else {
+                    step = step.merge(addedStep);
+                }
+            }
+            newTr.step(step);
+        }
+        this.tr = newTr;
+    }
+}
+export function recreateTransform(fromDoc, toDoc, complexSteps = true, wordDiffs = true) {
+    const recreator = new RecreateTransform(fromDoc, toDoc, complexSteps, wordDiffs);
+    return recreator.init();
+}
+//# sourceMappingURL=recreate_transform.js.map

package/dist/collab/merge/recreate_transform.js.map

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

package/dist/collab/merge/schema.js

@@ -0,0 +1,117 @@
+import { Schema } from "prosemirror-model";
+export function parseDiff(str) {
+    if (!str) {
+        return [];
+    }
+    let tracks;
+    try {
+        tracks = JSON.parse(str);
+    }
+    catch (_error) {
+        return [];
+    }
+    if (!Array.isArray(tracks)) {
+        return [];
+    }
+}
+export const createDiffSchema = docSchema => {
+    let specNodes = docSchema.spec.nodes;
+    specNodes.forEach(nodeTypeName => {
+        const nodeType = specNodes.get(nodeTypeName);
+        if (nodeType.group !== "block") {
+            return;
+        }
+        const attrs = nodeType.attrs;
+        specNodes = specNodes.update(nodeTypeName, Object.assign({}, nodeType, {
+            attrs: Object.assign({ diffdata: { default: [] } }, attrs),
+            toDOM: node => {
+                let dom = nodeType.toDOM(node);
+                if (node.attrs.diffdata && node.attrs.diffdata.length) {
+                    if (dom[1].class) {
+                        dom[1].class =
+                            dom[1].class + " " + node.attrs.diffdata[0].type;
+                    }
+                    else {
+                        dom[1]["class"] = node.attrs.diffdata[0].type;
+                    }
+                    dom = [
+                        dom[0],
+                        Object.assign({
+                            "data-diffdata": JSON.stringify(node.attrs.diffdata)
+                        }, dom[1]),
+                        dom[2]
+                    ];
+                }
+                return dom;
+            },
+            parseDOM: nodeType.parseDOM.map(tag => ({
+                tag: tag.tag,
+                getAttrs: dom => {
+                    const attrs = tag.getAttrs(dom);
+                    return Object.assign({
+                        diffdata: parseDiff(dom.dataset.diffdata)
+                    }, attrs);
+                }
+            }))
+        }));
+    });
+    const diffdata = {
+        attrs: {
+            diff: {
+                default: ""
+            },
+            steps: {
+                default: []
+            },
+            from: {
+                default: ""
+            },
+            to: {
+                default: ""
+            },
+            markOnly: false
+        },
+        inclusive: false,
+        parseDOM: [
+            {
+                tag: "span.diff",
+                getAttrs(dom) {
+                    return {
+                        diff: dom.dataset.diff,
+                        steps: dom.dataset.steps
+                    };
+                }
+            }
+        ],
+        toDOM(node) {
+            return [
+                "span",
+                {
+                    class: `diff ${node.attrs.diff}`,
+                    "data-diff": node.attrs.diff,
+                    "data-steps": node.attrs.steps,
+                    "data-from": node.attrs.from,
+                    "data-to": node.attrs.to,
+                    "data-markOnly": node.attrs.markOnly
+                }
+            ];
+        }
+    };
+    const spec = {
+        nodes: specNodes,
+        marks: docSchema.spec.marks.addToEnd("diffdata", diffdata)
+    };
+    // Update link mark toDom to render a span instead of anchor tag
+    // Since editable false PM Editor treats anchor tag as a normal a tag
+    // and redirects
+    const linkMarkSpec = spec.marks.get("link");
+    spec.marks = spec.marks.update("link", Object.assign({}, linkMarkSpec, {
+        toDOM: node => {
+            const dom = linkMarkSpec.toDOM(node);
+            dom[0] = "span";
+            return dom;
+        }
+    }));
+    return new Schema(spec);
+};
+//# sourceMappingURL=schema.js.map

package/dist/collab/merge/schema.js.map

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

package/dist/collab/merge/state_plugins/action.js

@@ -0,0 +1,138 @@
+import { showSystemMessage } from "fwtoolkit";
+import { TextSelection } from "prosemirror-state";
+import { AddMarkStep, Mapping, RemoveMarkStep, Step } from "prosemirror-transform";
+import { dispatchRemoveDiffdata } from "../tools";
+export const copyChange = (view, from, to) => {
+    /* when a certain change cannot be applied automatically,
+    we give users the ability to copy a change */
+    const tr = view.state.tr;
+    const resolvedFrom = view.state.doc.resolve(from);
+    const resolvedTo = view.state.doc.resolve(to);
+    const sel = new TextSelection(resolvedFrom, resolvedTo);
+    sel.visible = false;
+    tr.setSelection(sel);
+    view.dispatch(tr);
+    view.focus();
+    const slice = view.state.selection.content();
+    const { dom } = view.serializeForClipboard(slice);
+    // Copy data to clipboard!!
+    document.body.appendChild(dom);
+    const range = document.createRange();
+    range.selectNode(dom);
+    window.getSelection().addRange(range);
+    try {
+        document.execCommand("copy"); // Security exception may be thrown by some browsers.
+        document.body.removeChild(dom);
+        showSystemMessage(gettext("Change copied to clipboard."));
+    }
+    catch (_ex) {
+        showSystemMessage(gettext("Copy to clipboard failed. Please copy manually."));
+    }
+    window.getSelection().removeAllRanges();
+};
+export const acceptChanges = (merge, mark, mergeView, originalView, tr) => {
+    /* This is used to accept a change either from the offline/online version or
+    incase of deletion from the middle editor */
+    const mergedDocMap = new Mapping();
+    mergedDocMap.appendMapping(merge.mergedDocMap);
+    const insertionTr = mergeView.state.tr;
+    const from = mark.attrs.from;
+    const to = mark.attrs.to;
+    const steps = JSON.parse(mark.attrs.steps);
+    const stepMaps = tr.mapping.maps
+        .slice()
+        .reverse()
+        .map(map => map.invert());
+    const rebasedMapping = new Mapping(stepMaps);
+    rebasedMapping.appendMapping(mergedDocMap);
+    for (const stepIndex of steps) {
+        const maps = rebasedMapping.slice(tr.steps.length - stepIndex);
+        let mappedStep = tr.steps[stepIndex].map(maps);
+        if (mappedStep) {
+            mappedStep = Step.fromJSON(
+            // Switch from main editor schema to merge editor schema
+            insertionTr.doc.type.schema, mappedStep.toJSON());
+        }
+        if (mappedStep && !insertionTr.maybeStep(mappedStep).failed) {
+            mergedDocMap.appendMap(mappedStep.getMap());
+            rebasedMapping.appendMap(mappedStep.getMap());
+            rebasedMapping.setMirror(tr.steps.length - stepIndex - 1, tr.steps.length + mergedDocMap.maps.length - 1);
+        }
+    }
+    // Make sure that all the content steps are present in the new transaction
+    if (insertionTr.steps.length < steps.length) {
+        showSystemMessage(gettext("The change could not be applied automatically. Please consider using the copy option to copy the changes."));
+    }
+    else {
+        dispatchRemoveDiffdata(originalView, from, to);
+        merge.mergedDocMap = mergedDocMap;
+        insertionTr.setMeta("mapAppended", true);
+        insertionTr.setMeta("notrack", true);
+        mergeView.dispatch(insertionTr);
+    }
+};
+export const removeDecoration = (view, decorationId) => {
+    const tr = view.state.tr;
+    tr.setMeta("decorationId", decorationId);
+    view.dispatch(tr);
+};
+export const deleteContent = (merge, view, diffMark, mappingNeeded = true) => {
+    // const originalOnlineMapping = merge.onlineTr.mapping
+    const rebasedMapping = new Mapping();
+    const tr = view.state.tr;
+    if (mappingNeeded) {
+        rebasedMapping.appendMapping(merge.mergedDocMap);
+    }
+    const rebasedFrom = rebasedMapping.map(diffMark.attrs.from), rebasedTo = rebasedMapping.map(diffMark.attrs.to);
+    if (rebasedFrom && rebasedTo) {
+        tr.delete(rebasedFrom, rebasedTo);
+        merge.mergedDocMap.appendMapping(tr.mapping);
+        tr.setMeta("mapAppended", true);
+        tr.setMeta("notrack", true);
+        view.dispatch(tr);
+        return true;
+    }
+    showSystemMessage(gettext("The change could not be applied automatically. Please consider using the copy option to copy the changes."));
+    return false;
+};
+export const addDeletedContentBack = (merge, view, diffMark) => {
+    const commonDoc = merge.cpDoc;
+    const tr = view.state.tr;
+    const slice = commonDoc.slice(diffMark.attrs.from, diffMark.attrs.to);
+    const rebasedMapping = new Mapping();
+    rebasedMapping.appendMapping(merge.mergedDocMap);
+    const insertionPoint = rebasedMapping.map(diffMark.attrs.from);
+    if (insertionPoint) {
+        tr.insert(insertionPoint, slice.content);
+        tr.setMeta("mapAppended", true);
+        tr.setMeta("notrack", true);
+        view.dispatch(tr);
+        merge.mergedDocMap.appendMapping(tr.mapping);
+        return true;
+    }
+    showSystemMessage(gettext("The change could not be applied automatically. Please consider using the copy option to copy the changes."));
+    return false;
+};
+export const handleMarks = (view, mark, tr, schema) => {
+    // This function is used to remove the marks that have been applied in the online editor
+    const newTr = view.state.tr;
+    const steps = JSON.parse(mark.attrs.steps);
+    const marksToBeRemoved = [], marksToBeAdded = [];
+    steps.forEach(index => {
+        const JSONStep = tr.steps[index].toJSON();
+        if (JSONStep.mark && JSONStep.mark.type) {
+            if (tr.steps[index] instanceof AddMarkStep) {
+                marksToBeRemoved.push(JSONStep.mark.type);
+            }
+            else if (tr.steps[index] instanceof RemoveMarkStep) {
+                marksToBeAdded.push(tr.steps[index].mark);
+            }
+        }
+    });
+    marksToBeRemoved.forEach(removalMark => newTr.removeMark(mark.attrs.from, mark.attrs.to, schema.marks[removalMark]));
+    marksToBeAdded.forEach(AddMark => newTr.addMark(mark.attrs.from, mark.attrs.to, AddMark));
+    newTr.setMeta("notrack", true);
+    newTr.setMeta("mapAppended", true);
+    view.dispatch(newTr);
+};
+//# sourceMappingURL=action.js.map

package/dist/collab/merge/state_plugins/action.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../../src/collab/merge/state_plugins/action.js"],"names":[],"mappings":"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"}

package/dist/collab/merge/state_plugins/clipboard.js

@@ -0,0 +1,32 @@
+import { Plugin, PluginKey, TextSelection } from "prosemirror-state";
+import { docClipboardSerializer } from "../../../clipboard/copy";
+const key = new PluginKey("clipboard");
+export const clipboardPlugin = options => {
+    return new Plugin({
+        key,
+        props: {
+            handleDrop: (view, event, slice, moved) => {
+                if (moved || (slice && slice.size)) {
+                    return false; // Something other than en empty plain text string from outside. Handled by PM already.
+                }
+                const eventPos = view.posAtCoords({
+                    left: event.clientX,
+                    top: event.clientY
+                });
+                if (!eventPos) {
+                    return false;
+                }
+                const $mouse = view.state.doc.resolve(eventPos.pos);
+                if (!$mouse) {
+                    return false;
+                }
+                const tr = view.state.tr;
+                tr.setSelection(new TextSelection($mouse));
+                view.dispatch(tr);
+                return true;
+            },
+            clipboardSerializer: docClipboardSerializer(options.editor)
+        }
+    });
+};
+//# sourceMappingURL=clipboard.js.map

package/dist/collab/merge/state_plugins/clipboard.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clipboard.js","sourceRoot":"","sources":["../../../../src/collab/merge/state_plugins/clipboard.js"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAC,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAC,sBAAsB,EAAC,MAAM,yBAAyB,CAAA;AAE9D,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC,WAAW,CAAC,CAAA;AACtC,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC,EAAE;IACrC,OAAO,IAAI,MAAM,CAAC;QACd,GAAG;QACH,KAAK,EAAE;YACH,UAAU,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;gBACtC,IAAI,KAAK,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;oBACjC,OAAO,KAAK,CAAA,CAAC,uFAAuF;gBACxG,CAAC;gBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC;oBAC9B,IAAI,EAAE,KAAK,CAAC,OAAO;oBACnB,GAAG,EAAE,KAAK,CAAC,OAAO;iBACrB,CAAC,CAAA;gBACF,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACZ,OAAO,KAAK,CAAA;gBAChB,CAAC;gBACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;gBACnD,IAAI,CAAC,MAAM,EAAE,CAAC;oBACV,OAAO,KAAK,CAAA;gBAChB,CAAC;gBACD,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAA;gBACxB,EAAE,CAAC,YAAY,CAAC,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;gBAC1C,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;gBACjB,OAAO,IAAI,CAAA;YACf,CAAC;YACD,mBAAmB,EAAE,sBAAsB,CAAC,OAAO,CAAC,MAAM,CAAC;SAC9D;KACJ,CAAC,CAAA;AACN,CAAC,CAAA"}