@atlaskit/adf-schema 36.10.4 → 36.10.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/adf-schema
 
+## 36.10.5
+
+### Patch Changes
+
+- 1b75a44: Add items field to JSON Schema transformer from ADF DSL
+
 ## 36.10.4
 
 ### Patch Changes

package/package.json

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

@@ -101,3 +101,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
 ```
+
+Delete all subfields except for content, text, marks, attrs, anyOf, items, type and properties. Base level content objects (not nodes) are also deleted. `inline` is also deleted, as it is a content object for paragraph.
+
+All fields of content except for type and items have been 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(
+  .version, .required, .additionalProperties, .allOf, .minItems, .content.items.anyOf?, .content.items."$ref"?, .content.items[]?, .content."$ref",
+  .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
+```

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

@@ -48,6 +48,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
         attrs: {
           type: 'object',
@@ -682,6 +683,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
       },
     },
@@ -696,6 +698,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
       },
     },
@@ -774,6 +777,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
         attrs: {
           type: 'object',
@@ -796,6 +800,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: [],
         },
         attrs: {
           type: 'object',
@@ -815,6 +820,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: [],
         },
       },
     },
@@ -826,6 +832,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
       },
     },
@@ -837,6 +844,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
         attrs: {
           type: 'object',
@@ -857,6 +865,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
         attrs: {
           type: 'object',
@@ -881,6 +890,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
       },
     },
@@ -892,6 +902,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
         attrs: {
           type: 'object',
@@ -914,6 +925,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
         attrs: {
           type: 'object',
@@ -969,6 +981,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
       },
     },
@@ -980,6 +993,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
       },
     },
@@ -1108,6 +1122,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
         marks: {
           type: 'array',
@@ -1125,6 +1140,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
       },
     },
@@ -1202,6 +1218,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
       },
     },
@@ -1239,6 +1256,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
       },
     },
@@ -1261,6 +1279,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
       },
     },
@@ -1278,6 +1297,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
       },
     },
@@ -1290,6 +1310,7 @@ const jsonWithTypes = {
         },
         content: {
           type: 'array',
+          items: {},
         },
       },
     },
@@ -1297,13 +1318,19 @@ const jsonWithTypes = {
 };
 
 // New JSON, different to the old JSON schema
-jsonWithTypes.definitions.heading_node.properties.content = { type: 'array' };
+jsonWithTypes.definitions.heading_node.properties.content = {
+  type: 'array',
+  items: {},
+};
 jsonWithTypes.definitions.nestedExpand_node.properties.content = {
   type: 'array',
+  items: {},
 };
 jsonWithTypes.definitions.table_cell_node.properties.content = {
   type: 'array',
+  items: {},
 };
 jsonWithTypes.definitions.table_header_node.properties.content = {
   type: 'array',
+  items: {},
 };