dabke 0.83.0 → 0.84.0

package/dist/cpsat/rules/max-consecutive-days.js

@@ -1,78 +1,79 @@
 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 MaxConsecutiveDaysSchema = z
+import { assignmentVarsForDay } from "./assignment-terms.js";
+import { hardConstraint, reportValidation, softConstraint } from "./artifacts.js";
+import { buildAssignedDayIndicator } from "./assigned-day.js";
+export const MaxConsecutiveDaysSchema = z
     .object({
     days: z.number().min(0),
     priority: PrioritySchema,
 })
     .and(entityScope(["members", "roles", "skills"]));
 /**
- * Limits how many consecutive days a person can be assigned.
+ * Low-level descriptor for the `max-consecutive-days` rule.
  *
- * @param config - See {@link MaxConsecutiveDaysConfig}
- * @example
- * ```ts
- * createMaxConsecutiveDaysRule({ days: 5, priority: "MANDATORY" });
- * ```
+ * @remarks
+ * This rule limits the length of each assignment streak by counting assigned
+ * days in every sliding window of `days + 1` days.
+ *
+ * @category Rules
  */
-export function createMaxConsecutiveDaysRule(config) {
-    const parsed = MaxConsecutiveDaysSchema.parse(config);
-    const scope = parseEntityScope(parsed);
-    const { days, priority } = parsed;
-    const windowSize = days + 1;
-    const group = ruleGroup(`max-consecutive-days:${days}`, `Max ${days} consecutive days`, scope);
-    return {
-        compile(b) {
-            const members = resolveMembersFromScope(scope, b.members);
-            for (const emp of members) {
-                for (let i = 0; i <= b.days.length - windowSize; i++) {
-                    const windowDays = b.days.slice(i, i + windowSize);
-                    const worksDayVars = [];
-                    for (const day of windowDays) {
-                        const worksVar = b.boolVar(`works_${emp.id}_${day}`);
-                        worksDayVars.push(worksVar);
-                        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) {
-                            b.addLinear([{ var: worksVar, coeff: 1 }], "==", 0);
-                        }
-                        else {
-                            for (const assignVar of dayAssignments) {
-                                b.addLinear([
-                                    { var: worksVar, coeff: 1 },
-                                    { var: assignVar, coeff: -1 },
-                                ], ">=", 0);
-                            }
-                            b.addLinear([
-                                { var: worksVar, coeff: 1 },
-                                ...dayAssignments.map((v) => ({ var: v, coeff: -1 })),
-                            ], "<=", 0);
-                        }
-                    }
-                    const windowStart = windowDays[0];
-                    const constraintId = `max-consecutive-days:${emp.id}:${windowStart}`;
-                    if (priority === "MANDATORY") {
-                        b.addLinear(worksDayVars.map((v) => ({ var: v, coeff: 1 })), "<=", days);
-                    }
-                    else {
-                        b.addSoftLinear(worksDayVars.map((v) => ({ var: v, coeff: 1 })), "<=", days, priorityToPenalty(priority), constraintId);
-                        b.reporter.trackConstraint({
-                            id: constraintId,
-                            type: "rule",
-                            rule: "max-consecutive-days",
-                            description: `${emp.id} max ${days} consecutive days from ${windowStart}`,
-                            targetValue: days,
-                            comparator: "<=",
-                            day: windowStart,
-                            context: { memberIds: [emp.id], days: windowDays },
-                            group,
-                        });
-                    }
-                }
-            }
-        },
-    };
-}
+export const maxConsecutiveDaysRuleDescriptor = defineRuleDescriptor({
+    name: "max-consecutive-days",
+    schema: MaxConsecutiveDaysSchema,
+    compile(config, ctx) {
+        const scope = parseEntityScope(config);
+        const { days, priority } = config;
+        const windowSize = days + 1;
+        const group = ruleGroup(`max-consecutive-days:${days}`, `Max ${days} consecutive days`, scope);
+        const members = resolveMembersFromScope(scope, [...ctx.members]);
+        const artifacts = members.flatMap((member) => {
+            const supportArtifacts = ctx.days.flatMap((day) => buildAssignedDayIndicator({
+                memberId: member.id,
+                day,
+                assignmentVars: assignmentVarsForDay(member, day, ctx.shiftPatterns),
+                variableName: `assigned_${member.id}_${day.iso}`,
+            }).artifacts);
+            const windowArtifacts = Array.from({ length: Math.max(0, ctx.days.length - windowSize + 1) }, (_, index) => {
+                const windowDays = ctx.days.slice(index, index + windowSize);
+                const windowStart = windowDays[0];
+                const terms = windowDays.map((day) => ({
+                    var: `assigned_${member.id}_${day.iso}`,
+                    coeff: 1,
+                }));
+                const description = `${member.id} max ${days} consecutive days from ${windowStart.iso}`;
+                const context = { memberIds: [member.id], days: windowDays.map((day) => day.iso) };
+                const constraintId = `max-consecutive-days:${member.id}:${windowStart.iso}`;
+                return priority === "MANDATORY"
+                    ? hardConstraint({
+                        group,
+                        description,
+                        context,
+                        validation: reportValidation(constraintId),
+                        terms,
+                        comparator: "<=",
+                        targetValue: days,
+                    })
+                    : softConstraint({
+                        group,
+                        description,
+                        context,
+                        validation: reportValidation(),
+                        terms,
+                        comparator: "<=",
+                        targetValue: days,
+                        penalty: priorityToPenalty(priority),
+                        constraintId,
+                    });
+            });
+            return supportArtifacts.concat(windowArtifacts);
+        });
+        return {
+            rule: "max-consecutive-days",
+            artifacts,
+        };
+    },
+});
 //# sourceMappingURL=max-consecutive-days.js.map

