feat: optimize rawQuery object validation in api.ts

Pyxlab · Jun 10, 2024 · 9e4e7d9 · 9e4e7d9
1 parent f4fccb2
commit 9e4e7d9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/packages/adonis/package.json b/packages/adonis/package.json
@@ -92,7 +92,7 @@
       "@release-it/bumper": {
         "out": {
           "file": "package.json",
-          "prefix": "^",
+          "versionPrefix": "^",
           "path": [
             "peerDependencies.@cel_cash/core"
           ]

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -56,7 +56,7 @@
             "@release-it/bumper": {
                 "out": {
                     "file": "package.json",
-                    "prefix": "^",
+                    "versionPrefix": "^",
                     "path": [
                         "peerDependencies.@cel_cash/core"
                     ]

diff --git a/packages/core/src/utils/api.ts b/packages/core/src/utils/api.ts
@@ -48,16 +48,12 @@ export const api = async (
         (!!args.route.query && args.route.query instanceof ZodObject) ||
         (!!args.route.query && args.route.query instanceof ZodEffects)
     ) {
+        const entries = Object.entries(args.rawQuery || {}).filter(
+            ([_, v]) => !['', null, undefined].includes(v),
+        )
+
         const validation = args.route.query.safeParse(
-            Object.fromEntries(
-                Object.entries(args.rawQuery || {}).filter(([_, v]) =>
-                    typeof v === 'string'
-                        ? v.length > 0
-                        : typeof v === 'undefined'
-                          ? false
-                          : true,
-                ),
-            ),
+            Object.fromEntries(entries),
         )
 
         if (validation.success) {

diff --git a/packages/nest/package.json b/packages/nest/package.json
@@ -59,7 +59,7 @@
             "@release-it/bumper": {
                 "out": {
                     "file": "package.json",
-                    "prefix": "^",
+                    "versionPrefix": "^",
                     "path": [
                         "peerDependencies.@cel_cash/core"
                     ]