@kalutskii/foundation 0.6.10 → 0.6.12

package/dist/index.d.ts

@@ -58,12 +58,12 @@ type FetchResult<T> = {
     data: null;
 };
 
-type QueryPrimitive = string | number | boolean | bigint | Date | null | undefined;
+type QueryPrimitive = string | number | boolean | bigint | Date;
 /**
  * Recursively transforms all fields of T to `string`, matching how query parameters are serialized.
  * Handles nested objects, arrays, and primitive values (including null and undefined as optional).
  */
-type AsQuery<T> = T extends QueryPrimitive ? string : T extends readonly (infer Item)[] ? AsQuery<Item>[] : T extends object ? {
+type AsQuery<T> = T extends null | undefined ? T : T extends QueryPrimitive ? string : T extends readonly (infer Item)[] ? AsQuery<Item>[] : T extends object ? {
     [Key in keyof T]: AsQuery<T[Key]>;
 } : string;
 
@@ -315,93 +315,23 @@ type ZodPaginationOptions = z.infer<typeof zodPaginationSchema>;
  */
 declare const refinePagination: (options?: ZodPaginationOptions) => ZodPaginationOptions;
 
-type ZodShape = Record<string, z.ZodTypeAny>;
-type AnyZodObject = z.ZodObject<ZodShape>;
-type UnionToIntersection<T> = (T extends unknown ? (value: T) => void : never) extends (value: infer I) => void ? I : never;
-type UnwrapOptional<T extends z.ZodTypeAny> = T extends z.ZodOptional<infer Inner> ? Inner : T;
-type IsOptional<T extends z.ZodTypeAny> = T extends z.ZodOptional<z.ZodTypeAny> ? true : false;
-type Optionalize<TSchema extends z.ZodTypeAny, TShouldOptionalize extends boolean> = TShouldOptionalize extends true ? z.ZodOptional<TSchema> : TSchema;
-type FlattenObjectField<TSchema extends z.ZodTypeAny> = UnwrapOptional<TSchema> extends z.ZodObject<infer InnerShape extends ZodShape> ? {
-    [K in keyof InnerShape]: Optionalize<InnerShape[K], IsOptional<TSchema>>;
-} : never;
-type FlattenNestedObjectFields<TShape extends ZodShape> = {
-    [K in keyof TShape]: FlattenObjectField<TShape[K]>;
-}[keyof TShape];
-/**
- * The resulting shape after all nested `z.ZodObject` fields have been lifted to the top level.
- * Primitive fields are kept as-is; nested object fields are replaced with their inner keys.
- * If the parent field was optional, all promoted inner fields become optional as well.
- */
-type FlattenZodShape<TShape extends ZodShape> = {
-    [K in keyof TShape as UnwrapOptional<TShape[K]> extends AnyZodObject ? never : K]: TShape[K];
-} & UnionToIntersection<FlattenNestedObjectFields<TShape>>;
-
-/**
- * Recursively lifts all nested `z.ZodObject` fields to the top level of the shape.
- * Primitive fields are preserved as-is. If the parent field was optional, all promoted
- * inner keys become optional to avoid requiring fields that were previously nested under an optional object.
- *
- * ```ts
- * const flat = flattenZodShape({
- *   name: z.string(),
- *   address: z.object({ city: z.string(), zip: z.string() }).optional(),
- * });
- * // { name: z.string(), city: z.string().optional(), zip: z.string().optional() }
- * ```
- */
-declare const flattenZodShape: <TShape extends ZodShape>(shape: TShape) => FlattenZodShape<TShape>;
-/**
- * Builds a strict flat query schema from a nested `z.ZodObject`.
- * All nested object fields are lifted to the top level while preserving optionality,
- * making the result suitable for validating flat query parameter objects.
- *
- * ```ts
- * const schema = asQuerySchema(
- *   z.object({
- *     search: z.string().optional(),
- *     sort: z.object({ field: z.string(), order: z.enum(['asc', 'desc']) }).optional(),
- *   })
- * );
- *
- * schema.parse({ search: 'foo', field: 'name', order: 'asc' });
- * // { search: 'foo', field: 'name', order: 'asc' }
- * ```
- */
-declare const asQuerySchema: <TShape extends ZodShape>(schema: z.ZodObject<TShape>) => z.ZodObject<FlattenZodShape<TShape> extends infer T ? { -readonly [P in keyof T]: T[P]; } : never, z.core.$strict>;
-
-/**
- * Checks if the provided schema is an instance of `z.ZodObject`.
- * @returns `true` if the schema is a `z.ZodObject`, `false` otherwise.
- */
-declare const isZodObject: (schema: z.ZodTypeAny) => schema is AnyZodObject;
-/**
- * Checks if the provided schema is an instance of `z.ZodOptional`.
- * @returns `true` if the schema is a `z.ZodOptional`, `false` otherwise.
- */
-declare const isZodOptional: (schema: z.ZodTypeAny) => schema is z.ZodOptional<z.ZodTypeAny>;
-/**
- * Unwraps a `z.ZodOptional` schema to retrieve its inner schema.
- * If the provided schema is not optional, it is returned unchanged.
- */
-declare const unwrapOptional: (schema: z.ZodTypeAny) => z.ZodTypeAny;
-
 declare const parseQueryValue: (value: unknown) => unknown;
 /**
- * Query parameters always arrive as strings, even when they semantically represent numbers
- * or booleans, so we preprocess them to convert to the appropriate types before validation.
+ * Preprocesses query-like values before Zod validation.
+ *
+ * Query parameters are string-based by nature, even when they semantically represent
+ * numbers or booleans. This helper converts only clear primitive values, allowing
+ * regular schemas like `z.number()` and `z.boolean()` to validate query input directly.
  *
  * ```ts
- * const schema = z.object({
+ * const schema = asQuery(z.object({
  *   page: z.number().int().positive(),
  *   isActive: z.boolean(),
- * });
+ * }));
  *
- * const queryParams = { page: '2', isActive: 'true' };
- * const result = schema.parse(queryParams); // { page: 2, isActive: true }
+ * schema.parse({ page: '2', isActive: 'true' });
+ * // { page: 2, isActive: true }
  * ```
- *
- * @param schema - The Zod schema to validate the query parameters against.
- * @returns A new Zod schema that preprocesses query parameter values before validation.
  */
 declare const asQuery: <T extends z.ZodTypeAny>(schema: T) => z.ZodPreprocess<T>;
 
@@ -411,4 +341,4 @@ declare const asQuery: <T extends z.ZodTypeAny>(schema: T) => z.ZodPreprocess<T>
  */
 declare const isPlainObject: (value: unknown) => value is Record<string, unknown>;
 
-export { type APIContractData, type APIContractError, type APIContractResult, type APIError, type APISuccess, type AnyZodObject, type AsQuery, type AtLeastOne, EXCEPTION_STATUS_CODES, type ExceptionStatusCode, type FetchResult, type FlattenZodShape, type JWTServiceOptions, type JWTSignOptions, type MeasuredExecution, type Payload, type PayloadSchema, SUCCESS_STATUS_CODES, type Simplify, type SuccessStatusCode, ZodJWTService, type ZodPaginationOptions, type ZodShape, asQuery, asQuerySchema, failure, fetchAndThrow, fetchSafely, flattenZodShape, formatTime, generateRandomString, getColoredHTTPStatus, getFormattedDate, getFormattedTime, getUTCOffset, getZonedTime, honoLoggingHandler, isPlainObject, isZodObject, isZodOptional, log, measureExecutionTime, onHandlerError, parseQueryValue, refinePagination, respond, safeExecute, sqlWhere, success, unwrapOptional, zodPaginationSchema, zodPaginationShape };
+export { type APIContractData, type APIContractError, type APIContractResult, type APIError, type APISuccess, type AsQuery, type AtLeastOne, EXCEPTION_STATUS_CODES, type ExceptionStatusCode, type FetchResult, type JWTServiceOptions, type JWTSignOptions, type MeasuredExecution, type Payload, type PayloadSchema, SUCCESS_STATUS_CODES, type Simplify, type SuccessStatusCode, ZodJWTService, type ZodPaginationOptions, asQuery, failure, fetchAndThrow, fetchSafely, formatTime, generateRandomString, getColoredHTTPStatus, getFormattedDate, getFormattedTime, getUTCOffset, getZonedTime, honoLoggingHandler, isPlainObject, log, measureExecutionTime, onHandlerError, parseQueryValue, refinePagination, respond, safeExecute, sqlWhere, success, zodPaginationSchema, zodPaginationShape };

package/dist/index.js

@@ -219,9 +219,19 @@ import z2 from "zod";
 
 // src/zod-validation/zod-validation.refiners.ts
 import z from "zod";
+
+// src/zod-validation/zod-validation.utilities.ts
+var isPlainObject = (value) => {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+};
+
+// src/zod-validation/zod-validation.refiners.ts
 var parseQueryValue = (value) => {
   if (Array.isArray(value))
     return value.map(parseQueryValue);
+  if (isPlainObject(value)) {
+    return Object.fromEntries(Object.entries(value).map(([key, value2]) => [key, parseQueryValue(value2)]));
+  }
   if (typeof value !== "string")
     return value;
   const normalized = value.trim().toLowerCase();
@@ -245,55 +255,14 @@ var zodPaginationSchema = z2.object({
   limit: asQuery(z2.number().int().positive()).optional()
 });
 var zodPaginationShape = zodPaginationSchema.shape;
-
-// src/zod-flatten/zod-flatten.schemas.ts
-import z4 from "zod";
-
-// src/zod-flatten/zod-flatten.utilities.ts
-import z3 from "zod";
-var isZodObject = (schema) => {
-  return schema instanceof z3.ZodObject;
-};
-var isZodOptional = (schema) => {
-  return schema instanceof z3.ZodOptional;
-};
-var unwrapOptional = (schema) => {
-  return isZodOptional(schema) ? schema.unwrap() : schema;
-};
-
-// src/zod-flatten/zod-flatten.schemas.ts
-var flattenZodShape = (shape) => {
-  const flat = {};
-  for (const [key, schema] of Object.entries(shape)) {
-    const unwrappedSchema = unwrapOptional(schema);
-    if (isZodObject(unwrappedSchema) === false) {
-      flat[key] = schema;
-      continue;
-    }
-    for (const [innerKey, innerSchema] of Object.entries(unwrappedSchema.shape)) {
-      flat[innerKey] = isZodOptional(schema) ? innerSchema.optional() : innerSchema;
-    }
-  }
-  return flat;
-};
-var asQuerySchema = (schema) => {
-  return z4.object(flattenZodShape(schema.shape)).strict();
-};
-
-// src/zod-validation/zod-validation.utilities.ts
-var isPlainObject = (value) => {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-};
 export {
   EXCEPTION_STATUS_CODES,
   SUCCESS_STATUS_CODES,
   ZodJWTService,
   asQuery,
-  asQuerySchema,
   failure,
   fetchAndThrow,
   fetchSafely,
-  flattenZodShape,
   formatTime,
   generateRandomString,
   getColoredHTTPStatus,
@@ -303,8 +272,6 @@ export {
   getZonedTime,
   honoLoggingHandler,
   isPlainObject,
-  isZodObject,
-  isZodOptional,
   log,
   measureExecutionTime,
   onHandlerError,
@@ -314,7 +281,6 @@ export {
   safeExecute,
   sqlWhere,
   success,
-  unwrapOptional,
   zodPaginationSchema,
   zodPaginationShape
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kalutskii/foundation",
-  "version": "0.6.10",
+  "version": "0.6.12",
   "description": "Typescript collection of most common utilities, schemas and functions among private projects.",
   "type": "module",
   "repository": {