@atlaskit/adf-schema 36.18.1 → 36.18.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 36.18.3
+
+### Patch Changes
+
+- 3ed35ed: refacotor build attrs when build pm spec, unskip few tests of validation for mark spec
+
+## 36.18.2
+
+### Patch Changes
+
+- 4126ead: json schema validation for the next schema produced by adf-schema-generator
+
 ## 36.18.1
 
 ### Patch Changes

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unsupportedNodeAttribute = exports.unsupportedMark = exports.underline = exports.textColor = exports.subsup = exports.strong = exports.strike = exports.link = exports.indentation = exports.fragment = exports.em = exports.dataConsumer = exports.code = exports.breakout = exports.border = exports.backgroundColor = exports.annotation = exports.alignment = void 0;
+exports.unsupportedNodeAttribute = exports.unsupportedMark = exports.underline = exports.typeAheadQuery = exports.textColor = exports.subsup = exports.strong = exports.strike = exports.link = exports.indentation = exports.fragment = exports.em = exports.dataConsumer = exports.confluenceInlineComment = exports.code = exports.breakout = exports.border = exports.backgroundColor = exports.annotation = exports.alignment = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 /**
  * This file was automatically generated by @atlaskit/adf-schema-generator
@@ -13,28 +13,19 @@ var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 
 var unsupportedNodeAttribute = exports.unsupportedNodeAttribute = (0, _adfSchemaGenerator.createPMMarkSpecFactory)({
   attrs: {
-    type: {
-      default: null
-    },
-    unsupported: {
-      default: {}
-    }
+    unsupported: {},
+    type: {}
   }
 });
 var unsupportedMark = exports.unsupportedMark = (0, _adfSchemaGenerator.createPMMarkSpecFactory)({
   attrs: {
-    originalValue: {
-      default: {}
-    }
-  }
+    originalValue: {}
+  },
+  excludes: ''
 });
 var link = exports.link = (0, _adfSchemaGenerator.createPMMarkSpecFactory)({
   attrs: {
     href: {},
-    title: {},
-    id: {},
-    collection: {},
-    occurrenceKey: {},
     __confluenceMetadata: {
       default: null
     }
@@ -85,6 +76,7 @@ var annotation = exports.annotation = (0, _adfSchemaGenerator.createPMMarkSpecFa
     }
   },
   inclusive: true,
+  excludes: '',
   group: 'annotation'
 });
 var backgroundColor = exports.backgroundColor = (0, _adfSchemaGenerator.createPMMarkSpecFactory)({
@@ -95,6 +87,24 @@ var backgroundColor = exports.backgroundColor = (0, _adfSchemaGenerator.createPM
   excludes: 'color',
   group: 'color'
 });
+var typeAheadQuery = exports.typeAheadQuery = (0, _adfSchemaGenerator.createPMMarkSpecFactory)({
+  attrs: {
+    trigger: {
+      default: ''
+    }
+  },
+  inclusive: true,
+  group: 'searchQuery'
+});
+var confluenceInlineComment = exports.confluenceInlineComment = (0, _adfSchemaGenerator.createPMMarkSpecFactory)({
+  attrs: {
+    reference: {
+      default: ''
+    }
+  },
+  inclusive: false,
+  excludes: ''
+});
 var code = exports.code = (0, _adfSchemaGenerator.createPMMarkSpecFactory)({
   inclusive: true,
   excludes: 'fontStyle link searchQuery color'
@@ -115,7 +125,8 @@ var fragment = exports.fragment = (0, _adfSchemaGenerator.createPMMarkSpecFactor
       default: null
     }
   },
-  inclusive: false
+  inclusive: false,
+  excludes: ''
 });
 var border = exports.border = (0, _adfSchemaGenerator.createPMMarkSpecFactory)({
   attrs: {

package/dist/cjs/next-schema/generated/nodeTypes.js

@@ -288,7 +288,7 @@ var confluenceUnsupportedInline = exports.confluenceUnsupportedInline = (0, _adf
 });
 var paragraphWithNoMarks = exports.paragraphWithNoMarks = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
   content: 'inline*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   selectable: false
 });
 var media = exports.media = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
@@ -513,13 +513,13 @@ var panel = exports.panel = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
 });
 var paragraph = exports.paragraph = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
   content: 'inline*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   group: 'block',
   selectable: false
 });
 var paragraphWithMarks = exports.paragraphWithMarks = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
   content: 'inline*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   group: 'block',
   selectable: false
 });
@@ -553,7 +553,7 @@ var headingWithIndentation = exports.headingWithIndentation = (0, _adfSchemaGene
 });
 var paragraphWithAlignment = exports.paragraphWithAlignment = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({
   content: 'inline*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   selectable: false
 });
 var blockquote = exports.blockquote = (0, _adfSchemaGenerator.createPMNodeSpecFactory)({

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

@@ -5,4 +5,5 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.searchQueryMarkGroup = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
-var searchQueryMarkGroup = exports.searchQueryMarkGroup = (0, _adfSchemaGenerator.adfMarkGroup)('searchQuery');
+var _typeAheadQuery = require("../marks/typeAheadQuery");
+var searchQueryMarkGroup = exports.searchQueryMarkGroup = (0, _adfSchemaGenerator.adfMarkGroup)('searchQuery', [_typeAheadQuery.typeAheadQuery]);

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

@@ -9,6 +9,7 @@ var annotation = exports.annotation = (0, _adfSchemaGenerator.adfMark)('annotati
 var annotationGroup = exports.annotationGroup = (0, _adfSchemaGenerator.adfMarkGroup)('annotation', [annotation]);
 annotation.define({
   inclusive: true,
+  excludes: _adfSchemaGenerator.MarkExcludesNone,
   group: annotationGroup,
   attrs: {
     id: {

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

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.confluenceInlineComment = void 0;
+var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var confluenceInlineComment = exports.confluenceInlineComment = (0, _adfSchemaGenerator.adfMark)('confluenceInlineComment').define({
+  ignore: [_adfSchemaGenerator.JSONSchemaTransformerName, _adfSchemaGenerator.ValidatorSpecTransformerName],
+  inclusive: false,
+  excludes: _adfSchemaGenerator.MarkExcludesNone,
+  attrs: {
+    reference: {
+      type: 'string',
+      default: ''
+    }
+  }
+});

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

@@ -7,6 +7,8 @@ exports.fragment = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 var fragment = exports.fragment = (0, _adfSchemaGenerator.adfMark)('fragment').define({
   inclusive: false,
+  excludes: _adfSchemaGenerator.MarkExcludesNone,
+  allowExcludesEmpty: true,
   attrs: {
     localId: {
       minLength: 1,

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

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.typeAheadQuery = void 0;
+var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
+var typeAheadQuery = exports.typeAheadQuery = (0, _adfSchemaGenerator.adfMark)('typeAheadQuery').define({
+  ignore: [_adfSchemaGenerator.JSONSchemaTransformerName, _adfSchemaGenerator.ValidatorSpecTransformerName],
+  inclusive: true,
+  attrs: {
+    trigger: {
+      type: 'string',
+      default: ''
+    }
+  }
+});

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

@@ -7,10 +7,11 @@ exports.unsupportedMark = void 0;
 var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 var unsupportedMark = exports.unsupportedMark = (0, _adfSchemaGenerator.adfMark)('unsupportedMark').define({
   ignore: [_adfSchemaGenerator.JSONSchemaTransformerName, _adfSchemaGenerator.ValidatorSpecTransformerName],
+  excludes: _adfSchemaGenerator.MarkExcludesNone,
+  allowExcludesEmpty: true,
   attrs: {
     originalValue: {
-      type: 'object',
-      default: {}
+      type: 'object'
     }
   }
 });

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

@@ -8,13 +8,11 @@ var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
 var unsupportedNodeAttribute = exports.unsupportedNodeAttribute = (0, _adfSchemaGenerator.adfMark)('unsupportedNodeAttribute').define({
   ignore: [_adfSchemaGenerator.JSONSchemaTransformerName, _adfSchemaGenerator.ValidatorSpecTransformerName],
   attrs: {
-    type: {
-      type: 'string',
-      default: null
-    },
     unsupported: {
-      type: 'object',
-      default: {}
+      type: 'object'
+    },
+    type: {
+      type: 'string'
     }
   }
 });

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

@@ -16,8 +16,10 @@ var _underline = require("../marks/underline");
 var _color = require("../marks/color");
 var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
 var _unsupportedMark = require("../marks/unsupportedMark");
+var _typeAheadQuery = require("../marks/typeAheadQuery");
+var _confluenceInlineComment = require("../marks/confluenceInlineComment");
 var text = exports.text = (0, _adfSchemaGenerator.adfNode)('text').define({}).variant('formatted', {
-  marks: [_link.link, _em.em, _strong.strong, _strike.strike, _subsup.subsup, _underline.underline, _color.textColor, _annotation.annotation, _color.backgroundColor, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark]
+  marks: [_link.link, _em.em, _strong.strong, _strike.strike, _subsup.subsup, _underline.underline, _color.textColor, _annotation.annotation, _color.backgroundColor, _typeAheadQuery.typeAheadQuery, _confluenceInlineComment.confluenceInlineComment, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark]
 }).variant('code_inline', {
   marks: [_code.code, _link.link, _annotation.annotation, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark]
 });

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

@@ -7,28 +7,19 @@
 import { createPMMarkSpecFactory } from '@atlaskit/adf-schema-generator';
 export const unsupportedNodeAttribute = createPMMarkSpecFactory({
   attrs: {
-    type: {
-      default: null
-    },
-    unsupported: {
-      default: {}
-    }
+    unsupported: {},
+    type: {}
   }
 });
 export const unsupportedMark = createPMMarkSpecFactory({
   attrs: {
-    originalValue: {
-      default: {}
-    }
-  }
+    originalValue: {}
+  },
+  excludes: ''
 });
 export const link = createPMMarkSpecFactory({
   attrs: {
     href: {},
-    title: {},
-    id: {},
-    collection: {},
-    occurrenceKey: {},
     __confluenceMetadata: {
       default: null
     }
@@ -79,6 +70,7 @@ export const annotation = createPMMarkSpecFactory({
     }
   },
   inclusive: true,
+  excludes: '',
   group: 'annotation'
 });
 export const backgroundColor = createPMMarkSpecFactory({
@@ -89,6 +81,24 @@ export const backgroundColor = createPMMarkSpecFactory({
   excludes: 'color',
   group: 'color'
 });
+export const typeAheadQuery = createPMMarkSpecFactory({
+  attrs: {
+    trigger: {
+      default: ''
+    }
+  },
+  inclusive: true,
+  group: 'searchQuery'
+});
+export const confluenceInlineComment = createPMMarkSpecFactory({
+  attrs: {
+    reference: {
+      default: ''
+    }
+  },
+  inclusive: false,
+  excludes: ''
+});
 export const code = createPMMarkSpecFactory({
   inclusive: true,
   excludes: 'fontStyle link searchQuery color'
@@ -109,7 +119,8 @@ export const fragment = createPMMarkSpecFactory({
       default: null
     }
   },
-  inclusive: false
+  inclusive: false,
+  excludes: ''
 });
 export const border = createPMMarkSpecFactory({
   attrs: {

package/dist/es2019/next-schema/generated/nodeTypes.js

@@ -282,7 +282,7 @@ export const confluenceUnsupportedInline = createPMNodeSpecFactory({
 });
 export const paragraphWithNoMarks = createPMNodeSpecFactory({
   content: 'inline*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   selectable: false
 });
 export const media = createPMNodeSpecFactory({
@@ -507,13 +507,13 @@ export const panel = createPMNodeSpecFactory({
 });
 export const paragraph = createPMNodeSpecFactory({
   content: 'inline*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   group: 'block',
   selectable: false
 });
 export const paragraphWithMarks = createPMNodeSpecFactory({
   content: 'inline*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   group: 'block',
   selectable: false
 });
@@ -547,7 +547,7 @@ export const headingWithIndentation = createPMNodeSpecFactory({
 });
 export const paragraphWithAlignment = createPMNodeSpecFactory({
   content: 'inline*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   selectable: false
 });
 export const blockquote = createPMNodeSpecFactory({

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

@@ -1,2 +1,3 @@
 import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
-export const searchQueryMarkGroup = adfMarkGroup('searchQuery');
+import { typeAheadQuery } from '../marks/typeAheadQuery';
+export const searchQueryMarkGroup = adfMarkGroup('searchQuery', [typeAheadQuery]);

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

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

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

@@ -0,0 +1,12 @@
+import { ValidatorSpecTransformerName, JSONSchemaTransformerName, adfMark, MarkExcludesNone } from '@atlaskit/adf-schema-generator';
+export const confluenceInlineComment = adfMark('confluenceInlineComment').define({
+  ignore: [JSONSchemaTransformerName, ValidatorSpecTransformerName],
+  inclusive: false,
+  excludes: MarkExcludesNone,
+  attrs: {
+    reference: {
+      type: 'string',
+      default: ''
+    }
+  }
+});

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

@@ -1,6 +1,8 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
+import { MarkExcludesNone, adfMark } from '@atlaskit/adf-schema-generator';
 export const fragment = adfMark('fragment').define({
   inclusive: false,
+  excludes: MarkExcludesNone,
+  allowExcludesEmpty: true,
   attrs: {
     localId: {
       minLength: 1,

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

@@ -0,0 +1,11 @@
+import { ValidatorSpecTransformerName, JSONSchemaTransformerName, adfMark } from '@atlaskit/adf-schema-generator';
+export const typeAheadQuery = adfMark('typeAheadQuery').define({
+  ignore: [JSONSchemaTransformerName, ValidatorSpecTransformerName],
+  inclusive: true,
+  attrs: {
+    trigger: {
+      type: 'string',
+      default: ''
+    }
+  }
+});

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

@@ -1,10 +1,11 @@
-import { adfMark, JSONSchemaTransformerName, ValidatorSpecTransformerName } from '@atlaskit/adf-schema-generator';
+import { adfMark, JSONSchemaTransformerName, MarkExcludesNone, ValidatorSpecTransformerName } from '@atlaskit/adf-schema-generator';
 export const unsupportedMark = adfMark('unsupportedMark').define({
   ignore: [JSONSchemaTransformerName, ValidatorSpecTransformerName],
+  excludes: MarkExcludesNone,
+  allowExcludesEmpty: true,
   attrs: {
     originalValue: {
-      type: 'object',
-      default: {}
+      type: 'object'
     }
   }
 });

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

@@ -2,13 +2,11 @@ import { adfMark, JSONSchemaTransformerName, ValidatorSpecTransformerName } from
 export const unsupportedNodeAttribute = adfMark('unsupportedNodeAttribute').define({
   ignore: [JSONSchemaTransformerName, ValidatorSpecTransformerName],
   attrs: {
-    type: {
-      type: 'string',
-      default: null
-    },
     unsupported: {
-      type: 'object',
-      default: {}
+      type: 'object'
+    },
+    type: {
+      type: 'string'
     }
   }
 });

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

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

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

@@ -7,28 +7,19 @@
 import { createPMMarkSpecFactory } from '@atlaskit/adf-schema-generator';
 export var unsupportedNodeAttribute = createPMMarkSpecFactory({
   attrs: {
-    type: {
-      default: null
-    },
-    unsupported: {
-      default: {}
-    }
+    unsupported: {},
+    type: {}
   }
 });
 export var unsupportedMark = createPMMarkSpecFactory({
   attrs: {
-    originalValue: {
-      default: {}
-    }
-  }
+    originalValue: {}
+  },
+  excludes: ''
 });
 export var link = createPMMarkSpecFactory({
   attrs: {
     href: {},
-    title: {},
-    id: {},
-    collection: {},
-    occurrenceKey: {},
     __confluenceMetadata: {
       default: null
     }
@@ -79,6 +70,7 @@ export var annotation = createPMMarkSpecFactory({
     }
   },
   inclusive: true,
+  excludes: '',
   group: 'annotation'
 });
 export var backgroundColor = createPMMarkSpecFactory({
@@ -89,6 +81,24 @@ export var backgroundColor = createPMMarkSpecFactory({
   excludes: 'color',
   group: 'color'
 });
+export var typeAheadQuery = createPMMarkSpecFactory({
+  attrs: {
+    trigger: {
+      default: ''
+    }
+  },
+  inclusive: true,
+  group: 'searchQuery'
+});
+export var confluenceInlineComment = createPMMarkSpecFactory({
+  attrs: {
+    reference: {
+      default: ''
+    }
+  },
+  inclusive: false,
+  excludes: ''
+});
 export var code = createPMMarkSpecFactory({
   inclusive: true,
   excludes: 'fontStyle link searchQuery color'
@@ -109,7 +119,8 @@ export var fragment = createPMMarkSpecFactory({
       default: null
     }
   },
-  inclusive: false
+  inclusive: false,
+  excludes: ''
 });
 export var border = createPMMarkSpecFactory({
   attrs: {

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

@@ -282,7 +282,7 @@ export var confluenceUnsupportedInline = createPMNodeSpecFactory({
 });
 export var paragraphWithNoMarks = createPMNodeSpecFactory({
   content: 'inline*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   selectable: false
 });
 export var media = createPMNodeSpecFactory({
@@ -507,13 +507,13 @@ export var panel = createPMNodeSpecFactory({
 });
 export var paragraph = createPMNodeSpecFactory({
   content: 'inline*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   group: 'block',
   selectable: false
 });
 export var paragraphWithMarks = createPMNodeSpecFactory({
   content: 'inline*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   group: 'block',
   selectable: false
 });
@@ -547,7 +547,7 @@ export var headingWithIndentation = createPMNodeSpecFactory({
 });
 export var paragraphWithAlignment = createPMNodeSpecFactory({
   content: 'inline*',
-  marks: 'link em strong strike subsup underline textColor annotation backgroundColor unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   selectable: false
 });
 export var blockquote = createPMNodeSpecFactory({

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

@@ -1,2 +1,3 @@
 import { adfMarkGroup } from '@atlaskit/adf-schema-generator';
-export var searchQueryMarkGroup = adfMarkGroup('searchQuery');
+import { typeAheadQuery } from '../marks/typeAheadQuery';
+export var searchQueryMarkGroup = adfMarkGroup('searchQuery', [typeAheadQuery]);

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

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

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

@@ -0,0 +1,12 @@
+import { ValidatorSpecTransformerName, JSONSchemaTransformerName, adfMark, MarkExcludesNone } from '@atlaskit/adf-schema-generator';
+export var confluenceInlineComment = adfMark('confluenceInlineComment').define({
+  ignore: [JSONSchemaTransformerName, ValidatorSpecTransformerName],
+  inclusive: false,
+  excludes: MarkExcludesNone,
+  attrs: {
+    reference: {
+      type: 'string',
+      default: ''
+    }
+  }
+});

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

@@ -1,6 +1,8 @@
-import { adfMark } from '@atlaskit/adf-schema-generator';
+import { MarkExcludesNone, adfMark } from '@atlaskit/adf-schema-generator';
 export var fragment = adfMark('fragment').define({
   inclusive: false,
+  excludes: MarkExcludesNone,
+  allowExcludesEmpty: true,
   attrs: {
     localId: {
       minLength: 1,

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

@@ -0,0 +1,11 @@
+import { ValidatorSpecTransformerName, JSONSchemaTransformerName, adfMark } from '@atlaskit/adf-schema-generator';
+export var typeAheadQuery = adfMark('typeAheadQuery').define({
+  ignore: [JSONSchemaTransformerName, ValidatorSpecTransformerName],
+  inclusive: true,
+  attrs: {
+    trigger: {
+      type: 'string',
+      default: ''
+    }
+  }
+});

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

@@ -1,10 +1,11 @@
-import { adfMark, JSONSchemaTransformerName, ValidatorSpecTransformerName } from '@atlaskit/adf-schema-generator';
+import { adfMark, JSONSchemaTransformerName, MarkExcludesNone, ValidatorSpecTransformerName } from '@atlaskit/adf-schema-generator';
 export var unsupportedMark = adfMark('unsupportedMark').define({
   ignore: [JSONSchemaTransformerName, ValidatorSpecTransformerName],
+  excludes: MarkExcludesNone,
+  allowExcludesEmpty: true,
   attrs: {
     originalValue: {
-      type: 'object',
-      default: {}
+      type: 'object'
     }
   }
 });

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

@@ -2,13 +2,11 @@ import { adfMark, JSONSchemaTransformerName, ValidatorSpecTransformerName } from
 export var unsupportedNodeAttribute = adfMark('unsupportedNodeAttribute').define({
   ignore: [JSONSchemaTransformerName, ValidatorSpecTransformerName],
   attrs: {
-    type: {
-      type: 'string',
-      default: null
-    },
     unsupported: {
-      type: 'object',
-      default: {}
+      type: 'object'
+    },
+    type: {
+      type: 'string'
     }
   }
 });

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

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

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

@@ -5,8 +5,8 @@
  */
 import { Mark } from '@atlaskit/editor-prosemirror/model';
 export interface UnsupportedNodeAttributeMarkAttributes {
-    type: string;
     unsupported: Record<string, unknown>;
+    type: string;
 }
 export interface UnsupportedNodeAttributeDefinition {
     type: 'unsupportedNodeAttribute';
@@ -108,6 +108,28 @@ export interface BackgroundColorMark extends Mark {
     attrs: BackgroundColorMarkAttributes;
 }
 export declare const backgroundColor: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<BackgroundColorMark>) => import("prosemirror-model").MarkSpec;
