@paklo/core 0.12.1 → 0.14.0

package/dist/azure/index.d.mts

@@ -1,19 +1,15 @@
-import { Jt as DependabotPersistedPr, W as DependabotUpdatePullRequest, Wn as VariableFinderFn, f as DependabotCreatePullRequest, yn as DependabotConfig } from "../index-rsiHDQ5U.mjs";
-import "../index-BfwWezjJ.mjs";
+import { Ft as DependabotExistingPr, G as DependabotUpdatePullRequest, Nt as DependabotExistingGroupPr, Sn as DependabotConfig, Zt as DependabotPersistedPr, p as DependabotCreatePullRequest, qn as VariableFinderFn } from "../utils-CFTIkIwf.mjs";
+import "../ghsa-CqXOLQSp.mjs";
+import "../dependabot/index.mjs";
 import { z } from "zod";
 import { KyInstance } from "ky";
 
 //#region src/azure/url-parts.d.ts
 type AzureDevOpsOrganizationUrl = {
-  /** URL of the organization. This may lack the project name */
-  value: URL;
-  /** Organization URL hostname */
-  hostname: string;
-  /** Organization API endpoint URL */
-  'api-endpoint': string;
-  /** Organization name/slug */
-  organization: string;
-  /** Virtual directory if present (on-premises only) */
+  /** URL of the organization. This may lack the project name */value: URL; /** Organization URL hostname */
+  hostname: string; /** Organization API endpoint URL */
+  'api-endpoint': string; /** Organization name/slug */
+  organization: string; /** Virtual directory if present (on-premises only) */
   'virtual-directory'?: string;
   /**
    * Organization Identity API URL (different from the API endpoint).
@@ -21,39 +17,31 @@ type AzureDevOpsOrganizationUrl = {
    */
   'identity-api-url': URL;
 };
