@atlaskit/adf-schema 36.12.0 → 36.12.1

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

@@ -12,6 +12,11 @@ export var media = adfNode('media').define({
         values: ['link', 'file'],
         default: 'file'
       },
+      id: {
+        minLength: 1,
+        type: 'string',
+        default: ''
+      },
       alt: {
         type: 'string',
         default: '',
@@ -21,11 +26,6 @@ export var media = adfNode('media').define({
         type: 'string',
         default: ''
       },
-      id: {
-        minLength: 1,
-        type: 'string',
-        default: ''
-      },
       height: {
         type: 'number',
         default: null,
@@ -78,6 +78,11 @@ export var media = adfNode('media').define({
         optional: true
       }
     }, {
+      type: {
+        type: 'enum',
+        values: ['external'],
+        default: 'file'
+      },
       alt: {
         type: 'string',
         default: '',
@@ -96,12 +101,7 @@ export var media = adfNode('media').define({
       url: {
         type: 'string',
         default: null,
-        optional: true
-      },
-      type: {
-        type: 'enum',
-        values: ['external'],
-        default: 'file'
+        optional: false
       }
     }]
   }

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

@@ -20,7 +20,8 @@ export var mediaInline = adfNode('mediaInline').define({
       type: 'string'
     },
     alt: {
-      type: 'string'
+      type: 'string',
+      optional: true
     },
     collection: {
       type: 'string'

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

@@ -17,7 +17,8 @@ export var mediaSingle = adfNode('mediaSingle').define({
       },
       layout: {
         type: 'enum',
-        values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start']
+        values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start'],
+        default: 'center'
       },
       widthType: {
         type: 'enum',
@@ -29,19 +30,17 @@ export var mediaSingle = adfNode('mediaSingle').define({
       width: {
         type: 'number',
         minimum: 0,
-        default: null,
-        optional: true
+        default: null
+      },
+      widthType: {
+        type: 'enum',
+        values: ['pixel'],
+        default: 'pixel'
       },
       layout: {
         type: 'enum',
         values: ['wide', 'full-width', 'center', 'wrap-right', 'wrap-left', 'align-end', 'align-start'],
         default: 'center'
-      },
-      widthType: {
-        type: 'enum',
-        values: ['pixel'],
-        default: 'pixel',
-        optional: true
       }
     }]
   }

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

@@ -8,7 +8,9 @@ export var table = adfNode('table').define({
   attrs: {
     displayMode: {
       type: 'enum',
-      values: ['default', 'fixed']
+      values: ['default', 'fixed'],
+      default: 'default',
+      optional: true
     },
     isNumberColumnEnabled: {
       type: 'boolean',

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

@@ -1,7 +1,7 @@
-import { $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
+import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
 import { tableCell } from './tableCell';
 import { tableHeader } from './tableHeader';
 export var tableRow = adfNode('tableRow').define({
   selectable: false,
-  content: [$zeroPlus($or(tableCell, tableHeader))]
+  content: [$onePlus($or(tableCell, tableHeader))]
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "36.12.0",
+  "version": "36.12.1",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -22,6 +22,7 @@
     "ak-postbuild": "yarn build:json-schema",
     "test": "yarn test:unit",
     "test:unit": "yarn workspace @atlaskit/editor-prosemirror build && jest --testPathPattern=packages/adf-schema/ --config=../../jest.config.js",
+    "test:json-schema": "yarn run jest --expand --testPathPattern=packages/adf-schema/schema-generators/__tests__/unit/json-full-schema.unit.ts --config=../../jest.config.js",
     "build:cjs": "NODE_ENV=production BABEL_ENV=production:node-cjs babel --config-file ../../babel.config.js src --out-dir dist/cjs -x .ts,.tsx",
     "build:esm": "NODE_ENV=production BABEL_ENV=production:esm babel --config-file ../../babel.config.js src -d dist/esm -x .ts,.tsx",
     "build:es2019": "NODE_ENV=production BABEL_ENV=production:es2019 babel --config-file ../../babel.config.js src -d dist/es2019 -x .ts,.tsx",
@@ -45,7 +46,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.15.0",
-    "@atlaskit/adf-schema-generator": "^1.10.0",
+    "@atlaskit/adf-schema-generator": "^1.10.1",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",
     "@babel/plugin-proposal-class-properties": "^7.18.6",

package/schema-generators/__tests__/unit/jqueries.md

@@ -166,3 +166,16 @@ A number of nodes have `marks` defined, yet the array is empty. Assuming this is
   .block_content, .nestedExpand_content, .non_nestable_block_content, .table_cell_content, .inline_node,
   .bodiedExtension_node.properties.marks, .codeBlock_node.properties.marks, .expand_node.properties.marks, .heading_node.properties.marks, .inlineExtension_node.properties.marks, .text_node.properties.marks, .extension_node.properties.marks, .paragraph_node.properties.marks) else . end)' | pbcopy
 ```
+
+Base level content objects (not nodes) are deleted. `inline` is also deleted, as it is a content object for paragraph.
+
+`additionalProperties` and `allOf` are deleted as well.
+
+A number of nodes have `marks` defined, yet the array is empty. Assuming this is redundant, I've removed them.
+
+```sh
+ cat packages/adf-schema/json-schema/v1/full.json | jq 'walk(if type == "object" then del(
+  .additionalProperties, .allOf, .properties.required,
+  .block_content, .nestedExpand_content, .non_nestable_block_content, .table_cell_content, .inline_node,
+  .bodiedExtension_node.properties.marks, .codeBlock_node.properties.marks, .expand_node.properties.marks, .heading_node.properties.marks, .inlineExtension_node.properties.marks, .text_node.properties.marks, .extension_node.properties.marks, .paragraph_node.properties.marks) else . end)' | pbcopy
+```