@fluid-experimental/tree 2.0.0-rc.2.0.1 → 2.0.0-rc.3.0.0

package/dist/SharedTree.js

@@ -5,30 +5,30 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SharedTree = exports.SharedTreeFactory = void 0;
-const core_utils_1 = require("@fluidframework/core-utils");
 const client_utils_1 = require("@fluid-internal/client-utils");
 const container_definitions_1 = require("@fluidframework/container-definitions");
-const shared_object_base_1 = require("@fluidframework/shared-object-base");
-const telemetry_utils_1 = require("@fluidframework/telemetry-utils");
+const internal_1 = require("@fluidframework/core-utils/internal");
+const internal_2 = require("@fluidframework/shared-object-base/internal");
+const internal_3 = require("@fluidframework/telemetry-utils/internal");
+const ChangeTypes_js_1 = require("./ChangeTypes.js");
 const Common_js_1 = require("./Common.js");
 const EditLog_js_1 = require("./EditLog.js");
+const EditUtilities_js_1 = require("./EditUtilities.js");
+const EventTypes_js_1 = require("./EventTypes.js");
+const HistoryEditFactory_js_1 = require("./HistoryEditFactory.js");
+const IdConversion_js_1 = require("./IdConversion.js");
 const Identifiers_js_1 = require("./Identifiers.js");
 const InitialTree_js_1 = require("./InitialTree.js");
 const LogViewer_js_1 = require("./LogViewer.js");
-const SummaryBackCompatibility_js_1 = require("./SummaryBackCompatibility.js");
-const index_js_1 = require("./persisted-types/index.js");
-const Summary_js_1 = require("./Summary.js");
-const EditUtilities_js_1 = require("./EditUtilities.js");
 const NodeIdUtilities_js_1 = require("./NodeIdUtilities.js");
-const EventTypes_js_1 = require("./EventTypes.js");
 const RevisionView_js_1 = require("./RevisionView.js");
 const SharedTreeEncoder_js_1 = require("./SharedTreeEncoder.js");
-const HistoryEditFactory_js_1 = require("./HistoryEditFactory.js");
-const ChangeTypes_js_1 = require("./ChangeTypes.js");
-const index_js_2 = require("./id-compressor/index.js");
-const IdConversion_js_1 = require("./IdConversion.js");
 const StringInterner_js_1 = require("./StringInterner.js");
+const Summary_js_1 = require("./Summary.js");
+const SummaryBackCompatibility_js_1 = require("./SummaryBackCompatibility.js");
 const UuidUtilities_js_1 = require("./UuidUtilities.js");
+const index_js_1 = require("./id-compressor/index.js");
+const index_js_2 = require("./persisted-types/index.js");
 /**
  * Factory for SharedTree.
  * Includes history in the summary.
@@ -78,9 +78,9 @@ class SharedTreeFactory {
     createSharedTree(runtime, id) {
         const [writeFormat] = this.args;
         switch (writeFormat) {
-            case index_js_1.WriteFormat.v0_0_2:
+            case index_js_2.WriteFormat.v0_0_2:
                 return new SharedTree(runtime, id, ...this.args);
-            case index_js_1.WriteFormat.v0_1_1:
+            case index_js_2.WriteFormat.v0_1_1:
                 return new SharedTree(runtime, id, ...this.args);
             default:
                 (0, Common_js_1.fail)('Unknown write format');
@@ -107,7 +107,7 @@ const snapshotFileName = 'header';
 /**
  * Used for version comparison.
  */
-const sortedWriteVersions = [index_js_1.WriteFormat.v0_0_2, index_js_1.WriteFormat.v0_1_1];
+const sortedWriteVersions = [index_js_2.WriteFormat.v0_0_2, index_js_2.WriteFormat.v0_1_1];
 const sharedTreeTelemetryProperties = { all: { isSharedTreeEvent: true } };
 /** The SessionId of the temporary IdCompressor that records stashed ops */
 const stashedSessionId = '8477b8d5-cf6c-4673-8345-8f076a8f9bc6';
@@ -115,7 +115,7 @@ const stashedSessionId = '8477b8d5-cf6c-4673-8345-8f076a8f9bc6';
  * A [distributed tree](../Readme.md).
  * @alpha
  */