+export interface TypeAheadQueryMarkAttributes {
+    trigger: string;
+}
+export interface TypeAheadQueryDefinition {
+    type: 'typeAheadQuery';
+    attrs: TypeAheadQueryMarkAttributes;
+}
+export interface TypeAheadQueryMark extends Mark {
+    attrs: TypeAheadQueryMarkAttributes;
+}
+export declare const typeAheadQuery: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<TypeAheadQueryMark>) => import("prosemirror-model").MarkSpec;
+export interface ConfluenceInlineCommentMarkAttributes {
+    reference: string;
+}
+export interface ConfluenceInlineCommentDefinition {
+    type: 'confluenceInlineComment';
+    attrs: ConfluenceInlineCommentMarkAttributes;
+}
+export interface ConfluenceInlineCommentMark extends Mark {
+    attrs: ConfluenceInlineCommentMarkAttributes;
+}
+export declare const confluenceInlineComment: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").MarkSpecOptions<ConfluenceInlineCommentMark>) => import("prosemirror-model").MarkSpec;
 export interface CodeDefinition {
     type: 'code';
 }

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

@@ -5,7 +5,7 @@
  */
 import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { InlineDefinition, BlockDefinition, BlockRootOnlyDefinition } from './nodeGroupTypes';
-import { UnsupportedNodeAttributeMark, UnsupportedMarkMark, LinkMark, EmMark, StrongMark, StrikeMark, SubsupMark, UnderlineMark, TextColorMark, AnnotationMark, BackgroundColorMark, CodeMark, DataConsumerMark, FragmentMark, BorderMark, AlignmentMark, IndentationMark, BreakoutMark } from './markTypes';
+import { UnsupportedNodeAttributeMark, UnsupportedMarkMark, LinkMark, EmMark, StrongMark, StrikeMark, SubsupMark, UnderlineMark, TextColorMark, AnnotationMark, BackgroundColorMark, TypeAheadQueryMark, ConfluenceInlineCommentMark, CodeMark, DataConsumerMark, FragmentMark, BorderMark, AlignmentMark, IndentationMark, BreakoutMark } from './markTypes';
 export interface TextDefinition {
     type: 'text';
 }
