split api.ts

Author: forman

dashi/src/lib/actions/helpers/invokeCallbacks.ts

@@ -1,7 +1,7 @@
 import { store } from "@/lib/store";
 import type { CallbackRequest } from "@/lib/types/model/callback";
 import { fetchApiResult } from "@/lib/utils/fetchApiResult";
-import { fetchStateChangeRequests } from "@/lib/api";
+import { fetchStateChangeRequests } from "@/lib/api/fetchStateChangeRequests";
 import { applyStateChangeRequests } from "@/lib/actions/helpers/applyStateChangeRequests";
 
 export function invokeCallbacks(callbackRequests: CallbackRequest[]) {

dashi/src/lib/actions/initializeContributions.ts

@@ -1,6 +1,6 @@
 import { store } from "@/lib/store";
 import { type ApiResult, fetchApiResult } from "@/lib/utils/fetchApiResult";
-import { fetchContributions } from "@/lib/api";
+import { fetchContributions } from "@/lib/api/fetchContributions";
 import { type Contribution } from "@/lib/types/model/contribution";
 import { type ContributionState } from "@/lib/types/state/contribution";
 import {

dashi/src/lib/actions/updateContributionContainer.ts

@@ -1,5 +1,5 @@
 import { store } from "@/lib/store";
-import { fetchInitialComponentState } from "@/lib/api";
+import { fetchInitialComponentState } from "@/lib/api/fetchInitialComponentState";
 import { fetchApiResult } from "@/lib/utils/fetchApiResult";
 import { getInputValues } from "@/lib/actions/helpers/getInputValues";
 import { updateArray } from "@/lib/utils/updateArray";

dashi/src/lib/api.ts

@@ -0,0 +1,10 @@
+import type { ApiOptions } from "@/lib/api/types";
+
+const defaultServerUrl = "http://localhost:8888";
+const defaultEndpointName = "dashi";
+
+export function makeUrl(path: string, options?: ApiOptions): string {
+  const serverUrl = options?.serverUrl || defaultServerUrl;
+  const endpointName = options?.endpointName || defaultEndpointName;
+  return `${serverUrl}/${endpointName}/${path}`;
+}

dashi/src/lib/api/common.ts

@@ -0,0 +1,57 @@
+import { type Contributions } from "@/lib/types/model/extension";
+import { type Callback } from "@/lib/types/model/callback";
+import { callApi } from "@/lib/utils/fetchApiResult";
+import { toObjPath } from "@/lib/utils/objPath";
+import { mapObject } from "@/lib/utils/mapObject";
+import type { Contribution } from "@/lib/types/model/contribution";
+import type { Channel } from "@/lib/types/model/channel";
+import type { ApiOptions } from "@/lib/api/types";
+import { makeUrl } from "@/lib/api/common";
+
+export async function fetchContributions(
+  options?: ApiOptions,
+): Promise<Contributions> {
+  return callApi<Contributions>(
+    makeUrl("contributions", options),
+    undefined,
+    (contributions: Contributions) => ({
+      ...contributions,
+      contributions: mapObject(
+        contributions.contributions,
+        (contributions: Contribution[]) =>
+          contributions.map(
+            (contribution): Contribution => ({
+              ...contribution,
+              layout: contribution.layout
+                ? normalizeCallback(contribution.layout)
+                : undefined,
+              callbacks: normalizeCallbacks(contribution.callbacks),
+            }),
+          ),
+      ),
+    }),
+  );
+}
+
+function normalizeCallbacks(callbacks: Callback[] | undefined): Callback[] {
+  return callbacks ? callbacks.map(normalizeCallback) : [];
+}
+
+function normalizeCallback(callback: Callback): Callback {
+  return {
+    ...callback,
+    inputs: callback.inputs ? normalizeChannels(callback.inputs) : [],
+    outputs: callback.outputs ? normalizeChannels(callback.outputs) : [],
+  };
+}
+
+function normalizeChannels<S extends Channel>(channels: S[]): S[] {
+  return channels ? channels.map(normalizeChannel) : [];
+}
+
+function normalizeChannel<S extends Channel>(channel: S): S {
+  return {
+    ...channel,
+    property: toObjPath(channel.property),
+  };
+}

dashi/src/lib/api/fetchContributions.ts

@@ -0,0 +1,17 @@
+import { type ComponentState } from "@/lib/types/state/component";
+import { type ContribPoint } from "@/lib/types/model/extension";
+import { callApi } from "@/lib/utils/fetchApiResult";
+import type { ApiOptions } from "@/lib/api/types";
+import { makeUrl } from "@/lib/api/common";
+
+export async function fetchInitialComponentState(
+  contribPoint: ContribPoint,
+  contribIndex: number,
+  inputValues: unknown[],
+  options?: ApiOptions,
+): Promise<ComponentState> {
+  return callApi(makeUrl(`layout/${contribPoint}/${contribIndex}`, options), {
+    body: JSON.stringify({ inputValues }),
+    method: "post",
+  });
+}

dashi/src/lib/api/fetchInitialComponentState.ts

@@ -0,0 +1,17 @@
+import {
+  type CallbackRequest,
+  type StateChangeRequest,
+} from "@/lib/types/model/callback";
+import { callApi } from "@/lib/utils/fetchApiResult";
+import type { ApiOptions } from "@/lib/api/types";
+import { makeUrl } from "@/lib/api/common";
+
+export async function fetchStateChangeRequests(
+  callbackRequests: CallbackRequest[],
+  options?: ApiOptions,
+): Promise<StateChangeRequest[]> {
+  return callApi(makeUrl("callback", options), {
+    body: JSON.stringify({ callbackRequests }),
+    method: "post",
+  });
+}

dashi/src/lib/api/fetchStateChangeRequests.ts

@@ -0,0 +1,4 @@
+export interface ApiOptions {
+  serverUrl?: string;
+  endpointName?: string;
+}

dashi/src/lib/api/types.ts

@@ -5,7 +5,7 @@ import type {
 } from "@/lib/types/model/extension";
 import type { ApiResult } from "@/lib/utils/fetchApiResult";
 import type { ContributionState } from "@/lib/types/state/contribution";
-import type { ApiOptions } from "@/lib/api";
+import type { ApiOptions } from "@/lib/api/types";
 import type { LoggingOptions } from "@/lib/actions/helpers/configureLogging";
 import type { StoreApi } from "zustand";