@prismicio/types-internal 4.0.0-pr.6.09bccf8 → 4.0.0-pr.6.0ddf815

package/src/helpers/traverseContentWithModel.ts

@@ -1,12 +1,3 @@
-import type { StaticCustomTypeModel } from "../model/customType"
-import type { GroupModel, NestedGroupModel } from "../model/group"
-import type { LinkModel } from "../model/link"
-import type { NestableModel } from "../model/nestable"
-import type { CompositeSliceModel, LegacySliceModel, SharedSliceVariationModel } from "../model/slice"
-import type { StaticSlicesModel } from "../model/slices"
-import { TableCellModel } from "../model/table"
-import type { TableModel } from "../model/table"
-import type { StaticWidgetModel } from "../model/widget"
 import type { DocumentContent } from "../content/document"
 import { GroupContentType } from "../content/group"
 import type { GroupContent, GroupItemContent } from "../content/group"
@@ -26,6 +17,19 @@ import {
 } from "../content/slices"
 import { TableContentType, type TableContent } from "../content/table"
 import type { WidgetContent } from "../content/widget"
+import type { StaticCustomTypeModel } from "../model/customType"
+import type { GroupModel, NestedGroupModel } from "../model/group"
+import type { LinkModel } from "../model/link"
+import type { NestableModel } from "../model/nestable"
+import type {
+	CompositeSliceModel,
+	LegacySliceModel,
+	SharedSliceVariationModel,
+} from "../model/slice"
+import type { StaticSlicesModel } from "../model/slices"
+import { TableCellModel } from "../model/table"
+import type { TableModel } from "../model/table"
+import type { StaticWidgetModel } from "../model/widget"
 import * as contentPath from "./contentPath"
 import * as customTypeModel from "./customTypeModel"
 
