@atlaskit/adf-schema 36.16.0 → 36.17.0

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

@@ -18,8 +18,4 @@ import { rule } from '../nodes/rule';
 import { table } from '../nodes/table';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-export var blockGroup = adfNodeGroup('block', [blockCard, codeBlock.use('with_no_marks'), mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), taskList, orderedList, bulletList, blockquote.use('with_list'), decisionList, embedCard,
-// extension,
-extension.use('with_marks'), heading, heading.use('with_no_marks'), mediaGroup, rule, panel, table,
-// bodiedExtension,
-bodiedExtension.use('with_marks'), expand.use('with_no_mark'), confluenceUnsupportedBlock, unsupportedBlock]);
+export var blockGroup = adfNodeGroup('block', [panel, paragraph, paragraph.use('with_marks'), blockquote.use('with_list'), orderedList, bulletList, rule, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('caption'), mediaSingle.use('full'), decisionList, taskList, table, expand.use('with_no_mark'), extension.use('with_marks'), bodiedExtension.use('with_marks'), blockCard, embedCard, confluenceUnsupportedBlock, unsupportedBlock]);

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

@@ -1,2 +1,3 @@
 import { adfNodeGroup } from '@atlaskit/adf-schema-generator';
-export var blockRootOnlyGroup = adfNodeGroup('blockRootOnly');
+import { multiBodiedExtension } from '../nodes/multiBodiedExtension';
+export var blockRootOnlyGroup = adfNodeGroup('blockRootOnly', [multiBodiedExtension]);

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

@@ -11,4 +11,6 @@ import { inlineExtension } from '../nodes/inlineExtension';
 import { mediaInline } from '../nodes/mediaInline';
 import { unsupportedInline } from '../nodes/unsupportedInline';
 import { confluenceUnsupportedInline } from '../nodes/confluenceUnsupportedInline';
-export var inlineGroup = adfNodeGroup('inline', [text, text.use('formatted'), text.use('code_inline'), date, emoji, hardBreak, inlineCard, mention, placeholder, status, inlineExtension.use('with_marks'), mediaInline, confluenceUnsupportedInline, unsupportedInline]);
+import { image } from '../nodes/image';
+import { confluenceJiraIssue } from '../nodes/confluenceJiraIssue';
+export var inlineGroup = adfNodeGroup('inline', [text, text.use('formatted'), text.use('code_inline'), date, emoji, hardBreak, inlineCard, mention, placeholder, status, inlineExtension.use('with_marks'), mediaInline, image, confluenceJiraIssue, confluenceUnsupportedInline, unsupportedInline]);

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

@@ -13,6 +13,11 @@ export var codeBlock = adfNode('codeBlock').define({
       type: 'string',
       default: null,
       optional: true
+    },
+    uniqueId: {
+      type: 'string',
+      default: null,
+      optional: true
     }
   },
   content: [$zeroPlus($or(text, unsupportedInline))]

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

@@ -0,0 +1,32 @@
+import { adfNode, JSONSchemaTransformerName, ValidatorSpecTransformerName } from '@atlaskit/adf-schema-generator';
+export var confluenceJiraIssue = adfNode('confluenceJiraIssue').define({
+  ignore: [JSONSchemaTransformerName, ValidatorSpecTransformerName],
+  atom: true,
+  inline: true,
+  attrs: {
+    issueKey: {
+      type: 'string',
+      default: ''
+    },
+    macroId: {
+      type: 'string',
+      default: null,
+      optional: true
+    },
+    schemaVersion: {
+      type: 'string',
+      default: null,
+      optional: true
+    },
+    server: {
+      type: 'string',
+      default: null,
+      optional: true
+    },
+    serverId: {
+      type: 'string',
+      default: null,
+      optional: true
+    }
+  }
+});

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

@@ -2,7 +2,6 @@ import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
 import { inlineGroup } from '../groups/inlineGroup';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
-import { unsupportedBlock } from './unsupportedBlock';
 export var decisionItem = adfNode('decisionItem').define({
   defining: true,
   marks: [unsupportedNodeAttribute, unsupportedMark],
@@ -17,5 +16,5 @@ export var decisionItem = adfNode('decisionItem').define({
       default: 'DECIDED'
     }
   },
-  content: [$zeroPlus($or(inlineGroup, unsupportedBlock))]
+  content: [$zeroPlus($or(inlineGroup))]
 });

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

@@ -19,11 +19,13 @@ import { paragraph } from './paragraph';
 import { rule } from './rule';
 import { table } from './table';
 import { taskList } from './task';
