fix: Mandatory where filter typings

Author: celine-s

src/bin/gqm/permissions.ts

@@ -31,16 +31,15 @@ export const generatePermissionTypes = (models: Models) => {
     sourceFile.addStatements((writer) =>
       writer.write(`export type ${model.name}Where = `).inlineBlock(() => {
         for (const field of model.fields.filter((field) => field.filterable)) {
-          const optional = typeof field.filterable !== 'object' || field.filterable.nonNull !== true ? '?' : '';
           if (field.kind === 'relation') {
-            writer.writeLine(`${field.name}${optional}: ${field.type}Where,`);
+            writer.writeLine(`${field.name}?: ${field.type}Where,`);
           } else if (!field.kind || field.kind === 'primitive') {
-            writer.writeLine(`${field.name}${optional}: ${PRIMITIVE_TYPES[field.type]} | ${PRIMITIVE_TYPES[field.type]}[],`);
+            writer.writeLine(`${field.name}?: ${PRIMITIVE_TYPES[field.type]} | readonly ${PRIMITIVE_TYPES[field.type]}[],`);
           } else {
             if (field.kind === 'enum') {
               usedEnums.add(field.type);
             }
-            writer.writeLine(`${field.name}${optional}: ${field.type} | ${field.type}[],`);
+            writer.writeLine(`${field.name}?: ${field.type} | readonly ${field.type}[],`);
           }
         }
       }),

src/schema/generate.ts

@@ -58,7 +58,13 @@ export const generateDefinitions = ({
               list: !field.toOne,
               nonNull: !field.toOne,
               args: [
-                { name: 'where', type: `${targetModel.name}Where` },
+                {
+                  name: 'where',
+                  type: `${targetModel.name}Where`,
+                  nonNull: targetModel.fields.some(
+                    ({ filterable }) => typeof filterable === 'object' && filterable.nonNull === true,
+                  ),
+                },
                 ...(targetModel.fields.some(({ searchable }) => searchable) ? [{ name: 'search', type: 'String' }] : []),
                 ...(targetModel.fields.some(({ orderable }) => orderable)
                   ? [{ name: 'orderBy', type: `${targetModel.name}OrderBy`, list: true }]
@@ -210,7 +216,11 @@ export const generateDefinitions = ({
           list: true,
           nonNull: true,
           args: [
-            { name: 'where', type: `${model.name}Where` },
+            {
+              name: 'where',
+              type: `${model.name}Where`,
+              nonNull: model.fields.some(({ filterable }) => typeof filterable === 'object' && filterable.nonNull === true),
+            },
             ...(model.fields.some(({ searchable }) => searchable) ? [{ name: 'search', type: 'String' }] : []),
             ...(model.fields.some(({ orderable }) => orderable)
               ? [{ name: 'orderBy', type: `${model.name}OrderBy`, list: true }]
@@ -227,7 +237,11 @@ export const generateDefinitions = ({
           type: `${model.name}Aggregate`,
           nonNull: true,
           args: [
-            { name: 'where', type: `${model.name}Where` },
+            {
+              name: 'where',
+              type: `${model.name}Where`,
+              nonNull: model.fields.some(({ filterable }) => typeof filterable === 'object' && filterable.nonNull === true),
+            },
             ...(model.fields.some(({ searchable }) => searchable) ? [{ name: 'search', type: 'String' }] : []),
             { name: 'limit', type: 'Int' },
             { name: 'offset', type: 'Int' },