@atlaskit/adf-schema 36.12.2 → 36.13.0

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

@@ -1,4 +1,6 @@
 import { $onePlus, $or, adfNode } from '@atlaskit/adf-schema-generator';
+import { unsupportedMark } from '../marks/unsupportedMark';
+import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
 import { blockCard } from './blockCard';
 import { blockquote } from './blockquote';
 import { codeBlock } from './codeBlock';
@@ -18,6 +20,7 @@ export var tableHeader = adfNode('tableHeader').define({
   isolating: true,
   selectable: false,
   tableRole: 'header_cell',
+  marks: [unsupportedNodeAttribute, unsupportedMark],
   attrs: {
     colspan: {
       type: 'number',

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

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

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

@@ -1,10 +1,15 @@
 import { $onePlus, $or, $zeroPlus, adfNode } from '@atlaskit/adf-schema-generator';
 import { inlineGroup } from '../groups/inlineGroup';
+import { unsupportedMark } from '../marks/unsupportedMark';
+import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
+import { unsupportedInline } from './unsupportedInline';
+import { unsupportedBlock } from './unsupportedBlock';
 export var taskItem = adfNode('taskItem');
 export var taskList = adfNode('taskList');
 taskItem.define({
   defining: true,
   selectable: false,
+  marks: [unsupportedNodeAttribute, unsupportedMark],
   attrs: {
     localId: {
       type: 'string',
@@ -16,16 +21,17 @@ taskItem.define({
       default: 'TODO'
     }
   },
-  content: [$zeroPlus($or(inlineGroup))]
+  content: [$zeroPlus($or(inlineGroup, unsupportedInline))]
 });
 taskList.define({
   defining: true,
   selectable: false,
+  marks: [unsupportedNodeAttribute, unsupportedMark],
   attrs: {
     localId: {
       type: 'string',
       default: ''
     }
   },
-  content: [$onePlus($or(taskItem)), $zeroPlus($or(taskItem, taskList))]
+  content: [$onePlus($or(taskItem, unsupportedBlock)), $zeroPlus($or(taskItem, taskList, unsupportedBlock))]
 });

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

@@ -8,8 +8,10 @@ import { strong } from '../marks/strong';
 import { subsup } from '../marks/subsup';
 import { underline } from '../marks/underline';
 import { backgroundColor, textColor } from '../marks/color';
+import { unsupportedNodeAttribute } from '../marks/unsupportedNodeAttribute';
+import { unsupportedMark } from '../marks/unsupportedMark';
 export var text = adfNode('text').define({}).variant('formatted', {
-  marks: [link, em, strong, strike, subsup, underline, textColor, annotation, backgroundColor]
+  marks: [link, em, strong, strike, subsup, underline, textColor, annotation, backgroundColor, unsupportedNodeAttribute, unsupportedMark]
 }).variant('code_inline', {
-  marks: [code, link, annotation]
+  marks: [code, link, annotation, unsupportedNodeAttribute, unsupportedMark]
 });

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

@@ -0,0 +1,12 @@
+import { adfNode, JSONSchemaTransformerName, ValidatorSpecTransformerName } from '@atlaskit/adf-schema-generator';
+export var unsupportedBlock = adfNode('unsupportedBlock').define({
+  ignore: [JSONSchemaTransformerName, ValidatorSpecTransformerName],
+  atom: true,
+  selectable: true,
+  attrs: {
+    originalValue: {
+      type: 'object',
+      default: {}
+    }
+  }
+});

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

@@ -0,0 +1,12 @@
+import { adfNode, JSONSchemaTransformerName, ValidatorSpecTransformerName } from '@atlaskit/adf-schema-generator';
+export var unsupportedInline = adfNode('unsupportedInline').define({
+  ignore: [JSONSchemaTransformerName, ValidatorSpecTransformerName],
+  inline: true,
+  selectable: true,
+  attrs: {
+    originalValue: {
+      type: 'object',
+      default: {}
+    }
+  }
+});

package/dist/types/next-schema/marks/unsupportedMark.d.ts

@@ -0,0 +1 @@
+export declare const unsupportedMark: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>;

package/dist/types/next-schema/marks/unsupportedNodeAttribute.d.ts

@@ -0,0 +1 @@
+export declare const unsupportedNodeAttribute: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>;

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

@@ -0,0 +1,19 @@
+export declare const confluenceUnsupportedBlock: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string], {
+    ignore?: import("@atlaskit/adf-schema-generator/dist/types/transforms/transformerNames").TransformerNames[];
+    root?: boolean;
+    atom?: boolean;
+    version?: 1;
+    attrs?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFAttribute").ADFAttributes;
+    inline?: true;
+    code?: boolean;
+    content?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentSpec[];
+    defining?: boolean;
+    definingAsContext?: boolean;
+    definingForContent?: boolean;
+    draggable?: boolean;
+    group?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeGroup").ADFNodeGroup;
+    isolating?: boolean;
+    marks?: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<unknown>[];
+    selectable?: boolean;
+    whitespace?: "pre" | "normal";
+}>;

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

@@ -0,0 +1,19 @@
+export declare const confluenceUnsupportedInline: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string], {
+    ignore?: import("@atlaskit/adf-schema-generator/dist/types/transforms/transformerNames").TransformerNames[];
+    root?: boolean;
+    atom?: boolean;
+    version?: 1;
+    attrs?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFAttribute").ADFAttributes;
+    inline?: true;
+    code?: boolean;
+    content?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentSpec[];
+    defining?: boolean;
+    definingAsContext?: boolean;
+    definingForContent?: boolean;
+    draggable?: boolean;
+    group?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeGroup").ADFNodeGroup;
+    isolating?: boolean;
+    marks?: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<unknown>[];
+    selectable?: boolean;
+    whitespace?: "pre" | "normal";
+}>;

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

@@ -21,26 +21,3 @@ export declare const heading: import("@atlaskit/adf-schema-generator/dist/types/
 } & {
     marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
 }>;
-export declare const headingWithMarks: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "with_alignment", "with_indentation", "with_no_marks"], {
-    ignore?: import("@atlaskit/adf-schema-generator/dist/types/transforms/transformerNames").TransformerNames[];
-    root?: boolean;
-    atom?: boolean;
-    version?: 1;
-    attrs?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFAttribute").ADFAttributes;
-    inline?: true;
-    code?: boolean;
-    content?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentSpec[];
-    defining?: boolean;
-    definingAsContext?: boolean;
-    definingForContent?: boolean;
-    draggable?: boolean;
-    group?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeGroup").ADFNodeGroup;
-    isolating?: boolean;
-    marks?: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<unknown>[];
-    selectable?: boolean;
-    whitespace?: "pre" | "normal";
-} & {
-    marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
-} & {
-    marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
-}>;

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

@@ -0,0 +1,19 @@
+export declare const unsupportedBlock: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string], {
+    ignore?: import("@atlaskit/adf-schema-generator/dist/types/transforms/transformerNames").TransformerNames[];
+    root?: boolean;
+    atom?: boolean;
+    version?: 1;
+    attrs?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFAttribute").ADFAttributes;
+    inline?: true;
+    code?: boolean;
+    content?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentSpec[];
+    defining?: boolean;
+    definingAsContext?: boolean;
+    definingForContent?: boolean;
+    draggable?: boolean;
+    group?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeGroup").ADFNodeGroup;
+    isolating?: boolean;
+    marks?: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<unknown>[];
+    selectable?: boolean;
+    whitespace?: "pre" | "normal";
+}>;

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

@@ -0,0 +1,19 @@
+export declare const unsupportedInline: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string], {
+    ignore?: import("@atlaskit/adf-schema-generator/dist/types/transforms/transformerNames").TransformerNames[];
+    root?: boolean;
+    atom?: boolean;
+    version?: 1;
+    attrs?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFAttribute").ADFAttributes;
+    inline?: true;
+    code?: boolean;
+    content?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentSpec[];
+    defining?: boolean;
+    definingAsContext?: boolean;
+    definingForContent?: boolean;
+    draggable?: boolean;
+    group?: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeGroup").ADFNodeGroup;
+    isolating?: boolean;
+    marks?: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<unknown>[];
+    selectable?: boolean;
+    whitespace?: "pre" | "normal";
+}>;

package/package.json

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

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

@@ -179,3 +179,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(
+  .allOf,
+  .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
+```