@atlaskit/adf-schema 37.1.41 → 37.1.43

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 37.1.43
+
+### Patch Changes
+
+- 73eec15: Improve types in adf-schema-generator package
+
+## 37.1.42
+
+### Patch Changes
+
+- 758ee06: last hacks to support tableCell_content, nestedExpand_content and atomic_inlines pseudo groups in validator spec
+
 ## 37.1.41
 
 ### Patch Changes

package/dist/cjs/next-schema/groups/atomicInlineGroup.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.atomicInlineGroup = void 0;
+var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _date = require("../nodes/date");
+var _emoji = require("../nodes/emoji");
+var _hardBreak = require("../nodes/hardBreak");
+var _inlineCard = require("../nodes/inlineCard");
+var _inlineExtension = require("../nodes/inlineExtension");
+var _mediaInline = require("../nodes/mediaInline");
+var _mention = require("../nodes/mention");
+var _placeholder = require("../nodes/placeholder");
+var _status = require("../nodes/status");
+var atomicInlineGroup = exports.atomicInlineGroup = (0, _adfSchemaGenerator.adfNodeGroup)('atomic_inline', [_hardBreak.hardBreak, _mention.mention, _emoji.emoji, _inlineExtension.inlineExtension.use('with_marks'), _date.date, _placeholder.placeholder, _inlineCard.inlineCard, _status.status, _mediaInline.mediaInline], {
+  ignore: ['pm-spec', 'json-schema']
+});

package/dist/cjs/next-schema/groups/tableCellContentPseudoGroup.js

@@ -27,6 +27,6 @@ var tableCellContentNodes = [_codeBlock.codeBlock.use('with_no_marks'), _blockCa
 // @DSLCompatibilityException JSON Schema and PM Spec are not in sync. We need to fix it
 // In PM Spec, they contain different items. (tableHeader using tableHeaderContentPseudoGroup, tableCell using tableCellContentPseudoGroup)
 // In JSON Schema, both tableHeader and tableCell points to tableCellContentPseudoGroup
-// The differences are highighted below.
+// The differences are highlighted below.
 var tableCellContentPseudoGroup = exports.tableCellContentPseudoGroup = (0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, tableCellContentNodes.concat([_unsupportedBlock.unsupportedBlock])));
 var tableHeaderContentPseudoGroup = exports.tableHeaderContentPseudoGroup = (0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, tableCellContentNodes.concat([_nestedExpand.nestedExpand])));

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

@@ -53,7 +53,7 @@ var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.adfNode)('nest
     }
   }
 }).variant('content', {
-  ignore: ['pm-spec', 'validator-spec']
+  ignore: ['pm-spec']
 }).variant('with_no_marks', {
   marks: [],
   content: [],

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.paragraph = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var _atomicInlineGroup = require("../groups/atomicInlineGroup");
 var _inlineContentGroup = require("../groups/inlineContentGroup");
 var _inlineGroup = require("../groups/inlineGroup");
 var _alignmentAndIndentation = require("../marks/alignmentAndIndentation");
@@ -21,7 +22,7 @@ var paragraph = exports.paragraph = (0, _adfSchemaGenerator.adfNode)('paragraph'
   selectable: false,
   marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
   hasEmptyMarks: true,
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _inlineContentGroup.inlineContentGroup))],
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _atomicInlineGroup.atomicInlineGroup, _inlineContentGroup.inlineContentGroup))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.marks': {

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

