@prismicio/types-internal 2.0.0-alpha.7 → 2.0.0-alpha.8

package/lib/content/fields/slices/index.d.ts

@@ -1,5 +1,3 @@
-export * from "./Slice/CompositeSliceContent";
-export * from "./Slice/SharedSliceContent";
-export * from "./Slice/SimpleSliceContent";
+export * from "./Slice";
 export * from "./SliceItem";
 export * from "./SlicesContent";

package/lib/content/fields/slices/index.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./Slice/CompositeSliceContent"), exports);
-tslib_1.__exportStar(require("./Slice/SharedSliceContent"), exports);
-tslib_1.__exportStar(require("./Slice/SimpleSliceContent"), exports);
+tslib_1.__exportStar(require("./Slice"), exports);
 tslib_1.__exportStar(require("./SliceItem"), exports);
 tslib_1.__exportStar(require("./SlicesContent"), exports);

package/package.json

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

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

@@ -2,7 +2,6 @@ import { either } from "fp-ts"
 import { pipe } from "fp-ts/lib/function"
 import * as t from "io-ts"
 
-import { withOptionals } from "../../../utils/Objects"
 import { NumberOrNull, StringOrNull } from "../../../validators"
 import type { LegacyContentCtx, WithTypes } from "../../LegacyContentCtx"
 import { hasContentType } from "../../utils"
@@ -34,79 +33,41 @@ export const EmbedContentLegacy = t.exact(
 	]),
 )
 
-type EmbedLegacy = t.TypeOf<typeof EmbedContentLegacy>
+export type EmbedLegacy = t.TypeOf<typeof EmbedContentLegacy>
 
 export const EmbedLegacy = (ctx: LegacyContentCtx) =>
