@atlaskit/adf-schema 36.8.4 → 36.8.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/adf-schema
 
+## 36.8.5
+
+### Patch Changes
+
+- 669a895: Add anyof field to json marks in DSL transformer
+
 ## 36.8.4
 
 ### Patch Changes

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

@@ -10,7 +10,7 @@ var _border = require("../marks/border");
 var _link = require("../marks/link");
 var media = exports.media = (0, _adfSchemaGenerator.adfNode)('media').define({
   selectable: true,
-  marks: [_link.link, _border.border, _annotation.annotation],
+  marks: [_link.link, _annotation.annotation, _border.border],
   attrs: {
     type: {
       type: 'enum',

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

@@ -13,7 +13,7 @@ var _media = require("./media");
 var mediaInline = exports.mediaInline = (0, _adfSchemaGenerator.adfNode)('mediaInline').define({
   selectable: true,
   atom: false,
-  marks: [_link.link, _border.border, _annotation.annotation],
+  marks: [_link.link, _annotation.annotation, _border.border],
   attrs: {
     data: {
       type: 'object',

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

@@ -4,7 +4,7 @@ import { border } from '../marks/border';
 import { link } from '../marks/link';
 export const media = adfNode('media').define({
   selectable: true,
-  marks: [link, border, annotation],
+  marks: [link, annotation, border],
   attrs: {
     type: {
       type: 'enum',

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

@@ -7,7 +7,7 @@ import { media } from './media';
 export const mediaInline = adfNode('mediaInline').define({
   selectable: true,
   atom: false,
-  marks: [link, border, annotation],
+  marks: [link, annotation, border],
   attrs: {
     data: {
       type: 'object',

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

@@ -4,7 +4,7 @@ import { border } from '../marks/border';
 import { link } from '../marks/link';
 export var media = adfNode('media').define({
   selectable: true,
-  marks: [link, border, annotation],
+  marks: [link, annotation, border],
   attrs: {
     type: {
       type: 'enum',

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

@@ -7,7 +7,7 @@ import { media } from './media';
 export var mediaInline = adfNode('mediaInline').define({
   selectable: true,
   atom: false,
-  marks: [link, border, annotation],
+  marks: [link, annotation, border],
   attrs: {
     data: {
       type: 'object',

package/package.json

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

@@ -43,13 +43,13 @@ A number of nodes have `marks` defined, yet the array is empty. Assuming this is
   .bodiedExtension_node.properties.marks, .codeBlock_node.properties.marks, .expand_node.properties.marks, .heading_node.properties.marks, .inlineExtension_node.properties.marks, .text_node.properties.marks) else . end)'
 ```
 
-Delete all subfields except for marks, items, type and properties. Content objects are also deleted. Inline is also deleted, as it is a content object for paragraph.
+Delete all subfields except for marks, anyOf, items, type and properties. Content objects are also deleted. Inline is also deleted, as it is a content object for paragraph.
 
 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(
-  .content, .text, .attrs, .version, .required, .additionalProperties, .allOf, .anyOf, .minItems,
+  .content, .text, .attrs, .version, .required, .additionalProperties, .allOf, .minItems,
   .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)'
 ```

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

@@ -239,7 +239,19 @@ const jsonWithTypes = {
         },
         marks: {
           type: 'array',
-          items: {},
+          items: {
+            anyOf: [
+              {
+                $ref: '#/definitions/link_mark',
+              },
+              {
+                $ref: '#/definitions/annotation_mark',
+              },
+              {
+                $ref: '#/definitions/border_mark',
+              },
+            ],
+          },
         },
       },
     },
@@ -251,7 +263,19 @@ const jsonWithTypes = {
         },
         marks: {
           type: 'array',
-          items: {},
+          items: {
+            anyOf: [
+              {
+                $ref: '#/definitions/link_mark',
+              },
+              {
+                $ref: '#/definitions/annotation_mark',
+              },
+              {
+                $ref: '#/definitions/border_mark',
+              },
+            ],
+          },
         },
       },
     },