@atlaskit/adf-schema 36.10.12 → 36.10.13

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/adf-schema
 
+## 36.10.13
+
+### Patch Changes
+
+- 98d9d14: Create anyof field under content items in JSON Schema transformer for ADF dSL
+
 ## 36.10.12
 
 ### Patch Changes

package/dist/cjs/next-schema/full-schema.adf.js

@@ -8,9 +8,11 @@ var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 var _blockGroup = require("./groups/blockGroup");
 var _layoutSection = require("./nodes/layoutSection");
 var _blockRootOnlyGroup = require("./groups/blockRootOnlyGroup");
+var _nestedExpand = require("./nodes/nestedExpand");
+var _paragraph = require("./nodes/paragraph");
 var doc = (0, _adfSchemaGenerator.adfNode)('doc').define({
   root: true,
   version: 1,
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _layoutSection.layoutSection, _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup))]
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_blockGroup.blockGroup, _layoutSection.layoutSection, _layoutSection.layoutSection.use('full'), _blockRootOnlyGroup.blockRootOnlyGroup, _nestedExpand.nestedExpand, _paragraph.paragraph))]
 });
 var _default = exports.default = doc;

package/dist/cjs/next-schema/groups/nonNestableBlockContentGroup.js

@@ -21,4 +21,4 @@ var _table = require("../nodes/table");
 var _task = require("../nodes/task");
 // Not an actual group, but a collection of nodes that can't be nested inside each other
 // TODO: make it an actual group
-var nonNestableBlockContent = exports.nonNestableBlockContent = [_panel.panel, _paragraph.paragraph, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading, _codeBlock.codeBlock, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle, _decisionList.decisionList, _task.taskList, _table.table, _extension.extension, _blockCard.blockCard, _embedCard.embedCard];
+var nonNestableBlockContent = exports.nonNestableBlockContent = [_codeBlock.codeBlock.use('with_no_marks'), _blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _embedCard.embedCard, _table.table];

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

@@ -17,5 +17,5 @@ var _text = require("./text");
 var caption = exports.caption = (0, _adfSchemaGenerator.adfNode)('caption').define({
   isolating: true,
   selectable: false,
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_text.text.use('formatted'), _hardBreak.hardBreak, _mention.mention, _emoji.emoji, _date.date, _placeholder.placeholder, _inlineCard.inlineCard, _status.status))]
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_hardBreak.hardBreak, _mention.mention, _emoji.emoji, _date.date, _placeholder.placeholder, _inlineCard.inlineCard, _status.status, _text.text.use('formatted'), _text.text.use('code_inline')))]
 });

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

@@ -31,5 +31,5 @@ var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.adfNode)('nest
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph, _heading.heading, _mediaSingle.mediaSingle, _mediaGroup.mediaGroup, _codeBlock.codeBlock, _list.bulletList, _list.orderedList, _task.taskList, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_codeBlock.codeBlock.use('with_no_marks'), _paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote))]
 }).variant('with_no_marks', {});

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

@@ -44,5 +44,5 @@ var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph, _heading.heading, _list.bulletList, _list.orderedList, _blockCard.blockCard, _codeBlock.codeBlock, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle, _decisionList.decisionList, _task.taskList, _rule.rule))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_codeBlock.codeBlock.use('with_no_marks'), _blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule))]
 });

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

@@ -46,5 +46,5 @@ var tableCell = exports.tableCell = (0, _adfSchemaGenerator.adfNode)('tableCell'
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_panel.panel, _paragraph.paragraph, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading, _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _codeBlock.codeBlock, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle, _decisionList.decisionList, _task.taskList, _extension.extension, _blockCard.blockCard, _nestedExpand.nestedExpand, _embedCard.embedCard))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_codeBlock.codeBlock.use('with_no_marks'), _blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _embedCard.embedCard, _nestedExpand.nestedExpand.use('with_no_marks')))]
 });

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

