@prismicio/types-internal 2.2.0-traverse.alpha-6 → 2.2.0-traverse.alpha-7

package/lib/content/fields/slices/SlicesContent.js

@@ -91,10 +91,8 @@ function findSliceModel(slicesPath, model, content) {
         if ((0, customtypes_1.isCompositeSlice)(defaultModel)) {
             return {
                 type: "Slice",
-                fields: {
-                    "non-repeat": defaultModel["non-repeat"] || {},
-                    repeat: defaultModel.repeat || {},
-                },
+                "non-repeat": defaultModel["non-repeat"] || {},
+                repeat: defaultModel.repeat || {},
             };
         }
         if ((0, customtypes_1.isLegacySlice)(defaultModel)) {

package/lib/customtypes/widgets/slices/CompositeSlice.d.ts

@@ -1,5 +1,4 @@
 import * as t from "io-ts";
-import type { PickOnly } from "../../../_internal/utils";
 import type { DynamicSlice, StaticSlice } from "./Slice";
 export declare const CompositeSliceType = "Slice";
 export declare const CompositeSliceConfig: t.ExactC<t.PartialC<{
@@ -332,8 +331,4 @@ export declare const CompositeSlice: t.ExactC<t.IntersectionC<[t.TypeC<{
     }>>;
 }>]>>;
 export declare type CompositeSlice = t.TypeOf<typeof CompositeSlice>;
-export declare type CompositeSliceFields = {
-    type: "Slice";
-    fields: PickOnly<CompositeSlice, "non-repeat" | "repeat">;
-};
 export declare function isCompositeSlice(slice: DynamicSlice | StaticSlice): slice is CompositeSlice;

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,28 @@
 import type { Asset } from "../../../../common";
-import type { ImageContent, ImageContentView } from "../../../../content";
-import type { ImportImage } from "../../../validators";
+import type { ImageContent } from "../../../../content";
+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): {
+    origin: {
+        id: string;
+        url: string;
+        width: number;
+        height: number;
+    };
+    width: number;
+    height: number;
+    edit: {
+        zoom: number;
+        crop: {
+            x: number;
+            y: number;
+        };
+        background: string;
+    };
+} & {
+    url?: string;
+    credits?: string | null;
+    alt?: string | null;
+    provider?: string | null | undefined;
+};
 export declare const imageConverter: (imageField: ImportImage["value"], assets: Record<Asset["id"], Asset | undefined>) => ImageContent | undefined;

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

@@ -1,43 +1,42 @@
 "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) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+function convertImageView(inputImage, image) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     // We can do that because anyway all properties being read
     const imageField = {
         ...inputImage,
-        edit: "edit" in inputImage
-            ? inputImage.edit
-            : {
-                x: 0,
-                y: 0,
-                zoom: 1,
-            },
-        dimensions: "dimensions" in inputImage ? inputImage.dimensions : {},
+        edit: {
+            x: 0,
+            y: 0,
+            zoom: 1,
+            ...inputImage.edit,
+        },
+        dimensions: (_a = inputImage.dimensions) !== null && _a !== void 0 ? _a : {},
     };
     return (0, Objects_1.withOptionals)({
         origin: {
             id: image.id,
             url: image.origin_url,
             // All images returned form Asset API should have width and height properties.
-            width: (_a = image.width) !== null && _a !== void 0 ? _a : 0,
-            height: (_b = image.height) !== null && _b !== void 0 ? _b : 0,
+            width: (_b = image.width) !== null && _b !== void 0 ? _b : 0,
+            height: (_c = image.height) !== null && _c !== void 0 ? _c : 0,
         },
         // All images returned form Asset API should have width and height properties.
         // Image width and height will be only applied if there are no constraints and user didn't overwrite it
-        width: (_e = (_d = (_c = imageField === null || imageField === void 0 ? void 0 : imageField.dimensions) === null || _c === void 0 ? void 0 : _c.width) !== null && _d !== void 0 ? _d : image.width) !== null && _e !== void 0 ? _e : 0,
-        height: (_h = (_g = (_f = imageField === null || imageField === void 0 ? void 0 : imageField.dimensions) === null || _f === void 0 ? void 0 : _f.height) !== null && _g !== void 0 ? _g : image.height) !== null && _h !== void 0 ? _h : 0,
+        width: (_f = (_e = (_d = imageField === null || imageField === void 0 ? void 0 : imageField.dimensions) === null || _d === void 0 ? void 0 : _d.width) !== null && _e !== void 0 ? _e : image.width) !== null && _f !== void 0 ? _f : 0,
+        height: (_j = (_h = (_g = imageField === null || imageField === void 0 ? void 0 : imageField.dimensions) === null || _g === void 0 ? void 0 : _g.height) !== null && _h !== void 0 ? _h : image.height) !== null && _j !== void 0 ? _j : 0,
         // If edit is not provided, we crop constraint width and height from the left upper corner.
         // WARN: If constraints are greater than image dimensions cut outside the image (background will fill extra space).
         edit: {
-            zoom: (_k = (_j = imageField.edit) === null || _j === void 0 ? void 0 : _j.zoom) !== null && _k !== void 0 ? _k : 1,
+            zoom: (_l = (_k = imageField.edit) === null || _k === void 0 ? void 0 : _k.zoom) !== null && _l !== void 0 ? _l : 1,
             crop: {
-                x: (_m = (_l = imageField.edit) === null || _l === void 0 ? void 0 : _l.x) !== null && _m !== void 0 ? _m : 0,
-                y: (_p = (_o = imageField.edit) === null || _o === void 0 ? void 0 : _o.y) !== null && _p !== void 0 ? _p : 0,
+                x: (_o = (_m = imageField.edit) === null || _m === void 0 ? void 0 : _m.x) !== null && _o !== void 0 ? _o : 0,
+                y: (_q = (_p = imageField.edit) === null || _p === void 0 ? void 0 : _p.y) !== null && _q !== void 0 ? _q : 0,
             },
-            background: (_r = (_q = imageField.edit) === null || _q === void 0 ? void 0 : _q.background) !== null && _r !== void 0 ? _r : (image.extension === "png" ? "transparent" : "#ffffff"),
+            background: (_s = (_r = imageField.edit) === null || _r === void 0 ? void 0 : _r.background) !== null && _s !== void 0 ? _s : (image.extension === "png" ? "transparent" : "#ffffff"),
         },
         url: image.url,
     }, [
@@ -45,25 +44,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,41 @@
+"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,
+            ...(() => {
+                if (block.spans) {
+                    const convertedSpans = spansConverter(block.spans, assets);
+                    if (!convertedSpans)
+                        return {};
+                    return { spans: convertedSpans };
+                }
+                return {};
+            })(),
+        },
+        ...(block.direction ? { direction: block.direction } : {}),
+    };
+}
+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 {};
+            })(),
+        };
+    });
+}

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/lib/import/validators/fields/ImportContent.js

