Merge branch 'dani/repeatable-links-alt1' of github.com:prismicio/pri…

…smic-client into dani/repeatable-links-alt1

src/helpers/isFilled.ts

@@ -10,15 +10,14 @@ import type { KeyTextField } from "../types/value/keyText"
 import type { LinkField } from "../types/value/link"
 import type { LinkToMediaField } from "../types/value/linkToMedia"
 import type { NumberField } from "../types/value/number"
-import type { Repeatable } from "../types/value/repeatable"
 import type { RichTextField } from "../types/value/richText"
 import type { SelectField } from "../types/value/select"
 import type { SharedSlice } from "../types/value/sharedSlice"
 import type { Slice } from "../types/value/slice"
 import type { SliceZone } from "../types/value/sliceZone"
 import type { TimestampField } from "../types/value/timestamp"
 import type { TitleField } from "../types/value/title"
-import type { AnyRegularField, AnyRepeatableField } from "../types/value/types"
+import type { AnyRegularField, Repeatable } from "../types/value/types"
 
 /**
  * Determines if a value is not nullish (i.e. not `null` or `undefined`). This
@@ -276,9 +275,9 @@ export const integrationFields = integrationField
  *   otherwise.
  */
 
-export const repeatable = (
-	repeatable: Repeatable | null | undefined,
-): repeatable is Repeatable<Array<AnyRepeatableField>, "filled"> => {
+export const repeatable = <T extends LinkField>(
+	repeatable: Repeatable<T> | null | undefined,
+): repeatable is Repeatable<T, "filled"> => {
 	return isNonNullish(repeatable) && isNonEmptyArray(repeatable)
 }
 

src/types/value/link.ts

@@ -1,4 +1,4 @@
-import type { AnyRegularField, FieldState } from "./types"
+import type { AnyRegularField, FieldState, Repeatable } from "./types"
 
 import type { ContentRelationshipField } from "./contentRelationship"
 import type { GroupField } from "./group"
@@ -59,3 +59,9 @@ export type LinkField<
 			| ContentRelationshipField<TypeEnum, LangEnum, DataInterface, State>
 			| FilledLinkToWebField
 			| LinkToMediaField<State>
+
+/**
+ * A repeatable link field.
+ */
+
+export type RepeatableLinkField = Repeatable<LinkField>

src/types/value/types.ts

@@ -8,7 +8,7 @@ import type { GroupField } from "./group"
 import type { ImageField } from "./image"
 import type { IntegrationField } from "./integration"
 import type { KeyTextField } from "./keyText"
-import type { LinkField } from "./link"
+import type { LinkField, RepeatableLinkField } from "./link"
 import type { LinkToMediaField } from "./linkToMedia"
 import type { NumberField } from "./number"
 import type { Repeatable } from "./repeatable"
@@ -27,11 +27,6 @@ export type EmptyObjectField = Record<string, never>
  */
 export type FieldState = "empty" | "filled"
 
-/**
- * Any field that can be repeated.
- */
-export type AnyRepeatableField = LinkField
-
 /**
  * Any regular field that can be nested in a group-like field.
  */
@@ -41,6 +36,7 @@ export type AnyRegularField =
 	| ImageField
 	| ContentRelationshipField
 	| LinkField
+	| RepeatableLinkField
 	| LinkToMediaField
 	| EmbedField
 	| DateField
@@ -52,13 +48,20 @@ export type AnyRegularField =
 	| BooleanField
 	| GeoPointField
 	| IntegrationField
-	| Repeatable
 
 /**
  * Any field that can be used in a slice's primary section.
  */
 export type AnySlicePrimaryField = GroupField | AnyRegularField
 
+/**
+ * A list of repeatable fields.
+ */
+export type Repeatable<
+	Field extends LinkField,
+	State extends FieldState = FieldState,
+> = State extends "empty" ? [] : [Field, ...Field[]]
+
 /**
  * Useful to flatten the type output to improve type hints shown in editors. And
  * also to transform an interface into a type to aide with assignability.