@atlaskit/adf-schema 44.2.1 → 44.3.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/adf-schema
 
+## 44.3.0
+
+### Minor Changes
+
+- 7705aa3: remove layoutSection overrides for validator spec
+
 ## 44.2.1
 
 ### Patch Changes

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

@@ -558,7 +558,7 @@ var layoutColumn = exports.layoutColumn = (0, _createPMSpecFactory.createPMNodeS
   isolating: true
 });
 var layoutSection = exports.layoutSection = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
+  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock*',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   isolating: true
 });

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

@@ -13,25 +13,11 @@ var _unsupportedBlock = require("./unsupportedBlock");
 var layoutSection = exports.layoutSection = (0, _adfSchemaGenerator.adfNode)('layoutSection').define({
   isolating: true,
   marks: [_breakout.breakout, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
-  content: [(0, _adfSchemaGenerator.$or)(_layoutColumn.layoutColumn, _unsupportedBlock.unsupportedBlock)],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'pm-spec': {
-      content: {
-        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'
-      }
-    }
-  }
+  content: [(0, _adfSchemaGenerator.$range)(1, 3, (0, _adfSchemaGenerator.$or)(_layoutColumn.layoutColumn, _unsupportedBlock.unsupportedBlock)), (0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_unsupportedBlock.unsupportedBlock))]
 }).variant('with_single_column', {
   stage0: true,
+  marks: [_breakout.breakout, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
   content: [(0, _adfSchemaGenerator.$range)(1, 5, (0, _adfSchemaGenerator.$or)(_layoutColumn.layoutColumn, _unsupportedBlock.unsupportedBlock)), (0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_unsupportedBlock.unsupportedBlock))],
-  ignore: [],
   attrs: {
     columnRuleStyle: {
       type: 'enum',
@@ -39,39 +25,8 @@ var layoutSection = exports.layoutSection = (0, _adfSchemaGenerator.adfNode)('la
       default: null,
       optional: true
     }
-  },
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.type': {
-        value: {
-          type: 'enum',
-          values: ['layoutSection']
-        },
-        reason: '@DSLCompatibilityException - mismatch for layoutSection_with_single_column'
-      },
-      'props.marks': {
-        value: {
-          items: ['breakout'],
-          optional: true,
-          type: 'array'
-        },
-        reason: '@DSLCompatibilityException - mismatch for layoutSection_with_single_column'
-      }
-    }
   }
 }).variant('full', {
   marks: [_breakout.breakout, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
-  content: [(0, _adfSchemaGenerator.$range)(2, 3, (0, _adfSchemaGenerator.$or)(_layoutColumn.layoutColumn, _unsupportedBlock.unsupportedBlock))],
-  ignore: [],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.type': {
-        value: {
-          type: 'enum',
-          values: ['layoutSection']
-        },
-        reason: '@DSLCompatibilityException - mismatch for layoutSection_full'
-      }
-    }
-  }
+  content: [(0, _adfSchemaGenerator.$range)(2, 3, (0, _adfSchemaGenerator.$or)(_layoutColumn.layoutColumn, _unsupportedBlock.unsupportedBlock))]
 });

package/dist/cjs/validator-schema/generated/validatorSpec.js

@@ -1603,7 +1603,10 @@ var layoutSection = exports.layoutSection = {
     },
     content: {
       type: 'array',
-      items: ['layoutColumn']
+      items: ['layoutColumn'],
+      minItems: 1,
+      maxItems: 3,
+      allowUnsupportedBlock: true
     },
     marks: {
       type: 'array',
@@ -1631,14 +1634,10 @@ var layoutSection_with_single_column = exports.layoutSection_with_single_column
       maxItems: 5,
       allowUnsupportedBlock: true
     },
-    type: {
-      type: 'enum',
-      values: ['layoutSection']
-    },
     marks: {
-      items: ['breakout'],
+      type: 'array',
       optional: true,
-      type: 'array'
+      items: ['breakout']
     }
   }
 }];
@@ -1655,10 +1654,6 @@ var layoutSection_full = exports.layoutSection_full = ['layoutSection', {
       type: 'array',
       optional: true,
       items: ['breakout']
-    },
-    type: {
-      type: 'enum',
-      values: ['layoutSection']
     }
   }
 }];

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

@@ -552,7 +552,7 @@ export const layoutColumn = createPMNodeSpecFactory({
   isolating: true
 });
 export const layoutSection = createPMNodeSpecFactory({
-  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
+  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock*',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   isolating: true
 });

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

