@knpkv/jira-clockify 1.0.2 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knpkv/jira-clockify",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "TUI for Jira-Clockify time tracking, attachable to neovim",
   "license": "MIT",
   "author": "knpkv",
@@ -17,23 +17,23 @@
     "skills"
   ],
   "dependencies": {
-    "@effect/atom-react": "4.0.0-beta.87",
-    "@effect/platform-node": "4.0.0-beta.87",
+    "@effect/atom-react": "4.0.0-beta.93",
+    "@effect/platform-node": "4.0.0-beta.93",
     "@opentui/core": "https://pkg.pr.new/anomalyco/opentui/@opentui/core@367a94087821b3b5feedd35bbb57df43b10a286e",
     "@opentui/react": "https://pkg.pr.new/anomalyco/opentui/@opentui/react@367a94087821b3b5feedd35bbb57df43b10a286e",
-    "effect": "4.0.0-beta.87",
+    "effect": "4.0.0-beta.93",
     "react": "^19.2.7",
     "@knpkv/agent-skills": "^0.2.2",
-    "@knpkv/atlassian-common": "^1.0.0",
+    "@knpkv/atlassian-common": "^1.1.0",
     "@knpkv/clockify-api-client": "^0.3.0",
-    "@knpkv/jira-api-client": "^0.3.0",
-    "@knpkv/jira-cli": "^1.1.1"
+    "@knpkv/jira-api-client": "^0.4.0",
+    "@knpkv/jira-cli": "^1.2.0"
   },
   "devDependencies": {
-    "@effect/vitest": "4.0.0-beta.87",
+    "@effect/vitest": "4.0.0-beta.93",
     "@types/node": "latest",
     "@types/react": "^19.2.17",
-    "tsx": "^4.22.4",
+    "tsx": "^4.23.0",
     "vitest": "^4.1.9"
   },
   "scripts": {

package/dist/test/ReconcileService.test.js

@@ -1,146 +0,0 @@
-import { describe, expect, it } from "@effect/vitest";
-import { deltaToApply, resolvePeriod } from "../src/cli/reconcile.js";
-import { buildReconcileRows, combineDescriptions, localDay, parseTicketKey, stripTicketPrefix } from "../src/services/ReconcileService.js";
-describe("parseTicketKey", () => {
-    it("parses the bracket form `[KEY] summary`", () => {
-        expect(parseTicketKey("[PROJ-12] Fix the widget")).toBe("PROJ-12");
-    });
-    it("parses the colon form `KEY: summary`", () => {
-        expect(parseTicketKey("PROJ-12: Fix the widget")).toBe("PROJ-12");
-    });
-    // A bare colon prefix that isn't a ticket key must not be mistaken for one.
-    it("does not treat arbitrary `word:` prefixes as a key", () => {
-        expect(parseTicketKey("Meeting: standup")).toBeNull();
-    });
-    it("returns null for empty / missing descriptions", () => {
-        expect(parseTicketKey("")).toBeNull();
-        expect(parseTicketKey(null)).toBeNull();
-        expect(parseTicketKey(undefined)).toBeNull();
-    });
-});
-describe("localDay", () => {
-    it("formats a date as local YYYY-MM-DD", () => {
-        // Construct from local components to stay timezone-independent.
-        expect(localDay(new Date(2026, 5, 23, 9, 30))).toBe("2026-06-23");
-        expect(localDay(new Date(2026, 0, 1, 0, 0))).toBe("2026-01-01");
-    });
-});
-describe("buildReconcileRows", () => {
-    // Multiple entries on the same (ticket, day) on one side must sum, not duplicate.
-    it("sums per (ticket, day) bucket across both sides", () => {
-        const rows = buildReconcileRows([
-            { ticketKey: "PROJ-1", day: "2026-06-23", seconds: 3600 },
-            { ticketKey: "PROJ-1", day: "2026-06-23", seconds: 1800 }
-        ], [{ ticketKey: "PROJ-1", day: "2026-06-23", seconds: 3600 }]);
-        expect(rows).toHaveLength(1);
-        expect(rows[0]).toMatchObject({ ticketKey: "PROJ-1", day: "2026-06-23", clockifySeconds: 5400, jiraSeconds: 3600 });
-    });
-    // A bucket present on only one side still appears, with 0 on the other.
-    it("includes one-sided buckets with zero on the missing side", () => {
-        const rows = buildReconcileRows([{ ticketKey: "PROJ-1", day: "2026-06-23", seconds: 3600 }], [{ ticketKey: "PROJ-2", day: "2026-06-24", seconds: 1800 }]);
-        expect(rows).toEqual([
-            { ticketKey: "PROJ-1", day: "2026-06-23", clockifySeconds: 3600, jiraSeconds: 0, clockifyDescription: null },
-            { ticketKey: "PROJ-2", day: "2026-06-24", clockifySeconds: 0, jiraSeconds: 1800, clockifyDescription: null }
-        ]);
-    });
-    it("sorts by day then ticket for stable output", () => {
-        const rows = buildReconcileRows([
-            { ticketKey: "PROJ-9", day: "2026-06-24", seconds: 60 },
-            { ticketKey: "PROJ-2", day: "2026-06-23", seconds: 60 },
-            { ticketKey: "PROJ-1", day: "2026-06-23", seconds: 60 }
-        ], []);
-        expect(rows.map((r) => `${r.day} ${r.ticketKey}`)).toEqual([
-            "2026-06-23 PROJ-1",
-            "2026-06-23 PROJ-2",
-            "2026-06-24 PROJ-9"
-        ]);
-    });
-    it("returns an empty list when both sides are empty", () => {
-        expect(buildReconcileRows([], [])).toEqual([]);
-    });
-    // The Clockify description becomes the worklog comment, prefix stripped and deduped.
-    it("combines Clockify descriptions per bucket into clockifyDescription", () => {
-        const rows = buildReconcileRows([
-            { ticketKey: "PROJ-1", day: "2026-06-23", seconds: 3600, description: "[PROJ-1] Fix the widget" },
-            { ticketKey: "PROJ-1", day: "2026-06-23", seconds: 1800, description: "[PROJ-1] Write tests" },
-            { ticketKey: "PROJ-1", day: "2026-06-23", seconds: 600, description: "[PROJ-1] Fix the widget" }
-        ], []);
-        expect(rows[0]?.clockifyDescription).toBe("Fix the widget; Write tests");
-    });
-    it("yields a null clockifyDescription when descriptions are only the ticket prefix", () => {
-        const rows = buildReconcileRows([{ ticketKey: "PROJ-1", day: "2026-06-23", seconds: 3600, description: "[PROJ-1]" }], []);
-        expect(rows[0]?.clockifyDescription).toBeNull();
-    });
-});
-describe("stripTicketPrefix", () => {
-    it("strips the bracket and colon ticket markers", () => {
-        expect(stripTicketPrefix("[PROJ-12] Fix the widget")).toBe("Fix the widget");
-        expect(stripTicketPrefix("PROJ-12: Fix the widget")).toBe("Fix the widget");
-    });
-    it("keeps the prefix appended after a Clockify stop comment", () => {
-        expect(stripTicketPrefix("[PROJ-12] Fix the widget | extra note")).toBe("Fix the widget | extra note");
-    });
-    it("returns empty when only the marker is present", () => {
-        expect(stripTicketPrefix("[PROJ-12]")).toBe("");
-    });
-});
-describe("combineDescriptions", () => {
-    it("strips prefixes, dedupes, and joins with '; '", () => {
-        expect(combineDescriptions(["[A-1] one", "[A-1] two", "[A-1] one"])).toBe("one; two");
-    });
-    it("returns null when nothing meaningful remains", () => {
-        expect(combineDescriptions([null, undefined, "[A-1]", "  "])).toBeNull();
-    });
-});
-describe("deltaToApply", () => {
-    const row = (clockifySeconds, jiraSeconds) => ({
-        ticketKey: "PROJ-1",
-        day: "2026-06-23",
-        clockifySeconds,
-        jiraSeconds,
-        clockifyDescription: null
-    });
-    it("returns the gap the target is short in the chosen direction", () => {
-        expect(deltaToApply(row(7200, 3600), "clockify-to-jira")).toBe(3600);
-        expect(deltaToApply(row(3600, 7200), "jira-to-clockify")).toBe(3600);
-    });
-    // Reconciling clockify->jira never proposes shrinking Jira when Jira already has more.
-    it("returns 0 when the target already has at least as much", () => {
-        expect(deltaToApply(row(3600, 7200), "clockify-to-jira")).toBe(0);
-        expect(deltaToApply(row(7200, 3600), "jira-to-clockify")).toBe(0);
-    });
-    // Sub-minute differences are noise (Jira floors to 60s) and must not be flagged.
-    it("ignores differences under the 60s tolerance", () => {
-        expect(deltaToApply(row(3630, 3600), "clockify-to-jira")).toBe(0);
-        expect(deltaToApply(row(3660, 3600), "clockify-to-jira")).toBe(60);
-    });
-});
-describe("resolvePeriod", () => {
-    // A custom window is inclusive of both days → half-open [from 00:00, until+1 00:00).
-    it("builds an inclusive custom window from --since/--until", () => {
-        const period = resolvePeriod({ week: false, since: "2026-06-01", until: "2026-06-07" });
-        expect("error" in period).toBe(false);
-        if ("error" in period)
-            return;
-        expect(localDay(period.from)).toBe("2026-06-01");
-        // `to` is exclusive: the instant just before it is still 2026-06-07.
-        expect(localDay(new Date(period.to.getTime() - 1))).toBe("2026-06-07");
-    });
-    it("spans 7 local days for --week (inclusive of today)", () => {
-        const period = resolvePeriod({ week: true, since: undefined, until: undefined });
-        expect("error" in period).toBe(false);
-        if ("error" in period)
-            return;
-        const days = Math.round((period.to.getTime() - period.from.getTime()) / (24 * 60 * 60 * 1000));
-        expect(days).toBe(7);
-    });
-    it("rejects a reversed custom window", () => {
-        const period = resolvePeriod({ week: false, since: "2026-06-07", until: "2026-06-01" });
-        expect("error" in period).toBe(true);
-    });
-    it("rejects a malformed date", () => {
-        const period = resolvePeriod({ week: false, since: "june 1", until: undefined });
-        expect("error" in period).toBe(true);
-    });
-});
-//# sourceMappingURL=ReconcileService.test.js.map

package/dist/test/ReconcileService.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ReconcileService.test.js","sourceRoot":"","sources":["../../test/ReconcileService.test.ts"],"names":[],"mappings":"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"}