@@ -46,5 +46,5 @@ var tableHeader = exports.tableHeader = (0, _adfSchemaGenerator.adfNode)('tableH
       optional: true
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_panel.panel, _paragraph.paragraph, _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading, _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _codeBlock.codeBlock, _mediaGroup.mediaGroup, _mediaSingle.mediaSingle, _decisionList.decisionList, _task.taskList, _extension.extension, _blockCard.blockCard, _nestedExpand.nestedExpand, _nestedExpand.nestedExpand.use('with_no_marks'), _embedCard.embedCard))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_codeBlock.codeBlock.use('with_no_marks'), _blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _embedCard.embedCard, _nestedExpand.nestedExpand.use('with_no_marks')))]
 });

package/dist/es2019/next-schema/full-schema.adf.js

@@ -2,9 +2,11 @@ import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
 import { blockGroup } from './groups/blockGroup';
 import { layoutSection } from './nodes/layoutSection';
 import { blockRootOnlyGroup } from './groups/blockRootOnlyGroup';
+import { nestedExpand } from './nodes/nestedExpand';
+import { paragraph } from './nodes/paragraph';
 const doc = adfNode('doc').define({
   root: true,
   version: 1,
-  content: [$zeroPlus($or(blockGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup))]
+  content: [$zeroPlus($or(blockGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup, nestedExpand, paragraph))]
 });
 export default doc;

package/dist/es2019/next-schema/groups/nonNestableBlockContentGroup.js

@@ -16,4 +16,4 @@ import { taskList } from '../nodes/task';
 
 // Not an actual group, but a collection of nodes that can't be nested inside each other
 // TODO: make it an actual group
-export const nonNestableBlockContent = [panel, paragraph, blockquote, orderedList, bulletList, rule, heading, codeBlock, mediaGroup, mediaSingle, decisionList, taskList, table, extension, blockCard, embedCard];
+export const nonNestableBlockContent = [codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, table];

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

@@ -12,5 +12,5 @@ import { text } from './text';
 export const caption = adfNode('caption').define({
   isolating: true,
   selectable: false,
-  content: [$zeroPlus($or(text.use('formatted'), hardBreak, mention, emoji, date, placeholder, inlineCard, status))]
+  content: [$zeroPlus($or(hardBreak, mention, emoji, date, placeholder, inlineCard, status, text.use('formatted'), text.use('code_inline')))]
 });

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

@@ -25,5 +25,5 @@ export const nestedExpand = adfNode('nestedExpand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(paragraph, heading, mediaSingle, mediaGroup, codeBlock, bulletList, orderedList, taskList, decisionList, rule, panel, blockquote))]
+  content: [$onePlus($or(codeBlock.use('with_no_marks'), paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), mediaGroup, decisionList, rule, panel, blockquote))]
 }).variant('with_no_marks', {});

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

@@ -38,5 +38,5 @@ export const panel = adfNode('panel').define({
       optional: true
     }
   },
-  content: [$onePlus($or(paragraph, heading, bulletList, orderedList, blockCard, codeBlock, mediaGroup, mediaSingle, decisionList, taskList, rule))]
+  content: [$onePlus($or(codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), mediaGroup, decisionList, rule))]
 });

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

@@ -40,5 +40,5 @@ export const tableCell = adfNode('tableCell').define({
       optional: true
     }
   },
-  content: [$onePlus($or(panel, paragraph, blockquote, orderedList, bulletList, rule, heading, heading.use('with_alignment'), heading.use('with_indentation'), codeBlock, mediaGroup, mediaSingle, decisionList, taskList, extension, blockCard, nestedExpand, embedCard))]
+  content: [$onePlus($or(codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, nestedExpand.use('with_no_marks')))]
 });

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

@@ -40,5 +40,5 @@ export const tableHeader = adfNode('tableHeader').define({
       optional: true
     }
   },
