eas-cli 18.7.0 → 18.8.1

package/build/commands/update/insights.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const flags_1 = require("../../commandUtils/flags");
+const UpdateInsightsQuery_1 = require("../../graphql/queries/UpdateInsightsQuery");
+const timeRange_1 = require("../../insights/timeRange");
+const log_1 = tslib_1.__importDefault(require("../../log"));
+const formatInsights_1 = require("../../update/insights/formatInsights");
+const json_1 = require("../../utils/json");
+class UpdateInsights extends EasCommand_1.default {
+    static description = 'display launch, crash, unique-user, and size insights for an update group';
+    static args = {
+        groupId: core_1.Args.string({
+            required: true,
+            description: 'The ID of an update group.',
+        }),
+    };
+    static flags = {
+        platform: core_1.Flags.option({
+            description: 'Filter to a single platform.',
+            options: ['ios', 'android'],
+        })(),
+        days: core_1.Flags.integer({
+            description: `Show insights from the last N days (default ${timeRange_1.INSIGHTS_DEFAULT_DAYS_BACK}, mutually exclusive with --start/--end).`,
+            min: 1,
+            exclusive: ['start', 'end'],
+        }),
+        start: core_1.Flags.string({
+            description: 'Start of insights time range (ISO date).',
+            exclusive: ['days'],
+        }),
+        end: core_1.Flags.string({
+            description: 'End of insights time range (ISO date).',
+            exclusive: ['days'],
+        }),
+        ...flags_1.EasNonInteractiveAndJsonFlags,
+    };
+    static contextDefinition = {
+        ...this.ContextOptions.LoggedIn,
+    };
+    async runAsync() {
+        const { args: { groupId }, flags, } = await this.parse(UpdateInsights);
+        const { json, nonInteractive } = (0, flags_1.resolveNonInteractiveAndJsonFlags)(flags);
+        const { loggedIn: { graphqlClient }, } = await this.getContextAsync(UpdateInsights, { nonInteractive });
+        if (json) {
+            (0, json_1.enableJsonOutput)();
+        }
+        const { daysBack, startTime, endTime } = (0, timeRange_1.resolveInsightsTimeRange)(flags);
+        const allUpdates = await UpdateInsightsQuery_1.UpdateInsightsQuery.viewUpdateGroupInsightsAsync(graphqlClient, {
+            groupId,
+            startTime,
+            endTime,
+        });
+        const updates = flags.platform
+            ? allUpdates.filter(u => u.platform === flags.platform)
+            : allUpdates;
+        if (updates.length === 0) {
+            throw new Error(`Update group "${groupId}" has no ${flags.platform} update (available platforms: ${allUpdates
+                .map(u => u.platform)
+                .sort()
+                .join(', ')}).`);
+        }
+        const summary = (0, formatInsights_1.toUpdateInsightsSummary)(groupId, updates, { startTime, endTime, daysBack });
+        if (json) {
+            (0, json_1.printJsonOnlyOutput)((0, formatInsights_1.buildUpdateInsightsJson)(summary));
+        }
+        else {
+            log_1.default.addNewLineIfNone();
+            log_1.default.log((0, formatInsights_1.buildUpdateInsightsTable)(summary));
+        }
+    }
+}
+exports.default = UpdateInsights;

package/build/commands/update/view.d.ts

