@atlaskit/adf-schema 37.1.30 → 37.1.32

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/adf-schema
 
+## 37.1.32
+
+### Patch Changes
+
+- 64d5ec6: Aligned extensionFrame with current validator spec implementation with exception override.
+- 497d3c4: fix unit test description for node spec check
+
+## 37.1.31
+
+### Patch Changes
+
+- 79fd420: ED-23030: overrides caption for validator spec
+- 2d1185b: ED-23030: overrides validator-spec for expand node
+
 ## 37.1.30
 
 ### Patch Changes

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

@@ -26,7 +26,15 @@ var expand = exports.expand = (0, _adfSchemaGenerator.adfNode)('expand').define(
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup))],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      'props.attrs.optional': {
+        reason: '@DSLCompatibilityException - required for expand validator spec',
+        remove: true
+      }
+    }
+  }
 }).variant('with_breakout_mark', {
   marks: [_breakout.breakout, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
   content: [],

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

@@ -33,5 +33,13 @@ var extensionFrame = exports.extensionFrame = (0, _adfSchemaGenerator.adfNode)('
   selectable: false,
   marks: [_dataConsumer.dataConsumer, _fragment.fragment, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
   attrs: {},
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_bodiedExtension.bodiedExtension.use('with_marks'), _panel.panel, _paragraph.paragraph.use('with_no_marks'), _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _codeBlock.codeBlock.use('with_no_marks'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('caption'), _decisionList.decisionList, _task.taskList, _table.table, _extension.extension.use('with_marks'), _blockCard.blockCard, _embedCard.embedCard, _unsupportedBlock.unsupportedBlock))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_bodiedExtension.bodiedExtension.use('with_marks'), _panel.panel, _paragraph.paragraph.use('with_no_marks'), _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _codeBlock.codeBlock.use('with_no_marks'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('caption'), _decisionList.decisionList, _task.taskList, _table.table, _extension.extension.use('with_marks'), _blockCard.blockCard, _embedCard.embedCard, _unsupportedBlock.unsupportedBlock))],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      'props.content.allowUnsupportedBlock': {
+        remove: true,
+        reason: '@DSLCompatibilityException - mismatch for extensionFrame'
+      }
+    }
+  }
 });

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

@@ -14,5 +14,13 @@ var tableRow = exports.tableRow = (0, _adfSchemaGenerator.adfNode)('tableRow').d
   selectable: false,
   marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
   content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_tableCell.tableCell, _tableHeader.tableHeader, _tableCellContent.tableCellContent))],
-  tableRole: 'row'
+  tableRole: 'row',
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      'props.content.minItems': {
+        reason: '@DSLCompatibilityException - required for tableRow validator spec',
+        remove: true
+      }
+    }
+  }
 });

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

@@ -20,7 +20,15 @@ export const expand = adfNode('expand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(nonNestableBlockContentGroup))]
+  content: [$onePlus($or(nonNestableBlockContentGroup))],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      'props.attrs.optional': {
+        reason: '@DSLCompatibilityException - required for expand validator spec',
+        remove: true
+      }
+    }
+  }
 }).variant('with_breakout_mark', {
   marks: [breakout, unsupportedNodeAttribute, unsupportedMark],
   content: [],

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

@@ -27,5 +27,13 @@ export const extensionFrame = adfNode('extensionFrame').define({
   selectable: false,
   marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark],
   attrs: {},
-  content: [$onePlus($or(bodiedExtension.use('with_marks'), panel, paragraph.use('with_no_marks'), blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table, extension.use('with_marks'), blockCard, embedCard, unsupportedBlock))]
+  content: [$onePlus($or(bodiedExtension.use('with_marks'), panel, paragraph.use('with_no_marks'), blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table, extension.use('with_marks'), blockCard, embedCard, unsupportedBlock))],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      'props.content.allowUnsupportedBlock': {
+        remove: true,
+        reason: '@DSLCompatibilityException - mismatch for extensionFrame'
+      }
+    }
+  }
 });

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

@@ -8,5 +8,13 @@ export const tableRow = adfNode('tableRow').define({
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
   content: [$onePlus($or(tableCell, tableHeader, tableCellContent))],
-  tableRole: 'row'
+  tableRole: 'row',
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      'props.content.minItems': {
+        reason: '@DSLCompatibilityException - required for tableRow validator spec',
+        remove: true
+      }
+    }
+  }
 });

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

@@ -20,7 +20,15 @@ export var expand = adfNode('expand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(nonNestableBlockContentGroup))]
+  content: [$onePlus($or(nonNestableBlockContentGroup))],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      'props.attrs.optional': {
+        reason: '@DSLCompatibilityException - required for expand validator spec',
+        remove: true
+      }
+    }
+  }
 }).variant('with_breakout_mark', {
   marks: [breakout, unsupportedNodeAttribute, unsupportedMark],
   content: [],

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

@@ -27,5 +27,13 @@ export var extensionFrame = adfNode('extensionFrame').define({
   selectable: false,
   marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark],
   attrs: {},
-  content: [$onePlus($or(bodiedExtension.use('with_marks'), panel, paragraph.use('with_no_marks'), blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table, extension.use('with_marks'), blockCard, embedCard, unsupportedBlock))]
+  content: [$onePlus($or(bodiedExtension.use('with_marks'), panel, paragraph.use('with_no_marks'), blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table, extension.use('with_marks'), blockCard, embedCard, unsupportedBlock))],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      'props.content.allowUnsupportedBlock': {
+        remove: true,
+        reason: '@DSLCompatibilityException - mismatch for extensionFrame'
+      }
+    }
+  }
 });

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

@@ -8,5 +8,13 @@ export var tableRow = adfNode('tableRow').define({
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
   content: [$onePlus($or(tableCell, tableHeader, tableCellContent))],
-  tableRole: 'row'
+  tableRole: 'row',
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      'props.content.minItems': {
+        reason: '@DSLCompatibilityException - required for tableRow validator spec',
+        remove: true
+      }
+    }
+  }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "37.1.30",
+  "version": "37.1.32",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/schema-generators/__tests__/unit/adfToValidatorSpecValidation.unit.ts

@@ -6,8 +6,6 @@ const newSpecs = sortNestedArrays(adfToValidatorSpec(adfNode));
 const SKIP_LIST = [
   'codeBlock', // doesn't match existing spec
   'doc', // doesn't match existing spec, need to flatten groups
-  'expand', // doesn't match existing spec
-  'extensionFrame', // doesn't match existing spec
   'inline_comment_marker', // doesn't exist in the output
   'layoutSection_full', // doesn't match existing spec, allowUnsupportedBlock, extra marks
   'layoutSection_with_single_column', // doesn't exist in the output
@@ -17,7 +15,6 @@ const SKIP_LIST = [
   'nestedExpand', // doesn't match existing spec
   'tableCell', // doesn't match existing spec
   'tableHeader', // doesn't match existing spec
-  'tableRow', // doesn't match existing spec, extra minItems
 
   'atomic_inline', // doesn't exist in the output, not even used anywhere...
   'nestedExpand_content', // doesn't exist in the output, completely different format from other groups