@atlaskit/adf-schema 36.15.0 → 36.16.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/adf-schema
 
+## 36.16.0
+
+### Minor Changes
+
+- bd85ab9: Fix handling of anyOf in PM Spec
+
 ## 36.15.0
 
 ### Minor Changes

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

@@ -64,6 +64,7 @@ var blockCard = exports.blockCard = (0, _adfSchemaGenerator.adfNode)('blockCard'
       }
     }, {
       data: {
+        type: 'object',
         default: null
       }
     }]

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

@@ -29,6 +29,7 @@ var bodiedExtension = exports.bodiedExtension = (0, _adfSchemaGenerator.adfNode)
       default: ''
     },
     parameters: {
+      type: 'object',
       optional: true,
       default: null
     },

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

@@ -25,6 +25,7 @@ var extension = exports.extension = (0, _adfSchemaGenerator.adfNode)('extension'
       default: ''
     },
     parameters: {
+      type: 'object',
       optional: true,
       default: null
     },

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

@@ -21,6 +21,7 @@ var inlineCard = exports.inlineCard = (0, _adfSchemaGenerator.adfNode)('inlineCa
       }
     }, {
       data: {
+        type: 'object',
         default: null
       }
     }]

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

@@ -25,6 +25,7 @@ var inlineExtension = exports.inlineExtension = (0, _adfSchemaGenerator.adfNode)
       default: ''
     },
     parameters: {
+      type: 'object',
       optional: true,
       default: null
     },

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

