@prismicio/types-internal 2.2.0-traverse.alpha-0 → 2.2.0-traverse.alpha-1

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

@@ -1,6 +1,6 @@
 import * as t from "io-ts";
 import type { ContentPath, TraverseContentFn } from "../../_internal/utils";
-import type { Group } from "../../customtypes";
+import type { Group, NestableWidget } from "../../customtypes";
 import { LegacyContentCtx, WithTypes } from "../LegacyContentCtx";
 export declare const GroupItemContentType: "GroupItemContent";
 export declare const GroupItemContent: t.ExactC<t.TypeC<{
@@ -1442,5 +1442,10 @@ export declare function traverseGroupContent({ path, model, content, }: {
     path: ContentPath;
     content: GroupContent;
     model?: Group | undefined;
-}): (transform: TraverseContentFn) => GroupContent | undefined;
+}): (transform: TraverseContentFn) => GroupContent;
+export declare function traverseGroupItemsContent({ path, model, content, }: {
+    path: ContentPath;
+    content: Array<GroupItemContent>;
+    model?: Record<string, NestableWidget> | undefined;
+}): (transform: TraverseContentFn) => Array<GroupItemContent>;
 export {};

package/lib/content/fields/GroupContent.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.traverseGroupContent = exports.GroupContent = exports.isGroupContent = exports.GroupContentType = exports.GroupLegacy = exports.GroupItemLegacy = exports.GroupItemContent = exports.GroupItemContentType = void 0;
+exports.traverseGroupItemsContent = exports.traverseGroupContent = exports.GroupContent = exports.isGroupContent = exports.GroupContentType = exports.GroupLegacy = exports.GroupItemLegacy = exports.GroupItemContent = exports.GroupItemContentType = void 0;
 const tslib_1 = require("tslib");
 const fp_ts_1 = require("fp-ts");
 const Either_1 = require("fp-ts/lib/Either");
