diff --git a/package-lock.json b/package-lock.json index 4fd30c1c5..050f25397 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15717,10 +15717,12 @@ "version": "11.0.5", "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.5.tgz", "integrity": "sha512-508e6IcKLrhxKdBbcA2b4KQZlLVp2+J5UwQ6F7Drckkc5N9ZJwFa4TgWtsww9UG8fGHbm6gbV19TdM5pQ4GaIA==", + "dev": true, "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" ], + "license": "MIT", "bin": { "uuid": "dist/esm/bin/uuid" } @@ -16640,11 +16642,11 @@ "@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" }, "devDependencies": { - "@types/uuid": "^10.0.0" + "@types/uuid": "^10.0.0", + "uuid": "^11.0.5" } }, "packages/authentication/azure": { @@ -16729,6 +16731,10 @@ "dependencies": { "@microsoft/kiota-abstractions": "^1.0.0-preview.82", "tslib": "^2.6.2" + }, + "devDependencies": { + "@types/uuid": "^10.0.0", + "uuid": "^11.0.5" } }, "packages/test": { diff --git a/packages/abstractions/package.json b/packages/abstractions/package.json index ec26219a4..6e69e9f54 100644 --- a/packages/abstractions/package.json +++ b/packages/abstractions/package.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" - ] -} \ No newline at end of file + ], + "devDependencies": { + "@types/uuid": "^10.0.0", + "uuid": "^11.0.5" + } +} diff --git a/packages/abstractions/src/store/inMemoryBackingStore.ts b/packages/abstractions/src/store/inMemoryBackingStore.ts index 8d7f684b5..bb606b80e 100644 --- a/packages/abstractions/src/store/inMemoryBackingStore.ts +++ b/packages/abstractions/src/store/inMemoryBackingStore.ts @@ -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; } diff --git a/packages/abstractions/src/utils/guidUtils.ts b/packages/abstractions/src/utils/guidUtils.ts index 26bf1b5eb..a4b47dc3a 100644 --- a/packages/abstractions/src/utils/guidUtils.ts +++ b/packages/abstractions/src/utils/guidUtils.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. diff --git a/packages/serialization/text/package.json b/packages/serialization/text/package.json index 1cfb6dd2b..064fb7912 100644 --- a/packages/serialization/text/package.json +++ b/packages/serialization/text/package.json @@ -47,5 +47,9 @@ }, "browserslist": [ "defaults" - ] + ], + "devDependencies": { + "@types/uuid": "^10.0.0", + "uuid": "^11.0.5" + } }