@atlaskit/adf-schema 42.2.1 → 42.3.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/adf-schema
 
+## 42.3.1
+
+### Patch Changes
+
+- dfa64c8: Add override for pm.spec to ensure unsupportedBlock is correct for layoutSection_single_column
+
+## 42.3.0
+
+### Minor Changes
+
+- 8aff3bc: [ED-25105] This change aligns the node attributes between schema and next-schema for these nodes: codeblock, expand and nested expand, media and media inline.
+
 ## 42.2.1
 
 ### Patch Changes

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

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

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

@@ -41,6 +41,12 @@ var layoutSection = exports.layoutSection = (0, _adfSchemaGenerator.adfNode)('la
     }
   },
   DANGEROUS_MANUAL_OVERRIDE: {
+    'pm-spec': {
+      content: {
+        value: '(layoutColumn | unsupportedBlock){1,5} unsupportedBlock*',
+        reason: "The content expression is not correct or redundant around 'unsupportedBlock*'. This case is not supported by the DSL. Also in JSON schema there is no range for the items, so theres a mismatch between JSON and PM."
+      }
+    },
     'validator-spec': {
       'props.type': {
         value: {

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

@@ -56,7 +56,8 @@ var media = exports.media = (0, _adfSchemaGenerator.adfNode)('media').define({
         optional: true
       },
       __displayType: {
-        type: 'string',
+        type: 'enum',
+        values: ['file', 'thumbnail'],
         default: null,
         optional: true
       },
@@ -71,7 +72,7 @@ var media = exports.media = (0, _adfSchemaGenerator.adfNode)('media').define({
         optional: true
       },
       __fileName: {
-        type: 'string',
+        type: 'number',
         default: null,
         optional: true
       },
@@ -109,6 +110,11 @@ var media = exports.media = (0, _adfSchemaGenerator.adfNode)('media').define({
       url: {
         type: 'string',
         default: null
+      },
+      __external: {
+        type: 'boolean',
+        default: false,
+        optional: true
       }
     }]
   }

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

@@ -557,7 +557,7 @@ export const layoutSectionFull = createPMNodeSpecFactory({
   isolating: true
 });
 export const layoutSectionWithSingleColumnStage0 = createPMNodeSpecFactory({
-  content: '(layoutColumn | unsupportedBlock){1,5}',
+  content: '(layoutColumn | unsupportedBlock){1,5} unsupportedBlock*',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   attrs: {
     columnRuleStyle: {

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

@@ -35,6 +35,12 @@ export const layoutSection = adfNode('layoutSection').define({
     }
   },
   DANGEROUS_MANUAL_OVERRIDE: {
+    'pm-spec': {
+      content: {
+        value: '(layoutColumn | unsupportedBlock){1,5} unsupportedBlock*',
+        reason: `The content expression is not correct or redundant around 'unsupportedBlock*'. This case is not supported by the DSL. Also in JSON schema there is no range for the items, so theres a mismatch between JSON and PM.`
+      }
+    },
     'validator-spec': {
       'props.type': {
         value: {

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

@@ -50,7 +50,8 @@ export const media = adfNode('media').define({
         optional: true
       },
       __displayType: {
-        type: 'string',
+        type: 'enum',
+        values: ['file', 'thumbnail'],
         default: null,
         optional: true
       },
@@ -65,7 +66,7 @@ export const media = adfNode('media').define({
         optional: true
       },
       __fileName: {
-        type: 'string',
+        type: 'number',
         default: null,
         optional: true
       },
@@ -103,6 +104,11 @@ export const media = adfNode('media').define({
       url: {
         type: 'string',
         default: null
+      },
+      __external: {
+        type: 'boolean',
+        default: false,
+        optional: true
       }
     }]
   }

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

@@ -557,7 +557,7 @@ export var layoutSectionFull = createPMNodeSpecFactory({
   isolating: true
 });
 export var layoutSectionWithSingleColumnStage0 = createPMNodeSpecFactory({
-  content: '(layoutColumn | unsupportedBlock){1,5}',
+  content: '(layoutColumn | unsupportedBlock){1,5} unsupportedBlock*',
   marks: 'unsupportedMark unsupportedNodeAttribute',
   attrs: {
     columnRuleStyle: {

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

@@ -35,6 +35,12 @@ export var layoutSection = adfNode('layoutSection').define({
     }
   },
   DANGEROUS_MANUAL_OVERRIDE: {
+    'pm-spec': {
+      content: {
+        value: '(layoutColumn | unsupportedBlock){1,5} unsupportedBlock*',
+        reason: "The content expression is not correct or redundant around 'unsupportedBlock*'. This case is not supported by the DSL. Also in JSON schema there is no range for the items, so theres a mismatch between JSON and PM."
+      }
+    },
     'validator-spec': {
       'props.type': {
         value: {

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

@@ -50,7 +50,8 @@ export var media = adfNode('media').define({
         optional: true
       },
       __displayType: {
-        type: 'string',
+        type: 'enum',
+        values: ['file', 'thumbnail'],
         default: null,
         optional: true
       },
@@ -65,7 +66,7 @@ export var media = adfNode('media').define({
         optional: true
       },
       __fileName: {
-        type: 'string',
+        type: 'number',
         default: null,
         optional: true
       },
@@ -103,6 +104,11 @@ export var media = adfNode('media').define({
       url: {
         type: 'string',
         default: null
+      },
+      __external: {
+        type: 'boolean',
+        default: false,
+        optional: true
       }
     }]
   }

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

@@ -457,10 +457,10 @@ export interface MediaNodeAttributes0 {
     occurrenceKey?: string;
     width?: number;
     __contextId?: string;
-    __displayType?: string;
+    __displayType?: 'file' | 'thumbnail';
     __external?: boolean;
     __fileMimeType?: string;
-    __fileName?: string;
+    __fileName?: number;
     __fileSize?: string;
     __mediaTraceId?: string;
 }
@@ -470,6 +470,7 @@ export interface MediaNodeAttributes1 {
     height?: number;
     width?: number;
     url: string;
+    __external?: boolean;
 }
 export interface MediaDefinition {
     type: 'media';

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

@@ -11,6 +11,12 @@ export declare const layoutSection: import("@atlaskit/adf-schema-generator/dist/
         };
     };
     DANGEROUS_MANUAL_OVERRIDE: {
+        'pm-spec': {
+            content: {
+                value: string;
+                reason: string;
+            };
+        };
         'validator-spec': {
             'props.type': {
                 value: {

package/dist/types/schema/nodes/code-block.d.ts

@@ -16,6 +16,7 @@ export type CodeBlockBaseDefinition = {
 };
 export type CodeBlockAttrs = {
     language?: string;
+    uniqueId?: string;
 };
 /**
  * @name codeBlock_with_no_marks_node

package/dist/types/schema/nodes/expand.d.ts

@@ -10,6 +10,7 @@ export interface ExpandBaseDefinition {
     type: 'expand';
     attrs: {
         title?: string;
+        __expanded?: boolean;
     };
     /**
      * @minItems 1

package/dist/types/schema/nodes/media-inline.d.ts

@@ -6,6 +6,7 @@ import { AnnotationMarkDefinition } from '../marks/annotation';
 export interface MediaInlineAttributes extends MediaBaseAttributes {
     data?: object;
     type?: 'file' | 'link' | 'image';
+    url?: string | null;
 }
 /**
  * @name mediaInline_node

package/dist/types/schema/nodes/nested-expand.d.ts

@@ -23,6 +23,7 @@ export interface NestedExpandBaseDefinition {
     type: 'nestedExpand';
     attrs: {
         title?: string;
+        __expanded?: boolean;
     };
     content: NestedExpandContent;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "42.2.1",
+  "version": "42.3.1",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.22.0",
-    "@atlaskit/adf-schema-generator": "^1.32.1",
+    "@atlaskit/adf-schema-generator": "^1.33.0",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",