refactor: link types

src/Migration.ts

@@ -1,4 +1,5 @@
 import * as is from "./lib/isValue"
+import { getOptionalLinkProperties } from "./lib/getOptionalLinkProperties"
 import { validateAssetMetadata } from "./lib/validateAssetMetadata"
 
 import type { Asset } from "./types/api/asset/asset"
@@ -404,28 +405,32 @@ export class Migration<TDocuments extends PrismicDocument = PrismicDocument> {
 	 */
 	#migratePrismicDocumentData(input: unknown): unknown {
 		if (is.filledContentRelationship(input)) {
+			const optionalLinkProperties = getOptionalLinkProperties(input)
+
 			if (input.isBroken) {
 				return {
+					...optionalLinkProperties,
 					link_type: LinkType.Document,
 					// ID needs to be 16 characters long to be considered valid by the API
 					id: "_____broken_____",
 					isBroken: true,
-					text: input.text,
 				}
 			}
 
 			return {
+				...optionalLinkProperties,
 				link_type: LinkType.Document,
 				id: () => this._getByOriginalID(input.id),
-				text: input.text,
 			}
 		}
 
 		if (is.filledLinkToMedia(input)) {
+			const optionalLinkProperties = getOptionalLinkProperties(input)
+
 			return {
+				...optionalLinkProperties,
 				link_type: LinkType.Media,
 				id: this.createAsset(input),
-				text: input.text,
 			}
 		}
 

src/lib/getOptionalLinkProperties.ts

@@ -0,0 +1,23 @@
+import type { OptionalLinkProperties } from "../types/value/link"
+
+/**
+ * Returns optional properties only available to link fields. Link fields can
+ * have the same shape as content relationship and link to media fields,
+ * requiring special treatment to extract link-specific properties.
+ *
+ * @param input - The content relationship or link to media field from which the
+ *   link properties will be extracted.
+ *
+ * @returns Optional link properties that `input` might have.
+ */
+export const getOptionalLinkProperties = (
+	input: OptionalLinkProperties,
+): OptionalLinkProperties => {
+	const res: OptionalLinkProperties = {}
+
+	if ("text" in input) {
+		res.text = input.text
+	}
+
+	return res
+}

src/lib/isMigrationValue.ts

@@ -12,6 +12,7 @@ import {
 import type { PrismicDocument } from "../types/value/document"
 import type { GroupField } from "../types/value/group"
 import { LinkType } from "../types/value/link"
+import type { OptionalLinkProperties } from "../types/value/link"
 import { RichTextNodeType } from "../types/value/richText"
 import type { SliceZone } from "../types/value/sliceZone"
 import type { AnyRegularField } from "../types/value/types"
@@ -32,6 +33,10 @@ type UnknownValue =
 /**
  * Checks if a value is a migration content relationship field.
  *
+ * @remarks
+ * `OptionalLinkProperties` is included because `MigrationContentRelationship`
+ * may be a link field, not strictly a content relationship field.
+ *
  * @param value - Value to check.
  *
  * @returns `true` if `value` is a migration content relationship field, `false`
@@ -42,7 +47,7 @@ type UnknownValue =
  */
 export const contentRelationship = (
 	value: UnknownValue,
-): value is MigrationContentRelationship => {
+): value is MigrationContentRelationship & OptionalLinkProperties => {
 	return (
 		value instanceof PrismicMigrationDocument ||
 		is.prismicDocument(value) ||
@@ -80,6 +85,10 @@ export const image = (value: UnknownValue): value is MigrationImage => {
 /**
  * Checks if a value is a migration link to media field.
  *
+ * - @remarks `OptionalLinkProperties` is included because
+ *   `MigrationContentRelationship` may be a link field, not strictly a content
+ *   relationship field.
+ *
  * @param value - Value to check.
  *
  * @returns `true` if `value` is a migration link to media field, `false`
@@ -90,7 +99,7 @@ export const image = (value: UnknownValue): value is MigrationImage => {
  */
 export const linkToMedia = (
 	value: UnknownValue,
-): value is MigrationLinkToMedia => {
+): value is MigrationLinkToMedia & OptionalLinkProperties => {
 	return (
 		typeof value === "object" &&
 		value !== null &&

src/lib/isValue.ts

@@ -4,6 +4,7 @@ import type { PrismicDocument } from "../types/value/document"
 import type { GroupField } from "../types/value/group"
 import type { ImageField } from "../types/value/image"
 import { LinkType } from "../types/value/link"
+import type { OptionalLinkProperties } from "../types/value/link"
 import type { FilledLinkToMediaField } from "../types/value/linkToMedia"
 import { type RTImageNode, RichTextNodeType } from "../types/value/richText"
 import type { SliceZone } from "../types/value/sliceZone"
@@ -23,6 +24,11 @@ type UnknownValue =
 /**
  * Checks if a value is a link to media field.
  *
+ * @remarks
+ * The return value includes `OptionalLinkProperties` because
+ * `FilledLinkToMediaField` may be a link field, not strictly a content
+ * relationship field.
+ *
  * @param value - Value to check.
  *
  * @returns `true` if `value` is a link to media field, `false` otherwise.
@@ -32,7 +38,7 @@ type UnknownValue =
  */
 export const filledLinkToMedia = (
 	value: UnknownValue,
-): value is FilledLinkToMediaField => {
+): value is FilledLinkToMediaField & OptionalLinkProperties => {
 	if (value && typeof value === "object" && !("version" in value)) {
 		if (
 			"link_type" in value &&
@@ -138,6 +144,11 @@ export const rtImageNode = (value: UnknownValue): value is RTImageNode => {
 /**
  * Checks if a value is a content relationship field.
  *
+ * @remarks
+ * The return value includes `OptionalLinkProperties` because
+ * `FilledContentRelationshipField` may be a link field, not strictly a content
+ * relationship field.
+ *
  * @param value - Value to check.
  *
  * @returns `true` if `value` is a content relationship, `false` otherwise.
@@ -147,7 +158,7 @@ export const rtImageNode = (value: UnknownValue): value is RTImageNode => {
  */
 export const filledContentRelationship = (
 	value: UnknownValue,
-): value is FilledContentRelationshipField => {
+): value is FilledContentRelationshipField & OptionalLinkProperties => {
 	if (value && typeof value === "object" && !("version" in value)) {
 		if (
 			"link_type" in value &&

src/lib/resolveMigrationDocumentData.ts

@@ -10,8 +10,9 @@ import type {
 	MigrationContentRelationshipField,
 } from "../types/migration/ContentRelationship"
 import { PrismicMigrationDocument } from "../types/migration/Document"
+import type { MaybeLink } from "../types/migration/Link"
 import type { FilledImageFieldImage } from "../types/value/image"
-import type { LinkField } from "../types/value/link"
+import type { LinkField, OptionalLinkProperties } from "../types/value/link"
 import { LinkType } from "../types/value/link"
 import type { RTImageNode } from "../types/value/richText"
 import { RichTextNodeType } from "../types/value/richText"
@@ -20,6 +21,7 @@ import * as isFilled from "../helpers/isFilled"
 import type { Migration } from "../Migration"
 
 import * as isMigration from "./isMigrationValue"
+import { getOptionalLinkProperties } from "./getOptionalLinkProperties"
 
 /**
  * Resolves a migration content relationship to a content relationship field.
@@ -29,35 +31,48 @@ import * as isMigration from "./isMigrationValue"
  * @returns Resolved content relationship field.
  */
 export async function resolveMigrationContentRelationship(
-	relation: MigrationContentRelationship,
-): Promise<MigrationContentRelationshipField> {
+	relation: MaybeLink<MigrationContentRelationship>,
+): Promise<MigrationContentRelationshipField & OptionalLinkProperties> {
 	if (typeof relation === "function") {
 		return resolveMigrationContentRelationship(await relation())
 	}
 
 	if (relation instanceof PrismicMigrationDocument) {
 		return relation.document.id
 			? { link_type: LinkType.Document, id: relation.document.id }
-			: { link_type: LinkType.Document }
+			: { link_type: LinkType.Any }
 	}
 
+	const optionalLinkProperties =
+		relation && "link_type" in relation
+			? getOptionalLinkProperties(relation)
+			: undefined
+
 	if (relation) {
 		if (
 			isMigration.contentRelationship(relation.id) ||
-			typeof relation.id === "function"
+			typeof relation.id !== "string"
 		) {
 			return {
+				...optionalLinkProperties,
 				...(await resolveMigrationContentRelationship(relation.id)),
-				// TODO: Remove when link text PR is merged
-				// @ts-expect-error - Future-proofing for link text
-				text: relation.text,
 			}
 		}
 
-		return { link_type: LinkType.Document, id: relation.id }
+		// This is only called when resolveMigrationContentRelationship recursively
+		// calls itself from the statement above and the resolved content relation
+		// is a Prismic document value.
+		return {
+			...optionalLinkProperties,
+			link_type: LinkType.Document,
+			id: relation.id,
+		}
 	}
 
-	return { link_type: LinkType.Document }
+	return {
+		...optionalLinkProperties,
+		link_type: LinkType.Any,
+	}
 }
 
 /**
@@ -154,20 +169,24 @@ export const resolveMigrationRTImageNode = async (
  * @returns Resolved link to media field.
  */
 export const resolveMigrationLinkToMedia = (
-	linkToMedia: MigrationLinkToMedia,
+	linkToMedia: MaybeLink<MigrationLinkToMedia>,
 	migration: Migration,
 ): MigrationLinkToMediaField => {
 	const asset = migration._assets.get(linkToMedia.id.config.id)?.asset
+	const optionalLinkProperties = getOptionalLinkProperties(linkToMedia)
 
 	if (asset) {
 		return {
+			...optionalLinkProperties,
 			id: asset.id,
 			link_type: LinkType.Media,
-			text: linkToMedia.text,
 		}
 	}
 
-	return { link_type: LinkType.Media }
+	return {
+		...optionalLinkProperties,
+		link_type: LinkType.Any,
+	}
 }
 
 /**

src/types/migration/Asset.ts

@@ -1,6 +1,5 @@
 import type { Asset } from "../api/asset/asset"
 import type { FilledImageFieldImage } from "../value/image"
-import type { EmptyLinkField } from "../value/link"
 import type { LinkToMediaField } from "../value/linkToMedia"
 import { type RTImageNode } from "../value/richText"
 
@@ -73,23 +72,22 @@ export type MigrationImage =
  */
 export type MigrationLinkToMedia = Pick<
 	LinkToMediaField<"filled">,
-	"link_type"
-> &
-	Partial<Pick<LinkToMediaField<"filled">, "text">> & {
-		/**
-		 * A reference to the migration asset used to resolve the link to media
-		 * field's value.
-		 */
-		id: PrismicMigrationAsset
-	}
+	"link_type" | "text"
+> & {
+	/**
+	 * A reference to the migration asset used to resolve the link to media
+	 * field's value.
+	 */
+	id: PrismicMigrationAsset
+}
 
 /**
  * The minimum amount of information needed to represent a link to media field
  * with the migration API.
  */
 export type MigrationLinkToMediaField =
 	| Pick<LinkToMediaField<"filled">, "link_type" | "id" | "text">
-	| EmptyLinkField<"Media">
+	| LinkToMediaField<"empty">
 
 /**
  * A rich text image node in a migration.

src/types/migration/ContentRelationship.ts

@@ -1,6 +1,9 @@
-import type { FilledContentRelationshipField } from "../value/contentRelationship"
+import type {
+	ContentRelationshipField,
+	EmptyContentRelationshipField,
+	FilledContentRelationshipField,
+} from "../value/contentRelationship"
 import type { PrismicDocument } from "../value/document"
-import type { EmptyLinkField } from "../value/link"
 
 import type { PrismicMigrationDocument } from "./Document"
 
@@ -13,17 +16,16 @@ export type MigrationContentRelationship<
 	TDocuments extends PrismicDocument = PrismicDocument,
 > =
 	| ValueOrThunk<TDocuments | PrismicMigrationDocument<TDocuments> | undefined>
-	| (Pick<FilledContentRelationshipField, "link_type"> &
-			Partial<Pick<FilledContentRelationshipField, "text">> & {
-				id: ValueOrThunk<
-					TDocuments | PrismicMigrationDocument<TDocuments> | undefined
-				>
-			})
+	| (Pick<ContentRelationshipField, "link_type"> & {
+			id: ValueOrThunk<
+				TDocuments | PrismicMigrationDocument<TDocuments> | undefined
+			>
+	  })
 
 /**
  * The minimum amount of information needed to represent a content relationship
  * field with the migration API.
  */
 export type MigrationContentRelationshipField =
 	| Pick<FilledContentRelationshipField, "link_type" | "id">
-	| EmptyLinkField<"Document">
+	| EmptyContentRelationshipField

src/types/migration/Link.ts

@@ -0,0 +1,19 @@
+import type { LinkType, OptionalLinkProperties } from "../value/link"
+
+/**
+ * Adds `OptionalLinkProperties` to any type that looks like a link object (one
+ * that includes a valid `link_type` property).
+ *
+ * @example
+ *
+ * ```ts
+ * type Example = MaybeLink<PrismicDocument | LinkField>
+ * // PrismicDocument | (LinkField & OptionalLinkProperties)
+ * ```
+ *
+ * @typeParam T - The type to augment.
+ */
+export type MaybeLink<T> =
+	| Exclude<T, { link_type: (typeof LinkType)[keyof typeof LinkType] }>
+	| (Extract<T, { link_type: (typeof LinkType)[keyof typeof LinkType] }> &
+			OptionalLinkProperties)

src/types/model/contentRelationship.ts

@@ -18,6 +18,5 @@ export interface CustomTypeModelContentRelationshipField<
 		select: typeof CustomTypeModelLinkSelectType.Document
 		customtypes?: readonly CustomTypeIDs[]
 		tags?: readonly Tags[]
-		allowText?: boolean
 	}
 }