@prismicio/types-internal 2.0.0-alpha.3 → 2.0.0-alpha.5

package/lib/customtypes/widgets/nestable/Text.d.ts

@@ -17,4 +17,3 @@ export declare const Text: t.ExactC<t.IntersectionC<[t.TypeC<{
     }>>;
 }>]>>;
 export type Text = t.TypeOf<typeof Text>;
-export default Text;

package/lib/customtypes/widgets/nestable/Text.js

@@ -19,4 +19,3 @@ exports.Text = t.exact(t.intersection([
         config: exports.TextConfig,
     }),
 ]));
-exports.default = exports.Text;

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

@@ -1,6 +1,10 @@
 import * as t from "io-ts";
 export declare const CompositeSliceType = "Slice";
-declare const CompositeSlice: t.ExactC<t.IntersectionC<[t.TypeC<{
+export declare const CompositeSliceConfig: t.ExactC<t.PartialC<{
+    label: t.UnionC<[t.Type<string, string, unknown>, t.NullC, t.UndefinedC]>;
+}>>;
+export type CompositeSliceConfig = t.TypeOf<typeof CompositeSliceConfig>;
+export declare const CompositeSlice: t.ExactC<t.IntersectionC<[t.TypeC<{
     type: t.LiteralC<"Slice">;
 }>, t.PartialC<{
     fieldset: t.UnionC<[t.Type<string, string, unknown>, t.NullC, t.UndefinedC]>;
@@ -325,5 +329,4 @@ declare const CompositeSlice: t.ExactC<t.IntersectionC<[t.TypeC<{
         label: t.UnionC<[t.Type<string, string, unknown>, t.NullC, t.UndefinedC]>;
     }>>;
 }>]>>;
-type CompositeSlice = t.TypeOf<typeof CompositeSlice>;
-export default CompositeSlice;
+export type CompositeSlice = t.TypeOf<typeof CompositeSlice>;

package/lib/customtypes/widgets/slices/CompositeSlice.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CompositeSliceType = void 0;
+exports.CompositeSlice = exports.CompositeSliceConfig = exports.CompositeSliceType = void 0;
 const tslib_1 = require("tslib");
 const t = tslib_1.__importStar(require("io-ts"));
 const common_1 = require("../../../common");
 const validators_1 = require("../../../validators");
 const NestableWidget_1 = require("../nestable/NestableWidget");
 exports.CompositeSliceType = "Slice";
-const CompositeSliceConfig = t.exact(t.partial({
+exports.CompositeSliceConfig = t.exact(t.partial({
     label: validators_1.StringOrNull,
 }));
-const CompositeSlice = t.exact(t.intersection([
+exports.CompositeSlice = t.exact(t.intersection([
     t.type({
         type: t.literal(exports.CompositeSliceType),
     }),
@@ -21,7 +21,6 @@ const CompositeSlice = t.exact(t.intersection([
         display: t.string,
         "non-repeat": t.record(common_1.WidgetKey, NestableWidget_1.NestableWidget),
         repeat: t.record(common_1.WidgetKey, NestableWidget_1.NestableWidget),
-        config: CompositeSliceConfig,
+        config: exports.CompositeSliceConfig,
     }),
 ]));
-exports.default = CompositeSlice;

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

@@ -1,5 +1,5 @@
 import * as t from "io-ts";
-declare const LegacySlice: t.UnionC<[t.UnionC<[t.ExactC<t.IntersectionC<[t.TypeC<{
+export declare const LegacySlice: t.UnionC<[t.UnionC<[t.ExactC<t.IntersectionC<[t.TypeC<{
     type: t.LiteralC<"Color">;
 }>, t.PartialC<{
     fieldset: t.UnionC<[t.Type<string, string, unknown>, t.NullC, t.UndefinedC]>;
@@ -323,5 +323,4 @@ declare const LegacySlice: t.UnionC<[t.UnionC<[t.ExactC<t.IntersectionC<[t.TypeC
         }>]>>]>>;
     }>>;
 }>]>>]>;
-type LegacySlice = t.TypeOf<typeof LegacySlice>;
-export default LegacySlice;
+export type LegacySlice = t.TypeOf<typeof LegacySlice>;

package/lib/customtypes/widgets/slices/LegacySlice.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.LegacySlice = void 0;
 const tslib_1 = require("tslib");
 const t = tslib_1.__importStar(require("io-ts"));
-const Group_1 = tslib_1.__importDefault(require("../Group"));
+const Group_1 = require("../Group");
 const NestableWidget_1 = require("../nestable/NestableWidget");
-const LegacySlice = t.union([NestableWidget_1.NestableWidget, Group_1.default]);
-exports.default = LegacySlice;
+exports.LegacySlice = t.union([NestableWidget_1.NestableWidget, Group_1.Group]);

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

@@ -1,6 +1,5 @@
 import * as t from "io-ts";
-declare const SharedSliceRef: t.ExactC<t.TypeC<{
+export declare const SharedSliceRef: t.ExactC<t.TypeC<{
     type: t.LiteralC<"SharedSlice">;
 }>>;
-type SharedSliceRef = t.TypeOf<typeof SharedSliceRef>;
-export default SharedSliceRef;
+export type SharedSliceRef = t.TypeOf<typeof SharedSliceRef>;

package/lib/customtypes/widgets/slices/SharedSliceRef.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SharedSliceRef = void 0;
 const tslib_1 = require("tslib");
 const t = tslib_1.__importStar(require("io-ts"));
 const SharedSlice_1 = require("./SharedSlice");
-const SharedSliceRef = t.exact(t.type({
+exports.SharedSliceRef = t.exact(t.type({
     type: t.literal(SharedSlice_1.SharedSliceType),
 }));
-exports.default = SharedSliceRef;

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

@@ -1,6 +1,6 @@
-import type CompositeSlice from "./CompositeSlice";
-import type LegacySlice from "./LegacySlice";
+import type { CompositeSlice } from "./CompositeSlice";
+import type { LegacySlice } from "./LegacySlice";
 import type { SharedSlice } from "./SharedSlice";
-import type SharedSliceRef from "./SharedSliceRef";
+import type { SharedSliceRef } from "./SharedSliceRef";
 export type DynamicSlice = CompositeSlice | LegacySlice | SharedSliceRef;
 export type StaticSlice = CompositeSlice | LegacySlice | SharedSlice;

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

@@ -1,6 +1,6 @@
 import * as t from "io-ts";
 import { SharedSlice } from "./SharedSlice";
-import SharedSliceRef from "./SharedSliceRef";
+import { SharedSliceRef } from "./SharedSliceRef";
 export declare const LegacySlicesFieldType = "Choice";
 export declare const SlicesFieldType = "Slices";
 export declare const SlicesLabels: t.UnionC<[t.RecordC<t.StringC, t.ReadonlyArrayC<t.ExactC<t.IntersectionC<[t.TypeC<{
@@ -2316,13 +2316,19 @@ export declare const DynamicSlicesConfig: t.ExactC<t.PartialC<{
 }>>;
 export type DynamicSlicesConfig = t.TypeOf<typeof DynamicSlicesConfig>;
 export declare function slicesReader<T extends StaticSlicesConfig | DynamicSlicesConfig>(codec: t.Type<T, unknown>): t.ExactC<t.IntersectionC<[t.TypeC<{
-    type: t.UnionC<[t.LiteralC<"Slices">, t.LiteralC<"Choice">]>;
+    type: t.KeyofC<{
+        Slices: null;
+        Choice: null;
+    }>;
 }>, t.PartialC<{
     fieldset: t.UnionC<[t.Type<string, string, unknown>, t.NullC, t.UndefinedC]>;
     config: t.Type<T, unknown, unknown>;
 }>]>>;
 export declare const StaticSlices: t.ExactC<t.IntersectionC<[t.TypeC<{
-    type: t.UnionC<[t.LiteralC<"Slices">, t.LiteralC<"Choice">]>;
+    type: t.KeyofC<{
+        Slices: null;
+        Choice: null;
+    }>;
 }>, t.PartialC<{
     fieldset: t.UnionC<[t.Type<string, string, unknown>, t.NullC, t.UndefinedC]>;
     config: t.Type<{
@@ -3328,7 +3334,10 @@ export declare const StaticSlices: t.ExactC<t.IntersectionC<[t.TypeC<{
 }>]>>;
 export type StaticSlices = t.TypeOf<typeof StaticSlices>;
 export declare const DynamicSlices: t.ExactC<t.IntersectionC<[t.TypeC<{
-    type: t.UnionC<[t.LiteralC<"Slices">, t.LiteralC<"Choice">]>;
+    type: t.KeyofC<{
+        Slices: null;
+        Choice: null;
+    }>;
 }>, t.PartialC<{
     fieldset: t.UnionC<[t.Type<string, string, unknown>, t.NullC, t.UndefinedC]>;
     config: t.Type<{

package/lib/customtypes/widgets/slices/Slices.js

@@ -5,10 +5,10 @@ const tslib_1 = require("tslib");
 const t = tslib_1.__importStar(require("io-ts"));
 const common_1 = require("../../../common");
 const validators_1 = require("../../../validators");
-const CompositeSlice_1 = tslib_1.__importDefault(require("./CompositeSlice"));
-const LegacySlice_1 = tslib_1.__importDefault(require("./LegacySlice"));
+const CompositeSlice_1 = require("./CompositeSlice");
+const LegacySlice_1 = require("./LegacySlice");
 const SharedSlice_1 = require("./SharedSlice");
-const SharedSliceRef_1 = tslib_1.__importDefault(require("./SharedSliceRef"));
+const SharedSliceRef_1 = require("./SharedSliceRef");
 exports.LegacySlicesFieldType = "Choice";
 exports.SlicesFieldType = "Slices";
 exports.SlicesLabels = t.union([
@@ -26,12 +26,12 @@ function slicesConfigReader(codec) {
     return t.exact(t.partial({
         label: validators_1.StringOrNull,
         labels: exports.SlicesLabels,
-        choices: t.record(common_1.WidgetKey, t.union([LegacySlice_1.default, CompositeSlice_1.default, codec])),
+        choices: t.record(common_1.WidgetKey, t.union([LegacySlice_1.LegacySlice, CompositeSlice_1.CompositeSlice, codec])),
     }));
 }
 exports.slicesConfigReader = slicesConfigReader;
 exports.StaticSlicesConfig = slicesConfigReader(SharedSlice_1.SharedSlice);
-exports.DynamicSlicesConfig = slicesConfigReader(SharedSliceRef_1.default);
+exports.DynamicSlicesConfig = slicesConfigReader(SharedSliceRef_1.SharedSliceRef);
 const SlicesConfig = {
     toStatic(config, sharedSlices) {
         const choices = Object.entries(config.choices || {}).reduce((acc, [ref, slice]) => {
@@ -52,10 +52,10 @@ const SlicesConfig = {
 function slicesReader(codec) {
     return t.exact(t.intersection([
         t.type({
-            type: t.union([
-                t.literal(exports.SlicesFieldType),
-                t.literal(exports.LegacySlicesFieldType),
-            ]),
+            type: t.keyof({
+                [exports.SlicesFieldType]: null,
+                [exports.LegacySlicesFieldType]: null,
+            }),
         }),
         t.partial({
             fieldset: validators_1.StringOrNull,

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

@@ -1,7 +1,7 @@
-export { default as CompositeSlice } from "./CompositeSlice";
-export { default as LegacySlice } from "./LegacySlice";
+export * from "./CompositeSlice";
+export * from "./LegacySlice";
 export * from "./SharedSlice";
-export { default as SharedSliceRef } from "./SharedSliceRef";
-export * as Slice from "./Slice";
-export * as SliceZone from "./Slices";
-export { SlicesTypes } from "./SlicesTypes";
+export * from "./SharedSliceRef";
+export * from "./Slice";
+export * from "./Slices";
+export * from "./SlicesTypes";

package/lib/customtypes/widgets/slices/index.js

@@ -1,15 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SlicesTypes = exports.SliceZone = exports.Slice = exports.SharedSliceRef = exports.LegacySlice = exports.CompositeSlice = void 0;
 const tslib_1 = require("tslib");
-var CompositeSlice_1 = require("./CompositeSlice");
-Object.defineProperty(exports, "CompositeSlice", { enumerable: true, get: function () { return tslib_1.__importDefault(CompositeSlice_1).default; } });
-var LegacySlice_1 = require("./LegacySlice");
-Object.defineProperty(exports, "LegacySlice", { enumerable: true, get: function () { return tslib_1.__importDefault(LegacySlice_1).default; } });
+tslib_1.__exportStar(require("./CompositeSlice"), exports);
+tslib_1.__exportStar(require("./LegacySlice"), exports);
 tslib_1.__exportStar(require("./SharedSlice"), exports);
-var SharedSliceRef_1 = require("./SharedSliceRef");
-Object.defineProperty(exports, "SharedSliceRef", { enumerable: true, get: function () { return tslib_1.__importDefault(SharedSliceRef_1).default; } });
-exports.Slice = tslib_1.__importStar(require("./Slice"));
-exports.SliceZone = tslib_1.__importStar(require("./Slices"));
-var SlicesTypes_1 = require("./SlicesTypes");
-Object.defineProperty(exports, "SlicesTypes", { enumerable: true, get: function () { return SlicesTypes_1.SlicesTypes; } });
+tslib_1.__exportStar(require("./SharedSliceRef"), exports);
+tslib_1.__exportStar(require("./Slice"), exports);
+tslib_1.__exportStar(require("./Slices"), exports);
+tslib_1.__exportStar(require("./SlicesTypes"), exports);

package/package.json

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

package/src/content/Document.ts

@@ -1,4 +1,5 @@
 import { either } from "fp-ts"
+import { isLeft, isRight } from "fp-ts/lib/Either"
 import { pipe } from "fp-ts/lib/function"
 import * as t from "io-ts"
 
@@ -29,7 +30,7 @@ const DocumentLegacyCodec = (allTypes?: LegacyContentCtx["allTypes"]) => {
 						(acc, [widgetKey, widgetValue]) => {
 							const widgetCtx = defaultCtx(widgetKey, allTypes)
 							const parsedW = WidgetLegacy(widgetCtx).decode(widgetValue)
-							if (!parsedW || parsedW?._tag === "Left") return acc
+							if (!parsedW || isLeft(parsedW)) return acc
 
 							return { ...acc, [widgetKey]: parsedW.right }
 						},
@@ -68,7 +69,7 @@ function extractMetadata(data: { [p: string]: unknown }): {
 		(acc, [k, v]) => {
 			if (k.endsWith("_TYPE")) {
 				const decodedValue = FieldOrSliceType.decode(v)
-				if (decodedValue._tag === "Right") {
+				if (isRight(decodedValue)) {
 					return {
 						...acc,
 						types: acc.types.set(
@@ -118,7 +119,7 @@ function parseLegacyDocument(legacyDoc: unknown): Document | undefined {
 		}),
 	)
 
-	return result._tag === "Left" ? undefined : result.right
+	return isLeft(result) ? undefined : result.right
 }
 
 function encodeToLegacyDocument(document: Document): DocumentLegacy {

package/src/content/LegacyContentCtx.ts

@@ -1,8 +1,8 @@
 import * as t from "io-ts"
 
-import { FieldTypes, SlicesTypes } from "../customtypes/widgets"
+import { FieldType, SlicesTypes } from "../customtypes/widgets"
 
-export const FieldOrSliceType = t.union([FieldTypes, SlicesTypes])
+export const FieldOrSliceType = t.union([FieldType, SlicesTypes])
 export type FieldOrSliceType = t.TypeOf<typeof FieldOrSliceType>
 export class LegacyContentCtx {
 	fieldKey: string

package/src/content/fields/GroupContent.ts

@@ -1,4 +1,5 @@
 import { either } from "fp-ts"
+import { isLeft } from "fp-ts/lib/Either"
 import { pipe } from "fp-ts/lib/function"
 import * as t from "io-ts"
 
@@ -20,7 +21,7 @@ export const GroupItemContent = t.strict({
 export type GroupItemContent = t.TypeOf<typeof GroupItemContent>
 
 const itemLegacyReader = t.array(t.tuple([t.string, t.unknown]))
-export type GroupItemLegacy = t.TypeOf<typeof itemLegacyReader>
+type GroupItemLegacy = t.TypeOf<typeof itemLegacyReader>
 
 export const GroupItemLegacy = (ctx: LegacyContentCtx) => {
 	return new t.Type<GroupItemContent, WithTypes<GroupItemLegacy>>(
@@ -37,9 +38,8 @@ export const GroupItemLegacy = (ctx: LegacyContentCtx) => {
 							const result = NestableLegacy(itemCtx).decode(itemValue)
 							if (!result) return acc
 
-							if (result._tag === "Right")
-								return [...acc, [itemKey, result.right]]
-							else return acc
+							if (isLeft(result)) return acc
+							return [...acc, [itemKey, result.right]]
 						},
 						[],
 					)

package/src/content/fields/WidgetContent.ts

@@ -35,7 +35,7 @@ export const isWidgetContent = (u: unknown): u is WidgetContent =>
 	isSlicesContent(u)
 
 export type WidgetContent = t.TypeOf<typeof WidgetContent>
-export type WidgetTypes = WidgetContent["__TYPE__"]
+export type ContentType = WidgetContent["__TYPE__"]
 
 export const WidgetLegacy = (ctx: LegacyContentCtx) => {
 	return {

package/src/content/fields/nestable/EmbedContent.ts

@@ -34,7 +34,7 @@ export const EmbedContentLegacy = t.exact(
 	]),
 )
 
-export type EmbedLegacy = t.TypeOf<typeof EmbedContentLegacy>
+type EmbedLegacy = t.TypeOf<typeof EmbedContentLegacy>
 
 export const EmbedLegacy = (ctx: LegacyContentCtx) =>
 	new t.Type<EmbedContent, WithTypes<EmbedLegacy>, unknown>(

package/src/content/fields/nestable/NestableContent.ts

@@ -1,3 +1,4 @@
+import { isRight } from "fp-ts/lib/Either"
 import * as t from "io-ts"
 
 import type { LegacyContentCtx } from "../../LegacyContentCtx"
@@ -119,7 +120,7 @@ export const NestableLegacy = (ctx: LegacyContentCtx) => {
 			if (!ctx.fieldType) return
 
 			const nullValue = EmptyLegacy(ctx.fieldType).decode(value)
-			if (nullValue._tag === "Right") return nullValue
+			if (isRight(nullValue)) return nullValue
 
 			const codec = (() => {
 				switch (ctx.fieldType) {

package/src/content/fields/nestable/RichTextContent/Blocks.ts

@@ -1,5 +1,5 @@
 import { either } from "fp-ts"
-import * as E from "fp-ts/lib/Either"
+import { isLeft, isRight } from "fp-ts/lib/Either"
 import { pipe } from "fp-ts/lib/function"
 import * as t from "io-ts"
 
@@ -44,12 +44,12 @@ export const ValidatedMetas = (linkCodec: LinkCodec) =>
 				const res = metas
 					.reduce<Array<Meta>>((acc, maybeMeta) => {
 						const maybeDecodedMeta = Meta.decode(maybeMeta)
-						if (E.isRight(maybeDecodedMeta)) {
+						if (isRight(maybeDecodedMeta)) {
 							const meta = maybeDecodedMeta.right
 							// if it's an hyperlink it should have data validated as link otherwise we don't care and keep the meta
 							if (meta.data && meta.type === "hyperlink") {
 								const decoded = linkCodec.decode(meta.data)
-								if (decoded._tag === "Left") return acc
+								if (isLeft(decoded)) return acc
 
 								return [...acc, { ...meta, data: decoded.right }]
 							} else if (meta.type !== "hyperlink") {
@@ -67,7 +67,7 @@ export const ValidatedMetas = (linkCodec: LinkCodec) =>
 				if (meta.type === "hyperlink" && meta.data) {
 					// since the Span data are typed as unknown we have to redecode for type safety and then encode to either new format or legacy.
 					const decoded = linkCodec.decode(meta.data)
-					if (decoded._tag === "Left") return acc
+					if (isLeft(decoded)) return acc
 
 					return [...acc, { ...meta, data: linkCodec.encode(decoded.right) }]
 				}

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

@@ -1,4 +1,5 @@
 import { either } from "fp-ts"
+import { isLeft } from "fp-ts/lib/Either"
 import { pipe } from "fp-ts/lib/function"
 import * as t from "io-ts"
 
@@ -44,7 +45,7 @@ export const CompositeSliceLegacy = (ctx: LegacyContentCtx) => {
 							const result = RepeatableWidgetsLegacy(itemsCtx).decode(
 								parsedSlice.repeat,
 							)
-							if (!result || result._tag === "Left") return
+							if (!result || isLeft(result)) return
 							return result.right
 						})() || []
 
@@ -57,8 +58,8 @@ export const CompositeSliceLegacy = (ctx: LegacyContentCtx) => {
 						const result = NestableLegacy(fieldCtx).decode(value)
 						if (!result) return acc
 
-						if (result._tag === "Right") return { ...acc, [key]: result.right }
-						else return acc
+						if (isLeft(result)) return acc
+						return { ...acc, [key]: result.right }
 					}, {})
 
 					return {

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

@@ -1,4 +1,5 @@
 import { either } from "fp-ts"
+import { isLeft } from "fp-ts/lib/Either"
 import { pipe } from "fp-ts/lib/function"
 import * as t from "io-ts"
 import { withFallback } from "io-ts-types"
@@ -43,7 +44,7 @@ export const SharedSliceLegacy = (ctx: LegacyContentCtx) => {
 							const result = RepeatableWidgetsLegacy(itemsCtx).decode(
 								parsedSlice.items,
 							)
-							if (!result || result._tag === "Left") return
+							if (!result || isLeft(result)) return
 							return result.right
 						})() || []
 
@@ -59,8 +60,8 @@ export const SharedSliceLegacy = (ctx: LegacyContentCtx) => {
 						const result = NestableLegacy(FieldCtx).decode(value)
 						if (!result) return acc
 
-						if (result._tag === "Right") return { ...acc, [key]: result.right }
-						else return acc
+						if (isLeft(result)) return acc
+						return { ...acc, [key]: result.right }
 					}, {})
 
 					return {

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

@@ -1,4 +1,5 @@
 import { either } from "fp-ts"
+import { isLeft } from "fp-ts/lib/Either"
 import { pipe } from "fp-ts/lib/function"
 import * as t from "io-ts"
 
@@ -54,8 +55,7 @@ export const SlicesItemLegacy = (ctx: LegacyContentCtx) => {
 					)
 					const itemCtx = getFieldCtx(parsedSlice.key, ctx)
 					const item = SliceLegacy(itemCtx).decode(parsedSlice.value)
-					if (!item || item._tag === "Left")
-						return t.failure(sliceItem, context)
+					if (!item || isLeft(item)) return t.failure(sliceItem, context)
 
 					return t.success({
 						key: parsedSlice.key,

package/src/content/utils.ts

@@ -1,3 +1,5 @@
+import { isRight } from "fp-ts/lib/Either"
+
 import { FieldContentType, FieldType } from "./fields"
 
 type WithFieldType = WithContentType & { type: FieldType }
@@ -7,14 +9,11 @@ export function hasFieldContentType(obj: unknown): obj is WithFieldType {
 		obj.__TYPE__ === FieldContentType &&
 		(obj as WithFieldType)?.type !== undefined &&
 		typeof (obj as WithFieldType).type === "string" &&
-		FieldType.decode((obj as WithFieldType).type)._tag === "Right"
+		isRight(FieldType.decode((obj as WithFieldType).type))
 	)
 }
 
 type WithContentType = { __TYPE__: string }
 export function hasContentType(obj: unknown): obj is WithContentType {
-	return (
-		(obj as WithContentType)?.__TYPE__ !== undefined &&
-		typeof (obj as WithContentType).__TYPE__ === "string"
-	)
+	return typeof (obj as WithContentType).__TYPE__ === "string"
 }

package/src/customtypes/index.ts

@@ -1,4 +1,4 @@
 export * from "./CustomType"
-export * as Comparators from "./diff"
-export * as Section from "./Section"
+export * from "./diff"
+export * from "./Section"
 export * from "./widgets"

package/src/customtypes/widgets/Group.ts

@@ -5,16 +5,16 @@ import { StringOrNull } from "../../validators"
 import { NestableWidget } from "./nestable/NestableWidget"
 
 export const GroupFieldType = "Group"
-const GroupConfig = t.exact(
+export const GroupConfig = t.exact(
 	t.partial({
 		label: StringOrNull,
 		repeat: t.boolean,
 		fields: t.record(WidgetKey, NestableWidget),
 	}),
 )
-type GroupConfig = t.TypeOf<typeof GroupConfig>
+export type GroupConfig = t.TypeOf<typeof GroupConfig>
 
-const Group = t.exact(
+export const Group = t.exact(
 	t.intersection([
 		t.type({
 			type: t.literal(GroupFieldType),
@@ -27,6 +27,4 @@ const Group = t.exact(
 		}),
 	]),
 )
-type Group = t.TypeOf<typeof Group>
-
-export default Group
+export type Group = t.TypeOf<typeof Group>

package/src/customtypes/widgets/UID.ts

@@ -4,16 +4,16 @@ import { StringOrNull } from "../../validators"
 
 export const UIDFieldType = "UID"
 
-const UIDConfig = t.exact(
+export const UIDConfig = t.exact(
 	t.partial({
 		label: StringOrNull,
 		useAsTitle: t.boolean,
 		placeholder: t.string,
 	}),
 )
-type UIDConfig = t.TypeOf<typeof UIDConfig>
+export type UIDConfig = t.TypeOf<typeof UIDConfig>
 
-const UID = t.exact(
+export const UID = t.exact(
 	t.intersection([
 		t.type({
 			type: t.literal(UIDFieldType),
@@ -24,6 +24,4 @@ const UID = t.exact(
 		}),
 	]),
 )
-type UID = t.TypeOf<typeof UID>
-
-export default UID
+export type UID = t.TypeOf<typeof UID>

package/src/customtypes/widgets/Widget.ts

@@ -1,6 +1,6 @@
 import * as t from "io-ts"
 
-import Group, { GroupFieldType } from "./Group"
+import { Group, GroupFieldType } from "./Group"
 import {
 	BooleanFieldType,
 	ColorFieldType,
@@ -27,7 +27,7 @@ import {
 	SlicesFieldType,
 	StaticSlices,
 } from "./slices/Slices"
-import UID, { UIDFieldType } from "./UID"
+import { UID, UIDFieldType } from "./UID"
 
 export function widgetReader<T extends StaticSlices | DynamicSlices>(
 	codec: t.Type<T, unknown>,
@@ -41,7 +41,7 @@ export type StaticWidget = t.TypeOf<typeof StaticWidget>
 export const DynamicWidget = widgetReader(DynamicSlices)
 export type DynamicWidget = t.TypeOf<typeof DynamicWidget>
 
-export const FieldTypes = t.keyof({
+export const FieldType = t.keyof({
 	[ColorFieldType]: null,
 	[BooleanFieldType]: null,
 	[NumberFieldType]: null,
@@ -63,7 +63,7 @@ export const FieldTypes = t.keyof({
 	[LegacySlicesFieldType]: null,
 })
 
-export type FieldTypes = t.TypeOf<typeof FieldTypes>
+export type FieldType = t.TypeOf<typeof FieldType>
 
 export const Widgets = {
 	toStatic(
@@ -75,7 +75,7 @@ export const Widgets = {
 			case "Slices":
 				return Slices.toStatic(widget, sharedSlices)
 			default:
-				return widget as StaticWidget
+				return widget
 		}
 	},
 }

package/src/customtypes/widgets/nestable/Link.ts

@@ -94,5 +94,3 @@ export const Link = t.exact(
 	]),
 )
 export type Link = t.TypeOf<typeof Link>
-
-export default Link