@forge/cli 0.0.0-experimental-e8bfa83 → 0.0.0-experimental-c3effe3

package/out/deploy/packager/archiver.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
+import { Logger } from '@forge/cli-shared';
 export interface Archiver {
     addFile(fileName: string, contents: Buffer): void;
-    addManifestFile(filePath: string): void;
+    addRootDependencyFiles(filePaths: string[], logger: Logger): void;
     finalise(): Promise<string>;
     onWarning(cb: (err: Error) => void): void;
     onEntry(cb: (filePath: string) => void): void;
@@ -13,7 +14,7 @@ export declare class ZipArchiver implements Archiver {
     private rejects;
     constructor();
     addFile(fileName: string, contents: Buffer): void;
-    addManifestFile(filePath: string): void;
+    addRootDependencyFiles(fileNames: string[], logger: Logger): void;
     finalise(): Promise<string>;
     onWarning(cb: (err: Error) => void): void;
     onEntry(cb: (filePath: string) => void): void;

package/out/deploy/packager/archiver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/archiver.ts"],"names":[],"mappings":";AAMA,MAAM,WAAW,QAAQ;IACvB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAClD,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5B,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAC;IAC1C,OAAO,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;CAC/C;AAED,qBAAa,WAAY,YAAW,QAAQ;IAC1C,OAAO,CAAC,OAAO,CAAmB;IAClC,OAAO,CAAC,QAAQ,CAAqC;IACrD,OAAO,CAAC,QAAQ,CAAsC;IACtD,OAAO,CAAC,OAAO,CAAmC;;IAU3C,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAIjD,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAIvC,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;IAS3B,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI;IAIlC,OAAO,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI;IAQ7C,OAAO,CAAC,cAAc,CAIpB;IAEF,OAAO,CAAC,OAAO,CAIb;CACH"}
+{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/archiver.ts"],"names":[],"mappings":";AAKA,OAAO,EAAE,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAEjD,MAAM,WAAW,QAAQ;IACvB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAClD,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAClE,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5B,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAC;IAC1C,OAAO,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;CAC/C;AAED,qBAAa,WAAY,YAAW,QAAQ;IAC1C,OAAO,CAAC,OAAO,CAAmB;IAClC,OAAO,CAAC,QAAQ,CAAqC;IACrD,OAAO,CAAC,QAAQ,CAAsC;IACtD,OAAO,CAAC,OAAO,CAAmC;;IAU3C,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAIjD,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAWjE,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;IAS3B,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI;IAIlC,OAAO,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI;IAQ7C,OAAO,CAAC,cAAc,CAIpB;IAEF,OAAO,CAAC,OAAO,CAIb;CACH"}

package/out/deploy/packager/archiver.js

@@ -4,6 +4,7 @@ exports.ZipArchiver = void 0;
 const tslib_1 = require("tslib");
 const archiver_1 = tslib_1.__importDefault(require("archiver"));
 const fs_1 = require("fs");
+const path_1 = require("path");
 const tmp_1 = tslib_1.__importDefault(require("tmp"));
 const cli_shared_1 = require("@forge/cli-shared");
 class ZipArchiver {
@@ -30,8 +31,15 @@ class ZipArchiver {
     addFile(fileName, contents) {
         this.archive.append(contents, { name: fileName });
     }
-    addManifestFile(filePath) {
-        this.archive.file(filePath, { name: cli_shared_1.manifestFilename });
+    addRootDependencyFiles(fileNames, logger) {
+        const currentDirectory = process.cwd();
+        fileNames.forEach((fileName) => {
+            const filePath = path_1.join(currentDirectory, fileName);
+            if (fs_1.existsSync(filePath)) {
+                logger.debug(cli_shared_1.Text.deploy.taskPackage.packageFile(fileName, filePath));
+                this.archive.file(filePath, { name: fileName });
+            }
+        });
     }
     finalise() {
         return new Promise((resolve, reject) => {

package/out/deploy/packager/packager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"packager.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/packager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAA0B,MAAM,mBAAmB,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACvC,SAAS,CAAC,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC3C,QAAQ,CAAC,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH;AAED,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CAC1D;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,YAAa,SAAQ,KAAK;CAAG;AAE1C,qBAAa,WAAY,YAAW,QAAQ;IAExC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAFN,eAAe,EAAE,MAAM,QAAQ,EAC/B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO;IAGrB,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;CA0DtE"}
+{"version":3,"file":"packager.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/packager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAEtE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACvC,SAAS,CAAC,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC3C,QAAQ,CAAC,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH;AAED,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CAC1D;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,YAAa,SAAQ,KAAK;CAAG;AAE1C,qBAAa,WAAY,YAAW,QAAQ;IAExC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAFN,eAAe,EAAE,MAAM,QAAQ,EAC/B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO;IAGrB,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;CA0DtE"}

package/out/deploy/packager/packager.js

@@ -30,29 +30,29 @@ class AppPackager {
                 path: path_1.join(currentDirectory, 'src', handler)
             });
         }
-        let bundlerResponse;
-        try {
-            bundlerResponse = await this.bundle(process.cwd(), entryPoints);
-        }
-        catch (e) {
-            throw new BundlerError(e.message);
-        }
-        const { output, sourceMap, metadata } = bundlerResponse;
-        if (metadata) {
-            moduleList = metadata.modules;
-        }
-        this.logger.debug(cli_shared_1.Text.deploy.taskPackage.packageBundledFiles);
-        for (const { name } of entryPoints) {
-            archiver.addFile(`${name}.js`, Buffer.from(output[name]));
-        }
-        if (sourceMap) {
+        if (entryPoints.length > 0) {
+            let bundlerResponse;
+            try {
+                bundlerResponse = await this.bundle(process.cwd(), entryPoints);
+            }
+            catch (e) {
+                throw new BundlerError(e.message);
+            }
+            const { output, sourceMap, metadata } = bundlerResponse;
+            if (metadata) {
+                moduleList = metadata.modules;
+            }
+            this.logger.debug(cli_shared_1.Text.deploy.taskPackage.packageBundledFiles);
             for (const { name } of entryPoints) {
-                archiver.addFile(`${name}.js.map`, Buffer.from(sourceMap[name]));
+                archiver.addFile(`${name}.js`, Buffer.from(output[name]));
+            }
+            if (sourceMap) {
+                for (const { name } of entryPoints) {
+                    archiver.addFile(`${name}.js.map`, Buffer.from(sourceMap[name]));
+                }
             }
         }
-        const manifestPath = path_1.resolve(currentDirectory, cli_shared_1.manifestFilename);
-        this.logger.debug(cli_shared_1.Text.deploy.taskPackage.packageManifest(manifestPath));
-        archiver.addManifestFile(manifestPath);
+        archiver.addRootDependencyFiles(cli_shared_1.dependencyFileNames, this.logger);
         const archivePath = await archiver.finalise();
         this.logger.debug(cli_shared_1.Text.deploy.taskPackage.archiveCreated(archivePath));
         return { archivePath, moduleList };

package/out/deploy/uploader/artifact-graphql-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"artifact-graphql-client.d.ts","sourceRoot":"","sources":["../../../src/deploy/uploader/artifact-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,aAAa,EAIb,0BAA0B,EAE3B,MAAM,mBAAmB,CAAC;AAE3B,UAAU,4BAA4B;IACpC,aAAa,EAAE,0BAA0B,EAAE,CAAC;IAC5C,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACtD,4BAA4B,CAC1B,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC,4BAA4B,CAAC,CAAC;CAC1C;AAED,qBAAa,oBAAqB,SAAQ,KAAK;;CAI9C;AAED,qBAAa,oBAAqB,SAAQ,KAAK;;CAI9C;AAED,qBAAa,eAAgB,SAAQ,KAAK;;CAIzC;AAED,qBAAa,qBAAsB,YAAW,cAAc;IAC9C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAuCrD,4BAA4B,CACvC,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC,4BAA4B,CAAC;CA8CzC"}
+{"version":3,"file":"artifact-graphql-client.d.ts","sourceRoot":"","sources":["../../../src/deploy/uploader/artifact-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,aAAa,EAIb,0BAA0B,EAG3B,MAAM,mBAAmB,CAAC;AAE3B,UAAU,4BAA4B;IACpC,aAAa,EAAE,0BAA0B,EAAE,CAAC;IAC5C,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACtD,4BAA4B,CAC1B,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC,4BAA4B,CAAC,CAAC;CAC1C;AAED,qBAAa,oBAAqB,SAAQ,KAAK;;CAI9C;AAED,qBAAa,oBAAqB,SAAQ,KAAK;;CAI9C;AAED,qBAAa,eAAgB,SAAQ,KAAK;;CAIzC;AAED,qBAAa,qBAAsB,YAAW,cAAc;IAC9C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAwCrD,4BAA4B,CACvC,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC,4BAA4B,CAAC;CA+CzC"}

package/out/deploy/uploader/artifact-graphql-client.js

@@ -26,24 +26,27 @@ class ArtifactGraphQLClient {
     }
     async getUploadUrl(appDetails) {
         const artifactQuery = `
-      mutation getUploadUrl($input: CreateAppDeploymentUrlInput!) {
+      mutation forge_cli_getDeploymentUrl($input: CreateAppDeploymentUrlInput!) {
         createAppDeploymentUrl(input: $input) {
           success
-          message
-          errorDetails {
-            code
+          errors {
+            message
+            extensions {
+              errorType
+            }
           }
           deploymentUrl
         }
       }
     `;
-        const { response: { createAppDeploymentUrl: { deploymentUrl, success, errorDetails, message } }, requestId } = await this.graphqlClient.mutate(artifactQuery, {
+        const { response: { createAppDeploymentUrl: { deploymentUrl, success, errors } }, requestId } = await this.graphqlClient.mutate(artifactQuery, {
             input: {
                 appId: appDetails.id
             }
         });
+        const error = cli_shared_1.getError(errors);
         if (!success) {
-            throw new cli_shared_1.GraphQlMutationError(`${message} (requestId: ${requestId || 'unknown'})`, errorDetails ? errorDetails.code : undefined);
+            throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
         }
         if (!deploymentUrl) {
             throw new NoDeploymentURLError();
@@ -52,13 +55,12 @@ class ArtifactGraphQLClient {
     }
     async getHostedResourcesUploadUrls(appDetails, environmentKey, resourceKeys) {
         const artifactQuery = `
-      mutation getHostedResourcesUploadUrls($input: CreateHostedResourceUploadUrlInput!) {
+      mutation forge_cli_getHostedResourcesUploadUrls($input: CreateHostedResourceUploadUrlInput!) {
         createHostedResourceUploadUrl(input: $input) {
           success
           errors {
             message
             extensions {
-              statusCode
               errorType
             }
           }
@@ -77,8 +79,9 @@ class ArtifactGraphQLClient {
                 resourceKeys
             }
         });
+        const error = cli_shared_1.getError(errors);
         if (!success) {
-            throw new cli_shared_1.GraphQlMutationError(`${JSON.stringify(errors)} (requestId: ${requestId || 'unknown'})`);
+            throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
         }
         if (!preSignedUrls) {
             throw new NoPresignedUrlsError();

package/out/environment-variables/graphql-client.d.ts

@@ -9,7 +9,7 @@ export declare class MissingAppEnvironmentError extends Error {
 export declare class GraphqlClient implements SetEnvironmentVariableClient, DeleteEnvironmentVariableClient, ListEnvironmentVariablesClient {
     private readonly graphqlClient;
     constructor(graphqlClient: GraphQLClient);
-    listEnvironmentVariables(details: ListAppEnvironmentVariablesDetails): Promise<import("@forge/cli-shared").AppEnvironmentVariable[] | null | undefined>;
+    listEnvironmentVariables(details: ListAppEnvironmentVariablesDetails): Promise<import("@forge/cli-shared/src").AppEnvironmentVariable[] | null | undefined>;
     setEnvironmentVariable(details: SetAppEnvironmentVariableDetails): Promise<void>;
     deleteEnvironmentVariable(details: DeleteAppEnvironmentVariableDetails): Promise<void>;
 }

package/out/environment-variables/graphql-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/environment-variables/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAwB,MAAM,mBAAmB,CAAC;AAExE,OAAO,EACL,6BAA6B,IAAI,mCAAmC,EACpE,+BAA+B,EAChC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,8BAA8B,IAAI,kCAAkC,EACpE,8BAA8B,EAC/B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,6BAA6B,IAAI,gCAAgC,EACjE,4BAA4B,EAC7B,MAAM,4BAA4B,CAAC;AAEpC,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAC7C,qBAAa,0BAA2B,SAAQ,KAAK;CAAG;AAExD,qBAAa,aACX,YAAW,4BAA4B,EAAE,+BAA+B,EAAE,8BAA8B;IAC5F,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,wBAAwB,CAAC,OAAO,EAAE,kCAAkC;IAkCpE,sBAAsB,CAAC,OAAO,EAAE,gCAAgC;IAwChE,yBAAyB,CAAC,OAAO,EAAE,mCAAmC;CAsCpF"}
+{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/environment-variables/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,aAAa,EAAwB,MAAM,mBAAmB,CAAC;AAElF,OAAO,EACL,6BAA6B,IAAI,mCAAmC,EACpE,+BAA+B,EAChC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,8BAA8B,IAAI,kCAAkC,EACpE,8BAA8B,EAC/B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,6BAA6B,IAAI,gCAAgC,EACjE,4BAA4B,EAC7B,MAAM,4BAA4B,CAAC;AAEpC,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAC7C,qBAAa,0BAA2B,SAAQ,KAAK;CAAG;AAExD,qBAAa,aACX,YAAW,4BAA4B,EAAE,+BAA+B,EAAE,8BAA8B;IAC5F,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,wBAAwB,CAAC,OAAO,EAAE,kCAAkC;IAkCpE,sBAAsB,CAAC,OAAO,EAAE,gCAAgC;IAyChE,yBAAyB,CAAC,OAAO,EAAE,mCAAmC;CAuCpF"}

package/out/environment-variables/graphql-client.js

@@ -14,7 +14,7 @@ class GraphqlClient {
     }
     async listEnvironmentVariables(details) {
         const query = `
-      query app($appId: ID!, $key: String!) {
+      query forge_cli_getAppEnvironmentVariables($appId: ID!, $key: String!) {
         app(id: $appId) {
           name
           description
@@ -43,17 +43,19 @@ class GraphqlClient {
     }
     async setEnvironmentVariable(details) {
         const mutation = `
-      mutation setAppEnvironmentVariable($input: SetAppEnvironmentVariableInput!) {
+      mutation forge_cli_setAppEnvironmentVariable($input: SetAppEnvironmentVariableInput!) {
         setAppEnvironmentVariable(input: $input) {
           success
-          message
-          errorDetails {
-            code
+          errors {
+            message
+            extensions {
+              errorType
+            }
           }
         }
       }
     `;
-        const { response: { setAppEnvironmentVariable: { message, success, errorDetails } }, requestId } = await this.graphqlClient.mutate(mutation, {
+        const { response: { setAppEnvironmentVariable: { success, errors } }, requestId } = await this.graphqlClient.mutate(mutation, {
             input: {
                 environment: {
                     appId: details.appId,
@@ -66,23 +68,26 @@ class GraphqlClient {
                 }
             }
         });
+        const error = cli_shared_1.getError(errors);
         if (!success) {
-            throw new cli_shared_1.GraphQlMutationError(`${message} (requestId: ${requestId || 'unknown'})`, errorDetails ? errorDetails.code : undefined);
+            throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
         }
     }
     async deleteEnvironmentVariable(details) {
         const mutation = `
-      mutation deleteAppEnvironmentVariable($input: DeleteAppEnvironmentVariableInput!) {
+      mutation forge_cli_deleteAppEnvironmentVariable($input: DeleteAppEnvironmentVariableInput!) {
         deleteAppEnvironmentVariable(input: $input) {
           success
-          message
-          errorDetails {
-            code
+          errors {
+            message
+            extensions {
+              errorType
+            }
           }
         }
       }
     `;
-        const { response: { deleteAppEnvironmentVariable: { message, success, errorDetails } }, requestId } = await this.graphqlClient.mutate(mutation, {
+        const { response: { deleteAppEnvironmentVariable: { success, errors } }, requestId } = await this.graphqlClient.mutate(mutation, {
             input: {
                 environment: {
                     appId: details.appId,
@@ -91,8 +96,9 @@ class GraphqlClient {
                 key: details.key
             }
         });
+        const error = cli_shared_1.getError(errors);
         if (!success) {
-            throw new cli_shared_1.GraphQlMutationError(`${message} (requestId: ${requestId || 'unknown'})`, errorDetails ? errorDetails.code : undefined);
+            throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
         }
     }
 }

package/out/installations/graphql-client.d.ts

@@ -1,11 +1,15 @@
 /// <reference types="node" />
 import { URL } from 'url';
-import { AppEnvironment, GraphQLClient, GraphQlMutationError } from '@forge/cli-shared';
+import { AppEnvironment, GraphQLClient, GraphQlMutationError, Pause } from '@forge/cli-shared';
 import { AppUninstallationInput } from '@forge/cli-shared';
 import { AppInstallSiteDetails, InstallAppClient } from './install-app-site';
 import { Installation, ListAppInstallationsClient, UpgradeAppInstallationsClient } from '../service/installation-service';
 import { UninstallAppClient, UninstallAppOutput } from './uninstall-app';
+export declare const UNINSTALLATION_EVENT_POLL_INTERVAL = 500;
 export declare const ALREADY_UPGRADED_CODE = "INSTALLATION_ALREADY_UPGRADED";
+export declare class PermissionDeniedError extends GraphQlMutationError {
+    constructor(requestId?: string, appId?: string);
+}
 export declare class AlreadyInstalledError extends GraphQlMutationError {
     constructor();
 }
@@ -17,10 +21,14 @@ export declare class UpgradeError extends GraphQlMutationError {
 }
 export declare class EnvironmentNotFoundError extends Error {
 }
-export declare class MissingInstallationDetailsError extends Error {
+export declare class MissingTaskIdError extends Error {
+}
+export declare class InstallationRequestFailedError extends Error {
 }
 export declare class MissingAppError extends Error {
 }
+export declare class MissingAppUninstallTask extends Error {
+}
 export declare class InstallationNotFoundError extends Error {
 }
 export declare class UnknownSiteWithoutCloudIdError extends Error {
@@ -31,24 +39,22 @@ export declare class InvalidAtlassianSiteError extends Error {
 }
 export declare class InstallationsGraphqlClient implements InstallAppClient, ListAppInstallationsClient, UninstallAppClient, UpgradeAppInstallationsClient {
     private readonly graphqlClient;
+    private readonly pause;
     static buildInstallationContext(product: string, cloudId: string): string;
-    constructor(graphqlClient: GraphQLClient);
-    installAppIntoSite({ environmentKey, site, product, appId }: AppInstallSiteDetails): Promise<{
-        installationId: string;
-        authorizationUrl: any;
-    }>;
-    upgradeInstallation({ site, product, environmentKey, appId }: AppInstallSiteDetails): Promise<{
-        installationId: string;
-        authorizationUrl: string | null | undefined;
-    }>;
-    uninstallApp(input: AppUninstallationInput): Promise<void>;
+    constructor(graphqlClient: GraphQLClient, pause: Pause);
+    installAppIntoSite({ environmentKey, site, product, appId }: AppInstallSiteDetails): Promise<void>;
+    upgradeInstallation({ site, product, environmentKey, appId }: AppInstallSiteDetails): Promise<void>;
+    private monitorAppInstallOrUpgrade;
+    uninstallApp(input: AppUninstallationInput): Promise<boolean>;
     uninstallMultipleApps(apps: AppUninstallationInput[]): Promise<Partial<UninstallAppOutput>[]>;
     listInstallations(appId: string): Promise<Installation[]>;
     getInstallation(appId: string, installationId: string): Promise<Installation>;
+    private getAppInstallationTask;
+    private monitorUninstallApp;
     private createCloudIdToHostnameMap;
     private resolveInstallationsHostnames;
     private getAllInstallations;
     private getCloudId;
-    getScopes(appId: string, environmentKey: string): Promise<AppEnvironment['scopes']>;
+    getVersions(appId: string, environmentKey: string, firstN?: number): Promise<AppEnvironment['versions']>;
 }
 //# sourceMappingURL=graphql-client.d.ts.map

package/out/installations/graphql-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,oBAAoB,EAA0B,MAAM,mBAAmB,CAAC;AAChH,OAAO,EAEL,sBAAsB,EAOvB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EACL,YAAY,EACZ,0BAA0B,EAC1B,6BAA6B,EAC9B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAgBzE,eAAO,MAAM,qBAAqB,kCAAkC,CAAC;AAIrE,qBAAa,qBAAsB,SAAQ,oBAAoB;;CAI9D;AAED,qBAAa,iBAAkB,SAAQ,oBAAoB;gBAC7C,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,YAAa,SAAQ,oBAAoB;gBACxC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,wBAAyB,SAAQ,KAAK;CAAG;AACtD,qBAAa,+BAAgC,SAAQ,KAAK;CAAG;AAC7D,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAC7C,qBAAa,yBAA0B,SAAQ,KAAK;CAAG;AAEvD,qBAAa,8BAA+B,SAAQ,KAAK;;CAIxD;AAED,qBAAa,yBAA0B,SAAQ,KAAK;gBACtC,GAAG,EAAE,GAAG;CAGrB;AAuBD,qBAAa,0BACX,YAAW,gBAAgB,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,6BAA6B;IAW9F,OAAO,CAAC,QAAQ,CAAC,aAAa;WAV5B,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;gBAU1C,aAAa,EAAE,aAAa;IAE5C,kBAAkB,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,qBAAqB;;;;IAgDlF,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,qBAAqB;;;;IA4CnF,YAAY,CAAC,KAAK,EAAE,sBAAsB;IA4B1C,qBAAqB,CAAC,IAAI,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAiB7F,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAKzD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;YAS5E,0BAA0B;YAwB1B,6BAA6B;YAqC7B,mBAAmB;YAsCnB,UAAU;IAgBX,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;CAsBjG"}
+{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EACL,cAAc,EAGd,aAAa,EACb,oBAAoB,EAEpB,KAAK,EACN,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,sBAAsB,EAQvB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EACL,YAAY,EACZ,0BAA0B,EAC1B,6BAA6B,EAC9B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAEzE,eAAO,MAAM,kCAAkC,MAAM,CAAC;AAgBtD,eAAO,MAAM,qBAAqB,kCAAkC,CAAC;AAMrE,qBAAa,qBAAsB,SAAQ,oBAAoB;gBACjD,SAAS,SAAY,EAAE,KAAK,SAAY;CAGrD;AAED,qBAAa,qBAAsB,SAAQ,oBAAoB;;CAI9D;AAED,qBAAa,iBAAkB,SAAQ,oBAAoB;gBAC7C,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,YAAa,SAAQ,oBAAoB;gBACxC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,wBAAyB,SAAQ,KAAK;CAAG;AACtD,qBAAa,kBAAmB,SAAQ,KAAK;CAAG;AAChD,qBAAa,8BAA+B,SAAQ,KAAK;CAAG;AAC5D,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAC7C,qBAAa,uBAAwB,SAAQ,KAAK;CAAG;AACrD,qBAAa,yBAA0B,SAAQ,KAAK;CAAG;AAEvD,qBAAa,8BAA+B,SAAQ,KAAK;;CAIxD;AAED,qBAAa,yBAA0B,SAAQ,KAAK;gBACtC,GAAG,EAAE,GAAG;CAGrB;AAuBD,qBAAa,0BACX,YAAW,gBAAgB,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,6BAA6B;IAW9F,OAAO,CAAC,QAAQ,CAAC,aAAa;IAAiB,OAAO,CAAC,QAAQ,CAAC,KAAK;WAVnE,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;gBAU1C,aAAa,EAAE,aAAa,EAAmB,KAAK,EAAE,KAAK;IAE3E,kBAAkB,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,qBAAqB;IAoDlF,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,qBAAqB;YA8ClF,0BAA0B;IAe3B,YAAY,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC;IAgC7D,qBAAqB,CAAC,IAAI,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAmB7F,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAKzD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;YAS5E,sBAAsB;YA8BtB,mBAAmB;YAiBnB,0BAA0B;YAsC1B,6BAA6B;YAqC7B,mBAAmB;YAsCnB,UAAU;IAgBX,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;CAqCjH"}