@platecms/delta-client 0.9.0 → 0.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platecms/delta-client",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "Utilities and functions to interact with the Delta CMS.",
   "license": "UNLICENSED",
   "publishConfig": {
@@ -18,7 +18,7 @@
     "src/**/*"
   ],
   "peerDependencies": {
-    "@platecms/delta-cast": "0.9.0",
+    "@platecms/delta-cast": "0.9.2",
     "@graphql-typed-document-node/core": "3.2.0",
     "graphql": "16.11.0",
     "lodash": "4.17.21",

package/src/schema/lib/schemas/array.spec.ts

@@ -79,6 +79,21 @@ describe("Array schema", () => {
   });
 
   describe("when using multiple schemas", () => {
+    it("should parse an array of strings and numbers", () => {
+      const testSchema = schemaBuilder.array([schemaBuilder.string(), schemaBuilder.number()]);
+
+      const result = testSchema.parse([
+        {
+          primitiveValue: "hello",
+        },
+        {
+          primitiveValue: 42,
+        },
+      ]);
+
+      expect(result).toEqual(["hello", 42]);
+    });
+
     it("should parse an array of content values", () => {
       const testSchema = schemaBuilder.array(
         schemaBuilder.contentItem({

package/src/schema/lib/schemas/array.ts

@@ -2,7 +2,11 @@ import { compact, first } from "lodash";
 import { Schema, SchemaConfig } from ".";
 
 export class ArraySchema<T extends Schema | Schema[]>
-  implements Schema<T extends Schema[] ? T[number]["parse"][] : T extends Schema ? T["parse"][] : never, unknown>
+  implements
+    Schema<
+      T extends Schema[] ? ReturnType<T[number]["parse"]>[] : T extends Schema ? ReturnType<T["parse"]>[] : never,
+      unknown
+    >
 {
   private _minLength: number = 0;
 
@@ -16,7 +20,7 @@ export class ArraySchema<T extends Schema | Schema[]>
   public parse(
     data: unknown,
     config?: SchemaConfig,
-  ): T extends Schema[] ? T[number]["parse"][] : T extends Schema ? T["parse"][] : never {
+  ): T extends Schema[] ? ReturnType<T[number]["parse"]>[] : T extends Schema ? ReturnType<T["parse"]>[] : never {
     const dataAsArray = Array.isArray(data) ? data : [];
 
     if (dataAsArray.length < this._minLength) {
@@ -29,10 +33,14 @@ export class ArraySchema<T extends Schema | Schema[]>
       const resultForStructures = structures.map((schema) => schema.parse(item, config));
 
       return resultForStructures.find((result) => result !== null) ?? first(resultForStructures);
-    }) as T extends Schema[] ? T[number]["parse"][] : T extends Schema ? T["parse"][] : never;
+    }) as T extends Schema[] ? ReturnType<T[number]["parse"]>[] : T extends Schema ? ReturnType<T["parse"]>[] : never;
 
     return config?.placeholders === true
       ? results
-      : (compact(results) as T extends Schema[] ? T[number]["parse"][] : T extends Schema ? T["parse"][] : never);
+      : (compact(results) as T extends Schema[]
+          ? ReturnType<T[number]["parse"]>[]
+          : T extends Schema
+            ? ReturnType<T["parse"]>[]
+            : never);
   }
 }

package/src/schema/lib/schemas/asset.spec.ts

@@ -7,7 +7,7 @@ describe("Asset schema", () => {
 
     const result = schema.parse([
       {
-        linkedAsset: {
+        relatedAsset: {
           prn: "123",
           name: "title",
           url: "url",

package/src/schema/lib/schemas/asset.ts

@@ -1,10 +1,11 @@
 import { Asset } from "../../../__generated__/graphql";
+import { isContentValue } from "../utils/isContentValue";
 import { BaseSchema } from "./baseSchema";
 
 export class AssetSchema extends BaseSchema<Asset | null, unknown> {
   protected override findValue(data: unknown): Asset | null {
-    if (typeof data === "object" && data !== null && "linkedAsset" in data) {
-      return (data as { linkedAsset: Asset }).linkedAsset;
+    if (isContentValue(data) && "relatedAsset" in data) {
+      return (data as { relatedAsset: Asset }).relatedAsset;
     }
 
     return null;

package/src/schema/lib/schemas/buildingBlock.ts

@@ -9,7 +9,13 @@ export class BuildingBlockSchema<T extends Record<string, Schema | Schema[]>>
   public parse(
     data: BuildingBlockFieldFulfillment | BuildingBlockFieldFulfillment[],
     config?: SchemaConfig,
-  ): ObjectSchema<T> {
+  ): {
+    [key in keyof T]: T[key] extends Schema[]
+      ? ReturnType<T[key][number]["parse"]>
+      : T[key] extends Schema
+        ? ReturnType<T[key]["parse"]>
+        : never;
+  } {
     if (!Array.isArray(data)) {
       data = [data];
     }

package/src/schema/lib/schemas/contentItem.ts

@@ -7,7 +7,16 @@ export class ContentItemSchema<T extends Record<string, Schema | Schema[]>>
 {
   public constructor(private readonly structure: T) {}
 
-  public parse(data: unknown, config?: SchemaConfig): ObjectSchema<T> | null {
+  public parse(
+    data: unknown,
+    config?: SchemaConfig,
+  ): {
+    [key in keyof T]: T[key] extends Schema[]
+      ? ReturnType<T[key][number]["parse"]>
+      : T[key] extends Schema
+        ? ReturnType<T[key]["parse"]>
+        : never;
+  } {
     if (isArray(data)) {
       data = data[0];
     }

package/src/schema/lib/schemas/contentType.ts

@@ -1,9 +1,10 @@
 import { ContentType } from "../../../__generated__/graphql";
+import { isContentValue } from "../utils/isContentValue";
 import { BaseSchema } from "./baseSchema";
 
 export class ContentTypeSchema extends BaseSchema<ContentType | null, unknown> {
   protected override findValue(data: unknown): ContentType | null {
-    if (typeof data === "object" && data !== null && "linkedContentType" in data) {
+    if (isContentValue(data) && "linkedContentType" in data) {
       return (data as { linkedContentType: ContentType }).linkedContentType;
     }
 

package/src/schema/lib/schemas/gridPlacement.spec.ts

@@ -7,7 +7,7 @@ describe("GridPlacement schema", () => {
 
     const result = schema.parse([
       {
-        gridPlacement: {
+        linkedGridPlacement: {
           row: 0,
         },
       },

package/src/schema/lib/schemas/gridPlacement.ts

@@ -1,10 +1,11 @@
 import { GridPlacement } from "../../../__generated__/graphql";
+import { isContentValue } from "../utils/isContentValue";
 import { BaseSchema } from "./baseSchema";
 
 export class GridPlacementSchema extends BaseSchema<GridPlacement | null, unknown> {
   protected override findValue(data: unknown): GridPlacement | null {
-    if (typeof data === "object" && data !== null && "gridPlacement" in data) {
-      return (data as { gridPlacement: GridPlacement }).gridPlacement;
+    if (isContentValue(data) && "linkedGridPlacement" in data) {
+      return (data as { linkedGridPlacement: GridPlacement }).linkedGridPlacement;
     }
 
     return null;

package/src/schema/lib/schemas/index.ts

@@ -33,9 +33,9 @@ export interface Schema<TResult = unknown, TData = unknown> {
 
 export type ObjectSchema<T extends Record<string, Schema | Schema[]>> = {
   [key in keyof T]: T[key] extends Schema[]
-    ? ReturnType<T[key][number]["parse"]> | null
+    ? ReturnType<T[key][number]["parse"]>
     : T[key] extends Schema
-      ? ReturnType<T[key]["parse"]> | null
+      ? ReturnType<T[key]["parse"]>
       : never;
 };
 

package/src/schema/lib/schemas/pathPart.spec.ts

@@ -8,7 +8,7 @@ describe("PathPart schema", () => {
 
     const result = schema.parse([
       {
-        pathPart: {
+        linkedPathPart: {
           prn: "123",
           name: "title",
           path: "title",

package/src/schema/lib/schemas/pathPart.ts

@@ -1,10 +1,11 @@
 import { PathPart } from "../../../__generated__/graphql";
+import { isContentValue } from "../utils/isContentValue";
 import { BaseSchema } from "./baseSchema";
 
 export class PathPartSchema extends BaseSchema<PathPart | null, unknown> {
   protected override findValue(data: unknown): PathPart | null {
-    if (typeof data === "object" && data !== null && "pathPart" in data) {
-      return (data as { pathPart: PathPart }).pathPart;
+    if (isContentValue(data) && "linkedPathPart" in data) {
+      return (data as { linkedPathPart: PathPart }).linkedPathPart;
     }
 
     return null;

package/src/schema/lib/schemas/smartText.ts

@@ -1,9 +1,10 @@
 import { Root as SmartText } from "@platecms/delta-cast";
 import { BaseSchema } from "./baseSchema";
+import { isContentValue } from "../utils/isContentValue";
 
 export class SmartTextSchema extends BaseSchema<SmartText | null, unknown> {
   protected override findValue(data: unknown): SmartText | null {
-    if (typeof data === "object" && data !== null && "interpolatedSmartText" in data) {
+    if (isContentValue(data) && "interpolatedSmartText" in data) {
       return (data as { interpolatedSmartText: SmartText }).interpolatedSmartText;
     }
 

package/src/schema/lib/schemas/tag.ts

@@ -1,9 +1,10 @@
 import { Tag } from "../../../__generated__/graphql";
+import { isContentValue } from "../utils/isContentValue";
 import { BaseSchema } from "./baseSchema";
 
 export class TagSchema extends BaseSchema<Tag | null, unknown> {
   protected override findValue(data: unknown): Tag | null {
-    if (typeof data === "object" && data !== null && "linkedTag" in data) {
+    if (isContentValue(data) && "linkedTag" in data) {
       return (data as { linkedTag: Tag }).linkedTag;
     }