dabke 0.83.0 → 0.84.0

package/dist/cpsat/rules/min-days-of-week-per-period.js

@@ -0,0 +1,108 @@
+import * as z from "zod";
+import { DayOfWeekSchema } from "../../types.js";
+import { defineRuleDescriptor } from "../rule-descriptor.js";
+import { groupWeekChunks, priorityToPenalty, splitIntoMonths } from "../utils.js";
+import { PrioritySchema, entityScope, parseEntityScope, resolveMembersFromScope, ruleGroup, } from "./scope.types.js";
+import { assignmentVarsForDay } from "./assignment-terms.js";
+import { hasAnyAssignablePattern } from "./pattern-eligibility.js";
+import { assignedDayVariableName } from "./variables.js";
+import { hardConstraint, reportValidation, softConstraint } from "./artifacts.js";
+import { buildAssignedDayIndicator } from "./assigned-day.js";
+const PeriodSchema = z.discriminatedUnion("type", [
+    z.object({ type: z.literal("weeks"), value: z.number().int().min(1) }),
+    z.object({ type: z.literal("months"), value: z.number().int().min(1) }),
+]);
+const MinDaysOfWeekPerPeriodBase = z.object({
+    days: z.number().int().min(0),
+    dayOfWeek: z.array(DayOfWeekSchema).nonempty(),
+    period: PeriodSchema,
+    priority: PrioritySchema,
+});
+export const MinDaysOfWeekPerPeriodSchema = MinDaysOfWeekPerPeriodBase.and(entityScope(["members", "roles", "skills"]));
+export const minDaysOfWeekPerPeriodRuleDescriptor = defineRuleDescriptor({
+    name: "min-days-of-week-per-period",
+    schema: MinDaysOfWeekPerPeriodSchema,
+    compile(config, ctx) {
+        const entityScopeValue = parseEntityScope(config);
+        const { days, dayOfWeek, period, priority } = config;
+        const dowLabel = dayOfWeek.toSorted().join(",");
+        const periodLabel = `${period.value}${period.type === "weeks" ? "w" : "m"}`;
+        const group = ruleGroup(`min-days-of-week-per-period:${days}:${dowLabel}:${periodLabel}`, `Min ${days} ${dowLabel} per ${period.value} ${period.type}`, entityScopeValue);
+        const targetMembers = resolveMembersFromScope(entityScopeValue, [...ctx.members]);
+        const targetDows = new Set(dayOfWeek);
+        const chunks = period.type === "weeks"
+            ? groupWeekChunks([...ctx.days], period.value, ctx.weekStartsOn)
+            : splitIntoMonths([...ctx.days], period.value);
+        const artifacts = targetMembers.flatMap((member) => chunks.flatMap((chunkDays) => {
+            const chunkStart = chunkDays[0];
+            if (!chunkStart)
+                return [];
+            const matchingDays = chunkDays.filter((day) => targetDows.has(day.dayOfWeek));
+            if (matchingDays.length === 0)
+                return [];
+            const supportArtifacts = matchingDays.flatMap((day) => buildAssignedDayIndicator({
+                memberId: member.id,
+                day,
+                assignmentVars: assignmentVarsForDay(member, day, ctx.shiftPatterns),
+            }).artifacts);
+            const assignedDayVars = matchingDays
+                .filter((day) => assignmentVarsForDay(member, day, ctx.shiftPatterns).length > 0)
+                .map((day) => assignedDayVariableName(member.id, day.iso));
+            if (assignedDayVars.length === 0)
+                return supportArtifacts;
+            const description = `${member.id} min ${days} ${dowLabel} in period starting ${chunkStart.iso}`;
+            const context = { memberIds: [member.id], days: matchingDays.map((day) => day.iso) };
+            const constraintId = `min-days-of-week-per-period:${member.id}:${chunkStart.iso}`;
+            const terms = assignedDayVars.map((varName) => ({ var: varName, coeff: 1 }));
+            const finalArtifacts = priority === "MANDATORY"
+                ? [
+                    hardConstraint({
+                        group,
+                        description,
+                        context,
+                        validation: reportValidation(constraintId),
+                        terms,
+                        comparator: ">=",
+                        targetValue: days,
+                    }),
+                    {
+                        kind: "pre-solve-feedback",
+                        run(_preSolveContext, reporter) {
+                            const possibleDays = matchingDays.filter((day) => hasAnyAssignablePattern(member, day, ctx.shiftPatterns)).length;
+                            if (possibleDays >= days)
+                                return;
+                            reporter.reportRuleError({
+                                rule: "min-days-of-week-per-period",
+                                message: `${member.id} cannot reach ${days} ${dowLabel} assignments in the period starting ${chunkStart.iso}; only ${possibleDays} matching day${possibleDays === 1 ? " is" : "s are"} assignable.`,
+                                context,
+                                suggestions: [
+                                    `Reduce the ${dowLabel} minimum in this period`,
+                                    `Add more assignable ${dowLabel} shifts in the period starting ${chunkStart.iso}`,
+                                ],
+                                group,
+                            });
+                        },
+                    },
+                ]
+                : [
+                    softConstraint({
+                        group,
+                        description,
+                        context,
+                        validation: reportValidation(),
+                        terms,
+                        comparator: ">=",
+                        targetValue: days,
+                        penalty: priorityToPenalty(priority),
+                        constraintId,
+                    }),
+                ];
+            return supportArtifacts.concat(finalArtifacts);
+        }));
+        return {
+            rule: "min-days-of-week-per-period",
+            artifacts,
+        };
+    },
+});
+//# sourceMappingURL=min-days-of-week-per-period.js.map

