@atlaskit/adf-schema 44.3.0 → 44.5.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/adf-schema
 
+## 44.5.0
+
+### Minor Changes
+
+- bca057f: - fix content expressions cleanup logic
+  - add separate entry point for sanitizeNodes
+
+## 44.4.0
+
+### Minor Changes
+
+- bd599ae: Give heading marks in pm-spec
+
 ## 44.3.0
 
 ### Minor Changes

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

@@ -407,6 +407,7 @@ var hardBreak = exports.hardBreak = (0, _createPMSpecFactory.createPMNodeSpecFac
 });
 var heading = exports.heading = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: 'inline*',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   group: 'block',
   attrs: {
     level: {

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

@@ -13,9 +13,7 @@ var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
 var heading = exports.heading = (0, _adfSchemaGenerator.adfNode)('heading').define({
   defining: true,
   selectable: false,
-  // Marks don't make it into the PM node spec, as they get overridden by the marks in
-  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
-  // marks: [unsupportedMark, unsupportedNodeAttribute],
+  marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {
     level: {
@@ -30,19 +28,7 @@ var heading = exports.heading = (0, _adfSchemaGenerator.adfNode)('heading').defi
       default: null
     }
   },
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _inlineContentGroup.inlineContentGroup))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.marks': {
-        value: {
-          type: 'array',
-          items: [],
-          optional: true
-        },
-        reason: 'In old types, some nodes have marks: Array<any>, which is not possible to represent in new DSL'
-      }
-    }
-  }
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _inlineContentGroup.inlineContentGroup))]
 }).variant('with_alignment', {
   marks: [_alignmentAndIndentation.alignment, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   content: [],

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

@@ -21,19 +21,7 @@ var paragraph = exports.paragraph = (0, _adfSchemaGenerator.adfNode)('paragraph'
   selectable: false,
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   hasEmptyMarks: true,
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _inlineContentGroup.inlineContentGroup))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.marks': {
-        value: {
-          type: 'array',
-          items: [],
-          optional: true
-        },
-        reason: 'NoMark type used in old schema had a hack maxItems: 0 to mark nodes that should not have any marks. This is not possible to represent in new DSL.'
-      }
-    }
-  }
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _inlineContentGroup.inlineContentGroup))]
 }).variant('with_alignment', {
   marks: [_alignmentAndIndentation.alignment, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   content: [],

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

@@ -1,21 +1,16 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.allowCustomPanel = void 0;
 exports.createSchema = createSchema;
 exports.getNodesAndMarksMap = getNodesAndMarksMap;
-exports.sanitizeNodeSpecContent = sanitizeNodeSpecContent;
-exports.sanitizeNodes = sanitizeNodes;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _groups = require("./groups");
+var _sanitizeNodes = require("./sanitizeNodes");
 var _marks = require("./marks");
 var _nodes = require("./nodes");
-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; }
 function addItems(builtInItems, config) {
   var customSpecs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   if (!config) {
@@ -305,63 +300,10 @@ function createSchema(config) {
   var marksConfig = Object.keys(customMarkSpecs || {}).concat(config.marks || []).concat(markGroupDeclarationsNames);
   var nodes = addItems(nodesInOrder, nodesConfig, customNodeSpecs);
   var marks = addItems(marksInOrder, marksConfig, customMarkSpecs);
-  nodes = sanitizeNodes(nodes, marks);
+  nodes = (0, _sanitizeNodes.sanitizeNodes)(nodes, marks);
   return new _model.Schema({
     nodes: nodes,
     marks: marks
   });
 }
-function sanitizeNodes(nodes, supportedMarks) {
-  var nodeNames = Object.keys(nodes);
-  nodeNames.forEach(function (nodeKey) {
-    var nodeSpec = _objectSpread({}, nodes[nodeKey]);
-    if (nodeSpec.marks && nodeSpec.marks !== '_') {
-      nodeSpec.marks = nodeSpec.marks.split(' ').filter(function (mark) {
-        return !!supportedMarks[mark];
-      }).join(' ');
-    }
-    if (nodeSpec.content) {
-      nodeSpec.content = sanitizeNodeSpecContent(nodes, nodeSpec.content);
-    }
-    nodes[nodeKey] = nodeSpec;
-  });
-  return nodes;
-}
-function sanitizeNodeSpecContent(nodes, rawContent) {
-  var content = rawContent.replace(/\W/g, ' ');
-  var contentKeys = content.split(' ');
-  var unsupportedContentKeys = contentKeys.filter(function (contentKey) {
-    return !isContentSupported(nodes, contentKey);
-  });
-  return unsupportedContentKeys.reduce(function (newContent, nodeName) {
-    return sanitizedContent(newContent, nodeName);
-  }, rawContent);
-}
-function sanitizedContent(content, invalidContent) {
-  if (!invalidContent.length) {
-    return content || '';
-  }
-  if (!content || !content.match(/\w/)) {
-    return '';
-  }
-  var pattern = "(".concat(invalidContent, "((\\s)*\\|)+)|((\\|(\\s)*)+").concat(invalidContent, ")|(").concat(invalidContent, "$)|(").concat(invalidContent, "(\\+|\\*))");
-  return content.replace(new RegExp(pattern, 'g'), '').replace('  ', ' ').trim();
-}
-function isContentSupported(nodes, contentKey) {
-  var nodeKeys = Object.keys(nodes);
-
-  // content is with valid node
-  if (nodeKeys.indexOf(contentKey) > -1) {
-    return true;
-  }
-
-  // content is with valid group
-  for (var supportedKey in nodes) {
-    var nodeSpec = nodes[supportedKey];
-    if (nodeSpec && nodeSpec.group === contentKey) {
-      return true;
-    }
-  }
-  return false;
-}
 var allowCustomPanel = exports.allowCustomPanel = true;

package/dist/cjs/schema/index.js

@@ -540,7 +540,7 @@ Object.defineProperty(exports, "rule", {
 Object.defineProperty(exports, "sanitizeNodes", {
   enumerable: true,
   get: function get() {
-    return _createSchema.sanitizeNodes;
+    return _sanitizeNodes.sanitizeNodes;
   }
 });
 Object.defineProperty(exports, "status", {
@@ -776,4 +776,5 @@ var _marks = require("./marks");
 var _unsupported = require("./unsupported");
 var _inlineNodes = require("./inline-nodes");
 var _createSchema = require("./create-schema");
+var _sanitizeNodes = require("./sanitizeNodes");
 var _createPMSpecFactory = require("./createPMSpecFactory");

package/dist/cjs/schema/sanitizeNodes.js

@@ -0,0 +1,63 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.sanitizeNodes = sanitizeNodes;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+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; }
+function sanitizeNodes(nodes, supportedMarks) {
+  var nodeNames = Object.keys(nodes);
+  nodeNames.forEach(function (nodeKey) {
+    var nodeSpec = _objectSpread({}, nodes[nodeKey]);
+    if (nodeSpec.marks && nodeSpec.marks !== '_') {
+      nodeSpec.marks = nodeSpec.marks.split(' ').filter(function (mark) {
+        return !!supportedMarks[mark];
+      }).join(' ');
+    }
+    if (nodeSpec.content) {
+      nodeSpec.content = sanitizeNodeSpecContent(nodes, nodeSpec.content);
+    }
+    nodes[nodeKey] = nodeSpec;
+  });
+  return nodes;
+}
+function sanitizeNodeSpecContent(nodes, rawContent) {
+  var content = rawContent.replace(/\W/g, ' ');
+  var contentKeys = content.split(' ');
+  var unsupportedContentKeys = contentKeys.filter(function (contentKey) {
+    return !isContentSupported(nodes, contentKey);
+  });
+  return unsupportedContentKeys.reduce(function (newContent, nodeName) {
+    return sanitizedContent(newContent, nodeName);
+  }, rawContent);
+}
+function sanitizedContent(content, invalidContent) {
+  if (!invalidContent.length) {
+    return content || '';
+  }
+  if (!content || !content.match(/\w/)) {
+    return '';
+  }
+  var pattern = "(".concat(invalidContent, "((\\s)*\\|)+)|((\\|(\\s)*)+").concat(invalidContent, "(\\+|\\*)?)|(").concat(invalidContent, "$)|(").concat(invalidContent, "(\\+|\\*))");
+  return content.replace(new RegExp(pattern, 'g'), '').replace('  ', ' ').trim();
+}
+function isContentSupported(nodes, contentKey) {
+  var nodeKeys = Object.keys(nodes);
+
+  // content is with valid node
+  if (nodeKeys.indexOf(contentKey) > -1) {
+    return true;
+  }
+
+  // content is with valid group
+  for (var supportedKey in nodes) {
+    var nodeSpec = nodes[supportedKey];
+    if (nodeSpec && nodeSpec.group === contentKey) {
+      return true;
+    }
+  }
+  return false;
+}

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

@@ -401,6 +401,7 @@ export const hardBreak = createPMNodeSpecFactory({
 });
 export const heading = createPMNodeSpecFactory({
   content: 'inline*',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   group: 'block',
   attrs: {
     level: {

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

@@ -7,9 +7,7 @@ import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export const heading = adfNode('heading').define({
   defining: true,
   selectable: false,
-  // Marks don't make it into the PM node spec, as they get overridden by the marks in
-  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
-  // marks: [unsupportedMark, unsupportedNodeAttribute],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {
     level: {
@@ -24,19 +22,7 @@ export const heading = adfNode('heading').define({
       default: null
     }
   },
-  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.marks': {
-        value: {
-          type: 'array',
-          items: [],
-          optional: true
-        },
-        reason: 'In old types, some nodes have marks: Array<any>, which is not possible to represent in new DSL'
-      }
-    }
-  }
+  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))]
 }).variant('with_alignment', {
   marks: [alignment, unsupportedMark, unsupportedNodeAttribute],
   content: [],

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

@@ -15,19 +15,7 @@ export const paragraph = adfNode('paragraph').define({
   selectable: false,
   marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
-  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.marks': {
-        value: {
-          type: 'array',
-          items: [],
-          optional: true
-        },
-        reason: 'NoMark type used in old schema had a hack maxItems: 0 to mark nodes that should not have any marks. This is not possible to represent in new DSL.'
-      }
-    }
-  }
+  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))]
 }).variant('with_alignment', {
   marks: [alignment, unsupportedMark, unsupportedNodeAttribute],
   content: [],

package/dist/es2019/schema/create-schema.js

@@ -1,5 +1,6 @@
 import { Schema } from '@atlaskit/editor-prosemirror/model';
 import { COLOR, FONT_STYLE, SEARCH_QUERY, LINK } from './groups';
+import { sanitizeNodes } from './sanitizeNodes';
 import { link, em, strong, textColor, strike, subsup, underline, code, typeAheadQuery, confluenceInlineComment, breakout, alignment, indentation, annotation, unsupportedMark, unsupportedNodeAttribute, dataConsumer, fragment, border, backgroundColor } from './marks';
 import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItemWithTask, heading, blockquoteWithNestedCodeblockOrMedia, codeBlock, extendedPanel, rule, image, mention, media, mediaInline, mediaSingleFull, mediaGroup, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, multiBodiedExtension, extensionFrame, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expandWithNestedExpand, nestedExpand, embedCard, caption } from './nodes';
 function addItems(builtInItems, config, customSpecs = {}) {
@@ -299,53 +300,4 @@ export function createSchema(config) {
     marks
   });
 }
-export function sanitizeNodes(nodes, supportedMarks) {
-  const nodeNames = Object.keys(nodes);
-  nodeNames.forEach(nodeKey => {
-    const nodeSpec = {
-      ...nodes[nodeKey]
-    };
-    if (nodeSpec.marks && nodeSpec.marks !== '_') {
-      nodeSpec.marks = nodeSpec.marks.split(' ').filter(mark => !!supportedMarks[mark]).join(' ');
-    }
-    if (nodeSpec.content) {
-      nodeSpec.content = sanitizeNodeSpecContent(nodes, nodeSpec.content);
-    }
-    nodes[nodeKey] = nodeSpec;
-  });
-  return nodes;
-}
-export function sanitizeNodeSpecContent(nodes, rawContent) {
-  const content = rawContent.replace(/\W/g, ' ');
-  const contentKeys = content.split(' ');
-  const unsupportedContentKeys = contentKeys.filter(contentKey => !isContentSupported(nodes, contentKey));
-  return unsupportedContentKeys.reduce((newContent, nodeName) => sanitizedContent(newContent, nodeName), rawContent);
-}
-function sanitizedContent(content, invalidContent) {
-  if (!invalidContent.length) {
-    return content || '';
-  }
-  if (!content || !content.match(/\w/)) {
-    return '';
-  }
-  const pattern = `(${invalidContent}((\\s)*\\|)+)|((\\|(\\s)*)+${invalidContent})|(${invalidContent}$)|(${invalidContent}(\\+|\\*))`;
-  return content.replace(new RegExp(pattern, 'g'), '').replace('  ', ' ').trim();
-}
-function isContentSupported(nodes, contentKey) {
-  const nodeKeys = Object.keys(nodes);
-
-  // content is with valid node
-  if (nodeKeys.indexOf(contentKey) > -1) {
-    return true;
-  }
-
-  // content is with valid group
-  for (const supportedKey in nodes) {
-    const nodeSpec = nodes[supportedKey];
-    if (nodeSpec && nodeSpec.group === contentKey) {
-      return true;
-    }
-  }
-  return false;
-}
 export const allowCustomPanel = true;

package/dist/es2019/schema/index.js

@@ -3,7 +3,8 @@ export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout,
 colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, backgroundColor, backgroundColorPalette } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';
 export { inlineNodes } from './inline-nodes';
-export { sanitizeNodes, createSchema } from './create-schema';
+export { createSchema } from './create-schema';
+export { sanitizeNodes } from './sanitizeNodes';
 
 // ADF createPMSpecFactory
 

package/dist/es2019/schema/sanitizeNodes.js

@@ -0,0 +1,49 @@
+export function sanitizeNodes(nodes, supportedMarks) {
+  const nodeNames = Object.keys(nodes);
+  nodeNames.forEach(nodeKey => {
+    const nodeSpec = {
+      ...nodes[nodeKey]
+    };
+    if (nodeSpec.marks && nodeSpec.marks !== '_') {
+      nodeSpec.marks = nodeSpec.marks.split(' ').filter(mark => !!supportedMarks[mark]).join(' ');
+    }
+    if (nodeSpec.content) {
+      nodeSpec.content = sanitizeNodeSpecContent(nodes, nodeSpec.content);
+    }
+    nodes[nodeKey] = nodeSpec;
+  });
+  return nodes;
+}
+function sanitizeNodeSpecContent(nodes, rawContent) {
+  const content = rawContent.replace(/\W/g, ' ');
+  const contentKeys = content.split(' ');
+  const unsupportedContentKeys = contentKeys.filter(contentKey => !isContentSupported(nodes, contentKey));
+  return unsupportedContentKeys.reduce((newContent, nodeName) => sanitizedContent(newContent, nodeName), rawContent);
+}
+function sanitizedContent(content, invalidContent) {
+  if (!invalidContent.length) {
+    return content || '';
+  }
+  if (!content || !content.match(/\w/)) {
+    return '';
+  }
+  const pattern = `(${invalidContent}((\\s)*\\|)+)|((\\|(\\s)*)+${invalidContent}(\\+|\\*)?)|(${invalidContent}$)|(${invalidContent}(\\+|\\*))`;
+  return content.replace(new RegExp(pattern, 'g'), '').replace('  ', ' ').trim();
+}
+function isContentSupported(nodes, contentKey) {
+  const nodeKeys = Object.keys(nodes);
+
+  // content is with valid node
+  if (nodeKeys.indexOf(contentKey) > -1) {
+    return true;
+  }
+
+  // content is with valid group
+  for (const supportedKey in nodes) {
+    const nodeSpec = nodes[supportedKey];
+    if (nodeSpec && nodeSpec.group === contentKey) {
+      return true;
+    }
+  }
+  return false;
+}

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

@@ -401,6 +401,7 @@ export var hardBreak = createPMNodeSpecFactory({
 });
 export var heading = createPMNodeSpecFactory({
   content: 'inline*',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   group: 'block',
   attrs: {
     level: {

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

@@ -7,9 +7,7 @@ import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var heading = adfNode('heading').define({
   defining: true,
   selectable: false,
-  // Marks don't make it into the PM node spec, as they get overridden by the marks in
-  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
-  // marks: [unsupportedMark, unsupportedNodeAttribute],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {
     level: {
@@ -24,19 +22,7 @@ export var heading = adfNode('heading').define({
       default: null
     }
   },
-  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.marks': {
-        value: {
-          type: 'array',
-          items: [],
-          optional: true
-        },
-        reason: 'In old types, some nodes have marks: Array<any>, which is not possible to represent in new DSL'
-      }
-    }
-  }
+  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))]
 }).variant('with_alignment', {
   marks: [alignment, unsupportedMark, unsupportedNodeAttribute],
   content: [],

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

@@ -15,19 +15,7 @@ export var paragraph = adfNode('paragraph').define({
   selectable: false,
   marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
-  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.marks': {
-        value: {
-          type: 'array',
-          items: [],
-          optional: true
-        },
-        reason: 'NoMark type used in old schema had a hack maxItems: 0 to mark nodes that should not have any marks. This is not possible to represent in new DSL.'
-      }
-    }
-  }
+  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))]
 }).variant('with_alignment', {
   marks: [alignment, unsupportedMark, unsupportedNodeAttribute],
   content: [],

package/dist/esm/schema/create-schema.js

@@ -1,8 +1,6 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-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) { _defineProperty(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; }
 import { Schema } from '@atlaskit/editor-prosemirror/model';
 import { COLOR, FONT_STYLE, SEARCH_QUERY, LINK } from './groups';
+import { sanitizeNodes } from './sanitizeNodes';
 import { link, em, strong, textColor, strike, subsup, underline, code, typeAheadQuery, confluenceInlineComment, breakout, alignment, indentation, annotation, unsupportedMark, unsupportedNodeAttribute, dataConsumer, fragment, border, backgroundColor } from './marks';
 import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItemWithTask, heading, blockquoteWithNestedCodeblockOrMedia, codeBlock, extendedPanel, rule, image, mention, media, mediaInline, mediaSingleFull, mediaGroup, hardBreak, emoji, table, tableCell, tableHeader, tableRow, decisionList, decisionItem, taskList, taskItem, unknownBlock, extension, inlineExtension, bodiedExtension, multiBodiedExtension, extensionFrame, date, placeholder, layoutSection, layoutColumn, inlineCard, blockCard, unsupportedBlock, unsupportedInline, status, expandWithNestedExpand, nestedExpand, embedCard, caption } from './nodes';
 function addItems(builtInItems, config) {
@@ -300,57 +298,4 @@ export function createSchema(config) {
     marks: marks
   });
 }