@@ -51,7 +51,7 @@ export type BlockCardNode = PMNode & BlockCardDefinition;
 export declare const blockCard: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<BlockCardNode>) => import("prosemirror-model").NodeSpec;
 export interface TextFormattedDefinition {
     type: 'text';
-    marks: Array<LinkMark | EmMark | StrongMark | StrikeMark | SubsupMark | UnderlineMark | TextColorMark | AnnotationMark | BackgroundColorMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
+    marks: Array<LinkMark | EmMark | StrongMark | StrikeMark | SubsupMark | UnderlineMark | TextColorMark | AnnotationMark | BackgroundColorMark | TypeAheadQueryMark | ConfluenceInlineCommentMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
 }
 export type TextFormattedNode = PMNode & TextFormattedDefinition;
 export declare const textFormatted: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<TextFormattedNode>) => import("prosemirror-model").NodeSpec;

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

@@ -0,0 +1 @@
+export declare const confluenceInlineComment: 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/typeAheadQuery.d.ts

@@ -0,0 +1 @@
+export declare const typeAheadQuery: 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.18.1",
+  "version": "36.18.3",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.15.0",
-    "@atlaskit/adf-schema-generator": "^1.17.1",
+    "@atlaskit/adf-schema-generator": "^1.17.2",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@atlaskit/json-schema-generator": "^3.3.9",
     "@babel/cli": "^7.22.9",
