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

package/lib/content/fields/nestable/NestableContent.d.ts

@@ -281,7 +281,7 @@ export declare const NestableContent: t.UnionC<[t.ExactC<t.TypeC<{
             text: t.StringC;
         }>, t.PartialC<{
             spans: t.Type<({
-                data?: ({
+                data: ({
                     __TYPE__: "ImageLink";
                 } & {
                     id: string;
@@ -319,15 +319,21 @@ export declare const NestableContent: t.UnionC<[t.ExactC<t.TypeC<{
                     preview?: {
                         title?: string;
                     } | null | undefined;
-                }) | {
-                    label: string;
-                };
-            } & {
+                });
+                start: number;
+                end: number;
+                type: "hyperlink";
+            } | {
+                data: string;
+                start: number;
+                end: number;
+                type: "label";
+            } | {
                 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";
+                type: "strong" | "em";
             })[], ({
-                data?: ({
+                data: ({
                     __TYPE__: "ImageLink";
                 } & {
                     id: string;
@@ -365,13 +371,19 @@ export declare const NestableContent: t.UnionC<[t.ExactC<t.TypeC<{
                     preview?: {
                         title?: string;
                     } | null | undefined;
-                }) | {
-                    label: string;
-                };
-            } & {
+                });
+                start: number;
+                end: number;
+                type: "hyperlink";
+            } | {
+                data: string;
+                start: number;
+                end: number;
+                type: "label";
+            } | {
                 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";
+                type: "strong" | "em";
             })[], unknown>;
         }>]>;
     }>, t.PartialC<{
@@ -636,7 +648,7 @@ export declare const isNestableContent: (u: unknown) => u is {
             text: string;
         } & {
             spans?: ({
-                data?: ({
+                data: ({
                     __TYPE__: "ImageLink";
                 } & {
                     id: string;
@@ -674,13 +686,19 @@ export declare const isNestableContent: (u: unknown) => u is {
                     preview?: {
                         title?: string;
                     } | null | undefined;
-                }) | {
-                    label: string;
-                };
-            } & {
+                });
+                start: number;
+                end: number;
+                type: "hyperlink";
+            } | {
+                data: string;
+                start: number;
+                end: number;
+                type: "label";
+            } | {
                 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";
+                type: "strong" | "em";
             })[];
         };
     } & {
@@ -944,7 +962,7 @@ export declare const NestableLegacy: (ctx: LegacyContentCtx) => {
                 text: string;
             } & {
                 spans?: ({
-                    data?: ({
+                    data: ({
                         __TYPE__: "ImageLink";
                     } & {
                         id: string;
@@ -982,13 +1000,19 @@ export declare const NestableLegacy: (ctx: LegacyContentCtx) => {
                         preview?: {
                             title?: string;
                         } | null | undefined;
-                    }) | {
-                        label: string;
-                    };
-                } & {
+                    });
+                    start: number;
+                    end: number;
+                    type: "hyperlink";
+                } | {
+                    data: string;
+                    start: number;
+                    end: number;
+                    type: "label";
+                } | {
                     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";
+                    type: "strong" | "em";
                 })[];
             };
         } & {

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

@@ -1,6 +1,6 @@
 import * as t from "io-ts";
-export declare const Span: t.ExactC<t.IntersectionC<[t.PartialC<{
-    data: t.UnionC<[t.UnionC<[t.IntersectionC<[t.ExactC<t.TypeC<{
+export declare const Span: t.UnionC<[t.ExactC<t.TypeC<{
+    data: t.UnionC<[t.IntersectionC<[t.ExactC<t.TypeC<{
         __TYPE__: t.LiteralC<"ImageLink">;
     }>>, t.ExactC<t.IntersectionC<[t.TypeC<{
         id: t.StringC;
@@ -106,34 +106,26 @@ export declare const Span: t.ExactC<t.IntersectionC<[t.PartialC<{
         preview?: {
             title?: string;
         } | null | undefined;
-    }, unknown>]>, t.ExactC<t.TypeC<{
-        label: t.StringC;
-    }>>]>;
-}>, t.TypeC<{
+    }, unknown>]>;
+    start: t.NumberC;
+    end: t.NumberC;
+    type: t.LiteralC<"hyperlink">;
+}>>, t.ExactC<t.TypeC<{
+    data: t.StringC;
     start: t.NumberC;
     end: t.NumberC;
-    type: t.UnionC<[t.KeyofC<{
-        heading1: null;
-        heading2: null;
-        heading3: null;
-        heading4: null;
-        heading5: null;
-        heading6: null;
-        paragraph: null;
+    type: t.LiteralC<"label">;
+}>>, t.ExactC<t.TypeC<{
+    start: t.NumberC;
+    end: t.NumberC;
+    type: t.KeyofC<{
         strong: null;
         em: null;
-        preformatted: null;
-        hyperlink: null;
-        image: null;
-        embed: null;
-        "list-item": null;
-        "o-list-item": null;
-        rtl: null;
-    }>, t.LiteralC<"label">]>;
-}>]>>;
+    }>;
+}>>]>;
 export declare type Span = t.TypeOf<typeof Span>;
-export declare const SpanLegacy: t.ExactC<t.IntersectionC<[t.PartialC<{
-    data: t.UnionC<[t.UnionC<[t.IntersectionC<[t.ExactC<t.TypeC<{
+export declare const SpanLegacy: t.UnionC<[t.ExactC<t.TypeC<{
+    data: t.UnionC<[t.IntersectionC<[t.ExactC<t.TypeC<{
         __TYPE__: t.LiteralC<"ImageLink">;
     }>>, t.ExactC<t.IntersectionC<[t.TypeC<{
         id: t.StringC;
@@ -239,34 +231,26 @@ export declare const SpanLegacy: t.ExactC<t.IntersectionC<[t.PartialC<{
         preview?: {
             title?: string;
         } | null | undefined;
-    }, unknown>]>, t.ExactC<t.TypeC<{
-        label: t.StringC;
-    }>>]>;
-}>, t.TypeC<{
+    }, unknown>]>;
     start: t.NumberC;
     end: t.NumberC;
-    type: t.UnionC<[t.KeyofC<{
-        heading1: null;
-        heading2: null;
-        heading3: null;
-        heading4: null;
-        heading5: null;
-        heading6: null;
-        paragraph: null;
+    type: t.LiteralC<"hyperlink">;
+}>>, t.ExactC<t.TypeC<{
+    data: t.StringC;
+    start: t.NumberC;
+    end: t.NumberC;
+    type: t.LiteralC<"label">;
+}>>, t.ExactC<t.TypeC<{
+    start: t.NumberC;
+    end: t.NumberC;
+    type: t.KeyofC<{
         strong: null;
         em: null;
-        preformatted: null;
-        hyperlink: null;
-        image: null;
-        embed: null;
-        "list-item": null;
-        "o-list-item": null;
-        rtl: null;
-    }>, t.LiteralC<"label">]>;
-}>]>>;
+    }>;
+}>>]>;
 export declare type SpanLegacy = t.TypeOf<typeof SpanLegacy>;
-export declare const ValidatedSpans: <C extends t.ExactC<t.IntersectionC<[t.PartialC<{
-    data: t.UnionC<[t.UnionC<[t.IntersectionC<[t.ExactC<t.TypeC<{
+export declare const ValidatedSpans: <C extends t.UnionC<[t.ExactC<t.TypeC<{
+    data: t.UnionC<[t.IntersectionC<[t.ExactC<t.TypeC<{
         __TYPE__: t.LiteralC<"ImageLink">;
     }>>, t.ExactC<t.IntersectionC<[t.TypeC<{
         id: t.StringC;
@@ -372,31 +356,23 @@ export declare const ValidatedSpans: <C extends t.ExactC<t.IntersectionC<[t.Part
         preview?: {
             title?: string;
         } | null | undefined;
-    }, unknown>]>, t.ExactC<t.TypeC<{
-        label: t.StringC;
-    }>>]>;
-}>, t.TypeC<{
+    }, unknown>]>;
     start: t.NumberC;
     end: t.NumberC;
-    type: t.UnionC<[t.KeyofC<{
-        heading1: null;
-        heading2: null;
-        heading3: null;
-        heading4: null;
-        heading5: null;
-        heading6: null;
-        paragraph: null;
+    type: t.LiteralC<"hyperlink">;
+}>>, t.ExactC<t.TypeC<{
+    data: t.StringC;
+    start: t.NumberC;
+    end: t.NumberC;
+    type: t.LiteralC<"label">;
+}>>, t.ExactC<t.TypeC<{
+    start: t.NumberC;
+    end: t.NumberC;
+    type: t.KeyofC<{
         strong: null;
         em: null;
-        preformatted: null;
-        hyperlink: null;
-        image: null;
-        embed: null;
-        "list-item": null;
-        "o-list-item": null;
-        rtl: null;
-    }>, t.LiteralC<"label">]>;
-}>]>>>(spanCodec: C) => t.Type<t.TypeOf<C>[], t.TypeOf<C>[], unknown>;
+    }>;
+}>>]>>(spanCodec: C) => t.Type<t.TypeOf<C>[], t.TypeOf<C>[], unknown>;
 export declare const ImageBlock: t.ExactC<t.IntersectionC<[t.TypeC<{
     type: t.LiteralC<"image">;
     data: t.IntersectionC<[t.ExactC<t.IntersectionC<[t.TypeC<{
@@ -529,7 +505,7 @@ export declare const TextBlock: t.ExactC<t.IntersectionC<[t.TypeC<{
         text: t.StringC;
     }>, t.PartialC<{
         spans: t.Type<({
-            data?: ({
+            data: ({
                 __TYPE__: "ImageLink";
             } & {
                 id: string;
@@ -567,15 +543,21 @@ export declare const TextBlock: t.ExactC<t.IntersectionC<[t.TypeC<{
                 preview?: {
                     title?: string;
                 } | null | undefined;
-            }) | {
-                label: string;
-            };
-        } & {
+            });
+            start: number;
+            end: number;
+            type: "hyperlink";
+        } | {
+            data: string;
             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";
+            type: "label";
+        } | {
+            start: number;
+            end: number;
+            type: "strong" | "em";
         })[], ({
-            data?: ({
+            data: ({
                 __TYPE__: "ImageLink";
             } & {
                 id: string;
@@ -613,13 +595,19 @@ export declare const TextBlock: t.ExactC<t.IntersectionC<[t.TypeC<{
                 preview?: {
                     title?: string;
                 } | null | undefined;
-            }) | {
-                label: string;
-            };
-        } & {
+            });
+            start: number;
+            end: number;
+            type: "hyperlink";
+        } | {
+            data: string;
             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";
+            type: "label";
+        } | {
+            start: number;
+            end: number;
+            type: "strong" | "em";
         })[], unknown>;
     }>]>;
 }>, t.PartialC<{
@@ -725,7 +713,7 @@ export declare const BlockLegacy: t.Type<({
         text: string;
     } & {
         spans?: ({
-            data?: ({
+            data: ({
                 __TYPE__: "ImageLink";
             } & {
                 id: string;
@@ -763,13 +751,19 @@ export declare const BlockLegacy: t.Type<({
                 preview?: {
                     title?: string;
                 } | null | undefined;
-            }) | {
-                label: string;
-            };
-        } & {
+            });
             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";
+            type: "hyperlink";
+        } | {
+            data: string;
+            start: number;
+            end: number;
+            type: "label";
+        } | {
+            start: number;
+            end: number;
+            type: "strong" | "em";
         })[];
     };
 } & {
@@ -873,7 +867,7 @@ export declare const BlockLegacy: t.Type<({
         text: string;
     } & {
         spans?: ({
-            data?: ({
+            data: ({
                 __TYPE__: "ImageLink";
             } & {
                 id: string;
@@ -911,13 +905,19 @@ export declare const BlockLegacy: t.Type<({
                 preview?: {
                     title?: string;
                 } | null | undefined;
-            }) | {
-                label: string;
-            };
-        } & {
+            });
+            start: number;
+            end: number;
+            type: "hyperlink";
+        } | {
+            data: string;
+            start: number;
+            end: number;
+            type: "label";
+        } | {
             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";
+            type: "strong" | "em";
         })[];
     };
 } & {
@@ -1050,7 +1050,7 @@ export declare const Block: t.UnionC<[t.ExactC<t.IntersectionC<[t.TypeC<{
         text: t.StringC;
     }>, t.PartialC<{
         spans: t.Type<({
-            data?: ({
+            data: ({
                 __TYPE__: "ImageLink";
             } & {
                 id: string;
@@ -1088,15 +1088,21 @@ export declare const Block: t.UnionC<[t.ExactC<t.IntersectionC<[t.TypeC<{
                 preview?: {
                     title?: string;
                 } | null | undefined;
-            }) | {
-                label: string;
-            };
-        } & {
+            });
+            start: number;
+            end: number;
+            type: "hyperlink";
+        } | {
+            data: string;
+            start: number;
+            end: number;
+            type: "label";
+        } | {
             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";
+            type: "strong" | "em";
         })[], ({
-            data?: ({
+            data: ({
                 __TYPE__: "ImageLink";
             } & {
                 id: string;
@@ -1134,13 +1140,19 @@ export declare const Block: t.UnionC<[t.ExactC<t.IntersectionC<[t.TypeC<{
                 preview?: {
                     title?: string;
                 } | null | undefined;
-            }) | {
-                label: string;
-            };
-        } & {
+            });
+            start: number;
+            end: number;
+            type: "hyperlink";
+        } | {
+            data: string;
+            start: number;
+            end: number;
+            type: "label";
+        } | {
             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";
+            type: "strong" | "em";
         })[], unknown>;
     }>]>;
 }>, t.PartialC<{

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

@@ -6,27 +6,35 @@ const fp_ts_1 = require("fp-ts");
 const Either_1 = require("fp-ts/lib/Either");
 const function_1 = require("fp-ts/lib/function");
 const t = (0, tslib_1.__importStar)(require("io-ts"));
+const io_ts_types_1 = require("io-ts-types");
 const nestable_1 = require("../../../../customtypes/widgets/nestable");
 const validators_1 = require("../../../../validators");
 const function_2 = require("../../../../validators/function");
 const EmbedContent_1 = require("../EmbedContent");
 const ImageContent_1 = require("../ImageContent");
 const LinkContent_1 = require("../LinkContent");
-const labelCodec = t.strict({
-    label: t.string,
+const linkSpan = (linkCodec) => t.strict({
+    data: linkCodec,
+    start: t.number,
+    end: t.number,
+    type: t.literal(nestable_1.RichTextNodeType.hyperlink),
 });
-const SpanFn = (linkCodec) => t.exact(t.intersection([
-    t.partial({
-        data: t.union([linkCodec, labelCodec]),
-    }),
-    t.type({
-        start: t.number,
-        end: t.number,
-        type: t.union([nestable_1.RichTextNodeTypeCodec, t.literal("label")]),
+const labelSpan = t.strict({
+    data: (0, io_ts_types_1.withFallback)(t.string, ""),
+    start: t.number,
+    end: t.number,
+    type: t.literal("label"),
+});
+const basicSpan = t.strict({
+    start: t.number,
+    end: t.number,
+    type: t.keyof({
+        [nestable_1.RichTextNodeType.strong]: null,
+        [nestable_1.RichTextNodeType.em]: null,
     }),
-]));
-exports.Span = SpanFn(LinkContent_1.Link);
-exports.SpanLegacy = SpanFn(LinkContent_1.LinkLegacy);
+});
+exports.Span = t.union([linkSpan(LinkContent_1.Link), labelSpan, basicSpan]);
+exports.SpanLegacy = t.union([linkSpan(LinkContent_1.LinkLegacy), labelSpan, basicSpan]);
 const ValidatedSpans = (spanCodec) => {
     return new t.Type("ValidatedSpans", (spans) => Array.isArray(spans) && spans.every(spanCodec.is), (spans, c) => {
         if (Array.isArray(spans)) {
@@ -35,10 +43,6 @@ const ValidatedSpans = (spanCodec) => {
                 const decodedSpan = spanCodec.decode(maybeSpan);
                 if ((0, Either_1.isLeft)(decodedSpan))
                     return acc;
-                if ((decodedSpan.right.type === "hyperlink" ||
-                    decodedSpan.right.type === "label") &&
-                    !decodedSpan.right.data)
-                    return acc;
                 return [...acc, decodedSpan.right];
             }, [])
                 .sort((m1, m2) => m1.start - m2.start);
@@ -48,7 +52,8 @@ const ValidatedSpans = (spanCodec) => {
             return t.failure(spans, c);
     }, (m) => {
         return m.reduce((acc, meta) => {
-            return [...acc, spanCodec.encode(meta)];
+            const encoded = spanCodec.encode(meta);
+            return [...acc, encoded];
         }, []);
     });
 };