@atlaskit/adf-schema 36.18.2 → 37.0.0

package/dist/esm/next-schema/marks/confluenceInlineComment.js

@@ -0,0 +1,12 @@
+import { ValidatorSpecTransformerName, JSONSchemaTransformerName, adfMark, MarkExcludesNone } from '@atlaskit/adf-schema-generator';
+export var confluenceInlineComment = adfMark('confluenceInlineComment').define({
+  ignore: [JSONSchemaTransformerName, ValidatorSpecTransformerName],
+  inclusive: false,
+  excludes: MarkExcludesNone,
+  attrs: {
+    reference: {
+      type: 'string',
+      default: ''
+    }
+  }
+});

package/dist/esm/next-schema/marks/fragment.js

@@ -1,6 +1,8 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
+import { MarkExcludesNone, adfMark } from '@atlaskit/adf-schema-generator';
 export var fragment = adfMark('fragment').define({
   inclusive: false,
+  excludes: MarkExcludesNone,
+  allowExcludesEmpty: true,
   attrs: {
     localId: {
       minLength: 1,

package/dist/esm/next-schema/marks/typeAheadQuery.js

@@ -0,0 +1,11 @@
+import { ValidatorSpecTransformerName, JSONSchemaTransformerName, adfMark } from '@atlaskit/adf-schema-generator';
+export var typeAheadQuery = adfMark('typeAheadQuery').define({
+  ignore: [JSONSchemaTransformerName, ValidatorSpecTransformerName],
+  inclusive: true,
+  attrs: {
+    trigger: {
+      type: 'string',
+      default: ''
+    }
+  }
+});

package/dist/esm/next-schema/marks/unsupportedMark.js

@@ -1,10 +1,11 @@
-import { adfMark, JSONSchemaTransformerName, ValidatorSpecTransformerName } from '@atlaskit/adf-schema-generator';
+import { adfMark, JSONSchemaTransformerName, MarkExcludesNone, ValidatorSpecTransformerName } from '@atlaskit/adf-schema-generator';
 export var unsupportedMark = adfMark('unsupportedMark').define({
   ignore: [JSONSchemaTransformerName, ValidatorSpecTransformerName],
+  excludes: MarkExcludesNone,
+  allowExcludesEmpty: true,
   attrs: {
     originalValue: {
-      type: 'object',
-      default: {}
+      type: 'object'
     }
   }
 });

package/dist/esm/next-schema/marks/unsupportedNodeAttribute.js

@@ -2,13 +2,11 @@ import { adfMark, JSONSchemaTransformerName, ValidatorSpecTransformerName } from
 export var unsupportedNodeAttribute = adfMark('unsupportedNodeAttribute').define({
   ignore: [JSONSchemaTransformerName, ValidatorSpecTransformerName],
   attrs: {
-    type: {
-      type: 'string',
-      default: null
-    },
     unsupported: {
-      type: 'object',
-      default: {}
+      type: 'object'
+    },
+    type: {
+      type: 'string'
     }
   }
 });

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

@@ -13,6 +13,11 @@ export var heading = adfNode('heading').define({
       default: 1,
       minimum: 1,
       maximum: 6
+    },
+    localId: {
+      type: 'string',
+      optional: true,
+      default: null
     }
   },
   content: [$zeroPlus($or(inlineGroup))]

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

@@ -4,6 +4,13 @@ import { alignment, indentation } from '../marks/alignmentAndIndentation';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var paragraph = adfNode('paragraph').define({
+  attrs: {
+    localId: {
+      type: 'string',
+      optional: true,
+      default: null
+    }
+  },
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
   content: [$zeroPlus($or(inlineGroup))]

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

@@ -10,8 +10,10 @@ import { underline } from '../marks/underline';
 import { backgroundColor, textColor } from '../marks/color';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 import { unsupportedMark } from '../marks/unsupportedMark';
+import { typeAheadQuery } from '../marks/typeAheadQuery';
+import { confluenceInlineComment } from '../marks/confluenceInlineComment';
 export var text = adfNode('text').define({}).variant('formatted', {
-  marks: [link, em, strong, strike, subsup, underline, textColor, annotation, backgroundColor, unsupportedNodeAttribute, unsupportedMark]
+  marks: [link, em, strong, strike, subsup, underline, textColor, annotation, backgroundColor, typeAheadQuery, confluenceInlineComment, unsupportedNodeAttribute, unsupportedMark]
 }).variant('code_inline', {
   marks: [code, link, annotation, unsupportedNodeAttribute, unsupportedMark]
 });

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

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { Schema } from '@atlaskit/editor-prosemirror/model';
 import { COLOR, FONT_STYLE, SEARCH_QUERY, LINK } from './groups';
 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, paragraphNodeSpec, text, bulletList, orderedListWithOrder, listItemWithTask, headingNodeSpec, blockquoteWithList, 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, expand, nestedExpand, embedCard, caption } from './nodes';
+import { confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, doc, paragraph, text, bulletList, orderedListWithOrder, listItemWithTask, heading, blockquoteWithList, 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, expand, nestedExpand, embedCard, caption } from './nodes';
 function addItems(builtInItems, config) {
   var customSpecs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   if (!config) {
@@ -59,7 +59,7 @@ var nodesInOrder = [{
   spec: doc
 }, {
   name: 'paragraph',
-  spec: paragraphNodeSpec()
+  spec: paragraph
 }, {
   name: 'text',
   spec: text
@@ -74,7 +74,7 @@ var nodesInOrder = [{
   spec: listItemWithTask
 }, {
   name: 'heading',
-  spec: headingNodeSpec()
+  spec: heading
 }, {
   name: 'blockquote',
   spec: blockquoteWithList

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

@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one';
-import { extensionFrame, headingNodeSpec, layoutSectionWithSingleColumn, multiBodiedExtension, paragraphNodeSpec } from './nodes';
+import { extensionFrame, layoutSectionWithSingleColumn, multiBodiedExtension } from './nodes';
 import { createSchema } from './create-schema';
 var getDefaultSchemaConfig = function getDefaultSchemaConfig() {
   var defaultSchemaConfig = {
@@ -18,9 +18,7 @@ export var getSchemaBasedOnStage = memoizeOne(function () {
     defaultSchemaConfig.customNodeSpecs = {
       layoutSection: layoutSectionWithSingleColumn,
       multiBodiedExtension: multiBodiedExtension,
-      extensionFrame: extensionFrame,
-      heading: headingNodeSpec('stage0'),
-      paragraph: paragraphNodeSpec('stage0')
+      extensionFrame: extensionFrame
     };
   }
   return createSchema(defaultSchemaConfig);

package/dist/esm/schema/index.js

@@ -1,4 +1,4 @@
-export { PanelType, blockCard, blockquote, blockquoteWithList, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, headingNodeSpec, headingStage0, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, paragraphStage0, paragraphNodeSpec, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension } from './nodes';
+export { PanelType, blockCard, blockquote, blockquoteWithList, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension } from './nodes';
 export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
 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';

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

@@ -24,7 +24,7 @@ var getAttrs = function getAttrs(level) {
     };
   };
 };
-export var headingStage0 = {
+export var heading = {
   attrs: {
     level: {
       default: 1
@@ -66,53 +66,4 @@ export var headingStage0 = {
     }] : [];
     return [name].concat(attrs, [0]);
   }
-};
-export var heading = {
-  attrs: {
-    level: {
-      default: 1
-    }
-  },
-  content: "inline*",
-  group: 'block',
-  defining: true,
-  selectable: false,
-  parseDOM: [{
-    tag: 'h1',
-    attrs: {
-      level: 1
-    }
-  }, {
-    tag: 'h2',
-    attrs: {
-      level: 2
-    }
-  }, {
-    tag: 'h3',
-    attrs: {
-      level: 3
-    }
-  }, {
-    tag: 'h4',
-    attrs: {
-      level: 4
-    }
-  }, {
-    tag: 'h5',
-    attrs: {
-      level: 5
-    }
-  }, {
-    tag: 'h6',
-    attrs: {
-      level: 6
-    }
-  }],
-  toDOM: function toDOM(node) {
-    return ['h' + node.attrs['level'], 0];
-  }
-};
-export var headingNodeSpec = function headingNodeSpec() {
-  var adfStage = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'full';
-  return adfStage === 'stage0' ? headingStage0 : heading;
 };

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

@@ -8,10 +8,10 @@ export { blockquoteWithList } from './blockquote';
 export { bulletList, bulletListSelector } from './bullet-list';
 export { codeBlock, toJSON as codeBlockToJSON } from './code-block';
 export { hardBreak } from './hard-break';
-export { headingNodeSpec, heading, headingStage0 } from './heading';
+export { heading } from './heading';
 export { rule } from './rule';
 export { orderedList, orderedListSelector, orderedListWithOrder } from './ordered-list';
-export { paragraph, paragraphStage0, paragraphNodeSpec } from './paragraph';
+export { paragraph } from './paragraph';
 export { emoji } from './emoji';
 export { image } from './image';
 export { mention, toJSON as mentionToJSON } from './mention';

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

@@ -23,7 +23,7 @@
  * @name paragraph_with_indentation_node
  */
 
-export var paragraphStage0 = {
+export var paragraph = {
   selectable: false,
   content: 'inline*',
   group: 'block',
@@ -52,20 +52,4 @@ export var paragraphStage0 = {
     }] : [];
     return [name].concat(attrs, [0]);
   }
-};
-export var paragraph = {
-  selectable: false,
-  content: 'inline*',
-  group: 'block',
-  marks: 'strong code em link border strike subsup textColor backgroundColor typeAheadQuery underline confluenceInlineComment annotation unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
-  parseDOM: [{
-    tag: 'p'
-  }],
-  toDOM: function toDOM() {
-    return ['p', 0];
-  }
-};
-export var paragraphNodeSpec = function paragraphNodeSpec() {
-  var adfStage = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'full';
-  return adfStage === 'stage0' ? paragraphStage0 : paragraph;
 };

package/dist/json-schema/v1/full.json

@@ -1226,6 +1226,15 @@
             "$ref": "#/definitions/inline_node"
           }
         },
+        "attrs": {
+          "type": "object",
+          "properties": {
+            "localId": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
         "marks": {
           "type": "array"
         }
@@ -1705,6 +1714,9 @@
               "type": "number",
               "minimum": 1,
               "maximum": 6
+            },
+            "localId": {
+              "type": "string"
             }
           },
           "required": [

package/dist/types/index.d.ts

@@ -1,6 +1,6 @@
 export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, 
 /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
-colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, headingNodeSpec, headingStage0, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, paragraphStage0, paragraphNodeSpec, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, extensionFrame, multiBodiedExtension, backgroundColor, backgroundColorPalette, } from './schema';
+colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, extensionFrame, multiBodiedExtension, backgroundColor, backgroundColorPalette, } from './schema';
 export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, CodeDefinition, DatasourceAttributes, DatasourceAttributeProperties, DataConsumerAttributes, DataConsumerDefinition, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmDefinition, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionLayout, ExternalMediaAttributes, FragmentAttributes, FragmentDefinition, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, IndentationMarkAttributes, IndentationMarkDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineFormattedText, InlineLinkText, LayoutColumnDefinition, LayoutSectionDefinition, LayoutSectionFullDefinition, LayoutSectionWithSingleColumnDefinition, LinkAttributes, LinkDefinition, ListItemArray, ListItemDefinition, MarksObject, MediaADFAttrs, MediaAttributes, MediaInlineAttributes, MediaInlineDefinition, MediaBaseAttributes, MediaDefinition, MediaDisplayType, MediaGroupDefinition, MediaSingleDefinition, MediaType, MentionAttributes, MentionDefinition, MentionUserType, NestedExpandContent, NestedExpandDefinition, NoMark, NonNestableBlockContent, OrderedListDefinition, PanelAttributes, PanelDefinition, ParagraphBaseDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StrikeDefinition, StrongDefinition, SubSupAttributes, SubSupDefinition, TableAttributes, TableCellDefinition, TableDefinition, TableDisplayMode, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextColorAttributes, TextColorDefinition, TextDefinition, UnderlineDefinition, UrlType, AnnotationId, RichMediaAttributes, ExtendedMediaAttributes, RichMediaLayout, AnnotationDataAttributes, CellDomAttrs, BorderMarkAttributes, BorderMarkDefinition, MultiBodiedExtensionDefinition, ExtensionFrameDefinition, BackgroundColorDefinition, } from './schema';
 export { B100, B400, B50, B500, B75, G200, G300, G400, G50, G500, G75, N0, N20, N200, N30, N300, N40, N50, N500, N60, N80, N800, N90, P100, P300, P400, P50, P500, P75, R100, R300, R400, R50, R500, R75, T100, T300, T50, T500, T75, Y200, Y400, Y50, Y500, Y75, acNameToEmoji, acShortcutToEmoji, emojiIdToAcName, generateUuid, getEmojiAcName, getLinkMatch, hexToRgb, hexToRgba, isHex, isRgb, isSafeUrl, linkify, linkifyMatch, normalizeHexColor, normalizeUrl, rgbToHex, uuid, getDarkModeLCHColor, } from './utils';
 export type { Match, NameToEmoji } from './utils';

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

@@ -5,8 +5,8 @@
  */
 import { Mark } from '@atlaskit/editor-prosemirror/model';
 export interface UnsupportedNodeAttributeMarkAttributes {
-    type: string;
     unsupported: Record<string, unknown>;
+    type: string;
 }
 export interface UnsupportedNodeAttributeDefinition {
     type: 'unsupportedNodeAttribute';
@@ -108,6 +108,28 @@ export interface BackgroundColorMark extends Mark {
     attrs: BackgroundColorMarkAttributes;
 }
 export declare const backgroundColor: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<BackgroundColorMark>) => import("prosemirror-model").MarkSpec;
+export interface TypeAheadQueryMarkAttributes {
+    trigger: string;
+}
+export interface TypeAheadQueryDefinition {
+    type: 'typeAheadQuery';
+    attrs: TypeAheadQueryMarkAttributes;
+}
+export interface TypeAheadQueryMark extends Mark {
+    attrs: TypeAheadQueryMarkAttributes;
+}
+export declare const typeAheadQuery: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<TypeAheadQueryMark>) => import("prosemirror-model").MarkSpec;
+export interface ConfluenceInlineCommentMarkAttributes {
+    reference: string;
+}
+export interface ConfluenceInlineCommentDefinition {
+    type: 'confluenceInlineComment';
+    attrs: ConfluenceInlineCommentMarkAttributes;
+}
+export interface ConfluenceInlineCommentMark extends Mark {
+    attrs: ConfluenceInlineCommentMarkAttributes;
+}
+export declare const confluenceInlineComment: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<ConfluenceInlineCommentMark>) => import("prosemirror-model").MarkSpec;
 export interface CodeDefinition {
     type: 'code';
 }

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

@@ -5,7 +5,7 @@
  */
 import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { InlineDefinition, BlockDefinition, BlockRootOnlyDefinition } from './nodeGroupTypes';
-import { UnsupportedNodeAttributeMark, UnsupportedMarkMark, LinkMark, EmMark, StrongMark, StrikeMark, SubsupMark, UnderlineMark, TextColorMark, AnnotationMark, BackgroundColorMark, CodeMark, DataConsumerMark, FragmentMark, BorderMark, AlignmentMark, IndentationMark, BreakoutMark } from './markTypes';
+import { UnsupportedNodeAttributeMark, UnsupportedMarkMark, LinkMark, EmMark, StrongMark, StrikeMark, SubsupMark, UnderlineMark, TextColorMark, AnnotationMark, BackgroundColorMark, TypeAheadQueryMark, ConfluenceInlineCommentMark, CodeMark, DataConsumerMark, FragmentMark, BorderMark, AlignmentMark, IndentationMark, BreakoutMark } from './markTypes';
 export interface TextDefinition {
     type: 'text';
 }
@@ -51,7 +51,7 @@ export type BlockCardNode = PMNode & BlockCardDefinition;
 export declare const blockCard: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<BlockCardNode>) => import("prosemirror-model").NodeSpec;
 export interface TextFormattedDefinition {
     type: 'text';
-    marks: Array<LinkMark | EmMark | StrongMark | StrikeMark | SubsupMark | UnderlineMark | TextColorMark | AnnotationMark | BackgroundColorMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<LinkMark | EmMark | StrongMark | StrikeMark | SubsupMark | UnderlineMark | TextColorMark | AnnotationMark | BackgroundColorMark | TypeAheadQueryMark | ConfluenceInlineCommentMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
 }
 export type TextFormattedNode = PMNode & TextFormattedDefinition;
 export declare const textFormatted: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<TextFormattedNode>) => import("prosemirror-model").NodeSpec;
@@ -207,6 +207,9 @@ export interface ParagraphWithNoMarksDefinition {
     type: 'paragraph';
     content: Array<InlineDefinition>;
     marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    attrs: {
+        localId?: string;
+    };
 }
 export type ParagraphWithNoMarksNode = PMNode & ParagraphWithNoMarksDefinition;
 export declare const paragraphWithNoMarks: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ParagraphWithNoMarksNode>) => import("prosemirror-model").NodeSpec;
@@ -342,6 +345,7 @@ export interface HeadingWithNoMarksDefinition {
     marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
     attrs: {
         level: number;
+        localId?: string;
     };
 }
 export type HeadingWithNoMarksNode = PMNode & HeadingWithNoMarksDefinition;
@@ -397,6 +401,9 @@ export interface ParagraphDefinition {
     type: 'paragraph';
     content: Array<InlineDefinition>;
     marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    attrs: {
+        localId?: string;
+    };
 }
 export type ParagraphNode = PMNode & ParagraphDefinition;
 export declare const paragraph: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ParagraphNode>) => import("prosemirror-model").NodeSpec;
@@ -404,6 +411,9 @@ export interface ParagraphWithMarksDefinition {
     type: 'paragraph';
     content: Array<InlineDefinition>;
     marks: Array<AlignmentMark | IndentationMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    attrs: {
+        localId?: string;
+    };
 }
 export type ParagraphWithMarksNode = PMNode & ParagraphWithMarksDefinition;
 export declare const paragraphWithMarks: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ParagraphWithMarksNode>) => import("prosemirror-model").NodeSpec;
@@ -420,6 +430,7 @@ export interface HeadingWithAlignmentDefinition {
     marks: Array<AlignmentMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
     attrs: {
         level: number;
+        localId?: string;
     };
 }
 export type HeadingWithAlignmentNode = PMNode & HeadingWithAlignmentDefinition;
@@ -430,6 +441,7 @@ export interface HeadingWithIndentationDefinition {
     marks: Array<IndentationMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
     attrs: {
         level: number;
+        localId?: string;
     };
 }
 export type HeadingWithIndentationNode = PMNode & HeadingWithIndentationDefinition;
@@ -438,6 +450,9 @@ export interface ParagraphWithAlignmentDefinition {
     type: 'paragraph';
     content: Array<InlineDefinition>;
     marks: Array<AlignmentMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    attrs: {
+        localId?: string;
+    };
 }
 export type ParagraphWithAlignmentNode = PMNode & ParagraphWithAlignmentDefinition;
 export declare const paragraphWithAlignment: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ParagraphWithAlignmentNode>) => import("prosemirror-model").NodeSpec;