@@ -9,6 +9,6 @@ var _tableCellContentPseudoGroup = require("../groups/tableCellContentPseudoGrou
 // @DSLCompatibilityException This is only used by JSON schema to group the table cell content into a definition.
 // This node should be deleted and the content should be replicated in the JSON schema for table header and table cell node
 var tableCellContent = exports.tableCellContent = (0, _adfSchemaGenerator.adfNode)('tableCellContent').define({
-  ignore: ['pm-spec', 'validator-spec'],
+  ignore: ['pm-spec'],
   content: [_tableCellContentPseudoGroup.tableCellContentPseudoGroup]
 });

package/dist/cjs/validator-schema/generated/validatorSpec.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unsupportedInline = exports.unsupportedBlock = exports.underline = exports.textColor = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCellContent = exports.tableCell = exports.table = exports.subsup = exports.strong = exports.strike = exports.status = exports.rule = exports.placeholder = exports.paragraph_with_no_marks = exports.paragraph_with_indentation = exports.paragraph_with_alignment = exports.paragraph = exports.panel_legacy = exports.panel = exports.orderedList = exports.non_nestable_block_content = exports.nestedExpand_with_no_marks = exports.nestedExpand_content = exports.nestedExpand = exports.multiBodiedExtension = exports.mention = exports.mediaSingle_width_type = exports.mediaSingle_full = exports.mediaSingle_caption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem_legacy = exports.listItem = exports.link_text_inline = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_comment_marker = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.inline = exports.indentation = exports.image = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.formatted_text_inline = exports.extension_with_marks = exports.extensionFrame = exports.extension = exports.expand_with_no_mark = exports.expand_with_breakout_mark = exports.expand = exports.emoji = exports.embedCard = exports.em = exports.doc = exports.decisionList = exports.decisionItem = exports.date = exports.dataConsumer = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.code_inline = exports.codeBlock_with_no_marks = exports.codeBlock_with_marks = exports.codeBlock = exports.code = exports.caption = exports.bulletList = exports.breakout = exports.border = exports.bodiedExtension_with_marks = exports.bodiedExtension = exports.blockquote_legacy = exports.blockquote = exports.block_content = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.annotation = exports.alignment = void 0;
+exports.unsupportedInline = exports.unsupportedBlock = exports.underline = exports.textColor = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell_content = exports.tableCell = exports.table = exports.subsup = exports.strong = exports.strike = exports.status = exports.rule = exports.placeholder = exports.paragraph_with_no_marks = exports.paragraph_with_indentation = exports.paragraph_with_alignment = exports.paragraph = exports.panel_legacy = exports.panel = exports.orderedList = exports.non_nestable_block_content = exports.nestedExpand_with_no_marks = exports.nestedExpand_content = exports.nestedExpand = exports.multiBodiedExtension = exports.mention = exports.mediaSingle_width_type = exports.mediaSingle_full = exports.mediaSingle_caption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem_legacy = exports.listItem = exports.link_text_inline = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_comment_marker = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.inline = exports.indentation = exports.image = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.formatted_text_inline = exports.extension_with_marks = exports.extensionFrame = exports.extension = exports.expand_with_no_mark = exports.expand_with_breakout_mark = exports.expand = exports.emoji = exports.embedCard = exports.em = exports.doc = exports.decisionList = exports.decisionItem = exports.date = exports.dataConsumer = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.code_inline = exports.codeBlock_with_no_marks = exports.codeBlock_with_marks = exports.codeBlock = exports.code = exports.caption = exports.bulletList = exports.breakout = exports.border = exports.bodiedExtension_with_marks = exports.bodiedExtension = exports.blockquote_legacy = exports.blockquote = exports.block_content = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.atomic_inline = exports.annotation = exports.alignment = void 0;
 var blockCard = exports.blockCard = {
   props: {
     type: {
@@ -142,8 +142,8 @@ var codeBlock_with_marks = exports.codeBlock_with_marks = ['codeBlock', {
   props: {
     marks: {
       type: 'array',
-      items: ['breakout'],
-      optional: true
+      optional: true,
+      items: ['breakout']
     }
   }
 }];
@@ -199,8 +199,8 @@ var mediaSingle = exports.mediaSingle = {
     }],
     marks: {
       type: 'array',
-      items: ['link'],
-      optional: true
+      optional: true,
+      items: ['link']
     }
   }
 };
@@ -266,8 +266,8 @@ var media = exports.media = {
     }],
     marks: {
       type: 'array',
-      items: [['annotation', 'border', 'link']],
-      optional: true
+      optional: true,
+      items: [['annotation', 'border', 'link']]
     }
   },
   required: ['attrs']
