@knpkv/clockify-api-client 1.0.3 → 2.0.0

package/dist/index.d.ts

@@ -3,8 +3,8 @@
  *
  * @packageDocumentation
  */
-export { ClockifyApiClient, type ClockifyApiClientShape, type ClockifyClientError, layer, make } from "./ClockifyApiClient.js";
+export { ClockifyApiClient, type ClockifyApiClientContract, type ClockifyClientError, layer, make } from "./ClockifyApiClient.js";
 export type { AuthenticatedClockifyApi, CreateTimeEntryParams, GetTimeEntriesParams, GetTimeEntryParams, Project, StopTimeEntryParams, Tag, TimeEntry, TimeInterval, UpdateTimeEntryParams, User, Workspace, WorkspaceUser } from "./ClockifyApiClient.js";
-export { ClockifyApiConfig, type ClockifyApiConfigShape } from "./ClockifyApiConfig.js";
+export { ClockifyApiConfig, type ClockifyApiConfigContract } from "./ClockifyApiConfig.js";
 export * as ClockifyApi from "./generated/ClockifyApi.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,iBAAiB,EACjB,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACxB,KAAK,EACL,IAAI,EACL,MAAM,wBAAwB,CAAA;AAE/B,YAAY,EACV,wBAAwB,EACxB,qBAAqB,EACrB,oBAAoB,EACpB,kBAAkB,EAClB,OAAO,EACP,mBAAmB,EACnB,GAAG,EACH,SAAS,EACT,YAAY,EACZ,qBAAqB,EACrB,IAAI,EACJ,SAAS,EACT,aAAa,EACd,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAE,iBAAiB,EAAE,KAAK,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAEvF,OAAO,KAAK,WAAW,MAAM,4BAA4B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,iBAAiB,EACjB,KAAK,yBAAyB,EAC9B,KAAK,mBAAmB,EACxB,KAAK,EACL,IAAI,EACL,MAAM,wBAAwB,CAAA;AAE/B,YAAY,EACV,wBAAwB,EACxB,qBAAqB,EACrB,oBAAoB,EACpB,kBAAkB,EAClB,OAAO,EACP,mBAAmB,EACnB,GAAG,EACH,SAAS,EACT,YAAY,EACZ,qBAAqB,EACrB,IAAI,EACJ,SAAS,EACT,aAAa,EACd,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAE,iBAAiB,EAAE,KAAK,yBAAyB,EAAE,MAAM,wBAAwB,CAAA;AAE1F,OAAO,KAAK,WAAW,MAAM,4BAA4B,CAAA"}

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,iBAAiB,EAGjB,KAAK,EACL,IAAI,EACL,MAAM,wBAAwB,CAAA;AAkB/B,OAAO,EAAE,iBAAiB,EAA+B,MAAM,wBAAwB,CAAA;AAEvF,OAAO,KAAK,WAAW,MAAM,4BAA4B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,iBAAiB,EAGjB,KAAK,EACL,IAAI,EACL,MAAM,wBAAwB,CAAA;AAkB/B,OAAO,EAAE,iBAAiB,EAAkC,MAAM,wBAAwB,CAAA;AAE1F,OAAO,KAAK,WAAW,MAAM,4BAA4B,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knpkv/clockify-api-client",
-  "version": "1.0.3",
+  "version": "2.0.0",
   "description": "Effect-based Clockify REST API client",
   "license": "MIT",
   "author": "knpkv",
@@ -35,18 +35,18 @@
     "access": "public"
   },
   "peerDependencies": {
-    "effect": "4.0.0-beta.98"
+    "effect": "4.0.0"
   },
   "devDependencies": {
-    "@effect/openapi-generator": "4.0.0-beta.98",
-    "@effect/platform-node": "4.0.0-beta.98",
-    "@effect/vitest": "4.0.0-beta.98",
+    "@effect/openapi-generator": "4.0.0",
+    "@effect/platform-node": "4.0.0",
+    "@effect/vitest": "4.0.0",
     "@types/node": "latest",
-    "effect": "4.0.0-beta.98",
-    "prettier": "^3.9.5",
-    "tsx": "^4.23.0",
-    "typescript": "~6.0.3",
-    "vitest": "^4.1.10"
+    "effect": "4.0.0",
+    "prettier": "^3.9.9",
+    "tsx": "^4.23.15",
+    "typescript": "npm:@typescript/typescript6@^6.0.2",
+    "vitest": "^5.0.3"
   },
   "keywords": [
     "effect",

package/scripts/regenerate.ts

@@ -8,19 +8,19 @@
 import * as OpenApiGenerator from "@effect/openapi-generator/OpenApiGenerator"
 import * as OpenApiPatch from "@effect/openapi-generator/OpenApiPatch"
 import { NodeHttpClient, NodeRuntime, NodeServices } from "@effect/platform-node"
+import * as Command from "effect/cli/Command"
+import * as Flag from "effect/cli/Flag"
 import * as Console from "effect/Console"
 import * as Data from "effect/Data"
 import * as Effect from "effect/Effect"
 import * as FileSystem from "effect/FileSystem"
+import type { OpenAPISpec } from "effect/http-api/OpenApi"
+import * as HttpClient from "effect/http/HttpClient"
 import type * as JsonSchema from "effect/JsonSchema"
 import * as Layer from "effect/Layer"
 import * as Path from "effect/Path"
 import * as Predicate from "effect/Predicate"
 import * as Schema from "effect/Schema"
-import * as Command from "effect/unstable/cli/Command"
-import * as Flag from "effect/unstable/cli/Flag"
-import * as HttpClient from "effect/unstable/http/HttpClient"
-import type { OpenAPISpec } from "effect/unstable/httpapi/OpenApi"
 import { format as formatSource } from "prettier"
 
 const SPEC_URL = "https://docs.clockify.me/openapi.json"
@@ -169,12 +169,14 @@ const generate = Effect.fn("Clockify.regenerate.generate")(function*(
   )
 })
 
