fix: Filter non-context parameters needed for the event callback

Author: vladimir-rangelov

src/macrofier/engine.mjs

@@ -1592,10 +1592,27 @@ function insertMethodMacros(template, methodObj, platformApi, appApi, templates,
 
   let eventParams = event.params && event.params.length ? getTemplate('/sections/parameters', templates) + event.params.map(p => insertParameterMacros(getTemplate('/parameters/default', templates), p, event, currentModuleApiForEvent)).join('') : ''
   const eventForSubscriber = getNotifierForMethod(method, appApi)
-  let eventAllParams =  (eventForSubscriber && eventForSubscriber.params && eventForSubscriber.params.length) ? getTemplate('/sections/parameters', templates) + eventForSubscriber.params.map(p => insertParameterMacros(getTemplate('/parameters/default', templates), p, eventForSubscriber, appApi)).join(', ') : ''
+  
+  // Filter parameters to remove context parameters, because only non-context parameters are parameters for the event callback
+  let xContextParams = 0
+  let eventNonContextualParams = ''
+  if (eventForSubscriber) {
+    if (eventForSubscriber.tags) {
+      const tag = eventForSubscriber.tags.find(tag => tag.name === 'notifier');
+      xContextParams = tag['x-contextual-params'] || 0
+    }
+
+    if (eventForSubscriber.params && eventForSubscriber.params.length) {
+      if (xContextParams > 0) {
+        const nonContextParamsArray = eventForSubscriber.params.slice(xContextParams, eventForSubscriber.params.length)
+        eventNonContextualParams = getTemplate('/sections/parameters', templates) + nonContextParamsArray.map(p => insertParameterMacros(getTemplate('/parameters/default', templates), p, eventForSubscriber, appApi)).join(', ')
+      } else
+        eventNonContextualParams = getTemplate('/sections/parameters', templates) + eventForSubscriber.params.map(p => insertParameterMacros(getTemplate('/parameters/default', templates), p, eventForSubscriber, appApi)).join(', ')
+    }
+  }
 
   if (isGeneratingDocs(languages)) {
-    eventAllParams = isEventMethod(methodObj) && event.result ? Types.getMethodSignatureResult(event, currentModuleApiForEvent, { callback: true, namespace: !config.copySchemasIntoModules }) : ''
+    eventNonContextualParams = isEventMethod(methodObj) && event.result ? Types.getMethodSignatureResult(event, currentModuleApiForEvent, { callback: true, namespace: !config.copySchemasIntoModules }) : ''
     // If there's a notifier for this method, and it has examples, use its params for the eventParams section
     if (eventForSubscriber && eventForSubscriber.examples && eventForSubscriber.examples.length) {
       eventParams = (eventForSubscriber.params && eventForSubscriber.params.length) ?
@@ -1800,7 +1817,7 @@ function insertMethodMacros(template, methodObj, platformApi, appApi, templates,
     .replace(/\$\{method\.result\.type\}/g, Types.getSchemaType(result.schema, platformApi, { templateDir: state.typeTemplateDir, title: true, asPath: false, result: true, namespace: false  })) //, baseUrl: options.baseUrl    
     .replace(/\$\{method\.result\.json\}/g, Types.getSchemaType(result.schema.type === 'null' ? getNonNullSchema(methodObj, event, platformApi, appApi) : result.schema, platformApi, { templateDir: 'json-types', title: true, code: false, link: false, asPath: false, expandEnums: false, namespace: true  }))
     // todo: what does prefix do?
-    .replace(/\$\{event\.result\.type\}/g, isEventMethod(methodObj) && eventAllParams ? eventAllParams : '')
+    .replace(/\$\{event\.result\.type\}/g, isEventMethod(methodObj) && eventNonContextualParams ? eventNonContextualParams : '')
     .replace(/\$\{event\.result\.json\.type\}/g, resultJsonType)
     .replace(/\$\{event\.result\.json\.type\}/g, callbackResultJsonType)
     .replace(/\$\{event\.pulls\.param\.name\}/g, pullsEventParamName)