dabke 0.82.0 → 0.84.0

package/dist/cpsat/rules/min-rest-between-shifts.js

@@ -1,159 +1,169 @@
 import * as z from "zod";
+import { schedulingDay } from "../../types.js";
+import { defineRuleDescriptor } from "../rule-descriptor.js";
 import { normalizeEndMinutes, priorityToPenalty, timeOfDayToMinutes } from "../utils.js";
 import { PrioritySchema, entityScope, parseEntityScope, resolveMembersFromScope, ruleGroup, } from "./scope.types.js";
-const MinRestBetweenShiftsSchema = z
+import { assignmentVar } from "./variables.js";
+import { hardConstraint, reportValidation, softConstraint } from "./artifacts.js";
+import { canAssignMemberToPattern, isPatternAvailableOnDay } from "./pattern-eligibility.js";
+export const MinRestBetweenShiftsSchema = z
     .object({
     hours: z.number().min(0),
     priority: PrioritySchema,
 })
     .and(entityScope(["members", "roles", "skills"]));
 /**
- * Enforces a minimum rest period between any two shifts a person works.
+ * Low-level descriptor for the `min-rest-between-shifts` rule.
  *
- * @param config - See {@link MinRestBetweenShiftsConfig}
- * @example
- * ```ts
- * createMinRestBetweenShiftsRule({ hours: 10, priority: "MANDATORY" });
- * ```
+ * @category Rules
  */