@@ -66,6 +66,7 @@
     "cross-env": "^7.0.3",
     "jest": "^29.6.2",
     "jest-environment-jsdom": "^29.6.2",
+    "json-schema-diff-validator": "^0.4.1",
     "prop-types": "^15.5.4",
     "react": "^16.8.0",
     "react-dom": "^16.8.0",

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

@@ -0,0 +1,129 @@
+import { validateSchemaCompatibility } from 'json-schema-diff-validator';
+import { adfToJSON } from '@atlaskit/adf-schema-generator';
+import adfNode from '@atlaskit/adf-schema/src/next-schema/full-schema.adf';
+
+const DEFINITIONS_TO_SKIP_FULL = [
+  'blockCard_node',
+  'block_content',
+  'bodiedExtension_node',
+  'bodiedExtension_with_marks_node',
+  'codeBlock_node',
+  'codeBlock_with_marks_node',
+  'codeBlock_with_no_marks_node',
+  'code_inline_node',
+  'doc_node',
+  'expand_node',
+  'expand_with_breakout_mark_node',
+  'expand_with_no_mark_node',
+  'extension_node',
+  'extension_with_marks_node',
+  'formatted_text_inline_node',
+  'heading_node',
+  'heading_with_alignment_node',
+  'heading_with_indentation_node',
+  'heading_with_no_marks_node',
+  'inlineCard_node',
+  'inlineExtension_node',
+  'inlineExtension_with_marks_node',
+  'inline_node',
+  'layoutSection_full_node',
+  'mediaInline_node',
+  'mediaSingle_caption_node',
+  'mediaSingle_full_node',
+  'mediaSingle_node',
+  'nestedExpand_content',
+  'nestedExpand_node',
+  'nestedExpand_with_no_marks_node',
+  'non_nestable_block_content',
+  'paragraph_node',
+  'paragraph_with_alignment_node',
+  'paragraph_with_indentation_node',
+  'paragraph_with_no_marks_node',
+  'table_cell_content',
+  'table_cell_node',
+  'table_header_node',
+  'text_node',
+];
+
+test('ADF DSL to JSON Schema backwards compatibility for full schema', () => {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const currentSchema = require('../../../json-schema/v1/full.json');
+  const nextSchema = adfToJSON(adfNode);
+  DEFINITIONS_TO_SKIP_FULL.forEach((definition) => {
+    nextSchema.definitions[definition] = currentSchema.definitions[definition];
+  });
+
+  expect(() => {
+    validateSchemaCompatibility(currentSchema, nextSchema, {
+      allowNewOneOf: true,
+      allowNewEnumValue: true,
+      allowReorder: true,
+    });
+  }).not.toThrow();
+});
+
+const DEFINITIONS_TO_SKIP_STAGE_0 = [
+  'blockCard_node',
+  'block_content',
+  'bodiedExtension_node',
+  'bodiedExtension_with_marks_node',
+  'codeBlock_node',
+  'codeBlock_with_marks_node',
+  'codeBlock_with_no_marks_node',
+  'code_inline_node',
+  'date_node',
+  'doc_node',
+  'emoji_node',
+  'expand_node',
+  'expand_with_breakout_mark_node',
+  'expand_with_no_mark_node',
+  'extensionFrame_node',
+  'extension_node',
+  'extension_with_marks_node',
+  'formatted_text_inline_node',
+  'heading_node',
+  'heading_with_alignment_node',
+  'heading_with_indentation_node',
+  'heading_with_no_marks_node',
+  'inlineCard_node',
+  'inlineExtension_node',
+  'inlineExtension_with_marks_node',
+  'inline_node',
+  'layoutSection_full_node',
+  'layoutSection_with_single_column_node',
+  'mediaInline_node',
+  'mediaSingle_caption_node',
+  'mediaSingle_full_node',
+  'mediaSingle_node',
+  'mention_node',
+  'multiBodiedExtension_node',
+  'nestedExpand_content',
+  'nestedExpand_node',
+  'nestedExpand_with_no_marks_node',
+  'non_nestable_block_content',
+  'paragraph_node',
+  'paragraph_with_alignment_node',
+  'paragraph_with_indentation_node',
+  'paragraph_with_no_marks_node',
+  'status_node',
+  'table_cell_content',
+  'table_cell_node',
+  'table_header_node',
+  'text_node',
+];
+test('ADF DSL to JSON Schema backwards compatibility for stage0 schema', () => {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const currentSchema = require('../../../json-schema/v1/stage-0.json');
+  const nextSchema = adfToJSON(adfNode);
+  DEFINITIONS_TO_SKIP_STAGE_0.forEach((definition) => {
+    nextSchema.definitions[definition] = currentSchema.definitions[definition];
+  });
+
+  expect(() => {
+    validateSchemaCompatibility(currentSchema, nextSchema, {
+      allowNewOneOf: true,
+      allowNewEnumValue: true,
+      allowReorder: true,
+    });
+  }).not.toThrow();
+});

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

