fix: New names when combineScalarFilters enabled

unlight · Jan 18, 2025 · 88862bd · 88862bd
1 parent 81fe35f
commit 88862bd
Show file tree

Hide file tree

Showing 6 changed files with 257 additions and 234 deletions.
diff --git a/README.md b/README.md
@@ -78,8 +78,6 @@ Default: `@prisma/client`
 
 #### `combineScalarFilters`
 
-DOESNT WORK IN v21+
-
 Combine nested/nullable scalar filters to single  
 Type: `boolean`  
 Default: `false`
@@ -764,3 +762,4 @@ import { generate } from 'prisma-nestjs-graphql/generate';
 
 - keyof typeof SortOrder -> `SortOrder`
 - dummy-createfriends.input.ts -> `create-friends`
+- check 'TODO FIXME'
diff --git a/Taskfile b/Taskfile
@@ -30,10 +30,10 @@ compatibilty_check() {
   rm -rf ./@generated && npm run prisma:g && npm run tscheck
   sed -i 's/noAtomicOperations *= true/noAtomicOperations = false/g' prisma/schema.prisma
 
-  # echo === Check combineScalarFilters ===
-  # sed -i 's/combineScalarFilters *= false/combineScalarFilters = true/g' prisma/schema.prisma
-  # rm -rf ./@generated && npm run prisma:g && npm run tscheck
-  # sed -i 's/combineScalarFilters *= true/combineScalarFilters = false/g' prisma/schema.prisma
+  echo === Check combineScalarFilters ===
+  sed -i 's/combineScalarFilters *= false/combineScalarFilters = true/g' prisma/schema.prisma
+  rm -rf ./@generated && npm run prisma:g && npm run tscheck
+  sed -i 's/combineScalarFilters *= true/combineScalarFilters = false/g' prisma/schema.prisma
 
   echo === Switching reExport ===
   sed -i 's/reExport *= None/reExport = All/g' prisma/schema.prisma

diff --git a/src/handlers/combine-scalar-filters.ts b/src/handlers/combine-scalar-filters.ts
@@ -124,5 +124,13 @@ function postBegin(args: EventArguments) {
     ]);
   }
 
-  remove(inputTypes, inputType => isContainBogus(inputType.name));
+  for (const modelName of modelNames) {
+    replaceBogusFilters(`${modelName}ScalarRelationFilter`, [
+      `${modelName}NullableScalarRelationFilter`,
+    ]);
+  }
+
+  remove(inputTypes, inputType => {
+    return isContainBogus(inputType.name);
+  });
 }
diff --git a/src/test/combine-scalar-filters.spec.ts b/src/test/combine-scalar-filters.spec.ts
@@ -236,8 +236,7 @@ describe('combine scalar filters on array', () => {
   });
 });
 
-describe.skip('empty relation filter input', () => {
-  // TODO: Enable Check combineScalarFilters in Taskfile
+describe('empty relation filter input', () => {
   before(async () => {
     ({ project, sourceFiles } = await testGenerate({
       options: [`combineScalarFilters = true`],