package/dist/cpsat/rules/min-days-of-week-per-period.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"min-days-of-week-per-period.js","sourceRoot":"","sources":["../../../src/cpsat/rules/min-days-of-week-per-period.ts"],"names":[],"mappings":"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"}

package/dist/cpsat/rules/min-days-week.d.ts

@@ -1,34 +1,21 @@
 import * as z from "zod";
-import type { CompilationRule } from "../model-builder.js";
-declare const MinDaysWeekSchema: z.ZodIntersection<z.ZodObject<{
+export declare const MinDaysWeekSchema: z.ZodIntersection<z.ZodObject<{
     days: z.ZodNumber;
-    priority: z.ZodDefault<z.ZodUnion<readonly [z.ZodLiteral<"LOW">, z.ZodLiteral<"MEDIUM">, z.ZodLiteral<"HIGH">, z.ZodLiteral<"MANDATORY">]>>;
+    priority: z.ZodDefault<z.ZodEnum<{
+        LOW: "LOW";
+        MEDIUM: "MEDIUM";
+        HIGH: "HIGH";
+        MANDATORY: "MANDATORY";
+    }>>;
     weekStartsOn: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"monday">, z.ZodLiteral<"tuesday">, z.ZodLiteral<"wednesday">, z.ZodLiteral<"thursday">, z.ZodLiteral<"friday">, z.ZodLiteral<"saturday">, z.ZodLiteral<"sunday">]>>;
 }, z.core.$strip>, z.ZodType<import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">, unknown, z.core.$ZodTypeInternals<import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">, unknown>>>;
 /**
- * Configuration for {@link createMinDaysWeekRule}.
- *
- * - `days` (required): minimum number of days required per scheduling week
- * - `priority` (required): how strictly the solver enforces this rule
- * - `weekStartsOn` (optional): which day starts the week; defaults to {@link ModelBuilder.weekStartsOn}
- *
- * Entity scoping (at most one): `memberIds`, `roleIds`, `skillIds`
+ * Configuration for {@link minDaysWeekRuleDescriptor}.
  */
 export type MinDaysWeekConfig = z.infer<typeof MinDaysWeekSchema>;