@@ -6,6 +6,10 @@ export default class UpdateView extends EasCommand {
     };
     static flags: {
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        insights: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        days: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        start: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        end: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     static contextDefinition: {
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;

package/build/commands/update/view.js

@@ -5,8 +5,11 @@ const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const flags_1 = require("../../commandUtils/flags");
+const UpdateInsightsQuery_1 = require("../../graphql/queries/UpdateInsightsQuery");
 const UpdateQuery_1 = require("../../graphql/queries/UpdateQuery");
+const timeRange_1 = require("../../insights/timeRange");
 const log_1 = tslib_1.__importDefault(require("../../log"));
+const formatInsights_1 = require("../../update/insights/formatInsights");
 const utils_1 = require("../../update/utils");
 const json_1 = require("../../utils/json");
 class UpdateView extends EasCommand_1.default {
@@ -18,25 +21,67 @@ class UpdateView extends EasCommand_1.default {
         }),
     };
     static flags = {
+        insights: core_1.Flags.boolean({
+            description: 'Also show insights (launches, crash rate, unique users, payload size) for the update group.',
+            default: false,
+        }),
+        days: core_1.Flags.integer({
+            description: 'Show insights from the last N days (default 7). Only used with --insights.',
+            min: 1,
+            exclusive: ['start', 'end'],
+        }),
+        start: core_1.Flags.string({
+            description: 'Start of insights time range (ISO date). Only used with --insights.',
+            exclusive: ['days'],
+        }),
+        end: core_1.Flags.string({
+            description: 'End of insights time range (ISO date). Only used with --insights.',
+            exclusive: ['days'],
+        }),
         ...flags_1.EasJsonOnlyFlag,
     };
     static contextDefinition = {
         ...this.ContextOptions.LoggedIn,
     };
     async runAsync() {
-        const { args: { groupId }, flags: { json: jsonFlag }, } = await this.parse(UpdateView);
+        const { args: { groupId }, flags: { json: jsonFlag, insights: insightsFlag, days, start, end }, } = await this.parse(UpdateView);
+        if (!insightsFlag && (days !== undefined || start !== undefined || end !== undefined)) {
+            throw new Error('--days, --start, and --end can only be used with --insights.');
+        }
         const { loggedIn: { graphqlClient }, } = await this.getContextAsync(UpdateView, { nonInteractive: true });
         if (jsonFlag) {
             (0, json_1.enableJsonOutput)();
         }
         const updatesByGroup = await UpdateQuery_1.UpdateQuery.viewUpdateGroupAsync(graphqlClient, { groupId });
+        let insightsSummary = null;
+        if (insightsFlag) {
+            const { daysBack, startTime, endTime } = (0, timeRange_1.resolveInsightsTimeRange)({ days, start, end });
+            const updatesWithInsights = await UpdateInsightsQuery_1.UpdateInsightsQuery.viewUpdateGroupInsightsAsync(graphqlClient, { groupId, startTime, endTime });
+            insightsSummary = (0, formatInsights_1.toUpdateInsightsSummary)(groupId, updatesWithInsights, {
+                startTime,
+                endTime,
+                daysBack,
+            });
+        }
         if (jsonFlag) {
-            (0, json_1.printJsonOnlyOutput)((0, utils_1.getUpdateJsonInfosForUpdates)(updatesByGroup));
+            if (insightsSummary) {
+                (0, json_1.printJsonOnlyOutput)({
+                    updates: (0, utils_1.getUpdateJsonInfosForUpdates)(updatesByGroup),
+                    insights: (0, formatInsights_1.buildUpdateInsightsJson)(insightsSummary),
+                });
+            }
+            else {
+                (0, json_1.printJsonOnlyOutput)((0, utils_1.getUpdateJsonInfosForUpdates)(updatesByGroup));
+            }
         }
         else {
             const [updateGroupDescription] = (0, utils_1.getUpdateGroupDescriptions)([updatesByGroup]);
             log_1.default.log(chalk_1.default.bold('Update group:'));
             log_1.default.log((0, utils_1.formatUpdateGroup)(updateGroupDescription));
+            if (insightsSummary) {
+                log_1.default.addNewLineIfNone();
+                log_1.default.log((0, formatInsights_1.buildUpdateInsightsTable)(insightsSummary));
+            }
         }
     }
 }

package/build/credentials/ios/appstore/capabilityIdentifiers.js

