@forge/manifest 3.8.1 → 3.9.0-next.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @forge/manifest
 
+## 3.9.0-next.2
+
+### Minor Changes
+
+- 4285fc36: Added validator for cross-module uniqueness of property values and a validator for keyboard shortcut accelerators.
+
+## 3.9.0-next.1
+
+### Minor Changes
+
+- b447be27: CONFDEV-80332 Added validation for Custom Content modules
+
+## 3.8.2-next.0
+
+### Patch Changes
+
+- 74e00c86: Update manifest definitions
+
 ## 3.8.1
 
 ### Patch Changes

package/out/schema/manifest-schema.json

@@ -1402,7 +1402,7 @@
                                             "type": "string",
                                             "enum": [
                                                 "read",
-                                                "write",
+                                                "create",
                                                 "delete"
                                             ]
                                         }
@@ -1413,16 +1413,6 @@
                                     "preventDuplicateTitle": {
                                         "type": "boolean"
                                     },
-                                    "breadcrumbs": {
-                                        "type": "array",
-                                        "minItems": 1,
-                                        "uniqueItems": true,
-                                        "items": {
-                                            "type": "string",
-                                            "maxLength": 100,
-                                            "minLength": 1
-                                        }
-                                    },
                                     "function": {
                                         "type": "string",
                                         "minLength": 1,
@@ -1496,7 +1486,7 @@
                                             "type": "string",
                                             "enum": [
                                                 "read",
-                                                "write",
+                                                "create",
                                                 "delete"
                                             ]
                                         }
@@ -1507,16 +1497,6 @@
                                     "preventDuplicateTitle": {
                                         "type": "boolean"
                                     },
