@atlaskit/adf-schema 36.12.0 → 36.12.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/adf-schema
 
+## 36.12.2
+
+### Patch Changes
+
+- 94ea518: Move codemods and json-schema-generator to devdeps
+- 5ba2c7d: updated buildAttrs to clean up objects, added extra test coverage
+
+## 36.12.1
+
+### Patch Changes
+
+- d589477: Add required field to nodes and marks for JSON Schema transformer from ADF DSL
+
 ## 36.12.0
 
 ### Minor Changes

package/dist/cjs/next-schema/full-schema.adf.js

@@ -13,6 +13,6 @@ var _paragraph = require("./nodes/paragraph");
 var doc = (0, _adfSchemaGenerator.adfNode)('doc').define({
   root: true,
   version: 1,
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _layoutSection.layoutSection, _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup, _nestedExpand.nestedExpand, _paragraph.paragraph))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _layoutSection.layoutSection, _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup, _nestedExpand.nestedExpand, _paragraph.paragraph))]
 });
 var _default = exports.default = doc;

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

@@ -16,7 +16,6 @@ var blockCard = exports.blockCard = (0, _adfSchemaGenerator.adfNode)('blockCard'
       },
       datasource: {
         type: 'object',
-        optional: true,
         properties: {
           id: {
             type: 'string'
@@ -32,12 +31,14 @@ var blockCard = exports.blockCard = (0, _adfSchemaGenerator.adfNode)('blockCard'
                   type: 'string'
                 }
               },
+              required: ['type'],
               type: 'object'
             },
             minItems: 1,
             type: 'array'
           }
-        }
+        },
+        required: ['id', 'parameters', 'views']
       },
       width: {
         type: 'number',
@@ -50,12 +51,11 @@ var blockCard = exports.blockCard = (0, _adfSchemaGenerator.adfNode)('blockCard'
       }
     }, {
       url: {
-        type: 'string',
-        optional: true
+        type: 'string'
       }
     }, {
       data: {
-        optional: true
+        default: null
       }
     }]
   }

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