@@ -34,6 +34,19 @@ async function syncCapabilityIdentifiersForEntitlementsAsync(bundleId, entitleme
     // these are only APPLE_PAY, ICLOUD, APP_GROUPS
     const CapabilityIdMapping = capabilityList_1.CapabilityMapping.filter(capability => capability.capabilityIdModel);
     const updateRequest = [];
+    // Fetch the bundle with its linked capability identifiers to check for already linked identifiers.
+    const bundleWithRelationships = await apple_utils_1.BundleId.infoAsync(bundleId.context, {
+        id: bundleId.id,
+        query: {
+            includes: [
+                'bundleIdCapabilities',
+                'bundleIdCapabilities.appGroups',
+                'bundleIdCapabilities.merchantIds',
+                'bundleIdCapabilities.cloudContainers',
+            ],
+        },
+    });
+    const linkedBundleCapabilities = bundleWithRelationships.attributes.bundleIdCapabilities ?? [];
     // Iterate through the supported capabilities to build the request.
     for (const classifier of CapabilityIdMapping) {
         const CapabilityModel = classifier.capabilityIdModel;
@@ -57,12 +70,24 @@ async function syncCapabilityIdentifiersForEntitlementsAsync(bundleId, entitleme
         const capabilityIds = [...new Set(entitlementValue)];
         // Get a list of all of the capability IDs that are already created on the server.
         const existingIds = await CapabilityModel.getAsync(bundleId.context);
+        // Opaque ids of identifiers already linked to this capability.
+        const remoteLinkedIds = linkedBundleCapabilities.find(c => c.isType(classifier.capability))
+            ?.attributes;
+        const alreadyLinkedOpaqueIds = new Set((remoteLinkedIds?.[CapabilityModel.type] ?? []).map(model => model.id));
         // A list of server IDs for linking.
         const capabilityIdOpaqueIds = [];
-        const capabilitiesWithoutRemoteModels = capabilityIds.filter(localId => existingIds.find(model => model.attributes.identifier === localId) === undefined);
         // Iterate through all the local IDs and see if they exist on the server.
-        for (const localId of capabilitiesWithoutRemoteModels) {
-            let remoteIdModel = undefined;
+        for (const localId of capabilityIds) {
+            let remoteIdModel = existingIds.find(model => model.attributes.identifier === localId);
+            // Identifier already exists.
+            if (remoteIdModel) {
+                if (!alreadyLinkedOpaqueIds.has(remoteIdModel.id)) {
+                    // Link the existing identifier to this bundle.
+                    linkedIds.push(remoteIdModel.attributes.identifier);
+                    capabilityIdOpaqueIds.push(remoteIdModel.id);
+                }
+                continue;
+            }
             if (log_1.default.isDebug) {
                 log_1.default.log(`Creating capability ID: ${localId} (${CapabilityModel.type})`);
             }

package/build/graphql/client.d.ts

@@ -1,3 +1,16 @@
 import { CombinedError as GraphqlError, OperationResult } from '@urql/core';
+export declare const EAS_CLI_UPGRADE_REQUIRED_ERROR_CODE = "EAS_CLI_UPGRADE_REQUIRED";
 export declare function withErrorHandlingAsync<T>(promise: Promise<OperationResult<T>>): Promise<T>;
+/**
+ * Wraps `withErrorHandlingAsync` for queries that hit endpoints which may evolve in
+ * ways that require a newer eas-cli. The server signals this by returning a GraphQL
+ * error with `extensions.errorCode === EAS_CLI_UPGRADE_REQUIRED`. As a fallback we
+ * also detect schema validation errors of the form `Cannot query field "X" on type "Y"`,
+ * which surface when a field has been removed without a coded error.
+ *
+ * In either case we re-throw an `EasCommandError` instructing the user to upgrade.
+ */
+export declare function withUpgradeRequiredErrorHandlingAsync<T>(promise: Promise<OperationResult<T>>, { featureName }: {
+    featureName: string;
+}): Promise<T>;
 export { GraphqlError };

package/build/graphql/client.js

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GraphqlError = void 0;
+exports.GraphqlError = exports.EAS_CLI_UPGRADE_REQUIRED_ERROR_CODE = void 0;
 exports.withErrorHandlingAsync = withErrorHandlingAsync;
+exports.withUpgradeRequiredErrorHandlingAsync = withUpgradeRequiredErrorHandlingAsync;
 const tslib_1 = require("tslib");
 const core_1 = require("@urql/core");
 Object.defineProperty(exports, "GraphqlError", { enumerable: true, get: function () { return core_1.CombinedError; } });
+const errors_1 = require("../commandUtils/errors");
 const log_1 = tslib_1.__importDefault(require("../log"));
+exports.EAS_CLI_UPGRADE_REQUIRED_ERROR_CODE = 'EAS_CLI_UPGRADE_REQUIRED';
 async function withErrorHandlingAsync(promise) {
     const { data, error } = await promise;
     if (error) {
@@ -25,3 +28,35 @@ async function withErrorHandlingAsync(promise) {
     }
     return data;
 }
+/**
+ * Wraps `withErrorHandlingAsync` for queries that hit endpoints which may evolve in
+ * ways that require a newer eas-cli. The server signals this by returning a GraphQL
+ * error with `extensions.errorCode === EAS_CLI_UPGRADE_REQUIRED`. As a fallback we
+ * also detect schema validation errors of the form `Cannot query field "X" on type "Y"`,
+ * which surface when a field has been removed without a coded error.
+ *
+ * In either case we re-throw an `EasCommandError` instructing the user to upgrade.
+ */
+async function withUpgradeRequiredErrorHandlingAsync(promise, { featureName }) {
+    try {
+        return await withErrorHandlingAsync(promise);
+    }
+    catch (error) {
+        if (isUpgradeRequiredError(error)) {
+            throw new errors_1.EasCommandError(`${featureName} is not supported by this version of eas-cli. ` +
+                `Upgrade to the latest version: \`npm install -g eas-cli@latest\`.`);
+        }
+        throw error;
+    }
+}
+function isUpgradeRequiredError(error) {
+    if (!(error instanceof core_1.CombinedError)) {
+        return false;
+    }
+    return error.graphQLErrors.some(e => {
+        if (e?.extensions?.errorCode === exports.EAS_CLI_UPGRADE_REQUIRED_ERROR_CODE) {
+            return true;
+        }
+        return /Cannot query field ".+" on type ".+"/.test(e?.message ?? '');
+    });
+}