-  content: [$onePlus($or(panel, paragraph, blockquote, orderedList, bulletList, rule, heading, heading.use('with_alignment'), heading.use('with_indentation'), codeBlock, mediaGroup, mediaSingle, decisionList, taskList, extension, blockCard, nestedExpand, nestedExpand.use('with_no_marks'), embedCard))]
+  content: [$onePlus($or(codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, nestedExpand.use('with_no_marks')))]
 });

package/dist/esm/next-schema/full-schema.adf.js

@@ -2,9 +2,11 @@ import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
 import { blockGroup } from './groups/blockGroup';
 import { layoutSection } from './nodes/layoutSection';
 import { blockRootOnlyGroup } from './groups/blockRootOnlyGroup';
+import { nestedExpand } from './nodes/nestedExpand';
+import { paragraph } from './nodes/paragraph';
 var doc = adfNode('doc').define({
   root: true,
   version: 1,
-  content: [$zeroPlus($or(blockGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup))]
+  content: [$zeroPlus($or(blockGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup, nestedExpand, paragraph))]
 });
 export default doc;

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

@@ -16,4 +16,4 @@ import { taskList } from '../nodes/task';
 
 // Not an actual group, but a collection of nodes that can't be nested inside each other
 // TODO: make it an actual group
-export var nonNestableBlockContent = [panel, paragraph, blockquote, orderedList, bulletList, rule, heading, codeBlock, mediaGroup, mediaSingle, decisionList, taskList, table, extension, blockCard, embedCard];
+export var nonNestableBlockContent = [codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, table];

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

@@ -12,5 +12,5 @@ import { text } from './text';
 export var caption = adfNode('caption').define({
   isolating: true,
   selectable: false,
-  content: [$zeroPlus($or(text.use('formatted'), hardBreak, mention, emoji, date, placeholder, inlineCard, status))]
+  content: [$zeroPlus($or(hardBreak, mention, emoji, date, placeholder, inlineCard, status, text.use('formatted'), text.use('code_inline')))]
 });

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

@@ -25,5 +25,5 @@ export var nestedExpand = adfNode('nestedExpand').define({
       optional: true
     }
   },
-  content: [$onePlus($or(paragraph, heading, mediaSingle, mediaGroup, codeBlock, bulletList, orderedList, taskList, decisionList, rule, panel, blockquote))]
+  content: [$onePlus($or(codeBlock.use('with_no_marks'), paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), mediaGroup, decisionList, rule, panel, blockquote))]
 }).variant('with_no_marks', {});

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

@@ -38,5 +38,5 @@ export var panel = adfNode('panel').define({
       optional: true
     }
   },
-  content: [$onePlus($or(paragraph, heading, bulletList, orderedList, blockCard, codeBlock, mediaGroup, mediaSingle, decisionList, taskList, rule))]
+  content: [$onePlus($or(codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), mediaGroup, decisionList, rule))]
 });

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

@@ -40,5 +40,5 @@ export var tableCell = adfNode('tableCell').define({
       optional: true
     }
   },
-  content: [$onePlus($or(panel, paragraph, blockquote, orderedList, bulletList, rule, heading, heading.use('with_alignment'), heading.use('with_indentation'), codeBlock, mediaGroup, mediaSingle, decisionList, taskList, extension, blockCard, nestedExpand, embedCard))]
+  content: [$onePlus($or(codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, nestedExpand.use('with_no_marks')))]
 });

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

@@ -40,5 +40,5 @@ export var tableHeader = adfNode('tableHeader').define({
       optional: true
     }
   },
-  content: [$onePlus($or(panel, paragraph, blockquote, orderedList, bulletList, rule, heading, heading.use('with_alignment'), heading.use('with_indentation'), codeBlock, mediaGroup, mediaSingle, decisionList, taskList, extension, blockCard, nestedExpand, nestedExpand.use('with_no_marks'), embedCard))]
+  content: [$onePlus($or(codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, nestedExpand.use('with_no_marks')))]
 });

package/dist/types/next-schema/groups/nonNestableBlockContentGroup.d.ts

