equipped 5.3.1 → 5.3.2

package/dist/cjs/server/adapters/fastify/index.cjs

@@ -69,7 +69,7 @@ var import_cors = require("@fastify/cors");
 var import_cors2 = require("cors");
 var import_socket = require("socket.io");
 var import_supertest = __toESM(require("supertest"), 1);
-var import_valleyed8 = require("valleyed");
+var import_valleyed7 = require("valleyed");
 
 // src/events/adapters/base.ts
 var EventBus = class {
@@ -961,170 +961,6 @@ var openapi = (config) => {
   };
 };
 
-// src/utilities/configurable.ts
-var import_valleyed7 = require("valleyed");
-function configurable(pipeFn, base) {
-  const pipe = pipeFn();
-  import_valleyed7.v.compile(pipe);
-  class Configurable extends base {
-    constructor(config, ...baseArgs) {
-      super(...baseArgs);
-      this.config = config;
-    }
-    static create(input, ...args) {
-      const r = import_valleyed7.v.validate(pipe, input);
-      if (!r.valid) throw r.error;
-      return new this(r.value, ...args);
-    }
-  }
-  return Configurable;
-}
-if (void 0) {
-  const { describe, test, expect, expectTypeOf } = void 0;
-  const { v: v8 } = null;
-  const testPipe = () => v8.object({
-    host: v8.string(),
-    port: v8.number()
-  });
-  class TestBase {
-    baseValue;
-    constructor() {
-      this.baseValue = "base";
-    }
-  }
-  class TestBaseWithArgs {
-    label;
-    constructor(label) {
-      this.label = label;
-    }
-  }
-  describe("configurable", () => {
-    test("validation runs in static create before constructor body executes", () => {
-      let constructorRan = false;
-      const Wrapped = configurable(testPipe, TestBase);
-      class MyClass extends Wrapped {
-        constructor(config) {
-          super(config);
-          constructorRan = true;
-        }
-      }
-      expect(() => MyClass.create({ host: 123, port: "bad" })).toThrow();
-      expect(constructorRan).toBe(false);
-      MyClass.create({ host: "localhost", port: 3e3 });
-      expect(constructorRan).toBe(true);
-    });
-    test("constructor receives validated value", () => {
-      const Wrapped = configurable(testPipe, TestBase);
-      let receivedConfig;
-      class MyClass extends Wrapped {
-        constructor(config) {
-          super(config);
-          receivedConfig = this.config;
-        }
-      }
-      MyClass.create({ host: "localhost", port: 3e3 });
-      expect(receivedConfig).toEqual({ host: "localhost", port: 3e3 });
-    });
-    test("external new is a compile error", () => {
-      const Wrapped = configurable(testPipe, TestBase);
-      class MyClass extends Wrapped {
-        constructor(config) {
-          super(config);
-        }
-      }
-      void (() => new MyClass({ host: "localhost", port: 3e3 }));
-    });
-    test("static Config resolves to PipeOutput<P> at the type level", () => {
-      const Wrapped = configurable(testPipe, TestBase);
-      class MyClass extends Wrapped {
-        constructor(config) {
-          super(config);
-        }
-      }
-      expectTypeOf().toEqualTypeOf();
-      expect(MyClass.create).toBeTypeOf("function");
-    });
-    test("ConstructorParameters<This>-based extras inference works for non-zero-arg leaf signatures", () => {
-      const Wrapped = configurable(testPipe, TestBase);
-      class MyClass extends Wrapped {
-        extra;
-        constructor(config, extra) {
-          super(config);
-          this.extra = extra;
-        }
-      }
-      const instance = MyClass.create({ host: "localhost", port: 3e3 }, 42);
-      expect(instance.extra).toBe(42);
-      expectTypeOf(instance).toHaveProperty("extra");
-      expectTypeOf(instance.extra).toEqualTypeOf();
-      void (() => MyClass.create({ host: "localhost", port: 3e3 }, "not-a-number"));
-    });
-    test("base-args forwarding works for non-zero-arg bases", () => {
-      const Wrapped = configurable(testPipe, TestBaseWithArgs);
-      class MyClass extends Wrapped {
-        constructor(config, label) {
-          super(config, label);
-        }
-      }
-      const instance = MyClass.create({ host: "localhost", port: 3e3 }, "test-label");
-      expect(instance.label).toBe("test-label");
-    });
-    test("config is accessible as protected readonly on instances", () => {
-      const Wrapped = configurable(testPipe, TestBase);
-      class MyClass extends Wrapped {
-        constructor(config) {
-          super(config);
-        }
-        getHost() {
-          return this.config.host;
-        }
-      }
-      const instance = MyClass.create({ host: "localhost", port: 3e3 });
-      expect(instance.getHost()).toBe("localhost");
-    });
-    test("accepts an abstract base class", () => {
-      class AbstractBase {
-      }
-      const Wrapped = configurable(testPipe, AbstractBase);
-      class Concrete extends Wrapped {
-        constructor(config) {
-          super(config);
-        }
-        greet() {
-          return `hello from ${this.config.host}`;
-        }
-      }
-      const instance = Concrete.create({ host: "localhost", port: 3e3 });
-      expect(instance.greet()).toBe("hello from localhost");
-      expectTypeOf(instance).toHaveProperty("config");
-    });
-  });
-}
-
-// src/utilities/json.ts
-var parseJSONValue = (data) => {
-  try {
-    if (data?.constructor?.name !== "String") return data;
-    return JSON.parse(data);
-  } catch {
-    return data;
-  }
-};
-function parseJSONObject(data) {
-  return Object.fromEntries(Object.entries(data).map(([key, value]) => [key, parseJSONValue(value)]));
-}
-
-// src/utilities/media.ts
-var import_music_metadata = require("music-metadata");
-var getMediaDuration = async (buffer) => {
-  try {
-    const meta = await (0, import_music_metadata.parseBuffer)(buffer);
-    return meta.format.duration ?? 0;
-  } catch {
-    return 0;
-  }
-};
-
 // src/server/requests.ts
 var Request = class {
   ip;
@@ -1153,8 +989,10 @@ var Request = class {
     this.params = params;
     this.cookies = cookies;
     this.headers = headers;
-    this.query = parseJSONObject(query);
-    this.body = Object.assign(parseJSONObject(body), files);
+    const hasFiles = Object.keys(files).length > 0;
+    const bodyFields = body && typeof body === "object" && !Array.isArray(body) ? body : {};
+    this.query = query;
+    this.body = hasFiles ? Object.assign({}, bodyFields, files) : body;
   }
   pipe(stream, opts = {}) {
     return new Response({ ...opts, piped: true, body: stream });
@@ -1200,6 +1038,83 @@ var Response = class {
     });
   }
 };
