eas-cli 3.16.0 → 3.17.1

package/build/channel/queries.js

@@ -1,16 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureChannelExistsAsync = exports.createChannelOnAppAsync = exports.listAndRenderBranchesAndUpdatesOnChannelAsync = exports.listAndRenderChannelsOnAppAsync = exports.selectChannelOnAppAsync = exports.CHANNELS_LIMIT = void 0;
+exports.getChannelsDatasetAsync = exports.ensureChannelExistsAsync = exports.createChannelOnAppAsync = exports.listAndRenderBranchesAndUpdatesOnChannelAsync = exports.listAndRenderChannelsOnAppAsync = exports.selectChannelOnAppAsync = exports.CHANNELS_LIMIT = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const graphql_1 = require("graphql");
 const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
 const client_1 = require("../graphql/client");
 const BranchQuery_1 = require("../graphql/queries/BranchQuery");
 const ChannelQuery_1 = require("../graphql/queries/ChannelQuery");
+const UpdateChannelBasicInfo_1 = require("../graphql/types/UpdateChannelBasicInfo");
 const log_1 = tslib_1.__importDefault(require("../log"));
+const ora_1 = require("../ora");
 const formatFields_1 = tslib_1.__importDefault(require("../utils/formatFields"));
 const json_1 = require("../utils/json");
 const queries_1 = require("../utils/queries");