@@ -15,7 +15,7 @@ export declare const nonNestableBlockContent: (import("@atlaskit/adf-schema-gene
     marks?: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<unknown>[];
     selectable?: boolean;
     whitespace?: "pre" | "normal";
-}> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "with_marks", "with_no_marks"], {
+}> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<any, {
     root?: boolean;
     atom?: boolean;
     version?: 1;
@@ -34,7 +34,7 @@ export declare const nonNestableBlockContent: (import("@atlaskit/adf-schema-gene
     whitespace?: "pre" | "normal";
 } & {
     marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
-}> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "caption", "full"], {
+}> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<any, {
     root?: boolean;
     atom?: boolean;
     version?: 1;
@@ -54,29 +54,6 @@ export declare const nonNestableBlockContent: (import("@atlaskit/adf-schema-gene
 } & {
     atom: false;
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOrSpec[];
-}> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "with_alignment", "with_indentation", "with_marks", "with_no_marks"], {
-    root?: boolean;
-    atom?: boolean;
-    version?: 1;
-    attrs?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFAttribute").ADFAttributes;
-    inline?: true;
-    code?: boolean;
-    content?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentSpec[];
-    defining?: boolean;
-    definingAsContext?: boolean;
-    definingForContent?: boolean;
-    draggable?: boolean;
-    group?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeGroup").ADFNodeGroup;
-    isolating?: boolean;
-    marks?: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<unknown>[];
-    selectable?: boolean;
-    whitespace?: "pre" | "normal";
-} & {
-    marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
-} & {
-    marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
-} & {
-    marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
 }> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "with_list"], {
     root?: boolean;
     atom?: boolean;
@@ -96,44 +73,4 @@ export declare const nonNestableBlockContent: (import("@atlaskit/adf-schema-gene
     whitespace?: "pre" | "normal";
 } & {
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
-}> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "with_marks"], {
-    root?: boolean;
-    atom?: boolean;
-    version?: 1;
-    attrs?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFAttribute").ADFAttributes;
-    inline?: true;
-    code?: boolean;
-    content?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentSpec[];
-    defining?: boolean;
-    definingAsContext?: boolean;
-    definingForContent?: boolean;
-    draggable?: boolean;
-    group?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeGroup").ADFNodeGroup;
-    isolating?: boolean;
-    marks?: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<unknown>[];
-    selectable?: boolean;
-    whitespace?: "pre" | "normal";
-} & {
-    marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
-}> | import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "with_alignment", "with_indentation", "with_no_marks"], {
-    root?: boolean;
-    atom?: boolean;
-    version?: 1;
-    attrs?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFAttribute").ADFAttributes;
-    inline?: true;
-    code?: boolean;
-    content?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentSpec[];
-    defining?: boolean;
-    definingAsContext?: boolean;
-    definingForContent?: boolean;
-    draggable?: boolean;
-    group?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeGroup").ADFNodeGroup;
-    isolating?: boolean;
-    marks?: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<unknown>[];
-    selectable?: boolean;
-    whitespace?: "pre" | "normal";
-} & {
-    marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
-} & {
-    marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
 }>)[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "36.10.12",
+  "version": "36.10.13",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.15.0",
-    "@atlaskit/adf-schema-generator": "^1.8.6",
+    "@atlaskit/adf-schema-generator": "^1.9.1",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",
     "@babel/plugin-proposal-class-properties": "^7.18.6",

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

@@ -0,0 +1,69 @@
+import { adfToValidatorSpec } from '@atlaskit/adf-schema-generator';
+import adfNode from '@atlaskit/adf-schema/src/next-schema/full-schema.adf';
+
+test('should transform adfNode to validator spec', () => {
+  const result = adfToValidatorSpec(adfNode);
+
+  expect(result.heading_with_alignment.json.props).toEqual(
+    heading_with_alignment.props,
+  );
+});
+
+test('should be able to handle weird attrs', () => {
+  const result = adfToValidatorSpec(adfNode);
+
+  expect(result.mention.json.props.attrs).toEqual(mention);
+});
+
+const heading_with_alignment = {
+  props: {
+    attrs: {
+      level: {
+        default: 1,
+        maximum: 6,
+        minimum: 1,
+        type: 'number',
+      },
+    },
+    content: {
+      items: ['inline'],
+      minItems: 0,
+      type: 'array',
+    },
+    marks: {
+      items: [
+        'link',
+        'em',
+        'strong',
+        'strike',
+        'subsup',
+        'underline',
+        'textColor',
+        'annotation',
+        'backgroundColor',
+        'code',
+        'border',
+      ],
+      type: 'array',
+    },
+    type: {
+      type: 'enum',
+      values: ['heading'],
+    },
+  },
+};
+
+const mention = {
+  attrs: {
+    id: { type: 'string', default: '' },
+    localId: { type: 'string', optional: true },
+    text: { type: 'string', default: '', optional: true },
+    accessLevel: { type: 'string', default: '', optional: true },
+    userType: {
+      type: 'enum',
+      values: ['DEFAULT', 'SPECIAL', 'APP'],
+      default: null,
+      optional: true,
+    },
+  },
+};

package/schema-generators/__tests__/unit/jqueries.md

@@ -153,3 +153,16 @@ A number of nodes have `marks` defined, yet the array is empty. Assuming this is
   .block_content, .nestedExpand_content, .non_nestable_block_content, .table_cell_content, .inline_node,
   .bodiedExtension_node.properties.marks, .codeBlock_node.properties.marks, .expand_node.properties.marks, .heading_node.properties.marks, .inlineExtension_node.properties.marks, .text_node.properties.marks, .extension_node.properties.marks, .paragraph_node.properties.marks) else . end)' | pbcopy
 ```
+
+Base level content objects (not nodes) are deleted. `inline` is also deleted, as it is a content object for paragraph.
+
+All fields of content except for type, items, items.$ref and $ref have been deleted as well.
+
+A number of nodes have `marks` defined, yet the array is empty. Assuming this is redundant, I've removed them.
+
+```sh
+ cat packages/adf-schema/json-schema/v1/full.json | jq 'walk(if type == "object" then del(
+  .required, .additionalProperties, .allOf,
+  .block_content, .nestedExpand_content, .non_nestable_block_content, .table_cell_content, .inline_node,
+  .bodiedExtension_node.properties.marks, .codeBlock_node.properties.marks, .expand_node.properties.marks, .heading_node.properties.marks, .inlineExtension_node.properties.marks, .text_node.properties.marks, .extension_node.properties.marks, .paragraph_node.properties.marks) else . end)' | pbcopy
+```

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

@@ -702,7 +702,37 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
-          items: {},
+          items: {
+            anyOf: [
+              {
+                $ref: '#/definitions/hardBreak_node',
+              },
+              {
+                $ref: '#/definitions/mention_node',
+              },
+              {
+                $ref: '#/definitions/emoji_node',
+              },
+              {
+                $ref: '#/definitions/date_node',
+              },
+              {
+                $ref: '#/definitions/placeholder_node',
+              },
+              {
+                $ref: '#/definitions/inlineCard_node',
+              },
+              {
+                $ref: '#/definitions/status_node',
+              },
+              {
+                $ref: '#/definitions/formatted_text_inline_node',
+              },
+              {
+                $ref: '#/definitions/code_inline_node',
+              },
+            ],
+          },
           minItems: 0,
         },
       },
@@ -1062,7 +1092,46 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
-          items: {},
+          items: {
+            anyOf: [
+              {
+                $ref: '#/definitions/codeBlock_with_no_marks_node',
+              },
+              {
+                $ref: '#/definitions/blockCard_node',
+              },
+              {
+                $ref: '#/definitions/paragraph_with_no_marks_node',
+              },
+              {
+                $ref: '#/definitions/mediaSingle_caption_node',
+              },
+              {
+                $ref: '#/definitions/mediaSingle_full_node',
+              },
+              {
+                $ref: '#/definitions/taskList_node',
+              },
+              {
+                $ref: '#/definitions/bulletList_node',
+              },
+              {
+                $ref: '#/definitions/orderedList_node',
+              },
+              {
+                $ref: '#/definitions/heading_with_no_marks_node',
+              },
+              {
+                $ref: '#/definitions/mediaGroup_node',
+              },
+              {
+                $ref: '#/definitions/decisionList_node',
+              },
+              {
+                $ref: '#/definitions/rule_node',
+              },
+            ],
+          },
           minItems: 1,
         },
       },
@@ -1075,7 +1144,19 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
-          items: {},
+          items: {
+            anyOf: [
+              {
+                $ref: '#/definitions/paragraph_with_no_marks_node',
+              },
+              {
+                $ref: '#/definitions/bulletList_node',
+              },
+              {
+                $ref: '#/definitions/orderedList_node',
+              },
+            ],
+          },
           minItems: 1,
         },
       },
@@ -1228,7 +1309,16 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
-          items: {},
+          items: {
+            anyOf: [
+              {
+                $ref: '#/definitions/table_cell_node',
+              },
+              {
+                $ref: '#/definitions/table_header_node',
+              },
+            ],
+          },
         },
       },
     },
@@ -1416,7 +1506,88 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
-          items: {},
+          items: {
+            anyOf: [
+              {
+                $ref: '#/definitions/codeBlock_with_no_marks_node',
+              },
+              {
+                $ref: '#/definitions/codeBlock_with_marks_node',
+              },
+              {
+                $ref: '#/definitions/blockCard_node',
+              },
+              {
+                $ref: '#/definitions/paragraph_with_no_marks_node',
+              },
+              {
+                $ref: '#/definitions/paragraph_with_alignment_node',
+              },
+              {
+                $ref: '#/definitions/paragraph_with_indentation_node',
+              },
+              {
+                $ref: '#/definitions/mediaSingle_caption_node',
+              },
+              {
+                $ref: '#/definitions/mediaSingle_full_node',
+              },
+              {
+                $ref: '#/definitions/taskList_node',
+              },
+              {
+                $ref: '#/definitions/bulletList_node',
+              },
+              {
+                $ref: '#/definitions/orderedList_node',
+              },
+              {
+                $ref: '#/definitions/heading_with_no_marks_node',
+              },
+              {
+                $ref: '#/definitions/heading_with_alignment_node',
+              },
+              {
+                $ref: '#/definitions/heading_with_indentation_node',
+              },
+              {
+                $ref: '#/definitions/mediaGroup_node',
+              },
+              {
+                $ref: '#/definitions/decisionList_node',
+              },
+              {
+                $ref: '#/definitions/rule_node',
+              },
+              {
+                $ref: '#/definitions/panel_node',
+              },
+              {
+                $ref: '#/definitions/blockquote_node',
+              },
+              {
+                $ref: '#/definitions/extension_with_marks_node',
+              },
+              {
+                $ref: '#/definitions/embedCard_node',
+              },
+              {
+                $ref: '#/definitions/table_node',
+              },
+              {
+                $ref: '#/definitions/expand_with_no_mark_node',
+              },
+              {
+                $ref: '#/definitions/expand_with_breakout_mark_node',
+              },
+              {
+                $ref: '#/definitions/bodiedExtension_with_marks_node',
+              },
+              {
+                $ref: '#/definitions/layoutSection_full_node',
+              },
+            ],
+          },
         },
       },
     },
@@ -1426,18 +1597,312 @@ const jsonWithTypes = {
 // New JSON, different to the old JSON schema
 jsonWithTypes.definitions.nestedExpand_node.properties.content = {
   type: 'array',
-  items: {},
+  items: {
+    anyOf: [
+      {
+        $ref: '#/definitions/codeBlock_with_no_marks_node',
+      },
+      {
+        $ref: '#/definitions/paragraph_with_no_marks_node',
+      },
+      {
+        $ref: '#/definitions/mediaSingle_caption_node',
+      },
+      {
+        $ref: '#/definitions/mediaSingle_full_node',
+      },
+      {
+        $ref: '#/definitions/taskList_node',
+      },
+      {
+        $ref: '#/definitions/bulletList_node',
+      },
+      {
+        $ref: '#/definitions/orderedList_node',
+      },
+      {
+        $ref: '#/definitions/heading_with_no_marks_node',
+      },
+      {
+        $ref: '#/definitions/mediaGroup_node',
+      },
+      {
+        $ref: '#/definitions/decisionList_node',
+      },
+      {
+        $ref: '#/definitions/rule_node',
+      },
+      {
+        $ref: '#/definitions/panel_node',
+      },
+      {
+        $ref: '#/definitions/blockquote_node',
+      },
+    ],
+  },
   minItems: 1,
 };
-jsonWithTypes.definitions.expand_node.properties.content.items = {};
-jsonWithTypes.definitions.bodiedExtension_node.properties.content.items = {};
+jsonWithTypes.definitions.expand_node.properties.content.items = {
+  anyOf: [
+    {
+      $ref: '#/definitions/codeBlock_with_no_marks_node',
+    },
+    {
+      $ref: '#/definitions/blockCard_node',
+    },
+    {
+      $ref: '#/definitions/paragraph_with_no_marks_node',
+    },
+    {
+      $ref: '#/definitions/mediaSingle_caption_node',
+    },
+    {
+      $ref: '#/definitions/mediaSingle_full_node',
+    },
+    {
+      $ref: '#/definitions/taskList_node',
+    },
+    {
+      $ref: '#/definitions/bulletList_node',
+    },
+    {
+      $ref: '#/definitions/orderedList_node',
+    },
+    {
+      $ref: '#/definitions/heading_with_no_marks_node',
+    },
+    {
+      $ref: '#/definitions/mediaGroup_node',
+    },
+    {
+      $ref: '#/definitions/decisionList_node',
+    },
+    {
+      $ref: '#/definitions/rule_node',
+    },
+    {
+      $ref: '#/definitions/panel_node',
+    },
+    {
+      $ref: '#/definitions/blockquote_node',
+    },
+    {
+      $ref: '#/definitions/extension_with_marks_node',
+    },
+    {
+      $ref: '#/definitions/embedCard_node',
+    },
+    {
+      $ref: '#/definitions/table_node',
+    },
+  ],
+};
+jsonWithTypes.definitions.bodiedExtension_node.properties.content.items = {
+  anyOf: [
+    {
+      $ref: '#/definitions/codeBlock_with_no_marks_node',
+    },
+    {
+      $ref: '#/definitions/blockCard_node',
+    },
+    {
+      $ref: '#/definitions/paragraph_with_no_marks_node',
+    },
+    {
+      $ref: '#/definitions/mediaSingle_caption_node',
+    },
+    {
+      $ref: '#/definitions/mediaSingle_full_node',
+    },
+    {
+      $ref: '#/definitions/taskList_node',
+    },
+    {
+      $ref: '#/definitions/bulletList_node',
+    },
+    {
+      $ref: '#/definitions/orderedList_node',
+    },
+    {
+      $ref: '#/definitions/heading_with_no_marks_node',
+    },
+    {
+      $ref: '#/definitions/mediaGroup_node',
+    },
+    {
+      $ref: '#/definitions/decisionList_node',
+    },
+    {
+      $ref: '#/definitions/rule_node',
+    },
+    {
+      $ref: '#/definitions/panel_node',
+    },
+    {
+      $ref: '#/definitions/blockquote_node',
+    },
+    {
+      $ref: '#/definitions/extension_with_marks_node',
+    },
+    {
+      $ref: '#/definitions/embedCard_node',
+    },
+    {
+      $ref: '#/definitions/table_node',
+    },
+  ],
+};
 jsonWithTypes.definitions.table_cell_node.properties.content = {
   type: 'array',
-  items: {},
+  items: {
+    anyOf: [
+      {
+        $ref: '#/definitions/codeBlock_with_no_marks_node',
+      },
+      {
+        $ref: '#/definitions/blockCard_node',
+      },
+      {
+        $ref: '#/definitions/paragraph_with_no_marks_node',
+      },
+      {
+        $ref: '#/definitions/paragraph_with_alignment_node',
+      },
+      {
+        $ref: '#/definitions/mediaSingle_caption_node',
+      },
+      {
+        $ref: '#/definitions/mediaSingle_full_node',
+      },
+      {
+        $ref: '#/definitions/taskList_node',
+      },
+      {
+        $ref: '#/definitions/bulletList_node',
+      },
+      {
+        $ref: '#/definitions/orderedList_node',
+      },
+      {
+        $ref: '#/definitions/heading_with_no_marks_node',
+      },
+      {
+        $ref: '#/definitions/heading_with_alignment_node',
+      },
+      {
+        $ref: '#/definitions/heading_with_indentation_node',
+      },
+      {
+        $ref: '#/definitions/mediaGroup_node',
+      },
+      {
+        $ref: '#/definitions/decisionList_node',
+      },
+      {
+        $ref: '#/definitions/rule_node',
+      },
+      {
+        $ref: '#/definitions/panel_node',
+      },
+      {
+        $ref: '#/definitions/blockquote_node',
+      },
+      {
+        $ref: '#/definitions/extension_with_marks_node',
+      },
+      {
+        $ref: '#/definitions/embedCard_node',
+      },
+      {
+        $ref: '#/definitions/nestedExpand_with_no_marks_node',
+      },
+    ],
+  },
   minItems: 1,
 };
 jsonWithTypes.definitions.table_header_node.properties.content = {
   type: 'array',
-  items: {},
+  items: {
+    anyOf: [
+      {
+        $ref: '#/definitions/codeBlock_with_no_marks_node',
+      },
+      {
+        $ref: '#/definitions/blockCard_node',
+      },
+      {
+        $ref: '#/definitions/paragraph_with_no_marks_node',
+      },
+      {
+        $ref: '#/definitions/paragraph_with_alignment_node',
+      },
+      {
+        $ref: '#/definitions/mediaSingle_caption_node',
+      },
+      {
+        $ref: '#/definitions/mediaSingle_full_node',
+      },
+      {
+        $ref: '#/definitions/taskList_node',
+      },
+      {
+        $ref: '#/definitions/bulletList_node',
+      },
+      {
+        $ref: '#/definitions/orderedList_node',
+      },
+      {
+        $ref: '#/definitions/heading_with_no_marks_node',
+      },
+      {
+        $ref: '#/definitions/heading_with_alignment_node',
+      },
+      {
+        $ref: '#/definitions/heading_with_indentation_node',
+      },
+      {
+        $ref: '#/definitions/mediaGroup_node',
+      },
+      {
+        $ref: '#/definitions/decisionList_node',
+      },
+      {
+        $ref: '#/definitions/rule_node',
+      },
+      {
+        $ref: '#/definitions/panel_node',
+      },
+      {
+        $ref: '#/definitions/blockquote_node',
+      },
+      {
+        $ref: '#/definitions/extension_with_marks_node',
+      },
+      {
+        $ref: '#/definitions/embedCard_node',
+      },
+      {
+        $ref: '#/definitions/nestedExpand_with_no_marks_node',
+      },
+    ],
+  },
   minItems: 1,
 };
+jsonWithTypes.definitions.doc_node.properties.content.items.anyOf = [
+  {
+    $ref: '#/definitions/block_content',
+  },
+  {
+    $ref: '#/definitions/layoutSection_node',
+  },
+  {
+    $ref: '#/definitions/layoutSection_full_node',
+  },
+  {
+    $ref: '#/definitions/nestedExpand_node',
+  },
+  // There was no where else to put paragraph, so I'm parking it here for now
+  {
+    $ref: '#/definitions/paragraph_node',
+  },
+];