@forklaunch/core 0.8.3 → 0.8.5

package/lib/src/http/index.d.mts

@@ -1,6 +1,5 @@
 import { AnySchemaValidator, UnboxedObjectSchema, IdiomaticSchema, Schema } from '@forklaunch/validator';
 import { Counter, Gauge, Histogram, UpDownCounter, ObservableCounter, ObservableGauge, ObservableUpDownCounter, Span } from '@opentelemetry/api';
-import * as pino from 'pino';
 import { LevelWithSilentOrString, LevelWithSilent, Logger } from 'pino';
 import { UnionToIntersection, MimeType, Prettify, ExclusiveRecord, RemoveTrailingSlash, MakePropertyOptionalIfChildrenOptional } from '@forklaunch/common';
 import { ParsedQs } from 'qs';
@@ -622,6 +621,9 @@ type ExpressLikeSchemaHandler<SV extends AnySchemaValidator, P extends ParamsObj
  */
 type ExpressLikeSchemaAuthMapper<SV extends AnySchemaValidator, P extends ParamsObject<SV>, ReqBody extends Body<SV>, ReqQuery extends QueryObject<SV>, ReqHeaders extends HeadersObject<SV>, BaseRequest> = ExpressLikeAuthMapper<SV, MapParamsSchema<SV, P>, MapReqBodySchema<SV, ReqBody>, MapReqQuerySchema<SV, ReqQuery>, MapReqHeadersSchema<SV, ReqHeaders>, BaseRequest>;
 type ExpressLikeAuthMapper<SV extends AnySchemaValidator, P extends ParamsDictionary, ReqBody extends Record<string, unknown>, ReqQuery extends ParsedQs, ReqHeaders extends Record<string, string>, BaseRequest> = (sub: string, req?: ResolvedForklaunchRequest<SV, P, ReqBody, ReqQuery, ReqHeaders, BaseRequest>) => Set<string> | Promise<Set<string>>;
+type RemapFileBody<T> = T extends Record<string, unknown> ? {
+    [K in keyof T]: T[K] extends (name: string, type: string) => infer R ? R : T[K] extends Record<string, unknown> ? RemapFileBody<T[K]> : T[K];
+} : T extends (name: string, type: string) => infer R ? R : T;
 /**
  * Represents a live type function for the SDK.
  *
@@ -638,7 +640,7 @@ type ExpressLikeAuthMapper<SV extends AnySchemaValidator, P extends ParamsDictio
 type LiveTypeFunction<SV extends AnySchemaValidator, Route extends string, P extends ParamsObject<SV>, ResBodyMap extends ResponsesObject<SV>, ReqBody extends Body<SV>, ReqQuery extends QueryObject<SV>, ReqHeaders extends HeadersObject<SV>, ResHeaders extends HeadersObject<SV>> = (ParamsObject<SV> extends P ? unknown : {
     params: MapSchema<SV, P>;
 }) & (Body<SV> extends ReqBody ? unknown : {
-    body: MapSchema<SV, ReqBody>;
+    body: RemapFileBody<MapSchema<SV, ReqBody>>;
 }) & (QueryObject<SV> extends ReqQuery ? unknown : {
     query: MapSchema<SV, ReqQuery>;
 }) & (HeadersObject<SV> extends ReqHeaders ? unknown : {
@@ -1186,11 +1188,11 @@ declare const ATTR_CORRELATION_ID = "correlation.id";
 
 declare function evaluateTelemetryOptions(telemetryOptions: TelemetryOptions): {
     enabled: {
-        metrics: boolean | undefined;
-        tracing: boolean | undefined;
-        logging: boolean | undefined;
+        metrics?: boolean;
+        tracing?: boolean;
+        logging?: boolean;
     };
-    level: pino.default.LevelWithSilentOrString;
+    level: LevelWithSilentOrString;
 };
 
 declare function metricsDefinitions<T extends MetricsDefinition>(metrics: T): T;

package/lib/src/http/index.d.ts

@@ -1,6 +1,5 @@
 import { AnySchemaValidator, UnboxedObjectSchema, IdiomaticSchema, Schema } from '@forklaunch/validator';
 import { Counter, Gauge, Histogram, UpDownCounter, ObservableCounter, ObservableGauge, ObservableUpDownCounter, Span } from '@opentelemetry/api';
-import * as pino from 'pino';
 import { LevelWithSilentOrString, LevelWithSilent, Logger } from 'pino';
 import { UnionToIntersection, MimeType, Prettify, ExclusiveRecord, RemoveTrailingSlash, MakePropertyOptionalIfChildrenOptional } from '@forklaunch/common';
 import { ParsedQs } from 'qs';
@@ -622,6 +621,9 @@ type ExpressLikeSchemaHandler<SV extends AnySchemaValidator, P extends ParamsObj
  */
 type ExpressLikeSchemaAuthMapper<SV extends AnySchemaValidator, P extends ParamsObject<SV>, ReqBody extends Body<SV>, ReqQuery extends QueryObject<SV>, ReqHeaders extends HeadersObject<SV>, BaseRequest> = ExpressLikeAuthMapper<SV, MapParamsSchema<SV, P>, MapReqBodySchema<SV, ReqBody>, MapReqQuerySchema<SV, ReqQuery>, MapReqHeadersSchema<SV, ReqHeaders>, BaseRequest>;
 type ExpressLikeAuthMapper<SV extends AnySchemaValidator, P extends ParamsDictionary, ReqBody extends Record<string, unknown>, ReqQuery extends ParsedQs, ReqHeaders extends Record<string, string>, BaseRequest> = (sub: string, req?: ResolvedForklaunchRequest<SV, P, ReqBody, ReqQuery, ReqHeaders, BaseRequest>) => Set<string> | Promise<Set<string>>;