-class SharedTree extends shared_object_base_1.SharedObject {
+class SharedTree extends internal_2.SharedObject {
     /**
      * Create a new SharedTree. It will contain the default value (see initialTree).
      */
@@ -124,7 +124,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
     }
     static getFactory(...args) {
         const [formatArg, options] = args;
-        const writeFormat = formatArg ?? index_js_1.WriteFormat.v0_1_1;
+        const writeFormat = formatArg ?? index_js_2.WriteFormat.v0_1_1;
         // 	On 0.1.1 documents, due to current code limitations, all clients MUST agree on the value of `summarizeHistory`.
         //  Note that this means staged rollout changing this value should not be attempted.
         //  It is possible to update shared-tree to correctly handle such a staged rollout, but that hasn't been implemented.
@@ -138,11 +138,11 @@ class SharedTree extends shared_object_base_1.SharedObject {
      */
     get attributionId() {
         switch (this.writeFormat) {
-            case index_js_1.WriteFormat.v0_0_2:
+            case index_js_2.WriteFormat.v0_0_2:
                 return UuidUtilities_js_1.nilUuid;
             default: {
                 const { attributionId } = this.idCompressor;
-                if (attributionId === index_js_1.ghostSessionId) {
+                if (attributionId === index_js_2.ghostSessionId) {
                     return UuidUtilities_js_1.nilUuid;
                 }
                 return attributionId;
@@ -195,12 +195,12 @@ class SharedTree extends shared_object_base_1.SharedObject {
         };
         const historyPolicy = this.getHistoryPolicy(options);
         this.summarizeHistory = historyPolicy.summarizeHistory;
-        this.logger = (0, telemetry_utils_1.createChildLogger)({
+        this.logger = (0, internal_3.createChildLogger)({
             logger: runtime.logger,
             namespace: 'SharedTree',
             properties: sharedTreeTelemetryProperties,
         });
-        this.sequencedEditAppliedLogger = (0, telemetry_utils_1.createChildLogger)({
+        this.sequencedEditAppliedLogger = (0, internal_3.createChildLogger)({
             logger: this.logger,
             namespace: 'SequencedEditApplied',
             properties: sharedTreeTelemetryProperties,
@@ -218,14 +218,14 @@ class SharedTree extends shared_object_base_1.SharedObject {
                 },
             };
         })();
-        const idCompressorLoger = (0, telemetry_utils_1.createSampledLogger)(this.logger, idCompressorEventSampler);
-        this.idCompressor = new index_js_2.IdCompressor((0, index_js_2.createSessionId)(), index_js_1.reservedIdCount, attributionId, idCompressorLoger);
+        const idCompressorLoger = (0, internal_3.createSampledLogger)(this.logger, idCompressorEventSampler);
+        this.idCompressor = new index_js_1.IdCompressor((0, index_js_1.createSessionId)(), index_js_2.reservedIdCount, attributionId, idCompressorLoger);
         this.editLogSize = options.inMemoryHistorySize;
         this.editEvictionFrequency = options.inMemoryHistorySize;
         const { editLog, cachingLogViewer } = this.initializeNewEditLogFromSummary({
             editChunks: [],
             editIds: [],
-        }, undefined, this.idCompressor, this.processEditResult, this.processSequencedEditResult, index_js_1.WriteFormat.v0_1_1);
+        }, undefined, this.idCompressor, this.processEditResult, this.processSequencedEditResult, index_js_2.WriteFormat.v0_1_1);
         this.editLog = editLog;
         this.cachingLogViewer = cachingLogViewer;
         this.encoder_0_0_2 = new SharedTreeEncoder_js_1.SharedTreeEncoder_0_0_2(this.summarizeHistory);
@@ -252,7 +252,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
         if (!this.runtime.connected) {
             return false;
         }
-        (0, core_utils_1.assert)(this.runtime.clientId !== undefined, 0x62d /* Client id should be set if connected. */);
+        (0, internal_1.assert)(this.runtime.clientId !== undefined, 0x62d /* Client id should be set if connected. */);
         const quorum = this.runtime.getQuorum();
         const selfSequencedClient = quorum.getMember(this.runtime.clientId);
         // When in readonly mode our clientId will not be present in the quorum.
@@ -332,11 +332,11 @@ class SharedTree extends shared_object_base_1.SharedObject {
      */
     attributeNodeId(id) {
         switch (this.writeFormat) {
-            case index_js_1.WriteFormat.v0_0_2:
+            case index_js_2.WriteFormat.v0_0_2:
                 return UuidUtilities_js_1.nilUuid;
             default: {
                 const attributionId = this.idCompressor.attributeId(id);
-                if (attributionId === index_js_1.ghostSessionId) {
+                if (attributionId === index_js_2.ghostSessionId) {
                     return UuidUtilities_js_1.nilUuid;
                 }
                 return attributionId;
@@ -353,7 +353,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
      * {@inheritDoc @fluidframework/shared-object-base#SharedObject.summarizeCore}
      */
     summarizeCore(serializer) {
-        return (0, shared_object_base_1.createSingleBlobSummary)(snapshotFileName, this.saveSerializedSummary({ serializer }));
+        return (0, internal_2.createSingleBlobSummary)(snapshotFileName, this.saveSerializedSummary({ serializer }));
     }
     /**
      * {@inheritDoc @fluidframework/datastore-definitions#(IChannel:interface).getAttachSummary}
@@ -365,7 +365,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
         // ever invoked on a DataObject containing local changes when it is attached for the first time. In post-attach flows, an extra
         // instance of the DataObject is created for generating summaries and will never have local edits.
         if (this.editLog.numberOfLocalEdits > 0) {
-            if (this.writeFormat === index_js_1.WriteFormat.v0_1_1) {
+            if (this.writeFormat === index_js_2.WriteFormat.v0_1_1) {
                 // Since we're the first client to attach, we can safely finalize ourselves since we're the only ones who have made IDs.
                 this.idCompressor.finalizeCreationRange(this.idCompressor.takeNextCreationRange());
                 for (const edit of this.editLog.getLocalEdits()) {
@@ -398,7 +398,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
      * Saves this SharedTree into a deserialized summary.
      */
     saveSummary() {
-        (0, core_utils_1.assert)(this.editLog.numberOfLocalEdits === 0, 0x62f /* generateSummary must not be called with local edits */);
+        (0, internal_1.assert)(this.editLog.numberOfLocalEdits === 0, 0x62f /* generateSummary must not be called with local edits */);
         return this.generateSummary();
     }
     /**
@@ -408,9 +408,9 @@ class SharedTree extends shared_object_base_1.SharedObject {
     generateSummary() {
         try {
             switch (this.writeFormat) {
-                case index_js_1.WriteFormat.v0_0_2:
+                case index_js_2.WriteFormat.v0_0_2:
                     return this.encoder_0_0_2.encodeSummary(this.editLog, this.currentView, this);
-                case index_js_1.WriteFormat.v0_1_1:
+                case index_js_2.WriteFormat.v0_1_1:
                     return this.encoder_0_1_1.encodeSummary(this.editLog, this.currentView, this, this.idNormalizer, this.interner, this.idCompressor.serialize(false));
                 default:
                     (0, Common_js_1.fail)('Unknown version');
@@ -430,7 +430,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
     loadSummary(summary) {
         const { version: loadedSummaryVersion } = summary;
         if (isUpdateRequired(loadedSummaryVersion, this.writeFormat)) {
-            this.submitOp({ type: index_js_1.SharedTreeOpType.Update, version: this.writeFormat });
+            this.submitOp({ type: index_js_2.SharedTreeOpType.Update, version: this.writeFormat });
             this.logger.sendTelemetryEvent({
                 eventName: 'RequestVersionUpdate',
                 versionFrom: loadedSummaryVersion,
@@ -441,13 +441,13 @@ class SharedTree extends shared_object_base_1.SharedObject {
             // Write whatever format the loaded summary uses (this is the current agreed-upon format: it may be updated by an update op)
             this.changeWriteFormat(loadedSummaryVersion);
         }
-        (0, core_utils_1.assert)(this.idCompressor.getAllIdsFromLocalSession().next().done === true, 0x630 /* Summary load should not be executed after local state is created. */);
+        (0, internal_1.assert)(this.idCompressor.getAllIdsFromLocalSession().next().done === true, 0x630 /* Summary load should not be executed after local state is created. */);
         let convertedSummary;
         switch (loadedSummaryVersion) {
-            case index_js_1.WriteFormat.v0_0_2:
+            case index_js_2.WriteFormat.v0_0_2:
                 convertedSummary = this.encoder_0_0_2.decodeSummary(summary, this.attributionId);
                 break;
-            case index_js_1.WriteFormat.v0_1_1: {
+            case index_js_2.WriteFormat.v0_1_1: {
                 const typedSummary = summary;
                 // See comment in factory constructor--ensure we write a consistent type of summary as how the document began.
                 const loadedSummaryIncludesHistory = typedSummary.currentTree !== undefined;
@@ -464,11 +464,11 @@ class SharedTree extends shared_object_base_1.SharedObject {
         const { editHistory, currentTree, idCompressor, interner } = convertedSummary;
         this.interner = interner;
         this.interner.getOrCreateInternedId(InitialTree_js_1.initialTree.definition);
-        if (compareSummaryFormatVersions(loadedSummaryVersion, index_js_1.WriteFormat.v0_1_1) < 0) {
+        if (compareSummaryFormatVersions(loadedSummaryVersion, index_js_2.WriteFormat.v0_1_1) < 0) {
             const { editIds, editChunks } = editHistory;
             this.logger.sendTelemetryEvent({
                 eventName: 'SummaryConversion',
-                formatVersion: index_js_1.WriteFormat.v0_1_1,
+                formatVersion: index_js_2.WriteFormat.v0_1_1,
                 historySize: editIds.length,
                 totalNumberOfChunks: editChunks.length,
             });
@@ -477,9 +477,9 @@ class SharedTree extends shared_object_base_1.SharedObject {
     }
     static eventFromEditResult(editStatus) {
         switch (editStatus) {
-            case index_js_1.EditStatus.Applied:
+            case index_js_2.EditStatus.Applied:
                 return EventTypes_js_1.SharedTreeDiagnosticEvent.AppliedEdit;
-            case index_js_1.EditStatus.Invalid:
+            case index_js_2.EditStatus.Invalid:
                 return EventTypes_js_1.SharedTreeDiagnosticEvent.DroppedInvalidEdit;
             default:
                 return EventTypes_js_1.SharedTreeDiagnosticEvent.DroppedMalformedEdit;
@@ -536,7 +536,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
      * {@inheritDoc @fluidframework/shared-object-base#SharedObject.loadCore}
      */
     async loadCore(storage) {
-        const summaryLoadPerformanceEvent = telemetry_utils_1.PerformanceEvent.start(this.logger, { eventName: 'SummaryLoad' });
+        const summaryLoadPerformanceEvent = internal_3.PerformanceEvent.start(this.logger, { eventName: 'SummaryLoad' });
         try {
             const newBlob = await storage.readBlob(snapshotFileName);
             const blobData = (0, client_utils_1.bufferToString)(newBlob, 'utf8');
@@ -557,29 +557,29 @@ class SharedTree extends shared_object_base_1.SharedObject {
         const op = typedMessage.contents;
         if (op.version === undefined) {
             // Back-compat: some legacy documents may contain trailing ops with an unstamped version; normalize them.
-            op.version = index_js_1.WriteFormat.v0_0_2;
+            op.version = index_js_2.WriteFormat.v0_0_2;
         }
         const { type, version } = op;
         const sameVersion = version === this.writeFormat;
         // Edit and handle ops should only be processed if they're the same version as the tree write version.
         // Update ops should only be processed if they're not the same version.
         if (sameVersion) {
-            if (type === index_js_1.SharedTreeOpType.Handle) {
+            if (type === index_js_2.SharedTreeOpType.Handle) {
                 // Edit virtualization is no longer supported, log the event and ignore the op.
                 this.logger.sendErrorEvent({ eventName: 'UnexpectedHistoryChunk' });
             }
-            else if (type === index_js_1.SharedTreeOpType.Edit) {
-                if (op.version === index_js_1.WriteFormat.v0_1_1) {
+            else if (type === index_js_2.SharedTreeOpType.Edit) {
+                if (op.version === index_js_2.WriteFormat.v0_1_1) {
                     this.idCompressor.finalizeCreationRange(op.idRange);
                 }
                 const edit = this.parseSequencedEdit(op);
-                if (op.version === index_js_1.WriteFormat.v0_1_1) {
+                if (op.version === index_js_2.WriteFormat.v0_1_1) {
                     this.internStringsFromEdit(edit);
                 }
                 this.processSequencedEdit(edit, typedMessage);
             }
         }
-        else if (type === index_js_1.SharedTreeOpType.Update) {
+        else if (type === index_js_2.SharedTreeOpType.Update) {
             this.processVersionUpdate(op.version);
         }
         else if (compareSummaryFormatVersions(version, this.writeFormat) === 1) {
@@ -610,9 +610,9 @@ class SharedTree extends shared_object_base_1.SharedObject {
     parseSequencedEdit(op) {
         // TODO:Type Safety: Improve type safety around op sending/parsing (e.g. discriminated union over version field somehow)
         switch (op.version) {
-            case index_js_1.WriteFormat.v0_0_2:
+            case index_js_2.WriteFormat.v0_0_2:
                 return this.encoder_0_0_2.decodeEditOp(op, (x) => x, this);
-            case index_js_1.WriteFormat.v0_1_1:
+            case index_js_2.WriteFormat.v0_1_1:
                 return this.encoder_0_1_1.decodeEditOp(op, (x) => x, this.idNormalizer, this.interner);
             default:
                 (0, Common_js_1.fail)('Unknown op version');
@@ -643,8 +643,8 @@ class SharedTree extends shared_object_base_1.SharedObject {
      */
     processVersionUpdate(version) {
         if (isUpdateRequired(this.writeFormat, version)) {
-            telemetry_utils_1.PerformanceEvent.timedExec(this.logger, { eventName: 'VersionUpdate', version }, () => {
-                if (compareSummaryFormatVersions(version, index_js_1.WriteFormat.v0_1_1) >= 0) {
+            internal_3.PerformanceEvent.timedExec(this.logger, { eventName: 'VersionUpdate', version }, () => {
+                if (compareSummaryFormatVersions(version, index_js_2.WriteFormat.v0_1_1) >= 0) {
                     this.upgradeFrom_0_0_2_to_0_1_1();
                 }
                 else {
@@ -668,7 +668,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
         this.interner = new StringInterner_js_1.MutableStringInterner([InitialTree_js_1.initialTree.definition]);
         const oldIdCompressor = this.idCompressor;
         // Create the IdCompressor that will be used after the upgrade
-        const newIdCompressor = new index_js_2.IdCompressor((0, index_js_2.createSessionId)(), index_js_1.reservedIdCount, this.attributionId, this.logger);
+        const newIdCompressor = new index_js_1.IdCompressor((0, index_js_1.createSessionId)(), index_js_2.reservedIdCount, this.attributionId, this.logger);
         const newContext = (0, NodeIdUtilities_js_1.getNodeIdContext)(newIdCompressor);
         // Generate all local IDs in the new compressor that were in the old compressor and preserve their UUIDs.
         // This will allow the client to continue to use local IDs that were allocated pre-upgrade
@@ -682,7 +682,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
             }
         };
         // Construct a temporary "ghost" compressor which is used to generate final IDs that will be consistent across all upgrading clients
-        const ghostIdCompressor = new index_js_2.IdCompressor(index_js_1.ghostSessionId, index_js_1.reservedIdCount);
+        const ghostIdCompressor = new index_js_1.IdCompressor(index_js_2.ghostSessionId, index_js_2.reservedIdCount);
         const ghostContext = (0, NodeIdUtilities_js_1.getNodeIdContext)(ghostIdCompressor);
         if (this.summarizeHistory) {
             // All clients have the full history, and can therefore all "generate" the same final IDs for every ID in the history
@@ -769,12 +769,12 @@ class SharedTree extends shared_object_base_1.SharedObject {
                 return {
                     source: change.source,
                     destination: (0, EditUtilities_js_1.deepCloneStablePlace)(change.destination),
-                    type: index_js_1.ChangeTypeInternal.Insert,
+                    type: index_js_2.ChangeTypeInternal.Insert,
                 };
             case ChangeTypes_js_1.ChangeType.Detach: {
                 const detach = {
                     source: (0, EditUtilities_js_1.deepCloneStableRange)(change.source),
-                    type: index_js_1.ChangeTypeInternal.Detach,
+                    type: index_js_2.ChangeTypeInternal.Detach,
                 };
                 (0, Common_js_1.copyPropertyIfDefined)(change, detach, 'destination');
                 return detach;
@@ -785,7 +785,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
                     return {
                         source,
                         destination: change.destination,
-                        type: index_js_1.ChangeTypeInternal.Build,
+                        type: index_js_2.ChangeTypeInternal.Build,
                     };
                 }
                 else {
@@ -793,7 +793,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
                     return {
                         source: [source],
                         destination: change.destination,
-                        type: index_js_1.ChangeTypeInternal.Build,
+                        type: index_js_2.ChangeTypeInternal.Build,
                     };
                 }
             }
@@ -801,13 +801,13 @@ class SharedTree extends shared_object_base_1.SharedObject {
                 return {
                     nodeToModify: change.nodeToModify,
                     payload: change.payload,
-                    type: index_js_1.ChangeTypeInternal.SetValue,
+                    type: index_js_2.ChangeTypeInternal.SetValue,
                 };
             case ChangeTypes_js_1.ChangeType.Constraint: {
                 const constraint = {
                     effect: change.effect,
                     toConstrain: change.toConstrain,
-                    type: index_js_1.ChangeTypeInternal.Constraint,
+                    type: index_js_2.ChangeTypeInternal.Constraint,
                 };
                 (0, Common_js_1.copyPropertyIfDefined)(change, constraint, 'contentHash');
                 (0, Common_js_1.copyPropertyIfDefined)(change, constraint, 'identityHash');
@@ -867,10 +867,10 @@ class SharedTree extends shared_object_base_1.SharedObject {
         // Ops will be submitted again when attached (see loadSummary())
         if (this.isAttached()) {
             switch (this.writeFormat) {
-                case index_js_1.WriteFormat.v0_0_2:
+                case index_js_2.WriteFormat.v0_0_2:
                     this.submitOp(this.encoder_0_0_2.encodeEditOp(edit, (x) => x, this));
                     break;
-                case index_js_1.WriteFormat.v0_1_1:
+                case index_js_2.WriteFormat.v0_1_1:
                     this.submitOp(this.encoder_0_1_1.encodeEditOp(edit, (x) => x, this.idCompressor.takeNextCreationRange(), this.idNormalizer, this.interner));
                     break;
                 default:
@@ -880,7 +880,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
     }
     /** A type-safe `submitLocalMessage` wrapper to enforce op format */
     submitOp(content, localOpMetadata = undefined) {
-        (0, core_utils_1.assert)(compareSummaryFormatVersions(content.version, this.writeFormat) === 0, 0x631 /* Attempted to submit op of wrong version */);
+        (0, internal_1.assert)(compareSummaryFormatVersions(content.version, this.writeFormat) === 0, 0x631 /* Attempted to submit op of wrong version */);
         this.submitLocalMessage(content, localOpMetadata);
     }
     getRuntime() {
@@ -900,33 +900,33 @@ class SharedTree extends shared_object_base_1.SharedObject {
         // occurs in this method, and the result is passed to `resubmitCore` via the return value of this function.
         const sharedTreeOp = op;
         switch (sharedTreeOp.type) {
-            case index_js_1.SharedTreeOpType.Edit: {
+            case index_js_2.SharedTreeOpType.Edit: {
                 let stashedEdit;
                 switch (this.writeFormat) {
-                    case index_js_1.WriteFormat.v0_0_2:
+                    case index_js_2.WriteFormat.v0_0_2:
                         switch (sharedTreeOp.version) {
-                            case index_js_1.WriteFormat.v0_0_2: {
+                            case index_js_2.WriteFormat.v0_0_2: {
                                 stashedEdit = this.parseSequencedEdit(sharedTreeOp);
                                 break;
                             }
-                            case index_js_1.WriteFormat.v0_1_1:
+                            case index_js_2.WriteFormat.v0_1_1:
                                 (0, Common_js_1.fail)('Received stashed op 0.1.1 before upgrade');
                             default:
                                 (0, Common_js_1.fail)('Unknown version');
                         }
                         break;
-                    case index_js_1.WriteFormat.v0_1_1:
+                    case index_js_2.WriteFormat.v0_1_1:
                         switch (sharedTreeOp.version) {
-                            case index_js_1.WriteFormat.v0_0_2: {
+                            case index_js_2.WriteFormat.v0_0_2: {
                                 // Use the IDs from the stashed ops as overrides for the equivalent new ops
                                 stashedEdit = (0, IdConversion_js_1.convertEditIds)(sharedTreeOp.edit, (id) => this.generateNodeId(id));
                                 break;
                             }
-                            case index_js_1.WriteFormat.v0_1_1: {
-                                (0, core_utils_1.assert)(this.stashedIdCompressor !== null, 0x632 /* Stashed op applied after expected window */);
+                            case index_js_2.WriteFormat.v0_1_1: {
+                                (0, internal_1.assert)(this.stashedIdCompressor !== null, 0x632 /* Stashed op applied after expected window */);
                                 if (this.stashedIdCompressor === undefined) {
                                     // Use a temporary compressor that will help translate the stashed ops
-                                    this.stashedIdCompressor = index_js_2.IdCompressor.deserialize(this.idCompressor.serialize(false), stashedSessionId, sharedTreeOp.idRange.attributionId);
+                                    this.stashedIdCompressor = index_js_1.IdCompressor.deserialize(this.idCompressor.serialize(false), stashedSessionId, sharedTreeOp.idRange.attributionId);
                                     // Once all stashed ops have been applied, clear the temporary state
                                     this.runtime.on('connected', () => {
                                         this.stashedIdCompressor = null;
@@ -959,9 +959,9 @@ class SharedTree extends shared_object_base_1.SharedObject {
                 return;
             }
             // Handle and update ops are only acknowledged by the client that generated them upon sequencing--no local changes necessary.
-            case index_js_1.SharedTreeOpType.Handle:
-            case index_js_1.SharedTreeOpType.Update:
-            case index_js_1.SharedTreeOpType.NoOp:
+            case index_js_2.SharedTreeOpType.Handle:
+            case index_js_2.SharedTreeOpType.Update:
+            case index_js_2.SharedTreeOpType.NoOp:
                 return;
             default:
                 (0, Common_js_1.fail)('Unrecognized op');
@@ -970,13 +970,13 @@ class SharedTree extends shared_object_base_1.SharedObject {
     reSubmitCore(op, localOpMetadata) {
         const sharedTreeOp = op;
         switch (sharedTreeOp.type) {
-            case index_js_1.SharedTreeOpType.Edit:
+            case index_js_2.SharedTreeOpType.Edit:
                 if (compareSummaryFormatVersions(sharedTreeOp.version, this.writeFormat) > 0) {
                     (0, Common_js_1.fail)('Attempted to resubmit op of version newer than current version');
                 }
                 else if (localOpMetadata?.transformedEdit !== undefined) {
                     // Optimization: stashed 0.0.2 ops require no transformation in 0.0.2; don't re-encode
-                    if (this.writeFormat !== index_js_1.WriteFormat.v0_0_2 || sharedTreeOp.version !== index_js_1.WriteFormat.v0_0_2) {
+                    if (this.writeFormat !== index_js_2.WriteFormat.v0_0_2 || sharedTreeOp.version !== index_js_2.WriteFormat.v0_0_2) {
                         this.submitEditOp(localOpMetadata.transformedEdit);
                         return;
                     }
@@ -998,7 +998,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
      */
     internStringsFromEdit(edit) {
         for (const change of edit.changes) {
-            if (change.type === index_js_1.ChangeTypeInternal.Build) {
+            if (change.type === index_js_2.ChangeTypeInternal.Build) {
                 for (const root of change.source) {
                     (0, EditUtilities_js_1.walkTree)(root, (node) => {
                         this.interner.getOrCreateInternedId(node.definition);
@@ -1008,7 +1008,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
                     }, Identifiers_js_1.isDetachedSequenceId);
                 }
             }
-            else if (change.type === index_js_1.ChangeTypeInternal.Insert) {
+            else if (change.type === index_js_2.ChangeTypeInternal.Insert) {
                 const { referenceTrait } = change.destination;
                 if (referenceTrait !== undefined) {
                     this.interner.getOrCreateInternedId(referenceTrait.label);