dabke 0.83.0 → 0.84.0

package/dist/cpsat/rules/concurrent-intervals.js

@@ -0,0 +1,57 @@
+import { MINUTES_PER_DAY, normalizeEndMinutes, timeOfDayToMinutes } from "../utils.js";
+import { canAssignMemberToPattern, isPatternAvailableOnDay } from "./pattern-eligibility.js";
+import { assignmentVar } from "./variables.js";
+export function collectConcurrentAssignmentIntervals(day, targetMembers, shiftPatterns) {
+    const intervals = [];
+    for (const pattern of shiftPatterns) {
+        if (!isPatternAvailableOnDay(pattern, day))
+            continue;
+        const start = timeOfDayToMinutes(pattern.startTime);
+        const end = normalizeEndMinutes(start, timeOfDayToMinutes(pattern.endTime));
+        for (const member of targetMembers) {
+            if (!canAssignMemberToPattern(member, pattern))
+                continue;
+            intervals.push({
+                start,
+                end,
+                varName: assignmentVar(member.id, pattern.id, day.iso),
+            });
+        }
+    }
+    return intervals;
+}
+export function resolveConcurrentWindow(intervals, startMinutes, endMinutes) {
+    const start = startMinutes ?? 0;
+    if (endMinutes !== undefined) {
+        return { start, end: endMinutes };
+    }
+    const latestEnd = intervals.reduce((maxEnd, interval) => Math.max(maxEnd, interval.end), 0);
+    return { start, end: Math.max(MINUTES_PER_DAY, latestEnd) };
+}
+export function buildConcurrentAssignmentSegments(intervals, windowStart, windowEnd) {
+    const boundaries = new Set([windowStart, windowEnd]);
+    for (const interval of intervals) {
+        const start = Math.max(interval.start, windowStart);
+        const end = Math.min(interval.end, windowEnd);
+        if (start >= end)
+            continue;
+        boundaries.add(start);
+        boundaries.add(end);
+    }
+    const sortedBoundaries = [...boundaries].toSorted((left, right) => left - right);
+    const segments = [];
+    for (let index = 0; index < sortedBoundaries.length - 1; index++) {
+        const start = sortedBoundaries[index];
+        const end = sortedBoundaries[index + 1];
+        if (start === undefined || end === undefined || start >= end)
+            continue;
+        const varNames = intervals
+            .filter((interval) => interval.start < end && interval.end > start)
+            .map((interval) => interval.varName);
+        if (varNames.length === 0)
+            continue;
+        segments.push({ start, end, varNames });
+    }
+    return segments;
+}
+//# sourceMappingURL=concurrent-intervals.js.map

package/dist/cpsat/rules/concurrent-intervals.js.map

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

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

@@ -1,4 +1,4 @@
-import type { SchedulingMember, ShiftPattern } from "../types.js";
+import type { SchedulingMember } from "../types.js";
 /** Returns the hourly rate for a member, or undefined if not hourly. */
 export declare function getHourlyRate(member: SchedulingMember): number | undefined;
 /** Returns salaried pay info, or undefined if not salaried. */
@@ -6,6 +6,4 @@ export declare function getSalariedPay(member: SchedulingMember): {
     annual: number;
     hoursPerWeek: number;
 } | undefined;
-/** Computes shift duration in minutes from a pattern. */
-export declare function patternDurationMinutes(pattern: ShiftPattern): number;
 //# sourceMappingURL=cost-utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"cost-utils.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/cost-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGlE,wEAAwE;AACxE,wBAAgB,aAAa,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,GAAG,SAAS,CAI1E;AAED,+DAA+D;AAC/D,wBAAgB,cAAc,CAC5B,MAAM,EAAE,gBAAgB,GACvB;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAItD;AAED,yDAAyD;AACzD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,CAIpE"}
+{"version":3,"file":"cost-utils.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/cost-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,wEAAwE;AACxE,wBAAgB,aAAa,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,GAAG,SAAS,CAI1E;AAED,+DAA+D;AAC/D,wBAAgB,cAAc,CAC5B,MAAM,EAAE,gBAAgB,GACvB;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAItD"}

package/dist/cpsat/rules/cost-utils.js

