@atlaskit/adf-schema 36.10.0 → 36.10.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/adf-schema
 
+## 36.10.1
+
+### Patch Changes
+
+- 1baff5c: Add node and mark attributes to JSON transformer from ADF DSL
+
 ## 36.10.0
 
 ### Minor Changes

package/dist/cjs/next-schema/marks/alignmentAndIndentation.js

@@ -25,7 +25,7 @@ indentation.define({
   attrs: {
     level: {
       type: 'number',
-      minimum: 0,
+      minimum: 1,
       maximum: 6
     }
   }

package/dist/cjs/next-schema/marks/backgroundColor.js

@@ -5,4 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.backgroundColor = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var backgroundColor = exports.backgroundColor = (0, _adfSchemaGenerator.adfMark)('backgroundColor').define({});
+var backgroundColor = exports.backgroundColor = (0, _adfSchemaGenerator.adfMark)('backgroundColor').define({
+  attrs: {
+    color: {
+      pattern: '^#[0-9a-fA-F]{6}$',
+      type: 'string'
+    }
+  }
+});

package/dist/cjs/next-schema/marks/border.js

@@ -14,6 +14,7 @@ var border = exports.border = (0, _adfSchemaGenerator.adfMark)('border').define(
       maximum: 3
     },
     color: {
+      pattern: '^#[0-9a-fA-F]{8}$|^#[0-9a-fA-F]{6}$',
       type: 'string'
     }
   }

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

@@ -10,8 +10,7 @@ var dataConsumer = exports.dataConsumer = (0, _adfSchemaGenerator.adfMark)('data
     sources: {
       type: 'array',
       items: {
-        type: 'string',
-        min: 1
+        type: 'string'
       }
     }
   }

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

@@ -9,6 +9,7 @@ var fragment = exports.fragment = (0, _adfSchemaGenerator.adfMark)('fragment').d
   inclusive: false,
   attrs: {
     localId: {
+      minLength: 1,
       type: 'string',
       default: ''
     },

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

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

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

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

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

@@ -9,26 +9,52 @@ var blockCard = exports.blockCard = (0, _adfSchemaGenerator.adfNode)('blockCard'
   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/cjs/next-schema/nodes/bodiedExtension.js

@@ -16,10 +16,12 @@ var bodiedExtension = exports.bodiedExtension = (0, _adfSchemaGenerator.adfNode)
   isolating: true,
   attrs: {
     extensionType: {
+      minLength: 1,
       type: 'string',
       default: ''
     },
     extensionKey: {
+      minLength: 1,
       type: 'string',
       default: ''
     },
@@ -35,11 +37,12 @@ var bodiedExtension = exports.bodiedExtension = (0, _adfSchemaGenerator.adfNode)
     },
     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/cjs/next-schema/nodes/codeBlock.js

@@ -14,10 +14,6 @@ var codeBlock = exports.codeBlock = (0, _adfSchemaGenerator.adfNode)('codeBlock'
     language: {
       type: 'string',
       default: null
-    },
-    uniqueId: {
-      type: 'string',
-      default: null
     }
   },
   content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_text.text))]

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

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

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

@@ -14,11 +14,13 @@ var embedCard = exports.embedCard = (0, _adfSchemaGenerator.adfNode)('embedCard'
     },
     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/cjs/next-schema/nodes/extension.js

@@ -12,10 +12,12 @@ var extension = exports.extension = (0, _adfSchemaGenerator.adfNode)('extension'
   selectable: true,
   attrs: {
     extensionType: {
+      minLength: 1,
       type: 'string',
       default: ''
     },
     extensionKey: {
+      minLength: 1,
       type: 'string',
       default: ''
     },
@@ -31,11 +33,12 @@ var extension = exports.extension = (0, _adfSchemaGenerator.adfNode)('extension'
     },
     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/cjs/next-schema/nodes/hardBreak.js

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

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

@@ -11,16 +11,19 @@ var inlineCard = exports.inlineCard = (0, _adfSchemaGenerator.adfNode)('inlineCa
   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.annotation]

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

@@ -10,10 +10,12 @@ var inlineExtension = exports.inlineExtension = (0, _adfSchemaGenerator.adfNode)
   selectable: true,
   attrs: {
     extensionType: {
+      minLength: 1,
       type: 'string',
       default: ''
     },
     extensionKey: {
+      minLength: 1,
       type: 'string',
       default: ''
     },
@@ -28,6 +30,7 @@ var inlineExtension = exports.inlineExtension = (0, _adfSchemaGenerator.adfNode)
       default: null
     },
     localId: {
+      minLength: 1,
       type: 'string',
       optional: true,
       default: null

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

@@ -12,78 +12,103 @@ var media = exports.media = (0, _adfSchemaGenerator.adfNode)('media').define({
   selectable: true,
   marks: [_link.link, _annotation.annotation, _border.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/cjs/next-schema/nodes/mediaInline.js

@@ -21,16 +21,21 @@ var mediaInline = exports.mediaInline = (0, _adfSchemaGenerator.adfNode)('mediaI
     },
     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/cjs/next-schema/nodes/mediaSingle.js

@@ -13,24 +13,43 @@ var mediaSingle = exports.mediaSingle = (0, _adfSchemaGenerator.adfNode)('mediaS
   selectable: true,
   marks: [_link.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: [(0, _adfSchemaGenerator.$or)(_media.media)]
 }).variant('caption', {

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

@@ -13,6 +13,9 @@ var mention = exports.mention = (0, _adfSchemaGenerator.adfNode)('mention').defi
       type: 'string',
       default: ''
     },
+    localId: {
+      type: 'string'
+    },
     text: {
       type: 'string',
       default: '',

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

@@ -20,7 +20,7 @@ var panel = exports.panel = (0, _adfSchemaGenerator.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/cjs/next-schema/nodes/status.js

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

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

@@ -12,6 +12,10 @@ var table = exports.table = (0, _adfSchemaGenerator.adfNode)('table').define({
   selectable: true,
   marks: [_fragment.fragment],
   attrs: {
+    displayMode: {
+      type: 'enum',
+      values: ['default', 'fixed']
+    },
     isNumberColumnEnabled: {
       type: 'boolean',
       default: false,
@@ -19,12 +23,13 @@ var table = exports.table = (0, _adfSchemaGenerator.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/cjs/next-schema/nodes/tableCell.js

@@ -35,7 +35,7 @@ var tableCell = exports.tableCell = (0, _adfSchemaGenerator.adfNode)('tableCell'
       default: 1,
       optional: true
     },
-    colswidth: {
+    colwidth: {
       type: 'numberList',
       default: [],
       optional: true

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

@@ -35,7 +35,7 @@ var tableHeader = exports.tableHeader = (0, _adfSchemaGenerator.adfNode)('tableH
       default: 1,
       optional: true
     },
-    colswidth: {
+    colwidth: {
       type: 'numberList',
       default: [],
       optional: true

package/dist/es2019/next-schema/marks/alignmentAndIndentation.js

@@ -21,7 +21,7 @@ indentation.define({
   attrs: {
     level: {
       type: 'number',
-      minimum: 0,
+      minimum: 1,
       maximum: 6
     }
   }