npm package diff

Package: @forge/util

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

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

Index: package/packages/ari/commerce/index.js
===================================================================
--- package/packages/ari/commerce/index.js
+++ package/packages/ari/commerce/index.js
@@ -42,9 +42,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}.`);
 }
 
@@ -64,9 +64,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}.`);
 }
@@ -299,8 +299,9 @@
 var commerceCatalogAccountAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CommerceCatalogAccountAriResourceOwner,
   resourceType: CommerceCatalogAccountAriResourceType,
   resourceIdSlug: "{catalogAccountId}",
   resourceIdSegmentFormats: {
@@ -350,8 +351,9 @@
 var commerceChangeAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CommerceChangeAriResourceOwner,
   resourceType: CommerceChangeAriResourceType,
   resourceIdSlug: "{changeUuid}",
   resourceIdSegmentFormats: {
@@ -401,8 +403,9 @@
 var commerceEntitlementAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CommerceEntitlementAriResourceOwner,
   resourceType: CommerceEntitlementAriResourceType,
   resourceIdSlug: "{entitlementId}",
   resourceIdSegmentFormats: {
@@ -452,8 +455,9 @@
 var commerceEntitlementTemplateAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CommerceEntitlementTemplateAriResourceOwner,
   resourceType: CommerceEntitlementTemplateAriResourceType,
   resourceIdSlug: "{entitlementTemplateId}",
   resourceIdSegmentFormats: {
@@ -503,8 +507,9 @@
 var commerceInitiativeAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CommerceInitiativeAriResourceOwner,
   resourceType: CommerceInitiativeAriResourceType,
   resourceIdSlug: "{initiativeUuid}",
   resourceIdSegmentFormats: {
@@ -553,9 +558,10 @@
 // src/commerce/invoice-group/manifest.ts
 var commerceInvoiceGroupAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
-  cloudId: new RegExp("^[a-zA-Z0-9-]+$"),
+  cloudId: new RegExp("^[a-zA-Z0-9\\-]+$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CommerceInvoiceGroupAriResourceOwner,
   resourceType: CommerceInvoiceGroupAriResourceType,
   resourceIdSlug: "{invoiceGroupId}",
   resourceIdSegmentFormats: {
@@ -609,8 +615,9 @@
 var commerceOfferingAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CommerceOfferingAriResourceOwner,
   resourceType: CommerceOfferingAriResourceType,
   resourceIdSlug: "{offeringId}",
   resourceIdSegmentFormats: {
@@ -660,8 +667,9 @@
 var commerceOfferingRelationshipTemplateAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CommerceOfferingRelationshipTemplateAriResourceOwner,
   resourceType: CommerceOfferingRelationshipTemplateAriResourceType,
   resourceIdSlug: "{offeringRelationshipTemplateId}",
   resourceIdSegmentFormats: {
@@ -710,9 +718,10 @@
 // src/commerce/order/manifest.ts
 var commerceOrderAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
-  cloudId: new RegExp("^[a-zA-Z0-9-]+$"),
+  cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CommerceOrderAriResourceOwner,
   resourceType: CommerceOrderAriResourceType,
   resourceIdSlug: "{orderId}",
   resourceIdSegmentFormats: {
@@ -724,21 +733,18 @@
 // src/commerce/order/index.ts
 var CommerceOrderAri = class _CommerceOrderAri extends RegisteredAri {
   constructor(opts) {
     super(opts);
-    this._txaId = opts.cloudId || "", this._orderId = opts.resourceIdSegmentValues.orderId;
+    this._orderId = opts.resourceIdSegmentValues.orderId;
   }
-  get txaId() {
-    return this._txaId;
-  }
   get orderId() {
     return this._orderId;
   }
   static create(opts) {
     let derivedOpts = {
       qualifier: commerceOrderAriStaticOpts.qualifier,
       platformQualifier: commerceOrderAriStaticOpts.platformQualifier,
-      cloudId: opts.txaId,
+      cloudId: void 0,
       resourceOwner: commerceOrderAriStaticOpts.resourceOwner,
       resourceType: commerceOrderAriStaticOpts.resourceType,
       resourceId: `${opts.orderId}`,
       resourceIdSegmentValues: {
@@ -752,9 +758,8 @@
     return new _CommerceOrderAri(opts);
   }
   getVariables() {
     return {
-      txaId: this.txaId,
       orderId: this.orderId
     };
   }
 };
@@ -765,9 +770,10 @@
 // src/commerce/payment-method/manifest.ts
 var commercePaymentMethodAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
-  cloudId: new RegExp("^[a-zA-Z0-9-]+$"),
+  cloudId: new RegExp("^[a-zA-Z0-9\\-]+$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CommercePaymentMethodAriResourceOwner,
   resourceType: CommercePaymentMethodAriResourceType,
   resourceIdSlug: "{paymentMethodId}",
   resourceIdSegmentFormats: {
@@ -821,8 +827,9 @@
 var commercePricingPlanAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CommercePricingPlanAriResourceOwner,
   resourceType: CommercePricingPlanAriResourceType,
   resourceIdSlug: "{pricingPlanId}",
   resourceIdSegmentFormats: {
@@ -872,8 +879,9 @@
 var commerceProductAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CommerceProductAriResourceOwner,
   resourceType: CommerceProductAriResourceType,
   resourceIdSlug: "{productId}",
   resourceIdSegmentFormats: {
@@ -923,8 +931,9 @@
 var commercePromotionAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CommercePromotionAriResourceOwner,
   resourceType: CommercePromotionAriResourceType,
   resourceIdSlug: "{promotionId}",
   resourceIdSegmentFormats: {
@@ -973,9 +982,10 @@
 // src/commerce/quote/manifest.ts
 var commerceQuoteAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
-  cloudId: new RegExp("^[a-zA-Z0-9-]+$"),
+  cloudId: new RegExp("^[a-zA-Z0-9\\-]+$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CommerceQuoteAriResourceOwner,
   resourceType: CommerceQuoteAriResourceType,
   resourceIdSlug: "{quoteId}",
   resourceIdSegmentFormats: {
@@ -1029,13 +1039,14 @@
 var commerceRoleAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CommerceRoleAriResourceOwner,
   resourceType: CommerceRoleAriResourceType,
   resourceIdSlug: "{roleId}",
   resourceIdSegmentFormats: {
-    roleId: /[!a-zA-Z0-9\-_.~@:{}=]+(\/[!a-zA-Z0-9\-_.~@:{}=]+)*/
+    roleId: /[!a-zA-Z0-9\-_.~@:;{}=]+(\/[!a-zA-Z0-9\-_.~@:;{}=]+)*/
     // eslint-disable-line no-useless-escape
   }
 };
 
@@ -1079,9 +1090,10 @@
 // src/commerce/ship-to-party/manifest.ts
 var commerceShipToPartyAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
-  cloudId: new RegExp("^[a-zA-Z0-9-]+$"),
+  cloudId: new RegExp("^[a-zA-Z0-9\\-]+$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CommerceShipToPartyAriResourceOwner,
   resourceType: CommerceShipToPartyAriResourceType,
   resourceIdSlug: "{shipToPartyId}",
   resourceIdSegmentFormats: {
@@ -1135,8 +1147,9 @@
 var commerceTransactionAccountAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CommerceTransactionAccountAriResourceOwner,
   resourceType: CommerceTransactionAccountAriResourceType,
   resourceIdSlug: "{txaId}",
   resourceIdSegmentFormats: {
@@ -1186,8 +1199,9 @@
 var commerceWorkbenchResourceAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
+  // eslint-disable-line no-useless-escape
   resourceOwner: CommerceWorkbenchResourceAriResourceOwner,
   resourceType: CommerceWorkbenchResourceAriResourceType,
   resourceIdSlug: "{resourceName}",
   resourceIdSegmentFormats: {