package/dist/cpsat/rules/max-consecutive-days.js.map

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

package/dist/cpsat/rules/max-days-of-week-per-period.d.ts

@@ -0,0 +1,45 @@
+import * as z from "zod";
+export declare const MaxDaysOfWeekPerPeriodSchema: z.ZodIntersection<z.ZodObject<{
+    days: z.ZodNumber;
+    dayOfWeek: z.ZodArray<z.ZodUnion<readonly [z.ZodLiteral<"monday">, z.ZodLiteral<"tuesday">, z.ZodLiteral<"wednesday">, z.ZodLiteral<"thursday">, z.ZodLiteral<"friday">, z.ZodLiteral<"saturday">, z.ZodLiteral<"sunday">]>>;
+    period: z.ZodDiscriminatedUnion<[z.ZodObject<{
+        type: z.ZodLiteral<"weeks">;
+        value: z.ZodNumber;
+    }, z.core.$strip>, z.ZodObject<{
+        type: z.ZodLiteral<"months">;
+        value: z.ZodNumber;
+    }, z.core.$strip>], "type">;
+    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 maxDaysOfWeekPerPeriodRuleDescriptor}.
+ */
+export type MaxDaysOfWeekPerPeriodConfig = z.infer<typeof MaxDaysOfWeekPerPeriodSchema>;
+/**
+ * Low-level descriptor for the `max-days-of-week-per-period` rule.
+ *
+ * @remarks
+ * This rule counts assigned days matching the configured days of the week.
+ * Week-based periods align to `weekStartsOn`; month-based periods align to
+ * calendar month boundaries.
+ *
+ * @category Rules
+ */
+export declare const maxDaysOfWeekPerPeriodRuleDescriptor: import("../rule-descriptor.js").RuleDescriptor<"max-days-of-week-per-period", {
+    days: number;
+    dayOfWeek: ("monday" | "tuesday" | "wednesday" | "thursday" | "friday" | "saturday" | "sunday")[];
+    period: {
+        type: "weeks";
+        value: number;
+    } | {
+        type: "months";
+        value: number;
+    };
+    priority: "LOW" | "MEDIUM" | "HIGH" | "MANDATORY";
+} & import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">>;
+//# sourceMappingURL=max-days-of-week-per-period.d.ts.map

package/dist/cpsat/rules/max-days-of-week-per-period.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"max-days-of-week-per-period.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/max-days-of-week-per-period.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AA4BzB,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;iOAExC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,4BAA4B,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,4BAA4B,CAAC,CAAC;AAExF;;;;;;;;;GASG;AACH,eAAO,MAAM,oCAAoC;;;;;;;;;;;+EA+E/C,CAAC"}

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

