@fluid-experimental/property-changeset 2.0.0-internal.3.0.5 → 2.0.0-internal.3.1.1

package/dist/changeset_operations/arrayChangesetIterator.js

@@ -71,8 +71,7 @@ class ArrayChangeSetIterator {
         let type;
         this._op.removeInsertOperation = undefined;
         // Process the current remove entry
-        if (this._changeSet.remove &&
-            this._currentIndices.remove < this._changeSet.remove.length) {
+        if (this._changeSet.remove && this._currentIndices.remove < this._changeSet.remove.length) {
             type = ArrayChangeSetIterator.types.REMOVE;
             currentIndex = this._changeSet.remove[this._currentIndices.remove][0];
             let currentLength = this._changeSet.remove[this._currentIndices.remove][1];
@@ -82,8 +81,10 @@ class ArrayChangeSetIterator {
             // Check, whether this is a removeInsertOperation
             if (this._changeSet.insert &&
                 this._currentIndices.insert < this._changeSet.insert.length &&
-                this._changeSet.insert[this._currentIndices.insert][0] <= currentIndex + currentLength) {
-                this._op.removeInsertOperation = this._changeSet.insert[this._currentIndices.insert];
+                this._changeSet.insert[this._currentIndices.insert][0] <=
+                    currentIndex + currentLength) {
+                this._op.removeInsertOperation =
+                    this._changeSet.insert[this._currentIndices.insert];
             }
         }
         // Process the current insert entry (we prefer remove over insert, since this prevents the array from growing more
@@ -131,51 +132,52 @@ class ArrayChangeSetIterator {
                 this._op.operation = this._changeSet.remove[this._currentIndices.remove];
                 this._op.offset = this._currentOffset;
                 // Update the current offset. For a remove we have to decrement it by the number of the removed elements
-                var removedElements = (0, isNumber_1.default)(this._op.operation[1]) ? this._op.operation[1] : this._op.operation[1].length;
+                var removedElements = (0, isNumber_1.default)(this._op.operation[1])
+                    ? this._op.operation[1]
+                    : this._op.operation[1].length;
                 this._lastOperationOffset -= removedElements;
                 // Shift the internal index
                 this._currentIndices.remove++;
                 break;
-            case ArrayChangeSetIterator.types.MODIFY:
-                {
-                    this._op.type = ArrayChangeSetIterator.types.MODIFY;
-                    this._op.offset = this._currentOffset;
-                    // check, if the modify's range overlaps with coming insert changes:
-                    let nextModify = this._copiedModifies[this._currentIndices.modify];
-                    const modifyEnd = nextModify[0] + nextModify[1].length;
-                    if (this._changeSet.insert &&
-                        this._currentIndices.insert < this._changeSet.insert.length &&
-                        this._changeSet.insert[this._currentIndices.insert][0] < modifyEnd) {
-                        // we have an overlap and need to cut the modify
-                        const insertPosition = this._changeSet.insert[this._currentIndices.insert][0];
-                        // if we haven't copied the change set's modifies yet, we need to do that now
-                        if (this._copiedModifies === this._changeSet.modify) {
-                            this._copiedModifies = this._copyModifies(this._changeSet.modify);
-                            // now we need to update nextModify!
-                            nextModify = this._copiedModifies[this._currentIndices.modify];
-                        }
-                        // use modify only up to insert's position
-                        // build a partial modify and cut the remaining one:
-                        const partialModify = [nextModify[0], undefined];
-                        if ((0, isString_1.default)(nextModify[1])) {
-                            partialModify[1] = nextModify[1].substr(0, insertPosition - nextModify[0]);
-                            nextModify[1] = nextModify[1].substr(insertPosition - nextModify[0]);
-                        }
-                        else {
-                            partialModify[1] = nextModify[1].splice(0, insertPosition - nextModify[0]);
-                        }
-                        nextModify[0] = insertPosition;
-                        // use the whole modify
-                        this._op.operation = partialModify;
+            case ArrayChangeSetIterator.types.MODIFY: {
+                this._op.type = ArrayChangeSetIterator.types.MODIFY;
+                this._op.offset = this._currentOffset;
+                // check, if the modify's range overlaps with coming insert changes:
+                let nextModify = this._copiedModifies[this._currentIndices.modify];
+                const modifyEnd = nextModify[0] + nextModify[1].length;
+                if (this._changeSet.insert &&
+                    this._currentIndices.insert < this._changeSet.insert.length &&
+                    this._changeSet.insert[this._currentIndices.insert][0] < modifyEnd) {
+                    // we have an overlap and need to cut the modify
+                    const insertPosition = this._changeSet.insert[this._currentIndices.insert][0];
+                    // if we haven't copied the change set's modifies yet, we need to do that now
+                    if (this._copiedModifies === this._changeSet.modify) {
+                        this._copiedModifies = this._copyModifies(this._changeSet.modify);
+                        // now we need to update nextModify!
+                        nextModify = this._copiedModifies[this._currentIndices.modify];
+                    }
+                    // use modify only up to insert's position
+                    // build a partial modify and cut the remaining one:
+                    const partialModify = [nextModify[0], undefined];
+                    if ((0, isString_1.default)(nextModify[1])) {
+                        partialModify[1] = nextModify[1].substr(0, insertPosition - nextModify[0]);
+                        nextModify[1] = nextModify[1].substr(insertPosition - nextModify[0]);
                     }
                     else {
-                        // use the whole modify
-                        this._op.operation = nextModify;
-                        // Shift the internal index
-                        this._currentIndices.modify++;
+                        partialModify[1] = nextModify[1].splice(0, insertPosition - nextModify[0]);
                     }
-                    break;
+                    nextModify[0] = insertPosition;
+                    // use the whole modify
+                    this._op.operation = partialModify;
+                }
+                else {
+                    // use the whole modify
+                    this._op.operation = nextModify;
+                    // Shift the internal index
+                    this._currentIndices.modify++;
                 }
+                break;
+            }
             default:
                 throw new Error(`ArrayChangeSetIterator: ${MSG.UNKNOWN_OPERATION}`);
         }

package/dist/changeset_operations/arrayChangesetIterator.js.map

@@ -1 +1 @@
-{"version":3,"file":"arrayChangesetIterator.js","sourceRoot":"","sources":["../../src/changeset_operations/arrayChangesetIterator.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n/**\n * @fileoverview Iterator to iterate over array ChangeSets\n */\n\n import isNumber from \"lodash/isNumber\";\n import isString from \"lodash/isString\";\n\n// @ts-ignore\nimport { constants } from \"@fluid-experimental/property-common\";\n\nimport { SerializedChangeSet } from \"../changeset\";\nimport { ArrayIteratorOperationTypes } from \"./operationTypes\";\n\nconst { MSG } = constants;\n\ntype genericArray = (number | string | (SerializedChangeSet & { typeid: string; }))[];\nexport type arrayInsertList = [number, string | genericArray];\nexport type arrayModifyList = [number, string | genericArray] | [number, string, string] | [number, genericArray, genericArray];\nexport type arrayRemoveList = [number, number | string | genericArray];\n\n/**\n * Description of an array operation\n */\nexport interface OperationDescription {\n    _absoluteBegin?: number;\n    type?: ArrayIteratorOperationTypes;\n    offset?: number;\n}\n\n/**\n * Description of an insert array operation\n */\nexport interface InsertOperation extends OperationDescription {\n    type: ArrayIteratorOperationTypes.INSERT;\n    removeInsertOperation?: arrayInsertList;\n    operation?: arrayInsertList;\n}\n\n/**\n * Description of a remove array operation\n */\nexport interface RemoveOperation extends OperationDescription {\n    type: ArrayIteratorOperationTypes.REMOVE;\n    removeInsertOperation?: arrayRemoveList;\n    operation?: arrayRemoveList;\n}\n\n/**\n * Description of a modify array operation\n */\nexport interface ModifyOperation extends OperationDescription {\n    type: ArrayIteratorOperationTypes.MODIFY;\n    removeInsertOperation?: arrayModifyList;\n    operation: arrayModifyList;\n}\n\n/**\n * Description of a modify array operation\n */\n export interface NOPOperation extends Omit<OperationDescription, \"removeInsertOperation\" | \"operation\"> {\n    type: ArrayIteratorOperationTypes.NOP;\n    operation?: [];\n}\n\nexport type NoneNOPOperation = RemoveOperation | InsertOperation | ModifyOperation;\nexport type GenericOperation = NoneNOPOperation | NOPOperation;\n\n/**\n * Iterator class which iterates over an array ChangeSet. It will successively return the operations ordered by their\n * position within the array. Additionally, it will keep track of the modifications to the array indices caused\n * by the previous operations.\n *\n */\nexport class ArrayChangeSetIterator {\n    static types = ArrayIteratorOperationTypes; // @TODO Not sure if this is still required if we export it separately.\n\n    private readonly _changeSet: SerializedChangeSet;\n    private _copiedModifies: string | any[];\n    private readonly _currentIndices: { insert: number; remove: number; modify: number; };\n    private _currentOffset: number;\n    private _lastOperationIndex: number;\n    private _lastOperationOffset: number;\n\n    private _atEnd: boolean;\n    private _op: GenericOperation;\n\n    public get opDescription(): GenericOperation {\n        return this._op;\n    }\n\n    public get currentOffset(): number {\n        return this._currentOffset;\n    }\n\n    public get lastOperationIndex(): number {\n        return this._lastOperationIndex;\n    }\n\n    public get lastOperationOffset(): number {\n        return this._lastOperationOffset;\n    }\n\n    /**\n     * @param in_changeSet - The ChangeSet to iterate over (this has to be an array ChangeSet\n     */\n    constructor(in_changeSet: SerializedChangeSet) {\n        this._changeSet = in_changeSet;\n        // if we need to chop overlapping modifies internally, so we have to copy them\n        // we do this lazy and only if really needed\n        this._copiedModifies = in_changeSet.modify;\n        this._currentIndices = {\n            insert: 0,\n            remove: 0,\n            modify: 0,\n        };\n\n        this._currentOffset = 0;\n        this._lastOperationIndex = -1;\n        this._lastOperationOffset = 0;\n        this._atEnd = false;\n\n        this._op = {\n            type: ArrayIteratorOperationTypes.NOP,\n            offset: 0,\n            operation: undefined,\n        };\n\n        // go to the first element\n        this.next();\n    }\n\n    /**\n     * Returns the next operation in the ChangeSet\n     * @returns true, if there are operations left\n     */\n    next(): boolean {\n        // Find the smallest index in the operations lists\n        let currentIndex = Infinity;\n        let type: ArrayIteratorOperationTypes;\n        (this._op as any).removeInsertOperation = undefined;\n        // Process the current remove entry\n        if (this._changeSet.remove &&\n            this._currentIndices.remove < this._changeSet.remove.length) {\n            type = ArrayChangeSetIterator.types.REMOVE;\n            currentIndex = this._changeSet.remove[this._currentIndices.remove][0];\n            let currentLength = this._changeSet.remove[this._currentIndices.remove][1];\n            if (!isNumber(currentLength)) {\n                currentLength = currentLength.length;\n            }\n\n            // Check, whether this is a removeInsertOperation\n            if (this._changeSet.insert &&\n                this._currentIndices.insert < this._changeSet.insert.length &&\n                this._changeSet.insert[this._currentIndices.insert][0] <= currentIndex + currentLength) {\n                    (this._op as InsertOperation).removeInsertOperation = this._changeSet.insert[this._currentIndices.insert];\n            }\n        }\n\n        // Process the current insert entry (we prefer remove over insert, since this prevents the array from growing more\n        // than necessary)\n        if (this._changeSet.insert &&\n            this._currentIndices.insert < this._changeSet.insert.length &&\n            this._changeSet.insert[this._currentIndices.insert][0] < currentIndex) {\n            type = ArrayChangeSetIterator.types.INSERT;\n            currentIndex = this._changeSet.insert[this._currentIndices.insert][0];\n        }\n\n        // Process the current modify entry\n        if (this._copiedModifies &&\n            this._currentIndices.modify < this._copiedModifies.length &&\n            this._copiedModifies[this._currentIndices.modify][0] < currentIndex) {\n            type = ArrayChangeSetIterator.types.MODIFY;\n        }\n\n        if (this._lastOperationIndex !== currentIndex) {\n            this._currentOffset += this._lastOperationOffset;\n            this._lastOperationIndex = currentIndex;\n            this._lastOperationOffset = 0;\n        }\n\n        // We have found nothing, so we are at the end of the ChangeSet\n        if (type === undefined) {\n            this._op.type = ArrayChangeSetIterator.types.NOP;\n            this._op.offset = this._currentOffset;\n            this._op.operation = undefined;\n            this._atEnd = true;\n            return false;\n        }\n\n        // Determine the return value and update the internal indices and offsets depending on the next operation\n        switch (type) {\n            case ArrayChangeSetIterator.types.INSERT:\n                this._op.type = ArrayChangeSetIterator.types.INSERT;\n                // Define the return value\n                this._op.operation = this._changeSet.insert[this._currentIndices.insert];\n                this._op.offset = this._currentOffset;\n                // Update the current offset. For an insert we have to increase it by the number of the inserted elements\n                this._lastOperationOffset += (this._op.operation[1] as any).length;\n\n                // Shift the internal index\n                this._currentIndices.insert++;\n                break;\n            case ArrayChangeSetIterator.types.REMOVE:\n                this._op.type = ArrayChangeSetIterator.types.REMOVE;\n                // Define the return value\n                this._op.operation = this._changeSet.remove[this._currentIndices.remove];\n                this._op.offset = this._currentOffset;\n                // Update the current offset. For a remove we have to decrement it by the number of the removed elements\n                var removedElements = isNumber(this._op.operation[1]) ? this._op.operation[1] : this._op.operation[1].length;\n                this._lastOperationOffset -= removedElements;\n\n                // Shift the internal index\n                this._currentIndices.remove++;\n                break;\n            case ArrayChangeSetIterator.types.MODIFY:\n                {\n                    this._op.type = ArrayChangeSetIterator.types.MODIFY;\n                    this._op.offset = this._currentOffset;\n                    // check, if the modify's range overlaps with coming insert changes:\n                    let nextModify = this._copiedModifies[this._currentIndices.modify];\n                    const modifyEnd = nextModify[0] + nextModify[1].length;\n                    if (this._changeSet.insert &&\n                        this._currentIndices.insert < this._changeSet.insert.length &&\n                        this._changeSet.insert[this._currentIndices.insert][0] < modifyEnd) {\n                        // we have an overlap and need to cut the modify\n                        const insertPosition = this._changeSet.insert[this._currentIndices.insert][0];\n\n                        // if we haven't copied the change set's modifies yet, we need to do that now\n                        if (this._copiedModifies === this._changeSet.modify) {\n                            this._copiedModifies = this._copyModifies(this._changeSet.modify);\n                            // now we need to update nextModify!\n                            nextModify = this._copiedModifies[this._currentIndices.modify];\n                        }\n\n                        // use modify only up to insert's position\n\n                        // build a partial modify and cut the remaining one:\n                        const partialModify: arrayModifyList = [nextModify[0], undefined];\n                        if (isString(nextModify[1])) {\n                            partialModify[1] = nextModify[1].substr(0, insertPosition - nextModify[0]);\n                            nextModify[1] = nextModify[1].substr(insertPosition - nextModify[0]);\n                        } else {\n                            partialModify[1] = nextModify[1].splice(0, insertPosition - nextModify[0]);\n                        }\n\n                        nextModify[0] = insertPosition;\n\n                        // use the whole modify\n                        this._op.operation = partialModify;\n                    } else {\n                        // use the whole modify\n                        this._op.operation = nextModify;\n\n                        // Shift the internal index\n                        this._currentIndices.modify++;\n                    }\n                    break;\n                }\n            default:\n                throw new Error(`ArrayChangeSetIterator: ${MSG.UNKNOWN_OPERATION}`);\n        }\n        this._atEnd = false;\n        return true;\n    }\n\n    /**\n     * @returns true, if there are no more operations left\n     */\n    atEnd(): boolean {\n        return this._atEnd;\n    }\n\n    private _copyModifies(in_modifies: string[]) {\n        if (!in_modifies || in_modifies.length === 0) {\n            return undefined;\n        }\n        const result = [];\n        for (let i = 0; i < in_modifies.length; i++) {\n            result.push([in_modifies[i][0], in_modifies[i][1].slice()]);\n        }\n        return result;\n    }\n}\n"]}
+{"version":3,"file":"arrayChangesetIterator.js","sourceRoot":"","sources":["../../src/changeset_operations/arrayChangesetIterator.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n/**\n * @fileoverview Iterator to iterate over array ChangeSets\n */\n\nimport isNumber from \"lodash/isNumber\";\nimport isString from \"lodash/isString\";\n\n// @ts-ignore\nimport { constants } from \"@fluid-experimental/property-common\";\n\nimport { SerializedChangeSet } from \"../changeset\";\nimport { ArrayIteratorOperationTypes } from \"./operationTypes\";\n\nconst { MSG } = constants;\n\ntype genericArray = (number | string | (SerializedChangeSet & { typeid: string }))[];\nexport type arrayInsertList = [number, string | genericArray];\nexport type arrayModifyList =\n\t| [number, string | genericArray]\n\t| [number, string, string]\n\t| [number, genericArray, genericArray];\nexport type arrayRemoveList = [number, number | string | genericArray];\n\n/**\n * Description of an array operation\n */\nexport interface OperationDescription {\n\t_absoluteBegin?: number;\n\ttype?: ArrayIteratorOperationTypes;\n\toffset?: number;\n}\n\n/**\n * Description of an insert array operation\n */\nexport interface InsertOperation extends OperationDescription {\n\ttype: ArrayIteratorOperationTypes.INSERT;\n\tremoveInsertOperation?: arrayInsertList;\n\toperation?: arrayInsertList;\n}\n\n/**\n * Description of a remove array operation\n */\nexport interface RemoveOperation extends OperationDescription {\n\ttype: ArrayIteratorOperationTypes.REMOVE;\n\tremoveInsertOperation?: arrayRemoveList;\n\toperation?: arrayRemoveList;\n}\n\n/**\n * Description of a modify array operation\n */\nexport interface ModifyOperation extends OperationDescription {\n\ttype: ArrayIteratorOperationTypes.MODIFY;\n\tremoveInsertOperation?: arrayModifyList;\n\toperation: arrayModifyList;\n}\n\n/**\n * Description of a modify array operation\n */\nexport interface NOPOperation\n\textends Omit<OperationDescription, \"removeInsertOperation\" | \"operation\"> {\n\ttype: ArrayIteratorOperationTypes.NOP;\n\toperation?: [];\n}\n\nexport type NoneNOPOperation = RemoveOperation | InsertOperation | ModifyOperation;\nexport type GenericOperation = NoneNOPOperation | NOPOperation;\n\n/**\n * Iterator class which iterates over an array ChangeSet. It will successively return the operations ordered by their\n * position within the array. Additionally, it will keep track of the modifications to the array indices caused\n * by the previous operations.\n *\n */\nexport class ArrayChangeSetIterator {\n\tstatic types = ArrayIteratorOperationTypes; // @TODO Not sure if this is still required if we export it separately.\n\n\tprivate readonly _changeSet: SerializedChangeSet;\n\tprivate _copiedModifies: string | any[];\n\tprivate readonly _currentIndices: { insert: number; remove: number; modify: number };\n\tprivate _currentOffset: number;\n\tprivate _lastOperationIndex: number;\n\tprivate _lastOperationOffset: number;\n\n\tprivate _atEnd: boolean;\n\tprivate _op: GenericOperation;\n\n\tpublic get opDescription(): GenericOperation {\n\t\treturn this._op;\n\t}\n\n\tpublic get currentOffset(): number {\n\t\treturn this._currentOffset;\n\t}\n\n\tpublic get lastOperationIndex(): number {\n\t\treturn this._lastOperationIndex;\n\t}\n\n\tpublic get lastOperationOffset(): number {\n\t\treturn this._lastOperationOffset;\n\t}\n\n\t/**\n\t * @param in_changeSet - The ChangeSet to iterate over (this has to be an array ChangeSet\n\t */\n\tconstructor(in_changeSet: SerializedChangeSet) {\n\t\tthis._changeSet = in_changeSet;\n\t\t// if we need to chop overlapping modifies internally, so we have to copy them\n\t\t// we do this lazy and only if really needed\n\t\tthis._copiedModifies = in_changeSet.modify;\n\t\tthis._currentIndices = {\n\t\t\tinsert: 0,\n\t\t\tremove: 0,\n\t\t\tmodify: 0,\n\t\t};\n\n\t\tthis._currentOffset = 0;\n\t\tthis._lastOperationIndex = -1;\n\t\tthis._lastOperationOffset = 0;\n\t\tthis._atEnd = false;\n\n\t\tthis._op = {\n\t\t\ttype: ArrayIteratorOperationTypes.NOP,\n\t\t\toffset: 0,\n\t\t\toperation: undefined,\n\t\t};\n\n\t\t// go to the first element\n\t\tthis.next();\n\t}\n\n\t/**\n\t * Returns the next operation in the ChangeSet\n\t * @returns true, if there are operations left\n\t */\n\tnext(): boolean {\n\t\t// Find the smallest index in the operations lists\n\t\tlet currentIndex = Infinity;\n\t\tlet type: ArrayIteratorOperationTypes;\n\t\t(this._op as any).removeInsertOperation = undefined;\n\t\t// Process the current remove entry\n\t\tif (this._changeSet.remove && this._currentIndices.remove < this._changeSet.remove.length) {\n\t\t\ttype = ArrayChangeSetIterator.types.REMOVE;\n\t\t\tcurrentIndex = this._changeSet.remove[this._currentIndices.remove][0];\n\t\t\tlet currentLength = this._changeSet.remove[this._currentIndices.remove][1];\n\t\t\tif (!isNumber(currentLength)) {\n\t\t\t\tcurrentLength = currentLength.length;\n\t\t\t}\n\n\t\t\t// Check, whether this is a removeInsertOperation\n\t\t\tif (\n\t\t\t\tthis._changeSet.insert &&\n\t\t\t\tthis._currentIndices.insert < this._changeSet.insert.length &&\n\t\t\t\tthis._changeSet.insert[this._currentIndices.insert][0] <=\n\t\t\t\t\tcurrentIndex + currentLength\n\t\t\t) {\n\t\t\t\t(this._op as InsertOperation).removeInsertOperation =\n\t\t\t\t\tthis._changeSet.insert[this._currentIndices.insert];\n\t\t\t}\n\t\t}\n\n\t\t// Process the current insert entry (we prefer remove over insert, since this prevents the array from growing more\n\t\t// than necessary)\n\t\tif (\n\t\t\tthis._changeSet.insert &&\n\t\t\tthis._currentIndices.insert < this._changeSet.insert.length &&\n\t\t\tthis._changeSet.insert[this._currentIndices.insert][0] < currentIndex\n\t\t) {\n\t\t\ttype = ArrayChangeSetIterator.types.INSERT;\n\t\t\tcurrentIndex = this._changeSet.insert[this._currentIndices.insert][0];\n\t\t}\n\n\t\t// Process the current modify entry\n\t\tif (\n\t\t\tthis._copiedModifies &&\n\t\t\tthis._currentIndices.modify < this._copiedModifies.length &&\n\t\t\tthis._copiedModifies[this._currentIndices.modify][0] < currentIndex\n\t\t) {\n\t\t\ttype = ArrayChangeSetIterator.types.MODIFY;\n\t\t}\n\n\t\tif (this._lastOperationIndex !== currentIndex) {\n\t\t\tthis._currentOffset += this._lastOperationOffset;\n\t\t\tthis._lastOperationIndex = currentIndex;\n\t\t\tthis._lastOperationOffset = 0;\n\t\t}\n\n\t\t// We have found nothing, so we are at the end of the ChangeSet\n\t\tif (type === undefined) {\n\t\t\tthis._op.type = ArrayChangeSetIterator.types.NOP;\n\t\t\tthis._op.offset = this._currentOffset;\n\t\t\tthis._op.operation = undefined;\n\t\t\tthis._atEnd = true;\n\t\t\treturn false;\n\t\t}\n\n\t\t// Determine the return value and update the internal indices and offsets depending on the next operation\n\t\tswitch (type) {\n\t\t\tcase ArrayChangeSetIterator.types.INSERT:\n\t\t\t\tthis._op.type = ArrayChangeSetIterator.types.INSERT;\n\t\t\t\t// Define the return value\n\t\t\t\tthis._op.operation = this._changeSet.insert[this._currentIndices.insert];\n\t\t\t\tthis._op.offset = this._currentOffset;\n\t\t\t\t// Update the current offset. For an insert we have to increase it by the number of the inserted elements\n\t\t\t\tthis._lastOperationOffset += (this._op.operation[1] as any).length;\n\n\t\t\t\t// Shift the internal index\n\t\t\t\tthis._currentIndices.insert++;\n\t\t\t\tbreak;\n\t\t\tcase ArrayChangeSetIterator.types.REMOVE:\n\t\t\t\tthis._op.type = ArrayChangeSetIterator.types.REMOVE;\n\t\t\t\t// Define the return value\n\t\t\t\tthis._op.operation = this._changeSet.remove[this._currentIndices.remove];\n\t\t\t\tthis._op.offset = this._currentOffset;\n\t\t\t\t// Update the current offset. For a remove we have to decrement it by the number of the removed elements\n\t\t\t\tvar removedElements = isNumber(this._op.operation[1])\n\t\t\t\t\t? this._op.operation[1]\n\t\t\t\t\t: this._op.operation[1].length;\n\t\t\t\tthis._lastOperationOffset -= removedElements;\n\n\t\t\t\t// Shift the internal index\n\t\t\t\tthis._currentIndices.remove++;\n\t\t\t\tbreak;\n\t\t\tcase ArrayChangeSetIterator.types.MODIFY: {\n\t\t\t\tthis._op.type = ArrayChangeSetIterator.types.MODIFY;\n\t\t\t\tthis._op.offset = this._currentOffset;\n\t\t\t\t// check, if the modify's range overlaps with coming insert changes:\n\t\t\t\tlet nextModify = this._copiedModifies[this._currentIndices.modify];\n\t\t\t\tconst modifyEnd = nextModify[0] + nextModify[1].length;\n\t\t\t\tif (\n\t\t\t\t\tthis._changeSet.insert &&\n\t\t\t\t\tthis._currentIndices.insert < this._changeSet.insert.length &&\n\t\t\t\t\tthis._changeSet.insert[this._currentIndices.insert][0] < modifyEnd\n\t\t\t\t) {\n\t\t\t\t\t// we have an overlap and need to cut the modify\n\t\t\t\t\tconst insertPosition = this._changeSet.insert[this._currentIndices.insert][0];\n\n\t\t\t\t\t// if we haven't copied the change set's modifies yet, we need to do that now\n\t\t\t\t\tif (this._copiedModifies === this._changeSet.modify) {\n\t\t\t\t\t\tthis._copiedModifies = this._copyModifies(this._changeSet.modify);\n\t\t\t\t\t\t// now we need to update nextModify!\n\t\t\t\t\t\tnextModify = this._copiedModifies[this._currentIndices.modify];\n\t\t\t\t\t}\n\n\t\t\t\t\t// use modify only up to insert's position\n\n\t\t\t\t\t// build a partial modify and cut the remaining one:\n\t\t\t\t\tconst partialModify: arrayModifyList = [nextModify[0], undefined];\n\t\t\t\t\tif (isString(nextModify[1])) {\n\t\t\t\t\t\tpartialModify[1] = nextModify[1].substr(0, insertPosition - nextModify[0]);\n\t\t\t\t\t\tnextModify[1] = nextModify[1].substr(insertPosition - nextModify[0]);\n\t\t\t\t\t} else {\n\t\t\t\t\t\tpartialModify[1] = nextModify[1].splice(0, insertPosition - nextModify[0]);\n\t\t\t\t\t}\n\n\t\t\t\t\tnextModify[0] = insertPosition;\n\n\t\t\t\t\t// use the whole modify\n\t\t\t\t\tthis._op.operation = partialModify;\n\t\t\t\t} else {\n\t\t\t\t\t// use the whole modify\n\t\t\t\t\tthis._op.operation = nextModify;\n\n\t\t\t\t\t// Shift the internal index\n\t\t\t\t\tthis._currentIndices.modify++;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tdefault:\n\t\t\t\tthrow new Error(`ArrayChangeSetIterator: ${MSG.UNKNOWN_OPERATION}`);\n\t\t}\n\t\tthis._atEnd = false;\n\t\treturn true;\n\t}\n\n\t/**\n\t * @returns true, if there are no more operations left\n\t */\n\tatEnd(): boolean {\n\t\treturn this._atEnd;\n\t}\n\n\tprivate _copyModifies(in_modifies: string[]) {\n\t\tif (!in_modifies || in_modifies.length === 0) {\n\t\t\treturn undefined;\n\t\t}\n\t\tconst result = [];\n\t\tfor (let i = 0; i < in_modifies.length; i++) {\n\t\t\tresult.push([in_modifies[i][0], in_modifies[i][1].slice()]);\n\t\t}\n\t\treturn result;\n\t}\n}\n"]}

package/dist/changeset_operations/changesetConflictTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"changesetConflictTypes.d.ts","sourceRoot":"","sources":["../../src/changeset_operations/changesetConflictTypes.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH;;GAEG;AAEH,oBAAY,YAAY;IACpB,oGAAoG;IACpG,sBAAsB,IAAI;IAC1B,6CAA6C;IAC7C,aAAa,IAAA;IACb,wCAAwC;IACxC,2BAA2B,IAAA;IAC3B;;;;OAIG;IACH,sCAAsC,IAAA;IACtC,kEAAkE;IAClE,4BAA4B,IAAA;IAC5B,+GAA+G;IAC/G,mBAAmB,IAAA;IAEnB,kBAAkB,IAAA;IAElB,uBAAuB,IAAA;CAC1B"}
+{"version":3,"file":"changesetConflictTypes.d.ts","sourceRoot":"","sources":["../../src/changeset_operations/changesetConflictTypes.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH;;GAEG;AAEH,oBAAY,YAAY;IACvB,oGAAoG;IACpG,sBAAsB,IAAI;IAC1B,6CAA6C;IAC7C,aAAa,IAAA;IACb,wCAAwC;IACxC,2BAA2B,IAAA;IAC3B;;;;OAIG;IACH,sCAAsC,IAAA;IACtC,kEAAkE;IAClE,4BAA4B,IAAA;IAC5B,+GAA+G;IAC/G,mBAAmB,IAAA;IAEnB,kBAAkB,IAAA;IAElB,uBAAuB,IAAA;CACvB"}

package/dist/changeset_operations/changesetConflictTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"changesetConflictTypes.js","sourceRoot":"","sources":["../../src/changeset_operations/changesetConflictTypes.ts"],"names":[],"mappings":";AAAA;;;GAGG;AACH;;GAEG;;;AAEH,IAAY,YAqBX;AArBD,WAAY,YAAY;IACpB,oGAAoG;IACpG,mFAA0B,CAAA;IAC1B,6CAA6C;IAC7C,iEAAa,CAAA;IACb,wCAAwC;IACxC,6FAA2B,CAAA;IAC3B;;;;OAIG;IACH,mHAAsC,CAAA;IACtC,kEAAkE;IAClE,+FAA4B,CAAA;IAC5B,+GAA+G;IAC/G,6EAAmB,CAAA;IACnB,oDAAoD;IACpD,2EAAkB,CAAA;IAClB,+CAA+C;IAC/C,qFAAuB,CAAA;AAC3B,CAAC,EArBW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAqBvB","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n/**\n * @fileoverview Conflict types that can occur during changeset operations\n */\n\nexport enum ConflictType  {\n    /** We had two incompatible ChangeSets, they probably were with respect to different base commits */\n    INVALID_CHANGESET_BASE = 1,\n    /** A value was changed in both ChangeSets */\n    COLLIDING_SET,\n    /** A deleted child node was modified */\n    ENTRY_MODIFIED_AFTER_REMOVE,\n    /** A child was modified after it had been removed and added.\n     *\n     * The modification can no longer be applied, since the affected object has changed and thus\n     * the ChangeSet is no longer compatible.\n     */\n    ENTRY_MODIFICATION_AFTER_REMOVE_INSERT,\n    /** An entry with the same key was inserted into the collection */\n    INSERTED_ENTRY_WITH_SAME_KEY,\n    /** A property was removed after a modify, this should mostly be safe, be we report it for completeness sake */\n    REMOVE_AFTER_MODIFY,\n    // Templates do not match from one commit to another\n    MISMATCH_TEMPLATES,\n    // Tried to insert inside a removed array range\n    INSERT_IN_REMOVED_RANGE,\n}\n"]}
+{"version":3,"file":"changesetConflictTypes.js","sourceRoot":"","sources":["../../src/changeset_operations/changesetConflictTypes.ts"],"names":[],"mappings":";AAAA;;;GAGG;AACH;;GAEG;;;AAEH,IAAY,YAqBX;AArBD,WAAY,YAAY;IACvB,oGAAoG;IACpG,mFAA0B,CAAA;IAC1B,6CAA6C;IAC7C,iEAAa,CAAA;IACb,wCAAwC;IACxC,6FAA2B,CAAA;IAC3B;;;;OAIG;IACH,mHAAsC,CAAA;IACtC,kEAAkE;IAClE,+FAA4B,CAAA;IAC5B,+GAA+G;IAC/G,6EAAmB,CAAA;IACnB,oDAAoD;IACpD,2EAAkB,CAAA;IAClB,+CAA+C;IAC/C,qFAAuB,CAAA;AACxB,CAAC,EArBW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAqBvB","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n/**\n * @fileoverview Conflict types that can occur during changeset operations\n */\n\nexport enum ConflictType {\n\t/** We had two incompatible ChangeSets, they probably were with respect to different base commits */\n\tINVALID_CHANGESET_BASE = 1,\n\t/** A value was changed in both ChangeSets */\n\tCOLLIDING_SET,\n\t/** A deleted child node was modified */\n\tENTRY_MODIFIED_AFTER_REMOVE,\n\t/** A child was modified after it had been removed and added.\n\t *\n\t * The modification can no longer be applied, since the affected object has changed and thus\n\t * the ChangeSet is no longer compatible.\n\t */\n\tENTRY_MODIFICATION_AFTER_REMOVE_INSERT,\n\t/** An entry with the same key was inserted into the collection */\n\tINSERTED_ENTRY_WITH_SAME_KEY,\n\t/** A property was removed after a modify, this should mostly be safe, be we report it for completeness sake */\n\tREMOVE_AFTER_MODIFY,\n\t// Templates do not match from one commit to another\n\tMISMATCH_TEMPLATES,\n\t// Tried to insert inside a removed array range\n\tINSERT_IN_REMOVED_RANGE,\n}\n"]}

package/dist/changeset_operations/indexedCollection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"indexedCollection.d.ts","sourceRoot":"","sources":["../../src/changeset_operations/indexedCollection.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH;;GAEG;AAWH,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAsCxF,yBAAiB,mCAAmC,CAAC;IACjD;;;;;;;;;;;;;OAaG;IACI,MAAM,6CAA6C,2BAC9B,mBAAmB,6BAChB,mBAAmB,aACnC,MAAM,cACL,qBAAqB,SAgUpC,CAAC;IAEF;;;;;;;;;;;;;;;OAeG;IACI,MAAM,4CAA4C,4BAC5B,mBAAmB,8BAChB,mBAAmB,eAClC,MAAM,aACR,MAAM,8BACW,OAAO,iBACpB,YAAY,EAAE,cACjB,qBAAqB,SA+UpC,CAAC;IAEF;;;;;;OAMG;IACI,MAAM,gCAAgC,uBAAgC,mBAAmB,sBAAsB,OAAO,SAwD5H,CAAC;CACL"}
+{"version":3,"file":"indexedCollection.d.ts","sourceRoot":"","sources":["../../src/changeset_operations/indexedCollection.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH;;GAEG;AAWH,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAsCxF,yBAAiB,mCAAmC,CAAC;IACpD;;;;;;;;;;;;;OAaG;IACI,MAAM,6CAA6C,2BACjC,mBAAmB,6BAChB,mBAAmB,aACnC,MAAM,cACL,qBAAqB,SAoXjC,CAAC;IAEF;;;;;;;;;;;;;;;OAeG;IACI,MAAM,4CAA4C,4BAC/B,mBAAmB,8BAChB,mBAAmB,eAClC,MAAM,aACR,MAAM,8BACW,OAAO,iBACpB,YAAY,EAAE,cACjB,qBAAqB,SAmYjC,CAAC;IAEF;;;;;;OAMG;IACI,MAAM,gCAAgC,uBACxB,mBAAmB,sBACnB,OAAO,SAyD3B,CAAC;CACF"}

package/dist/changeset_operations/indexedCollection.js

@@ -74,8 +74,9 @@ var ChangeSetIndexedCollectionFunctions;
             // Get and initialize the corresponding entries in the existing collection
             let removedEntries = in_appliedPropertyChanges.remove;
             io_basePropertyChanges = io_basePropertyChanges || {};
-            io_basePropertyChanges.remove = io_basePropertyChanges.remove ||
-                (Array.isArray(in_appliedPropertyChanges.remove) ? [] : {});
+            io_basePropertyChanges.remove =
+                io_basePropertyChanges.remove ||
+                    (Array.isArray(in_appliedPropertyChanges.remove) ? [] : {});
             let baseInserted = io_basePropertyChanges.insert || {};
             let baseRemoved = io_basePropertyChanges.remove;
             let baseModified = io_basePropertyChanges.modify;
@@ -100,7 +101,8 @@ var ChangeSetIndexedCollectionFunctions;
                                 }
                             }
                             else {
-                                if (baseModified && baseModified[removedTypes[t]] &&
+                                if (baseModified &&
+                                    baseModified[removedTypes[t]] &&
                                     baseModified[removedTypes[t]][removedKeys[i]] !== undefined) {
                                     delete baseModified[removedTypes[t]][removedKeys[i]];
                                     // If all entries for a typeid have been removed, we can remove
@@ -116,7 +118,8 @@ var ChangeSetIndexedCollectionFunctions;
                                     if (!baseRemoved[removedTypes[t]]) {
                                         baseRemoved[removedTypes[t]] = {};
                                     }
-                                    baseRemoved[removedTypes[t]][removedKeys[i]] = removedEntries[removedTypes[t]][removedKeys[i]];
+                                    baseRemoved[removedTypes[t]][removedKeys[i]] =
+                                        removedEntries[removedTypes[t]][removedKeys[i]];
                                 }
                             }
                         }
@@ -199,11 +202,14 @@ var ChangeSetIndexedCollectionFunctions;
             let baseRemoved = io_basePropertyChanges.remove;
             // Insert the inserted entries
             // If no typeids are included, we just use a placeholder for the iteration below
-            const insertedTypeids = isPrimitiveTypeid ? [undefined] : Object.keys(in_appliedPropertyChanges.insert);
+            const insertedTypeids = isPrimitiveTypeid
+                ? [undefined]
+                : Object.keys(in_appliedPropertyChanges.insert);
             for (let i = 0; i < insertedTypeids.length; i++) {
                 let typeid = insertedTypeids[i];
-                const insertedEntries = isPrimitiveTypeid ?
-                    in_appliedPropertyChanges.insert : in_appliedPropertyChanges.insert[typeid];
+                const insertedEntries = isPrimitiveTypeid
+                    ? in_appliedPropertyChanges.insert
+                    : in_appliedPropertyChanges.insert[typeid];
                 const insertedKeys = Object.keys(insertedEntries);
                 let removalCS;
                 if (baseRemoved) {
@@ -217,7 +223,10 @@ var ChangeSetIndexedCollectionFunctions;
                     // TODO: We should actually compute a diff between the two and recursively convert portions to modifies
                     // Instead, right now, we only handle the case where the two keys cancel each out perfectly, i.e.,
                     // the insert is reinserting exactly what was removed.
-                    if (!isPrimitiveTypeid && removalCS && (0, isObject_1.default)(removalCS) && removalCS[key] !== undefined) {
+                    if (!isPrimitiveTypeid &&
+                        removalCS &&
+                        (0, isObject_1.default)(removalCS) &&
+                        removalCS[key] !== undefined) {
                         // Split out the two parts: all the keys other than remove/insert should match exactly.
                         // The contents 'remove' and 'insert', if they exist, should also match.
                         deeplyEqualCS = !!insertedEntries[key].insert === !!removalCS[key].remove;
@@ -226,13 +235,20 @@ var ChangeSetIndexedCollectionFunctions;
                             deeplyEqualCS = (0, isEqual_1.default)(insertedEntries[key].insert, removalCS[key].remove);
                         }
                         // Finally, check if the data being inserted matches the data that was removed
-                        const insertedEntry = (0, isObject_1.default)(insertedEntries[key]) ? (0, without_1.default)(insertedEntries[key], "insert") : insertedEntries[key];
-                        const removedEntry = (0, isObject_1.default)(removalCS[key]) ? (0, without_1.default)(removalCS[key], "remove") : removalCS[key];
+                        const insertedEntry = (0, isObject_1.default)(insertedEntries[key])
+                            ? (0, without_1.default)(insertedEntries[key], "insert")
+                            : insertedEntries[key];
+                        const removedEntry = (0, isObject_1.default)(removalCS[key])
+                            ? (0, without_1.default)(removalCS[key], "remove")
+                            : removalCS[key];
                         deeplyEqualCS = deeplyEqualCS && (0, isEqual_1.default)(insertedEntry, removedEntry);
                     }
-                    if ((isPrimitiveTypeid || typeidHelper_1.TypeIdHelper.isPrimitiveType(typeid) || deeplyEqualCS) &&
+                    if ((isPrimitiveTypeid ||
+                        typeidHelper_1.TypeIdHelper.isPrimitiveType(typeid) ||
+                        deeplyEqualCS) &&
                         removalCS &&
-                        ((Array.isArray(removalCS) && (0, includes_1.default)(baseRemoved, key)) || removalCS[key] !== undefined)) {
+                        ((Array.isArray(removalCS) && (0, includes_1.default)(baseRemoved, key)) ||
+                            removalCS[key] !== undefined)) {
                         // A remove and insert are combined into a modify for primitive types
                         // Remove the old remove command
                         let oldValueMatches = false;
@@ -245,7 +261,8 @@ var ChangeSetIndexedCollectionFunctions;
                             }
                         }
                         else {
-                            oldValueMatches = deeplyEqualCS || (removalCS[key] === insertedEntries[key]);
+                            oldValueMatches =
+                                deeplyEqualCS || removalCS[key] === insertedEntries[key];
                             delete removalCS[key];
                         }
                         // Insert a modify command instead
@@ -255,7 +272,8 @@ var ChangeSetIndexedCollectionFunctions;
                                 io_basePropertyChanges.modify[key] = insertedEntries[key];
                             }
                             else {
-                                io_basePropertyChanges.modify[typeid] = io_basePropertyChanges.modify[typeid] || {};
+                                io_basePropertyChanges.modify[typeid] =
+                                    io_basePropertyChanges.modify[typeid] || {};
                                 io_basePropertyChanges.modify[typeid][key] = (0, fastest_json_copy_1.copy)(insertedEntries[key]);
                             }
                         }
@@ -263,7 +281,8 @@ var ChangeSetIndexedCollectionFunctions;
                     else if (isPrimitiveTypeid && baseInserted[key] === undefined) {
                         baseInserted[key] = insertedEntries[key];
                     }
-                    else if (!isPrimitiveTypeid && (!baseInserted[typeid] || baseInserted[typeid][key] === undefined)) {
+                    else if (!isPrimitiveTypeid &&
+                        (!baseInserted[typeid] || baseInserted[typeid][key] === undefined)) {
                         baseInserted[typeid] = baseInserted[typeid] || {};
                         baseInserted[typeid][key] = (0, fastest_json_copy_1.copy)(insertedEntries[key]);
                     }
@@ -325,7 +344,8 @@ var ChangeSetIndexedCollectionFunctions;
                                 if (typeid === "Int64" || typeid === "Uint64") {
                                     newValue = newValue.slice();
                                 }
-                                if (baseInserted[typeid][key] && baseInserted[typeid][key].hasOwnProperty("value")) {
+                                if (baseInserted[typeid][key] &&
+                                    baseInserted[typeid][key].hasOwnProperty("value")) {
                                     baseInserted[typeid][key].value = newValue;
                                 }
                                 else {
@@ -336,7 +356,8 @@ var ChangeSetIndexedCollectionFunctions;
                                 this.performApplyAfterOnPropertyWithTypeid(key, baseInserted[typeid], modifiedEntries[typeid], typeid, false, in_options);
                             }
                         }
-                        else if (baseModified[typeid] && baseModified[typeid][key] !== undefined) {
+                        else if (baseModified[typeid] &&
+                            baseModified[typeid][key] !== undefined) {
                             // If there was a previous modification operation, we have to merge the two
                             if (isEntryPrimitiveType && typeid !== "String") {
                                 // Primitive types can simply be overwritten, however we have an exception for
@@ -403,9 +424,9 @@ var ChangeSetIndexedCollectionFunctions;
                 const key = keys[j];
                 // Store the type of the change
                 changesByKeys[key] = changesByKeys[key] || {};
-                changesByKeys[key][in_changePrefix] = changesByKeys[key][in_changePrefix] ?
-                    `${changesByKeys[key][in_changePrefix]}_${in_changeIdentifier}` :
-                    in_changeIdentifier;
+                changesByKeys[key][in_changePrefix] = changesByKeys[key][in_changePrefix]
+                    ? `${changesByKeys[key][in_changePrefix]}_${in_changeIdentifier}`
+                    : in_changeIdentifier;
                 // If applicable store the typeid of the change
                 if (in_typeidChange) {
                     changesByKeys[key][`${in_changePrefix}Typeid`] = in_typeidChange;
@@ -472,9 +493,9 @@ var ChangeSetIndexedCollectionFunctions;
         const changedKeys = Object.keys(changesByKeys);
         for (let i = 0; i < changedKeys.length; i++) {
             const key = changedKeys[i];
-            const newPath = in_useSquareBracketsInPath ?
-                `${in_basePath}[${pathHelper_1.PathHelper.quotePathSegmentIfNeeded(key)}]` :
-                (0, property_common_1.joinPaths)(in_basePath, pathHelper_1.PathHelper.quotePathSegmentIfNeeded(key), PROPERTY_PATH_DELIMITER);
+            const newPath = in_useSquareBracketsInPath
+                ? `${in_basePath}[${pathHelper_1.PathHelper.quotePathSegmentIfNeeded(key)}]`
+                : (0, property_common_1.joinPaths)(in_basePath, pathHelper_1.PathHelper.quotePathSegmentIfNeeded(key), PROPERTY_PATH_DELIMITER);
             const modification = changesByKeys[key];
             if (modification.own && modification.other) {
                 /*
@@ -512,7 +533,8 @@ var ChangeSetIndexedCollectionFunctions;
                 // A key was modified after it had been removed
                 if (modification.own === "modify" && modification.other === "modify") {
                     if (isPrimitiveTypeid ||
-                        (typeidHelper_1.TypeIdHelper.isPrimitiveType(modification.ownTypeid) && modification.ownTypeid !== "String")) {
+                        (typeidHelper_1.TypeIdHelper.isPrimitiveType(modification.ownTypeid) &&
+                            modification.ownTypeid !== "String")) {
                         // We have two modification operations that affect the same entry for a base type.
                         // This is a legal operation, the second one will overwrite the first one, but we
                         // report it as a possible conflict
@@ -534,10 +556,13 @@ var ChangeSetIndexedCollectionFunctions;
                             ownValue = ownValue.value;
                         }
                         let rebaseValue = rebasedModify[key];
-                        if (typeof rebaseValue === "object" && rebaseValue.hasOwnProperty("value")) {
+                        if (typeof rebaseValue === "object" &&
+                            rebaseValue.hasOwnProperty("value")) {
                             rebaseValue = rebaseValue.value;
                         }
-                        if (modification.ownTypeid === "Int64" || modification.ownTypeid === "Uint64" || ownValue.length === 2) {
+                        if (modification.ownTypeid === "Int64" ||
+                            modification.ownTypeid === "Uint64" ||
+                            ownValue.length === 2) {
                             // For (u)int64, values are arrays of 2 elements
                             if (ownValue[0] === rebaseValue[0] && ownValue[1] === rebaseValue[1]) {
                                 delete rebasedModify[key];
@@ -554,8 +579,9 @@ var ChangeSetIndexedCollectionFunctions;
                     }
                 }
                 else if (modification.own === "remove" && modification.other === "modify") {
-                    modifyMap = modification.otherTypeid ? io_rebasePropertyChangeSet.modify[modification.otherTypeid] :
-                        io_rebasePropertyChangeSet.modify;
+                    modifyMap = modification.otherTypeid
+                        ? io_rebasePropertyChangeSet.modify[modification.otherTypeid]
+                        : io_rebasePropertyChangeSet.modify;
                     // Create the conflict information
                     let conflict = {
                         path: newPath,
@@ -566,7 +592,8 @@ var ChangeSetIndexedCollectionFunctions;
                     // Delete the modification from the rebased ChangeSet
                     delete modifyMap[key];
                 }
-                else if (modification.own === "remove_insert" && modification.other === "modify") {
+                else if (modification.own === "remove_insert" &&
+                    modification.other === "modify") {
                     // We have a conflicting change. A node was removed and inserted (replaced) in the original
                     // ChangeSet and then modified by the rebased ChangeSet. Since the base of the modification
                     // can have been changed significantly by this operation, we don't know whether we can
@@ -584,8 +611,9 @@ var ChangeSetIndexedCollectionFunctions;
                 else if ((modification.own === "modify" || modification.own === "remove") &&
                     (modification.other === "remove" || modification.other === "remove_insert")) {
                     if (modification.own === "modify") {
-                        modifyMap = modification.ownTypeid ? in_ownPropertyChangeSet.modify[modification.ownTypeid] :
-                            in_ownPropertyChangeSet.modify;
+                        modifyMap = modification.ownTypeid
+                            ? in_ownPropertyChangeSet.modify[modification.ownTypeid]
+                            : in_ownPropertyChangeSet.modify;
                         // Create the conflict information
                         let conflict = {
                             path: newPath,
@@ -610,10 +638,10 @@ var ChangeSetIndexedCollectionFunctions;
                     }
                 }
                 else if (modification.own === "insert" && modification.other === "insert") {
-                    if (isPrimitiveTypeid ||
-                        (typeidHelper_1.TypeIdHelper.isPrimitiveType(modification.ownTypeid))) {
-                        let insertMap = modification.otherTypeid ? io_rebasePropertyChangeSet.insert[modification.otherTypeid] :
-                            io_rebasePropertyChangeSet.insert;
+                    if (isPrimitiveTypeid || typeidHelper_1.TypeIdHelper.isPrimitiveType(modification.ownTypeid)) {
+                        let insertMap = modification.otherTypeid
+                            ? io_rebasePropertyChangeSet.insert[modification.otherTypeid]
+                            : io_rebasePropertyChangeSet.insert;
                         // We have two insert operations that affect the same key for a primitive type.
                         // This is a legal operation, the second one will overwrite the first one, but we
                         // report it as a possible conflicting set
@@ -626,14 +654,16 @@ var ChangeSetIndexedCollectionFunctions;
                         // Convert to modify
                         let oldValue;
                         if (modification.otherTypeid) {
-                            io_rebasePropertyChangeSet.modify = io_rebasePropertyChangeSet.modify || {};
+                            io_rebasePropertyChangeSet.modify =
+                                io_rebasePropertyChangeSet.modify || {};
                             io_rebasePropertyChangeSet.modify[modification.otherTypeid] =
                                 io_rebasePropertyChangeSet.modify[modification.otherTypeid] || {};
                             modifyMap = io_rebasePropertyChangeSet.modify[modification.otherTypeid];
                             oldValue = in_ownPropertyChangeSet.insert[modification.ownTypeid][key];
                         }
                         else {
-                            io_rebasePropertyChangeSet.modify = io_rebasePropertyChangeSet.modify || {};
+                            io_rebasePropertyChangeSet.modify =
+                                io_rebasePropertyChangeSet.modify || {};
                             modifyMap = io_rebasePropertyChangeSet.modify;
                             oldValue = in_ownPropertyChangeSet.insert[key];
                         }
@@ -643,8 +673,9 @@ var ChangeSetIndexedCollectionFunctions;
                     else {
                         // Here we have two insert operations for objects. Since these affect a whole sub-tree and not
                         // just a single value, we cannot easily convert it into a modify and instead report it as invalid
-                        let insertMap = modification.otherTypeid ? io_rebasePropertyChangeSet.insert[modification.otherTypeid] :
-                            io_rebasePropertyChangeSet.insert;
+                        let insertMap = modification.otherTypeid
+                            ? io_rebasePropertyChangeSet.insert[modification.otherTypeid]
+                            : io_rebasePropertyChangeSet.insert;
                         // Create the conflict information
                         let conflict = {
                             path: newPath,
@@ -656,9 +687,11 @@ var ChangeSetIndexedCollectionFunctions;
                         delete insertMap[key];
                     }
                 }
-                else if (modification.own === "remove_insert" && modification.other === "remove_insert") {
-                    let insertMap = modification.otherTypeid ? io_rebasePropertyChangeSet.insert[modification.otherTypeid] :
-                        io_rebasePropertyChangeSet.insert;
+                else if (modification.own === "remove_insert" &&
+                    modification.other === "remove_insert") {
+                    let insertMap = modification.otherTypeid
+                        ? io_rebasePropertyChangeSet.insert[modification.otherTypeid]
+                        : io_rebasePropertyChangeSet.insert;
                     // Raise the duplicate inserts as a conflict
                     let conflict = {
                         path: newPath,
@@ -689,8 +722,7 @@ var ChangeSetIndexedCollectionFunctions;
                     else {
                         // Remove remove operations from the ChangeSet
                         if (Array.isArray(io_rebasePropertyChangeSet[modification.other])) {
-                            io_rebasePropertyChangeSet[modification.other] =
-                                (0, without_1.default)(io_rebasePropertyChangeSet[modification.other], key);
+                            io_rebasePropertyChangeSet[modification.other] = (0, without_1.default)(io_rebasePropertyChangeSet[modification.other], key);
                         }
                         else {
                             delete io_rebasePropertyChangeSet[modification.other][key];