@@ -606,6 +621,7 @@ export interface HeadingDefinition {
     marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
     attrs: {
         level: number;
+        localId?: string;
     };
 }
 export type HeadingNode = PMNode & HeadingDefinition;

package/dist/types/next-schema/marks/confluenceInlineComment.d.ts

@@ -0,0 +1 @@
+export declare const confluenceInlineComment: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>;

package/dist/types/next-schema/marks/typeAheadQuery.d.ts

@@ -0,0 +1 @@
+export declare const typeAheadQuery: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>;

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

@@ -1,4 +1,4 @@
-export { PanelType, blockCard, blockquote, blockquoteWithList, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, headingNodeSpec, headingStage0, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, paragraphStage0, paragraphNodeSpec, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension, } from './nodes';
+export { PanelType, blockCard, blockquote, blockquoteWithList, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, orderedListWithOrder, panel, extendedPanel, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension, } from './nodes';
 export type { BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, DatasourceAttributes, DatasourceAttributeProperties, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionLayout, ExternalMediaAttributes, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, Inline, InlineAtomic, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineFormattedText, InlineLinkText, LayoutColumnDefinition, LayoutSectionDefinition, LayoutSectionBaseDefinition, LayoutSectionFullDefinition, LayoutSectionWithSingleColumnDefinition, ListItemArray, ListItemDefinition, MarksObject, MediaADFAttrs, MediaAttributes, MediaInlineAttributes, MediaInlineDefinition, MediaBaseAttributes, MediaDefinition, MediaDisplayType, MediaGroupDefinition, MediaSingleDefinition, MediaType, MentionAttributes, MentionDefinition, MentionUserType, NestedExpandContent, NestedExpandDefinition, NoMark, NonNestableBlockContent, OrderedListDefinition, PanelAttributes, PanelDefinition, ParagraphBaseDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, TableAttributes, TableCellDefinition, TableDefinition, TableDisplayMode, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextDefinition, UrlType, RichMediaAttributes, ExtendedMediaAttributes, RichMediaLayout, CellDomAttrs, ExtensionFrameDefinition, MultiBodiedExtensionDefinition, } from './nodes';
 export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, 
 /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */

package/dist/types/schema/nodes/heading.d.ts

@@ -19,7 +19,7 @@ export interface HeadingBaseDefinition {
          */
         level: number;
         /**
-         * @stage 0
+         * An optional UUID for unique identification of the node
          */
         localId?: string;
     };
@@ -37,6 +37,4 @@ export type HeadingWithAlignmentDefinition = HeadingBaseDefinition & MarksObject
  */
 export type HeadingWithIndentationDefinition = HeadingBaseDefinition & MarksObject<IndentationMarkDefinition>;
 export type HeadingWithMarksDefinition = HeadingWithAlignmentDefinition | HeadingWithIndentationDefinition;
-export declare const headingStage0: NodeSpec;
 export declare const heading: NodeSpec;
-export declare const headingNodeSpec: (adfStage?: string) => NodeSpec;

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

@@ -14,13 +14,13 @@ export { codeBlock, toJSON as codeBlockToJSON } from './code-block';
 export type { CodeBlockDefinition, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockWithMarksDefinition, } from './code-block';
 export { hardBreak } from './hard-break';
 export type { HardBreakDefinition } from './hard-break';
-export { headingNodeSpec, heading, headingStage0 } from './heading';
+export { heading } from './heading';
 export type { HeadingDefinition, HeadingBaseDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, } from './heading';
 export { rule } from './rule';
 export type { RuleDefinition } from './rule';
 export { orderedList, orderedListSelector, orderedListWithOrder, } from './ordered-list';
 export type { OrderedListDefinition } from './types/list';
