@atlaskit/adf-schema 44.3.0 → 44.4.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/adf-schema
 
+## 44.4.0
+
+### Minor Changes
+
+- bd599ae: Give heading marks in pm-spec
+
 ## 44.3.0
 
 ### Minor Changes

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

@@ -407,6 +407,7 @@ var hardBreak = exports.hardBreak = (0, _createPMSpecFactory.createPMNodeSpecFac
 });
 var heading = exports.heading = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   content: 'inline*',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   group: 'block',
   attrs: {
     level: {

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

@@ -13,9 +13,7 @@ var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
 var heading = exports.heading = (0, _adfSchemaGenerator.adfNode)('heading').define({
   defining: true,
   selectable: false,
-  // Marks don't make it into the PM node spec, as they get overridden by the marks in
-  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
-  // marks: [unsupportedMark, unsupportedNodeAttribute],
+  marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {
     level: {
@@ -30,19 +28,7 @@ var heading = exports.heading = (0, _adfSchemaGenerator.adfNode)('heading').defi
       default: null
     }
   },
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _inlineContentGroup.inlineContentGroup))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.marks': {
-        value: {
-          type: 'array',
-          items: [],
-          optional: true
-        },
-        reason: 'In old types, some nodes have marks: Array<any>, which is not possible to represent in new DSL'
-      }
-    }
-  }
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _inlineContentGroup.inlineContentGroup))]
 }).variant('with_alignment', {
   marks: [_alignmentAndIndentation.alignment, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   content: [],

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

@@ -21,19 +21,7 @@ var paragraph = exports.paragraph = (0, _adfSchemaGenerator.adfNode)('paragraph'
   selectable: false,
   marks: [_unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   hasEmptyMarks: true,
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _inlineContentGroup.inlineContentGroup))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.marks': {
-        value: {
-          type: 'array',
-          items: [],
-          optional: true
-        },
-        reason: 'NoMark type used in old schema had a hack maxItems: 0 to mark nodes that should not have any marks. This is not possible to represent in new DSL.'
-      }
-    }
-  }
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup, _inlineContentGroup.inlineContentGroup))]
 }).variant('with_alignment', {
   marks: [_alignmentAndIndentation.alignment, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   content: [],

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

@@ -401,6 +401,7 @@ export const hardBreak = createPMNodeSpecFactory({
 });
 export const heading = createPMNodeSpecFactory({
   content: 'inline*',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   group: 'block',
   attrs: {
     level: {

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

@@ -7,9 +7,7 @@ import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export const heading = adfNode('heading').define({
   defining: true,
   selectable: false,
-  // Marks don't make it into the PM node spec, as they get overridden by the marks in
-  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
-  // marks: [unsupportedMark, unsupportedNodeAttribute],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {
     level: {
@@ -24,19 +22,7 @@ export const heading = adfNode('heading').define({
       default: null
     }
   },
-  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.marks': {
-        value: {
-          type: 'array',
-          items: [],
-          optional: true
-        },
-        reason: 'In old types, some nodes have marks: Array<any>, which is not possible to represent in new DSL'
-      }
-    }
-  }
+  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))]
 }).variant('with_alignment', {
   marks: [alignment, unsupportedMark, unsupportedNodeAttribute],
   content: [],

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

@@ -15,19 +15,7 @@ export const paragraph = adfNode('paragraph').define({
   selectable: false,
   marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
-  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.marks': {
-        value: {
-          type: 'array',
-          items: [],
-          optional: true
-        },
-        reason: 'NoMark type used in old schema had a hack maxItems: 0 to mark nodes that should not have any marks. This is not possible to represent in new DSL.'
-      }
-    }
-  }
+  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))]
 }).variant('with_alignment', {
   marks: [alignment, unsupportedMark, unsupportedNodeAttribute],
   content: [],

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

@@ -401,6 +401,7 @@ export var hardBreak = createPMNodeSpecFactory({
 });
 export var heading = createPMNodeSpecFactory({
   content: 'inline*',
+  marks: 'link em strong strike subsup underline textColor annotation backgroundColor typeAheadQuery confluenceInlineComment unsupportedNodeAttribute unsupportedMark code dataConsumer fragment border',
   group: 'block',
   attrs: {
     level: {

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

@@ -7,9 +7,7 @@ import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 export var heading = adfNode('heading').define({
   defining: true,
   selectable: false,
-  // Marks don't make it into the PM node spec, as they get overridden by the marks in
-  // packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
-  // marks: [unsupportedMark, unsupportedNodeAttribute],
+  marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
   attrs: {
     level: {
@@ -24,19 +22,7 @@ export var heading = adfNode('heading').define({
       default: null
     }
   },
-  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.marks': {
-        value: {
-          type: 'array',
-          items: [],
-          optional: true
-        },
-        reason: 'In old types, some nodes have marks: Array<any>, which is not possible to represent in new DSL'
-      }
-    }
-  }
+  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))]
 }).variant('with_alignment', {
   marks: [alignment, unsupportedMark, unsupportedNodeAttribute],
   content: [],

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

@@ -15,19 +15,7 @@ export var paragraph = adfNode('paragraph').define({
   selectable: false,
   marks: [unsupportedMark, unsupportedNodeAttribute],
   hasEmptyMarks: true,
-  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.marks': {
-        value: {
-          type: 'array',
-          items: [],
-          optional: true
-        },
-        reason: 'NoMark type used in old schema had a hack maxItems: 0 to mark nodes that should not have any marks. This is not possible to represent in new DSL.'
-      }
-    }
-  }
+  content: [$zeroPlus($or(inlineGroup, inlineContentGroup))]
 }).variant('with_alignment', {
   marks: [alignment, unsupportedMark, unsupportedNodeAttribute],
   content: [],

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

@@ -295,6 +295,7 @@ export declare const hardBreak: ({ parseDOM, toDOM, toDebugString }: import("../
 export interface HeadingDefinition {
     type: 'heading';
     content: Array<InlineDefinition>;
+    marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         level: number;
         localId?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "44.3.0",
+  "version": "44.4.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.24.0",
-    "@atlaskit/adf-schema-generator": "^1.36.1",
+    "@atlaskit/adf-schema-generator": "^1.37.0",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",