build: fix all type issues

Author: iobuhov

packages/shared/widget-plugin-dropdown-filter/package.json

@@ -29,6 +29,7 @@
     "dependencies": {
         "@mendix/widget-plugin-mobx-kit": "workspace:^",
         "downshift": "^9.0.9",
+        "mendix": "^10.21.64362",
         "mobx": "6.12.3",
         "mobx-react-lite": "4.0.7"
     },

packages/shared/widget-plugin-filtering/src/__tests__/RefFilterStore.spec.ts renamed to packages/shared/widget-plugin-dropdown-filter/src/__tests__/RefFilterStore.spec.ts

@@ -1,7 +1,7 @@
 import { cases, list, listExpression, listReference, ListValueBuilder, obj } from "@mendix/widget-plugin-test-utils";
 import { ObjectItem } from "mendix";
 import { _resetGlobalState, autorun } from "mobx";
-import { RefFilterStore, RefFilterStoreProps } from "../stores/picker/RefFilterStore";
+import { RefFilterStore, RefFilterStoreProps } from "../stores/RefFilterStore";
 
 describe("RefFilterStore", () => {
     afterEach(() => _resetGlobalState());

packages/shared/widget-plugin-filtering/src/controls/base/ClearButton.tsx renamed to packages/shared/widget-plugin-dropdown-filter/src/controls/base/ClearButton.tsx

@@ -28,7 +28,6 @@
         "dev": "tsc --watch",
         "format": "prettier --write .",
         "lint": "eslint src/ package.json",
-        "prepare": "tsc",
         "test": "jest"
     },
     "dependencies": {
@@ -41,7 +40,7 @@
         "@mendix/widget-plugin-mobx-kit": "workspace:^",
         "@mendix/widget-plugin-platform": "workspace:*",
         "downshift": "^9.0.8",
-        "mendix": "^10.16.49747",
+        "mendix": "^10.21.64362",
         "mobx": "6.12.3",
         "mobx-react-lite": "4.0.7"
     },

packages/shared/widget-plugin-filtering/src/controls/base/OptionsWrapper.tsx renamed to packages/shared/widget-plugin-dropdown-filter/src/controls/base/OptionsWrapper.tsx

@@ -1,5 +1,5 @@
 jest.mock("mendix/filters/builders");
-import { attrId, listAttr } from "@mendix/widget-plugin-test-utils";
+import { attrId, listAttribute } from "@mendix/widget-plugin-test-utils";
 import { ListAttributeValue } from "mendix";
 import {
     and,
@@ -28,7 +28,7 @@ describe("DateInputFilterStore", () => {
         let store: DateInputFilterStore;
 
         beforeEach(() => {
-            attr = listAttr(() => new Date());
+            attr = listAttribute(() => new Date());
             attr.id = attrId("attr_unset");
             store = new DateInputFilterStore([attr], null);
         });
@@ -125,7 +125,7 @@ describe("DateInputFilterStore", () => {
         });
 
         it("uses 'or' when have multiple attributes", () => {
-            const [attr1, attr2] = [listAttr(() => new Date()), listAttr(() => new Date())];
+            const [attr1, attr2] = [listAttribute(() => new Date()), listAttribute(() => new Date())];
             store = new DateInputFilterStore([attr1, attr2], null);
             const date1 = new Date("2024-09-17T01:01:01.000Z");
             store.filterFunction = "equal";
@@ -146,7 +146,7 @@ describe("DateInputFilterStore", () => {
         let store: DateInputFilterStore;
 
         beforeEach(() => {
-            attr = listAttr(() => new Date());
+            attr = listAttribute(() => new Date());
             store = new DateInputFilterStore([attr], null);
             expect(store.filterFunction).toBe("equal");
         });

packages/shared/widget-plugin-filtering/src/controls/combobox/Combobox.tsx renamed to packages/shared/widget-plugin-dropdown-filter/src/controls/combobox/Combobox.tsx

@@ -1,8 +1,12 @@
+import {
+    FilterFunctionBinary,
+    FilterFunctionGeneric,
+    FilterFunctionNonValue
+} from "@mendix/filter-commons/typings/FilterFunctions";
 import { debounce } from "@mendix/widget-plugin-platform/utils/debounce";
 import { action, autorun, computed, makeObservable, reaction, runInAction } from "mobx";
 import { createRef } from "react";
 import { InputStore } from "../../stores/input/InputStore";
-import { FilterFunctionBinary, FilterFunctionGeneric, FilterFunctionNonValue } from "../../typings/FilterFunctions";
 import { FilterV, Number_InputFilterInterface } from "../../typings/InputFilterInterface";
 
 export type Params = {

packages/shared/widget-plugin-filtering/src/controls/hooks/useFloatingMenu.tsx renamed to packages/shared/widget-plugin-dropdown-filter/src/controls/hooks/useFloatingMenu.tsx

@@ -1,13 +1,13 @@
-import { debounce } from "@mendix/widget-plugin-platform/utils/debounce";
-import { action, autorun, computed, makeObservable, reaction, runInAction } from "mobx";
-import { createRef } from "react";
-import { InputStore } from "../../stores/input/InputStore";
 import {
     FilterFunctionBinary,
     FilterFunctionGeneric,
     FilterFunctionNonValue,
     FilterFunctionString
-} from "../../typings/FilterFunctions";
+} from "@mendix/filter-commons/typings/FilterFunctions";
+import { debounce } from "@mendix/widget-plugin-platform/utils/debounce";
+import { action, autorun, computed, makeObservable, reaction, runInAction } from "mobx";
+import { createRef } from "react";
+import { InputStore } from "../../stores/input/InputStore";
 import { FilterV, String_InputFilterInterface } from "../../typings/InputFilterInterface";
 
 export type Params = {

packages/shared/widget-plugin-filtering/src/controls/picker-primitives.tsx renamed to packages/shared/widget-plugin-dropdown-filter/src/controls/picker-primitives.tsx

@@ -36,7 +36,7 @@ export function useSelect(props: useSelectProps): ViewProps {
         items: props.options,
         selectedItem,
         itemToString,
-        onSelectedItemChange: ({ selectedItem }) => props.onSelect(selectedItem.value)
+        onSelectedItemChange: ({ selectedItem }) => props.onSelect(selectedItem?.value ?? null)
     });
 
     const { refs, floatingStyles } = useFloating({

packages/shared/widget-plugin-filtering/src/controls/select/Select.tsx renamed to packages/shared/widget-plugin-dropdown-filter/src/controls/select/Select.tsx

@@ -3,7 +3,7 @@ import { observer } from "mobx-react-lite";
 import classNames from "classnames";
 import { FilterSelector } from "../filter-selector/FilterSelector";
 import { InputComponentProps } from "./typings";
-import { AllFunctions } from "../../typings/FilterFunctions";
+import { AllFunctions } from "@mendix/filter-commons/typings/FilterFunctions";
 
 export function InputWithFiltersComponent<Fn extends AllFunctions>(props: InputComponentProps<Fn>): React.ReactElement {
     const {

packages/shared/widget-plugin-filtering/src/controls/tag-picker/TagPicker.tsx renamed to packages/shared/widget-plugin-dropdown-filter/src/controls/tag-picker/TagPicker.tsx

@@ -1,5 +1,5 @@
+import { AllFunctions } from "@mendix/filter-commons/typings/FilterFunctions";
 import { InputStore } from "../../stores/input/InputStore";
-import { AllFunctions } from "../../typings/FilterFunctions";
 import { InputFilterInterface } from "../../typings/InputFilterInterface";
 
 export interface BaseProps {

packages/shared/widget-plugin-filtering/package.json

@@ -1,7 +1,7 @@
+import { isAnd, isTag } from "@mendix/filter-commons/condition-utils";
 import { disposeBatch } from "@mendix/widget-plugin-mobx-kit/disposeBatch";
 import { ISetupable } from "@mendix/widget-plugin-mobx-kit/setupable";
 import { FilterCondition } from "mendix/filters";
-import { isAnd, isTag } from "../condition-utils";
 import { FilterAPI } from "../context";
 import { Filter } from "../typings/FilterObserver";
 

packages/shared/widget-plugin-filtering/src/__tests__/DateInputFilterStore.spec.ts

@@ -1,7 +1,11 @@
+import {
+    FilterFunctionBinary,
+    FilterFunctionGeneric,
+    FilterFunctionNonValue
+} from "@mendix/filter-commons/typings/FilterFunctions";
 import { ActionValue, EditableValue } from "mendix";
 import { reaction } from "mobx";
 import { useEffect, useRef } from "react";
-import { FilterFunctionBinary, FilterFunctionGeneric, FilterFunctionNonValue } from "../typings/FilterFunctions";
 import { InputFilterInterface } from "../typings/InputFilterInterface";
 
 interface Props {

packages/shared/widget-plugin-filtering/src/controllers/input/NumberInputController.ts

@@ -1,7 +1,7 @@
+import { AllFunctions } from "@mendix/filter-commons/typings/FilterFunctions";
 import { useEffect, useState } from "react";
 import { NumberFilterController, Params } from "../controllers/input/NumberInputController";
 import { ArgumentInterface } from "../typings/ArgumentInterface";
-import { AllFunctions } from "../typings/FilterFunctions";
 import { FilterFn, InputFilterBaseInterface } from "../typings/InputFilterInterface";
 
 export function useNumberFilterController<

packages/shared/widget-plugin-filtering/src/controllers/input/StringInputController.ts

@@ -1,5 +1,5 @@
+import { IJSActionsControlled } from "@mendix/filter-commons/typings/IJSActionsControlled";
 import { useOnResetValueEvent, useOnSetValueEvent } from "@mendix/widget-plugin-external-events/hooks";
-import { IJSActionsControlled } from "../typings/IJSActionsControlled";
 
 export function usePickerJSActions(
     controller: IJSActionsControlled,

packages/shared/widget-plugin-filtering/src/controls/filter-selector/useSelect.tsx

@@ -1,8 +1,8 @@
+import { PickerFilterStore } from "@mendix/widget-plugin-dropdown-filter/typings/PickerFilterStore";
 import { useRef } from "react";
 import { FilterType, getFilterStore, useFilterContextValue } from "../context";
 import { APIError, EMISSINGSTORE, EStoreTypeMisMatch, OPTIONS_NOT_FILTERABLE } from "../errors";
 import { Result, error, value } from "../result-meta";
-import { PickerFilterStore } from "../typings/PickerFilterStore";
 
 export interface Select_FilterAPIv2 {
     filterStore: PickerFilterStore;

packages/shared/widget-plugin-filtering/src/controls/input/InputWithFilters.tsx

@@ -1,7 +1,7 @@
+import { AllFunctions } from "@mendix/filter-commons/typings/FilterFunctions";
 import { useEffect, useState } from "react";
 import { Params, StringFilterController } from "../controllers/input/StringInputController";
 import { ArgumentInterface } from "../typings/ArgumentInterface";
-import { AllFunctions } from "../typings/FilterFunctions";
 import { FilterFn, InputFilterBaseInterface } from "../typings/InputFilterInterface";
 
 export function useStringFilterController<

packages/shared/widget-plugin-filtering/src/controls/input/typings.ts

@@ -1,14 +1,14 @@
+import { FiltersSettingsMap } from "@mendix/filter-commons/typings/settings";
+import { StaticSelectFilterStore } from "@mendix/widget-plugin-dropdown-filter/stores/StaticSelectFilterStore";
+import { PickerFilterStore } from "@mendix/widget-plugin-dropdown-filter/typings/PickerFilterStore";
 import { ListAttributeValue } from "mendix";
 import { FilterCondition } from "mendix/filters";
 import { action, comparer, computed, makeObservable, observable, reaction } from "mobx";
 import { FilterType as Ft, LegacyProvider } from "../context";
 import { DateInputFilterStore } from "../stores/input/DateInputFilterStore";
 import { NumberInputFilterStore } from "../stores/input/NumberInputFilterStore";
 import { StringInputFilterStore } from "../stores/input/StringInputFilterStore";
-import { StaticSelectFilterStore } from "../stores/picker/StaticSelectFilterStore";
 import { InputFilterInterface } from "../typings/InputFilterInterface";
-import { PickerFilterStore } from "../typings/PickerFilterStore";
-import { FiltersSettingsMap } from "../typings/settings";
 
 type FilterMap = {
     [Ft.STRING]: StringInputFilterStore | null;

packages/shared/widget-plugin-filtering/src/custom-filter-api/BaseStoreProvider.ts

@@ -1,9 +1,9 @@
+import { tag } from "@mendix/filter-commons/condition-utils";
+import { FiltersSettingsMap } from "@mendix/filter-commons/typings/settings";
 import { FilterCondition } from "mendix/filters";
 import { and } from "mendix/filters/builders";
 import { autorun, makeAutoObservable } from "mobx";
-import { tag } from "../../condition-utils";
 import { Filter, FilterObserver } from "../../typings/FilterObserver";
-import { FiltersSettingsMap } from "../../typings/settings";
 
 export class CustomFilterHost implements FilterObserver {
     private filters: Map<string, Filter> = new Map();

packages/shared/widget-plugin-filtering/src/custom-filter-api/DropdownStoreProvider.ts

@@ -1,3 +1,4 @@
+import { FiltersSettingsMap } from "@mendix/filter-commons/typings/settings";
 import { ListAttributeValue } from "mendix";
 import { FilterCondition } from "mendix/filters";
 import { computed, makeObservable } from "mobx";
@@ -6,7 +7,6 @@ import { APIError } from "../../errors";
 import { LegacyPv } from "../../providers/LegacyPv";
 import { Result, value } from "../../result-meta";
 import { FilterObserver } from "../../typings/FilterObserver";
-import { FiltersSettingsMap } from "../../typings/settings";
 
 export interface FilterListType {
     filter: ListAttributeValue<string | Big | boolean | Date>;

packages/shared/widget-plugin-filtering/src/custom-filter-api/index.ts

@@ -1,3 +1,5 @@
+import { AllFunctions } from "@mendix/filter-commons/typings/FilterFunctions";
+import { FilterData, InputData } from "@mendix/filter-commons/typings/settings";
 import { Big } from "big.js";
 import { AttributeMetaData } from "mendix";
 import { FilterCondition } from "mendix/filters";
@@ -17,8 +19,6 @@ import {
     startsWith
 } from "mendix/filters/builders";
 import { action, computed, makeObservable, observable } from "mobx";
-import { AllFunctions } from "../../typings/FilterFunctions";
-import { FilterData, InputData } from "../../typings/settings";
 import { Argument } from "./Argument";
 
 type StateTuple<Fn, V> = [Fn] | [Fn, V] | [Fn, V, V];

packages/shared/widget-plugin-filtering/src/helpers/useDateSync.ts

@@ -1,3 +1,18 @@
+import {
+    betweenToState,
+    isAnd,
+    isEmptyExp,
+    isNotEmptyExp,
+    isOr,
+    singularToState
+} from "@mendix/filter-commons/condition-utils";
+import {
+    FilterFunctionBinary,
+    FilterFunctionGeneric,
+    FilterFunctionNonValue
+} from "@mendix/filter-commons/typings/FilterFunctions";
+import { FilterName } from "@mendix/filter-commons/typings/mendix";
+import { FilterData, InputData } from "@mendix/filter-commons/typings/settings";
 import { AttributeMetaData, DateTimeFormatter, ListAttributeValue, SimpleFormatter } from "mendix";
 import { AndCondition, FilterCondition, LiteralExpression } from "mendix/filters";
 import {
@@ -15,11 +30,7 @@ import {
     or
 } from "mendix/filters/builders";
 import { action, comparer, IReactionDisposer, makeObservable, observable, reaction } from "mobx";
-import { betweenToState, isAnd, isEmptyExp, isNotEmptyExp, isOr, singularToState } from "../../condition-utils";
-import { FilterFunctionBinary, FilterFunctionGeneric, FilterFunctionNonValue } from "../../typings/FilterFunctions";
 import { Date_InputFilterInterface } from "../../typings/InputFilterInterface";
-import { FilterFunction } from "../../typings/mendix";
-import { FilterData, InputData } from "../../typings/settings";
 import { DateArgument } from "./Argument";
 import { BaseInputFilterStore } from "./BaseInputFilterStore";
 
@@ -249,7 +260,7 @@ export class DateInputFilterStore
         }
     }
 
-    private mapFn = (name: FilterFunction | "between" | "empty" | "notEmpty"): DateFns => {
+    private mapFn = (name: FilterName | "between" | "empty" | "notEmpty"): DateFns => {
         switch (name) {
             case "day:=":
                 return "equal";

packages/shared/widget-plugin-filtering/src/helpers/useNumberFilterController.ts

@@ -1,11 +1,15 @@
+import { inputStateFromCond } from "@mendix/filter-commons/condition-utils";
+import {
+    FilterFunctionBinary,
+    FilterFunctionGeneric,
+    FilterFunctionNonValue
+} from "@mendix/filter-commons/typings/FilterFunctions";
+import { FilterData, InputData } from "@mendix/filter-commons/typings/settings";
 import { Big } from "big.js";
 import { AttributeMetaData, ListAttributeValue, SimpleFormatter } from "mendix";
 import { FilterCondition } from "mendix/filters";
 import { action, comparer, makeObservable } from "mobx";
-import { inputStateFromCond } from "../../condition-utils";
-import { FilterFunctionBinary, FilterFunctionGeneric, FilterFunctionNonValue } from "../../typings/FilterFunctions";
 import { Number_InputFilterInterface } from "../../typings/InputFilterInterface";
-import { FilterData, InputData } from "../../typings/settings";
 import { NumberArgument } from "./Argument";
 import { BaseInputFilterStore } from "./BaseInputFilterStore";
 import { baseNames } from "./fn-mappers";

packages/shared/widget-plugin-filtering/src/helpers/usePickerJSActions.ts

@@ -1,15 +1,15 @@
-import { AttributeMetaData, ListAttributeValue, SimpleFormatter } from "mendix";
-import { FilterCondition } from "mendix/filters";
-import { action, comparer, makeObservable } from "mobx";
-import { inputStateFromCond } from "../../condition-utils";
+import { inputStateFromCond } from "@mendix/filter-commons/condition-utils";
 import {
     FilterFunctionBinary,
     FilterFunctionGeneric,
     FilterFunctionNonValue,
     FilterFunctionString
-} from "../../typings/FilterFunctions";
+} from "@mendix/filter-commons/typings/FilterFunctions";
+import { FilterData, InputData } from "@mendix/filter-commons/typings/settings";
+import { AttributeMetaData, ListAttributeValue, SimpleFormatter } from "mendix";
+import { FilterCondition } from "mendix/filters";
+import { action, comparer, makeObservable } from "mobx";
 import { String_InputFilterInterface } from "../../typings/InputFilterInterface";
-import { FilterData, InputData } from "../../typings/settings";
 import { StringArgument } from "./Argument";
 import { BaseInputFilterStore } from "./BaseInputFilterStore";
 import { baseNames } from "./fn-mappers";

packages/shared/widget-plugin-filtering/src/helpers/useSelectFilterAPI.ts

@@ -1,8 +1,12 @@
-import { FilterFunctionBinary, FilterFunctionGeneric, FilterFunctionNonValue } from "../../typings/FilterFunctions";
-import { FilterFunction } from "../../typings/mendix";
+import {
+    FilterFunctionBinary,
+    FilterFunctionGeneric,
+    FilterFunctionNonValue
+} from "@mendix/filter-commons/typings/FilterFunctions";
+import { FilterName } from "@mendix/filter-commons/typings/mendix";
 
 export function baseNames(
-    fn: FilterFunction | "between" | "empty" | "notEmpty"
+    fn: FilterName | "between" | "empty" | "notEmpty"
 ): FilterFunctionGeneric | FilterFunctionNonValue | FilterFunctionBinary {
     switch (fn) {
         case "=":