@@ -15,12 +15,12 @@ var bodiedExtension = exports.bodiedExtension = (0, _adfSchemaGenerator.adfNode)
   selectable: true,
   isolating: true,
   attrs: {
-    extensionType: {
+    extensionKey: {
       minLength: 1,
       type: 'string',
       default: ''
     },
-    extensionKey: {
+    extensionType: {
       minLength: 1,
       type: 'string',
       default: ''

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

@@ -13,7 +13,8 @@ var codeBlock = exports.codeBlock = (0, _adfSchemaGenerator.adfNode)('codeBlock'
   attrs: {
     language: {
       type: 'string',
-      default: null
+      default: null,
+      optional: true
     }
   },
   content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_text.text))]

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

@@ -11,12 +11,12 @@ var extension = exports.extension = (0, _adfSchemaGenerator.adfNode)('extension'
   atom: true,
   selectable: true,
   attrs: {
-    extensionType: {
+    extensionKey: {
       minLength: 1,
       type: 'string',
       default: ''
     },
-    extensionKey: {
+    extensionType: {
       minLength: 1,
       type: 'string',
       default: ''

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

@@ -14,12 +14,10 @@ var inlineCard = exports.inlineCard = (0, _adfSchemaGenerator.adfNode)('inlineCa
     anyOf: [{
       url: {
         type: 'string',
-        optional: true,
         default: null
       }
     }, {
       data: {
-        optional: true,
         default: null
       }
     }]

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

@@ -9,12 +9,12 @@ var inlineExtension = exports.inlineExtension = (0, _adfSchemaGenerator.adfNode)
   inline: true,
   selectable: true,
   attrs: {
-    extensionType: {
+    extensionKey: {
       minLength: 1,
       type: 'string',
       default: ''
     },
-    extensionKey: {
+    extensionType: {
       minLength: 1,
       type: 'string',
       default: ''

package/dist/cjs/next-schema/nodes/list.js

@@ -18,7 +18,8 @@ orderedList.define({
     order: {
       type: 'number',
       minimum: 0,
-      default: 1
+      default: 1,
+      optional: true
     }
   },
   content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(listItem))]

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

@@ -18,6 +18,11 @@ var media = exports.media = (0, _adfSchemaGenerator.adfNode)('media').define({
         values: ['link', 'file'],
         default: 'file'
       },
+      id: {
+        minLength: 1,
+        type: 'string',
+        default: ''
+      },
       alt: {
         type: 'string',
         default: '',
@@ -27,11 +32,6 @@ var media = exports.media = (0, _adfSchemaGenerator.adfNode)('media').define({
         type: 'string',
         default: ''
       },
-      id: {
-        minLength: 1,
-        type: 'string',
-        default: ''
-      },
       height: {
         type: 'number',
         default: null,
@@ -84,6 +84,11 @@ var media = exports.media = (0, _adfSchemaGenerator.adfNode)('media').define({
         optional: true
       }
     }, {
+      type: {
+        type: 'enum',
+        values: ['external'],
+        default: 'file'
+      },
       alt: {
         type: 'string',
         default: '',
@@ -102,12 +107,7 @@ var media = exports.media = (0, _adfSchemaGenerator.adfNode)('media').define({
       url: {
         type: 'string',
         default: null,
-        optional: true
-      },
-      type: {
-        type: 'enum',
-        values: ['external'],
-        default: 'file'
+        optional: false
       }
     }]
   }

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

@@ -26,7 +26,8 @@ var mediaInline = exports.mediaInline = (0, _adfSchemaGenerator.adfNode)('mediaI
       type: 'string'
     },
     alt: {
-      type: 'string'
+      type: 'string',
+      optional: true
     },
     collection: {
       type: 'string'

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

@@ -23,7 +23,8 @@ var mediaSingle = exports.mediaSingle = (0, _adfSchemaGenerator.adfNode)('mediaS
       },
       layout: {
         type: 'enum',
-        values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start']
+        values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start'],
+        default: 'center'
       },
       widthType: {
         type: 'enum',
@@ -35,19 +36,17 @@ var mediaSingle = exports.mediaSingle = (0, _adfSchemaGenerator.adfNode)('mediaS
       width: {
         type: 'number',
         minimum: 0,
-        default: null,
-        optional: true
+        default: null
+      },
+      widthType: {
+        type: 'enum',
+        values: ['pixel'],
+        default: 'pixel'
       },
       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
       }
     }]
   }

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

@@ -14,7 +14,9 @@ var table = exports.table = (0, _adfSchemaGenerator.adfNode)('table').define({
   attrs: {
     displayMode: {
       type: 'enum',
-      values: ['default', 'fixed']
+      values: ['default', 'fixed'],
+      default: 'default',
+      optional: true
     },
     isNumberColumnEnabled: {
       type: 'boolean',

package/dist/cjs/next-schema/nodes/tableRow.js

@@ -9,5 +9,5 @@ var _tableCell = require("./tableCell");
 var _tableHeader = require("./tableHeader");
 var tableRow = exports.tableRow = (0, _adfSchemaGenerator.adfNode)('tableRow').define({
   selectable: false,
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_tableCell.tableCell, _tableHeader.tableHeader))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_tableCell.tableCell, _tableHeader.tableHeader))]
 });

package/dist/es2019/next-schema/full-schema.adf.js

@@ -1,4 +1,4 @@
-import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
+import { $or, $onePlus, adfNode } from '@atlaskit/adf-schema-generator';
 import { blockGroup } from './groups/blockGroup';
 import { layoutSection } from './nodes/layoutSection';
 import { blockRootOnlyGroup } from './groups/blockRootOnlyGroup';
@@ -7,6 +7,6 @@ import { paragraph } from './nodes/paragraph';
 const doc = adfNode('doc').define({
   root: true,
   version: 1,
-  content: [$zeroPlus($or(blockGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup, nestedExpand, paragraph))]
+  content: [$onePlus($or(blockGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup, nestedExpand, paragraph))]
 });
 export default doc;

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

@@ -10,7 +10,6 @@ export const blockCard = adfNode('blockCard').define({
       },
       datasource: {
         type: 'object',
-        optional: true,
         properties: {
           id: {
             type: 'string'
@@ -26,12 +25,14 @@ export const blockCard = adfNode('blockCard').define({
                   type: 'string'
                 }
               },
+              required: ['type'],
               type: 'object'
             },
             minItems: 1,
             type: 'array'
           }
-        }
+        },
+        required: ['id', 'parameters', 'views']
       },
       width: {
         type: 'number',
@@ -44,12 +45,11 @@ export const blockCard = adfNode('blockCard').define({
       }
     }, {
       url: {
-        type: 'string',
-        optional: true
+        type: 'string'
       }
     }, {
       data: {
-        optional: true
+        default: null
       }
     }]
   }

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

@@ -7,12 +7,12 @@ export const bodiedExtension = adfNode('bodiedExtension').define({
   selectable: true,
   isolating: true,
   attrs: {
-    extensionType: {
+    extensionKey: {
       minLength: 1,
       type: 'string',
       default: ''
     },
-    extensionKey: {
+    extensionType: {
       minLength: 1,
       type: 'string',
       default: ''

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

@@ -7,7 +7,8 @@ export const codeBlock = adfNode('codeBlock').define({
   attrs: {
     language: {
       type: 'string',
-      default: null
+      default: null,
+      optional: true
     }
   },
   content: [$zeroPlus($or(text))]

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

@@ -5,12 +5,12 @@ export const extension = adfNode('extension').define({
   atom: true,
   selectable: true,
   attrs: {
-    extensionType: {
+    extensionKey: {
       minLength: 1,
       type: 'string',
       default: ''
     },
-    extensionKey: {
+    extensionType: {
       minLength: 1,
       type: 'string',
       default: ''

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

@@ -8,12 +8,10 @@ export const inlineCard = adfNode('inlineCard').define({
     anyOf: [{
       url: {
         type: 'string',
-        optional: true,
         default: null
       }
     }, {
       data: {
-        optional: true,
         default: null
       }
     }]

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

@@ -3,12 +3,12 @@ export const inlineExtension = adfNode('inlineExtension').define({
   inline: true,
   selectable: true,
   attrs: {
-    extensionType: {
+    extensionKey: {
       minLength: 1,
       type: 'string',
       default: ''
     },
-    extensionKey: {
+    extensionType: {
       minLength: 1,
       type: 'string',
       default: ''

package/dist/es2019/next-schema/nodes/list.js

@@ -12,7 +12,8 @@ orderedList.define({
     order: {
       type: 'number',
       minimum: 0,
-      default: 1
+      default: 1,
+      optional: true
     }
   },
   content: [$onePlus($or(listItem))]

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

@@ -12,6 +12,11 @@ export const media = adfNode('media').define({
         values: ['link', 'file'],
         default: 'file'
       },
+      id: {
+        minLength: 1,
+        type: 'string',
+        default: ''
+      },
       alt: {
         type: 'string',
         default: '',
@@ -21,11 +26,6 @@ export const media = adfNode('media').define({
         type: 'string',
         default: ''
       },
-      id: {
-        minLength: 1,
-        type: 'string',
-        default: ''
-      },
       height: {
         type: 'number',
         default: null,
@@ -78,6 +78,11 @@ export const media = adfNode('media').define({
         optional: true
       }
     }, {
+      type: {
+        type: 'enum',
+        values: ['external'],
+        default: 'file'
+      },
       alt: {
         type: 'string',
         default: '',
@@ -96,12 +101,7 @@ export const media = adfNode('media').define({
       url: {
         type: 'string',
         default: null,
-        optional: true
-      },
-      type: {
-        type: 'enum',
-        values: ['external'],
-        default: 'file'
+        optional: false
       }
     }]
   }

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

@@ -20,7 +20,8 @@ export const mediaInline = adfNode('mediaInline').define({
       type: 'string'
     },
     alt: {
-      type: 'string'
+      type: 'string',
+      optional: true
     },
     collection: {
       type: 'string'

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

@@ -17,7 +17,8 @@ export const mediaSingle = adfNode('mediaSingle').define({
       },
       layout: {
         type: 'enum',
-        values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start']
+        values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start'],
+        default: 'center'
       },
       widthType: {
         type: 'enum',
@@ -29,19 +30,17 @@ export const mediaSingle = adfNode('mediaSingle').define({
       width: {
         type: 'number',
         minimum: 0,
-        default: null,
-        optional: true
+        default: null
+      },
+      widthType: {
+        type: 'enum',
+        values: ['pixel'],
+        default: 'pixel'
       },
       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
       }
     }]
   }

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

@@ -8,7 +8,9 @@ export const table = adfNode('table').define({
   attrs: {
     displayMode: {
       type: 'enum',
-      values: ['default', 'fixed']
+      values: ['default', 'fixed'],
+      default: 'default',
+      optional: true
     },
     isNumberColumnEnabled: {
       type: 'boolean',

package/dist/es2019/next-schema/nodes/tableRow.js

@@ -1,7 +1,7 @@
-import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
+import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
 import { tableCell } from './tableCell';
 import { tableHeader } from './tableHeader';
 export const tableRow = adfNode('tableRow').define({
   selectable: false,
-  content: [$zeroPlus($or(tableCell, tableHeader))]
+  content: [$onePlus($or(tableCell, tableHeader))]
 });

package/dist/esm/next-schema/full-schema.adf.js

@@ -1,4 +1,4 @@
-import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
+import { $or, $onePlus, adfNode } from '@atlaskit/adf-schema-generator';
 import { blockGroup } from './groups/blockGroup';
 import { layoutSection } from './nodes/layoutSection';
 import { blockRootOnlyGroup } from './groups/blockRootOnlyGroup';
@@ -7,6 +7,6 @@ import { paragraph } from './nodes/paragraph';
 var doc = adfNode('doc').define({
   root: true,
   version: 1,
-  content: [$zeroPlus($or(blockGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup, nestedExpand, paragraph))]
+  content: [$onePlus($or(blockGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup, nestedExpand, paragraph))]
 });
 export default doc;

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

@@ -10,7 +10,6 @@ export var blockCard = adfNode('blockCard').define({
       },
       datasource: {
         type: 'object',
-        optional: true,
         properties: {
           id: {
             type: 'string'
@@ -26,12 +25,14 @@ export var blockCard = adfNode('blockCard').define({
                   type: 'string'
                 }
               },
+              required: ['type'],
               type: 'object'
             },
             minItems: 1,
             type: 'array'
           }
-        }
+        },
+        required: ['id', 'parameters', 'views']
       },
       width: {
         type: 'number',
@@ -44,12 +45,11 @@ export var blockCard = adfNode('blockCard').define({
       }
     }, {
       url: {
-        type: 'string',
-        optional: true
+        type: 'string'
       }
     }, {
       data: {
-        optional: true
+        default: null
       }
     }]
   }

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

@@ -8,12 +8,12 @@ export var bodiedExtension = adfNode('bodiedExtension').define({
   selectable: true,
   isolating: true,
   attrs: {
-    extensionType: {
+    extensionKey: {
       minLength: 1,
       type: 'string',
       default: ''
     },
-    extensionKey: {
+    extensionType: {
       minLength: 1,
       type: 'string',
       default: ''

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

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

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

@@ -5,12 +5,12 @@ export var extension = adfNode('extension').define({
   atom: true,
   selectable: true,
   attrs: {
-    extensionType: {
+    extensionKey: {
       minLength: 1,
       type: 'string',
       default: ''
     },
-    extensionKey: {
+    extensionType: {
       minLength: 1,
       type: 'string',
       default: ''

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

@@ -8,12 +8,10 @@ export var inlineCard = adfNode('inlineCard').define({
     anyOf: [{
       url: {
         type: 'string',
-        optional: true,
         default: null
       }
     }, {
       data: {
-        optional: true,
         default: null
       }
     }]

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

@@ -3,12 +3,12 @@ export var inlineExtension = adfNode('inlineExtension').define({
   inline: true,
   selectable: true,
   attrs: {
-    extensionType: {
+    extensionKey: {
       minLength: 1,
       type: 'string',
       default: ''
     },
-    extensionKey: {
+    extensionType: {
       minLength: 1,
       type: 'string',
       default: ''

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

@@ -12,7 +12,8 @@ orderedList.define({
     order: {
       type: 'number',
       minimum: 0,
-      default: 1
+      default: 1,
+      optional: true
     }
   },
   content: [$onePlus($or(listItem))]