@prismicio/types-internal 3.10.2-alpha.3 → 3.11.0

package/lib/content/Document.js

@@ -149,89 +149,68 @@ function traverseDocument({ document, customType, }) {
         ? simplifyCustomType(customType)
         : customType;
     return ({ transformWidget = ({ content }) => content, transformSlice = ({ content }) => content, }) => {
-        let fieldModels = undefined;
-        if (model) {
-            fieldModels = {};
-            const modelKeys = Object.keys(model.fields);
-            for (let i = 0; i < modelKeys.length; i++) {
-                const key = modelKeys[i];
-                if (key) {
-                    const def = model.fields[key];
-                    if (def) {
-                        fieldModels[key] = def;
-                    }
+        const fieldModels = model &&
+            Object.entries(model.fields).reduce((acc, [key, def]) => ({ ...acc, [key]: def }), {});
+        return Object.entries(document).reduce((acc, [key, content]) => {
+            const fieldModel = fieldModels && fieldModels[key];
+            const path = utils_1.ContentPath.make([
+                { key: model === null || model === void 0 ? void 0 : model.customTypeId, type: "CustomType" },
+                { key, type: "Widget" },
+            ]);
+            const transformedWidget = (() => {
+                switch (content.__TYPE__) {
+                    case "SliceContentType":
+                        return (0, fields_1.traverseSlices)({
+                            path,
+                            key,
+                            model: (fieldModel === null || fieldModel === void 0 ? void 0 : fieldModel.type) === "Slices" || (fieldModel === null || fieldModel === void 0 ? void 0 : fieldModel.type) === "Choice"
+                                ? fieldModel
+                                : undefined,
+                            content,
+                        })({ transformWidget, transformSlice });
+                    case "GroupContentType":
+                        return (0, fields_1.traverseGroupContent)({
+                            path,
+                            key,
+                            apiId: key,
+                            model: (fieldModel === null || fieldModel === void 0 ? void 0 : fieldModel.type) === "Group" ? fieldModel : undefined,
+                            content,
+                        })(transformWidget);
+                    case "RepeatableContent":
+                        return (0, fields_1.traverseRepeatableContent)({
+                            path,
+                            key,
+                            apiId: key,
+                            model: (fieldModel === null || fieldModel === void 0 ? void 0 : fieldModel.type) === "Link" ? fieldModel : undefined,
+                            content,
+                        })(transformWidget);
+                    case "TableContent":
+                        return (0, fields_1.traverseTableContent)({
+                            path,
+                            key,
+                            apiId: key,
+                            model: (fieldModel === null || fieldModel === void 0 ? void 0 : fieldModel.type) === "Table" ? fieldModel : undefined,
+                            content,
+                        })(transformWidget);
+                    default:
+                        return transformWidget({
+                            path,
+                            key,
+                            apiId: key,
+                            model: (fieldModel === null || fieldModel === void 0 ? void 0 : fieldModel.type) !== "Group" &&
+                                (fieldModel === null || fieldModel === void 0 ? void 0 : fieldModel.type) !== "Slices" &&
+                                (fieldModel === null || fieldModel === void 0 ? void 0 : fieldModel.type) !== "Choice"
+                                ? fieldModel
+                                : undefined,
+                            content,
+                        });
                 }
-            }
-        }
-        const result = {};
-        const documentKeys = Object.keys(document);
-        for (let i = 0; i < documentKeys.length; i++) {
-            const key = documentKeys[i];
-            if (key) {
-                const content = document[key];
-                if (content) {
-                    const fieldModel = fieldModels && fieldModels[key];
-                    const path = utils_1.ContentPath.make([
-                        { key: model === null || model === void 0 ? void 0 : model.customTypeId, type: "CustomType" },
-                        { key, type: "Widget" },
-                    ]);
-                    const transformedWidget = (() => {
-                        switch (content.__TYPE__) {
-                            case "SliceContentType":
-                                return (0, fields_1.traverseSlices)({
-                                    path,
-                                    key,
-                                    model: (fieldModel === null || fieldModel === void 0 ? void 0 : fieldModel.type) === "Slices" ||
-                                        (fieldModel === null || fieldModel === void 0 ? void 0 : fieldModel.type) === "Choice"
-                                        ? fieldModel
-                                        : undefined,
-                                    content,
-                                })({ transformWidget, transformSlice });
-                            case "GroupContentType":
-                                return (0, fields_1.traverseGroupContent)({
-                                    path,
-                                    key,
-                                    apiId: key,
-                                    model: (fieldModel === null || fieldModel === void 0 ? void 0 : fieldModel.type) === "Group" ? fieldModel : undefined,
-                                    content,
-                                })(transformWidget);
-                            case "RepeatableContent":
-                                return (0, fields_1.traverseRepeatableContent)({
-                                    path,
-                                    key,
-                                    apiId: key,
-                                    model: (fieldModel === null || fieldModel === void 0 ? void 0 : fieldModel.type) === "Link" ? fieldModel : undefined,
-                                    content,
-                                })(transformWidget);
-                            case "TableContent":
-                                return (0, fields_1.traverseTableContent)({
-                                    path,
-                                    key,
-                                    apiId: key,
-                                    model: (fieldModel === null || fieldModel === void 0 ? void 0 : fieldModel.type) === "Table" ? fieldModel : undefined,
-                                    content,
-                                })(transformWidget);
-                            default:
-                                return transformWidget({
-                                    path,
-                                    key,
-                                    apiId: key,
-                                    model: (fieldModel === null || fieldModel === void 0 ? void 0 : fieldModel.type) !== "Group" &&
-                                        (fieldModel === null || fieldModel === void 0 ? void 0 : fieldModel.type) !== "Slices" &&
-                                        (fieldModel === null || fieldModel === void 0 ? void 0 : fieldModel.type) !== "Choice"
-                                        ? fieldModel
-                                        : undefined,
-                                    content,
-                                });
-                        }
-                    })();
-                    if (transformedWidget) {
-                        result[key] = transformedWidget;
-                    }
-                }
-            }
-        }
-        return result;
+            })();
+            return {
+                ...acc,
+                ...(transformedWidget ? { [key]: transformedWidget } : {}),
+            };
+        }, {});
     };
 }
 exports.traverseDocument = traverseDocument;

package/lib/content/fields/RepeatableContent.d.ts

@@ -1,90 +1,18 @@
 import * as t from "io-ts";
 import type { ContentPath, TraverseWidgetContentFn } from "../../_internal/utils";
-import { type Link, NestableFieldTypes, NestableWidget } from "../../customtypes";
+import type { Link, NestableWidget } from "../../customtypes";
 import type { LegacyContentCtx, WithTypes } from "../LegacyContentCtx";
-export declare const RepeatableContentType: "RepeatableContent";
-export declare const RepeatableFieldType: "Repeatable";
-export declare const RepeatableItemContent: t.ExactC<t.TypeC<{
-    __TYPE__: t.LiteralC<"LinkContent">;
-    value: t.UnionC<[t.IntersectionC<[t.ExactC<t.TypeC<{
-        __TYPE__: t.LiteralC<"ImageLink">;
-    }>>, t.UnionC<[t.IntersectionC<[t.IntersectionC<[t.ExactC<t.TypeC<{
-        kind: t.StringC;
-        id: t.StringC;
-        url: t.StringC;
-        height: t.StringC;
-        width: t.StringC;
-        size: t.StringC;
-        name: t.StringC;
-    }>>, t.ExactC<t.PartialC<{
-        date: t.UnionC<[t.Type<string, string, unknown>, t.NullC, t.UndefinedC]>;
-    }>>]>, t.ExactC<t.PartialC<{
-        text: t.StringC;
-    }>>]>, t.ExactC<t.TypeC<{
-        kind: t.LiteralC<"image">;
-        text: t.StringC;
-    }>>]>]>, t.IntersectionC<[t.ExactC<t.TypeC<{
-        __TYPE__: t.LiteralC<"FileLink">;
-    }>>, t.UnionC<[t.IntersectionC<[t.ExactC<t.IntersectionC<[t.TypeC<{
-        kind: t.StringC;
-        id: t.StringC;
-        url: t.StringC;
-        name: t.StringC;
-        size: t.StringC;
-    }>, t.PartialC<{
-        date: t.UnionC<[t.Type<string, string, unknown>, t.NullC, t.UndefinedC]>;
-    }>]>>, t.ExactC<t.PartialC<{
-        text: t.StringC;
-    }>>]>, t.ExactC<t.TypeC<{
-        kind: t.LiteralC<"file">;
-        text: t.StringC;
-    }>>]>]>, t.IntersectionC<[t.ExactC<t.TypeC<{
-        __TYPE__: t.LiteralC<"DocumentLink">;
-    }>>, t.UnionC<[t.IntersectionC<[t.ExactC<t.TypeC<{
-        id: t.Type<string, string, unknown>;
-    }>>, t.ExactC<t.PartialC<{
-        text: t.StringC;
-    }>>]>, t.ExactC<t.TypeC<{
-        kind: t.LiteralC<"document">;
-        text: t.StringC;
-    }>>]>]>, t.IntersectionC<[t.ExactC<t.TypeC<{
-        __TYPE__: t.LiteralC<"ExternalLink">;
-    }>>, t.UnionC<[t.IntersectionC<[t.ExactC<t.IntersectionC<[t.TypeC<{
-        url: t.StringC;
-    }>, t.PartialC<{
-        kind: t.LiteralC<"web">;
-        target: t.UnionC<[t.Type<string, string, unknown>, t.NullC, t.UndefinedC]>;
-        preview: t.UnionC<[t.Type<{
-            title?: string;
-        }, {
-            title?: string;
-        }, unknown>, t.NullC, t.UndefinedC]>;
-    }>]>>, t.ExactC<t.PartialC<{
-        text: t.StringC;
-    }>>]>, t.ExactC<t.TypeC<{
-        kind: t.LiteralC<"web">;
-        text: t.StringC;
-    }>>]>]>, t.IntersectionC<[t.ExactC<t.TypeC<{
-        __TYPE__: t.LiteralC<"MediaLink">;
-    }>>, t.ExactC<t.TypeC<{
-        kind: t.LiteralC<"media">;
-        text: t.StringC;
-    }>>]>, t.IntersectionC<[t.ExactC<t.TypeC<{
-        __TYPE__: t.LiteralC<"AnyLink">;
-    }>>, t.ExactC<t.TypeC<{
-        text: t.StringC;
-    }>>]>]>;
-}>>;
-export declare type RepeatableItemContent = t.TypeOf<typeof RepeatableItemContent>;
 export declare const RepeatableContent: t.ExactC<t.TypeC<{
     __TYPE__: t.LiteralC<"RepeatableContent">;
-    type: t.UnionC<[t.LiteralC<"Color">, t.LiteralC<"Boolean">, t.LiteralC<"Embed">, t.LiteralC<"GeoPoint">, t.LiteralC<"Date">, t.LiteralC<"Number">, t.LiteralC<"Range">, t.LiteralC<"StructuredText">, t.LiteralC<"Select">, t.LiteralC<"Separator">, t.LiteralC<"Text">, t.LiteralC<"Timestamp">, t.LiteralC<"Link">, t.LiteralC<"Image">, t.LiteralC<"IntegrationFields">]>;
-    value: t.ArrayC<t.ExactC<t.TypeC<{
+    type: t.LiteralC<"Link">;
+    value: t.ArrayC<t.IntersectionC<[t.ExactC<t.TypeC<{
+        key: t.Type<string, string, unknown>;
+    }>>, t.ExactC<t.TypeC<{
         __TYPE__: t.LiteralC<"LinkContent">;
         value: t.UnionC<[t.IntersectionC<[t.ExactC<t.TypeC<{
             __TYPE__: t.LiteralC<"ImageLink">;
-        }>>, t.UnionC<[t.IntersectionC<[t.IntersectionC<[t.ExactC<t.TypeC<{
-            kind: t.StringC;
+        }>>, t.IntersectionC<[t.UnionC<[t.IntersectionC<[t.ExactC<t.TypeC<{
+            kind: t.Type<"image", "image", unknown>;
             id: t.StringC;
             url: t.StringC;
             height: t.StringC;
@@ -93,38 +21,35 @@ export declare const RepeatableContent: t.ExactC<t.TypeC<{
             name: t.StringC;
         }>>, t.ExactC<t.PartialC<{
             date: t.UnionC<[t.Type<string, string, unknown>, t.NullC, t.UndefinedC]>;
-        }>>]>, t.ExactC<t.PartialC<{
-            text: t.StringC;
         }>>]>, t.ExactC<t.TypeC<{
             kind: t.LiteralC<"image">;
+        }>>]>, t.ExactC<t.PartialC<{
             text: t.StringC;
         }>>]>]>, t.IntersectionC<[t.ExactC<t.TypeC<{
             __TYPE__: t.LiteralC<"FileLink">;
-        }>>, t.UnionC<[t.IntersectionC<[t.ExactC<t.IntersectionC<[t.TypeC<{
-            kind: t.StringC;
+        }>>, t.IntersectionC<[t.UnionC<[t.ExactC<t.IntersectionC<[t.TypeC<{
+            kind: t.Type<"file", "file", unknown>;
             id: t.StringC;
             url: t.StringC;
             name: t.StringC;
             size: t.StringC;
         }>, t.PartialC<{
             date: t.UnionC<[t.Type<string, string, unknown>, t.NullC, t.UndefinedC]>;
-        }>]>>, t.ExactC<t.PartialC<{
-            text: t.StringC;
-        }>>]>, t.ExactC<t.TypeC<{
+        }>]>>, t.ExactC<t.TypeC<{
             kind: t.LiteralC<"file">;
+        }>>]>, t.ExactC<t.PartialC<{
             text: t.StringC;
         }>>]>]>, t.IntersectionC<[t.ExactC<t.TypeC<{
             __TYPE__: t.LiteralC<"DocumentLink">;
-        }>>, t.UnionC<[t.IntersectionC<[t.ExactC<t.TypeC<{
+        }>>, t.IntersectionC<[t.UnionC<[t.ExactC<t.TypeC<{
             id: t.Type<string, string, unknown>;
-        }>>, t.ExactC<t.PartialC<{
-            text: t.StringC;
-        }>>]>, t.ExactC<t.TypeC<{
+        }>>, t.ExactC<t.TypeC<{
             kind: t.LiteralC<"document">;
+        }>>]>, t.ExactC<t.PartialC<{
             text: t.StringC;
         }>>]>]>, t.IntersectionC<[t.ExactC<t.TypeC<{
             __TYPE__: t.LiteralC<"ExternalLink">;
-        }>>, t.UnionC<[t.IntersectionC<[t.ExactC<t.IntersectionC<[t.TypeC<{
+        }>>, t.IntersectionC<[t.UnionC<[t.ExactC<t.IntersectionC<[t.TypeC<{
             url: t.StringC;
         }>, t.PartialC<{
             kind: t.LiteralC<"web">;
@@ -134,33 +59,37 @@ export declare const RepeatableContent: t.ExactC<t.TypeC<{
             }, {
                 title?: string;
             }, unknown>, t.NullC, t.UndefinedC]>;
-        }>]>>, t.ExactC<t.PartialC<{
-            text: t.StringC;
-        }>>]>, t.ExactC<t.TypeC<{
+        }>]>>, t.ExactC<t.TypeC<{
             kind: t.LiteralC<"web">;
+        }>>]>, t.ExactC<t.PartialC<{
             text: t.StringC;
         }>>]>]>, t.IntersectionC<[t.ExactC<t.TypeC<{
             __TYPE__: t.LiteralC<"MediaLink">;
-        }>>, t.ExactC<t.TypeC<{
+        }>>, t.IntersectionC<[t.ExactC<t.TypeC<{
             kind: t.LiteralC<"media">;
+        }>>, t.ExactC<t.PartialC<{
             text: t.StringC;
-        }>>]>, t.IntersectionC<[t.ExactC<t.TypeC<{
+        }>>]>]>, t.IntersectionC<[t.ExactC<t.TypeC<{
             __TYPE__: t.LiteralC<"AnyLink">;
-        }>>, t.ExactC<t.TypeC<{
+        }>>, t.ExactC<t.IntersectionC<[t.TypeC<{
+            kind: t.LiteralC<"any">;
+        }>, t.PartialC<{
             text: t.StringC;
-        }>>]>]>;
-    }>>>;
+        }>]>>]>]>;
+    }>>]>>;
 }>>;
 export declare type RepeatableContent = t.TypeOf<typeof RepeatableContent>;
 export declare const isRepeatableContent: t.Is<{
     __TYPE__: "RepeatableContent";
-    type: "Boolean" | "Color" | "Date" | "Embed" | "GeoPoint" | "Image" | "IntegrationFields" | "Link" | "Number" | "Range" | "StructuredText" | "Select" | "Separator" | "Text" | "Timestamp";
-    value: {
+    type: "Link";
+    value: ({
+        key: string;
+    } & {
         __TYPE__: "LinkContent";
         value: ({
             __TYPE__: "ImageLink";
-        } & (({
-            kind: string;
+        } & ((({
+            kind: "image";
             id: string;
             url: string;
             height: string;
@@ -169,43 +98,41 @@ export declare const isRepeatableContent: t.Is<{
             name: string;
         } & {
             date?: string | null | undefined;
-        } & {
-            text?: string;
         }) | {
             kind: "image";
-            text: string;
+        }) & {
+            text?: string;
         })) | ({
             __TYPE__: "FileLink";
-        } & (({
-            kind: string;
+        } & ((({
+            kind: "file";
             id: string;
             url: string;
             name: string;
             size: string;
         } & {
             date?: string | null | undefined;
-        } & {
-            text?: string;
         }) | {
             kind: "file";
-            text: string;
+        }) & {
+            text?: string;
         })) | ({
             __TYPE__: "MediaLink";
         } & {
             kind: "media";
-            text: string;
+        } & {
+            text?: string;
         }) | ({
             __TYPE__: "DocumentLink";
         } & (({
             id: string;
-        } & {
-            text?: string;
-        }) | {
+        } | {
             kind: "document";
-            text: string;
+        }) & {
+            text?: string;
         })) | ({
             __TYPE__: "ExternalLink";
-        } & (({
+        } & ((({
             url: string;
         } & {
             kind?: "web";
@@ -213,19 +140,20 @@ export declare const isRepeatableContent: t.Is<{
             preview?: {
                 title?: string;
             } | null | undefined;
-        } & {
-            text?: string;
         }) | {
             kind: "web";
-            text: string;
+        }) & {
+            text?: string;
         })) | ({
             __TYPE__: "AnyLink";
         } & {
-            text: string;
+            kind: "any";
+        } & {
+            text?: string;
         });
-    }[];
+    })[];
 }>;
-export declare const RepeatableLegacy: (ctx: LegacyContentCtx, fieldType: NestableFieldTypes) => t.Type<RepeatableContent, WithTypes<Array<unknown>>, unknown>;
+export declare const RepeatableLegacy: (ctx: LegacyContentCtx, fieldType: "Link") => t.Type<RepeatableContent, WithTypes<Array<unknown>>, unknown>;
 export declare type RepeatableCustomType = Link;
 export declare function traverseRepeatableContent({ path, key, apiId, model, content, }: {
     path: ContentPath;

package/lib/content/fields/RepeatableContent.js

@@ -1,28 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.traverseRepeatableContent = exports.RepeatableLegacy = exports.isRepeatableContent = exports.RepeatableContent = exports.RepeatableItemContent = exports.RepeatableFieldType = exports.RepeatableContentType = void 0;
+exports.traverseRepeatableContent = exports.RepeatableLegacy = exports.isRepeatableContent = exports.RepeatableContent = void 0;
 const tslib_1 = require("tslib");
 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 customtypes_1 = require("../../customtypes");
 const nestable_1 = require("./nestable");
-exports.RepeatableContentType = "RepeatableContent";
-exports.RepeatableFieldType = "Repeatable";
-exports.RepeatableItemContent = nestable_1.LinkContent;
 exports.RepeatableContent = t.strict({
-    __TYPE__: t.literal(exports.RepeatableContentType),
-    type: customtypes_1.NestableFieldTypes,
-    // TODO: How to ensure it's an array of only one type
-    value: t.array(exports.RepeatableItemContent),
+    __TYPE__: t.literal("RepeatableContent"),
+    type: t.literal("Link"),
+    value: t.array(nestable_1.LinkContent),
 });
 exports.isRepeatableContent = exports.RepeatableContent.is;
 const RepeatableLegacy = (ctx, fieldType) => {
-    const codecDecode = t.array(t.unknown);
-    const codecEncode = t.array(exports.RepeatableItemContent);
     return new t.Type("RepeatableLegacy", exports.isRepeatableContent, (items) => {
-        const parsed = (0, function_1.pipe)(codecDecode.decode(items), fp_ts_1.either.map((items) => {
+        const parsed = (0, function_1.pipe)(t.array(t.unknown).decode(items), fp_ts_1.either.map((items) => {
             const parsedItems = items.reduce((acc, item) => {
                 let result;
                 switch (fieldType) {
@@ -39,12 +32,12 @@ const RepeatableLegacy = (ctx, fieldType) => {
             return {
                 value: parsedItems,
                 type: fieldType,
-                __TYPE__: exports.RepeatableContentType,
+                __TYPE__: "RepeatableContent",
             };
         }));
         return parsed;
     }, (r) => {
-        const res = codecEncode.encode(r.value);
+        const res = t.array(nestable_1.LinkContent).encode(r.value);
         const encodedItems = res.reduce((acc, item) => {
             let encoded;
             switch (item.__TYPE__) {
@@ -79,6 +72,9 @@ function traverseRepeatableContent({ path, key, apiId, model, content, }) {
             // Can happen if the transform function returns undefined to filter out a field
             if (!transformedField)
                 return acc;
+            // If the transformed field is not a link content, we don't include it
+            if (!(0, nestable_1.isLinkContent)(transformedField))
+                return acc;
             return acc.concat(transformedField);
         }, []);
         return transform({