fix(shared): add create, edit and delete methods to endpoints rest client (#1561)

Author: ascariandrea

packages/@liexp/shared/src/providers/EndpointQueriesProvider/EndpointQueriesProvider.spec.ts

@@ -2,7 +2,7 @@ import { fc } from "@liexp/test";
 import { parseISO } from "date-fns";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { type MockProxy } from "vitest-mock-extended";
-import { TestEndpoints, overrides } from "../../../test/TestEndpoints";
+import { TestEndpoints, overrides } from "../../../test/TestEndpoints.js";
 import { ActorArb } from "../../tests/index.js";
 import { fromEndpoints } from "../EndpointsRESTClient/EndpointsRESTClient.js";
 import { type APIRESTClient } from "../api-rest.provider.js";
@@ -29,6 +29,9 @@ describe("EndpointQueriesProvider", () => {
 
   it("should be defined", () => {
     expect(Q).toBeTruthy();
+    expect(Q.Actor.get.getKey).toBeInstanceOf(Function);
+    expect(Q.Actor.get.fetch).toBeInstanceOf(Function);
+    expect(Q.Actor.get.useQuery).toBeInstanceOf(Function);
   });
 
   it("should have Actor get", async () => {
@@ -44,14 +47,16 @@ describe("EndpointQueriesProvider", () => {
       createdAt: a.createdAt.toISOString(),
       updatedAt: a.updatedAt.toISOString(),
     }));
+
     apiProviderMock.get.mockResolvedValue({ data: actorData });
 
-    expect(Q.Actor.get).toBeTruthy();
     const params = { id: "1" };
     const actorKey = Q.Actor.get.getKey(params);
-    expect(actorKey).toEqual(["Actor", params, undefined, false]);
+
     const actor = await Q.Actor.get.fetch(params, undefined);
 
+    expect(actorKey).toEqual(["Actor", params, undefined, false]);
+
     expect(apiProviderMock.get).toHaveBeenCalledWith("/actors/1", {
       id: "1",
     });
@@ -148,7 +153,7 @@ describe("EndpointQueriesProvider", () => {
 
     expect(apiProviderMock.request).toHaveBeenCalledWith({
       data: undefined,
-      params: {},
+      params: undefined,
       method: "GET",
       url: "/actors/1/siblings",
       responseType: "json",

packages/@liexp/shared/src/providers/EndpointQueriesProvider/QueryProvider.ts

@@ -19,8 +19,8 @@ import {
   type GetListFn,
   type GetListFnParamsE,
   type GetEndpointQueryType,
-  type Query,
-} from "../EndpointsRESTClient/EndpointsRESTClient.js";
+  type EndpointREST,
+} from "../EndpointsRESTClient/types.js";
 import {
   type GetQueryOverride,
   type ResourceEndpointsQueriesOverride,
@@ -149,10 +149,13 @@ export const toQueries = <
   ES extends EndpointsMapType,
   G extends MinimalEndpoint,
   L extends MinimalEndpoint,
+  C extends MinimalEndpoint,
+  E extends MinimalEndpoint,
+  D extends MinimalEndpoint,
   CC extends Record<string, MinimalEndpointInstance>,
 >(
   key: string,
-  e: Query<G, L, CC>,
+  e: EndpointREST<G, L, C, E, D, CC>,
   override?: ResourceEndpointsQueriesOverride<ES, G, L, CC>,
 ): ResourceQueries<G, L, CC> => {
   return {
@@ -163,7 +166,7 @@ export const toQueries = <
       fp.Rec.mapWithIndex((index, ee) => {
         const getKey = getDefaultKey(`${key}-${index}`);
         const fetch = fetchQuery<any, any, any>((p, q) => {
-          return ee({ Params: p, Query: q } as any);
+          return ee({ Params: p, Query: q } as any, q);
         });
 
         return {

packages/@liexp/shared/src/providers/EndpointQueriesProvider/QueryProviderOverrides.ts

@@ -15,7 +15,7 @@ import {
   type GetFnParams,
   type GetEndpointQueryType,
   type GetListFnParamsE,
-} from "../EndpointsRESTClient/EndpointsRESTClient.js";
+} from "../EndpointsRESTClient/types.js";
 import { fetchQuery, getDefaultKey } from "./QueryProvider.js";
 import { type GetKeyFn, type ResourceQueries } from "./types.js";
 

packages/@liexp/shared/src/providers/EndpointQueriesProvider/index.ts

@@ -1,7 +1,7 @@
 import { fp, pipe } from "@liexp/core/lib/fp/index.js";
 import { type EndpointsMapType } from "../../endpoints/Endpoints.js";
 import { type Endpoints } from "../../endpoints/index.js";
-import { type EndpointsRESTClient } from "../EndpointsRESTClient/EndpointsRESTClient.js";
+import { type EndpointsRESTClient } from "../EndpointsRESTClient/types.js";
 import { API } from "../api/api.provider.js";
 import { toQueries } from "./QueryProvider.js";
 import {

packages/@liexp/shared/src/providers/EndpointQueriesProvider/overrides.ts

@@ -2,10 +2,10 @@ import { fp, pipe } from "@liexp/core/lib/fp/index.js";
 import { type MinimalEndpointInstance } from "ts-endpoint";
 import { type Endpoints } from "../../endpoints/index.js";
 import {
-  type GetDataOutputEI,
   type GetListFnParamsE,
+  type EndpointOutput,
   type GetFnParams,
-} from "../EndpointsRESTClient/EndpointsRESTClient.js";
+} from "../EndpointsRESTClient/types.js";
 import {
   type QueryProviderOverrides,
   type CustomQueryOverride,
@@ -17,7 +17,7 @@ const GetHierarchyNetwork: CustomQueryOverride<
   Endpoints,
   GetFnParams<typeof Endpoints.Networks.Get>,
   GetListFnParamsE<typeof Endpoints.Networks.Get>,
-  GetDataOutputEI<typeof Endpoints.Networks.Get>
+  EndpointOutput<typeof Endpoints.Networks.Get>
 > = (Q) => (p) => Q.Networks.get({ ...p, type: "hierarchy" });
 
 const NetworksOverride: ResourceEndpointsQueriesOverride<
@@ -37,7 +37,7 @@ const GetPageContentByPath: CustomQueryOverride<
   Endpoints,
   string,
   undefined,
-  GetDataOutputEI<typeof Endpoints.Page.Get>
+  EndpointOutput<typeof Endpoints.Page.Get>
 > = (Q) => (path) => {
   return pipe(
     Q.Page.getList({
@@ -53,7 +53,7 @@ const GetByPath: CustomQueryOverride<
   Endpoints,
   string,
   undefined,
-  GetDataOutputEI<typeof Endpoints.Story.Get>
+  EndpointOutput<typeof Endpoints.Story.Get>
 > = (Q) => (p) =>
   pipe(
     Q.Story.getList({ ...defaultUseQueryListParams, filter: { path: p } }),

packages/@liexp/shared/src/providers/EndpointQueriesProvider/types.ts

@@ -12,9 +12,9 @@ import {
   type EndpointOutput,
   type GetFnParams,
   type GetEndpointQueryType,
-  type Query,
+  type EndpointREST,
   type EndpointDataOutput,
-} from "../EndpointsRESTClient/EndpointsRESTClient.js";
+} from "../EndpointsRESTClient/types.js";
 
 export type QueryFnKey<P, Q = undefined> = [string, P, Q | undefined, boolean];
 export type GetKeyFn<P, Q = undefined> = (
@@ -64,7 +64,7 @@ export interface ResourceQueries<G, L, CC> {
 }
 
 export type ResourceQueryImpl<Q> =
-  Q extends Query<infer G, infer L, infer CC>
+  Q extends EndpointREST<infer G, infer L, unknown, unknown, unknown, infer CC>
     ? ResourceQueries<G, L, CC>
     : never;