Merge pull request #1596 from microsoft/fix/cleanup-uuid

fix/cleanup uuid

Author: baywet

package-lock.json

@@ -30,20 +30,20 @@
 		"url": "https://github.com/microsoft/kiota-typescript/issues"
 	},
 	"homepage": "https://github.com/microsoft/kiota#readme",
-	"devDependencies": {
-		"@types/uuid": "^10.0.0"
-	},
 	"dependencies": {
 		"@opentelemetry/api": "^1.7.0",
 		"@std-uritemplate/std-uritemplate": "^2.0.0",
 		"tinyduration": "^3.3.0",
-		"tslib": "^2.6.2",
-		"uuid": "^11.0.2"
+		"tslib": "^2.6.2"
 	},
 	"publishConfig": {
 		"access": "public"
 	},
 	"browserslist": [
 		"defaults"
-	]
-}
+	],
+	"devDependencies": {
+		"@types/uuid": "^10.0.0",
+		"uuid": "^11.0.5"
+	}
+}

packages/abstractions/package.json

@@ -4,9 +4,8 @@
  * See License in the project root for license information.
  * -------------------------------------------------------------------------------------------
  */
-import { v4 as uuidv4 } from "uuid";
-
 import type { BackingStore } from "./backingStore";
+import { createGuid } from "../utils";
 
 interface storeEntryWrapper {
 	changed: boolean;
@@ -65,7 +64,7 @@ export class InMemoryBackingStore implements BackingStore {
 		if (!callback) {
 			throw new Error("callback cannot be undefined");
 		}
-		subscriptionId = subscriptionId ?? uuidv4();
+		subscriptionId = subscriptionId ?? createGuid();
 		this.subscriptions.set(subscriptionId, callback);
 		return subscriptionId;
 	}

packages/abstractions/src/store/inMemoryBackingStore.ts

@@ -6,7 +6,7 @@
  */
 export type Guid = string;
 
-const guidValidator = new RegExp("^[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}$", "i");
+const guidValidator = /^[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}$/i;
 
 /**
  * Checks if the string is a valid GUID.

packages/abstractions/src/utils/guidUtils.ts

@@ -47,5 +47,9 @@
 	},
 	"browserslist": [
 		"defaults"
-	]
+	],
+	"devDependencies": {
+		"@types/uuid": "^10.0.0",
+		"uuid": "^11.0.5"
+	}
 }