@atlaskit/adf-schema 36.10.8 → 36.10.10

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 36.10.10
+
+### Patch Changes
+
+- b29eee7: update ADF DSL to match old PM spec, add validation unit test to verify nodeSpec and markSpec generated from ADF DSL
+
+## 36.10.9
+
+### Patch Changes
+
+- 7579d7a: Add minItems field to ADF JSON Schema transformer from ADF DSL
+
 ## 36.10.8
 
 ### Patch Changes

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

@@ -10,6 +10,6 @@ var _layoutSection = require("./nodes/layoutSection");
 var _blockRootOnlyGroup = require("./groups/blockRootOnlyGroup");
 var doc = (0, _adfSchemaGenerator.adfNode)('doc').define({
   root: true,
-  content: [(0, _adfSchemaGenerator.$onePlus)((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))]
 });
 var _default = exports.default = doc;

package/dist/cjs/next-schema/marks/alignmentAndIndentation.js

@@ -8,20 +8,19 @@ var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 // These marks defined together because they form a cycle within the excludes.
 var alignment = exports.alignment = (0, _adfSchemaGenerator.adfMark)('alignment');
 var indentation = exports.indentation = (0, _adfSchemaGenerator.adfMark)('indentation');
-var alignementMarkExclusionGroup = (0, _adfSchemaGenerator.adfMarkGroup)('alignmentMarkExclusion', [alignment]);
-var indentationMarkExclusionGroup = (0, _adfSchemaGenerator.adfMarkGroup)('indentationMarkExclusion', [indentation]);
+var alignementMarkExclusionGroup = (0, _adfSchemaGenerator.adfMarkGroup)('alignment', [alignment]);
+var indentationMarkExclusionGroup = (0, _adfSchemaGenerator.adfMarkGroup)('indentation', [indentation]);
 alignment.define({
-  excludes: [indentationMarkExclusionGroup],
+  excludes: [alignementMarkExclusionGroup, indentationMarkExclusionGroup],
   attrs: {
     align: {
       type: 'enum',
-      values: ['center', 'end'],
-      default: 'center'
+      values: ['center', 'end']
     }
   }
 });
 indentation.define({
-  excludes: [alignementMarkExclusionGroup],
+  excludes: [indentationMarkExclusionGroup, alignementMarkExclusionGroup],
   attrs: {
     level: {
       type: 'number',

package/dist/cjs/next-schema/marks/annotation.js

@@ -3,10 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.annotation = void 0;
+exports.annotationGroup = exports.annotation = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var annotation = exports.annotation = (0, _adfSchemaGenerator.adfMark)('annotation').define({
+var annotation = exports.annotation = (0, _adfSchemaGenerator.adfMark)('annotation');
+var annotationGroup = exports.annotationGroup = (0, _adfSchemaGenerator.adfMarkGroup)('annotation', [annotation]);
+annotation.define({
   inclusive: true,
+  group: annotationGroup,
   attrs: {
     id: {
       type: 'string',

package/dist/cjs/next-schema/marks/breakout.js

@@ -7,7 +7,7 @@ exports.breakout = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 var breakout = exports.breakout = (0, _adfSchemaGenerator.adfMark)('breakout').define({
   spanning: false,
-  inclusive: true,
+  inclusive: false,
   attrs: {
     mode: {
       type: 'enum',

package/dist/cjs/next-schema/marks/code.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.code = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var _colorGroup = require("../groups/colorGroup");
 var _fontStyleGroup = require("../groups/fontStyleGroup");
 var _linkMarkGroup = require("../groups/linkMarkGroup");
 var _searchQueryMarkGroup = require("../groups/searchQueryMarkGroup");
+var _color = require("./color");
 var code = exports.code = (0, _adfSchemaGenerator.adfMark)('code').define({
-  excludes: [_fontStyleGroup.fontStyleGroup, _linkMarkGroup.linkMarkGroup, _searchQueryMarkGroup.searchQueryMarkGroup, _colorGroup.colorGroup],
+  excludes: [_fontStyleGroup.fontStyleGroup, _linkMarkGroup.linkMarkGroup, _searchQueryMarkGroup.searchQueryMarkGroup, _color.colorGroup],
   inclusive: true
 });

package/dist/cjs/next-schema/marks/color.js

@@ -0,0 +1,29 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.textColor = exports.colorGroup = exports.backgroundColor = void 0;
+var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var backgroundColor = exports.backgroundColor = (0, _adfSchemaGenerator.adfMark)('backgroundColor');
+var textColor = exports.textColor = (0, _adfSchemaGenerator.adfMark)('textColor');
+var colorGroup = exports.colorGroup = (0, _adfSchemaGenerator.adfMarkGroup)('color', [textColor, backgroundColor]);
+backgroundColor.define({
+  inclusive: true,
+  excludes: [colorGroup],
+  attrs: {
+    color: {
+      pattern: '^#[0-9a-fA-F]{6}$',
+      type: 'string'
+    }
+  }
+});
+textColor.define({
+  inclusive: true,
+  attrs: {
+    color: {
+      type: 'string',
+      pattern: '^#[0-9a-fA-F]{6}$'
+    }
+  }
+});

package/dist/cjs/next-schema/marks/dataConsumer.js

@@ -11,7 +11,9 @@ var dataConsumer = exports.dataConsumer = (0, _adfSchemaGenerator.adfMark)('data
       type: 'array',
       items: {
         type: 'string'
-      }
+      },
+      minItems: 1,
+      default: []
     }
   }
 });

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

@@ -34,6 +34,7 @@ var blockCard = exports.blockCard = (0, _adfSchemaGenerator.adfNode)('blockCard'
               },
               type: 'object'
             },
+            minItems: 1,
             type: 'array'
           }
         }

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

@@ -9,5 +9,5 @@ var _tableCell = require("./tableCell");
 var _tableHeader = require("./tableHeader");
 var tableRow = exports.tableRow = (0, _adfSchemaGenerator.adfNode)('tableRow').define({
   selectable: false,
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_tableCell.tableCell, _tableHeader.tableHeader))]
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_tableCell.tableCell, _tableHeader.tableHeader))]
 });

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

@@ -12,11 +12,10 @@ var _link = require("../marks/link");
 var _strike = require("../marks/strike");
 var _strong = require("../marks/strong");
 var _subsup = require("../marks/subsup");
-var _textColor = require("../marks/textColor");
 var _underline = require("../marks/underline");
-var _backgroundColor = require("../marks/backgroundColor");
+var _color = require("../marks/color");
 var text = exports.text = (0, _adfSchemaGenerator.adfNode)('text').define({}).variant('formatted', {
-  marks: [_link.link, _em.em, _strong.strong, _strike.strike, _subsup.subsup, _underline.underline, _textColor.textColor, _annotation.annotation, _backgroundColor.backgroundColor]
+  marks: [_link.link, _em.em, _strong.strong, _strike.strike, _subsup.subsup, _underline.underline, _color.textColor, _annotation.annotation, _color.backgroundColor]
 }).variant('code_inline', {
   marks: [_code.code, _link.link, _annotation.annotation]
 });

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

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

package/dist/es2019/next-schema/marks/alignmentAndIndentation.js

@@ -4,20 +4,19 @@ import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
 // These marks defined together because they form a cycle within the excludes.
 export const alignment = adfMark('alignment');
 export const indentation = adfMark('indentation');
-const alignementMarkExclusionGroup = adfMarkGroup('alignmentMarkExclusion', [alignment]);
-const indentationMarkExclusionGroup = adfMarkGroup('indentationMarkExclusion', [indentation]);
+const alignementMarkExclusionGroup = adfMarkGroup('alignment', [alignment]);
+const indentationMarkExclusionGroup = adfMarkGroup('indentation', [indentation]);
 alignment.define({
-  excludes: [indentationMarkExclusionGroup],
+  excludes: [alignementMarkExclusionGroup, indentationMarkExclusionGroup],
   attrs: {
     align: {
       type: 'enum',
-      values: ['center', 'end'],
-      default: 'center'
+      values: ['center', 'end']
     }
   }
 });
 indentation.define({
-  excludes: [alignementMarkExclusionGroup],
+  excludes: [indentationMarkExclusionGroup, alignementMarkExclusionGroup],
   attrs: {
     level: {
       type: 'number',

package/dist/es2019/next-schema/marks/annotation.js

@@ -1,6 +1,9 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
-export const annotation = adfMark('annotation').define({
+import { adfMark, adfMarkGroup } from '@atlaskit/adf-schema-generator';
+export const annotation = adfMark('annotation');
+export const annotationGroup = adfMarkGroup('annotation', [annotation]);
+annotation.define({
   inclusive: true,
+  group: annotationGroup,
   attrs: {
     id: {
       type: 'string',

package/dist/es2019/next-schema/marks/breakout.js

@@ -1,7 +1,7 @@
 import { adfMark } from '@atlaskit/adf-schema-generator';
 export const breakout = adfMark('breakout').define({
   spanning: false,
-  inclusive: true,
+  inclusive: false,
   attrs: {
     mode: {
       type: 'enum',

package/dist/es2019/next-schema/marks/code.js

@@ -1,8 +1,8 @@
 import { adfMark } from '@atlaskit/adf-schema-generator';
-import { colorGroup } from '../groups/colorGroup';
 import { fontStyleGroup } from '../groups/fontStyleGroup';
 import { linkMarkGroup } from '../groups/linkMarkGroup';
 import { searchQueryMarkGroup } from '../groups/searchQueryMarkGroup';
+import { colorGroup } from './color';
 export const code = adfMark('code').define({
   excludes: [fontStyleGroup, linkMarkGroup, searchQueryMarkGroup, colorGroup],
   inclusive: true

package/dist/es2019/next-schema/marks/color.js

@@ -0,0 +1,24 @@
+import { adfMark } from '@atlaskit/adf-schema-generator';
+import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
+export const backgroundColor = adfMark('backgroundColor');
+export const textColor = adfMark('textColor');
+export const colorGroup = adfMarkGroup('color', [textColor, backgroundColor]);
+backgroundColor.define({
+  inclusive: true,
+  excludes: [colorGroup],
+  attrs: {
+    color: {
+      pattern: '^#[0-9a-fA-F]{6}$',
+      type: 'string'
+    }
+  }
+});
+textColor.define({
+  inclusive: true,
+  attrs: {
+    color: {
+      type: 'string',
+      pattern: '^#[0-9a-fA-F]{6}$'
+    }
+  }
+});

package/dist/es2019/next-schema/marks/dataConsumer.js

@@ -5,7 +5,9 @@ export const dataConsumer = adfMark('dataConsumer').define({
       type: 'array',
       items: {
         type: 'string'
-      }
+      },
+      minItems: 1,
+      default: []
     }
   }
 });

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

@@ -28,6 +28,7 @@ export const blockCard = adfNode('blockCard').define({
               },
               type: 'object'
             },
+            minItems: 1,
             type: 'array'
           }
         }

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

@@ -1,7 +1,7 @@
-import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
+import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
 import { tableCell } from './tableCell';
 import { tableHeader } from './tableHeader';
 export const tableRow = adfNode('tableRow').define({
   selectable: false,
-  content: [$onePlus($or(tableCell, tableHeader))]
+  content: [$zeroPlus($or(tableCell, tableHeader))]
 });

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

@@ -6,9 +6,8 @@ import { link } from '../marks/link';
 import { strike } from '../marks/strike';
 import { strong } from '../marks/strong';
 import { subsup } from '../marks/subsup';
-import { textColor } from '../marks/textColor';
 import { underline } from '../marks/underline';
-import { backgroundColor } from '../marks/backgroundColor';
+import { backgroundColor, textColor } from '../marks/color';
 export const text = adfNode('text').define({}).variant('formatted', {
   marks: [link, em, strong, strike, subsup, underline, textColor, annotation, backgroundColor]
 }).variant('code_inline', {

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

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

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

@@ -4,20 +4,19 @@ import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
 // These marks defined together because they form a cycle within the excludes.
 export var alignment = adfMark('alignment');
 export var indentation = adfMark('indentation');
-var alignementMarkExclusionGroup = adfMarkGroup('alignmentMarkExclusion', [alignment]);
-var indentationMarkExclusionGroup = adfMarkGroup('indentationMarkExclusion', [indentation]);
+var alignementMarkExclusionGroup = adfMarkGroup('alignment', [alignment]);
+var indentationMarkExclusionGroup = adfMarkGroup('indentation', [indentation]);
 alignment.define({
-  excludes: [indentationMarkExclusionGroup],
+  excludes: [alignementMarkExclusionGroup, indentationMarkExclusionGroup],
   attrs: {
     align: {
       type: 'enum',
-      values: ['center', 'end'],
-      default: 'center'
+      values: ['center', 'end']
     }
   }
 });
 indentation.define({
-  excludes: [alignementMarkExclusionGroup],
+  excludes: [indentationMarkExclusionGroup, alignementMarkExclusionGroup],
   attrs: {
     level: {
       type: 'number',

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

@@ -1,6 +1,9 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
-export var annotation = adfMark('annotation').define({
+import { adfMark, adfMarkGroup } from '@atlaskit/adf-schema-generator';
+export var annotation = adfMark('annotation');
+export var annotationGroup = adfMarkGroup('annotation', [annotation]);
+annotation.define({
   inclusive: true,
+  group: annotationGroup,
   attrs: {
     id: {
       type: 'string',

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

@@ -1,7 +1,7 @@
 import { adfMark } from '@atlaskit/adf-schema-generator';
 export var breakout = adfMark('breakout').define({
   spanning: false,
-  inclusive: true,
+  inclusive: false,
   attrs: {
     mode: {
       type: 'enum',

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

@@ -1,8 +1,8 @@
 import { adfMark } from '@atlaskit/adf-schema-generator';
-import { colorGroup } from '../groups/colorGroup';
 import { fontStyleGroup } from '../groups/fontStyleGroup';
 import { linkMarkGroup } from '../groups/linkMarkGroup';
 import { searchQueryMarkGroup } from '../groups/searchQueryMarkGroup';
+import { colorGroup } from './color';
 export var code = adfMark('code').define({
   excludes: [fontStyleGroup, linkMarkGroup, searchQueryMarkGroup, colorGroup],
   inclusive: true

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

@@ -0,0 +1,24 @@
+import { adfMark } from '@atlaskit/adf-schema-generator';
+import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
+export var backgroundColor = adfMark('backgroundColor');
+export var textColor = adfMark('textColor');
+export var colorGroup = adfMarkGroup('color', [textColor, backgroundColor]);
+backgroundColor.define({
+  inclusive: true,
+  excludes: [colorGroup],
+  attrs: {
+    color: {
+      pattern: '^#[0-9a-fA-F]{6}$',
+      type: 'string'
+    }
+  }
+});
+textColor.define({
+  inclusive: true,
+  attrs: {
+    color: {
+      type: 'string',
+      pattern: '^#[0-9a-fA-F]{6}$'
+    }
+  }
+});

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

@@ -5,7 +5,9 @@ export var dataConsumer = adfMark('dataConsumer').define({
       type: 'array',
       items: {
         type: 'string'
-      }
+      },
+      minItems: 1,
+      default: []
     }
   }
 });

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

@@ -28,6 +28,7 @@ export var blockCard = adfNode('blockCard').define({
               },
               type: 'object'
             },
+            minItems: 1,
             type: 'array'
           }
         }

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

@@ -1,7 +1,7 @@
-import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
+import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
 import { tableCell } from './tableCell';
 import { tableHeader } from './tableHeader';
 export var tableRow = adfNode('tableRow').define({
   selectable: false,
-  content: [$onePlus($or(tableCell, tableHeader))]
+  content: [$zeroPlus($or(tableCell, tableHeader))]
 });

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

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

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "36.10.8",
+  "version": "36.10.10",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -21,7 +21,7 @@
     "generate:json-schema:full": "json-schema-generator --outDir=./json-schema/v1/ ./src/schema/nodes/doc.ts",
     "ak-postbuild": "yarn build:json-schema",
     "test": "yarn test:unit",
-    "test:unit": "yarn workspace @atlaskit/editor-prosemirror build && jest --testPathPattern=adf-schema/src --config=../../jest.config.js",
+    "test:unit": "yarn workspace @atlaskit/editor-prosemirror build && jest --testPathPattern=packages/adf-schema/ --config=../../jest.config.js",
     "build:cjs": "NODE_ENV=production BABEL_ENV=production:node-cjs babel --config-file ../../babel.config.js src --out-dir dist/cjs -x .ts,.tsx",
     "build:esm": "NODE_ENV=production BABEL_ENV=production:esm babel --config-file ../../babel.config.js src -d dist/esm -x .ts,.tsx",
     "build:es2019": "NODE_ENV=production BABEL_ENV=production:es2019 babel --config-file ../../babel.config.js src -d dist/es2019 -x .ts,.tsx",
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.15.0",
-    "@atlaskit/adf-schema-generator": "^1.8.1",
+    "@atlaskit/adf-schema-generator": "^1.8.3",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",
     "@babel/plugin-proposal-class-properties": "^7.18.6",

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

@@ -114,3 +114,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 and items 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(
+  .version, .required, .additionalProperties, .allOf, .content.items.anyOf?, .content.items."$ref"?, .content.items[]?, .content."$ref",
+  .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

@@ -230,6 +230,7 @@ const jsonWithTypes = {
               items: {
                 type: 'string',
               },
+              minItems: 1,
             },
           },
         },
@@ -455,6 +456,7 @@ const jsonWithTypes = {
                           properties: {},
                         },
                       },
+                      minItems: 1,
                     },
                   },
                 },
@@ -699,6 +701,7 @@ const jsonWithTypes = {
         content: {
           type: 'array',
           items: {},
+          minItems: 0,
         },
       },
     },
@@ -801,6 +804,7 @@ const jsonWithTypes = {
         content: {
           type: 'array',
           items: [],
+          minItems: 1,
         },
         attrs: {
           type: 'object',
@@ -821,6 +825,7 @@ const jsonWithTypes = {
         content: {
           type: 'array',
           items: [],
+          minItems: 1,
         },
       },
     },
@@ -833,6 +838,7 @@ const jsonWithTypes = {
         content: {
           type: 'array',
           items: {},
+          minItems: 1,
         },
       },
     },
@@ -845,6 +851,7 @@ const jsonWithTypes = {
         content: {
           type: 'array',
           items: {},
+          minItems: 1,
         },
         attrs: {
           type: 'object',
@@ -891,6 +898,7 @@ const jsonWithTypes = {
         content: {
           type: 'array',
           items: {},
+          minItems: 1,
         },
       },
     },
@@ -926,6 +934,7 @@ const jsonWithTypes = {
         content: {
           type: 'array',
           items: {},
+          minItems: 1,
         },
         attrs: {
           type: 'object',
@@ -982,6 +991,7 @@ const jsonWithTypes = {
         content: {
           type: 'array',
           items: {},
+          minItems: 1,
         },
       },
     },
@@ -994,6 +1004,7 @@ const jsonWithTypes = {
         content: {
           type: 'array',
           items: {},
+          minItems: 1,
         },
       },
     },
@@ -1123,6 +1134,7 @@ const jsonWithTypes = {
         content: {
           type: 'array',
           items: {},
+          minItems: 1,
         },
         marks: {
           type: 'array',
@@ -1219,6 +1231,7 @@ const jsonWithTypes = {
         content: {
           type: 'array',
           items: {},
+          minItems: 1,
         },
       },
     },
@@ -1257,6 +1270,7 @@ const jsonWithTypes = {
         content: {
           type: 'array',
           items: {},
+          minItems: 1,
         },
       },
     },
@@ -1280,6 +1294,7 @@ const jsonWithTypes = {
         content: {
           type: 'array',
           items: {},
+          minItems: 1,
         },
       },
     },
@@ -1325,12 +1340,15 @@ jsonWithTypes.definitions.heading_node.properties.content = {
 jsonWithTypes.definitions.nestedExpand_node.properties.content = {
   type: 'array',
   items: {},
+  minItems: 1,
 };
 jsonWithTypes.definitions.table_cell_node.properties.content = {
   type: 'array',
   items: {},
+  minItems: 1,
 };
 jsonWithTypes.definitions.table_header_node.properties.content = {
   type: 'array',
   items: {},
+  minItems: 1,
 };

package/schema-generators/__tests__/unit/validate-pm-schema.unit.ts

@@ -0,0 +1,110 @@
+import { MarkSpec, NodeSpec, Schema } from '@atlaskit/editor-prosemirror/model';
+import * as newMarkSpecs from '@atlaskit/adf-schema-generator/src/generated/markTypes';
+import * as newNodeSpecs from '@atlaskit/adf-schema-generator/src/generated/nodeTypes';
+import {
+  MarkSpecFactory,
+  NodeSpecFactory,
+} from '@atlaskit/adf-schema-generator/src/transforms/adfToPm/createPMSpecFactory';
+import { defaultSchema } from '../../../src/schema/default-schema';
+
+function isMarkSpec(value: MarkSpec | NodeSpec): value is MarkSpec {
+  return true;
+}
+
+/**
+ * Custom omit function, mainly used to filter out parseDOM and toDOM from old spec
+ * and some special logic to filter out certain field when compare spec
+ * @param data
+ * @param keys
+ * @returns
+ */
+function omit<T extends object>(data: T, keys: (keyof T)[]): T {
+  const result = { ...data };
+  for (const k of keys) {
+    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+    delete result[k];
+  }
+  if (isMarkSpec(data)) {
+    // Treat excludes: '' same as no excludes property
+    if (data.excludes !== undefined && data.excludes === '') {
+      // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+      delete result['excludes'];
+    }
+  }
+  return result;
+}
+
+describe('validate PM schema', () => {
+  describe('marks', () => {
+    const { marks } = defaultSchema as Schema;
+    const skipLists = [
+      'link', // TODO: new link mark is not matching old link mark
+      'confluenceInlineComment', // TODO: not exist in ADF DSL
+      'unsupportedMark', // TODO: not exist in ADF DSL
+      'unsupportedNodeAttribute', // TODO: not exist in ADF DSL
+      'typeAheadQuery', // TODO: not exist in ADF DSL
+      // Following marks not exported in adf-schema
+      '__colorGroupDeclaration',
+      '__fontStyleGroupDeclaration',
+      '__searchQueryGroupDeclaration',
+      '__linkGroupDeclaration',
+    ];
+
+    const testCases = Object.entries(marks).map(([key, value]) => {
+      return {
+        name: key,
+        legacyMarkSpec: value.spec,
+        newMarkSpecFn: newMarkSpecs[`${key}`] as MarkSpecFactory,
+        skip: skipLists.includes(key),
+      };
+    });
+
+    const getTestingMethod = (skip: boolean) => {
+      return skip ? it.skip : it;
+    };
+
+    testCases.forEach(({ name, legacyMarkSpec, newMarkSpecFn, skip }) => {
+      const testMethod = getTestingMethod(skip);
+
+      testMethod(`validate markSpec for mark ${name}`, () => {
+        // check if there's any missing markSpec
+        expect(newMarkSpecFn).toBeDefined();
+        const newMarkSpec = newMarkSpecFn({});
+        expect(omit(newMarkSpec, ['parseDOM', 'toDOM'])).toEqual(
+          omit(legacyMarkSpec, ['parseDOM', 'toDOM']),
+        );
+      });
+    });
+  });
+
+  // TODO: content from node is too strict, need a custom comparor
+  // TODO: marks are not matching, especially missing unsupportedBlock, unsupportedNodeAttribute
+  describe.skip('nodes', () => {
+    const { nodes } = defaultSchema as Schema;
+    const skipLists = ['unknownBlock', 'unsupportedBlock', 'unsupportedInline'];
+    const testCases = Object.entries(nodes).map(([key, value]) => {
+      return {
+        name: key,
+        legacyNodeSpec: value.spec,
+        newNodeSpecFn: newNodeSpecs[`${key}`] as NodeSpecFactory,
+        skip: skipLists.includes(key),
+      };
+    });
+
+    const getTestingMethod = (skip: boolean) => {
+      return skip ? it.skip : it;
+    };
+
+    testCases.forEach(({ name, legacyNodeSpec, newNodeSpecFn, skip }) => {
+      const testMethod = getTestingMethod(skip);
+      testMethod(`validate nodeSpec for node ${name}`, () => {
+        // check if there's any missing nodeSpec
+        expect(newNodeSpecFn).toBeDefined();
+        const newNodeSpec = newNodeSpecFn({});
+        expect(omit(newNodeSpec, ['parseDOM', 'toDOM'])).toEqual(
+          omit(legacyNodeSpec, ['parseDOM', 'toDOM']),
+        );
+      });
+    });
+  });
+});

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

@@ -1,8 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.annotationGroup = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var annotationGroup = exports.annotationGroup = (0, _adfSchemaGenerator.adfMarkGroup)('annotation');

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

@@ -1,9 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.colorGroup = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var _textColor = require("../marks/textColor");
-var colorGroup = exports.colorGroup = (0, _adfSchemaGenerator.adfMarkGroup)('color', [_textColor.textColor]);

package/dist/cjs/next-schema/marks/backgroundColor.js

@@ -1,15 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.backgroundColor = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var backgroundColor = exports.backgroundColor = (0, _adfSchemaGenerator.adfMark)('backgroundColor').define({
-  attrs: {
-    color: {
-      pattern: '^#[0-9a-fA-F]{6}$',
-      type: 'string'
-    }
-  }
-});

package/dist/cjs/next-schema/marks/textColor.js

@@ -1,16 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.textColor = void 0;
-var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var textColor = exports.textColor = (0, _adfSchemaGenerator.adfMark)('textColor').define({
-  inclusive: true,
-  attrs: {
-    color: {
-      type: 'string',
-      pattern: '^#[0-9a-fA-F]{6}$'
-    }
-  }
-});

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

@@ -1,2 +0,0 @@
-import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
-export const annotationGroup = adfMarkGroup('annotation');

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

@@ -1,3 +0,0 @@
-import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
-import { textColor } from '../marks/textColor';
-export const colorGroup = adfMarkGroup('color', [textColor]);

package/dist/es2019/next-schema/marks/backgroundColor.js

@@ -1,9 +0,0 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
-export const backgroundColor = adfMark('backgroundColor').define({
-  attrs: {
-    color: {
-      pattern: '^#[0-9a-fA-F]{6}$',
-      type: 'string'
-    }
-  }
-});

package/dist/es2019/next-schema/marks/textColor.js

@@ -1,10 +0,0 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
-export const textColor = adfMark('textColor').define({
-  inclusive: true,
-  attrs: {
-    color: {
-      type: 'string',
-      pattern: '^#[0-9a-fA-F]{6}$'
-    }
-  }
-});

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

@@ -1,2 +0,0 @@
-import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
-export var annotationGroup = adfMarkGroup('annotation');

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

@@ -1,3 +0,0 @@
-import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
-import { textColor } from '../marks/textColor';
-export var colorGroup = adfMarkGroup('color', [textColor]);

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

@@ -1,9 +0,0 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
-export var backgroundColor = adfMark('backgroundColor').define({
-  attrs: {
-    color: {
-      pattern: '^#[0-9a-fA-F]{6}$',
-      type: 'string'
-    }
-  }
-});

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

@@ -1,10 +0,0 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
-export var textColor = adfMark('textColor').define({
-  inclusive: true,
-  attrs: {
-    color: {
-      type: 'string',
-      pattern: '^#[0-9a-fA-F]{6}$'
-    }
-  }
-});

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

@@ -1 +0,0 @@
-export declare const annotationGroup: import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkGroup").ADFMarkGroup;

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

@@ -1 +0,0 @@
-export declare const colorGroup: import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkGroup").ADFMarkGroup;

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

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

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

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