@forge/cli

Index: package/out/devspace/graphql-client.js
===================================================================
--- package/out/devspace/graphql-client.js
+++ package/out/devspace/graphql-client.js
@@ -7,23 +7,23 @@
     constructor(graphqlClient) {
         this.graphqlClient = graphqlClient;
     }
     async getDevSpacesWithLinkingAccess() {
-        const query = `
+        const query = (0, cli_shared_1.graphql)(`
       query GetDevSpaceWithLinkingAccess {
         ecosystem {
           devConsole {
             getDeveloperSpaceWithLinkingAccess
           }
         }
       }
-    `;
+    `);
         const result = await this.graphqlClient.query(query, {});
         const devSpaceIds = result?.ecosystem?.devConsole?.getDeveloperSpaceWithLinkingAccess;
         if (!devSpaceIds || !Array.isArray(devSpaceIds)) {
             return [];
         }
-        return devSpaceIds;
+        return devSpaceIds.filter((id) => id != null);
     }
     async getDevSpaceDetails(devSpaceIds) {
         const batchSize = 10;
         const batches = [];
@@ -44,9 +44,9 @@
         }
         return devSpaceDetails;
     }
     async getDevSpaceDetailsBulk(devSpaceIds) {
-        const query = `
+        const query = (0, cli_shared_1.graphql)(`
       query GetDevSpaceDetails($devSpaceIds: [String!]!) {
         ecosystem {
           devConsole {
             getDeveloperSpaceDetails(developerSpaceIds: $devSpaceIds) {
@@ -62,20 +62,20 @@
             }
           }
         }
       }
-    `;
+    `);
         const result = await this.graphqlClient.query(query, {
             devSpaceIds: devSpaceIds
         });
         const bulkResult = result?.ecosystem?.devConsole?.getDeveloperSpaceDetails;
         if (!bulkResult || !bulkResult.results || !Array.isArray(bulkResult.results)) {
             return [];
         }
-        return bulkResult.results;
+        return bulkResult.results.filter((result) => result != null);
     }
     async createDevSpace(input) {
-        const mutation = `
+        const mutation = (0, cli_shared_1.graphql)(`
       mutation CreateDeveloperSpace($input: DevConsoleCreateDeveloperSpaceInput!) {
         ecosystem {
           devConsole {
             createDeveloperSpace(input: $input) {
@@ -94,24 +94,29 @@
             }
           }
         }
       }
-    `;
-        const { response: { ecosystem: { devConsole: { createDeveloperSpace: { devSpace, success, errors } } } }, requestId } = await this.graphqlClient.mutate(mutation, {
+    `);
+        const { response, requestId } = await this.graphqlClient.mutate(mutation, {
             input
         });
+        const { createDeveloperSpace } = (0, cli_shared_1.requireMutationPayload)((0, cli_shared_1.requireMutationPayload)(response.ecosystem, requestId).devConsole, requestId);
+        const { devSpace, success, errors } = (0, cli_shared_1.requireMutationPayload)(createDeveloperSpace, requestId);
         if (!success) {
             const error = (0, cli_shared_1.getError)(errors);
             throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, {
                 requestId,
                 code: error.code,
                 statusCode: error.statusCode
             });
         }
+        if (!devSpace) {
+            throw new cli_shared_1.GraphQlMutationError(`Unable to get a response (requestId: ${requestId || 'unknown'})`, { requestId });
+        }
         return devSpace;
     }
     async getAppEnforcementMetadata(appId) {
-        const query = `
+        const query = (0, cli_shared_1.graphql)(`
       query getAppEnforcementMetadata($appId: ID!) {
         ecosystem {
           devConsole {
             getAppEnforcementMetadata(appId: $appId) {
@@ -125,11 +130,17 @@
             }
           }
         }
       }
-    `;
+    `);
         const result = await this.graphqlClient.query(query, { appId });
-        return result?.ecosystem?.devConsole?.getAppEnforcementMetadata;
+        const metadata = result?.ecosystem?.devConsole?.getAppEnforcementMetadata;
+        if (!metadata) {
+            throw new cli_shared_1.GraphQlMutationError(`Unable to get a response (requestId: ${result.requestId || 'unknown'})`, {
+                requestId: result.requestId
+            });
+        }
+        return metadata;
     }
 }
 exports.DevSpaceGraphQLClient = DevSpaceGraphQLClient;
 //# sourceMappingURL=graphql-client.js.map
\ No newline at end of file