@knpkv/clockify-api-client 0.3.0 → 1.0.1

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @knpkv/clockify-api-client
 
+## 1.0.1
+
+### Patch Changes
+
+- [#249](https://github.com/knpkv/npm/pull/249) [`5a61061`](https://github.com/knpkv/npm/commit/5a610619cef7609148b396d9248924422138221b) Thanks [@konopkov](https://github.com/konopkov)! - Fix `jcf` commands failing to decode Clockify time-entry responses when optional
+  fields come back as explicit `null`:
+
+  - `jcf timer start` failed with `Expected string, got null at ["kioskId"]` —
+    Clockify returns `kioskId`, `projectId`, and `taskId` as `null` (not absent).
+  - `jcf sync reconcile` failed with `Expected array, got null at [0]["tagIds"]` —
+    Clockify returns `tagIds` as `null` for entries with no tags.
+
+  Patch the OpenAPI spec so those fields decode as nullable across the time-entry
+  response schemas (`TimeEntryDtoImplV1`, `TimeEntryDtoV1`,
+  `TimeEntryWithRatesDtoV1`) and regenerate the client.
+
+  Also stop `jcf timer start` from printing a misleading `Timer started` line
+  after the start actually failed.
+
+## 1.0.0
+
+### Major Changes
+
+- [#125](https://github.com/knpkv/npm/pull/125) [`f820c19`](https://github.com/knpkv/npm/commit/f820c1906e00f2f2d17c2e7cc3921ba26522db43) Thanks [@konopkov](https://github.com/konopkov)! - Replace the openapi-fetch Clockify surface with a Schema-validated client generated by Effect's official OpenAPI generator. The old raw client, `ClockifyApiError`, `toEffect`, and `FetchClientError` exports are removed; consumers now use the generated `ClockifyApi` operations or the authenticated service conveniences.
+
+### Patch Changes
+
+- [#125](https://github.com/knpkv/npm/pull/125) [`f820c19`](https://github.com/knpkv/npm/commit/f820c1906e00f2f2d17c2e7cc3921ba26522db43) Thanks [@konopkov](https://github.com/konopkov)! - Upgrade the workspace to Effect 4.0.0-beta.98 and current compatible dependencies. Replace ad hoc object guards with Effect Predicate helpers and migrate retry schedules to the current Schedule API.
+
 ## 0.3.0
 
 ### Minor Changes

package/README.md

@@ -1,120 +1,132 @@
 # @knpkv/clockify-api-client
 
-Effect-based Clockify REST API client. Type-safe paths and responses generated from a patched OpenAPI spec via `openapi-typescript` + `openapi-fetch`.
-
-## Installation
-
-```bash
-pnpm add @knpkv/clockify-api-client
-```
-
-Peer dependencies: `effect`
+Schema-validated Effect client for Clockify's REST API. Request builders,
+response codecs, operation types, and the raw client are generated from
+Clockify's OpenAPI document by `@effect/openapi-generator`.
 
 ## Usage
 
-### Method-based API
-
-Convenience methods for common operations:
-
 ```typescript
-import { Effect, Layer } from "effect"
-import * as Redacted from "effect/Redacted"
+import { NodeHttpClient } from "@effect/platform-node"
 import { ClockifyApiClient, ClockifyApiConfig } from "@knpkv/clockify-api-client"
+import { Effect, Layer, Redacted } from "effect"
 
 const program = Effect.gen(function* () {
   const clockify = yield* ClockifyApiClient
-
   const user = yield* clockify.getUser()
   const projects = yield* clockify.getProjects("workspace-id")
 
-  // Start a timer
-  const entry = yield* clockify.createTimeEntry("workspace-id", {
-    start: new Date().toISOString(),
-    description: "Working on PROJ-123"
-  })
-
-  // Stop timer
-  yield* clockify.stopTimer("workspace-id", user.id, {
-    end: new Date().toISOString()
-  })
-
-  // Get running timer
-  const running = yield* clockify.getRunningTimer("workspace-id", user.id)
+  return { projects, user }
 })
 
-const configLayer = Layer.succeed(ClockifyApiConfig, {
+const ConfigLive = Layer.succeed(ClockifyApiConfig, {
   apiKey: Redacted.make("your-clockify-api-key"),
   workspaceId: "workspace-id",
   userId: "user-id",
   baseUrl: "https://api.clockify.me/api"
 })
 
-Effect.runPromise(program.pipe(Effect.provide(ClockifyApiClient.layer), Effect.provide(configLayer)))
-```
+const ClockifyLive = ClockifyApiClient.layer.pipe(Layer.provide(ConfigLive), Layer.provide(NodeHttpClient.layerFetch))
 
-### Raw API
+Effect.runPromise(program.pipe(Effect.provide(ClockifyLive)))
+```
 
-Direct openapi-fetch access for any endpoint:
+`ClockifyApiClient` exposes the timer application's domain conveniences. The
+complete generated client is exported as `ClockifyApi`, and `make` constructs
+an authenticated `AuthenticatedClockifyApi` wrapper from any Effect
+`HttpClient`. Its `uploadImage` method accepts a `Blob` and builds valid native
+`FormData`:
 
 ```typescript
-import { toEffect } from "@knpkv/clockify-api-client"
+import { type AuthenticatedClockifyApi, make } from "@knpkv/clockify-api-client"
 
-const program = Effect.gen(function* () {
-  const clockify = yield* ClockifyApiClient
+const raw: AuthenticatedClockifyApi = make(httpClient, {
+  apiKey: Redacted.make("key"),
+  baseUrl: "https://api.clockify.me/api"
+})
 
-  const user = yield* toEffect(clockify.api.client.GET("/v1/user"))
+const entries =
+  yield *
+  raw.getTimeEntries("workspace-id", "user-id", {
+    params: { "in-progress": "true" }
+  })
+```
 
-  const entries = yield* toEffect(
-    clockify.api.client.GET("/v1/workspaces/{workspaceId}/user/{userId}/time-entries", {
-      params: { path: { workspaceId: "ws-id", userId: "u-id" } }
-    })
-  )
-})
+All successful response bodies are decoded with generated Effect Schemas.
+Malformed success bodies fail with `SchemaError`; transport and non-success
+HTTP responses fail with `HttpClientError`.
+
+## Regenerating the client
+
+Run from the repository root:
+
+```bash
+pnpm --filter @knpkv/clockify-api-client regenerate
+pnpm --filter @knpkv/clockify-api-client build
+pnpm --filter @knpkv/clockify-api-client test
 ```
 
-## Available Methods
-
-| Method                                   | Description                   |
-| ---------------------------------------- | ----------------------------- |
-| `getUser()`                              | Current authenticated user    |
-| `getWorkspaces()`                        | List workspaces               |
-| `getProjects(wsId)`                      | List projects in workspace    |
-| `getProjectByName(wsId, name)`           | Find project by name          |
-| `createTimeEntry(wsId, params)`          | Start or create entry         |
-| `stopTimer(wsId, userId, params)`        | Stop running timer            |
-| `getTimeEntries(wsId, userId, params?)`  | List time entries             |
-| `getRunningTimer(wsId, userId)`          | Get in-progress entry or null |
-| `getTimeEntry(wsId, entryId)`            | Get single entry              |
-| `updateTimeEntry(wsId, entryId, params)` | Update entry                  |
-| `deleteTimeEntry(wsId, entryId)`         | Delete entry                  |
-| `getTags(wsId)`                          | List tags                     |
-| `createTag(wsId, name)`                  | Create tag                    |
-| `findOrCreateTag(wsId, name)`            | Find or create tag            |
-
-## Errors
-
-`FetchClientError` — tagged error with `status` and `message`:
+`regenerate` performs the complete deterministic pipeline:
+
+1. Fetch `https://docs.clockify.me/openapi.json`.
+2. Parse and canonicalize it as JSON.
+3. Save the unmodified upstream document to `.specs/clockify-v1.json`.
+4. Apply `.specs/clockify-v1.patch.json` in memory as RFC 6902 JSON Patch.
+   The patch corrects known upstream schema mismatches, including Clockify's
+   string-valued account status and nullable `end`/`duration` fields on running
+   time entries. The V1 `end` patch replaces the property and omits its
+   `date-time` format because the current generator drops `null` from a
+   formatted nullable string; the runtime value remains an ISO date-time string
+   when present.
+5. Remove unreliable `examples` and `default` schema annotations. Clockify's
+   document currently contains metadata whose values contradict its schemas.
+6. Generate `src/generated/ClockifyApi.ts` with
+   `@effect/openapi-generator`'s `httpclient` format.
+7. Normalize generated multipart request construction to Effect's record-aware
+   `bodyFormDataRecord` helper. The exported `uploadImage` method accepts a
+   `Blob`, so the runtime builds a real `FormData` body and boundary.
+8. Record the upstream version in `.specs/VERSION`.
+
+Never edit `src/generated/ClockifyApi.ts` or the committed upstream spec by
+hand. API corrections belong in `clockify-v1.patch.json`; generator behavior
+belongs in `scripts/regenerate.ts`. After changing only the patch or generator,
+regenerate without network access:
 
-```typescript
-import { FetchClientError } from "@knpkv/clockify-api-client"
+```bash
+pnpm --filter @knpkv/clockify-api-client regenerate --local
+```
+
+Review every regeneration with:
+
+```bash
+git diff -- packages/clockify-api-client/.specs
+git diff -- packages/clockify-api-client/src/generated/ClockifyApi.ts
+pnpm --filter @knpkv/clockify-api-client build
+pnpm --filter @knpkv/clockify-api-client test
+pnpm --filter @knpkv/jira-clockify test
+```
 
-program.pipe(Effect.catchTag("FetchClientError", (e) => Console.log(`HTTP ${e.status}: ${e.message}`)))
+## Checking specification freshness
+
+```bash
+pnpm --filter @knpkv/clockify-api-client regenerate:check
 ```
 
-## Notes
+The command fetches and canonicalizes the current upstream document, then
+compares it byte-for-byte with the committed unmodified document. It exits
+non-zero with the regeneration command when they differ.
 
-- The OpenAPI spec is patched for accurate types (the official spec has gaps).
-- API key is stored as `Redacted<string>` to prevent accidental logging.
+The scheduled `Clockify API Spec Check` GitHub Actions workflow runs this check
+daily. When the spec changes it regenerates the client, builds it, runs the
+Clockify and jira-clockify tests, adds a changeset, and opens or updates the
+`chore/clockify-api-spec-update` pull request.
 
-## Subpath Exports
+## Generated-code policy
 
-| Export                                         | Contents                        |
-| ---------------------------------------------- | ------------------------------- |
-| `@knpkv/clockify-api-client`                   | Client, config, toEffect, types |
-| `@knpkv/clockify-api-client/generated`         | Generated OpenAPI types         |
-| `@knpkv/clockify-api-client/ClockifyApiClient` | Client service only             |
-| `@knpkv/clockify-api-client/ClockifyApiConfig` | Config service only             |
-| `@knpkv/clockify-api-client/ClockifyApiError`  | Error types                     |
+`src/generated/**` is excluded from handwritten-source lint rules. The official
+Effect beta generator currently emits a small number of internal casts needed
+by its generic transport implementation. Generated code is still compiled and
+tested; only style/AST rules intended for maintained source are skipped.
 
 ## License
 

package/dist/ClockifyApiClient.d.ts

@@ -1,39 +1,36 @@
 /**
- * Effect Layer wrapping openapi-fetch Clockify v1 client with auth and base URL.
+ * Schema-validated Clockify API client.
  *
- * **Mental model**
- *
- * - **Auth via X-Api-Key**: The layer reads {@link ClockifyApiConfig} to build the
- *   `X-Api-Key` header and derive the base URL.
- * - **openapi-fetch wrapper**: Uses {@link OpenApiFetchClient} for type-safe HTTP calls.
- * - **Method-based interface**: Exposes convenience methods (getUser, createTimeEntry, etc.)
- *   for backwards compatibility with jira-clockify consumers.
- * - **Raw API access**: `.api` exposes the raw `OpenApiFetchClient<paths>` for direct access.
- *
- * **Common tasks**
- *
- * - Use the client: `const clockify = yield* ClockifyApiClient`
- * - Call a method: `clockify.getProjects(workspaceId)`
- * - Raw access: `toEffect(clockify.api.client.GET("/v1/user"))`
- * - Provide the layer: `Effect.provide(ClockifyApiClient.layer)`
+ * The OpenAPI generator owns request construction and response decoding. This
+ * module only applies Clockify authentication and provides domain conveniences
+ * used by the timer application.
  *
  * @module
  */
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
+import * as Redacted from "effect/Redacted";
+import type { SchemaError } from "effect/Schema";
+import * as HttpClient from "effect/unstable/http/HttpClient";
+import type * as HttpClientError from "effect/unstable/http/HttpClientError";
 import { ClockifyApiConfig } from "./ClockifyApiConfig.js";
-import type { components, paths } from "./generated/schema.js";
-import { type FetchClientError, type OpenApiFetchClient } from "./OpenApiFetchClient.js";
-export type User = components["schemas"]["UserDto"];
-export type Workspace = components["schemas"]["WorkspaceDtoV1"];
-export type Project = components["schemas"]["ProjectDtoV1"];
-export type Tag = components["schemas"]["TagDto"];
-export type TimeInterval = components["schemas"]["TimeIntervalDto"];
-export type TimeEntry = components["schemas"]["TimeEntryDto"];
-export type CreateTimeEntryParams = components["schemas"]["CreateTimeEntryRequest"];
-export type StopTimeEntryParams = components["schemas"]["StopTimeEntryRequest"];
-export type UpdateTimeEntryParams = components["schemas"]["UpdateTimeEntryRequest"];
+import * as Generated from "./generated/ClockifyApi.js";
+export type ClockifyClientError = HttpClientError.HttpClientError | SchemaError;
+export type User = Generated.GetLoggedUser200;
+export type Workspace = Generated.GetWorkspacesOfUser200[number];
+export type Project = Generated.GetProjects200[number];
+export type Tag = Generated.GetTags200[number];
+export type TimeEntry = Generated.GetTimeEntries200[number] | Generated.CreateTimeEntry201;
+export type TimeInterval = NonNullable<TimeEntry["timeInterval"]>;
+export type CreateTimeEntryParams = Generated.CreateTimeEntryRequestJson;
+export type StopTimeEntryParams = Generated.StopRunningTimeEntryRequestJson;
+export type UpdateTimeEntryParams = Generated.UpdateTimeEntryRequestJson;
+export type AuthenticatedClockifyApi = Omit<Generated.ClockifyApi, "uploadImage"> & {
+    readonly uploadImage: (input: {
+        readonly file: Blob;
+    }) => Effect.Effect<Generated.UploadImage200, ClockifyClientError>;
+};
 export interface GetTimeEntriesParams {
     readonly start?: string | undefined;
     readonly end?: string | undefined;
@@ -41,27 +38,29 @@ export interface GetTimeEntriesParams {
     readonly pageSize?: number | undefined;
 }
 export interface ClockifyApiClientShape {
-    /** Raw openapi-fetch client for direct type-safe API access. */
-    readonly api: OpenApiFetchClient<paths>;
-    readonly getUser: () => Effect.Effect<User, FetchClientError>;
-    readonly getWorkspaces: () => Effect.Effect<ReadonlyArray<Workspace>, FetchClientError>;
-    readonly getProjects: (workspaceId: string) => Effect.Effect<ReadonlyArray<Project>, FetchClientError>;
-    readonly getProjectByName: (workspaceId: string, name: string) => Effect.Effect<Project | null, FetchClientError>;
-    readonly createTimeEntry: (workspaceId: string, params: CreateTimeEntryParams) => Effect.Effect<TimeEntry, FetchClientError>;
-    readonly stopTimer: (workspaceId: string, userId: string, params: StopTimeEntryParams) => Effect.Effect<TimeEntry, FetchClientError>;
-    readonly getTimeEntries: (workspaceId: string, userId: string, params?: GetTimeEntriesParams) => Effect.Effect<ReadonlyArray<TimeEntry>, FetchClientError>;
-    readonly getRunningTimer: (workspaceId: string, userId: string) => Effect.Effect<TimeEntry | null, FetchClientError>;
-    readonly getTags: (workspaceId: string) => Effect.Effect<ReadonlyArray<Tag>, FetchClientError>;
-    readonly createTag: (workspaceId: string, name: string) => Effect.Effect<Tag, FetchClientError>;
-    readonly findOrCreateTag: (workspaceId: string, name: string) => Effect.Effect<Tag, FetchClientError>;
-    readonly getTimeEntry: (workspaceId: string, timeEntryId: string) => Effect.Effect<TimeEntry, FetchClientError>;
-    readonly deleteTimeEntry: (workspaceId: string, timeEntryId: string) => Effect.Effect<void, FetchClientError>;
-    readonly updateTimeEntry: (workspaceId: string, timeEntryId: string, params: UpdateTimeEntryParams) => Effect.Effect<TimeEntry, FetchClientError>;
+    readonly getUser: () => Effect.Effect<User, ClockifyClientError>;
+    readonly getWorkspaces: () => Effect.Effect<ReadonlyArray<Workspace>, ClockifyClientError>;
+    readonly getProjects: (workspaceId: string) => Effect.Effect<ReadonlyArray<Project>, ClockifyClientError>;
+    readonly getProjectByName: (workspaceId: string, name: string) => Effect.Effect<Project | null, ClockifyClientError>;
+    readonly createTimeEntry: (workspaceId: string, params: CreateTimeEntryParams) => Effect.Effect<Generated.CreateTimeEntry201, ClockifyClientError>;
+    readonly stopTimer: (workspaceId: string, userId: string, params: StopTimeEntryParams) => Effect.Effect<Generated.StopRunningTimeEntry200, ClockifyClientError>;
+    readonly getTimeEntries: (workspaceId: string, userId: string, params?: GetTimeEntriesParams) => Effect.Effect<Generated.GetTimeEntries200, ClockifyClientError>;
+    readonly getRunningTimer: (workspaceId: string, userId: string) => Effect.Effect<Generated.GetTimeEntries200[number] | null, ClockifyClientError>;
+    readonly getTags: (workspaceId: string) => Effect.Effect<Generated.GetTags200, ClockifyClientError>;
+    readonly createTag: (workspaceId: string, name: string) => Effect.Effect<Generated.CreateNewTag201, ClockifyClientError>;
+    readonly findOrCreateTag: (workspaceId: string, name: string) => Effect.Effect<Generated.GetTags200[number] | Generated.CreateNewTag201, ClockifyClientError>;
+    readonly getTimeEntry: (workspaceId: string, timeEntryId: string) => Effect.Effect<Generated.GetTimeEntry200, ClockifyClientError>;
+    readonly deleteTimeEntry: (workspaceId: string, timeEntryId: string) => Effect.Effect<void, ClockifyClientError>;
+    readonly updateTimeEntry: (workspaceId: string, timeEntryId: string, params: UpdateTimeEntryParams) => Effect.Effect<Generated.UpdateTimeEntry200, ClockifyClientError>;
 }
+export declare const make: (httpClient: HttpClient.HttpClient, options: {
+    readonly apiKey: Redacted.Redacted<string>;
+    readonly baseUrl: string;
+}) => AuthenticatedClockifyApi;
 declare const ClockifyApiClient_base: Context.ServiceClass<ClockifyApiClient, "@knpkv/clockify-api-client/ClockifyApiClient", ClockifyApiClientShape>;
 export declare class ClockifyApiClient extends ClockifyApiClient_base {
-    static readonly layer: Layer.Layer<ClockifyApiClient, never, ClockifyApiConfig>;
+    static readonly layer: Layer.Layer<ClockifyApiClient, never, ClockifyApiConfig | HttpClient.HttpClient>;
 }
-export declare const layer: Layer.Layer<ClockifyApiClient, never, ClockifyApiConfig>;
+export declare const layer: Layer.Layer<ClockifyApiClient, never, ClockifyApiConfig | HttpClient.HttpClient>;
 export {};
 //# sourceMappingURL=ClockifyApiClient.d.ts.map

package/dist/ClockifyApiClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClockifyApiClient.d.ts","sourceRoot":"","sources":["../src/ClockifyApiClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ClockifyApiClient.d.ts","sourceRoot":"","sources":["../src/ClockifyApiClient.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,KAAK,UAAU,MAAM,iCAAiC,CAAA;AAC7D,OAAO,KAAK,KAAK,eAAe,MAAM,sCAAsC,CAAA;AAG5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,KAAK,SAAS,MAAM,4BAA4B,CAAA;AAEvD,MAAM,MAAM,mBAAmB,GAAG,eAAe,CAAC,eAAe,GAAG,WAAW,CAAA;AAE/E,MAAM,MAAM,IAAI,GAAG,SAAS,CAAC,gBAAgB,CAAA;AAC7C,MAAM,MAAM,SAAS,GAAG,SAAS,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAA;AAChE,MAAM,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;AACtD,MAAM,MAAM,GAAG,GAAG,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;AAC9C,MAAM,MAAM,SAAS,GAAG,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,kBAAkB,CAAA;AAC1F,MAAM,MAAM,YAAY,GAAG,WAAW,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAA;AACjE,MAAM,MAAM,qBAAqB,GAAG,SAAS,CAAC,0BAA0B,CAAA;AACxE,MAAM,MAAM,mBAAmB,GAAG,SAAS,CAAC,+BAA+B,CAAA;AAC3E,MAAM,MAAM,qBAAqB,GAAG,SAAS,CAAC,0BAA0B,CAAA;AAExE,MAAM,MAAM,wBAAwB,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,aAAa,CAAC,GAAG;IAClF,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAA;KAAE,KAAK,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAA;CACvH,CAAA;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACnC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAClC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACvC;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,OAAO,EAAE,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAA;IAChE,QAAQ,CAAC,aAAa,EAAE,MAAM,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,mBAAmB,CAAC,CAAA;IAC1F,QAAQ,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,mBAAmB,CAAC,CAAA;IACzG,QAAQ,CAAC,gBAAgB,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,EAAE,mBAAmB,CAAC,CAAA;IACpH,QAAQ,CAAC,eAAe,EAAE,CACxB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,qBAAqB,KAC1B,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,CAAA;IACrE,QAAQ,CAAC,SAAS,EAAE,CAClB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,mBAAmB,KACxB,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,uBAAuB,EAAE,mBAAmB,CAAC,CAAA;IAC1E,QAAQ,CAAC,cAAc,EAAE,CACvB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,oBAAoB,KAC1B,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,CAAA;IACpE,QAAQ,CAAC,eAAe,EAAE,CACxB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,KACX,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,mBAAmB,CAAC,CAAA;IACnF,QAAQ,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAA;IACnG,QAAQ,CAAC,SAAS,EAAE,CAClB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,KACT,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAA;IAClE,QAAQ,CAAC,eAAe,EAAE,CACxB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,KACT,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAA;IACjG,QAAQ,CAAC,YAAY,EAAE,CACrB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,KAChB,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAA;IAClE,QAAQ,CAAC,eAAe,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAA;IAChH,QAAQ,CAAC,eAAe,EAAE,CACxB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,qBAAqB,KAC1B,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,CAAA;CACtE;AAED,eAAO,MAAM,IAAI,GACf,YAAY,UAAU,CAAC,UAAU,EACjC,SAAS;IAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,KAChF,wBAoBF,CAAA;;AAED,qBAAa,iBAAkB,SAAQ,sBAEtC;IACC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,GAAG,UAAU,CAAC,UAAU,CAAC,CAwDpG;CACJ;AAED,eAAO,MAAM,KAAK,kFAA0B,CAAA"}

package/dist/ClockifyApiClient.js

@@ -1,140 +1,71 @@
 /**
- * Effect Layer wrapping openapi-fetch Clockify v1 client with auth and base URL.
+ * Schema-validated Clockify API client.
  *
- * **Mental model**
- *
- * - **Auth via X-Api-Key**: The layer reads {@link ClockifyApiConfig} to build the
- *   `X-Api-Key` header and derive the base URL.
- * - **openapi-fetch wrapper**: Uses {@link OpenApiFetchClient} for type-safe HTTP calls.
- * - **Method-based interface**: Exposes convenience methods (getUser, createTimeEntry, etc.)
- *   for backwards compatibility with jira-clockify consumers.
- * - **Raw API access**: `.api` exposes the raw `OpenApiFetchClient<paths>` for direct access.
- *
- * **Common tasks**
- *
- * - Use the client: `const clockify = yield* ClockifyApiClient`
- * - Call a method: `clockify.getProjects(workspaceId)`
- * - Raw access: `toEffect(clockify.api.client.GET("/v1/user"))`
- * - Provide the layer: `Effect.provide(ClockifyApiClient.layer)`
+ * The OpenAPI generator owns request construction and response decoding. This
+ * module only applies Clockify authentication and provides domain conveniences
+ * used by the timer application.
  *
  * @module
  */
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
+import { flow } from "effect/Function";
 import * as Layer from "effect/Layer";
 import * as Redacted from "effect/Redacted";
+import * as HttpClient from "effect/unstable/http/HttpClient";
+import * as HttpClientRequest from "effect/unstable/http/HttpClientRequest";
+import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse";
 import { ClockifyApiConfig } from "./ClockifyApiConfig.js";
-import { makeOpenApiFetchClient, toEffect } from "./OpenApiFetchClient.js";
-// ---------------------------------------------------------------------------
-// Service tag + layer
-// ---------------------------------------------------------------------------
+import * as Generated from "./generated/ClockifyApi.js";
+export const make = (httpClient, options) => {
+    const api = Generated.make(httpClient.pipe(HttpClient.mapRequest(flow(HttpClientRequest.prependUrl(options.baseUrl), HttpClientRequest.setHeader("X-Api-Key", Redacted.value(options.apiKey))))));
+    return {
+        ...api,
+        uploadImage: (input) => {
+            const form = new FormData();
+            form.append("file", input.file);
+            return api.httpClient.execute(HttpClientRequest.post("/v1/file/image").pipe(HttpClientRequest.bodyFormData(form))).pipe(Effect.flatMap(HttpClientResponse.filterStatusOk), Effect.flatMap(HttpClientResponse.schemaBodyJson(Generated.UploadImage200)));
+        }
+    };
+};
 export class ClockifyApiClient extends Context.Service()("@knpkv/clockify-api-client/ClockifyApiClient") {
-    static layer = Layer.effect(ClockifyApiClient, Effect.gen(function* () {
+    static layer = Layer
+        .effect(ClockifyApiClient, Effect.gen(function* () {
         const config = yield* ClockifyApiConfig;
-        const headers = {
-            "X-Api-Key": Redacted.value(config.apiKey),
-            "Content-Type": "application/json"
-        };
-        const api = makeOpenApiFetchClient(config.baseUrl, headers);
-        const { client } = api;
-        return {
-            api,
-            getUser: () => toEffect(client.GET("/v1/user")),
-            getWorkspaces: () => toEffect(client.GET("/v1/workspaces")),
-            getProjects: (workspaceId) => toEffect(client.GET("/v1/workspaces/{workspaceId}/projects", {
-                params: {
-                    path: { workspaceId },
-                    query: { archived: false, "page-size": 500 }
-                }
-            })),
-            getProjectByName: (workspaceId, name) => Effect.gen(function* () {
-                const projects = yield* toEffect(client.GET("/v1/workspaces/{workspaceId}/projects", {
-                    params: {
-                        path: { workspaceId },
-                        query: { name, archived: false }
-                    }
-                }));
-                return projects.find((p) => p.name.toLowerCase() === name.toLowerCase()) ?? null;
-            }),
-            createTimeEntry: (workspaceId, params) => toEffect(client.POST("/v1/workspaces/{workspaceId}/time-entries", {
-                params: { path: { workspaceId } },
-                body: {
-                    description: params.description,
-                    start: params.start,
-                    ...(params.end ? { end: params.end } : {}),
-                    ...(params.projectId ? { projectId: params.projectId } : {}),
-                    ...(params.taskId ? { taskId: params.taskId } : {}),
-                    ...(params.billable !== undefined ? { billable: params.billable } : {}),
-                    ...(params.tagIds !== undefined ? { tagIds: [...params.tagIds] } : {})
-                }
-            })),
-            stopTimer: (workspaceId, userId, params) => toEffect(client.PATCH("/v1/workspaces/{workspaceId}/user/{userId}/time-entries", {
-                params: { path: { workspaceId, userId } },
-                body: { end: params.end }
-            })),
-            getTimeEntries: (workspaceId, userId, params) => toEffect(client.GET("/v1/workspaces/{workspaceId}/user/{userId}/time-entries", {
+        const httpClient = yield* HttpClient.HttpClient;
+        const api = make(httpClient, config);
+        const getProjects = (workspaceId) => api.getProjects(workspaceId, { params: { archived: false, "page-size": 500 } });
+        const getTags = (workspaceId) => api.getTags(workspaceId, { params: { archived: false, "page-size": 200 } });
+        return ClockifyApiClient.of({
+            getUser: () => api.getLoggedUser(undefined),
+            getWorkspaces: () => api.getWorkspacesOfUser(undefined),
+            getProjects,
+            getProjectByName: (workspaceId, name) => api.getProjects(workspaceId, { params: { name, archived: false } }).pipe(Effect.map((projects) => projects.find((project) => project.name.toLowerCase() === name.toLowerCase()) ?? null)),
+            createTimeEntry: (workspaceId, payload) => api.createTimeEntry(workspaceId, { payload }),
+            stopTimer: (workspaceId, userId, payload) => api.stopRunningTimeEntry(workspaceId, userId, { payload }),
+            getTimeEntries: (workspaceId, userId, params) => api.getTimeEntries(workspaceId, userId, {
                 params: {
-                    path: { workspaceId, userId },
-                    query: {
-                        ...(params?.start !== undefined ? { start: params.start } : {}),
-                        ...(params?.end !== undefined ? { end: params.end } : {}),
-                        ...(params?.page !== undefined ? { page: params.page } : {}),
-                        ...(params?.pageSize !== undefined ? { "page-size": params.pageSize } : {})
-                    }
+                    ...(params?.start !== undefined ? { start: params.start } : {}),
+                    ...(params?.end !== undefined ? { end: params.end } : {}),
+                    ...(params?.page !== undefined ? { page: params.page } : {}),
+                    ...(params?.pageSize !== undefined ? { "page-size": params.pageSize } : {})
                 }
-            })),
-            getRunningTimer: (workspaceId, userId) => Effect.gen(function* () {
-                const entries = yield* toEffect(client.GET("/v1/workspaces/{workspaceId}/user/{userId}/time-entries", {
-                    params: {
-                        path: { workspaceId, userId },
-                        query: { "in-progress": true, "page-size": 1 }
-                    }
-                }));
-                return entries.length > 0 ? entries[0] : null;
             }),
-            getTimeEntry: (workspaceId, timeEntryId) => toEffect(client.GET("/v1/workspaces/{workspaceId}/time-entries/{id}", {
-                params: { path: { workspaceId, id: timeEntryId } }
+            getRunningTimer: (workspaceId, userId) => api.getTimeEntries(workspaceId, userId, {
+                params: { "in-progress": "true", "page-size": 1 }
+            }).pipe(Effect.map((entries) => entries[0] ?? null)),
+            getTags,
+            createTag: (workspaceId, name) => api.createNewTag(workspaceId, { payload: { name } }),
+            findOrCreateTag: (workspaceId, name) => api.getTags(workspaceId, { params: { name, archived: false } }).pipe(Effect.flatMap((tags) => {
+                const existing = tags.find((tag) => tag.name?.toLowerCase() === name.toLowerCase());
+                return existing === undefined
+                    ? api.createNewTag(workspaceId, { payload: { name } })
+                    : Effect.succeed(existing);
             })),
-            updateTimeEntry: (workspaceId, timeEntryId, params) => toEffect(client.PUT("/v1/workspaces/{workspaceId}/time-entries/{id}", {
-                params: { path: { workspaceId, id: timeEntryId } },
-                body: {
-                    start: params.start,
-                    ...(params.end !== undefined ? { end: params.end } : {}),
-                    ...(params.description !== undefined ? { description: params.description } : {}),
-                    ...(params.projectId !== undefined ? { projectId: params.projectId } : {}),
-                    ...(params.billable !== undefined ? { billable: params.billable } : {}),
-                    ...(params.tagIds !== undefined ? { tagIds: [...params.tagIds] } : {})
-                }
-            })),
-            getTags: (workspaceId) => toEffect(client.GET("/v1/workspaces/{workspaceId}/tags", {
-                params: {
-                    path: { workspaceId },
-                    query: { archived: false, "page-size": 200 }
-                }
-            })),
-            createTag: (workspaceId, name) => toEffect(client.POST("/v1/workspaces/{workspaceId}/tags", {
-                params: { path: { workspaceId } },
-                body: { name }
-            })),
-            findOrCreateTag: (workspaceId, name) => Effect.gen(function* () {
-                const tags = yield* toEffect(client.GET("/v1/workspaces/{workspaceId}/tags", {
-                    params: {
-                        path: { workspaceId },
-                        query: { name, archived: false }
-                    }
-                }));
-                const existing = tags.find((t) => t.name.toLowerCase() === name.toLowerCase());
-                if (existing)
-                    return existing;
-                return yield* toEffect(client.POST("/v1/workspaces/{workspaceId}/tags", {
-                    params: { path: { workspaceId } },
-                    body: { name }
-                }));
-            }),
-            deleteTimeEntry: (workspaceId, timeEntryId) => toEffect(client.DELETE("/v1/workspaces/{workspaceId}/time-entries/{id}", {
-                params: { path: { workspaceId, id: timeEntryId } }
-            }))
-        };
+            getTimeEntry: (workspaceId, timeEntryId) => api.getTimeEntry(workspaceId, timeEntryId, undefined),
+            deleteTimeEntry: (workspaceId, timeEntryId) => api.deleteTimeEntry(workspaceId, timeEntryId, undefined),
+            updateTimeEntry: (workspaceId, timeEntryId, payload) => api.updateTimeEntry(workspaceId, timeEntryId, { payload })
+        });
     }));
 }
 export const layer = ClockifyApiClient.layer;