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

package/lib/content/Document.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentLegacy = exports.Document = 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 = tslib_1.__importStar(require("io-ts"));
 const common_1 = require("../common");
@@ -16,7 +17,7 @@ const DocumentLegacyCodec = (allTypes) => {
             return Object.entries(parsedDoc).reduce((acc, [widgetKey, widgetValue]) => {
                 const widgetCtx = (0, LegacyContentCtx_1.defaultCtx)(widgetKey, allTypes);
                 const parsedW = (0, fields_1.WidgetLegacy)(widgetCtx).decode(widgetValue);
-                if (!parsedW || (parsedW === null || parsedW === void 0 ? void 0 : parsedW._tag) === "Left")
+                if (!parsedW || (0, Either_1.isLeft)(parsedW))
                     return acc;
                 return { ...acc, [widgetKey]: parsedW.right };
             }, {});
@@ -39,7 +40,7 @@ function extractMetadata(data) {
     const { types, widgets } = fields.reduce((acc, [k, v]) => {
         if (k.endsWith("_TYPE")) {
             const decodedValue = LegacyContentCtx_1.FieldOrSliceType.decode(v);
-            if (decodedValue._tag === "Right") {
+            if ((0, Either_1.isRight)(decodedValue)) {
                 return {
                     ...acc,
                     types: acc.types.set(k.substring(0, k.length - 5), decodedValue.right),
@@ -78,7 +79,7 @@ function parseLegacyDocument(legacyDoc) {
         // parse the actual widgets
         return DocumentLegacyCodec(types).decode(widgets);
     }));
-    return result._tag === "Left" ? undefined : result.right;
+    return (0, Either_1.isLeft)(result) ? undefined : result.right;
 }
 function encodeToLegacyDocument(document) {
     const encoded = DocumentLegacyCodec().encode(document);

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

@@ -315,7 +315,7 @@ export declare const GroupItemContent: t.ExactC<t.TypeC<{
 }>>;
 export type GroupItemContent = t.TypeOf<typeof GroupItemContent>;
 declare const itemLegacyReader: t.ArrayC<t.TupleC<[t.StringC, t.UnknownC]>>;
-export type GroupItemLegacy = t.TypeOf<typeof itemLegacyReader>;
+type GroupItemLegacy = t.TypeOf<typeof itemLegacyReader>;
 export declare const GroupItemLegacy: (ctx: LegacyContentCtx) => t.Type<{
     __TYPE__: "GroupItemContent";
     value: [string, {

package/lib/content/fields/GroupContent.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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");
 const function_1 = require("fp-ts/lib/function");
 const t = tslib_1.__importStar(require("io-ts"));
 const LegacyContentCtx_1 = require("../LegacyContentCtx");
@@ -22,10 +23,9 @@ const GroupItemLegacy = (ctx) => {
                 const result = (0, nestable_1.NestableLegacy)(itemCtx).decode(itemValue);
                 if (!result)
                     return acc;
-                if (result._tag === "Right")
-                    return [...acc, [itemKey, result.right]];
-                else
+                if ((0, Either_1.isLeft)(result))
                     return acc;
+                return [...acc, [itemKey, result.right]];
             }, []);
             return {
                 value: parsedItems,

package/lib/content/fields/nestable/EmbedContent.d.ts

@@ -35,7 +35,6 @@ export declare const EmbedContentLegacy: t.ExactC<t.IntersectionC<[t.TypeC<{
     thumbnail_height: t.UnionC<[t.Type<number, number, unknown>, t.NullC, t.UndefinedC]>;
     html: t.UnionC<[t.Type<string, string, unknown>, t.NullC, t.UndefinedC]>;
 }>]>>;
-export type EmbedLegacy = t.TypeOf<typeof EmbedContentLegacy>;
 export declare const EmbedLegacy: (ctx: LegacyContentCtx) => t.Type<{
     embed_url: string;
     type: string;

package/lib/content/fields/nestable/NestableContent.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NestableLegacy = exports.isNestableContent = exports.NestableContent = void 0;
 const tslib_1 = require("tslib");
+const Either_1 = require("fp-ts/lib/Either");
 const t = tslib_1.__importStar(require("io-ts"));
 const EmptyContent_1 = require("../EmptyContent");
 const BooleanContent_1 = require("./BooleanContent");
@@ -54,7 +55,7 @@ const NestableLegacy = (ctx) => {
             if (!ctx.fieldType)
                 return;
             const nullValue = (0, EmptyContent_1.EmptyLegacy)(ctx.fieldType).decode(value);
-            if (nullValue._tag === "Right")
+            if ((0, Either_1.isRight)(nullValue))
                 return nullValue;
             const codec = (() => {
                 switch (ctx.fieldType) {

package/lib/content/fields/nestable/RichTextContent/Blocks.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Block = exports.BlockLegacy = exports.TextBlock = exports.checkEmbedBlock = exports.EmbedBlock = exports.checkImageBlock = exports.ImageBlock = exports.ValidatedMetas = exports.Span = exports.Meta = void 0;
 const tslib_1 = require("tslib");
 const fp_ts_1 = require("fp-ts");
-const E = tslib_1.__importStar(require("fp-ts/lib/Either"));
+const Either_1 = require("fp-ts/lib/Either");
 const function_1 = require("fp-ts/lib/function");
 const t = tslib_1.__importStar(require("io-ts"));
 const nestable_1 = require("../../../../customtypes/widgets/nestable");
@@ -29,12 +29,12 @@ const ValidatedMetas = (linkCodec) => new t.Type("ValidatedMetas", (metas) => Ar
         const res = metas
             .reduce((acc, maybeMeta) => {
             const maybeDecodedMeta = exports.Meta.decode(maybeMeta);
-            if (E.isRight(maybeDecodedMeta)) {
+            if ((0, Either_1.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")
+                    if ((0, Either_1.isLeft)(decoded))
                         return acc;
                     return [...acc, { ...meta, data: decoded.right }];
                 }
@@ -54,7 +54,7 @@ const ValidatedMetas = (linkCodec) => new t.Type("ValidatedMetas", (metas) => Ar
         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")
+            if ((0, Either_1.isLeft)(decoded))
                 return acc;
             return [...acc, { ...meta, data: linkCodec.encode(decoded.right) }];
         }

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CompositeSliceContent = exports.CompositeSliceLegacy = exports.isCompositeSliceContent = exports.CompositeSliceContentType = 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 = tslib_1.__importStar(require("io-ts"));
 const LegacyContentCtx_1 = require("../../../LegacyContentCtx");
@@ -22,7 +23,7 @@ const CompositeSliceLegacy = (ctx) => {
             const repeat = (() => {
                 const itemsCtx = (0, LegacyContentCtx_1.getFieldCtx)("repeat", ctx);
                 const result = (0, RepeatableContent_1.RepeatableWidgetsLegacy)(itemsCtx).decode(parsedSlice.repeat);
-                if (!result || result._tag === "Left")
+                if (!result || (0, Either_1.isLeft)(result))
                     return;
                 return result.right;
             })() || [];
@@ -33,10 +34,9 @@ const CompositeSliceLegacy = (ctx) => {
                 const result = (0, nestable_1.NestableLegacy)(fieldCtx).decode(value);
                 if (!result)
                     return acc;
-                if (result._tag === "Right")
-                    return { ...acc, [key]: result.right };
-                else
+                if ((0, Either_1.isLeft)(result))
                     return acc;
+                return { ...acc, [key]: result.right };
             }, {});
             return {
                 nonRepeat,

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SharedSliceContent = exports.SharedSliceLegacy = exports.isSharedSliceContent = exports.SharedSliceContentType = 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 = tslib_1.__importStar(require("io-ts"));
 const io_ts_types_1 = require("io-ts-types");
@@ -27,7 +28,7 @@ const SharedSliceLegacy = (ctx) => {
                     parsedSlice.variation,
                 ]);
                 const result = (0, RepeatableContent_1.RepeatableWidgetsLegacy)(itemsCtx).decode(parsedSlice.items);
-                if (!result || result._tag === "Left")
+                if (!result || (0, Either_1.isLeft)(result))
                     return;
                 return result.right;
             })() || [];
@@ -40,10 +41,9 @@ const SharedSliceLegacy = (ctx) => {
                 const result = (0, nestable_1.NestableLegacy)(FieldCtx).decode(value);
                 if (!result)
                     return acc;
-                if (result._tag === "Right")
-                    return { ...acc, [key]: result.right };
-                else
+                if ((0, Either_1.isLeft)(result))
                     return acc;
+                return { ...acc, [key]: result.right };
             }, {});
             return {
                 variation: parsedSlice.variation,

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SlicesItemLegacy = exports.SliceItemContent = 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 = tslib_1.__importStar(require("io-ts"));
 const function_2 = require("../../../validators/function");
@@ -36,7 +37,7 @@ const SlicesItemLegacy = (ctx) => {
             const sliceName = parsedSlice.key.substring(0, stopIdx > 0 ? stopIdx : undefined);
             const itemCtx = (0, LegacyContentCtx_1.getFieldCtx)(parsedSlice.key, ctx);
             const item = (0, Slice_1.SliceLegacy)(itemCtx).decode(parsedSlice.value);
-            if (!item || item._tag === "Left")
+            if (!item || (0, Either_1.isLeft)(item))
                 return t.failure(sliceItem, context);
             return t.success({
                 key: parsedSlice.key,

package/lib/content/utils.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasContentType = exports.hasFieldContentType = void 0;
+const Either_1 = require("fp-ts/lib/Either");
 const fields_1 = require("./fields");
 function hasFieldContentType(obj) {
     return (hasContentType(obj) &&
         obj.__TYPE__ === fields_1.FieldContentType &&
         (obj === null || obj === void 0 ? void 0 : obj.type) !== undefined &&
         typeof obj.type === "string" &&
-        fields_1.FieldType.decode(obj.type)._tag === "Right");
+        (0, Either_1.isRight)(fields_1.FieldType.decode(obj.type)));
 }
 exports.hasFieldContentType = hasFieldContentType;
 function hasContentType(obj) {
-    return ((obj === null || obj === void 0 ? void 0 : obj.__TYPE__) !== undefined &&
-        typeof obj.__TYPE__ === "string");
+    return typeof obj.__TYPE__ === "string";
 }
 exports.hasContentType = hasContentType;

package/lib/customtypes/index.d.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/lib/customtypes/index.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Section = exports.Comparators = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./CustomType"), exports);
-exports.Comparators = tslib_1.__importStar(require("./diff"));
-exports.Section = tslib_1.__importStar(require("./Section"));
+tslib_1.__exportStar(require("./diff"), exports);
+tslib_1.__exportStar(require("./Section"), exports);
 tslib_1.__exportStar(require("./widgets"), exports);

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

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RichText = exports.RichTextConfig = exports.RichTextNodeTypeCodec = exports.RichTextNodeType = exports.DEFAULT_OPTION = exports.RichTextFieldType = 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 = tslib_1.__importStar(require("io-ts"));
 const validators_1 = require("../../../validators");
 const ImageConstraint_1 = tslib_1.__importDefault(require("../shared/ImageConstraint"));
@@ -44,18 +46,18 @@ exports.RichTextNodeTypeCodec = t.keyof({
     [exports.RichTextNodeType.orderedList]: null,
     [exports.RichTextNodeType.rtl]: null,
 });
-const RichTextOptions = new t.Type("RichTextOptions", (u) => typeof u === "string", (u, context) => {
-    return Either_1.either.chain(t.union([t.string, t.null]).validate(u, context), (s) => {
+const RichTextOptions = new t.Type("RichTextOptions", (u) => typeof u === "string", (u) => {
+    return (0, function_1.pipe)(t.union([t.string, t.null]).decode(u), fp_ts_1.either.map((s) => {
         if (!s)
-            return t.success(exports.DEFAULT_OPTION);
+            return exports.DEFAULT_OPTION;
         const entries = s.split(",").map((e) => e.trim());
         const filtered = entries.filter((entry) => {
             return (0, Either_1.getOrElseW)(() => undefined)(exports.RichTextNodeTypeCodec.decode(entry));
         });
         if (!filtered.length)
-            return t.success(exports.DEFAULT_OPTION);
-        return t.success(filtered.join(","));
-    });
+            return exports.DEFAULT_OPTION;
+        return filtered.join(",");
+    }));
 }, (a) => a);
 const NoLabels = (labels) => {
     if (!labels)
@@ -100,15 +102,13 @@ const RichTextLabels = new t.Type("RichTextLabels", (u) => {
 }, (u, context) => {
     const legacyValidator = t.record(t.string, t.readonlyArray(t.record(t.literal("name"), t.string)));
     const validator = t.readonlyArray(t.string);
-    return Either_1.either.chain(t
-        .union([legacyValidator, validator, t.string, t.null])
-        .validate(u, context), (labels) => {
+    return (0, function_1.pipe)(t.union([legacyValidator, validator, t.string, t.null]).decode(u), fp_ts_1.either.chain((labels) => {
         return (NoLabels(labels) ||
             LabelsAsArray(labels) ||
             LabelsAsObject(labels) ||
             LabelsAsString(labels) ||
             t.failure(u, context));
-    });
+    }));
 }, (res) => res);
 exports.RichTextConfig = t.exact(t.partial({
     label: validators_1.StringOrNull,

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

@@ -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

@@ -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 { CompositeSlice } from "./CompositeSlice";
-export { LegacySlice } from "./LegacySlice";
+export * from "./CompositeSlice";
+export * from "./LegacySlice";
 export * from "./SharedSlice";
-export { 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 CompositeSlice_1.CompositeSlice; } });
-var LegacySlice_1 = require("./LegacySlice");
-Object.defineProperty(exports, "LegacySlice", { enumerable: true, get: function () { return LegacySlice_1.LegacySlice; } });
+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 SharedSliceRef_1.SharedSliceRef; } });
-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.4",
+	"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/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/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/nestable/RichText.ts

@@ -1,4 +1,6 @@
-import { either, getOrElseW } from "fp-ts/lib/Either"
+import { either } from "fp-ts/"
+import { getOrElseW } from "fp-ts/lib/Either"
+import { pipe } from "fp-ts/lib/function"
 import * as t from "io-ts"
 
 import { StringOrNull } from "../../../validators"
@@ -51,21 +53,21 @@ export const RichTextNodeTypeCodec = t.keyof({
 const RichTextOptions = new t.Type<string, string, unknown>(
 	"RichTextOptions",
 	(u: unknown): u is string => typeof u === "string",
-	(u: unknown, context: t.Context) => {
-		return either.chain(
-			t.union([t.string, t.null]).validate(u, context),
-			(s: string | null) => {
-				if (!s) return t.success(DEFAULT_OPTION)
+	(u: unknown) => {
+		return pipe(
+			t.union([t.string, t.null]).decode(u),
+			either.map((s: string | null) => {
+				if (!s) return DEFAULT_OPTION
 				const entries = s.split(",").map((e: string) => e.trim())
 				const filtered = entries.filter((entry) => {
 					return getOrElseW(() => undefined)(
 						RichTextNodeTypeCodec.decode(entry),
 					)
 				})
-				if (!filtered.length) return t.success(DEFAULT_OPTION)
+				if (!filtered.length) return DEFAULT_OPTION
 
-				return t.success(filtered.join(","))
-			},
+				return filtered.join(",")
+			}),
 		)
 	},
 	(a) => a,
@@ -169,11 +171,9 @@ const RichTextLabels = new t.Type<ReadonlyArray<string>, object, unknown>(
 		)
 		const validator = t.readonlyArray(t.string)
 
-		return either.chain(
-			t
-				.union([legacyValidator, validator, t.string, t.null])
-				.validate(u, context),
-			(labels) => {
+		return pipe(
+			t.union([legacyValidator, validator, t.string, t.null]).decode(u),
+			either.chain((labels) => {
 				return (
 					NoLabels(labels) ||
 					LabelsAsArray(labels) ||
@@ -181,7 +181,7 @@ const RichTextLabels = new t.Type<ReadonlyArray<string>, object, unknown>(
 					LabelsAsString(labels) ||
 					t.failure(u, context)
 				)
-			},
+			}),
 		)
 	},
 	(res) => res,

package/src/customtypes/widgets/slices/Slices.ts

@@ -77,10 +77,10 @@ export function slicesReader<
 	return t.exact(
 		t.intersection([
 			t.type({
-				type: t.union([
-					t.literal(SlicesFieldType),
-					t.literal(LegacySlicesFieldType),
-				]),
+				type: t.keyof({
+					[SlicesFieldType]: null,
+					[LegacySlicesFieldType]: null,
+				}),
 			}),
 			t.partial({
 				fieldset: StringOrNull,

package/src/customtypes/widgets/slices/index.ts

@@ -1,7 +1,7 @@
-export { CompositeSlice } from "./CompositeSlice"
-export { LegacySlice } from "./LegacySlice"
+export * from "./CompositeSlice"
+export * from "./LegacySlice"
 export * from "./SharedSlice"
-export { 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"