@expo/eas-json 0.40.0 → 0.44.0

package/build/build/schema.js

@@ -4,6 +4,7 @@ exports.BuildProfileSchema = void 0;
 const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const joi_1 = (0, tslib_1.__importDefault)(require("joi"));
+const semver_1 = (0, tslib_1.__importDefault)(require("semver"));
 const CacheSchema = joi_1.default.object({
     disabled: joi_1.default.boolean(),
     key: joi_1.default.string().max(128),
@@ -17,9 +18,9 @@ const CommonBuildProfileSchema = joi_1.default.object({
     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),
-    expoCli: joi_1.default.string().empty(null).custom(semverSchemaCheck),
+    node: joi_1.default.string().empty(null).custom(semverCheck),
+    yarn: joi_1.default.string().empty(null).custom(semverCheck),
+    expoCli: joi_1.default.string().empty(null).custom(semverCheck),
     env: joi_1.default.object().pattern(joi_1.default.string(), joi_1.default.string().empty(null)),
 });
 const AndroidBuildProfileSchema = CommonBuildProfileSchema.concat(joi_1.default.object({
@@ -27,7 +28,7 @@ const AndroidBuildProfileSchema = CommonBuildProfileSchema.concat(joi_1.default.
     distribution: joi_1.default.string().valid('store', 'internal'),
     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),
+    ndk: joi_1.default.string().empty(null).custom(semverCheck),
     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(),
@@ -40,9 +41,9 @@ const IosBuildProfileSchema = CommonBuildProfileSchema.concat(joi_1.default.obje
     autoIncrement: joi_1.default.alternatives().try(joi_1.default.boolean(), joi_1.default.string().valid('version', 'buildNumber')),
     simulator: joi_1.default.boolean(),
     image: joi_1.default.string().valid(...eas_build_job_1.Ios.builderBaseImages),
-    bundler: joi_1.default.string().empty(null).custom(semverSchemaCheck),
-    fastlane: joi_1.default.string().empty(null).custom(semverSchemaCheck),
-    cocoapods: joi_1.default.string().empty(null).custom(semverSchemaCheck),
+    bundler: joi_1.default.string().empty(null).custom(semverCheck),
+    fastlane: joi_1.default.string().empty(null).custom(semverCheck),
+    cocoapods: joi_1.default.string().empty(null).custom(semverCheck),
     artifactPath: joi_1.default.string(),
     scheme: joi_1.default.string(),
     buildConfiguration: joi_1.default.string(),
@@ -52,8 +53,8 @@ exports.BuildProfileSchema = CommonBuildProfileSchema.concat(joi_1.default.objec
     android: AndroidBuildProfileSchema,
     ios: IosBuildProfileSchema,
 }));
-function semverSchemaCheck(value) {
-    if (/^[0-9]+\.[0-9]+\.[0-9]+$/.test(value)) {
+function semverCheck(value) {
+    if (semver_1.default.valid(value)) {
         return value;
     }
     else {

package/build/reader.d.ts

@@ -11,5 +11,6 @@ export declare class EasJsonReader {
     getBuildProfileNamesAsync(): Promise<string[]>;
     getBuildProfileAsync<T extends Platform>(platform: T, profileName: string): Promise<BuildProfile<T>>;
     getCliConfigAsync(): Promise<EasJson['cli'] | null>;
+    getSubmitProfileNamesAsync(): Promise<string[]>;
     getSubmitProfileAsync<T extends Platform>(platform: T, profileName: string): Promise<SubmitProfile<T>>;
 }

package/build/reader.js

@@ -67,6 +67,11 @@ class EasJsonReader {
             throw err;
         }
     }
+    async getSubmitProfileNamesAsync() {
+        var _a;
+        const easJson = await this.readAsync();
+        return Object.keys((_a = easJson === null || easJson === void 0 ? void 0 : easJson.submit) !== null && _a !== void 0 ? _a : {});
+    }
     async getSubmitProfileAsync(platform, profileName) {
         const easJson = await this.readAsync();
         return (0, resolver_2.resolveSubmitProfile)({ easJson, platform, profileName });

package/build/submit/resolver.js

@@ -25,7 +25,7 @@ function resolveProfile({ easJson, profileName, depth = 0, platform, }) {
     const profile = (_a = easJson.submit) === null || _a === void 0 ? void 0 : _a[profileName];
     if (!profile) {
         if (depth === 0) {
-            throw new errors_1.MissingProfileError(`There is no submit profile named ${profileName} in eas.json`);
+            throw new errors_1.MissingProfileError(`Missing submit profile in eas.json: ${profileName}`);
         }
         else {
             throw new errors_1.MissingParentProfileError(`Extending non-existent submit profile in eas.json: ${profileName}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@expo/eas-json",
   "description": "A library for interacting with eas.json",
-  "version": "0.40.0",
+  "version": "0.44.0",
   "author": "Expo <support@expo.dev>",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
@@ -12,6 +12,7 @@
     "fs-extra": "10.0.0",
     "joi": "17.4.2",
     "log-symbols": "4.1.0",
+    "semver": "7.3.5",
     "tslib": "2.3.1"
   },
   "devDependencies": {
@@ -38,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ddfe60a7b062736ffd724c59bb09832dd9d8df03"
+  "gitHead": "f46063cca55c6ccf1b2a4433fac7e7422b5c7fc8"
 }

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

@@ -253,14 +253,14 @@ test('empty json', async () => {
 test('invalid semver value', async () => {
   await fs.writeJson('/project/eas.json', {
     build: {
-      production: { node: '12.0.0-alpha' },
+      production: { node: 'alpha' },
     },
   });
 
   const reader = new EasJsonReader('/project');
   const promise = reader.getBuildProfileAsync(Platform.ANDROID, 'production');
   await expect(promise).rejects.toThrowError(
-    'eas.json is not valid [ValidationError: "build.production.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 alpha is not a valid version]'
   );
 });
 
@@ -279,7 +279,7 @@ test('invalid release channel', async () => {
 test('get profile names', async () => {
   await fs.writeJson('/project/eas.json', {
     build: {
-      production: { node: '12.0.0' },
+      production: { node: '12.0.0-alpha' },
       blah: { node: '12.0.0' },
     },
   });

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

@@ -195,3 +195,28 @@ test('valid profile extending other profile', async () => {
     ascApiKeyId: 'ABCD',
   });
 });
+
+test('get profile names', async () => {
+  await fs.writeJson('/project/eas.json', {
+    submit: {
+      production: {
+        android: {
+          serviceAccountKeyPath: './path.json',
+          track: 'beta',
+          releaseStatus: 'completed',
+        },
+      },
+      blah: {
+        android: {
+          serviceAccountKeyPath: './path.json',
+          track: 'internal',
+          releaseStatus: 'completed',
+        },
+      },
+    },
+  });
+
+  const reader = new EasJsonReader('/project');
+  const allProfileNames = await reader.getSubmitProfileNamesAsync();
+  expect(allProfileNames.sort()).toEqual(['production', 'blah'].sort());
+});

package/src/build/schema.ts

@@ -1,5 +1,6 @@
 import { Android, Ios } from '@expo/eas-build-job';
 import Joi from 'joi';
+import semver from 'semver';
 
 const CacheSchema = Joi.object({
   disabled: Joi.boolean(),
@@ -16,9 +17,9 @@ const CommonBuildProfileSchema = Joi.object({
   channel: Joi.string().regex(/^[a-z\d][a-z\d._-]*$/),
   developmentClient: Joi.boolean(),
 
-  node: Joi.string().empty(null).custom(semverSchemaCheck),
-  yarn: Joi.string().empty(null).custom(semverSchemaCheck),
-  expoCli: Joi.string().empty(null).custom(semverSchemaCheck),
+  node: Joi.string().empty(null).custom(semverCheck),
+  yarn: Joi.string().empty(null).custom(semverCheck),
+  expoCli: Joi.string().empty(null).custom(semverCheck),
   env: Joi.object().pattern(Joi.string(), Joi.string().empty(null)),
 });
 
@@ -29,7 +30,7 @@ const AndroidBuildProfileSchema = CommonBuildProfileSchema.concat(
     withoutCredentials: Joi.boolean(),
 
     image: Joi.string().valid(...Android.builderBaseImages),
-    ndk: Joi.string().empty(null).custom(semverSchemaCheck),
+    ndk: Joi.string().empty(null).custom(semverCheck),
     autoIncrement: Joi.alternatives().try(
       Joi.boolean(),
       Joi.string().valid('version', 'versionCode')
@@ -54,9 +55,9 @@ const IosBuildProfileSchema = CommonBuildProfileSchema.concat(
     simulator: Joi.boolean(),
 
     image: Joi.string().valid(...Ios.builderBaseImages),
-    bundler: Joi.string().empty(null).custom(semverSchemaCheck),
-    fastlane: Joi.string().empty(null).custom(semverSchemaCheck),
-    cocoapods: Joi.string().empty(null).custom(semverSchemaCheck),
+    bundler: Joi.string().empty(null).custom(semverCheck),
+    fastlane: Joi.string().empty(null).custom(semverCheck),
+    cocoapods: Joi.string().empty(null).custom(semverCheck),
 
     artifactPath: Joi.string(),
     scheme: Joi.string(),
@@ -72,8 +73,8 @@ export const BuildProfileSchema = CommonBuildProfileSchema.concat(
   })
 );
 
-function semverSchemaCheck(value: any): any {
-  if (/^[0-9]+\.[0-9]+\.[0-9]+$/.test(value)) {
+function semverCheck(value: any): any {
+  if (semver.valid(value)) {
     return value;
   } else {
     throw new Error(`${value} is not a valid version`);

package/src/reader.ts

@@ -77,6 +77,11 @@ export class EasJsonReader {
     }
   }
 
+  public async getSubmitProfileNamesAsync(): Promise<string[]> {
+    const easJson = await this.readAsync();
+    return Object.keys(easJson?.submit ?? {});
+  }
+
   public async getSubmitProfileAsync<T extends Platform>(
     platform: T,
     profileName: string

package/src/submit/resolver.ts

@@ -48,7 +48,7 @@ function resolveProfile<T extends Platform>({
   const profile = easJson.submit?.[profileName];
   if (!profile) {
     if (depth === 0) {
-      throw new MissingProfileError(`There is no submit profile named ${profileName} in eas.json`);
+      throw new MissingProfileError(`Missing submit profile in eas.json: ${profileName}`);
     } else {
       throw new MissingParentProfileError(
         `Extending non-existent submit profile in eas.json: ${profileName}`