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

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

@@ -22,20 +22,33 @@ function textBlockConverter(block, assets) {
 }
 exports.textBlockConverter = textBlockConverter;
 function spansConverter(spans, assets) {
-    return spans.map((span) => {
-        return {
-            type: span.type,
-            start: span.start,
-            end: span.end,
-            ...(() => {
-                if (span.type === "hyperlink") {
-                    const convertedLinkContent = (0, Link_1.linkConverter)(span.data, assets);
-                    if (!convertedLinkContent)
-                        return {};
-                    return { data: convertedLinkContent === null || convertedLinkContent === void 0 ? void 0 : convertedLinkContent.value };
-                }
-                return {};
-            })(),
-        };
-    });
+    return spans.reduce((acc, span) => {
+        switch (span.type) {
+            case "em":
+            case "strong":
+                return [...acc, span];
+            case "label":
+                return [
+                    ...acc,
+                    {
+                        ...span,
+                        data: span.data.label,
+                    },
+                ];
+            case "hyperlink": {
+                const convertedLink = (0, Link_1.linkConverter)(span.data, assets);
+                if (!convertedLink)
+                    return acc;
+                return [
+                    ...acc,
+                    {
+                        type: span.type,
+                        start: span.start,
+                        end: span.end,
+                        data: convertedLink.value,
+                    },
+                ];
+            }
+        }
+    }, []);
 }

package/lib/import/validators/fields/nestable/ImportRichText/blocks/ImportTextBlock.d.ts