@@ -409,8 +409,8 @@ var mention = exports.mention = {
     },
     marks: {
       type: 'array',
-      items: ['annotation'],
-      optional: true
+      optional: true,
+      items: ['annotation']
     }
   }
 };
@@ -437,8 +437,8 @@ var emoji = exports.emoji = {
     },
     marks: {
       type: 'array',
-      items: ['annotation'],
-      optional: true
+      optional: true,
+      items: ['annotation']
     }
   }
 };
@@ -458,8 +458,8 @@ var date = exports.date = {
     },
     marks: {
       type: 'array',
-      items: ['annotation'],
-      optional: true
+      optional: true,
+      items: ['annotation']
     }
   }
 };
@@ -534,8 +534,8 @@ var status = exports.status = {
     },
     marks: {
       type: 'array',
-      items: ['annotation'],
-      optional: true
+      optional: true,
+      items: ['annotation']
     }
   }
 };
@@ -543,8 +543,8 @@ var formatted_text_inline = exports.formatted_text_inline = ['text', {
   props: {
     marks: {
       type: 'array',
-      items: [['annotation', 'backgroundColor', 'em', 'link', 'strike', 'strong', 'subsup', 'textColor', 'underline', null]],
-      optional: true
+      optional: true,
+      items: [['annotation', 'backgroundColor', 'em', 'link', 'strike', 'strong', 'subsup', 'textColor', 'underline', null]]
     }
   }
 }];
@@ -552,8 +552,8 @@ var code_inline = exports.code_inline = ['text', {
   props: {
     marks: {
       type: 'array',
-      items: [['annotation', 'code', 'link']],
-      optional: true
+      optional: true,
+      items: [['annotation', 'code', 'link']]
     }
   }
 }];
@@ -712,8 +712,8 @@ var link_text_inline = exports.link_text_inline = ['text', {
   props: {
     marks: {
       type: 'array',
-      items: ['link'],
-      optional: true
+      optional: true,
+      items: ['link']
     }
   }
 }];
@@ -759,8 +759,8 @@ var inlineExtension_with_marks = exports.inlineExtension_with_marks = ['inlineEx
   props: {
     marks: {
       type: 'array',
-      items: [['dataConsumer', 'fragment']],
-      optional: true
+      optional: true,
+      items: [['dataConsumer', 'fragment']]
     }
   }
 }];
@@ -809,8 +809,8 @@ var mediaInline = exports.mediaInline = {
     },
     marks: {
       type: 'array',
-      items: [['annotation', 'border', 'link']],
-      optional: true
+      optional: true,
+      items: [['annotation', 'border', 'link']]
     }
   }
 };
@@ -883,6 +883,7 @@ var confluenceUnsupportedInline = exports.confluenceUnsupportedInline = {
     }
   }
 };
+var atomic_inline = exports.atomic_inline = ['date', 'emoji', 'hardBreak', 'inlineCard', 'inlineExtension_with_marks', 'mediaInline', 'mention', 'placeholder', 'status'];
 var inline = exports.inline = ['code_inline', 'date', 'emoji', 'formatted_text_inline', 'hardBreak', 'inlineCard', 'inlineExtension_with_marks', 'mediaInline', 'mention', 'placeholder', 'status'];
 var paragraph = exports.paragraph = {
   props: {
@@ -916,8 +917,8 @@ var paragraph_with_alignment = exports.paragraph_with_alignment = ['paragraph',
   props: {
     marks: {
       type: 'array',
-      items: ['alignment'],
-      optional: true
+      optional: true,
+      items: ['alignment']
     }
   }
 }];
@@ -925,8 +926,8 @@ var paragraph_with_indentation = exports.paragraph_with_indentation = ['paragrap
   props: {
     marks: {
       type: 'array',
-      items: ['indentation'],
-      optional: true
+      optional: true,
+      items: ['indentation']
     }
   }
 }];
