@fluid-experimental/tree 2.0.0-rc.1.0.3 → 2.0.0-rc.2.0.0

package/dist/SharedTree.js

@@ -10,25 +10,25 @@ 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 Common_1 = require("./Common");
-const EditLog_1 = require("./EditLog");
-const Identifiers_1 = require("./Identifiers");
-const InitialTree_1 = require("./InitialTree");
-const LogViewer_1 = require("./LogViewer");
-const SummaryBackCompatibility_1 = require("./SummaryBackCompatibility");
-const persisted_types_1 = require("./persisted-types");
-const Summary_1 = require("./Summary");
-const EditUtilities_1 = require("./EditUtilities");
-const NodeIdUtilities_1 = require("./NodeIdUtilities");
-const EventTypes_1 = require("./EventTypes");
-const RevisionView_1 = require("./RevisionView");
-const SharedTreeEncoder_1 = require("./SharedTreeEncoder");
-const HistoryEditFactory_1 = require("./HistoryEditFactory");
-const ChangeTypes_1 = require("./ChangeTypes");
-const id_compressor_1 = require("./id-compressor");
-const IdConversion_1 = require("./IdConversion");
-const StringInterner_1 = require("./StringInterner");
-const UuidUtilities_1 = require("./UuidUtilities");
+const Common_js_1 = require("./Common.js");
+const EditLog_js_1 = require("./EditLog.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 UuidUtilities_js_1 = require("./UuidUtilities.js");
 /**
  * Factory for SharedTree.
  * Includes history in the summary.
@@ -78,12 +78,12 @@ class SharedTreeFactory {
     createSharedTree(runtime, id) {
         const [writeFormat] = this.args;
         switch (writeFormat) {
-            case persisted_types_1.WriteFormat.v0_0_2:
+            case index_js_1.WriteFormat.v0_0_2:
                 return new SharedTree(runtime, id, ...this.args);
-            case persisted_types_1.WriteFormat.v0_1_1:
+            case index_js_1.WriteFormat.v0_1_1:
                 return new SharedTree(runtime, id, ...this.args);
             default:
-                (0, Common_1.fail)('Unknown write format');
+                (0, Common_js_1.fail)('Unknown write format');
         }
     }
 }
@@ -107,7 +107,7 @@ const snapshotFileName = 'header';
 /**
  * Used for version comparison.
  */
-const sortedWriteVersions = [persisted_types_1.WriteFormat.v0_0_2, persisted_types_1.WriteFormat.v0_1_1];
+const sortedWriteVersions = [index_js_1.WriteFormat.v0_0_2, index_js_1.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';
@@ -124,7 +124,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
     }
     static getFactory(...args) {
         const [formatArg, options] = args;
-        const writeFormat = formatArg ?? persisted_types_1.WriteFormat.v0_1_1;
+        const writeFormat = formatArg ?? index_js_1.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,12 +138,12 @@ class SharedTree extends shared_object_base_1.SharedObject {
      */
     get attributionId() {
         switch (this.writeFormat) {
-            case persisted_types_1.WriteFormat.v0_0_2:
-                return UuidUtilities_1.nilUuid;
+            case index_js_1.WriteFormat.v0_0_2:
+                return UuidUtilities_js_1.nilUuid;
             default: {
                 const { attributionId } = this.idCompressor;
-                if (attributionId === persisted_types_1.ghostSessionId) {
-                    return UuidUtilities_1.nilUuid;
+                if (attributionId === index_js_1.ghostSessionId) {
+                    return UuidUtilities_js_1.nilUuid;
                 }
                 return attributionId;
             }
@@ -177,7 +177,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
             normalizeToSessionSpace: (id, sessionId) => this.idCompressor.normalizeToSessionSpace(id, sessionId),
         };
         // The initial tree's definition isn't included in any op by default but it should still be interned. Including it here ensures that.
-        this.interner = new StringInterner_1.MutableStringInterner([InitialTree_1.initialTree.definition]);
+        this.interner = new StringInterner_js_1.MutableStringInterner([InitialTree_js_1.initialTree.definition]);
         this.processEditResult = (editResult, editId) => {
             // TODO:#44859: Invalid results should be handled by the app
             this.emit(SharedTree.eventFromEditResult(editResult), editId);
@@ -191,7 +191,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
                 reconciliationPath,
                 outcome: result,
             };
-            this.emit(EventTypes_1.SharedTreeEvent.SequencedEditApplied, eventArguments);
+            this.emit(EventTypes_js_1.SharedTreeEvent.SequencedEditApplied, eventArguments);
         };
         const historyPolicy = this.getHistoryPolicy(options);
         this.summarizeHistory = historyPolicy.summarizeHistory;
@@ -219,17 +219,17 @@ class SharedTree extends shared_object_base_1.SharedObject {
             };
         })();
         const idCompressorLoger = (0, telemetry_utils_1.createSampledLogger)(this.logger, idCompressorEventSampler);
-        this.idCompressor = new id_compressor_1.IdCompressor((0, id_compressor_1.createSessionId)(), persisted_types_1.reservedIdCount, attributionId, idCompressorLoger);
+        this.idCompressor = new index_js_2.IdCompressor((0, index_js_2.createSessionId)(), index_js_1.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, persisted_types_1.WriteFormat.v0_1_1);
+        }, undefined, this.idCompressor, this.processEditResult, this.processSequencedEditResult, index_js_1.WriteFormat.v0_1_1);
         this.editLog = editLog;
         this.cachingLogViewer = cachingLogViewer;
