zod-paginate 1.5.0 → 1.6.1

package/dist/paginate.d.ts

@@ -271,12 +271,12 @@ export type PaginationResponseSchemaShape<TType extends PaginationType> = TType
  *   return paginate({ dataSchema: MySchema, … });
  * }
  */
-export interface PaginateResult<TSchema extends DataSchema, TSelectable extends AllowedPath<TSchema> = AllowedPath<TSchema>, TType extends PaginationType = PaginationType> {
+export interface PaginateResult<TSchema extends DataSchema, TType extends PaginationType = PaginationType> {
     queryParamsSchema: {
         (): z.ZodType<PaginationQueryParams<TSchema, TType>>;
         <TExtraShape extends z.ZodRawShape>(extraShape: TExtraShape): z.ZodType<PaginationQueryParams<TSchema, TType> & z.infer<z.ZodObject<TExtraShape>>>;
     };
-    validatorSchema: (parsed?: PaginationPayload<TSchema>) => z.ZodType;
+    validatorSchema: (parsed?: PaginationPayload<TSchema>) => z.ZodType<PaginationResponse<TSchema, AllowedPath<TSchema>, TType>>;
     responseSchema: z.ZodObject<PaginationResponseSchemaShape<TType>>;
 }
 /**
@@ -298,7 +298,7 @@ export declare function paginate<TSchema extends DataSchema, const TSelectable e
     filterable?: Partial<{
         [P in NoInfer<TSelectable[number]>]: FilterableFieldConfig<FieldTypeFromValue<PathValue<InferData<TSchema>, P>>>;
     }>;
-}): PaginateResult<TSchema, TSelectable[number], 'LIMIT_OFFSET'>;
+}): PaginateResult<TSchema, 'LIMIT_OFFSET'>;
 export declare function paginate<TSchema extends DataSchema, const TSelectable extends readonly AllowedPath<TSchema>[]>(config: Omit<CommonQueryConfigFromSchema<TSchema, TSelectable[number]>, 'selectable' | 'defaultSelect' | 'sortable' | 'defaultSortBy' | 'filterable'> & CursorPaginationConfig<InferData<TSchema>> & {
     selectable?: EnsureDiscriminatorInSelectable<TSchema, TSelectable>;
     defaultSelect: readonly NoInfer<TSelectable[number]>[] | '*';
@@ -310,7 +310,7 @@ export declare function paginate<TSchema extends DataSchema, const TSelectable e
     filterable?: Partial<{
         [P in NoInfer<TSelectable[number]>]: FilterableFieldConfig<FieldTypeFromValue<PathValue<InferData<TSchema>, P>>>;
     }>;
-}): PaginateResult<TSchema, TSelectable[number], 'CURSOR'>;
+}): PaginateResult<TSchema, 'CURSOR'>;
 export declare function paginate<TSchema extends DataSchema, const TSelectable extends readonly AllowedPath<TSchema>[]>(config: Omit<CommonQueryConfigFromSchema<TSchema, TSelectable[number]>, 'selectable' | 'defaultSelect' | 'sortable' | 'defaultSortBy' | 'filterable'> & {
     selectable?: EnsureDiscriminatorInSelectable<TSchema, TSelectable>;
     defaultSelect: readonly NoInfer<TSelectable[number]>[] | '*';
@@ -322,5 +322,5 @@ export declare function paginate<TSchema extends DataSchema, const TSelectable e
     filterable?: Partial<{
         [P in NoInfer<TSelectable[number]>]: FilterableFieldConfig<FieldTypeFromValue<PathValue<InferData<TSchema>, P>>>;
     }>;
-} & (LimitOffsetPaginationConfig | CursorPaginationConfig<InferData<TSchema>>)): PaginateResult<TSchema, TSelectable[number]>;
+} & (LimitOffsetPaginationConfig | CursorPaginationConfig<InferData<TSchema>>)): PaginateResult<TSchema>;
 export {};

package/dist/paginate.js

@@ -501,45 +501,47 @@ function isFiniteNumber(v) {
 function validateConditionType(expected, cond, field) {
     if (expected === 'any')
         return null;
-    if (cond.op === '$null')
-        return null;
-    if (cond.op === '$eq') {
-        if (expected === 'number' && !isFiniteNumber(cond.value))
-            return `Field "${field}" expects a number for "$eq"`;
-        if (expected === 'date' && !isISODateString(cond.value))
-            return `Field "${field}" expects an ISO date for "$eq"`;
-        if (expected === 'string' && typeof cond.value !== 'string')
-            return `Field "${field}" expects a string for "$eq"`;
-        return null;
-    }
-    if (cond.op === '$ilike' || cond.op === '$sw') {
-        if (expected !== 'string')
-            return `Field "${field}" does not support "${cond.op}" (configured as ${expected})`;
-        return null;
-    }
-    if (cond.op === '$in' || cond.op === '$contains')
-        return null;
-    if (cond.op === '$gt' || cond.op === '$gte' || cond.op === '$lt' || cond.op === '$lte') {
-        if (expected === 'string')
-            return `Field "${field}" does not support "${cond.op}" (configured as string)`;
-        if (expected === 'number' && !isFiniteNumber(cond.value))
-            return `Field "${field}" expects number for "${cond.op}"`;
-        if (expected === 'date' && !isISODateString(cond.value))
-            return `Field "${field}" expects ISO date for "${cond.op}"`;
-        return null;
-    }
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    if (cond.op === '$btw') {
-        const [a, b] = cond.value;
-        if (expected === 'string')
-            return `Field "${field}" does not support "$btw" (configured as string)`;
-        if (expected === 'number' && (!isFiniteNumber(a) || !isFiniteNumber(b)))
-            return `Field "${field}" expects numbers for "$btw"`;
-        if (expected === 'date' && (!isISODateString(a) || !isISODateString(b)))
-            return `Field "${field}" expects ISO dates for "$btw"`;
-        return null;
+    switch (cond.op) {
+        case '$null':
+            return null;
+        case '$eq':
+            if (expected === 'number' && !isFiniteNumber(cond.value))
+                return `Field "${field}" expects a number for "$eq"`;
+            if (expected === 'date' && !isISODateString(cond.value))
+                return `Field "${field}" expects an ISO date for "$eq"`;
+            if (expected === 'string' && typeof cond.value !== 'string')
+                return `Field "${field}" expects a string for "$eq"`;
+            return null;
+        case '$ilike':
+        case '$sw':
+            if (expected !== 'string')
+                return `Field "${field}" does not support "${cond.op}" (configured as ${expected})`;
+            return null;
+        case '$in':
+        case '$contains':
+            return null;
+        case '$gt':
+        case '$gte':
+        case '$lt':
+        case '$lte':
+            if (expected === 'string')
+                return `Field "${field}" does not support "${cond.op}" (configured as string)`;
+            if (expected === 'number' && !isFiniteNumber(cond.value))
+                return `Field "${field}" expects number for "${cond.op}"`;
+            if (expected === 'date' && !isISODateString(cond.value))
+                return `Field "${field}" expects ISO date for "${cond.op}"`;
+            return null;
+        case '$btw': {
+            const [a, b] = cond.value;
+            if (expected === 'string')
+                return `Field "${field}" does not support "$btw" (configured as string)`;
+            if (expected === 'number' && (!isFiniteNumber(a) || !isFiniteNumber(b)))
+                return `Field "${field}" expects numbers for "$btw"`;
+            if (expected === 'date' && (!isISODateString(a) || !isISODateString(b)))
+                return `Field "${field}" expects ISO dates for "$btw"`;
+            return null;
+        }
     }
-    return null;
 }
 function computeSortBy(sortByRaw, config) {
     if (sortByRaw) {
@@ -906,7 +908,9 @@ function paginate(config) {
             // Check nested discriminated unions
             if (!hasWildcard) {
                 for (const nested of nestedDiscriminators) {
-                    const hasAnyFieldUnderPrefix = selectForValidation.some((f) => f === nested.prefix || f.startsWith(`${nested.prefix}.`));
+                    const hasAnyFieldUnderPrefix = nested.prefix === ''
+                        ? selectForValidation.length > 0
+                        : selectForValidation.some((f) => f === nested.prefix || f.startsWith(`${nested.prefix}.`));
                     if (hasAnyFieldUnderPrefix &&
                         !selectForValidation.includes(nested.discriminatorPath)) {
                         ctx.addIssue({
@@ -1055,7 +1059,7 @@ function paginate(config) {
     const LIMIT_OFFSET_META_DESC = 'Pagination metadata for limit/offset mode';
     const CURSOR_META_DESC = 'Pagination metadata for cursor mode';
     const CURSOR_VALUE_DESC = 'Cursor value pointing to the last item returned';
-    const validatorSchema = (parsed) => {
+    function validatorSchema(parsed) {
         const effectiveSelect = parsed?.select ?? (0, select_1.computeSelect)(undefined, effectiveConfig) ?? undefined;
         const dataItemSchema = effectiveSelect && effectiveSelect.length > 0
             ? (0, select_1.projectDataSchemaPreservingUnion)(config.dataSchema, effectiveSelect.map(String))
@@ -1087,7 +1091,7 @@ function paginate(config) {
             })
                 .meta({ description: CURSOR_META_DESC }),
         });
-    };
+    }
     const partialDataItemSchema = selectableStrings.length > 0
         ? (0, select_1.projectDataSchemaPreservingUnion)(config.dataSchema, selectableStrings, { partial: true })
         : (0, select_1.resolveToZodObject)(config.dataSchema);