@archtx/procedures 4.0.0 → 4.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archtx/procedures",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "Procedure generator for @archtx",
   "main": "dist/exports.js",
   "types": "dist/exports.d.ts",

package/src/index.ts

@@ -5,7 +5,7 @@ import {
 } from './errors.js'
 import { ProcedureCodes } from './procedure-codes.js'
 import { computeSchema } from './schema/compute-schema.js'
-import { TJSONSchema, TSchemaLib } from './schema/types.js'
+import { Prettify, TJSONSchema, TSchemaLib } from './schema/types.js'
 
 export type TNoContextProvided = unknown
 
@@ -47,7 +47,7 @@ export function Procedures<TContext = TNoContextProvided>(
     {
       name: string
       config: TProcedureRegistration['config']
-      handler: (ctx: TContext, args: any) => Promise<any>
+      handler: (ctx: Prettify<TContext>, args: any) => Promise<any>
     }
   > = new Map()
 
@@ -56,21 +56,21 @@ export function Procedures<TContext = TNoContextProvided>(
     config: {
       description?: string
       hook?: (
-        ctx: TContext & TLocalContext,
+        ctx: Prettify<TContext & TLocalContext>,
         args: TSchemaLib<TArgs>,
-      ) => Promise<TLocalHook>
+      ) => Promise<Prettify<TLocalHook>>
       schema?: {
         args?: TArgs
         data?: TData
       }
     },
     handler: (
-      ctx: TContext & TLocalContext & TLocalHook,
+      ctx: Prettify<TContext & TLocalContext & TLocalHook>,
       args: TSchemaLib<TArgs>,
     ) => Promise<TSchemaLib<TData>>,
   ): {
     [K in TName | `${TName}_Info`]: K extends TName
-      ? (ctx: TContext, args: TSchemaLib<TArgs>) => Promise<TSchemaLib<TData>>
+      ? (ctx: Prettify<TContext>, args: TSchemaLib<TArgs>) => Promise<TSchemaLib<TData>>
       : {
           description?: string
           schema: {
@@ -92,7 +92,7 @@ export function Procedures<TContext = TNoContextProvided>(
         },
       },
 
-      handler: async (ctx: TContext, args: TSchemaLib<TArgs>) => {
+      handler: async (ctx: Prettify<TContext>, args: TSchemaLib<TArgs>) => {
         try {
           if (validations?.args) {
             const { errors } = validations.args(args)
@@ -143,7 +143,7 @@ export function Procedures<TContext = TNoContextProvided>(
               ...ctx,
               ...localCtx,
               ...computedLocalHook,
-            } as TContext & TLocalContext & TLocalHook,
+            } as Prettify<TContext & TLocalContext & TLocalHook>,
             args,
           )
         } catch (error: any) {

package/src/schema/types.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/ban-types */
 import { CoreValidator, TypeOf } from 'suretype'
 import { Static, TSchema } from '@sinclair/typebox'
 
@@ -10,3 +11,7 @@ export type TSchemaLib<SchemaLibType> =
       : unknown
 
 export type TJSONSchema = Record<string, any>
+
+export type Prettify<TObject> = {
+  [Key in keyof TObject]: TObject[Key]
+} & {}