@atlaskit/adf-schema 36.10.0 → 36.10.1

package/dist/esm/next-schema/marks/dataConsumer.js

@@ -4,8 +4,7 @@ export var dataConsumer = adfMark('dataConsumer').define({
     sources: {
       type: 'array',
       items: {
-        type: 'string',
-        min: 1
+        type: 'string'
       }
     }
   }

package/dist/esm/next-schema/marks/fragment.js

@@ -3,6 +3,7 @@ export var fragment = adfMark('fragment').define({
   inclusive: false,
   attrs: {
     localId: {
+      minLength: 1,
       type: 'string',
       default: ''
     },

package/dist/esm/next-schema/marks/link.js

@@ -23,7 +23,7 @@ link.define({
       type: 'string',
       optional: true
     },
-    occurenceKey: {
+    occurrenceKey: {
       type: 'string',
       optional: true
     },

package/dist/esm/next-schema/marks/textColor.js

@@ -3,7 +3,8 @@ export var textColor = adfMark('textColor').define({
   inclusive: true,
   attrs: {
     color: {
-      type: 'string'
+      type: 'string',
+      pattern: '^#[0-9a-fA-F]{6}$'
     }
   }
 });

package/dist/esm/next-schema/nodes/blockCard.js

@@ -3,26 +3,52 @@ export var blockCard = adfNode('blockCard').define({
   draggable: true,
   selectable: true,
   attrs: {
-    url: {
-      type: 'string',
-      optional: true
-    },
-    data: {
-      type: 'object',
-      optional: true
-    },
-    datasource: {
-      type: 'object',
-      optional: true
-    },
-    width: {
-      type: 'number',
-      optional: true
-    },
-    layout: {
-      type: 'enum',
-      values: ['wrap-right', 'center', 'wrap-left', 'wide', 'full-width', 'align-end', 'align-start'],
-      optional: true
-    }
+    anyOf: [{
+      url: {
+        type: 'string',
+        optional: true
+      },
+      datasource: {
+        type: 'object',
+        optional: true,
+        properties: {
+          id: {
+            type: 'string'
+          },
+          parameters: {},
+          views: {
+            items: {
+              properties: {
+                properties: {},
+                type: {
+                  type: 'string'
+                }
+              },
+              type: 'object'
+            },
+            type: 'array'
+          }
+        }
+      },
+      width: {
+        type: 'number',
+        optional: true
+      },
+      layout: {
+        type: 'enum',
+        values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start'],
+        optional: true
+      }
+    }, {
+      url: {
+        type: 'string',
+        optional: true
+      }
+    }, {
+      data: {
+        type: 'object',
+        optional: true
+      }
+    }]
   }
 });

package/dist/esm/next-schema/nodes/bodiedExtension.js

@@ -9,10 +9,12 @@ export var bodiedExtension = adfNode('bodiedExtension').define({
   isolating: true,
   attrs: {
     extensionType: {
+      minLength: 1,
       type: 'string',
       default: ''
     },
     extensionKey: {
+      minLength: 1,
       type: 'string',
       default: ''
     },
@@ -28,11 +30,12 @@ export var bodiedExtension = adfNode('bodiedExtension').define({
     },
     layout: {
       type: 'enum',
-      values: ['default', 'wide', 'full-width'],
+      values: ['wide', 'full-width', 'default'],
       optional: true,
       default: 'default'
     },
     localId: {
+      minLength: 1,
       type: 'string',
       optional: true,
       default: null

package/dist/esm/next-schema/nodes/codeBlock.js

@@ -8,10 +8,6 @@ export var codeBlock = adfNode('codeBlock').define({
     language: {
       type: 'string',
       default: null
-    },
-    uniqueId: {
-      type: 'string',
-      default: null
     }
   },
   content: [$zeroPlus($or(text))]

package/dist/esm/next-schema/nodes/date.js

@@ -4,6 +4,7 @@ export var date = adfNode('date').define({
   selectable: true,
   attrs: {
     timestamp: {
+      minLength: 1,
       type: 'string',
       default: ''
     }

package/dist/esm/next-schema/nodes/embedCard.js

@@ -8,11 +8,13 @@ export var embedCard = adfNode('embedCard').define({
     },
     layout: {
       type: 'enum',
-      values: ['wrap-right', 'center', 'wrap-left', 'wide', 'full-width', 'align-end', 'align-start'],
+      values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start'],
       default: 'center'
     },
     width: {
       type: 'number',
+      maximum: 100,
+      minimum: 0,
       default: 100,
       optional: true
     },

package/dist/esm/next-schema/nodes/extension.js

@@ -6,10 +6,12 @@ export var extension = adfNode('extension').define({
   selectable: true,
   attrs: {
     extensionType: {
+      minLength: 1,
       type: 'string',
       default: ''
     },
     extensionKey: {
+      minLength: 1,
       type: 'string',
       default: ''
     },
@@ -25,11 +27,12 @@ export var extension = adfNode('extension').define({
     },
     layout: {
       type: 'enum',
-      values: ['default', 'wide', 'full-width'],
+      values: ['wide', 'full-width', 'default'],
       optional: true,
       default: 'default'
     },
     localId: {
+      minLength: 1,
       type: 'string',
       optional: true,
       default: null

package/dist/esm/next-schema/nodes/hardBreak.js

@@ -4,7 +4,8 @@ export var hardBreak = adfNode('hardBreak').define({
   selectable: false,
   attrs: {
     text: {
-      type: 'string',
+      type: 'enum',
+      values: ['\n'],
       default: '\n',
       optional: true
     }

package/dist/esm/next-schema/nodes/inlineCard.js

@@ -5,16 +5,19 @@ export var inlineCard = adfNode('inlineCard').define({
   selectable: true,
   draggable: true,
   attrs: {
-    url: {
-      type: 'string',
-      optional: true,
-      default: null
-    },
-    data: {
-      type: 'object',
-      optional: true,
-      default: null
-    }
+    anyOf: [{
+      url: {
+        type: 'string',
+        optional: true,
+        default: null
+      }
+    }, {
+      data: {
+        type: 'object',
+        optional: true,
+        default: null
+      }
+    }]
   }
 }).variant('with_annotation', {
   marks: [annotation]

package/dist/esm/next-schema/nodes/inlineExtension.js

@@ -4,10 +4,12 @@ export var inlineExtension = adfNode('inlineExtension').define({
   selectable: true,
   attrs: {
     extensionType: {
+      minLength: 1,
       type: 'string',
       default: ''
     },
     extensionKey: {
+      minLength: 1,
       type: 'string',
       default: ''
     },
@@ -22,6 +24,7 @@ export var inlineExtension = adfNode('inlineExtension').define({
       default: null
     },
     localId: {
+      minLength: 1,
       type: 'string',
       optional: true,
       default: null

package/dist/esm/next-schema/nodes/media.js

@@ -6,78 +6,103 @@ export var media = adfNode('media').define({
   selectable: true,
   marks: [link, annotation, border],
   attrs: {
-    type: {
-      type: 'enum',
-      values: ['file', 'link', 'external'],
-      default: 'file'
-    },
-    alt: {
-      type: 'string',
-      default: '',
-      optional: true
-    },
-    collection: {
-      type: 'string',
-      default: ''
-    },
-    id: {
-      type: 'string',
-      default: ''
-    },
-    height: {
-      type: 'number',
-      default: null,
-      optional: true
-    },
-    occurrenceKey: {
-      type: 'string',
-      default: null,
-      optional: true
-    },
-    url: {
-      type: 'string',
-      default: null,
-      optional: true
-    },
-    width: {
-      type: 'number',
-      default: null,
-      optional: true
-    },
-    __contextId: {
-      type: 'string',
-      default: null,
-      optional: true
-    },
-    __displayType: {
-      type: 'string',
-      default: null,
-      optional: true
-    },
-    __external: {
-      type: 'number',
-      default: null,
-      optional: true
-    },
-    __fileMimeType: {
-      type: 'string',
-      default: null,
-      optional: true
-    },
-    __fileName: {
-      type: 'string',
-      default: null,
-      optional: true
-    },
-    __fileSize: {
-      type: 'string',
-      default: null,
-      optional: true
-    },
-    __mediaTraceId: {
-      type: 'string',
-      default: null,
-      optional: true
-    }
+    anyOf: [{
+      type: {
+        type: 'enum',
+        values: ['link', 'file'],
+        default: 'file'
+      },
+      alt: {
+        type: 'string',
+        default: '',
+        optional: true
+      },
+      collection: {
+        type: 'string',
+        default: ''
+      },
+      id: {
+        minLength: 1,
+        type: 'string',
+        default: ''
+      },
+      height: {
+        type: 'number',
+        default: null,
+        optional: true
+      },
+      occurrenceKey: {
+        minLength: 1,
+        type: 'string',
+        default: null,
+        optional: true
+      },
+      width: {
+        type: 'number',
+        default: null,
+        optional: true
+      },
+      __contextId: {
+        type: 'string',
+        default: null,
+        optional: true
+      },
+      __displayType: {
+        type: 'string',
+        default: null,
+        optional: true
+      },
+      __external: {
+        type: 'number',
+        default: null,
+        optional: true
+      },
+      __fileMimeType: {
+        type: 'string',
+        default: null,
+        optional: true
+      },
+      __fileName: {
+        type: 'string',
+        default: null,
+        optional: true
+      },
+      __fileSize: {
+        type: 'string',
+        default: null,
+        optional: true
+      },
+      __mediaTraceId: {
+        type: 'string',
+        default: null,
+        optional: true
+      }
+    }, {
+      alt: {
+        type: 'string',
+        default: '',
+        optional: true
+      },
+      height: {
+        type: 'number',
+        default: null,
+        optional: true
+      },
+      width: {
+        type: 'number',
+        default: null,
+        optional: true
+      },
+      url: {
+        type: 'string',
+        default: null,
+        optional: true
+      },
+      type: {
+        type: 'enum',
+        values: ['external'],
+        default: 'file'
+      }
+    }]
   }
 });

package/dist/esm/next-schema/nodes/mediaInline.js

@@ -15,16 +15,21 @@ export var mediaInline = adfNode('mediaInline').define({
     },
     type: {
       type: 'enum',
-      values: ['file', 'link', 'image'],
+      values: ['link', 'file', 'image'],
       optional: true
     },
     id: {
+      minLength: 1,
+      type: 'string'
+    },
+    alt: {
       type: 'string'
     },
     collection: {
       type: 'string'
     },
     occurrenceKey: {
+      minLength: 1,
       type: 'string',
       optional: true
     },

package/dist/esm/next-schema/nodes/mediaSingle.js

@@ -7,24 +7,43 @@ export var mediaSingle = adfNode('mediaSingle').define({
   selectable: true,
   marks: [link],
   attrs: {
-    width: {
-      type: 'number',
-      minimum: 0,
-      // maximum: 100, – can't encode both? 100 is for percentage, and for pixel it's unlimited
-      default: null,
-      optional: true
-    },
-    layout: {
-      type: 'enum',
-      values: ['wrap-right', 'center', 'wrap-left', 'wide', 'full-width', 'align-end', 'align-start'],
-      default: 'center'
-    },
-    widthType: {
-      type: 'enum',
-      values: ['pixel', 'percentage'],
-      default: 'percentage',
-      optional: true
-    }
+    anyOf: [{
+      width: {
+        type: 'number',
+        minimum: 0,
+        maximum: 100,
+        default: null,
+        optional: true
+      },
+      layout: {
+        type: 'enum',
+        values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start']
+      },
+      widthType: {
+        type: 'enum',
+        values: ['percentage'],
+        default: 'percentage',
+        optional: true
+      }
+    }, {
+      width: {
+        type: 'number',
+        minimum: 0,
+        default: null,
+        optional: true
+      },
+      layout: {
+        type: 'enum',
+        values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start'],
+        default: 'center'
+      },
+      widthType: {
+        type: 'enum',
+        values: ['pixel'],
+        default: 'pixel',
+        optional: true
+      }
+    }]
   },
   content: [$or(media)]
 }).variant('caption', {

package/dist/esm/next-schema/nodes/mention.js

@@ -7,6 +7,9 @@ export var mention = adfNode('mention').define({
       type: 'string',
       default: ''
     },
+    localId: {
+      type: 'string'
+    },
     text: {
       type: 'string',
       default: '',

package/dist/esm/next-schema/nodes/panel.js

@@ -14,7 +14,7 @@ export var panel = adfNode('panel').define({
   attrs: {
     panelType: {
       type: 'enum',
-      values: ['info', 'note', 'tip', 'warning', 'error', 'success'],
+      values: ['info', 'note', 'tip', 'warning', 'error', 'success', 'custom'],
       default: 'info'
     },
     panelIcon: {

package/dist/esm/next-schema/nodes/status.js

@@ -3,6 +3,7 @@ export var status = adfNode('status').define({
   selectable: true,
   attrs: {
     text: {
+      minLength: 1,
       type: 'string',
       default: ''
     },

package/dist/esm/next-schema/nodes/table.js

@@ -6,6 +6,10 @@ export var table = adfNode('table').define({
   selectable: true,
   marks: [fragment],
   attrs: {
+    displayMode: {
+      type: 'enum',
+      values: ['default', 'fixed']
+    },
     isNumberColumnEnabled: {
       type: 'boolean',
       default: false,
@@ -13,12 +17,13 @@ export var table = adfNode('table').define({
     },
     layout: {
       type: 'enum',
-      values: ['default', 'wide', 'full-width'],
+      values: ['wide', 'full-width', 'center', 'align-end', 'align-start', 'default'],
       default: 'default',
       optional: true
     },
     localId: {
       type: 'string',
+      minLength: 1,
       default: '',
       optional: true
     },

package/dist/esm/next-schema/nodes/tableCell.js

@@ -29,7 +29,7 @@ export var tableCell = adfNode('tableCell').define({
       default: 1,
       optional: true
     },
-    colswidth: {
+    colwidth: {
       type: 'numberList',
       default: [],
       optional: true

package/dist/esm/next-schema/nodes/tableHeader.js

@@ -29,7 +29,7 @@ export var tableHeader = adfNode('tableHeader').define({
       default: 1,
       optional: true
     },
-    colswidth: {
+    colwidth: {
       type: 'numberList',
       default: [],
       optional: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "36.10.0",
+  "version": "36.10.1",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.15.0",
-    "@atlaskit/adf-schema-generator": "^1.7.5",
+    "@atlaskit/adf-schema-generator": "^1.7.6",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",
     "@babel/plugin-proposal-class-properties": "^7.18.6",

package/schema-generators/__tests__/unit/jqueries.md

@@ -53,3 +53,25 @@ A number of nodes have `marks` defined, yet the array is empty. Assuming this is
   .block_content, .nestedExpand_content, .non_nestable_block_content, .table_cell_content, .inline_node,
   .bodiedExtension_node.properties.marks, .codeBlock_node.properties.marks, .expand_node.properties.marks, .heading_node.properties.marks, .inlineExtension_node.properties.marks, .text_node.properties.marks, .extension_node.properties.marks, .paragraph_node.properties.marks) else . end)'
 ```
+
+Delete all subfields except for marks, attrs, anyOf, items, type and properties. Content objects are also deleted. Inline is also deleted, as it is a content object for paragraph.
+
+A number of nodes have `marks` defined, yet the array is empty. Assuming this is redundant, I've removed them.
+
+```sh
+ cat packages/adf-schema/json-schema/v1/full.json | jq 'walk(if type == "object" then del(
+  .content, .text, .version, .required, .additionalProperties, .allOf, .minItems,
+  .block_content, .nestedExpand_content, .non_nestable_block_content, .table_cell_content, .inline_node,
+  .bodiedExtension_node.properties.marks, .codeBlock_node.properties.marks, .expand_node.properties.marks, .heading_node.properties.marks, .inlineExtension_node.properties.marks, .text_node.properties.marks, .extension_node.properties.marks, .paragraph_node.properties.marks) else . end)'
+```
+
+Delete all subfields except for text, marks, attrs, anyOf, items, type and properties. Content objects are also deleted. Inline is also deleted, as it is a content object for paragraph.
+
+A number of nodes have `marks` defined, yet the array is empty. Assuming this is redundant, I've removed them.
+
+```sh
+ cat packages/adf-schema/json-schema/v1/full.json | jq 'walk(if type == "object" then del(
+  .content, .version, .required, .additionalProperties, .allOf, .minItems,
+  .block_content, .nestedExpand_content, .non_nestable_block_content, .table_cell_content, .inline_node,
+  .bodiedExtension_node.properties.marks, .codeBlock_node.properties.marks, .expand_node.properties.marks, .heading_node.properties.marks, .inlineExtension_node.properties.marks, .text_node.properties.marks, .extension_node.properties.marks, .paragraph_node.properties.marks) else . end)'
+```