+if (void 0) {
+  const { describe, expect, test } = void 0;
+  describe("Request", () => {
+    test("preserves adapter-provided query and body values without JSON normalization", () => {
+      const query = {
+        count: "10",
+        active: "true",
+        filter: '{"name":"test"}',
+        quoted: '"value"'
+      };
+      const body = {
+        count: "10",
+        active: "false",
+        payload: '{"nested":true}',
+        quoted: '"value"'
+      };
+      const request = new Request({
+        ip: void 0,
+        body,
+        cookies: {},
+        params: {},
+        query,
+        method: "post",
+        path: "/items",
+        headers: {},
+        files: {}
+      });
+      expect(request.query).toEqual(query);
+      expect(request.body).toEqual(body);
+    });
+    test("continues merging uploaded files into body fields without parsing string fields", () => {
+      const file = {
+        name: "avatar.png",
+        type: "image/png",
+        size: 4,
+        isTruncated: false,
+        data: Buffer.from("file"),
+        duration: 0
+      };
+      const body = { metadata: '{"alt":"avatar"}' };
+      const request = new Request({
+        ip: void 0,
+        body,
+        cookies: {},
+        params: {},
+        query: {},
+        method: "post",
+        path: "/upload",
+        headers: {},
+        files: { avatar: [file] }
+      });
+      expect(request.body).toEqual({ metadata: '{"alt":"avatar"}', avatar: [file] });
+    });
+    test("does not spread non-object body values when uploaded files are present", () => {
+      const file = {
+        name: "avatar.png",
+        type: "image/png",
+        size: 4,
+        isTruncated: false,
+        data: Buffer.from("file"),
+        duration: 0
+      };
+      const request = new Request({
+        ip: void 0,
+        body: "raw text body",
+        cookies: {},
+        params: {},
+        query: {},
+        method: "post",
+        path: "/upload",
+        headers: {},
+        files: { avatar: [file] }
+      });
+      expect(request.body).toEqual({ avatar: [file] });
+    });
+  });
+}
 
 // src/server/requests-auth-methods/base.ts
 var import_node_http2 = require("http2");
