@clipboard-health/json-api-nestjs 2.12.2 → 2.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clipboard-health/json-api-nestjs",
-  "version": "2.12.2",
+  "version": "2.13.1",
   "description": "TypeScript-friendly utilities for adhering to the JSON:API specification with NestJS.",
   "keywords": [
     "api",
@@ -29,7 +29,7 @@
     "tslib": "2.8.1"
   },
   "devDependencies": {
-    "@clipboard-health/testing-core": "2.11.2",
+    "@clipboard-health/testing-core": "2.12.1",
     "type-fest": "5.8.0",
     "zod": "3.25.76"
   },

package/src/lib/query/includeQuery.d.ts

@@ -1,6 +1,7 @@
 import type { GreaterThan, Subtract } from "type-fest";
 import { z } from "zod";
 import type { JsonApiDocument, Relationship, Relationships } from "../types";
+type ArrayableValue<T> = T extends Array<infer ValueT> ? ValueT : T;
 /**
  * Recursively traverse the JSON:API document to build a list of all possible relationship paths up
  * to the specified depth, which prevents stack overflow for circular relationships. Use the result
@@ -11,15 +12,13 @@ import type { JsonApiDocument, Relationship, Relationships } from "../types";
  * @template Depth - The maximum depth for recursive relationship traversal.
  * @template Prefix - The prefix for nested relationship paths.
  */
-export type RelationshipPaths<MapT extends Record<string, z.ZodTypeAny>, DocumentT extends JsonApiDocument, Depth extends number = 5, Prefix extends string = ""> = GreaterThan<Depth, 0> extends true ? DocumentT["data"] extends Array<infer Data> | (infer Data) ? Data extends {
+export type RelationshipPaths<MapT extends Record<string, z.ZodTypeAny>, DocumentT extends JsonApiDocument, Depth extends number = 5, Prefix extends string = ""> = GreaterThan<Depth, 0> extends true ? ArrayableValue<DocumentT["data"]> extends {
     relationships?: infer Relation;
 } ? Relation extends Relationships ? {
-    [K in keyof Relation]: K extends string ? NonNullable<Relation[K]> extends Relationship ? NonNullable<Relation[K]>["data"] extends {
+    [K in keyof Relation]: K extends string ? NonNullable<Relation[K]> extends Relationship ? ArrayableValue<NonNullable<Relation[K]>["data"]> extends {
         type?: infer RelationT;
-    } | Array<{
-        type?: infer RelationT;
-    }> ? RelationT extends keyof MapT ? `${Prefix}${K}` | RelationshipPaths<MapT, z.infer<MapT[RelationT]>, Subtract<Depth, 1>, `${Prefix}${K}.`> : never : never : never : never;
-}[keyof Relation] : never : never : never : never;
+    } ? RelationT extends keyof MapT ? `${Prefix}${K}` | RelationshipPaths<MapT, z.infer<MapT[RelationT]>, Subtract<Depth, 1>, `${Prefix}${K}.`> : never : never : never : never;
+}[keyof Relation] : never : never : never;
 /**
  * Creates a Zod schema for JSON:API include parameters.
  *
@@ -91,3 +90,4 @@ export type RelationshipPaths<MapT extends Record<string, z.ZodTypeAny>, Documen
 export declare function includeQuery<const FieldT extends readonly string[]>(fields: FieldT): {
     include: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodOptional<z.ZodArray<z.ZodString, "many">>, string[] | undefined, unknown>, string[] | undefined, unknown>, FieldT[number][] | undefined, unknown>;
 };
+export {};