eas-cli 16.22.0 → 16.23.0

package/build/commands/env/push.d.ts

@@ -1,4 +1,3 @@
-import { EnvironmentVariableEnvironment } from '../../build/utils/environment';
 import EasCommand from '../../commandUtils/EasCommand';
 export default class EnvPush extends EasCommand {
     static description: string;
@@ -8,7 +7,8 @@ export default class EnvPush extends EasCommand {
     };
     static flags: {
         path: import("@oclif/core/lib/interfaces").OptionFlag<string>;
-        environment: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableEnvironment[] | undefined>;
+        force: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        environment: import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined>;
     };
     static args: {
         name: string;
@@ -18,10 +18,12 @@ export default class EnvPush extends EasCommand {
     runAsync(): Promise<void>;
     parseFlagsAndArgs(flags: {
         path: string;
-        environment: EnvironmentVariableEnvironment[] | undefined;
+        environment: string[] | undefined;
+        force: boolean;
     }, { environment }: Record<string, string>): {
-        environment?: EnvironmentVariableEnvironment[];
+        environment?: string[];
         path: string;
+        force: boolean;
     };
     private parseEnvFileAsync;
 }

package/build/commands/env/push.js

@@ -13,7 +13,6 @@ const EnvironmentVariablesQuery_1 = require("../../graphql/queries/EnvironmentVa
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const prompts_1 = require("../../prompts");
 const prompts_2 = require("../../utils/prompts");
-const variableUtils_1 = require("../../utils/variableUtils");
 class EnvPush extends EasCommand_1.default {
     static description = 'push environment variables from .env file to the selected environment';
     static contextDefinition = {
@@ -26,17 +25,21 @@ class EnvPush extends EasCommand_1.default {
             description: 'Path to the input `.env` file',
             default: '.env.local',
         }),
+        force: core_1.Flags.boolean({
+            description: 'Skip confirmation and automatically override existing variables',
+            default: false,
+        }),
     };
     static args = [
         {
             name: 'environment',
-            description: "Environment to push variables to. One of 'production', 'preview', or 'development'.",
+            description: "Environment to push variables to. Default environments are 'production', 'preview', and 'development'.",
             required: false,
         },
     ];
     async runAsync() {
         const { args, flags } = await this.parse(EnvPush);
-        let { environment: environments, path: envPath } = this.parseFlagsAndArgs(flags, args);
+        let { environment: environments, path: envPath, force } = this.parseFlagsAndArgs(flags, args);
         const { projectId, loggedIn: { graphqlClient }, } = await this.getContextAsync(EnvPush, {
             nonInteractive: false,
         });
@@ -44,6 +47,9 @@ class EnvPush extends EasCommand_1.default {
             environments = await (0, prompts_2.promptVariableEnvironmentAsync)({
                 nonInteractive: false,
                 multiple: true,
+                canEnterCustomEnvironment: true,
+                graphqlClient,
+                projectId,
             });
         }
         const updateVariables = await this.parseEnvFileAsync(envPath, environments);
@@ -82,32 +88,39 @@ class EnvPush extends EasCommand_1.default {
             if (existingDifferentVariables.length > 0) {
                 log_1.default.warn(`Some variables already exist in the ${displayedEnvironment} environment.`);
                 const variableNames = existingDifferentVariables.map(variable => variable.name);
-                const confirmationMessage = variableNames.length > 1
-                    ? `The ${variableNames.join(', ')} environment variables already exist in ${displayedEnvironment} environment. Do you want to override them all?`
-                    : `The ${variableNames[0]} environment variable already exists in ${displayedEnvironment} environment. Do you want to override it?`;
-                const confirm = await (0, prompts_1.confirmAsync)({
-                    message: confirmationMessage,
-                });
                 let variablesToOverwrite = [];
-                if (!confirm && existingDifferentVariables.length === 0) {
-                    throw new Error('No new variables to push.');
-                }
-                if (confirm) {
+                if (force) {
+                    // When --force is used, automatically override all existing variables
+                    log_1.default.log('Using --force flag: automatically overriding existing variables.');
                     variablesToOverwrite = existingDifferentVariables.map(variable => variable.name);
                 }
                 else {
-                    const promptResult = await (0, prompts_1.promptAsync)({
-                        type: 'multiselect',
-                        name: 'variablesToOverwrite',
-                        message: 'Select variables to overwrite:',
-                        // @ts-expect-error property missing from `@types/prompts`
-                        optionsPerPage: 20,
-                        choices: existingDifferentVariables.map(variable => ({
-                            title: `${variable.name}: ${updateVariables[variable.name].value} (was ${variable.value ?? '(secret)'})`,
-                            value: variable.name,
-                        })),
+                    const confirmationMessage = variableNames.length > 1
+                        ? `The ${variableNames.join(', ')} environment variables already exist in ${displayedEnvironment} environment. Do you want to override them all?`
+                        : `The ${variableNames[0]} environment variable already exists in ${displayedEnvironment} environment. Do you want to override it?`;
+                    const confirm = await (0, prompts_1.confirmAsync)({
+                        message: confirmationMessage,
                     });
-                    variablesToOverwrite = promptResult.variablesToOverwrite;
+                    if (!confirm && existingDifferentVariables.length === 0) {
+                        throw new Error('No new variables to push.');
+                    }
+                    if (confirm) {
+                        variablesToOverwrite = existingDifferentVariables.map(variable => variable.name);
+                    }
+                    else {
+                        const promptResult = await (0, prompts_1.promptAsync)({
+                            type: 'multiselect',
+                            name: 'variablesToOverwrite',
+                            message: 'Select variables to overwrite:',
+                            // @ts-expect-error property missing from `@types/prompts`
+                            optionsPerPage: 20,
+                            choices: existingDifferentVariables.map(variable => ({
+                                title: `${variable.name}: ${updateVariables[variable.name].value} (was ${variable.value ?? '(secret)'})`,
+                                value: variable.name,
+                            })),
+                        });
+                        variablesToOverwrite = promptResult.variablesToOverwrite;
+                    }
                 }
                 for (const existingVariable of existingVariables) {
                     const name = existingVariable.name;
@@ -121,7 +134,7 @@ class EnvPush extends EasCommand_1.default {
             }
             // Check if any of the sensitive variables already exist in the environment. Prompt the user to overwrite them.
             const existingSensitiveVariables = existingVariables.filter(variable => variable.visibility !== generated_1.EnvironmentVariableVisibility.Public);
-            if (existingSensitiveVariables.length > 0) {
+            if (existingSensitiveVariables.length > 0 && !force) {
                 const existingSensitiveVariablesNames = existingSensitiveVariables.map(variable => `- ${variable.name}`);
                 const confirm = await (0, prompts_1.confirmAsync)({
                     message: `You are about to overwrite sensitive variables.\n${existingSensitiveVariablesNames.join('\n')}\n Do you want to continue?`,
@@ -130,6 +143,9 @@ class EnvPush extends EasCommand_1.default {
                     throw new Error('Aborting...');
                 }
             }
+            else if (existingSensitiveVariables.length > 0 && force) {
+                log_1.default.log('Using --force flag: automatically overriding sensitive variables.');
+            }
         }
         const variablesToPush = Object.values(updateVariables);
         if (variablesToPush.length === 0) {
@@ -140,11 +156,7 @@ class EnvPush extends EasCommand_1.default {
         log_1.default.log(`Uploaded env file to ${environments.join(', ').toLocaleLowerCase()}.`);
     }
     parseFlagsAndArgs(flags, { environment }) {
-        if (environment && !(0, variableUtils_1.isEnvironment)(environment.toLowerCase())) {
-            throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-        }
-        const environments = flags.environment ??
-            (environment ? [environment.toLowerCase()] : undefined);
+        const environments = flags.environment ?? (environment ? [environment] : undefined);
         return {
             ...flags,
             environment: environments,

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

@@ -1,15 +1,14 @@
-import { EnvironmentVariableEnvironment } from '../../build/utils/environment';
 import EasCommand from '../../commandUtils/EasCommand';
 import { EASEnvironmentVariableScopeFlagValue } from '../../commandUtils/flags';
 export default class EnvUpdate extends EasCommand {
     static description: string;
     static flags: {
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        environment: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableEnvironment[] | undefined>;
+        environment: import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined>;
         scope: import("@oclif/core/lib/interfaces").OptionFlag<EASEnvironmentVariableScopeFlagValue>;
         visibility: import("@oclif/core/lib/interfaces").OptionFlag<"plaintext" | "sensitive" | "secret" | undefined>;
         'variable-name': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
-        'variable-environment': import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableEnvironment | undefined>;
+        'variable-environment': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         name: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         value: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         type: import("@oclif/core/lib/interfaces").OptionFlag<"string" | "file" | undefined>;

package/build/commands/env/update.js

@@ -22,7 +22,7 @@ class EnvUpdate extends EasCommand_1.default {
         'variable-name': core_1.Flags.string({
             description: 'Current name of the variable',
         }),
-        'variable-environment': core_1.Flags.enum({
+        'variable-environment': core_1.Flags.string({
             ...flags_1.EasEnvironmentFlagParameters,
             description: 'Current environment of the variable to update',
         }),
@@ -44,7 +44,7 @@ class EnvUpdate extends EasCommand_1.default {
     static args = [
         {
             name: 'environment',
-            description: "Current environment of the variable to update. One of 'production', 'preview', or 'development'.",
+            description: "Current environment of the variable to update. Default environments are 'production', 'preview', and 'development'.",
             required: false,
         },
     ];
@@ -103,7 +103,7 @@ class EnvUpdate extends EasCommand_1.default {
             'non-interactive': nonInteractive,
             type,
             scope,
-        });
+        }, { graphqlClient, projectId });
         const variable = await EnvironmentVariableMutation_1.EnvironmentVariableMutation.updateAsync(graphqlClient, {
             id: selectedVariable.id,
             name: newName,
@@ -131,10 +131,6 @@ class EnvUpdate extends EasCommand_1.default {
             ? generated_1.EnvironmentVariableScope.Shared
             : generated_1.EnvironmentVariableScope.Project;
         if (environment) {
-            environment = environment.toLowerCase();
-            if (!(0, variableUtils_1.isEnvironment)(environment)) {
-                throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-            }
             return {
                 ...flags,
                 'variable-environment': environment,
@@ -143,7 +139,7 @@ class EnvUpdate extends EasCommand_1.default {
         }
         return { ...flags, scope };
     }
-    async promptForMissingFlagsAsync(selectedVariable, { name, value, environment: environments, visibility, 'non-interactive': nonInteractive, type, ...rest }) {
+    async promptForMissingFlagsAsync(selectedVariable, { name, value, environment: environments, visibility, 'non-interactive': nonInteractive, type, ...rest }, { graphqlClient, projectId }) {
         let newType;
         let newVisibility;
         let fileName;
@@ -190,7 +186,10 @@ class EnvUpdate extends EasCommand_1.default {
                 environments = await (0, prompts_2.promptVariableEnvironmentAsync)({
                     nonInteractive,
                     multiple: true,
+                    canEnterCustomEnvironment: true,
                     selectedEnvironments: selectedVariable.environments ?? [],
+                    graphqlClient,
+                    projectId,
                 });
                 if (!environments ||
                     environments.length === 0 ||

package/build/commands/fingerprint/compare.d.ts

@@ -1,4 +1,3 @@
-import { EnvironmentVariableEnvironment } from '../../build/utils/environment';
 import EasCommand from '../../commandUtils/EasCommand';
 export default class FingerprintCompare extends EasCommand {
     static description: string;
@@ -15,7 +14,7 @@ export default class FingerprintCompare extends EasCommand {
         'build-id': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined>;
         'update-id': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined>;
         open: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        environment: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableEnvironment | undefined>;
+        environment: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     static contextDefinition: {
         getServerSideEnvironmentVariablesAsync: import("../../commandUtils/context/ServerSideEnvironmentVariablesContextField").ServerSideEnvironmentVariablesContextField;

package/build/commands/fingerprint/compare.js

@@ -69,7 +69,7 @@ class FingerprintCompare extends EasCommand_1.default {
         open: core_1.Flags.boolean({
             description: 'Open the fingerprint comparison in the browser',
         }),
-        environment: core_1.Flags.enum({
+        environment: core_1.Flags.string({
             ...flags_1.EasEnvironmentFlagParameters,
             description: 'If generating a fingerprint from the local directory, use the specified environment.',
         }),

package/build/commands/fingerprint/generate.d.ts

@@ -1,4 +1,3 @@
-import { EnvironmentVariableEnvironment } from '../../build/utils/environment';
 import EasCommand from '../../commandUtils/EasCommand';
 export default class FingerprintGenerate extends EasCommand {
     static description: string;
@@ -7,7 +6,7 @@ export default class FingerprintGenerate extends EasCommand {
     static flags: {
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        environment: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableEnvironment | undefined>;
+        environment: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         'build-profile': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         platform: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };

package/build/commands/fingerprint/generate.js

@@ -29,7 +29,7 @@ class FingerprintGenerate extends EasCommand_1.default {
             options: ['android', 'ios'],
         }),
         ...flags_1.EASEnvironmentFlag,
-        environment: core_1.Flags.enum({
+        environment: core_1.Flags.string({
             ...flags_1.EasEnvironmentFlagParameters,
             exclusive: ['build-profile'],
         }),

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

@@ -4,7 +4,7 @@ export default class UpdateConfigure extends EasCommand {
     static description: string;
     static flags: {
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        environment: import("@oclif/core/lib/interfaces").OptionFlag<import("../../build/utils/environment").EnvironmentVariableEnvironment | null>;
+        environment: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         platform: import("@oclif/core/lib/interfaces").OptionFlag<RequestedPlatform>;
     };
     static contextDefinition: {

package/build/commands/update/configure.js

@@ -31,7 +31,7 @@ class UpdateConfigure extends EasCommand_1.default {
         const { flags } = await this.parse(UpdateConfigure);
         const { privateProjectConfig: { projectId, exp, projectDir }, vcsClient, } = await this.getContextAsync(UpdateConfigure, {
             nonInteractive: flags['non-interactive'],
-            withServerSideEnvironment: flags['environment'],
+            withServerSideEnvironment: flags['environment'] ?? null,
         });
         log_1.default.log('💡 The following process will configure your project to use EAS Update. These changes only apply to your local project files and you can safely revert them at any time.');
         await vcsClient.ensureRepoExistsAsync();

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

@@ -1,4 +1,3 @@
-import { EnvironmentVariableEnvironment } from '../../build/utils/environment';
 import EasCommand from '../../commandUtils/EasCommand';
 import { RequestedPlatform } from '../../platform';
 export default class UpdatePublish extends EasCommand {
@@ -6,7 +5,7 @@ export default class UpdatePublish extends EasCommand {
     static flags: {
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        environment: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableEnvironment | null>;
+        environment: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         branch: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         channel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         message: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;

package/build/commands/update/index.js

@@ -101,7 +101,7 @@ class UpdatePublish extends EasCommand_1.default {
         const { auto: autoFlag, platform: requestedPlatform, channelName: channelNameArg, updateMessage: updateMessageArg, inputDir, skipBundler, clearCache, privateKeyPath, json: jsonFlag, nonInteractive, branchName: branchNameArg, emitMetadata, rolloutPercentage, environment, } = this.sanitizeFlags(rawFlags);
         const { getDynamicPublicProjectConfigAsync, getDynamicPrivateProjectConfigAsync, loggedIn: { graphqlClient }, vcsClient, getServerSideEnvironmentVariablesAsync, } = await this.getContextAsync(UpdatePublish, {
             nonInteractive,
-            withServerSideEnvironment: environment,
+            withServerSideEnvironment: environment ?? null,
         });
         if (jsonFlag) {
             (0, json_1.enableJsonOutput)();

package/build/graphql/generated.d.ts

@@ -13765,6 +13765,20 @@ export type EnvironmentSecretsByAppIdQuery = {
         };
     };
 };
+export type AppEnvironmentVariableEnvironmentsQueryVariables = Exact<{
+    appId: Scalars['String']['input'];
+}>;
+export type AppEnvironmentVariableEnvironmentsQuery = {
+    __typename?: 'RootQuery';
+    app: {
+        __typename?: 'AppQuery';
+        byId: {
+            __typename?: 'App';
+            id: string;
+            environmentVariableEnvironments: Array<any>;
+        };
+    };
+};
 export type EnvironmentVariablesIncludingSensitiveByAppIdQueryVariables = Exact<{
     appId: Scalars['String']['input'];
     filterNames?: InputMaybe<Array<Scalars['String']['input']> | Scalars['String']['input']>;

package/build/graphql/queries/EnvironmentVariablesQuery.d.ts

@@ -1,35 +1,35 @@
-import { EnvironmentVariableEnvironment } from '../../build/utils/environment';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EnvironmentVariableFragment } from '../generated';
 type EnvironmentVariableWithLinkedEnvironments = EnvironmentVariableFragment & {
-    linkedEnvironments?: EnvironmentVariableEnvironment[] | null;
+    linkedEnvironments?: string[] | null;
 };
 export type EnvironmentVariableWithFileContent = EnvironmentVariableFragment & {
     valueWithFileContent?: string | null | undefined;
 };
 export declare const EnvironmentVariablesQuery: {
+    environmentVariableEnvironmentsAsync(graphqlClient: ExpoGraphqlClient, appId: string): Promise<string[]>;
     byAppIdWithSensitiveAsync(graphqlClient: ExpoGraphqlClient, { appId, environment, filterNames, includeFileContent, }: {
         appId: string;
-        environment?: EnvironmentVariableEnvironment | undefined;
+        environment?: string | undefined;
         filterNames?: string[] | undefined;
         includeFileContent?: boolean | undefined;
     }): Promise<EnvironmentVariableWithFileContent[]>;
     byAppIdAsync(graphqlClient: ExpoGraphqlClient, { appId, environment, filterNames, includeFileContent, }: {
         appId: string;
-        environment?: EnvironmentVariableEnvironment | undefined;
+        environment?: string | undefined;
         filterNames?: string[] | undefined;
         includeFileContent?: boolean | undefined;
     }): Promise<(EnvironmentVariableWithFileContent & EnvironmentVariableWithLinkedEnvironments)[]>;
     sharedAsync(graphqlClient: ExpoGraphqlClient, { appId, filterNames, environment, includeFileContent, }: {
         appId: string;
         filterNames?: string[] | undefined;
-        environment?: EnvironmentVariableEnvironment | undefined;
+        environment?: string | undefined;
         includeFileContent?: boolean | undefined;
     }): Promise<(EnvironmentVariableWithFileContent & EnvironmentVariableWithLinkedEnvironments)[]>;
     sharedWithSensitiveAsync(graphqlClient: ExpoGraphqlClient, { appId, filterNames, environment, includeFileContent, }: {
         appId: string;
         filterNames?: string[] | undefined;
-        environment?: EnvironmentVariableEnvironment | undefined;
+        environment?: string | undefined;
         includeFileContent?: boolean | undefined;
     }): Promise<EnvironmentVariableWithFileContent[]>;
 };

package/build/graphql/queries/EnvironmentVariablesQuery.js

@@ -8,6 +8,21 @@ const client_1 = require("../client");
 const EnvironmentVariable_1 = require("../types/EnvironmentVariable");
 const EnvironmentVariableWithSecret_1 = require("../types/EnvironmentVariableWithSecret");
 exports.EnvironmentVariablesQuery = {
+    async environmentVariableEnvironmentsAsync(graphqlClient, appId) {
+        const data = await (0, client_1.withErrorHandlingAsync)(graphqlClient
+            .query((0, graphql_tag_1.default) `
+            query AppEnvironmentVariableEnvironments($appId: String!) {
+              app {
+                byId(appId: $appId) {
+                  id
+                  environmentVariableEnvironments
+                }
+              }
+            }
+          `, { appId }, { additionalTypenames: ['App'] })
+            .toPromise());
+        return data.app?.byId.environmentVariableEnvironments ?? [];
+    },
     async byAppIdWithSensitiveAsync(graphqlClient, { appId, environment, filterNames, includeFileContent = false, }) {
         const data = await (0, client_1.withErrorHandlingAsync)(graphqlClient
             .query((0, graphql_tag_1.default) `

package/build/utils/prompts.d.ts

@@ -1,20 +1,23 @@
-import { EnvironmentVariableEnvironment } from '../build/utils/environment';
+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { EnvironmentSecretType, EnvironmentVariableVisibility } from '../graphql/generated';
 import { RequestedPlatform } from '../platform';
+export declare function getProjectEnvironmentVariableEnvironmentsAsync(graphqlClient: ExpoGraphqlClient, projectId: string): Promise<string[]>;
 export declare function promptVariableTypeAsync(nonInteractive: boolean, initialType?: EnvironmentSecretType): Promise<EnvironmentSecretType>;
 export declare function parseVisibility(stringVisibility: 'plaintext' | 'sensitive' | 'secret'): EnvironmentVariableVisibility;
 export declare function promptVariableVisibilityAsync(nonInteractive: boolean, selectedVisibility?: EnvironmentVariableVisibility | null): Promise<EnvironmentVariableVisibility>;
 type EnvironmentPromptArgs = {
     nonInteractive: boolean;
-    selectedEnvironments?: EnvironmentVariableEnvironment[];
-    availableEnvironments?: EnvironmentVariableEnvironment[];
+    selectedEnvironments?: string[];
+    graphqlClient?: ExpoGraphqlClient;
+    projectId?: string;
+    canEnterCustomEnvironment?: boolean;
 };
 export declare function promptVariableEnvironmentAsync(input: EnvironmentPromptArgs & {
     multiple: true;
-}): Promise<EnvironmentVariableEnvironment[]>;
+}): Promise<string[]>;
 export declare function promptVariableEnvironmentAsync(input: EnvironmentPromptArgs & {
     multiple?: false;
-}): Promise<EnvironmentVariableEnvironment>;
+}): Promise<string>;
 export declare function promptVariableValueAsync({ nonInteractive, required, hidden, filePath, initial, }: {
     nonInteractive: boolean;
     required?: boolean;

package/build/utils/prompts.js

@@ -1,12 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promptPlatformAsync = exports.promptVariableNameAsync = exports.promptVariableValueAsync = exports.promptVariableEnvironmentAsync = exports.promptVariableVisibilityAsync = exports.parseVisibility = exports.promptVariableTypeAsync = void 0;
+exports.promptPlatformAsync = exports.promptVariableNameAsync = exports.promptVariableValueAsync = exports.promptVariableEnvironmentAsync = exports.promptVariableVisibilityAsync = exports.parseVisibility = exports.promptVariableTypeAsync = exports.getProjectEnvironmentVariableEnvironmentsAsync = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const environment_1 = require("../build/utils/environment");
 const generated_1 = require("../graphql/generated");
+const EnvironmentVariablesQuery_1 = require("../graphql/queries/EnvironmentVariablesQuery");
 const platform_1 = require("../platform");
 const prompts_1 = require("../prompts");
+const DEFAULT_ENVIRONMENTS = Object.values(environment_1.DefaultEnvironment);
+async function getProjectEnvironmentVariableEnvironmentsAsync(graphqlClient, projectId) {
+    try {
+        const environments = await EnvironmentVariablesQuery_1.EnvironmentVariablesQuery.environmentVariableEnvironmentsAsync(graphqlClient, projectId);
+        return environments;
+    }
+    catch {
+        throw new Error('Failed to fetch available environments');
+    }
+}
+exports.getProjectEnvironmentVariableEnvironmentsAsync = getProjectEnvironmentVariableEnvironmentsAsync;
+const CUSTOM_ENVIRONMENT_VALUE = '~~CUSTOM~~';
 async function promptVariableTypeAsync(nonInteractive, initialType) {
     if (nonInteractive) {
         throw new Error('The `--type` flag must be set when running in `--non-interactive` mode.');
@@ -39,6 +52,23 @@ function parseVisibility(stringVisibility) {
     }
 }
 exports.parseVisibility = parseVisibility;
+async function promptCustomEnvironmentAsync() {
+    const { customEnvironment } = await (0, prompts_1.promptAsync)({
+        type: 'text',
+        name: 'customEnvironment',
+        message: 'Enter custom environment name:',
+        validate: (value) => {
+            if (!value || value.trim() === '') {
+                return 'Environment name cannot be empty';
+            }
+            if (!value.match(/^[a-zA-Z0-9_-]+$/)) {
+                return 'Environment name may only contain letters, numbers, underscores, and hyphens';
+            }
+            return true;
+        },
+    });
+    return customEnvironment;
+}
 async function promptVariableVisibilityAsync(nonInteractive, selectedVisibility) {
     if (nonInteractive) {
         throw new Error('The `--visibility` flag must be set when running in `--non-interactive` mode.');
@@ -62,26 +92,55 @@ async function promptVariableVisibilityAsync(nonInteractive, selectedVisibility)
     ]);
 }
 exports.promptVariableVisibilityAsync = promptVariableVisibilityAsync;
-async function promptVariableEnvironmentAsync({ nonInteractive, selectedEnvironments, multiple = false, availableEnvironments, }) {
+async function promptVariableEnvironmentAsync({ nonInteractive, selectedEnvironments, multiple = false, canEnterCustomEnvironment = false, graphqlClient, projectId, }) {
     if (nonInteractive) {
         throw new Error('The `--environment` flag must be set when running in `--non-interactive` mode.');
     }
+    let allEnvironments = DEFAULT_ENVIRONMENTS;
+    if (graphqlClient && projectId) {
+        const projectEnvironments = await getProjectEnvironmentVariableEnvironmentsAsync(graphqlClient, projectId);
+        allEnvironments = [...new Set([...DEFAULT_ENVIRONMENTS, ...projectEnvironments])];
+    }
     if (!multiple) {
-        return await (0, prompts_1.selectAsync)('Select environment:', (availableEnvironments ?? Object.values(environment_1.EnvironmentVariableEnvironment)).map(environment => ({
-            title: environment.toLocaleLowerCase(),
+        const choices = allEnvironments.map(environment => ({
+            title: environment,
             value: environment,
-        })));
+        }));
+        if (canEnterCustomEnvironment) {
+            choices.push({
+                title: 'Other (enter custom environment)',
+                value: CUSTOM_ENVIRONMENT_VALUE,
+            });
+        }
+        const selectedEnvironment = await (0, prompts_1.selectAsync)('Select environment:', choices);
+        if (selectedEnvironment === CUSTOM_ENVIRONMENT_VALUE) {
+            return await promptCustomEnvironmentAsync();
+        }
+        return selectedEnvironment;
+    }
+    const choices = allEnvironments.map(environment => ({
+        title: environment,
+        value: environment,
+        selected: selectedEnvironments?.includes(environment),
+    }));
+    if (canEnterCustomEnvironment) {
+        choices.push({
+            title: 'Other (enter custom environment)',
+            value: CUSTOM_ENVIRONMENT_VALUE,
+            selected: false,
+        });
     }
     const { environments } = await (0, prompts_1.promptAsync)({
         message: 'Select environment:',
         name: 'environments',
         type: 'multiselect',
-        choices: Object.values(environment_1.EnvironmentVariableEnvironment).map(environment => ({
-            title: environment.toLocaleLowerCase(),
-            value: environment,
-            selected: selectedEnvironments?.includes(environment),
-        })),
+        choices,
     });
+    if (environments?.includes(CUSTOM_ENVIRONMENT_VALUE)) {
+        const customEnvironment = await promptCustomEnvironmentAsync();
+        const filteredEnvironments = environments.filter((env) => env !== CUSTOM_ENVIRONMENT_VALUE);
+        return [...filteredEnvironments, customEnvironment];
+    }
     return environments;
 }
 exports.promptVariableEnvironmentAsync = promptVariableEnvironmentAsync;

package/build/utils/variableUtils.d.ts

@@ -1,8 +1,6 @@
-import { EnvironmentVariableEnvironment } from '../build/utils/environment';
 import { EnvironmentVariableFragment } from '../graphql/generated';
 import { EnvironmentVariableWithFileContent } from '../graphql/queries/EnvironmentVariablesQuery';
-export declare function isEnvironment(environment: string): environment is EnvironmentVariableEnvironment;
 export declare function formatVariableName(variable: EnvironmentVariableFragment): string;
 export declare function formatVariableValue(variable: EnvironmentVariableWithFileContent): string;
-export declare function performForEnvironmentsAsync(environments: EnvironmentVariableEnvironment[] | null, fun: (environment: EnvironmentVariableEnvironment | undefined) => Promise<any>): Promise<any[]>;
+export declare function performForEnvironmentsAsync(environments: string[] | null, fun: (environment: string | undefined) => Promise<any>): Promise<any[]>;
 export declare function formatVariable(variable: EnvironmentVariableWithFileContent): string;

package/build/utils/variableUtils.js

@@ -1,15 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatVariable = exports.performForEnvironmentsAsync = exports.formatVariableValue = exports.formatVariableName = exports.isEnvironment = void 0;
+exports.formatVariable = exports.performForEnvironmentsAsync = exports.formatVariableValue = exports.formatVariableName = void 0;
 const tslib_1 = require("tslib");
 const dateformat_1 = tslib_1.__importDefault(require("dateformat"));
 const formatFields_1 = tslib_1.__importDefault(require("./formatFields"));
-const environment_1 = require("../build/utils/environment");
 const generated_1 = require("../graphql/generated");
-function isEnvironment(environment) {
-    return Object.values(environment_1.EnvironmentVariableEnvironment).includes(environment);
-}
-exports.isEnvironment = isEnvironment;
 function formatVariableName(variable) {
     const name = variable.name;
     const scope = variable.scope === generated_1.EnvironmentVariableScope.Project ? 'project' : 'shared';

package/build/worker/assets.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="node" />
 import { GzipOptions } from 'minizlib';
-import { EnvironmentVariableEnvironment } from '../build/utils/environment';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 interface AssetMapOptions {
     maxFileSize: number;
@@ -36,7 +35,7 @@ export interface CreateManifestResult {
 interface CreateManifestParams {
     projectId: string;
     projectDir: string;
-    environment?: EnvironmentVariableEnvironment;
+    environment?: string;
 }
 /** Creates a manifest configuration sent up for deployment */
 export declare function createManifestAsync(params: CreateManifestParams, graphqlClient: ExpoGraphqlClient): Promise<CreateManifestResult>;