@outbuild-company/schedule-core 1.9.3 → 1.9.4

package/dist/index.cjs

@@ -340,6 +340,10 @@ var FIELD_REGISTRY = {
     valueKind: "number",
     extract: (activity) => activity.expectedProgressBaseline
   },
+  expectedProgress: {
+    valueKind: "number",
+    extract: (activity) => activity.expectedProgress
+  },
   baselineDurationDays: {
     valueKind: "number",
     extract: (activity) => activity.baselineSnapshot?.durationDays ?? null
@@ -446,12 +450,20 @@ function matchNumber(value, target, operator) {
   if (operator === "lessOrEqual") return value <= target;
   return false;
 }
+function matchNumberBetween(value, minimum, maximum) {
+  return typeof value === "number" && value >= minimum && value <= maximum;
+}
 function matchDate(value, target, operator) {
   if (!(value instanceof Date)) return false;
   if (operator === "after") return value.getTime() > target.getTime();
   if (operator === "before") return value.getTime() < target.getTime();
   return false;
 }
+function matchDateBetween(value, minimum, maximum) {
+  if (!(value instanceof Date)) return false;
+  const time = value.getTime();
+  return time >= minimum.getTime() && time <= maximum.getTime();
+}
 function matchIdArray(value, allowed, operator) {
   const ids = Array.isArray(value) ? value : [];
   const intersects = ids.some((id) => allowed.has(String(id)));
@@ -474,6 +486,23 @@ function matchCriterion(activity, criterion, context) {
   if (descriptor === null) return false;
   const value = descriptor.extract(activity, context);
   const { operator } = criterion;
+  if (operator === "between") {
+    if (descriptor.valueKind === "number") {
+      return matchNumberBetween(
+        value,
+        Number(criterion.value),
+        Number(criterion.valueTo)
+      );
+    }
+    if (descriptor.valueKind === "date") {
+      return matchDateBetween(
+        value,
+        toTargetDate(criterion.value),
+        toTargetDate(criterion.valueTo)
+      );
+    }
+    return false;
+  }
   if (descriptor.valueKind === "string") {
     return matchString(value, String(criterion.value), operator);
   }
@@ -653,9 +682,10 @@ var OPERATORS_BY_KIND = {
     "greaterThan",
     "lessThan",
     "greaterOrEqual",
-    "lessOrEqual"
+    "lessOrEqual",
+    "between"
   ]),
-  date: /* @__PURE__ */ new Set(["after", "before"]),
+  date: /* @__PURE__ */ new Set(["after", "before", "between"]),
   "id-array": /* @__PURE__ */ new Set(["someOf", "notSomeOf"]),
   enum: /* @__PURE__ */ new Set(["someOf", "notSomeOf"]),
   boolean: /* @__PURE__ */ new Set(["someOf", "notSomeOf"]),
@@ -686,6 +716,9 @@ function normalizeCriterion(criterion) {
   if (!OPERATORS_BY_KIND[descriptor.valueKind].has(criterion.operator)) {
     return { ok: false, reason: "unknown_operator" };
   }
+  if (criterion.operator === "between") {
+    return normalizeBetweenCriterion(criterion, descriptor.valueKind);
+  }
   if (descriptor.valueKind === "number") {
     const value = normalizeNumberValue(criterion.value);
     return value === null ? { ok: false, reason: "invalid_value" } : {
@@ -726,6 +759,31 @@ function normalizeCriterion(criterion) {
   }
   return { ok: true, criterion };
 }
+function normalizeBetweenCriterion(criterion, valueKind) {
+  if (valueKind === "number") {
+    const value = normalizeNumberValue(criterion.value);
+    const valueTo = normalizeNumberValue(criterion.valueTo);
+    if (value === null || valueTo === null || value > valueTo) {
+      return { ok: false, reason: "invalid_value" };
+    }
+    return {
+      ok: true,
+      criterion: { ...criterion, value, valueTo }
+    };
+  }
+  if (valueKind === "date") {
+    const value = normalizeDateValue(criterion.value);
+    const valueTo = normalizeDateValue(criterion.valueTo);
+    if (value === null || valueTo === null || value.getTime() > valueTo.getTime()) {
+      return { ok: false, reason: "invalid_value" };
+    }
+    return {
+      ok: true,
+      criterion: { ...criterion, value, valueTo }
+    };
+  }
+  return { ok: false, reason: "unknown_operator" };
+}
 function validateValueForKind(criterion, valueKind) {
   const { value } = criterion;
   if (valueKind === "boolean") {