@atlaskit/adf-schema 42.1.0 → 42.2.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/adf-schema
 
+## 42.2.0
+
+### Minor Changes
+
+- 767b124: Added columnRuleStyle to layoutSection_with_single_column, and add layoutSectionAdvLayouts nodespec export
+
 ## 42.1.0
 
 ### Minor Changes

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

@@ -563,8 +563,13 @@ var layoutSectionFull = exports.layoutSectionFull = (0, _createPMSpecFactory.cre
   isolating: true
 });
 var layoutSectionWithSingleColumnStage0 = exports.layoutSectionWithSingleColumnStage0 = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(layoutColumn | unsupportedBlock){1,3}',
+  content: '(layoutColumn | unsupportedBlock){1,5}',
   marks: 'unsupportedMark unsupportedNodeAttribute',
+  attrs: {
+    columnRuleStyle: {
+      default: null
+    }
+  },
   isolating: true
 });
 var listItem = exports.listItem = (0, _createPMSpecFactory.createPMNodeSpecFactory)({

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

@@ -30,8 +30,16 @@ var layoutSection = exports.layoutSection = (0, _adfSchemaGenerator.adfNode)('la
   }
 }).variant('with_single_column', {
   stage0: true,
-  content: [(0, _adfSchemaGenerator.$range)(1, 3, (0, _adfSchemaGenerator.$or)(_layoutColumn.layoutColumn, _unsupportedBlock.unsupportedBlock))],
+  content: [(0, _adfSchemaGenerator.$range)(1, 5, (0, _adfSchemaGenerator.$or)(_layoutColumn.layoutColumn, _unsupportedBlock.unsupportedBlock))],
   ignore: [],
+  attrs: {
+    columnRuleStyle: {
+      type: 'enum',
+      values: ['solid'],
+      default: null,
+      optional: true
+    }
+  },
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.type': {

package/dist/cjs/schema/nodes/layout-section.js

@@ -53,18 +53,26 @@ var layoutSectionFull = exports.layoutSectionFull = (0, _nodeTypes.layoutSection
   }
 });
 