-/**
- * Enforces a minimum number of days a person must work per scheduling week.
- *
- * @remarks
- * Creates a binary "works on day" variable for each member and day, then
- * constrains the weekly sum. This counts distinct days, regardless of how
- * many shifts are assigned on a single day.
- *
- * @param config - See {@link MinDaysWeekConfig}
- * @example
- * ```ts
- * createMinDaysWeekRule({ days: 3, priority: "HIGH" });
- * ```
- */
-export declare function createMinDaysWeekRule(config: MinDaysWeekConfig): CompilationRule;
-export {};
+export declare const minDaysWeekRuleDescriptor: import("../rule-descriptor.js").RuleDescriptor<"min-days-week", {
+    days: number;
+    priority: "LOW" | "MEDIUM" | "HIGH" | "MANDATORY";
+    weekStartsOn?: "monday" | "tuesday" | "wednesday" | "thursday" | "friday" | "saturday" | "sunday" | undefined;
+} & import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">>;
 //# sourceMappingURL=min-days-week.d.ts.map

package/dist/cpsat/rules/min-days-week.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"min-days-week.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/min-days-week.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAEzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAiB3D,QAAA,MAAM,iBAAiB;;;;iOAAmE,CAAC;AAE3F;;;;;;;;GAQG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAElE;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,GAAG,eAAe,CAyEhF"}
+{"version":3,"file":"min-days-week.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/min-days-week.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAyBzB,eAAO,MAAM,iBAAiB;;;;;;;;;iOAAmE,CAAC;AAElG;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAElE,eAAO,MAAM,yBAAyB;;;;+EAyFpC,CAAC"}

package/dist/cpsat/rules/min-days-week.js

@@ -1,84 +1,95 @@
 import * as z from "zod";
 import { DayOfWeekSchema } from "../../types.js";
+import { defineRuleDescriptor } from "../rule-descriptor.js";
 import { priorityToPenalty, splitIntoWeeks } from "../utils.js";
 import { PrioritySchema, entityScope, parseEntityScope, resolveMembersFromScope, ruleGroup, } from "./scope.types.js";
+import { assignmentVarsForDay } from "./assignment-terms.js";
+import { hasAnyAssignablePattern } from "./pattern-eligibility.js";
+import { assignedDayVariableName } from "./variables.js";
+import { hardConstraint, reportValidation, softConstraint } from "./artifacts.js";
+import { buildAssignedDayIndicator } from "./assigned-day.js";
 const MinDaysWeekBase = z.object({
     days: z.number().int().min(0),
     priority: PrioritySchema,
     weekStartsOn: DayOfWeekSchema.optional(),
 });