@@ -0,0 +1,95 @@
+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 { 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 MaxDaysOfWeekPerPeriodBase = z.object({
+    days: z.number().int().min(0),
+    dayOfWeek: z.array(DayOfWeekSchema).nonempty(),
+    period: PeriodSchema,
+    priority: PrioritySchema,
+});
+export const MaxDaysOfWeekPerPeriodSchema = MaxDaysOfWeekPerPeriodBase.and(entityScope(["members", "roles", "skills"]));
+/**
+ * Low-level descriptor for the `max-days-of-week-per-period` rule.
+ *
+ * @remarks
+ * This rule counts assigned days matching the configured days of the week.
+ * Week-based periods align to `weekStartsOn`; month-based periods align to
+ * calendar month boundaries.
+ *
+ * @category Rules
+ */
+export const maxDaysOfWeekPerPeriodRuleDescriptor = defineRuleDescriptor({
+    name: "max-days-of-week-per-period",
+    schema: MaxDaysOfWeekPerPeriodSchema,
+    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(`max-days-of-week-per-period:${days}:${dowLabel}:${periodLabel}`, `Max ${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} max ${days} ${dowLabel} in period starting ${chunkStart.iso}`;
+            const context = { memberIds: [member.id], days: matchingDays.map((day) => day.iso) };
+            const constraintId = `max-days-of-week-per-period:${member.id}:${chunkStart.iso}`;
+            const terms = assignedDayVars.map((varName) => ({ var: varName, coeff: 1 }));
+            const finalArtifact = priority === "MANDATORY"
+                ? hardConstraint({
+                    group,
+                    description,
+                    context,
+                    validation: reportValidation(constraintId),
+                    terms,
+                    comparator: "<=",
+                    targetValue: days,
+                })
+                : softConstraint({
+                    group,
+                    description,
+                    context,
+                    validation: reportValidation(),
+                    terms,
+                    comparator: "<=",
+                    targetValue: days,
+                    penalty: priorityToPenalty(priority),
+                    constraintId,
+                });
+            return supportArtifacts.concat(finalArtifact);
+        }));
+        return {
+            rule: "max-days-of-week-per-period",
+            artifacts,
+        };
+    },
+});
+//# sourceMappingURL=max-days-of-week-per-period.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"max-days-of-week-per-period.js","sourceRoot":"","sources":["../../../src/cpsat/rules/max-days-of-week-per-period.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAClF,OAAO,EACL,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,uBAAuB,EACvB,SAAS,GACV,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAClF,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAE9D,MAAM,YAAY,GAAG,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE;IAChD,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACtE,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;CACxE,CAAC,CAAC;AAEH,MAAM,0BAA0B,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1C,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7B,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE;IAC9C,MAAM,EAAE,YAAY;IACpB,QAAQ,EAAE,cAAc;CACzB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,4BAA4B,GAAG,0BAA0B,CAAC,GAAG,CACxE,WAAW,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAC5C,CAAC;AAOF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,oCAAoC,GAAG,oBAAoB,CAAC;IACvE,IAAI,EAAE,6BAA6B;IACnC,MAAM,EAAE,4BAA4B;IACpC,OAAO,CAAC,MAAM,EAAE,GAAG;QACjB,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QACrD,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChD,MAAM,WAAW,GAAG,GAAG,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;QAC5E,MAAM,KAAK,GAAG,SAAS,CACrB,+BAA+B,IAAI,IAAI,QAAQ,IAAI,WAAW,EAAE,EAChE,OAAO,IAAI,IAAI,QAAQ,QAAQ,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,EAAE,EAC5D,gBAAgB,CACjB,CAAC;QACF,MAAM,aAAa,GAAG,uBAAuB,CAAC,gBAAgB,EAAE,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QAClF,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,MAAM,GACV,MAAM,CAAC,IAAI,KAAK,OAAO;YACrB,CAAC,CAAC,eAAe,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,YAAY,CAAC;YAChE,CAAC,CAAC,eAAe,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAEnD,MAAM,SAAS,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CACjD,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC3B,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YAChC,IAAI,CAAC,UAAU;gBAAE,OAAO,EAAE,CAAC;YAE3B,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;YAC9E,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,EAAE,CAAC;YAEzC,MAAM,gBAAgB,GAAG,YAAY,CAAC,OAAO,CAC3C,CAAC,GAAG,EAAE,EAAE,CACN,yBAAyB,CAAC;gBACxB,QAAQ,EAAE,MAAM,CAAC,EAAE;gBACnB,GAAG;gBACH,cAAc,EAAE,oBAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,aAAa,CAAC;aACrE,CAAC,CAAC,SAAS,CACf,CAAC;YAEF,MAAM,eAAe,GAAG,YAAY;iBACjC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;iBAChF,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,uBAAuB,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YAC7D,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,gBAAgB,CAAC;YAE1D,MAAM,WAAW,GAAG,GAAG,MAAM,CAAC,EAAE,QAAQ,IAAI,IAAI,QAAQ,uBAAuB,UAAU,CAAC,GAAG,EAAE,CAAC;YAChG,MAAM,OAAO,GAAG,EAAE,SAAS,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACrF,MAAM,YAAY,GAAG,+BAA+B,MAAM,CAAC,EAAE,IAAI,UAAU,CAAC,GAAG,EAAE,CAAC;YAClF,MAAM,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAE7E,MAAM,aAAa,GACjB,QAAQ,KAAK,WAAW;gBACtB,CAAC,CAAC,cAAc,CAAC;oBACb,KAAK;oBACL,WAAW;oBACX,OAAO;oBACP,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC;oBAC1C,KAAK;oBACL,UAAU,EAAE,IAAI;oBAChB,WAAW,EAAE,IAAI;iBAClB,CAAC;gBACJ,CAAC,CAAC,cAAc,CAAC;oBACb,KAAK;oBACL,WAAW;oBACX,OAAO;oBACP,UAAU,EAAE,gBAAgB,EAAE;oBAC9B,KAAK;oBACL,UAAU,EAAE,IAAI;oBAChB,WAAW,EAAE,IAAI;oBACjB,OAAO,EAAE,iBAAiB,CAAC,QAAQ,CAAC;oBACpC,YAAY;iBACb,CAAC,CAAC;YAET,OAAO,gBAAgB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAChD,CAAC,CAAC,CACH,CAAC;QAEF,OAAO;YACL,IAAI,EAAE,6BAA6B;YACnC,SAAS;SACV,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}

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

