@atlaskit/adf-schema 37.1.41 → 37.1.43

package/dist/types/validator-schema/generated/validatorSpec.d.ts

@@ -146,8 +146,8 @@ export declare const codeBlock_with_marks: (string | {
     props: {
         marks: {
             type: string;
-            items: string[];
             optional: boolean;
+            items: string[];
         };
     };
 })[];
@@ -206,8 +206,8 @@ export declare const mediaSingle: {
         })[];
         marks: {
             type: string;
-            items: string[];
             optional: boolean;
+            items: string[];
         };
     };
 };
@@ -277,8 +277,8 @@ export declare const media: {
         })[];
         marks: {
             type: string;
-            items: string[][];
             optional: boolean;
+            items: string[][];
         };
     };
     required: string[];
@@ -420,8 +420,8 @@ export declare const mention: {
         };
         marks: {
             type: string;
-            items: string[];
             optional: boolean;
+            items: string[];
         };
     };
 };
@@ -448,8 +448,8 @@ export declare const emoji: {
         };
         marks: {
             type: string;
-            items: string[];
             optional: boolean;
+            items: string[];
         };
     };
 };
@@ -469,8 +469,8 @@ export declare const date: {
         };
         marks: {
             type: string;
-            items: string[];
             optional: boolean;
+            items: string[];
         };
     };
 };
@@ -547,8 +547,8 @@ export declare const status: {
         };
         marks: {
             type: string;
-            items: string[];
             optional: boolean;
+            items: string[];
         };
     };
 };
@@ -556,8 +556,8 @@ export declare const formatted_text_inline: (string | {
     props: {
         marks: {
             type: string;
-            items: string[][];
             optional: boolean;
+            items: string[][];
         };
     };
 })[];
@@ -565,8 +565,8 @@ export declare const code_inline: (string | {
     props: {
         marks: {
             type: string;
-            items: string[][];
             optional: boolean;
+            items: string[][];
         };
     };
 })[];
@@ -725,8 +725,8 @@ export declare const link_text_inline: (string | {
     props: {
         marks: {
             type: string;
-            items: string[];
             optional: boolean;
+            items: string[];
         };
     };
 })[];
@@ -772,8 +772,8 @@ export declare const inlineExtension_with_marks: (string | {
     props: {
         marks: {
             type: string;
-            items: string[][];
             optional: boolean;
+            items: string[][];
         };
     };
 })[];
@@ -822,8 +822,8 @@ export declare const mediaInline: {
         };
         marks: {
             type: string;
-            items: string[][];
             optional: boolean;
+            items: string[][];
         };
     };
 };
@@ -896,6 +896,7 @@ export declare const confluenceUnsupportedInline: {
         };
     };
 };
+export declare const atomic_inline: string[];
 export declare const inline: string[];
 export declare const paragraph: {
     props: {
@@ -929,8 +930,8 @@ export declare const paragraph_with_alignment: (string | {
     props: {
         marks: {
             type: string;
-            items: string[];
             optional: boolean;
+            items: string[];
         };
     };
 })[];
@@ -938,8 +939,8 @@ export declare const paragraph_with_indentation: (string | {
     props: {
         marks: {
             type: string;
-            items: string[];
             optional: boolean;
+            items: string[];
         };
     };
 })[];
@@ -1212,8 +1213,8 @@ export declare const extension_with_marks: (string | {
     props: {
         marks: {
             type: string;
-            items: string[][];
             optional: boolean;
+            items: string[][];
         };
     };
 })[];
@@ -1253,8 +1254,8 @@ export declare const heading_with_indentation: (string | {
     props: {
         marks: {
             type: string;
-            items: string[];
             optional: boolean;
+            items: string[];
         };
     };
 })[];
@@ -1272,8 +1273,8 @@ export declare const heading_with_alignment: (string | {
     props: {
         marks: {
             type: string;
-            items: string[];
             optional: boolean;
+            items: string[];
         };
     };
 })[];
@@ -1347,9 +1348,12 @@ export declare const panel_legacy: (string | {
         };
     };
 })[];