-export { paragraph, paragraphStage0, paragraphNodeSpec } from './paragraph';
+export { paragraph } from './paragraph';
 export type { ParagraphDefinition, ParagraphBaseDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithMarksDefinition, } from './paragraph';
 export { emoji } from './emoji';
 export type { EmojiAttributes, EmojiDefinition } from './emoji';

package/dist/types/schema/nodes/paragraph.d.ts

@@ -4,7 +4,7 @@ import { MarksObject, NoMark } from './types/mark';
 import { Inline } from './types/inline-content';
 export interface ParagraphAttributes {
     /**
-     * @stage 0
+     * An optional UUID for unique identification of the node
      */
     localId?: string;
 }
@@ -17,9 +17,6 @@ export interface ParagraphBaseDefinition {
      * @allowUnsupportedInline true
      */
     content?: Array<Inline>;
-    /**
-     * @stage 0
-     */
     attrs?: ParagraphAttributes;
     marks?: Array<any>;
 }
@@ -44,6 +41,4 @@ export type ParagraphWithAlignmentDefinition = ParagraphBaseDefinition & MarksOb
  */
 export type ParagraphWithIndentationDefinition = ParagraphBaseDefinition & MarksObject<IndentationMarkDefinition>;
 export type ParagraphWithMarksDefinition = ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition;
