@finos/legend-application-studio 13.0.0

package/lib/stores/editor-state/entity-diff-editor-state/EntityChangeConflictEditorState.d.ts.map

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

package/lib/stores/editor-state/entity-diff-editor-state/EntityChangeConflictEditorState.js

@@ -0,0 +1,383 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { observable, action, flow, computed, makeObservable, flowResult, } from 'mobx';
+import { EntityDiffEditorState, } from './EntityDiffEditorState.js';
+import { assertErrorThrown, UnsupportedOperationError, } from '@finos/legend-shared';
+import { mergeDiff3 } from 'node-diff3';
+import { extractEntityNameFromPath } from '@finos/legend-storage';
+import { EntityChangeConflictResolution } from '@finos/legend-server-sdlc';
+import { ParserError } from '@finos/legend-graph';
+const START_HEADER_MARKER = '<<<<<<<';
+const COMMON_BASE_MARKER = '|||||||';
+const SPLITTER_MARKER = '=======';
+const END_FOOTER_MARKER = '>>>>>>>';
+const scanMergeConflict = (text) => {
+    const lines = text.split('\n');
+    const conflicts = [];
+    let currentConflict = null;
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        const lineNumber = i + 1;
+        // ignore empty lines
+        if (!line || !line.trim()) {
+            continue;
+        }
+        // Is this a start line? <<<<<<<
+        if (line.startsWith(START_HEADER_MARKER)) {
+            if (currentConflict !== null) {
+                // Give up parsing, anything matched up this to this point will be decorated
+                // anything after will not
+                break;
+            }
+            // Create a new conflict starting at this line
+            currentConflict = { startHeader: lineNumber };
+        }
+        else if (currentConflict &&
+            !currentConflict.splitter &&
+            line.startsWith(COMMON_BASE_MARKER)) {
+            // Are we within a conflict block and is this a common ancestors marker? |||||||
+            currentConflict.commonBase = lineNumber;
+        }
+        else if (currentConflict &&
+            !currentConflict.splitter &&
+            line.startsWith(SPLITTER_MARKER)) {
+            // Are we within a conflict block and is this a splitter? =======
+            currentConflict.splitter = lineNumber;
+        }
+        else if (currentConflict && line.startsWith(END_FOOTER_MARKER)) {
+            // Are we within a conflict block and is this a footer? >>>>>>>
+            currentConflict.endFooter = lineNumber;
+            if (currentConflict.splitter !== undefined) {
+                conflicts.push(currentConflict);
+            }
+            // Reset the current conflict to be empty, so we can match the next
+            // starting header marker.
+            currentConflict = null;
+        }
+    }
+    return conflicts;
+};
+export var ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE;
+(function (ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE) {
+    ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE["MERGE_VIEW"] = "MERGE_VIEW";
+    ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE["BASE_CURRENT"] = "BASE_CURRENT";
+    ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE["BASE_INCOMING"] = "BASE_INCOMING";
+    ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE["CURRENT_INCOMING"] = "CURRENT_INCOMING";
+})(ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE = ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE || (ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE = {}));
+export class EntityChangeConflictEditorState extends EntityDiffEditorState {
+    entityPath;
+    // revision
+    baseRevision;
+    currentChangeRevision;
+    incomingChangeRevision;
+    // entity
+    baseEntity;
+    currentChangeEntity;
+    incomingChangeEntity;
+    // grammar
+    baseGrammarText;
+    currentChangeGrammarText;
+    incomingChangeGrammarText;
+    // entity getter/updater function
+    baseEntityGetter;
+    currentChangeEntityGetter;
+    incomingChangeEntityGetter;
+    // editor
+    mergedText;
+    mergeSucceeded = true;
+    mergeConflicts = [];
+    isReadOnly = false;
+    currentMergeEditorConflict;
+    currentMergeEditorLine;
+    mergeEditorParserError;
+    currentMode = ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE.MERGE_VIEW;
+    conflictResolutionState;
+    constructor(editorStore, conflictResolutionState, entityPath, baseRevision, currentChangeRevision, incomingChangeRevision, baseEntity, currentChangeEntity, incomingChangeEntity, baseEntityGetter, currentChangeEntityGetter, incomingChangeEntityGetter) {
+        super(editorStore);
+        makeObservable(this, {
+            entityPath: observable,
+            baseRevision: observable,
+            currentChangeRevision: observable,
+            incomingChangeRevision: observable,
+            baseEntity: observable.ref,
+            currentChangeEntity: observable.ref,
+            incomingChangeEntity: observable.ref,
+            baseGrammarText: observable,
+            currentChangeGrammarText: observable,
+            incomingChangeGrammarText: observable,
+            baseEntityGetter: observable,
+            currentChangeEntityGetter: observable,
+            incomingChangeEntityGetter: observable,
+            mergedText: observable,
+            mergeSucceeded: observable,
+            mergeConflicts: observable,
+            isReadOnly: observable,
+            currentMergeEditorConflict: observable,
+            currentMergeEditorLine: observable,
+            mergeEditorParserError: observable,
+            currentMode: observable,
+            headerName: computed,
+            sortedMergedConflicts: computed,
+            canUseTheirs: computed,
+            canUseYours: computed,
+            canMarkAsResolved: computed,
+            previousConflict: computed,
+            nextConflict: computed,
+            setReadOnly: action,
+            setMergedText: action,
+            setCurrentMode: action,
+            setCurrentMergeEditorLine: action,
+            setCurrentMergeEditorConflict: action,
+            clearMergeEditorError: action,
+            refreshMergeConflict: action,
+            resetMergeEditorStateOnLeave: action,
+            acceptCurrentChange: action,
+            acceptIncomingChange: action,
+            acceptBothChanges: action,
+            rejectBothChanges: action,
+            refresh: flow,
+            getMergedText: flow,
+            markAsResolved: flow,
+            useCurrentChanges: flow,
+            useIncomingChanges: flow,
+            getGrammarForEntity: flow,
+        });
+        this.entityPath = entityPath;
+        // revision
+        this.baseRevision = baseRevision;
+        this.currentChangeRevision = currentChangeRevision;
+        this.incomingChangeRevision = incomingChangeRevision;
+        // entity
+        this.baseEntity = baseEntity;
+        this.currentChangeEntity = currentChangeEntity;
+        this.incomingChangeEntity = incomingChangeEntity;
+        // entity getter/updater function
+        this.baseEntityGetter = baseEntityGetter;
+        this.currentChangeEntityGetter = currentChangeEntityGetter;
+        this.incomingChangeEntityGetter = incomingChangeEntityGetter;
+        this.conflictResolutionState = conflictResolutionState;
+    }
+    setReadOnly(val) {
+        this.isReadOnly = val;
+    }
+    setMergedText(val) {
+        this.mergedText = val;
+    }
+    setCurrentMode(mode) {
+        this.currentMode = mode;
+    }
+    setCurrentMergeEditorLine(val) {
+        this.currentMergeEditorLine = val;
+    }
+    setCurrentMergeEditorConflict(conflict) {
+        this.currentMergeEditorConflict = conflict;
+    }
+    clearMergeEditorError() {
+        this.mergeEditorParserError = undefined;
+    }
+    refreshMergeConflict() {
+        if (this.mergedText !== undefined) {
+            this.mergeConflicts = scanMergeConflict(this.mergedText);
+        }
+    }
+    get headerName() {
+        return extractEntityNameFromPath(this.entityPath);
+    }
+    get sortedMergedConflicts() {
+        return this.mergeConflicts
+            .slice()
+            .sort((a, b) => a.startHeader - b.startHeader);
+    }
+    get canUseTheirs() {
+        return (this.currentMode !== ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE.BASE_CURRENT);
+    }
+    get canUseYours() {
+        return (this.currentMode !== ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE.BASE_INCOMING);
+    }
+    get canMarkAsResolved() {
+        return Boolean(!this.mergeConflicts.length &&
+            !this.mergeEditorParserError &&
+            this.currentMode === ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE.MERGE_VIEW);
+    }
+    get previousConflict() {
+        const currentLine = this.currentMergeEditorLine ?? 0;
+        return this.sortedMergedConflicts
+            .slice()
+            .reverse()
+            .find((conflict) => conflict.endFooter && conflict.endFooter < currentLine);
+    }
+    get nextConflict() {
+        const currentLine = this.currentMergeEditorLine ?? 0;
+        return this.sortedMergedConflicts.find((conflict) => conflict.startHeader > currentLine);
+    }
+    getModeComparisonViewInfo(mode) {
+        switch (mode) {
+            case ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE.MERGE_VIEW:
+                return {
+                    label: 'Merged changes',
+                    fromRevision: this.currentChangeRevision,
+                    toRevision: this.incomingChangeRevision,
+                };
+            case ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE.BASE_CURRENT:
+                return {
+                    label: 'Your changes',
+                    fromGrammarText: this.baseGrammarText ?? '',
+                    toGrammarText: this.currentChangeGrammarText ?? '',
+                    fromRevision: this.baseRevision,
+                    toRevision: this.currentChangeRevision,
+                };
+            case ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE.BASE_INCOMING:
+                return {
+                    label: 'Their changes',
+                    fromGrammarText: this.baseGrammarText ?? '',
+                    toGrammarText: this.incomingChangeGrammarText ?? '',
+                    fromRevision: this.baseRevision,
+                    toRevision: this.incomingChangeRevision,
+                };
+            case ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE.CURRENT_INCOMING:
+                return {
+                    label: 'Both changes',
+                    fromGrammarText: this.currentChangeGrammarText ?? '',
+                    toGrammarText: this.incomingChangeGrammarText ?? '',
+                    fromRevision: this.currentChangeRevision,
+                    toRevision: this.incomingChangeRevision,
+                };
+            default:
+                throw new UnsupportedOperationError();
+        }
+    }
+    resetMergeEditorStateOnLeave() {
+        this.clearMergeEditorError();
+        this.currentMergeEditorLine = undefined;
+        this.currentMergeEditorConflict = undefined;
+    }
+    *refresh() {
+        this.baseEntity = this.baseEntityGetter
+            ? this.baseEntityGetter(this.entityPath)
+            : this.baseEntity;
+        this.currentChangeEntity = this.currentChangeEntityGetter
+            ? this.currentChangeEntityGetter(this.entityPath)
+            : this.currentChangeEntity;
+        this.incomingChangeEntity = this.incomingChangeEntityGetter
+            ? this.incomingChangeEntityGetter(this.entityPath)
+            : this.incomingChangeEntity;
+        if (this.isReadOnly || this.mergedText === undefined) {
+            yield flowResult(this.getMergedText());
+        }
+    }
+    *getMergedText() {
+        this.baseGrammarText = (yield flowResult(this.getGrammarForEntity(this.baseEntity)));
+        this.currentChangeGrammarText = (yield flowResult(this.getGrammarForEntity(this.currentChangeEntity)));
+        this.incomingChangeGrammarText = (yield flowResult(this.getGrammarForEntity(this.incomingChangeEntity)));
+        const result = mergeDiff3(this.currentChangeGrammarText, this.baseGrammarText, this.incomingChangeGrammarText, {
+            stringSeparator: '\n',
+            label: { a: 'Your Change', o: 'BASE', b: 'Their Change' },
+        });
+        this.mergedText = result.result.join('\n');
+        this.refreshMergeConflict();
+        this.mergeSucceeded = !this.mergeConflicts.length;
+    }
+    *getGrammarForEntity(entity) {
+        if (entity) {
+            const elementGrammar = (yield this.editorStore.graphManagerState.graphManager.entitiesToPureCode([entity]));
+            return elementGrammar;
+        }
+        return '';
+    }
+    *markAsResolved() {
+        try {
+            const entities = (yield this.editorStore.graphManagerState.graphManager.pureCodeToEntities(this.mergedText ?? ''));
+            if (!entities.length) {
+                this.conflictResolutionState.resolveConflict(new EntityChangeConflictResolution(this.entityPath, undefined));
+            }
+            else if (entities.length === 1) {
+                this.conflictResolutionState.resolveConflict(new EntityChangeConflictResolution(this.entityPath, entities[0]));
+            }
+            else {
+                this.editorStore.applicationStore.notifyWarning(`Can't mark conflict as resolved: more than one element found in parsed text`);
+                return;
+            }
+        }
+        catch (error) {
+            assertErrorThrown(error);
+            if (error instanceof ParserError) {
+                this.mergeEditorParserError = error;
+                this.editorStore.applicationStore.notifyWarning(`Can't mark conflict as resolved. Parsing error: ${this.mergeEditorParserError.message}`);
+            }
+        }
+        yield flowResult(this.conflictResolutionState.markConflictAsResolved(this));
+    }
+    *useCurrentChanges() {
+        this.conflictResolutionState.resolveConflict(new EntityChangeConflictResolution(this.entityPath, this.currentChangeEntity));
+        yield flowResult(this.conflictResolutionState.markConflictAsResolved(this));
+    }
+    *useIncomingChanges() {
+        this.conflictResolutionState.resolveConflict(new EntityChangeConflictResolution(this.entityPath, this.incomingChangeEntity));
+        yield flowResult(this.conflictResolutionState.markConflictAsResolved(this));
+    }
+    acceptCurrentChange(conflict) {
+        if (this.mergedText === undefined) {
+            return;
+        }
+        const lines = this.mergedText.split('\n');
+        this.setMergedText(lines
+            .slice(0, conflict.startHeader - 1)
+            .concat(lines.slice(conflict.startHeader, (conflict.commonBase ?? conflict.splitter) - 1)) // current change
+            .concat(lines.slice(conflict.endFooter, lines.length))
+            .join('\n'));
+        this.refreshMergeConflict();
+    }
+    acceptIncomingChange(conflict) {
+        if (this.mergedText === undefined) {
+            return;
+        }
+        const lines = this.mergedText.split('\n');
+        this.setMergedText(lines
+            .slice(0, conflict.startHeader - 1)
+            .concat(lines.slice(conflict.splitter, conflict.endFooter - 1)) // incoming change
+            .concat(lines.slice(conflict.endFooter, lines.length))
+            .join('\n'));
+        this.refreshMergeConflict();
+    }
+    acceptBothChanges(conflict) {
+        if (this.mergedText === undefined) {
+            return;
+        }
+        const lines = this.mergedText.split('\n');
+        this.setMergedText(lines
+            .slice(0, conflict.startHeader - 1)
+            .concat(lines.slice(conflict.startHeader, (conflict.commonBase ?? conflict.splitter) - 1)) // current change
+            .concat(lines.slice(conflict.splitter, conflict.endFooter - 1)) // incoming change
+            .concat(lines.slice(conflict.endFooter, lines.length))
+            .join('\n'));
+        this.refreshMergeConflict();
+    }
+    rejectBothChanges(conflict) {
+        if (this.mergedText === undefined) {
+            return;
+        }
+        const lines = this.mergedText.split('\n');
+        this.setMergedText(lines
+            .slice(0, conflict.startHeader - 1)
+            .concat(conflict.commonBase
+            ? lines.slice(conflict.commonBase, conflict.splitter - 1)
+            : []) // base
+            .concat(lines.slice(conflict.endFooter, lines.length))
+            .join('\n'));
+        this.refreshMergeConflict();
+    }
+}
+//# sourceMappingURL=EntityChangeConflictEditorState.js.map

