@atlaskit/adf-schema 37.1.25 → 37.1.27

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 37.1.27
+
+### Patch Changes
+
+- 8d8dd32: Fix exception to layoutSection node for validator spec from DSL.
+
+## 37.1.26
+
+### Patch Changes
+
+- 6106a46: Unskip nestedExpand, nestedExpand_content and nestedExpand_with_no_marks
+
 ## 37.1.25
 
 ### Patch Changes

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

@@ -21,7 +21,7 @@ var _paragraph = require("../nodes/paragraph");
 var _rule = require("../nodes/rule");
 var _task = require("../nodes/task");
 var _unsupportedBlock = require("../nodes/unsupportedBlock");
-var tableCellContentNodes = [_codeBlock.codeBlock.use('with_no_marks'), _blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _embedCard.embedCard, _nestedExpand.nestedExpand.use('with_no_marks')];
+var tableCellContentNodes = [_codeBlock.codeBlock.use('with_no_marks'), _blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _embedCard.embedCard, _nestedExpand.nestedExpand.use('content'), _nestedExpand.nestedExpand.use('with_no_marks')];
 
 // This is not an actual group, but a collection of nodes
 // @DSLCompatibilityException JSON Schema and PM Spec are not in sync. We need to fix it

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

@@ -20,6 +20,12 @@ var layoutSection = exports.layoutSection = (0, _adfSchemaGenerator.adfNode)('la
         value: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
         reason: "The content expression is not correct or redundant around 'unsupportedBlock* | unsupportedBlock+'. This case is not supported by the DSL. Also in JSON schema there is no range for the items, so theres a mismatch between JSON and PM."
       }
+    },
+    'validator-spec': {
+      'props.content.allowUnsupportedBlock': {
+        remove: true,
+        reason: '@DSLCompatibilityException - mismatch for layoutSection'
+      }
     }
   }
 }).variant('full', {

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

@@ -36,6 +36,8 @@ var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.adfNode)('nest
     }
   },
   content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_codeBlock.codeBlock.use('with_no_marks'), _paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _unsupportedBlock.unsupportedBlock))]
