@prismicio/types-internal 2.2.0-alpha.23 → 2.2.0-alpha.24

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

@@ -10,8 +10,8 @@ const ImportContent = (type, valueCodec) => new t.Type("ImportField", (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/ImportSlices/ImportSlices.js

@@ -14,7 +14,7 @@ const ImportSlices = (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) => {
+    return (0, ImportContent_1.ImportContent)("Slices", (0, validators_1.EmptyArrayOrElse)(new t.Type("ImportSlices", (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

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/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", (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-alpha.23",
+	"version": "2.2.0-alpha.24",
 	"description": "Prismic types for Custom Types and Prismic Data",
 	"keywords": [
 		"typescript",

package/src/import/validators/fields/ImportContent.ts

@@ -15,9 +15,9 @@ export const ImportContent = <T extends FieldType, A, O = A>(
 			if (!isObject(u)) return false
 			return type === u["type"] && valueCodec.is(u["value"])
 		},
-		(u: unknown) => {
+		(u: unknown, c) => {
 			return pipe(
-				valueCodec.decode(u),
+				valueCodec.validate(u, c),
 				either.map((decodedValue) => {
 					return {
 						type,

package/src/import/validators/fields/ImportSlices/ImportSlices.ts

@@ -3,7 +3,7 @@ import { pipe } from "fp-ts/function"
 import * as t from "io-ts"
 
 import type { StaticSlices } from "../../../../customtypes"
-import { EmptyObjectOrElse } from "../../../../validators"
+import { EmptyArrayOrElse } from "../../../../validators"
 import { ImportContent } from "../ImportContent"
 import { SharedSlice } from "./SharedSlice"
 import {
@@ -20,7 +20,7 @@ export const ImportSlices = (staticSlices: StaticSlices) => {
 
 	return ImportContent(
 		"Slices",
-		EmptyObjectOrElse(
+		EmptyArrayOrElse(
 			new t.Type<SharedSlice[]>(
 				"ImportSlices",
 				(u): u is SharedSlice[] => SlicesArrayCodec.is(u),

package/src/import/validators/fields/ImportSlices/SharedSlice/fields/SharedSliceContent/SharedSliceContentEntry.ts

@@ -83,8 +83,8 @@ export const SharedSliceContentEntry = (
 								errors.map((error) => {
 									const context = [
 										...c,
-										...error.context.filter(({ key }) => !!key), // We replace the "" key coming from ImportNestable decoder
 										{ key, actual: content, type: codec },
+										...error.context.slice(1), // We ignore the first context element with "" key coming from ImportNestable decoder
 									]
 
 									const updatedError: t.ValidationError = { ...error, context }

package/src/validators/DefaultOrElse.ts

@@ -8,9 +8,9 @@ export const DefaultOrElse = <I, A, O = A>(inputValidator: t.Type<I>) => {
 		new t.Type<A | null, O | undefined>(
 			"DefaultOrElse",
 			(u: unknown): u is A | null => null === u || codec.is(u),
-			(u: unknown) => {
-				if (isRight(inputValidator.decode(u))) return t.success(null)
-				return codec.decode(u)
+			(u: unknown, c) => {
+				if (isRight(inputValidator.validate(u, c))) return t.success(null)
+				return codec.validate(u, c)
 			},
 			(chunk) => (chunk ? codec.encode(chunk) : undefined),
 		)