package/lib/stores/editor-state/entity-diff-editor-state/EntityChangeConflictEditorState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EntityChangeConflictEditorState.js","sourceRoot":"","sources":["../../../../src/stores/editor-state/entity-diff-editor-state/EntityChangeConflictEditorState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,UAAU,EACV,MAAM,EACN,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,UAAU,GACX,MAAM,MAAM,CAAC;AAEd,OAAO,EAEL,qBAAqB,GACtB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAEL,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAe,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGlD,MAAM,mBAAmB,GAAG,SAAS,CAAC;AACtC,MAAM,kBAAkB,GAAG,SAAS,CAAC;AACrC,MAAM,eAAe,GAAG,SAAS,CAAC;AAClC,MAAM,iBAAiB,GAAG,SAAS,CAAC;AAgBpC,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAmB,EAAE;IAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,SAAS,GAAoB,EAAE,CAAC;IACtC,IAAI,eAAe,GAAkC,IAAI,CAAC;IAE1D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,MAAM,UAAU,GAAG,CAAC,GAAG,CAAC,CAAC;QAEzB,qBAAqB;QACrB,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE;YACzB,SAAS;SACV;QAED,gCAAgC;QAChC,IAAI,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE;YACxC,IAAI,eAAe,KAAK,IAAI,EAAE;gBAC5B,4EAA4E;gBAC5E,0BAA0B;gBAC1B,MAAM;aACP;YAED,8CAA8C;YAC9C,eAAe,GAAG,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;SAC/C;aAAM,IACL,eAAe;YACf,CAAC,eAAe,CAAC,QAAQ;YACzB,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,EACnC;YACA,gFAAgF;YAChF,eAAe,CAAC,UAAU,GAAG,UAAU,CAAC;SACzC;aAAM,IACL,eAAe;YACf,CAAC,eAAe,CAAC,QAAQ;YACzB,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,EAChC;YACA,iEAAiE;YACjE,eAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;SACvC;aAAM,IAAI,eAAe,IAAI,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;YAChE,+DAA+D;YAC/D,eAAe,CAAC,SAAS,GAAG,UAAU,CAAC;YAEvC,IAAI,eAAe,CAAC,QAAQ,KAAK,SAAS,EAAE;gBAC1C,SAAS,CAAC,IAAI,CAAC,eAAgC,CAAC,CAAC;aAClD;YAED,mEAAmE;YACnE,0BAA0B;YAC1B,eAAe,GAAG,IAAI,CAAC;SACxB;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAUF,MAAM,CAAN,IAAY,uCAKX;AALD,WAAY,uCAAuC;IACjD,oEAAyB,CAAA;IACzB,wEAA6B,CAAA;IAC7B,0EAA+B,CAAA;IAC/B,gFAAqC,CAAA;AACvC,CAAC,EALW,uCAAuC,GAAvC,uCAAuC,KAAvC,uCAAuC,QAKlD;AAED,MAAM,OAAO,+BAAgC,SAAQ,qBAAqB;IACxE,UAAU,CAAS;IACnB,WAAW;IACX,YAAY,CAAkC;IAC9C,qBAAqB,CAAkC;IACvD,sBAAsB,CAAkC;IACxD,SAAS;IACT,UAAU,CAAsB;IAChC,mBAAmB,CAAsB;IACzC,oBAAoB,CAAsB;IAC1C,UAAU;IACV,eAAe,CAAsB;IACrC,wBAAwB,CAAsB;IAC9C,yBAAyB,CAAsB;IAC/C,iCAAiC;IACjC,gBAAgB,CAEF;IACd,yBAAyB,CAEX;IACd,0BAA0B,CAEZ;IACd,SAAS;IACT,UAAU,CAAsB;IAChC,cAAc,GAAG,IAAI,CAAC;IACtB,cAAc,GAAoB,EAAE,CAAC;IACrC,UAAU,GAAG,KAAK,CAAC;IACnB,0BAA0B,CAA6B;IACvD,sBAAsB,CAAsB;IAC5C,sBAAsB,CAA2B;IACjD,WAAW,GAAG,uCAAuC,CAAC,UAAU,CAAC;IACjE,uBAAuB,CAAkC;IAEzD,YACE,WAAwB,EACxB,uBAAwD,EACxD,UAAkB,EAClB,YAA6C,EAC7C,qBAAsD,EACtD,sBAAuD,EACvD,UAA8B,EAC9B,mBAAuC,EACvC,oBAAwC,EACxC,gBAAyE,EACzE,yBAEuB,EACvB,0BAEuB;QAEvB,KAAK,CAAC,WAAW,CAAC,CAAC;QAEnB,cAAc,CAGZ,IAAI,EAAE;YACN,UAAU,EAAE,UAAU;YACtB,YAAY,EAAE,UAAU;YACxB,qBAAqB,EAAE,UAAU;YACjC,sBAAsB,EAAE,UAAU;YAClC,UAAU,EAAE,UAAU,CAAC,GAAG;YAC1B,mBAAmB,EAAE,UAAU,CAAC,GAAG;YACnC,oBAAoB,EAAE,UAAU,CAAC,GAAG;YACpC,eAAe,EAAE,UAAU;YAC3B,wBAAwB,EAAE,UAAU;YACpC,yBAAyB,EAAE,UAAU;YACrC,gBAAgB,EAAE,UAAU;YAC5B,yBAAyB,EAAE,UAAU;YACrC,0BAA0B,EAAE,UAAU;YACtC,UAAU,EAAE,UAAU;YACtB,cAAc,EAAE,UAAU;YAC1B,cAAc,EAAE,UAAU;YAC1B,UAAU,EAAE,UAAU;YACtB,0BAA0B,EAAE,UAAU;YACtC,sBAAsB,EAAE,UAAU;YAClC,sBAAsB,EAAE,UAAU;YAClC,WAAW,EAAE,UAAU;YACvB,UAAU,EAAE,QAAQ;YACpB,qBAAqB,EAAE,QAAQ;YAC/B,YAAY,EAAE,QAAQ;YACtB,WAAW,EAAE,QAAQ;YACrB,iBAAiB,EAAE,QAAQ;YAC3B,gBAAgB,EAAE,QAAQ;YAC1B,YAAY,EAAE,QAAQ;YACtB,WAAW,EAAE,MAAM;YACnB,aAAa,EAAE,MAAM;YACrB,cAAc,EAAE,MAAM;YACtB,yBAAyB,EAAE,MAAM;YACjC,6BAA6B,EAAE,MAAM;YACrC,qBAAqB,EAAE,MAAM;YAC7B,oBAAoB,EAAE,MAAM;YAC5B,4BAA4B,EAAE,MAAM;YACpC,mBAAmB,EAAE,MAAM;YAC3B,oBAAoB,EAAE,MAAM;YAC5B,iBAAiB,EAAE,MAAM;YACzB,iBAAiB,EAAE,MAAM;YACzB,OAAO,EAAE,IAAI;YACb,aAAa,EAAE,IAAI;YACnB,cAAc,EAAE,IAAI;YACpB,iBAAiB,EAAE,IAAI;YACvB,kBAAkB,EAAE,IAAI;YACxB,mBAAmB,EAAE,IAAI;SAC1B,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,WAAW;QACX,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;QACnD,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;QACrD,SAAS;QACT,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;QAC/C,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,iCAAiC;QACjC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,yBAAyB,GAAG,yBAAyB,CAAC;QAC3D,IAAI,CAAC,0BAA0B,GAAG,0BAA0B,CAAC;QAC7D,IAAI,CAAC,uBAAuB,GAAG,uBAAuB,CAAC;IACzD,CAAC;IAED,WAAW,CAAC,GAAY;QACtB,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;IACxB,CAAC;IACD,aAAa,CAAC,GAAW;QACvB,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;IACxB,CAAC;IACD,cAAc,CAAC,IAA6C;QAC1D,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;IACD,yBAAyB,CAAC,GAAuB;QAC/C,IAAI,CAAC,sBAAsB,GAAG,GAAG,CAAC;IACpC,CAAC;IACD,6BAA6B,CAAC,QAAmC;QAC/D,IAAI,CAAC,0BAA0B,GAAG,QAAQ,CAAC;IAC7C,CAAC;IACD,qBAAqB;QACnB,IAAI,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAC1C,CAAC;IAED,oBAAoB;QAClB,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE;YACjC,IAAI,CAAC,cAAc,GAAG,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAC1D;IACH,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,yBAAyB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpD,CAAC;IACD,IAAY,qBAAqB;QAC/B,OAAO,IAAI,CAAC,cAAc;aACvB,KAAK,EAAE;aACP,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC;IACD,IAAI,YAAY;QACd,OAAO,CACL,IAAI,CAAC,WAAW,KAAK,uCAAuC,CAAC,YAAY,CAC1E,CAAC;IACJ,CAAC;IACD,IAAI,WAAW;QACb,OAAO,CACL,IAAI,CAAC,WAAW,KAAK,uCAAuC,CAAC,aAAa,CAC3E,CAAC;IACJ,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,OAAO,CACZ,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM;YACzB,CAAC,IAAI,CAAC,sBAAsB;YAC5B,IAAI,CAAC,WAAW,KAAK,uCAAuC,CAAC,UAAU,CAC1E,CAAC;IACJ,CAAC;IAED,IAAI,gBAAgB;QAClB,MAAM,WAAW,GAAG,IAAI,CAAC,sBAAsB,IAAI,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC,qBAAqB;aAC9B,KAAK,EAAE;aACP,OAAO,EAAE;aACT,IAAI,CACH,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,IAAI,QAAQ,CAAC,SAAS,GAAG,WAAW,CACrE,CAAC;IACN,CAAC;IAED,IAAI,YAAY;QACd,MAAM,WAAW,GAAG,IAAI,CAAC,sBAAsB,IAAI,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,CACpC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,GAAG,WAAW,CACjD,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,IAA6C;QAE7C,QAAQ,IAAI,EAAE;YACZ,KAAK,uCAAuC,CAAC,UAAU;gBACrD,OAAO;oBACL,KAAK,EAAE,gBAAgB;oBACvB,YAAY,EAAE,IAAI,CAAC,qBAAqB;oBACxC,UAAU,EAAE,IAAI,CAAC,sBAAsB;iBACxC,CAAC;YACJ,KAAK,uCAAuC,CAAC,YAAY;gBACvD,OAAO;oBACL,KAAK,EAAE,cAAc;oBACrB,eAAe,EAAE,IAAI,CAAC,eAAe,IAAI,EAAE;oBAC3C,aAAa,EAAE,IAAI,CAAC,wBAAwB,IAAI,EAAE;oBAClD,YAAY,EAAE,IAAI,CAAC,YAAY;oBAC/B,UAAU,EAAE,IAAI,CAAC,qBAAqB;iBACvC,CAAC;YACJ,KAAK,uCAAuC,CAAC,aAAa;gBACxD,OAAO;oBACL,KAAK,EAAE,eAAe;oBACtB,eAAe,EAAE,IAAI,CAAC,eAAe,IAAI,EAAE;oBAC3C,aAAa,EAAE,IAAI,CAAC,yBAAyB,IAAI,EAAE;oBACnD,YAAY,EAAE,IAAI,CAAC,YAAY;oBAC/B,UAAU,EAAE,IAAI,CAAC,sBAAsB;iBACxC,CAAC;YACJ,KAAK,uCAAuC,CAAC,gBAAgB;gBAC3D,OAAO;oBACL,KAAK,EAAE,cAAc;oBACrB,eAAe,EAAE,IAAI,CAAC,wBAAwB,IAAI,EAAE;oBACpD,aAAa,EAAE,IAAI,CAAC,yBAAyB,IAAI,EAAE;oBACnD,YAAY,EAAE,IAAI,CAAC,qBAAqB;oBACxC,UAAU,EAAE,IAAI,CAAC,sBAAsB;iBACxC,CAAC;YACJ;gBACE,MAAM,IAAI,yBAAyB,EAAE,CAAC;SACzC;IACH,CAAC;IAED,4BAA4B;QAC1B,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC7B,IAAI,CAAC,sBAAsB,GAAG,SAAS,CAAC;QACxC,IAAI,CAAC,0BAA0B,GAAG,SAAS,CAAC;IAC9C,CAAC;IAED,CAAC,OAAO;QACN,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,gBAAgB;YACrC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC;YACxC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;QACpB,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,yBAAyB;YACvD,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,UAAU,CAAC;YACjD,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC;QAC7B,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,0BAA0B;YACzD,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC;YAClD,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC;QAC9B,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE;YACpD,MAAM,UAAU,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;SACxC;IACH,CAAC;IAED,CAAC,aAAa;QACZ,IAAI,CAAC,eAAe,GAAG,CAAC,MAAM,UAAU,CACtC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAC1C,CAAW,CAAC;QACb,IAAI,CAAC,wBAAwB,GAAG,CAAC,MAAM,UAAU,CAC/C,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CACnD,CAAW,CAAC;QACb,IAAI,CAAC,yBAAyB,GAAG,CAAC,MAAM,UAAU,CAChD,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CACpD,CAAW,CAAC;QACb,MAAM,MAAM,GAAG,UAAU,CACvB,IAAI,CAAC,wBAAwB,EAC7B,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,yBAAyB,EAC9B;YACE,eAAe,EAAE,IAAI;YACrB,KAAK,EAAE,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,cAAc,EAAE;SAC1D,CACF,CAAC;QACF,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,IAAI,CAAC,cAAc,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;IACpD,CAAC;IAEO,CAAC,mBAAmB,CAC1B,MAA0B;QAE1B,IAAI,MAAM,EAAE;YACV,MAAM,cAAc,GAClB,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,YAAY,CAAC,kBAAkB,CACvE,CAAC,MAAM,CAAC,CACT,CAAW,CAAC;YACf,OAAO,cAAc,CAAC;SACvB;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,CAAC,cAAc;QACb,IAAI;YACF,MAAM,QAAQ,GACZ,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,YAAY,CAAC,kBAAkB,CACvE,IAAI,CAAC,UAAU,IAAI,EAAE,CACtB,CAAa,CAAC;YACjB,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;gBACpB,IAAI,CAAC,uBAAuB,CAAC,eAAe,CAC1C,IAAI,8BAA8B,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAC/D,CAAC;aACH;iBAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;gBAChC,IAAI,CAAC,uBAAuB,CAAC,eAAe,CAC1C,IAAI,8BAA8B,CAChC,IAAI,CAAC,UAAU,EACf,QAAQ,CAAC,CAAC,CAAW,CACtB,CACF,CAAC;aACH;iBAAM;gBACL,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,aAAa,CAC7C,6EAA6E,CAC9E,CAAC;gBACF,OAAO;aACR;SACF;QAAC,OAAO,KAAK,EAAE;YACd,iBAAiB,CAAC,KAAK,CAAC,CAAC;YACzB,IAAI,KAAK,YAAY,WAAW,EAAE;gBAChC,IAAI,CAAC,sBAAsB,GAAG,KAAK,CAAC;gBACpC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,aAAa,CAC7C,mDAAmD,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,CACzF,CAAC;aACH;SACF;QACD,MAAM,UAAU,CAAC,IAAI,CAAC,uBAAuB,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,CAAC,iBAAiB;QAChB,IAAI,CAAC,uBAAuB,CAAC,eAAe,CAC1C,IAAI,8BAA8B,CAChC,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,mBAAmB,CACzB,CACF,CAAC;QACF,MAAM,UAAU,CAAC,IAAI,CAAC,uBAAuB,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,CAAC,kBAAkB;QACjB,IAAI,CAAC,uBAAuB,CAAC,eAAe,CAC1C,IAAI,8BAA8B,CAChC,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,oBAAoB,CAC1B,CACF,CAAC;QACF,MAAM,UAAU,CAAC,IAAI,CAAC,uBAAuB,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,mBAAmB,CAAC,QAAuB;QACzC,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE;YACjC,OAAO;SACR;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,aAAa,CAChB,KAAK;aACF,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,WAAW,GAAG,CAAC,CAAC;aAClC,MAAM,CACL,KAAK,CAAC,KAAK,CACT,QAAQ,CAAC,WAAW,EACpB,CAAC,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAC/C,CACF,CAAC,iBAAiB;aAClB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;aACrD,IAAI,CAAC,IAAI,CAAC,CACd,CAAC;QACF,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;IAED,oBAAoB,CAAC,QAAuB;QAC1C,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE;YACjC,OAAO;SACR;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,aAAa,CAChB,KAAK;aACF,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,WAAW,GAAG,CAAC,CAAC;aAClC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,kBAAkB;aACjF,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;aACrD,IAAI,CAAC,IAAI,CAAC,CACd,CAAC;QACF,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;IAED,iBAAiB,CAAC,QAAuB;QACvC,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE;YACjC,OAAO;SACR;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,aAAa,CAChB,KAAK;aACF,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,WAAW,GAAG,CAAC,CAAC;aAClC,MAAM,CACL,KAAK,CAAC,KAAK,CACT,QAAQ,CAAC,WAAW,EACpB,CAAC,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAC/C,CACF,CAAC,iBAAiB;aAClB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,kBAAkB;aACjF,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;aACrD,IAAI,CAAC,IAAI,CAAC,CACd,CAAC;QACF,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;IAED,iBAAiB,CAAC,QAAuB;QACvC,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE;YACjC,OAAO;SACR;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,aAAa,CAChB,KAAK;aACF,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,WAAW,GAAG,CAAC,CAAC;aAClC,MAAM,CACL,QAAQ,CAAC,UAAU;YACjB,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,QAAQ,GAAG,CAAC,CAAC;YACzD,CAAC,CAAC,EAAE,CACP,CAAC,OAAO;aACR,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;aACrD,IAAI,CAAC,IAAI,CAAC,CACd,CAAC;QACF,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;CACF"}