+}).variant('content', {
+  ignore: ['pm-spec', 'validator-spec']
 }).variant('with_no_marks', {
   marks: [],
   content: [],

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

@@ -15,7 +15,7 @@ import { paragraph } from '../nodes/paragraph';
 import { rule } from '../nodes/rule';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-const tableCellContentNodes = [codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, nestedExpand.use('with_no_marks')];
+const tableCellContentNodes = [codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, nestedExpand.use('content'), nestedExpand.use('with_no_marks')];
 
 // This is not an actual group, but a collection of nodes
 // @DSLCompatibilityException JSON Schema and PM Spec are not in sync. We need to fix it

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

@@ -14,6 +14,12 @@ export const layoutSection = adfNode('layoutSection').define({
         value: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
         reason: `The content expression is not correct or redundant around 'unsupportedBlock* | unsupportedBlock+'. This case is not supported by the DSL. Also in JSON schema there is no range for the items, so theres a mismatch between JSON and PM.`
       }
+    },
+    'validator-spec': {
+      'props.content.allowUnsupportedBlock': {
+        remove: true,
+        reason: '@DSLCompatibilityException - mismatch for layoutSection'
+      }
     }
   }
 }).variant('full', {

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

@@ -30,6 +30,8 @@ export const nestedExpand = adfNode('nestedExpand').define({
     }
   },
   content: [$onePlus($or(codeBlock.use('with_no_marks'), paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), mediaGroup, decisionList, rule, panel, blockquote, unsupportedBlock))]
+}).variant('content', {
+  ignore: ['pm-spec', 'validator-spec']
 }).variant('with_no_marks', {
   marks: [],
   content: [],

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

@@ -15,7 +15,7 @@ import { paragraph } from '../nodes/paragraph';
 import { rule } from '../nodes/rule';
 import { taskList } from '../nodes/task';
 import { unsupportedBlock } from '../nodes/unsupportedBlock';
-var tableCellContentNodes = [codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, nestedExpand.use('with_no_marks')];
+var tableCellContentNodes = [codeBlock.use('with_no_marks'), blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, blockquote, extension.use('with_marks'), embedCard, nestedExpand.use('content'), nestedExpand.use('with_no_marks')];
 
 // This is not an actual group, but a collection of nodes
 // @DSLCompatibilityException JSON Schema and PM Spec are not in sync. We need to fix it

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

@@ -14,6 +14,12 @@ export var layoutSection = adfNode('layoutSection').define({
         value: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
         reason: "The content expression is not correct or redundant around 'unsupportedBlock* | unsupportedBlock+'. This case is not supported by the DSL. Also in JSON schema there is no range for the items, so theres a mismatch between JSON and PM."
       }
+    },
+    'validator-spec': {
+      'props.content.allowUnsupportedBlock': {
+        remove: true,
+        reason: '@DSLCompatibilityException - mismatch for layoutSection'
+      }
     }
   }
 }).variant('full', {

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

@@ -30,6 +30,8 @@ export var nestedExpand = adfNode('nestedExpand').define({
     }
   },
   content: [$onePlus($or(codeBlock.use('with_no_marks'), paragraph.use('with_no_marks'), mediaSingle.use('caption'), mediaSingle.use('full'), taskList, bulletList, orderedList, heading.use('with_no_marks'), mediaGroup, decisionList, rule, panel, blockquote, unsupportedBlock))]
+}).variant('content', {
+  ignore: ['pm-spec', 'validator-spec']
 }).variant('with_no_marks', {
   marks: [],
   content: [],

package/dist/types/next-schema/nodes/nestedExpand.d.ts

@@ -1,4 +1,4 @@
-export declare const nestedExpand: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "with_no_marks"], {
+export declare const nestedExpand: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "content", "with_no_marks"], {
     ignore?: import("@atlaskit/adf-schema-generator/dist/types/transforms/transformerNames").TransformerNames[];
     root?: boolean;
     atom?: boolean;
@@ -27,6 +27,8 @@ export declare const nestedExpand: import("@atlaskit/adf-schema-generator/dist/t
         'pm-spec'?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").DangerousManualOverride;
         'validator-spec'?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").DangerousManualOverride;
     };
+} & {
+    ignore: ("pm-spec" | "validator-spec")[];
 } & {
     marks: any[];
     content: any[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "37.1.25",
+  "version": "37.1.27",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -47,7 +47,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.16.0",
-    "@atlaskit/adf-schema-generator": "^1.25.4",
+    "@atlaskit/adf-schema-generator": "^1.25.5",
     "@atlaskit/adf-utils": "^19.2.2",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@atlaskit/json-schema-generator": "^3.3.9",

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

@@ -10,9 +10,7 @@ const SKIP_LIST = [
   'expand', // doesn't match existing spec
   'extensionFrame', // doesn't match existing spec
   'inlineCard', // doesn't match existing spec
-  'inlineExtension', // doesn't exist in the output
   'inline_comment_marker', // doesn't exist in the output
-  'layoutSection', // doesn't match existing spec, maxItem/minItem, extra marks
   'layoutSection_full', // doesn't match existing spec, allowUnsupportedBlock, extra marks
   'layoutSection_with_single_column', // doesn't exist in the output
   'media', // doesn't match existing spec

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

@@ -37,25 +37,43 @@ expect.extend({
   },
 });
 
+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);
+  expect(nextSchema).toBeBackwardsCompatibleWith(currentSchema);
+});
+
 // The end goal is to be able to remove all transformation for known failures
 function transformFullFixtureForKnownFailures(json) {
   const definitions = json.definitions;
 
-  delete definitions.nestedExpand_content;
-  delete definitions.nestedExpand_node;
-  delete definitions.nestedExpand_with_no_marks_node;
+  delete definitions.doc_node;
+  delete definitions.blockRootOnly_node;
+  delete definitions.extensionFrame_node;
+  delete definitions.block_content;
+  delete definitions.non_nestable_block_content;
+  delete definitions.table_row_node;
+  delete definitions.table_cell_content;
+  delete definitions.mediaGroup_node;
+  delete definitions.inline_node;
+  delete definitions.mediaInline_node;
+  delete definitions.mediaSingle_width_type_node;
+  delete definitions.status_node;
+  delete definitions.date_node;
+  delete definitions.emoji_node;
+  delete definitions.mention_node;
+  delete definitions.codeBlock_with_marks_node;
+  delete definitions.codeBlock_node;
 
   return json;
 }
 
-test('ADF DSL to JSON Schema backwards compatibility for full schema', () => {
-  const currentSchema = transformFullFixtureForKnownFailures(
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    require('../../../json-schema/v1/full.json'),
-  );
-  const nextSchema = adfToJSON(adfNode);
-
-  expect(nextSchema).toBeBackwardsCompatibleWith(currentSchema);
+test('JSON Schema to ADF DSL backwards compatibility for full schema', () => {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const currentSchema = require('../../../json-schema/v1/full.json');
+  const nextSchema = transformFullFixtureForKnownFailures(adfToJSON(adfNode));
+  expect(currentSchema).toBeBackwardsCompatibleWith(nextSchema);
 });
 
 const DEFINITIONS_TO_SKIP_STAGE_0 = [