@prismicio/types-internal 2.2.0-traverse.alpha-9 → 2.2.0-traverse.alpha-10

package/package.json

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

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

@@ -2,6 +2,7 @@ import { either } from "fp-ts"
 import { isLeft } from "fp-ts/lib/Either"
 import { pipe } from "fp-ts/lib/function"
 import * as t from "io-ts"
+import { withFallback } from "io-ts-types"
 
 import {
 	RichTextNodeType,
@@ -18,28 +19,39 @@ import {
 import { ImageContentView } from "../ImageContent"
 import { Link, LinkLegacy } from "../LinkContent"
 
-const labelCodec = t.strict({
-	label: t.string,
+const linkSpan = (linkCodec: typeof Link | typeof LinkLegacy) =>
+	t.strict({
+		data: linkCodec,
+		start: t.number,
+		end: t.number,
+		type: t.literal(RichTextNodeType.hyperlink),
+	})
+
+const labelSpan = t.strict({
+	data: withFallback(t.string, ""),
+	start: t.number,
+	end: t.number,
+	type: t.literal("label"),
 })
 
-const SpanFn = (linkCodec: typeof Link | typeof LinkLegacy) =>
-	t.exact(
-		t.intersection([
-			t.partial({
-				data: t.union([linkCodec, labelCodec]),
-			}),
-			t.type({
-				start: t.number,
-				end: t.number,
-				type: t.union([RichTextNodeTypeCodec, t.literal("label")]),
-			}),
-		]),
-	)
+const span = t.strict({
+	start: t.number,
+	end: t.number,
+	type: t.keyof(
+		Object.entries(RichTextNodeType).reduce<Record<string, null>>(
+			(acc, [, name]) => {
+				if (name === RichTextNodeType.hyperlink) return acc
+				return { ...acc, [name]: null }
+			},
+			{},
+		),
+	),
+})
 
-export const Span = SpanFn(Link)
+export const Span = t.union([linkSpan(Link), labelSpan, span])
 export type Span = t.TypeOf<typeof Span>
 
-export const SpanLegacy = SpanFn(LinkLegacy)
+export const SpanLegacy = t.union([linkSpan(LinkLegacy), labelSpan, span])
 export type SpanLegacy = t.TypeOf<typeof SpanLegacy>
 
 export const ValidatedSpans = <C extends typeof Span | typeof SpanLegacy>(
@@ -56,13 +68,6 @@ export const ValidatedSpans = <C extends typeof Span | typeof SpanLegacy>(
 					.reduce<Array<S>>((acc, maybeSpan) => {
 						const decodedSpan = spanCodec.decode(maybeSpan)
 						if (isLeft(decodedSpan)) return acc
-						if (
-							(decodedSpan.right.type === "hyperlink" ||
-								decodedSpan.right.type === "label") &&
-							!decodedSpan.right.data
-						)
-							return acc
-
 						return [...acc, decodedSpan.right]
 					}, [])
 					.sort((m1: S, m2: S) => m1.start - m2.start)

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

@@ -1,3 +0,0 @@
-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/GeooPoint.js

@@ -1,15 +0,0 @@
-"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/RichText.d.ts

@@ -1,4 +0,0 @@
-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.js

@@ -1,55 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.richTextConverter = void 0;
-const content_1 = require("../../../../content");
-const Embed_1 = require("./Embed");
-const Image_1 = require("./Image");
-const Link_1 = require("./Link");
-const richTextBlockConverter = (importBlock, assets, embeds) => {
-    var _a, _b, _c;
-    if (importBlock.type === "image") {
-        return {
-            type: importBlock.type,
-            data: (0, Image_1.imageBlockConverter)(importBlock, assets),
-        };
-    }
-    else if (importBlock.type === "embed") {
-        const embedData = (0, Embed_1.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: (_a = importBlock.direction) !== null && _a !== void 0 ? _a : "ltr",
-            content: {
-                text: importBlock.text,
-                spans: (_c = (_b = importBlock.spans) === null || _b === void 0 ? void 0 : _b.map((span) => {
-                    const linkData = span.type === "hyperlink"
-                        ? (0, Link_1.linkConverter)(span.data, assets)
-                        : undefined;
-                    return {
-                        type: span.type,
-                        start: span.start,
-                        end: span.end,
-                        data: linkData,
-                    };
-                })) !== null && _c !== void 0 ? _c : [],
-            },
-        };
-    }
-};
-const richTextConverter = (richTextField, assets, embeds) => {
-    if (richTextField === null)
-        return;
-    return {
-        __TYPE__: content_1.RichTextContentType,
-        value: richTextField.map((block) => richTextBlockConverter(block, assets, embeds)),
-    };
-};
-exports.richTextConverter = richTextConverter;