package/lib/stores/editor-state/entity-diff-editor-state/EntityDiffEditorState.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { EditorState } from '../../editor-state/EditorState.js';
+export declare enum SPECIAL_REVISION_ALIAS {
+    LOCAL = "LOCAL_REVISION",
+    WORKSPACE_BASE = "WORKSPACE_BASE",
+    WORKSPACE_HEAD = "WORKSPACE_HEAD",
+    WORKSPACE_UPDATE = "WORKSPACE_UPDATE",
+    PROJECT_HEAD = "PROJECT_HEAD"
+}
+export declare const getPrettyLabelForRevision: (revision: SPECIAL_REVISION_ALIAS | string) => string;
+export declare abstract class EntityDiffEditorState extends EditorState {
+    abstract refresh(): void;
+}
+//# sourceMappingURL=EntityDiffEditorState.d.ts.map

package/lib/stores/editor-state/entity-diff-editor-state/EntityDiffEditorState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EntityDiffEditorState.d.ts","sourceRoot":"","sources":["../../../../src/stores/editor-state/entity-diff-editor-state/EntityDiffEditorState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAEhE,oBAAY,sBAAsB;IAChC,KAAK,mBAAmB;IACxB,cAAc,mBAAmB;IACjC,cAAc,mBAAmB;IACjC,gBAAgB,qBAAqB;IACrC,YAAY,iBAAiB;CAC9B;AAED,eAAO,MAAM,yBAAyB,aAC1B,sBAAsB,GAAG,MAAM,KACxC,MAeF,CAAC;AAEF,8BAAsB,qBAAsB,SAAQ,WAAW;IAC7D,QAAQ,CAAC,OAAO,IAAI,IAAI;CACzB"}