@@ -6,12 +6,12 @@ const fp_ts_1 = require("fp-ts");
 const function_1 = require("fp-ts/lib/function");
 const t = (0, tslib_1.__importStar)(require("io-ts"));
 const Objects_1 = require("../../../utils/Objects");
-const ImportContent = (type, valueCodec) => new t.Type("ImportField", (u) => {
+const ImportContent = (type, valueCodec) => new t.Type(`ImportField: ${valueCodec.name}`, (u) => {
     if (!(0, Objects_1.isObject)(u))
         return false;
     return type === u["type"] && valueCodec.is(u["value"]);
-}, (u) => {
-    return (0, function_1.pipe)(valueCodec.decode(u), fp_ts_1.either.map((decodedValue) => {
+}, (u, c) => {
+    return (0, function_1.pipe)(valueCodec.validate(u, c), fp_ts_1.either.map((decodedValue) => {
         return {
             type,
             value: decodedValue,

package/lib/import/validators/fields/ImportField.d.ts

@@ -52,7 +52,7 @@ export declare const ImportField: {
         } | undefined, unknown> | import("io-ts").Type<{
             type: "StructuredText";
             value: import("./nestable").ImportBlock[] | null;
-        }, unknown[] | undefined, unknown> | import("io-ts").Type<{
+        }, import("./nestable").ImportBlock[] | undefined, unknown> | import("io-ts").Type<{
             type: "Number";
             value: number | null;
         }, number | undefined, unknown> | import("io-ts").Type<{

package/lib/import/validators/fields/ImportSlices/ImportSlices.js

@@ -13,8 +13,9 @@ const ImportSlices = (staticSlices) => {
     const supportedSlices = (0, utils_1.extractSupportedSlices)(staticSlices);
     // For now we only support the SharedSlice, however if we want to support more in the future
     // we would have to change the codec here to something like this: t.array(t.union([ImportSharedSlice(sharedSlices), NewSliceCodec(newSliceCustomTypes)])).
-    const SlicesArrayCodec = t.array((0, SharedSlice_1.SharedSlice)(supportedSlices));
-    return (0, ImportContent_1.ImportContent)("Slices", (0, validators_1.EmptyObjectOrElse)(new t.Type("ImportSlices", (u) => SlicesArrayCodec.is(u), (u, c) => {
+    const SharedSliceCodec = (0, SharedSlice_1.SharedSlice)(supportedSlices);
+    const SlicesArrayCodec = t.array(SharedSliceCodec);
+    return (0, ImportContent_1.ImportContent)("Slices", (0, validators_1.EmptyArrayOrElse)(new t.ArrayType(SlicesArrayCodec.name, (u) => SlicesArrayCodec.is(u), (u, c) => {
         return (0, function_1.pipe)(SlicesArrayCodec.validate(u, c), E.chain((slices) => {
             // This part might not make sense for all Slice types in the future, but for now we only support the SharedSlice
             // In case we support more in the future, we would have to filter only the relevant type for this check
@@ -24,6 +25,6 @@ const ImportSlices = (staticSlices) => {
             }
             return t.success(slices);
         }));
-    }, t.identity)));
+    }, t.identity, SharedSliceCodec)));
 };
 exports.ImportSlices = ImportSlices;

package/lib/import/validators/fields/ImportSlices/SharedSlice/fields/SharedSliceContent/SharedSliceContentEntry.js

@@ -58,8 +58,8 @@ const SharedSliceContentEntry = (sliceName, sliceContentField, sliceFieldModels)
         ]), E.mapLeft((errors) => errors.map((error) => {
             const context = [
                 ...c,
-                ...error.context.filter(({ key }) => !!key),
                 { key, actual: content, type: codec },
+                ...error.context.slice(1), // We ignore the first context element with "" key coming from ImportNestable decoder
             ];
             const updatedError = { ...error, context };
             return updatedError;

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

@@ -20,5 +20,5 @@ export declare const ImportRichText: (customType?: ({
 }) | undefined) => t.Type<{
     type: "StructuredText";
     value: ImportBlock[] | null;
-}, unknown[] | undefined, unknown>;
+}, ImportBlock[] | undefined, unknown>;
 export declare type ImportRichText = t.TypeOf<ReturnType<typeof ImportRichText>>;

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

@@ -2,25 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImportRichText = void 0;
 const tslib_1 = require("tslib");
+const E = (0, tslib_1.__importStar)(require("fp-ts/Either"));
+const function_1 = require("fp-ts/function");
 const t = (0, tslib_1.__importStar)(require("io-ts"));
 const validators_1 = require("../../../../../validators");
-const function_1 = require("../../../../../validators/function");
+const function_2 = require("../../../../../validators/function");
 const ImportContent_1 = require("../../ImportContent");
 const ImportBlock_1 = require("./ImportBlock");
-const ImportRichText = (customType) => (0, ImportContent_1.ImportContent)("StructuredText", (0, validators_1.EmptyArrayOrElse)((0, function_1.withCustomError)(t.array(t.unknown).pipe(new t.Type("RichTextField", (u) => t.array((0, ImportBlock_1.ImportBlock)([])).is(u), (u, c) => {
+const ImportRichText = (customType) => {
     var _a, _b, _c, _d;
     const single = (_b = (_a = customType === null || customType === void 0 ? void 0 : customType.config) === null || _a === void 0 ? void 0 : _a.single) === null || _b === void 0 ? void 0 : _b.split(",");
     const multi = (_d = (_c = customType === null || customType === void 0 ? void 0 : customType.config) === null || _c === void 0 ? void 0 : _c.multi) === null || _d === void 0 ? void 0 : _d.split(",");
-    if (multi) {
-        return t.array((0, ImportBlock_1.ImportBlock)(multi)).validate(u, c);
-    }
-    else if (single) {
-        return u.length > 1
-            ? t.failure(u, c, "This field only allows one block")
-            : t.array((0, ImportBlock_1.ImportBlock)(single)).validate(u, c);
-    }
-    else {
-        throw new Error("Rich text config must have either a 'single' or 'multi' field defined");
-    }
-}, t.identity)), () => "Rich text field must be an array")));
+    const allowedBlockTypes = multi || single;
+    const isSingleBlockAllowed = multi === undefined && single !== undefined;
+    const BlockCodec = (0, ImportBlock_1.ImportBlock)(allowedBlockTypes !== null && allowedBlockTypes !== void 0 ? allowedBlockTypes : []);
+    const RichTextArrayCodec = (0, function_2.withCustomError)(t.array(BlockCodec), () => "Rich text field must be an array");
+    return (0, ImportContent_1.ImportContent)("StructuredText", (0, validators_1.EmptyArrayOrElse)(new t.ArrayType(RichTextArrayCodec.name, (u) => RichTextArrayCodec.is(u), (u, c) => {
+        if (allowedBlockTypes === undefined) {
+            throw new Error("Invalid custom type for the rich text field: the model is missing a 'single' or 'multi' field defining a list of allowed block types");
+        }
+        return (0, function_1.pipe)(RichTextArrayCodec.validate(u, c), E.chain((blocks) => {
+            if (isSingleBlockAllowed && blocks.length > 1) {
+                return t.failure(blocks, c, "This field only allows one block");
+            }
+            return t.success(blocks);
+        }));
+    }, t.identity, BlockCodec)));
+};
 exports.ImportRichText = ImportRichText;

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

@@ -1,8 +1,22 @@
 import * as t from "io-ts";
 export declare const ImportImageBlockType: t.LiteralC<"image">;
 export declare type ImportImageBlockType = t.TypeOf<typeof ImportImageBlockType>;
-export declare const ImportImageBlock: t.ExactC<t.TypeC<{
+export declare const ImportImageBlock: t.ExactC<t.IntersectionC<[t.TypeC<{
     type: t.LiteralC<"image">;
+}>, t.IntersectionC<[t.TypeC<{
     id: t.StringC;
-}>>;
+}>, t.PartialC<{
+    dimensions: t.PartialC<{
+        width: t.NumberC;
+        height: t.NumberC;
+    }>;
+    edit: t.PartialC<{
+        x: t.NumberC;
+        y: t.NumberC;
+        zoom: t.NumberC;
+        background: t.StringC;
+    }>;
+    copyright: t.UnionC<[t.StringC, t.NullC]>;
+    alt: t.UnionC<[t.StringC, t.NullC]>;
+}>]>]>>;
 export declare type ImportImageBlock = t.TypeOf<typeof ImportImageBlock>;

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

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImportImageBlock = exports.ImportImageBlockType = void 0;
 const tslib_1 = require("tslib");
 const t = (0, tslib_1.__importStar)(require("io-ts"));
-const validators_1 = require("../../../../../../validators");
+const validators_1 = require("../../Image/validators");
 exports.ImportImageBlockType = t.literal("image");
-exports.ImportImageBlock = t.strict({
-    type: exports.ImportImageBlockType,
-    id: validators_1.String,
-});
+exports.ImportImageBlock = t.exact(t.intersection([
+    t.type({
+        type: exports.ImportImageBlockType,
+    }),
+    validators_1.ImportImageView,
+]));

package/lib/import/validators/fields/nestable/Nestable.d.ts

@@ -62,7 +62,7 @@ export declare const ImportNestable: {
         } | undefined, unknown> | import("io-ts").Type<{
             type: "StructuredText";
             value: import("./ImportRichText").ImportBlock[] | null;
-        }, unknown[] | undefined, unknown> | import("io-ts").Type<{
+        }, import("./ImportRichText").ImportBlock[] | undefined, unknown> | import("io-ts").Type<{
             type: "Number";
             value: number | null;
         }, number | undefined, unknown> | import("io-ts").Type<{

package/lib/validators/DefaultOrElse.js

@@ -6,10 +6,10 @@ const Either_1 = require("fp-ts/lib/Either");
 const t = (0, tslib_1.__importStar)(require("io-ts"));
 const BasicTypes_1 = require("./BasicTypes");
 const DefaultOrElse = (inputValidator) => {
-    return (codec) => new t.Type("DefaultOrElse", (u) => null === u || codec.is(u), (u) => {
-        if ((0, Either_1.isRight)(inputValidator.decode(u)))
+    return (codec) => new t.Type(`DefaultOrElse<${inputValidator.name}, ${codec.name}>`, (u) => null === u || codec.is(u), (u, c) => {
+        if ((0, Either_1.isRight)(inputValidator.validate(u, c)))
             return t.success(null);
-        return codec.decode(u);
+        return codec.validate(u, c);
     }, (chunk) => (chunk ? codec.encode(chunk) : undefined));
 };
 exports.DefaultOrElse = DefaultOrElse;

package/package.json

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

package/src/_internal/utils.ts

@@ -4,7 +4,7 @@ import type {
 	WidgetContent,
 } from "../content"
 import type {
-	CompositeSliceFields,
+	CompositeSlice,
 	Group,
 	NestableWidget,
 	StaticSlices,
@@ -18,7 +18,7 @@ export type PickOnly<T, K extends keyof T> = Pick<T, K> & {
 
 export type TraverseSliceContentFn = <
 	S extends SliceItemContent | SharedSliceItemContent,
-	D extends VariationFields | CompositeSliceFields | Group | NestableWidget,
+	D extends VariationFields | CompositeSlice | Group | NestableWidget,
 >({
 	path,
 	key,
@@ -91,5 +91,5 @@ export const ContentPath = {
 export type SliceModel =
 	| VariationFields
 	| NestableWidget
-	| CompositeSliceFields
+	| CompositeSlice
 	| Group