@atlaskit/adf-schema 36.14.0 → 36.15.0

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

@@ -1,4 +1,6 @@
 import { adfNode } from '@atlaskit/adf-schema-generator';
+import { dataConsumer } from '../marks/dataConsumer';
+import { fragment } from '../marks/fragment';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var inlineExtension = adfNode('inlineExtension').define({
@@ -32,4 +34,6 @@ export var inlineExtension = adfNode('inlineExtension').define({
       default: null
     }
   }
-}).variant('with_marks', {});
+}).variant('with_marks', {
+  marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark]
+});

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

@@ -2,6 +2,7 @@ import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
 import { blockGroup } from '../groups/blockGroup';
 import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
+import { unsupportedBlock } from '../nodes/unsupportedBlock';
 export var layoutColumn = adfNode('layoutColumn').define({
   isolating: true,
   selectable: false,
@@ -14,5 +15,5 @@ export var layoutColumn = adfNode('layoutColumn').define({
       default: undefined
     }
   },
-  content: [$onePlus($or(blockGroup))]
+  content: [$onePlus($or(blockGroup, unsupportedBlock))]
 });

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

@@ -55,8 +55,8 @@ export var media = adfNode('media').define({
         optional: true
       },
       __external: {
-        type: 'number',
-        default: null,
+        type: 'boolean',
+        default: false,
         optional: true
       },
       __fileMimeType: {

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

@@ -6,7 +6,8 @@ import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var mediaInline = adfNode('mediaInline').define({
   selectable: true,
-  atom: false,
+  // atom: false,
+  inline: true,
   marks: [link, annotation, border, unsupportedNodeAttribute, unsupportedMark],
   attrs: {
     data: {
@@ -15,23 +16,32 @@ export var mediaInline = adfNode('mediaInline').define({
     type: {
       type: 'enum',
       values: ['link', 'file', 'image'],
-      optional: true
+      optional: true,
+      default: 'file'
+    },
+    url: {
+      type: 'string',
+      default: null
     },
     id: {
       minLength: 1,
-      type: 'string'
+      type: 'string',
+      default: ''
     },
     alt: {
       type: 'string',
+      default: '',
       optional: true
     },
     collection: {
-      type: 'string'
+      type: 'string',
+      default: ''
     },
     occurrenceKey: {
       minLength: 1,
       type: 'string',
-      optional: true
+      optional: true,
+      default: null
     },
     width: {
       type: 'number',
@@ -45,32 +55,39 @@ export var mediaInline = adfNode('mediaInline').define({
     },
     __fileName: {
       type: 'string',
-      optional: true
+      optional: true,
+      default: null
     },
     __fileSize: {
       type: 'number',
-      optional: true
+      optional: true,
+      default: null
     },
     __fileMimeType: {
       type: 'string',
-      optional: true
+      optional: true,
+      default: null
     },
     __displayType: {
       type: 'enum',
       values: ['file', 'thumbnail'],
-      optional: true
+      optional: true,
+      default: null
     },
     __contextId: {
       type: 'string',
-      optional: true
+      optional: true,
+      default: null
     },
     __mediaTraceId: {
       type: 'string',
-      optional: true
+      optional: true,
+      default: null
     },
     __external: {
       type: 'boolean',
-      optional: true
+      optional: true,
+      default: false
     }
   }
 });

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

@@ -46,7 +46,8 @@ export var mediaSingle = adfNode('mediaSingle').define({
         default: 'center'
       }
     }]
-  }
+  },
+  content: [$or(media)]
 }).variant('caption', {
   atom: false,
   content: [$or(media, unsupportedBlock), $or(caption, unsupportedBlock)]

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

@@ -12,7 +12,8 @@ export var mention = adfNode('mention').define({
     },
     localId: {
       type: 'string',
-      optional: true
+      optional: true,
+      default: null
     },
     text: {
       type: 'string',

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

@@ -3,7 +3,9 @@ import { unsupportedMark } from '../marks/unsupportedMark';
 import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var placeholder = adfNode('placeholder').define({
   selectable: false,
+  inline: true,
   marks: [unsupportedNodeAttribute, unsupportedMark],
+  allowNoChildMark: true,
   attrs: {
     text: {
       type: 'string',

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

@@ -6,6 +6,7 @@ import { tableRow } from './tableRow';
 export var table = adfNode('table').define({
   isolating: true,
   selectable: true,
+  tableRole: 'table',
   marks: [fragment, unsupportedNodeAttribute, unsupportedMark],
   attrs: {
     displayMode: {

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

@@ -35,12 +35,12 @@ export var tableCell = adfNode('tableCell').define({
     },
     colwidth: {
       type: 'numberList',
-      default: [],
+      default: null,
       optional: true
     },
     background: {
       type: 'string',
-      default: '',
+      default: null,
       optional: true
     }
   },

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

@@ -34,12 +34,12 @@ export var tableHeader = adfNode('tableHeader').define({
     },
     colwidth: {
       type: 'numberList',
-      default: [],
+      default: null,
       optional: true
     },
     background: {
       type: 'string',
-      default: '',
+      default: null,
       optional: true
     }
   },

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

@@ -6,5 +6,6 @@ import { tableHeader } from './tableHeader';
 export var tableRow = adfNode('tableRow').define({
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
-  content: [$onePlus($or(tableCell, tableHeader))]
+  content: [$onePlus($or(tableCell, tableHeader))],
+  tableRole: 'row'
 });

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

@@ -10,6 +10,7 @@ taskItem.define({
   defining: true,
   selectable: false,
   marks: [unsupportedNodeAttribute, unsupportedMark],
+  allowAnyChildMark: true,
   attrs: {
     localId: {
       type: 'string',

package/dist/types/next-schema/full-schema.adf.d.ts

@@ -14,7 +14,10 @@ declare const doc: import("@atlaskit/adf-schema-generator/dist/types/adfNode").A
     group?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeGroup").ADFNodeGroup;
     isolating?: boolean;
     marks?: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<unknown>[];
+    allowAnyChildMark?: boolean;
+    allowNoChildMark?: boolean;
     selectable?: boolean;
     whitespace?: "pre" | "normal";
+    tableRole?: "table" | "row" | "cell" | "header_cell";
 }>;
 export default doc;

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

@@ -22,17 +22,6 @@ export interface UnsupportedMarkMark extends Mark {
     attrs: UnsupportedMarkMarkAttributes;
 }
 export declare const unsupportedMark: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<UnsupportedMarkMark>) => import("prosemirror-model").MarkSpec;
-export interface BreakoutMarkAttributes {
-    mode: 'wide' | 'full-width';
-}
-export interface BreakoutDefinition {
-    type: 'breakout';
-    attrs: BreakoutMarkAttributes;
-}
-export interface BreakoutMark extends Mark {
-    attrs: BreakoutMarkAttributes;
-}
-export declare const breakout: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<BreakoutMark>) => import("prosemirror-model").MarkSpec;
 export interface LinkMarkAttributes {
     href: string;
     title?: string;
@@ -77,17 +66,17 @@ export interface EmDefinition {
     type: 'em';
 }
 export type EmMark = Mark;
-export declare const em: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDom">>) => import("prosemirror-model").MarkSpec;
+export declare const em: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDOM">>) => import("prosemirror-model").MarkSpec;
 export interface StrongDefinition {
     type: 'strong';
 }
 export type StrongMark = Mark;
-export declare const strong: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDom">>) => import("prosemirror-model").MarkSpec;
+export declare const strong: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDOM">>) => import("prosemirror-model").MarkSpec;
 export interface StrikeDefinition {
     type: 'strike';
 }
 export type StrikeMark = Mark;
-export declare const strike: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDom">>) => import("prosemirror-model").MarkSpec;
+export declare const strike: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDOM">>) => import("prosemirror-model").MarkSpec;
 export interface SubsupMarkAttributes {
     type: 'sub' | 'sup';
 }
@@ -103,7 +92,7 @@ export interface UnderlineDefinition {
     type: 'underline';
 }
 export type UnderlineMark = Mark;
-export declare const underline: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDom">>) => import("prosemirror-model").MarkSpec;
+export declare const underline: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDOM">>) => import("prosemirror-model").MarkSpec;
 export interface TextColorMarkAttributes {
     color: string;
 }
@@ -130,7 +119,30 @@ export interface CodeDefinition {
     type: 'code';
 }
 export type CodeMark = Mark;
-export declare const code: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDom">>) => import("prosemirror-model").MarkSpec;
+export declare const code: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<Omit<Mark, "parseDOM" | "toDOM">>) => import("prosemirror-model").MarkSpec;
+export interface DataConsumerMarkAttributes {
+    sources: Array<string>;
+}
+export interface DataConsumerDefinition {
+    type: 'dataConsumer';
+    attrs: DataConsumerMarkAttributes;
+}
+export interface DataConsumerMark extends Mark {
+    attrs: DataConsumerMarkAttributes;
+}
+export declare const dataConsumer: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<DataConsumerMark>) => import("prosemirror-model").MarkSpec;
+export interface FragmentMarkAttributes {
+    localId: string;
+    name?: string;
+}
+export interface FragmentDefinition {
+    type: 'fragment';
+    attrs: FragmentMarkAttributes;
+}
+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 AlignmentMarkAttributes {
     align: 'center' | 'end';
 }
@@ -153,26 +165,14 @@ export interface IndentationMark extends Mark {
     attrs: IndentationMarkAttributes;
 }
 export declare const indentation: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<IndentationMark>) => import("prosemirror-model").MarkSpec;
-export interface DataConsumerMarkAttributes {
-    sources: Array<string>;
-}
-export interface DataConsumerDefinition {
-    type: 'dataConsumer';
-    attrs: DataConsumerMarkAttributes;
-}
-export interface DataConsumerMark extends Mark {
-    attrs: DataConsumerMarkAttributes;
-}
-export declare const dataConsumer: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<DataConsumerMark>) => import("prosemirror-model").MarkSpec;
-export interface FragmentMarkAttributes {
-    localId: string;
-    name?: string;
+export interface BreakoutMarkAttributes {
+    mode: 'wide' | 'full-width';
 }
-export interface FragmentDefinition {
-    type: 'fragment';
-    attrs: FragmentMarkAttributes;
+export interface BreakoutDefinition {
+    type: 'breakout';
+    attrs: BreakoutMarkAttributes;
 }
-export interface FragmentMark extends Mark {
-    attrs: FragmentMarkAttributes;
+export interface BreakoutMark extends Mark {
+    attrs: BreakoutMarkAttributes;
 }
-export declare const fragment: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<FragmentMark>) => import("prosemirror-model").MarkSpec;
+export declare const breakout: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<BreakoutMark>) => import("prosemirror-model").MarkSpec;

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

@@ -1,4 +1,4 @@
-import { TextDefinition, DateDefinition, EmojiDefinition, HardBreakDefinition, InlineCardDefinition, MentionDefinition, PlaceholderDefinition, StatusDefinition, InlineExtensionDefinition, MediaInlineDefinition, ConfluenceUnsupportedInlineDefinition, UnsupportedInlineDefinition } from './nodeTypes';
-export type InlineDefinition = Array<TextDefinition | DateDefinition | EmojiDefinition | HardBreakDefinition | InlineCardDefinition | MentionDefinition | PlaceholderDefinition | StatusDefinition | InlineExtensionDefinition | MediaInlineDefinition | ConfluenceUnsupportedInlineDefinition | UnsupportedInlineDefinition>;
-import { BlockCardDefinition, CodeBlockDefinition, MediaSingleDefinition, ParagraphDefinition, TaskListDefinition, OrderedListDefinition, BulletListDefinition, BlockquoteDefinition, DecisionListDefinition, EmbedCardDefinition, ExtensionDefinition, HeadingDefinition, MediaGroupDefinition, RuleDefinition, PanelDefinition, TableDefinition, BodiedExtensionDefinition, ExpandDefinition, ConfluenceUnsupportedBlockDefinition, UnsupportedBlockDefinition } from './nodeTypes';
-export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | MediaSingleDefinition | ParagraphDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | HeadingDefinition | MediaGroupDefinition | RuleDefinition | PanelDefinition | TableDefinition | BodiedExtensionDefinition | ExpandDefinition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;
+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>;