@@ -19,17 +19,7 @@ const defaultSchema = getNodesAndMarksMap();
 const EXCLUDE_CONTENT_FROM_NODESPEC = [
   'uknownBlock', // We won't have it in DSL
 ];
-const EXCLUDE_MARKS_FROM_NODESPEC = [
-  'confluenceInlineComment', // not exist in ADF DSL
-  'typeAheadQuery', // not exist in ADF DSL
-];
-const SKIPPED_MARKSPEC_TESTS = [
-  'link', // new link mark is not matching old link mark
-  'confluenceInlineComment', // not exist in ADF DSL
-  'unsupportedMark', // exist in ADF DSL but have default value where old spec doesn't have
-  'unsupportedNodeAttribute', // exist in ADF DSL but have default value where old spec doesn't have
-  'typeAheadQuery', // not exist in ADF DSL
-];
+
 const SKIPPED_NODESPEC_TESTS = [
   'unknownBlock', // unused node
   'mediaSingleFull', // not aligned with old spec - content is different, another case similar to layoutSection
@@ -93,7 +83,7 @@ expect.extend({
         content: formatContent(expected.content, EXCLUDE_CONTENT_FROM_NODESPEC),
       }),
       ...(expected.marks && {
-        marks: filterAndSortMarks(expected.marks, EXCLUDE_MARKS_FROM_NODESPEC),
+        marks: filterAndSortMarks(expected.marks),
       }),
     };
 
@@ -110,10 +100,6 @@ expect.extend({
   },
 });
 
-function isMarkSpec(_value: MarkSpec | NodeSpec): _value is MarkSpec {
-  return true;
-}
-
 function isNodeSpec(_value: MarkSpec | NodeSpec): _value is NodeSpec {
   return true;
 }
@@ -131,13 +117,6 @@ function omit<T extends object>(data: T, keys = []): T {
     // 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'];
-    }
-  }
   if (isNodeSpec(data)) {
     // Treat inline: false same as no inline property
     if (data.inline !== undefined && data.inline === false) {
@@ -151,14 +130,13 @@ function omit<T extends object>(data: T, keys = []): T {
 describe('validate PM schema', () => {
   describe('marks', () => {
     const { marks } = defaultSchema;
-    const skipLists = SKIPPED_MARKSPEC_TESTS;
 
     const testCases = Object.entries(marks).map(([key, value]) => {
       return {
         name: key,
         legacyMarkSpec: value,
         newMarkSpecFn: newMarkSpecs[key] as MarkSpecFactory,
-        skip: skipLists.includes(key) || key.startsWith('__'),
+        skip: key.startsWith('__'),
       };
     });