-        this.encoder_0_0_2 = new SharedTreeEncoder_1.SharedTreeEncoder_0_0_2(this.summarizeHistory);
-        this.encoder_0_1_1 = new SharedTreeEncoder_1.SharedTreeEncoder_0_1_1(this.summarizeHistory);
+        this.encoder_0_0_2 = new SharedTreeEncoder_js_1.SharedTreeEncoder_0_0_2(this.summarizeHistory);
+        this.encoder_0_1_1 = new SharedTreeEncoder_js_1.SharedTreeEncoder_0_1_1(this.summarizeHistory);
     }
     /**
      * The write format version currently used by this `SharedTree`. This is always initialized to the write format
@@ -295,7 +295,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
      * The result is safe to persist and re-use across `SharedTree` instances, unlike `NodeId`.
      */
     convertToStableNodeId(id) {
-        return this.idCompressor.tryDecompress(id) ?? (0, Common_1.fail)('Node id is not known to this SharedTree');
+        return this.idCompressor.tryDecompress(id) ?? (0, Common_js_1.fail)('Node id is not known to this SharedTree');
     }
     /**
      * Given a NodeId, attempt to return the corresponding stable ID.
@@ -314,7 +314,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
      * `id` was at some point generated by an instance of this SharedTree.
      */
     convertToNodeId(id) {
-        return (this.idCompressor.tryRecompress(id) ?? (0, Common_1.fail)('Stable node id is not known to this SharedTree'));
+        return (this.idCompressor.tryRecompress(id) ?? (0, Common_js_1.fail)('Stable node id is not known to this SharedTree'));
     }
     /**
      * Given a stable ID, return the corresponding NodeId or return undefined if the supplied stable ID was never generated with this tree,
@@ -332,12 +332,12 @@ class SharedTree extends shared_object_base_1.SharedObject {
      */
     attributeNodeId(id) {
         switch (this.writeFormat) {
-            case persisted_types_1.WriteFormat.v0_0_2:
-                return UuidUtilities_1.nilUuid;
+            case index_js_1.WriteFormat.v0_0_2:
+                return UuidUtilities_js_1.nilUuid;
             default: {
                 const attributionId = this.idCompressor.attributeId(id);
-                if (attributionId === persisted_types_1.ghostSessionId) {
-                    return UuidUtilities_1.nilUuid;
+                if (attributionId === index_js_1.ghostSessionId) {
+                    return UuidUtilities_js_1.nilUuid;
                 }
                 return attributionId;
             }
@@ -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 === persisted_types_1.WriteFormat.v0_1_1) {
+            if (this.writeFormat === index_js_1.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()) {
@@ -383,16 +383,16 @@ class SharedTree extends shared_object_base_1.SharedObject {
      */
     saveSerializedSummary(options) {
         const { serializer } = options ?? {};
-        return (0, Summary_1.serialize)(this.saveSummary(), serializer ?? this.serializer, this.handle);
+        return (0, Summary_js_1.serialize)(this.saveSummary(), serializer ?? this.serializer, this.handle);
     }
     /**
      * Initialize shared tree with a serialized summary. This is used for testing.
      * @returns Statistics about the loaded summary.
      */
     loadSerializedSummary(blobData) {
-        const summary = (0, SummaryBackCompatibility_1.deserialize)(blobData, this.serializer);
+        const summary = (0, SummaryBackCompatibility_js_1.deserialize)(blobData, this.serializer);
         this.loadSummary(summary);
-        return (0, SummaryBackCompatibility_1.getSummaryStatistics)(summary);
+        return (0, SummaryBackCompatibility_js_1.getSummaryStatistics)(summary);
     }
     /**
      * Saves this SharedTree into a deserialized summary.
@@ -408,12 +408,12 @@ class SharedTree extends shared_object_base_1.SharedObject {
     generateSummary() {
         try {
             switch (this.writeFormat) {
-                case persisted_types_1.WriteFormat.v0_0_2:
+                case index_js_1.WriteFormat.v0_0_2:
                     return this.encoder_0_0_2.encodeSummary(this.editLog, this.currentView, this);
-                case persisted_types_1.WriteFormat.v0_1_1:
+                case index_js_1.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_1.fail)('Unknown version');
+                    (0, Common_js_1.fail)('Unknown version');
             }
         }
         catch (error) {
@@ -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: persisted_types_1.SharedTreeOpType.Update, version: this.writeFormat });
+            this.submitOp({ type: index_js_1.SharedTreeOpType.Update, version: this.writeFormat });
             this.logger.sendTelemetryEvent({
                 eventName: 'RequestVersionUpdate',
                 versionFrom: loadedSummaryVersion,
@@ -444,31 +444,31 @@ class SharedTree extends shared_object_base_1.SharedObject {
         (0, core_utils_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 persisted_types_1.WriteFormat.v0_0_2:
+            case index_js_1.WriteFormat.v0_0_2:
                 convertedSummary = this.encoder_0_0_2.decodeSummary(summary, this.attributionId);
                 break;
-            case persisted_types_1.WriteFormat.v0_1_1: {
+            case index_js_1.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;
                 if (loadedSummaryIncludesHistory !== this.summarizeHistory) {
                     this.summarizeHistory = loadedSummaryIncludesHistory;
-                    this.encoder_0_1_1 = new SharedTreeEncoder_1.SharedTreeEncoder_0_1_1(this.summarizeHistory);
+                    this.encoder_0_1_1 = new SharedTreeEncoder_js_1.SharedTreeEncoder_0_1_1(this.summarizeHistory);
                 }
                 convertedSummary = this.encoder_0_1_1.decodeSummary(summary, this.attributionId);
                 break;
             }
             default:
-                (0, Common_1.fail)('Unknown version');
+                (0, Common_js_1.fail)('Unknown version');
         }
         const { editHistory, currentTree, idCompressor, interner } = convertedSummary;
         this.interner = interner;
-        this.interner.getOrCreateInternedId(InitialTree_1.initialTree.definition);
-        if (compareSummaryFormatVersions(loadedSummaryVersion, persisted_types_1.WriteFormat.v0_1_1) < 0) {
+        this.interner.getOrCreateInternedId(InitialTree_js_1.initialTree.definition);
+        if (compareSummaryFormatVersions(loadedSummaryVersion, index_js_1.WriteFormat.v0_1_1) < 0) {
             const { editIds, editChunks } = editHistory;
             this.logger.sendTelemetryEvent({
                 eventName: 'SummaryConversion',
-                formatVersion: persisted_types_1.WriteFormat.v0_1_1,
+                formatVersion: index_js_1.WriteFormat.v0_1_1,
                 historySize: editIds.length,
                 totalNumberOfChunks: editChunks.length,
             });
@@ -477,12 +477,12 @@ class SharedTree extends shared_object_base_1.SharedObject {
     }
     static eventFromEditResult(editStatus) {
         switch (editStatus) {
-            case persisted_types_1.EditStatus.Applied:
-                return EventTypes_1.SharedTreeDiagnosticEvent.AppliedEdit;
-            case persisted_types_1.EditStatus.Invalid:
-                return EventTypes_1.SharedTreeDiagnosticEvent.DroppedInvalidEdit;
+            case index_js_1.EditStatus.Applied:
+                return EventTypes_js_1.SharedTreeDiagnosticEvent.AppliedEdit;
+            case index_js_1.EditStatus.Invalid:
+                return EventTypes_js_1.SharedTreeDiagnosticEvent.DroppedInvalidEdit;
             default:
-                return EventTypes_1.SharedTreeDiagnosticEvent.DroppedMalformedEdit;
+                return EventTypes_js_1.SharedTreeDiagnosticEvent.DroppedMalformedEdit;
         }
     }
     /**
@@ -495,16 +495,16 @@ class SharedTree extends shared_object_base_1.SharedObject {
         // log viewers.
         this.cachingLogViewer?.detachFromEditLog();
         // Use previously registered EditAddedHandlers if there is an existing EditLog.
-        const editLog = new EditLog_1.EditLog(editHistory, this.logger, this.editLog?.editAddedHandlers, this.editLogSize, this.editEvictionFrequency);
-        editLog.on(EventTypes_1.SharedTreeDiagnosticEvent.UnexpectedHistoryChunk, () => {
-            this.emit(EventTypes_1.SharedTreeDiagnosticEvent.UnexpectedHistoryChunk);
+        const editLog = new EditLog_js_1.EditLog(editHistory, this.logger, this.editLog?.editAddedHandlers, this.editLogSize, this.editEvictionFrequency);
+        editLog.on(EventTypes_js_1.SharedTreeDiagnosticEvent.UnexpectedHistoryChunk, () => {
+            this.emit(EventTypes_js_1.SharedTreeDiagnosticEvent.UnexpectedHistoryChunk);
         });
         let initialRevision;
         if (currentTree !== undefined) {
-            const currentView = RevisionView_1.RevisionView.fromTree(currentTree);
+            const currentView = RevisionView_js_1.RevisionView.fromTree(currentTree);
             initialRevision = [editLog.length, { view: currentView }];
         }
-        const logViewer = new LogViewer_1.CachingLogViewer(editLog, RevisionView_1.RevisionView.fromTree(InitialTree_1.initialTree, this), initialRevision, editStatusCallback, sequencedEditResultCallback, 0);
+        const logViewer = new LogViewer_js_1.CachingLogViewer(editLog, RevisionView_js_1.RevisionView.fromTree(InitialTree_js_1.initialTree, this), initialRevision, editStatusCallback, sequencedEditResultCallback, 0);
         this.editLog = editLog;
         this.cachingLogViewer = logViewer;
         return { editLog, cachingLogViewer: logViewer };
@@ -527,7 +527,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
      * - state of caches
      */
     equals(sharedTree) {
-        if (!(0, EditUtilities_1.areRevisionViewsSemanticallyEqual)(this.currentView, this, sharedTree.currentView, sharedTree)) {
+        if (!(0, EditUtilities_js_1.areRevisionViewsSemanticallyEqual)(this.currentView, this, sharedTree.currentView, sharedTree)) {
             return false;
         }
         return this.editLog.equals(sharedTree.editLog);
@@ -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 = persisted_types_1.WriteFormat.v0_0_2;
+            op.version = index_js_1.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 === persisted_types_1.SharedTreeOpType.Handle) {
+            if (type === index_js_1.SharedTreeOpType.Handle) {
                 // Edit virtualization is no longer supported, log the event and ignore the op.
                 this.logger.sendErrorEvent({ eventName: 'UnexpectedHistoryChunk' });
             }
-            else if (type === persisted_types_1.SharedTreeOpType.Edit) {
-                if (op.version === persisted_types_1.WriteFormat.v0_1_1) {
+            else if (type === index_js_1.SharedTreeOpType.Edit) {
+                if (op.version === index_js_1.WriteFormat.v0_1_1) {
                     this.idCompressor.finalizeCreationRange(op.idRange);
                 }
                 const edit = this.parseSequencedEdit(op);
-                if (op.version === persisted_types_1.WriteFormat.v0_1_1) {
+                if (op.version === index_js_1.WriteFormat.v0_1_1) {
                     this.internStringsFromEdit(edit);
                 }
                 this.processSequencedEdit(edit, typedMessage);
             }
         }
-        else if (type === persisted_types_1.SharedTreeOpType.Update) {
+        else if (type === index_js_1.SharedTreeOpType.Update) {
             this.processVersionUpdate(op.version);
         }
         else if (compareSummaryFormatVersions(version, this.writeFormat) === 1) {
@@ -589,7 +589,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
             this.logger.sendErrorEvent({
                 eventName: 'UnexpectedNewerOpVersion',
             }, error);
-            (0, Common_1.fail)(error);
+            (0, Common_js_1.fail)(error);
         }
     }
     /**
@@ -610,22 +610,14 @@ 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 persisted_types_1.WriteFormat.v0_0_2:
-                return this.encoder_0_0_2.decodeEditOp(op, this.encodeSemiSerializedEdit.bind(this), this);
-            case persisted_types_1.WriteFormat.v0_1_1:
-                return this.encoder_0_1_1.decodeEditOp(op, this.encodeSemiSerializedEdit.bind(this), this.idNormalizer, this.interner);
+            case index_js_1.WriteFormat.v0_0_2:
+                return this.encoder_0_0_2.decodeEditOp(op, (x) => x, this);
+            case index_js_1.WriteFormat.v0_1_1:
+                return this.encoder_0_1_1.decodeEditOp(op, (x) => x, this.idNormalizer, this.interner);
             default:
-                (0, Common_1.fail)('Unknown op version');
+                (0, Common_js_1.fail)('Unknown op version');
         }
     }
-    encodeSemiSerializedEdit(semiSerializedEdit) {
-        // semiSerializedEdit may have handles which have been replaced by `serializer.encode`.
-        // Since there is no API to un-replace them except via parse, re-stringify the edit, then parse it.
-        // Stringify using JSON, not IFluidSerializer since OPs use JSON directly.
-        // TODO:Performance:#48025: Avoid this serialization round trip.
-        const encodedEdit = this.serializer.parse(JSON.stringify(semiSerializedEdit));
-        return encodedEdit;
-    }
     processSequencedEdit(edit, message) {
         const { id: editId } = edit;
         const wasLocalEdit = this.editLog.isLocalEdit(editId);
@@ -652,7 +644,7 @@ 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, persisted_types_1.WriteFormat.v0_1_1) >= 0) {
+                if (compareSummaryFormatVersions(version, index_js_1.WriteFormat.v0_1_1) >= 0) {
                     this.upgradeFrom_0_0_2_to_0_1_1();
                 }
                 else {
@@ -673,11 +665,11 @@ class SharedTree extends shared_object_base_1.SharedObject {
     }
     upgradeFrom_0_0_2_to_0_1_1() {
         // Reset the string interner, re-populate only with information that there is consensus on
-        this.interner = new StringInterner_1.MutableStringInterner([InitialTree_1.initialTree.definition]);
+        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 id_compressor_1.IdCompressor((0, id_compressor_1.createSessionId)(), persisted_types_1.reservedIdCount, this.attributionId, this.logger);
-        const newContext = (0, NodeIdUtilities_1.getNodeIdContext)(newIdCompressor);
+        const newIdCompressor = new index_js_2.IdCompressor((0, index_js_2.createSessionId)(), index_js_1.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
         for (const localId of oldIdCompressor.getAllIdsFromLocalSession()) {
@@ -685,20 +677,20 @@ class SharedTree extends shared_object_base_1.SharedObject {
         }
         const unifyHistoricalIds = (context) => {
             for (let i = 0; i < this.editLog.numberOfSequencedEdits; i++) {
-                const edit = this.editLog.tryGetEditAtIndex(i) ?? (0, Common_1.fail)('edit not found');
-                (0, IdConversion_1.convertEditIds)(edit, (id) => context.generateNodeId(this.convertToStableNodeId(id)));
+                const edit = this.editLog.tryGetEditAtIndex(i) ?? (0, Common_js_1.fail)('edit not found');
+                (0, IdConversion_js_1.convertEditIds)(edit, (id) => context.generateNodeId(this.convertToStableNodeId(id)));
             }
         };
         // Construct a temporary "ghost" compressor which is used to generate final IDs that will be consistent across all upgrading clients
-        const ghostIdCompressor = new id_compressor_1.IdCompressor(persisted_types_1.ghostSessionId, persisted_types_1.reservedIdCount);
-        const ghostContext = (0, NodeIdUtilities_1.getNodeIdContext)(ghostIdCompressor);
+        const ghostIdCompressor = new index_js_2.IdCompressor(index_js_1.ghostSessionId, index_js_1.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
             // via the ghost compressor.
             unifyHistoricalIds(ghostContext);
             // The same logic applies to string interning, so intern all the strings in the history (superset of those in the current view)
             for (let i = 0; i < this.editLog.numberOfSequencedEdits; i++) {
-                this.internStringsFromEdit(this.editLog.tryGetEditAtIndex(i) ?? (0, Common_1.fail)('edit not found'));
+                this.internStringsFromEdit(this.editLog.tryGetEditAtIndex(i) ?? (0, Common_js_1.fail)('edit not found'));
             }
         }
         else {
@@ -720,8 +712,8 @@ class SharedTree extends shared_object_base_1.SharedObject {
         this.idCompressor = newIdCompressor;
     }
     applyEdit(...changesOrArray) {
-        const changes = (0, Common_1.unwrapRestOrArray)(changesOrArray);
-        const id = (0, EditUtilities_1.newEditId)();
+        const changes = (0, Common_js_1.unwrapRestOrArray)(changesOrArray);
+        const id = (0, EditUtilities_js_1.newEditId)();
         const internalEdit = {
             id,
             changes: changes.map((c) => this.internalizeChange(c)),
@@ -746,7 +738,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
             const convertedStableId = stableIdRemapper?.(stableId) ?? stableId;
             return this.generateNodeId(convertedStableId);
         };
-        return Array.from(edits, (edit) => this.applyEditInternal((0, IdConversion_1.convertEditIds)(edit, (id) => idConverter(id))).id);
+        return Array.from(edits, (edit) => this.applyEditInternal((0, IdConversion_js_1.convertEditIds)(edit, (id) => idConverter(id))).id);
     }
     /**
      * Applies a set of internal changes to this tree. The result will be reflected in `SharedTree.currentView`.
@@ -757,7 +749,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
     applyEditInternal(editOrChanges) {
         let edit;
         if (Array.isArray(editOrChanges)) {
-            const id = (0, EditUtilities_1.newEditId)();
+            const id = (0, EditUtilities_js_1.newEditId)();
             edit = { id, changes: editOrChanges };
         }
         else {
@@ -773,59 +765,59 @@ class SharedTree extends shared_object_base_1.SharedObject {
      */
     internalizeChange(change) {
         switch (change.type) {
-            case ChangeTypes_1.ChangeType.Insert:
+            case ChangeTypes_js_1.ChangeType.Insert:
                 return {
                     source: change.source,
-                    destination: (0, EditUtilities_1.deepCloneStablePlace)(change.destination),
-                    type: persisted_types_1.ChangeTypeInternal.Insert,
+                    destination: (0, EditUtilities_js_1.deepCloneStablePlace)(change.destination),
+                    type: index_js_1.ChangeTypeInternal.Insert,
                 };
-            case ChangeTypes_1.ChangeType.Detach: {
+            case ChangeTypes_js_1.ChangeType.Detach: {
                 const detach = {
-                    source: (0, EditUtilities_1.deepCloneStableRange)(change.source),
-                    type: persisted_types_1.ChangeTypeInternal.Detach,
+                    source: (0, EditUtilities_js_1.deepCloneStableRange)(change.source),
+                    type: index_js_1.ChangeTypeInternal.Detach,
                 };
-                (0, Common_1.copyPropertyIfDefined)(change, detach, 'destination');
+                (0, Common_js_1.copyPropertyIfDefined)(change, detach, 'destination');
                 return detach;
             }
-            case ChangeTypes_1.ChangeType.Build: {
+            case ChangeTypes_js_1.ChangeType.Build: {
                 if (isTreeNodeSequence(change.source)) {
-                    const source = change.source.map((buildNode) => (0, EditUtilities_1.convertTreeNodes)(buildNode, (nodeData) => (0, EditUtilities_1.internalizeBuildNode)(nodeData, this), (x) => typeof x === 'number'));
+                    const source = change.source.map((buildNode) => (0, EditUtilities_js_1.convertTreeNodes)(buildNode, (nodeData) => (0, EditUtilities_js_1.internalizeBuildNode)(nodeData, this), (x) => typeof x === 'number'));
                     return {
                         source,
                         destination: change.destination,
-                        type: persisted_types_1.ChangeTypeInternal.Build,
+                        type: index_js_1.ChangeTypeInternal.Build,
                     };
                 }
                 else {
-                    const source = (0, EditUtilities_1.convertTreeNodes)(change.source, (nodeData) => (0, EditUtilities_1.internalizeBuildNode)(nodeData, this), (x) => typeof x === 'number');
+                    const source = (0, EditUtilities_js_1.convertTreeNodes)(change.source, (nodeData) => (0, EditUtilities_js_1.internalizeBuildNode)(nodeData, this), (x) => typeof x === 'number');
                     return {
                         source: [source],
                         destination: change.destination,
-                        type: persisted_types_1.ChangeTypeInternal.Build,
+                        type: index_js_1.ChangeTypeInternal.Build,
                     };
                 }
             }
-            case ChangeTypes_1.ChangeType.SetValue:
+            case ChangeTypes_js_1.ChangeType.SetValue:
                 return {
                     nodeToModify: change.nodeToModify,
                     payload: change.payload,
-                    type: persisted_types_1.ChangeTypeInternal.SetValue,
+                    type: index_js_1.ChangeTypeInternal.SetValue,
                 };
-            case ChangeTypes_1.ChangeType.Constraint: {
+            case ChangeTypes_js_1.ChangeType.Constraint: {
                 const constraint = {
                     effect: change.effect,
                     toConstrain: change.toConstrain,
-                    type: persisted_types_1.ChangeTypeInternal.Constraint,
+                    type: index_js_1.ChangeTypeInternal.Constraint,
                 };
-                (0, Common_1.copyPropertyIfDefined)(change, constraint, 'contentHash');
-                (0, Common_1.copyPropertyIfDefined)(change, constraint, 'identityHash');
-                (0, Common_1.copyPropertyIfDefined)(change, constraint, 'label');
-                (0, Common_1.copyPropertyIfDefined)(change, constraint, 'length');
-                (0, Common_1.copyPropertyIfDefined)(change, constraint, 'parentNode');
+                (0, Common_js_1.copyPropertyIfDefined)(change, constraint, 'contentHash');
+                (0, Common_js_1.copyPropertyIfDefined)(change, constraint, 'identityHash');
+                (0, Common_js_1.copyPropertyIfDefined)(change, constraint, 'label');
+                (0, Common_js_1.copyPropertyIfDefined)(change, constraint, 'length');
+                (0, Common_js_1.copyPropertyIfDefined)(change, constraint, 'parentNode');
                 return constraint;
             }
             default:
-                (0, Common_1.fail)('unexpected change type');
+                (0, Common_js_1.fail)('unexpected change type');
         }
     }
     applyEditLocally(edit, message) {
@@ -841,7 +833,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
             local: !isSequenced,
             tree: this,
         };
-        this.emit(EventTypes_1.SharedTreeEvent.EditCommitted, eventArguments);
+        this.emit(EventTypes_js_1.SharedTreeEvent.EditCommitted, eventArguments);
     }
     /**
      * Reverts a previous edit by applying a new edit containing the inverse of the original edit's changes.
@@ -850,7 +842,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
      */
     revert(editId) {
         const index = this.edits.getIndexOfId(editId);
-        const edit = this.edits.tryGetEditAtIndex(index) ?? (0, Common_1.fail)('edit not found');
+        const edit = this.edits.tryGetEditAtIndex(index) ?? (0, Common_js_1.fail)('edit not found');
         const before = this.logViewer.getRevisionViewInMemory(index);
         const changes = this.revertChanges(edit.changes, before);
         if (changes === undefined) {
@@ -865,7 +857,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
      * @returns the inverse of `changes` or undefined if the changes could not be inverted for the given tree state.
      */
     revertChanges(changes, before) {
-        return (0, HistoryEditFactory_1.revert)(changes, before, this.logger, this.emit.bind(this));
+        return (0, HistoryEditFactory_js_1.revert)(changes, before, this.logger, this.emit.bind(this));
     }
     /**
      * Submits an edit by the local client to the runtime.
@@ -875,20 +867,17 @@ class SharedTree extends shared_object_base_1.SharedObject {
         // Ops will be submitted again when attached (see loadSummary())
         if (this.isAttached()) {
             switch (this.writeFormat) {
-                case persisted_types_1.WriteFormat.v0_0_2:
-                    this.submitOp(this.encoder_0_0_2.encodeEditOp(edit, this.serializeEdit.bind(this), this));
+                case index_js_1.WriteFormat.v0_0_2:
+                    this.submitOp(this.encoder_0_0_2.encodeEditOp(edit, (x) => x, this));
                     break;
-                case persisted_types_1.WriteFormat.v0_1_1:
-                    this.submitOp(this.encoder_0_1_1.encodeEditOp(edit, this.serializeEdit.bind(this), this.idCompressor.takeNextCreationRange(), this.idNormalizer, this.interner));
+                case index_js_1.WriteFormat.v0_1_1:
+                    this.submitOp(this.encoder_0_1_1.encodeEditOp(edit, (x) => x, this.idCompressor.takeNextCreationRange(), this.idNormalizer, this.interner));
                     break;
                 default:
-                    (0, Common_1.fail)('Unknown version');
+                    (0, Common_js_1.fail)('Unknown version');
             }
         }
     }
-    serializeEdit(preparedEdit) {
-        return this.serializer.encode(preparedEdit, this.handle);
-    }
     /** 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 */);
@@ -902,8 +891,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
      * When closing a container, hosts have the option to stash this pending local state somewhere to be reapplied
      * later (to avoid data loss).
      * If a host then loads a container using that stashed state, this function is called for each stashed op, and is expected to:
-     * 1. Update this DDS to reflect that state locally.
-     * 2. Return any `localOpMetadata` that would have been associated with this op.
+     * Update this DDS to reflect that state locally, and submit the op to do that.
      *
      * @param content - op to apply locally.
      */
@@ -912,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 persisted_types_1.SharedTreeOpType.Edit: {
+            case index_js_1.SharedTreeOpType.Edit: {
                 let stashedEdit;
                 switch (this.writeFormat) {
-                    case persisted_types_1.WriteFormat.v0_0_2:
+                    case index_js_1.WriteFormat.v0_0_2:
                         switch (sharedTreeOp.version) {
-                            case persisted_types_1.WriteFormat.v0_0_2: {
+                            case index_js_1.WriteFormat.v0_0_2: {
                                 stashedEdit = this.parseSequencedEdit(sharedTreeOp);
                                 break;
                             }
-                            case persisted_types_1.WriteFormat.v0_1_1:
-                                (0, Common_1.fail)('Received stashed op 0.1.1 before upgrade');
+                            case index_js_1.WriteFormat.v0_1_1:
+                                (0, Common_js_1.fail)('Received stashed op 0.1.1 before upgrade');
                             default:
-                                (0, Common_1.fail)('Unknown version');
+                                (0, Common_js_1.fail)('Unknown version');
                         }
                         break;
-                    case persisted_types_1.WriteFormat.v0_1_1:
+                    case index_js_1.WriteFormat.v0_1_1:
                         switch (sharedTreeOp.version) {
-                            case persisted_types_1.WriteFormat.v0_0_2: {
+                            case index_js_1.WriteFormat.v0_0_2: {
                                 // Use the IDs from the stashed ops as overrides for the equivalent new ops
-                                stashedEdit = (0, IdConversion_1.convertEditIds)(sharedTreeOp.edit, (id) => this.generateNodeId(id));
+                                stashedEdit = (0, IdConversion_js_1.convertEditIds)(sharedTreeOp.edit, (id) => this.generateNodeId(id));
                                 break;
                             }
-                            case persisted_types_1.WriteFormat.v0_1_1: {
+                            case index_js_1.WriteFormat.v0_1_1: {
                                 (0, core_utils_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 = id_compressor_1.IdCompressor.deserialize(this.idCompressor.serialize(false), stashedSessionId, sharedTreeOp.idRange.attributionId);
+                                    this.stashedIdCompressor = index_js_2.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;
@@ -946,7 +934,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
                                 }
                                 // Pretend (from the perspective of the temporary compressor) that the stashed ops have been sequenced
                                 this.stashedIdCompressor.finalizeCreationRange(sharedTreeOp.idRange);
-                                const stashedIdContext = (0, NodeIdUtilities_1.getNodeIdContext)(this.stashedIdCompressor);
+                                const stashedIdContext = (0, NodeIdUtilities_js_1.getNodeIdContext)(this.stashedIdCompressor);
                                 // Use a normalizer to translate all node IDs in the stashed ops
                                 const normalizer = {
                                     localSessionId: this.idCompressor.localSessionId,
@@ -957,38 +945,38 @@ class SharedTree extends shared_object_base_1.SharedObject {
                                     },
                                     normalizeToOpSpace: (id) => this.idNormalizer.normalizeToOpSpace(id),
                                 };
-                                stashedEdit = this.encoder_0_1_1.decodeEditOp(sharedTreeOp, this.encodeSemiSerializedEdit.bind(this), normalizer, this.interner);
+                                stashedEdit = this.encoder_0_1_1.decodeEditOp(sharedTreeOp, (x) => x, normalizer, this.interner);
                                 break;
                             }
                             default:
-                                (0, Common_1.fail)('Unknown version');
+                                (0, Common_js_1.fail)('Unknown version');
                         }
                         break;
                     default:
-                        (0, Common_1.fail)('Unknown version');
+                        (0, Common_js_1.fail)('Unknown version');
                 }
-                this.applyEditLocally(stashedEdit, undefined);
-                return { transformedEdit: stashedEdit };
+                this.applyEditInternal(stashedEdit);
+                return;
             }
             // Handle and update ops are only acknowledged by the client that generated them upon sequencing--no local changes necessary.
-            case persisted_types_1.SharedTreeOpType.Handle:
-            case persisted_types_1.SharedTreeOpType.Update:
-            case persisted_types_1.SharedTreeOpType.NoOp:
-                return {};
+            case index_js_1.SharedTreeOpType.Handle:
+            case index_js_1.SharedTreeOpType.Update:
+            case index_js_1.SharedTreeOpType.NoOp:
+                return;
             default:
-                (0, Common_1.fail)('Unrecognized op');
+                (0, Common_js_1.fail)('Unrecognized op');
         }
     }
     reSubmitCore(op, localOpMetadata) {
         const sharedTreeOp = op;
         switch (sharedTreeOp.type) {
-            case persisted_types_1.SharedTreeOpType.Edit:
+            case index_js_1.SharedTreeOpType.Edit:
                 if (compareSummaryFormatVersions(sharedTreeOp.version, this.writeFormat) > 0) {
-                    (0, Common_1.fail)('Attempted to resubmit op of version newer than current version');
+                    (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 !== persisted_types_1.WriteFormat.v0_0_2 || sharedTreeOp.version !== persisted_types_1.WriteFormat.v0_0_2) {
+                    if (this.writeFormat !== index_js_1.WriteFormat.v0_0_2 || sharedTreeOp.version !== index_js_1.WriteFormat.v0_0_2) {
                         this.submitEditOp(localOpMetadata.transformedEdit);
                         return;
                     }
@@ -1001,7 +989,7 @@ class SharedTree extends shared_object_base_1.SharedObject {
     }
     changeWriteFormat(newFormat) {
         this.writeFormat = newFormat;
-        this.emit(EventTypes_1.SharedTreeDiagnosticEvent.WriteVersionChanged, newFormat);
+        this.emit(EventTypes_js_1.SharedTreeDiagnosticEvent.WriteVersionChanged, newFormat);
     }
     /**
      * Interns all Definitions and TraitLabel_s referenced by the provided edit.
@@ -1010,17 +998,17 @@ class SharedTree extends shared_object_base_1.SharedObject {
      */
     internStringsFromEdit(edit) {
         for (const change of edit.changes) {
-            if (change.type === persisted_types_1.ChangeTypeInternal.Build) {
+            if (change.type === index_js_1.ChangeTypeInternal.Build) {
                 for (const root of change.source) {
-                    (0, EditUtilities_1.walkTree)(root, (node) => {
+                    (0, EditUtilities_js_1.walkTree)(root, (node) => {
                         this.interner.getOrCreateInternedId(node.definition);
                         for (const trait of Object.keys(node.traits)) {
                             this.interner.getOrCreateInternedId(trait);
                         }
-                    }, Identifiers_1.isDetachedSequenceId);
+                    }, Identifiers_js_1.isDetachedSequenceId);
                 }
             }
-            else if (change.type === persisted_types_1.ChangeTypeInternal.Insert) {
+            else if (change.type === index_js_1.ChangeTypeInternal.Insert) {
                 const { referenceTrait } = change.destination;
                 if (referenceTrait !== undefined) {
                     this.interner.getOrCreateInternedId(referenceTrait.label);
@@ -1038,7 +1026,7 @@ function compareSummaryFormatVersions(versionA, versionB) {
     const versionAIndex = sortedWriteVersions.indexOf(versionA);
     const versionBIndex = sortedWriteVersions.indexOf(versionB);
     if (versionAIndex === -1 || versionBIndex === -1) {
-        (0, Common_1.fail)('Summary version being compared cannot be read.');
+        (0, Common_js_1.fail)('Summary version being compared cannot be read.');
     }
     if (versionAIndex < versionBIndex) {
         return -1;
@@ -1056,7 +1044,7 @@ function compareSummaryFormatVersions(versionA, versionB) {
 function isUpdateRequired(oldVersion, newVersion) {
     const newVersionIndex = sortedWriteVersions.indexOf(newVersion);
     if (newVersionIndex === -1) {
-        (0, Common_1.fail)('New write version is invalid.');
+        (0, Common_js_1.fail)('New write version is invalid.');
     }
     return compareSummaryFormatVersions(oldVersion, newVersion) === -1 ? true : false;
 }