@forge/util 1.2.3-next.0 → 1.2.4-next.0

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

@@ -1,40 +1,23 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
 Object.defineProperty(exports, "__esModule", { value: true });
-var Constraints_1 = require("./Constraints");
-__export(require("./AppAris"));
+const tslib_1 = require("tslib");
+const Constraints_1 = require("./Constraints");
+tslib_1.__exportStar(require("./AppAris"), exports);
 /**
  * InvalidAriError - an error thrown if an invalid Ari is constructed
  */
-var InvalidAriError = /** @class */ (function (_super) {
-    __extends(InvalidAriError, _super);
+class InvalidAriError extends Error {
     /**
      * Construct an InvalidAriError given an error message
      *
      * @param {string} ariString - the ARI that failed to parse
      * @param {string|undefined} description - The error message
      */
-    function InvalidAriError(ariString, description) {
-        var _this = _super.call(this, "Invalid ari string: " + ariString + (description ? '. ' + description : '')) || this;
-        _this.ariString = ariString;
+    constructor(ariString, description) {
+        super(`Invalid ari string: ${ariString}${description ? '. ' + description : ''}`);
+        this.ariString = ariString;
         // Support correct inheritance in ES5
-        Object.setPrototypeOf(_this, InvalidAriError.prototype);
-        return _this;
+        Object.setPrototypeOf(this, InvalidAriError.prototype);
     }
     /**
      * Construct an InvalidAriError given some constraint violations
@@ -42,11 +25,10 @@ var InvalidAriError = /** @class */ (function (_super) {
      * @param {string} ariString - the ARI that failed to parse
      * @param {ConstraintViolation<Object>[]} violations - The array of constraint errors
      */
-    InvalidAriError.withConstraintViolations = function (ariString, violations) {
-        return new InvalidAriError(ariString, violations.map(function (v) { return v.toString(); }).join('\n'));
-    };
-    return InvalidAriError;
-}(Error));
+    static withConstraintViolations(ariString, violations) {
+        return new InvalidAriError(ariString, violations.map((v) => v.toString()).join('\n'));
+    }
+}
 exports.InvalidAriError = InvalidAriError;
 function matchesSegment(value1, value2) {
     if (value1 === value2) {
@@ -58,23 +40,29 @@ 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
-var basicCharConstraint = Constraints_1.pattern(/^[a-z][a-z.-]*$/);
-var resourceOwnerConstraints = [Constraints_1.lengthBetween(3, 255), basicCharConstraint];
-var resourceTypeConstraints = [Constraints_1.lengthBetween(3, 255), basicCharConstraint];
-var cloudIdConstraints = [Constraints_1.lengthBetween(36, 255)];
-var siteResourceType = 'site';
-var resourceIdChars = /[\w-._~:@]/.source;
-var resourceIdConstraints = [Constraints_1.pattern(new RegExp("^" + resourceIdChars + "+(/" + resourceIdChars + "*)*(;v=" + resourceIdChars + "*)*$"))];
+const basicCharConstraint = 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 siteResourceType = 'site';
+const resourceIdChars = /[\w-._~:@#]/.source;
+const resourceIdConstraints = [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.
  */
 function upgrade(values) {
-    var resourceId = values.resourceId, resourceOwner = values.resourceOwner, cloudId = values.cloudId;
+    const { resourceId, resourceOwner, cloudId } = values;
     // note: The new ARI spec has not defined a format for system wide contexts so we exclude them from upgrade
     if (!resourceId && cloudId) {
         return {
-            resourceOwner: resourceOwner,
+            resourceOwner,
             resourceType: siteResourceType,
             resourceId: cloudId,
         };
@@ -83,7 +71,13 @@ function upgrade(values) {
         return values;
     }
 }
-var ResourceIdentifier = /** @class */ (function () {
+class ResourceIdentifier {
+    get cloudId() {
+        if (this.resourceType === siteResourceType) {
+            return this.internalCloudId ? this.internalCloudId : this.resourceId;
+        }
+        return this.internalCloudId;
+    }
     /**
      * Create a new Ari
      *
@@ -97,24 +91,14 @@ var ResourceIdentifier = /** @class */ (function () {
      *
      * @throws {InvalidAriError} if the provided segments fail to pass validation
      */
-    function ResourceIdentifier(values) {
-        var _a = upgrade(values), resourceId = _a.resourceId, resourceOwner = _a.resourceOwner, resourceType = _a.resourceType, cloudId = _a.cloudId;
+    constructor(values) {
+        const { resourceId, resourceOwner, resourceType, cloudId } = upgrade(values);
         this.resourceOwner = resourceOwner;
         this.internalCloudId = cloudId;
         this.resourceType = resourceType;
         this.resourceId = resourceId;
         this.validate();
     }
-    Object.defineProperty(ResourceIdentifier.prototype, "cloudId", {
-        get: function () {
-            if (this.resourceType === siteResourceType) {
-                return this.internalCloudId ? this.internalCloudId : this.resourceId;
-            }
-            return this.internalCloudId;
-        },
-        enumerable: true,
-        configurable: true
-    });
     /**
     * Parse a string as an Ari
     *
@@ -122,16 +106,16 @@ var ResourceIdentifier = /** @class */ (function () {
     * @returns {Ari} the parsed ari
     * @throws {InvalidAriError} if the string could not be correctly parsed as an Ari.
     */
-    ResourceIdentifier.parse = function (ariString) {
+    static parse(ariString) {
         if (!ariString) {
             throw new InvalidAriError(ariString);
         }
-        var match = ariString.match(/^ari:cloud:([^:/]+):([^:/]*):([^:/]*)\/(.*)$/);
+        const match = ariString.match(/^ari:cloud:([^:/]+):([^:/]*):([^:/]*)\/(.*)$/);
         if (!match || (match.length !== 5)) {
             throw new InvalidAriError(ariString);
         }
-        var terms = match.map(function (a) { return a && a.length > 0 ? a : undefined; });
-        var resourceOwner = terms[1];
+        const terms = match.map((a) => a && a.length > 0 ? a : undefined);
+        const resourceOwner = terms[1];
         if (!resourceOwner) {
             throw new InvalidAriError(ariString);
         }
@@ -141,41 +125,41 @@ var ResourceIdentifier = /** @class */ (function () {
             resourceType: terms[3],
             resourceId: terms[4]
         });
-    };
-    ResourceIdentifier.parseEncoded = function (encodedAriString) {
+    }
+    static parseEncoded(encodedAriString) {
         return parse(decodeURIComponent(encodedAriString));
-    };
+    }
     /**
      * Converts this Ari to a string.
      */
-    ResourceIdentifier.prototype.toString = function () {
+    toString() {
         if (!this.ariString) {
-            var resourceId = this.resourceType === siteResourceType && this.internalCloudId ? this.internalCloudId : (this.resourceId || '');
-            var resourceType = this.resourceType || '';
-            var sanitizedCloudId = this.resourceType === siteResourceType ? '' : this.internalCloudId || '';
-            this.ariString = "ari:cloud:" + this.resourceOwner + ":" + sanitizedCloudId + ":" + resourceType + "/" + 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}`;
         }
         return this.ariString;
-    };
+    }
     /**
      * Converts this object to its json representation
      */
-    ResourceIdentifier.prototype.toJSON = function () {
+    toJSON() {
         return this.toString();
-    };
+    }
     /**
      * Checks if this context is the same as another context
      *
      * @param {Ari} other - the other parameter to match with
      * @returns {boolean} - true if all segments of both Aris are equal, false otherwise
      */
-    ResourceIdentifier.prototype.equals = function (other) {
+    equals(other) {
         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.
      *
@@ -185,9 +169,9 @@ var ResourceIdentifier = /** @class */ (function () {
      * @param {Ari} other
      * @returns {boolean}
      */
-    ResourceIdentifier.prototype.contains = function (other) {
+    contains(other) {
         return this.matches(new ResourceIdentifier(other));
-    };
+    }
     /**
      * Checks if this context is the same as or contains the provided context.
      *
@@ -202,42 +186,41 @@ var ResourceIdentifier = /** @class */ (function () {
      * @param {Ari} other - the other parameter to match with
      * @returns {boolean} true if this Ari is the same as the other Ari, or matches the other Ari. False otherwise.
      */
-    ResourceIdentifier.prototype.matches = function (other) {
+    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));
-    };
-    ResourceIdentifier.prototype.validateSiteWide = function () {
-        var _a = this, resourceType = _a.resourceType, cloudId = _a.cloudId;
+    }
+    validateSiteWide() {
+        const { resourceType, cloudId } = this;
         if (resourceType === siteResourceType && !cloudId) {
             return new Constraints_1.GeneralValidationError('site wide ARIs must have a cloudId');
         }
-    };
-    ResourceIdentifier.prototype.validate = function () {
-        var constraintViolations = [
+    }
+    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(function (v) { return v; });
+            .filter((v) => v);
         if (constraintViolations.length > 0) {
             throw InvalidAriError.withConstraintViolations(this.toString(), constraintViolations);
         }
         if (this.resourceId !== undefined && this.resourceType === undefined) {
             throw new InvalidAriError(this.toString(), 'The resource type must be specified if the resource id is defined.');
         }
-    };
-    ResourceIdentifier.prototype.urlEncode = function () {
+    }
+    urlEncode() {
         return encodeURIComponent(this.toString());
-    };
-    ResourceIdentifier.prototype.urlDecode = function () {
+    }
+    urlDecode() {
         return decodeURIComponent(this.toString());
-    };
-    return ResourceIdentifier;
-}());
+    }
+}
 exports.ResourceIdentifier = ResourceIdentifier;
 /**
  * Parse a string as an Ari

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

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

package/packages/cs-ari/package.json

@@ -1,6 +1,7 @@
 {
   "name": "cs-ari",
-  "version": "1.10.0",
+  "version": "1.12.1",
+  "license": "ISC",
   "description": "An implementation of the Atlassian Resource Identifier (ARI) scheme for Connect as a Service (CaaS)",
   "publishConfig": {
     "registry": "https://packages.atlassian.com"
@@ -14,9 +15,12 @@
     "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"
+    "bamboo": "npm install -g yarn@0.18.0 && yarn && yarn test",
+    "yarn-deduplicate": "yarn-deduplicate"
+  },
+  "dependencies": {
+    "ts-is-present": "^1.1.1"
   },
-  "dependencies": {},
   "devDependencies": {
     "@types/chai": "^4.1.7",
     "@types/mocha": "^5.2.7",
@@ -29,7 +33,8 @@
     "ts-node": "^8.2.0",
     "tslint": "^5.17.0",
     "typescript": "^3.5.1",
-    "typescript-formatter": "7.2.2"
+    "typescript-formatter": "7.2.2",
+    "yarn-deduplicate": "^1.1.1"
   },
   "typings": "./dist/Index.d.ts"
 }

package/packages/cs-ari/xunit.xml

@@ -1,18 +1,20 @@
-<testsuite name="Mocha Tests" tests="97" failures="0" errors="0" skipped="0" timestamp="Mon, 29 Jul 2019 01:39:16 GMT" time="0.08">
+<testsuite name="Mocha Tests" tests="107" failures="0" errors="0" skipped="0" timestamp="Fri, 28 Aug 2020 02:29:05 GMT" time="0.05">
 <testcase classname="Ari toString" name="should correctly serialise ari when all fields are present" time="0.001"/>
 <testcase classname="Ari toString" name="should correctly serialise ari when cloudId is omitted" time="0"/>
 <testcase classname="Ari toString" name="should correctly serialise ari when a system wide user context provided" time="0"/>
 <testcase classname="Ari toString" name="should correctly serialise ari when resourceId is omitted" time="0"/>
 <testcase classname="Ari toString" name="should correctly serialise ari when resourceId and resourceType are omitted" time="0"/>
-<testcase classname="Ari toString" name="should correctly serialise ari when resourceOwner contains a full stop" time="0.001"/>
+<testcase classname="Ari toString" name="should correctly serialise ari when resourceOwner contains a full stop" time="0"/>
 <testcase classname="Ari toString" name="should correctly serialise ari when resourceOwner contains a dash" time="0"/>
 <testcase classname="Ari toString" name="should correctly serialise ari when a global system context provided" time="0"/>
 <testcase classname="Ari toString" name="should correctly serialise ari when cloudId and resourceId are both UUIDs" time="0"/>
 <testcase classname="Ari toString" name="should correctly serialise ari when application wide system context provided" time="0"/>
 <testcase classname="Ari toString" name="should correctly serialise ari when site wide context" time="0"/>
 <testcase classname="Ari toString" name="should correctly serialise ari when ARI has colon in resource id" time="0"/>
+<testcase classname="Ari toString" name="should correctly serialise ari when ARI has hash in resource id" time="0"/>
 <testcase classname="Ari toString" name="should correctly serialise ari when ARI has path characters in resource id" time="0"/>
-<testcase classname="Ari JSON.stringify" name="should correctly serialise ari when all fields are present" time="0.001"/>
+<testcase classname="Ari toString" name="should correctly serialise ari when resourceType is capitalized" time="0"/>
+<testcase classname="Ari JSON.stringify" name="should correctly serialise ari when all fields are present" time="0"/>
 <testcase classname="Ari JSON.stringify" name="should correctly serialise ari when cloudId is omitted" time="0"/>
 <testcase classname="Ari JSON.stringify" name="should correctly serialise ari when a system wide user context provided" time="0"/>
 <testcase classname="Ari JSON.stringify" name="should correctly serialise ari when resourceId is omitted" time="0"/>
@@ -24,26 +26,28 @@
 <testcase classname="Ari JSON.stringify" name="should correctly serialise ari when application wide system context provided" time="0"/>
 <testcase classname="Ari JSON.stringify" name="should correctly serialise ari when site wide context" time="0"/>
 <testcase classname="Ari JSON.stringify" name="should correctly serialise ari when ARI has colon in resource id" time="0"/>
+<testcase classname="Ari JSON.stringify" name="should correctly serialise ari when ARI has hash in resource id" time="0"/>
 <testcase classname="Ari JSON.stringify" name="should correctly serialise ari when ARI has path characters in resource id" time="0"/>
-<testcase classname="Ari parse" name="should throw InvalidAriError when ariString is invalid" time="0.002"/>
+<testcase classname="Ari JSON.stringify" name="should correctly serialise ari when resourceType is capitalized" time="0"/>
+<testcase classname="Ari parse" name="should throw InvalidAriError when ariString is invalid" time="0.001"/>
 <testcase classname="Ari parse" name="should throw InvalidAriError when resourceOwner is null" time="0"/>
-<testcase classname="Ari parse" name="should throw InvalidAriError when resourceOwner too short" time="0"/>
+<testcase classname="Ari parse" name="should throw InvalidAriError when resourceOwner too short" time="0.001"/>
 <testcase classname="Ari parse" name="should throw InvalidAriError when resourceOwner starts with a -" time="0"/>
 <testcase classname="Ari parse" name="should throw InvalidAriError when resourceOwner starts with a ." time="0.001"/>
-<testcase classname="Ari parse" name="should throw InvalidAriError when resourceType starts with a -" time="0.001"/>
-<testcase classname="Ari parse" name="should throw InvalidAriError when resourceType starts with a ." time="0"/>
+<testcase classname="Ari parse" name="should throw InvalidAriError when resourceType starts with a -" time="0"/>
+<testcase classname="Ari parse" name="should throw InvalidAriError when resourceType starts with a ." time="0.001"/>
 <testcase classname="Ari parse" name="should throw InvalidAriError when cloudId too short" time="0"/>
-<testcase classname="Ari parse" name="should throw InvalidAriError when resourceId contains a %" time="0.001"/>
-<testcase classname="Ari parse" name="should throw InvalidAriError when both resourceOwner and cloudId too short" time="0.001"/>
-<testcase classname="Ari parse" name="should throw InvalidAriError when a resource id is provided but the cloud id or resource type is not specified" time="0.001"/>
+<testcase classname="Ari parse" name="should throw InvalidAriError when resourceId contains a %" time="0"/>
+<testcase classname="Ari parse" name="should throw InvalidAriError when both resourceOwner and cloudId too short" time="0"/>
+<testcase classname="Ari parse" name="should throw InvalidAriError when a resource id is provided but the cloud id or resource type is not specified" time="0"/>
 <testcase classname="Ari parse" name="should throw InvalidAriError when a site wide resourceType without a cloudId" time="0"/>
 <testcase classname="Ari parse" name="should correctly format ARI in case of site resource type and cloud id" time="0"/>
 <testcase classname="Ari parse" name="should correctly format ARI in case of site resource type and resource id" time="0"/>
 <testcase classname="Ari parse" name="should correctly parse ari when all fields are present" time="0"/>
 <testcase classname="Ari parse" name="should correctly parse ari when cloudId is omitted" time="0"/>
-<testcase classname="Ari parse" name="should correctly parse ari when a system wide user context provided" time="0.001"/>
+<testcase classname="Ari parse" name="should correctly parse ari when a system wide user context provided" time="0"/>
 <testcase classname="Ari parse" name="should correctly parse ari when resourceId is omitted" time="0"/>
-<testcase classname="Ari parse" name="should correctly parse ari when resourceId and resourceType are omitted" time="0.001"/>
+<testcase classname="Ari parse" name="should correctly parse ari when resourceId and resourceType are omitted" time="0"/>
 <testcase classname="Ari parse" name="should correctly parse ari when resourceOwner contains a full stop" time="0"/>
 <testcase classname="Ari parse" name="should correctly parse ari when resourceOwner contains a dash" time="0"/>
 <testcase classname="Ari parse" name="should correctly parse ari when a global system context provided" time="0"/>
@@ -51,41 +55,47 @@
 <testcase classname="Ari parse" name="should correctly parse ari when application wide system context provided" time="0"/>
 <testcase classname="Ari parse" name="should correctly parse ari when site wide context" time="0"/>
 <testcase classname="Ari parse" name="should correctly parse ari when ARI has colon in resource id" time="0"/>
+<testcase classname="Ari parse" name="should correctly parse ari when ARI has hash in resource id" time="0"/>
 <testcase classname="Ari parse" name="should correctly parse ari when ARI has path characters in resource id" time="0"/>
+<testcase classname="Ari parse" name="should correctly parse ari when resourceType is capitalized" time="0.001"/>
 <testcase classname="Ari urlEncodeAri and urlDecodeAri" name="should be able to urlEncodeAri and urlDecodeAri the ARI" time="0.001"/>
 <testcase classname="Ari urlEncodeAri and urlDecodeAri" name="should be able to urlEncodeAri and urlDecodeAri the ARI when a part of resource Id has a /" time="0"/>
 <testcase classname="Ari urlEncodeAri and urlDecodeAri" name="should be able to parse a encoded ARI" time="0"/>
-<testcase classname="Ari contains" name="should return true when both contexts are the same" time="0.001"/>
-<testcase classname="Ari contains" name="should return true when self is broader than other context" time="0"/>
-<testcase classname="Ari contains" name="should return false when other context is broader than self" time="0.012"/>
-<testcase classname="Ari contains" name="should return false when self resource Id is different than other context resource Id" time="0"/>
+<testcase classname="Ari contains" name="should return true when both contexts are the same" time="0"/>
+<testcase classname="Ari contains" name="should return true when self is broader than other context" time="0.001"/>
+<testcase classname="Ari contains" name="should return false when other context is broader than self" time="0"/>
+<testcase classname="Ari contains" name="should return false when self resource Id is different than other context resource Id" time="0.001"/>
 <testcase classname="Ari contains" name="should return false when self resource type is different than other context resource type" time="0"/>
 <testcase classname="Ari contains" name="should return false when self cloud Id is different than other cloud Id" time="0"/>
 <testcase classname="Ari contains" name="should return false when self resource owner is different than other" time="0"/>
 <testcase classname="Ari contains" name="should return false when self cloud Id is undefined" time="0"/>
 <testcase classname="Ari contains" name="should contain site resource type ARI with cloudIds in different fields" time="0"/>
 <testcase classname="Ari cloudId" name="should return cloud ids for site resource type" time="0"/>
-<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when an app ari" time="0.003"/>
-<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when an environment group ari" time="0.002"/>
-<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when an environment group ari with version" time="0"/>
-<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when an extension group ari" time="0.001"/>
-<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when a static extension-group group ari" time="0.001"/>
-<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when a defaulted static environment group ari" time="0.001"/>
-<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when an extension group ari with version" time="0.001"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when an app ari" time="0.002"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when an environment group ari" time="0"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when an environment group ari with version" time="0.001"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when an extension group ari" time="0"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when a static extension-group group ari" time="0"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when a defaulted static environment group ari" time="0"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when an extension group ari with version" time="0"/>
 <testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when a static extension-group group ari with version" time="0"/>
-<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when a defaulted static environment group ari with version" time="0"/>
-<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when an extension ari" time="0.001"/>
-<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when an extension ari with static extension group" time="0"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when a defaulted static environment group ari with version" time="0.001"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when an extension ari" time="0"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should correctly parse ari when an extension ari with static extension group" time="0.001"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should throw InvalidAriError when app ID is not a valid UUID" time="0"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should throw InvalidAriError when environment ID is not a valid UUID" time="0.001"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should throw InvalidAriError when extension group ID is not a valid UUID" time="0"/>
 <testcase classname="AppFamilyAri parseAppAri" name="should throw NotAppFamilyAriError when extra segs on app ari" time="0"/>
-<testcase classname="AppFamilyAri parseAppAri" name="should throw NotAppFamilyAriError when extra segs on environment ari" time="0"/>
-<testcase classname="AppFamilyAri parseAppAri" name="should throw NotAppFamilyAriError when extra segs on extension group ari" time="0.001"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should throw NotAppFamilyAriError when extra segs on environment ari" time="0.001"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should throw NotAppFamilyAriError when extra segs on extension group ari" time="0"/>
 <testcase classname="AppFamilyAri parseAppAri" name="should throw NotAppFamilyAriError when extra segs on extension ari" time="0"/>
-<testcase classname="AppFamilyAri parseAppAri" name="should throw NotAppFamilyAriError when too few segs on extension ari" time="0"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should throw NotAppFamilyAriError when too few segs on extension ari" time="0.001"/>
 <testcase classname="AppFamilyAri parseAppAri" name="should throw NotAppFamilyAriError when too few segs on extension group ari" time="0"/>
-<testcase classname="AppFamilyAri parseAppAri" name="should throw NotAppFamilyAriError when too few segs on environment ari" time="0.001"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should throw NotAppFamilyAriError when too few segs on environment ari" time="0"/>
 <testcase classname="AppFamilyAri parseAppAri" name="should throw NotAppFamilyAriError when too few segs on app ari" time="0"/>
-<testcase classname="AppFamilyAri parseAppAri" name="should throw NotAppFamilyAriError when empty segs on extension group ari" time="0.001"/>
-<testcase classname="AppFamilyAri toAri" name="should correctly convert to ari when an app ari" time="0.001"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should throw InvalidAriError when empty first seg on extension group ARI" time="0"/>
+<testcase classname="AppFamilyAri parseAppAri" name="should throw NotAppFamilyAriError when empty segs on extension group ari" time="0"/>
+<testcase classname="AppFamilyAri toAri" name="should correctly convert to ari when an app ari" time="0"/>
 <testcase classname="AppFamilyAri toAri" name="should correctly convert to ari when an environment group ari" time="0"/>
 <testcase classname="AppFamilyAri toAri" name="should correctly convert to ari when an environment group ari with version" time="0"/>
 <testcase classname="AppFamilyAri toAri" name="should correctly convert to ari when an extension group ari" time="0"/>