@fluidframework/garbage-collector - npm Package Compare versions

Comparing version 2.0.0-internal.2.3.1 to 2.0.0-internal.2.4.0

dist/packageVersion.d.ts

@@ -8,3 +8,3 @@ /*!
 export declare const pkgName = "@fluidframework/garbage-collector";
-export declare const pkgVersion = "2.0.0-internal.2.3.1";
+export declare const pkgVersion = "2.0.0-internal.2.4.0";
 //# sourceMappingURL=packageVersion.d.ts.map

dist/packageVersion.js

@@ -11,3 +11,3 @@ "use strict";
 exports.pkgName = "@fluidframework/garbage-collector";
-exports.pkgVersion = "2.0.0-internal.2.3.1";
+exports.pkgVersion = "2.0.0-internal.2.4.0";
 //# sourceMappingURL=packageVersion.js.map

dist/utils.d.ts

@@ -84,6 +84,6 @@ /*!
 /**
- * Gets the base garbage collection state from the given snapshot tree. It contains GC state and tombstone state.
- * The GC state may be written into multiple blobs. Merge the GC state from all such blobs into one.
+ * Gets the base garbage collection state from the given snapshot tree. It contains GC state, deleted nodes and
+ * tombstones. The GC state may be written into multiple blobs. Merge the GC state from all such blobs into one.
  */
 export declare function getGCDataFromSnapshot(gcSnapshotTree: ISnapshotTree, readAndParseBlob: <T>(id: string) => Promise<T>): Promise<IGarbageCollectionSnapshotData>;
 //# sourceMappingURL=utils.d.ts.map

dist/utils.js

@@ -249,4 +249,4 @@ "use strict";
 /**
- * Gets the base garbage collection state from the given snapshot tree. It contains GC state and tombstone state.
- * The GC state may be written into multiple blobs. Merge the GC state from all such blobs into one.
+ * Gets the base garbage collection state from the given snapshot tree. It contains GC state, deleted nodes and
+ * tombstones. The GC state may be written into multiple blobs. Merge the GC state from all such blobs into one.
  */
