@atlaskit/adf-schema 52.9.2 → 52.9.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/adf-schema
 
+## 52.9.4
+
+### Patch Changes
+
+- [`ded95ac7efcc4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ded95ac7efcc4) -
+  Persist code block wrap state in ADF, default code blocks created across editor runtime paths to
+  wrapped, and update the wrap toolbar tooltip behind platform_editor_code_block_q4_lovability.
+
+## 52.9.3
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 52.9.2
 
 ### Patch Changes

package/dist/cjs/schema/nodes/code-block.js

@@ -199,7 +199,11 @@ var codeBlockWithExtendedAttributes = exports.codeBlockWithExtendedAttributes =
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       dom.getAttribute('data-language');
       dom = removeLastNewLine(dom);
-      var wrap = dom.getAttribute('data-wrap') === 'true';
+      var wrapAttr = dom.getAttribute('data-wrap');
+      var isCopiedFromEditor = Boolean(dom.closest('[data-pm-slice]') || dom.hasAttribute('data-pm-slice'));
+      // Default external HTML paste to wrapped when data-wrap is absent, but preserve
+      // unwrapped editor-origin paste when copied content has data-pm-slice.
+      var wrap = wrapAttr === null ? !isCopiedFromEditor : wrapAttr !== 'false';
       var hideLineNumbers = dom.getAttribute('data-hide-line-numbers') === 'true';
       return {
         language: language,
@@ -218,7 +222,9 @@ var codeBlockWithExtendedAttributes = exports.codeBlockWithExtendedAttributes =
       // eslint-disable-next-line @atlaskit/editor/no-as-casting
       var dom = domNode;
       if (dom.style.whiteSpace === 'pre' || dom.style.fontFamily && dom.style.fontFamily.toLowerCase().indexOf('monospace') > -1) {
-        return {};
+        return {
+          wrap: true
+        };
       }
       return false;
     },
@@ -234,7 +240,9 @@ var codeBlockWithExtendedAttributes = exports.codeBlockWithExtendedAttributes =
     getAttrs: function getAttrs(dom) {
       // eslint-disable-next-line @atlaskit/editor/no-as-casting
       if (dom.querySelector('td[class*="blob-code"]')) {
-        return {};
+        return {
+          wrap: true
+        };
       }
       return false;
     }
@@ -254,7 +262,9 @@ var codeBlockWithExtendedAttributes = exports.codeBlockWithExtendedAttributes =
           return line.remove();
         });
       }
-      return {};
+      return {
+        wrap: true
+      };
     }
   }],
   toDOM: function toDOM(node) {
@@ -263,9 +273,11 @@ var codeBlockWithExtendedAttributes = exports.codeBlockWithExtendedAttributes =
     if ((node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.localId) !== undefined) {
       attrs['data-local-id'] = node.attrs.localId;
     }
-    if (node.attrs.wrap) {
-      attrs['data-wrap'] = 'true';
-    }
+
+    // Always serialize data-wrap explicitly (both true and false) so that
+    // editor-to-editor paste can distinguish intentional wrap:false from
+    // absent data-wrap (which parseDOM defaults to wrap:true for external HTML).
+    attrs['data-wrap'] = node.attrs.wrap ? 'true' : 'false';
     if (node.attrs.hideLineNumbers) {
       attrs['data-hide-line-numbers'] = 'true';
     }

package/dist/es2019/schema/nodes/code-block.js

@@ -187,7 +187,11 @@ export const codeBlockWithExtendedAttributes = {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         dom.getAttribute('data-language');
         dom = removeLastNewLine(dom);
-        const wrap = dom.getAttribute('data-wrap') === 'true';
+        const wrapAttr = dom.getAttribute('data-wrap');
+        const isCopiedFromEditor = Boolean(dom.closest('[data-pm-slice]') || dom.hasAttribute('data-pm-slice'));
+        // Default external HTML paste to wrapped when data-wrap is absent, but preserve
+        // unwrapped editor-origin paste when copied content has data-pm-slice.
+        const wrap = wrapAttr === null ? !isCopiedFromEditor : wrapAttr !== 'false';
         const hideLineNumbers = dom.getAttribute('data-hide-line-numbers') === 'true';
         return {
           language,
@@ -206,7 +210,9 @@ export const codeBlockWithExtendedAttributes = {
         // eslint-disable-next-line @atlaskit/editor/no-as-casting
         const dom = domNode;
         if (dom.style.whiteSpace === 'pre' || dom.style.fontFamily && dom.style.fontFamily.toLowerCase().indexOf('monospace') > -1) {
-          return {};
+          return {
+            wrap: true
+          };
         }
         return false;
       },
@@ -222,7 +228,9 @@ export const codeBlockWithExtendedAttributes = {
       getAttrs: dom => {
         // eslint-disable-next-line @atlaskit/editor/no-as-casting
         if (dom.querySelector('td[class*="blob-code"]')) {
-          return {};
+          return {
+            wrap: true
+          };
         }
         return false;
       }
@@ -240,7 +248,9 @@ export const codeBlockWithExtendedAttributes = {
           // `react-syntax-highlighter-line-number` check, so that we don't remove real code
           lineNumber.forEach(line => line.remove());
         }
-        return {};
+        return {
+          wrap: true
+        };
       }
     }],
     toDOM(node) {
@@ -249,9 +259,11 @@ export const codeBlockWithExtendedAttributes = {
       if ((node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.localId) !== undefined) {
         attrs['data-local-id'] = node.attrs.localId;
       }
-      if (node.attrs.wrap) {
-        attrs['data-wrap'] = 'true';
-      }
+
+      // Always serialize data-wrap explicitly (both true and false) so that
+      // editor-to-editor paste can distinguish intentional wrap:false from
+      // absent data-wrap (which parseDOM defaults to wrap:true for external HTML).
+      attrs['data-wrap'] = node.attrs.wrap ? 'true' : 'false';
       if (node.attrs.hideLineNumbers) {
         attrs['data-hide-line-numbers'] = 'true';
       }

package/dist/esm/schema/nodes/code-block.js

@@ -193,7 +193,11 @@ export var codeBlockWithExtendedAttributes = _objectSpread({}, codeBlockWithExte
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       dom.getAttribute('data-language');
       dom = removeLastNewLine(dom);
-      var wrap = dom.getAttribute('data-wrap') === 'true';
+      var wrapAttr = dom.getAttribute('data-wrap');
+      var isCopiedFromEditor = Boolean(dom.closest('[data-pm-slice]') || dom.hasAttribute('data-pm-slice'));
+      // Default external HTML paste to wrapped when data-wrap is absent, but preserve
+      // unwrapped editor-origin paste when copied content has data-pm-slice.
+      var wrap = wrapAttr === null ? !isCopiedFromEditor : wrapAttr !== 'false';
       var hideLineNumbers = dom.getAttribute('data-hide-line-numbers') === 'true';
       return {
         language: language,
@@ -212,7 +216,9 @@ export var codeBlockWithExtendedAttributes = _objectSpread({}, codeBlockWithExte
       // eslint-disable-next-line @atlaskit/editor/no-as-casting
       var dom = domNode;
       if (dom.style.whiteSpace === 'pre' || dom.style.fontFamily && dom.style.fontFamily.toLowerCase().indexOf('monospace') > -1) {
-        return {};
+        return {
+          wrap: true
+        };
       }
       return false;
     },
@@ -228,7 +234,9 @@ export var codeBlockWithExtendedAttributes = _objectSpread({}, codeBlockWithExte
     getAttrs: function getAttrs(dom) {
       // eslint-disable-next-line @atlaskit/editor/no-as-casting
       if (dom.querySelector('td[class*="blob-code"]')) {
-        return {};
+        return {
+          wrap: true
+        };
       }
       return false;
     }
@@ -248,7 +256,9 @@ export var codeBlockWithExtendedAttributes = _objectSpread({}, codeBlockWithExte
           return line.remove();
         });
       }
-      return {};
+      return {
+        wrap: true
+      };
     }
   }],
   toDOM: function toDOM(node) {
@@ -257,9 +267,11 @@ export var codeBlockWithExtendedAttributes = _objectSpread({}, codeBlockWithExte
     if ((node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.localId) !== undefined) {
       attrs['data-local-id'] = node.attrs.localId;
     }
-    if (node.attrs.wrap) {
-      attrs['data-wrap'] = 'true';
-    }
+
+    // Always serialize data-wrap explicitly (both true and false) so that
+    // editor-to-editor paste can distinguish intentional wrap:false from
+    // absent data-wrap (which parseDOM defaults to wrap:true for external HTML).
+    attrs['data-wrap'] = node.attrs.wrap ? 'true' : 'false';
     if (node.attrs.hideLineNumbers) {
       attrs['data-hide-line-numbers'] = 'true';
     }

package/dist/types/validator-schema/generated/validatorSpec.d.ts

@@ -54,6 +54,7 @@ export declare const blockCard: {
     props: {
         attrs: ({
             props: {
+                data?: undefined;
                 datasource: {
                     props: {
                         id: {
@@ -97,35 +98,34 @@ export declare const blockCard: {
                     optional: boolean;
                     type: string;
                 };
-                data?: undefined;
             };
         } | {
             props: {
+                data?: undefined;
+                datasource?: undefined;
+                layout?: undefined;
                 localId: {
                     optional: boolean;
                     type: string;
                 };
                 url: {
+                    optional?: undefined;
                     type: string;
                     validatorFn: string;
-                    optional?: undefined;
                 };
-                datasource?: undefined;
-                layout?: undefined;
                 width?: undefined;
-                data?: undefined;
             };
         } | {
             props: {
                 data: {
                     type: string;
                 };
+                datasource?: undefined;
+                layout?: undefined;
                 localId: {
                     optional: boolean;
                     type: string;
                 };
-                datasource?: undefined;
-                layout?: undefined;
                 url?: undefined;
                 width?: undefined;
             };
@@ -225,7 +225,7 @@ export declare const bodiedExtension: {
             type: string;
         };
         marks: {
-            items: never[];
+            items: unknown[];
             optional: boolean;
             type: string;
         };
@@ -738,7 +738,7 @@ export declare const extension: {
             };
         };
         marks: {
-            items: never[];
+            items: unknown[];
             optional: boolean;
             type: string;
         };
@@ -855,7 +855,7 @@ export declare const heading: {
             type: string;
         };
         marks: {
-            items: never[];
+            items: unknown[];
             optional: boolean;
             type: string;
         };
@@ -886,7 +886,7 @@ export declare const heading_with_indentation: (string | {
 export declare const heading_with_no_marks: (string | {
     props: {
         marks: {
-            items: never[];
+            items: unknown[];
             maxItems: number;
             optional: boolean;
             type: string;
@@ -915,6 +915,7 @@ export declare const inlineCard: {
     props: {
         attrs: ({
             props: {
+                data?: undefined;
                 localId: {
                     optional: boolean;
                     type: string;
@@ -923,7 +924,6 @@ export declare const inlineCard: {
                     type: string;
                     validatorFn: string;
                 };
-                data?: undefined;
             };
         } | {
             props: {
@@ -977,7 +977,7 @@ export declare const inlineExtension: {
             };
         };
         marks: {
-            items: never[];
+            items: unknown[];
             optional: boolean;
             type: string;
         };
@@ -1185,11 +1185,11 @@ export declare const media: {
                     type: string;
                     values: string[];
                 };
+                url?: undefined;
                 width: {
                     optional: boolean;
                     type: string;
                 };
-                url?: undefined;
             };
         } | {
             props: {
@@ -1197,14 +1197,17 @@ export declare const media: {
                     optional: boolean;
                     type: string;
                 };
+                collection?: undefined;
                 height: {
                     optional: boolean;
                     type: string;
                 };
+                id?: undefined;
                 localId: {
                     optional: boolean;
                     type: string;
                 };
+                occurrenceKey?: undefined;
                 type: {
                     type: string;
                     values: string[];
@@ -1216,9 +1219,6 @@ export declare const media: {
                     optional: boolean;
                     type: string;
                 };
-                collection?: undefined;
-                id?: undefined;
-                occurrenceKey?: undefined;
             };
         })[];
         marks: {
@@ -1340,15 +1340,15 @@ export declare const mediaSingle: {
                     type: string;
                 };
                 width: {
-                    minimum: number;
-                    type: string;
                     maximum?: undefined;
+                    minimum: number;
                     optional?: undefined;
+                    type: string;
                 };
                 widthType: {
+                    optional?: undefined;
                     type: string;
                     values: string[];
-                    optional?: undefined;
                 };
             };
         })[];
@@ -1471,7 +1471,7 @@ export declare const multiBodiedExtension: {
             type: string;
         };
         marks: {
-            items: never[];
+            items: unknown[];
             optional: boolean;
             type: string;
         };
@@ -1512,7 +1512,7 @@ export declare const nestedExpand_content: {
 export declare const nestedExpand_with_no_marks: (string | {
     props: {
         marks: {
-            items: never[];
+            items: unknown[];
             maxItems: number;
             optional: boolean;
             type: string;
@@ -1607,7 +1607,7 @@ export declare const paragraph: {
             type: string;
         };
         marks: {
-            items: never[];
+            items: unknown[];
             optional: boolean;
             type: string;
         };
@@ -1647,7 +1647,7 @@ export declare const paragraph_with_indentation: (string | {
 export declare const paragraph_with_no_marks: (string | {
     props: {
         marks: {
-            items: never[];
+            items: unknown[];
             maxItems: number;
             optional: boolean;
             type: string;
@@ -1979,7 +1979,7 @@ export declare const taskList: {
 export declare const text: {
     props: {
         marks: {
-            items: never[];
+            items: unknown[];
             optional: boolean;
             type: string;
         };
@@ -2023,7 +2023,7 @@ export declare const text_link_inline: (string | {
 export declare const text_with_no_marks: (string | {
     props: {
         marks: {
-            items: never[];
+            items: unknown[];
             maxItems: number;
             optional: boolean;
             type: string;

package/dist/types-ts4.5/validator-schema/generated/validatorSpec.d.ts

@@ -54,6 +54,7 @@ export declare const blockCard: {
     props: {
         attrs: ({
             props: {
+                data?: undefined;
                 datasource: {
                     props: {
                         id: {
@@ -97,35 +98,34 @@ export declare const blockCard: {
                     optional: boolean;
                     type: string;
                 };
-                data?: undefined;
             };
         } | {
             props: {
+                data?: undefined;
+                datasource?: undefined;
+                layout?: undefined;
                 localId: {
                     optional: boolean;
                     type: string;
                 };
                 url: {
+                    optional?: undefined;
                     type: string;
                     validatorFn: string;
-                    optional?: undefined;
                 };
-                datasource?: undefined;
-                layout?: undefined;
                 width?: undefined;
-                data?: undefined;
             };
         } | {
             props: {
                 data: {
                     type: string;
                 };
+                datasource?: undefined;
+                layout?: undefined;
                 localId: {
                     optional: boolean;
                     type: string;
                 };
-                datasource?: undefined;
-                layout?: undefined;
                 url?: undefined;
                 width?: undefined;
             };
@@ -225,7 +225,7 @@ export declare const bodiedExtension: {
             type: string;
         };
         marks: {
-            items: never[];
+            items: unknown[];
             optional: boolean;
             type: string;
         };
@@ -738,7 +738,7 @@ export declare const extension: {
             };
         };
         marks: {
-            items: never[];
+            items: unknown[];
             optional: boolean;
             type: string;
         };
@@ -855,7 +855,7 @@ export declare const heading: {
             type: string;
         };
         marks: {
-            items: never[];
+            items: unknown[];
             optional: boolean;
             type: string;
         };
@@ -886,7 +886,7 @@ export declare const heading_with_indentation: (string | {
 export declare const heading_with_no_marks: (string | {
     props: {
         marks: {
-            items: never[];
+            items: unknown[];
             maxItems: number;
             optional: boolean;
             type: string;
@@ -915,6 +915,7 @@ export declare const inlineCard: {
     props: {
         attrs: ({
             props: {
+                data?: undefined;
                 localId: {
                     optional: boolean;
                     type: string;
@@ -923,7 +924,6 @@ export declare const inlineCard: {
                     type: string;
                     validatorFn: string;
                 };
-                data?: undefined;
             };
         } | {
             props: {
@@ -977,7 +977,7 @@ export declare const inlineExtension: {
             };
         };
         marks: {
-            items: never[];
+            items: unknown[];
             optional: boolean;
             type: string;
         };
@@ -1185,11 +1185,11 @@ export declare const media: {
                     type: string;
                     values: string[];
                 };
+                url?: undefined;
                 width: {
                     optional: boolean;
                     type: string;
                 };
-                url?: undefined;
             };
         } | {
             props: {
@@ -1197,14 +1197,17 @@ export declare const media: {
                     optional: boolean;
                     type: string;
                 };
+                collection?: undefined;
                 height: {
                     optional: boolean;
                     type: string;
                 };
+                id?: undefined;
                 localId: {
                     optional: boolean;
                     type: string;
                 };
+                occurrenceKey?: undefined;
                 type: {
                     type: string;
                     values: string[];
@@ -1216,9 +1219,6 @@ export declare const media: {
                     optional: boolean;
                     type: string;
                 };
-                collection?: undefined;
-                id?: undefined;
-                occurrenceKey?: undefined;
             };
         })[];
         marks: {
@@ -1340,15 +1340,15 @@ export declare const mediaSingle: {
                     type: string;
                 };
                 width: {
-                    minimum: number;
-                    type: string;
                     maximum?: undefined;
+                    minimum: number;
                     optional?: undefined;
+                    type: string;
                 };
                 widthType: {
+                    optional?: undefined;
                     type: string;
                     values: string[];
-                    optional?: undefined;
                 };
             };
         })[];
@@ -1471,7 +1471,7 @@ export declare const multiBodiedExtension: {
             type: string;
         };
         marks: {
-            items: never[];
+            items: unknown[];
             optional: boolean;
             type: string;
         };
@@ -1512,7 +1512,7 @@ export declare const nestedExpand_content: {
 export declare const nestedExpand_with_no_marks: (string | {
     props: {
         marks: {
-            items: never[];
+            items: unknown[];
             maxItems: number;
             optional: boolean;
             type: string;
@@ -1607,7 +1607,7 @@ export declare const paragraph: {
             type: string;
         };
         marks: {
-            items: never[];
+            items: unknown[];
             optional: boolean;
             type: string;
         };
@@ -1647,7 +1647,7 @@ export declare const paragraph_with_indentation: (string | {
 export declare const paragraph_with_no_marks: (string | {
     props: {
         marks: {
-            items: never[];
+            items: unknown[];
             maxItems: number;
             optional: boolean;
             type: string;
@@ -1979,7 +1979,7 @@ export declare const taskList: {
 export declare const text: {
     props: {
         marks: {
-            items: never[];
+            items: unknown[];
             optional: boolean;
             type: string;
         };
@@ -2023,7 +2023,7 @@ export declare const text_link_inline: (string | {
 export declare const text_with_no_marks: (string | {
     props: {
         marks: {
-            items: never[];
+            items: unknown[];
             maxItems: number;
             optional: boolean;
             type: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "52.9.2",
+	"version": "52.9.4",
 	"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": "^76.0.0",
+		"@atlaskit/tmp-editor-statsig": "^77.2.0",
 		"@babel/runtime": "^7.0.0",
 		"css-color-names": "0.0.4",
 		"linkify-it": "^3.0.3",

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

@@ -37,7 +37,11 @@ function serializeValidatorJson(value: unknown, depth = 0): string {
 		if (value.length === 0) {
 			return '[]';
 		}
-		const inner = value
+		const items = value.filter((item) => item !== undefined);
+		if (items.length === 0) {
+			return '[]';
+		}
+		const inner = items
 			.map((item) => serializeValidatorJson(item, depth + 1))
 			.join(`,${indent(depth + 1)}`);
 		return `[${indent(depth + 1)}${inner}${indent(depth)}]`;
@@ -60,12 +64,101 @@ function serializeValidatorJson(value: unknown, depth = 0): string {
 	throw new Error(`Unsupported value in validator spec: ${typeof value}`);
 }
 
+function isPlainObject(value: unknown): value is Record<string, unknown> {
+	return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+/**
+ * Emit the TypeScript type annotation for a value, widening all primitive
+ * literals to their base types (e.g. `'enum'` → `string`, `100` → `number`).
+ *
+ * This produces an explicit type annotation on each generated `export const`
+ * so that:
+ *  1. Running the codegen never silently removes type information.
+ *  2. Consumers that use `--isolatedDeclarations` get an explicit declaration
+ *     rather than relying on type inference from a deeply-nested literal.
+ *
+ * For arrays whose elements all share the same structural type, the result is
+ * `T[]`.  For heterogeneous arrays (e.g. an extends tuple like
+ * `[string, ValidatorSpecNode]` or an anyOf attrs list), the result is
+ * `(T1 | T2 | ...)[]`, deduplicating structurally identical element types.
+ *
+ * The `siblings` argument carries parallel values from sibling array branches
+ * at the current path — used to produce a discriminated-union style annotation
+ * for object branches that have non-overlapping key sets. When an object
+ * branch is missing a key that another sibling branch has, the missing key is
+ * emitted as `key?: undefined`. This matches the TypeScript pattern used to
+ * make `anyOf`-style attribute unions mutually exclusive (e.g. `media`'s
+ * `file` vs `link` attrs, `blockCard`'s three attribute variants).
+ */
+function serializeValidatorType(value: unknown, depth = 0, siblings: unknown[] = []): string {
+	if (value === null) {
+		return 'null';
+	}
+	if (value === undefined) {
+		return 'undefined';
+	}
+	if (typeof value === 'string') {
+		return 'string';
+	}
+	if (typeof value === 'number') {
+		return 'number';
+	}
+	if (typeof value === 'boolean') {
+		return 'boolean';
+	}
+	if (Array.isArray(value)) {
+		if (value.length === 0) {
+			return 'unknown[]';
+		}
+		const items = value.filter((item) => item !== undefined);
+		if (items.length === 0) {
+			return 'unknown[]';
+		}
+		const elementTypes = items.map((item, i) => {
+			const otherElements = items.filter((_, j) => j !== i);
+			return serializeValidatorType(item, depth + 1, otherElements);
+		});
+		const uniqueTypes = [...new Set(elementTypes)];
+		const elementType = uniqueTypes.length === 1 ? uniqueTypes[0] : `(${uniqueTypes.join(' | ')})`;
+		return `${elementType}[]`;
+	}
+	if (typeof value === 'object') {
+		const selfRecord = value as Record<string, unknown>;
+		const siblingObjects = siblings.filter(isPlainObject);
+		const ownKeys = Object.keys(selfRecord);
+		const allKeys = new Set<string>(ownKeys);
+		for (const sibling of siblingObjects) {
+			for (const key of Object.keys(sibling)) {
+				allKeys.add(key);
+			}
+		}
+		if (allKeys.size === 0) {
+			return '{}';
+		}
+		const sortedKeys = [...allKeys].sort((a, b) => a.localeCompare(b));
+		const inner = sortedKeys
+			.map((k) => {
+				const keyName = /^[a-zA-Z_$][\w$]*$/u.test(k) ? k : JSON.stringify(k);
+				if (k in selfRecord) {
+					const siblingsForK = siblingObjects.filter((s) => k in s).map((s) => s[k]);
+					return `${keyName}: ${serializeValidatorType(selfRecord[k], depth + 1, siblingsForK)}`;
+				}
+				return `${keyName}?: undefined`;
+			})
+			.join(`;${indent(depth + 1)}`);
+		return `{${indent(depth + 1)}${inner};${indent(depth)}}`;
+	}
+	throw new Error(`Unsupported value in validator type: ${typeof value}`);
+}
+
 function generateValidatorSpec() {
 	const output = adfToValidatorSpec(adfNode);
 	return Object.entries(output)
 		.map(([key, entry]) => {
 			const { json } = entry as { json: unknown };
-			return `export const ${key} = ${serializeValidatorJson(json)};`;
+			const type = serializeValidatorType(json);
+			return `export const ${key}: ${type} = ${serializeValidatorJson(json)};`;
 		})
 		.join('\n\n');
 }