package/lib/stores/editor-state/entity-diff-editor-state/EntityDiffEditorState.js

@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { EditorState } from '../../editor-state/EditorState.js';
+export var SPECIAL_REVISION_ALIAS;
+(function (SPECIAL_REVISION_ALIAS) {
+    SPECIAL_REVISION_ALIAS["LOCAL"] = "LOCAL_REVISION";
+    SPECIAL_REVISION_ALIAS["WORKSPACE_BASE"] = "WORKSPACE_BASE";
+    SPECIAL_REVISION_ALIAS["WORKSPACE_HEAD"] = "WORKSPACE_HEAD";
+    SPECIAL_REVISION_ALIAS["WORKSPACE_UPDATE"] = "WORKSPACE_UPDATE";
+    SPECIAL_REVISION_ALIAS["PROJECT_HEAD"] = "PROJECT_HEAD";
+})(SPECIAL_REVISION_ALIAS = SPECIAL_REVISION_ALIAS || (SPECIAL_REVISION_ALIAS = {}));
+export const getPrettyLabelForRevision = (revision) => {
+    switch (revision) {
+        case SPECIAL_REVISION_ALIAS.LOCAL:
+            return 'Local';
+        case SPECIAL_REVISION_ALIAS.WORKSPACE_BASE:
+            return 'Workspace BASE';
+        case SPECIAL_REVISION_ALIAS.WORKSPACE_HEAD:
+            return 'Workspace HEAD';
+        case SPECIAL_REVISION_ALIAS.WORKSPACE_UPDATE:
+            return 'Workspace UPDATE';
+        case SPECIAL_REVISION_ALIAS.PROJECT_HEAD:
+            return 'Project HEAD';
+        default:
+            return revision;
+    }
+};
+export class EntityDiffEditorState extends EditorState {
+}
+//# sourceMappingURL=EntityDiffEditorState.js.map

