@fluidframework/tree 2.116.0 → 2.116.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/packageVersion.d.ts +1 -1
- package/dist/packageVersion.js +1 -1
- package/dist/packageVersion.js.map +1 -1
- package/dist/shared-tree/treeCheckout.js +8 -8
- package/dist/shared-tree/treeCheckout.js.map +1 -1
- package/lib/packageVersion.d.ts +1 -1
- package/lib/packageVersion.js +1 -1
- package/lib/packageVersion.js.map +1 -1
- package/lib/shared-tree/treeCheckout.js +8 -8
- package/lib/shared-tree/treeCheckout.js.map +1 -1
- package/package.json +23 -23
- package/src/packageVersion.ts +1 -1
- package/src/shared-tree/treeCheckout.ts +8 -8
package/dist/packageVersion.d.ts
CHANGED
package/dist/packageVersion.js
CHANGED
|
@@ -8,5 +8,5 @@
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.pkgVersion = exports.pkgName = void 0;
|
|
10
10
|
exports.pkgName = "@fluidframework/tree";
|
|
11
|
-
exports.pkgVersion = "2.116.
|
|
11
|
+
exports.pkgVersion = "2.116.1";
|
|
12
12
|
//# sourceMappingURL=packageVersion.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEU,QAAA,OAAO,GAAG,sBAAsB,CAAC;AACjC,QAAA,UAAU,GAAG,SAAS,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/tree\";\nexport const pkgVersion = \"2.116.
|
|
1
|
+
{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEU,QAAA,OAAO,GAAG,sBAAsB,CAAC;AACjC,QAAA,UAAU,GAAG,SAAS,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/tree\";\nexport const pkgVersion = \"2.116.1\";\n"]}
|
|
@@ -287,7 +287,7 @@ let TreeCheckout = (() => {
|
|
|
287
287
|
throw new internal_2.UsageError("Cannot generate the same revertible more than once. Note that this can happen when multiple changed event listeners are registered.");
|
|
288
288
|
}
|
|
289
289
|
const revertible = this.createRevertible(revision, kind, this, onRevertibleDisposed, commitLabelTree);
|
|
290
|
-
this.revertibleCommitBranches.set(revision, tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").
|
|
290
|
+
this.revertibleCommitBranches.set(revision, tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.fork(commit));
|
|
291
291
|
this.revertibles.set(revision, revertible);
|
|
292
292
|
return revertible;
|
|
293
293
|
};
|
|
@@ -738,8 +738,8 @@ let TreeCheckout = (() => {
|
|
|
738
738
|
throw new internal_2.UsageError("Unable to clone a revertible that has been disposed.");
|
|
739
739
|
}
|
|
740
740
|
const commitToRevert = revertibleBranch.getHead();
|
|
741
|
-
const
|
|
742
|
-
if ((0, index_js_2.isAncestor)(commitToRevert,
|
|
741
|
+
const branchHead = tslib_1.__classPrivateFieldGet(targetCheckout, _TreeCheckout_transaction, "f").branch.getHead();
|
|
742
|
+
if ((0, index_js_2.isAncestor)(commitToRevert, branchHead, true) === false) {
|
|
743
743
|
throw new internal_2.UsageError("Cannot clone revertible for a commit that is not present on the given branch.");
|
|
744
744
|
}
|
|
745
745
|
targetCheckout.revertibleCommitBranches.set(revision, revertibleBranch.fork());
|
|
@@ -782,7 +782,7 @@ let TreeCheckout = (() => {
|
|
|
782
782
|
if (this.transaction.size > 0) {
|
|
783
783
|
throw new internal_2.UsageError("A view cannot be forked while it has a pending transaction.");
|
|
784
784
|
}
|
|
785
|
-
const branch = tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").
|
|
785
|
+
const branch = tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.fork();
|
|
786
786
|
const storedSchema = this.storedSchema.clone();
|
|
787
787
|
const forkBreaker = new index_js_6.Breakable("TreeCheckout", this.logger);
|
|
788
788
|
const forest = this.forest.clone(storedSchema, forkBreaker);
|
|
@@ -814,7 +814,7 @@ let TreeCheckout = (() => {
|
|
|
814
814
|
throw new internal_2.UsageError("A view cannot be rebased while it has a pending transaction.");
|
|
815
815
|
}
|
|
816
816
|
(0, internal_1.assert)(!checkout.isSharedBranch, 0xa5d /* Shared branches cannot be rebased onto another branch. */);
|
|
817
|
-
tslib_1.__classPrivateFieldGet(checkout, _TreeCheckout_transaction, "f").
|
|
817
|
+
tslib_1.__classPrivateFieldGet(checkout, _TreeCheckout_transaction, "f").branch.rebaseOnto(tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch);
|
|
818
818
|
}
|
|
819
819
|
rebaseOnto(branch) {
|
|
820
820
|
getCheckout(branch).rebase(this);
|
|
@@ -851,7 +851,7 @@ let TreeCheckout = (() => {
|
|
|
851
851
|
if (checkout.transaction.size > 0) {
|
|
852
852
|
throw new internal_2.UsageError("Views with an open transaction cannot be merged into another view.");
|
|
853
853
|
}
|
|
854
|
-
tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").
|
|
854
|
+
tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.merge(tslib_1.__classPrivateFieldGet(checkout, _TreeCheckout_transaction, "f").branch);
|
|
855
855
|
if (disposeMerged && !checkout.isSharedBranch) {
|
|
856
856
|
// Dispose the merged checkout unless it is a shared branch.
|
|
857
857
|
checkout[index_js_6.disposeSymbol]();
|
|
@@ -927,7 +927,7 @@ let TreeCheckout = (() => {
|
|
|
927
927
|
const commitToRevert = revertibleBranch.getHead();
|
|
928
928
|
const revisionForInvert = this.mintRevisionTag();
|
|
929
929
|
let change = (0, index_js_2.tagChange)(this.changeFamily.rebaser.invert(commitToRevert, false, revisionForInvert), revisionForInvert);
|
|
930
|
-
const headCommit = tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").
|
|
930
|
+
const headCommit = tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.getHead();
|
|
931
931
|
// Rebase the inverted change onto any commits that occurred after the undoable commits.
|
|
932
932
|
if (commitToRevert !== headCommit) {
|
|
933
933
|
// The inverse may be rebased over newer commits which (despite being present in the history)
|
|
@@ -943,7 +943,7 @@ let TreeCheckout = (() => {
|
|
|
943
943
|
const previousLabelTreeNode = this.labelTreeNode;
|
|
944
944
|
this.labelTreeNode = labelTree;
|
|
945
945
|
try {
|
|
946
|
-
tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").
|
|
946
|
+
tslib_1.__classPrivateFieldGet(this, _TreeCheckout_transaction, "f").branch.apply(change, kind === index_js_2.CommitKind.Default || kind === index_js_2.CommitKind.Redo
|
|
947
947
|
? index_js_2.CommitKind.Undo
|
|
948
948
|
: index_js_2.CommitKind.Redo);
|
|
949
949
|
}
|