@expo/eas-json 0.28.0 → 0.31.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/EasJson.types.d.ts

@@ -1,3 +1,4 @@
+import { Platform } from '@expo/eas-build-job';
 import { AndroidBuildProfile, CommonBuildProfile, IosBuildProfile } from './EasBuild.types';
 import { AndroidSubmitProfile, IosSubmitProfile } from './EasSubmit.types';
 export declare enum CredentialsSource {
@@ -6,12 +7,12 @@ export declare enum CredentialsSource {
 }
 export interface RawBuildProfile extends Partial<CommonBuildProfile> {
     extends?: string;
-    android?: Partial<AndroidBuildProfile>;
-    ios?: Partial<IosBuildProfile>;
+    [Platform.ANDROID]?: Partial<AndroidBuildProfile>;
+    [Platform.IOS]?: Partial<IosBuildProfile>;
 }
 export interface EasSubmitConfiguration {
-    android?: AndroidSubmitProfile;
-    ios?: IosSubmitProfile;
+    [Platform.ANDROID]?: AndroidSubmitProfile;
+    [Platform.IOS]?: IosSubmitProfile;
 }
 export interface EasJson {
     build: {

package/build/EasJson.types.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CredentialsSource = void 0;
+const eas_build_job_1 = require("@expo/eas-build-job");
 var CredentialsSource;
 (function (CredentialsSource) {
     CredentialsSource["LOCAL"] = "local";

package/build/EasJsonReader.js

@@ -57,7 +57,7 @@ class EasJsonReader {
         }
     }
     async readSubmitProfileAsync(platform, profileName) {
-        var _a, _b;
+        var _a;
         if (!profileName) {
             const profileNames = await this.getSubmitProfileNamesAsync({
                 throwIfEasJsonDoesNotExist: false,
@@ -70,11 +70,17 @@ class EasJsonReader {
             }
         }
         const easJson = await this.readAndValidateAsync();
-        const profile = (_b = (_a = easJson === null || easJson === void 0 ? void 0 : easJson.submit) === null || _a === void 0 ? void 0 : _a[profileName]) === null || _b === void 0 ? void 0 : _b[platform];
+        const profile = (_a = easJson === null || easJson === void 0 ? void 0 : easJson.submit) === null || _a === void 0 ? void 0 : _a[profileName];
         if (!profile) {
-            throw new Error(`There is no profile named ${profileName} in eas.json for ${platform}.`);
+            throw new Error(`There is no profile named ${profileName} in eas.json`);
+        }
+        const platformProfile = profile[platform];
+        if (platformProfile) {
+            return this.evaluateFields(platform, platformProfile);
+        }
+        else {
+            return getDefaultSubmitProfile(platform);
         }
-        return this.evaluateFields(platform, profile);
     }
     async readAndValidateAsync() {
         const easJson = await this.readRawAsync();
@@ -111,7 +117,7 @@ class EasJsonReader {
         }
         const buildProfile = easJson.build[profileName];
         if (!buildProfile) {
-            throw new Error(`There is no profile named ${profileName}`);
+            throw new Error(`There is no profile named ${profileName} in eas.json`);
         }
         const { extends: baseProfileName, ...buildProfileRest } = buildProfile;
         if (baseProfileName) {
@@ -123,7 +129,7 @@ class EasJsonReader {
     }
     ensureBuildProfileExists(easJson, profileName) {
         if (!easJson.build || !easJson.build[profileName]) {
-            throw new Error(`There is no profile named ${profileName} in eas.json.`);
+            throw new Error(`There is no profile named ${profileName} in eas.json`);
         }
     }
     evaluateFields(platform, profile) {

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'),

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.28.0",
+  "version": "0.31.0",
   "author": "Expo <support@expo.dev>",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/eas-build-job": "0.2.46",
+    "@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": "2364ed74d724961428514bbfd9a85a13c52a1e8e"
+  "gitHead": "def91af01fe43106714f7782316d61270395a2ff"
 }

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/EasJson.types.ts

@@ -1,3 +1,5 @@
+import { Platform } from '@expo/eas-build-job';
+
 import { AndroidBuildProfile, CommonBuildProfile, IosBuildProfile } from './EasBuild.types';
 import { AndroidSubmitProfile, IosSubmitProfile } from './EasSubmit.types';
 
@@ -8,13 +10,13 @@ export enum CredentialsSource {
 
 export interface RawBuildProfile extends Partial<CommonBuildProfile> {
   extends?: string;
-  android?: Partial<AndroidBuildProfile>;
-  ios?: Partial<IosBuildProfile>;
+  [Platform.ANDROID]?: Partial<AndroidBuildProfile>;
+  [Platform.IOS]?: Partial<IosBuildProfile>;
 }
 
 export interface EasSubmitConfiguration {
-  android?: AndroidSubmitProfile;
-  ios?: IosSubmitProfile;
+  [Platform.ANDROID]?: AndroidSubmitProfile;
+  [Platform.IOS]?: IosSubmitProfile;
 }
 
 export interface EasJson {

package/src/EasJsonReader.ts

@@ -94,11 +94,16 @@ export class EasJsonReader {
       }
     }
     const easJson = await this.readAndValidateAsync();
-    const profile = easJson?.submit?.[profileName]?.[platform];
+    const profile = easJson?.submit?.[profileName];
     if (!profile) {
-      throw new Error(`There is no profile named ${profileName} in eas.json for ${platform}.`);
+      throw new Error(`There is no profile named ${profileName} in eas.json`);
+    }
+    const platformProfile = profile[platform];
+    if (platformProfile) {
+      return this.evaluateFields(platform, platformProfile as SubmitProfile<T>);
+    } else {
+      return getDefaultSubmitProfile(platform);
     }
-    return this.evaluateFields(platform, profile as SubmitProfile<T>);
   }
 
   public async readAndValidateAsync(): Promise<EasJson> {
@@ -144,7 +149,7 @@ export class EasJsonReader {
     }
     const buildProfile = easJson.build[profileName];
     if (!buildProfile) {
-      throw new Error(`There is no profile named ${profileName}`);
+      throw new Error(`There is no profile named ${profileName} in eas.json`);
     }
     const { extends: baseProfileName, ...buildProfileRest } = buildProfile;
     if (baseProfileName) {
@@ -159,7 +164,7 @@ export class EasJsonReader {
 
   private ensureBuildProfileExists(easJson: EasJson, profileName: string): void {
     if (!easJson.build || !easJson.build[profileName]) {
-      throw new Error(`There is no profile named ${profileName} in eas.json.`);
+      throw new Error(`There is no profile named ${profileName} in eas.json`);
     }
   }
 

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(),

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

@@ -225,7 +225,7 @@ test('valid eas.json with missing profile', async () => {
 
   const reader = new EasJsonReader('/project');
   const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'debug');
-  await expect(promise).rejects.toThrowError('There is no profile named debug in eas.json.');
+  await expect(promise).rejects.toThrowError('There is no profile named debug in eas.json');
 });
 
 test('invalid eas.json when using wrong buildType', async () => {
@@ -247,7 +247,7 @@ test('empty json', async () => {
 
   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.');
+  await expect(promise).rejects.toThrowError('There is no profile named release in eas.json');
 });
 
 test('invalid semver value', async () => {

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

@@ -14,10 +14,7 @@ beforeEach(async () => {
 test('minimal allowed eas.json for both platforms', async () => {
   await fs.writeJson('/project/eas.json', {
     submit: {
-      release: {
-        android: {},
-        ios: {},
-      },
+      release: {},
     },
   });
 
@@ -111,22 +108,3 @@ test('ios config with all required values', async () => {
     language: 'en-US',
   });
 });
-
-test('missing ios profile', async () => {
-  await fs.writeJson('/project/eas.json', {
-    submit: {
-      release: {
-        android: {
-          serviceAccountKeyPath: './path.json',
-          track: 'beta',
-          releaseStatus: 'completed',
-        },
-      },
-    },
-  });
-
-  const reader = new EasJsonReader('/project');
-  const promise = reader.readSubmitProfileAsync(Platform.IOS, 'release');
-
-  expect(promise).rejects.toThrow('There is no profile named release in eas.json for ios.');
-});

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';