bamboohr-cli 1.0.21 → 1.0.22-g942e3c7.1

package/dist/index.js

@@ -60,33 +60,77 @@ function readPackageVersion(importMetaUrl) {
 
 // ../../cli-utils/dist/validators.js
 import { InvalidArgumentError } from "commander";
+function nonNegativeInt(raw) {
+  const n = parseInt(raw, 10);
+  if (Number.isNaN(n) || n < 0) {
+    throw new InvalidArgumentError("Must be a non-negative integer.");
+  }
+  return n;
+}
 function positiveInt(raw) {
   const n = parseInt(raw, 10);
   if (Number.isNaN(n) || n < 1) {
-    throw new InvalidArgumentError(`Must be a positive integer (got "${raw}")`);
+    throw new InvalidArgumentError("Must be a positive integer.");
   }
   return n;
 }
+function text(raw) {
+  return raw;
+}
+function date(raw) {
+  const m = /^(\d{4})-(\d{2})-(\d{2})$/.exec(raw);
+  if (!m) {
+    throw new InvalidArgumentError("Must be a date in YYYY-MM-DD format.");
+  }
+  const [, y, mo, d] = m;
+  const year = Number(y);
+  const month = Number(mo);
+  const day = Number(d);
+  const dt = new Date(Date.UTC(year, month - 1, day));
+  if (dt.getUTCFullYear() !== year || dt.getUTCMonth() !== month - 1 || dt.getUTCDate() !== day) {
+    throw new InvalidArgumentError("Not a real calendar date.");
+  }
+  return raw;
+}
+
+// ../../cli-utils/dist/json.js
+import { InvalidArgumentError as InvalidArgumentError2 } from "commander";
+function jsonShape(schema) {
+  return (raw) => {
+    let parsed;
+    try {
+      parsed = JSON.parse(raw);
+    } catch {
+      throw new InvalidArgumentError2("Must be valid JSON.");
+    }
+    const result = schema.safeParse(parsed);
+    if (!result.success) {
+      const issues = result.error.issues.map((i) => `${i.path.join(".") || "(root)"}: ${i.message}`).join("; ");
+      throw new InvalidArgumentError2(`Invalid JSON shape \u2014 ${issues}`);
+    }
+    return result.data;
+  };
+}
 
 // ../../cli-utils/dist/text-or-file.js
 import { readFileSync as readFileSync3 } from "fs";
-import { InvalidArgumentError as InvalidArgumentError2, Option } from "commander";
+import { InvalidArgumentError as InvalidArgumentError3, Option } from "commander";
 var STDIN_REF = "-";
 function rejectStdinSentinel(value) {
   if (value === "@-" || value === STDIN_REF) {
-    throw new InvalidArgumentError2(`"${value}" looks like a stdin redirect, which is not supported here. Pass the text directly, or read it from a file/stdin with the matching --\u2026-file <path|-> option.`);
+    throw new InvalidArgumentError3(`"${value}" looks like a stdin redirect, which is not supported here. Pass the text directly, or read it from a file/stdin with the matching --\u2026-file <path|-> option.`);
   }
   return value;
 }
 function readFileOrStdin(ref) {
   if (ref === STDIN_REF) {
     if (process.stdin.isTTY) {
-      throw new InvalidArgumentError2('"--\u2026-file -" reads stdin, but stdin is a terminal (nothing piped).');
+      throw new InvalidArgumentError3('"--\u2026-file -" reads stdin, but stdin is a terminal (nothing piped).');
     }
     try {
       return readFileSync3(0, "utf8");
     } catch (err) {
-      throw new InvalidArgumentError2(`failed to read stdin for "--\u2026-file -": ${err.message}`);
+      throw new InvalidArgumentError3(`failed to read stdin for "--\u2026-file -": ${err.message}`);
     }
   }
   try {
@@ -94,28 +138,29 @@ function readFileOrStdin(ref) {
   } catch (err) {
     const e = err;
     if (e.code === "ENOENT") {
-      throw new InvalidArgumentError2(`file not found: "${ref}".`);
+      throw new InvalidArgumentError3(`file not found: "${ref}".`);
     }
-    throw new InvalidArgumentError2(`failed to read file "${ref}": ${e.message}`);
+    throw new InvalidArgumentError3(`failed to read file "${ref}": ${e.message}`);
   }
 }
 function textOrFileOption(cmd, name, opts = {}) {
   const label = `${name.charAt(0).toUpperCase()}${name.slice(1)} content`;
   cmd.option(`--${name} <text>`, opts.description ?? label, rejectStdinSentinel);
-  cmd.addOption(new Option(`--${name}-file <path>`, `Read --${name} from a file, or "-" for stdin (mutually exclusive with --${name})`).conflicts(name));
+  cmd.addOption(new Option(`--${name}-file <path>`, `Read --${name} from a file, or "-" for stdin (mutually exclusive with --${name})`).conflicts(name).argParser(text));
   return cmd;
 }
 function resolveTextOrFile(opts, name, { required = true } = {}) {
-  const literal = opts[name];
-  const ref = opts[`${name}File`];
+  const record = opts;
+  const literal = record[name];
+  const ref = record[`${name}File`];
   if (literal !== void 0 && ref !== void 0) {
-    throw new InvalidArgumentError2(`--${name} and --${name}-file are mutually exclusive; provide only one.`);
+    throw new InvalidArgumentError3(`--${name} and --${name}-file are mutually exclusive; provide only one.`);
   }
   if (ref !== void 0) {
     return readFileOrStdin(ref);
   }
   if (literal === void 0 && required) {
-    throw new InvalidArgumentError2(`a ${name} is required: provide --${name} <text> or --${name}-file <path>.`);
+    throw new InvalidArgumentError3(`a ${name} is required: provide --${name} <text> or --${name}-file <path>.`);
   }
   return literal;
 }
@@ -518,7 +563,7 @@ function directory(parent) {
 
 // src/commands/employee/get.ts
 function get(parent) {
-  const cmd = parent.command("get [employeeId]").description("Get employee data by ID (default: current user)").option("--fields <fields>", "Comma-separated field names", "firstName,lastName,email,jobTitle").option("--include-future", "Include future-dated values from history fields").option("--with-photos", "Include the employee's signed photo URL and photoUploaded flag");
+  const cmd = parent.command("get").description("Get employee data by ID (default: current user)").argument("[employeeId]", "Employee ID (0 or omitted = current user)", nonNegativeInt).option("--fields <fields>", "Comma-separated field names", text, "firstName,lastName,email,jobTitle").option("--include-future", "Include future-dated values from history fields").option("--with-photos", "Include the employee's signed photo URL and photoUploaded flag");
   examples(cmd, [
     "",
     "123",
@@ -531,7 +576,7 @@ function get(parent) {
       const client = getClient();
       const fields2 = opts.withPhotos ? mergeFields(opts.fields, ["photoUrl", "photoUploaded"]) : opts.fields;
       const result = await client.employees.get({
-        id: employeeId ?? "0",
+        id: employeeId !== void 0 ? String(employeeId) : "0",
         fields: fields2,
         onlyCurrent: !opts.includeFuture
       });
@@ -551,12 +596,12 @@ function mergeFields(existing, extra) {
 import { Option as Option2 } from "commander";
 var GOAL_FILTERS = ["open", "closed", "all"];
 function goals(parent) {
-  const cmd = parent.command("goals <employeeId>").description("Get employee performance goals").addOption(new Option2("--filter <filter>", "Filter goals by status").choices(GOAL_FILTERS).default("all"));
+  const cmd = parent.command("goals").description("Get employee performance goals").argument("<employeeId>", "Employee ID (0 = current user)", nonNegativeInt).addOption(new Option2("--filter <filter>", "Filter goals by status").choices(GOAL_FILTERS).default("all"));
   examples(cmd, ["123", ["123 --filter open", "only open goals"], ["123 --filter closed", "only closed goals"]]);
   cmd.action(async (employeeId, opts) => {
     const client = getClient();
     const result = await client.goals.get({
-      employeeId,
+      employeeId: String(employeeId),
       filter: opts.filter === "all" ? void 0 : opts.filter
     });
     output(transformGoals(result));
@@ -568,12 +613,12 @@ import { writeFileSync as writeFileSync2 } from "fs";
 import { Option as Option3 } from "commander";
 var PHOTO_SIZES = ["original", "large", "medium", "small", "xs", "tiny"];
 function photo(parent) {
-  const cmd = parent.command("photo <employeeId>").description("Download employee photo").requiredOption("--output <path>", "File path to save photo").addOption(new Option3("--size <size>", "Photo size").choices(PHOTO_SIZES).default("medium"));
+  const cmd = parent.command("photo").description("Download employee photo").argument("<employeeId>", "Employee ID (0 = current user)", nonNegativeInt).requiredOption("--output <path>", "File path to save photo", text).addOption(new Option3("--size <size>", "Photo size").choices(PHOTO_SIZES).default("medium"));
   examples(cmd, [["123 --output ./photo.jpg", "medium size (default)"], "123 --output ./photo.jpg --size large"]);
   cmd.action(async (employeeId, opts) => {
     const client = getClient();
     const buffer = await client.employees.getPhoto({
-      employeeId,
+      employeeId: String(employeeId),
       size: opts.size
     });
     writeFileSync2(opts.output, buffer);
@@ -590,7 +635,7 @@ async function resolveEmployeeId(client, employeeId) {
 
 // src/commands/employee/search.ts
 function search(parent) {
-  const cmd = parent.command("search [query]").description("Search and filter employees").option("--supervisor <name>", 'Filter by supervisor name (use "me" for current user)').option("--department <name>", "Filter by department").option("--location <name>", "Filter by location").option("--division <name>", "Filter by division").option("--with-photos", "Include each result's signed photo URL and photoUploaded flag");
+  const cmd = parent.command("search").description("Search and filter employees").argument("[query]", "Name fragment to search for", text).option("--supervisor <name>", 'Filter by supervisor name (use "me" for current user)', text).option("--department <name>", "Filter by department", text).option("--location <name>", "Filter by location", text).option("--division <name>", "Filter by division", text).option("--with-photos", "Include each result's signed photo URL and photoUploaded flag");
   examples(cmd, [
     "john",
     "--supervisor me",
@@ -657,11 +702,11 @@ function registerEmployeeCommands(program) {
 // src/commands/file/get.ts
 import { writeFileSync as writeFileSync3 } from "fs";
 function get2(parent) {
-  const cmd = parent.command("get <fileId>").description("Download a company file").requiredOption("--output <path>", "File path to save to");
+  const cmd = parent.command("get").description("Download a company file").argument("<fileId>", "File ID", positiveInt).requiredOption("--output <path>", "File path to save to", text);
   examples(cmd, ["42 --output ./handbook.pdf"]);
   cmd.action(async (fileId, opts) => {
     const client = getClient();
-    const buffer = await client.files.get({ fileId });
+    const buffer = await client.files.get({ fileId: String(fileId) });
     writeFileSync3(opts.output, buffer);
     output({ saved: true, path: opts.output, size: buffer.length });
   });
@@ -745,59 +790,43 @@ function registerMetaCommands(program) {
 
 // src/commands/timeoff/balance.ts
 function balance(parent) {
-  const cmd = parent.command("balance [employeeId]").description("Estimate time off balance (defaults to current user)").option("--date <date>", "Future date to estimate balance for (YYYY-MM-DD)");
+  const cmd = parent.command("balance").description("Estimate time off balance (defaults to current user)").argument("[employeeId]", "Employee ID (0 or omitted = current user)", nonNegativeInt).option("--date <date>", "Future date to estimate balance for (YYYY-MM-DD)", date);
   examples(cmd, ["", "123", ["--date 2026-06-30", "balance at a future date"]]);
   cmd.action(async (employeeId, opts) => {
     const client = getClient();
-    const id = await resolveEmployeeId(client, employeeId);
+    const id = await resolveEmployeeId(client, employeeId !== void 0 ? String(employeeId) : void 0);
     const result = await client.timeOff.getBalance({ employeeId: id, date: opts.date });
     output(transformTimeOffBalances(result));
   });
 }
 
 // src/commands/timeoff/create.ts
-import { InvalidArgumentError as InvalidArgumentError4, Option as Option4 } from "commander";
+import { InvalidArgumentError as InvalidArgumentError5, Option as Option4 } from "commander";
+import { z } from "zod";
 
 // src/utils/timeoff-dates.ts
-import { InvalidArgumentError as InvalidArgumentError3 } from "commander";
+import { InvalidArgumentError as InvalidArgumentError4 } from "commander";
 var WEEKDAY_NAMES = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
 var YMD = /^\d{4}-\d{2}-\d{2}$/;
-function parseDatesJson(raw) {
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch {
-    throw new InvalidArgumentError3(
-      `--dates is not valid JSON. Expected an array like '[{"ymd":"2026-03-21","amount":0.5}]'.`
-    );
-  }
-  const isEntry = (d) => typeof d === "object" && d !== null && typeof d.ymd === "string" && YMD.test(d.ymd) && typeof d.amount === "number" && Number.isFinite(d.amount) && d.amount >= 0;
-  if (!Array.isArray(parsed) || parsed.length === 0 || !parsed.every(isEntry)) {
-    throw new InvalidArgumentError3(
-      '--dates must be a non-empty JSON array of {"ymd":"YYYY-MM-DD","amount":<non-negative number>} objects.'
-    );
-  }
-  return parsed.map((d) => ({ ymd: d.ymd, amount: d.amount }));
-}
 function parseYmd(value, label) {
   if (!YMD.test(value)) {
-    throw new InvalidArgumentError3(`${label} must be a YYYY-MM-DD date, got "${value}".`);
+    throw new InvalidArgumentError4(`${label} must be a YYYY-MM-DD date, got "${value}".`);
   }
-  const date = /* @__PURE__ */ new Date(`${value}T00:00:00Z`);
-  if (Number.isNaN(date.getTime())) {
-    throw new InvalidArgumentError3(`${label} is not a valid date: "${value}".`);
+  const date2 = /* @__PURE__ */ new Date(`${value}T00:00:00Z`);
+  if (Number.isNaN(date2.getTime())) {
+    throw new InvalidArgumentError4(`${label} is not a valid date: "${value}".`);
   }
-  return date;
+  return date2;
 }
-function toYmd(date) {
-  return date.toISOString().slice(0, 10);
+function toYmd(date2) {
+  return date2.toISOString().slice(0, 10);
 }
 function buildTimeOffDates(params) {
   const { start, end, units, defaultHours, holidays = [] } = params;
   const startDate = parseYmd(start, "--start-date");
   const endDate = parseYmd(end, "--end-date");
   if (endDate < startDate) {
-    throw new InvalidArgumentError3(`--end-date ${end} is before --start-date ${start}.`);
+    throw new InvalidArgumentError4(`--end-date ${end} is before --start-date ${start}.`);
   }
   const hoursByName = new Map(defaultHours.map((entry) => [entry.name, Number(entry.amount)]));
   const fallbackHours = hoursByName.get("default") ?? 8;
@@ -813,12 +842,31 @@ function buildTimeOffDates(params) {
 }
 
 // src/commands/timeoff/create.ts
+var datesSchema = z.array(
+  z.object({
+    // Reuse the shared `date` validator so an impossible calendar date (e.g. 2026-02-30)
+    // is rejected inside --dates JSON exactly as it is for --start-date/--end-date.
+    ymd: z.string().refine(
+      (v) => {
+        try {
+          date(v);
+          return true;
+        } catch {
+          return false;
+        }
+      },
+      { message: "must be a real YYYY-MM-DD date" }
+    ),
+    amount: z.number().finite().nonnegative()
+  })
+).min(1, "must be a non-empty array");
 function create(parent) {
-  const cmd = parent.command("create [employeeId]").description("Create a time off request (defaults to current user)").requiredOption("--start-date <date>", "Start date (YYYY-MM-DD)").requiredOption("--end-date <date>", "End date (YYYY-MM-DD)").requiredOption("--type-id <id>", 'Time off type ID (use "timeoff types" to find IDs)', positiveInt).addOption(
+  const cmd = parent.command("create").description("Create a time off request (defaults to current user)").argument("[employeeId]", "Employee ID (0 or omitted = current user)", nonNegativeInt).requiredOption("--start-date <date>", "Start date (YYYY-MM-DD)", date).requiredOption("--end-date <date>", "End date (YYYY-MM-DD)", date).requiredOption("--type-id <id>", 'Time off type ID (use "timeoff types" to find IDs)', positiveInt).addOption(
     new Option4("--status <status>", "Request status").choices(["requested", "approved"]).default("requested")
   ).option(
     "--dates <json>",
-    `Per-day amounts as JSON array, e.g. '[{"ymd":"2026-03-21","amount":0.5}]' for a half day. When omitted, generated automatically: 1 day (or the weekday's working hours) per working day, 0 on weekends and company holidays`
+    `Per-day amounts as JSON array, e.g. '[{"ymd":"2026-03-21","amount":0.5}]' for a half day. When omitted, generated automatically: 1 day (or the weekday's working hours) per working day, 0 on weekends and company holidays`,
+    jsonShape(datesSchema)
   );
   textOrFileOption(cmd, "note", { description: "Note to include with the request" });
   examples(cmd, [
@@ -835,11 +883,11 @@ function create(parent) {
   cmd.action(
     async (employeeId, opts) => {
       const client = getClient();
-      const id = await resolveEmployeeId(client, employeeId);
+      const id = await resolveEmployeeId(client, employeeId !== void 0 ? String(employeeId) : void 0);
       const note = resolveTextOrFile(opts, "note", { required: false });
       let dates;
       if (opts.dates) {
-        dates = parseDatesJson(opts.dates);
+        dates = opts.dates;
       } else {
         const [types2, whosOut2] = await Promise.all([
           getTimeOffTypes(client),
@@ -847,7 +895,7 @@ function create(parent) {
         ]);
         const type = types2.timeOffTypes.find((t) => Number(t.id) === opts.typeId);
         if (!type) {
-          throw new InvalidArgumentError4(`Unknown time off type ID ${opts.typeId}. Run "timeoff types" to list IDs.`);
+          throw new InvalidArgumentError5(`Unknown time off type ID ${opts.typeId}. Run "timeoff types" to list IDs.`);
         }
         const holidays = whosOut2.filter((e) => e.type === "holiday").map((e) => ({ start: e.start, end: e.end }));
         dates = buildTimeOffDates({
@@ -860,7 +908,7 @@ function create(parent) {
       }
       const total = dates.reduce((sum, d) => sum + d.amount, 0);
       if (total <= 0) {
-        throw new InvalidArgumentError4(
+        throw new InvalidArgumentError5(
           opts.dates ? "The per-day amounts in --dates sum to 0; a request must claim more than 0 days/hours." : "The requested range contains no working days (weekends/company holidays only). Adjust the dates or pass --dates explicitly."
         );
       }
@@ -884,7 +932,7 @@ function create(parent) {
 // src/commands/timeoff/requests.ts
 import { Option as Option5 } from "commander";
 function requests(parent) {
-  const cmd = parent.command("requests").description("Get time off requests (defaults to current user)").option("--request-id <id>", "Specific request ID", positiveInt).addOption(new Option5("--action <action>", "Access level filter").choices(["view", "approve"])).option("--employee-id <id>", "Filter by employee ID").option("--all", "Show all visible requests instead of just current user").option("--start-date <date>", "Start date (YYYY-MM-DD)").option("--end-date <date>", "End date (YYYY-MM-DD)").addOption(
+  const cmd = parent.command("requests").description("Get time off requests (defaults to current user)").option("--request-id <id>", "Specific request ID", positiveInt).addOption(new Option5("--action <action>", "Access level filter").choices(["view", "approve"])).option("--employee-id <id>", "Filter by employee ID (0 = current user)", nonNegativeInt).option("--all", "Show all visible requests instead of just current user").option("--start-date <date>", "Start date (YYYY-MM-DD)", date).option("--end-date <date>", "End date (YYYY-MM-DD)", date).addOption(
     new Option5("--status <status>", "Filter by request status").choices([
       "approved",
       "denied",
@@ -892,7 +940,7 @@ function requests(parent) {
       "requested",
       "canceled"
     ])
-  ).option("--type-id <typeId>", "Filter by time off type ID");
+  ).option("--type-id <typeId>", "Filter by time off type ID", positiveInt);
   examples(cmd, [
     "",
     "--status requested",
@@ -905,7 +953,7 @@ function requests(parent) {
       const start = opts.startDate ?? `${year}-01-01`;
       const end = opts.endDate ?? `${year}-12-31`;
       const client = getClient();
-      let employeeId = opts.employeeId;
+      let employeeId = opts.employeeId !== void 0 ? String(opts.employeeId) : void 0;
       if (!employeeId && !opts.all) {
         employeeId = await resolveEmployeeId(client);
       }
@@ -916,7 +964,7 @@ function requests(parent) {
         start,
         end,
         status: opts.status,
-        type: opts.typeId
+        type: opts.typeId !== void 0 ? String(opts.typeId) : void 0
       });
       output(transformTimeOffRequests(result));
     }
@@ -937,7 +985,7 @@ function types(parent) {
 // src/commands/timeoff/update-status.ts
 import { Option as Option6 } from "commander";
 function updateStatus(parent) {
-  const cmd = parent.command("update-status <requestId>").description("Update time off request status (approve, deny, cancel)").addOption(
+  const cmd = parent.command("update-status").description("Update time off request status (approve, deny, cancel)").argument("<requestId>", "Time off request ID", positiveInt).addOption(
     new Option6("--status <status>", "New status").choices(["approved", "denied", "canceled"]).makeOptionMandatory()
   );
   textOrFileOption(cmd, "note", { description: "Note to attach to the status change" });
@@ -951,7 +999,7 @@ function updateStatus(parent) {
       const client = getClient();
       const note = resolveTextOrFile(opts, "note", { required: false });
       const result = await client.timeOff.updateRequestStatus({
-        requestId,
+        requestId: String(requestId),
         status: opts.status,
         note
       });
@@ -962,7 +1010,7 @@ function updateStatus(parent) {
 
 // src/commands/timeoff/whos-out.ts
 function whosOut(parent) {
-  const cmd = parent.command("whos-out").description("View who's out \u2014 upcoming time off and holidays").option("--start-date <date>", "Start date (YYYY-MM-DD, defaults to today)").option("--end-date <date>", "End date (YYYY-MM-DD, defaults to today)");
+  const cmd = parent.command("whos-out").description("View who's out \u2014 upcoming time off and holidays").option("--start-date <date>", "Start date (YYYY-MM-DD, defaults to today)", date).option("--end-date <date>", "End date (YYYY-MM-DD, defaults to today)", date);
   examples(cmd, ["", ["--start-date 2026-03-20 --end-date 2026-04-03", "two-week window"]]);
   cmd.action(async (opts) => {
     const client = getClient();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bamboohr-cli",
-  "version": "1.0.21",
+  "version": "1.0.22-g942e3c7.1",
   "publish": true,
   "type": "module",
   "main": "dist/index.js",
@@ -12,7 +12,8 @@
   ],
   "dependencies": {
     "commander": "^13.1.0",
-    "bamboohr-client": "1.0.24"
+    "zod": "^3.25.67",
+    "bamboohr-client": "1.0.24-g942e3c7.1"
   },
   "devDependencies": {
     "@types/node": "24.10.4",
@@ -32,8 +33,8 @@
   "scripts": {
     "build": "tsup",
     "dev": "tsx src/index.ts",
-    "lint": "eslint src",
-    "lint:fix": "eslint src --fix",
+    "lint": "eslint src tests",
+    "lint:fix": "eslint src tests --fix",
     "test": "vitest run",
     "test:integration": "vitest run --config vitest.integration.config.ts"
   }