@atlaskit/adf-schema 37.1.27 → 37.1.29

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/adf-schema
 
+## 37.1.29
+
+### Patch Changes
+
+- f6c953f: align extensionFrame to match ADF
+- 362c287: ED-23030: adds overrides for required for table nodes
+
+## 37.1.28
+
+### Patch Changes
+
+- 9f0af09: Fix inlineCard validator spec from DSL.
+
 ## 37.1.27
 
 ### Patch Changes

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

@@ -33,5 +33,5 @@ var extensionFrame = exports.extensionFrame = (0, _adfSchemaGenerator.adfNode)('
   selectable: false,
   marks: [_dataConsumer.dataConsumer, _fragment.fragment, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
   attrs: {},
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_bodiedExtension.bodiedExtension, _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, _unsupportedBlock.unsupportedBlock))]
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_bodiedExtension.bodiedExtension.use('with_marks'), _panel.panel, _paragraph.paragraph.use('with_no_marks'), _blockquote.blockquote, _list.orderedList, _list.bulletList, _rule.rule, _heading.heading.use('with_no_marks'), _codeBlock.codeBlock.use('with_no_marks'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('caption'), _decisionList.decisionList, _task.taskList, _table.table, _extension.extension.use('with_marks'), _blockCard.blockCard, _embedCard.embedCard, _unsupportedBlock.unsupportedBlock))]
 });

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

@@ -17,7 +17,8 @@ var inlineCard = exports.inlineCard = (0, _adfSchemaGenerator.adfNode)('inlineCa
     anyOf: [{
       url: {
         type: 'string',
-        default: null
+        default: null,
+        validatorFn: 'safeUrl'
       }
     }, {
       data: {
@@ -25,6 +26,18 @@ var inlineCard = exports.inlineCard = (0, _adfSchemaGenerator.adfNode)('inlineCa
         default: null
       }
     }]
+  },
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      'props.marks': {
+        reason: '@DSLCompatibilityException - Annotation mark is in variant, but not full schema. However this has been added for compatibility with current validator.',
+        value: {
+          items: ['annotation'],
+          optional: true,
+          type: 'array'
+        }
+      }
+    }
   }
 }).variant('with_annotation', {
   marks: [_annotation.annotation, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark]

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

@@ -38,5 +38,13 @@ var tableCell = exports.tableCell = (0, _adfSchemaGenerator.adfNode)('tableCell'
       optional: true
     }
   },
-  content: [_tableCellContentPseudoGroup.tableCellContentPseudoGroup]
+  content: [_tableCellContentPseudoGroup.tableCellContentPseudoGroup],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      required: {
+        reason: '@DSLCompatibilityException - required for tableHeader validator spec',
+        value: ['content']
+      }
+    }
+  }
 });

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

@@ -38,5 +38,13 @@ var tableHeader = exports.tableHeader = (0, _adfSchemaGenerator.adfNode)('tableH
       optional: true
     }
   },
-  content: [_tableCellContentPseudoGroup.tableHeaderContentPseudoGroup]
+  content: [_tableCellContentPseudoGroup.tableHeaderContentPseudoGroup],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      required: {
+        reason: '@DSLCompatibilityException - required for tableHeader validator spec',
+        value: ['content']
+      }
+    }
+  }
 });

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

@@ -27,5 +27,5 @@ export const extensionFrame = adfNode('extensionFrame').define({
   selectable: false,
   marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark],
   attrs: {},
-  content: [$onePlus($or(bodiedExtension, panel, paragraph, blockquote, orderedList, bulletList, rule, heading, codeBlock, mediaGroup, mediaSingle, decisionList, taskList, table, extension, blockCard, embedCard, unsupportedBlock))]
+  content: [$onePlus($or(bodiedExtension.use('with_marks'), panel, paragraph.use('with_no_marks'), blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table, extension.use('with_marks'), blockCard, embedCard, unsupportedBlock))]
 });

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

@@ -11,7 +11,8 @@ export const inlineCard = adfNode('inlineCard').define({
     anyOf: [{
       url: {
         type: 'string',
-        default: null
+        default: null,
+        validatorFn: 'safeUrl'
       }
     }, {
       data: {
@@ -19,6 +20,18 @@ export const inlineCard = adfNode('inlineCard').define({
         default: null
       }
     }]
+  },
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      'props.marks': {
+        reason: '@DSLCompatibilityException - Annotation mark is in variant, but not full schema. However this has been added for compatibility with current validator.',
+        value: {
+          items: ['annotation'],
+          optional: true,
+          type: 'array'
+        }
+      }
+    }
   }
 }).variant('with_annotation', {
   marks: [annotation, unsupportedNodeAttribute, unsupportedMark]

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

@@ -32,5 +32,13 @@ export const tableCell = adfNode('tableCell').define({
       optional: true
     }
   },
-  content: [tableCellContentPseudoGroup]
+  content: [tableCellContentPseudoGroup],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      required: {
+        reason: '@DSLCompatibilityException - required for tableHeader validator spec',
+        value: ['content']
+      }
+    }
+  }
 });

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

