feat: support groups in groups

CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.1.21-alpha.0](https://github.com/prismicio/prismic-ts-codegen/compare/v0.1.20...v0.1.21-alpha.0) (2024-06-05)
+
+
+### Features
+
+* support groups in groups ([e93146c](https://github.com/prismicio/prismic-ts-codegen/commit/e93146c2dead44caeb869b309f4a0e20fb75ebd1))
+
+
+### Bug Fixes
+
+* update `@prismicio/mock` to prevent a type error ([bb2a846](https://github.com/prismicio/prismic-ts-codegen/commit/bb2a846326c99068348ebd7d30e8d89919c48b29))
+
+
+### Chore
+
+* add temporary `overrides` entry to prevent `@prismicio/mock` installation error ([33cb3d7](https://github.com/prismicio/prismic-ts-codegen/commit/33cb3d765634e595258c9765fd1e49ec78a79aad))
+
 ### [0.1.20](https://github.com/prismicio/prismic-ts-codegen/compare/v0.1.19...v0.1.20) (2024-05-08)
 
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "prismic-ts-codegen",
-	"version": "0.1.20",
+	"version": "0.1.21-alpha.0",
 	"description": "An experimental Prismic model-to-TypeScript-type generator",
 	"keywords": [
 		"typescript",
@@ -37,8 +37,8 @@
 		"prepare": "npm run build",
 		"release": "npm run test && standard-version && git push --follow-tags && npm run build && npm publish",
 		"release:dry": "standard-version --dry-run",
-		"release:alpha": "npm run test && standard-version --release-as major --prerelease alpha && git push --follow-tags && npm run build && npm publish --tag alpha",
-		"release:alpha:dry": "standard-version --release-as major --prerelease alpha --dry-run",
+		"release:alpha": "npm run test && standard-version --release-as patch --prerelease alpha && git push --follow-tags && npm run build && npm publish --tag alpha",
+		"release:alpha:dry": "standard-version --release-as patch --prerelease alpha --dry-run",
 		"lint": "eslint --ext .js,.ts .",
 		"types": "tsc --noEmit",
 		"unit": "vitest run --coverage",
@@ -60,8 +60,8 @@
 		"quick-lru": "^6.1.1"
 	},
 	"devDependencies": {
-		"@prismicio/client": "^7.5.0",
-		"@prismicio/mock": "^0.3.6",
+		"@prismicio/client": "^7.6.0-alpha.0",
+		"@prismicio/mock": "^0.3.7-alpha.1",
 		"@size-limit/preset-small-lib": "^8.2.6",
 		"@trivago/prettier-plugin-sort-imports": "^4.1.1",
 		"@types/common-tags": "^1.8.1",
@@ -99,5 +99,8 @@
 	},
 	"publishConfig": {
 		"access": "public"
+	},
+	"overrides": {
+		"@prismicio/client": "^7.6.0-alpha.0"
 	}
 }

src/lib/buildFieldProperties.ts

@@ -1,4 +1,7 @@
-import type { CustomTypeModelField } from "@prismicio/client";
+import {
+	type CustomTypeModelField,
+	CustomTypeModelFieldType,
+} from "@prismicio/client";
 import { source, stripIndent } from "common-tags";
 
 import { AuxiliaryType, FieldConfigs, FieldPath } from "../types";
@@ -291,10 +294,25 @@ function buildFieldProperty(
 			});
 			contentTypeNames.push(itemName);
 
-			code = addLine(
-				`${name}: prismic.GroupField<Simplify<${itemName}>>;`,
-				code,
+			const indexOfFirstGroupInPath = path.findIndex(
+				(pathElement) =>
+					pathElement.model &&
+					"type" in pathElement.model &&
+					pathElement.model.type === CustomTypeModelFieldType.Group,
 			);
+			const isNestedGroup = indexOfFirstGroupInPath < path.length - 1;
+
+			if (isNestedGroup) {
+				code = addLine(
+					`${name}: prismic.NestedGroupField<Simplify<${itemName}>>;`,
+					code,
+				);
+			} else {
+				code = addLine(
+					`${name}: prismic.GroupField<Simplify<${itemName}>>;`,
+					code,
+				);
+			}
 
 			break;
 		}

test/generateTypes-group.test.ts

@@ -56,6 +56,51 @@ it("creates an interface for a group item containing its fields", (ctx) => {
 	).toBe("prismic.SelectField");
 });
 
+it("supports nested groups", (ctx) => {
+	const model = ctx.mock.model.customType({
+		id: "foo",
+		fields: {
+			bar: ctx.mock.model.group({
+				fields: {
+					baz: ctx.mock.model.group({
+						fields: {
+							qux: ctx.mock.model.keyText(),
+							quux: ctx.mock.model.select(),
+						},
+					}),
+				},
+			}),
+		},
+	});
+
+	const types = lib.generateTypes({ customTypeModels: [model] });
+	const file = parseSourceFile(types);
+
+	const nestedGroupProperty = file
+		.getInterfaceOrThrow("FooDocumentDataBarItem")
+		.getPropertyOrThrow("baz");
+	expect(nestedGroupProperty.getTypeNodeOrThrow().getText()).toBe(
+		"prismic.NestedGroupField<Simplify<FooDocumentDataBazItem>>",
+	);
+
+	const nestedGroupItemInterface = file.getInterfaceOrThrow(
+		"FooDocumentDataBazItem",
+	);
+	expect(nestedGroupItemInterface.isExported()).toBe(true);
+	expect(
+		nestedGroupItemInterface
+			.getPropertyOrThrow("qux")
+			.getTypeNodeOrThrow()
+			.getText(),
+	).toBe("prismic.KeyTextField");
+	expect(
+		nestedGroupItemInterface
+			.getPropertyOrThrow("quux")
+			.getTypeNodeOrThrow()
+			.getText(),
+	).toBe("prismic.SelectField");
+});
+
 it("prefixes Group types starting with a number using an underscore prefix", (ctx) => {
 	const model = ctx.mock.model.customType({
 		id: "123",