@outbuild-company/schedule-core 1.13.2 → 1.13.4

package/dist/index.cjs

@@ -3595,7 +3595,7 @@ var LAG_UNIT = {
   MONTH_DHTMLX: "mon",
   YEAR: "y"
 };
-var ENTRY_RE = /^(\d+)(fs|ss|ff|sf)?(?:([+-]?)(\d+(?:\.\d+)?)(wk|w|mon|m|d|y)?)?$/i;
+var ENTRY_RE = /^(\d+)(fs|ss|ff|sf)?(?:([+-]?)(\d+(?:\.\d+)?)(weeks?|wk|w|months?|mon|m|days?|d|years?|y)?)?$/i;
 
 // src/autoscheduler/links/parse-predecessor-string.ts
 var DEFAULT_WORKING_DAYS_PER_WEEK = 5;
@@ -3603,10 +3603,22 @@ var DAYS_PER_MONTH = 30;
 var DAYS_PER_YEAR = 365;
 var FIXED_UNIT_DAYS = {
   [LAG_UNIT.DAY]: 1,
+  day: 1,
+  days: 1,
   [LAG_UNIT.MONTH]: DAYS_PER_MONTH,
   [LAG_UNIT.MONTH_DHTMLX]: DAYS_PER_MONTH,
-  [LAG_UNIT.YEAR]: DAYS_PER_YEAR
+  month: DAYS_PER_MONTH,
+  months: DAYS_PER_MONTH,
+  [LAG_UNIT.YEAR]: DAYS_PER_YEAR,
+  year: DAYS_PER_YEAR,
+  years: DAYS_PER_YEAR
 };
+var WEEK_UNITS = /* @__PURE__ */ new Set([
+  LAG_UNIT.WEEK,
+  LAG_UNIT.WEEK_DHTMLX,
+  "week",
+  "weeks"
+]);
 function parsePredecessorString(input, options = {}) {
   const specs = [];
   const errors = [];
@@ -3631,7 +3643,7 @@ function parseEntry(entry, daysPerWeek) {
   if (magnitude !== void 0) {
     const value = Number(magnitude);
     if (Number.isNaN(value)) return null;
-    const unitDays = unit === LAG_UNIT.WEEK || unit === LAG_UNIT.WEEK_DHTMLX ? daysPerWeek : FIXED_UNIT_DAYS[unit ?? LAG_UNIT.DAY];
+    const unitDays = unit !== void 0 && WEEK_UNITS.has(unit) ? daysPerWeek : FIXED_UNIT_DAYS[unit ?? LAG_UNIT.DAY];
     const days = value * unitDays;
     lag = sign === "-" ? -days : days;
   }
@@ -15345,7 +15357,7 @@ function parseFiniteNonNegative(value) {
   if (!Number.isFinite(numeric) || numeric < 0) return null;
   return numeric;
 }
-function normalizeBaselinePoint(point, reporter, diagnostic) {
+function normalizeBaselinePoint(point, reporter, diagnostic, isMilestone = false) {
   const durationDays = parseFiniteNonNegative(point.duration);
   const cost = parseFiniteNonNegative(point.cost);
   const workHours = parseFiniteNonNegative(point.hh_work);
@@ -15361,9 +15373,17 @@ function normalizeBaselinePoint(point, reporter, diagnostic) {
     );
     return null;
   }
+  const startDate = parseBaselineDate(point.start_date);
+  const parsedEndDate = parseBaselineDate(point.end_date);
+  const hasInvertedLegacyMilestone = isMilestone && durationDays === 0 && startDate !== null && parsedEndDate !== null && parsedEndDate < startDate;
+  if (hasInvertedLegacyMilestone) {
+    reporter.warn(
+      "[baseline] normalizing inverted zero-duration milestone to one instant"
+    );
+  }
   return {
-    startDate: parseBaselineDate(point.start_date),
-    endDate: parseBaselineDate(point.end_date),
+    startDate,
+    endDate: hasInvertedLegacyMilestone ? startDate : parsedEndDate,
     durationDays,
     cost,
     workHours,
@@ -15407,14 +15427,20 @@ function applyBaselinePoints(adapter, points, reporter, recordDiagnostic = noopL
   }
   const changed = [];
   for (const [coreId, group] of grouped) {
+    const isMilestone = adapter.getActivity(coreId)?.type === ACTIVITY_TYPE.MILESTONE;
     adapter.setActivityField(
       coreId,
       "baselinePoints",
       group.map(
-        (point) => normalizeBaselinePoint(point, reporter, {
-          record: recordDiagnostic,
-          sampleId: coreId
-        })
+        (point) => normalizeBaselinePoint(
+          point,
+          reporter,
+          {
+            record: recordDiagnostic,
+            sampleId: coreId
+          },
+          isMilestone
+        )
       ).filter((point) => point !== null)
     );
     changed.push(coreId);
@@ -20899,13 +20925,18 @@ function parseCriticality(raw, reporter) {
   );
   return false;
 }
-function parseBaselinePoints(raw, reporter, recordDiagnostic, activityId) {
+function parseBaselinePoints(raw, reporter, recordDiagnostic, activityId, isMilestone) {
   if (!Array.isArray(raw)) return [];
   return raw.map(
-    (point) => normalizeBaselinePoint(point, reporter, {
-      record: recordDiagnostic,
-      sampleId: activityId
-    })
+    (point) => normalizeBaselinePoint(
+      point,
+      reporter,
+      {
+        record: recordDiagnostic,
+        sampleId: activityId
+      },
+      isMilestone
+    )
   ).filter((point) => point !== null);
 }
 function parseActivity(raw, context) {
@@ -20966,7 +20997,8 @@ function parseActivity(raw, context) {
       raw.baseline_points,
       context.reporter,
       context.recordDiagnostic,
-      String(raw.unique_id)
+      String(raw.unique_id),
+      isMilestone
     ),
     baselineSnapshot: null,
     recursiveDurationHours: durationToHours(