@@ -32,5 +32,13 @@ export const tableHeader = adfNode('tableHeader').define({
       optional: true
     }
   },
-  content: [tableHeaderContentPseudoGroup]
+  content: [tableHeaderContentPseudoGroup],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      required: {
+        reason: '@DSLCompatibilityException - required for tableHeader validator spec',
+        value: ['content']
+      }
+    }
+  }
 });

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

@@ -27,5 +27,5 @@ export var extensionFrame = adfNode('extensionFrame').define({
   selectable: false,
   marks: [dataConsumer, fragment, unsupportedNodeAttribute, unsupportedMark],
   attrs: {},
-  content: [$onePlus($or(bodiedExtension, panel, paragraph, blockquote, orderedList, bulletList, rule, heading, codeBlock, mediaGroup, mediaSingle, decisionList, taskList, table, extension, blockCard, embedCard, unsupportedBlock))]
+  content: [$onePlus($or(bodiedExtension.use('with_marks'), panel, paragraph.use('with_no_marks'), blockquote, orderedList, bulletList, rule, heading.use('with_no_marks'), codeBlock.use('with_no_marks'), mediaGroup, mediaSingle.use('full'), mediaSingle.use('caption'), decisionList, taskList, table, extension.use('with_marks'), blockCard, embedCard, unsupportedBlock))]
 });

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

@@ -11,7 +11,8 @@ export var inlineCard = adfNode('inlineCard').define({
     anyOf: [{
       url: {
         type: 'string',
-        default: null
+        default: null,
+        validatorFn: 'safeUrl'
       }
     }, {
       data: {
@@ -19,6 +20,18 @@ export var inlineCard = adfNode('inlineCard').define({
         default: null
       }
     }]
+  },
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      'props.marks': {
+        reason: '@DSLCompatibilityException - Annotation mark is in variant, but not full schema. However this has been added for compatibility with current validator.',
+        value: {
+          items: ['annotation'],
+          optional: true,
+          type: 'array'
+        }
+      }
+    }
   }
 }).variant('with_annotation', {
   marks: [annotation, unsupportedNodeAttribute, unsupportedMark]

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

@@ -32,5 +32,13 @@ export var tableCell = adfNode('tableCell').define({
       optional: true
     }
   },
-  content: [tableCellContentPseudoGroup]
+  content: [tableCellContentPseudoGroup],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      required: {
+        reason: '@DSLCompatibilityException - required for tableHeader validator spec',
+        value: ['content']
+      }
+    }
+  }
 });

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

@@ -32,5 +32,13 @@ export var tableHeader = adfNode('tableHeader').define({
       optional: true
     }
   },
-  content: [tableHeaderContentPseudoGroup]
+  content: [tableHeaderContentPseudoGroup],
+  DANGEROUS_MANUAL_OVERRIDE: {
+    'validator-spec': {
+      required: {
+        reason: '@DSLCompatibilityException - required for tableHeader validator spec',
+        value: ['content']
+      }
+    }
+  }
 });

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

@@ -240,7 +240,7 @@ export type ExtensionWithMarksNode = PMNode & ExtensionWithMarksDefinition;
 export declare const extensionWithMarks: ({ parseDOM, toDOM, toDebugString }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<ExtensionWithMarksNode>) => import("prosemirror-model").NodeSpec;
 export interface ExtensionFrameDefinition {
     type: 'extensionFrame';
-    content: Array<BlockCardDefinition | BlockquoteDefinition | BodiedExtensionDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | HeadingDefinition | MediaGroupDefinition | MediaSingleDefinition | OrderedListDefinition | PanelDefinition | ParagraphDefinition | RuleDefinition | TableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
+    content: Array<BlockCardDefinition | BlockquoteDefinition | BodiedExtensionWithMarksDefinition | BulletListDefinition | CodeBlockWithNoMarksDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
     marks: Array<DataConsumerMark | FragmentMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
 }
 export type ExtensionFrameNode = PMNode & ExtensionFrameDefinition;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "37.1.27",
+  "version": "37.1.29",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

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

@@ -9,7 +9,6 @@ const SKIP_LIST = [
   'doc', // doesn't match existing spec, need to flatten groups
   'expand', // doesn't match existing spec
   'extensionFrame', // doesn't match existing spec
-  'inlineCard', // doesn't match existing spec
   'inline_comment_marker', // doesn't exist in the output
   'layoutSection_full', // doesn't match existing spec, allowUnsupportedBlock, extra marks
   'layoutSection_with_single_column', // doesn't exist in the output