@unisonlabs/sixminute-admin 0.1.1232-next → 0.1.1234-next

package/dist/sixminute-admin.mjs

@@ -21,7 +21,7 @@ import { homedir } from "node:os";
 import { fileURLToPath } from "node:url";
 
 // tools/admin/src/build-info.ts
-var BUILT = { version: "0.1.1232-next", commit: "2bf7a3249e979dfadad0ba2f985d1dcf875dd3aa", surface: "4326872fec11ff43" };
+var BUILT = { version: "0.1.1234-next", commit: "87eb8615276920192e16568312a53f1302621d8e", surface: "daa5005ac9ba21da" };
 
 // tools/admin/src/run.ts
 import { rmSync as rmSync3 } from "node:fs";
@@ -4356,6 +4356,39 @@ var ActivityTypeSchema = exports_external.object({
 });
 var JudgmentPipelineSchema = exports_external.enum(["standard", "jev"]);
 
+// packages/contracts/src/grid.ts
+var UNIT_MINUTES = [3, 5, 6, 10, 12, 15];
+var UNIT_MIN = UNIT_MINUTES[0];
+var UNIT_MAX = UNIT_MINUTES[UNIT_MINUTES.length - 1];
+var UnitMinutesSchema = exports_external.number().int().min(UNIT_MIN).max(UNIT_MAX).refine((minutes) => !Number.isInteger(minutes) || minutes < UNIT_MIN || minutes > UNIT_MAX || UNIT_MINUTES.includes(minutes), { message: `an interval is one of ${UNIT_MINUTES.join(", ")} minutes, a divisor of the hour` });
+var WALL_CLOCKS = new Map;
+function wallClockFormat(zone) {
+  const kept = WALL_CLOCKS.get(zone);
+  if (kept !== undefined)
+    return kept;
+  const format = new Intl.DateTimeFormat("en-US", {
+    timeZone: zone,
+    hourCycle: "h23",
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit"
+  });
+  WALL_CLOCKS.set(zone, format);
+  return format;
+}
+function wallClock(ms, zone) {
+  const parts = wallClockFormat(zone).formatToParts(new Date(ms));
+  const part = (type) => Number(parts.find((p) => p.type === type).value);
+  const wholeSeconds = Date.UTC(part("year"), part("month") - 1, part("day"), part("hour"), part("minute"), part("second"));
+  return wholeSeconds + (ms - Math.floor(ms / 1000) * 1000);
+}
+function dayOf(iso, zone) {
+  return new Date(wallClock(Date.parse(iso), zone)).toISOString().slice(0, 10);
+}
+
 // packages/contracts/src/entry.ts
 var EntryStatusSchema = exports_external.enum(["draft", "released"]);
 var AssignmentSchema = exports_external.enum(["model", "user", "none"]);
@@ -4370,6 +4403,12 @@ var NarrativeSchema = exports_external.string().transform((s) => s.trim()).super
     });
   }
 });
