Merge branch 'develop' into DP-3835-gsg-simplifier-et-etandre-la-facon-dappeller-les-hooks-de-resolvers-et-ou-mutation-array

Author: vincentdesmares

CHANGELOG.md

@@ -2,6 +2,94 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [9.4.1](https://github.com/teamstarter/graphql-sequelize-generator/compare/v9.4.0...v9.4.1) (2025-03-26)
+
+
+### Bug Fixes
+
+* **count:** Fix where and includes not initialized in the count hook like the list one. ([df10069](https://github.com/teamstarter/graphql-sequelize-generator/commit/df10069))
+
+
+
+## [9.4.0](https://github.com/teamstarter/graphql-sequelize-generator/compare/v9.3.0...v9.4.0) (2025-03-26)
+
+
+### Features
+
+* **hooks:** Harmonize hooks parametersnaming ([0fb5e05](https://github.com/teamstarter/graphql-sequelize-generator/commit/0fb5e05))
+
+
+
+## [9.3.0](https://github.com/teamstarter/graphql-sequelize-generator/compare/v9.2.0...v9.3.0) (2025-03-26)
+
+
+### Features
+
+* **hooks:** Make possible to type the context of the hooks. ([33f1859](https://github.com/teamstarter/graphql-sequelize-generator/commit/33f1859))
+
+
+
+## [9.2.0](https://github.com/teamstarter/graphql-sequelize-generator/compare/v9.1.0...v9.2.0) (2025-03-25)
+
+
+### Features
+
+* **hooks:** Initialize the includes and limit the way they work by default to make it easier to use in hooks. ([4996577](https://github.com/teamstarter/graphql-sequelize-generator/commit/4996577))
+
+
+
+## [9.1.0](https://github.com/teamstarter/graphql-sequelize-generator/compare/v9.0.3...v9.1.0) (2025-03-25)
+
+
+### Features
+
+* **list:** Improve the list resolver by initializing the where and typing it properly to avoid suggesting it could be a function while it's not possible through Graphql. ([9c6aaa2](https://github.com/teamstarter/graphql-sequelize-generator/commit/9c6aaa2))
+
+
+
+### [9.0.3](https://github.com/teamstarter/graphql-sequelize-generator/compare/v9.0.2...v9.0.3) (2025-03-24)
+
+
+### Bug Fixes
+
+* **subscription:** Fix regression. ([00ca8b6](https://github.com/teamstarter/graphql-sequelize-generator/commit/00ca8b6))
+
+
+
+### [9.0.2](https://github.com/teamstarter/graphql-sequelize-generator/compare/v9.0.1...v9.0.2) (2025-03-24)
+
+
+### Bug Fixes
+
+* **customHooks:** Fix create/update/delete complete overwrite. ([f6600f1](https://github.com/teamstarter/graphql-sequelize-generator/commit/f6600f1))
+
+
+
+### [9.0.1](https://github.com/teamstarter/graphql-sequelize-generator/compare/v9.0.0...v9.0.1) (2025-03-24)
+
+
+### Bug Fixes
+
+* **types:** Fix regression on declaration. ([d3b3545](https://github.com/teamstarter/graphql-sequelize-generator/commit/d3b3545))
+
+
+
+## [9.0.0](https://github.com/teamstarter/graphql-sequelize-generator/compare/v8.7.4...v9.0.0) (2025-03-24)
+
+
+### Features
+
+* **hooks:** Change global hook signature ([b15061b](https://github.com/teamstarter/graphql-sequelize-generator/commit/b15061b))
+* **hooks:** Change the signature of all the hooks to take an object instead of an array. ([bae8017](https://github.com/teamstarter/graphql-sequelize-generator/commit/bae8017))
+
+
+### BREAKING CHANGES
+
+* **hooks:** Change the signature of all the hooks to take an object instead of an array.
+* **hooks:** change global hook signature
+
+
+
 ### [8.7.4](https://github.com/teamstarter/graphql-sequelize-generator/compare/v8.7.3...v8.7.4) (2024-06-04)
 
 

lib/mutationResolvers/create.js

@@ -87,7 +87,7 @@ function generateMutationCreate(modelName, inputType, outputType, model, graphql
             ? graphqlModelDeclaration.create.extraArg
             : {})),
         resolve: function (source, args, context, info) { return __awaiter(_this, void 0, void 0, function () {
-            var attributes, beforeList, beforeList_1, beforeList_1_1, before, handle, e_1_1, beforeList, beforeList_2, beforeList_2_1, before, beforeHandle, e_2_1, preventDuplicateAttributes_1, filters, entityDuplicate, newEntity, error_1, afterList, updatedEntity, hookData, afterList_1, afterList_1_1, after, afterHandle, e_3_1;
+            var attributes, beforeList, beforeList_1, beforeList_1_1, before, handle, e_1_1, beforeList, beforeList_2, beforeList_2_1, before, beforeHandle, e_2_1, preventDuplicateAttributes_1, filters, entityDuplicate, newEntity, error_1, afterList, createdEntity, hookData, afterList_1, afterList_1_1, after, afterHandle, e_3_1;
             var e_1, _a, e_2, _b, e_3, _c, _d, _e;
             return __generator(this, function (_f) {
                 switch (_f.label) {
@@ -221,8 +221,8 @@ function generateMutationCreate(modelName, inputType, outputType, model, graphql
                         afterList = Array.isArray(graphqlModelDeclaration.create.after)
                             ? graphqlModelDeclaration.create.after
                             : [graphqlModelDeclaration.create.after];
-                        updatedEntity = newEntity;
-                        hookData = { data: updatedEntity.get({ plain: true }) };
+                        createdEntity = newEntity;
+                        hookData = { data: createdEntity.get({ plain: true }) };
                         _f.label = 24;
                     case 24:
                         _f.trys.push([24, 29, 30, 31]);
@@ -233,15 +233,15 @@ function generateMutationCreate(modelName, inputType, outputType, model, graphql
                         after = afterList_1_1.value;
                         afterHandle = globalPreCallback('createAfter');
                         return [4 /*yield*/, after({
-                                newEntity: updatedEntity,
+                                createdEntity: createdEntity,
                                 source: source,
                                 args: args,
                                 context: context,
                                 info: info,
                                 setWebhookData: (0, setWebhookData_1["default"])(hookData)
                             })];
                     case 26:
-                        updatedEntity = _f.sent();
+                        createdEntity = _f.sent();
                         if (afterHandle) {
                             afterHandle();
                         }
@@ -263,13 +263,13 @@ function generateMutationCreate(modelName, inputType, outputType, model, graphql
                     case 31:
                         if (pubSubInstance) {
                             pubSubInstance.publish("".concat(modelName, "Created"), (_d = {},
-                                _d["".concat(modelName, "Created")] = updatedEntity.get(),
+                                _d["".concat(modelName, "Created")] = createdEntity.get(),
                                 _d));
                         }
                         return [4 /*yield*/, (0, callModelWebhook_1["default"])(modelName, graphqlModelDeclaration.webhooks, 'create', context, hookData.data, callWebhook)];
                     case 32:
                         _f.sent();
-                        return [2 /*return*/, updatedEntity];
+                        return [2 /*return*/, createdEntity];
                     case 33:
                         if (pubSubInstance) {
                             pubSubInstance.publish("".concat(modelName, "Created"), (_e = {},

lib/mutationResolvers/update.js

@@ -206,7 +206,7 @@ function generateMutationUpdate(modelName, inputType, outputType, graphqlModelDe
                         afterHandle = globalPreCallback('updateAfter');
                         return [4 /*yield*/, after({
                                 updatedEntity: updatedEntity,
-                                entitySnapshot: snapshotBeforeUpdate,
+                                previousPropertiesSnapshot: snapshotBeforeUpdate,
                                 source: source,
                                 args: args,
                                 context: context,

lib/queryResolvers/count.js

@@ -105,6 +105,12 @@ function countResolver(model, schemaDeclaration, globalPreCallback) {
                     return [7 /*endfinally*/];
                 case 8:
                     findOptions = graphql_sequelize_1.argsToFindOptions["default"](args, Object.keys(model.getAttributes()));
+                    if (!findOptions.where) {
+                        findOptions.where = {};
+                    }
+                    if (typeof findOptions.include === 'undefined') {
+                        findOptions.include = [];
+                    }
                     if (!countBefore) return [3 /*break*/, 16];
                     beforeList = Array.isArray(countBefore)
                         ? countBefore

lib/queryResolvers/createListResolver.js

@@ -63,7 +63,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 var graphql_sequelize_1 = require("graphql-sequelize");
 var sequelize_1 = require("sequelize");
-var removeUnusedAttributes_1 = __importDefault(require("../removeUnusedAttributes"));
+var removeUnusedAttributes_1 = __importDefault(require("./../removeUnusedAttributes"));
 function allowOrderOnAssociations(findOptions, model) {
     if (typeof findOptions.order === 'undefined') {
         return findOptions;
@@ -161,15 +161,15 @@ function allowOrderOnAssociations(findOptions, model) {
     return findOptions;
 }
 var argsAdvancedProcessing = function (findOptions, args, context, info, model, models) {
-    findOptions = allowOrderOnAssociations(findOptions, model);
+    var findOptionsWithFlatWhere = allowOrderOnAssociations(findOptions, model);
     // When an association uses a scope, we have to add it to the where condition by default.
     if (info.parentType &&
         models[info.parentType.name] &&
         models[info.parentType.name].associations[info.fieldName].scope) {
-        findOptions.where = __assign(__assign({}, (findOptions.where ? findOptions.where : {})), models[info.parentType.name].associations[info.fieldName]
+        findOptionsWithFlatWhere.where = __assign(__assign({}, (findOptions.where ? findOptions.where : {})), models[info.parentType.name].associations[info.fieldName]
             .scope);
     }
-    return findOptions;
+    return findOptionsWithFlatWhere;
 };
 function trimAndOptimizeFindOptions(_a) {
     var findOptions = _a.findOptions, graphqlTypeDeclaration = _a.graphqlTypeDeclaration, info = _a.info, models = _a.models, args = _a.args;
@@ -298,6 +298,12 @@ function createListResolver(graphqlTypeDeclaration, models, globalPreCallback, r
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
+                        if (!findOptions.where) {
+                            findOptions.where = {};
+                        }
+                        if (typeof findOptions.include === 'undefined') {
+                            findOptions.include = [];
+                        }
                         processedFindOptions = argsAdvancedProcessing(findOptions, args, context, info, graphqlTypeDeclaration.model, models);
                         if (graphqlTypeDeclaration.list &&
                             graphqlTypeDeclaration.list.enforceMaxLimit) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamstarter/graphql-sequelize-generator",
-  "version": "8.7.4",
+  "version": "9.4.1",
   "description": "A set of tools to easily generate a Graphql API from sequelize models.",
   "keywords": [
     "graphql",

src/mutationResolvers/create.ts

@@ -157,12 +157,12 @@ export default function generateMutationCreate<M extends Model<any>>(
           ? graphqlModelDeclaration.create.after
           : [graphqlModelDeclaration.create.after as CreateAfterHook<M>]
 
-        let updatedEntity = newEntity
-        const hookData = { data: updatedEntity.get({ plain: true }) }
+        let createdEntity = newEntity
+        const hookData = { data: createdEntity.get({ plain: true }) }
         for (const after of afterList) {
           const afterHandle = globalPreCallback('createAfter')
-          updatedEntity = await after({
-            newEntity: updatedEntity,
+          createdEntity = await after({
+            createdEntity,
             source,
             args,
             context,
@@ -176,7 +176,7 @@ export default function generateMutationCreate<M extends Model<any>>(
 
         if (pubSubInstance) {
           pubSubInstance.publish(`${modelName}Created`, {
-            [`${modelName}Created`]: updatedEntity.get(),
+            [`${modelName}Created`]: createdEntity.get(),
           })
         }
 
@@ -189,7 +189,7 @@ export default function generateMutationCreate<M extends Model<any>>(
           callWebhook
         )
 
-        return updatedEntity
+        return createdEntity
       }
 
       if (pubSubInstance) {

src/mutationResolvers/delete.ts

@@ -20,7 +20,10 @@ import callModelWebhook from './callModelWebhook'
  * @param {*} models
  * @param {PubSub} pubSubInstance
  */
-export default function generateMutationDelete<M extends Model<any>>(
+export default function generateMutationDelete<
+  M extends Model<any>,
+  TContext = any
+>(
   modelName: string,
   graphqlModelDeclaration: ModelDeclarationType<M>,
   models: SequelizeModels,

src/mutationResolvers/update.ts

@@ -124,7 +124,7 @@ export default function generateMutationUpdate<M extends Model<any>>(
           const afterHandle = globalPreCallback('updateAfter')
           updatedEntity = await after({
             updatedEntity,
-            entitySnapshot: snapshotBeforeUpdate,
+            previousPropertiesSnapshot: snapshotBeforeUpdate,
             source,
             args,
             context,

src/queryResolvers/count.ts

@@ -8,7 +8,7 @@ import {
   QueryBeforeHook,
 } from '../types/types'
 
-export default function countResolver<M extends Model<any>>(
+export default function countResolver<M extends Model<any>, TContext = any>(
   model: ModelStatic<M>,
   schemaDeclaration: ModelDeclarationType<M>,
   globalPreCallback: GlobalPreCallback
@@ -33,7 +33,7 @@ export default function countResolver<M extends Model<any>>(
       ? schemaDeclaration.count.before
       : listBefore
 
-  return async (source: any, args: any, context: any, info: any) => {
+  return async (source: any, args: any, context: TContext, info: any) => {
     if (schemaDeclaration.before) {
       const beforeList: GlobalBeforeHook[] = Array.isArray(
         schemaDeclaration.before
@@ -55,6 +55,14 @@ export default function countResolver<M extends Model<any>>(
       Object.keys(model.getAttributes())
     )
 
+    if (!findOptions.where) {
+      findOptions.where = {}
+    }
+
+    if (typeof findOptions.include === 'undefined') {
+      findOptions.include = []
+    }
+
     if (countBefore) {
       const beforeList: QueryBeforeHook<M>[] = Array.isArray(countBefore)
         ? countBefore