@expo/eas-json 0.34.0 → 0.37.0

package/build/EasJsonReader.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const json_file_1 = (0, tslib_1.__importDefault)(require("@expo/json-file"));
 const env_string_1 = (0, tslib_1.__importDefault)(require("env-string"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const EasJson_types_1 = require("./EasJson.types");
 const EasJsonSchema_1 = require("./EasJsonSchema");
@@ -46,7 +47,7 @@ class EasJsonReader {
             return value;
         }
         catch (err) {
-            if (err.code === 'ENOENT') {
+            if (err instanceof errors_1.MissingEasJsonError) {
                 return null;
             }
             throw err;
@@ -103,7 +104,7 @@ class EasJsonReader {
         const easJson = await this.readAndValidateAsync();
         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`);
+            throw new Error(`There is no submit profile named ${profileName} in eas.json`);
         }
         const platformProfile = profile[platform];
         if (platformProfile) {
@@ -128,6 +129,9 @@ class EasJsonReader {
     async readRawAsync() {
         try {
             const easJsonPath = EasJsonReader.formatEasJsonPath(this.projectDir);
+            if (!(await fs_extra_1.default.pathExists(easJsonPath))) {
+                throw new errors_1.MissingEasJsonError(`An eas.json file could not be found at ${easJsonPath}. You must make one in order to proceed. Learn more at https://expo.fyi/eas-json`);
+            }
             const rawEasJson = json_file_1.default.read(easJsonPath);
             const { value, error } = EasJsonSchema_1.MinimalEasJsonSchema.validate(rawEasJson, { abortEarly: false });
             if (error) {
@@ -148,7 +152,7 @@ class EasJsonReader {
         }
         const buildProfile = easJson.build[profileName];
         if (!buildProfile) {
-            throw new Error(`There is no profile named ${profileName} in eas.json`);
+            throw new Error(`There is no build profile named ${profileName} in eas.json`);
         }
         const { extends: baseProfileName, ...buildProfileRest } = buildProfile;
         if (baseProfileName) {
@@ -160,7 +164,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 build profile named ${profileName} in eas.json`);
         }
     }
     evaluateFields(platform, profile) {

package/build/EasJsonSchema.js

@@ -23,8 +23,8 @@ const CommonBuildProfileSchema = joi_1.default.object({
     credentialsSource: joi_1.default.string().valid('local', 'remote'),
     distribution: joi_1.default.string().valid('store', 'internal'),
     cache: CacheSchema,
-    releaseChannel: joi_1.default.string(),
-    channel: joi_1.default.string(),
+    releaseChannel: joi_1.default.string().regex(/^[a-z\d][a-z\d._-]*$/),
+    channel: joi_1.default.string().regex(/^[a-z\d][a-z\d._-]*$/),
     developmentClient: joi_1.default.boolean(),
     node: joi_1.default.string().empty(null).custom(semverSchemaCheck),
     yarn: joi_1.default.string().empty(null).custom(semverSchemaCheck),
@@ -66,6 +66,7 @@ exports.AndroidSubmitProfileSchema = joi_1.default.object({
         .valid(...Object.values(EasSubmit_types_1.AndroidReleaseStatus))
         .default(EasSubmit_types_1.AndroidReleaseStatus.completed),
     changesNotSentForReview: joi_1.default.boolean().default(false),
+    applicationId: joi_1.default.string(),
 });
 exports.IosSubmitProfileSchema = joi_1.default.object({
     ascApiKeyPath: joi_1.default.string(),
@@ -78,6 +79,7 @@ exports.IosSubmitProfileSchema = joi_1.default.object({
     language: joi_1.default.string().default('en-US'),
     companyName: joi_1.default.string(),
     appName: joi_1.default.string(),
+    bundleIdentifier: joi_1.default.string(),
 });
 const EasJsonSubmitConfigurationSchema = joi_1.default.object({
     android: exports.AndroidSubmitProfileSchema,

package/build/EasSubmit.types.d.ts

@@ -16,6 +16,7 @@ export interface AndroidSubmitProfile {
     track: AndroidReleaseTrack;
     releaseStatus: AndroidReleaseStatus;
     changesNotSentForReview: boolean;
+    applicationId?: string;
 }
 export declare const AndroidSubmitProfileFieldsToEvaluate: (keyof AndroidSubmitProfile)[];
 export interface IosSubmitProfile {
@@ -29,6 +30,7 @@ export interface IosSubmitProfile {
     language: string;
     companyName?: string;
     appName?: string;
+    bundleIdentifier?: string;
 }
 export declare const IosSubmitProfileFieldsToEvaluate: (keyof IosSubmitProfile)[];
 export declare type SubmitProfile<TPlatform extends Platform = Platform> = TPlatform extends Platform.ANDROID ? AndroidSubmitProfile : TPlatform extends Platform.IOS ? IosSubmitProfile : TPlatform extends Platform ? AndroidSubmitProfile | IosSubmitProfile : never;

package/build/errors.d.ts

@@ -1,2 +1,4 @@
 export declare class InvalidEasJsonError extends Error {
 }
+export declare class MissingEasJsonError extends Error {
+}

package/build/errors.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InvalidEasJsonError = void 0;
+exports.MissingEasJsonError = exports.InvalidEasJsonError = void 0;
 class InvalidEasJsonError extends Error {
 }
 exports.InvalidEasJsonError = InvalidEasJsonError;
+class MissingEasJsonError extends Error {
+}
+exports.MissingEasJsonError = MissingEasJsonError;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@expo/eas-json",
-  "description": "A library for interacting with the eas.json",
-  "version": "0.34.0",
+  "description": "A library for interacting with eas.json",
+  "version": "0.37.0",
   "author": "Expo <support@expo.dev>",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
@@ -24,16 +24,18 @@
   "homepage": "https://github.com/expo/eas-cli",
   "license": "MIT",
   "main": "build/index.js",
+  "types": "build/index.d.ts",
   "repository": "expo/eas-cli",
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
     "watch": "yarn build --watch --preserveWatchOutput",
     "typecheck": "tsc",
     "prepack": "rm -rf build && yarn build",
-    "test": "jest"
+    "test": "jest",
+    "clean": "rm -rf build node_modules yarn-error.log"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "36118b700f4cadc184bddd733b568fe7abde69fe"
+  "gitHead": "558c3670387cb32d135cfebe9bdd9fb2afd25237"
 }

package/src/EasJsonReader.ts

@@ -1,6 +1,7 @@
 import { Platform } from '@expo/eas-build-job';
 import JsonFile from '@expo/json-file';
 import envString from 'env-string';
+import fs from 'fs-extra';
 import path from 'path';
 
 import { BuildProfile } from './EasBuild.types';
@@ -17,7 +18,7 @@ import {
   IosSubmitProfileFieldsToEvaluate,
   SubmitProfile,
 } from './EasSubmit.types';
-import { InvalidEasJsonError } from './errors';
+import { InvalidEasJsonError, MissingEasJsonError } from './errors';
 
 interface EasJsonPreValidation {
   cli?: object;
@@ -71,7 +72,7 @@ export class EasJsonReader {
       }
       return value as CliConfig;
     } catch (err: any) {
-      if (err.code === 'ENOENT') {
+      if (err instanceof MissingEasJsonError) {
         return null;
       }
       throw err;
@@ -141,7 +142,7 @@ export class EasJsonReader {
     const easJson = await this.readAndValidateAsync();
     const profile = easJson?.submit?.[profileName];
     if (!profile) {
-      throw new Error(`There is no profile named ${profileName} in eas.json`);
+      throw new Error(`There is no submit profile named ${profileName} in eas.json`);
     }
     const platformProfile = profile[platform];
     if (platformProfile) {
@@ -168,6 +169,11 @@ export class EasJsonReader {
   public async readRawAsync(): Promise<EasJsonPreValidation> {
     try {
       const easJsonPath = EasJsonReader.formatEasJsonPath(this.projectDir);
+      if (!(await fs.pathExists(easJsonPath))) {
+        throw new MissingEasJsonError(
+          `An eas.json file could not be found at ${easJsonPath}. You must make one in order to proceed. Learn more at https://expo.fyi/eas-json`
+        );
+      }
       const rawEasJson = JsonFile.read(easJsonPath);
       const { value, error } = MinimalEasJsonSchema.validate(rawEasJson, { abortEarly: false });
       if (error) {
@@ -194,7 +200,7 @@ export class EasJsonReader {
     }
     const buildProfile = easJson.build[profileName];
     if (!buildProfile) {
-      throw new Error(`There is no profile named ${profileName} in eas.json`);
+      throw new Error(`There is no build profile named ${profileName} in eas.json`);
     }
     const { extends: baseProfileName, ...buildProfileRest } = buildProfile;
     if (baseProfileName) {
@@ -209,7 +215,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 build profile named ${profileName} in eas.json`);
     }
   }
 

package/src/EasJsonSchema.ts

@@ -22,8 +22,8 @@ const CommonBuildProfileSchema = Joi.object({
   credentialsSource: Joi.string().valid('local', 'remote'),
   distribution: Joi.string().valid('store', 'internal'),
   cache: CacheSchema,
-  releaseChannel: Joi.string(),
-  channel: Joi.string(),
+  releaseChannel: Joi.string().regex(/^[a-z\d][a-z\d._-]*$/),
+  channel: Joi.string().regex(/^[a-z\d][a-z\d._-]*$/),
   developmentClient: Joi.boolean(),
 
   node: Joi.string().empty(null).custom(semverSchemaCheck),
@@ -87,6 +87,7 @@ export const AndroidSubmitProfileSchema = Joi.object({
     .valid(...Object.values(AndroidReleaseStatus))
     .default(AndroidReleaseStatus.completed),
   changesNotSentForReview: Joi.boolean().default(false),
+  applicationId: Joi.string(),
 });
 
 export const IosSubmitProfileSchema = Joi.object({
@@ -100,6 +101,7 @@ export const IosSubmitProfileSchema = Joi.object({
   language: Joi.string().default('en-US'),
   companyName: Joi.string(),
   appName: Joi.string(),
+  bundleIdentifier: Joi.string(),
 });
 
 const EasJsonSubmitConfigurationSchema = Joi.object({

package/src/EasSubmit.types.ts

@@ -19,6 +19,7 @@ export interface AndroidSubmitProfile {
   track: AndroidReleaseTrack;
   releaseStatus: AndroidReleaseStatus;
   changesNotSentForReview: boolean;
+  applicationId?: string;
 }
 
 export const AndroidSubmitProfileFieldsToEvaluate: (keyof AndroidSubmitProfile)[] = [
@@ -36,6 +37,7 @@ export interface IosSubmitProfile {
   language: string;
   companyName?: string;
   appName?: string;
+  bundleIdentifier?: string;
 }
 
 export const IosSubmitProfileFieldsToEvaluate: (keyof IosSubmitProfile)[] = [

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 build profile named debug in eas.json');
 });
 
 test('invalid eas.json when using wrong buildType', async () => {
@@ -247,7 +247,9 @@ test('empty json', async () => {
 
   const reader = new EasJsonReader('/project');
   const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'production');
-  await expect(promise).rejects.toThrowError('There is no profile named production in eas.json');
+  await expect(promise).rejects.toThrowError(
+    'There is no build profile named production in eas.json'
+  );
 });
 
 test('invalid semver value', async () => {
@@ -264,6 +266,18 @@ test('invalid semver value', async () => {
   );
 });
 
+test('invalid release channel', async () => {
+  await fs.writeJson('/project/eas.json', {
+    build: {
+      production: { releaseChannel: 'feature/myfeature' },
+    },
+  });
+
+  const reader = new EasJsonReader('/project');
+  const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'production');
+  await expect(promise).rejects.toThrowError(/fails to match the required pattern/);
+});
+
 test('get profile names', async () => {
   await fs.writeJson('/project/eas.json', {
     build: {

package/src/errors.ts

@@ -1 +1,3 @@
 export class InvalidEasJsonError extends Error {}
+
+export class MissingEasJsonError extends Error {}