@expo/eas-json 0.29.0 → 0.33.0

package/build/EasBuild.types.d.ts

@@ -5,7 +5,9 @@ export declare enum CredentialsSource {
 }
 export declare type DistributionType = 'store' | 'internal';
 export declare type IosEnterpriseProvisioning = 'adhoc' | 'universal';
-export declare type VersionAutoIncrement = boolean | 'version' | 'buildNumber';
+export declare type VersionAutoIncrement = boolean | 'version';
+export declare type IosVersionAutoIncrement = VersionAutoIncrement | 'buildNumber';
+export declare type AndroidVersionAutoIncrement = VersionAutoIncrement | 'versionCode';
 export interface CommonBuildProfile {
     credentialsSource: CredentialsSource;
     distribution: DistributionType;
@@ -22,13 +24,14 @@ export interface AndroidBuildProfile extends CommonBuildProfile {
     withoutCredentials?: boolean;
     image?: Android.BuilderEnvironment['image'];
     ndk?: string;
+    autoIncrement?: AndroidVersionAutoIncrement;
     buildType?: Android.BuildType.APK | Android.BuildType.APP_BUNDLE;
     gradleCommand?: string;
     artifactPath?: string;
 }
 export interface IosBuildProfile extends CommonBuildProfile {
     enterpriseProvisioning?: IosEnterpriseProvisioning;
-    autoIncrement?: VersionAutoIncrement;
+    autoIncrement?: IosVersionAutoIncrement;
     simulator?: boolean;
     image?: Ios.BuilderEnvironment['image'];
     bundler?: string;

package/build/EasJsonReader.d.ts

@@ -19,7 +19,7 @@ export declare class EasJsonReader {
         throwIfEasJsonDoesNotExist?: boolean | undefined;
     }): Promise<string[]>;
     readBuildProfileAsync<T extends Platform>(platform: T, profileName: string): Promise<BuildProfile<T>>;
-    readSubmitProfileAsync<T extends Platform>(platform: T, profileName?: string): Promise<SubmitProfile<T>>;
+    readSubmitProfileAsync<T extends Platform>(platform: T, profileNameArg?: string): Promise<SubmitProfile<T>>;
     readAndValidateAsync(): Promise<EasJson>;
     readRawAsync(): Promise<EasJsonPreValidation>;
     private resolveBuildProfile;

package/build/EasJsonReader.js

@@ -56,14 +56,18 @@ class EasJsonReader {
             throw new Error(`Unknown platform ${platform}`);
         }
     }