@@ -1,4 +1,3 @@
-import { timeOfDayToMinutes, normalizeEndMinutes } from "../utils.js";
 /** Returns the hourly rate for a member, or undefined if not hourly. */
 export function getHourlyRate(member) {
     if (!member.pay)
@@ -15,10 +14,4 @@ export function getSalariedPay(member) {
         return member.pay;
     return undefined;
 }
-/** Computes shift duration in minutes from a pattern. */
-export function patternDurationMinutes(pattern) {
-    const start = timeOfDayToMinutes(pattern.startTime);
-    const end = normalizeEndMinutes(start, timeOfDayToMinutes(pattern.endTime));
-    return end - start;
-}
 //# sourceMappingURL=cost-utils.js.map

package/dist/cpsat/rules/cost-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"cost-utils.js","sourceRoot":"","sources":["../../../src/cpsat/rules/cost-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEtE,wEAAwE;AACxE,MAAM,UAAU,aAAa,CAAC,MAAwB;IACpD,IAAI,CAAC,MAAM,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAClC,IAAI,YAAY,IAAI,MAAM,CAAC,GAAG;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;IAC7D,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,cAAc,CAC5B,MAAwB;IAExB,IAAI,CAAC,MAAM,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAClC,IAAI,QAAQ,IAAI,MAAM,CAAC,GAAG;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC;IAC9C,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,yDAAyD;AACzD,MAAM,UAAU,sBAAsB,CAAC,OAAqB;IAC1D,MAAM,KAAK,GAAG,kBAAkB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpD,MAAM,GAAG,GAAG,mBAAmB,CAAC,KAAK,EAAE,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC5E,OAAO,GAAG,GAAG,KAAK,CAAC;AACrB,CAAC"}
+{"version":3,"file":"cost-utils.js","sourceRoot":"","sources":["../../../src/cpsat/rules/cost-utils.ts"],"names":[],"mappings":"AAEA,wEAAwE;AACxE,MAAM,UAAU,aAAa,CAAC,MAAwB;IACpD,IAAI,CAAC,MAAM,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAClC,IAAI,YAAY,IAAI,MAAM,CAAC,GAAG;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;IAC7D,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,cAAc,CAC5B,MAAwB;IAExB,IAAI,CAAC,MAAM,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAClC,IAAI,QAAQ,IAAI,MAAM,CAAC,GAAG;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC;IAC9C,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/cpsat/rules/day-cost-multiplier.d.ts

@@ -1,19 +1,19 @@
 import * as z from "zod";
-import type { CompilationRule } from "../model-builder.js";
-declare const DayCostMultiplierSchema: z.ZodIntersection<z.ZodIntersection<z.ZodObject<{
+export declare const DayCostMultiplierSchema: z.ZodIntersection<z.ZodIntersection<z.ZodObject<{
     factor: z.ZodNumber;
 }, 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 createDayCostMultiplierRule}. */
+/** Configuration for {@link dayCostMultiplierRuleDescriptor}. */
 export type DayCostMultiplierConfig = z.infer<typeof DayCostMultiplierSchema>;
 /**
- * Creates a day-based rate multiplier rule.
+ * Low-level descriptor for the `day-cost-multiplier` rule.
  *
- * Multiplies the base rate for assignments on matching days. The extra cost
- * above 1x is added as a penalty term (the base 1x is handled by `minimizeCost()`).
+ * @remarks
+ * This artifact always contributes to post-solve cost calculation. It only adds
+ * solver objective terms when `minimize-cost` is active.
  *
- * When `minimizeCost()` is not present, no solver terms are emitted,
- * but the `cost()` method still contributes to post-solve calculation.
+ * @category Rules
  */
-export declare function createDayCostMultiplierRule(config: DayCostMultiplierConfig): CompilationRule;
-export {};
+export declare const dayCostMultiplierRuleDescriptor: import("../rule-descriptor.js").RuleDescriptor<"day-cost-multiplier", ({
+    factor: number;
+} & import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">) & import("./scope.types.js").OptionalTimeScopeType<"dateRange" | "dayOfWeek" | "specificDates" | "recurring">>;
 //# sourceMappingURL=day-cost-multiplier.d.ts.map

package/dist/cpsat/rules/day-cost-multiplier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"day-cost-multiplier.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/day-cost-multiplier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,KAAK,EAAE,eAAe,EAAoB,MAAM,qBAAqB,CAAC;AAc7E,QAAA,MAAM,uBAAuB;;mfAK8C,CAAC;AAE5E,6DAA6D;AAC7D,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAE9E;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,uBAAuB,GAAG,eAAe,CA8E5F"}
+{"version":3,"file":"day-cost-multiplier.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/day-cost-multiplier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAezB,eAAO,MAAM,uBAAuB;;mfAKuC,CAAC;AAE5E,iEAAiE;AACjE,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAE9E;;;;;;;;GAQG;AACH,eAAO,MAAM,+BAA+B;;8LAkG1C,CAAC"}

package/dist/cpsat/rules/day-cost-multiplier.js

@@ -1,93 +1,104 @@
 import * as z from "zod";
+import { defineRuleDescriptor } from "../rule-descriptor.js";
 import { COST_CATEGORY } from "../cost.js";
-import { entityScope, timeScope, parseEntityScope, parseTimeScope, resolveMembersFromScope, resolveActiveDaysFromScope, } from "./scope.types.js";
-import { getHourlyRate, patternDurationMinutes } from "./cost-utils.js";
-const DayCostMultiplierSchema = z
+import { entityScope, parseEntityScope, parseTimeScope, resolveActiveDaysFromScope, resolveMembersFromScope, timeScope, } from "./scope.types.js";
+import { getHourlyRate } from "./cost-utils.js";
+import { patternDurationMinutes } from "./pattern-time.js";
+export const DayCostMultiplierSchema = z
     .object({
     factor: z.number().min(1),
 })
     .and(entityScope(["members", "roles", "skills"]))
     .and(timeScope(["dateRange", "specificDates", "dayOfWeek", "recurring"]));
 /**
- * Creates a day-based rate multiplier rule.
+ * Low-level descriptor for the `day-cost-multiplier` rule.
  *
- * Multiplies the base rate for assignments on matching days. The extra cost
- * above 1x is added as a penalty term (the base 1x is handled by `minimizeCost()`).
+ * @remarks
+ * This artifact always contributes to post-solve cost calculation. It only adds
+ * solver objective terms when `minimize-cost` is active.
  *
- * When `minimizeCost()` is not present, no solver terms are emitted,
- * but the `cost()` method still contributes to post-solve calculation.
+ * @category Rules
  */
-export function createDayCostMultiplierRule(config) {
-    const parsed = DayCostMultiplierSchema.parse(config);
-    const { factor } = parsed;
-    const entityScopeValue = parseEntityScope(parsed);
-    const timeScopeValue = parseTimeScope(parsed);
-    return {
-        compile(b) {
-            if (!b.costContext?.active)
-                return;
-            if (factor <= 1)
-                return;
-            const targetMembers = resolveMembersFromScope(entityScopeValue, b.members);
-            const activeDays = resolveActiveDaysFromScope(timeScopeValue, b.days);
-            if (targetMembers.length === 0 || activeDays.length === 0)
-                return;
-            const { normalizationFactor } = b.costContext;
-            const extraFactor = factor - 1;
-            for (const emp of targetMembers) {
-                const rate = getHourlyRate(emp);
-                if (rate === undefined)
-                    continue;
-                for (const pattern of b.shiftPatterns) {
-                    if (!b.canAssign(emp, pattern))
+export const dayCostMultiplierRuleDescriptor = defineRuleDescriptor({
+    name: "day-cost-multiplier",
+    schema: DayCostMultiplierSchema,
+    compile(config) {
+        const { factor } = config;
+        const entityScopeValue = parseEntityScope(config);
+        const timeScopeValue = parseTimeScope(config);
+        const validation = {
+            strategy: "skip",
+            category: "no-meaningful-feedback",
+            rationale: factor <= 1
+                ? "A 1x multiplier does not change optimization or cost accounting."
+                : "Day cost multipliers only affect optimization when minimize-cost is active.",
+        };
+        const costArtifact = {
+            kind: "cost",
+            validation,
+            compileObjective(builder) {
+                if (!builder.costContext?.active || factor <= 1)
+                    return;
+                const targetMembers = resolveMembersFromScope(entityScopeValue, builder.members);
+                const activeDays = resolveActiveDaysFromScope(timeScopeValue, builder.days);
+                if (targetMembers.length === 0 || activeDays.length === 0)
+                    return;
+                const { normalizationFactor } = builder.costContext;
+                const extraFactor = factor - 1;
+                for (const member of targetMembers) {
+                    const rate = getHourlyRate(member);
+                    if (rate === undefined)
                         continue;
-                    for (const day of activeDays) {
-                        if (!b.patternAvailableOnDay(pattern, day))
+                    for (const pattern of builder.shiftPatterns) {
+                        if (!builder.canAssign(member, pattern))
                             continue;
-                        const duration = patternDurationMinutes(pattern);
-                        const extraCost = (rate * extraFactor * duration) / 60;
-                        const normalizedPenalty = extraCost / normalizationFactor;
-                        b.addPenalty(b.assignment(emp.id, pattern.id, day), Math.max(1, normalizedPenalty));
+                        for (const day of activeDays) {
+                            if (!builder.patternAvailableOnDay(pattern, day))
+                                continue;
+                            const duration = patternDurationMinutes(pattern);
+                            const extraCost = (rate * extraFactor * duration) / 60;
+                            const normalizedPenalty = extraCost / normalizationFactor;
+                            builder.addPenalty(builder.assignment(member.id, pattern.id, day), Math.max(1, normalizedPenalty));
+                        }
                     }
                 }
-            }
-        },
-        cost(assignments, members, shiftPatterns) {
-            if (factor <= 1)
-                return { entries: [] };
-            const empMap = new Map(members.map((e) => [e.id, e]));
-            const patternMap = new Map(shiftPatterns.map((p) => [p.id, p]));
-            // Resolve which days this rule applies to from assignments
-            const allDays = [...new Set(assignments.map((a) => a.day))].toSorted();
-            const activeDays = new Set(resolveActiveDaysFromScope(timeScopeValue, allDays));
-            const targetEmpIds = new Set(resolveMembersFromScope(entityScopeValue, [...empMap.values()]).map((e) => e.id));
-            const entries = [];
-            const extraFactor = factor - 1;
-            for (const a of assignments) {
-                if (!activeDays.has(a.day))
-                    continue;
-                if (!targetEmpIds.has(a.memberId))
-                    continue;
-                const emp = empMap.get(a.memberId);
-                if (!emp)
-                    continue;
-                const rate = getHourlyRate(emp);
-                if (rate === undefined)
-                    continue;
-                const pattern = patternMap.get(a.shiftPatternId);
-                if (!pattern)
-                    continue;
-                const duration = patternDurationMinutes(pattern);
-                const amount = (rate * extraFactor * duration) / 60;
-                entries.push({
-                    memberId: a.memberId,
-                    day: a.day,
-                    category: COST_CATEGORY.PREMIUM,
-                    amount,
-                });
-            }
-            return { entries };
-        },
-    };
-}
+            },
+            calculateCost(assignments, costContext) {
+                if (factor <= 1)
+                    return { entries: [] };
+                const memberMap = new Map(costContext.members.map((member) => [member.id, member]));
+                const patternMap = new Map(costContext.shiftPatterns.map((pattern) => [pattern.id, pattern]));
+                const activeDays = new Set(resolveActiveDaysFromScope(timeScopeValue, [...costContext.days]).map((day) => day.iso));
+                const targetMemberIds = new Set(resolveMembersFromScope(entityScopeValue, [...costContext.members]).map((member) => member.id));
+                const extraFactor = factor - 1;
+                const entries = [];
+                for (const assignment of assignments) {
+                    if (!activeDays.has(assignment.day) || !targetMemberIds.has(assignment.memberId))
+                        continue;
+                    const member = memberMap.get(assignment.memberId);
+                    if (!member)
+                        continue;
+                    const rate = getHourlyRate(member);
+                    if (rate === undefined)
+                        continue;
+                    const pattern = patternMap.get(assignment.shiftPatternId);
+                    if (!pattern)
+                        continue;
+                    const duration = patternDurationMinutes(pattern);
+                    entries.push({
+                        memberId: assignment.memberId,
+                        day: assignment.day,
+                        category: COST_CATEGORY.PREMIUM,
+                        amount: (rate * extraFactor * duration) / 60,
+                    });
+                }
+                return { entries };
+            },
+        };
+        return {
+            rule: "day-cost-multiplier",
+            artifacts: [costArtifact],
+        };
+    },
+});
 //# sourceMappingURL=day-cost-multiplier.js.map

package/dist/cpsat/rules/day-cost-multiplier.js.map

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

package/dist/cpsat/rules/day-cost-surcharge.d.ts

@@ -1,19 +1,19 @@
 import * as z from "zod";
-import type { CompilationRule } from "../model-builder.js";
-declare const DayCostSurchargeSchema: z.ZodIntersection<z.ZodIntersection<z.ZodObject<{
+export declare const DayCostSurchargeSchema: z.ZodIntersection<z.ZodIntersection<z.ZodObject<{
     amountPerHour: z.ZodNumber;
 }, 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 createDayCostSurchargeRule}. */
+/** Configuration for {@link dayCostSurchargeRuleDescriptor}. */
 export type DayCostSurchargeConfig = z.infer<typeof DayCostSurchargeSchema>;
 /**
- * Creates a day-based flat surcharge rule.
+ * Low-level descriptor for the `day-cost-surcharge` rule.
  *
- * Adds a flat extra amount per hour for assignments on matching days,
- * independent of the member's base rate.
+ * @remarks
+ * This artifact always contributes to post-solve cost calculation. It only adds
+ * solver objective terms when `minimize-cost` is active.
  *
- * When `minimizeCost()` is not present, no solver terms are emitted,
- * but the `cost()` method still contributes to post-solve calculation.
+ * @category Rules
  */
-export declare function createDayCostSurchargeRule(config: DayCostSurchargeConfig): CompilationRule;
-export {};
+export declare const dayCostSurchargeRuleDescriptor: import("../rule-descriptor.js").RuleDescriptor<"day-cost-surcharge", ({
+    amountPerHour: number;
+} & import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">) & import("./scope.types.js").OptionalTimeScopeType<"dateRange" | "dayOfWeek" | "specificDates" | "recurring">>;
 //# sourceMappingURL=day-cost-surcharge.d.ts.map

package/dist/cpsat/rules/day-cost-surcharge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"day-cost-surcharge.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/day-cost-surcharge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,KAAK,EAAE,eAAe,EAAoB,MAAM,qBAAqB,CAAC;AAc7E,QAAA,MAAM,sBAAsB;;mfAK+C,CAAC;AAE5E,4DAA4D;AAC5D,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAE5E;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,sBAAsB,GAAG,eAAe,CAkE1F"}
+{"version":3,"file":"day-cost-surcharge.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/day-cost-surcharge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAczB,eAAO,MAAM,sBAAsB;;mfAKwC,CAAC;AAE5E,gEAAgE;AAChE,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAE5E;;;;;;;;GAQG;AACH,eAAO,MAAM,8BAA8B;;8LAwFzC,CAAC"}

package/dist/cpsat/rules/day-cost-surcharge.js

@@ -1,80 +1,91 @@
 import * as z from "zod";
+import { defineRuleDescriptor } from "../rule-descriptor.js";
 import { COST_CATEGORY } from "../cost.js";
-import { entityScope, timeScope, parseEntityScope, parseTimeScope, resolveMembersFromScope, resolveActiveDaysFromScope, } from "./scope.types.js";
-import { patternDurationMinutes } from "./cost-utils.js";
-const DayCostSurchargeSchema = z
+import { entityScope, parseEntityScope, parseTimeScope, resolveActiveDaysFromScope, resolveMembersFromScope, timeScope, } from "./scope.types.js";
+import { patternDurationMinutes } from "./pattern-time.js";
+export const DayCostSurchargeSchema = z
     .object({
     amountPerHour: z.number().min(0),
 })
     .and(entityScope(["members", "roles", "skills"]))
     .and(timeScope(["dateRange", "specificDates", "dayOfWeek", "recurring"]));
 /**
- * Creates a day-based flat surcharge rule.
+ * Low-level descriptor for the `day-cost-surcharge` rule.
  *
- * Adds a flat extra amount per hour for assignments on matching days,
- * independent of the member's base rate.
+ * @remarks
+ * This artifact always contributes to post-solve cost calculation. It only adds
+ * solver objective terms when `minimize-cost` is active.
  *
- * When `minimizeCost()` is not present, no solver terms are emitted,
- * but the `cost()` method still contributes to post-solve calculation.
+ * @category Rules
  */
-export function createDayCostSurchargeRule(config) {
-    const parsed = DayCostSurchargeSchema.parse(config);
-    const { amountPerHour } = parsed;
-    const entityScopeValue = parseEntityScope(parsed);
-    const timeScopeValue = parseTimeScope(parsed);
-    return {
-        compile(b) {
-            if (!b.costContext?.active)
-                return;
-            if (amountPerHour <= 0)
-                return;
-            const targetMembers = resolveMembersFromScope(entityScopeValue, b.members);
-            const activeDays = resolveActiveDaysFromScope(timeScopeValue, b.days);
-            if (targetMembers.length === 0 || activeDays.length === 0)
-                return;
-            const { normalizationFactor } = b.costContext;
-            for (const emp of targetMembers) {
-                for (const pattern of b.shiftPatterns) {
-                    if (!b.canAssign(emp, pattern))
-                        continue;
-                    for (const day of activeDays) {
-                        if (!b.patternAvailableOnDay(pattern, day))
+export const dayCostSurchargeRuleDescriptor = defineRuleDescriptor({
+    name: "day-cost-surcharge",
+    schema: DayCostSurchargeSchema,
+    compile(config) {
+        const { amountPerHour } = config;
+        const entityScopeValue = parseEntityScope(config);
+        const timeScopeValue = parseTimeScope(config);
+        const validation = {
+            strategy: "skip",
+            category: "no-meaningful-feedback",
+            rationale: amountPerHour <= 0
+                ? "A zero surcharge does not change optimization or cost accounting."
+                : "Day cost surcharges only affect optimization when minimize-cost is active.",
+        };
+        const costArtifact = {
+            kind: "cost",
+            validation,
+            compileObjective(builder) {
+                if (!builder.costContext?.active || amountPerHour <= 0)
+                    return;
+                const targetMembers = resolveMembersFromScope(entityScopeValue, builder.members);
+                const activeDays = resolveActiveDaysFromScope(timeScopeValue, builder.days);
+                if (targetMembers.length === 0 || activeDays.length === 0)
+                    return;
+                const { normalizationFactor } = builder.costContext;
+                for (const member of targetMembers) {
+                    for (const pattern of builder.shiftPatterns) {
+                        if (!builder.canAssign(member, pattern))
                             continue;
-                        const duration = patternDurationMinutes(pattern);
-                        const surcharge = (amountPerHour * duration) / 60;
-                        const normalizedPenalty = surcharge / normalizationFactor;
-                        b.addPenalty(b.assignment(emp.id, pattern.id, day), Math.max(1, normalizedPenalty));
+                        for (const day of activeDays) {
+                            if (!builder.patternAvailableOnDay(pattern, day))
+                                continue;
+                            const duration = patternDurationMinutes(pattern);
+                            const surcharge = (amountPerHour * duration) / 60;
+                            const normalizedPenalty = surcharge / normalizationFactor;
+                            builder.addPenalty(builder.assignment(member.id, pattern.id, day), Math.max(1, normalizedPenalty));
+                        }
                     }
                 }
-            }
-        },
-        cost(assignments, members, shiftPatterns) {
-            if (amountPerHour <= 0)
-                return { entries: [] };
-            const patternMap = new Map(shiftPatterns.map((p) => [p.id, p]));
-            const allDays = [...new Set(assignments.map((a) => a.day))].toSorted();
-            const activeDays = new Set(resolveActiveDaysFromScope(timeScopeValue, allDays));
-            const targetEmpIds = new Set(resolveMembersFromScope(entityScopeValue, [...members]).map((e) => e.id));
-            const entries = [];
-            for (const a of assignments) {
-                if (!activeDays.has(a.day))
-                    continue;
-                if (!targetEmpIds.has(a.memberId))
-                    continue;
-                const pattern = patternMap.get(a.shiftPatternId);
-                if (!pattern)
-                    continue;
-                const duration = patternDurationMinutes(pattern);
-                const amount = (amountPerHour * duration) / 60;
-                entries.push({
-                    memberId: a.memberId,
-                    day: a.day,
-                    category: COST_CATEGORY.PREMIUM,
-                    amount,
-                });
-            }
-            return { entries };
-        },
-    };
-}
+            },
+            calculateCost(assignments, costContext) {
+                if (amountPerHour <= 0)
+                    return { entries: [] };
+                const patternMap = new Map(costContext.shiftPatterns.map((pattern) => [pattern.id, pattern]));
+                const activeDays = new Set(resolveActiveDaysFromScope(timeScopeValue, [...costContext.days]).map((day) => day.iso));
+                const targetMemberIds = new Set(resolveMembersFromScope(entityScopeValue, [...costContext.members]).map((member) => member.id));
+                const entries = [];
+                for (const assignment of assignments) {
+                    if (!activeDays.has(assignment.day) || !targetMemberIds.has(assignment.memberId))
+                        continue;
+                    const pattern = patternMap.get(assignment.shiftPatternId);
+                    if (!pattern)
+                        continue;
+                    const duration = patternDurationMinutes(pattern);
+                    entries.push({
+                        memberId: assignment.memberId,
+                        day: assignment.day,
+                        category: COST_CATEGORY.PREMIUM,
+                        amount: (amountPerHour * duration) / 60,
+                    });
+                }
+                return { entries };
+            },
+        };
+        return {
+            rule: "day-cost-surcharge",
+            artifacts: [costArtifact],
+        };
+    },
+});
 //# sourceMappingURL=day-cost-surcharge.js.map

package/dist/cpsat/rules/day-cost-surcharge.js.map

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