+const relay_1 = require("../utils/relay");
 const utils_1 = require("./utils");
 exports.CHANNELS_LIMIT = 25;
 async function selectChannelOnAppAsync(graphqlClient, { projectId, selectionPromptTitle, paginatedQueryOptions, }) {
@@ -146,11 +150,11 @@ async function createChannelOnAppAsync(graphqlClient, { appId, branchId, channel
             updateChannel {
               createUpdateChannelForApp(appId: $appId, name: $name, branchMapping: $branchMapping) {
                 id
-                name
-                branchMapping
+                ...UpdateChannelBasicInfoFragment
               }
             }
           }
+          ${(0, graphql_1.print)(UpdateChannelBasicInfo_1.UpdateChannelBasicInfoFragmentNode)}
         `, {
         appId,
         name: channelName,
@@ -177,3 +181,25 @@ async function ensureChannelExistsAsync(graphqlClient, { appId, branchId, channe
     }
 }
 exports.ensureChannelExistsAsync = ensureChannelExistsAsync;
+async function getChannelsDatasetAsync(graphqlClient, { appId, filterPredicate, batchSize = 100, }) {
+    const queryAsync = async ({ first, after, }) => await ChannelQuery_1.ChannelQuery.viewUpdateChannelsBasicInfoPaginatedOnAppAsync(graphqlClient, {
+        appId,
+        first,
+        after,
+    });
+    const assetSpinner = (0, ora_1.ora)().start('Fetching channels...');
+    const afterEachQuery = (totalNodesFetched, _dataset, _batch, pageInfo) => {
+        if (pageInfo.hasNextPage) {
+            assetSpinner.text = `Fetched ${totalNodesFetched} channels`;
+        }
+    };
+    const dataset = await (0, relay_1.getPaginatedDatasetAsync)({
+        queryAsync,
+        afterEachQuery,
+        filterPredicate,
+        batchSize,
+    });
+    assetSpinner.succeed(`Fetched all channels`);
+    return dataset;
+}
+exports.getChannelsDatasetAsync = getChannelsDatasetAsync;

package/build/channel/utils.d.ts

@@ -1,15 +1,5 @@
-import { UpdateChannelObject } from '../graphql/queries/ChannelQuery';
-export type BranchMapping = {
-    version: number;
-    data: {
-        branchId: string;
-        branchMappingLogic: {
-            operand: number;
-            clientKey: string;
-            branchMappingOperator: string;
-        } & string;
-    }[];
-};
+import { UpdateBranchObject, UpdateChannelObject } from '../graphql/queries/ChannelQuery';
+import { BranchMapping } from './branch-mapping';
 /**
  * Get the branch mapping and determine whether it is a rollout.
  * Ensure that the branch mapping is properly formatted.
@@ -20,3 +10,4 @@ export declare function getBranchMapping(branchMappingString?: string): {
     rolloutPercent?: number;
 };
 export declare function logChannelDetails(channel: UpdateChannelObject): void;
+export declare function getUpdateBranch(channel: UpdateChannelObject, branchId: string): UpdateBranchObject;

package/build/channel/utils.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logChannelDetails = exports.getBranchMapping = void 0;
+exports.getUpdateBranch = exports.logChannelDetails = exports.getBranchMapping = void 0;
 const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const log_1 = tslib_1.__importDefault(require("../log"));
 const utils_1 = require("../update/utils");
+const branch_mapping_1 = require("./branch-mapping");
 /**
  * Get the branch mapping and determine whether it is a rollout.
  * Ensure that the branch mapping is properly formatted.
@@ -27,7 +28,12 @@ function getBranchMapping(branchMappingString) {
         throw new Error('Branch mapping must be version 0.');
     }
     const isRollout = branchMapping.data.length === 2;
-    const rolloutPercent = (_a = branchMapping.data[0]) === null || _a === void 0 ? void 0 : _a.branchMappingLogic.operand;
+    const branchMappingNode = (_a = branchMapping.data[0]) === null || _a === void 0 ? void 0 : _a.branchMappingLogic;
+    let rolloutPercent;
+    if ((0, branch_mapping_1.isNodeObject)(branchMappingNode)) {
+        (0, branch_mapping_1.assertNumber)(branchMappingNode.operand);
+        rolloutPercent = branchMappingNode.operand;
+    }
     switch (branchMapping.data.length) {
         case 0:
             break;
@@ -37,10 +43,11 @@ function getBranchMapping(branchMappingString) {
             }
             break;
         case 2:
-            if (branchMapping.data[0].branchMappingLogic.clientKey !== 'rolloutToken') {
+            (0, branch_mapping_1.assertNodeObject)(branchMappingNode);
+            if (branchMappingNode.clientKey !== 'rolloutToken') {
                 throw new Error('Client key of initial branch mapping must be "rolloutToken"');
             }
-            if (branchMapping.data[0].branchMappingLogic.branchMappingOperator !== 'hash_lt') {
+            if (branchMappingNode.branchMappingOperator !== 'hash_lt') {
                 throw new Error('Branch mapping operator of initial branch mapping must be "hash_lt"');
             }
             if (rolloutPercent == null) {
@@ -86,3 +93,16 @@ function logChannelDetails(channel) {
     }
 }
 exports.logChannelDetails = logChannelDetails;
+function getUpdateBranchNullable(channel, branchId) {
+    const updateBranches = channel.updateBranches;
+    const updateBranch = updateBranches.find(branch => branch.id === branchId);
+    return updateBranch !== null && updateBranch !== void 0 ? updateBranch : null;
+}
+function getUpdateBranch(channel, branchId) {
+    const updateBranch = getUpdateBranchNullable(channel, branchId);
+    if (!updateBranch) {
+        throw new Error(`Could not find branch with id "${branchId}" in branch-mapping of channel "${channel.name}"`);
+    }
+    return updateBranch;
+}
+exports.getUpdateBranch = getUpdateBranch;

package/build/commandUtils/context/contextUtils/createGraphqlClient.d.ts

@@ -1,9 +1,9 @@
-import { AnyVariables, Client, OperationContext, OperationResult, PromisifiedSource, TypedDocumentNode } from '@urql/core';
+import { AnyVariables, Client, OperationContext, OperationResult, OperationResultSource, TypedDocumentNode } from '@urql/core';
 import { DocumentNode } from 'graphql';
 export interface ExpoGraphqlClient extends Client {
     query<Data = any, Variables extends AnyVariables = AnyVariables>(query: DocumentNode | TypedDocumentNode<Data, Variables> | string, variables: Variables, context: Partial<OperationContext> & {
         additionalTypenames: string[];
-    }): PromisifiedSource<OperationResult<Data, Variables>>;
+    }): OperationResultSource<OperationResult<Data, Variables>>;
 }
 export declare function createGraphqlClient(authInfo: {
     accessToken: string | null;

package/build/commandUtils/context/contextUtils/createGraphqlClient.js

@@ -11,7 +11,6 @@ function createGraphqlClient(authInfo) {
     return (0, core_1.createClient)({
         url: (0, api_1.getExpoApiBaseUrl)() + '/graphql',
         exchanges: [
-            core_1.dedupExchange,
             core_1.cacheExchange,
             (0, exchange_retry_1.retryExchange)({
                 maxDelayMs: 4000,

package/build/commands/channel/edit.d.ts

@@ -1,7 +1,7 @@
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { UpdateChannelBranchMappingMutation, UpdateChannelBranchMappingMutationVariables } from '../../graphql/generated';
-export declare function updateChannelBranchMappingAsync(graphqlClient: ExpoGraphqlClient, { channelId, branchMapping }: UpdateChannelBranchMappingMutationVariables): Promise<UpdateChannelBranchMappingMutation['updateChannel']['editUpdateChannel']>;
+import { UpdateChannelBasicInfoFragment, UpdateChannelBranchMappingMutationVariables } from '../../graphql/generated';
+export declare function updateChannelBranchMappingAsync(graphqlClient: ExpoGraphqlClient, { channelId, branchMapping }: UpdateChannelBranchMappingMutationVariables): Promise<UpdateChannelBasicInfoFragment>;
 export default class ChannelEdit extends EasCommand {
     static description: string;
     static args: {

package/build/commands/channel/edit.js

@@ -5,6 +5,7 @@ exports.updateChannelBranchMappingAsync = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const graphql_1 = require("graphql");
 const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
 const queries_1 = require("../../branch/queries");
 const queries_2 = require("../../channel/queries");
@@ -13,6 +14,7 @@ const flags_1 = require("../../commandUtils/flags");
 const client_1 = require("../../graphql/client");
 const BranchQuery_1 = require("../../graphql/queries/BranchQuery");
 const ChannelQuery_1 = require("../../graphql/queries/ChannelQuery");
+const UpdateChannelBasicInfo_1 = require("../../graphql/types/UpdateChannelBasicInfo");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const json_1 = require("../../utils/json");
 async function updateChannelBranchMappingAsync(graphqlClient, { channelId, branchMapping }) {
@@ -22,11 +24,11 @@ async function updateChannelBranchMappingAsync(graphqlClient, { channelId, branc
             updateChannel {
               editUpdateChannel(channelId: $channelId, branchMapping: $branchMapping) {
                 id
-                name
-                branchMapping
+                ...UpdateChannelBasicInfoFragment
               }
             }
           }
+          ${(0, graphql_1.print)(UpdateChannelBasicInfo_1.UpdateChannelBasicInfoFragmentNode)}
         `, { channelId, branchMapping })
         .toPromise());
     const channel = data.updateChannel.editUpdateChannel;