@@ -1330,50 +1245,50 @@ var SocketEmitter = class {
 };
 
 // src/server/adapters/base.ts
-var serverConfigPipe = () => import_valleyed8.v.object({
-  port: import_valleyed8.v.number(),
-  cors: import_valleyed8.v.optional(
-    import_valleyed8.v.object({
-      origin: import_valleyed8.v.optional(import_valleyed8.v.or([import_valleyed8.v.array(import_valleyed8.v.string()), import_valleyed8.v.is(true)])),
-      methods: import_valleyed8.v.optional(import_valleyed8.v.array(import_valleyed8.v.in(Object.values(Methods)))),
-      credentials: import_valleyed8.v.optional(import_valleyed8.v.boolean())
+var serverConfigPipe = () => import_valleyed7.v.object({
+  port: import_valleyed7.v.number(),
+  cors: import_valleyed7.v.optional(
+    import_valleyed7.v.object({
+      origin: import_valleyed7.v.optional(import_valleyed7.v.or([import_valleyed7.v.array(import_valleyed7.v.string()), import_valleyed7.v.is(true)])),
+      methods: import_valleyed7.v.optional(import_valleyed7.v.array(import_valleyed7.v.in(Object.values(Methods)))),
+      credentials: import_valleyed7.v.optional(import_valleyed7.v.boolean())
     })
   ),
-  eventBus: import_valleyed8.v.optional(import_valleyed8.v.instanceOf(EventBus)),
-  publicPath: import_valleyed8.v.optional(import_valleyed8.v.string()),
-  healthPath: import_valleyed8.v.optional(import_valleyed8.v.string()),
-  openapi: import_valleyed8.v.defaults(
-    import_valleyed8.v.object({
-      docsVersion: import_valleyed8.v.defaults(import_valleyed8.v.string(), "1.0.0"),
-      docsBaseUrl: import_valleyed8.v.defaults(import_valleyed8.v.array(import_valleyed8.v.string()), ["/"]),
-      docsPath: import_valleyed8.v.defaults(import_valleyed8.v.string(), "/__docs")
+  eventBus: import_valleyed7.v.optional(import_valleyed7.v.instanceOf(EventBus)),
+  publicPath: import_valleyed7.v.optional(import_valleyed7.v.string()),
+  healthPath: import_valleyed7.v.optional(import_valleyed7.v.string()),
+  openapi: import_valleyed7.v.defaults(
+    import_valleyed7.v.object({
+      docsVersion: import_valleyed7.v.defaults(import_valleyed7.v.string(), "1.0.0"),
+      docsBaseUrl: import_valleyed7.v.defaults(import_valleyed7.v.array(import_valleyed7.v.string()), ["/"]),
+      docsPath: import_valleyed7.v.defaults(import_valleyed7.v.string(), "/__docs")
     }),
     {}
   ),
-  requests: import_valleyed8.v.defaults(
-    import_valleyed8.v.object({
-      log: import_valleyed8.v.defaults(import_valleyed8.v.boolean(), true),
-      rateLimit: import_valleyed8.v.defaults(
-        import_valleyed8.v.object({
-          enabled: import_valleyed8.v.defaults(import_valleyed8.v.boolean(), false),
-          periodInMs: import_valleyed8.v.defaults(import_valleyed8.v.number(), 60 * 60 * 1e3),
-          limit: import_valleyed8.v.defaults(import_valleyed8.v.number(), 5e3)
+  requests: import_valleyed7.v.defaults(
+    import_valleyed7.v.object({
+      log: import_valleyed7.v.defaults(import_valleyed7.v.boolean(), true),
+      rateLimit: import_valleyed7.v.defaults(
+        import_valleyed7.v.object({
+          enabled: import_valleyed7.v.defaults(import_valleyed7.v.boolean(), false),
+          periodInMs: import_valleyed7.v.defaults(import_valleyed7.v.number(), 60 * 60 * 1e3),
+          limit: import_valleyed7.v.defaults(import_valleyed7.v.number(), 5e3)
         }),
         {}
       ),
-      slowdown: import_valleyed8.v.defaults(
-        import_valleyed8.v.object({
-          enabled: import_valleyed8.v.defaults(import_valleyed8.v.boolean(), false),
-          periodInMs: import_valleyed8.v.defaults(import_valleyed8.v.number(), 10 * 60 * 1e3),
-          delayAfter: import_valleyed8.v.defaults(import_valleyed8.v.number(), 2e3),
-          delayInMs: import_valleyed8.v.defaults(import_valleyed8.v.number(), 500)
+      slowdown: import_valleyed7.v.defaults(
+        import_valleyed7.v.object({
+          enabled: import_valleyed7.v.defaults(import_valleyed7.v.boolean(), false),
+          periodInMs: import_valleyed7.v.defaults(import_valleyed7.v.number(), 10 * 60 * 1e3),
+          delayAfter: import_valleyed7.v.defaults(import_valleyed7.v.number(), 2e3),
+          delayInMs: import_valleyed7.v.defaults(import_valleyed7.v.number(), 500)
         }),
         {}
       )
     }),
     {}
   ),
-  socketsAuthMethods: import_valleyed8.v.defaults(import_valleyed8.v.array(import_valleyed8.v.instanceOf(BaseRequestAuthMethod)), [])
+  socketsAuthMethods: import_valleyed7.v.defaults(import_valleyed7.v.array(import_valleyed7.v.instanceOf(BaseRequestAuthMethod)), [])
 });
 var rawResponseHandledSymbol = /* @__PURE__ */ Symbol("rawResponseHandled");
 var rawResponseHandled = Object.freeze({ [rawResponseHandledSymbol]: true });
@@ -1394,7 +1309,7 @@ function writeRawHandlerError(response, error) {
 var errorsSchemas = Object.entries(StatusCodes).filter(([, value]) => value > 399).map(([key, value]) => ({
   status: value,
   contentType: "application/json",
-  pipe: import_valleyed8.v.meta(import_valleyed8.v.array(import_valleyed8.v.object({ message: import_valleyed8.v.string(), field: import_valleyed8.v.optional(import_valleyed8.v.string()) })), {
+  pipe: import_valleyed7.v.meta(import_valleyed7.v.array(import_valleyed7.v.object({ message: import_valleyed7.v.string(), field: import_valleyed7.v.optional(import_valleyed7.v.string()) })), {
     $refId: `Errors.${key}Response`,
     description: `${key} Response`
   })
@@ -1551,37 +1466,37 @@ var Server = class {
       { key: "responseCookies", type: "response" }
     ];
     defs.forEach((def) => {
-      const pipe = schema[def.key] ?? import_valleyed8.v.any();
+      const pipe = schema[def.key] ?? import_valleyed7.v.any();
       if (def.skip) return;
       if (def.type === "request") {
         requestPipeDefs[def.key] = pipe;
-        jsonSchema.request[def.key] = import_valleyed8.v.schema(pipe);
+        jsonSchema.request[def.key] = import_valleyed7.v.schema(pipe);
       }
       if (def.type === "response") {
         const pipeRecords = errorsSchemas.concat({ status: defaultStatusCode, contentType, pipe });
-        responsePipeDefs[def.key] = import_valleyed8.v.any().pipe((input) => {
+        responsePipeDefs[def.key] = import_valleyed7.v.any().pipe((input) => {
           const p = pipeRecords.find((rec) => rec.status === status)?.pipe;
-          if (!p) throw import_valleyed8.PipeError.root(`schema not defined for status code: ${status}`, input);
-          const r = import_valleyed8.v.validate(p, input);
+          if (!p) throw import_valleyed7.PipeError.root(`schema not defined for status code: ${status}`, input);
+          const r = import_valleyed7.v.validate(p, input);
           if (!r.valid) throw r.error;
           return r.value;
         });
         jsonSchema.response[def.key] = pipeRecords.map((record) => ({
           status: record.status,
           contentType: record.contentType,
-          schema: import_valleyed8.v.schema(record.pipe)
+          schema: import_valleyed7.v.schema(record.pipe)
         }));
       }
     });
-    const requestPipe = import_valleyed8.v.object(requestPipeDefs);
-    import_valleyed8.v.compile(requestPipe, { allErrors: true });
-    const responsePipe = import_valleyed8.v.object(responsePipeDefs);
-    import_valleyed8.v.compile(responsePipe, { allErrors: true });
+    const requestPipe = import_valleyed7.v.object(requestPipeDefs);
+    import_valleyed7.v.compile(requestPipe, { allErrors: true });
+    const responsePipe = import_valleyed7.v.object(responsePipeDefs);
+    import_valleyed7.v.compile(responsePipe, { allErrors: true });
     const validateRequest = async (request) => {
       if (!Object.keys(requestPipeDefs)) return request;
       const validity = requestLocalStorage.run(
         request,
-        () => import_valleyed8.v.validate(requestPipe, {
+        () => import_valleyed7.v.validate(requestPipe, {
           params: request.params,
           headers: request.headers,
           query: request.query,
@@ -1603,7 +1518,7 @@ var Server = class {
       contentType = response.contentType;
       const validity = responseLocalStorage.run(
         response,
-        () => import_valleyed8.v.validate(responsePipe, {
+        () => import_valleyed7.v.validate(responsePipe, {
           responseHeaders: response.headers,
           responseCookies: Object.fromEntries(Object.entries(response.cookies).map(([key, val]) => [key, val.value])),
           response: response.body
@@ -1854,6 +1769,157 @@ var ValidationError = class extends RequestError {
   }
 };
 
+// src/utilities/configurable.ts
+var import_valleyed9 = require("valleyed");
+function configurable(pipeFn, base) {
+  const pipe = pipeFn();
+  import_valleyed9.v.compile(pipe);
+  class Configurable extends base {
+    constructor(config, ...baseArgs) {
+      super(...baseArgs);
+      this.config = config;
+    }
+    static create(input, ...args) {
+      const r = import_valleyed9.v.validate(pipe, input);
+      if (!r.valid) throw r.error;
+      return new this(r.value, ...args);
+    }
+  }
+  return Configurable;
+}
+if (void 0) {
+  const { describe, test, expect, expectTypeOf } = void 0;
+  const { v: v8 } = null;
+  const testPipe = () => v8.object({
+    host: v8.string(),
+    port: v8.number()
+  });
+  class TestBase {
+    baseValue;
+    constructor() {
+      this.baseValue = "base";
+    }
+  }
+  class TestBaseWithArgs {
+    label;
+    constructor(label) {
+      this.label = label;
+    }
+  }
+  describe("configurable", () => {
+    test("validation runs in static create before constructor body executes", () => {
+      let constructorRan = false;
+      const Wrapped = configurable(testPipe, TestBase);
+      class MyClass extends Wrapped {
+        constructor(config) {
+          super(config);
+          constructorRan = true;
+        }
+      }
+      expect(() => MyClass.create({ host: 123, port: "bad" })).toThrow();
+      expect(constructorRan).toBe(false);
+      MyClass.create({ host: "localhost", port: 3e3 });
+      expect(constructorRan).toBe(true);
+    });
+    test("constructor receives validated value", () => {
+      const Wrapped = configurable(testPipe, TestBase);
+      let receivedConfig;
+      class MyClass extends Wrapped {
+        constructor(config) {
+          super(config);
+          receivedConfig = this.config;
+        }
+      }
+      MyClass.create({ host: "localhost", port: 3e3 });
+      expect(receivedConfig).toEqual({ host: "localhost", port: 3e3 });
+    });
+    test("external new is a compile error", () => {
+      const Wrapped = configurable(testPipe, TestBase);
+      class MyClass extends Wrapped {
+        constructor(config) {
+          super(config);
+        }
+      }
+      void (() => new MyClass({ host: "localhost", port: 3e3 }));
+    });
+    test("static Config resolves to PipeOutput<P> at the type level", () => {
+      const Wrapped = configurable(testPipe, TestBase);
+      class MyClass extends Wrapped {
+        constructor(config) {
+          super(config);
+        }
+      }
+      expectTypeOf().toEqualTypeOf();
+      expect(MyClass.create).toBeTypeOf("function");
+    });
+    test("ConstructorParameters<This>-based extras inference works for non-zero-arg leaf signatures", () => {
+      const Wrapped = configurable(testPipe, TestBase);
+      class MyClass extends Wrapped {
+        extra;
+        constructor(config, extra) {
+          super(config);
+          this.extra = extra;
+        }
+      }
+      const instance = MyClass.create({ host: "localhost", port: 3e3 }, 42);
+      expect(instance.extra).toBe(42);
+      expectTypeOf(instance).toHaveProperty("extra");
+      expectTypeOf(instance.extra).toEqualTypeOf();
+      void (() => MyClass.create({ host: "localhost", port: 3e3 }, "not-a-number"));
+    });
+    test("base-args forwarding works for non-zero-arg bases", () => {
+      const Wrapped = configurable(testPipe, TestBaseWithArgs);
+      class MyClass extends Wrapped {
+        constructor(config, label) {
+          super(config, label);
+        }
+      }
+      const instance = MyClass.create({ host: "localhost", port: 3e3 }, "test-label");
+      expect(instance.label).toBe("test-label");
+    });
+    test("config is accessible as protected readonly on instances", () => {
+      const Wrapped = configurable(testPipe, TestBase);
+      class MyClass extends Wrapped {
+        constructor(config) {
+          super(config);
+        }
+        getHost() {
+          return this.config.host;
+        }
+      }
+      const instance = MyClass.create({ host: "localhost", port: 3e3 });
+      expect(instance.getHost()).toBe("localhost");
+    });
+    test("accepts an abstract base class", () => {
+      class AbstractBase {
+      }
+      const Wrapped = configurable(testPipe, AbstractBase);
+      class Concrete extends Wrapped {
+        constructor(config) {
+          super(config);
+        }
+        greet() {
+          return `hello from ${this.config.host}`;
+        }
+      }
+      const instance = Concrete.create({ host: "localhost", port: 3e3 });
+      expect(instance.greet()).toBe("hello from localhost");
+      expectTypeOf(instance).toHaveProperty("config");
+    });
+  });
+}
+
+// src/utilities/media.ts
+var import_music_metadata = require("music-metadata");
+var getMediaDuration = async (buffer) => {
+  try {
+    const meta = await (0, import_music_metadata.parseBuffer)(buffer);
+    return meta.format.duration ?? 0;
+  } catch {
+    return 0;
+  }
+};
+
 // src/server/adapters/fastify/index.ts
 var FastifyServer = class extends configurable(serverConfigPipe, Server) {
   #app;