-const MinDaysWeekSchema = MinDaysWeekBase.and(entityScope(["members", "roles", "skills"]));
-/**
- * Enforces a minimum number of days a person must work per scheduling week.
- *
- * @remarks
- * Creates a binary "works on day" variable for each member and day, then
- * constrains the weekly sum. This counts distinct days, regardless of how
- * many shifts are assigned on a single day.
- *
- * @param config - See {@link MinDaysWeekConfig}
- * @example
- * ```ts
- * createMinDaysWeekRule({ days: 3, priority: "HIGH" });
- * ```
- */
-export function createMinDaysWeekRule(config) {
-    const parsed = MinDaysWeekSchema.parse(config);
-    const scope = parseEntityScope(parsed);
-    const { days, priority, weekStartsOn } = parsed;
-    const group = ruleGroup(`min-days-week:${days}`, `Min ${days}d per week`, scope);
-    return {
-        compile(b) {
-            if (days <= 0)
-                return;
-            const members = resolveMembersFromScope(scope, b.members);
-            const weeks = splitIntoWeeks(b.days, weekStartsOn ?? b.weekStartsOn);
-            for (const emp of members) {
-                for (const weekDays of weeks) {
-                    const weekWorkVars = [];
-                    for (const day of weekDays) {
-                        const dayAssignments = b.shiftPatterns
-                            .filter((p) => b.canAssign(emp, p) && b.patternAvailableOnDay(p, day))
-                            .map((p) => b.assignment(emp.id, p.id, day));
-                        if (dayAssignments.length === 0)
-                            continue;
-                        const worksVar = b.boolVar(`works_day_${emp.id}_${day}`);
-                        weekWorkVars.push(worksVar);
-                        // worksVar >= each assignment (if any assignment is 1, worksVar must be 1)
-                        for (const assignVar of dayAssignments) {
-                            b.addLinear([
-                                { var: worksVar, coeff: 1 },
-                                { var: assignVar, coeff: -1 },
-                            ], ">=", 0);
-                        }
-                        // worksVar <= sum(assignments) (if no assignment is 1, worksVar must be 0)
-                        b.addLinear([{ var: worksVar, coeff: 1 }, ...dayAssignments.map((v) => ({ var: v, coeff: -1 }))], "<=", 0);
-                    }
-                    if (weekWorkVars.length === 0)
-                        continue;
-                    const weekLabel = weekDays[0];
-                    const constraintId = `min-days-week:${emp.id}:${weekLabel}`;
-                    const terms = weekWorkVars.map((v) => ({ var: v, coeff: 1 }));
-                    if (priority === "MANDATORY") {
-                        b.addLinear(terms, ">=", days);
-                    }
-                    else {
-                        b.addSoftLinear(terms, ">=", days, priorityToPenalty(priority), constraintId);
-                        b.reporter.trackConstraint({
-                            id: constraintId,
-                            type: "rule",
-                            rule: "min-days-week",
-                            description: `${emp.id} min ${days}d in week starting ${weekLabel}`,
-                            targetValue: days,
-                            comparator: ">=",
-                            day: weekLabel,
-                            context: { memberIds: [emp.id], days: weekDays },
-                            group,
-                        });
-                    }
-                }
-            }
-        },
-    };
-}
+export const MinDaysWeekSchema = MinDaysWeekBase.and(entityScope(["members", "roles", "skills"]));
+export const minDaysWeekRuleDescriptor = defineRuleDescriptor({
+    name: "min-days-week",
+    schema: MinDaysWeekSchema,
+    compile(config, ctx) {
+        const scope = parseEntityScope(config);
+        const { days, priority, weekStartsOn } = config;
+        const group = ruleGroup(`min-days-week:${days}`, `Min ${days}d per week`, scope);
+        const members = resolveMembersFromScope(scope, [...ctx.members]);
+        const weeks = splitIntoWeeks([...ctx.days], weekStartsOn ?? ctx.weekStartsOn);
+        const artifacts = members.flatMap((member) => weeks.flatMap((weekDays) => {
+            const weekStart = weekDays[0];
+            if (!weekStart)
+                return [];
+            const supportArtifacts = weekDays.flatMap((day) => buildAssignedDayIndicator({
+                memberId: member.id,
+                day,
+                assignmentVars: assignmentVarsForDay(member, day, ctx.shiftPatterns),
+            }).artifacts);
+            const assignedDayVars = weekDays
+                .filter((day) => assignmentVarsForDay(member, day, ctx.shiftPatterns).length > 0)
+                .map((day) => assignedDayVariableName(member.id, day.iso));
+            if (assignedDayVars.length === 0)
+                return supportArtifacts;
+            const description = `${member.id} min ${days}d in week starting ${weekStart.iso}`;
+            const context = { memberIds: [member.id], days: weekDays.map((day) => day.iso) };
+            const constraintId = `min-days-week:${member.id}:${weekStart.iso}`;
+            const terms = assignedDayVars.map((varName) => ({ var: varName, coeff: 1 }));
+            const finalArtifacts = priority === "MANDATORY"
+                ? [
+                    hardConstraint({
+                        group,
+                        description,
+                        context,
+                        validation: reportValidation(constraintId),
+                        terms,
+                        comparator: ">=",
+                        targetValue: days,
+                    }),
+                    {
+                        kind: "pre-solve-feedback",
+                        run(_preSolveContext, reporter) {
+                            const possibleDays = weekDays.filter((day) => hasAnyAssignablePattern(member, day, ctx.shiftPatterns)).length;
+                            if (possibleDays >= days)
+                                return;
+                            reporter.reportRuleError({
+                                rule: "min-days-week",
+                                message: `${member.id} cannot reach ${days} assigned days in week starting ${weekStart.iso}; only ${possibleDays} day${possibleDays === 1 ? " is" : "s are"} assignable.`,
+                                context,
+                                suggestions: [
+                                    `Reduce the weekly day minimum for ${member.id}`,
+                                    `Add more assignable days in the week starting ${weekStart.iso}`,
+                                ],
+                                group,
+                            });
+                        },
+                    },
+                ]
+                : [
+                    softConstraint({
+                        group,
+                        description,
+                        context,
+                        validation: reportValidation(),
+                        terms,
+                        comparator: ">=",
+                        targetValue: days,
+                        penalty: priorityToPenalty(priority),
+                        constraintId,
+                    }),
+                ];
+            return supportArtifacts.concat(finalArtifacts);
+        }));
+        return {
+            rule: "min-days-week",
+            artifacts,
+        };
+    },
+});
 //# sourceMappingURL=min-days-week.js.map

