@prismicio/types-internal 2.2.0-alpha.18 → 2.2.0-alpha.19

package/lib/content/fields/nestable/RichTextContent/Blocks.d.ts

@@ -214,6 +214,29 @@ export declare const TextBlock: t.ExactC<t.IntersectionC<[t.TypeC<{
     direction: t.StringC;
 }>]>>;
 export declare type TextBlock = t.TypeOf<typeof TextBlock>;
+export declare const TextBlockLegacy: t.ExactC<t.IntersectionC<[t.TypeC<{
+    type: t.Type<"image" | "paragraph" | "heading1" | "heading2" | "heading3" | "heading4" | "heading5" | "heading6" | "strong" | "em" | "preformatted" | "hyperlink" | "embed" | "list-item" | "o-list-item" | "rtl", "image" | "paragraph" | "heading1" | "heading2" | "heading3" | "heading4" | "heading5" | "heading6" | "strong" | "em" | "preformatted" | "hyperlink" | "embed" | "list-item" | "o-list-item" | "rtl", unknown>;
+    content: t.IntersectionC<[t.TypeC<{
+        text: t.StringC;
+    }>, t.PartialC<{
+        spans: t.Type<({
+            data?: unknown;
+        } & {
+            start: number;
+            end: number;
+            type: "image" | "label" | "paragraph" | "heading1" | "heading2" | "heading3" | "heading4" | "heading5" | "heading6" | "strong" | "em" | "preformatted" | "hyperlink" | "embed" | "list-item" | "o-list-item" | "rtl";
+        })[], ({
+            data?: unknown;
+        } & {
+            start: number;
+            end: number;
+            type: "image" | "label" | "paragraph" | "heading1" | "heading2" | "heading3" | "heading4" | "heading5" | "heading6" | "strong" | "em" | "preformatted" | "hyperlink" | "embed" | "list-item" | "o-list-item" | "rtl";
+        })[], unknown>;
+    }>]>;
+}>, t.PartialC<{
+    label: t.StringC;
+    direction: t.StringC;
+}>]>>;
 export declare const BlockLegacy: t.Type<({
     type: "image";
     data: {

package/lib/content/fields/nestable/RichTextContent/Blocks.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Block = exports.BlockLegacy = exports.TextBlock = exports.checkEmbedBlock = exports.EmbedBlock = exports.checkImageBlock = exports.ImageBlock = exports.ValidatedMetas = exports.Span = exports.Meta = void 0;
+exports.Block = exports.BlockLegacy = exports.TextBlockLegacy = exports.TextBlock = exports.checkEmbedBlock = exports.EmbedBlock = exports.checkImageBlock = exports.ImageBlock = exports.ValidatedMetas = exports.Span = exports.Meta = void 0;
 const tslib_1 = require("tslib");
 const fp_ts_1 = require("fp-ts");
 const Either_1 = require("fp-ts/lib/Either");
@@ -144,20 +144,20 @@ const TextBlockCodec = (linkCodec) => t.exact(t.intersection([
     }),
 ]));
 exports.TextBlock = TextBlockCodec(LinkContent_1.Link);
-const TextBlockLegacy = TextBlockCodec(LinkContent_1.LinkLegacy);
+exports.TextBlockLegacy = TextBlockCodec(LinkContent_1.LinkLegacy);
 const legacyBlockCodec = t.union([
     EmbedBlockLegacy,
     ImageBlockLegacy,
-    TextBlockLegacy,
+    exports.TextBlockLegacy,
 ]);
-exports.BlockLegacy = new t.Type("BlockLegacy", (u) => EmbedBlockLegacy.is(u) || ImageBlockLegacy.is(u) || TextBlockLegacy.is(u), (legacyBlock) => legacyBlockCodec.decode(legacyBlock), (block) => {
+exports.BlockLegacy = new t.Type("BlockLegacy", (u) => EmbedBlockLegacy.is(u) || ImageBlockLegacy.is(u) || exports.TextBlockLegacy.is(u), (legacyBlock) => legacyBlockCodec.decode(legacyBlock), (block) => {
     return (() => {
         if (exports.ImageBlock.is(block))
             return ImageBlockLegacy.encode(block);
         else if (exports.EmbedBlock.is(block))
             return EmbedBlockLegacy.encode(block);
         else
-            return TextBlockLegacy.encode(block);
+            return exports.TextBlockLegacy.encode(block);
     })();
 });
 exports.Block = t.union([exports.ImageBlock, exports.EmbedBlock, exports.TextBlock]);

package/lib/import/converters/fields/nestable/GeoPoint.d.ts

@@ -0,0 +1,3 @@
+import type { GeoPointContent } from "../../../../content";
+import type { ImportGeoPoint } from "../../../validators";
+export declare const geopointConverter: (field: ImportGeoPoint["value"]) => GeoPointContent | undefined;

package/lib/import/converters/fields/nestable/GeoPoint.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.geopointConverter = void 0;
+const geopointConverter = (field) => {
+    if (field === null)
+        return;
+    return {
+        position: {
+            lat: field.latitude,
+            lng: field.longitude,
+        },
+        __TYPE__: "GeoPointContent",
+    };
+};
+exports.geopointConverter = geopointConverter;

package/lib/import/converters/fields/nestable/Image.d.ts

@@ -1,6 +1,6 @@
 import type { Asset } from "../../../../common";
 import type { ImageContent, ImageContentView } from "../../../../content";
-import type { ImportImage } from "../../../validators";
+import type { ImageField, ImportImage } from "../../../validators";
 import type { ImportImageBlock } from "../../../validators/fields/nestable/ImportRichText/blocks";
-export declare const imageBlockConverter: (imageBlock: ImportImageBlock, assets: Record<Asset["id"], Asset | undefined>) => ImageContentView;
+export declare function convertImageView<Input extends ImageField | ImportImageBlock>(inputImage: Input, image: Asset): ImageContentView;
 export declare const imageConverter: (imageField: ImportImage["value"], assets: Record<Asset["id"], Asset | undefined>) => ImageContent | undefined;

package/lib/import/converters/fields/nestable/Image.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.imageConverter = exports.imageBlockConverter = void 0;
+exports.imageConverter = exports.convertImageView = void 0;
 const common_1 = require("../../../../common");
 const Objects_1 = require("../../../../utils/Objects");
-function convertImage(inputImage, image) {
+function convertImageView(inputImage, image) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     // We can do that because anyway all properties being read
     const imageField = {
@@ -45,25 +45,22 @@ function convertImage(inputImage, image) {
         ["credits", (imageField === null || imageField === void 0 ? void 0 : imageField.copyright) || image.credits],
     ]);
 }
+exports.convertImageView = convertImageView;
 function convertThumbnails(imageField, assets) {
     return Object.entries(imageField.thumbnails).reduce((acc, [thumbnailName, thumbnail]) => {
         return {
             ...acc,
-            [thumbnailName]: convertImage(thumbnail, (0, common_1.getAssetOrThrow)(assets)(thumbnail.id)),
+            [thumbnailName]: convertImageView(thumbnail, (0, common_1.getAssetOrThrow)(assets)(thumbnail.id)),
         };
     }, {});
 }
-const imageBlockConverter = (imageBlock, assets) => {
-    return convertImage(imageBlock, (0, common_1.getAssetOrThrow)(assets)(imageBlock.id));
-};
-exports.imageBlockConverter = imageBlockConverter;
 // All assets from `imageField` must be present in `assets`
 // If not then function will throw an error
 const imageConverter = (imageField, assets) => {
     if (!imageField)
         return;
     return {
-        ...convertImage(imageField, (0, common_1.getAssetOrThrow)(assets)(imageField.id)),
+        ...convertImageView(imageField, (0, common_1.getAssetOrThrow)(assets)(imageField.id)),
         thumbnails: convertThumbnails(imageField, assets),
         __TYPE__: "ImageContent",
     };

package/lib/import/converters/fields/nestable/RichText/embedBlock.d.ts

@@ -0,0 +1,4 @@
+import type { Embed } from "../../../../../common";
+import type { EmbedBlock } from "../../../../../content";
+import type { ImportEmbedBlock } from "../../../../validators/fields/nestable/ImportRichText/blocks";
+export declare function embedBlockConverter(block: ImportEmbedBlock, embeds: Record<string, Embed | undefined>): EmbedBlock;

package/lib/import/converters/fields/nestable/RichText/embedBlock.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.embedBlockConverter = void 0;
+const Embed_1 = require("../Embed");
+function embedBlockConverter(block, embeds) {
+    const embedData = (0, Embed_1.embedConverter)(block.oembed, embeds);
+    if (!embedData)
+        throw new Error("Failed to convert embed data");
+    return {
+        type: block.type,
+        data: embedData,
+    };
+}
+exports.embedBlockConverter = embedBlockConverter;

package/lib/import/converters/fields/nestable/RichText/imageBlock.d.ts

@@ -0,0 +1,4 @@
+import { Asset } from "../../../../../common";
+import type { ImageBlock } from "../../../../../content";
+import type { ImportImageBlock } from "../../../../validators/fields/nestable/ImportRichText/blocks";
+export declare function imageBlockConverter(block: ImportImageBlock, assets: Record<Asset["id"], Asset | undefined>): ImageBlock;

package/lib/import/converters/fields/nestable/RichText/imageBlock.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.imageBlockConverter = void 0;
+const common_1 = require("../../../../../common");
+const Image_1 = require("../Image");
+function imageBlockConverter(block, assets) {
+    return {
+        type: block.type,
+        data: (0, Image_1.convertImageView)(block, (0, common_1.getAssetOrThrow)(assets)(block.id)),
+    };
+}
+exports.imageBlockConverter = imageBlockConverter;

package/lib/import/converters/fields/nestable/RichText/index.d.ts

@@ -0,0 +1,4 @@
+import type { Asset, Embed } from "../../../../../common";
+import type { RichTextContent } from "../../../../../content";
+import type { ImportRichText } from "../../../../validators";
+export declare const richTextConverter: (richTextField: ImportRichText["value"], assets: Record<Asset["id"], Asset | undefined>, embeds: Record<string, Embed | undefined>) => RichTextContent | undefined;

package/lib/import/converters/fields/nestable/RichText/index.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.richTextConverter = void 0;
+const content_1 = require("../../../../../content");
+const embedBlock_1 = require("./embedBlock");
+const imageBlock_1 = require("./imageBlock");
+const textBlock_1 = require("./textBlock");
+const richTextConverter = (richTextField, assets, embeds) => {
+    if (richTextField === null)
+        return;
+    return {
+        __TYPE__: content_1.RichTextContentType,
+        value: richTextField.map((block) => {
+            if (block.type === "image")
+                return (0, imageBlock_1.imageBlockConverter)(block, assets);
+            else if (block.type === "embed")
+                return (0, embedBlock_1.embedBlockConverter)(block, embeds);
+            return (0, textBlock_1.textBlockConverter)(block, assets);
+        }),
+    };
+};
+exports.richTextConverter = richTextConverter;

package/lib/import/converters/fields/nestable/RichText/textBlock.d.ts

@@ -0,0 +1,4 @@
+import type { Asset } from "../../../../../common";
+import type { TextBlock } from "../../../../../content";
+import type { ImportTextBlock } from "../../../../validators/fields/nestable/ImportRichText/blocks";
+export declare function textBlockConverter(block: ImportTextBlock, assets: Record<Asset["id"], Asset | undefined>): TextBlock;

package/lib/import/converters/fields/nestable/RichText/textBlock.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.textBlockConverter = void 0;
+const Link_1 = require("../Link");
+function textBlockConverter(block, assets) {
+    return {
+        type: block.type,
+        content: {
+            text: block.text,
+            ...block.spans ? { spans: spansConverter(block.spans, assets) } : {}
+        },
+        ...block.direction ? { direction: block.direction } : {},
+    };
+}
+exports.textBlockConverter = textBlockConverter;
+function spansConverter(spans, assets) {
+    return spans.map(span => {
+        var _a;
+        return {
+            type: span.type,
+            start: span.start,
+            end: span.end,
+            // Text blocks in Content format have for data the Link type and not the whole LinkContent object
+            ...span.type === "hyperlink" ? { data: (_a = (0, Link_1.linkConverter)(span.data, assets)) === null || _a === void 0 ? void 0 : _a.value } : {}
+        };
+    });
+}

package/lib/import/converters/fields/nestable/index.d.ts

@@ -2,7 +2,7 @@ export * from "./Boolean";
 export * from "./Color";
 export * from "./Date";
 export * from "./Embed";
-export * from "./GeooPoint";
+export * from "./GeoPoint";
 export * from "./Image";
 export * from "./Link";
 export * from "./Nestable";

package/lib/import/converters/fields/nestable/index.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 (0, tslib_1.__exportStar)(require("./Color"), exports);
 (0, tslib_1.__exportStar)(require("./Date"), exports);
 (0, tslib_1.__exportStar)(require("./Embed"), exports);
-(0, tslib_1.__exportStar)(require("./GeooPoint"), exports);
+(0, tslib_1.__exportStar)(require("./GeoPoint"), exports);
 (0, tslib_1.__exportStar)(require("./Image"), exports);
 (0, tslib_1.__exportStar)(require("./Link"), exports);
 (0, tslib_1.__exportStar)(require("./Nestable"), exports);

package/package.json

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

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

@@ -198,7 +198,7 @@ const TextBlockCodec = (linkCodec: LinkCodec) =>
 export const TextBlock = TextBlockCodec(Link)
 export type TextBlock = t.TypeOf<typeof TextBlock>
 
-const TextBlockLegacy = TextBlockCodec(LinkLegacy)
+export const TextBlockLegacy = TextBlockCodec(LinkLegacy)
 type TextBlockLegacy = t.TypeOf<typeof TextBlockLegacy>
 
 const legacyBlockCodec = t.union([

package/src/import/converters/fields/nestable/Image.ts

@@ -3,12 +3,12 @@ import { getAssetOrThrow } from "../../../../common"
 import type { ImageContent, ImageContentView } from "../../../../content"
 import { withOptionals } from "../../../../utils/Objects"
 import type { ImageField, ImportImage } from "../../../validators"
-import type { ImportImageBlock } from "../../../validators/fields/nestable/ImportRichText/blocks"
+import type { ImportImageBlock } from "../../../validators/fields/nestable/ImportRichText/blocks";
 
-function convertImage<Input extends ImageField | ImportImageBlock>(
+export function convertImageView<Input extends ImageField | ImportImageBlock>(
 	inputImage: Input,
 	image: Asset,
-) {
+): ImageContentView {
 	// We can do that because anyway all properties being read
 	const imageField: ImageField = {
 		...inputImage,
@@ -64,7 +64,7 @@ function convertThumbnails(
 		(acc, [thumbnailName, thumbnail]) => {
 			return {
 				...acc,
-				[thumbnailName]: convertImage(
+				[thumbnailName]: convertImageView(
 					thumbnail,
 					getAssetOrThrow(assets)(thumbnail.id),
 				),
@@ -74,16 +74,6 @@ function convertThumbnails(
 	)
 }
 
-export const imageBlockConverter = (
-	imageBlock: ImportImageBlock,
-	assets: Record<Asset["id"], Asset | undefined>,
-): ImageContentView => {
-	return convertImage<ImportImageBlock>(
-		imageBlock,
-		getAssetOrThrow(assets)(imageBlock.id),
-	)
-}
-
 // All assets from `imageField` must be present in `assets`
 // If not then function will throw an error
 export const imageConverter = (
@@ -93,7 +83,7 @@ export const imageConverter = (
 	if (!imageField) return
 
 	return {
-		...convertImage<ImageField>(
+		...convertImageView<ImageField>(
 			imageField,
 			getAssetOrThrow(assets)(imageField.id),
 		),

package/src/import/converters/fields/nestable/RichText/embedBlock.ts

@@ -0,0 +1,14 @@
+import type { Embed } from "../../../../../common"
+import type { EmbedBlock } from "../../../../../content";
+import type { ImportEmbedBlock } from "../../../../validators/fields/nestable/ImportRichText/blocks";
+import { embedConverter } from "../Embed";
+
+export function embedBlockConverter(block: ImportEmbedBlock, 	embeds: Record<string, Embed | undefined>): EmbedBlock {
+  const embedData = embedConverter(block.oembed, embeds)
+  
+  if (!embedData) throw new Error("Failed to convert embed data")
+  return {
+    type: block.type,
+    data: embedData,
+  }
+}

package/src/import/converters/fields/nestable/RichText/imageBlock.ts

@@ -0,0 +1,14 @@
+import { Asset, getAssetOrThrow } from "../../../../../common";
+import type { ImageBlock } from "../../../../../content";
+import type { ImportImageBlock } from "../../../../validators/fields/nestable/ImportRichText/blocks";
+import { convertImageView } from "../Image";
+
+export function imageBlockConverter(block: ImportImageBlock, 	assets: Record<Asset["id"], Asset | undefined>): ImageBlock {
+  return {
+    type: block.type,
+    data: convertImageView<ImportImageBlock>(
+      block,
+      getAssetOrThrow(assets)(block.id)
+    ),
+  }
+}

package/src/import/converters/fields/nestable/RichText/index.ts

@@ -0,0 +1,23 @@
+import type { Asset, Embed } from "../../../../../common"
+import type { RichTextContent } from "../../../../../content"
+import { RichTextContentType } from "../../../../../content"
+import type { ImportRichText } from "../../../../validators"
+import { embedBlockConverter } from "./embedBlock"
+import { imageBlockConverter } from "./imageBlock"
+import { textBlockConverter } from "./textBlock"
+
+export const richTextConverter = (
+	richTextField: ImportRichText["value"],
+	assets: Record<Asset["id"], Asset | undefined>,
+	embeds: Record<string, Embed | undefined>,
+): RichTextContent | undefined => {
+	if (richTextField === null) return
+	return {
+		__TYPE__: RichTextContentType,
+		value: richTextField.map((block) => {
+      if (block.type === "image") return imageBlockConverter(block, assets)
+      else if (block.type === "embed") return embedBlockConverter(block, embeds)
+	    return textBlockConverter(block, assets)
+    }),
+	}
+}

package/src/import/converters/fields/nestable/RichText/textBlock.ts

@@ -0,0 +1,27 @@
+import type { Asset } from "../../../../../common"
+import type { TextBlock } from "../../../../../content"
+import type { ImportTextBlock } from "../../../../validators/fields/nestable/ImportRichText/blocks"
+import { linkConverter } from "../Link"
+
+export function textBlockConverter(block: ImportTextBlock, assets: Record<Asset["id"], Asset | undefined>): TextBlock {
+  return {
+    type: block.type,
+    content: {
+      text: block.text,
+      ...block.spans ? { spans: spansConverter(block.spans, assets) }: {}
+    },
+    ...block.direction ? { direction: block.direction } : {},
+  }
+}
+
+function spansConverter(spans: NonNullable<ImportTextBlock['spans']>, assets: Record<Asset["id"], Asset | undefined>): TextBlock['content']['spans'] {
+  return spans.map(span => {
+    return {
+      type: span.type,
+      start: span.start,
+      end: span.end,
+      // Text blocks in Content format have for data the Link type and not the whole LinkContent object
+      ...span.type === "hyperlink" ? { data: linkConverter(span.data, assets)?.value } : {}
+    }
+  })
+}

package/src/import/converters/fields/nestable/index.ts

@@ -2,7 +2,7 @@ export * from "./Boolean"
 export * from "./Color"
 export * from "./Date"
 export * from "./Embed"
-export * from "./GeooPoint"
+export * from "./GeoPoint"
 export * from "./Image"
 export * from "./Link"
 export * from "./Nestable"

package/src/import/converters/fields/nestable/RichText.ts

@@ -1,62 +0,0 @@
-import type { Asset, Embed } from "../../../../common"
-import type { Block, RichTextContent } from "../../../../content"
-import { RichTextContentType } from "../../../../content"
-import type { ImportBlock, ImportRichText } from "../../../validators"
-import { embedConverter } from "./Embed"
-import { imageBlockConverter } from "./Image"
-import { linkConverter } from "./Link"
-
-const richTextBlockConverter = (
-	importBlock: ImportBlock,
-	assets: Record<Asset["id"], Asset | undefined>,
-	embeds: Record<string, Embed | undefined>,
-): Block => {
-	if (importBlock.type === "image") {
-		return {
-			type: importBlock.type,
-			data: imageBlockConverter(importBlock, assets),
-		}
-	} else if (importBlock.type === "embed") {
-		const embedData = embedConverter(importBlock.oembed, embeds)
-		if (!embedData) throw new Error("Failed to convert embed data")
-		return {
-			type: importBlock.type,
-			data: embedData,
-		}
-	} else {
-		// Text block
-		return {
-			type: importBlock.type,
-			direction: importBlock.direction ?? "ltr",
-			content: {
-				text: importBlock.text,
-				spans:
-					importBlock.spans?.map((span) => {
-						const linkData =
-							span.type === "hyperlink"
-								? linkConverter(span.data, assets)
-								: undefined
-						return {
-							type: span.type,
-							start: span.start,
-							end: span.end,
-							data: linkData,
-						}
-					}) ?? [],
-			},
-		}
-	}
-}
-export const richTextConverter = (
-	richTextField: ImportRichText["value"],
-	assets: Record<Asset["id"], Asset | undefined>,
-	embeds: Record<string, Embed | undefined>,
-): RichTextContent | undefined => {
-	if (richTextField === null) return
-	return {
-		__TYPE__: RichTextContentType,
-		value: richTextField.map((block) =>
-			richTextBlockConverter(block, assets, embeds),
-		),
-	}
-}