@@ -256,3 +256,10 @@ async function getGCDataFromSnapshot(gcSnapshotTree, readAndParseBlob) {
     let tombstones;
+    let deletedNodes;
     for (const key of Object.keys(gcSnapshotTree.blobs)) {
+        // Update deleted nodes blob.
+        if (key === runtime_definitions_1.gcDeletedBlobKey) {
+            deletedNodes = await readAndParseBlob(gcSnapshotTree.blobs[key]);
+            continue;
+        }
+        // Update tombstone blob.
         if (key === runtime_definitions_1.gcTombstoneBlobKey) {
@@ -275,5 +282,5 @@ tombstones = await readAndParseBlob(gcSnapshotTree.blobs[key]);
     }
-    return { gcState: rootGCState, tombstones };
+    return { gcState: rootGCState, tombstones, deletedNodes };
 }
 exports.getGCDataFromSnapshot = getGCDataFromSnapshot;
 //# sourceMappingURL=utils.js.map

lib/packageVersion.d.ts

@@ -8,3 +8,3 @@ /*!
 export declare const pkgName = "@fluidframework/garbage-collector";
-export declare const pkgVersion = "2.0.0-internal.2.3.1";
+export declare const pkgVersion = "2.0.0-internal.2.4.0";
 //# sourceMappingURL=packageVersion.d.ts.map

lib/packageVersion.js

@@ -8,3 +8,3 @@ /*!
 export const pkgName = "@fluidframework/garbage-collector";
-export const pkgVersion = "2.0.0-internal.2.3.1";
+export const pkgVersion = "2.0.0-internal.2.4.0";
 //# sourceMappingURL=packageVersion.js.map

lib/utils.d.ts

@@ -84,6 +84,6 @@ /*!
 /**
- * Gets the base garbage collection state from the given snapshot tree. It contains GC state and tombstone state.
- * The GC state may be written into multiple blobs. Merge the GC state from all such blobs into one.
+ * Gets the base garbage collection state from the given snapshot tree. It contains GC state, deleted nodes and
+ * tombstones. The GC state may be written into multiple blobs. Merge the GC state from all such blobs into one.
  */
 export declare function getGCDataFromSnapshot(gcSnapshotTree: ISnapshotTree, readAndParseBlob: <T>(id: string) => Promise<T>): Promise<IGarbageCollectionSnapshotData>;
 //# sourceMappingURL=utils.d.ts.map

lib/utils.js

@@ -6,3 +6,3 @@ /*!
 import { assert } from "@fluidframework/common-utils";
-import { gcBlobPrefix, gcTombstoneBlobKey, } from "@fluidframework/runtime-definitions";
+import { gcBlobPrefix, gcDeletedBlobKey, gcTombstoneBlobKey, } from "@fluidframework/runtime-definitions";
 /**
@@ -237,4 +237,4 @@ * Trims the leading and trailing slashes from the given string.
 /**
- * Gets the base garbage collection state from the given snapshot tree. It contains GC state and tombstone state.
- * The GC state may be written into multiple blobs. Merge the GC state from all such blobs into one.
+ * Gets the base garbage collection state from the given snapshot tree. It contains GC state, deleted nodes and
+ * tombstones. The GC state may be written into multiple blobs. Merge the GC state from all such blobs into one.
  */
@@ -244,3 +244,10 @@ export async function getGCDataFromSnapshot(gcSnapshotTree, readAndParseBlob) {
     let tombstones;
+    let deletedNodes;
     for (const key of Object.keys(gcSnapshotTree.blobs)) {
+        // Update deleted nodes blob.
+        if (key === gcDeletedBlobKey) {
+            deletedNodes = await readAndParseBlob(gcSnapshotTree.blobs[key]);
+            continue;
+        }
+        // Update tombstone blob.
         if (key === gcTombstoneBlobKey) {
@@ -263,4 +270,4 @@ tombstones = await readAndParseBlob(gcSnapshotTree.blobs[key]);
     }
-    return { gcState: rootGCState, tombstones };
+    return { gcState: rootGCState, tombstones, deletedNodes };
 }
 //# sourceMappingURL=utils.js.map

package.json

 {
   "name": "@fluidframework/garbage-collector",
-  "version": "2.0.0-internal.2.3.1",
+  "version": "2.0.0-internal.2.4.0",
   "description": "Garbage Collector implementation for Fluid",
@@ -74,11 +74,11 @@ "homepage": "https://fluidframework.com",
     "@fluidframework/protocol-definitions": "^1.1.0",
-    "@fluidframework/runtime-definitions": ">=2.0.0-internal.2.3.1 <2.0.0-internal.3.0.0"
+    "@fluidframework/runtime-definitions": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0"
   },
   "devDependencies": {
-    "@fluid-tools/build-cli": "^0.7.0",
+    "@fluid-tools/build-cli": "^0.8.0",
     "@fluidframework/build-common": "^1.1.0",
-    "@fluidframework/build-tools": "^0.7.0",
+    "@fluidframework/build-tools": "^0.8.0",
     "@fluidframework/eslint-config-fluid": "^2.0.0",
-    "@fluidframework/garbage-collector-previous": "npm:@fluidframework/garbage-collector@2.0.0-internal.2.3.0",
-    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.2.3.1 <2.0.0-internal.3.0.0",
+    "@fluidframework/garbage-collector-previous": "npm:@fluidframework/garbage-collector@2.0.0-internal.2.2.0",
+    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0",
     "@microsoft/api-extractor": "^7.22.2",
@@ -88,2 +88,3 @@ "@rushstack/eslint-config": "^2.5.1",
     "@types/mocha": "^9.1.1",
+    "@types/node": "^14.18.36",
     "concurrently": "^6.2.0",
@@ -100,6 +101,7 @@ "copyfiles": "^2.4.1",
   "typeValidation": {
-    "version": "2.0.0-internal.2.3.1",
-    "baselineRange": "2.0.0-internal.2.3.0",
+    "version": "2.0.0-internal.2.3.0",
+    "baselineRange": ">=2.0.0-internal.2.2.0 <2.0.0-internal.2.3.0",
+    "baselineVersion": "2.0.0-internal.2.2.0",
     "broken": {}
   }
 }

src/packageVersion.ts

@@ -9,2 +9,2 @@ /*!
 export const pkgName = "@fluidframework/garbage-collector";
-export const pkgVersion = "2.0.0-internal.2.3.1";
+export const pkgVersion = "2.0.0-internal.2.4.0";

src/utils.ts

@@ -15,2 +15,3 @@ /*!
     gcBlobPrefix,
+    gcDeletedBlobKey,
     gcTombstoneBlobKey,
@@ -274,4 +275,4 @@ } from "@fluidframework/runtime-definitions";
 /**
- * Gets the base garbage collection state from the given snapshot tree. It contains GC state and tombstone state.
- * The GC state may be written into multiple blobs. Merge the GC state from all such blobs into one.
+ * Gets the base garbage collection state from the given snapshot tree. It contains GC state, deleted nodes and
+ * tombstones. The GC state may be written into multiple blobs. Merge the GC state from all such blobs into one.
  */
@@ -284,3 +285,11 @@ export async function getGCDataFromSnapshot(
     let tombstones: string[] | undefined;
+    let deletedNodes: string[] | undefined;
     for (const key of Object.keys(gcSnapshotTree.blobs)) {
+        // Update deleted nodes blob.
+        if (key === gcDeletedBlobKey) {
+            deletedNodes = await readAndParseBlob<string[]>(gcSnapshotTree.blobs[key]);
+            continue;
+        }
+
+        // Update tombstone blob.
         if (key === gcTombstoneBlobKey) {
@@ -305,3 +314,3 @@ tombstones = await readAndParseBlob<string[]>(gcSnapshotTree.blobs[key]);
     }
-    return { gcState: rootGCState, tombstones };
+    return { gcState: rootGCState, tombstones, deletedNodes };
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

124859

increased by1.68%

Lines of code

1381

increased by1.62%

Worsened metrics

Dev dependency count

20

increased by5.26%

Dependency changes

• Updated@fluidframework/runtime-definitions@>=2.0.0-internal.2.4.0 <2.0.0-internal.3.0.0