@emeryld/rrroutes-server 2.3.6 → 2.3.8

package/dist/index.cjs

@@ -23,18 +23,20 @@ __export(index_exports, {
   CTX_SYMBOL: () => CTX_SYMBOL,
   bindAll: () => bindAll,
   bindExpressRoutes: () => bindExpressRoutes,
+  contractKeyOf: () => import_rrroutes_contract2.keyOf,
   createConnectionLoggingMiddleware: () => createConnectionLoggingMiddleware,
   createRRRoute: () => createRRRoute,
   createSocketConnections: () => createSocketConnections,
   defineControllers: () => defineControllers,
   getCtx: () => getCtx,
-  keyOf: () => keyOf,
   warnMissingControllers: () => warnMissingControllers
 });
 module.exports = __toCommonJS(index_exports);
+var import_rrroutes_contract2 = require("@emeryld/rrroutes-contract");
 
 // src/routesV3.server.ts
 var import_rrroutes_contract = require("@emeryld/rrroutes-contract");
+var import_zod = require("zod");
 var serverDebugEventTypes = [
   "register",
   "request",
@@ -68,7 +70,61 @@ function createServerDebugEmitter(option) {
   }
   return disabled;
 }
-var keyOf = (leaf) => `${leaf.method.toUpperCase()} ${leaf.path}`;
+var isPlainObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+var isZodType = (schema) => Boolean(schema && typeof schema.parse === "function");
+var unwrapQuerySchema = (schema) => {
+  let current = schema;
+  const EffectsCtor = import_zod.z.ZodEffects;
+  const PipelineCtor = import_zod.z.ZodPipeline;
+  const CatchCtor = import_zod.z.ZodCatch;
+  for (let i = 0; i < 10; i += 1) {
+    if (!current) break;
+    if (current instanceof import_zod.z.ZodOptional || current instanceof import_zod.z.ZodNullable) {
+      current = current.unwrap();
+      continue;
+    }
+    if (current instanceof import_zod.z.ZodDefault) {
+      current = current._def?.innerType;
+      continue;
+    }
+    if (CatchCtor && current instanceof CatchCtor) {
+      current = current._def?.innerType;
+      continue;
+    }
+    if (EffectsCtor && current instanceof EffectsCtor) {
+      current = current._def?.schema ?? current._def?.innerType;
+      continue;
+    }
+    if (PipelineCtor && current instanceof PipelineCtor) {
+      current = current._def?.out ?? current._def?.innerType;
+      continue;
+    }
+    break;
+  }
+  return current ?? schema;
+};
+var normalizeQueryValue = (schema, value) => {
+  const resolved = unwrapQuerySchema(schema);
+  if (resolved instanceof import_zod.z.ZodArray) {
+    if (value === void 0 || value === null) return value;
+    return Array.isArray(value) ? value : [value];
+  }
+  if (resolved instanceof import_zod.z.ZodObject && isPlainObject(value)) {
+    const shape = (0, import_rrroutes_contract.getZodShape)(resolved);
+    const next = {};
+    for (const [key, childValue] of Object.entries(value)) {
+      const childSchema = shape[key];
+      next[key] = childSchema && isZodType(childSchema) ? normalizeQueryValue(childSchema, childValue) : childValue;
+    }
+    return next;
+  }
+  return value;
+};
+var normalizeQueryForSchema = (schema, value) => {
+  if (!schema || value === void 0 || value === null) return value;
+  if (!isPlainObject(value)) return value;
+  return isZodType(schema) ? normalizeQueryValue(schema, value) : value;
+};
 var CTX_SYMBOL = Symbol.for("typedLeaves.ctx");
 function getCtx(res) {
   return res.locals[CTX_SYMBOL];
@@ -156,7 +212,7 @@ function createRRRoute(router, config) {
     const method = leaf.method;
     const methodUpper = method.toUpperCase();
     const path = leaf.path;
-    const key = keyOf(leaf);
+    const key = (0, import_rrroutes_contract.keyOf)(leaf, false);
     const defDebug = def.debug;
     let debugName = void 0;
     let routeDebugEmitter;
@@ -252,7 +308,8 @@ function createRRRoute(router, config) {
       try {
         params = leaf.cfg.paramsSchema ? (0, import_rrroutes_contract.lowProfileParse)(leaf.cfg.paramsSchema, req.params) : Object.keys(req.params || {}).length ? req.params : void 0;
         try {
-          query = leaf.cfg.querySchema ? (0, import_rrroutes_contract.lowProfileParse)(leaf.cfg.querySchema, req.query) : Object.keys(req.query || {}).length ? req.query : void 0;
+          const queryInput = leaf.cfg.querySchema ? normalizeQueryForSchema(leaf.cfg.querySchema, req.query) : req.query;
+          query = leaf.cfg.querySchema ? (0, import_rrroutes_contract.lowProfileParse)(leaf.cfg.querySchema, queryInput) : Object.keys(req.query || {}).length ? req.query : void 0;
         } catch (e) {
           logger?.error?.("Query parsing error", {
             path,
@@ -362,7 +419,7 @@ function createRRRoute(router, config) {
   }
   function registerControllers(registry, controllers, all) {
     for (const leaf of registry.all) {
-      const key = keyOf(leaf);
+      const key = (0, import_rrroutes_contract.keyOf)(leaf, false);
       knownLeaves.set(key, leaf);
     }
     ;
@@ -381,7 +438,7 @@ function createRRRoute(router, config) {
     if (all) {
       const missing = [];
       for (const leaf of registry.all) {
-        const key = keyOf(leaf);
+        const key = (0, import_rrroutes_contract.keyOf)(leaf, false);
         if (!controllers[key]) {
           missing.push(key);
         }
@@ -401,7 +458,7 @@ function createRRRoute(router, config) {
       );
     }
     for (const leaf of registry.all) {
-      const key = keyOf(leaf);
+      const key = (0, import_rrroutes_contract.keyOf)(leaf, false);
       if (!registeredFromStore.has(key)) {
         warnLogger.warn(`No controller registered for route: ${key}`);
       }
@@ -431,7 +488,7 @@ function warnMissingControllers(router, registry, logger) {
   const initial = registeredStore ? Array.from(registeredStore) : collectRoutesFromStack(router);
   const registeredKeys = new Set(initial);
   for (const leaf of registry.all) {
-    const k = keyOf(leaf);
+    const k = (0, import_rrroutes_contract.keyOf)(leaf, false);
     if (!registeredKeys.has(k)) {
       logger.warn(`No controller registered for route: ${k}`);
     }
@@ -452,7 +509,7 @@ function createDebugger(options) {
 }
 
 // src/sockets/socket.server.sys.ts
-var import_zod = require("zod");
+var import_zod2 = require("zod");
 var normalizeError = (error) => {
   if (error instanceof Error) {
     return { name: error.name, message: error.message };
@@ -460,8 +517,8 @@ var normalizeError = (error) => {
   if (typeof error === "string") return { message: error };
   return { message: "Unknown error" };
 };
-var roomValueSchema = import_zod.z.union([import_zod.z.string(), import_zod.z.array(import_zod.z.string())]);
-var buildRoomPayloadSchema = (metaSchema) => import_zod.z.object({
+var roomValueSchema = import_zod2.z.union([import_zod2.z.string(), import_zod2.z.array(import_zod2.z.string())]);
+var buildRoomPayloadSchema = (metaSchema) => import_zod2.z.object({
   rooms: roomValueSchema,
   meta: metaSchema
 });
@@ -1164,12 +1221,12 @@ var createConnectionLoggingMiddleware = (options = {}) => {
   CTX_SYMBOL,
   bindAll,
   bindExpressRoutes,
+  contractKeyOf,
   createConnectionLoggingMiddleware,
   createRRRoute,
   createSocketConnections,
   defineControllers,
   getCtx,
-  keyOf,
   warnMissingControllers
 });
 //# sourceMappingURL=index.cjs.map