@contrail/cli 2.3.3 → 2.4.0-alpha

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/2.3.3 darwin-arm64 node-v18.13.0
+@contrail/cli/2.4.0-alpha darwin-arm64 node-v22.3.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND
@@ -174,10 +174,9 @@ Install an app from the marketplace
 
 ```
 USAGE
-  $ contrail app install [-i <value>] [-w] [-h]
+  $ contrail app install [-i <value>] [-w]
 
 FLAGS
-  -h, --showHidden                Show the option to install public but hidden apps
   -i, --appIdentifier=<value>     The identifier of the app to install
   -w, --installWorkflowTemplates  "Install the app's accompanying workflows"
 

package/dist/api/apps.d.ts

@@ -7,4 +7,4 @@ export declare function upgradeAppVersion(appOrg: any, appVersionId: any): Promi
 export declare function deleteAppOrg(appOrgId: string): Promise<AppOrg>;
 export declare function getInstalledApps(): Promise<AppOrg[]>;
 export declare function installAppToOrg(app: any, configProperties: any): Promise<AppOrg>;
-export declare function getAvailableApps(options?: any): Promise<App[]>;
+export declare function getAvailableApps(): Promise<App[]>;

package/dist/api/apps.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAvailableApps = exports.installAppToOrg = exports.getInstalledApps = exports.deleteAppOrg = exports.upgradeAppVersion = exports.getAppVersions = exports.getWorkflowTemplateDefinitionsForAppVersion = void 0;
-const auth_1 = require("../auth/auth");
 const sdk_1 = require("@contrail/sdk");
 async function getWorkflowTemplateDefinitionsForAppVersion(options) {
     return await new sdk_1.Entities().get({
@@ -55,26 +54,10 @@ async function installAppToOrg(app, configProperties) {
     });
 }
 exports.installAppToOrg = installAppToOrg;
-async function getAvailableApps(options) {
-    const orgId = options?.orgId ?? auth_1.Auth.config.orgId;
-    const apps = [];
-    apps.push(...(await new sdk_1.Entities().get({
+async function getAvailableApps() {
+    const apps = await new sdk_1.Entities().get({
         entityName: 'app',
-        criteria: {
-            orgId,
-            private: true,
-            ...options,
-        },
-    })));
-    apps.push(...(await new sdk_1.Entities().get({
-        entityName: 'app',
-        criteria: {
-            orgId,
-            private: false,
-            hidden: true,
-            ...options,
-        },
-    })));
+    });
     return apps;
 }
 exports.getAvailableApps = getAvailableApps;

package/dist/auth/login.d.ts

@@ -1,3 +1,2 @@
 import { AuthContext } from './auth';
 export declare function authUser(): Promise<AuthContext>;
-export declare function getCurrentUser(): Promise<any>;

package/dist/auth/login.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCurrentUser = exports.authUser = void 0;
+exports.authUser = void 0;
 const tslib_1 = require("tslib");
 const amazon_cognito_identity_js_1 = require("amazon-cognito-identity-js");
 const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
@@ -122,19 +122,9 @@ async function setAuthContext(user, params) {
     (0, sdk_1.setConfig)(auth_1.Auth.config);
     return refreshCurrentUserOrg();
 }
-async function getCurrentUser() {
-    return await sdk_1.Request.request('/users/current', {
-        method: 'GET',
-        headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json',
-        },
-    });
-}
-exports.getCurrentUser = getCurrentUser;
 async function refreshCurrentUserOrg() {
     logger_1.default.debug('refreshing current user org...');
-    const currentUser = await getCurrentUser();
+    const currentUser = await (0, sdk_1.getCurrentUser)();
     if (!currentUser) {
         throw Error('Could not get current user');
     }

package/dist/commands/app/create.js

@@ -15,7 +15,7 @@ class CreateApp extends basecommand_1.BaseCommand {
     ];
     async run() {
         await (0, login_1.authUser)();
-        const currentUser = await (0, login_1.getCurrentUser)();
+        const currentUser = await (0, sdk_1.getCurrentUser)();
         const username = currentUser.email.split('@')[0];
         const defaultAppName = `Hello World by ${username}`;
         const defaultAppIdentifier = `@${username}/hello-world`;
@@ -61,7 +61,6 @@ class CreateApp extends basecommand_1.BaseCommand {
             name: answers.appName,
             publisher: answers.appPublisher,
             public: false,
-            hidden: false,
             description: answers.appDescription,
             frameworkVersion: 2,
         };

package/dist/commands/app/init.js

@@ -5,6 +5,7 @@ const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const login_1 = require("../../auth/login");
 const basecommand_1 = require("../../basecommand");
 const setup_template_1 = require("../../helpers/app/setup-template");
+const sdk_1 = require("@contrail/sdk");
 class CreateApp extends basecommand_1.BaseCommand {
     static description = 'Create an app from a template';
     static examples = [
@@ -13,7 +14,7 @@ class CreateApp extends basecommand_1.BaseCommand {
     ];
     async run() {
         await (0, login_1.authUser)();
-        const currentUser = await (0, login_1.getCurrentUser)();
+        const currentUser = await (0, sdk_1.getCurrentUser)();
         const username = currentUser.email.split('@')[0];
         const defaultAppName = `Hello World by ${username}`;
         const defaultAppIdentifier = `@${username}/hello-world`;

package/dist/commands/app/install.d.ts

@@ -6,7 +6,6 @@ export default class InstallApp extends BaseCommand {
     static flags: {
         appIdentifier: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         installWorkflowTemplates: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        showHidden: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/dist/commands/app/install.js

@@ -30,16 +30,11 @@ class InstallApp extends basecommand_1.BaseCommand {
             description: '"Install the app\'s accompanying workflows"',
             required: false,
         }),
-        showHidden: core_1.Flags.boolean({
-            char: 'h',
-            description: 'Show the option to install public but hidden apps',
-            required: false,
-        }),
     };
     async run() {
         const { flags } = await this.parse(InstallApp);
         await (0, login_1.authUser)();
-        const apps = await (0, apps_1.getAvailableApps)({ hidden: flags.showHidden });
+        const apps = await (0, apps_1.getAvailableApps)();
         if (!apps.length) {
             throw new Error('No apps are available to install...');
         }

package/dist/commands/types/getAll.js

@@ -312,6 +312,9 @@ function reduceTypes(dataHolder) {
     for (const type of dataHolder.types) {
         const reducedTypeProperties = [];
         for (const typeProperty of type.typeProperties) {
+            if (typeProperty.inherited) {
+                continue;
+            }
             const reducedTypeProperty = {
                 slug: typeProperty.slug,
                 id: typeProperty.id,
@@ -325,10 +328,14 @@ function reduceTypes(dataHolder) {
                 formula: typeProperty.formula,
                 referencedTypePath: typeProperty.referencedTypePath,
                 referencedTypeRootSlug: typeProperty.referencedTypeRootSlug,
+                typePropertyUserListId: typeProperty.typePropertyUserListId,
+                referencedTypeRole: typeProperty.referencedTypeRole,
                 defaultValue: typeProperty.defaultValue,
                 propertyLevel: typeProperty.propertyLevel,
                 carryOverBehavior: typeProperty.carryOverBehavior,
                 carryOverDefault: typeProperty.carryOverDefault,
+                isUniqueProperty: typeProperty.isUniqueProperty,
+                isUniquePropertyInFamily: typeProperty.isUniquePropertyInFamily,
                 inherited: typeProperty.inherited,
                 formulaFunction: typeProperty.formulaFunction,
                 validationFunction: typeProperty.validationFunction,

package/dist/commands/types/mergeOptionSets.js

@@ -55,6 +55,7 @@ async function mergeOptionSets(fileLocation) {
     const currentOptionSets = currentOptionSetsFull.map((os) => Object.assign({}, {
         name: os.name,
         isArchived: os.isArchived,
+        slug: os.slug,
         optionSet: os.optionSet,
     }));
     const currentOptionSetsByName = {};
@@ -101,9 +102,10 @@ function mergeOptionSet(existingOptionSet, uploadedOptionSet) {
         for (const keyVal of existingOptionSet.optionSet) {
             const value = keyVal.value;
             const display = keyVal.display;
+            const disabled = keyVal?.disabled;
             const found = merged.optionSet.find((keyVal) => keyVal.value === value);
             if (!found) {
-                merged.optionSet.push({ value, display });
+                merged.optionSet.push({ value, display, disabled });
             }
         }
     }

package/dist/commands/types/parseOptionSetsLocalFiles.d.ts

@@ -18,18 +18,20 @@ export declare function ParseOptionSetsToFolderStructure(args: any): Promise<voi
  */
 export declare function parseLabelsInColumn(uploadedOptionData: any): any[];
 /**
- * Expects a CSV file with an ignored header file and 3 columns:
+ * Expects a CSV file with an ignored header file and 4 columns:
  *  The first column contains the option set name (e.g. Gender)
  *  The second column contains the option keys (e.g. ge_men)
- *  The second column contains the option display label (e.g. Men)
+ *  The third column contains the option display label (e.g. Men)
+ *  The fourth column contains the disabled value (e.g. true / false)
  *
  * Sample file
- * ignored header 1, ignored header 2, ignored header 3
- * Gender, ge_men, Men
- * Gender, ge_women, Women
- * Brand, b_prada, Prada
- * Brand, b_coach, Coach
+ * ignored header 1, ignored header 2, ignored header 3, ignored header 4
+ * Gender, ge_men, Men, true
+ * Gender, ge_women, Women, false
+ * Brand, b_prada, Prada, true
+ * Brand, b_coach, Coach, true
  * @param uploadedOptionData
  * @returns
  */
 export declare function parseNameAndLabelAndKey(uploadedOptionData: any[]): any[];
+export declare function parseDisabledValue(stringValue: string): boolean;

package/dist/commands/types/parseOptionSetsLocalFiles.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseNameAndLabelAndKey = exports.parseLabelsInColumn = exports.ParseOptionSetsToFolderStructure = void 0;
+exports.parseDisabledValue = exports.parseNameAndLabelAndKey = exports.parseLabelsInColumn = exports.ParseOptionSetsToFolderStructure = void 0;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
@@ -154,7 +154,7 @@ function parseLabelsInColumn(uploadedOptionData) {
         const uniqueOptionSetValues = new Set();
         for (const data of uploadedOptionData) {
             const label = data[optionSetName];
-            uniqueOptionSetValues.add(label);
+            uniqueOptionSetValues.add(label.toString()); // Parse the value to string
         }
         const optionSet = [];
         if (uniqueOptionSetValues) {
@@ -180,17 +180,18 @@ function parseLabelsInColumn(uploadedOptionData) {
 }
 exports.parseLabelsInColumn = parseLabelsInColumn;
 /**
- * Expects a CSV file with an ignored header file and 3 columns:
+ * Expects a CSV file with an ignored header file and 4 columns:
  *  The first column contains the option set name (e.g. Gender)
  *  The second column contains the option keys (e.g. ge_men)
- *  The second column contains the option display label (e.g. Men)
+ *  The third column contains the option display label (e.g. Men)
+ *  The fourth column contains the disabled value (e.g. true / false)
  *
  * Sample file
- * ignored header 1, ignored header 2, ignored header 3
- * Gender, ge_men, Men
- * Gender, ge_women, Women
- * Brand, b_prada, Prada
- * Brand, b_coach, Coach
+ * ignored header 1, ignored header 2, ignored header 3, ignored header 4
+ * Gender, ge_men, Men, true
+ * Gender, ge_women, Women, false
+ * Brand, b_prada, Prada, true
+ * Brand, b_coach, Coach, true
  * @param uploadedOptionData
  * @returns
  */
@@ -198,7 +199,7 @@ function parseNameAndLabelAndKey(uploadedOptionData) {
     const optionSets = {};
     for (const csvRow of uploadedOptionData) {
         const row = Object.values(csvRow);
-        if (row.length !== 3 || row.some((x) => !x)) {
+        if (!(row.length === 4 || row.length === 3) || row.some((x) => !x)) {
             console.log('skipping bad row', JSON.stringify(row, null, 2));
             continue;
         }
@@ -208,15 +209,23 @@ function parseNameAndLabelAndKey(uploadedOptionData) {
         }
         const key = row[1];
         const label = row[2];
-        optionSets[optionSetName][key] = label;
+        let disabled = false;
+        if (row.length === 4) {
+            // as bad row is skipped above, testString is always a string
+            const testString = row[3];
+            disabled = parseDisabledValue(testString);
+        }
+        optionSets[optionSetName][key] = { label, disabled };
     }
     const result = [];
     for (const optionSetName of Object.keys(optionSets)) {
         const optionSet = [];
-        for (const [key, value] of Object.entries(optionSets[optionSetName])) {
+        for (const [key, obj] of Object.entries(optionSets[optionSetName])) {
+            const optionObj = obj; // Add type annotation
             optionSet.push({
-                value: key,
-                display: value,
+                value: key.toString(),
+                display: optionObj?.label,
+                disabled: optionObj?.disabled, // Use the type annotated variable
             });
         }
         const reducedOptionSet = {
@@ -230,3 +239,13 @@ function parseNameAndLabelAndKey(uploadedOptionData) {
     return result;
 }
 exports.parseNameAndLabelAndKey = parseNameAndLabelAndKey;
+function parseDisabledValue(stringValue) {
+    const testString = /^true$/i.test(stringValue?.trim());
+    const isDisabledFalse = testString === false;
+    const isDisabledTrue = testString === true;
+    if (!isDisabledFalse && !isDisabledTrue) {
+        console.warn(`Invalid value (${stringValue}) for disabled attribute. Must be either "true" or "false"`);
+    }
+    return isDisabledTrue;
+}
+exports.parseDisabledValue = parseDisabledValue;

package/dist/commands/types/uploadOptionSets.d.ts

@@ -8,3 +8,4 @@ export default class UploadOptionSets extends BaseCommand {
     run(): Promise<void>;
 }
 export declare function uploadOptionSets(dir: string): Promise<void>;
+export declare function parseOptionSetValuesToString(optionSet: any): any;

package/dist/commands/types/uploadOptionSets.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadOptionSets = void 0;
+exports.parseOptionSetValuesToString = exports.uploadOptionSets = void 0;
 const tslib_1 = require("tslib");
 const sdk_1 = require("@contrail/sdk");
 const fs_1 = tslib_1.__importDefault(require("fs"));
@@ -11,6 +11,7 @@ const core_1 = require("@oclif/core");
 const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const lodash_1 = require("lodash");
 class UploadOptionSets extends basecommand_1.BaseCommand {
     static description = 'Upload OptionSets for your Org. OptionSets are loaded from .yml files in the option-sets directory.';
     static examples = [
@@ -34,7 +35,7 @@ exports.default = UploadOptionSets;
 async function uploadOptionSets(dir) {
     try {
         const userConfig = await (0, login_1.authUser)();
-        logger_1.default.info(`${chalk_1.default.blue.bold('START')} Getting all types for orgId: ${userConfig.orgId}`);
+        logger_1.default.info(`${chalk_1.default.blue.bold('START')} Getting all types for org ${userConfig.orgSlug}`);
         logger_1.default.info(`${chalk_1.default.yellow.bold('OPTION SETS')} Uploading`);
         await uploadOS(dir);
         logger_1.default.info(`${chalk_1.default.yellow.bold('OPTION SETS')} Uploaded`);
@@ -60,6 +61,17 @@ function loadOptionSets(fromDir) {
         throw new Error(`ERROR PARSING YAML: ${e}`);
     }
 }
+function parseOptionSetValuesToString(optionSet) {
+    return (0, lodash_1.cloneDeepWith)(optionSet, (value) => {
+        // If the value is an object or array, let cloneDeepWith handle it
+        if ((0, lodash_1.isObject)(value) || (0, lodash_1.isArray)(value)) {
+            return undefined;
+        }
+        // Otherwise, convert the value to string
+        return String(value);
+    });
+}
+exports.parseOptionSetValuesToString = parseOptionSetValuesToString;
 async function uploadOS(dir) {
     const optionSets = loadOptionSets(dir);
     const currentOptionSets = await new sdk_1.Entities().get({
@@ -83,18 +95,20 @@ async function uploadOS(dir) {
                     logger_1.default.info(`No OptionSet for: ${optionSet.slug}`);
                     continue;
                 }
-                logger_1.default.info(`Creating: ${JSON.stringify(optionSet, null, 2)}`);
+                const parsedOptionSet = parseOptionSetValuesToString(optionSet.optionSet);
+                logger_1.default.info(`Creating: ${JSON.stringify(parsedOptionSet, null, 2)}`);
                 await new sdk_1.Entities().create({
                     entityName: 'type-property-option-set',
                     object: {
                         name: optionSet.name,
                         slug: optionSet.slug,
-                        optionSet: optionSet.optionSet,
+                        optionSet: parsedOptionSet,
                         isArchived: optionSet.isArchived,
                     },
                 });
             }
             else {
+                const parsedOptionSet = parseOptionSetValuesToString(optionSet.optionSet);
                 logger_1.default.info(`Updating: ${optionSet.slug}`);
                 await new sdk_1.Entities().update({
                     entityName: 'type-property-option-set',
@@ -102,7 +116,7 @@ async function uploadOS(dir) {
                     object: {
                         name: optionSet.name,
                         slug: optionSet.slug,
-                        optionSet: optionSet.optionSet,
+                        optionSet: parsedOptionSet,
                         isArchived: optionSet.isArchived,
                     },
                 });
@@ -112,19 +126,18 @@ async function uploadOS(dir) {
             logger_1.default.error(`Error Uploading OptionSets: ${err}`);
         }
     }
-    for (const currentOptionSet of currentOptionSets) {
-        try {
-            const found = newOptionSetsBySlug[currentOptionSet.slug];
-            if (!found) {
-                logger_1.default.info(`Deleting: ${currentOptionSet.slug}`);
-                await new sdk_1.Entities().delete({
-                    entityName: 'type-property-option-set',
-                    id: currentOptionSet.id,
-                });
-            }
-        }
-        catch (err) {
-            logger_1.default.error(`Error Deleting OptionSets: ${err}`);
-        }
-    }
+    // for (const currentOptionSet of currentOptionSets) {
+    //   try {
+    //     const found = newOptionSetsBySlug[currentOptionSet.slug];
+    //     if (!found) {
+    //       logger.info(`Deleting: ${currentOptionSet.slug}`);
+    //       await new Entities().delete({
+    //         entityName: 'type-property-option-set',
+    //         id: currentOptionSet.id,
+    //       });
+    //     }
+    //   } catch (err) {
+    //     logger.error(`Error Deleting OptionSets: ${err}`);
+    //   }
+    // }
 }

package/dist/helpers/app/app-config-validators.d.ts

@@ -1,7 +1,22 @@
 import { AppDeclaration } from '../../interfaces';
 export interface AppConfigValidationError {
-    error: string;
+    errors: string[];
+    warnings: string[];
 }
+export declare const ERROR_MESSAGES: {
+    missingVersionField: string;
+    invalidVersionField: string;
+    invalidAppVersion: string;
+    accessGrantsArray: string;
+    invalidOrgSlug: string;
+    emptyPermissionsArray: string;
+    invalidVisibility: string;
+    deprecatedHiddenField: string;
+    ignoredAccessGrants: string;
+    invalidPermission: (permission: string) => string;
+    invalidAccessGrants: (error: string) => string;
+};
 export declare function validateAppConfig(appConfig: AppDeclaration): void;
 export declare function appVersionValidator(appDeclaration: AppDeclaration): AppConfigValidationError;
 export declare function visibilityValidator(appDeclaration: AppDeclaration): AppConfigValidationError;
+export declare function validateAccessGrants(appDeclaration: AppDeclaration): AppConfigValidationError;

package/dist/helpers/app/app-config-validators.js

@@ -1,14 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.visibilityValidator = exports.appVersionValidator = exports.validateAppConfig = void 0;
-const VALIDATORS = [appVersionValidator, visibilityValidator];
+exports.validateAccessGrants = exports.visibilityValidator = exports.appVersionValidator = exports.validateAppConfig = exports.ERROR_MESSAGES = void 0;
+const tslib_1 = require("tslib");
+const interfaces_1 = require("../../interfaces");
+const logger_1 = tslib_1.__importDefault(require("../../logger"));
+const VALIDATORS = [appVersionValidator, visibilityValidator, validateAccessGrants];
+exports.ERROR_MESSAGES = {
+    missingVersionField: 'Missing "version" field". Semantic App Version looks like "1.0.0". Use "contrail app version [patch|minor|major]" to update the app version.',
+    invalidVersionField: '"version" field is not a string. Expecting a version like "1.0.0". Manually update the "version" field to be a string in the app.yml file.',
+    invalidAppVersion: 'Invalid app version. Semantic App Version looks like "1.0.0". Use "contrail app version [patch|minor|major]" to update the app version.',
+    accessGrantsArray: 'accessGrants must be an array.',
+    invalidOrgSlug: 'Invalid or missing orgSlug in one of the accessGrants objects.',
+    emptyPermissionsArray: 'Permissions must be a non-empty array in one of the accessGrants objects.',
+    invalidVisibility: 'Invalid visibility. Visibility must be "public" or "private".',
+    deprecatedHiddenField: 'The "hidden" field is deprecated.',
+    ignoredAccessGrants: 'App is set to public. accessGrants will be ignored.',
+    invalidPermission: (permission) => `Invalid permission found in one of the accessGrants objects: ${permission}.`,
+    invalidAccessGrants: (error) => `Invalid accessGrants. ${error}`,
+};
 function validateAppConfig(appConfig) {
     const errors = [];
+    const warnings = [];
     for (const validator of VALIDATORS) {
-        const error = validator(appConfig);
-        if (error) {
-            errors.push(error);
-        }
+        const validation = validator(appConfig);
+        errors.push(...validation.errors);
+        warnings.push(...validation.warnings);
+    }
+    if (warnings.length) {
+        logger_1.default.warn(warnings);
     }
     if (errors.length) {
         throw new Error(`Invalid app config: \n ${errors.map((x) => x.error).join('\n')}`);
@@ -16,36 +35,66 @@ function validateAppConfig(appConfig) {
 }
 exports.validateAppConfig = validateAppConfig;
 function appVersionValidator(appDeclaration) {
+    const errors = [];
+    const warnings = [];
     if (!appDeclaration.version) {
-        return {
-            error: 'Missing "version" field". Semantic App Version looks like "1.0.0". Use "contrail app version [patch|minor|major]" to update the app version.',
-        };
+        errors.push(exports.ERROR_MESSAGES.missingVersionField);
+        return { errors, warnings };
     }
     if (typeof appDeclaration.version !== 'string') {
-        return {
-            error: '"version" field is not a string. Expecting a version like "1.0.0". Manually update the "version" field to be a string in the app.yml file.',
-        };
+        errors.push(exports.ERROR_MESSAGES.invalidVersionField);
+        return { errors, warnings };
     }
     const parts = appDeclaration.version.split('.');
     if (parts.length !== 3) {
-        return {
-            error: 'Invalid app version. Semantic App Version looks like "1.0.0". Use "contrail app version [patch|minor|major]" to update the app version.',
-        };
+        errors.push(exports.ERROR_MESSAGES.invalidAppVersion);
     }
+    return { errors, warnings };
 }
 exports.appVersionValidator = appVersionValidator;
 function visibilityValidator(appDeclaration) {
+    const errors = [];
+    const warnings = [];
     if (!['public', 'private'].includes(appDeclaration.visibility)) {
-        return {
-            error: 'Invalid visibility. Visibility must be "public" or "private".',
-        };
+        errors.push(exports.ERROR_MESSAGES.invalidVisibility);
     }
-    if (appDeclaration.visibility === 'private' &&
-        Object.prototype.hasOwnProperty.call(appDeclaration, 'hidden') &&
-        appDeclaration.hidden === true) {
-        return {
-            error: 'Apps can not be private and hidden.',
-        };
+    if (appDeclaration.hasOwnProperty('hidden')) {
+        warnings.push(exports.ERROR_MESSAGES.deprecatedHiddenField);
     }
+    return { errors, warnings };
 }
 exports.visibilityValidator = visibilityValidator;
+function validateAccessGrants(appDeclaration) {
+    const errors = [];
+    const warnings = [];
+    if (appDeclaration.visibility === 'public' && appDeclaration.hasOwnProperty('accessGrants')) {
+        warnings.push(exports.ERROR_MESSAGES.ignoredAccessGrants);
+    }
+    if (appDeclaration.visibility === 'private' && appDeclaration.hasOwnProperty('accessGrants')) {
+        const accessGrantsArray = appDeclaration.accessGrants;
+        if (!Array.isArray(accessGrantsArray)) {
+            errors.push(exports.ERROR_MESSAGES.accessGrantsArray);
+            return { errors, warnings };
+        }
+        for (const accessGrants of accessGrantsArray) {
+            if (!accessGrants?.orgSlug || accessGrants?.orgSlug.trim() === '') {
+                errors.push(exports.ERROR_MESSAGES.invalidOrgSlug);
+            }
+            if (!Array.isArray(accessGrants?.permissions) || accessGrants?.permissions.length === 0) {
+                errors.push(exports.ERROR_MESSAGES.emptyPermissionsArray);
+            }
+            if (Array.isArray(accessGrants?.permissions)) {
+                for (const permission of accessGrants.permissions) {
+                    if (!isValidPermission(permission)) {
+                        errors.push(exports.ERROR_MESSAGES.invalidPermission(permission));
+                    }
+                }
+            }
+        }
+    }
+    return { errors, warnings };
+}
+exports.validateAccessGrants = validateAccessGrants;
+function isValidPermission(permission) {
+    return Object.values(interfaces_1.AppAccessPermission).includes(permission);
+}