-export declare const nestedExpand_content: (string | {
-    props: {};
-})[];
+export declare const nestedExpand_content: {
+    type: string;
+    items: string[][];
+    minItems: number;
+    allowUnsupportedBlock: boolean;
+};
 export declare const nestedExpand_with_no_marks: (string | {
     props: {
         marks: {
@@ -1518,19 +1522,11 @@ export declare const tableHeader: {
     };
     required: string[];
 };
-export declare const tableCellContent: {
-    props: {
-        type: {
-            type: string;
-            values: string[];
-        };
-        content: {
-            type: string;
-            items: string[][];
-            minItems: number;
-            allowUnsupportedBlock: boolean;
-        };
-    };
+export declare const tableCell_content: {
+    type: string;
+    items: string[][];
+    minItems: number;
+    allowUnsupportedBlock: boolean;
 };
 export declare const tableRow: {
     props: {
@@ -1585,8 +1581,8 @@ export declare const table: {
         };
         marks: {
             type: string;
-            items: string[];
             optional: boolean;
+            items: string[];
         };
     };
 };
@@ -1644,8 +1640,8 @@ export declare const bodiedExtension_with_marks: (string | {
     props: {
         marks: {
             type: string;
-            items: string[][];
             optional: boolean;
+            items: string[][];
         };
     };
 })[];
@@ -1690,8 +1686,8 @@ export declare const expand_with_breakout_mark: (string | {
     props: {
         marks: {
             type: string;
-            items: string[];
             optional: boolean;
+            items: string[];
         };
     };
 })[];
@@ -1746,8 +1742,8 @@ export declare const layoutSection: {
         };
         marks: {
             type: string;
-            items: string[];
             optional: boolean;
+            items: string[];
         };
     };
 };
@@ -1762,8 +1758,8 @@ export declare const layoutSection_full: (string | {
         };
         marks: {
             type: string;
-            items: string[];
             optional: boolean;
+            items: string[];
         };
         type: {
             type: string;
@@ -1804,8 +1800,8 @@ export declare const extensionFrame: {
         };
         marks: {
             type: string;
-            items: string[][];
             optional: boolean;
+            items: string[][];
         };
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "37.1.41",
+  "version": "37.1.43",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.16.0",
-    "@atlaskit/adf-schema-generator": "^1.25.10",
+    "@atlaskit/adf-schema-generator": "^1.26.0",
     "@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

@@ -4,11 +4,6 @@ import adfNode from '../../../src/next-schema/full-schema.adf';
 import { sortNestedArrays } from '../../../src/validator-schema/utils/sortNestedArrays';
 
 const newSpecs = sortNestedArrays(adfToValidatorSpec(adfNode));
-const SKIP_LIST = [
-  'atomic_inline', // doesn't exist in the output, not even used anywhere...
-  'nestedExpand_content', // doesn't exist in the output, completely different format from other groups
-  'tableCell_content', // doesn't exist in the output, completely different format from other groups
-];
 
 const testCases = Object.entries(currentSpecs).map(([key, value]) => {
   return {
@@ -19,8 +14,7 @@ const testCases = Object.entries(currentSpecs).map(([key, value]) => {
 });
 
 testCases.forEach(({ name, currentSpec, newSpec }) => {
-  const testMethod = SKIP_LIST.includes(name) ? it.skip : it;
-  testMethod(`should be able to handle ${name}`, () => {
+  it(`should be able to handle ${name}`, () => {
     expect(newSpec).toEqual(currentSpec);
   });
 });

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

@@ -101,63 +101,40 @@ test('JSON Schema to ADF DSL backwards compatibility for full schema', () => {
   expect(currentSchema).toBeBackwardsCompatibleWith(nextSchema);
 });
 
-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',
+const DEFINITIONS_TO_SKIP_STAGE_0_BACKWARDS = [
   '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_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) => {
+  DEFINITIONS_TO_SKIP_STAGE_0_BACKWARDS.forEach((definition) => {
     nextSchema.definitions[definition] = currentSchema.definitions[definition];
   });
 
   expect(nextSchema).toBeBackwardsCompatibleWith(currentSchema);
 });
+
+const DEFINITIONS_TO_SKIP_STAGE_0_FORWARDS = [
+  'extensionFrame_node',
+  'inline_node',
+  'table_row_node',
+  'table_cell_content',
+  'codeBlock_node',
+  'codeBlock_with_marks_node',
+  'mediaInline_node',
+  'mediaGroup_node',
+];
+test('JSON Schema to ADF DSL 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_FORWARDS.forEach((definition) => {
+    currentSchema.definitions[definition] = nextSchema.definitions[definition];
+  });
+
+  expect(currentSchema).toBeBackwardsCompatibleWith(nextSchema);
+});