package/lib/stores/editor-state/entity-diff-editor-state/EntityDiffEditorState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EntityDiffEditorState.js","sourceRoot":"","sources":["../../../../src/stores/editor-state/entity-diff-editor-state/EntityDiffEditorState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAEhE,MAAM,CAAN,IAAY,sBAMX;AAND,WAAY,sBAAsB;IAChC,kDAAwB,CAAA;IACxB,2DAAiC,CAAA;IACjC,2DAAiC,CAAA;IACjC,+DAAqC,CAAA;IACrC,uDAA6B,CAAA;AAC/B,CAAC,EANW,sBAAsB,GAAtB,sBAAsB,KAAtB,sBAAsB,QAMjC;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,QAAyC,EACjC,EAAE;IACV,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAsB,CAAC,KAAK;YAC/B,OAAO,OAAO,CAAC;QACjB,KAAK,sBAAsB,CAAC,cAAc;YACxC,OAAO,gBAAgB,CAAC;QAC1B,KAAK,sBAAsB,CAAC,cAAc;YACxC,OAAO,gBAAgB,CAAC;QAC1B,KAAK,sBAAsB,CAAC,gBAAgB;YAC1C,OAAO,kBAAkB,CAAC;QAC5B,KAAK,sBAAsB,CAAC,YAAY;YACtC,OAAO,cAAc,CAAC;QACxB;YACE,OAAO,QAAQ,CAAC;KACnB;AACH,CAAC,CAAC;AAEF,MAAM,OAAgB,qBAAsB,SAAQ,WAAW;CAE9D"}