@@ -7,25 +7,11 @@ import { unsupportedBlock } from './unsupportedBlock';
 export const layoutSection = adfNode('layoutSection').define({
   isolating: true,
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
-  content: [$or(layoutColumn, unsupportedBlock)],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'pm-spec': {
-      content: {
-        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'
-      }
-    }
-  }
+  content: [$range(1, 3, $or(layoutColumn, unsupportedBlock)), $zeroPlus($or(unsupportedBlock))]
 }).variant('with_single_column', {
   stage0: true,
+  marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
   content: [$range(1, 5, $or(layoutColumn, unsupportedBlock)), $zeroPlus($or(unsupportedBlock))],
-  ignore: [],
   attrs: {
     columnRuleStyle: {
       type: 'enum',
@@ -33,39 +19,8 @@ export const layoutSection = adfNode('layoutSection').define({
       default: null,
       optional: true
     }
-  },
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.type': {
-        value: {
-          type: 'enum',
-          values: ['layoutSection']
-        },
-        reason: '@DSLCompatibilityException - mismatch for layoutSection_with_single_column'
-      },
-      'props.marks': {
-        value: {
-          items: ['breakout'],
-          optional: true,
-          type: 'array'
-        },
-        reason: '@DSLCompatibilityException - mismatch for layoutSection_with_single_column'
-      }
-    }
   }
 }).variant('full', {
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
-  content: [$range(2, 3, $or(layoutColumn, unsupportedBlock))],
-  ignore: [],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.type': {
-        value: {
-          type: 'enum',
-          values: ['layoutSection']
-        },
-        reason: '@DSLCompatibilityException - mismatch for layoutSection_full'
-      }
-    }
-  }
+  content: [$range(2, 3, $or(layoutColumn, unsupportedBlock))]
 });

package/dist/es2019/validator-schema/generated/validatorSpec.js

@@ -1597,7 +1597,10 @@ export const layoutSection = {
     },
     content: {
       type: 'array',
-      items: ['layoutColumn']
+      items: ['layoutColumn'],
+      minItems: 1,
+      maxItems: 3,
+      allowUnsupportedBlock: true
     },
     marks: {
       type: 'array',
@@ -1625,14 +1628,10 @@ export const layoutSection_with_single_column = ['layoutSection', {
       maxItems: 5,
       allowUnsupportedBlock: true
     },
-    type: {
-      type: 'enum',
-      values: ['layoutSection']
-    },
     marks: {
-      items: ['breakout'],
+      type: 'array',
       optional: true,
-      type: 'array'
+      items: ['breakout']
     }
   }
 }];
@@ -1649,10 +1648,6 @@ export const layoutSection_full = ['layoutSection', {
       type: 'array',
       optional: true,
       items: ['breakout']
-    },
-    type: {
-      type: 'enum',
-      values: ['layoutSection']
     }
   }
 }];

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

@@ -552,7 +552,7 @@ export var layoutColumn = createPMNodeSpecFactory({
   isolating: true
 });
 export var layoutSection = createPMNodeSpecFactory({
-  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
+  content: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock*',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   isolating: true
 });

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

@@ -7,25 +7,11 @@ import { unsupportedBlock } from './unsupportedBlock';
 export var layoutSection = adfNode('layoutSection').define({
   isolating: true,
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
-  content: [$or(layoutColumn, unsupportedBlock)],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'pm-spec': {
-      content: {
-        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'
-      }
-    }
-  }
+  content: [$range(1, 3, $or(layoutColumn, unsupportedBlock)), $zeroPlus($or(unsupportedBlock))]
 }).variant('with_single_column', {
   stage0: true,
+  marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
   content: [$range(1, 5, $or(layoutColumn, unsupportedBlock)), $zeroPlus($or(unsupportedBlock))],
-  ignore: [],
   attrs: {
     columnRuleStyle: {
       type: 'enum',
@@ -33,39 +19,8 @@ export var layoutSection = adfNode('layoutSection').define({
       default: null,
       optional: true
     }
-  },
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.type': {
-        value: {
-          type: 'enum',
-          values: ['layoutSection']
-        },
-        reason: '@DSLCompatibilityException - mismatch for layoutSection_with_single_column'
-      },
-      'props.marks': {
-        value: {
-          items: ['breakout'],
-          optional: true,
-          type: 'array'
-        },
-        reason: '@DSLCompatibilityException - mismatch for layoutSection_with_single_column'
-      }
-    }
   }
 }).variant('full', {
   marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
-  content: [$range(2, 3, $or(layoutColumn, unsupportedBlock))],
-  ignore: [],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.type': {
-        value: {
-          type: 'enum',
-          values: ['layoutSection']
-        },
-        reason: '@DSLCompatibilityException - mismatch for layoutSection_full'
-      }
-    }
-  }
+  content: [$range(2, 3, $or(layoutColumn, unsupportedBlock))]
 });

