@outbuild-company/schedule-core 1.9.3 → 1.9.4

package/dist/index.d.cts

@@ -282,9 +282,9 @@ type StringOperator = 'includes' | 'notIncludes' | 'is' | 'isNot';
 type NumberOperator = 'equals' | 'notEquals' | 'greaterThan' | 'lessThan' | 'greaterOrEqual' | 'lessOrEqual';
 type DateOperator = 'after' | 'before';
 type MembershipOperator = 'someOf' | 'notSomeOf';
-type FilterOperator = StringOperator | NumberOperator | DateOperator | MembershipOperator;
+type FilterOperator = StringOperator | NumberOperator | DateOperator | 'between' | MembershipOperator;
 type StringFilterField = 'name' | 'description' | 'customId';
-type NumberFilterField = 'correlativeId' | 'uniqueCorrelativeId' | 'progress' | 'durationDays' | 'calendarDuration' | 'cost' | 'usedCost' | 'realCost' | 'workHours' | 'realWorkHours' | 'ponderator' | 'freeSlackDays' | 'totalSlackDays' | 'expectedProgressBaseline' | 'baselineDurationDays' | 'baselineCost' | 'baselineWorkHours';
+type NumberFilterField = 'correlativeId' | 'uniqueCorrelativeId' | 'progress' | 'durationDays' | 'calendarDuration' | 'cost' | 'usedCost' | 'realCost' | 'workHours' | 'realWorkHours' | 'ponderator' | 'freeSlackDays' | 'totalSlackDays' | 'expectedProgressBaseline' | 'baselineDurationDays' | 'baselineCost' | 'baselineWorkHours' | 'expectedProgress';
 type DateFilterField = 'startDate' | 'endDate' | 'constraintDate' | 'baselineStartDate' | 'baselineEndDate' | 'earlyStart' | 'earlyFinish' | 'lateStart' | 'lateFinish';
 type IdArrayFilterField = 'responsableIds' | 'tagIds';
 type EnumFilterField = 'status' | 'constraintType';
@@ -298,7 +298,13 @@ interface Criterion<Field extends FilterField, Operator, Value> {
     readonly operator: Operator;
     readonly value: Value;
 }
-type FilterCriterion = Criterion<StringFilterField, StringOperator, string> | Criterion<NumberFilterField, NumberOperator, string | number> | Criterion<DateFilterField, DateOperator, string | number | Date> | Criterion<IdArrayFilterField, MembershipOperator, ReadonlyArray<string | number>> | Criterion<EnumFilterField, MembershipOperator, ReadonlyArray<string>> | Criterion<ReferenceFilterField, MembershipOperator, ReadonlyArray<string | number>> | Criterion<BooleanFilterField, MembershipOperator, ReadonlyArray<boolean>>;
+interface BetweenCriterion<Field extends FilterField, Value> {
+    readonly field: Field;
+    readonly operator: 'between';
+    readonly value: Value;
+    readonly valueTo: Value;
+}
+type FilterCriterion = Criterion<StringFilterField, StringOperator, string> | Criterion<NumberFilterField, NumberOperator, string | number> | BetweenCriterion<NumberFilterField, string | number> | Criterion<DateFilterField, DateOperator, string | number | Date> | BetweenCriterion<DateFilterField, string | number | Date> | Criterion<IdArrayFilterField, MembershipOperator, ReadonlyArray<string | number>> | Criterion<EnumFilterField, MembershipOperator, ReadonlyArray<string>> | Criterion<ReferenceFilterField, MembershipOperator, ReadonlyArray<string | number>> | Criterion<BooleanFilterField, MembershipOperator, ReadonlyArray<boolean>>;
 interface FilterDateRange {
     readonly start: Date;
     readonly end: Date;

package/dist/index.d.ts

@@ -282,9 +282,9 @@ type StringOperator = 'includes' | 'notIncludes' | 'is' | 'isNot';
 type NumberOperator = 'equals' | 'notEquals' | 'greaterThan' | 'lessThan' | 'greaterOrEqual' | 'lessOrEqual';
 type DateOperator = 'after' | 'before';
 type MembershipOperator = 'someOf' | 'notSomeOf';
-type FilterOperator = StringOperator | NumberOperator | DateOperator | MembershipOperator;
+type FilterOperator = StringOperator | NumberOperator | DateOperator | 'between' | MembershipOperator;
 type StringFilterField = 'name' | 'description' | 'customId';
-type NumberFilterField = 'correlativeId' | 'uniqueCorrelativeId' | 'progress' | 'durationDays' | 'calendarDuration' | 'cost' | 'usedCost' | 'realCost' | 'workHours' | 'realWorkHours' | 'ponderator' | 'freeSlackDays' | 'totalSlackDays' | 'expectedProgressBaseline' | 'baselineDurationDays' | 'baselineCost' | 'baselineWorkHours';
+type NumberFilterField = 'correlativeId' | 'uniqueCorrelativeId' | 'progress' | 'durationDays' | 'calendarDuration' | 'cost' | 'usedCost' | 'realCost' | 'workHours' | 'realWorkHours' | 'ponderator' | 'freeSlackDays' | 'totalSlackDays' | 'expectedProgressBaseline' | 'baselineDurationDays' | 'baselineCost' | 'baselineWorkHours' | 'expectedProgress';
 type DateFilterField = 'startDate' | 'endDate' | 'constraintDate' | 'baselineStartDate' | 'baselineEndDate' | 'earlyStart' | 'earlyFinish' | 'lateStart' | 'lateFinish';
 type IdArrayFilterField = 'responsableIds' | 'tagIds';
 type EnumFilterField = 'status' | 'constraintType';
@@ -298,7 +298,13 @@ interface Criterion<Field extends FilterField, Operator, Value> {
     readonly operator: Operator;
     readonly value: Value;
 }
-type FilterCriterion = Criterion<StringFilterField, StringOperator, string> | Criterion<NumberFilterField, NumberOperator, string | number> | Criterion<DateFilterField, DateOperator, string | number | Date> | Criterion<IdArrayFilterField, MembershipOperator, ReadonlyArray<string | number>> | Criterion<EnumFilterField, MembershipOperator, ReadonlyArray<string>> | Criterion<ReferenceFilterField, MembershipOperator, ReadonlyArray<string | number>> | Criterion<BooleanFilterField, MembershipOperator, ReadonlyArray<boolean>>;
+interface BetweenCriterion<Field extends FilterField, Value> {
+    readonly field: Field;
+    readonly operator: 'between';
+    readonly value: Value;
+    readonly valueTo: Value;
+}
+type FilterCriterion = Criterion<StringFilterField, StringOperator, string> | Criterion<NumberFilterField, NumberOperator, string | number> | BetweenCriterion<NumberFilterField, string | number> | Criterion<DateFilterField, DateOperator, string | number | Date> | BetweenCriterion<DateFilterField, string | number | Date> | Criterion<IdArrayFilterField, MembershipOperator, ReadonlyArray<string | number>> | Criterion<EnumFilterField, MembershipOperator, ReadonlyArray<string>> | Criterion<ReferenceFilterField, MembershipOperator, ReadonlyArray<string | number>> | Criterion<BooleanFilterField, MembershipOperator, ReadonlyArray<boolean>>;
 interface FilterDateRange {
     readonly start: Date;
     readonly end: Date;

package/dist/index.js

@@ -338,6 +338,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
@@ -444,12 +448,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)));
@@ -472,6 +484,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);
   }
@@ -651,9 +680,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"]),
@@ -684,6 +714,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" } : {
@@ -724,6 +757,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") {