@fluid-experimental/property-changeset 2.0.0-rc.2.0.2 → 2.0.0-rc.3.0.0

package/dist/changeset_operations/arrayChangesetIterator.js

@@ -3,19 +3,18 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-/**
- * @fileoverview Iterator to iterate over array ChangeSets
- */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArrayChangeSetIterator = void 0;
-const isNumber_1 = __importDefault(require("lodash/isNumber"));
-const isString_1 = __importDefault(require("lodash/isString"));
-// @ts-ignore
+/**
+ * @fileoverview Iterator to iterate over array ChangeSets
+ */
 const property_common_1 = require("@fluid-experimental/property-common");
-const operationTypes_1 = require("./operationTypes");
+const isNumber_js_1 = __importDefault(require("lodash/isNumber.js"));
+const isString_js_1 = __importDefault(require("lodash/isString.js"));
+const operationTypes_js_1 = require("./operationTypes.js");
 const { MSG } = property_common_1.constants;
 /**
  * Iterator class which iterates over an array ChangeSet. It will successively return the operations ordered by their
@@ -54,7 +53,7 @@ class ArrayChangeSetIterator {
         this._lastOperationOffset = 0;
         this._atEnd = false;
         this._op = {
-            type: operationTypes_1.ArrayIteratorOperationTypes.NOP,
+            type: operationTypes_js_1.ArrayIteratorOperationTypes.NOP,
             offset: 0,
             operation: undefined,
         };
@@ -75,7 +74,7 @@ class ArrayChangeSetIterator {
             type = ArrayChangeSetIterator.types.REMOVE;
             currentIndex = this._changeSet.remove[this._currentIndices.remove][0];
             let currentLength = this._changeSet.remove[this._currentIndices.remove][1];
-            if (!(0, isNumber_1.default)(currentLength)) {
+            if (!(0, isNumber_js_1.default)(currentLength)) {
                 currentLength = currentLength.length;
             }
             // Check, whether this is a removeInsertOperation
@@ -132,7 +131,7 @@ 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])
+                var removedElements = (0, isNumber_js_1.default)(this._op.operation[1])
                     ? this._op.operation[1]
                     : this._op.operation[1].length;
                 this._lastOperationOffset -= removedElements;
@@ -159,7 +158,7 @@ class ArrayChangeSetIterator {
                     // 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])) {
+                    if ((0, isString_js_1.default)(nextModify[1])) {
                         partialModify[1] = nextModify[1].substr(0, insertPosition - nextModify[0]);
                         nextModify[1] = nextModify[1].substr(insertPosition - nextModify[0]);
                     }
@@ -202,5 +201,5 @@ class ArrayChangeSetIterator {
     }
 }
 exports.ArrayChangeSetIterator = ArrayChangeSetIterator;
-ArrayChangeSetIterator.types = operationTypes_1.ArrayIteratorOperationTypes; // @TODO Not sure if this is still required if we export it separately.
+ArrayChangeSetIterator.types = operationTypes_js_1.ArrayIteratorOperationTypes; // @TODO Not sure if this is still required if we export it separately.
 //# sourceMappingURL=arrayChangesetIterator.js.map

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\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 * @internal\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"]}
+{"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/**\n * @fileoverview Iterator to iterate over array ChangeSets\n */\n\nimport { constants } from \"@fluid-experimental/property-common\";\nimport isNumber from \"lodash/isNumber.js\";\nimport isString from \"lodash/isString.js\";\n\n// @ts-ignore\n\nimport { SerializedChangeSet } from \"../changeset.js\";\n\nimport { ArrayIteratorOperationTypes } from \"./operationTypes.js\";\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 * @internal\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;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"}
+{"version":3,"file":"changesetConflictTypes.d.ts","sourceRoot":"","sources":["../../src/changeset_operations/changesetConflictTypes.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;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

@@ -3,11 +3,11 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConflictType = void 0;
 /**
  * @fileoverview Conflict types that can occur during changeset operations
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConflictType = void 0;
 var ConflictType;
 (function (ConflictType) {
     /** We had two incompatible ChangeSets, they probably were with respect to different base commits */

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;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,4BAAZ,YAAY,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"]}
+{"version":3,"file":"changesetConflictTypes.js","sourceRoot":"","sources":["../../src/changeset_operations/changesetConflictTypes.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH;;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,4BAAZ,YAAY,QAqBvB","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\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

@@ -2,10 +2,7 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-/**
- * @fileoverview Helper functions and classes to work with ChangeSets with indexed collections (sets and maps)
- */
-import { ApplyChangeSetOptions, ConflictInfo, SerializedChangeSet } from "../changeset";
+import { ApplyChangeSetOptions, ConflictInfo, SerializedChangeSet } from "../changeset.js";
 export declare namespace ChangeSetIndexedCollectionFunctions {
     /**
      * Applies a ChangeSet to a given indexed collection property (recursively). The ChangeSet is assumed to be relative

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;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"}
+{"version":3,"file":"indexedCollection.d.ts","sourceRoot":"","sources":["../../src/changeset_operations/indexedCollection.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAeH,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAuC3F,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

@@ -3,26 +3,25 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-/**
- * @fileoverview Helper functions and classes to work with ChangeSets with indexed collections (sets and maps)
- */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChangeSetIndexedCollectionFunctions = void 0;
-const fastest_json_copy_1 = require("fastest-json-copy");
-const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
-const isEqual_1 = __importDefault(require("lodash/isEqual"));
-const isObject_1 = __importDefault(require("lodash/isObject"));
-const without_1 = __importDefault(require("lodash/without"));
-const includes_1 = __importDefault(require("lodash/includes"));
-// @ts-ignore
+/**
+ * @fileoverview Helper functions and classes to work with ChangeSets with indexed collections (sets and maps)
+ */
 const property_common_1 = require("@fluid-experimental/property-common");
-const typeidHelper_1 = require("../helpers/typeidHelper");
-const pathHelper_1 = require("../pathHelper");
-const changesetConflictTypes_1 = require("./changesetConflictTypes");
-const isEmptyChangeset_1 = require("./isEmptyChangeset");
+const fastest_json_copy_1 = require("fastest-json-copy");
+const includes_js_1 = __importDefault(require("lodash/includes.js"));
+const isEmpty_js_1 = __importDefault(require("lodash/isEmpty.js"));
+const isEqual_js_1 = __importDefault(require("lodash/isEqual.js"));
+const isObject_js_1 = __importDefault(require("lodash/isObject.js"));
+const without_js_1 = __importDefault(require("lodash/without.js"));
+const typeidHelper_js_1 = require("../helpers/typeidHelper.js");
+const pathHelper_js_1 = require("../pathHelper.js");
+const changesetConflictTypes_js_1 = require("./changesetConflictTypes.js");
+const isEmptyChangeset_js_1 = require("./isEmptyChangeset.js");
 const { PROPERTY_PATH_DELIMITER, MSG } = property_common_1.constants;
 /**
  * @namespace property-changeset.ChangeSetOperations.IndexedCollectionOperations
@@ -40,8 +39,8 @@ const { PROPERTY_PATH_DELIMITER, MSG } = property_common_1.constants;
  * @private
  */
 const _fastIsEmptyObject = function (in_object) {
-    if (!in_object || Array.isArray(in_object) || !(0, isObject_1.default)(in_object)) {
-        return (0, isEmpty_1.default)(in_object);
+    if (!in_object || Array.isArray(in_object) || !(0, isObject_js_1.default)(in_object)) {
+        return (0, isEmpty_js_1.default)(in_object);
     }
     // eslint-disable-next-line guard-for-in, no-restricted-syntax
     for (const _entry in in_object) {
@@ -67,7 +66,7 @@ var ChangeSetIndexedCollectionFunctions;
      * @private
      */
     ChangeSetIndexedCollectionFunctions._performApplyAfterOnPropertyIndexedCollection = function (io_basePropertyChanges, in_appliedPropertyChanges, in_typeid, in_options) {
-        const isPrimitiveTypeid = typeidHelper_1.TypeIdHelper.isPrimitiveType(in_typeid);
+        const isPrimitiveTypeid = typeidHelper_js_1.TypeIdHelper.isPrimitiveType(in_typeid);
         // Handle remove entry operations
         if (in_appliedPropertyChanges.remove) {
             // Get and initialize the corresponding entries in the existing collection
@@ -95,7 +94,7 @@ var ChangeSetIndexedCollectionFunctions;
                                 delete baseInserted[removedTypes[t]][removedKeys[i]];
                                 // If all entries for a typeid have been removed, we can remove
                                 // the whole typeid from the inserted section
-                                if (baseInserted && (0, isEmpty_1.default)(baseInserted[removedTypes[t]])) {
+                                if (baseInserted && (0, isEmpty_js_1.default)(baseInserted[removedTypes[t]])) {
                                     delete baseInserted[removedTypes[t]];
                                 }
                             }
@@ -106,7 +105,7 @@ var ChangeSetIndexedCollectionFunctions;
                                     delete baseModified[removedTypes[t]][removedKeys[i]];
                                     // If all entries for a typeid have been removed, we can remove
                                     // the whole typeid from the inserted section
-                                    if (baseModified && (0, isEmpty_1.default)(baseModified[removedTypes[t]])) {
+                                    if (baseModified && (0, isEmpty_js_1.default)(baseModified[removedTypes[t]])) {
                                         delete baseModified[removedTypes[t]];
                                     }
                                 }
@@ -168,10 +167,10 @@ var ChangeSetIndexedCollectionFunctions;
                             delete baseInserted[foundInTypeid][key];
                             // If all entries for a typeid have been removed, we can remove
                             // the whole typeid from the inserted or modified section
-                            if (baseInserted && (0, isEmpty_1.default)(baseInserted[foundInTypeid])) {
+                            if (baseInserted && (0, isEmpty_js_1.default)(baseInserted[foundInTypeid])) {
                                 delete baseInserted[foundInTypeid];
                             }
-                            if (baseModified && (0, isEmpty_1.default)(baseModified[foundInTypeid])) {
+                            if (baseModified && (0, isEmpty_js_1.default)(baseModified[foundInTypeid])) {
                                 delete baseModified[foundInTypeid];
                             }
                         }
@@ -224,39 +223,39 @@ var ChangeSetIndexedCollectionFunctions;
                     // the insert is reinserting exactly what was removed.
                     if (!isPrimitiveTypeid &&
                         removalCS &&
-                        (0, isObject_1.default)(removalCS) &&
+                        (0, isObject_js_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;
                         // If there are 'insert' and 'remove', see if the removed data matches the inserted data
                         if (deeplyEqualCS && insertedEntries[key].insert) {
-                            deeplyEqualCS = (0, isEqual_1.default)(insertedEntries[key].insert, removalCS[key].remove);
+                            deeplyEqualCS = (0, isEqual_js_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")
+                        const insertedEntry = (0, isObject_js_1.default)(insertedEntries[key])
+                            ? (0, without_js_1.default)(insertedEntries[key], "insert")
                             : insertedEntries[key];
-                        const removedEntry = (0, isObject_1.default)(removalCS[key])
-                            ? (0, without_1.default)(removalCS[key], "remove")
+                        const removedEntry = (0, isObject_js_1.default)(removalCS[key])
+                            ? (0, without_js_1.default)(removalCS[key], "remove")
                             : removalCS[key];
-                        deeplyEqualCS = deeplyEqualCS && (0, isEqual_1.default)(insertedEntry, removedEntry);
+                        deeplyEqualCS = deeplyEqualCS && (0, isEqual_js_1.default)(insertedEntry, removedEntry);
                     }
                     if ((isPrimitiveTypeid ||
-                        typeidHelper_1.TypeIdHelper.isPrimitiveType(typeid) ||
+                        typeidHelper_js_1.TypeIdHelper.isPrimitiveType(typeid) ||
                         deeplyEqualCS) &&
                         removalCS &&
-                        ((Array.isArray(removalCS) && (0, includes_1.default)(baseRemoved, key)) ||
+                        ((Array.isArray(removalCS) && (0, includes_js_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;
                         if (Array.isArray(removalCS)) {
                             if (isPrimitiveTypeid) {
-                                io_basePropertyChanges.remove = (0, without_1.default)(io_basePropertyChanges.remove, key);
+                                io_basePropertyChanges.remove = (0, without_js_1.default)(io_basePropertyChanges.remove, key);
                             }
                             else {
-                                io_basePropertyChanges.remove[typeid] = (0, without_1.default)(io_basePropertyChanges.remove[typeid], key);
+                                io_basePropertyChanges.remove[typeid] = (0, without_js_1.default)(io_basePropertyChanges.remove[typeid], key);
                             }
                         }
                         else {
@@ -329,7 +328,7 @@ var ChangeSetIndexedCollectionFunctions;
                     else {
                         // If this is a polymorphic collection, we can still have individual entries with
                         // primitive types
-                        const isEntryPrimitiveType = typeidHelper_1.TypeIdHelper.isPrimitiveType(typeid);
+                        const isEntryPrimitiveType = typeidHelper_js_1.TypeIdHelper.isPrimitiveType(typeid);
                         if (baseInserted[typeid] && baseInserted[typeid][key] !== undefined) {
                             // If this entry was added by this ChangeSet, we modify the insert operation according to the
                             // new ChangeSet
@@ -404,7 +403,7 @@ var ChangeSetIndexedCollectionFunctions;
      * @private
      */
     ChangeSetIndexedCollectionFunctions._rebaseIndexedCollectionChangeSetForProperty = function (in_ownPropertyChangeSet, io_rebasePropertyChangeSet, in_basePath, in_typeid, in_useSquareBracketsInPath, out_conflicts, in_options) {
-        const isPrimitiveTypeid = typeidHelper_1.TypeIdHelper.isPrimitiveType(in_typeid);
+        const isPrimitiveTypeid = typeidHelper_js_1.TypeIdHelper.isPrimitiveType(in_typeid);
         const changesByKeys = {};
         let modifyMap = {};
         // Helper function which stores the changes indexed by key in the changesByKeys array to
@@ -489,8 +488,8 @@ var ChangeSetIndexedCollectionFunctions;
         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);
+                ? `${in_basePath}[${pathHelper_js_1.PathHelper.quotePathSegmentIfNeeded(key)}]`
+                : (0, property_common_1.joinPaths)(in_basePath, pathHelper_js_1.PathHelper.quotePathSegmentIfNeeded(key), PROPERTY_PATH_DELIMITER);
             const modification = changesByKeys[key];
             if (modification.own && modification.other) {
                 /*
@@ -528,7 +527,7 @@ 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) &&
+                        (typeidHelper_js_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
@@ -541,7 +540,7 @@ var ChangeSetIndexedCollectionFunctions;
                         }
                         let conflict = {
                             path: newPath,
-                            type: changesetConflictTypes_1.ConflictType.COLLIDING_SET,
+                            type: changesetConflictTypes_js_1.ConflictType.COLLIDING_SET,
                             conflictingChange: ownModify[key],
                         };
                         out_conflicts.push(conflict);
@@ -580,7 +579,7 @@ var ChangeSetIndexedCollectionFunctions;
                     // Create the conflict information
                     let conflict = {
                         path: newPath,
-                        type: changesetConflictTypes_1.ConflictType.ENTRY_MODIFIED_AFTER_REMOVE,
+                        type: changesetConflictTypes_js_1.ConflictType.ENTRY_MODIFIED_AFTER_REMOVE,
                         conflictingChange: modifyMap[key],
                     };
                     out_conflicts.push(conflict);
@@ -597,7 +596,7 @@ var ChangeSetIndexedCollectionFunctions;
                         // Create the conflict information
                         let conflict = {
                             path: newPath,
-                            type: changesetConflictTypes_1.ConflictType.ENTRY_MODIFICATION_AFTER_REMOVE_INSERT,
+                            type: changesetConflictTypes_js_1.ConflictType.ENTRY_MODIFICATION_AFTER_REMOVE_INSERT,
                             conflictingChange: io_rebasePropertyChangeSet.modify[modification.otherTypeid][key],
                         };
                         out_conflicts.push(conflict);
@@ -614,7 +613,7 @@ var ChangeSetIndexedCollectionFunctions;
                         // Create the conflict information
                         let conflict = {
                             path: newPath,
-                            type: changesetConflictTypes_1.ConflictType.REMOVE_AFTER_MODIFY,
+                            type: changesetConflictTypes_js_1.ConflictType.REMOVE_AFTER_MODIFY,
                             conflictingChange: modifyMap[key],
                         };
                         out_conflicts.push(conflict);
@@ -622,7 +621,7 @@ var ChangeSetIndexedCollectionFunctions;
                     // If we have a duplicated delete, we remove it from the new ChangeSet
                     if (modification.own === "remove") {
                         if (Array.isArray(io_rebasePropertyChangeSet.remove)) {
-                            io_rebasePropertyChangeSet.remove = (0, without_1.default)(io_rebasePropertyChangeSet.remove, key);
+                            io_rebasePropertyChangeSet.remove = (0, without_js_1.default)(io_rebasePropertyChangeSet.remove, key);
                         }
                         else {
                             if (isPrimitiveTypeid) {
@@ -635,7 +634,7 @@ var ChangeSetIndexedCollectionFunctions;
                     }
                 }
                 else if (modification.own === "insert" && modification.other === "insert") {
-                    if (isPrimitiveTypeid || typeidHelper_1.TypeIdHelper.isPrimitiveType(modification.ownTypeid)) {
+                    if (isPrimitiveTypeid || typeidHelper_js_1.TypeIdHelper.isPrimitiveType(modification.ownTypeid)) {
                         let insertMap = modification.otherTypeid
                             ? io_rebasePropertyChangeSet.insert[modification.otherTypeid]
                             : io_rebasePropertyChangeSet.insert;
@@ -644,7 +643,7 @@ var ChangeSetIndexedCollectionFunctions;
                         // report it as a possible conflicting set
                         let conflict = {
                             path: newPath,
-                            type: changesetConflictTypes_1.ConflictType.COLLIDING_SET,
+                            type: changesetConflictTypes_js_1.ConflictType.COLLIDING_SET,
                             conflictingChange: insertMap[key],
                         };
                         out_conflicts.push(conflict);
@@ -676,7 +675,7 @@ var ChangeSetIndexedCollectionFunctions;
                         // Create the conflict information
                         let conflict = {
                             path: newPath,
-                            type: changesetConflictTypes_1.ConflictType.INSERTED_ENTRY_WITH_SAME_KEY,
+                            type: changesetConflictTypes_js_1.ConflictType.INSERTED_ENTRY_WITH_SAME_KEY,
                             conflictingChange: insertMap[key],
                         };
                         out_conflicts.push(conflict);
@@ -692,7 +691,7 @@ var ChangeSetIndexedCollectionFunctions;
                     // Raise the duplicate inserts as a conflict
                     let conflict = {
                         path: newPath,
-                        type: changesetConflictTypes_1.ConflictType.COLLIDING_SET,
+                        type: changesetConflictTypes_js_1.ConflictType.COLLIDING_SET,
                         conflictingChange: insertMap[key],
                     };
                     out_conflicts.push(conflict);
@@ -703,7 +702,7 @@ var ChangeSetIndexedCollectionFunctions;
                     // Create the conflict information
                     let conflict = {
                         path: newPath,
-                        type: changesetConflictTypes_1.ConflictType.INVALID_CHANGESET_BASE,
+                        type: changesetConflictTypes_js_1.ConflictType.INVALID_CHANGESET_BASE,
                         conflictingChange: modification.change,
                     };
                     out_conflicts.push(conflict);
@@ -719,7 +718,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_js_1.default)(io_rebasePropertyChangeSet[modification.other], key);
                         }
                         else {
                             delete io_rebasePropertyChangeSet[modification.other][key];
@@ -776,7 +775,7 @@ var ChangeSetIndexedCollectionFunctions;
                 const modifies = changes.modify[typeidList[j]];
                 const modifyKeys = Object.keys(modifies);
                 for (let k = 0; k < modifyKeys.length; k++) {
-                    if ((0, isEmptyChangeset_1.isEmptyChangeSet)(modifies[modifyKeys[k]])) {
+                    if ((0, isEmptyChangeset_js_1.isEmptyChangeSet)(modifies[modifyKeys[k]])) {
                         delete modifies[modifyKeys[k]];
                     }
                 }