moved api/types into types/api

Author: forman

dashi/src/lib/actions/initializeContributions.ts

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

dashi/src/lib/api/fetchCallback.ts

@@ -2,8 +2,8 @@ import {
   type CallbackRequest,
   type StateChangeRequest,
 } from "@/lib/types/model/callback";
+import type { ApiOptions, ApiResult } from "@/lib/types/api";
 import { makeUrl, callApi, fetchApiResult } from "./helpers";
-import type { ApiOptions, ApiResult } from "./types";
 
 export async function fetchCallback(
   callbackRequests: CallbackRequest[],

dashi/src/lib/api/fetchContributions.ts

@@ -4,8 +4,8 @@ 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, ApiResult } from "@/lib/types/api";
 import { makeUrl, callApi, fetchApiResult } from "./helpers";
-import type { ApiOptions, ApiResult } from "./types";
 
 export async function fetchContributions(
   options?: ApiOptions,

dashi/src/lib/api/fetchLayout.ts

@@ -1,7 +1,7 @@
 import { type ComponentState } from "@/lib/types/state/component";
 import { type ContribPoint } from "@/lib/types/model/extension";
+import type { ApiOptions, ApiResult } from "@/lib/types/api";
 import { makeUrl, callApi, fetchApiResult } from "./helpers";
-import type { ApiOptions, ApiResult } from "./types";
 
 export async function fetchLayout(
   contribPoint: ContribPoint,

dashi/src/lib/api/helpers.ts

@@ -1,11 +1,9 @@
-import type { ApiOptions } from "@/lib/api/types";
+import type { ApiOptions, ApiError, ApiResult } from "@/lib/types/api";
+import { hasOwnProperty } from "../utils/hasOwnProperty";
 
 const defaultServerUrl = "http://localhost:8888";
 const defaultEndpointName = "dashi";
 
-import { hasOwnProperty } from "../utils/hasOwnProperty";
-import type { ApiError, ApiResult } from "./types";
-
 export async function fetchApiResult<T, P extends unknown[]>(
   callApi: (...args: P) => Promise<T>,
   ...args: P

dashi/src/lib/api/types.ts dashi/src/lib/types/api.tsdashi/src/lib/api/types.ts renamed to dashi/src/lib/types/api.ts

@@ -1,4 +1,4 @@
-import type { ApiResult } from "@/lib/api/types";
+import type { ApiResult } from "@/lib/types/api";
 import type { Contribution } from "@/lib/types/model/contribution";
 import type { ComponentState } from "./component";
 

dashi/src/lib/types/state/contribution.ts

@@ -6,7 +6,7 @@ import type {
   Extension,
 } from "@/lib/types/model/extension";
 import type { ContributionState } from "@/lib/types/state/contribution";
-import type { ApiOptions, ApiResult } from "@/lib/api/types";
+import type { ApiOptions, ApiResult } from "@/lib/types/api";
 import type { LoggingOptions } from "@/lib/actions/helpers/configureLogging";
 
 export interface FrameworkOptions<S extends object = object> {