@@ -1,44 +1,30 @@
 import * as z from "zod";
-import type { CompilationRule } from "../model-builder.js";
-declare const MaxDaysWeekSchema: z.ZodIntersection<z.ZodIntersection<z.ZodObject<{
+export declare const MaxDaysWeekSchema: z.ZodIntersection<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>>>, 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 createMaxDaysWeekRule}.
- *
- * - `days` (required): maximum number of days allowed 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`
- * Time scoping (at most one, optional): `dateRange`, `specificDates`, `dayOfWeek`, `recurringPeriods`
+ * Configuration for {@link maxDaysWeekRuleDescriptor}.
  */
 export type MaxDaysWeekConfig = z.infer<typeof MaxDaysWeekSchema>;
 /**
- * Caps total number of days a person can work within each scheduling week.
+ * Low-level descriptor for the `max-days-week` rule.
  *
  * @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 MaxDaysWeekConfig}
- * @example Limit everyone to 5 days per week
- * ```ts
- * createMaxDaysWeekRule({ days: 5, priority: "MANDATORY" });
- * ```
+ * This rule counts assigned days, not assigned shifts. Multiple assignments on
+ * the same day still count as one assigned day.
  *
- * @example Part-time staff limited to 3 days
- * ```ts
- * createMaxDaysWeekRule({
- *   roleIds: ["part-time"],
- *   days: 3,
- *   priority: "HIGH",
- * });
- * ```
+ * @category Rules
  */
-export declare function createMaxDaysWeekRule(config: MaxDaysWeekConfig): CompilationRule;
-export {};
+export declare const maxDaysWeekRuleDescriptor: import("../rule-descriptor.js").RuleDescriptor<"max-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">) & import("./scope.types.js").OptionalTimeScopeType<"dateRange" | "dayOfWeek" | "specificDates" | "recurring">>;
 //# sourceMappingURL=max-days-week.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"max-days-week.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/max-days-week.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAEzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAoB3D,QAAA,MAAM,iBAAiB;;;;mfAEtB,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAElE;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,GAAG,eAAe,CAiFhF"}
+{"version":3,"file":"max-days-week.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/max-days-week.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAyBzB,eAAO,MAAM,iBAAiB;;;;;;;;;mfAE4C,CAAC;AAE3E;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAElE;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB;;;;8LAyEpC,CAAC"}

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

@@ -1,95 +1,83 @@
 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, timeScope, parseEntityScope, parseTimeScope, resolveMembersFromScope, resolveActiveDaysFromScope, ruleGroup, } from "./scope.types.js";
+import { PrioritySchema, entityScope, parseEntityScope, parseTimeScope, resolveActiveDaysFromScope, resolveMembersFromScope, ruleGroup, timeScope, } from "./scope.types.js";
+import { assignmentVarsForDay } from "./assignment-terms.js";
+import { assignedDayVariableName } from "./variables.js";
+import { hardConstraint, reportValidation, softConstraint } from "./artifacts.js";
+import { buildAssignedDayIndicator } from "./assigned-day.js";
 const MaxDaysWeekBase = z.object({
     days: z.number().int().min(0),
     priority: PrioritySchema,
     weekStartsOn: DayOfWeekSchema.optional(),
 });
-const MaxDaysWeekSchema = MaxDaysWeekBase.and(entityScope(["members", "roles", "skills"])).and(timeScope(["dateRange", "specificDates", "dayOfWeek", "recurring"]));
+export const MaxDaysWeekSchema = MaxDaysWeekBase.and(entityScope(["members", "roles", "skills"])).and(timeScope(["dateRange", "specificDates", "dayOfWeek", "recurring"]));
 /**
- * Caps total number of days a person can work within each scheduling week.
+ * Low-level descriptor for the `max-days-week` rule.
  *
  * @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.
+ * This rule counts assigned days, not assigned shifts. Multiple assignments on
+ * the same day still count as one assigned day.
  *
- * @param config - See {@link MaxDaysWeekConfig}
- * @example Limit everyone to 5 days per week
- * ```ts
- * createMaxDaysWeekRule({ days: 5, priority: "MANDATORY" });
- * ```
- *
- * @example Part-time staff limited to 3 days
- * ```ts
- * createMaxDaysWeekRule({
- *   roleIds: ["part-time"],
- *   days: 3,
- *   priority: "HIGH",
- * });
- * ```
+ * @category Rules
  */
-export function createMaxDaysWeekRule(config) {
-    const parsed = MaxDaysWeekSchema.parse(config);
-    const entityScopeValue = parseEntityScope(parsed);
-    const timeScopeValue = parseTimeScope(parsed);
-    const { days, priority, weekStartsOn } = parsed;
-    const group = ruleGroup(`max-days-week:${days}`, `Max ${days}d per week`, entityScopeValue, timeScopeValue);
-    return {
-        compile(b) {
-            const targetMembers = resolveMembersFromScope(entityScopeValue, b.members);
-            const activeDays = resolveActiveDaysFromScope(timeScopeValue, b.days);
-            if (targetMembers.length === 0 || activeDays.length === 0)
-                return;
-            const weeks = splitIntoWeeks(activeDays, weekStartsOn ?? b.weekStartsOn);
-            for (const emp of targetMembers) {
-                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 = `max-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: "max-days-week",
-                            description: `${emp.id} max ${days}d in week starting ${weekLabel}`,
-                            targetValue: days,
-                            comparator: "<=",
-                            day: weekLabel,
-                            context: { memberIds: [emp.id], days: weekDays },
-                            group,
-                        });
-                    }
-                }
-            }
-        },
-    };
-}
+export const maxDaysWeekRuleDescriptor = defineRuleDescriptor({
+    name: "max-days-week",
+    schema: MaxDaysWeekSchema,
+    compile(config, ctx) {
+        const entityScopeValue = parseEntityScope(config);
+        const timeScopeValue = parseTimeScope(config);
+        const { days, priority, weekStartsOn } = config;
+        const group = ruleGroup(`max-days-week:${days}`, `Max ${days}d per week`, entityScopeValue, timeScopeValue);
+        const targetMembers = resolveMembersFromScope(entityScopeValue, [...ctx.members]);
+        const activeDays = resolveActiveDaysFromScope(timeScopeValue, [...ctx.days]);
+        const weeks = splitIntoWeeks(activeDays, weekStartsOn ?? ctx.weekStartsOn);
+        const artifacts = targetMembers.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} max ${days}d in week starting ${weekStart.iso}`;
+            const context = { memberIds: [member.id], days: weekDays.map((day) => day.iso) };
+            const constraintId = `max-days-week:${member.id}:${weekStart.iso}`;
+            const terms = assignedDayVars.map((varName) => ({ var: varName, coeff: 1 }));
+            const finalArtifact = priority === "MANDATORY"
+                ? hardConstraint({
+                    group,
+                    description,
+                    context,
+                    validation: reportValidation(constraintId),
+                    terms,
+                    comparator: "<=",
+                    targetValue: days,
+                })
+                : softConstraint({
+                    group,
+                    description,
+                    context,
+                    validation: reportValidation(),
+                    terms,
+                    comparator: "<=",
+                    targetValue: days,
+                    penalty: priorityToPenalty(priority),
+                    constraintId,
+                });
+            return supportArtifacts.concat(finalArtifact);
+        }));
+        return {
+            rule: "max-days-week",
+            artifacts,
+        };
+    },
+});
 //# sourceMappingURL=max-days-week.js.map

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

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