package/dist/esm/validator-schema/generated/validatorSpec.js

@@ -1597,7 +1597,10 @@ export var layoutSection = {
     },
     content: {
       type: 'array',
-      items: ['layoutColumn']
+      items: ['layoutColumn'],
+      minItems: 1,
+      maxItems: 3,
+      allowUnsupportedBlock: true
     },
     marks: {
       type: 'array',
@@ -1625,14 +1628,10 @@ export var layoutSection_with_single_column = ['layoutSection', {
       maxItems: 5,
       allowUnsupportedBlock: true
     },
-    type: {
-      type: 'enum',
-      values: ['layoutSection']
-    },
     marks: {
-      items: ['breakout'],
+      type: 'array',
       optional: true,
-      type: 'array'
+      items: ['breakout']
     }
   }
 }];
@@ -1649,10 +1648,6 @@ export var layoutSection_full = ['layoutSection', {
       type: 'array',
       optional: true,
       items: ['breakout']
-    },
-    type: {
-      type: 'enum',
-      values: ['layoutSection']
     }
   }
 }];

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

@@ -405,7 +405,7 @@ export type LayoutColumnNode = PMNode & LayoutColumnDefinition;
 export declare const layoutColumn: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<LayoutColumnNode>) => import("prosemirror-model").NodeSpec;
 export interface LayoutSectionDefinition {
     type: 'layoutSection';
-    content: Array<LayoutColumnDefinition | UnsupportedBlockDefinition>;
+    content: Array<LayoutColumnDefinition | UnsupportedBlockDefinition | UnsupportedBlockDefinition>;
     marks: Array<BreakoutMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
 }
 export type LayoutSectionNode = PMNode & LayoutSectionDefinition;

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

@@ -1,7 +1,7 @@
 export declare const layoutSection: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "with_single_column", "full"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
     stage0: true;
+    marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
     content: (import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentZeroOrMoreSpec | import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentRangeSpec)[];
-    ignore: any[];
     attrs: {
         columnRuleStyle: {
             type: "enum";
@@ -10,38 +10,7 @@ export declare const layoutSection: import("@atlaskit/adf-schema-generator/dist/
             optional: true;
         };
     };
-    DANGEROUS_MANUAL_OVERRIDE: {
-        'validator-spec': {
-            'props.type': {
-                value: {
-                    type: string;
-                    values: string[];
-                };
-                reason: string;
-            };
-            'props.marks': {
-                value: {
-                    items: string[];
-                    optional: boolean;
-                    type: string;
-                };
-                reason: string;
-            };
-        };
-    };
 } & {
     marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentRangeSpec[];
-    ignore: any[];
-    DANGEROUS_MANUAL_OVERRIDE: {
-        'validator-spec': {
-            'props.type': {
-                value: {
-                    type: string;
-                    values: string[];
-                };
-                reason: string;
-            };
-        };
-    };
 }>;

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

@@ -1617,6 +1617,9 @@ export declare const layoutSection: {
         content: {
             type: string;
             items: string[];
+            minItems: number;
+            maxItems: number;
+            allowUnsupportedBlock: boolean;
         };
         marks: {
             type: string;
@@ -1644,14 +1647,10 @@ export declare const layoutSection_with_single_column: (string | {
             maxItems: number;
             allowUnsupportedBlock: boolean;
         };
-        type: {
-            type: string;
-            values: string[];
-        };
         marks: {
-            items: string[];
-            optional: boolean;
             type: string;
+            optional: boolean;
+            items: string[];
         };
     };
 })[];
@@ -1669,10 +1668,6 @@ export declare const layoutSection_full: (string | {
             optional: boolean;
             items: string[];
         };
-        type: {
-            type: string;
-            values: string[];
-        };
     };
 })[];
 export declare const extensionFrame: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "44.2.1",
+  "version": "44.3.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.0",
+    "@atlaskit/adf-schema-generator": "^1.36.1",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",