npm package diff

Package: @forge/util

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

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

Index: package/packages/ari/cmdb/index.js
===================================================================
--- package/packages/ari/cmdb/index.js
+++ package/packages/ari/cmdb/index.js
@@ -31,9 +31,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}.`);
 }
 
@@ -53,9 +53,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}.`);
 }
@@ -288,15 +288,16 @@
 var cmdbAttributeAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CmdbAttributeAriResourceOwner,
   resourceType: CmdbAttributeAriResourceType,
   resourceIdSlug: "{workspaceId}/{attributeId}",
   resourceIdSegmentFormats: {
     workspaceId: /[a-zA-Z0-9\-]+/,
     // eslint-disable-line no-useless-escape
-    attributeId: /[!a-zA-Z0-9\-_.~@:{}=]+(\/[!a-zA-Z0-9\-_.~@:{}=]+)*/
+    attributeId: /[!a-zA-Z0-9\-_.~@:;{}=]+(\/[!a-zA-Z0-9\-_.~@:;{}=]+)*/
     // eslint-disable-line no-useless-escape
   }
 };
 
@@ -346,15 +347,16 @@
 var cmdbImportConfigurationAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CmdbImportConfigurationAriResourceOwner,
   resourceType: CmdbImportConfigurationAriResourceType,
   resourceIdSlug: "{workspaceId}/{importConfigId}",
   resourceIdSegmentFormats: {
     workspaceId: /[a-zA-Z0-9\-]+/,
     // eslint-disable-line no-useless-escape
-    importConfigId: /[!a-zA-Z0-9\-_.~@:{}=]+(\/[!a-zA-Z0-9\-_.~@:{}=]+)*/
+    importConfigId: /[!a-zA-Z0-9\-_.~@:;{}=]+(\/[!a-zA-Z0-9\-_.~@:;{}=]+)*/
     // eslint-disable-line no-useless-escape
   }
 };
 
@@ -404,15 +406,16 @@
 var cmdbObjectAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CmdbObjectAriResourceOwner,
   resourceType: CmdbObjectAriResourceType,
   resourceIdSlug: "{workspaceId}/{objectId}",
   resourceIdSegmentFormats: {
     workspaceId: /[a-zA-Z0-9\-]+/,
     // eslint-disable-line no-useless-escape
-    objectId: /[!a-zA-Z0-9\-_.~@:{}=]+(\/[!a-zA-Z0-9\-_.~@:{}=]+)*/
+    objectId: /[!a-zA-Z0-9\-_.~@:;{}=]+(\/[!a-zA-Z0-9\-_.~@:;{}=]+)*/
     // eslint-disable-line no-useless-escape
   }
 };
 
@@ -462,8 +465,9 @@
 var cmdbRoleAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CmdbRoleAriResourceOwner,
   resourceType: CmdbRoleAriResourceType,
   resourceIdSlug: "{roleGroup}/{roleType}",
   resourceIdSegmentFormats: {
@@ -520,15 +524,16 @@
 var cmdbSchemaAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CmdbSchemaAriResourceOwner,
   resourceType: CmdbSchemaAriResourceType,
   resourceIdSlug: "{workspaceId}/{schemaId}",
   resourceIdSegmentFormats: {
     workspaceId: /[a-zA-Z0-9\-]+/,
     // eslint-disable-line no-useless-escape
-    schemaId: /[!a-zA-Z0-9\-_.~@:{}=]+(\/[!a-zA-Z0-9\-_.~@:{}=]+)*/
+    schemaId: /[!a-zA-Z0-9\-_.~@:;{}=]+(\/[!a-zA-Z0-9\-_.~@:;{}=]+)*/
     // eslint-disable-line no-useless-escape
   }
 };
 
@@ -578,15 +583,16 @@
 var cmdbTypeAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CmdbTypeAriResourceOwner,
   resourceType: CmdbTypeAriResourceType,
   resourceIdSlug: "{workspaceId}/{typeId}",
   resourceIdSegmentFormats: {
     workspaceId: /[a-zA-Z0-9\-]+/,
     // eslint-disable-line no-useless-escape
-    typeId: /[!a-zA-Z0-9\-_.~@:{}=]+(\/[!a-zA-Z0-9\-_.~@:{}=]+)*/
+    typeId: /[!a-zA-Z0-9\-_.~@:;{}=]+(\/[!a-zA-Z0-9\-_.~@:;{}=]+)*/
     // eslint-disable-line no-useless-escape
   }
 };
 
@@ -636,8 +642,9 @@
 var cmdbWorkspaceAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CmdbWorkspaceAriResourceOwner,
   resourceType: CmdbWorkspaceAriResourceType,
   resourceIdSlug: "{workspaceId}",
   resourceIdSegmentFormats: {