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

package/lib/utils.js

@@ -23,18 +23,18 @@ const { PROPERTY_PATH_DELIMITER, MSG } = constants;
  * Utils
  * @alias property-changeset.Utils
  * @class
-*/
+ */
 // eslint-disable-next-line @typescript-eslint/no-namespace
 export var Utils;
 (function (Utils) {
     /**
-    * Traverses a ChangeSet recursively and invokes the callback for each visited property.
-    *
-    * @param in_preCallback - The (pre-order) callback function that is invoked for each property
-    * @param in_postCallback - The (post-order) callback function that is invoked for each property
-    * @param in_context -  The traversal context for the currently processed property
-    * @param in_levelCallback - A callback for when a node is reached
-    */
+     * Traverses a ChangeSet recursively and invokes the callback for each visited property.
+     *
+     * @param in_preCallback - The (pre-order) callback function that is invoked for each property
+     * @param in_postCallback - The (post-order) callback function that is invoked for each property
+     * @param in_context -  The traversal context for the currently processed property
+     * @param in_levelCallback - A callback for when a node is reached
+     */
     function _traverseChangeSetRecursivelyAsync(in_preCallback, in_postCallback, in_context, in_levelCallback) {
         let pathSeparator;
         let currentPath;
@@ -44,9 +44,7 @@ export var Utils;
         // Call the callback function for this ChangeSet
         in_context._traversalStopped = false;
         const typeid = in_context.getTypeid();
-        let splitTypeId = typeid !== undefined ?
-            TypeIdHelper.extractContext(typeid) :
-            undefined;
+        let splitTypeId = typeid !== undefined ? TypeIdHelper.extractContext(typeid) : undefined;
         in_context.setSplitTypeID(splitTypeId);
         let currentUserData;
         series([
@@ -66,9 +64,8 @@ export var Utils;
                 const _typeid = in_context.getTypeid();
                 // Call the callback function for this ChangeSet
                 in_context._traversalStopped = false;
-                splitTypeId = _typeid !== undefined ?
-                    TypeIdHelper.extractContext(_typeid) :
-                    undefined;
+                splitTypeId =
+                    _typeid !== undefined ? TypeIdHelper.extractContext(_typeid) : undefined;
                 in_context.setSplitTypeID(splitTypeId);
                 if (in_postCallback !== undefined) {
                     // TODO: this duplicates the context object putting stress on the GC.
@@ -103,16 +100,20 @@ export var Utils;
                             try {
                                 // Update the path
                                 in_context._lastSegment = in_segment;
-                                const escapedSegment = in_escape && isString(in_segment) ? PathHelper.quotePathSegmentIfNeeded(in_segment) : in_segment;
+                                const escapedSegment = in_escape && isString(in_segment)
+                                    ? PathHelper.quotePathSegmentIfNeeded(in_segment)
+                                    : in_segment;
                                 let nextSegmentToPushInParentStack = in_context.getLastSegment();
                                 // Note: we don't quote the path string here, since the paths
                                 // in a ChangeSet are already quoted, if necessary
-                                in_context._lastSegmentString = currentTypeIdContext === "map" ||
-                                    currentTypeIdContext === "array" ||
-                                    currentTypeIdContext === "set"
-                                    ? `[${escapedSegment}]`
-                                    : pathSeparator + escapedSegment;
-                                in_context._fullPath = currentPath + in_context.getLastSegmentString();
+                                in_context._lastSegmentString =
+                                    currentTypeIdContext === "map" ||
+                                        currentTypeIdContext === "array" ||
+                                        currentTypeIdContext === "set"
+                                        ? `[${escapedSegment}]`
+                                        : pathSeparator + escapedSegment;
+                                in_context._fullPath =
+                                    currentPath + in_context.getLastSegmentString();
                                 // Store the typeid and nested ChangeSet
                                 in_context._typeid = in_nestedTypeid;
                                 in_context._nestedChangeSet = in_subChangeSet;
@@ -121,22 +122,29 @@ export var Utils;
                                 in_context._arrayLocalIndex = in_arrayLocalIndex;
                                 in_context._arrayOperationOffset = in_arrayOperationOffset;
                                 in_context._arrayIteratorOffset = in_arrayIteratorOffset;
-                                if (in_arrayIteratorOffset !== undefined && isNumber(in_segment)) {
+                                if (in_arrayIteratorOffset !== undefined &&
+                                    isNumber(in_segment)) {
                                     if (in_context._operationType === "remove") {
                                         nextSegmentToPushInParentStack =
-                                            in_context.getLastSegment() + in_arrayIteratorOffset - in_arrayLocalIndex;
-                                        in_context._fullPostPath =
-                                            `${currentPostPath}[${in_segment +
-                                                in_arrayIteratorOffset - in_arrayLocalIndex}]`;
+                                            in_context.getLastSegment() +
+                                                in_arrayIteratorOffset -
+                                                in_arrayLocalIndex;
+                                        in_context._fullPostPath = `${currentPostPath}[${in_segment +
+                                            in_arrayIteratorOffset -
+                                            in_arrayLocalIndex}]`;
                                     }
                                     else {
-                                        nextSegmentToPushInParentStack = in_context.getLastSegment() + in_arrayIteratorOffset;
+                                        nextSegmentToPushInParentStack =
+                                            in_context.getLastSegment() +
+                                                in_arrayIteratorOffset;
                                         in_context._fullPostPath = `${currentPostPath}[${in_segment + in_arrayIteratorOffset}]`;
                                     }
                                 }
                                 else {
-                                    nextSegmentToPushInParentStack = in_context._lastSegment;
-                                    in_context._fullPostPath = currentPostPath + in_context._lastSegmentString;
+                                    nextSegmentToPushInParentStack =
+                                        in_context._lastSegment;
+                                    in_context._fullPostPath =
+                                        currentPostPath + in_context._lastSegmentString;
                                 }
                                 // Continue traversal
                                 in_context._stackDepth++;
@@ -167,9 +175,11 @@ export var Utils;
                 series([
                     function (n3) {
                         // If this property is a collection, we set the correct type, otherwise we assume it is a NodeProperty
-                        const propertyContainerType = (splitTypeId.context === "map" ||
+                        const propertyContainerType = splitTypeId.context === "map" ||
                             splitTypeId.context === "set" ||
-                            splitTypeId.context === "array") ? splitTypeId.context : "NodeProperty";
+                            splitTypeId.context === "array"
+                            ? splitTypeId.context
+                            : "NodeProperty";
                         let oldOperationType = in_context._operationType;
                         if (splitTypeId.context === "array") {
                             // Use the ArrayChangeSetIterator to process the changes in the ChangeSet in the correct order
@@ -184,7 +194,8 @@ export var Utils;
                                 switch (arrayIterator.opDescription.type) {
                                     case ArrayIteratorOperationTypes.INSERT:
                                         in_context._operationType = "insert";
-                                        operation = arrayIterator.opDescription.operation;
+                                        operation =
+                                            arrayIterator.opDescription.operation;
                                         eachOfSeries(operation[1], function (item, i, n5) {
                                             // The typeid is stored inline for arrays
                                             const typeid = item.typeid;
@@ -198,7 +209,8 @@ export var Utils;
                                         break;
                                     case ArrayIteratorOperationTypes.REMOVE:
                                         in_context._operationType = "remove";
-                                        operation = arrayIterator.opDescription.operation;
+                                        operation =
+                                            arrayIterator.opDescription.operation;
                                         timesSeries(operation[1], function (i, n5) {
                                             // For removals, we don't have a typeid and we use the ChangeSet
                                             // of the removal operation as nested
@@ -211,7 +223,8 @@ export var Utils;
                                         });
                                         break;
                                     case ArrayIteratorOperationTypes.MODIFY:
-                                        operation = arrayIterator.opDescription.operation;
+                                        operation =
+                                            arrayIterator.opDescription.operation;
                                         in_context._operationType = "modify";
                                         timesSeries(operation[1].length, function (i, n5) {
                                             // The typeid is stored inline for arrays
@@ -226,7 +239,8 @@ export var Utils;
                                         break;
                                     default:
                                         arrayIterator.next();
-                                        n4(new Error(MSG.UNKNOWN_OPERATOR + arrayIterator.opDescription.type));
+                                        n4(new Error(MSG.UNKNOWN_OPERATOR +
+                                            arrayIterator.opDescription.type));
                                 }
                             }, function (err) {
                                 in_context._operationType = oldOperationType;
@@ -247,7 +261,8 @@ export var Utils;
                                                 // removal operation as nested ChangeSet
                                                 processChange(paths[i], nestedChangeSet.remove, undefined, true, propertyContainerType, undefined, undefined, undefined, undefined, n5);
                                             }, function (err) {
-                                                in_context._operationType = oldOperationType;
+                                                in_context._operationType =
+                                                    oldOperationType;
                                                 n4(err);
                                             });
                                         }
@@ -261,7 +276,8 @@ export var Utils;
                                                     processChange(paths[j], nestedChangeSet.remove[typeid][paths[j]], typeid, true, propertyContainerType, undefined, undefined, undefined, undefined, n6);
                                                 }, n5);
                                             }, function (err) {
-                                                in_context._operationType = oldOperationType;
+                                                in_context._operationType =
+                                                    oldOperationType;
                                                 n4(err);
                                             });
                                         }
@@ -284,7 +300,8 @@ export var Utils;
                                                 processChange(paths[j], nestedChangeSet.insert[typeid][paths[j]], typeid, true, propertyContainerType, undefined, undefined, undefined, undefined, n6);
                                             }, n5);
                                         }, function (err) {
-                                            in_context._operationType = oldOperationType;
+                                            in_context._operationType =
+                                                oldOperationType;
                                             n4(err);
                                         });
                                     }
@@ -376,26 +393,26 @@ export var Utils;
                     in_objectToPopulate.remove = in_objectToPopulate.remove || {};
                     in_objectToPopulate.remove[in_context.getTypeid()] =
                         in_objectToPopulate.remove[in_context.getTypeid()] || {};
-                    in_objectToPopulate.remove[in_context.getTypeid()][in_context.getLastSegment()] =
-                        cloneDeep(in_context.getNestedChangeSet());
+                    in_objectToPopulate.remove[in_context.getTypeid()][in_context.getLastSegment()] = cloneDeep(in_context.getNestedChangeSet());
                 }
             }
             else {
-                in_objectToPopulate[in_context.getOperationType()] = in_objectToPopulate[in_context.getOperationType()] || {};
+                in_objectToPopulate[in_context.getOperationType()] =
+                    in_objectToPopulate[in_context.getOperationType()] || {};
                 in_objectToPopulate[in_context.getOperationType()][in_context.getTypeid()] =
-                    in_objectToPopulate[in_context.getOperationType()][in_context.getTypeid()] || {};
+                    in_objectToPopulate[in_context.getOperationType()][in_context.getTypeid()] ||
+                        {};
                 if (TypeIdHelper.isPrimitiveType(in_context.getTypeid()) || in_isLeaf) {
-                    in_objectToPopulate[in_context.getOperationType()][in_context.getTypeid()][in_context.getLastSegment()] =
-                        cloneDeep(in_context.getNestedChangeSet());
+                    in_objectToPopulate[in_context.getOperationType()][in_context.getTypeid()][in_context.getLastSegment()] = cloneDeep(in_context.getNestedChangeSet());
                 }
                 else {
-                    in_objectToPopulate[in_context.getOperationType()][in_context.getTypeid()][in_context.getLastSegment()] =
-                        nestedChangeSet;
+                    in_objectToPopulate[in_context.getOperationType()][in_context.getTypeid()][in_context.getLastSegment()] = nestedChangeSet;
                 }
             }
         }
         else if (in_context.getPropertyContainerType() === "template") {
-            in_objectToPopulate[in_context.getTypeid()] = in_objectToPopulate[in_context.getTypeid()] || {};
+            in_objectToPopulate[in_context.getTypeid()] =
+                in_objectToPopulate[in_context.getTypeid()] || {};
             if (TypeIdHelper.isPrimitiveType(in_context.getTypeid()) || in_isLeaf) {
                 in_objectToPopulate[in_context.getTypeid()][in_context.getLastSegment()] =
                     cloneDeep(in_context.getNestedChangeSet());
@@ -429,9 +446,9 @@ export var Utils;
         const nestedChangeSet = in_context.getNestedChangeSet();
         // Call the callback function for this ChangeSet
         in_context._traversalStopped = false;
-        const splitTypeId = in_context.getTypeid() !== undefined ?
-            TypeIdHelper.extractContext(in_context.getTypeid()) :
-            undefined;
+        const splitTypeId = in_context.getTypeid() !== undefined
+            ? TypeIdHelper.extractContext(in_context.getTypeid())
+            : undefined;
         in_context._splitTypeId = splitTypeId;
         // TODO: this duplicates the context object putting stress on the GC.
         let postOrderContext;
@@ -458,14 +475,17 @@ export var Utils;
         const processChange = function (in_segment, in_subChangeSet, in_nestedTypeid, in_escape, in_parentPropertyType, in_arrayOperationIndex, in_arrayLocalIndex, in_arrayOperationOffset, in_arrayIteratorOffset) {
             // Update the path
             in_context._lastSegment = in_segment;
-            const escapedSegment = in_escape && isString(in_segment) ? PathHelper.quotePathSegmentIfNeeded(in_segment) : in_segment;
+            const escapedSegment = in_escape && isString(in_segment)
+                ? PathHelper.quotePathSegmentIfNeeded(in_segment)
+                : in_segment;
             let nextSegmentToPushInParentStack = in_context._lastSegment;
             // Note: we don't quote the path string here, since the paths in a ChangeSet are already quoted, if necessary
-            in_context._lastSegmentString = currentTypeIdContext === "map" ||
-                currentTypeIdContext === "array" ||
-                currentTypeIdContext === "set"
-                ? `[${escapedSegment}]`
-                : pathSeparator + escapedSegment;
+            in_context._lastSegmentString =
+                currentTypeIdContext === "map" ||
+                    currentTypeIdContext === "array" ||
+                    currentTypeIdContext === "set"
+                    ? `[${escapedSegment}]`
+                    : pathSeparator + escapedSegment;
             in_context._fullPath = currentPath + in_context._lastSegmentString;
             // Store the typeid and nested ChangeSet
             in_context._typeid = in_nestedTypeid;
@@ -477,12 +497,15 @@ export var Utils;
             in_context._arrayIteratorOffset = in_arrayIteratorOffset;
             if (in_arrayIteratorOffset !== undefined) {
                 if (in_context._operationType === "remove") {
-                    nextSegmentToPushInParentStack = in_context._lastSegment + in_arrayIteratorOffset - in_arrayLocalIndex;
-                    in_context._fullPostPath = `${currentPostPath}[${in_segment +
-                        in_arrayIteratorOffset - in_arrayLocalIndex}]`;
+                    nextSegmentToPushInParentStack =
+                        in_context._lastSegment +
+                            in_arrayIteratorOffset -
+                            in_arrayLocalIndex;
+                    in_context._fullPostPath = `${currentPostPath}[${in_segment + in_arrayIteratorOffset - in_arrayLocalIndex}]`;
                 }
                 else {
-                    nextSegmentToPushInParentStack = in_context._lastSegment + in_arrayIteratorOffset;
+                    nextSegmentToPushInParentStack =
+                        in_context._lastSegment + in_arrayIteratorOffset;
                     in_context._fullPostPath = `${currentPostPath}[${in_segment + in_arrayIteratorOffset}]`;
                 }
             }
@@ -506,9 +529,11 @@ export var Utils;
             in_context._parentNestedChangeSet = nestedChangeSet;
         };
         // If this property is a collection, we set the correct type, otherwise we assume it is a NodeProperty
-        const propertyContainerType = (splitTypeId.context === "map" ||
+        const propertyContainerType = splitTypeId.context === "map" ||
             splitTypeId.context === "set" ||
-            splitTypeId.context === "array") ? splitTypeId.context : "NodeProperty";
+            splitTypeId.context === "array"
+            ? splitTypeId.context
+            : "NodeProperty";
         let oldOperationType = in_context._operationType;
         let paths;
         let typeids;
@@ -737,9 +762,9 @@ export var Utils;
         //
         // @ts-ignore currently it's not needed
         isLeafNode() {
-            return TypeIdHelper.isPrimitiveType(this._typeid) ||
+            return (TypeIdHelper.isPrimitiveType(this._typeid) ||
                 this._isEmptyObject(this) ||
-                this.getOperationType() === "remove";
+                this.getOperationType() === "remove");
         }
         /**
          * Returns the index of the last segment, either a string with the key or a number with the position in the array
@@ -747,7 +772,9 @@ export var Utils;
          * @returns The last segment index
          */
         getPostLastSegment() {
-            if (this._propertyContainerType === "array" && isNumber(this._lastSegment) && this._arrayIteratorOffset !== undefined) {
+            if (this._propertyContainerType === "array" &&
+                isNumber(this._lastSegment) &&
+                this._arrayIteratorOffset !== undefined) {
                 return this._operationType === "remove"
                     ? this._lastSegment + this._arrayIteratorOffset - this._arrayLocalIndex
                     : this._lastSegment + this._arrayIteratorOffset;
@@ -790,8 +817,10 @@ export var Utils;
                  but could not find "${this.getTypeid()}" in "${JSON.stringify(this.getParentNestedChangeSet())}"`);
                 }
             }
-            else if (this.getPropertyContainerType() === "NodeProperty" || this.getPropertyContainerType() === "map") {
-                parent[this.getOperationType()][this.getTypeid()][this.getLastSegment()] = in_newNestedChangeset;
+            else if (this.getPropertyContainerType() === "NodeProperty" ||
+                this.getPropertyContainerType() === "map") {
+                parent[this.getOperationType()][this.getTypeid()][this.getLastSegment()] =
+                    in_newNestedChangeset;
             }
             else {
                 console.warn("replaceNestedChangeSet: not implemented. type: ", this.getPropertyContainerType());
@@ -1089,8 +1118,9 @@ export var Utils;
                     return;
                 }
                 const operationScope = in_context.getPropertyContainerType() !== "template"
-                    ? (userData[in_context.getOperationType()] = userData[in_context.getOperationType()]
-                        || (in_context.getPropertyContainerType() === "array" ? [] : {}))
+                    ? (userData[in_context.getOperationType()] =
+                        userData[in_context.getOperationType()] ||
+                            (in_context.getPropertyContainerType() === "array" ? [] : {}))
                     : userData;
                 if (TypeIdHelper.isPrimitiveType(in_context.getTypeid())) {
                     // This is a primitive type, we store it under its name in the result
@@ -1100,7 +1130,10 @@ export var Utils;
                     const nestedUserData = {};
                     if (in_context.getPropertyContainerType() === "array") {
                         if (!operationScope[in_context.getArrayOperationIndex()]) {
-                            operationScope[in_context.getArrayOperationIndex()] = [in_context.getArrayOperationOffset(), []];
+                            operationScope[in_context.getArrayOperationIndex()] = [
+                                in_context.getArrayOperationOffset(),
+                                [],
+                            ];
                         }
                         const arrayOperation = operationScope[in_context.getArrayOperationIndex()];
                         arrayOperation[1][in_context.getArrayLocalIndex()] = nestedUserData;
@@ -1115,7 +1148,9 @@ export var Utils;
             userData: result,
         });
         // Remove all existing keys from the ChangeSet
-        Object.keys(io_changeSet).forEach(function (key) { delete io_changeSet[key]; });
+        Object.keys(io_changeSet).forEach(function (key) {
+            delete io_changeSet[key];
+        });
         // Assign from the result user data
         extend(io_changeSet, result);
     }
@@ -1136,8 +1171,10 @@ export var Utils;
                 // If we found and instance of the requested typeid, we store it under its path
                 if (in_context.getTypeid() === in_typeid) {
                     const userData = in_context.getUserData();
-                    userData[in_context.getOperationType()] = userData[in_context.getOperationType()] || {};
-                    userData[in_context.getOperationType()][in_context.getFullPath()] = in_context.getNestedChangeSet();
+                    userData[in_context.getOperationType()] =
+                        userData[in_context.getOperationType()] || {};
+                    userData[in_context.getOperationType()][in_context.getFullPath()] =
+                        in_context.getNestedChangeSet();
                 }
             },
             userData: result,
@@ -1201,8 +1238,10 @@ export var Utils;
                     changesetSegment.substr(0, mergedSegment.length) === mergedSegment &&
                     level < pathSegments.length - 1) {
                     level++;
-                    mergedSegment = mergedSegment + PROPERTY_PATH_DELIMITER +
-                        PathHelper.quotePathSegmentIfNeeded(pathSegments[level]);
+                    mergedSegment =
+                        mergedSegment +
+                            PROPERTY_PATH_DELIMITER +
+                            PathHelper.quotePathSegmentIfNeeded(pathSegments[level]);
                 }
                 // Have we found the right entry in the ChangeSet?
                 // TODO: This could be done more efficiently
@@ -1223,7 +1262,8 @@ export var Utils;
                                 currentChangeSet = cloneDeep(currentChangeSet);
                                 Utils._stripTypeids(currentChangeSet);
                             }
-                            result[in_context.getOperationType()][in_context.getFullPath()] = currentChangeSet;
+                            result[in_context.getOperationType()][in_context.getFullPath()] =
+                                currentChangeSet;
                             in_context._traversalStopped = true;
                         }
                         else {
@@ -1318,7 +1358,7 @@ export var Utils;
      * escaped (by adding an additional '_') before the lookup into the paths map. This frees the keyspace with
      * duplicated underscores for the use by the calling application.
      */
-    function getChangesToTokenizedPaths(in_paths, in_changeSet, in_callback, in_options = { escapeLeadingDoubleUnderscore: false, rootOperation: 'modify' }) {
+    function getChangesToTokenizedPaths(in_paths, in_changeSet, in_callback, in_options = { escapeLeadingDoubleUnderscore: false, rootOperation: "modify" }) {
         const currentTokenizedPath = [];
         let paths;
         let legacyPaths;
@@ -1330,8 +1370,12 @@ export var Utils;
             // Note that if the calling application sets the in_options.escapeLeadingDoubleUnderscore option, it is responsible
             // for escaping input path segments that begin with a double underscore,
             // otherwise such segments will be considered as user data!
-            return in_options.escapeLeadingDoubleUnderscore && k && k.length > 2 && k[0] === "_" && k[1] === "_" &&
-                k[2] !== "_";
+            return (in_options.escapeLeadingDoubleUnderscore &&
+                k &&
+                k.length > 2 &&
+                k[0] === "_" &&
+                k[1] === "_" &&
+                k[2] !== "_");
         };
         let _convertLevelToMap = function (obj) {
             const thisLevel = new Map();
@@ -1365,9 +1409,9 @@ export var Utils;
         };
         const _toCallbackParam = (pathLevels) => {
             return legacyPaths
-                // If a user provided objects as paths, they would expect objects in their callbacks as well.
-                // So, we transform the parameter to an object, which is not very performant but is backwards compatible.
-                ? _convertMapToLevel(pathLevels)
+                ? // If a user provided objects as paths, they would expect objects in their callbacks as well.
+                    // So, we transform the parameter to an object, which is not very performant but is backwards compatible.
+                    _convertMapToLevel(pathLevels)
                 : pathLevels;
         };
         if (!(in_paths instanceof Map)) {
@@ -1538,18 +1582,24 @@ export var Utils;
                 tokenizedPath.forEach((segment, index) => {
                     if (index === 0) {
                         parentPath += PathHelper.quotePathSegmentIfNeeded(segment);
-                        changeSetToPopulate = pathToChangeSet[parentPath] || changeSetToPopulate;
+                        changeSetToPopulate =
+                            pathToChangeSet[parentPath] || changeSetToPopulate;
                     }
                     else if (index < tokenizedPath.length - 1) {
-                        parentPath += context.getContainerStack()[index] !== "set" && context.getContainerStack()[index] !== "map"
-                            ? `.${PathHelper.quotePathSegmentIfNeeded(segment)}`
-                            : `[${PathHelper.quotePathSegmentIfNeeded(segment)}]`;
-                        changeSetToPopulate = pathToChangeSet[parentPath] || changeSetToPopulate;
+                        parentPath +=
+                            context.getContainerStack()[index] !== "set" &&
+                                context.getContainerStack()[index] !== "map"
+                                ? `.${PathHelper.quotePathSegmentIfNeeded(segment)}`
+                                : `[${PathHelper.quotePathSegmentIfNeeded(segment)}]`;
+                        changeSetToPopulate =
+                            pathToChangeSet[parentPath] || changeSetToPopulate;
                     }
                     else {
-                        parentPath += context.getContainerStack()[index] !== "set" && context.getContainerStack()[index] !== "map"
-                            ? `.${PathHelper.quotePathSegmentIfNeeded(segment)}`
-                            : `[${PathHelper.quotePathSegmentIfNeeded(segment)}]`;
+                        parentPath +=
+                            context.getContainerStack()[index] !== "set" &&
+                                context.getContainerStack()[index] !== "map"
+                                ? `.${PathHelper.quotePathSegmentIfNeeded(segment)}`
+                                : `[${PathHelper.quotePathSegmentIfNeeded(segment)}]`;
                         fullPath = parentPath;
                     }
                     pathsToDelete.push(parentPath);
@@ -1576,7 +1626,8 @@ export var Utils;
                         }
                     }
                 });
-                if (fullPath !== context.getFullPath() && pathToChangeSet[context.getFullPath()]) {
+                if (fullPath !== context.getFullPath() &&
+                    pathToChangeSet[context.getFullPath()]) {
                     // Here we are in the case where we have a changeset that
                     // contains a property with path a.b.c.d as the key.
                     // In that case, getChangesToTokenizedPaths will be called
@@ -1601,7 +1652,8 @@ export var Utils;
             // property container which means that our fullPath will actually contain
             // dots for sets. This is OK because we build the fullpath ourselves in such a
             // case and it will be consistent with the way we search for a valid changeSetToPopulate
-            if (context.getPropertyContainerType() !== "set" && context.getPropertyContainerType() !== "map") {
+            if (context.getPropertyContainerType() !== "set" &&
+                context.getPropertyContainerType() !== "map") {
                 fullPath = context.getFullPath();
             }
             // keep a reference to the underlying change set of the current path.
@@ -1621,9 +1673,9 @@ export var Utils;
             // i.e.
             const lastSegment = context.getLastSegmentEscaped();
             if (contractedPathSegment &&
-                ((lastSegment.indexOf(".") !== -1 ||
+                (lastSegment.indexOf(".") !== -1 ||
                     (lastSegment.length > 0 && lastSegment[0] === '"')) &&
-                    PathHelper.tokenizePathString(lastSegment).length > 1)) {
+                PathHelper.tokenizePathString(lastSegment).length > 1) {
                 toPurge[context.getFullPath()] = {
                     changeSet: changeSetToPopulate,
                     typeid: context.getTypeid(),
@@ -1762,7 +1814,9 @@ export var Utils;
         const rootChangeSet = cloneDeep(in_changeSet);
         Utils.traverseChangeSetRecursively(rootChangeSet, {
             preCallback: (in_context) => {
-                const shouldExclude = find(tokenizedPaths, (val) => { return isEqual(val, in_context.getParentStack()); });
+                const shouldExclude = find(tokenizedPaths, (val) => {
+                    return isEqual(val, in_context.getParentStack());
+                });
                 if (shouldExclude) {
                     const operationType = in_context.getOperationType();
                     const typeId = in_context.getTypeid();