-export function sanitizeNodes(nodes, supportedMarks) {
-  var nodeNames = Object.keys(nodes);
-  nodeNames.forEach(function (nodeKey) {
-    var nodeSpec = _objectSpread({}, nodes[nodeKey]);
-    if (nodeSpec.marks && nodeSpec.marks !== '_') {
-      nodeSpec.marks = nodeSpec.marks.split(' ').filter(function (mark) {
-        return !!supportedMarks[mark];
-      }).join(' ');
-    }
-    if (nodeSpec.content) {
-      nodeSpec.content = sanitizeNodeSpecContent(nodes, nodeSpec.content);
-    }
-    nodes[nodeKey] = nodeSpec;
-  });
-  return nodes;
-}
-export function sanitizeNodeSpecContent(nodes, rawContent) {
-  var content = rawContent.replace(/\W/g, ' ');
-  var contentKeys = content.split(' ');
-  var unsupportedContentKeys = contentKeys.filter(function (contentKey) {
-    return !isContentSupported(nodes, contentKey);
-  });
-  return unsupportedContentKeys.reduce(function (newContent, nodeName) {
-    return sanitizedContent(newContent, nodeName);
-  }, rawContent);
-}
-function sanitizedContent(content, invalidContent) {
-  if (!invalidContent.length) {
-    return content || '';
-  }
-  if (!content || !content.match(/\w/)) {
-    return '';
-  }
-  var pattern = "(".concat(invalidContent, "((\\s)*\\|)+)|((\\|(\\s)*)+").concat(invalidContent, ")|(").concat(invalidContent, "$)|(").concat(invalidContent, "(\\+|\\*))");
-  return content.replace(new RegExp(pattern, 'g'), '').replace('  ', ' ').trim();
-}
-function isContentSupported(nodes, contentKey) {
-  var nodeKeys = Object.keys(nodes);
-
-  // content is with valid node
-  if (nodeKeys.indexOf(contentKey) > -1) {
-    return true;
-  }
-
-  // content is with valid group
-  for (var supportedKey in nodes) {
-    var nodeSpec = nodes[supportedKey];
-    if (nodeSpec && nodeSpec.group === contentKey) {
-      return true;
-    }
-  }
-  return false;
-}
 export var allowCustomPanel = true;