-	new t.Type<EmbedContent, WithTypes<EmbedLegacy>, unknown>(
+	new t.Type<EmbedContent, WithTypes<unknown>, unknown>(
 		"EmbedLegacy",
 		isEmbedContent,
 		(u) => {
 			return pipe(
 				EmbedContentLegacy.decode(u),
-				either.map((embed) =>
-					buildEmbedContent({
-						...embed,
-						__TYPE__: EmbedContentType,
-					}),
-				),
+				either.map((embed) => ({
+					...embed,
+					all: u,
+					__TYPE__: EmbedContentType,
+				})),
 			)
 		},
 
 		(embed: EmbedContent) => {
 			return {
-				content: buildEmbedContent(embed).all,
+				/**
+				 *  we cast here because actually in the all property
+				 * we can have extra keys that are never parsed and we don't want to loose them.
+				 **/
+				content: embed.all,
 				types: { [ctx.keyOfType]: "Embed" },
 			}
 		},
 	)
 
-export type EmbedContent = EmbedLegacy & {
-	__TYPE__: typeof EmbedContentType
-	all: unknown
-}
+export const EmbedContent = t.intersection([
+	EmbedContentLegacy,
+	t.strict({
+		__TYPE__: t.literal(EmbedContentType),
+		all: t.unknown,
+	}),
+])
 
-export const EmbedContent = new t.Type<EmbedContent>(
-	"EmbedContent",
-	isEmbedContent,
-	(u: unknown) => {
-		return pipe(
-			t
-				.intersection([
-					EmbedContentLegacy,
-					t.strict({
-						__TYPE__: t.literal(EmbedContentType),
-					}),
-				])
-				.decode(u),
-			either.map((parsedEmbed: Omit<EmbedContent, "all">) => {
-				return buildEmbedContent(parsedEmbed)
-			}),
-		)
-	},
-	(e) => e,
-)
-
-export function buildEmbedContent(embed: Omit<EmbedContent, "all">) {
-	return {
-		...embed,
-		all: withOptionals<EmbedLegacy>(
-			{
-				embed_url: embed.embed_url,
-				type: embed.type,
-			},
-			[
-				["author_name", embed.author_name],
-				["author_url", embed.author_url],
-				["cache_age", embed.cache_age],
-				["html", embed.html],
-				["provider_name", embed.provider_name],
-				["provider_url", embed.provider_url],
-				["thumbnail_height", embed.thumbnail_height],
-				["thumbnail_width", embed.thumbnail_width],
-				["thumbnail_url", embed.thumbnail_url],
-				["title", embed.title],
-				["version", embed.version],
-			],
-		),
-	}
-}
+export type EmbedContent = t.TypeOf<typeof EmbedContent>

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

@@ -10,10 +10,10 @@ import {
 import { StringOrNull } from "../../../../validators"
 import { nullable, refineType } from "../../../../validators/function"
 import {
-	buildEmbedContent,
 	EmbedContent,
 	EmbedContentLegacy,
 	EmbedContentType,
+	EmbedLegacy,
 } from "../EmbedContent"
 import { ImageContentView } from "../ImageContent"
 import { Link, LinkLegacy } from "../LinkContent"
@@ -103,7 +103,7 @@ const embedBlockLegacyCodec = t.exact(
 	t.intersection([
 		t.type({
 			type: t.literal(RichTextNodeType.embed),
-			data: EmbedContentLegacy,
+			data: t.unknown,
 		}),
 		t.partial({
 			label: StringOrNull,
@@ -120,18 +120,29 @@ const EmbedBlockLegacy = new t.Type<EmbedBlock, EmbedBlockLegacy, unknown>(
 	(block) =>
 		pipe(
 			embedBlockLegacyCodec.decode(block),
-			either.map((parsedBlock) => {
+			either.chain((decodedBlock) => {
+				return either.map<EmbedLegacy, [EmbedBlockLegacy, EmbedLegacy]>(
+					(decodedData: EmbedLegacy) => {
+						return [decodedBlock, decodedData]
+					},
+				)(EmbedContentLegacy.decode(decodedBlock.data))
+			}),
+			either.map(([block, parsedData]) => {
 				return EmbedBlock.encode({
-					...parsedBlock,
-					data: buildEmbedContent({
-						...parsedBlock.data,
+					...block,
+					data: {
+						...parsedData,
 						__TYPE__: EmbedContentType,
-					}),
+						all: block.data,
+					},
 				})
 			}),
 		),
 	(embedBlock: EmbedBlock): EmbedBlockLegacy => {
-		return embedBlockLegacyCodec.encode(embedBlock)
+		return {
+			...embedBlockLegacyCodec.encode(embedBlock),
+			data: EmbedContentLegacy.encode(embedBlock.data),
+		}
 	},
 )
 export const EmbedBlock = t.exact(

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

@@ -45,3 +45,7 @@ export const SliceContent = t.union([
 ])
 
 export type SliceContent = t.TypeOf<typeof SliceContent>
+
+export * from "./CompositeSliceContent"
+export * from "./SharedSliceContent"
+export * from "./SimpleSliceContent"

package/src/content/fields/slices/SliceItem.ts

@@ -53,7 +53,7 @@ export const SlicesItemLegacy = (ctx: LegacyContentCtx) => {
 						0,
 						stopIdx > 0 ? stopIdx : undefined,
 					)
-					const itemCtx = getFieldCtx(parsedSlice.key, ctx)
+					const itemCtx = getFieldCtx(sliceName, ctx)
 					const item = SliceLegacy(itemCtx).decode(parsedSlice.value)
 					if (!item || isLeft(item)) return t.failure(sliceItem, context)
 
@@ -67,7 +67,7 @@ export const SlicesItemLegacy = (ctx: LegacyContentCtx) => {
 			)
 		},
 		(sItem: SliceItemContent) => {
-			const itemCtx = getFieldCtx(sItem.key, ctx)
+			const itemCtx = getFieldCtx(sItem.name, ctx)
 			const result = SliceLegacy(itemCtx).encode(sItem.widget)
 
 			return {

package/src/content/fields/slices/index.ts

@@ -1,5 +1,3 @@
-export * from "./Slice/CompositeSliceContent"
-export * from "./Slice/SharedSliceContent"
-export * from "./Slice/SimpleSliceContent"
+export * from "./Slice"
 export * from "./SliceItem"
 export * from "./SlicesContent"