@taujs/server 0.5.8 → 0.6.0

package/dist/{Config-2Loymxo2.d.ts → Config-BODjH3XQ.d.ts}

@@ -23,7 +23,6 @@ interface Logs extends BaseLogger {
     isDebugEnabled(category: DebugCategory): boolean;
 }
 
-type RegistryCaller<R extends ServiceRegistry = ServiceRegistry> = (serviceName: keyof R & string, methodName: string, args?: JsonObject) => Promise<JsonObject>;
 type JsonPrimitive = string | number | boolean | null;
 type JsonValue = JsonPrimitive | JsonValue[] | {
     [k: string]: JsonValue;
@@ -34,7 +33,7 @@ type JsonObject = {
 type NarrowSchema<T> = {
     parse: (u: unknown) => T;
 } | ((u: unknown) => T);
-type ServiceContext = {
+type BaseServiceContext = {
     signal?: AbortSignal;
     deadlineMs?: number;
     traceId?: string;
@@ -43,26 +42,46 @@ type ServiceContext = {
         id: string;
         roles: string[];
     } | null;
-    call?: (service: string, method: string, args?: JsonObject) => Promise<JsonObject>;
 };
-declare function withDeadline(signal: AbortSignal | undefined, ms?: number): AbortSignal | undefined;
-type ServiceMethod<P, R extends JsonObject = JsonObject> = (params: P, ctx: ServiceContext) => Promise<R>;
-type ServiceDefinition = Readonly<Record<string, ServiceMethod<any, JsonObject>>>;
+type UntypedRegistryCaller = (serviceName: string, methodName: string, args?: JsonObject) => Promise<JsonObject>;
+type RuntimeServiceContext = BaseServiceContext & {
+    call?: UntypedRegistryCaller;
+};
+interface ServiceContext extends BaseServiceContext {
+}
+type ServiceMethod<P extends JsonObject = JsonObject, R extends JsonObject = JsonObject, Ctx extends BaseServiceContext = TypedServiceContext> = (params: P, ctx: Ctx) => Promise<R>;
+type RuntimeServiceMethod<P extends JsonObject = JsonObject, R extends JsonObject = JsonObject> = (params: P, ctx: RuntimeServiceContext) => Promise<R>;
+type ServiceDefinition = Readonly<Record<string, RuntimeServiceMethod<any, JsonObject>>>;
 type ServiceRegistry = Readonly<Record<string, ServiceDefinition>>;
+type ServiceMethodParams<M> = M extends (params: infer P, ctx: any) => Promise<any> ? P : never;
+type ServiceMethodResult<M> = Awaited<M extends (...args: any[]) => Promise<infer R> ? R : never>;
+type RegistryCallerArgs<R extends ServiceRegistry, S extends keyof R & string, M extends keyof R[S] & string> = undefined extends ServiceMethodParams<R[S][M]> ? [serviceName: S, methodName: M, args?: ServiceMethodParams<R[S][M]>] : [serviceName: S, methodName: M, args: ServiceMethodParams<R[S][M]>];
+type RegistryCaller<R extends ServiceRegistry = ServiceRegistry> = <S extends keyof R & string, M extends keyof R[S] & string>(...args: RegistryCallerArgs<R, S, M>) => Promise<ServiceMethodResult<R[S][M]>>;
+type TypedServiceContext<R extends ServiceRegistry = ServiceRegistry> = ServiceContext & {
+    call?: RegistryCaller<R>;
+};
+declare function withDeadline(signal: AbortSignal | undefined, ms?: number): AbortSignal | undefined;
 type ServiceDescriptor = {
     serviceName: string;
     serviceMethod: string;
     args?: JsonObject;
 };
-declare function defineService<T extends Record<string, ServiceMethod<any, JsonObject> | {
+type ServiceSpecEntry = ServiceMethod<any, JsonObject> | {
     handler: ServiceMethod<any, JsonObject>;
     params?: NarrowSchema<any>;
     result?: NarrowSchema<any>;
-}>>(spec: T): { [K in keyof T]: T[K] extends ServiceMethod<infer P, infer R> ? ServiceMethod<P, R> : T[K] extends {
-    handler: ServiceMethod<infer P, infer R_1>;
-} ? ServiceMethod<P, R_1> : never; };
+};
+type ServiceSpec = Record<string, ServiceSpecEntry>;
+type ExtractServiceMethod<T> = T extends {
+    handler: infer H;
+} ? H : T;
+type NormalizeServiceMethod<M> = M extends (params: infer P extends JsonObject, ctx: any) => Promise<infer R extends JsonObject> ? RuntimeServiceMethod<P, R> : never;
+type NormalizedServiceSpec<T extends ServiceSpec> = {
+    [K in keyof T]: NormalizeServiceMethod<ExtractServiceMethod<T[K]>>;
+};
+declare function defineService<T extends ServiceSpec>(spec: T): NormalizedServiceSpec<T>;
 declare const defineServiceRegistry: <R extends ServiceRegistry>(registry: R) => R;
-declare function callServiceMethod(registry: ServiceRegistry, serviceName: string, methodName: string, params: JsonObject | undefined, ctx: ServiceContext): Promise<JsonObject>;
+declare function callServiceMethod(registry: ServiceRegistry, serviceName: string, methodName: string, params: JsonObject | undefined, ctx: BaseServiceContext): Promise<JsonObject>;
 
 type RequestContext<L extends Logs = Logs> = {
     traceId: string;
@@ -260,4 +279,4 @@ type RouteData<C extends TaujsConfig = TaujsConfig, P extends string = string> =
 
 declare function defineConfig<const C extends TaujsConfig>(config: C): C;
 
-export { type AppConfig as A, type BaseLogger as B, type CoreAppConfig as C, type DebugConfig as D, type RouteContext as R, type ServiceRegistry as S, type TaujsConfig as T, type SecurityConfig as a, type RouteData as b, callServiceMethod as c, defineConfig as d, defineService as e, defineServiceRegistry as f, type RegistryCaller as g, type ServiceContext as h, AppError as i, withDeadline as w };
+export { type AppConfig as A, type BaseLogger as B, type CoreAppConfig as C, type DebugConfig as D, type JsonObject as J, type RouteContext as R, type ServiceRegistry as S, type TaujsConfig as T, type SecurityConfig as a, type RouteData as b, callServiceMethod as c, defineConfig as d, defineService as e, defineServiceRegistry as f, type JsonPrimitive as g, type JsonValue as h, type RegistryCaller as i, type ServiceContext as j, type TypedServiceContext as k, AppError as l, withDeadline as w };

package/dist/Config.d.ts

@@ -1,3 +1,3 @@
 import 'fastify';
 import 'vite';
-export { A as AppConfig, i as AppError, g as RegistryCaller, R as RouteContext, b as RouteData, a as SecurityConfig, h as ServiceContext, T as TaujsConfig, c as callServiceMethod, d as defineConfig, e as defineService, f as defineServiceRegistry, w as withDeadline } from './Config-2Loymxo2.js';
+export { A as AppConfig, l as AppError, J as JsonObject, g as JsonPrimitive, h as JsonValue, i as RegistryCaller, R as RouteContext, b as RouteData, a as SecurityConfig, j as ServiceContext, T as TaujsConfig, k as TypedServiceContext, c as callServiceMethod, d as defineConfig, e as defineService, f as defineServiceRegistry, w as withDeadline } from './Config-BODjH3XQ.js';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { FastifyPluginCallback, FastifyPluginAsync, FastifyInstance } from 'fastify';
-import { T as TaujsConfig, S as ServiceRegistry, D as DebugConfig, B as BaseLogger, C as CoreAppConfig } from './Config-2Loymxo2.js';
+import { T as TaujsConfig, S as ServiceRegistry, D as DebugConfig, B as BaseLogger, C as CoreAppConfig } from './Config-BODjH3XQ.js';
 import { InlineConfig } from 'vite';
 
 type NetResolved = {

package/dist/index.js

@@ -785,7 +785,7 @@ var resolveLogs = (logger) => logger ?? noopLogger;
 
 // src/core/services/DataServices.ts
 function createCaller(registry, ctx) {
-  return (serviceName, methodName, args) => callServiceMethod(registry, serviceName, methodName, args ?? {}, ctx);
+  return ((serviceName, methodName, args) => callServiceMethod(registry, serviceName, methodName, args ?? {}, ctx));
 }
 function ensureServiceCaller(registry, ctx) {
   if (!ctx.call) ctx.call = createCaller(registry, ctx);
@@ -896,7 +896,10 @@ var fetchInitialData = async (attr, params, serviceRegistry, ctx, callServiceMet
   };
   ensureServiceCaller(serviceRegistry, ctxForData);
   try {
-    const result = await dataHandler(params, ctxForData);
+    const result = await dataHandler(
+      params,
+      ctxForData
+    );
     if (isServiceDescriptor(result)) {
       const { serviceName, serviceMethod, args } = result;
       return callServiceMethodImpl(serviceRegistry, serviceName, serviceMethod, args ?? {}, ctxForData);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taujs/server",
-  "version": "0.5.8",
+  "version": "0.6.0",
   "description": "τjs [ taujs ]",
   "author": "John Smith | Aoede <taujs@aoede.uk.net> (https://www.aoede.uk.net)",
   "license": "MIT",