@atlaskit/adf-schema 36.16.0 → 36.17.0

package/dist/es2019/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 const 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 const 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/es2019/next-schema/groups/blockRootOnlyGroup.js

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

package/dist/es2019/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 const 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 const 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/es2019/next-schema/nodes/codeBlock.js

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

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

@@ -0,0 +1,32 @@
+import { adfNode, JSONSchemaTransformerName, ValidatorSpecTransformerName } from '@atlaskit/adf-schema-generator';
+export const 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/es2019/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 const decisionItem = adfNode('decisionItem').define({
   defining: true,
   marks: [unsupportedNodeAttribute, unsupportedMark],
@@ -17,5 +16,5 @@ export const decisionItem = adfNode('decisionItem').define({
       default: 'DECIDED'
     }
   },
-  content: [$zeroPlus($or(inlineGroup, unsupportedBlock))]
+  content: [$zeroPlus($or(inlineGroup))]
 });

package/dist/es2019/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 const 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/es2019/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 const heading = adfNode('heading').define({
   defining: true,
   selectable: false,
@@ -16,7 +15,7 @@ export const 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/es2019/next-schema/nodes/image.js

@@ -0,0 +1,22 @@
+import { adfNode, JSONSchemaTransformerName, ValidatorSpecTransformerName } from '@atlaskit/adf-schema-generator';
+export const 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/es2019/next-schema/nodes/mediaGroup.js

@@ -6,5 +6,7 @@ import { unsupportedBlock } from './unsupportedBlock';
 export const 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/es2019/next-schema/nodes/mediaInline.js

@@ -10,10 +10,6 @@ export const 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/es2019/next-schema/nodes/mediaSingle.js

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

package/dist/es2019/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 const 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/es2019/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 const status = adfNode('status').define({
+  inline: true,
   selectable: true,
   marks: [unsupportedNodeAttribute, unsupportedMark],
   attrs: {

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

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

package/dist/es2019/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 const taskItem = adfNode('taskItem');
 export const 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/es2019/schema/create-schema.js

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

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

@@ -10,7 +10,6 @@ import { getExtensionAttrs } from '../../utils/extensions';
  * @returns NodeSpec for ExtensionFrameDefinition
  */
 export const 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 @@ const createMultiBodiedExtensionNodeSpec = () => {
     inline: false,
     group: 'blockRootOnly',
     content: 'extensionFrame+',
-    block: true,
     definingAsContext: true,
     selectable: true,
     attrs: {

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

@@ -32,7 +32,7 @@ export const 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: domNode => {
@@ -59,7 +59,7 @@ export const 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/esm/next-schema/full-schema.adf.js

@@ -2,13 +2,9 @@ import { $or, $onePlus, adfNode } from '@atlaskit/adf-schema-generator';
 import { blockGroup } from './groups/blockGroup';
 import { layoutSection } from './nodes/layoutSection';
 import { blockRootOnlyGroup } from './groups/blockRootOnlyGroup';
-import { paragraph } from './nodes/paragraph';
-import { expand } from './nodes/expand';
-import { codeBlock } from './nodes/codeBlock';
-import { unsupportedBlock } from './nodes/unsupportedBlock';
 var doc = adfNode('doc').define({
   root: true,
   version: 1,
-  content: [$onePlus($or(blockGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup, expand.use('with_breakout_mark'), codeBlock.use('with_no_marks'), codeBlock.use('with_marks'), paragraph.use('with_indentation'), unsupportedBlock))]
+  content: [$onePlus($or(blockGroup, layoutSection, blockRootOnlyGroup))]
 });
 export default doc;

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

@@ -31,25 +31,6 @@ export var link = createPMMarkSpecFactory({
   excludes: 'link',
   group: 'link'
 });
-export var annotation = createPMMarkSpecFactory({
-  attrs: {
-    id: {
-      default: ''
-    },
-    annotationType: {
-      default: 'inlineComment'
-    }
-  },
-  inclusive: true,
-  group: 'annotation'
-});
-export var border = createPMMarkSpecFactory({
-  attrs: {
-    size: {},
-    color: {}
-  },
-  inclusive: false
-});
 export var em = createPMMarkSpecFactory({
   inclusive: true,
   group: 'fontStyle'
@@ -82,6 +63,18 @@ export var textColor = createPMMarkSpecFactory({
   inclusive: true,
   group: 'color'
 });
+export var annotation = createPMMarkSpecFactory({
+  attrs: {
+    id: {
+      default: ''
+    },
+    annotationType: {
+      default: 'inlineComment'
+    }
+  },
+  inclusive: true,
+  group: 'annotation'
+});
 export var backgroundColor = createPMMarkSpecFactory({
   attrs: {
     color: {}
@@ -112,6 +105,13 @@ export var fragment = createPMMarkSpecFactory({
   },
   inclusive: false
 });
+export var border = createPMMarkSpecFactory({
+  attrs: {
+    size: {},
+    color: {}
+  },
+  inclusive: false
+});
 export var alignment = createPMMarkSpecFactory({
   attrs: {
     align: {}