-// it's same as layoutSection
-var layoutSectionWithSingleColumn = exports.layoutSectionWithSingleColumn = (0, _nodeTypes.layoutSection)({
+// stage-0 support for columnRuleStyle attribute and 1-5 columns
+var layoutSectionWithSingleColumn = exports.layoutSectionWithSingleColumn = (0, _nodeTypes.layoutSectionWithSingleColumnStage0)({
   parseDOM: [{
     context: 'layoutSection//|layoutColumn//',
     tag: 'div[data-layout-section]',
     skip: true
   }, {
-    tag: 'div[data-layout-section]'
+    tag: 'div[data-layout-section]',
+    getAttrs: function getAttrs(dom) {
+      var columnRuleStyle = dom.getAttribute('data-column-rule-style');
+      return columnRuleStyle ? {
+        columnRuleStyle: columnRuleStyle
+      } : {};
+    }
   }],
-  toDOM: function toDOM() {
+  toDOM: function toDOM(node) {
+    var columnRuleStyle = node.attrs.columnRuleStyle;
     var attrs = {
-      'data-layout-section': 'true'
+      'data-layout-section': 'true',
+      'data-column-rule-style': columnRuleStyle || undefined
     };
     return ['div', attrs, 0];
   }

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

@@ -1803,11 +1803,21 @@ var layoutSection_full = exports.layoutSection_full = ['layoutSection', {
 }];
 var layoutSection_with_single_column = exports.layoutSection_with_single_column = ['layoutSection', {
   props: {
+    attrs: {
+      props: {
+        columnRuleStyle: {
+          type: 'enum',
+          values: ['solid'],
+          optional: true
+        }
+      },
+      optional: true
+    },
     content: {
       type: 'array',
       items: ['layoutColumn'],
       minItems: 1,
-      maxItems: 3,
+      maxItems: 5,
       allowUnsupportedBlock: true
     },
     type: {

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

@@ -557,8 +557,13 @@ export const layoutSectionFull = createPMNodeSpecFactory({
   isolating: true
 });
 export const layoutSectionWithSingleColumnStage0 = createPMNodeSpecFactory({
-  content: '(layoutColumn | unsupportedBlock){1,3}',
+  content: '(layoutColumn | unsupportedBlock){1,5}',
   marks: 'unsupportedMark unsupportedNodeAttribute',
+  attrs: {
+    columnRuleStyle: {
+      default: null
+    }
+  },
   isolating: true
 });
 export const listItem = createPMNodeSpecFactory({

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

@@ -24,8 +24,16 @@ export const layoutSection = adfNode('layoutSection').define({
   }
 }).variant('with_single_column', {
   stage0: true,
-  content: [$range(1, 3, $or(layoutColumn, unsupportedBlock))],
+  content: [$range(1, 5, $or(layoutColumn, unsupportedBlock))],
   ignore: [],
+  attrs: {
+    columnRuleStyle: {
+      type: 'enum',
+      values: ['solid'],
+      default: null,
+      optional: true
+    }
+  },
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.type': {

package/dist/es2019/schema/nodes/layout-section.js

@@ -1,4 +1,4 @@
-import { layoutSection as layoutSectionFactory } from '../../next-schema/generated/nodeTypes';
+import { layoutSection as layoutSectionFactory, layoutSectionWithSingleColumnStage0 as layoutSectionWithSingleColumnStage0Factory } from '../../next-schema/generated/nodeTypes';
 import { layoutSectionFull as layoutSectionFullFactory } from '../../next-schema/generated/nodeTypes';
 
 /**
@@ -49,18 +49,28 @@ export const layoutSectionFull = layoutSectionFullFactory({
   }
 });
 
-// it's same as layoutSection
-export const layoutSectionWithSingleColumn = layoutSectionFactory({
+// stage-0 support for columnRuleStyle attribute and 1-5 columns
+export const layoutSectionWithSingleColumn = layoutSectionWithSingleColumnStage0Factory({
   parseDOM: [{
     context: 'layoutSection//|layoutColumn//',
     tag: 'div[data-layout-section]',
     skip: true
   }, {
-    tag: 'div[data-layout-section]'
+    tag: 'div[data-layout-section]',
+    getAttrs: dom => {
+      const columnRuleStyle = dom.getAttribute('data-column-rule-style');
+      return columnRuleStyle ? {
+        columnRuleStyle
+      } : {};
+    }
   }],
-  toDOM() {
+  toDOM(node) {
+    const {
+      columnRuleStyle
+    } = node.attrs;
     const attrs = {
-      'data-layout-section': 'true'
+      'data-layout-section': 'true',
+      'data-column-rule-style': columnRuleStyle || undefined
     };
     return ['div', attrs, 0];
   }

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

@@ -1797,11 +1797,21 @@ export const layoutSection_full = ['layoutSection', {
 }];
 export const layoutSection_with_single_column = ['layoutSection', {
   props: {
+    attrs: {
+      props: {
+        columnRuleStyle: {
+          type: 'enum',
+          values: ['solid'],
+          optional: true
+        }
+      },
+      optional: true
+    },
     content: {
       type: 'array',
       items: ['layoutColumn'],
       minItems: 1,
-      maxItems: 3,
+      maxItems: 5,
       allowUnsupportedBlock: true
     },
     type: {

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

@@ -557,8 +557,13 @@ export var layoutSectionFull = createPMNodeSpecFactory({
   isolating: true
 });
 export var layoutSectionWithSingleColumnStage0 = createPMNodeSpecFactory({
-  content: '(layoutColumn | unsupportedBlock){1,3}',
+  content: '(layoutColumn | unsupportedBlock){1,5}',
   marks: 'unsupportedMark unsupportedNodeAttribute',
+  attrs: {
+    columnRuleStyle: {
+      default: null
+    }
+  },
   isolating: true
 });
 export var listItem = createPMNodeSpecFactory({

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

@@ -24,8 +24,16 @@ export var layoutSection = adfNode('layoutSection').define({
   }
 }).variant('with_single_column', {
   stage0: true,
-  content: [$range(1, 3, $or(layoutColumn, unsupportedBlock))],
+  content: [$range(1, 5, $or(layoutColumn, unsupportedBlock))],
   ignore: [],
+  attrs: {
+    columnRuleStyle: {
+      type: 'enum',
+      values: ['solid'],
+      default: null,
+      optional: true
+    }
+  },
   DANGEROUS_MANUAL_OVERRIDE: {
     'validator-spec': {
       'props.type': {

package/dist/esm/schema/nodes/layout-section.js

@@ -1,4 +1,4 @@
-import { layoutSection as layoutSectionFactory } from '../../next-schema/generated/nodeTypes';
+import { layoutSection as layoutSectionFactory, layoutSectionWithSingleColumnStage0 as layoutSectionWithSingleColumnStage0Factory } from '../../next-schema/generated/nodeTypes';
 import { layoutSectionFull as layoutSectionFullFactory } from '../../next-schema/generated/nodeTypes';
 
 /**
@@ -49,18 +49,26 @@ export var layoutSectionFull = layoutSectionFullFactory({
   }
 });
 
-// it's same as layoutSection
-export var layoutSectionWithSingleColumn = layoutSectionFactory({
+// stage-0 support for columnRuleStyle attribute and 1-5 columns
+export var layoutSectionWithSingleColumn = layoutSectionWithSingleColumnStage0Factory({
   parseDOM: [{
     context: 'layoutSection//|layoutColumn//',
     tag: 'div[data-layout-section]',
     skip: true
   }, {
-    tag: 'div[data-layout-section]'
+    tag: 'div[data-layout-section]',
+    getAttrs: function getAttrs(dom) {
+      var columnRuleStyle = dom.getAttribute('data-column-rule-style');
+      return columnRuleStyle ? {
+        columnRuleStyle: columnRuleStyle
+      } : {};
+    }
   }],
-  toDOM: function toDOM() {
+  toDOM: function toDOM(node) {
+    var columnRuleStyle = node.attrs.columnRuleStyle;
     var attrs = {
-      'data-layout-section': 'true'
+      'data-layout-section': 'true',
+      'data-column-rule-style': columnRuleStyle || undefined
     };
     return ['div', attrs, 0];
   }

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

@@ -1797,11 +1797,21 @@ export var layoutSection_full = ['layoutSection', {
 }];
 export var layoutSection_with_single_column = ['layoutSection', {
   props: {
+    attrs: {
+      props: {
+        columnRuleStyle: {
+          type: 'enum',
+          values: ['solid'],
+          optional: true
+        }
+      },
+      optional: true
+    },
     content: {
       type: 'array',
       items: ['layoutColumn'],
       minItems: 1,
-      maxItems: 3,
+      maxItems: 5,
       allowUnsupportedBlock: true
     },
     type: {

package/dist/json-schema/v1/stage-0.json

@@ -2645,35 +2645,37 @@
       ]
     },
     "layoutSection_with_single_column_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/layoutSection_node"
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["layoutSection"]
         },
-        {
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/breakout_mark"
+          }
+        },
+        "attrs": {
           "type": "object",
           "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/breakout_mark"
-              }
-            },
-            "content": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/layoutColumn_node"
-              },
-              "minItems": 1,
-              "maxItems": 3
-            },
-            "type": {
-              "enum": ["layoutSection"]
+            "columnRuleStyle": {
+              "enum": ["solid"]
             }
           },
-          "required": ["type", "content"],
           "additionalProperties": false
+        },
+        "content": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/layoutColumn_node"
+          },
+          "minItems": 1,
+          "maxItems": 5
         }
-      ]
+      },
+      "additionalProperties": false,
+      "required": ["type", "content"]
     },
     "extensionFrame_node": {
       "type": "object",

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

@@ -421,6 +421,9 @@ export interface LayoutSectionWithSingleColumnStage0Definition {
     type: 'layoutSection';
     content: Array<LayoutColumnDefinition | UnsupportedBlockDefinition>;
     marks: Array<BreakoutMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
+    attrs: {
+        columnRuleStyle?: 'solid';
+    };
 }
 export type LayoutSectionWithSingleColumnStage0Node = PMNode & LayoutSectionWithSingleColumnStage0Definition;
 export declare const layoutSectionWithSingleColumnStage0: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<LayoutSectionWithSingleColumnStage0Node>) => import("prosemirror-model").NodeSpec;

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

@@ -2,6 +2,14 @@ export declare const layoutSection: import("@atlaskit/adf-schema-generator/dist/
     stage0: true;
     content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentRangeSpec[];
     ignore: any[];
+    attrs: {
+        columnRuleStyle: {
+            type: "enum";
+            values: string[];
+            default: any;
+            optional: true;
+        };
+    };
     DANGEROUS_MANUAL_OVERRIDE: {
         'validator-spec': {
             'props.type': {

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

@@ -1816,6 +1816,16 @@ export declare const layoutSection_full: (string | {
 })[];
 export declare const layoutSection_with_single_column: (string | {
     props: {
+        attrs: {
+            props: {
+                columnRuleStyle: {
+                    type: string;
+                    values: string[];
+                    optional: boolean;
+                };
+            };
+            optional: boolean;
+        };
         content: {
             type: string;
             items: string[];

package/json-schema/v1/stage-0.json

@@ -2645,35 +2645,37 @@
       ]
     },
     "layoutSection_with_single_column_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/layoutSection_node"
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["layoutSection"]
         },
-        {
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/breakout_mark"
+          }
+        },
+        "attrs": {
           "type": "object",
           "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/breakout_mark"
-              }
-            },
-            "content": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/layoutColumn_node"
-              },
-              "minItems": 1,
-              "maxItems": 3
-            },
-            "type": {
-              "enum": ["layoutSection"]
+            "columnRuleStyle": {
+              "enum": ["solid"]
             }
           },
-          "required": ["type", "content"],
           "additionalProperties": false
+        },
+        "content": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/layoutColumn_node"
+          },
+          "minItems": 1,
+          "maxItems": 5
         }
-      ]
+      },
+      "additionalProperties": false,
+      "required": ["type", "content"]
     },
     "extensionFrame_node": {
       "type": "object",

package/package.json

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