@atlaskit/adf-schema 40.8.0 → 40.8.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 40.8.2
+
+### Patch Changes
+
+- fde250b: Unskip parsing rules to parse content of expand and nestedExpand.
+
+## 40.8.1
+
+### Patch Changes
+
+- f515514: [ED-24281] Add new node nesting scenario to pseudo block content element, so the validator spec gets updated
+
 ## 40.8.0
 
 ### Minor Changes

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

@@ -37,6 +37,6 @@ var _unsupportedBlock = require("../nodes/unsupportedBlock");
  * - no base heading
  * - no base expand
  */
-var blockContentGroup = exports.blockContentGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block_content', [_blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock.use('with_no_marks'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _embedCard.embedCard, _table.table, _expand.expand.use('with_no_mark'), _bodiedExtension.bodiedExtension.use('with_marks'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
+var blockContentGroup = exports.blockContentGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block_content', [_blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock.use('with_no_marks'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _panel.panel.use('with_nested_blockquote'), _blockquote.blockquote, _blockquote.blockquote.use('without_nested_codeblock_or_media'), _extension.extension.use('with_marks'), _embedCard.embedCard, _table.table, _expand.expand.use('without_nested_expand'), _expand.expand.use('with_no_mark'), _bodiedExtension.bodiedExtension.use('with_marks'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
   ignore: ['pm-spec', 'json-schema']
 });

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

@@ -36,11 +36,11 @@ var nodeSpecOptions = {
   }, {
     context: 'expand//',
     tag: '[data-node-type="expand"]',
-    skip: true
+    getAttrs: getExpandAttrs
   }, {
     context: 'nestedExpand//',
     tag: '[data-node-type="expand"]',
-    skip: true
+    getAttrs: getExpandAttrs
   }, {
     tag: '[data-node-type="nestedExpand"] button',
     ignore: true

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

@@ -19,6 +19,14 @@ var _nodeTypes = require("../../next-schema/generated/nodeTypes");
  * @name nestedExpand_with_no_marks_node
  */
 
+function getExpandAttrs(domNode) {
+  var dom = domNode;
+  return {
+    title: dom.getAttribute('data-title'),
+    __expanded: true
+  };
+}
+
 /**
  * @name nestedExpand
  * @description an expand that can be nested (eg. inside table, layout).
@@ -27,7 +35,7 @@ var nestedExpand = exports.nestedExpand = (0, _nodeTypes.nestedExpand)({
   parseDOM: [{
     context: 'nestedExpand//',
     tag: '[data-node-type="nestedExpand"]',
-    skip: true
+    getAttrs: getExpandAttrs
   }, {
     tag: '[data-node-type="nestedExpand"] button',
     ignore: true
@@ -36,13 +44,7 @@ var nestedExpand = exports.nestedExpand = (0, _nodeTypes.nestedExpand)({
     ignore: true
   }, {
     tag: 'div[data-node-type="nestedExpand"]',
-    getAttrs: function getAttrs(domNode) {
-      var dom = domNode;
-      return {
-        title: dom.getAttribute('data-title'),
-        __expanded: true
-      };
-    }
+    getAttrs: getExpandAttrs
   }],
   toDOM: function toDOM(node) {
     var attrs = {

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

@@ -1735,7 +1735,7 @@ var confluenceUnsupportedBlock = exports.confluenceUnsupportedBlock = {
     }
   }
 };
-var block_content = exports.block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks'];
+var block_content = exports.block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks'];
 var layoutColumn = exports.layoutColumn = {
   props: {
     type: {
@@ -1910,7 +1910,7 @@ var doc = exports.doc = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_full', 'layoutSection_with_single_column', 'multiBodiedExtension', 'expand_with_breakout_mark']],
+      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_full', 'layoutSection_with_single_column', 'multiBodiedExtension', 'expand_with_breakout_mark']],
       allowUnsupportedBlock: true
     }
   }

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

@@ -32,6 +32,6 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
  * - no base heading
  * - no base expand
  */
-export const blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, table, expand.use('with_no_mark'), bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
+export const blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, panel.use('with_nested_blockquote'), blockquote, blockquote.use('without_nested_codeblock_or_media'), extension.use('with_marks'), embedCard, table, expand.use('without_nested_expand'), expand.use('with_no_mark'), bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
   ignore: ['pm-spec', 'json-schema']
 });

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

