sprint-es 0.0.149 → 0.0.150

package/dist/cjs/index.cjs

@@ -31,6 +31,7 @@ const morgan = require("morgan");
 const dotenv = require("dotenv");
 const url = require("url");
 const rateLimit = require("toolkitify/rate-limit");
+const modules_schemas_index = require("./modules/schemas/index.cjs");
 var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
 process.argv.includes("--dev");
 const isVerbose = process.argv.includes("--verbose");
@@ -829,6 +830,7 @@ class Sprint {
   }
 }
 function createSchemaValidationMiddleware(schema) {
+  const headersSchema = schema.headers ? modules_schemas_index.normalizeHeadersSchema(schema.headers) : null;
   return (req, res, next) => {
     const errors = [];
     const method = req.method.toUpperCase();
@@ -863,11 +865,9 @@ function createSchemaValidationMiddleware(schema) {
         })));
       }
     }
-    if (schema.headers) {
+    if (headersSchema) {
       const normalizedHeaders = Object.fromEntries(Object.entries(req.headers).map(([key, value]) => [key.toLowerCase(), value]));
-      const schemaShape = schema.headers._def?.shape?.();
-      const normalizedSchema = schemaShape ? schema.headers.constructor.create(Object.fromEntries(Object.entries(schemaShape).map(([key, value]) => [key.toLowerCase(), value]))) : schema.headers;
-      const result = normalizedSchema.safeParse(normalizedHeaders);
+      const result = headersSchema.safeParse(normalizedHeaders);
       if (!result.success) {
         errors.push(...result.error.issues.map((issue) => ({
           location: "headers",

package/dist/cjs/modules/schemas/index.cjs

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const zod = require("zod");
+function normalizeHeadersSchema(schema) {
+  const shape = schema.shape ?? schema._def?.shape?.();
+  if (!shape) return schema;
+  const normalizedShape = Object.fromEntries(Object.entries(shape).map(([key, value]) => [key.toLowerCase(), value]));
+  return zod.z.object(normalizedShape);
+}
 function createSprintAuthorizationSchema(options) {
   const defaultSources = ["query:token", "headers:authorization"];
   const sources = options?.sources ? Array.isArray(options.sources) ? options.sources : [options.sources] : defaultSources;
@@ -36,6 +42,7 @@ function parseSchema(schema, data) {
   return { success: true, data: result.data };
 }
 function defineRouteSchema(schema) {
+  const headersSchema = schema.headers ? normalizeHeadersSchema(schema.headers) : null;
   const middleware = (req, res, next) => {
     const errors = [];
     const method = req.method.toUpperCase();
@@ -52,19 +59,10 @@ function defineRouteSchema(schema) {
       const result = parseSchema(schema.params, req.params);
       if (!result.success) errors.push(...result.errors.map((e) => ({ location: "params", ...e })));
     }
-    if (schema.headers) {
+    if (headersSchema) {
       const normalizedHeaders = Object.fromEntries(Object.entries(req.headers).map(([key, value]) => [key.toLowerCase(), value]));
-      const schemaShape = schema.headers.shape;
-      const normalizedShape = schemaShape ? Object.fromEntries(Object.entries(schemaShape).map(([key, value]) => [key.toLowerCase(), value])) : null;
-      const effectiveSchema = normalizedShape ? schema.headers.constructor.create(normalizedShape) : schema.headers;
-      const result = effectiveSchema.safeParse(normalizedHeaders);
-      if (!result.success) {
-        errors.push(...result.error.issues.map((issue) => ({
-          location: "headers",
-          path: issue.path.join("."),
-          message: issue.message
-        })));
-      }
+      const result = headersSchema.safeParse(normalizedHeaders);
+      if (!result.success) errors.push(...result.errors.map((e) => ({ location: "headers", ...e })));
     }
     if (schema.sprint?.authorization) {
       const authSchema = schema.sprint.authorization;
@@ -110,5 +108,6 @@ function defineRouteSchema(schema) {
   return middleware;
 }
 exports.defineRouteSchema = defineRouteSchema;
+exports.normalizeHeadersSchema = normalizeHeadersSchema;
 exports.sprint = sprintBuilder;
 exports.z = proxyZ;

package/dist/esm/index.js

@@ -7,6 +7,7 @@ import morgan from "morgan";
 import dotenv from "dotenv";
 import { pathToFileURL } from "url";
 import { RateLimiter } from "toolkitify/rate-limit";
+import { normalizeHeadersSchema } from "./modules/schemas/index.js";
 process.argv.includes("--dev");
 const isVerbose = process.argv.includes("--verbose");
 let __filename$1;
@@ -804,6 +805,7 @@ class Sprint {
   }
 }
 function createSchemaValidationMiddleware(schema) {
+  const headersSchema = schema.headers ? normalizeHeadersSchema(schema.headers) : null;
   return (req, res, next) => {
     const errors = [];
     const method = req.method.toUpperCase();
@@ -838,11 +840,9 @@ function createSchemaValidationMiddleware(schema) {
         })));
       }
     }
-    if (schema.headers) {
+    if (headersSchema) {
       const normalizedHeaders = Object.fromEntries(Object.entries(req.headers).map(([key, value]) => [key.toLowerCase(), value]));
-      const schemaShape = schema.headers._def?.shape?.();
-      const normalizedSchema = schemaShape ? schema.headers.constructor.create(Object.fromEntries(Object.entries(schemaShape).map(([key, value]) => [key.toLowerCase(), value]))) : schema.headers;
-      const result = normalizedSchema.safeParse(normalizedHeaders);
+      const result = headersSchema.safeParse(normalizedHeaders);
       if (!result.success) {
         errors.push(...result.error.issues.map((issue) => ({
           location: "headers",

package/dist/esm/modules/schemas/index.js

@@ -1,4 +1,10 @@
 import { z } from "zod";
+function normalizeHeadersSchema(schema) {
+  const shape = schema.shape ?? schema._def?.shape?.();
+  if (!shape) return schema;
+  const normalizedShape = Object.fromEntries(Object.entries(shape).map(([key, value]) => [key.toLowerCase(), value]));
+  return z.object(normalizedShape);
+}
 function createSprintAuthorizationSchema(options) {
   const defaultSources = ["query:token", "headers:authorization"];
   const sources = options?.sources ? Array.isArray(options.sources) ? options.sources : [options.sources] : defaultSources;
@@ -34,6 +40,7 @@ function parseSchema(schema, data) {
   return { success: true, data: result.data };
 }
 function defineRouteSchema(schema) {
+  const headersSchema = schema.headers ? normalizeHeadersSchema(schema.headers) : null;
   const middleware = (req, res, next) => {
     const errors = [];
     const method = req.method.toUpperCase();
@@ -50,19 +57,10 @@ function defineRouteSchema(schema) {
       const result = parseSchema(schema.params, req.params);
       if (!result.success) errors.push(...result.errors.map((e) => ({ location: "params", ...e })));
     }
-    if (schema.headers) {
+    if (headersSchema) {
       const normalizedHeaders = Object.fromEntries(Object.entries(req.headers).map(([key, value]) => [key.toLowerCase(), value]));
-      const schemaShape = schema.headers.shape;
-      const normalizedShape = schemaShape ? Object.fromEntries(Object.entries(schemaShape).map(([key, value]) => [key.toLowerCase(), value])) : null;
-      const effectiveSchema = normalizedShape ? schema.headers.constructor.create(normalizedShape) : schema.headers;
-      const result = effectiveSchema.safeParse(normalizedHeaders);
-      if (!result.success) {
-        errors.push(...result.error.issues.map((issue) => ({
-          location: "headers",
-          path: issue.path.join("."),
-          message: issue.message
-        })));
-      }
+      const result = headersSchema.safeParse(normalizedHeaders);
+      if (!result.success) errors.push(...result.errors.map((e) => ({ location: "headers", ...e })));
     }
     if (schema.sprint?.authorization) {
       const authSchema = schema.sprint.authorization;
@@ -109,6 +107,7 @@ function defineRouteSchema(schema) {
 }
 export {
   defineRouteSchema,
+  normalizeHeadersSchema,
   sprintBuilder as sprint,
   proxyZ as z
 };

package/dist/types/middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAuB,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAoGlF;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,gBAAgB,EAC7D,MAAM,EAAE,gBAAgB,CAAC,OAAO,CAAC,GAClC,gBAAgB,CAAC,OAAO,CAAC,CAwB3B"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAuB,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAoGlF;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,gBAAgB,EAC7D,MAAM,EAAE,gBAAgB,CAAC,OAAO,CAAC,GAClC,gBAAgB,CAAC,OAAO,CAAC,CAwB3B"}

package/dist/types/modules/schemas/index.d.ts

@@ -4,6 +4,7 @@ export type AuthorizationSource = `query:${string}` | `headers:${string}`;
 export interface SprintAuthorizationOptions {
     sources?: AuthorizationSource | AuthorizationSource[];
 }
+export declare function normalizeHeadersSchema(schema: any): any;
 declare function createSprintAuthorizationSchema(options?: SprintAuthorizationOptions): ZodSchemaType<string, ZodTypeDef, string>;
 declare const sprintBuilder: {
     authorization: typeof createSprintAuthorizationSchema;

package/dist/types/modules/schemas/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/schemas/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,CAAC,EAAE,SAAS,IAAI,aAAa,EAAE,UAAU,EAAuB,MAAM,KAAK,CAAC;AAErF,MAAM,MAAM,mBAAmB,GAAG,SAAS,MAAM,EAAE,GAAG,WAAW,MAAM,EAAE,CAAC;AAE1E,MAAM,WAAW,0BAA0B;IACvC,OAAO,CAAC,EAAE,mBAAmB,GAAG,mBAAmB,EAAE,CAAC;CACzD;AAED,iBAAS,+BAA+B,CAAC,OAAO,CAAC,EAAE,0BAA0B,GAAG,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,CAKxH;AAED,QAAA,MAAM,aAAa;;CAElB,CAAC;AAEF,QAAA,MAAM,UAAU;;CAEf,CAAC;AAEF,KAAK,cAAc,GAAG,OAAO,UAAU,GAAG,CAAC,MAAM,OAAO,UAAU,CAAC,CAAC;AAQpE,KAAK,aAAa,GAAG,OAAO,CAAC,GAAG;IAC5B,MAAM,EAAE,cAAc,CAAC;CAC1B,CAAC;AAEF,QAAA,MAAM,MAAM,EAKN,aAAa,CAAC;AAEpB,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,CAAC;AACvB,OAAO,EAAE,aAAa,IAAI,MAAM,EAAE,CAAC;AAEnC,MAAM,WAAW,kBAAkB;IAC/B,IAAI,CAAC,EAAE,aAAa,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;IAC3C,WAAW,CAAC,EAAE,aAAa,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;IAClD,MAAM,CAAC,EAAE,aAAa,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,aAAa,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;IAC9C,MAAM,CAAC,EAAE;QACL,aAAa,CAAC,EAAE,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;KAC7D,CAAC;CACL;AAqBD,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,cAAc,CAwFzF;AAED,YAAY,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/schemas/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,CAAC,EAAE,SAAS,IAAI,aAAa,EAAE,UAAU,EAAuB,MAAM,KAAK,CAAC;AAErF,MAAM,MAAM,mBAAmB,GAAG,SAAS,MAAM,EAAE,GAAG,WAAW,MAAM,EAAE,CAAC;AAE1E,MAAM,WAAW,0BAA0B;IACvC,OAAO,CAAC,EAAE,mBAAmB,GAAG,mBAAmB,EAAE,CAAC;CACzD;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CAKvD;AAED,iBAAS,+BAA+B,CAAC,OAAO,CAAC,EAAE,0BAA0B,GAAG,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,CAKxH;AAED,QAAA,MAAM,aAAa;;CAElB,CAAC;AAEF,QAAA,MAAM,UAAU;;CAEf,CAAC;AAEF,KAAK,cAAc,GAAG,OAAO,UAAU,GAAG,CAAC,MAAM,OAAO,UAAU,CAAC,CAAC;AAQpE,KAAK,aAAa,GAAG,OAAO,CAAC,GAAG;IAC5B,MAAM,EAAE,cAAc,CAAC;CAC1B,CAAC;AAEF,QAAA,MAAM,MAAM,EAKN,aAAa,CAAC;AAEpB,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,CAAC;AACvB,OAAO,EAAE,aAAa,IAAI,MAAM,EAAE,CAAC;AAEnC,MAAM,WAAW,kBAAkB;IAC/B,IAAI,CAAC,EAAE,aAAa,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;IAC3C,WAAW,CAAC,EAAE,aAAa,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;IAClD,MAAM,CAAC,EAAE,aAAa,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,aAAa,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;IAC9C,MAAM,CAAC,EAAE;QACL,aAAa,CAAC,EAAE,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;KAC7D,CAAC;CACL;AAqBD,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,cAAc,CA8EzF;AAED,YAAY,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sprint-es",
-    "version": "0.0.149",
+    "version": "0.0.150",
     "description": "Sprint - Quickly API",
     "main": "dist/cjs/index.js",
     "module": "dist/esm/index.js",