@@ -58,7 +58,15 @@ export declare const ImportTextBlock: t.ExactC<t.IntersectionC<[t.TypeC<{
             id: string;
         };
     }) | ({
-        type: "label" | "strong" | "em";
+        type: "strong" | "em";
+    } & {
+        start: number;
+        end: number;
+    }) | ({
+        type: "label";
+        data: {
+            label: string;
+        };
     } & {
         start: number;
         end: number;

package/lib/import/validators/fields/nestable/ImportRichText/blocks/Span.d.ts

@@ -2,8 +2,7 @@ import * as t from "io-ts";
 declare const SpanType: t.UnionC<[t.LiteralC<"hyperlink">, t.KeyofC<{
     strong: null;
     em: null;
-    label: null;
-}>]>;
+}>, t.LiteralC<"label">]>;
 export declare type SpanType = t.TypeOf<typeof SpanType>;
 declare const SpanShape: t.UnionC<[t.ExactC<t.IntersectionC<[t.TypeC<{
     type: t.LiteralC<"hyperlink">;
@@ -29,11 +28,18 @@ declare const SpanShape: t.UnionC<[t.ExactC<t.IntersectionC<[t.TypeC<{
     type: t.KeyofC<{
         strong: null;
         em: null;
-        label: null;
     }>;
 }>, t.TypeC<{
     start: t.NumberC;
     end: t.NumberC;
+}>]>>, t.ExactC<t.IntersectionC<[t.TypeC<{
+    type: t.LiteralC<"label">;
+    data: t.ExactC<t.TypeC<{
+        label: t.StringC;
+    }>>;
+}>, t.TypeC<{
+    start: t.NumberC;
+    end: t.NumberC;
 }>]>>]>;
 export declare type Span = t.TypeOf<typeof SpanShape>;
 export declare const Span: t.Type<({
@@ -55,7 +61,15 @@ export declare const Span: t.Type<({
         id: string;
     };
 }) | ({
-    type: "label" | "strong" | "em";
+    type: "strong" | "em";
+} & {
+    start: number;
+    end: number;
+}) | ({
+    type: "label";
+    data: {
+        label: string;
+    };
 } & {
     start: number;
     end: number;

package/lib/import/validators/fields/nestable/ImportRichText/blocks/Span.js

@@ -5,15 +5,22 @@ const tslib_1 = require("tslib");
 const t = (0, tslib_1.__importStar)(require("io-ts"));
 const function_1 = require("../../../../../../validators/function");
 const spans_1 = require("./spans");
-const SpanType = (0, function_1.withCustomError)(t.union([spans_1.HyperlinkSpanType, spans_1.TextSpanType]), () => `Span 'type' field must be specified and have one of the following values: ${Object.keys(spans_1.TextSpanType.keys).join(", ")} or ${spans_1.HyperlinkSpanType.value}`);
+const LabelSpan_1 = require("./spans/LabelSpan");
+const SpanType = (0, function_1.withCustomError)(t.union([spans_1.HyperlinkSpanType, spans_1.TextSpanType, LabelSpan_1.LabelSpanType]), () => `Span 'type' field must be specified and have one of the following values: ${[
+    ...Object.keys(spans_1.TextSpanType.keys),
+    LabelSpan_1.LabelSpanType.value,
+].join(", ")} or ${spans_1.HyperlinkSpanType.value}`);
 const SpanTypeValidator = (0, function_1.withCustomError)(t.type({
     type: SpanType,
 }), () => "Span must be an object");
-const SpanShape = t.union([spans_1.HyperlinkSpan, spans_1.TextSpan]);
+const SpanShape = t.union([spans_1.HyperlinkSpan, spans_1.TextSpan, LabelSpan_1.LabelSpan]);
 exports.Span = SpanTypeValidator.pipe(new t.Type("Span", (u) => SpanShape.is(u), (u, c) => {
     if (spans_1.HyperlinkSpanType.is(u.type)) {
         return spans_1.HyperlinkSpan.validate(u, c);
     }
+    else if (LabelSpan_1.LabelSpanType.is(u.type)) {
+        return LabelSpan_1.LabelSpan.validate(u, c);
+    }
     else {
         return spans_1.TextSpan.validate(u, c);
     }

package/lib/import/validators/fields/nestable/ImportRichText/blocks/spans/LabelSpan.d.ts

@@ -0,0 +1,12 @@
+import * as t from "io-ts";
+export declare const LabelSpanType: t.LiteralC<"label">;
+export declare const LabelSpan: t.ExactC<t.IntersectionC<[t.TypeC<{
+    type: t.LiteralC<"label">;
+    data: t.ExactC<t.TypeC<{
+        label: t.StringC;
+    }>>;
+}>, t.TypeC<{
+    start: t.NumberC;
+    end: t.NumberC;
+}>]>>;
+export declare type LabelSpan = t.TypeOf<typeof LabelSpan>;

package/lib/import/validators/fields/nestable/ImportRichText/blocks/spans/LabelSpan.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LabelSpan = exports.LabelSpanType = void 0;
+const tslib_1 = require("tslib");
+const t = (0, tslib_1.__importStar)(require("io-ts"));
+const SpanLocation_1 = require("./SpanLocation");
+exports.LabelSpanType = t.literal("label");
+exports.LabelSpan = t.exact(t.intersection([
+    t.type({
+        type: exports.LabelSpanType,
+        data: t.strict({
+            label: t.string,
+        }),
+    }),
+    SpanLocation_1.SpanLocation,
+]));

package/lib/import/validators/fields/nestable/ImportRichText/blocks/spans/TextSpan.d.ts

@@ -2,13 +2,11 @@ import * as t from "io-ts";
 export declare const TextSpanType: t.KeyofC<{
     strong: null;
     em: null;
-    label: null;
 }>;
 export declare const TextSpan: t.ExactC<t.IntersectionC<[t.TypeC<{
     type: t.KeyofC<{
         strong: null;
         em: null;
-        label: null;
     }>;
 }>, t.TypeC<{
     start: t.NumberC;

package/lib/import/validators/fields/nestable/ImportRichText/blocks/spans/TextSpan.js

@@ -7,12 +7,10 @@ const SpanLocation_1 = require("./SpanLocation");
 const TextSpanTypes = {
     Strong: "strong",
     Em: "em",
-    Label: "label",
 };
 exports.TextSpanType = t.keyof({
     [TextSpanTypes.Strong]: null,
     [TextSpanTypes.Em]: null,
-    [TextSpanTypes.Label]: null,
 });
 exports.TextSpan = t.exact(t.intersection([
     t.type({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@prismicio/types-internal",
-	"version": "2.2.0-traverse.alpha-9",
+	"version": "2.2.0-traverse.alpha-11",
 	"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,34 @@ 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 basicSpan = t.strict({
+	start: t.number,
+	end: t.number,
+	type: t.keyof({
+		[RichTextNodeType.strong]: null,
+		[RichTextNodeType.em]: null,
+	}),
+})
 
-export const Span = SpanFn(Link)
+export const Span = t.union([linkSpan(Link), labelSpan, basicSpan])
 export type Span = t.TypeOf<typeof Span>
 
-export const SpanLegacy = SpanFn(LinkLegacy)
+export const SpanLegacy = t.union([linkSpan(LinkLegacy), labelSpan, basicSpan])
 export type SpanLegacy = t.TypeOf<typeof SpanLegacy>
 
 export const ValidatedSpans = <C extends typeof Span | typeof SpanLegacy>(
@@ -56,13 +63,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)
@@ -71,7 +71,8 @@ export const ValidatedSpans = <C extends typeof Span | typeof SpanLegacy>(
 		},
 		(m) => {
 			return m.reduce<Array<S>>((acc, meta) => {
-				return [...acc, spanCodec.encode(meta)]
+				const encoded = <S>spanCodec.encode(meta)
+				return [...acc, encoded]
 			}, [])
 		},
 	)

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

@@ -1,5 +1,5 @@
 import type { Asset } from "../../../../../common"
-import type { TextBlock } from "../../../../../content"
+import type { Span, TextBlock } from "../../../../../content"
 import type { ImportTextBlock } from "../../../../validators/fields/nestable/ImportRichText/blocks"
 import { linkConverter } from "../Link"
 
@@ -28,21 +28,35 @@ export function textBlockConverter(
 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,
-			...(() => {
-				if (span.type === "hyperlink") {
-					const convertedLinkContent = linkConverter(span.data, assets)
-					if (!convertedLinkContent) return {}
+): Span[] {
+	return spans.reduce<Span[]>((acc, span) => {
+		switch (span.type) {
+			case "em":
+			case "strong":
+				return [...acc, span]
+			case "label":
+				return [
+					...acc,
+					{
+						...span,
+						data: span.data.label,
+					},
+				]
 
-					return { data: convertedLinkContent?.value }
-				}
-				return {}
-			})(),
+			case "hyperlink": {
+				const convertedLink = linkConverter(span.data, assets)
+				if (!convertedLink) return acc
+
+				return [
+					...acc,
+					{
+						type: span.type,
+						start: span.start,
+						end: span.end,
+						data: convertedLink.value,
+					},
+				]
+			}
 		}
-	})
+	}, [])
 }

package/src/import/validators/fields/nestable/ImportRichText/blocks/Span.ts

@@ -7,13 +7,15 @@ import {
 	TextSpan,
 	TextSpanType,
 } from "./spans"
+import { LabelSpan, LabelSpanType } from "./spans/LabelSpan"
 
 const SpanType = withCustomError(
-	t.union([HyperlinkSpanType, TextSpanType]),
+	t.union([HyperlinkSpanType, TextSpanType, LabelSpanType]),
 	() =>
-		`Span 'type' field must be specified and have one of the following values: ${Object.keys(
-			TextSpanType.keys,
-		).join(", ")} or ${HyperlinkSpanType.value}`,
+		`Span 'type' field must be specified and have one of the following values: ${[
+			...Object.keys(TextSpanType.keys),
+			LabelSpanType.value,
+		].join(", ")} or ${HyperlinkSpanType.value}`,
 )
 export type SpanType = t.TypeOf<typeof SpanType>
 
@@ -24,7 +26,7 @@ const SpanTypeValidator = withCustomError(
 	() => "Span must be an object",
 )
 
-const SpanShape = t.union([HyperlinkSpan, TextSpan])
+const SpanShape = t.union([HyperlinkSpan, TextSpan, LabelSpan])
 
 export type Span = t.TypeOf<typeof SpanShape>
 
@@ -35,6 +37,8 @@ export const Span = SpanTypeValidator.pipe(
 		(u, c) => {
 			if (HyperlinkSpanType.is(u.type)) {
 				return HyperlinkSpan.validate(u, c)
+			} else if (LabelSpanType.is(u.type)) {
+				return LabelSpan.validate(u, c)
 			} else {
 				return TextSpan.validate(u, c)
 			}

package/src/import/validators/fields/nestable/ImportRichText/blocks/spans/LabelSpan.ts

@@ -0,0 +1,19 @@
+import * as t from "io-ts"
+
+import { SpanLocation } from "./SpanLocation"
+
+export const LabelSpanType = t.literal("label")
+
+export const LabelSpan = t.exact(
+	t.intersection([
+		t.type({
+			type: LabelSpanType,
+			data: t.strict({
+				label: t.string,
+			}),
+		}),
+		SpanLocation,
+	]),
+)
+
+export type LabelSpan = t.TypeOf<typeof LabelSpan>

package/src/import/validators/fields/nestable/ImportRichText/blocks/spans/TextSpan.ts

@@ -5,13 +5,11 @@ import { SpanLocation } from "./SpanLocation"
 const TextSpanTypes = {
 	Strong: "strong",
 	Em: "em",
-	Label: "label",
 } as const
 
 export const TextSpanType = t.keyof({
 	[TextSpanTypes.Strong]: null,
 	[TextSpanTypes.Em]: null,
-	[TextSpanTypes.Label]: null,
 })
 
 export const TextSpan = t.exact(

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;