@angeloashmore/prismic-cli-poc 0.0.0-pr.8.b80fefa → 0.0.0-pr.9.5366ece

package/src/custom-type-add-field-image.ts

@@ -6,6 +6,7 @@ import * as v from "valibot";
 
 import { buildTypes } from "./codegen-types";
 import { findUpward } from "./lib/file";
+import { findGroupInTab, isGroupField, parseFieldPath, validateNestedFieldPath } from "./lib/field-path";
 import { stringify } from "./lib/json";
 import { humanReadable } from "./lib/string";
 
@@ -76,6 +77,15 @@ export async function customTypeAddFieldImage(): Promise<void> {
 		return;
 	}
 
+	// Parse and validate field path
+	const fieldPath = parseFieldPath(fieldId);
+	const pathValidation = validateNestedFieldPath(fieldPath);
+	if (!pathValidation.ok) {
+		console.error(pathValidation.error);
+		process.exitCode = 1;
+		return;
+	}
+
 	// Find the custom type file
 	const projectRoot = await findUpward("package.json");
 	if (!projectRoot) {
@@ -122,26 +132,46 @@ export async function customTypeAddFieldImage(): Promise<void> {
 		model.json[targetTab] = {};
 	}
 
-	// Check if field already exists in any tab
-	for (const [tabName, tabFields] of Object.entries(model.json)) {
-		if (tabFields[fieldId]) {
-			console.error(`Field "${fieldId}" already exists in tab "${tabName}"`);
-			process.exitCode = 1;
-			return;
-		}
-	}
-
 	// Build field definition
 	const fieldDefinition: Image = {
 		type: "Image",
 		config: {
-			label: label ?? humanReadable(fieldId),
+			label: label ?? humanReadable(fieldPath.type === "nested" ? fieldPath.nestedFieldId : fieldId),
 			...(placeholder && { placeholder }),
 		},
 	};
 
 	// Add field to model
-	model.json[targetTab][fieldId] = fieldDefinition;
+	if (fieldPath.type === "nested") {
+		const groupResult = findGroupInTab(model.json[targetTab], fieldPath.groupId, targetTab);
+		if (!groupResult.ok) {
+			console.error(groupResult.error);
+			process.exitCode = 1;
+			return;
+		}
+		if (groupResult.group.config.fields[fieldPath.nestedFieldId]) {
+			console.error(`Field "${fieldPath.nestedFieldId}" already exists in group "${fieldPath.groupId}"`);
+			process.exitCode = 1;
+			return;
+		}
+		groupResult.group.config.fields[fieldPath.nestedFieldId] = fieldDefinition;
+	} else {
+		for (const [tabName, tabFields] of Object.entries(model.json)) {
+			if (tabFields[fieldId]) {
+				console.error(`Field "${fieldId}" already exists in tab "${tabName}"`);
+				process.exitCode = 1;
+				return;
+			}
+			for (const [groupFieldId, groupField] of Object.entries(tabFields)) {
+				if (isGroupField(groupField) && groupField.config.fields[fieldId]) {
+					console.error(`Field "${fieldId}" already exists in group "${groupFieldId}" in tab "${tabName}"`);
+					process.exitCode = 1;
+					return;
+				}
+			}
+		}
+		model.json[targetTab][fieldId] = fieldDefinition;
+	}
 
 	// Write updated model
 	try {
@@ -156,7 +186,11 @@ export async function customTypeAddFieldImage(): Promise<void> {
 		return;
 	}
 
-	console.info(`Added field "${fieldId}" (Image) to "${targetTab}" tab in ${typeId}`);
+	if (fieldPath.type === "nested") {
+		console.info(`Added field "${fieldPath.nestedFieldId}" (Image) to group "${fieldPath.groupId}" in ${typeId}`);
+	} else {
+		console.info(`Added field "${fieldId}" (Image) to "${targetTab}" tab in ${typeId}`);
+	}
 
 	try {
 		await buildTypes({ output: types });

package/src/custom-type-add-field-key-text.ts

@@ -6,6 +6,7 @@ import * as v from "valibot";
 
 import { buildTypes } from "./codegen-types";
 import { findUpward } from "./lib/file";
+import { findGroupInTab, isGroupField, parseFieldPath, validateNestedFieldPath } from "./lib/field-path";
 import { stringify } from "./lib/json";
 import { humanReadable } from "./lib/string";
 
@@ -76,6 +77,15 @@ export async function customTypeAddFieldKeyText(): Promise<void> {
 		return;
 	}
 
+	// Parse and validate field path
+	const fieldPath = parseFieldPath(fieldId);
+	const pathValidation = validateNestedFieldPath(fieldPath);
+	if (!pathValidation.ok) {
+		console.error(pathValidation.error);
+		process.exitCode = 1;
+		return;
+	}
+
 	// Find the custom type file
 	const projectRoot = await findUpward("package.json");
 	if (!projectRoot) {
@@ -122,26 +132,46 @@ export async function customTypeAddFieldKeyText(): Promise<void> {
 		model.json[targetTab] = {};
 	}
 
-	// Check if field already exists in any tab
-	for (const [tabName, tabFields] of Object.entries(model.json)) {
-		if (tabFields[fieldId]) {
-			console.error(`Field "${fieldId}" already exists in tab "${tabName}"`);
-			process.exitCode = 1;
-			return;
-		}
-	}
-
 	// Build field definition
 	const fieldDefinition: Text = {
 		type: "Text",
 		config: {
-			label: label ?? humanReadable(fieldId),
+			label: label ?? humanReadable(fieldPath.type === "nested" ? fieldPath.nestedFieldId : fieldId),
 			...(placeholder && { placeholder }),
 		},
 	};
 
 	// Add field to model
-	model.json[targetTab][fieldId] = fieldDefinition;
+	if (fieldPath.type === "nested") {
+		const groupResult = findGroupInTab(model.json[targetTab], fieldPath.groupId, targetTab);
+		if (!groupResult.ok) {
+			console.error(groupResult.error);
+			process.exitCode = 1;
+			return;
+		}
+		if (groupResult.group.config.fields[fieldPath.nestedFieldId]) {
+			console.error(`Field "${fieldPath.nestedFieldId}" already exists in group "${fieldPath.groupId}"`);
+			process.exitCode = 1;
+			return;
+		}
+		groupResult.group.config.fields[fieldPath.nestedFieldId] = fieldDefinition;
+	} else {
+		for (const [tabName, tabFields] of Object.entries(model.json)) {
+			if (tabFields[fieldId]) {
+				console.error(`Field "${fieldId}" already exists in tab "${tabName}"`);
+				process.exitCode = 1;
+				return;
+			}
+			for (const [groupFieldId, groupField] of Object.entries(tabFields)) {
+				if (isGroupField(groupField) && groupField.config.fields[fieldId]) {
+					console.error(`Field "${fieldId}" already exists in group "${groupFieldId}" in tab "${tabName}"`);
+					process.exitCode = 1;
+					return;
+				}
+			}
+		}
+		model.json[targetTab][fieldId] = fieldDefinition;
+	}
 
 	// Write updated model
 	try {
@@ -156,7 +186,11 @@ export async function customTypeAddFieldKeyText(): Promise<void> {
 		return;
 	}
 
-	console.info(`Added field "${fieldId}" (Text) to "${targetTab}" tab in ${typeId}`);
+	if (fieldPath.type === "nested") {
+		console.info(`Added field "${fieldPath.nestedFieldId}" (Text) to group "${fieldPath.groupId}" in ${typeId}`);
+	} else {
+		console.info(`Added field "${fieldId}" (Text) to "${targetTab}" tab in ${typeId}`);
+	}
 
 	try {
 		await buildTypes({ output: types });

package/src/custom-type-add-field-link.ts

@@ -6,6 +6,7 @@ import * as v from "valibot";
 
 import { buildTypes } from "./codegen-types";
 import { findUpward } from "./lib/file";
+import { findGroupInTab, isGroupField, parseFieldPath, validateNestedFieldPath } from "./lib/field-path";
 import { stringify } from "./lib/json";
 import { humanReadable } from "./lib/string";
 
@@ -95,6 +96,15 @@ export async function customTypeAddFieldLink(): Promise<void> {
 		return;
 	}
 
+	// Parse and validate field path
+	const fieldPath = parseFieldPath(fieldId);
+	const pathValidation = validateNestedFieldPath(fieldPath);
+	if (!pathValidation.ok) {
+		console.error(pathValidation.error);
+		process.exitCode = 1;
+		return;
+	}
+
 	// Find the custom type file
 	const projectRoot = await findUpward("package.json");
 	if (!projectRoot) {
@@ -141,20 +151,11 @@ export async function customTypeAddFieldLink(): Promise<void> {
 		model.json[targetTab] = {};
 	}
 
-	// Check if field already exists in any tab
-	for (const [tabName, tabFields] of Object.entries(model.json)) {
-		if (tabFields[fieldId]) {
-			console.error(`Field "${fieldId}" already exists in tab "${tabName}"`);
-			process.exitCode = 1;
-			return;
-		}
-	}
-
 	// Build field definition
 	const fieldDefinition: Link = {
 		type: "Link",
 		config: {
-			label: label ?? humanReadable(fieldId),
+			label: label ?? humanReadable(fieldPath.type === "nested" ? fieldPath.nestedFieldId : fieldId),
 			...(placeholder && { placeholder }),
 			...(variation && variation.length > 0 && { variants: variation }),
 			...(allowText && { allowText: true }),
@@ -164,7 +165,36 @@ export async function customTypeAddFieldLink(): Promise<void> {
 	};
 
 	// Add field to model
-	model.json[targetTab][fieldId] = fieldDefinition;
+	if (fieldPath.type === "nested") {
+		const groupResult = findGroupInTab(model.json[targetTab], fieldPath.groupId, targetTab);
+		if (!groupResult.ok) {
+			console.error(groupResult.error);
+			process.exitCode = 1;
+			return;
+		}
+		if (groupResult.group.config.fields[fieldPath.nestedFieldId]) {
+			console.error(`Field "${fieldPath.nestedFieldId}" already exists in group "${fieldPath.groupId}"`);
+			process.exitCode = 1;
+			return;
+		}
+		groupResult.group.config.fields[fieldPath.nestedFieldId] = fieldDefinition;
+	} else {
+		for (const [tabName, tabFields] of Object.entries(model.json)) {
+			if (tabFields[fieldId]) {
+				console.error(`Field "${fieldId}" already exists in tab "${tabName}"`);
+				process.exitCode = 1;
+				return;
+			}
+			for (const [groupFieldId, groupField] of Object.entries(tabFields)) {
+				if (isGroupField(groupField) && groupField.config.fields[fieldId]) {
+					console.error(`Field "${fieldId}" already exists in group "${groupFieldId}" in tab "${tabName}"`);
+					process.exitCode = 1;
+					return;
+				}
+			}
+		}
+		model.json[targetTab][fieldId] = fieldDefinition;
+	}
 
 	// Write updated model
 	try {
@@ -179,7 +209,11 @@ export async function customTypeAddFieldLink(): Promise<void> {
 		return;
 	}
 
-	console.info(`Added field "${fieldId}" (Link) to "${targetTab}" tab in ${typeId}`);
+	if (fieldPath.type === "nested") {
+		console.info(`Added field "${fieldPath.nestedFieldId}" (Link) to group "${fieldPath.groupId}" in ${typeId}`);
+	} else {
+		console.info(`Added field "${fieldId}" (Link) to "${targetTab}" tab in ${typeId}`);
+	}
 
 	try {
 		await buildTypes({ output: types });

package/src/custom-type-add-field-number.ts

@@ -6,6 +6,7 @@ import * as v from "valibot";
 
 import { buildTypes } from "./codegen-types";
 import { findUpward } from "./lib/file";
+import { findGroupInTab, isGroupField, parseFieldPath, validateNestedFieldPath } from "./lib/field-path";
 import { stringify } from "./lib/json";
 import { humanReadable } from "./lib/string";
 
@@ -82,6 +83,15 @@ export async function customTypeAddFieldNumber(): Promise<void> {
 		return;
 	}
 
+	// Parse and validate field path
+	const fieldPath = parseFieldPath(fieldId);
+	const pathValidation = validateNestedFieldPath(fieldPath);
+	if (!pathValidation.ok) {
+		console.error(pathValidation.error);
+		process.exitCode = 1;
+		return;
+	}
+
 	// Parse numeric values
 	const minValue = min !== undefined ? Number(min) : undefined;
 	const maxValue = max !== undefined ? Number(max) : undefined;
@@ -151,20 +161,11 @@ export async function customTypeAddFieldNumber(): Promise<void> {
 		model.json[targetTab] = {};
 	}
 
-	// Check if field already exists in any tab
-	for (const [tabName, tabFields] of Object.entries(model.json)) {
-		if (tabFields[fieldId]) {
-			console.error(`Field "${fieldId}" already exists in tab "${tabName}"`);
-			process.exitCode = 1;
-			return;
-		}
-	}
-
 	// Build field definition
 	const fieldDefinition: NumberField = {
 		type: "Number",
 		config: {
-			label: label ?? humanReadable(fieldId),
+			label: label ?? humanReadable(fieldPath.type === "nested" ? fieldPath.nestedFieldId : fieldId),
 			...(placeholder && { placeholder }),
 			...(minValue !== undefined && { min: minValue }),
 			...(maxValue !== undefined && { max: maxValue }),
@@ -173,7 +174,36 @@ export async function customTypeAddFieldNumber(): Promise<void> {
 	};
 
 	// Add field to model
-	model.json[targetTab][fieldId] = fieldDefinition;
+	if (fieldPath.type === "nested") {
+		const groupResult = findGroupInTab(model.json[targetTab], fieldPath.groupId, targetTab);
+		if (!groupResult.ok) {
+			console.error(groupResult.error);
+			process.exitCode = 1;
+			return;
+		}
+		if (groupResult.group.config.fields[fieldPath.nestedFieldId]) {
+			console.error(`Field "${fieldPath.nestedFieldId}" already exists in group "${fieldPath.groupId}"`);
+			process.exitCode = 1;
+			return;
+		}
+		groupResult.group.config.fields[fieldPath.nestedFieldId] = fieldDefinition;
+	} else {
+		for (const [tabName, tabFields] of Object.entries(model.json)) {
+			if (tabFields[fieldId]) {
+				console.error(`Field "${fieldId}" already exists in tab "${tabName}"`);
+				process.exitCode = 1;
+				return;
+			}
+			for (const [groupFieldId, groupField] of Object.entries(tabFields)) {
+				if (isGroupField(groupField) && groupField.config.fields[fieldId]) {
+					console.error(`Field "${fieldId}" already exists in group "${groupFieldId}" in tab "${tabName}"`);
+					process.exitCode = 1;
+					return;
+				}
+			}
+		}
+		model.json[targetTab][fieldId] = fieldDefinition;
+	}
 
 	// Write updated model
 	try {
@@ -188,7 +218,11 @@ export async function customTypeAddFieldNumber(): Promise<void> {
 		return;
 	}
 
-	console.info(`Added field "${fieldId}" (Number) to "${targetTab}" tab in ${typeId}`);
+	if (fieldPath.type === "nested") {
+		console.info(`Added field "${fieldPath.nestedFieldId}" (Number) to group "${fieldPath.groupId}" in ${typeId}`);
+	} else {
+		console.info(`Added field "${fieldId}" (Number) to "${targetTab}" tab in ${typeId}`);
+	}
 
 	try {
 		await buildTypes({ output: types });

package/src/custom-type-add-field-rich-text.ts

@@ -6,6 +6,7 @@ import * as v from "valibot";
 
 import { buildTypes } from "./codegen-types";
 import { findUpward } from "./lib/file";
+import { findGroupInTab, isGroupField, parseFieldPath, validateNestedFieldPath } from "./lib/field-path";
 import { stringify } from "./lib/json";
 import { humanReadable } from "./lib/string";
 
@@ -97,6 +98,15 @@ export async function customTypeAddFieldRichText(): Promise<void> {
 		return;
 	}
 
+	// Parse and validate field path
+	const fieldPath = parseFieldPath(fieldId);
+	const pathValidation = validateNestedFieldPath(fieldPath);
+	if (!pathValidation.ok) {
+		console.error(pathValidation.error);
+		process.exitCode = 1;
+		return;
+	}
+
 	// Find the custom type file
 	const projectRoot = await findUpward("package.json");
 	if (!projectRoot) {
@@ -143,20 +153,11 @@ export async function customTypeAddFieldRichText(): Promise<void> {
 		model.json[targetTab] = {};
 	}
 
-	// Check if field already exists in any tab
-	for (const [tabName, tabFields] of Object.entries(model.json)) {
-		if (tabFields[fieldId]) {
-			console.error(`Field "${fieldId}" already exists in tab "${tabName}"`);
-			process.exitCode = 1;
-			return;
-		}
-	}
-
 	// Build field definition
 	const fieldDefinition: RichText = {
 		type: "StructuredText",
 		config: {
-			label: label ?? humanReadable(fieldId),
+			label: label ?? humanReadable(fieldPath.type === "nested" ? fieldPath.nestedFieldId : fieldId),
 			...(placeholder && { placeholder }),
 			...(single && { single }),
 			...(multi && { multi }),
@@ -165,7 +166,36 @@ export async function customTypeAddFieldRichText(): Promise<void> {
 	};
 
 	// Add field to model
-	model.json[targetTab][fieldId] = fieldDefinition;
+	if (fieldPath.type === "nested") {
+		const groupResult = findGroupInTab(model.json[targetTab], fieldPath.groupId, targetTab);
+		if (!groupResult.ok) {
+			console.error(groupResult.error);
+			process.exitCode = 1;
+			return;
+		}
+		if (groupResult.group.config.fields[fieldPath.nestedFieldId]) {
+			console.error(`Field "${fieldPath.nestedFieldId}" already exists in group "${fieldPath.groupId}"`);
+			process.exitCode = 1;
+			return;
+		}
+		groupResult.group.config.fields[fieldPath.nestedFieldId] = fieldDefinition;
+	} else {
+		for (const [tabName, tabFields] of Object.entries(model.json)) {
+			if (tabFields[fieldId]) {
+				console.error(`Field "${fieldId}" already exists in tab "${tabName}"`);
+				process.exitCode = 1;
+				return;
+			}
+			for (const [groupFieldId, groupField] of Object.entries(tabFields)) {
+				if (isGroupField(groupField) && groupField.config.fields[fieldId]) {
+					console.error(`Field "${fieldId}" already exists in group "${groupFieldId}" in tab "${tabName}"`);
+					process.exitCode = 1;
+					return;
+				}
+			}
+		}
+		model.json[targetTab][fieldId] = fieldDefinition;
+	}
 
 	// Write updated model
 	try {
@@ -180,7 +210,11 @@ export async function customTypeAddFieldRichText(): Promise<void> {
 		return;
 	}
 
-	console.info(`Added field "${fieldId}" (StructuredText) to "${targetTab}" tab in ${typeId}`);
+	if (fieldPath.type === "nested") {
+		console.info(`Added field "${fieldPath.nestedFieldId}" (StructuredText) to group "${fieldPath.groupId}" in ${typeId}`);
+	} else {
+		console.info(`Added field "${fieldId}" (StructuredText) to "${targetTab}" tab in ${typeId}`);
+	}
 
 	try {
 		await buildTypes({ output: types });

package/src/custom-type-add-field-select.ts

@@ -6,6 +6,7 @@ import * as v from "valibot";
 
 import { buildTypes } from "./codegen-types";
 import { findUpward } from "./lib/file";
+import { findGroupInTab, isGroupField, parseFieldPath, validateNestedFieldPath } from "./lib/field-path";
 import { stringify } from "./lib/json";
 import { humanReadable } from "./lib/string";
 
@@ -45,15 +46,7 @@ const CustomTypeSchema = v.object({
 
 export async function customTypeAddFieldSelect(): Promise<void> {
 	const {
-		values: {
-			help,
-			tab,
-			label,
-			placeholder,
-			option,
-			default: defaultValue,
-			types,
-		},
+		values: { help, tab, label, placeholder, option, default: defaultValue, types },
 		positionals: [typeId, fieldId],
 	} = parseArgs({
 		args: process.argv.slice(5), // skip: node, script, "custom-type", "add-field", "select"
@@ -88,6 +81,15 @@ export async function customTypeAddFieldSelect(): Promise<void> {
 		return;
 	}
 
+	// Parse and validate field path
+	const fieldPath = parseFieldPath(fieldId);
+	const pathValidation = validateNestedFieldPath(fieldPath);
+	if (!pathValidation.ok) {
+		console.error(pathValidation.error);
+		process.exitCode = 1;
+		return;
+	}
+
 	// Find the custom type file
 	const projectRoot = await findUpward("package.json");
 	if (!projectRoot) {
@@ -134,20 +136,11 @@ export async function customTypeAddFieldSelect(): Promise<void> {
 		model.json[targetTab] = {};
 	}
 
-	// Check if field already exists in any tab
-	for (const [tabName, tabFields] of Object.entries(model.json)) {
-		if (tabFields[fieldId]) {
-			console.error(`Field "${fieldId}" already exists in tab "${tabName}"`);
-			process.exitCode = 1;
-			return;
-		}
-	}
-
 	// Build field definition
 	const fieldDefinition: Select = {
 		type: "Select",
 		config: {
-			label: label ?? humanReadable(fieldId),
+			label: label ?? humanReadable(fieldPath.type === "nested" ? fieldPath.nestedFieldId : fieldId),
 			...(placeholder && { placeholder }),
 			...(option && option.length > 0 && { options: option }),
 			...(defaultValue && { default_value: defaultValue }),
@@ -155,7 +148,36 @@ export async function customTypeAddFieldSelect(): Promise<void> {
 	};
 
 	// Add field to model
-	model.json[targetTab][fieldId] = fieldDefinition;
+	if (fieldPath.type === "nested") {
+		const groupResult = findGroupInTab(model.json[targetTab], fieldPath.groupId, targetTab);
+		if (!groupResult.ok) {
+			console.error(groupResult.error);
+			process.exitCode = 1;
+			return;
+		}
+		if (groupResult.group.config.fields[fieldPath.nestedFieldId]) {
+			console.error(`Field "${fieldPath.nestedFieldId}" already exists in group "${fieldPath.groupId}"`);
+			process.exitCode = 1;
+			return;
+		}
+		groupResult.group.config.fields[fieldPath.nestedFieldId] = fieldDefinition;
+	} else {
+		for (const [tabName, tabFields] of Object.entries(model.json)) {
+			if (tabFields[fieldId]) {
+				console.error(`Field "${fieldId}" already exists in tab "${tabName}"`);
+				process.exitCode = 1;
+				return;
+			}
+			for (const [groupFieldId, groupField] of Object.entries(tabFields)) {
+				if (isGroupField(groupField) && groupField.config.fields[fieldId]) {
+					console.error(`Field "${fieldId}" already exists in group "${groupFieldId}" in tab "${tabName}"`);
+					process.exitCode = 1;
+					return;
+				}
+			}
+		}
+		model.json[targetTab][fieldId] = fieldDefinition;
+	}
 
 	// Write updated model
 	try {
@@ -170,7 +192,11 @@ export async function customTypeAddFieldSelect(): Promise<void> {
 		return;
 	}
 
-	console.info(`Added field "${fieldId}" (Select) to "${targetTab}" tab in ${typeId}`);
+	if (fieldPath.type === "nested") {
+		console.info(`Added field "${fieldPath.nestedFieldId}" (Select) to group "${fieldPath.groupId}" in ${typeId}`);
+	} else {
+		console.info(`Added field "${fieldId}" (Select) to "${targetTab}" tab in ${typeId}`);
+	}
 
 	try {
 		await buildTypes({ output: types });

package/src/custom-type-add-field-timestamp.ts

@@ -6,6 +6,7 @@ import * as v from "valibot";
 
 import { buildTypes } from "./codegen-types";
 import { findUpward } from "./lib/file";
+import { findGroupInTab, isGroupField, parseFieldPath, validateNestedFieldPath } from "./lib/field-path";
 import { stringify } from "./lib/json";
 import { humanReadable } from "./lib/string";
 
@@ -78,6 +79,15 @@ export async function customTypeAddFieldTimestamp(): Promise<void> {
 		return;
 	}
 
+	// Parse and validate field path
+	const fieldPath = parseFieldPath(fieldId);
+	const pathValidation = validateNestedFieldPath(fieldPath);
+	if (!pathValidation.ok) {
+		console.error(pathValidation.error);
+		process.exitCode = 1;
+		return;
+	}
+
 	// Find the custom type file
 	const projectRoot = await findUpward("package.json");
 	if (!projectRoot) {
@@ -124,27 +134,47 @@ export async function customTypeAddFieldTimestamp(): Promise<void> {
 		model.json[targetTab] = {};
 	}
 
-	// Check if field already exists in any tab
-	for (const [tabName, tabFields] of Object.entries(model.json)) {
-		if (tabFields[fieldId]) {
-			console.error(`Field "${fieldId}" already exists in tab "${tabName}"`);
-			process.exitCode = 1;
-			return;
-		}
-	}
-
 	// Build field definition
 	const fieldDefinition: Timestamp = {
 		type: "Timestamp",
 		config: {
-			label: label ?? humanReadable(fieldId),
+			label: label ?? humanReadable(fieldPath.type === "nested" ? fieldPath.nestedFieldId : fieldId),
 			...(placeholder && { placeholder }),
 			...(defaultValue && { default: defaultValue }),
 		},
 	};
 
 	// Add field to model
-	model.json[targetTab][fieldId] = fieldDefinition;
+	if (fieldPath.type === "nested") {
+		const groupResult = findGroupInTab(model.json[targetTab], fieldPath.groupId, targetTab);
+		if (!groupResult.ok) {
+			console.error(groupResult.error);
+			process.exitCode = 1;
+			return;
+		}
+		if (groupResult.group.config.fields[fieldPath.nestedFieldId]) {
+			console.error(`Field "${fieldPath.nestedFieldId}" already exists in group "${fieldPath.groupId}"`);
+			process.exitCode = 1;
+			return;
+		}
+		groupResult.group.config.fields[fieldPath.nestedFieldId] = fieldDefinition;
+	} else {
+		for (const [tabName, tabFields] of Object.entries(model.json)) {
+			if (tabFields[fieldId]) {
+				console.error(`Field "${fieldId}" already exists in tab "${tabName}"`);
+				process.exitCode = 1;
+				return;
+			}
+			for (const [groupFieldId, groupField] of Object.entries(tabFields)) {
+				if (isGroupField(groupField) && groupField.config.fields[fieldId]) {
+					console.error(`Field "${fieldId}" already exists in group "${groupFieldId}" in tab "${tabName}"`);
+					process.exitCode = 1;
+					return;
+				}
+			}
+		}
+		model.json[targetTab][fieldId] = fieldDefinition;
+	}
 
 	// Write updated model
 	try {
@@ -159,7 +189,11 @@ export async function customTypeAddFieldTimestamp(): Promise<void> {
 		return;
 	}
 
-	console.info(`Added field "${fieldId}" (Timestamp) to "${targetTab}" tab in ${typeId}`);
+	if (fieldPath.type === "nested") {
+		console.info(`Added field "${fieldPath.nestedFieldId}" (Timestamp) to group "${fieldPath.groupId}" in ${typeId}`);
+	} else {
+		console.info(`Added field "${fieldId}" (Timestamp) to "${targetTab}" tab in ${typeId}`);
+	}
 
 	try {
 		await buildTypes({ output: types });