@@ -17,6 +17,7 @@ var mediaInline = exports.mediaInline = (0, _adfSchemaGenerator.adfNode)('mediaI
   marks: [_link.link, _annotation.annotation, _border.border, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
   attrs: {
     data: {
+      type: 'object',
       optional: true
     },
     type: {

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

@@ -24,6 +24,7 @@ var multiBodiedExtension = exports.multiBodiedExtension = (0, _adfSchemaGenerato
       default: ''
     },
     parameters: {
+      type: 'object',
       optional: true,
       default: null
     },

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

@@ -58,6 +58,7 @@ export const blockCard = adfNode('blockCard').define({
       }
     }, {
       data: {
+        type: 'object',
         default: null
       }
     }]

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

@@ -21,6 +21,7 @@ export const bodiedExtension = adfNode('bodiedExtension').define({
       default: ''
     },
     parameters: {
+      type: 'object',
       optional: true,
       default: null
     },

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

@@ -19,6 +19,7 @@ export const extension = adfNode('extension').define({
       default: ''
     },
     parameters: {
+      type: 'object',
       optional: true,
       default: null
     },

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

@@ -15,6 +15,7 @@ export const inlineCard = adfNode('inlineCard').define({
       }
     }, {
       data: {
+        type: 'object',
         default: null
       }
     }]

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

@@ -19,6 +19,7 @@ export const inlineExtension = adfNode('inlineExtension').define({
       default: ''
     },
     parameters: {
+      type: 'object',
       optional: true,
       default: null
     },

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

@@ -11,6 +11,7 @@ export const mediaInline = adfNode('mediaInline').define({
   marks: [link, annotation, border, unsupportedNodeAttribute, unsupportedMark],
   attrs: {
     data: {
+      type: 'object',
       optional: true
     },
     type: {

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

@@ -18,6 +18,7 @@ export const multiBodiedExtension = adfNode('multiBodiedExtension').define({
       default: ''
     },
     parameters: {
+      type: 'object',
       optional: true,
       default: null
     },

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

@@ -58,6 +58,7 @@ export var blockCard = adfNode('blockCard').define({
       }
     }, {
       data: {
+        type: 'object',
         default: null
       }
     }]

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

@@ -22,6 +22,7 @@ export var bodiedExtension = adfNode('bodiedExtension').define({
       default: ''
     },
     parameters: {
+      type: 'object',
       optional: true,
       default: null
     },

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

@@ -19,6 +19,7 @@ export var extension = adfNode('extension').define({
       default: ''
     },
     parameters: {
+      type: 'object',
       optional: true,
       default: null
     },

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

@@ -15,6 +15,7 @@ export var inlineCard = adfNode('inlineCard').define({
       }
     }, {
       data: {
+        type: 'object',
         default: null
       }
     }]

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

@@ -19,6 +19,7 @@ export var inlineExtension = adfNode('inlineExtension').define({
       default: ''
     },
     parameters: {
+      type: 'object',
       optional: true,
       default: null
     },

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

@@ -11,6 +11,7 @@ export var mediaInline = adfNode('mediaInline').define({
   marks: [link, annotation, border, unsupportedNodeAttribute, unsupportedMark],
   attrs: {
     data: {
+      type: 'object',
       optional: true
     },
     type: {

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

@@ -18,6 +18,7 @@ export var multiBodiedExtension = adfNode('multiBodiedExtension').define({
       default: ''
     },
     parameters: {
+      type: 'object',
       optional: true,
       default: null
     },

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

@@ -1,15 +1,22 @@
 import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { InlineDefinition, BlockDefinition } from './nodeGroupTypes';
 import { UnsupportedNodeAttributeMark, UnsupportedMarkMark, LinkMark, AnnotationMark, BorderMark, EmMark, StrongMark, StrikeMark, SubsupMark, UnderlineMark, TextColorMark, BackgroundColorMark, CodeMark, DataConsumerMark, FragmentMark, AlignmentMark, IndentationMark, BreakoutMark } from './markTypes';
+export interface BlockCardNodeAttributes0 {
+    url?: string;
+    datasource: Record<string, unknown>;
+    width?: number;
+    layout?: 'wide' | 'full-width' | 'center' | 'wrap-right' | 'wrap-left' | 'align-end' | 'align-start';
+}
+export interface BlockCardNodeAttributes1 {
+    url: string;
+}
+export interface BlockCardNodeAttributes2 {
+    data: Record<string, unknown>;
+}
 export interface BlockCardDefinition {
     type: 'blockCard';
     marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
-    attrs: {
-        url?: string;
-        datasource: Record<string, unknown>;
-        width?: number;
-        layout?: 'wide' | 'full-width' | 'center' | 'wrap-right' | 'wrap-left' | 'align-end' | 'align-start';
-    };
+    attrs: BlockCardNodeAttributes0 | BlockCardNodeAttributes1 | BlockCardNodeAttributes2;
 }
 export type BlockCardNode = PMNode & BlockCardDefinition;
 export declare const blockCard: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<BlockCardNode>) => import("prosemirror-model").NodeSpec;
@@ -36,38 +43,51 @@ export interface CodeBlockWithNoMarksDefinition {
 }
 export type CodeBlockWithNoMarksNode = PMNode & CodeBlockWithNoMarksDefinition;
 export declare const codeBlockWithNoMarks: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<CodeBlockWithNoMarksNode>) => import("prosemirror-model").NodeSpec;
+export interface MediaNodeAttributes0 {
+    type: 'link' | 'file';
+    id: string;
+    alt?: string;
+    collection: string;
+    height?: number;
+    occurrenceKey?: string;
+    width?: number;
+    __contextId?: string;
+    __displayType?: string;
+    __external?: boolean;
+    __fileMimeType?: string;
+    __fileName?: string;
+    __fileSize?: string;
+    __mediaTraceId?: string;
+}
+export interface MediaNodeAttributes1 {
+    type: 'external';
+    alt?: string;
+    height?: number;
+    width?: number;
+    url: string;
+}
 export interface MediaDefinition {
     type: 'media';
     marks: Array<LinkMark | AnnotationMark | BorderMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
-    attrs: {
-        type: 'external' | 'file';
-        id: string;
-        alt?: string;
-        collection: string;
-        height?: number;
-        occurrenceKey?: string;
-        width?: number;
-        __contextId?: string;
-        __displayType?: string;
-        __external?: boolean;
-        __fileMimeType?: string;
-        __fileName?: string;
-        __fileSize?: string;
-        __mediaTraceId?: string;
-        url: string;
-    };
+    attrs: MediaNodeAttributes0 | MediaNodeAttributes1;
 }
 export type MediaNode = PMNode & MediaDefinition;
 export declare const media: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<MediaNode>) => import("prosemirror-model").NodeSpec;
+export interface MediaSingleNodeAttributes0 {
+    width?: number;
+    layout: 'wide' | 'full-width' | 'center' | 'wrap-right' | 'wrap-left' | 'align-end' | 'align-start';
+    widthType?: 'percentage';
+}
+export interface MediaSingleNodeAttributes1 {
+    width: number;
+    widthType: 'pixel';
+    layout: 'wide' | 'full-width' | 'center' | 'wrap-right' | 'wrap-left' | 'align-end' | 'align-start';
+}
 export interface MediaSingleDefinition {
     type: 'mediaSingle';
     content: Array<MediaDefinition>;
     marks: Array<LinkMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
-    attrs: {
-        width?: number;
-        layout: 'wide' | 'full-width' | 'center' | 'wrap-right' | 'wrap-left' | 'align-end' | 'align-start';
-        widthType?: 'pixel';
-    };
+    attrs: MediaSingleNodeAttributes0 | MediaSingleNodeAttributes1;
 }
 export type MediaSingleNode = PMNode & MediaSingleDefinition;
 export declare const mediaSingle: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<MediaSingleNode>) => import("prosemirror-model").NodeSpec;
@@ -130,12 +150,16 @@ export interface PlaceholderDefinition {
 }
 export type PlaceholderNode = PMNode & PlaceholderDefinition;
 export declare const placeholder: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<PlaceholderNode>) => import("prosemirror-model").NodeSpec;
+export interface InlineCardNodeAttributes0 {
+    url: string;
+}
+export interface InlineCardNodeAttributes1 {
+    data: Record<string, unknown>;
+}
 export interface InlineCardDefinition {
     type: 'inlineCard';
     marks: Array<UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
-    attrs: {
-        url: string;
-    };
+    attrs: InlineCardNodeAttributes0 | InlineCardNodeAttributes1;
 }
 export type InlineCardNode = PMNode & InlineCardDefinition;
 export declare const inlineCard: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<InlineCardNode>) => import("prosemirror-model").NodeSpec;
@@ -170,27 +194,39 @@ export interface CaptionDefinition {
 }
 export type CaptionNode = PMNode & CaptionDefinition;
 export declare const caption: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<CaptionNode>) => import("prosemirror-model").NodeSpec;
+export interface MediaSingleCaptionNodeAttributes0 {
+    width?: number;
+    layout: 'wide' | 'full-width' | 'center' | 'wrap-right' | 'wrap-left' | 'align-end' | 'align-start';
+    widthType?: 'percentage';
+}
+export interface MediaSingleCaptionNodeAttributes1 {
+    width: number;
+    widthType: 'pixel';
+    layout: 'wide' | 'full-width' | 'center' | 'wrap-right' | 'wrap-left' | 'align-end' | 'align-start';
+}
 export interface MediaSingleCaptionDefinition {
     type: 'mediaSingle';
     content: Array<MediaDefinition | UnsupportedBlockDefinition | CaptionDefinition | UnsupportedBlockDefinition>;
     marks: Array<LinkMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
-    attrs: {
-        width?: number;
-        layout: 'wide' | 'full-width' | 'center' | 'wrap-right' | 'wrap-left' | 'align-end' | 'align-start';
-        widthType?: 'pixel';
-    };
+    attrs: MediaSingleCaptionNodeAttributes0 | MediaSingleCaptionNodeAttributes1;
 }
 export type MediaSingleCaptionNode = PMNode & MediaSingleCaptionDefinition;
 export declare const mediaSingleCaption: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<MediaSingleCaptionNode>) => import("prosemirror-model").NodeSpec;
+export interface MediaSingleFullNodeAttributes0 {
+    width?: number;
+    layout: 'wide' | 'full-width' | 'center' | 'wrap-right' | 'wrap-left' | 'align-end' | 'align-start';
+    widthType?: 'percentage';
+}
+export interface MediaSingleFullNodeAttributes1 {
+    width: number;
+    widthType: 'pixel';
+    layout: 'wide' | 'full-width' | 'center' | 'wrap-right' | 'wrap-left' | 'align-end' | 'align-start';
+}
 export interface MediaSingleFullDefinition {
     type: 'mediaSingle';
     content: Array<MediaDefinition>;
     marks: Array<LinkMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
-    attrs: {
-        width?: number;
-        layout: 'wide' | 'full-width' | 'center' | 'wrap-right' | 'wrap-left' | 'align-end' | 'align-start';
-        widthType?: 'pixel';
-    };
+    attrs: MediaSingleFullNodeAttributes0 | MediaSingleFullNodeAttributes1;
 }
 export type MediaSingleFullNode = PMNode & MediaSingleFullDefinition;
 export declare const mediaSingleFull: ({ parseDOM, toDOM }: import("@atlaskit/adf-schema-generator").NodeSpecOptions<MediaSingleFullNode>) => import("prosemirror-model").NodeSpec;
@@ -200,6 +236,7 @@ export interface InlineExtensionWithMarksDefinition {
     attrs: {
         extensionKey: string;
         extensionType: string;
+        parameters?: Record<string, unknown>;
         text?: string;
         localId?: string;
     };
@@ -210,6 +247,7 @@ export interface MediaInlineDefinition {
     type: 'mediaInline';
     marks: Array<LinkMark | AnnotationMark | BorderMark | UnsupportedNodeAttributeMark | UnsupportedMarkMark>;
     attrs: {
+        data?: Record<string, unknown>;
         type?: 'link' | 'file' | 'image';
         url: string;
         id: string;
@@ -357,6 +395,7 @@ export interface ExtensionWithMarksDefinition {
     attrs: {
         extensionKey: string;
         extensionType: string;
+        parameters?: Record<string, unknown>;
         text?: string;
         layout?: 'wide' | 'full-width' | 'default';
         localId?: string;
@@ -503,6 +542,7 @@ export interface BodiedExtensionWithMarksDefinition {
     attrs: {
         extensionKey: string;
         extensionType: string;
+        parameters?: Record<string, unknown>;
         text?: string;
         layout?: 'wide' | 'full-width' | 'default';
         localId?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "36.15.0",
+  "version": "36.16.0",
   "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.14.0",
+    "@atlaskit/adf-schema-generator": "^1.15.0",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@atlaskit/json-schema-generator": "^3.3.9",
     "@babel/cli": "^7.22.9",

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

@@ -144,7 +144,9 @@ const jsonWithTypes = {
             {
               additionalProperties: false,
               properties: {
-                data: {},
+                data: {
+                  type: 'object',
+                },
               },
               required: ['data'],
               type: 'object',
@@ -646,7 +648,9 @@ const jsonWithTypes = {
             {
               additionalProperties: false,
               properties: {
-                data: {},
+                data: {
+                  type: 'object',
+                },
               },
               required: ['data'],
               type: 'object',
@@ -831,7 +835,9 @@ const jsonWithTypes = {
             collection: {
               type: 'string',
             },
-            data: {},
+            data: {
+              type: 'object',
+            },
             height: {
               type: 'number',
             },