@atlaskit/adf-schema 52.7.1 → 52.9.0

package/json-schema/v1/full.json

@@ -309,6 +309,9 @@
                 {
                   "$ref": "#/definitions/paragraph_with_no_marks_node"
                 },
+                {
+                  "$ref": "#/definitions/paragraph_with_font_size_node"
+                },
                 {
                   "$ref": "#/definitions/extension_with_marks_node"
                 }
@@ -319,6 +322,9 @@
                 {
                   "$ref": "#/definitions/paragraph_with_no_marks_node"
                 },
+                {
+                  "$ref": "#/definitions/paragraph_with_font_size_node"
+                },
                 {
                   "$ref": "#/definitions/extension_with_marks_node"
                 }
@@ -1196,6 +1202,26 @@
         }
       ]
     },
+    "fontSize_mark": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["fontSize"]
+        },
+        "attrs": {
+          "type": "object",
+          "properties": {
+            "fontSize": {
+              "enum": ["small"]
+            }
+          },
+          "required": ["fontSize"],
+          "additionalProperties": false
+        }
+      },
+      "required": ["type", "attrs"],
+      "additionalProperties": false
+    },
     "formatted_text_inline_node": {
       "allOf": [
         {
@@ -1679,6 +1705,9 @@
           "type": "array",
           "items": {
             "anyOf": [
+              {
+                "$ref": "#/definitions/paragraph_with_font_size_node"
+              },
               {
                 "$ref": "#/definitions/paragraph_with_no_marks_node"
               },
@@ -2047,6 +2076,9 @@
           {
             "$ref": "#/definitions/paragraph_with_no_marks_node"
           },
+          {
+            "$ref": "#/definitions/paragraph_with_font_size_node"
+          },
           {
             "$ref": "#/definitions/heading_with_no_marks_node"
           },
@@ -2137,6 +2169,9 @@
         {
           "$ref": "#/definitions/paragraph_with_no_marks_node"
         },
+        {
+          "$ref": "#/definitions/paragraph_with_font_size_node"
+        },
         {
           "$ref": "#/definitions/panel_node"
         },
@@ -2263,6 +2298,9 @@
               {
                 "$ref": "#/definitions/paragraph_with_no_marks_node"
               },
+              {
+                "$ref": "#/definitions/paragraph_with_font_size_node"
+              },
               {
                 "$ref": "#/definitions/heading_with_no_marks_node"
               },
@@ -2346,7 +2384,33 @@
             "marks": {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/alignment_mark"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/fontSize_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/alignment_mark"
+                  }
+                ]
+              }
+            }
+          },
+          "additionalProperties": true
+        }
+      ]
+    },
+    "paragraph_with_font_size_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/paragraph_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "marks": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/fontSize_mark"
               }
             }
           },
@@ -2365,7 +2429,14 @@
             "marks": {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/indentation_mark"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/fontSize_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/indentation_mark"
+                  }
+                ]
               }
             }
           },

package/json-schema/v1/stage-0.json

@@ -81,12 +81,6 @@
         {
           "$ref": "#/definitions/paragraph_with_indentation_node"
         },
-        {
-          "$ref": "#/definitions/paragraph_with_font_size_and_alignment_node"
-        },
-        {
-          "$ref": "#/definitions/paragraph_with_font_size_and_indentation_node"
-        },
         {
           "$ref": "#/definitions/mediaSingle_caption_node"
         },
@@ -96,6 +90,9 @@
         {
           "$ref": "#/definitions/codeBlock_node"
         },
+        {
+          "$ref": "#/definitions/codeBlock_with_extended_attributes_node"
+        },
         {
           "$ref": "#/definitions/taskList_node"
         },
@@ -453,12 +450,6 @@
               {
                 "$ref": "#/definitions/paragraph_with_indentation_node"
               },
-              {
-                "$ref": "#/definitions/paragraph_with_font_size_and_alignment_node"
-              },
-              {
-                "$ref": "#/definitions/paragraph_with_font_size_and_indentation_node"
-              },
               {
                 "$ref": "#/definitions/paragraph_with_no_marks_node"
               },
