@deessejs/functions 0.0.60 → 0.0.62

package/dist/context/define.d.ts

@@ -1,8 +1,6 @@
 import { MergeExtensions } from "../extensions/types";
 export declare function defineContext<TContext extends Record<string, any>>(): {
-    withExtensions: <TExtensions extends readonly {
-        functions: (ctx: TContext) => any;
-    }[]>(config: {
+    withExtensions: <TExtensions extends readonly any[]>(config: {
         extensions: readonly [...TExtensions];
     }) => MergeExtensions<TContext, TExtensions> & {
         context: TContext;

package/dist/context/define.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.defineContext = defineContext;
 function defineContext() {
     return {
-        // FIX CRUCIAL :
-        // On contraint TExtensions pour que chaque extension ait une méthode 'functions'
-        // qui accepte TContext. Cela force TS à instancier le générique <C> de rpc immédiatement.
+        // ON UTILISE 'readonly any[]'.
+        // C'est vital. Si on met un type plus précis ici, TypeScript risque 
+        // de simplifier le générique de 'rpc' avant qu'on puisse l'injecter.
         withExtensions: (config) => {
             const runtimeBuilder = {};
             const dummyContext = {};
             for (const extension of config.extensions) {
-                // Au runtime, on vérifie juste que c'est une fonction
+                // Runtime only
                 if (extension && typeof extension.functions === "function") {
                     const extensionMethods = extension.functions(dummyContext);
                     Object.assign(runtimeBuilder, extensionMethods);

package/dist/context/types.d.ts

@@ -13,12 +13,3 @@ export type MutationDefinition<TContext, TArgs extends ZodType, TOutput, TError
     _type: "mutation";
 };
 export type CommandsDefinition = QueryDefinition<any, any, any, any> | MutationDefinition<any, any, any, any>;
-export type FunctionsForContext<C> = {
-    query: <TArgs extends ZodType, TOutput, TError extends Exception>(def: QueryDefinition<C, TArgs, TOutput, TError>) => QueryDefinition<C, TArgs, TOutput, TError>;
-    mutation: <TArgs extends ZodType, TOutput, TError extends Exception>(def: MutationDefinition<C, TArgs, TOutput, TError>) => MutationDefinition<C, TArgs, TOutput, TError>;
-    on?: <TEvent extends string, TPayload>(config: {
-        event: TEvent;
-        handler: (ctx: C, payload: TPayload) => AsyncResult<any, any>;
-    }) => any;
-    group?: <TGroup extends Record<string, CommandsDefinition>>(defs: TGroup) => TGroup;
-};

package/dist/extensions/index.d.ts

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

package/dist/extensions/index.js

@@ -1,8 +1,9 @@
 "use strict";
-// extensions/index.ts (ou extensions.ts)
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extensions = extensions;
+// N'importe PAS FunctionsForContext ici pour le typage, ça brise la généricité.
 function extensions(config) {
+    // On laisse TypeScript retourner l'objet tel quel.
     return (...args) => {
         const optionsInput = args[0];
         const options = (config.schema ? config.schema.parse(optionsInput) : undefined);

package/dist/extensions/rpc.d.ts

@@ -5,15 +5,18 @@ import { CommandsDefinition, MutationDefinition, QueryDefinition } from "../cont
 export type APINode = CommandsDefinition | {
     [key: string]: APINode;
 };
-export declare const rpc: import("./types").Extension<undefined, Record<string, unknown>, <C>(context: C) => {
-    query: <TArgs extends ZodType<any, any, any>, TOutput, TError extends Exception>(options: {
-        args: TArgs;
-        handler: (ctx: C, // C sera ici { user: ... }
-        args: z.infer<TArgs>) => AsyncResult<TOutput, TError>;
-    }) => QueryDefinition<C, TArgs, TOutput, TError>;
-    mutation: <TArgs extends ZodType<any, any, any>, TOutput_1, TError_1 extends Exception>(options: {
-        args: TArgs;
-        handler: (ctx: C, args: z.infer<TArgs>) => AsyncResult<TOutput_1, TError_1>;
-    }) => MutationDefinition<C, TArgs, TOutput_1, TError_1>;
-    group: <T extends Record<string, APINode>>(definitions: T) => T;
-}>;
+export declare const rpc: (...args: any[]) => {
+    context: Record<string, unknown>;
+    functions: <C>(context: C) => {
+        query: <TArgs extends ZodType<any, any, any>, TOutput, TError extends Exception>(options: {
+            args: TArgs;
+            handler: (ctx: C, // C sera ici { user: ... }
+            args: z.core.output<TArgs>) => AsyncResult<TOutput, TError>;
+        }) => QueryDefinition<C, TArgs, TOutput, TError>;
+        mutation: <TArgs extends ZodType<any, any, any>, TOutput_1, TError_1 extends Exception>(options: {
+            args: TArgs;
+            handler: (ctx: C, args: z.core.output<TArgs>) => AsyncResult<TOutput_1, TError_1>;
+        }) => MutationDefinition<C, TArgs, TOutput_1, TError_1>;
+        group: <T extends Record<string, APINode>>(definitions: T) => T;
+    };
+};

package/dist/extensions/types.d.ts

@@ -1,13 +1,20 @@
 import z, { ZodType } from "zod";
-export type ExtensionBase<C = any> = {
-    context: any;
-    functions: (context: C) => any;
-};
+/**
+ * LA SOLUTION ULTIME : Intersection de ReturnType.
+ *
+ * 1. F & ((c: C) => unknown) : On crée une fonction hybride qui doit satisfaire
+ *    TA fonction générique ET une fonction qui prend ton Contexte.
+ * 2. ReturnType<...> : Pour résoudre le type de retour de cette hybride,
+ *    TypeScript est obligé de remplacer le générique de F par C.
+ * 3. Le "& unknown" assure qu'on ne pollue pas le type de retour (R & unknown = R).
+ */
+type ApplyContext<F, C> = F extends (c: any) => any ? ReturnType<F & ((c: C) => unknown)> : never;
 export type MergeExtensions<TContext, TExtensions extends readonly any[]> = TExtensions extends readonly [infer Head, ...infer Tail] ? (Head extends {
-    functions: (ctx: any) => infer R;
-} ? R : {}) & MergeExtensions<TContext, Tail> : {};
+    functions: infer F;
+} ? ApplyContext<F, TContext> : {}) & MergeExtensions<TContext, Tail> : {};
 export type InferOptions<T extends ZodType | undefined> = T extends ZodType ? z.infer<T> : undefined;
-export type Extension<TSchema extends ZodType | undefined, TContextAddon extends Record<string, unknown>, TFunctionsFactory extends (<C>(context: C) => any)> = (...args: TSchema extends ZodType ? [options: z.input<TSchema>] : [options?: undefined]) => {
+export type Extension<TSchema extends ZodType | undefined, TContextAddon extends Record<string, unknown>, TFunctionsFactory> = (...args: TSchema extends ZodType ? [options: z.input<TSchema>] : [options?: undefined]) => {
     context: TContextAddon;
     functions: TFunctionsFactory;
 };
+export {};

package/package.json

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