-export declare const paragraphStage0: NodeSpec;
 export declare const paragraph: NodeSpec;
-export declare const paragraphNodeSpec: (adfStage?: string) => NodeSpec;

package/json-schema/v1/full.json

@@ -1226,6 +1226,15 @@
             "$ref": "#/definitions/inline_node"
           }
         },
+        "attrs": {
+          "type": "object",
+          "properties": {
+            "localId": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
         "marks": {
           "type": "array"
         }
@@ -1705,6 +1714,9 @@
               "type": "number",
               "minimum": 1,
               "maximum": 6
+            },
+            "localId": {
+              "type": "string"
             }
           },
           "required": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "36.18.2",
+  "version": "37.0.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -43,8 +43,8 @@
     "memoize-one": "^6.0.0"
   },
   "devDependencies": {
-    "@atlassian/adf-schema-json": "^1.15.0",
-    "@atlaskit/adf-schema-generator": "^1.17.1",
+    "@atlassian/adf-schema-json": "^1.16.0",
+    "@atlaskit/adf-schema-generator": "^1.17.2",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@atlaskit/json-schema-generator": "^3.3.9",
     "@babel/cli": "^7.22.9",

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

@@ -64,6 +64,7 @@ const paragraph = {
       optional: true,
     },
     marks: { type: 'array', items: [], optional: true },
+    attrs: { props: { localId: { type: 'string', optional: true } } },
   },
 };
 
@@ -142,6 +143,11 @@ const heading = {
       optional: true,
     },
     marks: { type: 'array', items: [], optional: true },
-    attrs: { props: { level: { type: 'number', minimum: 1, maximum: 6 } } },
+    attrs: {
+      props: {
+        level: { type: 'number', minimum: 1, maximum: 6 },
+        localId: { type: 'string', optional: true },
+      },
+    },
   },
 };

package/schema-generators/__tests__/unit/json-full-schema.unit.ts

@@ -822,6 +822,9 @@ const jsonWithTypes = {
               minimum: 1,
               type: 'number',
             },
+            localId: {
+              type: 'string',
+            },
           },
           required: ['level'],
           type: 'object',
@@ -1480,6 +1483,15 @@ const jsonWithTypes = {
         type: {
           enum: ['paragraph'],
         },
+        attrs: {
+          additionalProperties: false,
+          properties: {
+            localId: {
+              type: 'string',
+            },
+          },
+          type: 'object',
+        },
       },
       required: ['type'],
       type: 'object',