feat(nl-to-mquery): try use sift first

src/app/[lang]/pokedex/OpenAISearch.tsx

@@ -3,13 +3,12 @@
 import * as React from "react"
 import { QueryKeys, useFetchPokemonMquery } from "@/api/query"
 import { formatResponseError } from "@/utils/formatResponseError"
+import { mysift as sift } from "@/utils/mysift"
 import { msg, Trans } from "@lingui/macro"
 import { useLingui } from "@lingui/react"
 import { useQueryClient } from "@tanstack/react-query"
 import { Edit, Search } from "lucide-react"
 import * as R from "remeda"
-// import sift from "sift"
-import { filter as sift } from "uqry/full"
 
 import { Button } from "@/components/ui/button"
 import {

src/app/[lang]/pokedex/PokedexPage.tsx

@@ -6,6 +6,7 @@ import { flexsearchAtom, flexsearchIsIndexingAtom } from "@/atoms"
 import type { Pokemon2, PokemonType } from "@/domain/pokemon"
 import { binaraySearch } from "@/utils/binarySearch"
 import { getPokemonImageSrc } from "@/utils/getPokemonImageSrc"
+import { mysift as sift } from "@/utils/mysift"
 import { toPokemon2 } from "@/utils/toPokemon2"
 import { Trans } from "@lingui/macro"
 import { useLingui } from "@lingui/react"
@@ -15,8 +16,6 @@ import { ScopeProvider } from "jotai-scope"
 import { ArrowDown, ArrowUp } from "lucide-react"
 import { create } from "mutative"
 import { LazyLoadImage } from "react-lazy-load-image-component"
-// import sift from "sift"
-import { filter as sift } from "uqry/full"
 
 import { useDownloadJSON } from "@/hooks/useDownloadJSON"
 import { useLoadPokemonLingui } from "@/hooks/useLoadPokemonLingui"

src/utils/mysift.ts

@@ -0,0 +1,18 @@
+import sift from "sift"
+import { filter as uqry } from "uqry/full"
+
+export function mysift(mongodbQuery: any) {
+  const hasExpr = (obj: any): boolean => {
+    if (obj?.hasOwnProperty("$expr")) return true
+    if (typeof obj !== "object") return false
+    for (const key of Object.keys(obj)) {
+      if (hasExpr(obj[key])) return true
+    }
+    return false
+  }
+  if (hasExpr(mongodbQuery)) {
+    return uqry(mongodbQuery)
+  } else {
+    return sift(mongodbQuery)
+  }
+}