@@ -162,8 +166,8 @@ export function traverseSlicesContentWithModel(
 
 type TraverseSharedSliceContentWithModelConfig = {
 	model: SharedSliceVariationModel
-	transformWidget: TraverseWidgetContentWithModelFunction
-	transformSlice: TraverseSliceContentWithModelFunction
+	transformWidget?: TraverseWidgetContentWithModelFunction
+	transformSlice?: TraverseSliceContentWithModelFunction
 }
 
 export function traverseSharedSliceContentWithModel(
@@ -173,12 +177,15 @@ export function traverseSharedSliceContentWithModel(
 	content: SharedSliceItemContent | undefined,
 	config: TraverseSharedSliceContentWithModelConfig,
 ): SharedSliceItemContent | undefined {
-	const { transformWidget, transformSlice } = config
-
 	if (!content) {
 		return
 	}
 
+	const {
+		transformWidget = (args) => args.content,
+		transformSlice = (args) => args.content
+	} = config
+
 	const traversedPrimary: SharedSliceContent["primary"] = {}
 	for (const [key, model] of Object.entries(config.model.fields.primary ?? {})) {
 		const traversedContent = traverseWidgetContentWithModel(
@@ -217,8 +224,8 @@ export function traverseSharedSliceContentWithModel(
 
 type TraverseCompositeSliceContentWithModelConfig = {
 	model: CompositeSliceModel
-	transformWidget: TraverseWidgetContentWithModelFunction
-	transformSlice: TraverseSliceContentWithModelFunction
+	transformWidget?: TraverseWidgetContentWithModelFunction
+	transformSlice?: TraverseSliceContentWithModelFunction
 }
 
 export function traverseCompositeSliceContentWithModel(
@@ -228,12 +235,15 @@ export function traverseCompositeSliceContentWithModel(
 	content: CompositeSliceItemContent | undefined,
 	config: TraverseCompositeSliceContentWithModelConfig,
 ): CompositeSliceItemContent | undefined {
-	const { transformWidget, transformSlice } = config
-
 	if (!content) {
 		return
 	}
 
+	const {
+		transformWidget = (args) => args.content,
+		transformSlice = (args) => args.content
+	} = config
+
 	const traversedPrimary: CompositeSliceContent["nonRepeat"] = {}
 	for (const [key, model] of Object.entries(config.model?.["non-repeat"] ?? {})) {
 		const traversedContent = traverseWidgetContentWithModel(
@@ -269,8 +279,8 @@ export function traverseCompositeSliceContentWithModel(
 
 type TraverseLegacySliceContentWithModelConfig = {
 	model: LegacySliceModel
-	transformWidget: TraverseWidgetContentWithModelFunction
-	transformSlice: TraverseSliceContentWithModelFunction
+	transformWidget?: TraverseWidgetContentWithModelFunction
+	transformSlice?: TraverseSliceContentWithModelFunction
 }
 
 export function traverseLegacySliceContentWithModel(
@@ -280,12 +290,16 @@ export function traverseLegacySliceContentWithModel(
 	content: LegacySliceItemContent | undefined,
 	config: TraverseLegacySliceContentWithModelConfig,
 ): LegacySliceItemContent | undefined {
-	const { model, transformWidget, transformSlice } = config
-
 	if (!content) {
 		return
 	}
 
+	const {
+		model,
+		transformWidget = (args) => args.content,
+		transformSlice = (args) => args.content
+	} = config
+
 	const traversedContent = traverseWidgetContentWithModel(path, key, apiID, content.widget, {
 		model,
 		transformWidget,

package/src/index.ts

@@ -35,7 +35,13 @@ export type {
 	SharedSliceContent,
 	SliceContent,
 } from "./content/slice"
-export type { SliceItemContent, SlicesContent } from "./content/slices"
+export type {
+	LegacySliceItemContent,
+	CompositeSliceItemContent,
+	SharedSliceItemContent,
+	SliceItemContent,
+	SlicesContent,
+} from "./content/slices"
 export type { TableContent } from "./content/table"
 export type { UIDContent } from "./content/uid"
 export type { WidgetContent } from "./content/widget"

package/src/io-ts.ts

@@ -70,7 +70,13 @@ import {
 	SharedSliceContentSchema,
 	SliceContentSchema,
 } from "./content/slice"
-import { SliceItemContentSchema, SlicesContentSchema } from "./content/slices"
+import {
+	LegacySliceItemContentSchema,
+	CompositeSliceItemContentSchema,
+	SharedSliceItemContentSchema,
+	SliceItemContentSchema,
+	SlicesContentSchema,
+} from "./content/slices"
 import { TableContentSchema } from "./content/table"
 import { UIDContentSchema } from "./content/uid"
 import { WidgetContentSchema } from "./content/widget"
@@ -142,6 +148,9 @@ export const GroupItemContent = toIOTS(GroupItemContentSchema)
 export const CompositeSliceContent = toIOTS(CompositeSliceContentSchema)
 export const LegacySliceContent = toIOTS(LegacySliceContentSchema)
 export const SliceContent = toIOTS(SliceContentSchema)
+export const LegacySliceItemContent = toIOTS(LegacySliceItemContentSchema)
+export const CompositeSliceItemContent = toIOTS(CompositeSliceItemContentSchema)
+export const SharedSliceItemContent = toIOTS(SharedSliceItemContentSchema)
 export const SliceItemContent = toIOTS(SliceItemContentSchema)
 export const SlicesContent = toIOTS(SlicesContentSchema)
 export const WidgetContent = toIOTS(WidgetContentSchema)
@@ -240,7 +249,11 @@ function toIOTSCodec<TArgs extends unknown[], A, LegacyRaw, AllowUndefined exten
 ) => t.Type<A, ReturnType<LegacyCodec<A, LegacyRaw, AllowUndefined>["fromContent"]>, unknown> {
 	return (...args: TArgs) => {
 		const codec = codecFactory(...args)
-		return new t.Type<A, ReturnType<LegacyCodec<A, LegacyRaw, AllowUndefined>["fromContent"]>, unknown>(
+		return new t.Type<
+			A,
+			ReturnType<LegacyCodec<A, LegacyRaw, AllowUndefined>["fromContent"]>,
+			unknown
+		>(
 			codec.name,
 			codec.is,
 			(input, context) => {

package/src/model/widget.ts

@@ -2,9 +2,9 @@ import { z } from "zod/mini"
 
 import { GroupModelSchema } from "./group"
 import { NestableModelSchema } from "./nestable"
+import { SliceModelTypeSchema } from "./slice"
 import { DynamicSlicesModelSchema, StaticSlicesModelSchema } from "./slices"
 import { UIDModelSchema } from "./uid"
-import { SliceModelTypeSchema } from "./slice"
 
 // StaticWidget = UID | Nestable | Group | StaticSlices
 export const StaticWidgetModelSchema = z.union([
@@ -54,9 +54,6 @@ export const FieldModelTypeSchema = z.enum([
 export type FieldModelType = z.infer<typeof FieldModelTypeSchema>
 
 // Field and slice types
-export const FieldOrSliceTypeSchema = z.union([
-	FieldModelTypeSchema,
-	SliceModelTypeSchema,
-])
+export const FieldOrSliceTypeSchema = z.union([FieldModelTypeSchema, SliceModelTypeSchema])
 
 export type FieldOrSliceType = z.infer<typeof FieldOrSliceTypeSchema>

package/src/zod4.ts

@@ -34,7 +34,13 @@ import {
 	SharedSliceContentSchema,
 	SliceContentSchema,
 } from "./content/slice"
-import { SliceItemContentSchema, SlicesContentSchema } from "./content/slices"
+import {
+	LegacySliceItemContentSchema,
+	CompositeSliceItemContentSchema,
+	SharedSliceItemContentSchema,
+	SliceItemContentSchema,
+	SlicesContentSchema,
+} from "./content/slices"
 import { TableContentSchema } from "./content/table"
 import { UIDContentSchema } from "./content/uid"
 import { WidgetContentSchema } from "./content/widget"
@@ -106,6 +112,9 @@ export const GroupItemContent = toZod4(GroupItemContentSchema)
 export const CompositeSliceContent = toZod4(CompositeSliceContentSchema)
 export const LegacySliceContent = toZod4(LegacySliceContentSchema)
 export const SliceContent = toZod4(SliceContentSchema)
+export const LegacySliceItemContent = toZod4(LegacySliceItemContentSchema)
+export const CompositeSliceItemContent = toZod4(CompositeSliceItemContentSchema)
+export const SharedSliceItemContent = toZod4(SharedSliceItemContentSchema)
 export const SliceItemContent = toZod4(SliceItemContentSchema)
 export const SlicesContent = toZod4(SlicesContentSchema)
 export const WidgetContent = toZod4(WidgetContentSchema)