gantt-lib 0.124.2 → 0.126.0

package/dist/core/scheduling/index.mjs

@@ -101,8 +101,7 @@ function getTaskDuration(startDate, endDate, businessDays = false, weekendPredic
 // src/core/scheduling/dependencies.ts
 function normalizePredecessorDates(predecessor, parseDateFn) {
   const predStart = parseDateFn(predecessor.startDate);
-  const isMilestone = predecessor.type === "milestone";
-  const predEnd = isMilestone ? new Date(predStart.getTime() - DAY_MS) : parseDateFn(predecessor.endDate);
+  const predEnd = predecessor.type === "milestone" ? predStart : parseDateFn(predecessor.endDate);
   return { predStart, predEnd };
 }
 function getDependencyLag(dep) {
@@ -111,7 +110,7 @@ function getDependencyLag(dep) {
 function normalizeTaskDependencyLags(task) {
   return task;
 }
-function normalizeDependencyLag(linkType, lag, predecessorStart, predecessorEnd, businessDays = false, weekendPredicate) {
+function normalizeDependencyLag(linkType, lag, predecessorStart, predecessorEnd, businessDays = false, weekendPredicate, successorType) {
   if (linkType !== "FS") {
     return lag;
   }
@@ -121,9 +120,10 @@ function normalizeDependencyLag(linkType, lag, predecessorStart, predecessorEnd,
     businessDays,
     weekendPredicate
   );
-  return Math.max(-predecessorDuration, lag);
+  const minimumLag = successorType === "milestone" ? -Math.max(0, predecessorDuration - 1) : -predecessorDuration;
+  return Math.max(minimumLag, lag);
 }
-function computeLagFromDates(linkType, predStart, predEnd, succStart, succEnd, businessDays = false, weekendPredicate) {
+function computeLagFromDates(linkType, predStart, predEnd, succStart, succEnd, businessDays = false, weekendPredicate, successorType) {
   const pS = Date.UTC(predStart.getUTCFullYear(), predStart.getUTCMonth(), predStart.getUTCDate());
   const pE = Date.UTC(predEnd.getUTCFullYear(), predEnd.getUTCMonth(), predEnd.getUTCDate());
   const sS = Date.UTC(succStart.getUTCFullYear(), succStart.getUTCMonth(), succStart.getUTCDate());
@@ -133,11 +133,12 @@ function computeLagFromDates(linkType, predStart, predEnd, succStart, succEnd, b
       case "FS":
         return normalizeDependencyLag(
           linkType,
-          Math.round((sS - pE) / DAY_MS) - 1,
+          Math.round((sS - pE) / DAY_MS) - (successorType === "milestone" ? 0 : 1),
           predStart,
           predEnd,
           businessDays,
-          weekendPredicate
+          weekendPredicate,
+          successorType
         );
       case "SS":
         return Math.round((sS - pS) / DAY_MS);
@@ -154,11 +155,12 @@ function computeLagFromDates(linkType, predStart, predEnd, succStart, succEnd, b
     case "FS":
       return normalizeDependencyLag(
         linkType,
-        businessOffset - 1,
+        businessOffset - (successorType === "milestone" ? 0 : 1),
         predStart,
         predEnd,
         businessDays,
-        weekendPredicate
+        weekendPredicate,
+        successorType
       );
     case "SS":
       return businessOffset;
@@ -168,19 +170,20 @@ function computeLagFromDates(linkType, predStart, predEnd, succStart, succEnd, b
       return businessOffset + 1;
   }
 }
-function calculateSuccessorDate(predecessorStart, predecessorEnd, linkType, lag = 0, businessDays = false, weekendPredicate) {
+function calculateSuccessorDate(predecessorStart, predecessorEnd, linkType, lag = 0, businessDays = false, weekendPredicate, successorType) {
   const normalizedLag = normalizeDependencyLag(
     linkType,
     lag,
     predecessorStart,
     predecessorEnd,
     businessDays,
-    weekendPredicate
+    weekendPredicate,
+    successorType
   );
   if (!businessDays || !weekendPredicate) {
     switch (linkType) {
       case "FS":
-        return new Date(predecessorEnd.getTime() + (normalizedLag + 1) * DAY_MS);
+        return new Date(predecessorEnd.getTime() + (normalizedLag + (successorType === "milestone" ? 0 : 1)) * DAY_MS);
       case "SS":
         return new Date(predecessorStart.getTime() + normalizedLag * DAY_MS);
       case "FF":
@@ -193,7 +196,7 @@ function calculateSuccessorDate(predecessorStart, predecessorEnd, linkType, lag
   let offset;
   switch (linkType) {
     case "FS":
-      offset = normalizedLag + 1;
+      offset = normalizedLag + (successorType === "milestone" ? 0 : 1);
       break;
     case "SS":
       offset = normalizedLag;
@@ -425,7 +428,8 @@ function clampTaskRangeForIncomingFS(task, proposedStart, proposedEnd, allTasks,
       "FS",
       -predecessorDuration,
       businessDays,
-      weekendPredicate
+      weekendPredicate,
+      task.type
     );
     if (!minAllowedStart || candidateMinStart.getTime() > minAllowedStart.getTime()) {
       minAllowedStart = candidateMinStart;
@@ -459,7 +463,8 @@ function recalculateIncomingLags(task, newStartDate, newEndDate, allTasks, busin
       newStartDate,
       newEndDate,
       businessDays,
-      weekendPredicate
+      weekendPredicate,
+      task.type
     );
     return { ...dep, lag: nextLag };
   });
@@ -574,7 +579,10 @@ function cascadeByLinks(movedTaskId, newStart, newEnd, allTasks, skipChildCascad
         normalizedPredStart,
         normalizedPredEnd,
         dep.type,
-        getDependencyLag(dep)
+        getDependencyLag(dep),
+        false,
+        void 0,
+        task.type
       );
       let newSuccStart;
       let newSuccEnd;
@@ -736,7 +744,8 @@ function universalCascade(movedTask, newStart, newEnd, allTasks, businessDays =
         dep.type,
         getDependencyLag(dep),
         businessDays,
-        weekendPredicate
+        weekendPredicate,
+        task.type
       );
       let succNewStart;
       let succNewEnd;
@@ -1036,7 +1045,8 @@ function recalculateTaskFromDependencies(taskId, snapshot, options) {
       dep.type,
       getDependencyLag(dep),
       businessDays,
-      weekendPredicate
+      weekendPredicate,
+      task.type
     );
     const duration = getTaskDuration(
       parseDateOnly(task.startDate),
@@ -1152,7 +1162,8 @@ function recalculateProjectSchedule(snapshot, options) {
           dep.type,
           getDependencyLag(dep),
           businessDays,
-          weekendPredicate
+          weekendPredicate,
+          currentTask.type
         );
         const candidateRange = dep.type === "FS" || dep.type === "SS" ? buildTaskRangeFromStart(constraintDate, duration, businessDays, weekendPredicate) : buildTaskRangeFromEnd(constraintDate, duration, businessDays, weekendPredicate);
         if (!constrainedRange || candidateRange.start.getTime() > constrainedRange.start.getTime() || candidateRange.start.getTime() === constrainedRange.start.getTime() && candidateRange.end.getTime() > constrainedRange.end.getTime()) {