improve return types of createTemplateFilter() and createTemplateGlobalFunction();

accommodate in ScaffolderTemplatingExtensionPoint

Signed-off-by: Matt Benson <gudnabrsam@gmail.com>

plugins/scaffolder-node/src/alpha/filters/createTemplateFilter.ts

@@ -24,9 +24,9 @@ import { z } from 'zod';
  */
 export const createTemplateFilter = <
   TSchema extends TemplateFilterSchema<any, any> | undefined,
-  TFunctionSchema extends TSchema extends TemplateFilterSchema<any, any>
+  TFilterSchema extends TSchema extends TemplateFilterSchema<any, any>
     ? z.infer<ReturnType<TSchema>>
     : (arg: JsonValue, ...rest: JsonValue[]) => JsonValue | undefined,
 >(
-  filter: CreatedTemplateFilter<TSchema, TFunctionSchema>,
-): CreatedTemplateFilter<unknown, unknown> => filter;
+  filter: CreatedTemplateFilter<TSchema, TFilterSchema>,
+): CreatedTemplateFilter<TSchema, TFilterSchema> => filter;

plugins/scaffolder-node/src/alpha/globals/createTemplateGlobal.ts

@@ -45,4 +45,4 @@ export const createTemplateGlobalFunction = <
     : (...args: JsonValue[]) => JsonValue | undefined,
 >(
   fn: CreatedTemplateGlobalFunction<TSchema, TFilterSchema>,
-): CreatedTemplateGlobalFunction<any, any> => fn;
+): CreatedTemplateGlobalFunction<TSchema, TFilterSchema> => fn;

plugins/scaffolder-node/src/alpha/index.ts

@@ -73,7 +73,9 @@ export const scaffolderTaskBrokerExtensionPoint =
  */
 export interface ScaffolderTemplatingExtensionPoint {
   addTemplateFilters(
-    filters: Record<string, TemplateFilter> | CreatedTemplateFilter[],
+    filters:
+      | Record<string, TemplateFilter>
+      | CreatedTemplateFilter<unknown, unknown>[],
   ): void;
 
   addTemplateGlobals(