@forge/manifest 13.6.0-next.3 → 13.6.0-next.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @forge/manifest
 
+## 13.6.0-next.5
+
+### Patch Changes
+
+- 537590c: Update manifest definitions
+
+## 13.6.0-next.4
+
+### Minor Changes
+
+- 5932866: Allow `and`/`or`/`not` in `displayConditions` on Jira and JSM modules to be a list of composite conditions, in addition to a single condition object.
+
 ## 13.6.0-next.3
 
 ### Minor Changes

package/out/schema/manifest-schema.json

@@ -3806,6 +3806,61 @@
                     },
                     "minItems": 1
                 },
+                "confluence:attachmentAction": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "title": {
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 100
+                            },
+                            "icon": {
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 255
+                            },
+                            "resource": {
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 47,
+                                "pattern": "^[a-zA-Z0-9_\\-]{1,23}(/[a-zA-Z0-9_\\-]{1,23})?$"
+                            },
+                            "resolvedResourceEntry": {
+                                "type": "string",
+                                "minLength": 1,
+                                "maxLength": 64,
+                                "pattern": "^[a-zA-Z0-9._-]+$"
+                            },
+                            "render": {
+                                "enum": [
+                                    "native",
+                                    "default"
+                                ],
+                                "type": "string",
+                                "default": "default"
+                            },
+                            "location": {
+                                "type": "string",
+                                "enum": [
+                                    "action",
+                                    "metadata"
+                                ]
+                            },
+                            "key": {
+                                "$ref": "#/definitions/ModuleKeySchema"
+                            }
+                        },
+                        "required": [
+                            "title",
+                            "resource",
+                            "location",
+                            "key"
+                        ]
+                    },
+                    "minItems": 1
+                },
                 "confluence:contentBylineItem": {
                     "type": "array",
                     "items": {

package/out/schema/manifest.d.ts

@@ -13654,6 +13654,28 @@ export interface Modules {
         }
     )[]
   ];
+  'confluence:attachmentAction'?: [
+    {
+      title: string;
+      icon?: string;
+      resource: string;
+      resolvedResourceEntry?: string;
+      render?: 'native' | 'default';
+      location: 'action' | 'metadata';
+      key: ModuleKeySchema;
+      [k: string]: unknown;
+    },
+    ...{
+      title: string;
+      icon?: string;
+      resource: string;
+      resolvedResourceEntry?: string;
+      render?: 'native' | 'default';
+      location: 'action' | 'metadata';
+      key: ModuleKeySchema;
+      [k: string]: unknown;
+    }[]
+  ];
   'confluence:contentBylineItem'?: [
     (
       | {

package/out/validators/display-conditions-validator.d.ts

@@ -7,7 +7,7 @@ export declare class DisplayConditionsValidator<T> implements ValidatorInterface
     private readonly moduleSchemas;
     private readonly supportedOperations;
     constructor(schema: object);
-    flattenDisplayConditions(moduleKey: string, displayConditions: any, nesting?: number, location?: string): any;
+    flattenDisplayConditions(moduleType: string, moduleKey: string, displayConditions: any, nesting?: number, location?: string): any;
     toValidationError(message: string): ValidationError;
     private collectNestedDisplayConditionsTargets;
     private validateDisplayConditions;

package/out/validators/display-conditions-validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"display-conditions-validator.d.ts","sourceRoot":"","sources":["../../src/validators/display-conditions-validator.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,cAAc,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAGrG,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAiBpD,qBAAa,0BAA0B,CAAC,CAAC,CACvC,YAAW,kBAAkB,CAAC,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,EAAE,cAAc,CAAC;IAM7E,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJnC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAmB;IAClD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAC/C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA2B;gBAElC,MAAM,EAAE,MAAM;IAoE3C,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,OAAO,SAAI,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,GAAG;IA2BxG,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe;IAanD,OAAO,CAAC,qCAAqC;IA0C7C,OAAO,CAAC,yBAAyB;IAuD3B,QAAQ,CACZ,QAAQ,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,GACnD,OAAO,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;CA4ErD"}
+{"version":3,"file":"display-conditions-validator.d.ts","sourceRoot":"","sources":["../../src/validators/display-conditions-validator.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,cAAc,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAGrG,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAsBpD,qBAAa,0BAA0B,CAAC,CAAC,CACvC,YAAW,kBAAkB,CAAC,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,EAAE,cAAc,CAAC;IAM7E,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJnC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAmB;IAClD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAC/C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA2B;gBAElC,MAAM,EAAE,MAAM;IAoE3C,wBAAwB,CACtB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,GAAG,EACtB,OAAO,SAAI,EACX,QAAQ,CAAC,EAAE,MAAM,GAChB,GAAG;IAqCN,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe;IAanD,OAAO,CAAC,qCAAqC;IA0C7C,OAAO,CAAC,yBAAyB;IAuD3B,QAAQ,CACZ,QAAQ,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,GACnD,OAAO,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;CA4ErD"}

package/out/validators/display-conditions-validator.js

@@ -9,6 +9,7 @@ const isPlainObject = (obj) => Object.prototype.toString.call(obj) === '[object
 const errors = text_1.errors.modules.displayConditions;
 const pageLocation = (page, index) => typeof page?.route === 'string' ? `page "${page.route}"` : `page[${index}]`;
 const sectionLocation = (section, index) => typeof section?.header === 'string' ? `section "${section.header}"` : `section[${index}]`;
+const isJiraOrJsmModuleType = (moduleType) => moduleType.startsWith('jira:') || moduleType.startsWith('jiraServiceManagement:');
 class DisplayConditionsValidator {
     schema;
     validateSchema;
@@ -22,11 +23,14 @@ class DisplayConditionsValidator {
         this.moduleSchemas = properties.modules?.properties;
         this.supportedOperations = properties.operations?.items?.enum;
     }
-    flattenDisplayConditions(moduleKey, displayConditions, nesting = 0, location) {
+    flattenDisplayConditions(moduleType, moduleKey, displayConditions, nesting = 0, location) {
         if (nesting >= 10) {
             throw Error(errors.overcomplicated(moduleKey, location));
         }
         if (Array.isArray(displayConditions)) {
+            if (isJiraOrJsmModuleType(moduleType)) {
+                return displayConditions.flatMap((entry) => this.flattenDisplayConditions(moduleType, moduleKey, entry, nesting, location));
+            }
             return [displayConditions];
         }
         const result = [];
@@ -34,7 +38,7 @@ class DisplayConditionsValidator {
         const keys = Object.keys(displayConditions);
         for (let i = 0; i < keys.length; i += 1) {
             if (this.supportedOperations.includes(keys[i])) {
-                result.push(...this.flattenDisplayConditions(moduleKey, displayConditions[keys[i]], nesting + 1, location));
+                result.push(...this.flattenDisplayConditions(moduleType, moduleKey, displayConditions[keys[i]], nesting + 1, location));
             }
             else {
                 obj[keys[i]] = displayConditions[keys[i]];
@@ -90,7 +94,7 @@ class DisplayConditionsValidator {
         }
         let flattened = [];
         try {
-            flattened = this.flattenDisplayConditions(moduleKey, displayConditions, 0, location);
+            flattened = this.flattenDisplayConditions(moduleType, moduleKey, displayConditions, 0, location);
         }
         catch (e) {
             reportError('n/a', e.message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/manifest",
-  "version": "13.6.0-next.3",
+  "version": "13.6.0-next.5",
   "description": "Definitions and validations of the Forge manifest",
   "main": "out/index.js",
   "scripts": {