-    async readSubmitProfileAsync(platform, profileName) {
+    async readSubmitProfileAsync(platform, profileNameArg) {
         var _a;
+        let profileName = profileNameArg;
         if (!profileName) {
             const profileNames = await this.getSubmitProfileNamesAsync({
                 throwIfEasJsonDoesNotExist: false,
             });
-            if (profileNames.includes('release')) {
-                return await this.readSubmitProfileAsync(platform, 'release');
+            if (profileNames.includes('production')) {
+                profileName = 'production';
+            }
+            else if (profileNames.includes('release')) {
+                profileName = 'release';
             }
             else {
                 return getDefaultSubmitProfile(platform);

package/build/EasJsonSchema.js

@@ -35,6 +35,7 @@ const AndroidBuildProfileSchema = CommonBuildProfileSchema.concat(joi_1.default.
     withoutCredentials: joi_1.default.boolean(),
     image: joi_1.default.string().valid(...eas_build_job_1.Android.builderBaseImages),
     ndk: joi_1.default.string().empty(null).custom(semverSchemaCheck),
+    autoIncrement: joi_1.default.alternatives().try(joi_1.default.boolean(), joi_1.default.string().valid('version', 'versionCode')),
     artifactPath: joi_1.default.string(),
     gradleCommand: joi_1.default.string(),
     buildType: joi_1.default.string().valid('apk', 'app-bundle'),
@@ -67,6 +68,9 @@ exports.AndroidSubmitProfileSchema = joi_1.default.object({
     changesNotSentForReview: joi_1.default.boolean().default(false),
 });
 exports.IosSubmitProfileSchema = joi_1.default.object({
+    ascApiKeyPath: joi_1.default.string(),
+    ascApiKeyId: joi_1.default.string(),
+    ascApiKeyIssuerId: joi_1.default.string(),
     appleId: joi_1.default.string(),
     ascAppId: joi_1.default.string(),
     appleTeamId: joi_1.default.string(),

package/build/EasSubmit.types.d.ts

@@ -19,6 +19,9 @@ export interface AndroidSubmitProfile {
 }
 export declare const AndroidSubmitProfileFieldsToEvaluate: (keyof AndroidSubmitProfile)[];
 export interface IosSubmitProfile {
+    ascApiKeyPath?: string;
+    ascApiKeyIssuerId?: string;
+    ascApiKeyId?: string;
     appleId?: string;
     ascAppId?: string;
     appleTeamId?: string;

package/build/EasSubmit.types.js

@@ -18,4 +18,8 @@ var AndroidReleaseTrack;
 exports.AndroidSubmitProfileFieldsToEvaluate = [
     'serviceAccountKeyPath',
 ];
-exports.IosSubmitProfileFieldsToEvaluate = [];
+exports.IosSubmitProfileFieldsToEvaluate = [
+    'ascApiKeyPath',
+    'ascApiKeyIssuerId',
+    'ascApiKeyId',
+];

package/build/index.d.ts

@@ -1,5 +1,5 @@
 export { AndroidSubmitProfile, AndroidReleaseStatus, AndroidReleaseTrack, IosSubmitProfile, SubmitProfile, } from './EasSubmit.types';
 export { EasJson } from './EasJson.types';
-export { AndroidBuildProfile, BuildProfile, CredentialsSource, DistributionType, IosBuildProfile, IosEnterpriseProvisioning, VersionAutoIncrement, } from './EasBuild.types';
+export { AndroidBuildProfile, BuildProfile, CredentialsSource, DistributionType, IosBuildProfile, IosEnterpriseProvisioning, IosVersionAutoIncrement, AndroidVersionAutoIncrement, } from './EasBuild.types';
 export { EasJsonReader } from './EasJsonReader';
 export { hasMismatchedExtendsAsync, isUsingDeprecatedFormatAsync, migrateAsync } from './migrate';

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@expo/eas-json",
   "description": "A library for interacting with the eas.json",
-  "version": "0.29.0",
+  "version": "0.33.0",
   "author": "Expo <support@expo.dev>",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/eas-build-job": "0.2.48",
+    "@expo/eas-build-job": "0.2.52",
     "@expo/json-file": "8.2.33",
     "env-string": "1.0.1",
     "fs-extra": "10.0.0",
@@ -33,5 +33,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6e1c7dd91e4d6ba45dca2744bd9c95fc32bed62d"
+  "gitHead": "48130dcbdc3192a495a8094707408f2f6925075c"
 }

package/src/EasBuild.types.ts

@@ -9,7 +9,9 @@ export type DistributionType = 'store' | 'internal';
 
 export type IosEnterpriseProvisioning = 'adhoc' | 'universal';
 
-export type VersionAutoIncrement = boolean | 'version' | 'buildNumber';
+export type VersionAutoIncrement = boolean | 'version';
+export type IosVersionAutoIncrement = VersionAutoIncrement | 'buildNumber';
+export type AndroidVersionAutoIncrement = VersionAutoIncrement | 'versionCode';
 
 export interface CommonBuildProfile {
   credentialsSource: CredentialsSource;
@@ -29,6 +31,7 @@ export interface AndroidBuildProfile extends CommonBuildProfile {
   withoutCredentials?: boolean;
   image?: Android.BuilderEnvironment['image'];
   ndk?: string;
+  autoIncrement?: AndroidVersionAutoIncrement;
 
   buildType?: Android.BuildType.APK | Android.BuildType.APP_BUNDLE;
 
@@ -38,7 +41,7 @@ export interface AndroidBuildProfile extends CommonBuildProfile {
 
 export interface IosBuildProfile extends CommonBuildProfile {
   enterpriseProvisioning?: IosEnterpriseProvisioning;
-  autoIncrement?: VersionAutoIncrement;
+  autoIncrement?: IosVersionAutoIncrement;
   simulator?: boolean;
   image?: Ios.BuilderEnvironment['image'];
   bundler?: string;

package/src/EasJsonReader.ts

@@ -81,18 +81,24 @@ export class EasJsonReader {
 
   public async readSubmitProfileAsync<T extends Platform>(
     platform: T,
-    profileName?: string
+    profileNameArg?: string
   ): Promise<SubmitProfile<T>> {
+    let profileName = profileNameArg;
+
     if (!profileName) {
       const profileNames = await this.getSubmitProfileNamesAsync({
         throwIfEasJsonDoesNotExist: false,
       });
-      if (profileNames.includes('release')) {
-        return await this.readSubmitProfileAsync(platform, 'release');
+
+      if (profileNames.includes('production')) {
+        profileName = 'production';
+      } else if (profileNames.includes('release')) {
+        profileName = 'release';
       } else {
         return getDefaultSubmitProfile(platform);
       }
     }
+
     const easJson = await this.readAndValidateAsync();
     const profile = easJson?.submit?.[profileName];
     if (!profile) {

package/src/EasJsonSchema.ts

@@ -38,6 +38,10 @@ const AndroidBuildProfileSchema = CommonBuildProfileSchema.concat(
 
     image: Joi.string().valid(...Android.builderBaseImages),
     ndk: Joi.string().empty(null).custom(semverSchemaCheck),
+    autoIncrement: Joi.alternatives().try(
+      Joi.boolean(),
+      Joi.string().valid('version', 'versionCode')
+    ),
 
     artifactPath: Joi.string(),
     gradleCommand: Joi.string(),
@@ -86,6 +90,9 @@ export const AndroidSubmitProfileSchema = Joi.object({
 });
 
 export const IosSubmitProfileSchema = Joi.object({
+  ascApiKeyPath: Joi.string(),
+  ascApiKeyId: Joi.string(),
+  ascApiKeyIssuerId: Joi.string(),
   appleId: Joi.string(),
   ascAppId: Joi.string(),
   appleTeamId: Joi.string(),

package/src/EasSubmit.types.ts

@@ -26,6 +26,9 @@ export const AndroidSubmitProfileFieldsToEvaluate: (keyof AndroidSubmitProfile)[
 ];
 
 export interface IosSubmitProfile {
+  ascApiKeyPath?: string;
+  ascApiKeyIssuerId?: string;
+  ascApiKeyId?: string;
   appleId?: string;
   ascAppId?: string;
   appleTeamId?: string;
@@ -35,7 +38,11 @@ export interface IosSubmitProfile {
   appName?: string;
 }
 
-export const IosSubmitProfileFieldsToEvaluate: (keyof IosSubmitProfile)[] = [];
+export const IosSubmitProfileFieldsToEvaluate: (keyof IosSubmitProfile)[] = [
+  'ascApiKeyPath',
+  'ascApiKeyIssuerId',
+  'ascApiKeyId',
+];
 
 export type SubmitProfile<TPlatform extends Platform = Platform> =
   TPlatform extends Platform.ANDROID

package/src/__tests__/EasJsonReader-build-test.ts

@@ -14,13 +14,13 @@ beforeEach(async () => {
 test('minimal valid eas.json for both platforms', async () => {
   await fs.writeJson('/project/eas.json', {
     build: {
-      release: {},
+      production: {},
     },
   });
 
   const reader = new EasJsonReader('/project');
-  const iosProfile = await reader.readBuildProfileAsync(Platform.IOS, 'release');
-  const androidProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'release');
+  const iosProfile = await reader.readBuildProfileAsync(Platform.IOS, 'production');
+  const androidProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'production');
 
   expect({
     distribution: 'store',
@@ -36,7 +36,7 @@ test('minimal valid eas.json for both platforms', async () => {
 test('valid eas.json for development client builds', async () => {
   await fs.writeJson('/project/eas.json', {
     build: {
-      release: {},
+      production: {},
       debug: {
         developmentClient: true,
         android: {
@@ -219,7 +219,7 @@ test('valid profile extending other profile with platform specific caching', asy
 test('valid eas.json with missing profile', async () => {
   await fs.writeJson('/project/eas.json', {
     build: {
-      release: {},
+      production: {},
     },
   });
 
@@ -231,14 +231,14 @@ test('valid eas.json with missing profile', async () => {
 test('invalid eas.json when using wrong buildType', async () => {
   await fs.writeJson('/project/eas.json', {
     build: {
-      release: { android: { buildType: 'archive' } },
+      production: { android: { buildType: 'archive' } },
     },
   });
 
   const reader = new EasJsonReader('/project');
-  const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'release');
+  const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'production');
   await expect(promise).rejects.toThrowError(
-    'eas.json is not valid [ValidationError: "build.release.android.buildType" must be one of [apk, app-bundle]]'
+    'eas.json is not valid [ValidationError: "build.production.android.buildType" must be one of [apk, app-bundle]]'
   );
 });
 
@@ -246,33 +246,33 @@ test('empty json', async () => {
   await fs.writeJson('/project/eas.json', {});
 
   const reader = new EasJsonReader('/project');
-  const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'release');
-  await expect(promise).rejects.toThrowError('There is no profile named release in eas.json');
+  const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'production');
+  await expect(promise).rejects.toThrowError('There is no profile named production in eas.json');
 });
 
 test('invalid semver value', async () => {
   await fs.writeJson('/project/eas.json', {
     build: {
-      release: { node: '12.0.0-alpha' },
+      production: { node: '12.0.0-alpha' },
     },
   });
 
   const reader = new EasJsonReader('/project');
-  const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'release');
+  const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'production');
   await expect(promise).rejects.toThrowError(
-    'eas.json is not valid [ValidationError: "build.release.node" failed custom validation because 12.0.0-alpha is not a valid version]'
+    'eas.json is not valid [ValidationError: "build.production.node" failed custom validation because 12.0.0-alpha is not a valid version]'
   );
 });
 
 test('get profile names', async () => {
   await fs.writeJson('/project/eas.json', {
     build: {
-      release: { node: '12.0.0-alpha' },
+      production: { node: '12.0.0-alpha' },
       blah: { node: '12.0.0-alpha' },
     },
   });
 
   const reader = new EasJsonReader('/project');
   const allProfileNames = await reader.getBuildProfileNamesAsync();
-  expect(allProfileNames.sort()).toEqual(['blah', 'release'].sort());
+  expect(allProfileNames.sort()).toEqual(['blah', 'production'].sort());
 });

package/src/__tests__/EasJsonReader-submit-test.ts

@@ -14,13 +14,13 @@ beforeEach(async () => {
 test('minimal allowed eas.json for both platforms', async () => {
   await fs.writeJson('/project/eas.json', {
     submit: {
-      release: {},
+      production: {},
     },
   });
 
   const reader = new EasJsonReader('/project');
-  const iosProfile = await reader.readSubmitProfileAsync(Platform.IOS, 'release');
-  const androidProfile = await reader.readSubmitProfileAsync(Platform.ANDROID, 'release');
+  const iosProfile = await reader.readSubmitProfileAsync(Platform.IOS, 'production');
+  const androidProfile = await reader.readSubmitProfileAsync(Platform.ANDROID, 'production');
 
   expect(androidProfile).toEqual({
     changesNotSentForReview: false,
@@ -35,7 +35,7 @@ test('minimal allowed eas.json for both platforms', async () => {
 test('android config with all required values', async () => {
   await fs.writeJson('/project/eas.json', {
     submit: {
-      release: {
+      production: {
         android: {
           serviceAccountKeyPath: './path.json',
           track: 'beta',
@@ -46,7 +46,7 @@ test('android config with all required values', async () => {
   });
 
   const reader = new EasJsonReader('/project');
-  const androidProfile = await reader.readSubmitProfileAsync(Platform.ANDROID, 'release');
+  const androidProfile = await reader.readSubmitProfileAsync(Platform.ANDROID, 'production');
 
   expect(androidProfile).toEqual({
     serviceAccountKeyPath: './path.json',
@@ -59,7 +59,7 @@ test('android config with all required values', async () => {
 test('android config with serviceAccountKeyPath set to env var', async () => {
   await fs.writeJson('/project/eas.json', {
     submit: {
-      release: {
+      production: {
         android: {
           serviceAccountKeyPath: '$GOOGLE_SERVICE_ACCOUNT',
           track: 'beta',
@@ -72,7 +72,7 @@ test('android config with serviceAccountKeyPath set to env var', async () => {
   try {
     process.env.GOOGLE_SERVICE_ACCOUNT = './path.json';
     const reader = new EasJsonReader('/project');
-    const androidProfile = await reader.readSubmitProfileAsync(Platform.ANDROID, 'release');
+    const androidProfile = await reader.readSubmitProfileAsync(Platform.ANDROID, 'production');
 
     expect(androidProfile).toEqual({
       serviceAccountKeyPath: './path.json',
@@ -88,23 +88,68 @@ test('android config with serviceAccountKeyPath set to env var', async () => {
 test('ios config with all required values', async () => {
   await fs.writeJson('/project/eas.json', {
     submit: {
-      release: {
+      production: {
         ios: {
           appleId: 'some@email.com',
           ascAppId: '1223423523',
           appleTeamId: 'QWERTY',
+          ascApiKeyPath: './path-ABCD.p8',
+          ascApiKeyIssuerId: 'abc-123-def-456',
+          ascApiKeyId: 'ABCD',
         },
       },
     },
   });
 
   const reader = new EasJsonReader('/project');
-  const iosProfile = await reader.readSubmitProfileAsync(Platform.IOS, 'release');
+  const iosProfile = await reader.readSubmitProfileAsync(Platform.IOS, 'production');
 
   expect(iosProfile).toEqual({
     appleId: 'some@email.com',
     appleTeamId: 'QWERTY',
     ascAppId: '1223423523',
+    ascApiKeyPath: './path-ABCD.p8',
+    ascApiKeyIssuerId: 'abc-123-def-456',
+    ascApiKeyId: 'ABCD',
     language: 'en-US',
   });
 });
+
+test('ios config with ascApiKey fields set to env var', async () => {
+  await fs.writeJson('/project/eas.json', {
+    submit: {
+      release: {
+        ios: {
+          appleId: 'some@email.com',
+          ascAppId: '1223423523',
+          appleTeamId: 'QWERTY',
+          ascApiKeyPath: '$ASC_API_KEY_PATH',
+          ascApiKeyIssuerId: '$ASC_API_KEY_ISSUER_ID',
+          ascApiKeyId: '$ASC_API_KEY_ID',
+        },
+      },
+    },
+  });
+
+  try {
+    process.env.ASC_API_KEY_PATH = './path-ABCD.p8';
+    process.env.ASC_API_KEY_ISSUER_ID = 'abc-123-def-456';
+    process.env.ASC_API_KEY_ID = 'ABCD';
+    const reader = new EasJsonReader('/project');
+    const iosProfile = await reader.readSubmitProfileAsync(Platform.IOS, 'release');
+
+    expect(iosProfile).toEqual({
+      appleId: 'some@email.com',
+      ascAppId: '1223423523',
+      appleTeamId: 'QWERTY',
+      ascApiKeyPath: './path-ABCD.p8',
+      ascApiKeyIssuerId: 'abc-123-def-456',
+      ascApiKeyId: 'ABCD',
+      language: 'en-US',
+    });
+  } finally {
+    process.env.ASC_API_KEY_PATH = undefined;
+    process.env.ASC_API_KEY_ISSUER_ID = undefined;
+    process.env.ASC_API_KEY_ID = undefined;
+  }
+});

package/src/__tests__/migrate-test.ts

@@ -35,7 +35,7 @@ test('migration for default manged eas.json', async () => {
   });
 });
 
-test('migration for default generic eas.json', async () => {
+test('migration for default bare workflow eas.json', async () => {
   const easJson = {
     builds: {
       android: {
@@ -194,7 +194,7 @@ test('migration for example manged eas.json', async () => {
   });
 });
 
-test('migration for example generic eas.json', async () => {
+test('migration for example bare workflow eas.json', async () => {
   const easJson = {
     builds: {
       android: {

package/src/index.ts

@@ -13,7 +13,8 @@ export {
   DistributionType,
   IosBuildProfile,
   IosEnterpriseProvisioning,
-  VersionAutoIncrement,
+  IosVersionAutoIncrement,
+  AndroidVersionAutoIncrement,
 } from './EasBuild.types';
 export { EasJsonReader } from './EasJsonReader';
 export { hasMismatchedExtendsAsync, isUsingDeprecatedFormatAsync, migrateAsync } from './migrate';