+var EntryPartSchema = exports_external.object({
+  t_start: TimestampSchema,
+  t_end: TimestampSchema
+}).refine((part) => part.t_start < part.t_end, { path: ["t_end"], message: "a part ends after it starts" });
+var OVERRIDE_MAX_SECONDS = 86400;
+var OverrideSecondsSchema = exports_external.number().int().positive().max(OVERRIDE_MAX_SECONDS).refine((seconds) => seconds % 60 === 0, { message: "an override is a whole number of minutes" });
 var EntryContentFields = exports_external.object({
   id: EntryIdSchema,
   day: LocalDaySchema,
@@ -4377,6 +4416,7 @@ var EntryContentFields = exports_external.object({
   timekeeper_id: exports_external.string().min(1),
   t_start: TimestampSchema,
   t_end: TimestampSchema,
+  parts: exports_external.array(EntryPartSchema).min(1).optional(),
   narrative: NarrativeSchema,
   matter_id: MatterIdSchema.nullable().default(null),
   attributes: EntryAttributesSchema.default({}),
@@ -4398,10 +4438,13 @@ var AsJudgedSchema = EntryContentFields.omit({
 });
 var AS_JUDGED_FIELDS = Object.keys(AsJudgedSchema.shape);
 var EntryFields = EntryContentFields.extend({
-  edited_at: TimestampSchema.nullable().default(null)
+  edited_at: TimestampSchema.nullable().default(null),
+  override_seconds: OverrideSecondsSchema.nullable().optional()
 });
 var JudgedEntryFields = EntryFields.extend({
-  as_judged: AsJudgedSchema.nullable().default(null)
+  as_judged: AsJudgedSchema.superRefine((copy, ctx) => {
+    refineParts(copy, ctx);
+  }).nullable().default(null)
 });
 function refineEntry(entry, ctx) {
   if (entry.status !== "draft" && entry.released_at === null) {
@@ -4418,9 +4461,58 @@ function refineEntry(entry, ctx) {
       message: "the block ends after it starts"
     });
   }
+  refineParts(entry, ctx);
 }
-var EntrySchema = EntryFields.superRefine(refineEntry);
-var JudgedEntrySchema = JudgedEntryFields.superRefine(refineEntry);
+function refineParts(entry, ctx) {
+  const parts = entry.parts;
+  if (parts === undefined || parts.length === 0)
+    return;
+  parts.forEach((part, index) => {
+    const previous = parts[index - 1];
+    if (previous !== undefined && part.t_start <= previous.t_end) {
+      ctx.addIssue({
+        code: exports_external.ZodIssueCode.custom,
+        path: ["parts", index, "t_start"],
+        message: part.t_start === previous.t_end ? "parts that touch are one part: join them" : "the parts are in time order and do not overlap: this one starts before the one before it ends"
+      });
+    }
+  });
+  if (parts.length < 2)
+    return;
+  if (parts[0].t_start !== entry.t_start) {
+    ctx.addIssue({
+      code: exports_external.ZodIssueCode.custom,
+      path: ["t_start"],
+      message: "t_start is the first part's start"
+    });
+  }
+  if (parts[parts.length - 1].t_end !== entry.t_end) {
+    ctx.addIssue({
+      code: exports_external.ZodIssueCode.custom,
+      path: ["t_end"],
+      message: "t_end is the last part's end"
+    });
+  }
+  parts.forEach((part, index) => {
+    if (!partOnDay(part, entry.day, entry.time_zone)) {
+      ctx.addIssue({
+        code: exports_external.ZodIssueCode.custom,
+        path: ["parts", index],
+        message: `every part lies on the entry's day, ${entry.day} in ${entry.time_zone}, and never crosses midnight`
+      });
+    }
+  });
+}
+function settleEntry(entry, ctx) {
+  refineEntry(entry, ctx);
+  return {
+    ...entry,
+    parts: entry.parts !== undefined && entry.parts.length > 1 ? entry.parts : [{ t_start: entry.t_start, t_end: entry.t_end }],
+    override_seconds: entry.override_seconds ?? null
+  };
+}
+var EntrySchema = EntryFields.transform(settleEntry);
+var JudgedEntrySchema = JudgedEntryFields.transform(settleEntry);
 var RecordingFields = {
   idle_ratio: exports_external.number().min(0).max(1).default(0),
   observation_ids: exports_external.array(ObservationIdSchema).default([]),
@@ -4429,8 +4521,23 @@ var RecordingFields = {
   assigned_at: TimestampSchema.nullable().default(null),
   recording_id: RecordingIdSchema.nullable().default(null)
 };
-var RecordingEntrySchema = JudgedEntryFields.extend(RecordingFields).superRefine(refineEntry);
+var RecordingEntrySchema = JudgedEntryFields.extend(RecordingFields).transform(settleEntry);
 var RECORDING_ENTRY_FIELDS = Object.keys(RecordingFields);
+function partsOf(entry) {
+  const parts = entry.parts;
+  const block = [{ t_start: entry.t_start, t_end: entry.t_end }];
+  if (parts === undefined || parts.length === 0)
+    return block;
+  const bounded = Date.parse(parts[0].t_start) === Date.parse(entry.t_start) && Date.parse(parts[parts.length - 1].t_end) === Date.parse(entry.t_end);
+  return bounded ? parts : block;
+}
+function partOnDay(part, day, zone) {
+  try {
+    return dayOf(part.t_start, zone) === day && dayOf(new Date(Date.parse(part.t_end) - 1).toISOString(), zone) === day;
+  } catch {
+    return false;
+  }
+}
 
 // packages/contracts/src/connector.ts
 var ConnectorKindSchema = exports_external.enum(["urios", "legalsense", "partner", "fake"]);
@@ -4863,13 +4970,6 @@ var IntervalTextSchema = exports_external.object({
   entries: exports_external.array(IntervalTextEntrySchema).optional()
 });
 
-// packages/contracts/src/grid.ts
-var UNIT_MINUTES = [3, 5, 6, 10, 12, 15];
-var UNIT_MIN = UNIT_MINUTES[0];
-var UNIT_MAX = UNIT_MINUTES[UNIT_MINUTES.length - 1];
-var UnitMinutesSchema = exports_external.number().int().min(UNIT_MIN).max(UNIT_MAX).refine((minutes) => !Number.isInteger(minutes) || minutes < UNIT_MIN || minutes > UNIT_MAX || UNIT_MINUTES.includes(minutes), { message: `an interval is one of ${UNIT_MINUTES.join(", ")} minutes, a divisor of the hour` });
-var WALL_CLOCKS = new Map;
-
 // packages/contracts/src/api.ts
 var ProblemSchema = exports_external.object({
   type: exports_external.string().min(1),
@@ -5154,6 +5254,8 @@ var EntryPatchSchema = exports_external.object({
   matter_id: EntrySchema.innerType().shape.matter_id.optional(),
   t_start: TimestampSchema.optional(),
   t_end: TimestampSchema.optional(),
+  parts: exports_external.array(EntryPartSchema).min(1).optional(),
+  override_seconds: OverrideSecondsSchema.nullable().optional(),
   reason: exports_external.string().min(1).nullable().default(null)
 }).superRefine((patch, ctx) => {
   const hasStart = patch.t_start !== undefined;
@@ -5165,6 +5267,27 @@ var EntryPatchSchema = exports_external.object({
       message: "a block is a pair: send t_start and t_end together"
     });
   }
+  if (patch.parts !== undefined && (hasStart || hasEnd)) {
+    ctx.addIssue({
+      code: exports_external.ZodIssueCode.custom,
+      path: ["parts"],
+      message: "parts replace the block: send parts or t_start and t_end, not both"
+    });
+  }
+  if (patch.parts !== undefined && patch.override_seconds !== undefined) {
+    ctx.addIssue({
+      code: exports_external.ZodIssueCode.custom,
+      path: ["override_seconds"],
+      message: "a change to the parts clears the override: send parts or override_seconds, not both"
+    });
+  }
+  if ((hasStart || hasEnd) && patch.override_seconds !== undefined) {
+    ctx.addIssue({
+      code: exports_external.ZodIssueCode.custom,
+      path: ["override_seconds"],
+      message: "a move of the block clears the override: send t_start and t_end or override_seconds, not both"
+    });
+  }
 });
 var ConfirmedNarrativeSchema = EntrySchema.innerType().shape.narrative.refine((narrative) => narrative.length > 0, { message: "a confirmed narrative is not empty: this is the line the person read and approved" });
 var EntryHalfSchema = exports_external.object({
@@ -5173,10 +5296,18 @@ var EntryHalfSchema = exports_external.object({
   attributes: EntryAttributesSchema
 });
 var EntrySplitRequestSchema = exports_external.object({
-  at: TimestampSchema,
+  at: TimestampSchema.optional(),
+  leaving: exports_external.array(EntryPartSchema).min(1).optional(),
   first: EntryHalfSchema.optional(),
   second: EntryHalfSchema.optional()
 }).superRefine((body, ctx) => {
+  if (body.at === undefined === (body.leaving === undefined)) {
+    ctx.addIssue({
+      code: exports_external.ZodIssueCode.custom,
+      path: ["leaving"],
+      message: "a split names a line in `at` or the parts that leave in `leaving`, and exactly one of them"
+    });
+  }
   if (body.first === undefined !== (body.second === undefined)) {
     ctx.addIssue({
       code: exports_external.ZodIssueCode.custom,
@@ -5215,13 +5346,20 @@ var EntryBatchItemSchema = exports_external.object({
   entry: JudgedEntrySchema,
   intervals: exports_external.array(IntervalSchema).default([])
 }).superRefine((item, ctx) => {
-  const { t_start, t_end } = item.entry;
+  if (item.entry.override_seconds != null) {
+    ctx.addIssue({
+      code: exports_external.ZodIssueCode.custom,
+      path: ["entry", "override_seconds"],
+      message: "a batch row carries no override: a person sets one on the entry's PATCH"
+    });
+  }
+  const parts = partsOf(item.entry);
   item.intervals.forEach((interval, index) => {
-    if (interval.t_start < t_start || interval.t_end > t_end) {
+    if (!parts.some((part) => part.t_start <= interval.t_start && interval.t_end <= part.t_end)) {
       ctx.addIssue({
         code: exports_external.ZodIssueCode.custom,
         path: ["intervals", index],
-        message: `an interval lies inside its entry's block: this one covers ${interval.t_start} to ${interval.t_end}, and the block ${t_start} to ${t_end}`
+        message: `an interval lies inside one of its entry's parts: this one covers ${interval.t_start} to ${interval.t_end}, and the parts ${parts.map((part) => `${part.t_start} to ${part.t_end}`).join(", ")}`
       });
       return;
     }
@@ -5650,6 +5788,8 @@ var JudgedPairEntrySchema = exports_external.object({
   timekeeper_id: exports_external.string(),
   t_start: exports_external.string(),
   t_end: exports_external.string(),
+  parts: exports_external.array(exports_external.object({ t_start: exports_external.string(), t_end: exports_external.string() })).nullable().default(null),
+  override_seconds: exports_external.number().int().nullable().default(null),
   narrative: exports_external.string(),
   matter_id: exports_external.string().nullable(),
   attributes: exports_external.unknown(),
@@ -6264,9 +6404,29 @@ var LocalRecordingStopSchema = exports_external.object({
   seconds: exports_external.number().nonnegative()
 });
 var LocalAcceptedSchema = exports_external.object({ accepted: exports_external.literal(true) });
-var LocalProposeRangeSchema = exports_external.object({ from: TimestampSchema, to: TimestampSchema, matter_id: MatterIdSchema.optional() }).refine((range) => Date.parse(range.from) < Date.parse(range.to), {
-  path: ["to"],
-  message: "a range ends after it starts"
+var LocalProposeRangeSchema = exports_external.object({
+  from: TimestampSchema,
+  to: TimestampSchema,
+  matter_id: MatterIdSchema.optional(),
+  parts: exports_external.array(exports_external.object({ from: TimestampSchema, to: TimestampSchema })).min(1).optional()
+}).superRefine((range, ctx) => {
+  if (!(Date.parse(range.from) < Date.parse(range.to))) {
+    ctx.addIssue({ code: exports_external.ZodIssueCode.custom, path: ["to"], message: "a range ends after it starts" });
+  }
+  range.parts?.forEach((part, index) => {
+    const previous = range.parts[index - 1];
+    if (!(Date.parse(part.from) < Date.parse(part.to))) {
+      ctx.addIssue({ code: exports_external.ZodIssueCode.custom, path: ["parts", index, "to"], message: "a part ends after it starts" });
+    } else if (Date.parse(part.from) < Date.parse(range.from) || Date.parse(part.to) > Date.parse(range.to)) {
+      ctx.addIssue({ code: exports_external.ZodIssueCode.custom, path: ["parts", index], message: "a part lies inside its range" });
+    } else if (previous !== undefined && Date.parse(part.from) <= Date.parse(previous.to)) {
+      ctx.addIssue({
+        code: exports_external.ZodIssueCode.custom,
+        path: ["parts", index, "from"],
+        message: "the parts are in time order and neither touch nor overlap"
+      });
+    }
+  });
 });
 var LocalProposeRangesRequestSchema = exports_external.object({
   ranges: exports_external.array(LocalProposeRangeSchema).min(1).max(2)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unisonlabs/sixminute-admin",
-  "version": "0.1.1232-next",
+  "version": "0.1.1234-next",
   "description": "Sixminute operator tool: the admin commands of the Sixminute API, run with your own operator sign-in.",
   "license": "UNLICENSED",
   "repository": {