@@ -1199,8 +1200,8 @@ var extension_with_marks = exports.extension_with_marks = ['extension', {
   props: {
     marks: {
       type: 'array',
-      items: [['dataConsumer', 'fragment']],
-      optional: true
+      optional: true,
+      items: [['dataConsumer', 'fragment']]
     }
   }
 }];
@@ -1240,8 +1241,8 @@ var heading_with_indentation = exports.heading_with_indentation = ['heading', {
   props: {
     marks: {
       type: 'array',
-      items: ['indentation'],
-      optional: true
+      optional: true,
+      items: ['indentation']
     }
   }
 }];
@@ -1259,8 +1260,8 @@ var heading_with_alignment = exports.heading_with_alignment = ['heading', {
   props: {
     marks: {
       type: 'array',
-      items: ['alignment'],
-      optional: true
+      optional: true,
+      items: ['alignment']
     }
   }
 }];
@@ -1334,9 +1335,12 @@ var panel_legacy = exports.panel_legacy = ['panel', {
     }
   }
 }];
-var nestedExpand_content = exports.nestedExpand_content = ['nestedExpand', {
-  props: {}
-}];
+var nestedExpand_content = exports.nestedExpand_content = {
+  type: 'array',
+  items: [['blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'orderedList', 'panel', 'paragraph_with_no_marks', 'rule', 'taskList']],
+  minItems: 1,
+  allowUnsupportedBlock: true
+};
 var nestedExpand_with_no_marks = exports.nestedExpand_with_no_marks = ['nestedExpand', {
   props: {
     marks: {
@@ -1505,19 +1509,11 @@ var tableHeader = exports.tableHeader = {
   },
   required: ['content']
 };
-var tableCellContent = exports.tableCellContent = {
-  props: {
-    type: {
-      type: 'enum',
-      values: ['tableCellContent']
-    },
-    content: {
-      type: 'array',
-      items: [['blockCard', 'blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'extension_with_marks', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'nestedExpand_with_no_marks', 'orderedList', 'panel', 'paragraph_with_alignment', 'paragraph_with_no_marks', 'rule', 'taskList']],
-      minItems: 1,
-      allowUnsupportedBlock: true
-    }
-  }
+var tableCell_content = exports.tableCell_content = {
+  type: 'array',
+  items: [['blockCard', 'blockquote', 'bulletList', 'codeBlock_with_no_marks', 'decisionList', 'embedCard', 'extension_with_marks', 'heading_with_alignment', 'heading_with_indentation', 'heading_with_no_marks', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'nestedExpand_with_no_marks', 'orderedList', 'panel', 'paragraph_with_alignment', 'paragraph_with_no_marks', 'rule', 'taskList']],
+  minItems: 1,
+  allowUnsupportedBlock: true
 };
 var tableRow = exports.tableRow = {
   props: {
@@ -1572,8 +1568,8 @@ var table = exports.table = {
     },
     marks: {
       type: 'array',
-      items: ['fragment'],
-      optional: true
+      optional: true,
+      items: ['fragment']
     }
   }
 };
@@ -1631,8 +1627,8 @@ var bodiedExtension_with_marks = exports.bodiedExtension_with_marks = ['bodiedEx
   props: {
     marks: {
       type: 'array',
-      items: [['dataConsumer', 'fragment']],
-      optional: true
+      optional: true,
+      items: [['dataConsumer', 'fragment']]
     }
   }
 }];
@@ -1677,8 +1673,8 @@ var expand_with_breakout_mark = exports.expand_with_breakout_mark = ['expand', {
   props: {
     marks: {
       type: 'array',
-      items: ['breakout'],
-      optional: true
+      optional: true,
+      items: ['breakout']
     }
   }
 }];
@@ -1733,8 +1729,8 @@ var layoutSection = exports.layoutSection = {
     },
     marks: {
       type: 'array',
-      items: ['breakout'],
-      optional: true
+      optional: true,
+      items: ['breakout']
     }
   }
 };
@@ -1749,8 +1745,8 @@ var layoutSection_full = exports.layoutSection_full = ['layoutSection', {
     },
     marks: {
       type: 'array',
-      items: ['breakout'],
-      optional: true
+      optional: true,
+      items: ['breakout']
     },
     type: {
       type: 'enum',
@@ -1791,8 +1787,8 @@ var extensionFrame = exports.extensionFrame = {
     },
     marks: {
       type: 'array',
-      items: [['dataConsumer', 'fragment']],
-      optional: true
+      optional: true,
+      items: [['dataConsumer', 'fragment']]
     }
   }
 };

package/dist/es2019/next-schema/groups/atomicInlineGroup.js

@@ -0,0 +1,13 @@
+import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
+import { date } from '../nodes/date';
+import { emoji } from '../nodes/emoji';
+import { hardBreak } from '../nodes/hardBreak';
+import { inlineCard } from '../nodes/inlineCard';
+import { inlineExtension } from '../nodes/inlineExtension';
+import { mediaInline } from '../nodes/mediaInline';
+import { mention } from '../nodes/mention';
+import { placeholder } from '../nodes/placeholder';
+import { status } from '../nodes/status';
+export const atomicInlineGroup = adfNodeGroup('atomic_inline', [hardBreak, mention, emoji, inlineExtension.use('with_marks'), date, placeholder, inlineCard, status, mediaInline], {
+  ignore: ['pm-spec', 'json-schema']
+});

package/dist/es2019/next-schema/groups/tableCellContentPseudoGroup.js

@@ -21,6 +21,6 @@ const tableCellContentNodes = [codeBlock.use('with_no_marks'), blockCard, paragr
 // @DSLCompatibilityException JSON Schema and PM Spec are not in sync. We need to fix it
 // In PM Spec, they contain different items. (tableHeader using tableHeaderContentPseudoGroup, tableCell using tableCellContentPseudoGroup)
 // In JSON Schema, both tableHeader and tableCell points to tableCellContentPseudoGroup
-// The differences are highighted below.
+// The differences are highlighted below.
 export const tableCellContentPseudoGroup = $onePlus($or(...tableCellContentNodes, unsupportedBlock));
 export const tableHeaderContentPseudoGroup = $onePlus($or(...tableCellContentNodes, nestedExpand));

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

@@ -47,7 +47,7 @@ export const nestedExpand = adfNode('nestedExpand').define({
     }
   }
 }).variant('content', {
-  ignore: ['pm-spec', 'validator-spec']
+  ignore: ['pm-spec']
 }).variant('with_no_marks', {
   marks: [],
   content: [],

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

@@ -1,4 +1,5 @@
 import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
+import { atomicInlineGroup } from '../groups/atomicInlineGroup';
 import { inlineContentGroup } from '../groups/inlineContentGroup';
 import { inlineGroup } from '../groups/inlineGroup';
 import { alignment, indentation } from '../marks/alignmentAndIndentation';
@@ -15,7 +16,7 @@ export const paragraph = adfNode('paragraph').define({
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
   hasEmptyMarks: true,
-  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))],
+  content: [$zeroPlus($or(inlineGroup, atomicInlineGroup, inlineContentGroup))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.marks': {

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

@@ -4,6 +4,6 @@ import { tableCellContentPseudoGroup } from '../groups/tableCellContentPseudoGro
 // @DSLCompatibilityException This is only used by JSON schema to group the table cell content into a definition.
 // This node should be deleted and the content should be replicated in the JSON schema for table header and table cell node
 export const tableCellContent = adfNode('tableCellContent').define({
-  ignore: ['pm-spec', 'validator-spec'],
+  ignore: ['pm-spec'],
   content: [tableCellContentPseudoGroup]
 });