@@ -778,6 +769,90 @@
       "additionalProperties": false,
       "required": ["type"]
     },
+    "codeBlock_root_only_with_extended_attributes_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["codeBlock"]
+        },
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/breakout_mark"
+          }
+        },
+        "attrs": {
+          "type": "object",
+          "properties": {
+            "language": {
+              "type": "string"
+            },
+            "uniqueId": {
+              "type": "string"
+            },
+            "localId": {
+              "type": "string"
+            },
+            "wrap": {
+              "type": "boolean"
+            },
+            "hideLineNumbers": {
+              "type": "boolean"
+            }
+          },
+          "additionalProperties": false
+        },
+        "content": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/text_with_no_marks_node"
+          }
+        }
+      },
+      "additionalProperties": false,
+      "required": ["type"]
+    },
+    "codeBlock_with_extended_attributes_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": ["codeBlock"]
+        },
+        "marks": {
+          "type": "array",
+          "maxItems": 0
+        },
+        "attrs": {
+          "type": "object",
+          "properties": {
+            "language": {
+              "type": "string"
+            },
+            "uniqueId": {
+              "type": "string"
+            },
+            "localId": {
+              "type": "string"
+            },
+            "wrap": {
+              "type": "boolean"
+            },
+            "hideLineNumbers": {
+              "type": "boolean"
+            }
+          },
+          "additionalProperties": false
+        },
+        "content": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/text_with_no_marks_node"
+          }
+        }
+      },
+      "additionalProperties": false,
+      "required": ["type"]
+    },
     "dataConsumer_mark": {
       "type": "object",
       "properties": {
@@ -904,6 +979,9 @@
               {
                 "$ref": "#/definitions/codeBlock_node"
               },
+              {
+                "$ref": "#/definitions/codeBlock_with_extended_attributes_node"
+              },
               {
                 "$ref": "#/definitions/mediaSingle_caption_node"
               },
@@ -916,12 +994,6 @@
               {
                 "$ref": "#/definitions/paragraph_with_indentation_node"
               },
-              {
-                "$ref": "#/definitions/paragraph_with_font_size_and_alignment_node"
-              },
-              {
-                "$ref": "#/definitions/paragraph_with_font_size_and_indentation_node"
-              },
               {
                 "$ref": "#/definitions/paragraph_with_no_marks_node"
               },
@@ -976,6 +1048,9 @@
               {
                 "$ref": "#/definitions/codeBlock_root_only_node"
               },
+              {
+                "$ref": "#/definitions/codeBlock_root_only_with_extended_attributes_node"
+              },
               {
                 "$ref": "#/definitions/layoutSection_with_single_column_node"
               },
@@ -2414,6 +2489,9 @@
         {
           "$ref": "#/definitions/codeBlock_node"
         },
+        {
+          "$ref": "#/definitions/codeBlock_with_extended_attributes_node"
+        },
         {
           "$ref": "#/definitions/mediaGroup_node"
         },
@@ -2595,25 +2673,6 @@
       "required": ["type"]
     },
     "paragraph_with_alignment_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/paragraph_node"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/alignment_mark"
-              }
-            }
-          },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "paragraph_with_font_size_and_alignment_node": {
       "allOf": [
         {
           "$ref": "#/definitions/paragraph_node"
@@ -2639,32 +2698,6 @@
         }
       ]
     },
-    "paragraph_with_font_size_and_indentation_node": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/paragraph_node"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "marks": {
-              "type": "array",
-              "items": {
-                "anyOf": [
-                  {
-                    "$ref": "#/definitions/fontSize_mark"
-                  },
-                  {
-                    "$ref": "#/definitions/indentation_mark"
-                  }
-                ]
-              }
-            }
-          },
-          "additionalProperties": true
-        }
-      ]
-    },
     "paragraph_with_font_size_node": {
       "allOf": [
         {
@@ -2695,7 +2728,14 @@
             "marks": {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/indentation_mark"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/fontSize_mark"
+                  },
+                  {
+                    "$ref": "#/definitions/indentation_mark"
+                  }
+                ]
               }
             }
           },