@@ -27,11 +27,11 @@ const nodeSpecOptions = {
   }, {
     context: 'expand//',
     tag: '[data-node-type="expand"]',
-    skip: true
+    getAttrs: getExpandAttrs
   }, {
     context: 'nestedExpand//',
     tag: '[data-node-type="expand"]',
-    skip: true
+    getAttrs: getExpandAttrs
   }, {
     tag: '[data-node-type="nestedExpand"] button',
     ignore: true

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

@@ -14,6 +14,14 @@ import { nestedExpand as nestedExpandFactory } from '../../next-schema/generated
  * @name nestedExpand_with_no_marks_node
  */
 
+function getExpandAttrs(domNode) {
+  const dom = domNode;
+  return {
+    title: dom.getAttribute('data-title'),
+    __expanded: true
+  };
+}
+
 /**
  * @name nestedExpand
  * @description an expand that can be nested (eg. inside table, layout).
@@ -22,7 +30,7 @@ export const nestedExpand = nestedExpandFactory({
   parseDOM: [{
     context: 'nestedExpand//',
     tag: '[data-node-type="nestedExpand"]',
-    skip: true
+    getAttrs: getExpandAttrs
   }, {
     tag: '[data-node-type="nestedExpand"] button',
     ignore: true
@@ -31,13 +39,7 @@ export const nestedExpand = nestedExpandFactory({
     ignore: true
   }, {
     tag: 'div[data-node-type="nestedExpand"]',
-    getAttrs: domNode => {
-      const dom = domNode;
-      return {
-        title: dom.getAttribute('data-title'),
-        __expanded: true
-      };
-    }
+    getAttrs: getExpandAttrs
   }],
   toDOM(node) {
     const attrs = {

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

@@ -1728,7 +1728,7 @@ export const confluenceUnsupportedBlock = {
     }
   }
 };
-export const block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks'];
+export const block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks'];
 export const layoutColumn = {
   props: {
     type: {
@@ -1903,7 +1903,7 @@ export const doc = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_full', 'layoutSection_with_single_column', 'multiBodiedExtension', 'expand_with_breakout_mark']],
+      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_full', 'layoutSection_with_single_column', 'multiBodiedExtension', 'expand_with_breakout_mark']],
       allowUnsupportedBlock: true
     }
   }

package/dist/esm/next-schema/groups/blockContentGroup.js

@@ -32,6 +32,6 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
  * - no base heading
  * - no base expand
  */
-export var blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, table, expand.use('with_no_mark'), bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
+export var blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock.use('with_no_marks'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, panel.use('with_nested_blockquote'), blockquote, blockquote.use('without_nested_codeblock_or_media'), extension.use('with_marks'), embedCard, table, expand.use('without_nested_expand'), expand.use('with_no_mark'), bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
   ignore: ['pm-spec', 'json-schema']
 });

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

@@ -30,11 +30,11 @@ var nodeSpecOptions = {
   }, {
     context: 'expand//',
     tag: '[data-node-type="expand"]',
-    skip: true
+    getAttrs: getExpandAttrs
   }, {
     context: 'nestedExpand//',
     tag: '[data-node-type="expand"]',
-    skip: true
+    getAttrs: getExpandAttrs
   }, {
     tag: '[data-node-type="nestedExpand"] button',
     ignore: true

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

@@ -14,6 +14,14 @@ import { nestedExpand as nestedExpandFactory } from '../../next-schema/generated
  * @name nestedExpand_with_no_marks_node
  */
 
+function getExpandAttrs(domNode) {
+  var dom = domNode;
+  return {
+    title: dom.getAttribute('data-title'),
+    __expanded: true
+  };
+}
+
 /**
  * @name nestedExpand
  * @description an expand that can be nested (eg. inside table, layout).
@@ -22,7 +30,7 @@ export var nestedExpand = nestedExpandFactory({
   parseDOM: [{
     context: 'nestedExpand//',
     tag: '[data-node-type="nestedExpand"]',
-    skip: true
+    getAttrs: getExpandAttrs
   }, {
     tag: '[data-node-type="nestedExpand"] button',
     ignore: true
@@ -31,13 +39,7 @@ export var nestedExpand = nestedExpandFactory({
     ignore: true
   }, {
     tag: 'div[data-node-type="nestedExpand"]',
-    getAttrs: function getAttrs(domNode) {
-      var dom = domNode;
-      return {
-        title: dom.getAttribute('data-title'),
-        __expanded: true
-      };
-    }
+    getAttrs: getExpandAttrs
   }],
   toDOM: function toDOM(node) {
     var attrs = {

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

@@ -1728,7 +1728,7 @@ export var confluenceUnsupportedBlock = {
     }
   }
 };
-export var block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks'];
+export var block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks'];
 export var layoutColumn = {
   props: {
     type: {
@@ -1903,7 +1903,7 @@ export var doc = {
     },
     content: {
       type: 'array',
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_full', 'layoutSection_with_single_column', 'multiBodiedExtension', 'expand_with_breakout_mark']],
+      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock_with_no_marks', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'panel_with_nested_blockquote', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand_with_no_mark', 'bodiedExtension_with_marks', 'codeBlock_with_marks', 'layoutSection_full', 'layoutSection_with_single_column', 'multiBodiedExtension', 'expand_with_breakout_mark']],
       allowUnsupportedBlock: true
     }
   }

package/package.json

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