package/dist/esm/schema/index.js

@@ -3,7 +3,8 @@ export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout,
 colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, backgroundColor, backgroundColorPalette } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';
 export { inlineNodes } from './inline-nodes';
-export { sanitizeNodes, createSchema } from './create-schema';
+export { createSchema } from './create-schema';
+export { sanitizeNodes } from './sanitizeNodes';
 
 // ADF createPMSpecFactory
 

package/dist/esm/schema/sanitizeNodes.js

@@ -0,0 +1,56 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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) { _defineProperty(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; }
+export function sanitizeNodes(nodes, supportedMarks) {
+  var nodeNames = Object.keys(nodes);
+  nodeNames.forEach(function (nodeKey) {
+    var nodeSpec = _objectSpread({}, nodes[nodeKey]);
+    if (nodeSpec.marks && nodeSpec.marks !== '_') {
+      nodeSpec.marks = nodeSpec.marks.split(' ').filter(function (mark) {
+        return !!supportedMarks[mark];
+      }).join(' ');
+    }
+    if (nodeSpec.content) {
+      nodeSpec.content = sanitizeNodeSpecContent(nodes, nodeSpec.content);
+    }
+    nodes[nodeKey] = nodeSpec;
+  });
+  return nodes;
+}
+function sanitizeNodeSpecContent(nodes, rawContent) {
+  var content = rawContent.replace(/\W/g, ' ');
+  var contentKeys = content.split(' ');
+  var unsupportedContentKeys = contentKeys.filter(function (contentKey) {
+    return !isContentSupported(nodes, contentKey);
+  });
+  return unsupportedContentKeys.reduce(function (newContent, nodeName) {
+    return sanitizedContent(newContent, nodeName);
+  }, rawContent);
+}
+function sanitizedContent(content, invalidContent) {
+  if (!invalidContent.length) {
+    return content || '';
+  }
+  if (!content || !content.match(/\w/)) {
+    return '';
+  }
+  var pattern = "(".concat(invalidContent, "((\\s)*\\|)+)|((\\|(\\s)*)+").concat(invalidContent, "(\\+|\\*)?)|(").concat(invalidContent, "$)|(").concat(invalidContent, "(\\+|\\*))");
+  return content.replace(new RegExp(pattern, 'g'), '').replace('  ', ' ').trim();
+}
+function isContentSupported(nodes, contentKey) {
+  var nodeKeys = Object.keys(nodes);
+
+  // content is with valid node
+  if (nodeKeys.indexOf(contentKey) > -1) {
+    return true;
+  }
+
+  // content is with valid group
+  for (var supportedKey in nodes) {
+    var nodeSpec = nodes[supportedKey];
+    if (nodeSpec && nodeSpec.group === contentKey) {
+      return true;
+    }
+  }
+  return false;
+}

package/dist/types/next-schema/generated/nodeTypes.d.ts

@@ -295,6 +295,7 @@ export declare const hardBreak: ({ parseDOM, toDOM, toDebugString }: import("../
 export interface HeadingDefinition {
     type: 'heading';
     content: Array<InlineDefinition>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         level: number;
         localId?: string;

package/dist/types/schema/create-schema.d.ts

@@ -7,16 +7,6 @@ export declare function getNodesAndMarksMap(): {
  * Creates a schema preserving order of marks and nodes.
  */
 export declare function createSchema<N extends string = string, M extends string = string>(config: SchemaConfig<N, M>): Schema<N, M>;
-export declare function sanitizeNodes(nodes: {
-    [key: string]: NodeSpec;
-}, supportedMarks: {
-    [key: string]: MarkSpec;
-}): {
-    [key: string]: NodeSpec;
-};
-export declare function sanitizeNodeSpecContent(nodes: {
-    [key: string]: NodeSpec;
-}, rawContent: string): string;
 export interface SchemaConfig<N = string, M = string> {
     nodes: N[];
     customNodeSpecs?: SchemaCustomNodeSpecs;

package/dist/types/schema/index.d.ts

@@ -6,6 +6,7 @@ colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON,
 export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, CodeDefinition, EmDefinition, FragmentAttributes, FragmentDefinition, IndentationMarkAttributes, IndentationMarkDefinition, LinkAttributes, LinkDefinition, StrikeDefinition, StrongDefinition, SubSupAttributes, SubSupDefinition, TextColorAttributes, TextColorDefinition, UnderlineDefinition, AnnotationId, AnnotationDataAttributes, DataConsumerAttributes, DataConsumerDefinition, BorderMarkAttributes, BorderMarkDefinition, BackgroundColorDefinition, } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';
 export { inlineNodes } from './inline-nodes';
-export { sanitizeNodes, createSchema } from './create-schema';
+export { createSchema } from './create-schema';
+export { sanitizeNodes } from './sanitizeNodes';
 export type { NodeSpecOptions, MarkSpecOptions } from './createPMSpecFactory';
 export { createPMNodeSpecFactory, createPMMarkSpecFactory, } from './createPMSpecFactory';

package/dist/types/schema/sanitizeNodes.d.ts

@@ -0,0 +1,8 @@
+import { NodeSpec, MarkSpec } from '@atlaskit/editor-prosemirror/model';
+export declare function sanitizeNodes(nodes: {
+    [key: string]: NodeSpec;
+}, supportedMarks: {
+    [key: string]: MarkSpec;
+}): {
+    [key: string]: NodeSpec;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "44.3.0",
+  "version": "44.5.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.24.0",
-    "@atlaskit/adf-schema-generator": "^1.36.1",
+    "@atlaskit/adf-schema-generator": "^1.37.0",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",

package/sanitize-nodes/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "@atlaskit/adf-schema/sanitize-nodes",
+  "main": "../dist/cjs/schema/sanitizeNodes.js",
+  "module": "../dist/esm/schema/sanitizeNodes.js",
+  "module:es2019": "../dist/es2019/schema/sanitizeNodes.js",
+  "sideEffects": false,
+  "types": "../dist/types/schema/sanitizeNodes.d.ts"
+}