-                                    "breadcrumbs": {
-                                        "type": "array",
-                                        "minItems": 1,
-                                        "uniqueItems": true,
-                                        "items": {
-                                            "type": "string",
-                                            "maxLength": 100,
-                                            "minLength": 1
-                                        }
-                                    },
                                     "resolver": {
                                         "additionalProperties": false,
                                         "type": "object",

package/out/schema/manifest.d.ts

@@ -820,10 +820,9 @@ export interface Modules {
           bodyType?: 'raw' | 'storage';
           supportedContainerTypes: [string, ...string[]];
           supportedChildTypes?: [string, ...string[]];
-          supportedSpacePermissions?: ['read' | 'write' | 'delete', ...('read' | 'write' | 'delete')[]];
+          supportedSpacePermissions?: ['read' | 'create' | 'delete', ...('read' | 'create' | 'delete')[]];
           indexing?: boolean;
           preventDuplicateTitle?: boolean;
-          breadcrumbs?: [string, ...string[]];
           function: string;
           key: ModuleKeySchema;
         }
@@ -834,10 +833,9 @@ export interface Modules {
           bodyType?: 'raw' | 'storage';
           supportedContainerTypes: [string, ...string[]];
           supportedChildTypes?: [string, ...string[]];
-          supportedSpacePermissions?: ['read' | 'write' | 'delete', ...('read' | 'write' | 'delete')[]];
+          supportedSpacePermissions?: ['read' | 'create' | 'delete', ...('read' | 'create' | 'delete')[]];
           indexing?: boolean;
           preventDuplicateTitle?: boolean;
-          breadcrumbs?: [string, ...string[]];
           resolver?: {
             function: string;
           };
@@ -854,10 +852,9 @@ export interface Modules {
           bodyType?: 'raw' | 'storage';
           supportedContainerTypes: [string, ...string[]];
           supportedChildTypes?: [string, ...string[]];
-          supportedSpacePermissions?: ['read' | 'write' | 'delete', ...('read' | 'write' | 'delete')[]];
+          supportedSpacePermissions?: ['read' | 'create' | 'delete', ...('read' | 'create' | 'delete')[]];
           indexing?: boolean;
           preventDuplicateTitle?: boolean;
-          breadcrumbs?: [string, ...string[]];
           function: string;
           key: ModuleKeySchema;
         }
@@ -868,10 +865,9 @@ export interface Modules {
           bodyType?: 'raw' | 'storage';
           supportedContainerTypes: [string, ...string[]];
           supportedChildTypes?: [string, ...string[]];
-          supportedSpacePermissions?: ['read' | 'write' | 'delete', ...('read' | 'write' | 'delete')[]];
+          supportedSpacePermissions?: ['read' | 'create' | 'delete', ...('read' | 'create' | 'delete')[]];
           indexing?: boolean;
           preventDuplicateTitle?: boolean;
-          breadcrumbs?: [string, ...string[]];
           resolver?: {
             function: string;
           };

package/out/text/errors.d.ts

@@ -35,7 +35,18 @@ export declare const errors: {
         };
         confluence: {
             multipleProperty: (property: string, moduleKey: string, keys: string[]) => string;
-            propertyUniquenessValidator: (property: string, moduleKey: string, keys: string[]) => string;
+            propertyUniqueness: (property: string, moduleKey: string, keys: string[]) => string;
+            crossModulePropertyUniqueness: (property: string, keys: string[]) => string;
+            validateCustomContentHierarchyUnknown: (property: string, moduleKey: string, unknownKey: string) => string;
+            validateCustomContentCrossReferenceMissingContainer: (moduleKey: string, referredModuleKey: string) => string;
+            validateCustomContentCrossReferenceMissingChild: (moduleKey: string, referredModuleKey: string) => string;
+            keyboardShortcuts: {
+                emptyAccelerator: () => string;
+                spaceAroundAccelerator: (accelerator: string) => string;
+                invalidPlusSyntax: (accelerator: string) => string;
+                invalidAcceleratorCombination: (accelerator: string) => string;
+                invalidKey: (accelerator: string, key: string) => string;
+            };
         };
         jiraWorkflowValidator: {
             missingProperty: (key: string) => string;

package/out/text/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/text/errors.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,MAAM;8BACS,MAAM,KAAG,MAAM;2BACpB,MAAM;yBAEN,MAAM,GAAG,SAAS,QAAQ,MAAM,EAAE,UAAU,MAAM,GAAG,SAAS,KAAG,MAAM;;uBAO3E,MAAM,EAAE,EAAE,GAAG,SAAS,KAAG,MAAM;4BAI1B,MAAM,EAAE,KAAG,MAAM;mCACV,MAAM,SAAS,MAAM,0CAA4B,MAAM;mDAIvC,MAAM,KAAG,MAAM;;;qCAI7B,MAAM,SAAS,MAAM,KAAG,MAAM;4CAEvB,MAAM,SAAS,MAAM,KAAG,MAAM;wCAElC,MAAM,SAAS,MAAM,EAAE,KAAG,MAAM;;;uCAMjC,MAAM,KAAG,MAAM;oCACpB,MAAM;iCAEP,MAAM,KAAG,MAAM;4CACJ,MAAM,KAAG,MAAM;;;gCAG3B,MAAM,KAAG,MAAM;6BACpB,MAAM;+BACJ,MAAM;iCACF,MAAM,KAAG,MAAM;yCACP,MAAM,eAAe,MAAM,KAAG,MAAM;yCAEpC,MAAM,eAAe,MAAM,KAAG,MAAM;6CAEhC,MAAM,KAAG,MAAM;;yCAGrB,MAAM,KAAG,MAAM;iCAEvB,MAAM,KAAG,MAAM;4CACJ,MAAM,gBAAgB,MAAM,KAAG,MAAM;sCAE3C,MAAM,gBAAgB,MAAM,gBAAgB,MAAM,KAAG,MAAM;;;yCAIxD,MAAM,aAAa,MAAM,QAAQ,MAAM,EAAE,KAAG,MAAM;oDAIvC,MAAM,aAAa,MAAM,QAAQ,MAAM,EAAE,KAAG,MAAM;;;mCAInE,MAAM,KAAG,MAAM;mCAEf,MAAM,KAAG,MAAM;;;qCAIb,MAAM,KAAG,MAAM;;;0CAIV,MAAM,KAAG,MAAM;;;mCAItB,MAAM,EAAE,KAAG,MAAM;;;qCAIf,MAAM,KAAG,MAAM;2CAET,MAAM,KAAG,MAAM;;;oCAGtB,MAAM,KAAG,MAAM;;oCAEjB,MAAM,SAAS,MAAM,KAAG,MAAM;qCAI7B,MAAM,YAAY,MAAM,KAAG,MAAM;;;;;mCAQ/B,MAAM,OAAO,MAAM,KAAG,MAAM;iCAE9B,MAAM,OAAO,MAAM,KAAG,MAAM;oCAEzB,MAAM,OAAO,MAAM,KAAG,MAAM;gDAEhB,MAAM,KAAG,MAAM;uCAExB,MAAM,KAAG,MAAM;;;;;;;;kCAQpB,MAAM,UAAU,MAAM,KAAG,MAAM;gCAEjC,MAAM,KAAG,MAAM;2CAEJ,MAAM,eAAe,MAAM,KAAG,MAAM;;;uCAI1C,MAAM;uCAEJ,MAAM,KAAG,MAAM;qCAEnB,MAAM;;CAGpC,CAAC;AAEF,oBAAY,UAAU;IACpB,eAAe,2BAA2B;IAC1C,eAAe,wBAAwB;IACvC,WAAW,4BAA4B;IACvC,WAAW,+BAA+B;IAC1C,aAAa,8BAA8B;IAC3C,OAAO,0BAA0B;IACjC,cAAc,kCAAkC;IAChD,mBAAmB,0BAA0B;IAC7C,SAAS,4BAA4B;IACrC,SAAS,4BAA4B;IACrC,UAAU,wBAAwB;IAClC,GAAG,8BAA8B;CAClC"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/text/errors.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,MAAM;8BACS,MAAM,KAAG,MAAM;2BACpB,MAAM;yBAEN,MAAM,GAAG,SAAS,QAAQ,MAAM,EAAE,UAAU,MAAM,GAAG,SAAS,KAAG,MAAM;;uBAO3E,MAAM,EAAE,EAAE,GAAG,SAAS,KAAG,MAAM;4BAI1B,MAAM,EAAE,KAAG,MAAM;mCACV,MAAM,SAAS,MAAM,0CAA4B,MAAM;mDAIvC,MAAM,KAAG,MAAM;;;qCAI7B,MAAM,SAAS,MAAM,KAAG,MAAM;4CAEvB,MAAM,SAAS,MAAM,KAAG,MAAM;wCAElC,MAAM,SAAS,MAAM,EAAE,KAAG,MAAM;;;uCAMjC,MAAM,KAAG,MAAM;oCACpB,MAAM;iCAEP,MAAM,KAAG,MAAM;4CACJ,MAAM,KAAG,MAAM;;;gCAG3B,MAAM,KAAG,MAAM;6BACpB,MAAM;+BACJ,MAAM;iCACF,MAAM,KAAG,MAAM;yCACP,MAAM,eAAe,MAAM,KAAG,MAAM;yCAEpC,MAAM,eAAe,MAAM,KAAG,MAAM;6CAEhC,MAAM,KAAG,MAAM;;yCAGrB,MAAM,KAAG,MAAM;iCAEvB,MAAM,KAAG,MAAM;4CACJ,MAAM,gBAAgB,MAAM,KAAG,MAAM;sCAE3C,MAAM,gBAAgB,MAAM,gBAAgB,MAAM,KAAG,MAAM;;;yCAIxD,MAAM,aAAa,MAAM,QAAQ,MAAM,EAAE,KAAG,MAAM;2CAIhD,MAAM,aAAa,MAAM,QAAQ,MAAM,EAAE,KAAG,MAAM;sDAEvC,MAAM,QAAQ,MAAM,EAAE,KAAG,MAAM;8DAEvB,MAAM,aAAa,MAAM,cAAc,MAAM,KAAG,MAAM;6EAEvC,MAAM,qBAAqB,MAAM,KAAG,MAAM;yEAE9C,MAAM,qBAAqB,MAAM,KAAG,MAAM;;wCAG/E,MAAM;sDACU,MAAM,KAAG,MAAM;iDAEpB,MAAM,KAAG,MAAM;6DAEH,MAAM,KAAG,MAAM;0CAElC,MAAM,OAAO,MAAM,KAAG,MAAM;;;;mCAKjC,MAAM,KAAG,MAAM;mCAEf,MAAM,KAAG,MAAM;;;qCAIb,MAAM,KAAG,MAAM;;;0CAIV,MAAM,KAAG,MAAM;;;mCAItB,MAAM,EAAE,KAAG,MAAM;;;qCAIf,MAAM,KAAG,MAAM;2CAET,MAAM,KAAG,MAAM;;;oCAGtB,MAAM,KAAG,MAAM;;oCAEjB,MAAM,SAAS,MAAM,KAAG,MAAM;qCAI7B,MAAM,YAAY,MAAM,KAAG,MAAM;;;;;mCAQ/B,MAAM,OAAO,MAAM,KAAG,MAAM;iCAE9B,MAAM,OAAO,MAAM,KAAG,MAAM;oCAEzB,MAAM,OAAO,MAAM,KAAG,MAAM;gDAEhB,MAAM,KAAG,MAAM;uCAExB,MAAM,KAAG,MAAM;;;;;;;;kCAQpB,MAAM,UAAU,MAAM,KAAG,MAAM;gCAEjC,MAAM,KAAG,MAAM;2CAEJ,MAAM,eAAe,MAAM,KAAG,MAAM;;;uCAI1C,MAAM;uCAEJ,MAAM,KAAG,MAAM;qCAEnB,MAAM;;CAGpC,CAAC;AAEF,oBAAY,UAAU;IACpB,eAAe,2BAA2B;IAC1C,eAAe,wBAAwB;IACvC,WAAW,4BAA4B;IACvC,WAAW,+BAA+B;IAC1C,aAAa,8BAA8B;IAC3C,OAAO,0BAA0B;IACjC,cAAc,kCAAkC;IAChD,mBAAmB,0BAA0B;IAC7C,SAAS,4BAA4B;IACrC,SAAS,4BAA4B;IACrC,UAAU,wBAAwB;IAClC,GAAG,8BAA8B;CAClC"}

package/out/text/errors.js

@@ -47,7 +47,18 @@ exports.errors = {
         },
         confluence: {
             multipleProperty: (property, moduleKey, keys) => `There can be only 1 ${moduleKey} module which designates "${property}": true. Modules containing designation: ${keys.join(', ')}`,
-            propertyUniquenessValidator: (property, moduleKey, keys) => `${property} should be unique across all ${moduleKey} modules. Found duplicates: ${keys.join(', ')}`
+            propertyUniqueness: (property, moduleKey, keys) => `${property} should be unique across all ${moduleKey} modules. Found duplicates: ${keys.join(', ')}`,
+            crossModulePropertyUniqueness: (property, keys) => `${property} should be unique across all modules. Found duplicates: ${keys.join(', ')}`,
+            validateCustomContentHierarchyUnknown: (property, moduleKey, unknownKey) => `${property} of the "${moduleKey}" module refers to unknown key: ${unknownKey}`,
+            validateCustomContentCrossReferenceMissingContainer: (moduleKey, referredModuleKey) => `supportedContainerTypes of the "${moduleKey}" module refers to "${referredModuleKey}" module. "${referredModuleKey}" module must include "${moduleKey}" in supportedChildTypes`,
+            validateCustomContentCrossReferenceMissingChild: (moduleKey, referredModuleKey) => `supportedChildTypes of the "${moduleKey}" module refers to "${referredModuleKey}" module. "${referredModuleKey}" module must include "${moduleKey}" in supportedContainerTypes`,
+            keyboardShortcuts: {
+                emptyAccelerator: () => 'Keyboard shortcut accelerator must be defined and not be an empty string.',
+                spaceAroundAccelerator: (accelerator) => `Keyboard shortcut accelerator must not have surrounding empty spaces. Accelerator issue found: [${accelerator}]`,
+                invalidPlusSyntax: (accelerator) => `Keyboard shortcut accelerator must not be single "+" character or have empty spaces on left or right of "+" character. Accelerator issue found: [${accelerator}]`,
+                invalidAcceleratorCombination: (accelerator) => `Keyboard shortcut accelerator combinations must have unique keys when joined with "+". Accelerator issue found: [${accelerator}]`,
+                invalidKey: (accelerator, key) => `Keyboard shortcut accelerator key must be a valid named key, i.e. ctrl, command, or a single key. Accelerator issue found: [${accelerator}] with invalid key: [${key}]`
+            }
         },
         jiraWorkflowValidator: {
             missingProperty: (key) => `${types_1.AllModuleTypes.JiraWorkflowValidator} module '${key}' must have either a function or expression.`,

package/out/utils/get-all-modules.d.ts

@@ -0,0 +1,3 @@
+import { Modules } from '../schema/manifest';
+export declare const getAllModules: (allModules: Modules) => any[];
+//# sourceMappingURL=get-all-modules.d.ts.map

package/out/utils/get-all-modules.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-all-modules.d.ts","sourceRoot":"","sources":["../../src/utils/get-all-modules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,eAAO,MAAM,aAAa,eAAgB,OAAO,KAAG,GAAG,EACqD,CAAC"}

package/out/utils/get-all-modules.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAllModules = void 0;
+exports.getAllModules = (allModules) => Object.keys(allModules).reduce((acc, key) => acc.concat(...allModules[key]), []);

package/out/utils/index.d.ts

@@ -1,3 +1,4 @@
+export * from './get-all-modules';
 export * from './line-finder';
 export * from './module-key-cleaner';
 export * from './module-references';

package/out/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC"}

package/out/utils/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./get-all-modules"), exports);
 tslib_1.__exportStar(require("./line-finder"), exports);
 tslib_1.__exportStar(require("./module-key-cleaner"), exports);
 tslib_1.__exportStar(require("./module-references"), exports);

package/out/validators/modules-validators/confluence/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/validators/modules-validators/confluence/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAkB,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAQjE,eAAO,MAAM,yBAAyB,YAAa,OAAO,+CAAiC,eAAe,EAkBzG,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/validators/modules-validators/confluence/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAkB,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAYjE,eAAO,MAAM,yBAAyB,YAAa,OAAO,+CAAiC,eAAe,EA8BzG,CAAC"}

package/out/validators/modules-validators/confluence/index.js

@@ -4,9 +4,13 @@ exports.validateConfluenceModules = void 0;
 const types_1 = require("../../../types");
 const validateSingleProperty_1 = require("./validateSingleProperty");
 const validatePropertyUniqueness_1 = require("./validatePropertyUniqueness");
+const validateKeyboardShortcuts_1 = require("./validateKeyboardShortcuts");
+const validateCrossModulePropertyUniqueness_1 = require("./validateCrossModulePropertyUniqueness");
+const validateCustomContentHierarchy_1 = require("./validateCustomContentHierarchy");
 const ROUTE = 'route';
 const USE_AS_CONFIG = 'useAsConfig';
 const USE_AS_GET_STARTED = 'useAsGetStarted';
+const KEYBOARD_SHORTCUT_ACCELERATOR = 'keyboardShortcut.accelerator';
 exports.validateConfluenceModules = (modules, yamlContentByLine) => {
     const validationErrors = [];
     [
@@ -18,5 +22,7 @@ exports.validateConfluenceModules = (modules, yamlContentByLine) => {
     });
     validationErrors.push(...validateSingleProperty_1.validateSingleProperty(modules, types_1.AllModuleTypes.ConfluenceGlobalSettings, USE_AS_CONFIG, yamlContentByLine));
     validationErrors.push(...validateSingleProperty_1.validateSingleProperty(modules, types_1.AllModuleTypes.ConfluenceGlobalSettings, USE_AS_GET_STARTED, yamlContentByLine));
+    validationErrors.push(...validateCustomContentHierarchy_1.validateCustomContentHierarchy(modules, types_1.AllModuleTypes.ConfluenceCustomContent, yamlContentByLine));
+    validationErrors.push(...validateCrossModulePropertyUniqueness_1.validateCrossModulePropertyUniqueness(modules, KEYBOARD_SHORTCUT_ACCELERATOR, yamlContentByLine), ...validateKeyboardShortcuts_1.validateKeyboardShortcuts(modules, yamlContentByLine));
     return validationErrors;
 };

package/out/validators/modules-validators/confluence/validateCrossModulePropertyUniqueness.d.ts

@@ -0,0 +1,4 @@
+import { ValidationError } from '../../../types';
+import { Modules } from '../../../schema/manifest';
+export declare const validateCrossModulePropertyUniqueness: (allModules: Modules, property: string, yamlContentByLine?: string[] | undefined) => ValidationError[];
+//# sourceMappingURL=validateCrossModulePropertyUniqueness.d.ts.map

package/out/validators/modules-validators/confluence/validateCrossModulePropertyUniqueness.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateCrossModulePropertyUniqueness.d.ts","sourceRoot":"","sources":["../../../../src/validators/modules-validators/confluence/validateCrossModulePropertyUniqueness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjD,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AASnD,eAAO,MAAM,qCAAqC,eACpC,OAAO,YACT,MAAM,+CAEf,eAAe,EAuBjB,CAAC"}

package/out/validators/modules-validators/confluence/validateCrossModulePropertyUniqueness.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateCrossModulePropertyUniqueness = void 0;
+const tslib_1 = require("tslib");
+const get_1 = tslib_1.__importDefault(require("lodash/get"));
+const text_1 = require("../../../text");
+const utils_1 = require("../../../utils");
+exports.validateCrossModulePropertyUniqueness = (allModules, property, yamlContentByLine) => {
+    var _a;
+    const validationErrors = [];
+    const modules = utils_1.getAllModules(allModules) || [];
+    const allPropertyValues = modules.map((module) => get_1.default(module, property)).filter((propertyValue) => propertyValue);
+    const duplicatePropertyValues = allPropertyValues.filter((propertyValue, index, all) => all.indexOf(propertyValue) !== index);
+    if (duplicatePropertyValues.length > 0) {
+        const allModulesWithDuplicatedPropertyValues = modules.filter((module) => get_1.default(module, property) === duplicatePropertyValues[0]);
+        validationErrors.push(Object.assign({ message: text_1.errors.modules.confluence.crossModulePropertyUniqueness(property, duplicatePropertyValues), reference: text_1.References.Modules, level: 'error' }, utils_1.findPosition((_a = allModulesWithDuplicatedPropertyValues === null || allModulesWithDuplicatedPropertyValues === void 0 ? void 0 : allModulesWithDuplicatedPropertyValues[0]) === null || _a === void 0 ? void 0 : _a.key, yamlContentByLine)));
+    }
+    return validationErrors;
+};

package/out/validators/modules-validators/confluence/validateCustomContentHierarchy.d.ts

@@ -0,0 +1,4 @@
+import { AllModuleTypes, ValidationError } from '../../../types';
+import { Modules } from '../../../schema/manifest';
+export declare const validateCustomContentHierarchy: (allModules: Modules, moduleType: AllModuleTypes, yamlContentByLine?: string[] | undefined) => ValidationError[];
+//# sourceMappingURL=validateCustomContentHierarchy.d.ts.map

package/out/validators/modules-validators/confluence/validateCustomContentHierarchy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateCustomContentHierarchy.d.ts","sourceRoot":"","sources":["../../../../src/validators/modules-validators/confluence/validateCustomContentHierarchy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjE,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAInD,eAAO,MAAM,8BAA8B,eAC7B,OAAO,cACP,cAAc,+CAEzB,eAAe,EAyDjB,CAAC"}

package/out/validators/modules-validators/confluence/validateCustomContentHierarchy.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateCustomContentHierarchy = void 0;
+const text_1 = require("../../../text");
+const utils_1 = require("../../../utils");
+const INNER_TYPE_PREFIX = 'this:';
+exports.validateCustomContentHierarchy = (allModules, moduleType, yamlContentByLine) => {
+    const validationErrors = [];
+    const modules = allModules[moduleType] || [];
+    modules.forEach((module) => {
+        const supportedContainerTypes = module.supportedContainerTypes || [];
+        const supportedChildTypes = module.supportedChildTypes || [];
+        [
+            {
+                propName: 'supportedContainerTypes',
+                propInnerValues: supportedContainerTypes.filter((supportedContainerType) => supportedContainerType.startsWith(INNER_TYPE_PREFIX)),
+                dependentPropName: 'supportedChildTypes',
+                dependentReferenceMissingMessage: text_1.errors.modules.confluence.validateCustomContentCrossReferenceMissingContainer
+            },
+            {
+                propName: 'supportedChildTypes',
+                propInnerValues: supportedChildTypes.filter((supportedChildType) => supportedChildType.startsWith(INNER_TYPE_PREFIX)),
+                dependentPropName: 'supportedContainerTypes',
+                dependentReferenceMissingMessage: text_1.errors.modules.confluence.validateCustomContentCrossReferenceMissingChild
+            }
+        ].forEach(({ propName, propInnerValues, dependentPropName, dependentReferenceMissingMessage }) => {
+            propInnerValues.forEach((value) => {
+                const referredModuleName = value.substring(INNER_TYPE_PREFIX.length);
+                const referredModule = modules.find((m) => m.key === referredModuleName);
+                if (!referredModule) {
+                    validationErrors.push(Object.assign({ message: text_1.errors.modules.confluence.validateCustomContentHierarchyUnknown(propName, module.key, referredModuleName), reference: text_1.References.Modules, level: 'error' }, utils_1.findPosition(module.key, yamlContentByLine)));
+                }
+                else {
+                    const referredModuleDependentPropValues = referredModule[dependentPropName] || [];
+                    if (!referredModuleDependentPropValues.includes(`${INNER_TYPE_PREFIX}${module.key}`)) {
+                        validationErrors.push(Object.assign({ message: dependentReferenceMissingMessage(module.key, referredModule.key), reference: text_1.References.Modules, level: 'error' }, utils_1.findPosition(module.key, yamlContentByLine)));
+                    }
+                }
+            });
+        });
+    });
+    return validationErrors;
+};

package/out/validators/modules-validators/confluence/validateKeyboardShortcuts.d.ts

@@ -0,0 +1,4 @@
+import { ValidationError } from '../../../types';
+import { Modules } from '../../../schema/manifest';
+export declare const validateKeyboardShortcuts: (allModules: Modules, yamlContentByLine?: string[] | undefined) => ValidationError[];
+//# sourceMappingURL=validateKeyboardShortcuts.d.ts.map

package/out/validators/modules-validators/confluence/validateKeyboardShortcuts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateKeyboardShortcuts.d.ts","sourceRoot":"","sources":["../../../../src/validators/modules-validators/confluence/validateKeyboardShortcuts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjD,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAgHnD,eAAO,MAAM,yBAAyB,eAAgB,OAAO,+CAAiC,eAAe,EAsB5G,CAAC"}

package/out/validators/modules-validators/confluence/validateKeyboardShortcuts.js

@@ -0,0 +1,102 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateKeyboardShortcuts = void 0;
+const text_1 = require("../../../text");
+const utils_1 = require("../../../utils");
+const VALID_SINGLE_KEY = new RegExp(/^[^+ ]$/);
+const INVALID_COMBINATION_SYNTAX = new RegExp(/(^\+$| \+|\+ )/);
+const VALID_NAMED_KEYS = new Set([
+    'f1',
+    'f2',
+    'f3',
+    'f4',
+    'f5',
+    'f6',
+    'f7',
+    'f8',
+    'f9',
+    'f10',
+    'f11',
+    'f12',
+    'shift',
+    'ctrl',
+    'alt',
+    'option',
+    'meta',
+    'command',
+    'mod',
+    'backspace',
+    'tab',
+    'enter',
+    'return',
+    'capslock',
+    'esc',
+    'escape',
+    'pageup',
+    'pagedown',
+    'end',
+    'home',
+    'left',
+    'up',
+    'right',
+    'down',
+    'ins',
+    'del',
+    'space',
+    'plus'
+]);
+const isValidKey = (key) => VALID_NAMED_KEYS.has(key) || !!key.match(VALID_SINGLE_KEY);
+const validateShortcut = (moduleKey, accelerator) => {
+    const keyboardShortcutErrors = [];
+    if (!accelerator || accelerator.trim() === '') {
+        keyboardShortcutErrors.push({
+            moduleKey,
+            message: text_1.errors.modules.confluence.keyboardShortcuts.emptyAccelerator()
+        });
+        return keyboardShortcutErrors;
+    }
+    else if (accelerator.startsWith(' ') || accelerator.endsWith(' ')) {
+        keyboardShortcutErrors.push({
+            moduleKey,
+            message: text_1.errors.modules.confluence.keyboardShortcuts.spaceAroundAccelerator(accelerator)
+        });
+        return keyboardShortcutErrors;
+    }
+    else if (accelerator.match(INVALID_COMBINATION_SYNTAX)) {
+        keyboardShortcutErrors.push({
+            moduleKey,
+            message: text_1.errors.modules.confluence.keyboardShortcuts.invalidPlusSyntax(accelerator)
+        });
+        return keyboardShortcutErrors;
+    }
+    const sequence = accelerator.split(' ');
+    for (const combination of sequence) {
+        const keys = combination.split('+');
+        const uniqueKeys = new Set(keys);
+        const allDifferent = keys.length === uniqueKeys.size;
+        if (!allDifferent) {
+            keyboardShortcutErrors.push({
+                moduleKey,
+                message: text_1.errors.modules.confluence.keyboardShortcuts.invalidAcceleratorCombination(accelerator)
+            });
+        }
+        for (const key of keys) {
+            if (!isValidKey(key)) {
+                keyboardShortcutErrors.push({
+                    moduleKey,
+                    message: text_1.errors.modules.confluence.keyboardShortcuts.invalidKey(accelerator, key)
+                });
+            }
+        }
+    }
+    return keyboardShortcutErrors;
+};
+exports.validateKeyboardShortcuts = (allModules, yamlContentByLine) => {
+    const validationErrors = [];
+    const modules = utils_1.getAllModules(allModules) || [];
+    const modulesWithKeyboardShortcut = modules.filter((module) => { var _a; return (_a = module === null || module === void 0 ? void 0 : module.keyboardShortcut) === null || _a === void 0 ? void 0 : _a.accelerator; });
+    if (modulesWithKeyboardShortcut.length > 0) {
+        modulesWithKeyboardShortcut.forEach((m) => validationErrors.push(...validateShortcut(m.key, m.keyboardShortcut.accelerator).map((e) => (Object.assign({ message: e.message, reference: text_1.References.Modules, level: 'error' }, utils_1.findPosition(e.moduleKey, yamlContentByLine))))));
+    }
+    return validationErrors;
+};

package/out/validators/modules-validators/confluence/validatePropertyUniqueness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validatePropertyUniqueness.d.ts","sourceRoot":"","sources":["../../../../src/validators/modules-validators/confluence/validatePropertyUniqueness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjE,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,eAAO,MAAM,0BAA0B,eACzB,OAAO,cACP,cAAc,YAChB,MAAM,+CAEf,eAAe,EAqBjB,CAAC"}
+{"version":3,"file":"validatePropertyUniqueness.d.ts","sourceRoot":"","sources":["../../../../src/validators/modules-validators/confluence/validatePropertyUniqueness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjE,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAUnD,eAAO,MAAM,0BAA0B,eACzB,OAAO,cACP,cAAc,YAChB,MAAM,+CAEf,eAAe,EAqBjB,CAAC"}

package/out/validators/modules-validators/confluence/validatePropertyUniqueness.js

@@ -11,7 +11,7 @@ exports.validatePropertyUniqueness = (allModules, moduleType, property, yamlCont
     const duplicatePropertyValues = allPropertyValues.filter((property, index, all) => all.indexOf(property) !== index);
     if (duplicatePropertyValues.length > 0) {
         const allModulesWithDuplicatedPropertyValues = modules.filter((module) => module[property] === duplicatePropertyValues[0]);
-        validationErrors.push(Object.assign({ message: text_1.errors.modules.confluence.propertyUniquenessValidator(property, moduleType, duplicatePropertyValues), reference: text_1.References.Modules, level: 'error' }, utils_1.findPosition((_a = allModulesWithDuplicatedPropertyValues === null || allModulesWithDuplicatedPropertyValues === void 0 ? void 0 : allModulesWithDuplicatedPropertyValues[0]) === null || _a === void 0 ? void 0 : _a.key, yamlContentByLine)));
+        validationErrors.push(Object.assign({ message: text_1.errors.modules.confluence.propertyUniqueness(property, moduleType, duplicatePropertyValues), reference: text_1.References.Modules, level: 'error' }, utils_1.findPosition((_a = allModulesWithDuplicatedPropertyValues === null || allModulesWithDuplicatedPropertyValues === void 0 ? void 0 : allModulesWithDuplicatedPropertyValues[0]) === null || _a === void 0 ? void 0 : _a.key, yamlContentByLine)));
     }
     return validationErrors;
 };

package/out/validators/modules-validators/confluence/validateSingleProperty.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateSingleProperty.d.ts","sourceRoot":"","sources":["../../../../src/validators/modules-validators/confluence/validateSingleProperty.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjE,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,eAAO,MAAM,sBAAsB,eACrB,OAAO,cACP,cAAc,YAChB,MAAM,+CAEf,eAAe,EAgBjB,CAAC"}
+{"version":3,"file":"validateSingleProperty.d.ts","sourceRoot":"","sources":["../../../../src/validators/modules-validators/confluence/validateSingleProperty.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjE,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AASnD,eAAO,MAAM,sBAAsB,eACrB,OAAO,cACP,cAAc,YAChB,MAAM,+CAEf,eAAe,EAgBjB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/manifest",
-  "version": "3.8.1",
+  "version": "3.9.0-next.2",
   "description": "Definitions and validations of the Forge manifest",
   "main": "out/index.js",
   "scripts": {
@@ -28,6 +28,7 @@
     "cheerio": "^0.22.0",
     "js-yaml": "^3.13.1",
     "json-schema-to-typescript": "^9.1.1",
+    "lodash": "^4.17.20",
     "node-fetch": "2.6.1",
     "typescript-json-schema": "^0.45.1"
   }