@atlaskit/adf-schema 52.16.6 → 53.0.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/adf-schema
 
+## 53.0.0
+
+### Major Changes
+
+- [`38d753a24e9ad`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/38d753a24e9ad) -
+  Promote code block wrap and line number attrs to the full ADF schema
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 52.16.6
 
 ### Patch Changes

package/dist/cjs/entry-points/code-block.js

@@ -15,12 +15,6 @@ Object.defineProperty(exports, "codeBlockToJSON", {
     return _codeBlock.toJSON;
   }
 });
-Object.defineProperty(exports, "codeBlockWithExtendedAttributes", {
-  enumerable: true,
-  get: function get() {
-    return _codeBlock.codeBlockWithExtendedAttributes;
-  }
-});
 Object.defineProperty(exports, "codeBlockWithLocalId", {
   enumerable: true,
   get: function get() {

package/dist/cjs/entry-points/schema-code-block.js

@@ -15,12 +15,6 @@ Object.defineProperty(exports, "codeBlockToJSON", {
     return _codeBlock.toJSON;
   }
 });
-Object.defineProperty(exports, "codeBlockWithExtendedAttributes", {
-  enumerable: true,
-  get: function get() {
-    return _codeBlock.codeBlockWithExtendedAttributes;
-  }
-});
 Object.defineProperty(exports, "codeBlockWithLocalId", {
   enumerable: true,
   get: function get() {

package/dist/cjs/entry-points/schema-next-nodeTypes.js

@@ -69,18 +69,6 @@ Object.defineProperty(exports, "codeBlockRootOnly", {
     return _nodeTypes.codeBlockRootOnly;
   }
 });
-Object.defineProperty(exports, "codeBlockRootOnlyWithExtendedAttributesStage0", {
-  enumerable: true,
-  get: function get() {
-    return _nodeTypes.codeBlockRootOnlyWithExtendedAttributesStage0;
-  }
-});
-Object.defineProperty(exports, "codeBlockWithExtendedAttributesStage0", {
-  enumerable: true,
-  get: function get() {
-    return _nodeTypes.codeBlockWithExtendedAttributesStage0;
-  }
-});
 Object.defineProperty(exports, "confluenceJiraIssue", {
   enumerable: true,
   get: function get() {

package/dist/cjs/index.js

@@ -441,12 +441,6 @@ Object.defineProperty(exports, "codeBlockToJSON", {
     return _schema.codeBlockToJSON;
   }
 });
-Object.defineProperty(exports, "codeBlockWithExtendedAttributes", {
-  enumerable: true,
-  get: function get() {
-    return _schema.codeBlockWithExtendedAttributes;
-  }
-});
 Object.defineProperty(exports, "codeBlockWithLocalId", {
   enumerable: true,
   get: function get() {

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

@@ -21,7 +21,7 @@ _panel.panel.use('c1').addContent(_tableNodes.table);
 var doc = (0, _adfSchemaGenerator.adfNode)('doc').define({
   root: true,
   version: 1,
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _blockContentGroup.blockContentGroup, _codeBlock.codeBlock.use('root_only'), _codeBlock.codeBlock.use('root_only_with_extended_attributes'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('with_single_column'), _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup, _expand.expand.use('root_only'), _syncBlock.syncBlock, _bodiedSyncBlock.bodiedSyncBlock))],
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _blockContentGroup.blockContentGroup, _codeBlock.codeBlock.use('root_only'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('with_single_column'), _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup, _expand.expand.use('root_only'), _syncBlock.syncBlock, _bodiedSyncBlock.bodiedSyncBlock))],
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.content.minItems': {

package/dist/cjs/next-schema/generated/nodeTypes.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unsupportedInline = exports.unsupportedBlock = exports.textWithNoMarks = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableWithNestedTable = exports.tableRowWithNestedTable = exports.tableRow = exports.tableHeaderWithNestedTableStage0 = exports.tableHeaderWithNestedTable = exports.tableHeaderStage0 = exports.tableHeader = exports.tableCellWithNestedTableStage0 = exports.tableCellWithNestedTable = exports.tableCellStage0 = exports.tableCell = exports.table = exports.syncBlock = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithFontSize = exports.paragraphWithAlignment = exports.paragraph = exports.panelC1 = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem = exports.layoutSectionWithSingleColumnStage0 = exports.layoutSectionFull = exports.layoutSection = exports.layoutColumnStage0 = exports.layoutColumn = exports.inlineExtensionWithMarks = exports.inlineExtension = exports.inlineCardStage0 = exports.inlineCard = exports.image = exports.headingWithNoMarks = exports.headingWithIndentation = exports.headingWithAlignment = exports.heading = exports.hardBreak = exports.extensionWithMarks = exports.extensionFrameStage0 = exports.extension = exports.expandRootOnly = exports.expand = exports.emojiStage0 = exports.emoji = exports.embedCard = exports.doc = exports.decisionList = exports.decisionItem = exports.dateStage0 = exports.date = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.codeBlockWithExtendedAttributesStage0 = exports.codeBlockRootOnlyWithExtendedAttributesStage0 = exports.codeBlockRootOnly = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedSyncBlock = exports.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteLegacy = exports.blockquote = exports.blockTaskItem = exports.blockCard = void 0;
+exports.unsupportedInline = exports.unsupportedBlock = exports.textWithNoMarks = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableWithNestedTable = exports.tableRowWithNestedTable = exports.tableRow = exports.tableHeaderWithNestedTableStage0 = exports.tableHeaderWithNestedTable = exports.tableHeaderStage0 = exports.tableHeader = exports.tableCellWithNestedTableStage0 = exports.tableCellWithNestedTable = exports.tableCellStage0 = exports.tableCell = exports.table = exports.syncBlock = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithFontSize = exports.paragraphWithAlignment = exports.paragraph = exports.panelC1 = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem = exports.layoutSectionWithSingleColumnStage0 = exports.layoutSectionFull = exports.layoutSection = exports.layoutColumnStage0 = exports.layoutColumn = exports.inlineExtensionWithMarks = exports.inlineExtension = exports.inlineCardStage0 = exports.inlineCard = exports.image = exports.headingWithNoMarks = exports.headingWithIndentation = exports.headingWithAlignment = exports.heading = exports.hardBreak = exports.extensionWithMarks = exports.extensionFrameStage0 = exports.extension = exports.expandRootOnly = exports.expand = exports.emojiStage0 = exports.emoji = exports.embedCard = exports.doc = exports.decisionList = exports.decisionItem = exports.dateStage0 = exports.date = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.codeBlockRootOnly = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedSyncBlock = exports.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteLegacy = exports.blockquote = exports.blockTaskItem = exports.blockCard = void 0;
 var _createPMSpecFactory = require("../../schema/createPMSpecFactory");
 /**
  * This file was automatically generated by @atlaskit/adf-schema-generator
@@ -169,40 +169,6 @@ var codeBlock = exports.codeBlock = (0, _createPMSpecFactory.createPMNodeSpecFac
   content: '(text | unsupportedInline)*',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   group: 'block',
-  attrs: {
-    language: {
-      default: null
-    },
-    uniqueId: {
-      default: null
-    },
-    localId: {
-      default: null
-    }
-  },
-  code: true,
-  defining: true
-});
-var codeBlockRootOnly = exports.codeBlockRootOnly = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(text | unsupportedInline)*',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
-  attrs: {
-    language: {
-      default: null
-    },
-    uniqueId: {
-      default: null
-    },
-    localId: {
-      default: null
-    }
-  },
-  code: true,
-  defining: true
-});
-var codeBlockRootOnlyWithExtendedAttributesStage0 = exports.codeBlockRootOnlyWithExtendedAttributesStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(text | unsupportedInline)*',
-  marks: 'unsupportedMark unsupportedNodeAttribute',
   attrs: {
     language: {
       default: null
@@ -223,10 +189,9 @@ var codeBlockRootOnlyWithExtendedAttributesStage0 = exports.codeBlockRootOnlyWit
   code: true,
   defining: true
 });
-var codeBlockWithExtendedAttributesStage0 = exports.codeBlockWithExtendedAttributesStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
+var codeBlockRootOnly = exports.codeBlockRootOnly = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: '(text | unsupportedInline)*',
   marks: 'unsupportedMark unsupportedNodeAttribute',
-  group: 'block',
   attrs: {
     language: {
       default: null

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

@@ -36,7 +36,7 @@ var _unsupportedBlock = require("../nodes/unsupportedBlock");
  * - no base mediaSingle
  * - no base heading
  */
-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, _codeBlock.codeBlock.use('with_extended_attributes'), _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, _tableNodes.table,
+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, _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, _tableNodes.table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 _tableNodes.table.use('with_nested_table'), _expand.expand, _bodiedExtension.bodiedExtension.use('with_marks'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
   ignore: ['pm-spec']

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

@@ -24,7 +24,7 @@ var _rule = require("../nodes/rule");
 var _tableNodes = require("../nodes/tableNodes");
 var _task = require("../nodes/task");
 var _unsupportedBlock = require("../nodes/unsupportedBlock");
-var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _codeBlock.codeBlock.use('with_extended_attributes'), _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _decisionList.decisionList, _embedCard.embedCard, _extension.extension, _extension.extension.use('with_marks'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _panel.panel, _panel.panel.use('c1'), _tableNodes.table,
+var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _decisionList.decisionList, _embedCard.embedCard, _extension.extension, _extension.extension.use('with_marks'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _panel.panel, _panel.panel.use('c1'), _tableNodes.table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 _tableNodes.table.use('with_nested_table'), _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
   // @DSLCompatibilityException

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

@@ -24,7 +24,7 @@ var _unsupportedBlock = require("../nodes/unsupportedBlock");
 // Not an actual group, but a collection of nodes that can't be nested inside each other
 // TODO: ED-29537 - make it an actual group
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-var nonNestableBlockContent = exports.nonNestableBlockContent = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _codeBlock.codeBlock, _codeBlock.codeBlock.use('with_extended_attributes'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _decisionList.decisionList, _task.taskList, _tableNodes.table,
+var nonNestableBlockContent = exports.nonNestableBlockContent = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_font_size'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _codeBlock.codeBlock, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _decisionList.decisionList, _task.taskList, _tableNodes.table,
 // @ts-expect-error - types don't deal well with circular references for the variant
 _tableNodes.table.use('with_nested_table'), _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _unsupportedBlock.unsupportedBlock];
 

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

@@ -22,7 +22,7 @@ var _rule = require("../nodes/rule");
 var _task = require("../nodes/task");
 var _unsupportedBlock = require("../nodes/unsupportedBlock");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-var tableCellContentNodes = exports.tableCellContentNodes = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _codeBlock.codeBlock, _codeBlock.codeBlock.use('with_extended_attributes'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _decisionList.decisionList, _task.taskList, _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _nestedExpand.nestedExpand.use('content'), _nestedExpand.nestedExpand.use('with_no_marks')];
+var tableCellContentNodes = exports.tableCellContentNodes = [_paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _panel.panel, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _codeBlock.codeBlock, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaGroup.mediaGroup, _decisionList.decisionList, _task.taskList, _blockCard.blockCard, _embedCard.embedCard, _extension.extension.use('with_marks'), _nestedExpand.nestedExpand.use('content'), _nestedExpand.nestedExpand.use('with_no_marks')];
 
 // This is not an actual group, but a collection of nodes
 // @DSLCompatibilityException JSON Schema and PM Spec are not in sync. We need to fix it

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

@@ -13,34 +13,6 @@ var _unsupportedInline = require("./unsupportedInline");
 var codeBlock = exports.codeBlock = (0, _adfSchemaGenerator.adfNode)('codeBlock').define({
   code: true,
   defining: true,
-  attrs: {
-    language: {
-      type: 'string',
-      default: null,
-      optional: true
-    },
-    uniqueId: {
-      type: 'string',
-      default: null,
-      optional: true
-    },
-    localId: {
-      type: 'string',
-      default: null,
-      optional: true
-    }
-  },
-  noMarks: true,
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_text.text.use('with_no_marks'), _unsupportedInline.unsupportedInline))]
-})
-// Variant used root scenario where we have breakout
-.variant('root_only', {
-  marks: [_breakout.breakout, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
-  noMarks: false,
-  noExtend: true
-})
-// Stage-0 variant: adds wrap and hideLineNumbers attributes (ADF Change 101)
-.variant('with_extended_attributes', {
   attrs: {
     language: {
       type: 'string',
@@ -68,39 +40,12 @@ var codeBlock = exports.codeBlock = (0, _adfSchemaGenerator.adfNode)('codeBlock'
       optional: true
     }
   },
-  stage0: true
+  noMarks: true,
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_text.text.use('with_no_marks'), _unsupportedInline.unsupportedInline))]
 })
-// Stage-0 variant: root_only marks + extended attributes (ADF Change 101)
-.variant('root_only_with_extended_attributes', {
+// Variant used root scenario where we have breakout
+.variant('root_only', {
   marks: [_breakout.breakout, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   noMarks: false,
-  noExtend: true,
-  attrs: {
-    language: {
-      type: 'string',
-      default: null,
-      optional: true
-    },
-    uniqueId: {
-      type: 'string',
-      default: null,
-      optional: true
-    },
-    localId: {
-      type: 'string',
-      default: null,
-      optional: true
-    },
-    wrap: {
-      type: 'boolean',
-      default: null,
-      optional: true
-    },
-    hideLineNumbers: {
-      type: 'boolean',
-      default: false,
-      optional: true
-    }
-  },
-  stage0: true
+  noExtend: true
 });

package/dist/cjs/schema/default-schema.js

@@ -35,8 +35,7 @@ function () {
       table: _nodes.tableWithNestedTable,
       tableRow: _nodes.tableRowWithNestedTable,
       tableCell: _nodes.tableCellWithNestedTableStage0,
-      tableHeader: _nodes.tableHeaderWithNestedTableStage0,
-      codeBlock: _nodes.codeBlockWithExtendedAttributes
+      tableHeader: _nodes.tableHeaderWithNestedTableStage0
     };
   }
   return (0, _createSchema.createSchema)(defaultSchemaConfig);

package/dist/cjs/schema/index.js

@@ -159,12 +159,6 @@ Object.defineProperty(exports, "codeBlockToJSON", {
     return _nodes.codeBlockToJSON;
   }
 });
-Object.defineProperty(exports, "codeBlockWithExtendedAttributes", {
-  enumerable: true,
-  get: function get() {
-    return _nodes.codeBlockWithExtendedAttributes;
-  }
-});
 Object.defineProperty(exports, "codeBlockWithLocalId", {
   enumerable: true,
   get: function get() {

package/dist/cjs/schema/nodes/code-block.js

@@ -1,16 +1,12 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toJSON = exports.codeBlockWithLocalId = exports.codeBlockWithExtendedAttributes = exports.codeBlock = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+exports.toJSON = exports.codeBlockWithLocalId = exports.codeBlock = void 0;
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _nodeTypes = require("../../next-schema/generated/nodeTypes");
 var _utils = require("../../utils");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
  * @name codeBlock_with_no_marks_node
  */
@@ -82,109 +78,6 @@ function parseCodeFromHtml(node) {
   return code;
 }
 var codeBlock = exports.codeBlock = (0, _nodeTypes.codeBlock)({
-  parseDOM: [{
-    tag: 'pre',
-    preserveWhitespace: 'full',
-    getAttrs: function getAttrs(domNode) {
-      // eslint-disable-next-line @atlaskit/editor/no-as-casting
-      var dom = domNode;
-      var language =
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      getLanguageFromBitbucketStyle(dom.parentElement) ||
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      getLanguageFromEditorStyle(dom.parentElement) || getLanguageFromCode(dom) ||
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      dom.getAttribute('data-language');
-      dom = removeLastNewLine(dom);
-      return {
-        language: language
-      };
-    }
-  },
-  // Handle VSCode, Android Studio paste
-  // Checking `white-space: pre-wrap` is too aggressive @see ED-2627
-  {
-    tag: 'div[style]',
-    preserveWhitespace: 'full',
-    getAttrs: function getAttrs(domNode) {
-      // eslint-disable-next-line @atlaskit/editor/no-as-casting
-      var dom = domNode;
-      if (dom.style.whiteSpace === 'pre' || dom.style.fontFamily && dom.style.fontFamily.toLowerCase().indexOf('monospace') > -1) {
-        return {};
-      }
-      return false;
-    },
-    getContent: function getContent(domNode, schema) {
-      var code = parseCodeFromHtml(domNode);
-      return code ? _model.Fragment.from(schema.text(code)) : _model.Fragment.empty;
-    }
-  },
-  // Handle GitHub/Gist paste
-  {
-    tag: 'table[style]',
-    preserveWhitespace: 'full',
-    getAttrs: function getAttrs(dom) {
-      // eslint-disable-next-line @atlaskit/editor/no-as-casting
-      if (dom.querySelector('td[class*="blob-code"]')) {
-        return {};
-      }
-      return false;
-    }
-  }, {
-    tag: 'div.code-block',
-    preserveWhitespace: 'full',
-    getAttrs: function getAttrs(domNode) {
-      // eslint-disable-next-line @atlaskit/editor/no-as-casting
-      var dom = domNode;
-      // TODO: ED-5604 - Fix it inside `react-syntax-highlighter`
-      // Remove line numbers
-      var lineNumber = dom.querySelectorAll('.react-syntax-highlighter-line-number');
-      if (lineNumber.length > 0) {
-        // It's possible to copy without the line numbers too hence this
-        // `react-syntax-highlighter-line-number` check, so that we don't remove real code
-        lineNumber.forEach(function (line) {
-          return line.remove();
-        });
-      }
-      return {};
-    }
-  }],
-  toDOM: function toDOM(node) {
-    return ['pre', ['code', {
-      'data-language': node.attrs.language
-    }, 0]];
-  }
-});
-var toJSON = exports.toJSON = function toJSON(node) {
-  return {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    attrs: Object.keys(node.attrs).reduce(function (memo, key) {
-      if (key === 'uniqueId') {
-        return memo;
-      }
-      if (key === 'language' && node.attrs.language === null) {
-        return memo;
-      }
-      if (key === 'wrap' && node.attrs.wrap === null) {
-        return memo;
-      }
-      if (key === 'hideLineNumbers' && !node.attrs.hideLineNumbers) {
-        return memo;
-      }
-      memo[key] = node.attrs[key];
-      return memo;
-    }, {})
-  };
-};
-
-/**
- * @name codeBlock_with_extended_attributes
- * @description stage-0 codeBlock variant with wrap and hideLineNumbers attributes (ADF Change 101)
- *
- * Stage-0 variant: adds wrap and hideLineNumbers attributes (ADF Change 101).
- * The DSL variant includes all attrs (base + new), so the generated factory provides the full set.
- */
-var codeBlockWithExtendedAttributes = exports.codeBlockWithExtendedAttributes = _objectSpread({}, (0, _nodeTypes.codeBlockWithExtendedAttributesStage0)({
   parseDOM: [{
     tag: 'pre',
     preserveWhitespace: 'full',
@@ -285,7 +178,28 @@ var codeBlockWithExtendedAttributes = exports.codeBlockWithExtendedAttributes =
       'data-language': node.attrs.language
     }, 0]];
   }
-}));
+});
+var toJSON = exports.toJSON = function toJSON(node) {
+  return {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    attrs: Object.keys(node.attrs).reduce(function (memo, key) {
+      if (key === 'uniqueId') {
+        return memo;
+      }
+      if (key === 'language' && node.attrs.language === null) {
+        return memo;
+      }
+      if (key === 'wrap' && node.attrs.wrap === null) {
+        return memo;
+      }
+      if (key === 'hideLineNumbers' && !node.attrs.hideLineNumbers) {
+        return memo;
+      }
+      memo[key] = node.attrs[key];
+      return memo;
+    }, {})
+  };
+};
 var codeBlockWithLocalId = exports.codeBlockWithLocalId = (0, _nodeTypes.codeBlock)({
   parseDOM: [{
     tag: 'pre',

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

@@ -88,12 +88,6 @@ Object.defineProperty(exports, "codeBlockToJSON", {
     return _codeBlock.toJSON;
   }
 });
-Object.defineProperty(exports, "codeBlockWithExtendedAttributes", {
-  enumerable: true,
-  get: function get() {
-    return _codeBlock.codeBlockWithExtendedAttributes;
-  }
-});
 Object.defineProperty(exports, "codeBlockWithLocalId", {
   enumerable: true,
   get: function get() {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.underline = exports.text_with_no_marks = exports.text_link_inline = exports.text_formatted = exports.text_code_inline = exports.textColor = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell = exports.table = exports.syncBlock = exports.subsup = exports.strong = exports.strike = exports.status = exports.rule = exports.placeholder = exports.paragraph_with_no_marks = exports.paragraph_with_indentation = exports.paragraph_with_font_size = exports.paragraph_with_alignment = exports.paragraph = 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 = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_content = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.indentation = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.fontSize = exports.extension_with_marks = exports.extensionFrame = exports.extension = exports.expand_root_only = exports.expand = exports.emoji = exports.embedCard = exports.em = exports.doc = exports.decisionList = exports.decisionItem = exports.date = exports.dataConsumer = exports.confluenceInlineComment = exports.codeBlock_with_extended_attributes = exports.codeBlock_root_only_with_extended_attributes = exports.codeBlock_root_only = exports.codeBlock = exports.code = exports.caption = exports.bulletList = exports.breakout = exports.border = exports.bodiedSyncBlock = exports.bodiedExtension_with_marks = exports.bodiedExtension = exports.blockquote = exports.block_content = exports.blockTaskItem = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.annotation = exports.alignment = void 0;
+exports.underline = exports.text_with_no_marks = exports.text_link_inline = exports.text_formatted = exports.text_code_inline = exports.textColor = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell = exports.table = exports.syncBlock = exports.subsup = exports.strong = exports.strike = exports.status = exports.rule = exports.placeholder = exports.paragraph_with_no_marks = exports.paragraph_with_indentation = exports.paragraph_with_font_size = exports.paragraph_with_alignment = exports.paragraph = 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 = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_content = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.indentation = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.fontSize = exports.extension_with_marks = exports.extensionFrame = exports.extension = exports.expand_root_only = exports.expand = exports.emoji = exports.embedCard = exports.em = exports.doc = exports.decisionList = exports.decisionItem = exports.date = exports.dataConsumer = exports.confluenceInlineComment = exports.codeBlock_root_only = exports.codeBlock = exports.code = exports.caption = exports.bulletList = exports.breakout = exports.border = exports.bodiedSyncBlock = exports.bodiedExtension_with_marks = exports.bodiedExtension = exports.blockquote = exports.block_content = exports.blockTaskItem = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.annotation = exports.alignment = void 0;
 var alignment = exports.alignment = {
   props: {
     attrs: {
@@ -55,7 +55,7 @@ var backgroundColor = exports.backgroundColor = {
     }
   }
 };
-var block_content = exports.block_content = ['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'codeBlock_with_extended_attributes', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', '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', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks'];
 var blockCard = exports.blockCard = {
   props: {
     attrs: [{
@@ -368,6 +368,10 @@ var codeBlock = exports.codeBlock = {
     attrs: {
       optional: true,
       props: {
+        hideLineNumbers: {
+          optional: true,
+          type: 'boolean'
+        },
         language: {
           optional: true,
           type: 'string'
@@ -379,6 +383,10 @@ var codeBlock = exports.codeBlock = {
         uniqueId: {
           optional: true,
           type: 'string'
+        },
+        wrap: {
+          optional: true,
+          type: 'boolean'
         }
       }
     },
@@ -403,69 +411,6 @@ var codeBlock_root_only = exports.codeBlock_root_only = ['codeBlock', {
     }
   }
 }];
-var codeBlock_root_only_with_extended_attributes = exports.codeBlock_root_only_with_extended_attributes = ['codeBlock', {
-  props: {
-    attrs: {
-      optional: true,
-      props: {
-        hideLineNumbers: {
-          optional: true,
-          type: 'boolean'
-        },
-        language: {
-          optional: true,
-          type: 'string'
-        },
-        localId: {
-          optional: true,
-          type: 'string'
-        },
-        uniqueId: {
-          optional: true,
-          type: 'string'
-        },
-        wrap: {
-          optional: true,
-          type: 'boolean'
-        }
-      }
-    },
-    marks: {
-      items: ['breakout'],
-      optional: true,
-      type: 'array'
-    }
-  }
-}];
-var codeBlock_with_extended_attributes = exports.codeBlock_with_extended_attributes = ['codeBlock', {
-  props: {
-    attrs: {
-      optional: true,
-      props: {
-        hideLineNumbers: {
-          optional: true,
-          type: 'boolean'
-        },
-        language: {
-          optional: true,
-          type: 'string'
-        },
-        localId: {
-          optional: true,
-          type: 'string'
-        },
-        uniqueId: {
-          optional: true,
-          type: 'string'
-        },
-        wrap: {
-          optional: true,
-          type: 'boolean'
-        }
-      }
-    }
-  }
-}];
 var confluenceInlineComment = exports.confluenceInlineComment = {
   props: {
     attrs: {
@@ -574,7 +519,7 @@ var doc = exports.doc = {
   props: {
     content: {
       allowUnsupportedBlock: true,
-      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'codeBlock_with_extended_attributes', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'codeBlock_root_only_with_extended_attributes', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only', 'syncBlock', 'bodiedSyncBlock']],
+      items: [['blockCard', 'paragraph_with_no_marks', 'paragraph_with_alignment', 'paragraph_with_indentation', 'mediaSingle_caption', 'mediaSingle_full', 'codeBlock', 'taskList', 'bulletList', 'orderedList', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'mediaGroup', 'decisionList', 'rule', 'panel', 'blockquote', 'extension_with_marks', 'embedCard', 'table', 'expand', 'bodiedExtension_with_marks', 'codeBlock_root_only', 'layoutSection_with_single_column', 'layoutSection_full', 'multiBodiedExtension', 'expand_root_only', 'syncBlock', 'bodiedSyncBlock']],
       type: 'array'
     },
     type: {
@@ -682,7 +627,7 @@ var expand = exports.expand = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock', 'codeBlock_with_extended_attributes', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
       minItems: 1,
       type: 'array'
     },
@@ -1511,7 +1456,7 @@ var nestedExpand_with_no_marks = exports.nestedExpand_with_no_marks = ['nestedEx
     }
   }
 }];
-var non_nestable_block_content = exports.non_nestable_block_content = ['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock', 'codeBlock_with_extended_attributes', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks'];
+var non_nestable_block_content = exports.non_nestable_block_content = ['paragraph_with_no_marks', 'paragraph_with_font_size', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'codeBlock', 'mediaGroup', 'mediaSingle_caption', 'mediaSingle_full', 'decisionList', 'taskList', 'table', 'blockCard', 'embedCard', 'extension_with_marks'];
 var orderedList = exports.orderedList = {
   props: {
     attrs: {
@@ -1853,7 +1798,7 @@ var tableCell = exports.tableCell = {
     },
     content: {
       allowUnsupportedBlock: true,
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'codeBlock_with_extended_attributes', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks']],
       minItems: 1,
       type: 'array'
     },
@@ -1900,7 +1845,7 @@ var tableHeader = exports.tableHeader = {
       }
     },
     content: {
-      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'codeBlock_with_extended_attributes', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand']],
+      items: [['paragraph_with_no_marks', 'paragraph_with_alignment', 'panel', 'blockquote', 'orderedList', 'bulletList', 'rule', 'heading_with_no_marks', 'heading_with_alignment', 'heading_with_indentation', 'codeBlock', 'mediaSingle_caption', 'mediaSingle_full', 'mediaGroup', 'decisionList', 'taskList', 'blockCard', 'embedCard', 'extension_with_marks', 'nestedExpand_with_no_marks', 'nestedExpand']],
       minItems: 1,
       type: 'array'
     },

package/dist/es2019/entry-points/code-block.js

@@ -1,2 +1,2 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
-export { codeBlock, codeBlockWithLocalId, codeBlockWithExtendedAttributes, toJSON as codeBlockToJSON } from '../schema/nodes/code-block';
+export { codeBlock, codeBlockWithLocalId, toJSON as codeBlockToJSON } from '../schema/nodes/code-block';