+import { unsupportedBlock } from './unsupportedBlock';
 export var extensionFrame = adfNode('extensionFrame').define({
   isolating: true,
   definingAsContext: false,
   definingForContent: true,
   selectable: false,
   marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark],
-  content: [$onePlus($or(bodiedExtension, panel, paragraph, blockquote, orderedList, bulletList, rule, heading, codeBlock, mediaGroup, mediaSingle, decisionList, taskList, table, extension, blockCard, embedCard))]
+  attrs: {},
+  content: [$onePlus($or(bodiedExtension, panel, paragraph, blockquote, orderedList, bulletList, rule, heading, codeBlock, mediaGroup, mediaSingle, decisionList, taskList, table, extension, blockCard, embedCard, unsupportedBlock))]
 });

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

@@ -3,7 +3,6 @@ import { inlineGroup } from '../groups/inlineGroup';
 import { alignment, indentation } from '../marks/alignmentAndIndentation';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
-import { unsupportedInline } from './unsupportedInline';
 export var heading = adfNode('heading').define({
   defining: true,
   selectable: false,
@@ -16,7 +15,7 @@ export var heading = adfNode('heading').define({
       maximum: 6
     }
   },
-  content: [$zeroPlus($or(inlineGroup, unsupportedInline))]
+  content: [$zeroPlus($or(inlineGroup))]
 }).variant('with_alignment', {
   marks: [alignment, unsupportedNodeAttribute, unsupportedMark]
 }).variant('with_indentation', {

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

@@ -0,0 +1,22 @@
+import { adfNode, JSONSchemaTransformerName, ValidatorSpecTransformerName } from '@atlaskit/adf-schema-generator';
+export var image = adfNode('image').define({
+  ignore: [JSONSchemaTransformerName, ValidatorSpecTransformerName],
+  inline: true,
+  draggable: true,
+  attrs: {
+    src: {
+      type: 'string',
+      default: ''
+    },
+    alt: {
+      type: 'string',
+      default: '',
+      optional: true
+    },
+    title: {
+      type: 'string',
+      default: null,
+      optional: true
+    }
+  }
+});

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

@@ -6,5 +6,7 @@ import { unsupportedBlock } from './unsupportedBlock';
 export var mediaGroup = adfNode('mediaGroup').define({
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
+  // Need to be empty object to match old PM Spec
+  attrs: {},
   content: [$onePlus($or(media, unsupportedBlock))]
 });

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

@@ -10,10 +10,6 @@ export var mediaInline = adfNode('mediaInline').define({
   inline: true,
   marks: [link, annotation, border, unsupportedNodeAttribute, unsupportedMark],
   attrs: {
-    data: {
-      type: 'object',
-      optional: true
-    },
     type: {
       type: 'enum',
       values: ['link', 'file', 'image'],

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

@@ -38,7 +38,7 @@ export var mediaSingle = adfNode('mediaSingle').define({
       widthType: {
         type: 'enum',
         values: ['pixel'],
-        default: 'pixel'
+        default: null
       },
       layout: {
         type: 'enum',

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

@@ -3,11 +3,10 @@ import { inlineGroup } from '../groups/inlineGroup';
 import { alignment, indentation } from '../marks/alignmentAndIndentation';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
-import { unsupportedInline } from './unsupportedInline';
 export var paragraph = adfNode('paragraph').define({
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
-  content: [$zeroPlus($or(inlineGroup, unsupportedInline))]
+  content: [$zeroPlus($or(inlineGroup))]
 }).variant('with_alignment', {
   marks: [alignment, unsupportedNodeAttribute, unsupportedMark]
 }).variant('with_indentation', {

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

@@ -2,6 +2,7 @@ import { adfNode } from '@atlaskit/adf-schema-generator';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var status = adfNode('status').define({
+  inline: true,
   selectable: true,
   marks: [unsupportedNodeAttribute, unsupportedMark],
   attrs: {

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

@@ -12,7 +12,7 @@ export var table = adfNode('table').define({
     displayMode: {
       type: 'enum',
       values: ['default', 'fixed'],
-      default: 'default',
+      default: null,
       optional: true
     },
     isNumberColumnEnabled: {

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

@@ -2,7 +2,6 @@ import { $onePlus, $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generato
 import { inlineGroup } from '../groups/inlineGroup';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
-import { unsupportedInline } from './unsupportedInline';
 import { unsupportedBlock } from './unsupportedBlock';
 export var taskItem = adfNode('taskItem');
 export var taskList = adfNode('taskList');
@@ -22,7 +21,7 @@ taskItem.define({
       default: 'TODO'
     }
   },
-  content: [$zeroPlus($or(inlineGroup, unsupportedInline))]
+  content: [$zeroPlus($or(inlineGroup))]
 });
 taskList.define({
   defining: true,

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

@@ -263,6 +263,26 @@ var marksInOrder = [{
   name: 'unsupportedNodeAttribute',
   spec: unsupportedNodeAttribute
 }]);
+export function getNodesAndMarksMap() {
+  var nodes = nodesInOrder.reduce(function (acc, _ref2) {
+    var name = _ref2.name,
+      spec = _ref2.spec;
+    // @ts-expect-error - Type for SchemaBuiltInItem is not correct
+    acc[name] = spec;
+    return acc;
+  }, {});
+  var marks = marksInOrder.reduce(function (acc, _ref3) {
+    var name = _ref3.name,
+      spec = _ref3.spec;
+    // @ts-expect-error - Type for SchemaBuiltInItem is not correct
+    acc[name] = spec;
+    return acc;
+  }, {});
+  return {
+    nodes: nodes,
+    marks: marks
+  };
+}
 
 /**
  * Creates a schema preserving order of marks and nodes.

package/dist/esm/schema/nodes/multi-bodied-extension.js

@@ -10,7 +10,6 @@ import { getExtensionAttrs } from '../../utils/extensions';
  * @returns NodeSpec for ExtensionFrameDefinition
  */
 export var extensionFrame = {
-  type: 'extensionFrame',
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | extension | bodiedExtension | unsupportedBlock | blockCard | embedCard)+',
   isolating: true,
   marks: 'dataConsumer fragment',
@@ -47,7 +46,6 @@ var createMultiBodiedExtensionNodeSpec = function createMultiBodiedExtensionNode
     inline: false,
     group: 'blockRootOnly',
     content: 'extensionFrame+',
-    block: true,
     definingAsContext: true,
     selectable: true,
     attrs: {

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

@@ -32,7 +32,7 @@ export var paragraphStage0 = {
       default: null
     }
   },
-  marks: 'strong code em link border strike subsup textColor backgroundColor typeAheadQuery underline confluenceInlineComment action annotation unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  marks: 'strong code em link border strike subsup textColor backgroundColor typeAheadQuery underline confluenceInlineComment annotation unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   parseDOM: [{
     tag: 'p',
     getAttrs: function getAttrs(domNode) {
@@ -57,7 +57,7 @@ export var paragraph = {
   selectable: false,
   content: 'inline*',
   group: 'block',
-  marks: 'strong code em link border strike subsup textColor backgroundColor typeAheadQuery underline confluenceInlineComment action annotation unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
+  marks: 'strong code em link border strike subsup textColor backgroundColor typeAheadQuery underline confluenceInlineComment annotation unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   parseDOM: [{
     tag: 'p'
   }],

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

@@ -38,30 +38,6 @@ export interface LinkMark extends Mark {
     attrs: LinkMarkAttributes;
 }
 export declare const link: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<LinkMark>) => import("prosemirror-model").MarkSpec;
-export interface AnnotationMarkAttributes {
-    id: string;
-    annotationType: 'inlineComment';
-}
-export interface AnnotationDefinition {
-    type: 'annotation';
-    attrs: AnnotationMarkAttributes;
-}
-export interface AnnotationMark extends Mark {
-    attrs: AnnotationMarkAttributes;
-}
-export declare const annotation: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<AnnotationMark>) => import("prosemirror-model").MarkSpec;
-export interface BorderMarkAttributes {
-    size: number;
-    color: string;
-}
-export interface BorderDefinition {
-    type: 'border';
-    attrs: BorderMarkAttributes;
-}
-export interface BorderMark extends Mark {
-    attrs: BorderMarkAttributes;
-}
-export declare const border: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<BorderMark>) => import("prosemirror-model").MarkSpec;
 export interface EmDefinition {
     type: 'em';
 }
@@ -104,6 +80,18 @@ export interface TextColorMark extends Mark {
     attrs: TextColorMarkAttributes;
 }
 export declare const textColor: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<TextColorMark>) => import("prosemirror-model").MarkSpec;
+export interface AnnotationMarkAttributes {
+    id: string;
+    annotationType: 'inlineComment';
+}
+export interface AnnotationDefinition {
+    type: 'annotation';
+    attrs: AnnotationMarkAttributes;
+}
+export interface AnnotationMark extends Mark {
+    attrs: AnnotationMarkAttributes;
+}
+export declare const annotation: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<AnnotationMark>) => import("prosemirror-model").MarkSpec;
 export interface BackgroundColorMarkAttributes {
     color: string;
 }
@@ -143,6 +131,18 @@ export interface FragmentMark extends Mark {
     attrs: FragmentMarkAttributes;
 }
 export declare const fragment: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<FragmentMark>) => import("prosemirror-model").MarkSpec;
+export interface BorderMarkAttributes {
+    size: number;
+    color: string;
+}
+export interface BorderDefinition {
+    type: 'border';
+    attrs: BorderMarkAttributes;
+}
+export interface BorderMark extends Mark {
+    attrs: BorderMarkAttributes;
+}
+export declare const border: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<BorderMark>) => import("prosemirror-model").MarkSpec;
 export interface AlignmentMarkAttributes {
     align: 'center' | 'end';
 }

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

@@ -1,4 +1,6 @@
-import { TextDefinition, TextFormattedDefinition, TextCodeInlineDefinition, DateDefinition, EmojiDefinition, HardBreakDefinition, InlineCardDefinition, MentionDefinition, PlaceholderDefinition, StatusDefinition, InlineExtensionWithMarksDefinition, MediaInlineDefinition, ConfluenceUnsupportedInlineDefinition, UnsupportedInlineDefinition } from './nodeTypes';
-export type InlineDefinition = Array<TextDefinition | TextFormattedDefinition | TextCodeInlineDefinition | DateDefinition | EmojiDefinition | HardBreakDefinition | InlineCardDefinition | MentionDefinition | PlaceholderDefinition | StatusDefinition | InlineExtensionWithMarksDefinition | MediaInlineDefinition | ConfluenceUnsupportedInlineDefinition | UnsupportedInlineDefinition>;
-import { BlockCardDefinition, CodeBlockWithNoMarksDefinition, MediaSingleDefinition, MediaSingleCaptionDefinition, MediaSingleFullDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, TaskListDefinition, OrderedListDefinition, BulletListDefinition, BlockquoteWithListDefinition, DecisionListDefinition, EmbedCardDefinition, ExtensionWithMarksDefinition, HeadingDefinition, HeadingWithNoMarksDefinition, MediaGroupDefinition, RuleDefinition, PanelDefinition, TableDefinition, BodiedExtensionWithMarksDefinition, ExpandWithNoMarkDefinition, ConfluenceUnsupportedBlockDefinition, UnsupportedBlockDefinition } from './nodeTypes';
-export type BlockDefinition = Array<BlockCardDefinition | CodeBlockWithNoMarksDefinition | MediaSingleDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteWithListDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | RuleDefinition | PanelDefinition | TableDefinition | BodiedExtensionWithMarksDefinition | ExpandWithNoMarkDefinition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;
+import { TextDefinition, TextFormattedDefinition, TextCodeInlineDefinition, DateDefinition, EmojiDefinition, HardBreakDefinition, InlineCardDefinition, MentionDefinition, PlaceholderDefinition, StatusDefinition, InlineExtensionWithMarksDefinition, MediaInlineDefinition, ImageDefinition, ConfluenceJiraIssueDefinition, ConfluenceUnsupportedInlineDefinition, UnsupportedInlineDefinition } from './nodeTypes';
+export type InlineDefinition = Array<TextDefinition | TextFormattedDefinition | TextCodeInlineDefinition | DateDefinition | EmojiDefinition | HardBreakDefinition | InlineCardDefinition | MentionDefinition | PlaceholderDefinition | StatusDefinition | InlineExtensionWithMarksDefinition | MediaInlineDefinition | ImageDefinition | ConfluenceJiraIssueDefinition | ConfluenceUnsupportedInlineDefinition | UnsupportedInlineDefinition>;
+import { PanelDefinition, ParagraphDefinition, ParagraphWithMarksDefinition, BlockquoteWithListDefinition, OrderedListDefinition, BulletListDefinition, RuleDefinition, HeadingWithNoMarksDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, CodeBlockWithNoMarksDefinition, MediaGroupDefinition, MediaSingleCaptionDefinition, MediaSingleFullDefinition, DecisionListDefinition, TaskListDefinition, TableDefinition, ExpandWithNoMarkDefinition, ExtensionWithMarksDefinition, BodiedExtensionWithMarksDefinition, BlockCardDefinition, EmbedCardDefinition, ConfluenceUnsupportedBlockDefinition, UnsupportedBlockDefinition } from './nodeTypes';
+export type BlockDefinition = Array<PanelDefinition | ParagraphDefinition | ParagraphWithMarksDefinition | BlockquoteWithListDefinition | OrderedListDefinition | BulletListDefinition | RuleDefinition | HeadingWithNoMarksDefinition | HeadingWithAlignmentDefinition | HeadingWithIndentationDefinition | CodeBlockWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | DecisionListDefinition | TaskListDefinition | TableDefinition | ExpandWithNoMarkDefinition | ExtensionWithMarksDefinition | BodiedExtensionWithMarksDefinition | BlockCardDefinition | EmbedCardDefinition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;
+import { MultiBodiedExtensionDefinition } from './nodeTypes';
+export type BlockRootOnlyDefinition = Array<MultiBodiedExtensionDefinition>;