@prismicio/types-internal 2.0.0-beta.0 → 2.0.0-beta.1

package/src/content/fields/nestable/RichTextContent/Blocks.ts

@@ -77,24 +77,31 @@ export const ValidatedMetas = (linkCodec: LinkCodec) =>
 		},
 	)
 
-export const ImageBlock = t.exact(
-	t.intersection([
-		t.type({
-			type: t.literal(RichTextNodeType.image),
-			data: t.intersection([
-				ImageContentView,
-				t.partial({
-					linkTo: nullable(Link),
-				}),
-			]),
-		}),
-		t.partial({
-			label: StringOrNull,
-			direction: StringOrNull,
-		}),
-	]),
-)
+const ImageBlockCodec = (linkCodec: LinkCodec) =>
+	t.exact(
+		t.intersection([
+			t.type({
+				type: t.literal(RichTextNodeType.image),
+				data: t.intersection([
+					ImageContentView,
+					t.partial({
+						linkTo: nullable(linkCodec),
+					}),
+				]),
+			}),
+			t.partial({
+				label: StringOrNull,
+				direction: StringOrNull,
+			}),
+		]),
+	)
+
+export const ImageBlock = ImageBlockCodec(Link)
 export type ImageBlock = t.TypeOf<typeof ImageBlock>
+
+const ImageBlockLegacy = ImageBlockCodec(LinkLegacy)
+type ImageBlockLegacy = t.TypeOf<typeof ImageBlockLegacy>
+
 export function checkImageBlock(block: Block): block is ImageBlock {
 	return block.type === RichTextNodeType.image
 }
@@ -196,7 +203,7 @@ type TextBlockLegacy = t.TypeOf<typeof TextBlockLegacy>
 
 const legacyBlockCodec = t.union([
 	EmbedBlockLegacy,
-	ImageBlock,
+	ImageBlockLegacy,
 	TextBlockLegacy,
 ])
 type BlockLegacy = t.TypeOf<typeof legacyBlockCodec>
@@ -204,13 +211,14 @@ type BlockLegacy = t.TypeOf<typeof legacyBlockCodec>
 export const BlockLegacy = new t.Type<Block, BlockLegacy, unknown>(
 	"BlockLegacy",
 	(u): u is Block =>
-		EmbedBlockLegacy.is(u) || ImageBlock.is(u) || TextBlockLegacy.is(u),
+		EmbedBlockLegacy.is(u) || ImageBlockLegacy.is(u) || TextBlockLegacy.is(u),
 	(legacyBlock) => legacyBlockCodec.decode(legacyBlock),
 	(block: Block) => {
-		if (ImageBlock.is(block)) return ImageBlock.encode(block)
-		else if (EmbedBlock.is(block))
-			return EmbedBlockLegacy.encode(block) as BlockLegacy
-		else return TextBlockLegacy.encode(block)
+		return (() => {
+			if (ImageBlock.is(block)) return ImageBlockLegacy.encode(block)
+			else if (EmbedBlock.is(block)) return EmbedBlockLegacy.encode(block)
+			else return TextBlockLegacy.encode(block)
+		})() as BlockLegacy
 	},
 )
 export const Block = t.union([ImageBlock, EmbedBlock, TextBlock])

package/src/content/fields/nestable/RichTextContent/index.ts

@@ -28,9 +28,7 @@ export const RichTextLegacy = (ctx: LegacyContentCtx) =>
 		(u) => {
 			return pipe(
 				legacyReader.decode(u),
-				either.map((r) =>
-					RichTextContent.encode({ value: r, __TYPE__: RichTextContentType }),
-				),
+				either.map((r) => ({ value: r, __TYPE__: RichTextContentType })),
 			)
 		},
 

package/src/content/fields/slices/Slice/SimpleSliceContent.ts

@@ -16,7 +16,10 @@ export const isSimpleSliceContent = (u: unknown): u is SimpleSliceContent =>
 
 export const SimpleSliceLegacy = (ctx: LegacyContentCtx) => {
 	return {
-		decode: (NestableLegacy(ctx) || GroupLegacy(ctx)).decode.bind(null),
+		decode: (() => {
+			if (ctx.fieldType === "Group") return GroupLegacy(ctx).decode.bind(null)
+			return NestableLegacy(ctx).decode.bind(null)
+		})(),
 
 		encode: (value: SimpleSliceContent) => {
 			switch (value.__TYPE__) {

package/src/customtypes/CustomType.ts

@@ -9,6 +9,11 @@ import type { DynamicSlice } from "./widgets/slices/Slice"
 import type { DynamicSlices } from "./widgets/slices/Slices"
 import type { DynamicWidget } from "./widgets/Widget"
 
+export const CustomTypeFormat = {
+	page: "page",
+	custom: "custom",
+}
+
 class CustomTypeSlicesError extends Error {
 	slices: Array<string>
 	override message: string
@@ -41,6 +46,7 @@ function customTypeReader<T extends StaticSection | DynamicSection>(
 			}),
 			t.partial({
 				hash: t.string,
+				format: withFallback(t.keyof(CustomTypeFormat), "custom"),
 			}),
 		]),
 	)