package/dist/cpsat/rules/min-days-week.js.map

@@ -1 +1 @@
-{"version":3,"file":"min-days-week.js","sourceRoot":"","sources":["../../../src/cpsat/rules/min-days-week.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EACL,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,uBAAuB,EACvB,SAAS,GACV,MAAM,kBAAkB,CAAC;AAE1B,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7B,QAAQ,EAAE,cAAc;IACxB,YAAY,EAAE,eAAe,CAAC,QAAQ,EAAE;CACzC,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;AAa3F;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,qBAAqB,CAAC,MAAyB;IAC7D,MAAM,MAAM,GAAG,iBAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IAChD,MAAM,KAAK,GAAG,SAAS,CAAC,iBAAiB,IAAI,EAAE,EAAE,OAAO,IAAI,YAAY,EAAE,KAAK,CAAC,CAAC;IAEjF,OAAO;QACL,OAAO,CAAC,CAAC;YACP,IAAI,IAAI,IAAI,CAAC;gBAAE,OAAO;YAEtB,MAAM,OAAO,GAAG,uBAAuB,CAAC,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YAC1D,MAAM,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,YAAY,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC;YAErE,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;gBAC1B,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;oBAC7B,MAAM,YAAY,GAAa,EAAE,CAAC;oBAElC,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;wBAC3B,MAAM,cAAc,GAAG,CAAC,CAAC,aAAa;6BACnC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,qBAAqB,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;6BACrE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;wBAE/C,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;4BAAE,SAAS;wBAE1C,MAAM,QAAQ,GAAG,CAAC,CAAC,OAAO,CAAC,aAAa,GAAG,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;wBACzD,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;wBAE5B,2EAA2E;wBAC3E,KAAK,MAAM,SAAS,IAAI,cAAc,EAAE,CAAC;4BACvC,CAAC,CAAC,SAAS,CACT;gCACE,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE;gCAC3B,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE;6BAC9B,EACD,IAAI,EACJ,CAAC,CACF,CAAC;wBACJ,CAAC;wBAED,2EAA2E;wBAC3E,CAAC,CAAC,SAAS,CACT,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EACpF,IAAI,EACJ,CAAC,CACF,CAAC;oBACJ,CAAC;oBAED,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;wBAAE,SAAS;oBAExC,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAE,CAAC;oBAC/B,MAAM,YAAY,GAAG,iBAAiB,GAAG,CAAC,EAAE,IAAI,SAAS,EAAE,CAAC;oBAC5D,MAAM,KAAK,GAAW,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;oBAEtE,IAAI,QAAQ,KAAK,WAAW,EAAE,CAAC;wBAC7B,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;oBACjC,CAAC;yBAAM,CAAC;wBACN,CAAC,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,iBAAiB,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,CAAC;wBAC9E,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC;4BACzB,EAAE,EAAE,YAAY;4BAChB,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,eAAe;4BACrB,WAAW,EAAE,GAAG,GAAG,CAAC,EAAE,QAAQ,IAAI,sBAAsB,SAAS,EAAE;4BACnE,WAAW,EAAE,IAAI;4BACjB,UAAU,EAAE,IAAI;4BAChB,GAAG,EAAE,SAAS;4BACd,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE;4BAChD,KAAK;yBACN,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"min-days-week.js","sourceRoot":"","sources":["../../../src/cpsat/rules/min-days-week.ts"],"names":[],"mappings":"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"}

package/dist/cpsat/rules/min-hours-day.d.ts

@@ -1,27 +1,24 @@
 import * as z from "zod";
-import type { CompilationRule } from "../model-builder.js";
-declare const MinHoursDaySchema: z.ZodIntersection<z.ZodObject<{
+export declare const MinHoursDaySchema: z.ZodIntersection<z.ZodObject<{
     hours: z.ZodNumber;
-    priority: z.ZodDefault<z.ZodUnion<readonly [z.ZodLiteral<"LOW">, z.ZodLiteral<"MEDIUM">, z.ZodLiteral<"HIGH">, z.ZodLiteral<"MANDATORY">]>>;
+    priority: z.ZodDefault<z.ZodEnum<{
+        LOW: "LOW";
+        MEDIUM: "MEDIUM";
+        HIGH: "HIGH";
+        MANDATORY: "MANDATORY";
+    }>>;
 }, z.core.$strip>, z.ZodType<import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">, unknown, z.core.$ZodTypeInternals<import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">, unknown>>>;
 /**
- * Configuration for {@link createMinHoursDayRule}.
- *
- * - `hours` (required): minimum hours required per day when scheduled
- * - `priority` (required): how strictly the solver enforces this rule
- *
- * Entity scoping (at most one): `memberIds`, `roleIds`, `skillIds`
+ * Configuration for {@link minHoursDayRuleDescriptor}.
  */
 export type MinHoursDayConfig = z.infer<typeof MinHoursDaySchema>;
 /**
- * Ensures a person works at least a minimum number of hours per day.
+ * Low-level descriptor for the `min-hours-day` rule.
  *
- * @param config - See {@link MinHoursDayConfig}
- * @example
- * ```ts
- * createMinHoursDayRule({ hours: 6, priority: "MANDATORY" });
- * ```
+ * @category Rules
  */
-export declare function createMinHoursDayRule(config: MinHoursDayConfig): CompilationRule;
-export {};
+export declare const minHoursDayRuleDescriptor: import("../rule-descriptor.js").RuleDescriptor<"min-hours-day", {
+    hours: number;
+    priority: "LOW" | "MEDIUM" | "HIGH" | "MANDATORY";
+} & import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">>;
 //# sourceMappingURL=min-hours-day.d.ts.map

package/dist/cpsat/rules/min-hours-day.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"min-hours-day.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/min-hours-day.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAW3D,QAAA,MAAM,iBAAiB;;;iOAK4B,CAAC;AAEpD;;;;;;;GAOG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAElE;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,GAAG,eAAe,CAiDhF"}
+{"version":3,"file":"min-hours-day.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/min-hours-day.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAezB,eAAO,MAAM,iBAAiB;;;;;;;;iOAKqB,CAAC;AAEpD;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAElE;;;;GAIG;AACH,eAAO,MAAM,yBAAyB;;;+EA4EpC,CAAC"}

package/dist/cpsat/rules/min-hours-day.js

@@ -1,68 +1,86 @@
 import * as z from "zod";
+import { defineRuleDescriptor } from "../rule-descriptor.js";
 import { priorityToPenalty } from "../utils.js";
 import { PrioritySchema, entityScope, parseEntityScope, resolveMembersFromScope, ruleGroup, } from "./scope.types.js";
-const MinHoursDaySchema = z
+import { assignmentTermsForDay } from "./assignment-terms.js";
+import { maxAssignableMinutesForDay, patternDurationMinutes } from "./pattern-time.js";
+import { hardConstraint, reportValidation, softConstraint } from "./artifacts.js";
+export const MinHoursDaySchema = z
     .object({
     hours: z.number().min(0),
     priority: PrioritySchema,
 })
     .and(entityScope(["members", "roles", "skills"]));
 /**
- * Ensures a person works at least a minimum number of hours per day.
+ * Low-level descriptor for the `min-hours-day` rule.
  *
- * @param config - See {@link MinHoursDayConfig}
- * @example
- * ```ts
- * createMinHoursDayRule({ hours: 6, priority: "MANDATORY" });
- * ```
+ * @category Rules
  */
-export function createMinHoursDayRule(config) {
-    const parsed = MinHoursDaySchema.parse(config);
-    const scope = parseEntityScope(parsed);
-    const { hours, priority } = parsed;
-    const minMinutes = hours * 60;
-    const group = ruleGroup(`min-hours-day:${hours}`, `Min ${hours}h per day`, scope);
-    return {
-        compile(b) {
-            if (hours <= 0)
-                return;
-            const members = resolveMembersFromScope(scope, b.members);
-            for (const emp of members) {
-                for (const day of b.days) {
-                    const terms = [];
-                    for (const pattern of b.shiftPatterns) {
-                        if (!b.canAssign(emp, pattern))
-                            continue;
-                        if (!b.patternAvailableOnDay(pattern, day))
-                            continue;
-                        terms.push({
-                            var: b.assignment(emp.id, pattern.id, day),
-                            coeff: b.patternDuration(pattern.id),
-                        });
-                    }
-                    if (terms.length === 0)
-                        continue;
-                    const constraintId = `min-hours-day:${emp.id}:${day}`;
-                    if (priority === "MANDATORY") {
-                        b.addLinear(terms, ">=", minMinutes);
-                    }
-                    else {
-                        b.addSoftLinear(terms, ">=", minMinutes, priorityToPenalty(priority), constraintId);
-                        b.reporter.trackConstraint({
-                            id: constraintId,
-                            type: "rule",
-                            rule: "min-hours-day",
-                            description: `${emp.id} min ${hours}h on ${day}`,
-                            targetValue: minMinutes,
-                            comparator: ">=",
-                            day,
-                            context: { memberIds: [emp.id], days: [day] },
-                            group,
-                        });
-                    }
+export const minHoursDayRuleDescriptor = defineRuleDescriptor({
+    name: "min-hours-day",
+    schema: MinHoursDaySchema,
+    compile(config, ctx) {
+        const scope = parseEntityScope(config);
+        const { hours, priority } = config;
+        const minMinutes = hours * 60;
+        const group = ruleGroup(`min-hours-day:${hours}`, `Min ${hours}h per day`, scope);
+        const members = resolveMembersFromScope(scope, [...ctx.members]);
+        const artifacts = [];
+        for (const member of members) {
+            for (const day of ctx.days) {
+                const terms = assignmentTermsForDay(member, day, ctx.shiftPatterns, patternDurationMinutes);
+                if (terms.length === 0)
+                    continue;
+                const context = { memberIds: [member.id], days: [day.iso] };
+                const constraintId = `min-hours-day:${member.id}:${day.iso}`;
+                const description = `${member.id} min ${hours}h on ${day.iso}`;
+                if (priority === "MANDATORY") {
+                    artifacts.push(hardConstraint({
+                        group,
+                        description,
+                        context,
+                        validation: reportValidation(constraintId),
+                        terms,
+                        comparator: ">=",
+                        targetValue: minMinutes,
+                    }), {
+                        kind: "pre-solve-feedback",
+                        run(preSolveContext, reporter) {
+                            const maxMinutes = maxAssignableMinutesForDay(member, day, preSolveContext.shiftPatterns);
+                            if (maxMinutes >= minMinutes)
+                                return;
+                            reporter.reportRuleError({
+                                rule: "min-hours-day",
+                                message: `${member.id} cannot reach ${hours}h on ${day.iso}; maximum possible is ${Math.round((maxMinutes / 60) * 10) / 10}h.`,
+                                context,
+                                suggestions: [
+                                    `Reduce the daily minimum for ${member.id}`,
+                                    `Add a longer shift on ${day.iso}`,
+                                ],
+                                group,
+                            });
+                        },
+                    });
+                }
+                else {
+                    artifacts.push(softConstraint({
+                        group,
+                        description,
+                        context,
+                        validation: reportValidation(),
+                        terms,
+                        comparator: ">=",
+                        targetValue: minMinutes,
+                        penalty: priorityToPenalty(priority),
+                        constraintId,
+                    }));
                 }
             }
-        },
-    };
-}
+        }
+        return {
+            rule: "min-hours-day",
+            artifacts,
+        };
+    },
+});
 //# sourceMappingURL=min-hours-day.js.map

package/dist/cpsat/rules/min-hours-day.js.map

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