@@ -83,13 +83,29 @@ exports.GroupContent = t.strict({
 });
 function traverseGroupContent({ path, model, content, }) {
     return (transform) => {
-        const groupItems = content.value.map((groupItem, index) => {
+        var _a;
+        const groupItems = traverseGroupItemsContent({
+            path,
+            model: (_a = model === null || model === void 0 ? void 0 : model.config) === null || _a === void 0 ? void 0 : _a.fields,
+            content: content.value,
+        })(transform);
+        return {
+            __TYPE__: content.__TYPE__,
+            value: groupItems,
+        };
+    };
+}
+exports.traverseGroupContent = traverseGroupContent;
+function traverseGroupItemsContent({ path, model, content, }) {
+    return (transform) => {
+        return content.map((groupItem, index) => {
+            const groupItemPath = path.concat([
+                { key: index.toString(), type: "GroupItem" },
+            ]);
             const groupItemFields = groupItem.value.reduce((acc, [fieldKey, fieldContent]) => {
-                var _a, _b;
-                const fieldDef = (_b = (_a = model === null || model === void 0 ? void 0 : model.config) === null || _a === void 0 ? void 0 : _a.fields) === null || _b === void 0 ? void 0 : _b[fieldKey];
+                const fieldDef = model === null || model === void 0 ? void 0 : model[fieldKey];
                 const transformedField = transform({
-                    path: path.concat([
-                        { key: index.toString(), type: "GroupItem" },
+                    path: groupItemPath.concat([
                         { key: fieldKey, type: fieldContent.__TYPE__ },
                     ]),
                     key: fieldKey,
@@ -107,10 +123,6 @@ function traverseGroupContent({ path, model, content, }) {
                 value: groupItemFields,
             };
         });
-        return {
-            __TYPE__: content.__TYPE__,
-            value: groupItems,
-        };
     };
 }
-exports.traverseGroupContent = traverseGroupContent;
+exports.traverseGroupItemsContent = traverseGroupItemsContent;

package/lib/content/fields/slices/Slice/CompositeSliceContent.d.ts

@@ -1706,4 +1706,4 @@ export declare function traverseCompositeSliceContent({ path, sliceName, model,
     sliceName: string;
     content: CompositeSliceContent;
     model?: CompositeSlice | undefined;
-}): (transform: TraverseContentFn) => CompositeSliceContent | undefined;
+}): (transform: TraverseContentFn) => CompositeSliceContent;

package/lib/content/fields/slices/Slice/CompositeSliceContent.js

@@ -8,6 +8,7 @@ const function_1 = require("fp-ts/lib/function");
 const t = (0, tslib_1.__importStar)(require("io-ts"));
 const LegacyContentCtx_1 = require("../../../LegacyContentCtx");
 const utils_1 = require("../../../utils");
+const GroupContent_1 = require("../../GroupContent");
 const nestable_1 = require("../../nestable");
 const RepeatableContent_1 = require("./RepeatableContent");
 exports.CompositeSliceContentType = "CompositeSliceContent";
@@ -102,30 +103,11 @@ function traverseCompositeSliceContent({ path, sliceName, model, content, }) {
                 [fieldKey]: transformedField,
             };
         }, {});
-        const items = content.repeat.map((itemBlock) => {
-            const itemBlockFields = itemBlock.value.reduce((acc, [fieldKey, fieldContent]) => {
-                var _a;
-                const fieldDef = (_a = model === null || model === void 0 ? void 0 : model.repeat) === null || _a === void 0 ? void 0 : _a[fieldKey];
-                const transformedField = transform({
-                    path: path.concat([
-                        { key: "repeat", type: "items" },
-                        { key: fieldKey, type: fieldContent.__TYPE__ },
-                    ]),
-                    key: fieldKey,
-                    apiId: sliceName,
-                    model: fieldDef,
-                    content: fieldContent,
-                });
-                // Can happen if the transform function returns undefined to filter out a field
-                if (!transformedField)
-                    return acc;
-                return acc.concat([[fieldKey, transformedField]]);
-            }, []);
-            return {
-                __TYPE__: itemBlock.__TYPE__,
-                value: itemBlockFields,
-            };
-        });
+        const items = (0, GroupContent_1.traverseGroupItemsContent)({
+            path: path.concat([{ key: "repeat", type: "items" }]),
+            model: model === null || model === void 0 ? void 0 : model.repeat,
+            content: content.repeat,
+        })(transform);
         return {
             __TYPE__: content.__TYPE__,
             repeat: items,

package/lib/content/fields/slices/Slice/SharedSliceContent.d.ts

@@ -1710,4 +1710,4 @@ export declare function traverseSharedSliceContent({ path, sliceName, model, con
     sliceName: string;
     content: SharedSliceContent;
     model?: SharedSlice | undefined;
-}): (transform: TraverseContentFn) => SharedSliceContent | undefined;
+}): (transform: TraverseContentFn) => SharedSliceContent;

package/lib/content/fields/slices/Slice/SharedSliceContent.js

@@ -9,6 +9,7 @@ const t = (0, tslib_1.__importStar)(require("io-ts"));
 const io_ts_types_1 = require("io-ts-types");
 const LegacyContentCtx_1 = require("../../../LegacyContentCtx");
 const utils_1 = require("../../../utils");
+const GroupContent_1 = require("../../GroupContent");
 const nestable_1 = require("../../nestable");
 const RepeatableContent_1 = require("./RepeatableContent");
 exports.SharedSliceContentType = "SharedSliceContent";
@@ -120,30 +121,11 @@ function traverseSharedSliceContent({ path, sliceName, model, content, }) {
                 [fieldKey]: transformedField,
             };
         }, {});
-        const items = content.items.map((itemBlock) => {
-            const itemBlockFields = itemBlock.value.reduce((acc, [fieldKey, fieldContent]) => {
-                var _a;
-                const fieldDef = variationDef && ((_a = variationDef.items) === null || _a === void 0 ? void 0 : _a[fieldKey]);
-                const transformedField = transform({
-                    path: path.concat([
-                        { key: "items", type: "items" },
-                        { key: fieldKey, type: fieldContent.__TYPE__ },
-                    ]),
-                    key: fieldKey,
-                    apiId: sliceName,
-                    model: fieldDef,
-                    content: fieldContent,
-                });
-                // Can happen if the transform function returns undefined to filter out a field
-                if (!transformedField)
-                    return acc;
-                return acc.concat([[fieldKey, transformedField]]);
-            }, []);
-            return {
-                __TYPE__: itemBlock.__TYPE__,
-                value: itemBlockFields,
-            };
-        });
+        const items = (0, GroupContent_1.traverseGroupItemsContent)({
+            path: path.concat([{ key: "items", type: "items" }]),
+            model: variationDef === null || variationDef === void 0 ? void 0 : variationDef.items,
+            content: content.items,
+        })(transform);
         return {
             __TYPE__: content.__TYPE__,
             variation: content.variation,

package/lib/content/fields/slices/SlicesContent.d.ts

@@ -5099,5 +5099,5 @@ export declare function traverseSlices({ path, model, content, }: {
     path: ContentPath;
     content: SlicesContent;
     model?: StaticSlices | undefined;
-}): (transform: TraverseContentFn) => SlicesContent | undefined;
+}): (transform: TraverseContentFn) => SlicesContent;
 export {};

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