@@ -2877,9 +2917,6 @@
           {
             "$ref": "#/definitions/paragraph_with_alignment_node"
           },
-          {
-            "$ref": "#/definitions/paragraph_with_font_size_and_alignment_node"
-          },
           {
             "$ref": "#/definitions/panel_node"
           },
@@ -2907,6 +2944,9 @@
           {
             "$ref": "#/definitions/codeBlock_node"
           },
+          {
+            "$ref": "#/definitions/codeBlock_with_extended_attributes_node"
+          },
           {
             "$ref": "#/definitions/mediaSingle_caption_node"
           },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "52.7.1",
+	"version": "52.9.0",
 	"description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -43,7 +43,7 @@
 		"@atlaskit/adf-schema-generator": "^2.2.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^74.0.0",
+		"@atlaskit/tmp-editor-statsig": "^74.7.0",
 		"@babel/runtime": "^7.0.0",
 		"css-color-names": "0.0.4",
 		"linkify-it": "^3.0.3",

package/schema-generators/validator-full-schema.ts

@@ -5,10 +5,68 @@ import { writeToFile } from './helpers/writeToFile';
 
 const outputPath = path.join('src', 'validator-schema', 'generated');
 
+const indent = (level: number) => '\n' + '  '.repeat(level);
+
+/**
+ * Emit TypeScript object/array literals.
+ *
+ * Arrays are intentionally NOT marked `as const`. With `as const`, TypeScript
+ * infers `readonly` tuple types for every array, which then fail to satisfy
+ * the `Array<string>` (mutable) shape used in the consumer's `ValidatorSpec`
+ * type — this surfaced as a TS2352 on `as Record<string, ValidatorSpec>` in
+ * `ai-model-io/.../specs/index.ts`.
+ *
+ * Plain object/array literals (without `as const`) are also fully derivable
+ * by `--isolatedDeclarations`, so dropping `as const` is safe for both the
+ * adf-schema build and any downstream consumer.
+ */
+function serializeValidatorJson(value: unknown, depth = 0): string {
+	if (value === null) {
+		return 'null';
+	}
+	if (value === undefined) {
+		return 'undefined';
+	}
+	if (typeof value === 'string') {
+		return JSON.stringify(value);
+	}
+	if (typeof value === 'number' || typeof value === 'boolean') {
+		return String(value);
+	}
+	if (Array.isArray(value)) {
+		if (value.length === 0) {
+			return '[]';
+		}
+		const inner = value
+			.map((item) => serializeValidatorJson(item, depth + 1))
+			.join(`,${indent(depth + 1)}`);
+		return `[${indent(depth + 1)}${inner}${indent(depth)}]`;
+	}
+	if (typeof value === 'object') {
+		const entries = Object.entries(value as Record<string, unknown>).sort(([a], [b]) =>
+			a.localeCompare(b),
+		);
+		if (entries.length === 0) {
+			return '{}';
+		}
+		const inner = entries
+			.map(([k, v]) => {
+				const keyName = /^[a-zA-Z_$][\w$]*$/u.test(k) ? k : JSON.stringify(k);
+				return `${keyName}: ${serializeValidatorJson(v, depth + 1)}`;
+			})
+			.join(`,${indent(depth + 1)}`);
+		return `{${indent(depth + 1)}${inner}${indent(depth)}}`;
+	}
+	throw new Error(`Unsupported value in validator spec: ${typeof value}`);
+}
+
 function generateValidatorSpec() {
 	const output = adfToValidatorSpec(adfNode);
 	return Object.entries(output)
-		.map(([key, value]) => `export const ${key} = ${JSON.stringify(value.json)};`)
+		.map(([key, entry]) => {
+			const { json } = entry as { json: unknown };
+			return `export const ${key} = ${serializeValidatorJson(json)};`;
+		})
 		.join('\n\n');
 }