@osdk/react-components 0.2.0-beta.17 → 0.2.0-beta.18

package/build/browser/filter-list/base/FilterListHeader.module.css

@@ -49,6 +49,16 @@
   font-variant-numeric: tabular-nums;
 }
 
+.actions {
+  display: flex;
+  align-items: center;
+  gap: var(--osdk-surface-spacing);
+
+  &:empty {
+    display: none;
+  }
+}
+
 .collapseButton {
   display: flex;
   align-items: center;
@@ -59,6 +69,7 @@
   cursor: pointer;
   border-radius: var(--osdk-filter-header-button-border-radius);
   transition: background-color var(--osdk-filter-header-button-transition);
+  color: var(--osdk-filter-header-collapse-icon-color);
 
   &:hover {
     background: var(--osdk-filter-header-button-bg-hover);
@@ -78,49 +89,10 @@
   }
 }
 
-.collapseIcon {
-  display: block;
-  width: var(--osdk-filter-header-collapse-icon-size);
-  height: var(--osdk-filter-header-collapse-icon-size);
-  border-left: var(--osdk-filter-header-collapse-icon-border-width) solid var(--osdk-filter-header-collapse-icon-color);
-  border-bottom: var(--osdk-filter-header-collapse-icon-border-width) solid var(--osdk-filter-header-collapse-icon-color);
-  transform: rotate(-45deg);
-  transition: transform var(--osdk-filter-header-button-transition);
-
-  @media (prefers-reduced-motion: reduce) {
-    transition: none;
-  }
-}
-
-.collapsed {
-  transform: rotate(-135deg);
-}
-
-.headerContentWrapper {
-  display: grid;
-  grid-template-columns: 1fr;
-  overflow: hidden;
-  transition: grid-template-columns var(--osdk-filter-list-collapse-transition);
-
-  @media (prefers-reduced-motion: reduce) {
-    transition: none;
-  }
-}
-
-.headerContentWrapper[data-collapsed="true"] {
-  grid-template-columns: 0fr;
-}
-
-.headerContentInner {
+.resetButton {
   display: flex;
   align-items: center;
-  justify-content: space-between;
-  flex: 1;
-  overflow: hidden;
-  min-width: 0;
-}
-
-.resetButton {
+  gap: calc(var(--osdk-surface-spacing) * 0.5);
   font-family: var(--osdk-filter-header-font-family);
   font-size: var(--osdk-filter-header-reset-font-size);
   color: var(--osdk-filter-header-reset-color);

package/build/browser/filter-list/base/FilterListHeader.module.css.js

@@ -5,11 +5,8 @@ const styles = {
   "title": "FilterListHeader-module__title___xqfWfSzK",
   "titleIcon": "FilterListHeader-module__titleIcon___MQy-dec8",
   "activeCount": "FilterListHeader-module__activeCount___GyBsnsQL",
+  "actions": "FilterListHeader-module__actions___YZA7zmGc",
   "collapseButton": "FilterListHeader-module__collapseButton___N1-sj3B3",
-  "collapseIcon": "FilterListHeader-module__collapseIcon___P4YOgKig",
-  "collapsed": "FilterListHeader-module__collapsed___RKg0zje4",
-  "headerContentWrapper": "FilterListHeader-module__headerContentWrapper___Jb48M86S",
-  "headerContentInner": "FilterListHeader-module__headerContentInner___d2-TGJNm",
   "resetButton": "FilterListHeader-module__resetButton___jLcUypov"
 };
 

package/build/browser/filter-list/hooks/useFilterListState.js

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { useOsdkMetadata } from "@osdk/react";
 import { useCallback, useMemo, useState } from "react";
 import { assertUnreachable } from "../utils/assertUnreachable.js";
 import { buildWhereClause } from "../utils/filterStateToWhereClause.js";
@@ -76,6 +77,23 @@ export function useFilterListState(props) {
     initialFilterStates
   } = props;
   const objectType = objectSet.$objectSetInternals.def;
+  const {
+    metadata
+  } = useOsdkMetadata(objectType);
+  const propertyTypes = useMemo(() => {
+    const map = new Map();
+    if (metadata?.properties) {
+      for (const [key, prop] of Object.entries(metadata.properties)) {
+        if (typeof prop.type === "string") {
+          map.set(key, {
+            type: prop.type,
+            multiplicity: prop.multiplicity === true
+          });
+        }
+      }
+    }
+    return map;
+  }, [metadata?.properties]);
   const [filterStates, setFilterStates] = useState(() => {
     const states = buildInitialStates(filterDefinitions);
     if (initialFilterStates) {
@@ -86,22 +104,22 @@ export function useFilterListState(props) {
     return states;
   });
   const setFilterState = useCallback((filterKey, state) => {
-    let computedClause;
+    let newWhereClause;
     setFilterStates(prev => {
       const next = new Map(prev);
       next.set(filterKey, state);
-      computedClause = buildWhereClause(filterDefinitions, next, filterOperator, objectType);
+      newWhereClause = buildWhereClause(filterDefinitions, next, filterOperator, propertyTypes);
       return next;
     });
-    if (computedClause !== undefined) {
-      onFilterClauseChanged?.(computedClause);
+    if (newWhereClause !== undefined) {
+      onFilterClauseChanged?.(newWhereClause);
     }
     const definition = filterDefinitions?.find(d => getFilterKey(d) === filterKey);
     if (definition) {
       onFilterStateChanged?.(definition, state);
     }
-  }, [filterDefinitions, filterOperator, objectType, onFilterClauseChanged, onFilterStateChanged]);
-  const whereClause = useMemo(() => buildWhereClause(filterDefinitions, filterStates, filterOperator, objectType), [filterDefinitions, filterStates, filterOperator, objectType]);
+  }, [filterDefinitions, filterOperator, propertyTypes, onFilterClauseChanged, onFilterStateChanged]);
+  const whereClause = useMemo(() => buildWhereClause(filterDefinitions, filterStates, filterOperator, propertyTypes), [filterDefinitions, filterStates, filterOperator, propertyTypes]);
   const perFilterWhereClauses = useMemo(() => {
     const map = new Map();
     if (!filterDefinitions) {
@@ -109,10 +127,10 @@ export function useFilterListState(props) {
     }
     for (const definition of filterDefinitions) {
       const key = getFilterKey(definition);
-      map.set(key, buildWhereClause(filterDefinitions, filterStates, filterOperator, objectType, key));
+      map.set(key, buildWhereClause(filterDefinitions, filterStates, filterOperator, propertyTypes, key));
     }
     return map;
-  }, [filterDefinitions, filterStates, filterOperator, objectType]);
+  }, [filterDefinitions, filterStates, filterOperator, propertyTypes]);
   const activeFilterCount = useMemo(() => {
     let count = 0;
     for (const state of filterStates.values()) {
@@ -125,8 +143,9 @@ export function useFilterListState(props) {
   const reset = useCallback(() => {
     const initialStates = buildInitialStates(filterDefinitions);
     setFilterStates(initialStates);
-    onFilterClauseChanged?.(buildWhereClause(filterDefinitions, initialStates, filterOperator, objectType));
-  }, [filterDefinitions, filterOperator, objectType, onFilterClauseChanged]);
+    const newWhereClause = buildWhereClause(filterDefinitions, initialStates, filterOperator, propertyTypes);
+    onFilterClauseChanged?.(newWhereClause);
+  }, [filterDefinitions, filterOperator, propertyTypes, onFilterClauseChanged]);
   return useMemo(() => ({
     filterStates,
     setFilterState,

package/build/browser/filter-list/hooks/useFilterListState.js.map

@@ -1 +1 @@
-{"version":3,"file":"useFilterListState.js","names":["useCallback","useMemo","useState","assertUnreachable","buildWhereClause","filterHasActiveState","getFilterKey","buildInitialStates","definitions","states","Map","definition","key","type","state","filterState","set","defaultFilterState","innerState","defaultLinkedFilterState","linkedFilterState","useFilterListState","props","objectSet","filterDefinitions","filterOperator","onFilterStateChanged","onFilterClauseChanged","initialFilterStates","objectType","$objectSetInternals","def","filterStates","setFilterStates","setFilterState","filterKey","computedClause","prev","next","undefined","find","d","whereClause","perFilterWhereClauses","map","activeFilterCount","count","values","reset","initialStates"],"sources":["useFilterListState.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { ObjectTypeDefinition, WhereClause } from \"@osdk/api\";\nimport { useCallback, useMemo, useState } from \"react\";\nimport type { FilterListProps } from \"../FilterListApi.js\";\nimport type { FilterState } from \"../FilterListItemApi.js\";\nimport type { LinkedPropertyFilterState } from \"../types/LinkedFilterTypes.js\";\nimport { assertUnreachable } from \"../utils/assertUnreachable.js\";\nimport { buildWhereClause } from \"../utils/filterStateToWhereClause.js\";\nimport { filterHasActiveState } from \"../utils/filterValues.js\";\nimport { getFilterKey } from \"../utils/getFilterKey.js\";\n\nexport interface UseFilterListStateResult<Q extends ObjectTypeDefinition> {\n  filterStates: Map<string, FilterState>;\n  setFilterState: (\n    filterKey: string,\n    state: FilterState,\n  ) => void;\n  whereClause: WhereClause<Q>;\n  perFilterWhereClauses: Map<string, WhereClause<Q>>;\n  activeFilterCount: number;\n  reset: () => void;\n}\n\n/**\n * Build initial states from filter definitions.\n * Uses string keys derived from getFilterKey() for stable lookups.\n */\nfunction buildInitialStates<Q extends ObjectTypeDefinition>(\n  definitions: FilterListProps<Q>[\"filterDefinitions\"],\n): Map<string, FilterState> {\n  const states = new Map<string, FilterState>();\n\n  if (!definitions) {\n    return states;\n  }\n\n  for (const definition of definitions) {\n    const key = getFilterKey(definition);\n    switch (definition.type) {\n      case \"PROPERTY\": {\n        const state = definition.filterState;\n        if (state) {\n          states.set(key, state);\n        }\n        break;\n      }\n      case \"HAS_LINK\":\n      case \"KEYWORD_SEARCH\":\n      case \"CUSTOM\": {\n        const state = definition.defaultFilterState;\n        if (state) {\n          states.set(key, state);\n        }\n        break;\n      }\n      case \"LINKED_PROPERTY\": {\n        const innerState = definition.defaultLinkedFilterState;\n        if (innerState) {\n          const state: LinkedPropertyFilterState = {\n            type: \"linkedProperty\",\n            linkedFilterState: innerState,\n          };\n          states.set(key, state);\n        }\n        break;\n      }\n      default:\n        assertUnreachable(definition);\n    }\n  }\n\n  return states;\n}\n\nexport function useFilterListState<Q extends ObjectTypeDefinition>(\n  props: FilterListProps<Q>,\n): UseFilterListStateResult<Q> {\n  const {\n    objectSet,\n    filterDefinitions,\n    filterOperator = \"and\",\n    onFilterStateChanged,\n    onFilterClauseChanged,\n    initialFilterStates,\n  } = props;\n\n  const objectType = objectSet.$objectSetInternals.def;\n\n  const [filterStates, setFilterStates] = useState<\n    Map<string, FilterState>\n  >(() => {\n    const states = buildInitialStates(filterDefinitions);\n    if (initialFilterStates) {\n      for (const [key, state] of initialFilterStates) {\n        states.set(key, state);\n      }\n    }\n    return states;\n  });\n\n  const setFilterState = useCallback(\n    (filterKey: string, state: FilterState) => {\n      let computedClause: WhereClause<Q> | undefined;\n\n      setFilterStates((prev) => {\n        const next = new Map(prev);\n        next.set(filterKey, state);\n        computedClause = buildWhereClause(\n          filterDefinitions,\n          next,\n          filterOperator,\n          objectType,\n        );\n        return next;\n      });\n\n      if (computedClause !== undefined) {\n        onFilterClauseChanged?.(computedClause);\n      }\n\n      const definition = filterDefinitions?.find(\n        (d) => getFilterKey(d) === filterKey,\n      );\n      if (definition) {\n        onFilterStateChanged?.(definition, state);\n      }\n    },\n    [\n      filterDefinitions,\n      filterOperator,\n      objectType,\n      onFilterClauseChanged,\n      onFilterStateChanged,\n    ],\n  );\n\n  const whereClause = useMemo(\n    () =>\n      buildWhereClause(\n        filterDefinitions,\n        filterStates,\n        filterOperator,\n        objectType,\n      ),\n    [filterDefinitions, filterStates, filterOperator, objectType],\n  );\n\n  const perFilterWhereClauses = useMemo(() => {\n    const map = new Map<string, WhereClause<Q>>();\n    if (!filterDefinitions) {\n      return map;\n    }\n    for (const definition of filterDefinitions) {\n      const key = getFilterKey(definition);\n      map.set(\n        key,\n        buildWhereClause(\n          filterDefinitions,\n          filterStates,\n          filterOperator,\n          objectType,\n          key,\n        ),\n      );\n    }\n    return map;\n  }, [filterDefinitions, filterStates, filterOperator, objectType]);\n\n  const activeFilterCount = useMemo(() => {\n    let count = 0;\n    for (const state of filterStates.values()) {\n      if (filterHasActiveState(state)) {\n        count++;\n      }\n    }\n    return count;\n  }, [filterStates]);\n\n  const reset = useCallback(() => {\n    const initialStates = buildInitialStates(filterDefinitions);\n    setFilterStates(initialStates);\n    onFilterClauseChanged?.(\n      buildWhereClause(\n        filterDefinitions,\n        initialStates,\n        filterOperator,\n        objectType,\n      ),\n    );\n  }, [filterDefinitions, filterOperator, objectType, onFilterClauseChanged]);\n\n  return useMemo(() => ({\n    filterStates,\n    setFilterState,\n    whereClause,\n    perFilterWhereClauses,\n    activeFilterCount,\n    reset,\n  }), [\n    filterStates,\n    setFilterState,\n    whereClause,\n    perFilterWhereClauses,\n    activeFilterCount,\n    reset,\n  ]);\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"useFilterListState.js","names":["useOsdkMetadata","useCallback","useMemo","useState","assertUnreachable","buildWhereClause","filterHasActiveState","getFilterKey","buildInitialStates","definitions","states","Map","definition","key","type","state","filterState","set","defaultFilterState","innerState","defaultLinkedFilterState","linkedFilterState","useFilterListState","props","objectSet","filterDefinitions","filterOperator","onFilterStateChanged","onFilterClauseChanged","initialFilterStates","objectType","$objectSetInternals","def","metadata","propertyTypes","map","properties","prop","Object","entries","multiplicity","filterStates","setFilterStates","setFilterState","filterKey","newWhereClause","prev","next","undefined","find","d","whereClause","perFilterWhereClauses","activeFilterCount","count","values","reset","initialStates"],"sources":["useFilterListState.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { ObjectTypeDefinition, WhereClause } from \"@osdk/api\";\nimport { useOsdkMetadata } from \"@osdk/react\";\nimport { useCallback, useMemo, useState } from \"react\";\nimport type { FilterListProps } from \"../FilterListApi.js\";\nimport type { FilterState } from \"../FilterListItemApi.js\";\nimport type { LinkedPropertyFilterState } from \"../types/LinkedFilterTypes.js\";\nimport { assertUnreachable } from \"../utils/assertUnreachable.js\";\nimport {\n  buildWhereClause,\n  type PropertyTypeInfo,\n} from \"../utils/filterStateToWhereClause.js\";\nimport { filterHasActiveState } from \"../utils/filterValues.js\";\nimport { getFilterKey } from \"../utils/getFilterKey.js\";\n\nexport interface UseFilterListStateResult<Q extends ObjectTypeDefinition> {\n  filterStates: Map<string, FilterState>;\n  setFilterState: (\n    filterKey: string,\n    state: FilterState,\n  ) => void;\n  whereClause: WhereClause<Q>;\n  perFilterWhereClauses: Map<string, WhereClause<Q>>;\n  activeFilterCount: number;\n  reset: () => void;\n}\n\n/**\n * Build initial states from filter definitions.\n * Uses string keys derived from getFilterKey() for stable lookups.\n */\nfunction buildInitialStates<Q extends ObjectTypeDefinition>(\n  definitions: FilterListProps<Q>[\"filterDefinitions\"],\n): Map<string, FilterState> {\n  const states = new Map<string, FilterState>();\n\n  if (!definitions) {\n    return states;\n  }\n\n  for (const definition of definitions) {\n    const key = getFilterKey(definition);\n    switch (definition.type) {\n      case \"PROPERTY\": {\n        const state = definition.filterState;\n        if (state) {\n          states.set(key, state);\n        }\n        break;\n      }\n      case \"HAS_LINK\":\n      case \"KEYWORD_SEARCH\":\n      case \"CUSTOM\": {\n        const state = definition.defaultFilterState;\n        if (state) {\n          states.set(key, state);\n        }\n        break;\n      }\n      case \"LINKED_PROPERTY\": {\n        const innerState = definition.defaultLinkedFilterState;\n        if (innerState) {\n          const state: LinkedPropertyFilterState = {\n            type: \"linkedProperty\",\n            linkedFilterState: innerState,\n          };\n          states.set(key, state);\n        }\n        break;\n      }\n      default:\n        assertUnreachable(definition);\n    }\n  }\n\n  return states;\n}\n\nexport function useFilterListState<Q extends ObjectTypeDefinition>(\n  props: FilterListProps<Q>,\n): UseFilterListStateResult<Q> {\n  const {\n    objectSet,\n    filterDefinitions,\n    filterOperator = \"and\",\n    onFilterStateChanged,\n    onFilterClauseChanged,\n    initialFilterStates,\n  } = props;\n\n  const objectType = objectSet.$objectSetInternals.def;\n  const { metadata } = useOsdkMetadata(objectType);\n\n  const propertyTypes = useMemo(() => {\n    const map = new Map<string, PropertyTypeInfo>();\n    if (metadata?.properties) {\n      for (const [key, prop] of Object.entries(metadata.properties)) {\n        if (typeof prop.type === \"string\") {\n          map.set(key, {\n            type: prop.type,\n            multiplicity: prop.multiplicity === true,\n          });\n        }\n      }\n    }\n    return map;\n  }, [metadata?.properties]);\n\n  const [filterStates, setFilterStates] = useState<\n    Map<string, FilterState>\n  >(() => {\n    const states = buildInitialStates(filterDefinitions);\n    if (initialFilterStates) {\n      for (const [key, state] of initialFilterStates) {\n        states.set(key, state);\n      }\n    }\n    return states;\n  });\n\n  const setFilterState = useCallback(\n    (filterKey: string, state: FilterState) => {\n      let newWhereClause: WhereClause<Q> | undefined;\n\n      setFilterStates((prev) => {\n        const next = new Map(prev);\n        next.set(filterKey, state);\n\n        newWhereClause = buildWhereClause(\n          filterDefinitions,\n          next,\n          filterOperator,\n          propertyTypes,\n        );\n\n        return next;\n      });\n\n      if (newWhereClause !== undefined) {\n        onFilterClauseChanged?.(newWhereClause);\n      }\n      const definition = filterDefinitions?.find(\n        (d) => getFilterKey(d) === filterKey,\n      );\n      if (definition) {\n        onFilterStateChanged?.(definition, state);\n      }\n    },\n    [\n      filterDefinitions,\n      filterOperator,\n      propertyTypes,\n      onFilterClauseChanged,\n      onFilterStateChanged,\n    ],\n  );\n\n  const whereClause = useMemo(\n    () =>\n      buildWhereClause(\n        filterDefinitions,\n        filterStates,\n        filterOperator,\n        propertyTypes,\n      ),\n    [filterDefinitions, filterStates, filterOperator, propertyTypes],\n  );\n\n  const perFilterWhereClauses = useMemo(() => {\n    const map = new Map<string, WhereClause<Q>>();\n    if (!filterDefinitions) {\n      return map;\n    }\n    for (const definition of filterDefinitions) {\n      const key = getFilterKey(definition);\n      map.set(\n        key,\n        buildWhereClause(\n          filterDefinitions,\n          filterStates,\n          filterOperator,\n          propertyTypes,\n          key,\n        ),\n      );\n    }\n    return map;\n  }, [filterDefinitions, filterStates, filterOperator, propertyTypes]);\n\n  const activeFilterCount = useMemo(() => {\n    let count = 0;\n    for (const state of filterStates.values()) {\n      if (filterHasActiveState(state)) {\n        count++;\n      }\n    }\n    return count;\n  }, [filterStates]);\n\n  const reset = useCallback(() => {\n    const initialStates = buildInitialStates(filterDefinitions);\n    setFilterStates(initialStates);\n\n    const newWhereClause = buildWhereClause(\n      filterDefinitions,\n      initialStates,\n      filterOperator,\n      propertyTypes,\n    );\n    onFilterClauseChanged?.(newWhereClause);\n  }, [filterDefinitions, filterOperator, propertyTypes, onFilterClauseChanged]);\n\n  return useMemo(() => ({\n    filterStates,\n    setFilterState,\n    whereClause,\n    perFilterWhereClauses,\n    activeFilterCount,\n    reset,\n  }), [\n    filterStates,\n    setFilterState,\n    whereClause,\n    perFilterWhereClauses,\n    activeFilterCount,\n    reset,\n  ]);\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAGA,SAASA,eAAe,QAAQ,aAAa;AAC7C,SAASC,WAAW,EAAEC,OAAO,EAAEC,QAAQ,QAAQ,OAAO;AAItD,SAASC,iBAAiB,QAAQ,+BAA+B;AACjE,SACEC,gBAAgB,QAEX,sCAAsC;AAC7C,SAASC,oBAAoB,QAAQ,0BAA0B;AAC/D,SAASC,YAAY,QAAQ,0BAA0B;AAcvD;AACA;AACA;AACA;AACA,SAASC,kBAAkBA,CACzBC,WAAoD,EAC1B;EAC1B,MAAMC,MAAM,GAAG,IAAIC,GAAG,CAAsB,CAAC;EAE7C,IAAI,CAACF,WAAW,EAAE;IAChB,OAAOC,MAAM;EACf;EAEA,KAAK,MAAME,UAAU,IAAIH,WAAW,EAAE;IACpC,MAAMI,GAAG,GAAGN,YAAY,CAACK,UAAU,CAAC;IACpC,QAAQA,UAAU,CAACE,IAAI;MACrB,KAAK,UAAU;QAAE;UACf,MAAMC,KAAK,GAAGH,UAAU,CAACI,WAAW;UACpC,IAAID,KAAK,EAAE;YACTL,MAAM,CAACO,GAAG,CAACJ,GAAG,EAAEE,KAAK,CAAC;UACxB;UACA;QACF;MACA,KAAK,UAAU;MACf,KAAK,gBAAgB;MACrB,KAAK,QAAQ;QAAE;UACb,MAAMA,KAAK,GAAGH,UAAU,CAACM,kBAAkB;UAC3C,IAAIH,KAAK,EAAE;YACTL,MAAM,CAACO,GAAG,CAACJ,GAAG,EAAEE,KAAK,CAAC;UACxB;UACA;QACF;MACA,KAAK,iBAAiB;QAAE;UACtB,MAAMI,UAAU,GAAGP,UAAU,CAACQ,wBAAwB;UACtD,IAAID,UAAU,EAAE;YAKdT,MAAM,CAACO,GAAG,CAACJ,GAAG,EAJ2B;cACvCC,IAAI,EAAE,gBAAgB;cACtBO,iBAAiB,EAAEF;YACrB,CACqB,CAAC;UACxB;UACA;QACF;MACA;QACEf,iBAAiB,CAACQ,UAAU,CAAC;IACjC;EACF;EAEA,OAAOF,MAAM;AACf;AAEA,OAAO,SAASY,kBAAkBA,CAChCC,KAAyB,EACI;EAC7B,MAAM;IACJC,SAAS;IACTC,iBAAiB;IACjBC,cAAc,GAAG,KAAK;IACtBC,oBAAoB;IACpBC,qBAAqB;IACrBC;EACF,CAAC,GAAGN,KAAK;EAET,MAAMO,UAAU,GAAGN,SAAS,CAACO,mBAAmB,CAACC,GAAG;EACpD,MAAM;IAAEC;EAAS,CAAC,GAAGjC,eAAe,CAAC8B,UAAU,CAAC;EAEhD,MAAMI,aAAa,GAAGhC,OAAO,CAAC,MAAM;IAClC,MAAMiC,GAAG,GAAG,IAAIxB,GAAG,CAA2B,CAAC;IAC/C,IAAIsB,QAAQ,EAAEG,UAAU,EAAE;MACxB,KAAK,MAAM,CAACvB,GAAG,EAAEwB,IAAI,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACN,QAAQ,CAACG,UAAU,CAAC,EAAE;QAC7D,IAAI,OAAOC,IAAI,CAACvB,IAAI,KAAK,QAAQ,EAAE;UACjCqB,GAAG,CAAClB,GAAG,CAACJ,GAAG,EAAE;YACXC,IAAI,EAAEuB,IAAI,CAACvB,IAAI;YACf0B,YAAY,EAAEH,IAAI,CAACG,YAAY,KAAK;UACtC,CAAC,CAAC;QACJ;MACF;IACF;IACA,OAAOL,GAAG;EACZ,CAAC,EAAE,CAACF,QAAQ,EAAEG,UAAU,CAAC,CAAC;EAE1B,MAAM,CAACK,YAAY,EAAEC,eAAe,CAAC,GAAGvC,QAAQ,CAE9C,MAAM;IACN,MAAMO,MAAM,GAAGF,kBAAkB,CAACiB,iBAAiB,CAAC;IACpD,IAAII,mBAAmB,EAAE;MACvB,KAAK,MAAM,CAAChB,GAAG,EAAEE,KAAK,CAAC,IAAIc,mBAAmB,EAAE;QAC9CnB,MAAM,CAACO,GAAG,CAACJ,GAAG,EAAEE,KAAK,CAAC;MACxB;IACF;IACA,OAAOL,MAAM;EACf,CAAC,CAAC;EAEF,MAAMiC,cAAc,GAAG1C,WAAW,CAChC,CAAC2C,SAAiB,EAAE7B,KAAkB,KAAK;IACzC,IAAI8B,cAA0C;IAE9CH,eAAe,CAAEI,IAAI,IAAK;MACxB,MAAMC,IAAI,GAAG,IAAIpC,GAAG,CAACmC,IAAI,CAAC;MAC1BC,IAAI,CAAC9B,GAAG,CAAC2B,SAAS,EAAE7B,KAAK,CAAC;MAE1B8B,cAAc,GAAGxC,gBAAgB,CAC/BoB,iBAAiB,EACjBsB,IAAI,EACJrB,cAAc,EACdQ,aACF,CAAC;MAED,OAAOa,IAAI;IACb,CAAC,CAAC;IAEF,IAAIF,cAAc,KAAKG,SAAS,EAAE;MAChCpB,qBAAqB,GAAGiB,cAAc,CAAC;IACzC;IACA,MAAMjC,UAAU,GAAGa,iBAAiB,EAAEwB,IAAI,CACvCC,CAAC,IAAK3C,YAAY,CAAC2C,CAAC,CAAC,KAAKN,SAC7B,CAAC;IACD,IAAIhC,UAAU,EAAE;MACde,oBAAoB,GAAGf,UAAU,EAAEG,KAAK,CAAC;IAC3C;EACF,CAAC,EACD,CACEU,iBAAiB,EACjBC,cAAc,EACdQ,aAAa,EACbN,qBAAqB,EACrBD,oBAAoB,CAExB,CAAC;EAED,MAAMwB,WAAW,GAAGjD,OAAO,CACzB,MACEG,gBAAgB,CACdoB,iBAAiB,EACjBgB,YAAY,EACZf,cAAc,EACdQ,aACF,CAAC,EACH,CAACT,iBAAiB,EAAEgB,YAAY,EAAEf,cAAc,EAAEQ,aAAa,CACjE,CAAC;EAED,MAAMkB,qBAAqB,GAAGlD,OAAO,CAAC,MAAM;IAC1C,MAAMiC,GAAG,GAAG,IAAIxB,GAAG,CAAyB,CAAC;IAC7C,IAAI,CAACc,iBAAiB,EAAE;MACtB,OAAOU,GAAG;IACZ;IACA,KAAK,MAAMvB,UAAU,IAAIa,iBAAiB,EAAE;MAC1C,MAAMZ,GAAG,GAAGN,YAAY,CAACK,UAAU,CAAC;MACpCuB,GAAG,CAAClB,GAAG,CACLJ,GAAG,EACHR,gBAAgB,CACdoB,iBAAiB,EACjBgB,YAAY,EACZf,cAAc,EACdQ,aAAa,EACbrB,GACF,CACF,CAAC;IACH;IACA,OAAOsB,GAAG;EACZ,CAAC,EAAE,CAACV,iBAAiB,EAAEgB,YAAY,EAAEf,cAAc,EAAEQ,aAAa,CAAC,CAAC;EAEpE,MAAMmB,iBAAiB,GAAGnD,OAAO,CAAC,MAAM;IACtC,IAAIoD,KAAK,GAAG,CAAC;IACb,KAAK,MAAMvC,KAAK,IAAI0B,YAAY,CAACc,MAAM,CAAC,CAAC,EAAE;MACzC,IAAIjD,oBAAoB,CAACS,KAAK,CAAC,EAAE;QAC/BuC,KAAK,EAAE;MACT;IACF;IACA,OAAOA,KAAK;EACd,CAAC,EAAE,CAACb,YAAY,CAAC,CAAC;EAElB,MAAMe,KAAK,GAAGvD,WAAW,CAAC,MAAM;IAC9B,MAAMwD,aAAa,GAAGjD,kBAAkB,CAACiB,iBAAiB,CAAC;IAC3DiB,eAAe,CAACe,aAAa,CAAC;IAE9B,MAAMZ,cAAc,GAAGxC,gBAAgB,CACrCoB,iBAAiB,EACjBgC,aAAa,EACb/B,cAAc,EACdQ,aACF,CAAC;IACDN,qBAAqB,GAAGiB,cAAc,CAAC;EACzC,CAAC,EAAE,CAACpB,iBAAiB,EAAEC,cAAc,EAAEQ,aAAa,EAAEN,qBAAqB,CAAC,CAAC;EAE7E,OAAO1B,OAAO,CAAC,OAAO;IACpBuC,YAAY;IACZE,cAAc;IACdQ,WAAW;IACXC,qBAAqB;IACrBC,iBAAiB;IACjBG;EACF,CAAC,CAAC,EAAE,CACFf,YAAY,EACZE,cAAc,EACdQ,WAAW,EACXC,qBAAqB,EACrBC,iBAAiB,EACjBG,KAAK,CACN,CAAC;AACJ","ignoreList":[]}

package/build/browser/filter-list/utils/assertUnreachable.js

@@ -14,12 +14,5 @@
  * limitations under the License.
  */
 
-/**
- * Exhaustive type checking helper.
- * Use in default cases of switch statements to ensure all cases are handled.
- * TypeScript will error if a case is missing.
- */
-export function assertUnreachable(value) {
-  throw new Error(`Unhandled value: ${String(value)}`);
-}
+export { assertUnreachable } from "../../shared/assertUnreachable.js";
 //# sourceMappingURL=assertUnreachable.js.map

package/build/browser/filter-list/utils/assertUnreachable.js.map

@@ -1 +1 @@
-{"version":3,"file":"assertUnreachable.js","names":["assertUnreachable","value","Error","String"],"sources":["assertUnreachable.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\n/**\n * Exhaustive type checking helper.\n * Use in default cases of switch statements to ensure all cases are handled.\n * TypeScript will error if a case is missing.\n */\nexport function assertUnreachable(value: never): never {\n  throw new Error(`Unhandled value: ${String(value)}`);\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,iBAAiBA,CAACC,KAAY,EAAS;EACrD,MAAM,IAAIC,KAAK,CAAC,oBAAoBC,MAAM,CAACF,KAAK,CAAC,EAAE,CAAC;AACtD","ignoreList":[]}
+{"version":3,"file":"assertUnreachable.js","names":["assertUnreachable"],"sources":["assertUnreachable.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nexport { assertUnreachable } from \"../../shared/assertUnreachable.js\";\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,iBAAiB,QAAQ,mCAAmC","ignoreList":[]}

package/build/browser/filter-list/utils/filterStateToWhereClause.js

@@ -14,41 +14,56 @@
  * limitations under the License.
  */
 
+import { formatDateForInput } from "../base/inputs/dateUtils.js";
 import { assertUnreachable } from "./assertUnreachable.js";
 import { getFilterKey } from "./getFilterKey.js";
-function liftCompoundPropertyFilter(propertyKey, filter) {
-  if (typeof filter === "object" && !Array.isArray(filter)) {
-    if ("$and" in filter && Array.isArray(filter.$and)) {
-      return {
-        $and: filter.$and.map(f => liftCompoundPropertyFilter(propertyKey, f))
-      };
-    }
-    if ("$or" in filter && Array.isArray(filter.$or)) {
-      return {
-        $or: filter.$or.map(f => liftCompoundPropertyFilter(propertyKey, f))
-      };
-    }
+function isCompoundFilter(f) {
+  return typeof f === "object" && f != null && "__compound" in f;
+}
+const NUMERIC_BOUNDS = {
+  byte: {
+    min: -128,
+    max: 127
+  },
+  short: {
+    min: -32_768,
+    max: 32_767
+  },
+  integer: {
+    min: -2_147_483_648,
+    max: 2_147_483_647
+  },
+  long: {
+    min: Number.MIN_SAFE_INTEGER,
+    max: Number.MAX_SAFE_INTEGER
   }
-  return {
-    [propertyKey]: filter
-  };
+};
+function clampToPropertyBounds(value, propertyType) {
+  if (propertyType === undefined) {
+    return value;
+  }
+  const bounds = NUMERIC_BOUNDS[propertyType];
+  if (bounds === undefined) {
+    return value;
+  }
+  return Math.max(bounds.min, Math.min(bounds.max, value));
+}
+function formatDateValue(date, propertyType) {
+  if (propertyType === "datetime") {
+    return formatDateForInput(date);
+  }
+  return date.toISOString();
 }
-function filterStateToPropertyFilter(state) {
+function filterStateToPropertyFilter(state, propertyType) {
   switch (state.type) {
     case "CONTAINS_TEXT":
       {
         if (!state.value) {
           return undefined;
         }
-        const filter = {
+        return {
           $containsAnyTerm: state.value
         };
-        if (state.isExcluding) {
-          return {
-            $not: filter
-          };
-        }
-        return filter;
       }
     case "TOGGLE":
       {
@@ -59,138 +74,104 @@ function filterStateToPropertyFilter(state) {
         const conditions = [];
         if (state.minValue !== undefined) {
           conditions.push({
-            $gte: state.minValue.toISOString()
+            $gte: formatDateValue(state.minValue, propertyType)
           });
         }
         if (state.maxValue !== undefined) {
           conditions.push({
-            $lte: state.maxValue.toISOString()
+            $lte: formatDateValue(state.maxValue, propertyType)
           });
         }
         if (conditions.length === 0 && !state.includeNull) {
           return undefined;
         }
-        let rangeFilter;
-        if (conditions.length === 1) {
-          rangeFilter = conditions[0];
-        } else if (conditions.length > 1) {
-          rangeFilter = {
-            $and: conditions
-          };
-        }
-        if (state.includeNull) {
-          if (rangeFilter) {
-            return {
-              $or: [rangeFilter, {
-                $isNull: true
-              }]
-            };
-          }
+        if (conditions.length === 0 && state.includeNull) {
           return {
             $isNull: true
           };
         }
-        return rangeFilter;
+        if (conditions.length === 1 && !state.includeNull) {
+          return conditions[0];
+        }
+        return {
+          __compound: true,
+          conditions,
+          includeNull: state.includeNull ?? false
+        };
       }
     case "NUMBER_RANGE":
       {
         const conditions = [];
         if (state.minValue !== undefined) {
           conditions.push({
-            $gte: state.minValue
+            $gte: clampToPropertyBounds(state.minValue, propertyType)
           });
         }
         if (state.maxValue !== undefined) {
           conditions.push({
-            $lte: state.maxValue
+            $lte: clampToPropertyBounds(state.maxValue, propertyType)
           });
         }
         if (conditions.length === 0 && !state.includeNull) {
           return undefined;
         }
-        let rangeFilter;
-        if (conditions.length === 1) {
-          rangeFilter = conditions[0];
-        } else if (conditions.length > 1) {
-          rangeFilter = {
-            $and: conditions
-          };
-        }
-        if (state.includeNull) {
-          if (rangeFilter) {
-            return {
-              $or: [rangeFilter, {
-                $isNull: true
-              }]
-            };
-          }
+        if (conditions.length === 0 && state.includeNull) {
           return {
             $isNull: true
           };
         }
-        return rangeFilter;
+        if (conditions.length === 1 && !state.includeNull) {
+          return conditions[0];
+        }
+        return {
+          __compound: true,
+          conditions,
+          includeNull: state.includeNull ?? false
+        };
       }
     case "EXACT_MATCH":
       {
         if (state.values.length === 0) {
           return undefined;
         }
-        const filter = state.values.length === 1 ? state.values[0] : {
+        return state.values.length === 1 ? state.values[0] : {
           $in: state.values
         };
-        if (state.isExcluding) {
-          return {
-            $not: filter
-          };
-        }
-        return filter;
       }
     case "SELECT":
       {
         if (state.selectedValues.length === 0) {
           return undefined;
         }
-        const values = state.selectedValues.map(v => v instanceof Date ? v.toISOString() : v);
-        const filter = values.length === 1 ? values[0] : {
+        const values = state.selectedValues.map(v => v instanceof Date ? formatDateValue(v, propertyType) : v);
+        return values.length === 1 ? values[0] : {
           $in: values
         };
-        if (state.isExcluding) {
-          return {
-            $not: filter
-          };
-        }
-        return filter;
       }
     case "TIMELINE":
       {
         const conditions = [];
         if (state.startDate !== undefined) {
           conditions.push({
-            $gte: state.startDate.toISOString()
+            $gte: formatDateValue(state.startDate, propertyType)
           });
         }
         if (state.endDate !== undefined) {
           conditions.push({
-            $lte: state.endDate.toISOString()
+            $lte: formatDateValue(state.endDate, propertyType)
           });
         }
         if (conditions.length === 0) {
           return undefined;
         }
-        let rangeFilter;
         if (conditions.length === 1) {
-          rangeFilter = conditions[0];
-        } else {
-          rangeFilter = {
-            $and: conditions
-          };
+          return conditions[0];
         }
-        if (state.isExcluding) {
-          return {
-            $not: rangeFilter
-          };
-        }
-        return rangeFilter;
+        return {
+          __compound: true,
+          conditions,
+          includeNull: false
+        };
       }
 
     // These filter types are handled separately in buildWhereClause
@@ -217,7 +198,8 @@ function filterStateToPropertyFilter(state) {
  * cannot verify that the constructed clause structure matches the generic Q's
  * expected shape, but the structure is guaranteed to be valid by construction.
  */
-export function buildWhereClause(definitions, filterStates, operator, objectType, excludeFilterKey) {
+
+export function buildWhereClause(definitions, filterStates, operator, propertyTypes, excludeFilterKey) {
   if (!definitions || definitions.length === 0) {
     return {};
   }
@@ -234,9 +216,37 @@ export function buildWhereClause(definitions, filterStates, operator, objectType
     switch (definition.type) {
       case "PROPERTY":
         {
-          const filter = filterStateToPropertyFilter(state);
+          const propertyType = propertyTypes?.get(definition.key)?.type;
+          const filter = filterStateToPropertyFilter(state, propertyType);
           if (filter !== undefined) {
-            clauses.push(liftCompoundPropertyFilter(definition.key, filter));
+            const isExcluding = "isExcluding" in state && state.isExcluding;
+            if (isCompoundFilter(filter)) {
+              const fieldClauses = filter.conditions.map(c => ({
+                [definition.key]: c
+              }));
+              let rangeClause = fieldClauses.length === 1 ? fieldClauses[0] : {
+                $and: fieldClauses
+              };
+              if (filter.includeNull) {
+                rangeClause = {
+                  $or: [rangeClause, {
+                    [definition.key]: {
+                      $isNull: true
+                    }
+                  }]
+                };
+              }
+              clauses.push(isExcluding ? {
+                $not: rangeClause
+              } : rangeClause);
+            } else {
+              const clause = {
+                [definition.key]: filter
+              };
+              clauses.push(isExcluding ? {
+                $not: clause
+              } : clause);
+            }
           }
           break;
         }
@@ -288,12 +298,17 @@ export function buildWhereClause(definitions, filterStates, operator, objectType
           const properties = definition.properties;
           let propertiesToSearch;
           if (properties === "all") {
-            if (objectType?.__DefinitionMetadata?.properties) {
-              propertiesToSearch = Object.entries(objectType.__DefinitionMetadata.properties).filter(([, prop]) => prop.type === "string" && !prop.multiplicity).map(([key]) => key);
+            if (propertyTypes && propertyTypes.size > 0) {
+              propertiesToSearch = [];
+              for (const [key, info] of propertyTypes) {
+                if (info.type === "string" && !info.multiplicity) {
+                  propertiesToSearch.push(key);
+                }
+              }
             } else {
               if (process.env.NODE_ENV !== "production") {
                 // eslint-disable-next-line no-console
-                console.warn("[FilterList] Keyword search with properties: 'all' requires objectType to be provided. Filter will be skipped.");
+                console.warn("[FilterList] Keyword search with properties: 'all' requires propertyTypes to be provided. Filter will be skipped.");
               }
               break;
             }
@@ -305,21 +320,21 @@ export function buildWhereClause(definitions, filterStates, operator, objectType
           }
           const containsOp = state.operator === "AND" ? "$containsAllTerms" : "$containsAnyTerm";
           const propertySearches = propertiesToSearch.map(prop => ({
-            [prop]: state.isExcluding ? {
-              $not: {
-                [containsOp]: searchTerm
-              }
-            } : {
+            [prop]: {
               [containsOp]: searchTerm
             }
           }));
+          let searchClause;
           if (propertySearches.length === 1) {
-            clauses.push(propertySearches[0]);
+            searchClause = propertySearches[0];
           } else {
-            clauses.push({
+            searchClause = {
               $or: propertySearches
-            });
+            };
           }
+          clauses.push(state.isExcluding ? {
+            $not: searchClause
+          } : searchClause);
           break;
         }
       case "CUSTOM":