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

package/src/page-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 { type Framework, detectFrameworkInfo } from "./lib/framework";
 import { stringify } from "./lib/json";
 import { humanReadable } from "./lib/string";
@@ -90,6 +91,15 @@ export async function pageTypeAddFieldTimestamp(): 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 pageTypeAddFieldTimestamp(): 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 {
@@ -171,7 +201,11 @@ export async function pageTypeAddFieldTimestamp(): 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 });
@@ -187,7 +221,7 @@ export async function pageTypeAddFieldTimestamp(): 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-uid.ts

@@ -6,6 +6,7 @@ import * as v from "valibot";
 
 import { buildTypes } from "./codegen-types";
 import { findUpward } from "./lib/file";
+import { 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,22 @@ export async function pageTypeAddFieldUid(): 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;
+	}
+
+	// UID fields cannot be nested in groups
+	if (fieldPath.type === "nested") {
+		console.error("UID fields cannot be nested inside groups");
+		process.exitCode = 1;
+		return;
+	}
+
 	// Find the page type file
 	const projectRoot = await findUpward("package.json");
 	if (!projectRoot) {
@@ -184,7 +201,7 @@ export async function pageTypeAddFieldUid(): 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.ts

@@ -5,6 +5,7 @@ import { pageTypeAddFieldColor } from "./page-type-add-field-color";
 import { pageTypeAddFieldDate } from "./page-type-add-field-date";
 import { pageTypeAddFieldEmbed } from "./page-type-add-field-embed";
 import { pageTypeAddFieldGeoPoint } from "./page-type-add-field-geo-point";
+import { pageTypeAddFieldGroup } from "./page-type-add-field-group";
 import { pageTypeAddFieldImage } from "./page-type-add-field-image";
 import { pageTypeAddFieldKeyText } from "./page-type-add-field-key-text";
 import { pageTypeAddFieldLink } from "./page-type-add-field-link";
@@ -26,6 +27,7 @@ FIELD TYPES
   date                   Date picker
   embed                  Embed (oEmbed)
   geo-point              Geographic coordinates
+  group                  Repeatable group of fields
   image                  Image
   key-text               Single-line text
   link                   Any link type
@@ -76,6 +78,9 @@ export async function pageTypeAddField(): Promise<void> {
 		case "geo-point":
 			await pageTypeAddFieldGeoPoint();
 			break;
+		case "group":
+			await pageTypeAddFieldGroup();
+			break;
 		case "image":
 			await pageTypeAddFieldImage();
 			break;

package/src/page-type-create.ts

@@ -151,7 +151,7 @@ export async function pageTypeCreate(): Promise<void> {
 		const docsPath = getDocsPath(frameworkInfo.framework);
 		const anchor = getWritePageComponentsAnchor(frameworkInfo.framework);
 		console.info(
-			`      Run \`prismic docs ${docsPath}${anchor}\` to learn how to implement a page file`,
+			`      Run \`prismic docs fetch ${docsPath}${anchor}\` to learn how to implement a page file`,
 		);
 	}
 }

package/src/repo-create.ts

@@ -102,6 +102,23 @@ export async function repoCreate(): Promise<void> {
 		return;
 	}
 
+	// Check if domain is available
+	const available = await checkDomainAvailable(domain);
+	if (!available.ok) {
+		if (available.error instanceof ForbiddenRequestError) {
+			handleUnauthenticated();
+		} else {
+			console.error(`Failed to check domain availability: ${stringify(available.error)}`);
+			process.exitCode = 1;
+		}
+		return;
+	}
+	if (!available.value) {
+		console.error(`Repository name "${domain}" is already taken.`);
+		process.exitCode = 1;
+		return;
+	}
+
 	const response = await createRepository(domain, name);
 	if (!response.ok) {
 		if (response.error instanceof ForbiddenRequestError) {
@@ -143,8 +160,18 @@ export async function repoCreate(): Promise<void> {
 		const clientFile = getClientFilePath(frameworkInfo);
 		const fileDesc = clientFile ? `creating ${clientFile}` : "configuring Prismic";
 		console.info();
-		console.info(`Next: Run \`prismic docs ${docsPath}${anchor}\` for instructions on ${fileDesc}`);
+		console.info(`Next: Run \`prismic docs fetch ${docsPath}${anchor}\` for instructions on ${fileDesc}`);
+	}
+}
+
+async function checkDomainAvailable(domain: string) {
+	const url = new URL(`/app/dashboard/repositories/${domain}/exists`, await readHost());
+	const response = await request<string>(url);
+	if (!response.ok) {
+		return response;
 	}
+	// Endpoint returns "false" when repository exists, "true" when available
+	return { ok: true as const, value: response.value === "true" };
 }
 
 async function createRepository(domain: string, name = domain) {

package/src/slice-add-field-boolean.ts

@@ -4,6 +4,7 @@ import { writeFile } from "node:fs/promises";
 import { parseArgs } from "node:util";
 
 import { buildTypes } from "./codegen-types";
+import { findGroupInVariation, isGroupField, parseFieldPath, validateNestedFieldPath } from "./lib/field-path";
 import { type Framework, detectFrameworkInfo } from "./lib/framework";
 import { stringify } from "./lib/json";
 import { findSliceModel } from "./lib/slice";
@@ -101,6 +102,15 @@ export async function sliceAddFieldBoolean(): 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 slice model
 	const result = await findSliceModel(sliceId);
 	if (!result.ok) {
@@ -136,28 +146,55 @@ export async function sliceAddFieldBoolean(): Promise<void> {
 		targetVariation.primary = {};
 	}
 
-	// Check if field already exists in any variation
-	for (const v of model.variations) {
-		if (v.primary?.[fieldId]) {
-			console.error(`Field "${fieldId}" already exists in variation "${v.id}"`);
-			process.exitCode = 1;
-			return;
-		}
-	}
-
 	// Build field definition
 	const fieldDefinition: BooleanField = {
 		type: "Boolean",
 		config: {
-			label: label ?? humanReadable(fieldId),
+			label: label ?? humanReadable(fieldPath.type === "nested" ? fieldPath.nestedFieldId : fieldId),
 			...(defaultValue && { default_value: true }),
 			...(trueLabel && { placeholder_true: trueLabel }),
 			...(falseLabel && { placeholder_false: falseLabel }),
 		},
 	};
 
-	// Add field to variation
-	targetVariation.primary[fieldId] = fieldDefinition;
+	// Add field to variation (with nested field support)
+	if (fieldPath.type === "nested") {
+		const groupResult = findGroupInVariation(targetVariation.primary, fieldPath.groupId, targetVariation.id);
+		if (!groupResult.ok) {
+			console.error(groupResult.error);
+			process.exitCode = 1;
+			return;
+		}
+		// Check if nested field already exists
+		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 {
+		// Check if field already exists in any variation (at top level or in groups)
+		for (const v of model.variations) {
+			if (v.primary?.[fieldId]) {
+				console.error(`Field "${fieldId}" already exists in variation "${v.id}"`);
+				process.exitCode = 1;
+				return;
+			}
+			// Also check inside groups
+			for (const [groupFieldId, groupField] of Object.entries(v.primary ?? {})) {
+				if (isGroupField(groupField) && groupField.config.fields[fieldId]) {
+					console.error(
+						`Field "${fieldId}" already exists in group "${groupFieldId}" in variation "${v.id}"`,
+					);
+					process.exitCode = 1;
+					return;
+				}
+			}
+		}
+		targetVariation.primary[fieldId] = fieldDefinition;
+	}
 
 	// Write updated model
 	try {
@@ -172,9 +209,15 @@ export async function sliceAddFieldBoolean(): Promise<void> {
 		return;
 	}
 
-	console.info(
-		`Added field "${fieldId}" (Boolean) to "${targetVariation.id}" variation in ${sliceId}`,
-	);
+	if (fieldPath.type === "nested") {
+		console.info(
+			`Added field "${fieldPath.nestedFieldId}" (Boolean) to group "${fieldPath.groupId}" in ${sliceId}`,
+		);
+	} else {
+		console.info(
+			`Added field "${fieldId}" (Boolean) to "${targetVariation.id}" variation in ${sliceId}`,
+		);
+	}
 
 	try {
 		await buildTypes({ output: types });
@@ -191,7 +234,7 @@ export async function sliceAddFieldBoolean(): Promise<void> {
 		const docsPath = getDocsPath(frameworkInfo.framework);
 		const anchor = getWriteComponentsAnchor(frameworkInfo.framework);
 		console.info(
-			`      Run \`prismic docs ${docsPath}${anchor}\` to learn how to implement the slice's component`,
+			`      Run \`prismic docs fetch ${docsPath}${anchor}\` to learn how to implement the slice's component`,
 		);
 	}
 }

package/src/slice-add-field-color.ts

@@ -4,6 +4,7 @@ import { writeFile } from "node:fs/promises";
 import { parseArgs } from "node:util";
 
 import { buildTypes } from "./codegen-types";
+import { findGroupInVariation, isGroupField, parseFieldPath, validateNestedFieldPath } from "./lib/field-path";
 import { type Framework, detectFrameworkInfo } from "./lib/framework";
 import { stringify } from "./lib/json";
 import { findSliceModel } from "./lib/slice";
@@ -89,6 +90,15 @@ export async function sliceAddFieldColor(): 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 slice model
 	const result = await findSliceModel(sliceId);
 	if (!result.ok) {
@@ -124,26 +134,53 @@ export async function sliceAddFieldColor(): Promise<void> {
 		targetVariation.primary = {};
 	}
 
-	// Check if field already exists in any variation
-	for (const v of model.variations) {
-		if (v.primary?.[fieldId]) {
-			console.error(`Field "${fieldId}" already exists in variation "${v.id}"`);
-			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 variation
-	targetVariation.primary[fieldId] = fieldDefinition;
+	// Add field to variation (with nested field support)
+	if (fieldPath.type === "nested") {
+		const groupResult = findGroupInVariation(targetVariation.primary, fieldPath.groupId, targetVariation.id);
+		if (!groupResult.ok) {
+			console.error(groupResult.error);
+			process.exitCode = 1;
+			return;
+		}
+		// Check if nested field already exists
+		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 {
+		// Check if field already exists in any variation (at top level or in groups)
+		for (const v of model.variations) {
+			if (v.primary?.[fieldId]) {
+				console.error(`Field "${fieldId}" already exists in variation "${v.id}"`);
+				process.exitCode = 1;
+				return;
+			}
+			// Also check inside groups
+			for (const [groupFieldId, groupField] of Object.entries(v.primary ?? {})) {
+				if (isGroupField(groupField) && groupField.config.fields[fieldId]) {
+					console.error(
+						`Field "${fieldId}" already exists in group "${groupFieldId}" in variation "${v.id}"`,
+					);
+					process.exitCode = 1;
+					return;
+				}
+			}
+		}
+		targetVariation.primary[fieldId] = fieldDefinition;
+	}
 
 	// Write updated model
 	try {
@@ -158,9 +195,15 @@ export async function sliceAddFieldColor(): Promise<void> {
 		return;
 	}
 
-	console.info(
-		`Added field "${fieldId}" (Color) to "${targetVariation.id}" variation in ${sliceId}`,
-	);
+	if (fieldPath.type === "nested") {
+		console.info(
+			`Added field "${fieldPath.nestedFieldId}" (Color) to group "${fieldPath.groupId}" in ${sliceId}`,
+		);
+	} else {
+		console.info(
+			`Added field "${fieldId}" (Color) to "${targetVariation.id}" variation in ${sliceId}`,
+		);
+	}
 
 	try {
 		await buildTypes({ output: types });
@@ -177,7 +220,7 @@ export async function sliceAddFieldColor(): Promise<void> {
 		const docsPath = getDocsPath(frameworkInfo.framework);
 		const anchor = getWriteComponentsAnchor(frameworkInfo.framework);
 		console.info(
-			`      Run \`prismic docs ${docsPath}${anchor}\` to learn how to implement the slice's component`,
+			`      Run \`prismic docs fetch ${docsPath}${anchor}\` to learn how to implement the slice's component`,
 		);
 	}
 }

package/src/slice-add-field-date.ts

@@ -4,6 +4,7 @@ import { writeFile } from "node:fs/promises";
 import { parseArgs } from "node:util";
 
 import { buildTypes } from "./codegen-types";
+import { findGroupInVariation, isGroupField, parseFieldPath, validateNestedFieldPath } from "./lib/field-path";
 import { type Framework, detectFrameworkInfo } from "./lib/framework";
 import { stringify } from "./lib/json";
 import { findSliceModel } from "./lib/slice";
@@ -89,6 +90,15 @@ export async function sliceAddFieldDate(): 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 slice model
 	const result = await findSliceModel(sliceId);
 	if (!result.ok) {
@@ -124,26 +134,53 @@ export async function sliceAddFieldDate(): Promise<void> {
 		targetVariation.primary = {};
 	}
 
-	// Check if field already exists in any variation
-	for (const v of model.variations) {
-		if (v.primary?.[fieldId]) {
-			console.error(`Field "${fieldId}" already exists in variation "${v.id}"`);
-			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 }),
 		},
 	};
 
-	// Add field to variation
-	targetVariation.primary[fieldId] = fieldDefinition;
+	// Add field to variation (with nested field support)
+	if (fieldPath.type === "nested") {
+		const groupResult = findGroupInVariation(targetVariation.primary, fieldPath.groupId, targetVariation.id);
+		if (!groupResult.ok) {
+			console.error(groupResult.error);
+			process.exitCode = 1;
+			return;
+		}
+		// Check if nested field already exists
+		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 {
+		// Check if field already exists in any variation (at top level or in groups)
+		for (const v of model.variations) {
+			if (v.primary?.[fieldId]) {
+				console.error(`Field "${fieldId}" already exists in variation "${v.id}"`);
+				process.exitCode = 1;
+				return;
+			}
+			// Also check inside groups
+			for (const [groupFieldId, groupField] of Object.entries(v.primary ?? {})) {
+				if (isGroupField(groupField) && groupField.config.fields[fieldId]) {
+					console.error(
+						`Field "${fieldId}" already exists in group "${groupFieldId}" in variation "${v.id}"`,
+					);
+					process.exitCode = 1;
+					return;
+				}
+			}
+		}
+		targetVariation.primary[fieldId] = fieldDefinition;
+	}
 
 	// Write updated model
 	try {
@@ -158,9 +195,15 @@ export async function sliceAddFieldDate(): Promise<void> {
 		return;
 	}
 
-	console.info(
-		`Added field "${fieldId}" (Date) to "${targetVariation.id}" variation in ${sliceId}`,
-	);
+	if (fieldPath.type === "nested") {
+		console.info(
+			`Added field "${fieldPath.nestedFieldId}" (Date) to group "${fieldPath.groupId}" in ${sliceId}`,
+		);
+	} else {
+		console.info(
+			`Added field "${fieldId}" (Date) to "${targetVariation.id}" variation in ${sliceId}`,
+		);
+	}
 
 	try {
 		await buildTypes({ output: types });
@@ -177,7 +220,7 @@ export async function sliceAddFieldDate(): Promise<void> {
 		const docsPath = getDocsPath(frameworkInfo.framework);
 		const anchor = getWriteComponentsAnchor(frameworkInfo.framework);
 		console.info(
-			`      Run \`prismic docs ${docsPath}${anchor}\` to learn how to implement the slice's component`,
+			`      Run \`prismic docs fetch ${docsPath}${anchor}\` to learn how to implement the slice's component`,
 		);
 	}
 }