package/lib/stores/editor-state/entity-diff-editor-state/EntityDiffViewState.d.ts

@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { type GeneratorFn } from '@finos/legend-shared';
+import type { EditorStore } from '../../EditorStore.js';
+import { type SPECIAL_REVISION_ALIAS, EntityDiffEditorState } from './EntityDiffEditorState.js';
+import { type Entity } from '@finos/legend-storage';
+import type { PackageableElement } from '@finos/legend-graph';
+/**
+ * NOTE: when we support comparison between entities, we should create a new editor state
+ * as there are no benefits in trying to make this current one also work with comparison
+ * There are many differences, such as the concept of from and to revision makes no sense,
+ * the header text is different, etc.
+ */
+export declare enum DIFF_VIEW_MODE {
+    JSON = "JSON",
+    GRAMMAR = "Grammar"
+}
+export declare class EntityDiffViewState extends EntityDiffEditorState {
+    diffMode: DIFF_VIEW_MODE;
+    fromEntityPath?: string | undefined;
+    toEntityPath?: string | undefined;
+    fromRevision: SPECIAL_REVISION_ALIAS | string;
+    toRevision: SPECIAL_REVISION_ALIAS | string;
+    fromEntity?: Entity | undefined;
+    toEntity?: Entity | undefined;
+    fromGrammarText?: string | undefined;
+    toGrammarText?: string | undefined;
+    fromEntityGetter?: ((entityPath: string | undefined) => Entity | undefined) | undefined;
+    toEntityGetter?: ((entityPath: string | undefined) => Entity | undefined) | undefined;
+    constructor(editorStore: EditorStore, fromRevision: SPECIAL_REVISION_ALIAS | string, toRevision: SPECIAL_REVISION_ALIAS | string, fromEntityPath: string | undefined, toEntityPath: string | undefined, fromEntity: Entity | undefined, toEntity: Entity | undefined, fromEntityGetter?: (entityPath: string | undefined) => Entity | undefined, toEntityGetter?: (entityPath: string | undefined) => Entity | undefined);
+    /**
+     * The idea behind effective is that an entity diff state was constructed, one of `toEntityPath` and `fromEntityPath` can be undefined
+     * when the diff is a delete or create. But we can always guarantee that at least one exist and thus `effectiveEntityPath` is that guaranteed to exist path.
+     * It serves 2 main purposes:
+     * 1. For display
+     * 2. For refreshing diff: for example, when we push a workspace change, a delete is updated and if we continue to use the
+     *    `toEntityPath` the diff will be shown as a delete still, but we don't want this, we want both panels to have the same content
+     *
+     * As for which path to take precedence, it is more suitable to take `toEntityPath` because it reflects what currently presents in the project
+     * and what the UI should show all the time in the display
+     * e.g. it does not make sense to show the old path for a create element diff.
+     */
+    get effectiveEntityPath(): string;
+    get element(): PackageableElement | undefined;
+    get headerName(): string;
+    get headerTooltip(): string;
+    get summaryText(): string;
+    setDiffMode: (diffMode: DIFF_VIEW_MODE) => void;
+    private setToGrammarText;
+    private setFromGrammarText;
+    refresh(): void;
+    getFromGrammar(): GeneratorFn<void>;
+    getToGrammar(): GeneratorFn<void>;
+}
+//# sourceMappingURL=EntityDiffViewState.d.ts.map

