@expo/eas-json 7.0.0 → 7.1.0

package/build/schema.js

@@ -14,5 +14,5 @@ exports.EasJsonSchema = joi_1.default.object({
         promptToConfigurePushNotifications: joi_1.default.boolean(),
     }),
     build: joi_1.default.object().pattern(joi_1.default.string(), schema_1.BuildProfileSchema),
-    submit: joi_1.default.object().pattern(joi_1.default.string(), schema_2.SubmitProfileSchema),
+    submit: joi_1.default.object().pattern(joi_1.default.string(), schema_2.UnresolvedSubmitProfileSchema),
 });

package/build/submit/resolver.js

@@ -63,7 +63,7 @@ function mergeProfiles(base, update) {
     return { ...base, ...update };
 }
 function getDefaultProfile(platform) {
-    const Schema = platform === eas_build_job_1.Platform.ANDROID ? schema_1.AndroidSubmitProfileSchema : schema_1.IosSubmitProfileSchema;
+    const Schema = platform === eas_build_job_1.Platform.ANDROID ? schema_1.AndroidSubmitProfileSchema : schema_1.ResolvedIosSubmitProfileSchema;
     return Schema.validate({}, { allowUnknown: false, abortEarly: false, convert: true }).value;
 }
 exports.getDefaultProfile = getDefaultProfile;

package/build/submit/schema.d.ts

@@ -1,4 +1,5 @@
 import Joi from 'joi';
 export declare const AndroidSubmitProfileSchema: Joi.ObjectSchema<any>;
-export declare const IosSubmitProfileSchema: Joi.ObjectSchema<any>;
-export declare const SubmitProfileSchema: Joi.ObjectSchema<any>;
+export declare const UnresolvedIosSubmitProfileSchema: Joi.ObjectSchema<any>;
+export declare const ResolvedIosSubmitProfileSchema: Joi.ObjectSchema<any>;
+export declare const UnresolvedSubmitProfileSchema: Joi.ObjectSchema<any>;

package/build/submit/schema.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SubmitProfileSchema = exports.IosSubmitProfileSchema = exports.AndroidSubmitProfileSchema = void 0;
+exports.UnresolvedSubmitProfileSchema = exports.ResolvedIosSubmitProfileSchema = exports.UnresolvedIosSubmitProfileSchema = exports.AndroidSubmitProfileSchema = void 0;
 const tslib_1 = require("tslib");
 const joi_1 = tslib_1.__importDefault(require("joi"));
 const types_1 = require("./types");
@@ -20,7 +20,9 @@ exports.AndroidSubmitProfileSchema = joi_1.default.object({
         otherwise: joi_1.default.forbidden(),
     }),
 });
-exports.IosSubmitProfileSchema = joi_1.default.object({
+// it is less strict submission schema allowing for magic syntax like "$ASC_API_KEY_PATH"
+// to read value from environment variable later on
+exports.UnresolvedIosSubmitProfileSchema = joi_1.default.object({
     ascApiKeyPath: joi_1.default.string(),
     ascApiKeyId: joi_1.default.string(),
     ascApiKeyIssuerId: joi_1.default.string(),
@@ -34,8 +36,33 @@ exports.IosSubmitProfileSchema = joi_1.default.object({
     bundleIdentifier: joi_1.default.string(),
     metadataPath: joi_1.default.string(),
 });
-exports.SubmitProfileSchema = joi_1.default.object({
+// more strict version after resolving all of the values
+exports.ResolvedIosSubmitProfileSchema = joi_1.default.object({
+    ascApiKeyPath: joi_1.default.string(),
+    ascApiKeyId: joi_1.default.string()
+        .regex(/^[\dA-Z]{10}$/)
+        .message('Invalid Apple App Store Connect API Key ID ("ascApiKeyId") was specified. It should consist of 10 uppercase letters or digits. Example: "AB32CDE81F". Learn more: https://expo.fyi/creating-asc-api-key.'),
+    ascApiKeyIssuerId: joi_1.default.string()
+        .uuid()
+        .message('Invalid Apple App Store Connect API Key Issuer ID ("ascApiKeyIssuerId") was specified. It should be a valid UUID. Example: "b4d78f58-48c6-4f2c-96cb-94d8cd76970a". Learn more: https://expo.fyi/creating-asc-api-key.'),
+    appleId: joi_1.default.string()
+        .email()
+        .message('Invalid Apple ID was specified. It should be a valid email address. Example: "name@example.com".'),
+    ascAppId: joi_1.default.string()
+        .regex(/^\d{10}$/)
+        .message('Invalid Apple App Store Connect App ID ("ascAppId") was specified. It should consist of 10 digits. Example: "1234567891". Learn more: https://expo.fyi/asc-app-id.md.'),
+    appleTeamId: joi_1.default.string()
+        .regex(/^[\dA-Z]{10}$/)
+        .message('Invalid Apple Team ID was specified. It should consist of 10 uppercase letters or digits. Example: "AB32CDE81F".'),
+    sku: joi_1.default.string(),
+    language: joi_1.default.string().default('en-US'),
+    companyName: joi_1.default.string(),
+    appName: joi_1.default.string(),
+    bundleIdentifier: joi_1.default.string(),
+    metadataPath: joi_1.default.string(),
+});
+exports.UnresolvedSubmitProfileSchema = joi_1.default.object({
     extends: joi_1.default.string(),
     android: exports.AndroidSubmitProfileSchema,
-    ios: exports.IosSubmitProfileSchema,
+    ios: exports.UnresolvedIosSubmitProfileSchema,
 });

package/build/utils.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EasJsonUtils = void 0;
+const eas_build_job_1 = require("@expo/eas-build-job");
 const resolver_1 = require("./build/resolver");
 const errors_1 = require("./errors");
 const resolver_2 = require("./submit/resolver");
+const schema_1 = require("./submit/schema");
 class EasJsonUtils {
     static async getBuildProfileNamesAsync(accessor) {
         var _a;
@@ -66,7 +68,17 @@ class EasJsonUtils {
     }
     static async getSubmitProfileAsync(accessor, platform, profileName) {
         const easJson = await accessor.readAsync();
-        return (0, resolver_2.resolveSubmitProfile)({ easJson, platform, profileName });
+        const profile = (0, resolver_2.resolveSubmitProfile)({ easJson, platform, profileName });
+        const Schema = platform === eas_build_job_1.Platform.ANDROID ? schema_1.AndroidSubmitProfileSchema : schema_1.ResolvedIosSubmitProfileSchema;
+        const { value, error } = Schema.validate(profile, {
+            allowUnknown: false,
+            abortEarly: false,
+            convert: true,
+        });
+        if (error) {
+            throw error;
+        }
+        return value;
     }
 }
 exports.EasJsonUtils = EasJsonUtils;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@expo/eas-json",
   "description": "A library for interacting with eas.json",
-  "version": "7.0.0",
+  "version": "7.1.0",
   "author": "Expo <support@expo.dev>",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
@@ -53,5 +53,5 @@
     "node": "20.11.0",
     "yarn": "1.22.21"
   },
-  "gitHead": "fe1a1f14d1d38c5e72aa60dd365d912a9ee67650"
+  "gitHead": "bbf14e2ee8554929cea6262d60bce6395e4d9536"
 }