@angeloashmore/prismic-cli-poc 0.0.0-canary.fe51fbb → 0.0.0-pr.10.032f7ef

package/src/page-type-add-field-color.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 { type Framework, detectFrameworkInfo } from "./lib/framework";
 import { stringify } from "./lib/json";
 import { humanReadable } from "./lib/string";
@@ -88,6 +89,15 @@ export async function pageTypeAddFieldColor(): 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 page type file
 	const projectRoot = await findUpward("package.json");
 	if (!projectRoot) {
@@ -134,26 +144,46 @@ export async function pageTypeAddFieldColor(): 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: Color = {
 		type: "Color",
 		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 {
@@ -168,7 +198,11 @@ export async function pageTypeAddFieldColor(): Promise<void> {
 		return;
 	}
 
-	console.info(`Added field "${fieldId}" (Color) to "${targetTab}" tab in ${typeId}`);
+	if (fieldPath.type === "nested") {
+		console.info(`Added field "${fieldPath.nestedFieldId}" (Color) to group "${fieldPath.groupId}" in ${typeId}`);
+	} else {
+		console.info(`Added field "${fieldId}" (Color) to "${targetTab}" tab in ${typeId}`);
+	}
 
 	try {
 		await buildTypes({ output: types });
@@ -184,7 +218,7 @@ export async function pageTypeAddFieldColor(): Promise<void> {
 	if (frameworkInfo?.framework) {
 		const docsPath = getDocsPath(frameworkInfo.framework);
 		console.info(
-			`      Run \`prismic docs ${docsPath}#write-page-components\` to learn how to implement a page file`,
+			`      Run \`prismic docs fetch ${docsPath}#write-page-components\` to learn how to implement a page file`,
 		);
 	}
 }

package/src/page-type-add-field-date.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 { type Framework, detectFrameworkInfo } from "./lib/framework";
 import { stringify } from "./lib/json";
 import { humanReadable } from "./lib/string";
@@ -90,6 +91,15 @@ export async function pageTypeAddFieldDate(): 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 page type file
 	const projectRoot = await findUpward("package.json");
 	if (!projectRoot) {
@@ -136,27 +146,47 @@ export async function pageTypeAddFieldDate(): 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: DateField = {
 		type: "Date",
 		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 {
@@ -171,7 +201,11 @@ export async function pageTypeAddFieldDate(): Promise<void> {
 		return;
 	}
 
-	console.info(`Added field "${fieldId}" (Date) to "${targetTab}" tab in ${typeId}`);
+	if (fieldPath.type === "nested") {
+		console.info(`Added field "${fieldPath.nestedFieldId}" (Date) to group "${fieldPath.groupId}" in ${typeId}`);
+	} else {
+		console.info(`Added field "${fieldId}" (Date) to "${targetTab}" tab in ${typeId}`);
+	}
 
 	try {
 		await buildTypes({ output: types });
@@ -187,7 +221,7 @@ export async function pageTypeAddFieldDate(): Promise<void> {
 	if (frameworkInfo?.framework) {
 		const docsPath = getDocsPath(frameworkInfo.framework);
 		console.info(
-			`      Run \`prismic docs ${docsPath}#write-page-components\` to learn how to implement a page file`,
+			`      Run \`prismic docs fetch ${docsPath}#write-page-components\` to learn how to implement a page file`,
 		);
 	}
 }

package/src/page-type-add-field-embed.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 { type Framework, detectFrameworkInfo } from "./lib/framework";
 import { stringify } from "./lib/json";
 import { humanReadable } from "./lib/string";
@@ -88,6 +89,15 @@ export async function pageTypeAddFieldEmbed(): 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 page type file
 	const projectRoot = await findUpward("package.json");
 	if (!projectRoot) {
@@ -134,26 +144,46 @@ export async function pageTypeAddFieldEmbed(): 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: Embed = {
 		type: "Embed",
 		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 {
@@ -168,7 +198,11 @@ export async function pageTypeAddFieldEmbed(): Promise<void> {
 		return;
 	}
 
-	console.info(`Added field "${fieldId}" (Embed) to "${targetTab}" tab in ${typeId}`);
+	if (fieldPath.type === "nested") {
+		console.info(`Added field "${fieldPath.nestedFieldId}" (Embed) to group "${fieldPath.groupId}" in ${typeId}`);
+	} else {
+		console.info(`Added field "${fieldId}" (Embed) to "${targetTab}" tab in ${typeId}`);
+	}
 
 	try {
 		await buildTypes({ output: types });
@@ -184,7 +218,7 @@ export async function pageTypeAddFieldEmbed(): Promise<void> {
 	if (frameworkInfo?.framework) {
 		const docsPath = getDocsPath(frameworkInfo.framework);
 		console.info(
-			`      Run \`prismic docs ${docsPath}#write-page-components\` to learn how to implement a page file`,
+			`      Run \`prismic docs fetch ${docsPath}#write-page-components\` to learn how to implement a page file`,
 		);
 	}
 }

package/src/page-type-add-field-geo-point.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 { type Framework, detectFrameworkInfo } from "./lib/framework";
 import { stringify } from "./lib/json";
 import { humanReadable } from "./lib/string";
@@ -86,6 +87,15 @@ export async function pageTypeAddFieldGeoPoint(): 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 page type file
 	const projectRoot = await findUpward("package.json");
 	if (!projectRoot) {
@@ -132,25 +142,45 @@ export async function pageTypeAddFieldGeoPoint(): 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: GeoPoint = {
 		type: "GeoPoint",
 		config: {
-			label: label ?? humanReadable(fieldId),
+			label: label ?? humanReadable(fieldPath.type === "nested" ? fieldPath.nestedFieldId : fieldId),
 		},
 	};
 
 	// 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 {
@@ -165,7 +195,11 @@ export async function pageTypeAddFieldGeoPoint(): Promise<void> {
 		return;
 	}
 
-	console.info(`Added field "${fieldId}" (GeoPoint) to "${targetTab}" tab in ${typeId}`);
+	if (fieldPath.type === "nested") {
+		console.info(`Added field "${fieldPath.nestedFieldId}" (GeoPoint) to group "${fieldPath.groupId}" in ${typeId}`);
+	} else {
+		console.info(`Added field "${fieldId}" (GeoPoint) to "${targetTab}" tab in ${typeId}`);
+	}
 
 	try {
 		await buildTypes({ output: types });
@@ -181,7 +215,7 @@ export async function pageTypeAddFieldGeoPoint(): Promise<void> {
 	if (frameworkInfo?.framework) {
 		const docsPath = getDocsPath(frameworkInfo.framework);
 		console.info(
-			`      Run \`prismic docs ${docsPath}#write-page-components\` to learn how to implement a page file`,
+			`      Run \`prismic docs fetch ${docsPath}#write-page-components\` to learn how to implement a page file`,
 		);
 	}
 }

package/src/page-type-add-field-group.ts

@@ -0,0 +1,198 @@
+import type { CustomType, Group } from "@prismicio/types-internal/lib/customtypes";
+
+import { readFile, writeFile } from "node:fs/promises";
+import { parseArgs } from "node:util";
+import * as v from "valibot";
+
+import { buildTypes } from "./codegen-types";
+import { findUpward } from "./lib/file";
+import { type Framework, detectFrameworkInfo } from "./lib/framework";
+import { stringify } from "./lib/json";
+import { humanReadable } from "./lib/string";
+
+const HELP = `
+Add a group field to an existing page type.
+
+USAGE
+  prismic page-type add-field group <type-id> <field-id> [flags]
+
+ARGUMENTS
+  type-id                Page type identifier (required)
+  field-id               Field identifier (required)
+
+FLAGS
+  -t, --tab string       Target tab (default: first existing tab, or "Main")
+  -l, --label string     Display label for the field (inferred from field-id if omitted)
+      --non-repeatable   Make this a non-repeating group (default: repeatable)
+      --types string     Output file for generated types (default: "prismicio-types.d.ts")
+  -h, --help             Show help for command
+
+EXAMPLES
+  prismic page-type add-field group homepage buttons
+  prismic page-type add-field group article authors --non-repeatable
+  prismic page-type add-field group product variants --tab "Content"
+`.trim();
+
+const CustomTypeSchema = v.object({
+	id: v.string(),
+	label: v.string(),
+	repeatable: v.boolean(),
+	status: v.boolean(),
+	format: v.string(),
+	json: v.record(v.string(), v.record(v.string(), v.unknown())),
+});
+
+function getDocsPath(framework: Framework): string {
+	switch (framework) {
+		case "next":
+			return "nextjs/with-cli";
+		case "nuxt":
+			return "nuxt/with-cli";
+		case "sveltekit":
+			return "sveltekit/with-cli";
+	}
+}
+
+export async function pageTypeAddFieldGroup(): Promise<void> {
+	const {
+		values: { help, tab, label, "non-repeatable": nonRepeatable, types },
+		positionals: [typeId, fieldId],
+	} = parseArgs({
+		args: process.argv.slice(5), // skip: node, script, "page-type", "add-field", "group"
+		options: {
+			tab: { type: "string", short: "t" },
+			label: { type: "string", short: "l" },
+			"non-repeatable": { type: "boolean" },
+			types: { type: "string" },
+			help: { type: "boolean", short: "h" },
+		},
+		allowPositionals: true,
+	});
+
+	if (help) {
+		console.info(HELP);
+		return;
+	}
+
+	if (!typeId) {
+		console.error("Missing required argument: type-id\n");
+		console.error("Usage: prismic page-type add-field group <type-id> <field-id>");
+		process.exitCode = 1;
+		return;
+	}
+
+	if (!fieldId) {
+		console.error("Missing required argument: field-id\n");
+		console.error("Usage: prismic page-type add-field group <type-id> <field-id>");
+		process.exitCode = 1;
+		return;
+	}
+
+	// Groups cannot be nested
+	if (fieldId.includes(".")) {
+		console.error("Groups cannot be nested inside other groups");
+		process.exitCode = 1;
+		return;
+	}
+
+	// Find the page type file
+	const projectRoot = await findUpward("package.json");
+	if (!projectRoot) {
+		console.error("Could not find project root (no package.json found)");
+		process.exitCode = 1;
+		return;
+	}
+
+	const modelPath = new URL(`customtypes/${typeId}/index.json`, projectRoot);
+
+	// Read and parse the model
+	let model: CustomType;
+	try {
+		const contents = await readFile(modelPath, "utf8");
+		const result = v.safeParse(CustomTypeSchema, JSON.parse(contents));
+		if (!result.success) {
+			console.error(`Invalid page type model: ${modelPath.href}`);
+			process.exitCode = 1;
+			return;
+		}
+		model = result.output as CustomType;
+	} catch (error) {
+		if (error instanceof Error && "code" in error && error.code === "ENOENT") {
+			console.error(`Page type not found: ${typeId}\n`);
+			console.error(`Create it first with: prismic page-type create ${typeId}`);
+			process.exitCode = 1;
+			return;
+		}
+		if (error instanceof Error) {
+			console.error(`Failed to read page type: ${error.message}`);
+		} else {
+			console.error("Failed to read page type");
+		}
+		process.exitCode = 1;
+		return;
+	}
+
+	// Determine target tab
+	const existingTabs = Object.keys(model.json);
+	const targetTab = tab ?? existingTabs[0] ?? "Main";
+
+	// Initialize tab if it doesn't exist
+	if (!model.json[targetTab]) {
+		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: Group = {
+		type: "Group",
+		config: {
+			label: label ?? humanReadable(fieldId),
+			repeat: !nonRepeatable,
+			fields: {},
+		},
+	};
+
+	// Add field to model
+	model.json[targetTab][fieldId] = fieldDefinition;
+
+	// Write updated model
+	try {
+		await writeFile(modelPath, stringify(model));
+	} catch (error) {
+		if (error instanceof Error) {
+			console.error(`Failed to update page type: ${error.message}`);
+		} else {
+			console.error("Failed to update page type");
+		}
+		process.exitCode = 1;
+		return;
+	}
+
+	console.info(`Added field "${fieldId}" (Group) to "${targetTab}" tab in ${typeId}`);
+
+	try {
+		await buildTypes({ output: types });
+		console.info(`Updated types in ${types ?? "prismicio-types.d.ts"}`);
+	} catch (error) {
+		console.warn(`Could not generate types: ${error instanceof Error ? error.message : error}`);
+	}
+
+	console.info();
+	console.info(`Next: Add fields to the group with \`prismic page-type add-field <type> ${typeId} ${fieldId}.<field-id>\``);
+
+	const frameworkInfo = await detectFrameworkInfo();
+	if (frameworkInfo?.framework) {
+		const docsPath = getDocsPath(frameworkInfo.framework);
+		console.info(
+			`      Run \`prismic docs fetch ${docsPath}#write-page-components\` to learn how to implement a page file`,
+		);
+	}
+}