package/lib/stores/editor-state/entity-diff-editor-state/EntityDiffViewState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EntityDiffViewState.d.ts","sourceRoot":"","sources":["../../../../src/stores/editor-state/entity-diff-editor-state/EntityDiffViewState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EACL,KAAK,WAAW,EAMjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EACL,KAAK,sBAAsB,EAC3B,qBAAqB,EACtB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,KAAK,MAAM,EAA6B,MAAM,uBAAuB,CAAC;AAE/E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9D;;;;;GAKG;AAEH,oBAAY,cAAc;IACxB,IAAI,SAAS;IACb,OAAO,YAAY;CACpB;AAED,qBAAa,mBAAoB,SAAQ,qBAAqB;IAC5D,QAAQ,iBAA0B;IAClC,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,YAAY,EAAE,sBAAsB,GAAG,MAAM,CAAC;IAC9C,UAAU,EAAE,sBAAsB,GAAG,MAAM,CAAC;IAE5C,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEnC,gBAAgB,CAAC,EACb,CAAC,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,KAAK,MAAM,GAAG,SAAS,CAAC,GACxD,SAAS,CAAC;IACd,cAAc,CAAC,EACX,CAAC,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,KAAK,MAAM,GAAG,SAAS,CAAC,GACxD,SAAS,CAAC;gBAGZ,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,sBAAsB,GAAG,MAAM,EAC7C,UAAU,EAAE,sBAAsB,GAAG,MAAM,EAC3C,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,gBAAgB,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,KAAK,MAAM,GAAG,SAAS,EACzE,cAAc,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,KAAK,MAAM,GAAG,SAAS;IA2CzE;;;;;;;;;;;OAWG;IACH,IAAI,mBAAmB,IAAI,MAAM,CAKhC;IACD,IAAI,OAAO,IAAI,kBAAkB,GAAG,SAAS,CAI5C;IACD,IAAI,UAAU,IAAI,MAAM,CAEvB;IACD,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,IAAI,WAAW,IAAI,MAAM,CAcxB;IAED,WAAW,aAAc,cAAc,KAAG,IAAI,CAE5C;IACF,OAAO,CAAC,gBAAgB,CAEtB;IACF,OAAO,CAAC,kBAAkB,CAExB;IAEF,OAAO,IAAI,IAAI;IASd,cAAc,IAAI,WAAW,CAAC,IAAI,CAAC;IAuBnC,YAAY,IAAI,WAAW,CAAC,IAAI,CAAC;CAsBnC"}