@prismicio/types-internal 2.7.0-alpha.2 → 2.7.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@prismicio/types-internal",
-	"version": "2.7.0-alpha.2",
+	"version": "2.7.0-alpha.4",
 	"description": "Prismic types for Custom Types and Prismic Data",
 	"keywords": [
 		"typescript",

package/src/content/fields/nestable/LinkContent.ts

@@ -10,23 +10,31 @@ import { hasContentType } from "../../utils"
 
 export const ImageLinkType = "ImageLink"
 
-const imageLinkLegacyCodec = t.exact(
-	t.intersection([
-		t.type({
-			id: t.string,
-			url: t.string,
-			height: t.string,
-			width: t.string,
-			size: t.string,
-			name: t.string,
-			kind: t.string,
-		}),
-		t.partial({
-			date: StringOrNull,
+const imageLinkLegacyCodec = t.intersection([
+	t.strict({ kind: t.literal("image") }),
+	t.union([
+		t.exact(
+			t.intersection([
+				t.type({
+					id: t.string,
+					url: t.string,
+					height: t.string,
+					width: t.string,
+					size: t.string,
+					name: t.string,
+				}),
+				t.partial({
+					date: StringOrNull,
+					text: t.string,
+				}),
+			]),
+		),
+		t.strict({
 			text: t.string,
 		}),
 	]),
-)
+])
+
 type ImageLinkLegacy = t.TypeOf<typeof imageLinkLegacyCodec>
 const ImageLinkLegacy = new t.Type<ImageLinkContent, ImageLinkLegacy, unknown>(
 	"ImageLink",
@@ -58,21 +66,31 @@ export type ImageLinkContent = t.TypeOf<typeof ImageLinkContent>
 
 export const FileLinkType = "FileLink"
 
-const fileLinkLegacyCodec = t.exact(
-	t.intersection([
-		t.type({
-			id: t.string,
-			url: t.string,
-			name: t.string,
-			kind: t.string,
-			size: withFallback(t.string, "0"),
-		}),
-		t.partial({
-			date: nullable(t.string),
+const fileLinkLegacyCodec = t.intersection([
+	t.strict({
+		kind: t.literal("file"),
+	}),
+	t.union([
+		t.exact(
+			t.intersection([
+				t.type({
+					id: t.string,
+					url: t.string,
+					name: t.string,
+					size: withFallback(t.string, "0"),
+				}),
+				t.partial({
+					date: StringOrNull,
+					text: t.string,
+				}),
+			]),
+		),
+		t.strict({
 			text: t.string,
 		}),
 	]),
-)
+])
+
 type FileLinkLegacy = t.TypeOf<typeof fileLinkLegacyCodec>
 const FileLinkLegacy = new t.Type<FileLinkContent, FileLinkLegacy>(
 	"FileLink",
@@ -94,31 +112,31 @@ const FileLinkLegacy = new t.Type<FileLinkContent, FileLinkLegacy>(
 )
 
 export const FileLinkContent = t.intersection([
+	t.strict({
+		__TYPE__: t.literal(FileLinkType),
+	}),
 	fileLinkLegacyCodec,
+])
+export type FileLinkContent = t.TypeOf<typeof FileLinkContent>
+
+export const DocumentLinkType = "DocumentLink"
+
+const documentLinkLegacyCodec = t.union([
 	t.exact(
 		t.intersection([
-			t.type({
-				__TYPE__: t.literal(FileLinkType),
-			}),
+			t.type({ id: NonEmptyString }),
 			t.partial({
-				size: withFallback(t.string, "0"),
+				kind: t.literal("document"),
 				text: t.string,
 			}),
 		]),
 	),
+	t.strict({
+		kind: t.literal("document"),
+		text: t.string,
+	}),
 ])
-export type FileLinkContent = t.TypeOf<typeof FileLinkContent>
-
-export const DocumentLinkType = "DocumentLink"
 
-const documentLinkLegacyCodec = t.exact(
-	t.intersection([
-		t.type({ id: NonEmptyString }),
-		t.partial({
-			text: t.string,
-		}),
-	]),
-)
 type DocumentLinkLegacy = t.TypeOf<typeof documentLinkLegacyCodec>
 const DocumentLinkLegacy = new t.Type<DocumentLinkContent, DocumentLinkLegacy>(
 	"DocumentLink",
@@ -149,23 +167,29 @@ export type DocumentLinkContent = t.TypeOf<typeof DocumentLinkContent>
 
 export const ExternalLinkType = "ExternalLink"
 
-const externalLinkLegacyCodec = t.exact(
-	t.intersection([
-		t.type({
-			url: t.string,
-		}),
-		t.partial({
-			kind: t.literal("web"),
-			target: StringOrNull,
-			preview: nullable(
-				t.partial({
-					title: t.string,
-				}),
-			),
-			text: t.string,
-		}),
-	]),
-)
+const externalLinkLegacyCodec = t.union([
+	t.exact(
+		t.intersection([
+			t.type({
+				url: t.string,
+			}),
+			t.partial({
+				kind: t.literal("web"),
+				target: StringOrNull,
+				preview: nullable(
+					t.partial({
+						title: t.string,
+					}),
+				),
+				text: t.string,
+			}),
+		]),
+	),
+	t.strict({
+		kind: t.literal("web"),
+		text: t.string,
+	}),
+])
 
 type ExternalLinkLegacy = t.TypeOf<typeof externalLinkLegacyCodec>
 const ExternalLinkLegacy = new t.Type<ExternalLinkContent, ExternalLinkLegacy>(
@@ -196,6 +220,40 @@ export const ExternalLinkContent = t.intersection([
 ])
 export type ExternalLinkContent = t.TypeOf<typeof ExternalLinkContent>
 
+export const AnyLinkType = "AnyLink"
+
+const anyLinkLegacyCodec = t.strict({
+	text: t.string,
+})
+
+type AnyLinkLegacy = t.TypeOf<typeof anyLinkLegacyCodec>
+const AnyLinkLegacy = new t.Type<AnyLinkContent, AnyLinkLegacy>(
+	"AnyLink",
+	(u): u is AnyLinkContent => hasContentType(u) && u.__TYPE__ === AnyLinkType,
+	(anyLink) => {
+		return pipe(
+			anyLinkLegacyCodec.decode(anyLink),
+			either.map((parsedAnyLink) => {
+				return AnyLinkContent.encode({
+					...parsedAnyLink,
+					__TYPE__: AnyLinkType,
+				})
+			}),
+		)
+	},
+	(anyLink: AnyLinkContent): AnyLinkLegacy => {
+		return anyLinkLegacyCodec.encode(anyLink)
+	},
+)
+
+export const AnyLinkContent = t.intersection([
+	t.strict({
+		__TYPE__: t.literal(AnyLinkType),
+	}),
+	anyLinkLegacyCodec,
+])
+export type AnyLinkContent = t.TypeOf<typeof AnyLinkContent>
+
 export const LinkContentType = "LinkContent"
 
 export const isLinkContent = (u: unknown): u is LinkContent =>
@@ -206,6 +264,7 @@ export const LinkLegacy = t.union([
 	FileLinkLegacy,
 	DocumentLinkLegacy,
 	ExternalLinkLegacy,
+	AnyLinkLegacy,
 ])
 
 type LinkLegacy = t.OutputOf<typeof LinkLegacy>
@@ -239,6 +298,7 @@ export const Link = t.union([
 	FileLinkContent,
 	DocumentLinkContent,
 	ExternalLinkContent,
+	AnyLinkContent,
 ])
 export const LinkContent = t.strict({
 	__TYPE__: t.literal(LinkContentType),

package/src/customtypes/widgets/nestable/Link.ts

@@ -3,7 +3,6 @@ import * as t from "io-ts"
 import { withFallback } from "io-ts-types/lib/withFallback"
 
 import { StringOrNull } from "../../../validators"
-import { Text } from "./Text"
 
 const arrayString = (
 	entries:
@@ -79,7 +78,7 @@ export const LinkConfig = t.exact(
 		masks: MasksArrayString,
 		tags: MasksArrayString,
 		allowTargetBlank: t.boolean,
-		text: Text,
+		allowText: t.boolean,
 	}),
 )
 export type LinkConfig = t.TypeOf<typeof LinkConfig>