npm package diff

Package: @forge/util

Versions: 1.4.10-next.0 - 1.4.10-next.0-experimental-effab31

File: package/packages/ari/bitbucket/index.js

Index: package/packages/ari/bitbucket/index.js
===================================================================
--- package/packages/ari/bitbucket/index.js
+++ package/packages/ari/bitbucket/index.js
@@ -33,9 +33,9 @@
 var ValidationError = class extends Error {
 };
 
 // src/core/rules/cloud-id.ts
-function validateCloudId(cloudId, format = new RegExp("^[a-zA-Z0-9\\-]*$")) {
+function validateCloudId(cloudId, format = new RegExp("^[a-zA-Z0-9_\\-.]{0,255}$")) {
   if (!cloudId.match(format))
     throw new ValidationError(`Invalid cloud ID, expected ID of format ${format}.`);
 }
 
@@ -55,9 +55,9 @@
     throw new ValidationError(`ARI must have a qualifier of 'ari'. Received: ${qualifier}`);
 }
 
 // src/core/rules/resource-id.ts
-function validateResourceId(id, format = new RegExp("[!a-zA-Z0-9\\-_.~@:{}=]+(/[!a-zA-Z0-9\\-_.~@:{}=]+)*" /* ANY_RESOURCE_ID */), key = "resourceId") {
+function validateResourceId(id, format = new RegExp("[!a-zA-Z0-9\\-_.~@:;{}=]+(/[!a-zA-Z0-9\\-_.~@:;{}=]+)*" /* ANY_RESOURCE_ID */), key = "resourceId") {
   let formatWithCarets = new RegExp(`^${format.source}$`);
   if (!id.match(formatWithCarets))
     throw new ValidationError(`Invalid ${key} - ${id}, expected ID of format ${formatWithCarets}.`);
 }
@@ -290,15 +290,16 @@
 var bitbucketAppAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: BitbucketAppAriResourceOwner,
   resourceType: BitbucketAppAriResourceType,
   resourceIdSlug: "{workspaceId}/{appId}",
   resourceIdSegmentFormats: {
     workspaceId: /\{[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}}/,
     // eslint-disable-line no-useless-escape
-    appId: /[!a-zA-Z0-9\-_.~@:{}=]+(\/[!a-zA-Z0-9\-_.~@:{}=]+)*/
+    appId: /[!a-zA-Z0-9\-_.~@:;{}=]+(\/[!a-zA-Z0-9\-_.~@:;{}=]+)*/
     // eslint-disable-line no-useless-escape
   }
 };
 
@@ -348,13 +349,14 @@
 var bitbucketOauthConsumerAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: BitbucketOauthConsumerAriResourceOwner,
   resourceType: BitbucketOauthConsumerAriResourceType,
   resourceIdSlug: "{clientId}",
   resourceIdSegmentFormats: {
-    clientId: /[!a-zA-Z0-9\-_.~@:{}=]+(\/[!a-zA-Z0-9\-_.~@:{}=]+)*/
+    clientId: /[!a-zA-Z0-9\-_.~@:;{}=]+(\/[!a-zA-Z0-9\-_.~@:;{}=]+)*/
     // eslint-disable-line no-useless-escape
   }
 };
 
@@ -399,8 +401,9 @@
 var bitbucketProjectAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: BitbucketProjectAriResourceOwner,
   resourceType: BitbucketProjectAriResourceType,
   resourceIdSlug: "{projectId}",
   resourceIdSegmentFormats: {
@@ -450,13 +453,14 @@
 var bitbucketPullrequestAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: BitbucketPullrequestAriResourceOwner,
   resourceType: BitbucketPullrequestAriResourceType,
   resourceIdSlug: "{pullRequestId}",
   resourceIdSegmentFormats: {
-    pullRequestId: /[!a-zA-Z0-9\-_.~@:{}=]+(\/[!a-zA-Z0-9\-_.~@:{}=]+)*/
+    pullRequestId: /[!a-zA-Z0-9\-_.~@:;{}=]+(\/[!a-zA-Z0-9\-_.~@:;{}=]+)*/
     // eslint-disable-line no-useless-escape
   }
 };
 
@@ -501,8 +505,9 @@
 var bitbucketRepositoryAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: BitbucketRepositoryAriResourceOwner,
   resourceType: BitbucketRepositoryAriResourceType,
   resourceIdSlug: "{repositoryId}",
   resourceIdSegmentFormats: {
@@ -552,8 +557,9 @@
 var bitbucketRepositoryTransferAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: BitbucketRepositoryTransferAriResourceOwner,
   resourceType: BitbucketRepositoryTransferAriResourceType,
   resourceIdSlug: "{transferId}",
   resourceIdSegmentFormats: {
@@ -603,8 +609,9 @@
 var bitbucketSiteAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: BitbucketSiteAriResourceOwner,
   resourceType: BitbucketSiteAriResourceType,
   resourceIdSlug: "bitbucket",
   resourceIdSegmentFormats: {}
@@ -643,8 +650,9 @@
 var bitbucketTeamAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: BitbucketTeamAriResourceOwner,
   resourceType: BitbucketTeamAriResourceType,
   resourceIdSlug: "{teamId}",
   resourceIdSegmentFormats: {
@@ -694,8 +702,9 @@
 var bitbucketWorkspaceAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: BitbucketWorkspaceAriResourceOwner,
   resourceType: BitbucketWorkspaceAriResourceType,
   resourceIdSlug: "{workspaceId}",
   resourceIdSegmentFormats: {