@@ -79,8 +79,6 @@ function traverseSlices({ path, model, content, }) {
                         return sliceContent.widget;
                 }
             })();
-            if (!convertedSliceWidget)
-                return acc;
             const convertedSlice = transform({
                 key: sliceContent.key,
                 apiId: sliceContent.name,

package/package.json

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

package/src/content/fields/GroupContent.ts

@@ -4,7 +4,7 @@ import { pipe } from "fp-ts/lib/function"
 import * as t from "io-ts"
 
 import type { ContentPath, TraverseContentFn } from "../../_internal/utils"
-import type { Group } from "../../customtypes"
+import type { Group, NestableWidget } from "../../customtypes"
 import {
 	FieldOrSliceType,
 	getFieldCtx,
@@ -129,15 +129,41 @@ export function traverseGroupContent({
 	content: GroupContent
 	model?: Group | undefined
 }) {
-	return (transform: TraverseContentFn): GroupContent | undefined => {
-		const groupItems = content.value.map((groupItem, index) => {
+	return (transform: TraverseContentFn): GroupContent => {
+		const groupItems = traverseGroupItemsContent({
+			path,
+			model: model?.config?.fields,
+			content: content.value,
+		})(transform)
+
+		return {
+			__TYPE__: content.__TYPE__,
+			value: groupItems,
+		}
+	}
+}
+
+export function traverseGroupItemsContent({
+	path,
+	model,
+	content,
+}: {
+	path: ContentPath
+	content: Array<GroupItemContent>
+	model?: Record<string, NestableWidget> | undefined
+}) {
+	return (transform: TraverseContentFn): Array<GroupItemContent> => {
+		return content.map((groupItem, index) => {
+			const groupItemPath = path.concat([
+				{ key: index.toString(), type: "GroupItem" },
+			])
+
 			const groupItemFields = groupItem.value.reduce<GroupItemContent["value"]>(
 				(acc, [fieldKey, fieldContent]) => {
-					const fieldDef = model?.config?.fields?.[fieldKey]
+					const fieldDef = model?.[fieldKey]
 
 					const transformedField = transform({
-						path: path.concat([
-							{ key: index.toString(), type: "GroupItem" },
+						path: groupItemPath.concat([
 							{ key: fieldKey, type: fieldContent.__TYPE__ },
 						]),
 						key: fieldKey,
@@ -157,10 +183,5 @@ export function traverseGroupContent({
 				value: groupItemFields,
 			}
 		})
-
-		return {
-			__TYPE__: content.__TYPE__,
-			value: groupItems,
-		}
 	}
 }

package/src/content/fields/slices/Slice/CompositeSliceContent.ts

@@ -14,7 +14,7 @@ import {
 	WithTypes,
 } from "../../../LegacyContentCtx"
 import { hasContentType } from "../../../utils"
-import type { GroupItemContent } from "../../GroupContent"
+import { traverseGroupItemsContent } from "../../GroupContent"
 import { NestableContent, NestableLegacy } from "../../nestable"
 import { RepeatableWidgets, RepeatableWidgetsLegacy } from "./RepeatableContent"
 
@@ -135,7 +135,7 @@ export function traverseCompositeSliceContent({
 	content: CompositeSliceContent
 	model?: CompositeSlice | undefined
 }) {
-	return (transform: TraverseContentFn): CompositeSliceContent | undefined => {
+	return (transform: TraverseContentFn): CompositeSliceContent => {
 		const primary = Object.entries(content.nonRepeat).reduce<
 			Record<string, NestableContent>
 		>((acc, [fieldKey, fieldContent]) => {
@@ -159,33 +159,11 @@ export function traverseCompositeSliceContent({
 			}
 		}, {})
 
-		const items = content.repeat.map((itemBlock) => {
-			const itemBlockFields = itemBlock.value.reduce<GroupItemContent["value"]>(
-				(acc, [fieldKey, fieldContent]) => {
-					const fieldDef = model?.repeat?.[fieldKey]
-
-					const transformedField = transform({
-						path: path.concat([
-							{ key: "repeat", type: "items" },
-							{ key: fieldKey, type: fieldContent.__TYPE__ },
-						]),
-						key: fieldKey,
-						apiId: sliceName,
-						model: fieldDef,
-						content: fieldContent,
-					})
-					// Can happen if the transform function returns undefined to filter out a field
-					if (!transformedField) return acc
-					return acc.concat([[fieldKey, transformedField]])
-				},
-				[],
-			)
-
-			return {
-				__TYPE__: itemBlock.__TYPE__,
-				value: itemBlockFields,
-			}
-		})
+		const items = traverseGroupItemsContent({
+			path: path.concat([{ key: "repeat", type: "items" }]),
+			model: model?.repeat,
+			content: content.repeat,
+		})(transform)
 
 		return {
 			__TYPE__: content.__TYPE__,

package/src/content/fields/slices/Slice/SharedSliceContent.ts

@@ -15,7 +15,7 @@ import {
 	WithTypes,
 } from "../../../LegacyContentCtx"
 import { hasContentType } from "../../../utils"
-import type { GroupItemContent } from "../../GroupContent"
+import { traverseGroupItemsContent } from "../../GroupContent"
 import { NestableContent, NestableLegacy } from "../../nestable"
 import { RepeatableWidgets, RepeatableWidgetsLegacy } from "./RepeatableContent"
 
@@ -146,7 +146,7 @@ export function traverseSharedSliceContent({
 	content: SharedSliceContent
 	model?: SharedSlice | undefined
 }) {
-	return (transform: TraverseContentFn): SharedSliceContent | undefined => {
+	return (transform: TraverseContentFn): SharedSliceContent => {
 		const variationDef = model?.variations.find(
 			(v) => v.id === content.variation,
 		)
@@ -174,33 +174,11 @@ export function traverseSharedSliceContent({
 			}
 		}, {})
 
-		const items = content.items.map((itemBlock) => {
-			const itemBlockFields = itemBlock.value.reduce<GroupItemContent["value"]>(
-				(acc, [fieldKey, fieldContent]) => {
-					const fieldDef = variationDef && variationDef.items?.[fieldKey]
-
-					const transformedField = transform({
-						path: path.concat([
-							{ key: "items", type: "items" },
-							{ key: fieldKey, type: fieldContent.__TYPE__ },
-						]),
-						key: fieldKey,
-						apiId: sliceName,
-						model: fieldDef,
-						content: fieldContent,
-					})
-					// Can happen if the transform function returns undefined to filter out a field
-					if (!transformedField) return acc
-					return acc.concat([[fieldKey, transformedField]])
-				},
-				[],
-			)
-
-			return {
-				__TYPE__: itemBlock.__TYPE__,
-				value: itemBlockFields,
-			}
-		})
+		const items = traverseGroupItemsContent({
+			path: path.concat([{ key: "items", type: "items" }]),
+			model: variationDef?.items,
+			content: content.items,
+		})(transform)
 
 		return {
 			__TYPE__: content.__TYPE__,

package/src/content/fields/slices/SlicesContent.ts

@@ -75,7 +75,7 @@ export function traverseSlices({
 	content: SlicesContent
 	model?: StaticSlices | undefined
 }) {
-	return (transform: TraverseContentFn): SlicesContent | undefined => {
+	return (transform: TraverseContentFn): SlicesContent => {
 		const value = content.value.reduce<SlicesContent["value"]>(
 			(acc, sliceContent) => {
 				const sliceModel: StaticSlice | undefined =
@@ -124,8 +124,6 @@ export function traverseSlices({
 					}
 				})()
 
-				if (!convertedSliceWidget) return acc
-
 				const convertedSlice = transform({
 					key: sliceContent.key,
 					apiId: sliceContent.name,

package/lib/validators/NullOrT.d.ts

@@ -1,2 +0,0 @@
-import * as t from "io-ts";
-export declare const NullOrElse: <A, O = A>(codec: t.Type<A, O, unknown>) => t.Type<A | null, O | undefined, unknown>;

package/lib/validators/NullOrT.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NullOrElse = void 0;
-const tslib_1 = require("tslib");
-const Either_1 = require("fp-ts/lib/Either");
-const t = (0, tslib_1.__importStar)(require("io-ts"));
-const NullOrElse = (codec) => new t.Type("NullOrT", (u) => null === u || codec.is(u), (u) => {
-    if ((0, Either_1.isRight)(t.null.decode(u)))
-        return t.success(null);
-    return codec.decode(u);
-}, (chunk) => (chunk ? codec.encode(chunk) : undefined));
-exports.NullOrElse = NullOrElse;