-type AzureDevOpsProjectUrl = AzureDevOpsOrganizationUrl & {
+type AzureDevOpsRepositoryUrl = AzureDevOpsOrganizationUrl & {
   /**
    * Project ID or Name.
    * This value is not URL-encoded, clients must encode it when constructing URLs.
    */
   project: string;
-};
-type AzureDevOpsRepositoryUrl = AzureDevOpsProjectUrl & {
   /**
    * Repository ID or Name.
    * This value is not URL-encoded, clients must encode it when constructing URLs.
    */
-  repository: string;
-  /** Slug of the repository e.g. `contoso/prj1/_git/repo1`, `tfs/contoso/prj1/_git/repo1` */
+  repository: string; /** Slug of the repository e.g. `contoso/prj1/_git/repo1`, `tfs/contoso/prj1/_git/repo1` */
   'repository-slug': string;
 };
+/**
+ * Extract organization details from any Azure DevOps URL.
+ * Accepts organization, project, or repository URLs.
+ */
 declare function extractOrganizationUrl({
   organizationUrl
 }: {
   organizationUrl: string;
 }): AzureDevOpsOrganizationUrl;
-declare function extractProjectUrl({
-  organizationUrl,
-  project
-}: {
-  organizationUrl: string;
-  project: string;
-}): AzureDevOpsProjectUrl;
-declare function extractRepositoryUrl({
-  organizationUrl,
-  project,
-  repository
-}: {
+declare function extractRepositoryUrl(options: {
+  repositoryUrl: string;
+} | {
   organizationUrl: string;
   project: string;
   repository: string;
@@ -71,21 +59,21 @@ declare class BaseAzureDevOpsClient {
 //#endregion
 //#region src/azure/client/types.d.ts
 declare const AzdoVersionControlChangeTypeSchema: z.ZodEnum<{
-  all: "all";
-  branch: "branch";
-  delete: "delete";
   none: "none";
   add: "add";
   edit: "edit";
   encoding: "encoding";
   rename: "rename";
+  delete: "delete";
   undelete: "undelete";
+  branch: "branch";
   merge: "merge";
   lock: "lock";
   rollback: "rollback";
   sourceRename: "sourceRename";
   targetRename: "targetRename";
   property: "property";
+  all: "all";
 }>;
 type AzdoVersionControlChangeType = z.infer<typeof AzdoVersionControlChangeTypeSchema>;
 declare const AZDO_PULL_REQUEST_MERGE_STRATEGIES: readonly ["noFastForward", "squash", "rebase", "rebaseMerge"];
@@ -248,21 +236,21 @@ declare const AzdoGitRefUpdateResultSchema: z.ZodObject<{
 type AzdoGitRefUpdateResult = z.infer<typeof AzdoGitRefUpdateResultSchema>;
 declare const AzdoGitChangeSchema: z.ZodObject<{
   changeType: z.ZodEnum<{
-    all: "all";
-    branch: "branch";
-    delete: "delete";
     none: "none";
     add: "add";
     edit: "edit";
     encoding: "encoding";
     rename: "rename";
+    delete: "delete";
     undelete: "undelete";
+    branch: "branch";
     merge: "merge";
     lock: "lock";
     rollback: "rollback";
     sourceRename: "sourceRename";
     targetRename: "targetRename";
     property: "property";
+    all: "all";
   }>;
   item: z.ZodOptional<z.ZodObject<{
     path: z.ZodString;
@@ -291,21 +279,21 @@ declare const AzdoGitCommitRefSchema: z.ZodObject<{
   }, z.core.$strip>>;
   changes: z.ZodOptional<z.ZodArray<z.ZodObject<{
     changeType: z.ZodEnum<{
-      all: "all";
-      branch: "branch";
-      delete: "delete";
       none: "none";
       add: "add";
       edit: "edit";
       encoding: "encoding";
       rename: "rename";
+      delete: "delete";
       undelete: "undelete";
+      branch: "branch";
       merge: "merge";
       lock: "lock";
       rollback: "rollback";
       sourceRename: "sourceRename";
       targetRename: "targetRename";
       property: "property";
+      all: "all";
     }>;
     item: z.ZodOptional<z.ZodObject<{
       path: z.ZodString;
@@ -336,21 +324,21 @@ declare const AzdoGitPushSchema: z.ZodObject<{
     }, z.core.$strip>>;
     changes: z.ZodOptional<z.ZodArray<z.ZodObject<{
       changeType: z.ZodEnum<{
-        all: "all";
-        branch: "branch";
-        delete: "delete";
         none: "none";
         add: "add";
         edit: "edit";
         encoding: "encoding";
         rename: "rename";
+        delete: "delete";
         undelete: "undelete";
+        branch: "branch";
         merge: "merge";
         lock: "lock";
         rollback: "rollback";
         sourceRename: "sourceRename";
         targetRename: "targetRename";
         property: "property";
+        all: "all";
       }>;
       item: z.ZodOptional<z.ZodObject<{
         path: z.ZodString;
@@ -395,21 +383,21 @@ declare const AzdoGitPushCreateSchema: z.ZodObject<{
     }, z.core.$strip>>;
     changes: z.ZodArray<z.ZodObject<{
       changeType: z.ZodEnum<{
-        all: "all";
-        branch: "branch";
-        delete: "delete";
         none: "none";
         add: "add";
         edit: "edit";
         encoding: "encoding";
         rename: "rename";
+        delete: "delete";
         undelete: "undelete";
+        branch: "branch";
         merge: "merge";
         lock: "lock";
         rollback: "rollback";
         sourceRename: "sourceRename";
         targetRename: "targetRename";
         property: "property";
+        all: "all";
       }>;
       item: z.ZodOptional<z.ZodObject<{
         path: z.ZodString;
@@ -436,21 +424,21 @@ declare const AzdoGitCommitDiffsSchema: z.ZodObject<{
   baseCommit: z.ZodString;
   changes: z.ZodArray<z.ZodObject<{
     changeType: z.ZodEnum<{
-      all: "all";
-      branch: "branch";
-      delete: "delete";
       none: "none";
       add: "add";
       edit: "edit";
       encoding: "encoding";
       rename: "rename";
+      delete: "delete";
       undelete: "undelete";
+      branch: "branch";
       merge: "merge";
       lock: "lock";
       rollback: "rollback";
       sourceRename: "sourceRename";
       targetRename: "targetRename";
       property: "property";
+      all: "all";
     }>;
     item: z.ZodOptional<z.ZodObject<{
       path: z.ZodString;
@@ -482,21 +470,21 @@ declare const AzdoRepositoryItemSchema: z.ZodObject<{
     }, z.core.$strip>>;
     changes: z.ZodOptional<z.ZodArray<z.ZodObject<{
       changeType: z.ZodEnum<{
-        all: "all";
-        branch: "branch";
-        delete: "delete";
         none: "none";
         add: "add";
         edit: "edit";
         encoding: "encoding";
         rename: "rename";
+        delete: "delete";
         undelete: "undelete";
+        branch: "branch";
         merge: "merge";
         lock: "lock";
         rollback: "rollback";
         sourceRename: "sourceRename";
         targetRename: "targetRename";
         property: "property";
+        all: "all";
       }>;
       item: z.ZodOptional<z.ZodObject<{
         path: z.ZodString;
@@ -551,21 +539,21 @@ declare const AzdoPullRequestSchema: z.ZodObject<{
     }, z.core.$strip>>;
     changes: z.ZodOptional<z.ZodArray<z.ZodObject<{
       changeType: z.ZodEnum<{
-        all: "all";
-        branch: "branch";
-        delete: "delete";
         none: "none";
         add: "add";
         edit: "edit";
         encoding: "encoding";
         rename: "rename";
+        delete: "delete";
         undelete: "undelete";
+        branch: "branch";
         merge: "merge";
         lock: "lock";
         rollback: "rollback";
         sourceRename: "sourceRename";
         targetRename: "targetRename";
         property: "property";
+        all: "all";
       }>;
       item: z.ZodOptional<z.ZodObject<{
         path: z.ZodString;
@@ -594,21 +582,21 @@ declare const AzdoPullRequestSchema: z.ZodObject<{
     }, z.core.$strip>>;
     changes: z.ZodOptional<z.ZodArray<z.ZodObject<{
       changeType: z.ZodEnum<{
-        all: "all";
-        branch: "branch";
-        delete: "delete";
         none: "none";
         add: "add";
         edit: "edit";
         encoding: "encoding";
         rename: "rename";
+        delete: "delete";
         undelete: "undelete";
+        branch: "branch";
         merge: "merge";
         lock: "lock";
         rollback: "rollback";
         sourceRename: "sourceRename";
         targetRename: "targetRename";
         property: "property";
+        all: "all";
       }>;
       item: z.ZodOptional<z.ZodObject<{
         path: z.ZodString;
@@ -959,10 +947,11 @@ declare function buildPullRequestProperties(packageManager: string, dependencies
   name: string;
   value: string;
 }[];
-declare function parsePullRequestProperties(pullRequests: AzdoPrExtractedWithProperties[], packageManager: string | null): Record<string, DependabotPersistedPr>;
-declare function getPullRequestForDependencyNames(existingPullRequests: AzdoPrExtractedWithProperties[], packageManager: string, dependencyNames: string[]): AzdoPrExtractedWithProperties | undefined;
+declare function parsePullRequestProps(pr: AzdoPrExtractedWithProperties): DependabotExistingPr | DependabotExistingGroupPr;
+declare function parsePullRequestProperties(pullRequests: AzdoPrExtractedWithProperties[], packageManager: string): (DependabotExistingPr | DependabotExistingGroupPr)[];
+declare function getPullRequestForDependencyNames(existingPullRequests: AzdoPrExtractedWithProperties[], packageManager: string, dependencyNames: string[], dependencyGroupName?: string | null): AzdoPrExtractedWithProperties | undefined;
 declare function getPullRequestChangedFiles(data: DependabotCreatePullRequest | DependabotUpdatePullRequest): {
-  changeType: "delete" | "add" | "edit";
+  changeType: "add" | "edit" | "delete";
   path: string;
   content: string | undefined;
   encoding: "utf-8" | "base64";
@@ -1242,21 +1231,21 @@ declare const AzdoEventCodePushResourceSchema: z.ZodObject<{
     }, z.core.$strip>>;
     changes: z.ZodOptional<z.ZodArray<z.ZodObject<{
       changeType: z.ZodEnum<{
-        all: "all";
-        branch: "branch";
-        delete: "delete";
         none: "none";
         add: "add";
         edit: "edit";
         encoding: "encoding";
         rename: "rename";
+        delete: "delete";
         undelete: "undelete";
+        branch: "branch";
         merge: "merge";
         lock: "lock";
         rollback: "rollback";
         sourceRename: "sourceRename";
         targetRename: "targetRename";
         property: "property";
+        all: "all";
       }>;
       item: z.ZodOptional<z.ZodObject<{
         path: z.ZodString;
@@ -1477,21 +1466,21 @@ declare const AzdoEventSchema: z.ZodIntersection<z.ZodObject<{
       }, z.core.$strip>>;
       changes: z.ZodOptional<z.ZodArray<z.ZodObject<{
         changeType: z.ZodEnum<{
-          all: "all";
-          branch: "branch";
-          delete: "delete";
           none: "none";
           add: "add";
           edit: "edit";
           encoding: "encoding";
           rename: "rename";
+          delete: "delete";
           undelete: "undelete";
+          branch: "branch";
           merge: "merge";
           lock: "lock";
           rollback: "rollback";
           sourceRename: "sourceRename";
           targetRename: "targetRename";
           property: "property";
+          all: "all";
         }>;
         item: z.ZodOptional<z.ZodObject<{
           path: z.ZodString;
@@ -1723,5 +1712,5 @@ declare const AzdoEventSchema: z.ZodIntersection<z.ZodObject<{
 }, z.core.$strip>], "eventType">>;
 type AzdoEvent = z.infer<typeof AzdoEventSchema>;
 //#endregion
-export { ANONYMOUS_USER_ID, API_VERSION, API_VERSION_PREVIEW, AZDO_PULL_REQUEST_MERGE_STRATEGIES, AzdoCommentThreadStatus, AzdoCommentThreadStatusSchema, AzdoCommentType, AzdoCommentTypeSchema, AzdoConnectionData, AzdoConnectionDataSchema, AzdoEvent, AzdoEventCodePushResource, AzdoEventCodePushResourceSchema, AzdoEventPullRequestCommentEventResource, AzdoEventPullRequestCommentEventResourceSchema, AzdoEventPullRequestResource, AzdoEventPullRequestResourceSchema, AzdoEventRepositoryCreatedResource, AzdoEventRepositoryCreatedResourceSchema, AzdoEventRepositoryDeletedResource, AzdoEventRepositoryDeletedResourceSchema, AzdoEventRepositoryRenamedResource, AzdoEventRepositoryRenamedResourceSchema, AzdoEventRepositorySchema, AzdoEventRepositoryStatusChangedResource, AzdoEventRepositoryStatusChangedResourceSchema, AzdoEventSchema, AzdoEventType, AzdoEventTypeSchema, AzdoFileChange, AzdoGitBranchStats, AzdoGitBranchStatsSchema, AzdoGitChange, AzdoGitChangeSchema, AzdoGitCommitDiffs, AzdoGitCommitDiffsSchema, AzdoGitCommitRef, AzdoGitCommitRefSchema, AzdoGitPush, AzdoGitPushCreate, AzdoGitPushCreateSchema, AzdoGitPushSchema, AzdoGitRef, AzdoGitRefSchema, AzdoGitRefUpdate, AzdoGitRefUpdateResult, AzdoGitRefUpdateResultSchema, AzdoGitRefUpdateSchema, AzdoGitUserDate, AzdoGitUserDateSchema, AzdoIdentity, AzdoIdentityRef, AzdoIdentityRefSchema, AzdoIdentityRefWithVote, AzdoIdentityRefWithVoteSchema, AzdoIdentitySchema, AzdoPrExtractedWithProperties, AzdoProject, AzdoProjectSchema, AzdoProperties, AzdoPropertiesSchema, AzdoPullRequest, AzdoPullRequestAsyncStatus, AzdoPullRequestAsyncStatusSchema, AzdoPullRequestComment, AzdoPullRequestCommentSchema, AzdoPullRequestCommentThread, AzdoPullRequestCommentThreadSchema, AzdoPullRequestMergeStrategy, AzdoPullRequestMergeStrategySchema, AzdoPullRequestSchema, AzdoPullRequestStatus, AzdoPullRequestStatusSchema, AzdoRepository, AzdoRepositoryItem, AzdoRepositoryItemSchema, AzdoRepositorySchema, AzdoResponse, AzdoSubscription, AzdoSubscriptionSchema, AzdoSubscriptionsQuery, AzdoSubscriptionsQueryInputFilter, AzdoSubscriptionsQueryInputFilterSchema, AzdoSubscriptionsQueryResponse, AzdoSubscriptionsQueryResponseSchema, AzdoSubscriptionsQuerySchema, AzdoVersionControlChangeType, AzdoVersionControlChangeTypeSchema, AzureDevOpsClient, AzureDevOpsClientWrapper, type AzureDevOpsOrganizationUrl, type AzureDevOpsProjectUrl, type AzureDevOpsRepositoryUrl, PR_DESCRIPTION_MAX_LENGTH, PR_PROPERTY_DEPENDABOT_DEPENDENCIES, PR_PROPERTY_DEPENDABOT_PACKAGE_MANAGER, PR_PROPERTY_MICROSOFT_GIT_SOURCE_REF_NAME, buildPullRequestProperties, extractOrganizationUrl, extractProjectUrl, extractRepositoryUrl, getDependabotConfig, getPullRequestChangedFiles, getPullRequestForDependencyNames, parsePullRequestProperties };
+export { ANONYMOUS_USER_ID, API_VERSION, API_VERSION_PREVIEW, AZDO_PULL_REQUEST_MERGE_STRATEGIES, AzdoCommentThreadStatus, AzdoCommentThreadStatusSchema, AzdoCommentType, AzdoCommentTypeSchema, AzdoConnectionData, AzdoConnectionDataSchema, AzdoEvent, AzdoEventCodePushResource, AzdoEventCodePushResourceSchema, AzdoEventPullRequestCommentEventResource, AzdoEventPullRequestCommentEventResourceSchema, AzdoEventPullRequestResource, AzdoEventPullRequestResourceSchema, AzdoEventRepositoryCreatedResource, AzdoEventRepositoryCreatedResourceSchema, AzdoEventRepositoryDeletedResource, AzdoEventRepositoryDeletedResourceSchema, AzdoEventRepositoryRenamedResource, AzdoEventRepositoryRenamedResourceSchema, AzdoEventRepositorySchema, AzdoEventRepositoryStatusChangedResource, AzdoEventRepositoryStatusChangedResourceSchema, AzdoEventSchema, AzdoEventType, AzdoEventTypeSchema, AzdoFileChange, AzdoGitBranchStats, AzdoGitBranchStatsSchema, AzdoGitChange, AzdoGitChangeSchema, AzdoGitCommitDiffs, AzdoGitCommitDiffsSchema, AzdoGitCommitRef, AzdoGitCommitRefSchema, AzdoGitPush, AzdoGitPushCreate, AzdoGitPushCreateSchema, AzdoGitPushSchema, AzdoGitRef, AzdoGitRefSchema, AzdoGitRefUpdate, AzdoGitRefUpdateResult, AzdoGitRefUpdateResultSchema, AzdoGitRefUpdateSchema, AzdoGitUserDate, AzdoGitUserDateSchema, AzdoIdentity, AzdoIdentityRef, AzdoIdentityRefSchema, AzdoIdentityRefWithVote, AzdoIdentityRefWithVoteSchema, AzdoIdentitySchema, AzdoPrExtractedWithProperties, AzdoProject, AzdoProjectSchema, AzdoProperties, AzdoPropertiesSchema, AzdoPullRequest, AzdoPullRequestAsyncStatus, AzdoPullRequestAsyncStatusSchema, AzdoPullRequestComment, AzdoPullRequestCommentSchema, AzdoPullRequestCommentThread, AzdoPullRequestCommentThreadSchema, AzdoPullRequestMergeStrategy, AzdoPullRequestMergeStrategySchema, AzdoPullRequestSchema, AzdoPullRequestStatus, AzdoPullRequestStatusSchema, AzdoRepository, AzdoRepositoryItem, AzdoRepositoryItemSchema, AzdoRepositorySchema, AzdoResponse, AzdoSubscription, AzdoSubscriptionSchema, AzdoSubscriptionsQuery, AzdoSubscriptionsQueryInputFilter, AzdoSubscriptionsQueryInputFilterSchema, AzdoSubscriptionsQueryResponse, AzdoSubscriptionsQueryResponseSchema, AzdoSubscriptionsQuerySchema, AzdoVersionControlChangeType, AzdoVersionControlChangeTypeSchema, AzureDevOpsClient, AzureDevOpsClientWrapper, type AzureDevOpsOrganizationUrl, type AzureDevOpsRepositoryUrl, PR_DESCRIPTION_MAX_LENGTH, PR_PROPERTY_DEPENDABOT_DEPENDENCIES, PR_PROPERTY_DEPENDABOT_PACKAGE_MANAGER, PR_PROPERTY_MICROSOFT_GIT_SOURCE_REF_NAME, buildPullRequestProperties, extractOrganizationUrl, extractRepositoryUrl, getDependabotConfig, getPullRequestChangedFiles, getPullRequestForDependencyNames, parsePullRequestProperties, parsePullRequestProps };
 //# sourceMappingURL=index.d.mts.map

package/dist/azure/index.mjs

@@ -1,6 +1,6 @@
-import { n as logger } from "../logger-3Qfh9NUj.mjs";
-import { B as parseDependabotConfig, E as CONFIG_FILE_PATHS_AZURE, _ as DependabotPersistedPrSchema } from "../job-ClEevC5P.mjs";
-import { n as getDependencyNames, o as normalizeBranchName, s as normalizeFilePath, t as areEqual } from "../dependabot-DAdoJJp4.mjs";
+import { logger } from "../logger.mjs";
+import { D as CONFIG_FILE_PATHS_AZURE, V as parseDependabotConfig, u as DependabotExistingPrDependencySchema, v as DependabotPersistedPrSchema } from "../job-Bb9WiMwE.mjs";
+import { n as getDependencyNames, o as normalizeBranchName, s as normalizeFilePath, t as areEqual } from "../utils-BVmUgc0p.mjs";
 import { z } from "zod";
 import ky, { isHTTPError } from "ky";
 import * as path from "node:path";
@@ -27,12 +27,12 @@ var BaseAzureDevOpsClient = class {
 	constructor(client) {
 		this.client = client;
 	}
-	makeUrl(path$1, params, apiVersion = API_VERSION) {
+	makeUrl(path, params, apiVersion = API_VERSION) {
 		if (typeof params === "string") {
 			apiVersion = params;
 			params = {};
 		}
-		return `${path$1}?${Object.entries({
+		return `${path}?${Object.entries({
 			"api-version": apiVersion,
 			...params
 		}).filter(([, value]) => value).map(([key, value]) => `${key}=${value}`).join("&")}`;
@@ -53,10 +53,10 @@ var ConnectionClient = class extends BaseAzureDevOpsClient {
 //#endregion
 //#region src/azure/client/client-git.ts
 var GitClient = class extends BaseAzureDevOpsClient {
-	async getItem(projectIdOrName, repositoryIdOrName, path$1, includeContent = true, latestProcessedChange = true) {
+	async getItem(projectIdOrName, repositoryIdOrName, path, includeContent = true, latestProcessedChange = true) {
 		try {
 			return await this.client.get(this.makeUrl(`${encodeURIComponent(projectIdOrName)}/_apis/git/repositories/${encodeURIComponent(repositoryIdOrName)}/items`, {
-				path: path$1,
+				path,
 				includeContent,
 				latestProcessedChange
 			})).json();
@@ -280,16 +280,16 @@ var AzureDevOpsClient = class AzureDevOpsClient {
 				Accept: "application/json"
 			},
 			hooks: {
-				beforeRequest: [async (request, options$1) => {
+				beforeRequest: [async (request, options) => {
 					if (debug) logger.debug(`🌎 🠊 [${request.method}] ${request.url}`);
 				}],
-				afterResponse: [async (request, options$1, response) => {
+				afterResponse: [async (request, options, response) => {
 					if (debug) {
 						logger.debug(`🌎 🠈 [${response.status}] ${response.statusText}`);
 						if (request.body) logger.debug(`REQUEST: ${JSON.stringify(request.body)}`);
 					}
 				}],
-				beforeRetry: [async ({ request, options: options$1, error, retryCount }) => {
+				beforeRetry: [async ({ request, options, error, retryCount }) => {
 					if (debug && isHTTPError(error)) logger.debug(`⏳ Retrying failed request with status code: ${error.response.status}`);
 				}]
 			},
@@ -563,16 +563,29 @@ function buildPullRequestProperties(packageManager, dependencies) {
 		value: JSON.stringify(dependencies)
 	}];
 }
+function parsePullRequestProps(pr) {
+	const parsed = z.union([DependabotPersistedPrSchema, DependabotExistingPrDependencySchema.array()]).parse(JSON.parse(pr.properties.find((p) => p.name === PR_PROPERTY_DEPENDABOT_DEPENDENCIES).value));
+	if (Array.isArray(parsed)) return {
+		"pr-number": pr.pullRequestId,
+		dependencies: parsed
+	};
+	else return {
+		"pr-number": pr.pullRequestId,
+		...parsed
+	};
+}
+function filterPullRequestsByPackageManager(pr, packageManager) {
+	return pr.properties?.find((p) => p.name === PR_PROPERTY_DEPENDABOT_PACKAGE_MANAGER && p.value === packageManager);
+}
 function parsePullRequestProperties(pullRequests, packageManager) {
-	return Object.fromEntries(pullRequests.filter((pr) => {
-		return pr.properties?.find((p) => p.name === PR_PROPERTY_DEPENDABOT_PACKAGE_MANAGER && (packageManager === null || p.value === packageManager));
-	}).map((pr) => {
-		return [pr.pullRequestId, DependabotPersistedPrSchema.parse(JSON.parse(pr.properties.find((p) => p.name === PR_PROPERTY_DEPENDABOT_DEPENDENCIES).value))];
-	}));
+	return pullRequests.filter((pr) => filterPullRequestsByPackageManager(pr, packageManager)).map(parsePullRequestProps);
 }
-function getPullRequestForDependencyNames(existingPullRequests, packageManager, dependencyNames) {
-	return existingPullRequests.find((pr) => {
-		return pr.properties?.find((p) => p.name === PR_PROPERTY_DEPENDABOT_PACKAGE_MANAGER && p.value === packageManager) && pr.properties?.find((p) => p.name === PR_PROPERTY_DEPENDABOT_DEPENDENCIES && areEqual(getDependencyNames(DependabotPersistedPrSchema.parse(JSON.parse(p.value))), dependencyNames));
+function getPullRequestForDependencyNames(existingPullRequests, packageManager, dependencyNames, dependencyGroupName) {
+	return existingPullRequests.filter((pr) => filterPullRequestsByPackageManager(pr, packageManager)).find((pr) => {
+		const parsedPr = parsePullRequestProps(pr);
+		const prGroupName = "dependency-group-name" in parsedPr ? parsedPr["dependency-group-name"] : null;
+		if (dependencyGroupName) return prGroupName === dependencyGroupName;
+		return !prGroupName && areEqual(getDependencyNames(parsedPr), dependencyNames);
 	});
 }
 function getPullRequestChangedFiles(data) {
@@ -1220,13 +1233,28 @@ const AzdoEventSchema = z.object({
 
 //#endregion
 //#region src/azure/url-parts.ts
+/**
+* Extract organization details from any Azure DevOps URL.
+* Accepts organization, project, or repository URLs.
+*/
 function extractOrganizationUrl({ organizationUrl }) {
 	const value = new URL(organizationUrl);
 	const protocol = value.protocol.slice(0, -1);
+	if (protocol !== "https" && protocol !== "http") throw new Error(`Invalid URL protocol: '${protocol}'. Only 'http' and 'https' are supported.`);
 	let { hostname } = value;
-	if (/^(?<prefix>\S+)\.visualstudio\.com$/iu.test(hostname)) hostname = "dev.azure.com";
-	const organization = extractOrganization(organizationUrl);
-	const virtualDirectory = extractVirtualDirectory(value);
+	const visualStudioMatch = hostname.match(/^(\S+)\.visualstudio\.com$/i);
+	if (visualStudioMatch) hostname = "dev.azure.com";
+	const allSegments = value.pathname.split("/").filter(Boolean);
+	const gitIndex = allSegments.indexOf("_git");
+	const segments = gitIndex >= 0 ? allSegments.slice(0, gitIndex) : allSegments;
+	let organization;
+	let virtualDirectory;
+	if (visualStudioMatch) organization = visualStudioMatch[1];
+	else if (segments.length >= 2 && hostname !== "dev.azure.com") {
+		virtualDirectory = segments[0];
+		organization = segments[1];
+	} else if (segments.length >= 1) organization = segments[0];
+	else throw new Error(`Error parsing organization from url: '${organizationUrl}'.`);
 	const apiEndpoint = `${protocol}://${hostname}${value.port ? `:${value.port}` : ""}/${virtualDirectory ? `${virtualDirectory}/` : ""}`;
 	const identityApiUrl = hostname === "dev.azure.com" || hostname.endsWith(".visualstudio.com") ? new URL(`https://vssps.dev.azure.com/${organization}/`) : value;
 	return {
@@ -1238,58 +1266,36 @@ function extractOrganizationUrl({ organizationUrl }) {
 		"identity-api-url": identityApiUrl
 	};
 }
-function extractProjectUrl({ organizationUrl, project }) {
-	const extracted = extractOrganizationUrl({ organizationUrl });
-	const decodedProject = decodeURIComponent(project);
-	return {
-		...extracted,
-		project: decodedProject
-	};
-}
-function extractRepositoryUrl({ organizationUrl, project, repository }) {
-	const extracted = extractProjectUrl({
-		organizationUrl,
-		project
-	});
-	const { organization, "virtual-directory": virtualDirectory, project: decodedProject } = extracted;
-	const decodedRepository = decodeURIComponent(repository);
-	const repoSlug = `${virtualDirectory ? `${virtualDirectory}/` : ""}${organization}/${encodeURI(decodedProject)}/_git/${encodeURI(decodedRepository)}`;
+function extractRepositoryUrl(options) {
+	let project;
+	let repository;
+	let extracted;
+	if ("repositoryUrl" in options) {
+		const url = new URL(options.repositoryUrl);
+		if (!url.pathname.includes("/_git/")) throw new Error(`Invalid repository URL: '${options.repositoryUrl}'. URL must contain '/_git/'.`);
+		const segments = url.pathname.split("/").filter(Boolean);
+		const gitIndex = segments.indexOf("_git");
+		if (gitIndex === -1 || gitIndex >= segments.length - 1) throw new Error(`Invalid repository URL: '${options.repositoryUrl}'. Repository name must follow '/_git/'.`);
+		project = decodeURIComponent(segments[gitIndex - 1]);
+		repository = decodeURIComponent(segments.slice(gitIndex + 1).join("/"));
+		const orgSegments = segments.slice(0, gitIndex - 1);
+		const orgPath = orgSegments.length > 0 ? `/${orgSegments.join("/")}/` : "/";
+		extracted = extractOrganizationUrl({ organizationUrl: `${url.protocol}//${url.host}${orgPath}` });
+	} else {
+		project = decodeURIComponent(options.project);
+		repository = decodeURIComponent(options.repository);
+		extracted = extractOrganizationUrl({ organizationUrl: options.organizationUrl });
+	}
+	const virtualDirectory = extracted["virtual-directory"];
+	const repoSlug = `${virtualDirectory ? `${virtualDirectory}/` : ""}${extracted.organization}/${encodeURI(project)}/_git/${encodeURI(repository)}`;
 	return {
 		...extracted,
-		repository: decodedRepository,
+		project,
+		repository,
 		"repository-slug": repoSlug
 	};
 }
-/**
-* Extract organization name from organization URL
-*
-* @param organizationUrl
-*
-* @returns organization name
-*/
-function extractOrganization(organizationUrl) {
-	const { hostname, pathname } = new URL(organizationUrl);
-	if (hostname.endsWith(".visualstudio.com")) return hostname.split(".")[0];
-	const pathSegments = pathname.split("/").filter((segment) => segment !== "");
-	if (pathSegments.length >= 2 && hostname !== "dev.azure.com") return pathSegments[1];
-	if (pathSegments.length >= 1) return pathSegments[0];
-	throw new Error(`Error parsing organization from organization url: '${organizationUrl}'.`);
-}
-/**
-* Extract virtual directory from organization URL
-*
-* Virtual Directories are sometimes used in on-premises
-* @param organizationUrl
-*
-* @returns virtual directory
-*
-* @example URLs typically are like this:`https://server.domain.com/tfs/x/` and `tfs` is the virtual directory
-*/
-function extractVirtualDirectory(organizationUrl) {
-	const path$1 = organizationUrl.pathname.split("/");
-	return path$1.length === 4 ? path$1[1] : void 0;
-}
 
 //#endregion
-export { ANONYMOUS_USER_ID, API_VERSION, API_VERSION_PREVIEW, AZDO_PULL_REQUEST_MERGE_STRATEGIES, AzdoCommentThreadStatusSchema, AzdoCommentTypeSchema, AzdoConnectionDataSchema, AzdoEventCodePushResourceSchema, AzdoEventPullRequestCommentEventResourceSchema, AzdoEventPullRequestResourceSchema, AzdoEventRepositoryCreatedResourceSchema, AzdoEventRepositoryDeletedResourceSchema, AzdoEventRepositoryRenamedResourceSchema, AzdoEventRepositorySchema, AzdoEventRepositoryStatusChangedResourceSchema, AzdoEventSchema, AzdoEventTypeSchema, AzdoGitBranchStatsSchema, AzdoGitChangeSchema, AzdoGitCommitDiffsSchema, AzdoGitCommitRefSchema, AzdoGitPushCreateSchema, AzdoGitPushSchema, AzdoGitRefSchema, AzdoGitRefUpdateResultSchema, AzdoGitRefUpdateSchema, AzdoGitUserDateSchema, AzdoIdentityRefSchema, AzdoIdentityRefWithVoteSchema, AzdoIdentitySchema, AzdoProjectSchema, AzdoPropertiesSchema, AzdoPullRequestAsyncStatusSchema, AzdoPullRequestCommentSchema, AzdoPullRequestCommentThreadSchema, AzdoPullRequestMergeStrategySchema, AzdoPullRequestSchema, AzdoPullRequestStatusSchema, AzdoRepositoryItemSchema, AzdoRepositorySchema, AzdoSubscriptionSchema, AzdoSubscriptionsQueryInputFilterSchema, AzdoSubscriptionsQueryResponseSchema, AzdoSubscriptionsQuerySchema, AzdoVersionControlChangeTypeSchema, AzureDevOpsClient, AzureDevOpsClientWrapper, PR_DESCRIPTION_MAX_LENGTH, PR_PROPERTY_DEPENDABOT_DEPENDENCIES, PR_PROPERTY_DEPENDABOT_PACKAGE_MANAGER, PR_PROPERTY_MICROSOFT_GIT_SOURCE_REF_NAME, buildPullRequestProperties, extractOrganizationUrl, extractProjectUrl, extractRepositoryUrl, getDependabotConfig, getPullRequestChangedFiles, getPullRequestForDependencyNames, parsePullRequestProperties };
+export { ANONYMOUS_USER_ID, API_VERSION, API_VERSION_PREVIEW, AZDO_PULL_REQUEST_MERGE_STRATEGIES, AzdoCommentThreadStatusSchema, AzdoCommentTypeSchema, AzdoConnectionDataSchema, AzdoEventCodePushResourceSchema, AzdoEventPullRequestCommentEventResourceSchema, AzdoEventPullRequestResourceSchema, AzdoEventRepositoryCreatedResourceSchema, AzdoEventRepositoryDeletedResourceSchema, AzdoEventRepositoryRenamedResourceSchema, AzdoEventRepositorySchema, AzdoEventRepositoryStatusChangedResourceSchema, AzdoEventSchema, AzdoEventTypeSchema, AzdoGitBranchStatsSchema, AzdoGitChangeSchema, AzdoGitCommitDiffsSchema, AzdoGitCommitRefSchema, AzdoGitPushCreateSchema, AzdoGitPushSchema, AzdoGitRefSchema, AzdoGitRefUpdateResultSchema, AzdoGitRefUpdateSchema, AzdoGitUserDateSchema, AzdoIdentityRefSchema, AzdoIdentityRefWithVoteSchema, AzdoIdentitySchema, AzdoProjectSchema, AzdoPropertiesSchema, AzdoPullRequestAsyncStatusSchema, AzdoPullRequestCommentSchema, AzdoPullRequestCommentThreadSchema, AzdoPullRequestMergeStrategySchema, AzdoPullRequestSchema, AzdoPullRequestStatusSchema, AzdoRepositoryItemSchema, AzdoRepositorySchema, AzdoSubscriptionSchema, AzdoSubscriptionsQueryInputFilterSchema, AzdoSubscriptionsQueryResponseSchema, AzdoSubscriptionsQuerySchema, AzdoVersionControlChangeTypeSchema, AzureDevOpsClient, AzureDevOpsClientWrapper, PR_DESCRIPTION_MAX_LENGTH, PR_PROPERTY_DEPENDABOT_DEPENDENCIES, PR_PROPERTY_DEPENDABOT_PACKAGE_MANAGER, PR_PROPERTY_MICROSOFT_GIT_SOURCE_REF_NAME, buildPullRequestProperties, extractOrganizationUrl, extractRepositoryUrl, getDependabotConfig, getPullRequestChangedFiles, getPullRequestForDependencyNames, parsePullRequestProperties, parsePullRequestProps };
 //# sourceMappingURL=index.mjs.map