package/build/commands/channel/rollout.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const queries_1 = require("../../branch/queries");
+const branch_mapping_1 = require("../../channel/branch-mapping");
 const queries_2 = require("../../channel/queries");
 const utils_1 = require("../../channel/utils");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
@@ -35,6 +36,7 @@ async function promptForRolloutPercentAsync({ promptMessage, }) {
     return rolloutPercent;
 }
 function getRolloutInfo(channel) {
+    var _b;
     const { branchMapping } = (0, utils_1.getBranchMapping)(channel.branchMapping);
     const [newBranchId, oldBranchId] = branchMapping.data.map(d => d.branchId);
     const newBranch = channel.updateBranches.filter(branch => branch.id === newBranchId)[0];
@@ -42,7 +44,10 @@ function getRolloutInfo(channel) {
     if (!newBranch || !oldBranch) {
         throw new Error(`Branch mapping rollout is missing a branch for channel "${channel.name}".`);
     }
-    const currentPercent = 100 * branchMapping.data[0].branchMappingLogic.operand;
+    const branchMappingNode = (_b = branchMapping.data[0]) === null || _b === void 0 ? void 0 : _b.branchMappingLogic;
+    (0, branch_mapping_1.assertNodeObject)(branchMappingNode);
+    (0, branch_mapping_1.assertNumber)(branchMappingNode.operand);
+    const currentPercent = 100 * branchMappingNode.operand;
     return { newBranch, oldBranch, currentPercent };
 }
 async function startRolloutAsync(graphqlClient, { channelName, branchName, percent, projectId, displayName, currentBranchMapping, channel, nonInteractive, }) {

package/build/credentials/android/api/graphql/mutations/AndroidAppBuildCredentialsMutation.js

@@ -37,7 +37,7 @@ exports.AndroidAppBuildCredentialsMutation = {
     async setDefaultAndroidAppBuildCredentialsAsync(graphqlClient, androidAppBuildCredentialsId) {
         const data = await (0, client_1.withErrorHandlingAsync)(graphqlClient
             .mutation((0, graphql_tag_1.default) `
-            mutation AndroidAppBuildCredentialsMutation(
+            mutation SetDefaultAndroidAppBuildCredentialsMutation(
               $androidAppBuildCredentialsId: ID!
               $isDefault: Boolean!
             ) {
@@ -55,7 +55,7 @@ exports.AndroidAppBuildCredentialsMutation = {
         })
             .toPromise());
         (0, assert_1.default)(data, `GraphQL: 'setDefault' not defined in server response ${JSON.stringify(data)}}`);
-        return data;
+        return data.androidAppBuildCredentials.setDefault;
     },
     async setKeystoreAsync(graphqlClient, androidAppBuildCredentialsId, keystoreId) {
         const data = await (0, client_1.withErrorHandlingAsync)(graphqlClient