-const check = Flag.boolean("check").pipe(
-  Flag.withDescription("Exit non-zero when the committed upstream spec differs from Clockify")
+const check = Flag.Boolean("check").pipe(
+  Flag.withDescription("Exit non-zero when the committed upstream spec differs from Clockify"),
+  Flag.withDefault(false)
 )
 
-const local = Flag.boolean("local").pipe(
-  Flag.withDescription("Regenerate from the committed spec without contacting Clockify")
+const local = Flag.Boolean("local").pipe(
+  Flag.withDescription("Regenerate from the committed spec without contacting Clockify"),
+  Flag.withDefault(false)
 )
 
 const root = Command.make("clockify-api-regenerate", { check, local }).pipe(

package/src/ClockifyApiClient.ts

@@ -10,13 +10,13 @@
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import { flow } from "effect/Function"
+import * as HttpClient from "effect/http/HttpClient"
+import type * as HttpClientError from "effect/http/HttpClientError"
+import * as HttpClientRequest from "effect/http/HttpClientRequest"
+import * as HttpClientResponse from "effect/http/HttpClientResponse"
 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 * as HttpClientRequest from "effect/unstable/http/HttpClientRequest"
-import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse"
 import { ClockifyApiConfig } from "./ClockifyApiConfig.js"
 import * as Generated from "./generated/ClockifyApi.js"
 
@@ -49,7 +49,7 @@ export interface GetTimeEntryParams {
   readonly hydrated?: boolean | undefined
 }
 
-export interface ClockifyApiClientShape {
+export interface ClockifyApiClientContract {
   readonly getUser: () => Effect.Effect<User, ClockifyClientError>
   readonly getWorkspaceUsers?: (
     workspaceId: string
@@ -127,7 +127,7 @@ export const make = (
   }
 }
 
-export class ClockifyApiClient extends Context.Service<ClockifyApiClient, ClockifyApiClientShape>()(
+export class ClockifyApiClient extends Context.Service<ClockifyApiClient, ClockifyApiClientContract>()(
   "@knpkv/clockify-api-client/ClockifyApiClient"
 ) {
   static readonly layer: Layer.Layer<ClockifyApiClient, never, ClockifyApiConfig | HttpClient.HttpClient> = Layer
@@ -187,11 +187,11 @@ export class ClockifyApiClient extends Context.Service<ClockifyApiClient, Clocki
           getTimeEntries: (workspaceId, userId, params) =>
             api.getTimeEntries(workspaceId, userId, {
               params: {
-                ...(params?.start !== undefined ? { start: params.start } : {}),
-                ...(params?.end !== undefined ? { end: params.end } : {}),
-                ...(params?.hydrated === undefined ? {} : { hydrated: params.hydrated }),
-                ...(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?.hydrated === undefined) && { hydrated: params.hydrated }),
+                ...((params?.page !== undefined) && { page: params.page }),
+                ...((params?.pageSize !== undefined) && { "page-size": params.pageSize })
               }
             }),
           getRunningTimer: (workspaceId, userId) =>
@@ -212,7 +212,7 @@ export class ClockifyApiClient extends Context.Service<ClockifyApiClient, Clocki
           getTimeEntry: (workspaceId, timeEntryId, params) =>
             api.getTimeEntry(workspaceId, timeEntryId, {
               params: {
-                ...(params?.hydrated === undefined ? {} : { hydrated: params.hydrated })
+                ...(!(params?.hydrated === undefined) && { hydrated: params.hydrated })
               }
             }),
           deleteTimeEntry: (workspaceId, timeEntryId) => api.deleteTimeEntry(workspaceId, timeEntryId, undefined),

package/src/ClockifyApiConfig.ts

@@ -13,13 +13,13 @@
 import * as Context from "effect/Context"
 import type * as Redacted from "effect/Redacted"
 
-export interface ClockifyApiConfigShape {
+export interface ClockifyApiConfigContract {
   readonly apiKey: Redacted.Redacted<string>
   readonly workspaceId: string
   readonly userId: string
   readonly baseUrl: string
 }
 
-export class ClockifyApiConfig extends Context.Service<ClockifyApiConfig, ClockifyApiConfigShape>()(
+export class ClockifyApiConfig extends Context.Service<ClockifyApiConfig, ClockifyApiConfigContract>()(
   "@knpkv/clockify-api-client/ClockifyApiConfig"
 ) {}