-export function createMinRestBetweenShiftsRule(config) {
-    const parsed = MinRestBetweenShiftsSchema.parse(config);
-    const scope = parseEntityScope(parsed);
-    const { hours, priority } = parsed;
-    const minMinutes = hours * 60;
-    const group = ruleGroup(`min-rest-between-shifts:${hours}`, `Min ${hours}h rest between shifts`, scope);
-    return {
-        compile(b) {
-            const members = resolveMembersFromScope(scope, b.members);
-            for (const emp of members) {
-                for (let i = 0; i < b.days.length; i++) {
-                    const day1 = b.days[i];
-                    if (!day1)
+export const minRestBetweenShiftsRuleDescriptor = defineRuleDescriptor({
+    name: "min-rest-between-shifts",
+    schema: MinRestBetweenShiftsSchema,
+    compile(config, ctx) {
+        const scope = parseEntityScope(config);
+        const { hours, priority } = config;
+        const minMinutes = hours * 60;
+        const group = ruleGroup(`min-rest-between-shifts:${hours}`, `Min ${hours}h rest between shifts`, scope);
+        const members = resolveMembersFromScope(scope, [...ctx.members]);
+        const artifacts = members.flatMap((member) => {
+            const memberArtifacts = [];
+            for (let dayIndex = 0; dayIndex < ctx.days.length; dayIndex++) {
+                const day1 = ctx.days[dayIndex];
+                if (!day1)
+                    continue;
+                const checkDays = [day1];
+                const nextDay = ctx.days[dayIndex + 1];
+                if (nextDay)
+                    checkDays.push(nextDay);
+                for (const pattern1 of ctx.shiftPatterns) {
+                    if (!canAssignMemberToPattern(member, pattern1) ||
+                        !isPatternAvailableOnDay(pattern1, day1)) {
                         continue;
-                    const checkDays = [day1];
-                    const nextDay = b.days[i + 1];
-                    if (nextDay)
-                        checkDays.push(nextDay);
-                    for (const pattern1 of b.shiftPatterns) {
-                        if (!b.canAssign(emp, pattern1))
-                            continue;
-                        if (!b.patternAvailableOnDay(pattern1, day1))
-                            continue;
-                        const end1 = b.endMinutes(pattern1, day1);
-                        for (const day2 of checkDays) {
-                            if (!day2)
+                    }
+                    const end1 = patternEndMinutes(pattern1);
+                    for (const day2 of checkDays) {
+                        for (const pattern2 of ctx.shiftPatterns) {
+                            if (!canAssignMemberToPattern(member, pattern2) ||
+                                !isPatternAvailableOnDay(pattern2, day2) ||
+                                (day1.iso === day2.iso && pattern1.id === pattern2.id)) {
                                 continue;
-                            for (const pattern2 of b.shiftPatterns) {
-                                if (!b.canAssign(emp, pattern2))
-                                    continue;
-                                if (!b.patternAvailableOnDay(pattern2, day2))
-                                    continue;
-                                if (day1 === day2 && pattern1.id === pattern2.id)
-                                    continue;
-                                const start2 = b.startMinutes(pattern2, day2);
-                                const gap = start2 - end1;
-                                if (gap >= 0 && gap < minMinutes) {
-                                    const var1 = b.assignment(emp.id, pattern1.id, day1);
-                                    const var2 = b.assignment(emp.id, pattern2.id, day2);
-                                    if (priority === "MANDATORY") {
-                                        b.addLinear([
-                                            { var: var1, coeff: 1 },
-                                            { var: var2, coeff: 1 },
-                                        ], "<=", 1);
-                                    }
-                                    else {
-                                        const conflictVar = b.boolVar(`rest_conflict_${emp.id}_${pattern1.id}_${day1}_${pattern2.id}_${day2}`);
-                                        b.addLinear([
-                                            { var: var1, coeff: 1 },
-                                            { var: var2, coeff: 1 },
-                                            { var: conflictVar, coeff: -1 },
-                                        ], "<=", 1);
-                                        b.addLinear([
-                                            { var: conflictVar, coeff: 1 },
-                                            { var: var1, coeff: -1 },
-                                        ], "<=", 0);
-                                        b.addLinear([
-                                            { var: conflictVar, coeff: 1 },
-                                            { var: var2, coeff: -1 },
-                                        ], "<=", 0);
-                                        b.addPenalty(conflictVar, priorityToPenalty(priority));
-                                    }
-                                }
+                            }
+                            const start2 = dayGapMinutes(day1, day2) + timeOfDayToMinutes(pattern2.startTime);
+                            const gap = start2 - end1;
+                            if (gap < 0 || gap >= minMinutes)
+                                continue;
+                            const description = `${member.id} needs ${hours}h rest between ${pattern1.id} on ${day1.iso} and ${pattern2.id} on ${day2.iso}`;
+                            const context = { memberIds: [member.id], days: [day1.iso, day2.iso] };
+                            const constraintId = `min-rest-between-shifts:${member.id}:${pattern1.id}:${day1.iso}:${pattern2.id}:${day2.iso}`;
+                            const terms = [
+                                { var: assignmentVar(member.id, pattern1.id, day1.iso), coeff: 1 },
+                                { var: assignmentVar(member.id, pattern2.id, day2.iso), coeff: 1 },
+                            ];
+                            if (priority === "MANDATORY") {
+                                memberArtifacts.push(hardConstraint({
+                                    group,
+                                    description,
+                                    context,
+                                    validation: reportValidation(constraintId),
+                                    terms,
+                                    comparator: "<=",
+                                    targetValue: 1,
+                                }));
+                            }
+                            else {
+                                memberArtifacts.push(softConstraint({
+                                    group,
+                                    description,
+                                    context,
+                                    validation: reportValidation(),
+                                    terms,
+                                    comparator: "<=",
+                                    targetValue: 1,
+                                    penalty: priorityToPenalty(priority),
+                                    constraintId,
+                                }));
                             }
                         }
                     }
                 }
             }
-        },
-        validate(assignments, reporter, context) {
-            if (priority === "MANDATORY")
-                return;
-            const members = resolveMembersFromScope(scope, context.members);
-            if (members.length === 0)
-                return;
-            const memberIds = new Set(members.map((m) => m.id));
-            // Group assignments by member, sort by day then start time
-            const byMember = new Map();
-            for (const a of assignments) {
-                if (!memberIds.has(a.memberId))
-                    continue;
-                const list = byMember.get(a.memberId) ?? [];
-                list.push(a);
-                byMember.set(a.memberId, list);
-            }
-            for (const [memberId, memberAssignments] of byMember) {
-                const sorted = memberAssignments.toSorted((a, b) => {
-                    if (a.day !== b.day)
-                        return a.day < b.day ? -1 : 1;
-                    return timeOfDayToMinutes(a.startTime) - timeOfDayToMinutes(b.startTime);
-                });
-                let violated = false;
-                for (let i = 0; i < sorted.length - 1; i++) {
-                    const current = sorted[i];
-                    const next = sorted[i + 1];
-                    const currentEndMin = timeOfDayToMinutes(current.endTime);
-                    const normalizedEnd = normalizeEndMinutes(timeOfDayToMinutes(current.startTime), currentEndMin);
-                    const nextStartMin = timeOfDayToMinutes(next.startTime);
-                    // Calculate gap considering day boundaries
-                    let gap;
-                    if (current.day === next.day) {
-                        gap = nextStartMin - normalizedEnd;
-                    }
-                    else {
-                        // Different days: account for the day boundary
-                        const dayDiff = daysBetween(current.day, next.day);
-                        gap = dayDiff * 24 * 60 - normalizedEnd + nextStartMin;
-                    }
-                    if (gap >= 0 && gap < minMinutes) {
-                        reporter.reportRuleViolation({
-                            rule: "min-rest-between-shifts",
-                            message: `${memberId} has ${Math.round((gap / 60) * 10) / 10}h rest between shifts on ${current.day} and ${next.day}, need ${hours}h`,
-                            context: { memberIds: [memberId], days: [current.day, next.day] },
-                            shortfall: minMinutes - gap,
-                            group,
-                        });
-                        violated = true;
-                    }
-                }
-                if (!violated && sorted.length > 1) {
-                    reporter.reportRulePassed({
-                        rule: "min-rest-between-shifts",
-                        message: `${memberId} has ${hours}h+ rest between all shifts`,
-                        context: {
-                            memberIds: [memberId],
-                            days: [...new Set(sorted.map((a) => a.day))],
-                        },
-                        group,
-                    });
-                }
-            }
-        },
-    };
+            return memberArtifacts;
+        });
+        const validatorArtifacts = priority === "MANDATORY"
+            ? []
+            : [
+                {
+                    kind: "post-solve-feedback",
+                    run(assignments, reporter, validationContext) {
+                        const validatorMembers = resolveMembersFromScope(scope, [
+                            ...validationContext.members,
+                        ]);
+                        if (validatorMembers.length === 0)
+                            return;
+                        const dayLookup = new Map(validationContext.days.map((day) => [day.iso, day]));
+                        const memberIds = new Set(validatorMembers.map((member) => member.id));
+                        const byMember = new Map();
+                        for (const assignment of assignments) {
+                            if (!memberIds.has(assignment.memberId))
+                                continue;
+                            const list = byMember.get(assignment.memberId) ?? [];
+                            list.push(assignment);
+                            byMember.set(assignment.memberId, list);
+                        }
+                        for (const [memberId, memberAssignments] of byMember) {
+                            const sorted = [...memberAssignments].toSorted((left, right) => {
+                                if (left.day !== right.day)
+                                    return left.day < right.day ? -1 : 1;
+                                return timeOfDayToMinutes(left.startTime) - timeOfDayToMinutes(right.startTime);
+                            });
+                            let violated = false;
+                            for (let index = 0; index < sorted.length - 1; index++) {
+                                const current = sorted[index];
+                                const next = sorted[index + 1];
+                                const currentEnd = normalizeEndMinutes(timeOfDayToMinutes(current.startTime), timeOfDayToMinutes(current.endTime));
+                                const nextStart = timeOfDayToMinutes(next.startTime);
+                                const gap = current.day === next.day
+                                    ? nextStart - currentEnd
+                                    : daysBetween(current.day, next.day, dayLookup) * 24 * 60 -
+                                        currentEnd +
+                                        nextStart;
+                                if (gap < 0 || gap >= minMinutes)
+                                    continue;
+                                violated = true;
+                            }
+                            if (!violated && sorted.length > 1) {
+                                reporter.reportRulePassed({
+                                    rule: "min-rest-between-shifts",
+                                    message: `${memberId} has ${hours}h+ rest between all shifts`,
+                                    context: {
+                                        memberIds: [memberId],
+                                        days: [...new Set(sorted.map((assignment) => assignment.day))],
+                                    },
+                                    group,
+                                });
+                            }
+                        }
+                    },
+                },
+            ];
+        return {
+            rule: "min-rest-between-shifts",
+            artifacts: [...artifacts, ...validatorArtifacts],
+        };
+    },
+});
+function patternEndMinutes(pattern) {
+    return normalizeEndMinutes(timeOfDayToMinutes(pattern.startTime), timeOfDayToMinutes(pattern.endTime));
+}
+function dayGapMinutes(day1, day2) {
+    return (day2.epochDay - day1.epochDay) * 24 * 60;
 }
-/** Compute day difference from YYYY-MM-DD strings. */
-function daysBetween(day1, day2) {
-    const d1 = new Date(`${day1}T00:00:00Z`);
-    const d2 = new Date(`${day2}T00:00:00Z`);
-    return Math.round((d2.getTime() - d1.getTime()) / (24 * 60 * 60 * 1000));
+function daysBetween(day1, day2, lookup) {
+    const left = lookup.get(day1);
+    const right = lookup.get(day2);
+    if (left && right)
+        return right.epochDay - left.epochDay;
+    return schedulingDay(day2).epochDay - schedulingDay(day1).epochDay;
 }
 //# sourceMappingURL=min-rest-between-shifts.js.map

package/dist/cpsat/rules/min-rest-between-shifts.js.map

@@ -1 +1 @@
-{"version":3,"file":"min-rest-between-shifts.js","sourceRoot":"","sources":["../../../src/cpsat/rules/min-rest-between-shifts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"min-rest-between-shifts.js","sourceRoot":"","sources":["../../../src/cpsat/rules/min-rest-between-shifts.ts"],"names":[],"mappings":"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"}

package/dist/cpsat/rules/minimize-cost.d.ts

@@ -1,23 +1,7 @@
 import type * as z from "zod";
-import type { CompilationRule } from "../model-builder.js";
 declare const MinimizeCostSchema: z.ZodIntersection<z.ZodType<import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">, unknown, z.core.$ZodTypeInternals<import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">, unknown>>, z.ZodType<import("./scope.types.js").OptionalTimeScopeType<"dateRange" | "dayOfWeek" | "specificDates" | "recurring">, unknown, z.core.$ZodTypeInternals<import("./scope.types.js").OptionalTimeScopeType<"dateRange" | "dayOfWeek" | "specificDates" | "recurring">, unknown>>>;
-/** Configuration for {@link createMinimizeCostRule}. */
+/** Configuration for {@link minimizeCostRuleDescriptor}. */
 export type MinimizeCostConfig = z.infer<typeof MinimizeCostSchema>;
-/**
- * Creates the minimize-cost rule.
- *
- * **Hourly members:** adds a penalty proportional to
- * `hourlyRate * shiftDurationMinutes / 60` for each assignment.
- *
- * **Salaried members:** zero marginal cost up to their contracted hours.
- * A boolean variable tracks whether the member has any assignment in a
- * given week. When active, their full weekly salary (`annual / 52`) is
- * added as a penalty. This causes the solver to load work onto salaried
- * members (who are "free" once activated) before hourly workers.
- *
- * Computes a normalization factor and stores it on the model builder's
- * `costContext` so modifier rules can use the same scale.
- */
-export declare function createMinimizeCostRule(config: MinimizeCostConfig): CompilationRule;
+export declare const minimizeCostRuleDescriptor: import("../rule-descriptor.js").RuleDescriptor<"minimize-cost", import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills"> & import("./scope.types.js").OptionalTimeScopeType<"dateRange" | "dayOfWeek" | "specificDates" | "recurring">>;
 export {};
 //# sourceMappingURL=minimize-cost.d.ts.map

package/dist/cpsat/rules/minimize-cost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"minimize-cost.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/minimize-cost.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,CAAC,MAAM,KAAK,CAAC;AAE9B,OAAO,KAAK,EAAE,eAAe,EAAoB,MAAM,qBAAqB,CAAC;AAe7E,QAAA,MAAM,kBAAkB,mfAEvB,CAAC;AAEF,wDAAwD;AACxD,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEpE;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,GAAG,eAAe,CAuLlF"}
+{"version":3,"file":"minimize-cost.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/minimize-cost.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,CAAC,MAAM,KAAK,CAAC;AAiB9B,QAAA,MAAM,kBAAkB,mfAEvB,CAAC;AAEF,4DAA4D;AAC5D,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEpE,eAAO,MAAM,0BAA0B,2PAyLrC,CAAC"}