+type RemapFileBody<T> = T extends Record<string, unknown> ? {
+    [K in keyof T]: T[K] extends (name: string, type: string) => infer R ? R : T[K] extends Record<string, unknown> ? RemapFileBody<T[K]> : T[K];
+} : T extends (name: string, type: string) => infer R ? R : T;
 /**
  * Represents a live type function for the SDK.
  *
@@ -638,7 +640,7 @@ type ExpressLikeAuthMapper<SV extends AnySchemaValidator, P extends ParamsDictio
 type LiveTypeFunction<SV extends AnySchemaValidator, Route extends string, P extends ParamsObject<SV>, ResBodyMap extends ResponsesObject<SV>, ReqBody extends Body<SV>, ReqQuery extends QueryObject<SV>, ReqHeaders extends HeadersObject<SV>, ResHeaders extends HeadersObject<SV>> = (ParamsObject<SV> extends P ? unknown : {
     params: MapSchema<SV, P>;
 }) & (Body<SV> extends ReqBody ? unknown : {
-    body: MapSchema<SV, ReqBody>;
+    body: RemapFileBody<MapSchema<SV, ReqBody>>;
 }) & (QueryObject<SV> extends ReqQuery ? unknown : {
     query: MapSchema<SV, ReqQuery>;
 }) & (HeadersObject<SV> extends ReqHeaders ? unknown : {
@@ -1186,11 +1188,11 @@ declare const ATTR_CORRELATION_ID = "correlation.id";
 
 declare function evaluateTelemetryOptions(telemetryOptions: TelemetryOptions): {
     enabled: {
-        metrics: boolean | undefined;
-        tracing: boolean | undefined;
-        logging: boolean | undefined;
+        metrics?: boolean;
+        tracing?: boolean;
+        logging?: boolean;
     };
-    level: pino.default.LevelWithSilentOrString;
+    level: LevelWithSilentOrString;
 };
 
 declare function metricsDefinitions<T extends MetricsDefinition>(metrics: T): T;

package/lib/src/http/index.js

@@ -895,6 +895,24 @@ var ForklaunchExpressLikeRouter = class {
         body: discriminateBody(this.schemaValidator, request?.body)?.schema ?? {},
         path: route
       };
+      function remapFileBody(body) {
+        if (body instanceof File) {
+          return (name, contentType) => {
+            return new File([body], name, { type: contentType });
+          };
+        }
+        Object.entries(body).forEach(([key, value]) => {
+          if (value instanceof File) {
+            body[key] = (name, contentType) => {
+              return new File([value], name, { type: contentType });
+            };
+          } else if (typeof value === "object") {
+            body[key] = remapFileBody(value);
+          }
+        });
+        return body;
+      }
+      req.body = remapFileBody(req.body);
       const res = {
         status: (code) => {
           statusCode = code;
@@ -912,8 +930,8 @@ var ForklaunchExpressLikeRouter = class {
         setHeader: (key, value) => {
           responseHeaders[key] = value;
         },
-        sseEmiter: (generator) => {
-          responseMessage = generator;
+        sseEmitter: (generator) => {
+          responseMessage = generator();
         }
       };
       let cursor = handlers.shift();