@forge/util 1.3.1-next.0 → 1.3.1-next.2

package/packages/cs-ari/dist/{Constraints.js → constraints.js}

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateField = exports.pattern = exports.lengthBetween = exports.ConstraintViolation = exports.GeneralValidationError = exports.RegexConstraint = exports.LengthConstraint = void 0;
 const ts_is_present_1 = require("ts-is-present");
 class LengthConstraint {
     constructor(min, max) {
@@ -22,7 +23,7 @@ class RegexConstraint {
         return `value must match regex ${this.regex.source}`;
     }
     isValid(value) {
-        return !value || (this.regex.test(value));
+        return !value || this.regex.test(value);
     }
 }
 exports.RegexConstraint = RegexConstraint;
@@ -42,7 +43,7 @@ class ConstraintViolation {
         this.constraints = constraints;
     }
     toString() {
-        const constraintSummary = this.constraints.map((c) => `  - ${c.description}`).join('\n');
+        const constraintSummary = this.constraints.map(c => `  - ${c.description}`).join('\n');
         return `'${this.value}' is not a valid value for ${this.fieldName} as it violates the following constraints:\n${constraintSummary}`;
     }
 }
@@ -57,10 +58,14 @@ function pattern(regex) {
 exports.pattern = pattern;
 function validateField(object, fieldName, constraints) {
     const value = object[fieldName];
-    const violatedConstraints = constraints.map((c) => {
+    const violatedConstraints = constraints
+        .map(c => {
         return c.isValid(value) ? undefined : c;
-    }).filter(ts_is_present_1.isDefined);
-    return violatedConstraints.length > 0 ? new ConstraintViolation(fieldName, value, violatedConstraints) : undefined;
+    })
+        .filter(ts_is_present_1.isDefined);
+    return violatedConstraints.length > 0
+        ? new ConstraintViolation(fieldName, value, violatedConstraints)
+        : undefined;
 }
 exports.validateField = validateField;
-//# sourceMappingURL=Constraints.js.map
+//# sourceMappingURL=constraints.js.map

package/packages/cs-ari/dist/constraints.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constraints.js","sourceRoot":"","sources":["../src/constraints.ts"],"names":[],"mappings":";;;AAAA,iDAA0C;AAQ1C,MAAa,gBAAgB;IAI3B,YAAY,GAAW,EAAE,GAAW;QAClC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAED,IAAI,WAAW;QACb,OAAO,0BAA0B,IAAI,CAAC,GAAG,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC;IAC9D,CAAC;IAED,OAAO,CAAC,KAAa;QACnB,OAAO,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1E,CAAC;CACF;AAhBD,4CAgBC;AAED,MAAa,eAAe;IAC1B,YAAqB,KAAa;QAAb,UAAK,GAAL,KAAK,CAAQ;IAAG,CAAC;IAEtC,IAAI,WAAW;QACb,OAAO,0BAA0B,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;IACvD,CAAC;IAED,OAAO,CAAC,KAAa;QACnB,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;CACF;AAVD,0CAUC;AAMD,MAAa,sBAAsB;IACjC,YAA6B,KAAa;QAAb,UAAK,GAAL,KAAK,CAAQ;IAAG,CAAC;IAC9C,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;CACF;AALD,wDAKC;AAED,MAAa,mBAAmB;IAK9B,YAAY,SAAiB,EAAE,KAAQ,EAAE,WAA4B;QACnE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAED,QAAQ;QACN,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvF,OAAO,IAAI,IAAI,CAAC,KAAK,8BAA8B,IAAI,CAAC,SAAS,+CAA+C,iBAAiB,EAAE,CAAC;IACtI,CAAC;CACF;AAfD,kDAeC;AAED,SAAgB,aAAa,CAAC,GAAW,EAAE,GAAW;IACpD,OAAO,IAAI,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACxC,CAAC;AAFD,sCAEC;AAED,SAAgB,OAAO,CAAC,KAAa;IACnC,OAAO,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC;AACpC,CAAC;AAFD,0BAEC;AAED,SAAgB,aAAa,CAC3B,MAAS,EACT,SAAY,EACZ,WAA+B;IAE/B,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,mBAAmB,GAAG,WAAW;SACpC,GAAG,CAAC,CAAC,CAAC,EAAE;QACP,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC;SACD,MAAM,CAAC,yBAAS,CAAC,CAAC;IAErB,OAAO,mBAAmB,CAAC,MAAM,GAAG,CAAC;QACnC,CAAC,CAAC,IAAI,mBAAmB,CAAO,SAAmB,EAAE,KAAK,EAAE,mBAAmB,CAAC;QAChF,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAfD,sCAeC"}

package/packages/cs-ari/dist/index.d.ts

@@ -0,0 +1,21 @@
+import { Ari } from './ari';
+export * from './ari';
+export * from './app-aris';
+export * from './resource-identifier';
+/**
+ * Parse a string as an Ari
+ *
+ * @param {string} ariString - the string to parse
+ * @returns {Ari} the parsed ari
+ * @throws {InvalidAriError} if the string could not be correctly parsed as an Ari.
+ */
+export declare function parse(ariString: string): Ari;
+/**
+ * Parse a URL encoded string as an Ari
+ *
+ * @param {string} encodedAriString - the string to parse
+ * @returns {Ari} the parsed ari
+ * @throws {InvalidAriError} if the string could not be correctly parsed as an Ari.
+ */
+export declare function parseEncoded(encodedAriString: string): Ari;
+//# sourceMappingURL=index.d.ts.map

package/packages/cs-ari/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAG5B,cAAc,OAAO,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AAEtC;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,GAAG,CAE5C;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,gBAAgB,EAAE,MAAM,GAAG,GAAG,CAE1D"}

package/packages/cs-ari/dist/index.js

@@ -0,0 +1,40 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseEncoded = exports.parse = void 0;
+const resource_identifier_1 = require("./resource-identifier");
+__exportStar(require("./ari"), exports);
+__exportStar(require("./app-aris"), exports);
+__exportStar(require("./resource-identifier"), exports);
+/**
+ * Parse a string as an Ari
+ *
+ * @param {string} ariString - the string to parse
+ * @returns {Ari} the parsed ari
+ * @throws {InvalidAriError} if the string could not be correctly parsed as an Ari.
+ */
+function parse(ariString) {
+    return resource_identifier_1.ResourceIdentifier.parse(ariString);
+}
+exports.parse = parse;
+/**
+ * Parse a URL encoded string as an Ari
+ *
+ * @param {string} encodedAriString - the string to parse
+ * @returns {Ari} the parsed ari
+ * @throws {InvalidAriError} if the string could not be correctly parsed as an Ari.
+ */
+function parseEncoded(encodedAriString) {
+    return resource_identifier_1.ResourceIdentifier.parseEncoded(encodedAriString);
+}
+exports.parseEncoded = parseEncoded;
+//# sourceMappingURL=index.js.map

package/packages/cs-ari/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,+DAA2D;AAE3D,wCAAsB;AACtB,6CAA2B;AAC3B,wDAAsC;AAEtC;;;;;;GAMG;AACH,SAAgB,KAAK,CAAC,SAAiB;IACrC,OAAO,wCAAkB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;AAC7C,CAAC;AAFD,sBAEC;AAED;;;;;;GAMG;AACH,SAAgB,YAAY,CAAC,gBAAwB;IACnD,OAAO,wCAAkB,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;AAC3D,CAAC;AAFD,oCAEC"}

package/packages/cs-ari/dist/{Index.d.ts → resource-identifier.d.ts}

@@ -1,5 +1,5 @@
-import { ValidationError } from './Constraints';
-export * from './AppAris';
+import { Ari } from './ari';
+import { ValidationError } from './constraints';
 /**
  * InvalidAriError - an error thrown if an invalid Ari is constructed
  */
@@ -27,30 +27,13 @@ export declare type AriConstructorType = {
     readonly resourceType?: string;
     readonly resourceId?: string;
 };
-/**
- * ARI - an Atlassian Resource Identifier used within connect to describe installation contexts.
- *
- * an implementation of https://product-fabric.atlassian.net/wiki/display/PRODUCT/Atlassian+Resource+Identifier
- */
-export interface Ari {
-    readonly resourceOwner: string;
-    readonly cloudId?: string;
-    readonly resourceType?: string;
-    readonly resourceId?: string;
-    toString: () => string;
-    toJSON: () => string;
-    equals: (other: any) => boolean;
-    contains: (other: Ari) => boolean;
-    urlEncode: () => string;
-    urlDecode: () => string;
-}
 export declare class ResourceIdentifier implements Ari {
     readonly resourceOwner: string;
     readonly resourceType?: string;
     readonly resourceId?: string;
     private ariString?;
     private readonly internalCloudId?;
-    readonly cloudId: string | undefined;
+    get cloudId(): string | undefined;
     /**
      * Create a new Ari
      *
@@ -66,12 +49,12 @@ export declare class ResourceIdentifier implements Ari {
      */
     constructor(values: AriConstructorType);
     /**
-    * Parse a string as an Ari
-    *
-    * @param {string} ariString - the string to parse
-    * @returns {Ari} the parsed ari
-    * @throws {InvalidAriError} if the string could not be correctly parsed as an Ari.
-    */
+     * Parse a string as an Ari
+     *
+     * @param {string} ariString - the string to parse
+     * @returns {Ari} the parsed ari
+     * @throws {InvalidAriError} if the string could not be correctly parsed as an Ari.
+     */
     static parse(ariString: string): Ari;
     static parseEncoded(encodedAriString: string): Ari;
     /**
@@ -88,7 +71,7 @@ export declare class ResourceIdentifier implements Ari {
      * @param {Ari} other - the other parameter to match with
      * @returns {boolean} - true if all segments of both Aris are equal, false otherwise
      */
-    equals(other: any): boolean;
+    equals(other: unknown): boolean;
     /**
      * This method checks if the current context contains the other context.
      *
@@ -119,19 +102,4 @@ export declare class ResourceIdentifier implements Ari {
     urlEncode(): string;
     urlDecode(): string;
 }
-/**
- * Parse a string as an Ari
- *
- * @param {string} ariString - the string to parse
- * @returns {Ari} the parsed ari
- * @throws {InvalidAriError} if the string could not be correctly parsed as an Ari.
- */
-export declare function parse(ariString: string): Ari;
-/**
- * Parse a URL encoded string as an Ari
- *
- * @param {string} encodedAriString - the string to parse
- * @returns {Ari} the parsed ari
- * @throws {InvalidAriError} if the string could not be correctly parsed as an Ari.
- */
-export declare function parseEncoded(encodedAriString: string): Ari;
+//# sourceMappingURL=resource-identifier.d.ts.map

package/packages/cs-ari/dist/resource-identifier.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resource-identifier.d.ts","sourceRoot":"","sources":["../src/resource-identifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAIL,eAAe,EAIhB,MAAM,eAAe,CAAC;AAEvB;;GAEG;AACH,qBAAa,eAAgB,SAAQ,KAAK;IACxC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB;;;;;OAKG;gBACS,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;IAQnD;;;;;OAKG;IACH,MAAM,CAAC,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,eAAe;CAGnG;AAYD,oBAAY,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAsCF,qBAAa,kBAAmB,YAAW,GAAG;IAC5C,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAS;IAE1C,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAKhC;IAED;;;;;;;;;;;;OAYG;gBACS,MAAM,EAAE,kBAAkB;IAStC;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,GAAG;IAuBpC,MAAM,CAAC,YAAY,CAAC,gBAAgB,EAAE,MAAM,GAAG,GAAG;IAIlD;;OAEG;IACH,QAAQ,IAAI,MAAM;IAWlB;;OAEG;IACH,MAAM,IAAI,MAAM;IAIhB;;;;;OAKG;IACH,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO;IAU/B;;;;;;;;OAQG;IACH,QAAQ,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO;IAI7B;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,OAAO;IAWf,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,QAAQ;IAkBhB,SAAS,IAAI,MAAM;IAInB,SAAS,IAAI,MAAM;CAGpB"}

package/packages/cs-ari/dist/{Index.js → resource-identifier.js}

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const Constraints_1 = require("./Constraints");
-tslib_1.__exportStar(require("./AppAris"), exports);
+exports.ResourceIdentifier = exports.InvalidAriError = void 0;
+const constraints_1 = require("./constraints");
 /**
  * InvalidAriError - an error thrown if an invalid Ari is constructed
  */
@@ -40,19 +39,21 @@ function matchesSegment(value1, value2) {
     return false;
 }
 // constraints are based on draft of v2 spec https://hello.atlassian.net/wiki/spaces/ARCH/pages/161909310/Atlassian+Resource+Identifier+Spec+draft-2.0#AtlassianResourceIdentifierSpec(draft-2.0)-Syntax
-const basicCharConstraint = Constraints_1.pattern(/^[a-z][a-z.-]*$/);
+const basicCharConstraint = (0, constraints_1.pattern)(/^[a-z][a-z.-]*$/);
 /**
  * resourceType allows for capitalized letters to support Identity ARIs (`ari:cloud:identity::userGrant/<...>`)
  * It's a violation of the spec, but we still need to support that.
  * See https://hello.atlassian.net/wiki/spaces/ARCH/pages/161909310/Atlassian+Resource+Identifier+Spec+draft-2.0
  */
-const resourceTypeCharConstraints = Constraints_1.pattern(/^[a-z][a-z.-]*$/i);
-const resourceOwnerConstraints = [Constraints_1.lengthBetween(3, 255), basicCharConstraint];
-const resourceTypeConstraints = [Constraints_1.lengthBetween(3, 255), resourceTypeCharConstraints];
-const cloudIdConstraints = [Constraints_1.lengthBetween(3, 255)];
+const resourceTypeCharConstraints = (0, constraints_1.pattern)(/^[a-z][a-z.-]*$/i);
+const resourceOwnerConstraints = [(0, constraints_1.lengthBetween)(3, 255), basicCharConstraint];
+const resourceTypeConstraints = [(0, constraints_1.lengthBetween)(3, 255), resourceTypeCharConstraints];
+const cloudIdConstraints = [(0, constraints_1.lengthBetween)(3, 255)];
 const siteResourceType = 'site';
 const resourceIdChars = /[\w-._~:@#]/.source;
-const resourceIdConstraints = [Constraints_1.pattern(new RegExp(`^${resourceIdChars}+(/${resourceIdChars}*)*(;v=${resourceIdChars}*)*$`))];
+const resourceIdConstraints = [
+    (0, constraints_1.pattern)(new RegExp(`^${resourceIdChars}+(/${resourceIdChars}*)*(;v=${resourceIdChars}*)*$`)),
+];
 /**
  * Returns an Ari that is of the latest version of the Ari spec that we support. Any legacy formats
  * (like those for site wide ARIs) are upgraded to their latest form.
@@ -72,12 +73,6 @@ function upgrade(values) {
     }
 }
 class ResourceIdentifier {
-    get cloudId() {
-        if (this.resourceType === siteResourceType) {
-            return this.internalCloudId ? this.internalCloudId : this.resourceId;
-        }
-        return this.internalCloudId;
-    }
     /**
      * Create a new Ari
      *
@@ -99,22 +94,28 @@ class ResourceIdentifier {
         this.resourceId = resourceId;
         this.validate();
     }
+    get cloudId() {
+        if (this.resourceType === siteResourceType) {
+            return this.internalCloudId ? this.internalCloudId : this.resourceId;
+        }
+        return this.internalCloudId;
+    }
     /**
-    * Parse a string as an Ari
-    *
-    * @param {string} ariString - the string to parse
-    * @returns {Ari} the parsed ari
-    * @throws {InvalidAriError} if the string could not be correctly parsed as an Ari.
-    */
+     * Parse a string as an Ari
+     *
+     * @param {string} ariString - the string to parse
+     * @returns {Ari} the parsed ari
+     * @throws {InvalidAriError} if the string could not be correctly parsed as an Ari.
+     */
     static parse(ariString) {
         if (!ariString) {
             throw new InvalidAriError(ariString);
         }
-        const match = ariString.match(/^ari:cloud:([^:/]+):([^:/]*):([^:/]*)\/(.*)$/);
-        if (!match || (match.length !== 5)) {
+        const match = new RegExp(/^ari:cloud:([^:/]+):([^:/]*):([^:/]*)\/(.*)$/).exec(ariString);
+        if (!match || match.length !== 5) {
             throw new InvalidAriError(ariString);
         }
-        const terms = match.map((a) => a && a.length > 0 ? a : undefined);
+        const terms = match.map((a) => (a && a.length > 0 ? a : undefined));
         const resourceOwner = terms[1];
         if (!resourceOwner) {
             throw new InvalidAriError(ariString);
@@ -123,18 +124,18 @@ class ResourceIdentifier {
             resourceOwner: resourceOwner,
             cloudId: terms[2],
             resourceType: terms[3],
-            resourceId: terms[4]
+            resourceId: terms[4],
         });
     }
     static parseEncoded(encodedAriString) {
-        return parse(decodeURIComponent(encodedAriString));
+        return ResourceIdentifier.parse(decodeURIComponent(encodedAriString));
     }
     /**
      * Converts this Ari to a string.
      */
     toString() {
         if (!this.ariString) {
-            const resourceId = this.resourceType === siteResourceType && this.internalCloudId ? this.internalCloudId : (this.resourceId || '');
+            const resourceId = this.resourceType === siteResourceType && this.internalCloudId ? this.internalCloudId : this.resourceId || '';
             const resourceType = this.resourceType || '';
             const sanitizedCloudId = this.resourceType === siteResourceType ? '' : this.internalCloudId || '';
             this.ariString = `ari:cloud:${this.resourceOwner}:${sanitizedCloudId}:${resourceType}/${resourceId}`;
@@ -154,11 +155,11 @@ class ResourceIdentifier {
      * @returns {boolean} - true if all segments of both Aris are equal, false otherwise
      */
     equals(other) {
-        return other instanceof ResourceIdentifier
-            && this.resourceOwner === other.resourceOwner
-            && this.cloudId === other.cloudId
-            && this.resourceType === other.resourceType
-            && this.resourceId === other.resourceId;
+        return (other instanceof ResourceIdentifier &&
+            this.resourceOwner === other.resourceOwner &&
+            this.cloudId === other.cloudId &&
+            this.resourceType === other.resourceType &&
+            this.resourceId === other.resourceId);
     }
     /**
      * This method checks if the current context contains the other context.
@@ -187,26 +188,27 @@ class ResourceIdentifier {
      * @returns {boolean} true if this Ari is the same as the other Ari, or matches the other Ari. False otherwise.
      */
     matches(other) {
-        return matchesSegment(this.resourceOwner, other.resourceOwner)
-            && matchesSegment(this.cloudId, other.cloudId)
-            && ((this.resourceType === siteResourceType && !!other.resourceType) || matchesSegment(this.resourceType, other.resourceType))
-            && ((this.resourceType === siteResourceType && !!other.resourceType) || matchesSegment(this.resourceId, other.resourceId));
+        return (matchesSegment(this.resourceOwner, other.resourceOwner) &&
+            matchesSegment(this.cloudId, other.cloudId) &&
+            ((this.resourceType === siteResourceType && !!other.resourceType) ||
+                matchesSegment(this.resourceType, other.resourceType)) &&
+            ((this.resourceType === siteResourceType && !!other.resourceType) ||
+                matchesSegment(this.resourceId, other.resourceId)));
     }
     validateSiteWide() {
         const { resourceType, cloudId } = this;
         if (resourceType === siteResourceType && !cloudId) {
-            return new Constraints_1.GeneralValidationError('site wide ARIs must have a cloudId');
+            return new constraints_1.GeneralValidationError('site wide ARIs must have a cloudId');
         }
     }
     validate() {
         const constraintViolations = [
-            Constraints_1.validateField(this, 'resourceOwner', resourceOwnerConstraints),
-            Constraints_1.validateField(this, 'resourceType', resourceTypeConstraints),
-            Constraints_1.validateField(this, 'resourceId', resourceIdConstraints),
-            Constraints_1.validateField(this, 'cloudId', cloudIdConstraints),
-            this.validateSiteWide()
-        ]
-            .filter((v) => v);
+            (0, constraints_1.validateField)(this, 'resourceOwner', resourceOwnerConstraints),
+            (0, constraints_1.validateField)(this, 'resourceType', resourceTypeConstraints),
+            (0, constraints_1.validateField)(this, 'resourceId', resourceIdConstraints),
+            (0, constraints_1.validateField)(this, 'cloudId', cloudIdConstraints),
+            this.validateSiteWide(),
+        ].filter((v) => v);
         if (constraintViolations.length > 0) {
             throw InvalidAriError.withConstraintViolations(this.toString(), constraintViolations);
         }
@@ -222,26 +224,4 @@ class ResourceIdentifier {
     }
 }
 exports.ResourceIdentifier = ResourceIdentifier;
-/**
- * Parse a string as an Ari
- *
- * @param {string} ariString - the string to parse
- * @returns {Ari} the parsed ari
- * @throws {InvalidAriError} if the string could not be correctly parsed as an Ari.
- */
-function parse(ariString) {
-    return ResourceIdentifier.parse(ariString);
-}
-exports.parse = parse;
-/**
- * Parse a URL encoded string as an Ari
- *
- * @param {string} encodedAriString - the string to parse
- * @returns {Ari} the parsed ari
- * @throws {InvalidAriError} if the string could not be correctly parsed as an Ari.
- */
-function parseEncoded(encodedAriString) {
-    return ResourceIdentifier.parseEncoded(encodedAriString);
-}
-exports.parseEncoded = parseEncoded;
-//# sourceMappingURL=Index.js.map
+//# sourceMappingURL=resource-identifier.js.map

package/packages/cs-ari/dist/resource-identifier.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resource-identifier.js","sourceRoot":"","sources":["../src/resource-identifier.ts"],"names":[],"mappings":"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"}

package/packages/cs-ari/package.json

@@ -1,40 +1,29 @@
 {
   "name": "cs-ari",
-  "version": "1.12.1",
+  "version": "3.0.0",
   "license": "ISC",
   "description": "An implementation of the Atlassian Resource Identifier (ARI) scheme for Connect as a Service (CaaS)",
-  "publishConfig": {
-    "registry": "https://packages.atlassian.com"
-  },
   "author": "Atlassian",
-  "main": "dist/Index.js",
-  "scripts": {
-    "clean": "shx rm -rf ./dist",
-    "build": "npm run clean && npm run lint && tsc",
-    "prepublishOnly": "npm run build",
-    "test": "mocha --reporter mocha-multi --reporter-options spec=-,xunit=xunit.xml --require ts-node/register `find ./lib -name '*.spec.ts' -print`",
-    "lint": "tslint -c ../../tslint.json --project tsconfig.json --project",
-    "format": "tsfmt -r && tslint -c ../../tslint.json --project tsconfig.json --fix --force",
-    "bamboo": "npm install -g yarn@0.18.0 && yarn && yarn test",
-    "yarn-deduplicate": "yarn-deduplicate"
-  },
+  "main": "dist/index",
   "dependencies": {
-    "ts-is-present": "^1.1.1"
+    "ts-is-present": "^1.1.3"
+  },
+  "typings": "dist/index.d.ts",
+  "types": "dist/index.d.ts",
+  "config": {
+    "registry": "atlassian"
   },
-  "devDependencies": {
-    "@types/chai": "^4.1.7",
-    "@types/mocha": "^5.2.7",
-    "@types/sinon": "^7.0.12",
-    "chai": "4.2.0",
-    "mocha": "^5.2.0",
-    "mocha-multi": "^1.1.0",
-    "shx": "^0.3.2",
-    "sinon": "^7.3.2",
-    "ts-node": "^8.2.0",
-    "tslint": "^5.17.0",
-    "typescript": "^3.5.1",
-    "typescript-formatter": "7.2.2",
-    "yarn-deduplicate": "^1.1.1"
+  "repository": {
+    "directory": "src/packages/ecosystem/cs-ari",
+    "type": "git",
+    "url": "git@bitbucket.org:atlassian/incredible-monorepo.git"
   },
-  "typings": "./dist/Index.d.ts"
+  "homepage": "https://bitbucket.org/atlassian/incredible-monorepo/src/master/src/packages/ecosystem/cs-ari",
+  "files": [
+    "bin/",
+    "dist/",
+    "package.json",
+    "CHANGELOG.md",
+    "README.md"
+  ]
 }

package/packages/cs-ari/dist/AppAriImpls.d.ts

@@ -1,27 +0,0 @@
-import { AppAri, AppAriJson, AppEnvironmentAri, AppEnvironmentAriJson, AppFamilyAriJson, AppFamilyAriOperations, ExtensionAri, ExtensionAriJson, ExtensionGroupAri, ExtensionGroupAriJson } from './AppAris';
-import { Ari } from './Index';
-export declare class AppFamilyAriImpl<J extends AppFamilyAriJson> implements AppAriJson, Partial<AppEnvironmentAriJson>, Partial<ExtensionGroupAriJson>, Partial<ExtensionAriJson>, AppFamilyAriOperations<J> {
-    private readonly json;
-    constructor(json: J);
-    readonly appId: string;
-    readonly environmentId: string | undefined;
-    readonly version: string | undefined;
-    readonly extensionGroupId: string | undefined;
-    readonly extensionKey: string | undefined;
-    toJSON(): J;
-    static parse<J extends AppFamilyAriJson>(ari: Ari): AppFamilyAriImpl<J>;
-    asAppAri(): AppAri;
-    asAppEnvironmentAri(): AppEnvironmentAri;
-    asExtensionGroupAri(): ExtensionGroupAri;
-    asExtensionAri(): ExtensionAri;
-    isAppAri(): this is AppAri;
-    isAppEnvironmentAri(): this is AppEnvironmentAri;
-    isExtensionGroupAri(): this is ExtensionGroupAri;
-    isExtensionAri(): this is ExtensionAri;
-    private returnIf;
-    private readonly isAtLeastAppEnvironmentAri;
-    private readonly isAtLeastExtensionGroupAri;
-    private validate;
-    toAri(): Ari;
-    toString(): string;
-}