drizzle-graphql-plus 0.8.22 → 0.8.24

package/index.js

@@ -2469,6 +2469,7 @@ var generateTypeDefs = (tables, relations) => {
       }
       fields.push(`  ${columnName}: ${typeStr}`);
     }
+    fields.push(`  _operation: OPERATION!`);
     const tableRelations = relations[tableName];
     if (tableRelations) {
       for (const [relationName, relationInfo] of Object.entries(
@@ -2478,8 +2479,21 @@ var generateTypeDefs = (tables, relations) => {
         const targetTableName = relationInfo.targetTableName;
         const targetTypeName = capitalize(targetTableName);
         if (isOne) {
+          const relation = relationInfo.relation;
+          const config = relation.config;
+          let isNonNullable = false;
+          if (config?.fields && config.fields.length > 0) {
+            isNonNullable = config.fields.every((field) => {
+              const fieldColumnName = field.name;
+              const column = Object.values(tableInfo.columns).find(
+                (col) => col.name === fieldColumnName
+              );
+              return column && column.notNull;
+            });
+          }
+          const nullableModifier = isNonNullable ? "!" : "";
           fields.push(
-            `  ${relationName}(where: ${targetTypeName}Filters): ${targetTypeName}`
+            `  ${relationName}(where: ${targetTypeName}Filters): ${targetTypeName}${nullableModifier}`
           );
         } else {
           fields.push(
@@ -2552,6 +2566,12 @@ ${orderByFields.join("\n")}
 }`);
   }
   const allDefs = [];
+  allDefs.push(`enum OPERATION {
+  READ
+  INSERTED
+  UPDATED
+  DELETED
+}`);
   if (customScalars.size > 0) {
     for (const scalarName of Array.from(customScalars).sort()) {
       allDefs.push(`scalar ${scalarName}`);
@@ -2880,7 +2900,10 @@ var createQueryResolver = (queryBase, tableInfo, tables, relations) => {
           allFields
         )
       });
-      return result;
+      return result.map((row) => ({
+        ...row,
+        _operation: "READ"
+      }));
     } catch (e) {
       if (typeof e === "object" && e !== null && "message" in e) {
         throw new GraphQLError6(String(e.message));
@@ -2953,6 +2976,7 @@ var buildWhereClause2 = (tableInfo, where) => {
 };
 var generateMutations = (db, tables, relations) => {
   const mutations = {};
+  const deleteResultResolvers = {};
   for (const [tableName, tableInfo] of Object.entries(tables)) {
     const capitalizedName = capitalize(tableName);
     const queryBase = db.query[tableName];
@@ -2989,7 +3013,7 @@ var generateMutations = (db, tables, relations) => {
         const insertedIds = insertedRows.map(
           (row) => row[primaryKeyColumn.name]
         );
-        return queryResolver(
+        const result = await queryResolver(
           parent,
           {
             where: {
@@ -2999,6 +3023,10 @@ var generateMutations = (db, tables, relations) => {
           context,
           info
         );
+        return result.map((row) => ({
+          ...row,
+          _operation: "INSERTED"
+        }));
       } catch (e) {
         if (typeof e === "object" && e !== null && "message" in e) {
           throw new GraphQLError7(String(e.message));
@@ -3022,7 +3050,7 @@ var generateMutations = (db, tables, relations) => {
         const updatedIds = updatedRows.map(
           (row) => row[primaryKeyColumn.name]
         );
-        return queryResolver(
+        const result = await queryResolver(
           parent,
           {
             where: {
@@ -3032,6 +3060,10 @@ var generateMutations = (db, tables, relations) => {
           context,
           info
         );
+        return result.map((row) => ({
+          ...row,
+          _operation: "UPDATED"
+        }));
       } catch (e) {
         if (typeof e === "object" && e !== null && "message" in e) {
           throw new GraphQLError7(String(e.message));
@@ -3047,8 +3079,11 @@ var generateMutations = (db, tables, relations) => {
         if (whereClause) {
           deleteQuery = deleteQuery.where(whereClause);
         }
-        const result = await deleteQuery.returning();
-        return result;
+        const deletedRows = await deleteQuery.returning();
+        return deletedRows.map((row) => ({
+          ...row,
+          _operation: "DELETED"
+        }));
       } catch (e) {
         if (typeof e === "object" && e !== null && "message" in e) {
           throw new GraphQLError7(String(e.message));
@@ -3057,7 +3092,7 @@ var generateMutations = (db, tables, relations) => {
       }
     };
   }
-  return mutations;
+  return { mutations, deleteResultResolvers: {} };
 };
 
 // src/buildSchemaSDL/index.ts
@@ -3080,12 +3115,17 @@ var buildSchemaSDL = (db, config) => {
   typeDefsArray.push(generateMutationTypeDefs(tables));
   const typeDefs = typeDefsArray.join("\n\n");
   const queries = generateQueries(db, tables, relations);
-  const mutations = generateMutations(db, tables, relations);
+  const { mutations, deleteResultResolvers } = generateMutations(
+    db,
+    tables,
+    relations
+  );
   return {
     typeDefs,
     resolvers: {
       Query: queries,
-      Mutation: mutations
+      Mutation: mutations,
+      ...deleteResultResolvers
     }
   };
 };