@deessejs/functions 0.0.34 → 0.0.36

package/dist/extensions/index.d.ts

@@ -1,6 +1,6 @@
 import { ZodType } from "zod";
 import { Extension, InferOptions } from "./types";
-export declare function extensions<TSchema extends ZodType | undefined = undefined, TContextAddon extends Record<string, unknown> = Record<string, unknown>, TFunctionsFactory extends (context: any) => any = (context: any) => any>(config: {
+export declare function extensions<TSchema extends ZodType | undefined = undefined, TContextAddon extends Record<string, unknown> = Record<string, unknown>, TFunctionsFactory extends (<C>(context: C) => any) = (<C>(context: C) => any)>(config: {
     name: string;
     schema?: TSchema;
     context?: (options: InferOptions<TSchema>) => TContextAddon;

package/dist/extensions/types.d.ts

@@ -2,13 +2,16 @@ import z, { ZodType } from "zod";
 export type InferOptions<T extends ZodType | undefined> = T extends ZodType ? z.infer<T> : undefined;
 export type ExtensionBase = {
     context: any;
-    functions: (context: any) => any;
+    functions: <C>(context: C) => any;
 };
-type ExtractFunctionsReturn<F, C> = F extends (context: C) => infer R ? R : F extends (context: any) => infer R ? R : never;
-export type MergeExtensions<TContext, TExtensions extends readonly any[]> = TExtensions extends readonly [infer Head, ...infer Tail] ? // On récupère 'functions' du Head (s'il existe) et on l'instancie avec TContext
-(Head extends {
+type FnCallSignatureMatchesWith<C, F> = F extends {
+    (context: C): infer R;
+} ? R : F extends {
+    <U>(context: U): infer RGeneric;
+} ? RGeneric : F extends (context: any) => infer R ? R : never;
+export type MergeExtensions<TContext, TExtensions extends readonly any[]> = TExtensions extends readonly [infer Head, ...infer Tail] ? (Head extends {
     functions: infer F;
-} ? ExtractFunctionsReturn<F, TContext> : {}) & MergeExtensions<TContext, Tail> : {};
+} ? FnCallSignatureMatchesWith<TContext, F> : {}) & MergeExtensions<TContext, Tail> : {};
 export type ExtensionConfig<TSchema extends ZodType | undefined, TContextAddon extends Record<string, unknown>> = {
     name: string;
     schema?: TSchema;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@deessejs/functions",
-    "version": "0.0.34",
+    "version": "0.0.36",
     "description": "A powerful utility library for building type-safe APIs and functions with context management",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",