@fluidframework/container-runtime 0.59.4000-71128 → 0.59.4001

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/container-runtime",
-  "version": "0.59.4000-71128",
+  "version": "0.59.4001",
   "description": "Fluid container runtime",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -63,30 +63,29 @@
   "dependencies": {
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^0.32.1",
-    "@fluidframework/container-definitions": "^0.48.2000-0",
-    "@fluidframework/container-runtime-definitions": "0.59.4000-71128",
-    "@fluidframework/container-utils": "0.59.4000-71128",
+    "@fluidframework/container-definitions": "^0.48.2000",
+    "@fluidframework/container-runtime-definitions": "^0.59.4001",
+    "@fluidframework/container-utils": "^0.59.4001",
     "@fluidframework/core-interfaces": "^0.43.1000",
-    "@fluidframework/datastore": "0.59.4000-71128",
-    "@fluidframework/driver-definitions": "^0.46.2000-0",
-    "@fluidframework/driver-utils": "0.59.4000-71128",
-    "@fluidframework/garbage-collector": "0.59.4000-71128",
-    "@fluidframework/protocol-base": "^0.1036.4000-0",
-    "@fluidframework/protocol-definitions": "^0.1028.2000-0",
-    "@fluidframework/runtime-definitions": "0.59.4000-71128",
-    "@fluidframework/runtime-utils": "0.59.4000-71128",
-    "@fluidframework/telemetry-utils": "0.59.4000-71128",
+    "@fluidframework/datastore": "^0.59.4001",
+    "@fluidframework/driver-definitions": "^0.46.2000",
+    "@fluidframework/driver-utils": "^0.59.4001",
+    "@fluidframework/garbage-collector": "^0.59.4001",
+    "@fluidframework/protocol-base": "^0.1036.4000",
+    "@fluidframework/protocol-definitions": "^0.1028.2000",
+    "@fluidframework/runtime-definitions": "^0.59.4001",
+    "@fluidframework/runtime-utils": "^0.59.4001",
+    "@fluidframework/telemetry-utils": "^0.59.4001",
     "double-ended-queue": "^2.1.0-0",
-    "semver": "^7.3.4",
     "uuid": "^8.3.1"
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.23.0",
     "@fluidframework/build-tools": "^0.2.70857",
-    "@fluidframework/container-runtime-previous": "npm:@fluidframework/container-runtime@0.59.3000",
+    "@fluidframework/container-runtime-previous": "npm:@fluidframework/container-runtime@0.59.4000",
     "@fluidframework/eslint-config-fluid": "^0.28.2000",
-    "@fluidframework/mocha-test-setup": "0.59.4000-71128",
-    "@fluidframework/test-runtime-utils": "0.59.4000-71128",
+    "@fluidframework/mocha-test-setup": "^0.59.4001",
+    "@fluidframework/test-runtime-utils": "^0.59.4001",
     "@microsoft/api-extractor": "^7.22.2",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/double-ended-queue": "^2.1.0",
@@ -119,7 +118,7 @@
     "typescript-formatter": "7.1.0"
   },
   "typeValidation": {
-    "version": "0.59.4000",
+    "version": "0.59.4001",
     "broken": {}
   }
 }

package/src/garbageCollection.ts

@@ -39,7 +39,6 @@ import {
     TelemetryDataTag,
 } from "@fluidframework/telemetry-utils";
 
-import * as semver from "semver";
 import { IGCRuntimeOptions, RuntimeHeaders } from "./containerRuntime";
 import { getSummaryForDatastores } from "./dataStores";
 import { pkgVersion } from "./packageVersion";
@@ -1324,5 +1323,56 @@ function setLongTimeout(
  * @param minimumVersion - the function to execute when the timer ends
  */
 function meetsMinimumVersionRequirement(currentVersion: string, minimumVersion: string | undefined) {
-    return minimumVersion === undefined || semver.compare(currentVersion, minimumVersion) >= 0;
+    return minimumVersion === undefined || semverCompare(currentVersion, minimumVersion) >= 0;
+}
+
+/**
+ * Compare semver versions.
+ * @param currentVersion - assumed to be any valid semver version
+ * @param minimumVersion - must be [major].[minor].[patch], where major, minor, and patch are all numbers
+ *  as it complicates the algorithm if we allow comparisons against minimum pre-release versions.
+ * @returns
+ *  0 if the currentVersion equals the minimumVersion
+ *  1 if the currentVersion is greater than the minimumVersion
+ *  -1 if the minimumVersion is greater than the currentVersion
+ */
+export function semverCompare(currentVersion: string, minimumVersion: string): number {
+    const minimumValues = minimumVersion.split(".").map((value): number => {
+        assert(isNaN(+value) === false, 0x2fa /* Expected real numbers in minimum version! */);
+        return Number.parseInt(value, 10);
+    });
+    assert(minimumValues.length === 3, 0x2fb /* Expected minimumVersion to be [major].[minor].[patch] */);
+    const [minMajor, minMinor, minPatch] = minimumValues;
+
+    const currentValuesString = currentVersion.split(/\W/);
+    assert(currentValuesString.length >= 3, 0x2fc /* Expected version to match semver rules! */);
+    const currentValues = currentValuesString.slice(0, 3).map((value) => {
+        assert(isNaN(+value) === false, 0x2fd /* Expected real numbers in minimum version! */);
+        return Number.parseInt(value, 10);
+    });
+    const [cMajor, cMinor, cPatch] = currentValues;
+
+    if (cMajor > minMajor) {
+        return 1;
+    } else if (minMajor > cMajor) {
+        return -1;
+    }
+
+    if (cMinor > minMinor) {
+        return 1;
+    } else if (minMinor > cMinor) {
+        return -1;
+    }
+
+    if (cPatch > minPatch) {
+        return 1;
+    } else if (minPatch > cPatch) {
+        return -1;
+    }
+
+    if (currentValuesString.length === 3) {
+        return 0;
+    }
+
+    return -1;
 }

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-runtime";
-export const pkgVersion = "0.59.4000-71128";
+export const pkgVersion = "0.59.4001";