@diia-inhouse/scaffold 2.23.0 → 2.24.0

package/dist/_sharedTemplates/actionTest.t

@@ -4,7 +4,7 @@ import <%= h.changeCase.pascal(name) %>Action from '<%= relateActionPathFromTest
 
 import { getApp } from '@tests/utils/getApp'
 
-import { <%= h.changeCase.pascal(name) %>Res } from '@src/generated'
+import { ActionResult } from '<%= relativeInterfacePath %>'
 
 describe(`Action ${<%= h.changeCase.pascal(name) %>Action.name}`, () => {
     let app: Awaited<ReturnType<typeof getApp>>
@@ -31,6 +31,6 @@ describe(`Action ${<%= h.changeCase.pascal(name) %>Action.name}`, () => {
         const result = await action.handler({session, headers, params: {}})
 
         // Assert
-        expect(result).toEqual<<%= h.changeCase.pascal(name) %>Res>({})
+        expect(result).toEqual<ActionResult>({})
     })
 })

package/dist/_templates/add/action/01-action.ts.t

@@ -4,23 +4,22 @@ to:  <%= actionPath %>
 
 import { GrpcAppAction } from '@diia-inhouse/diia-app'
 
-import { ActionContext } from '@diia-inhouse/types'
 <% if (isActionWithValidation) { %>
   import { ValidationSchema } from '@diia-inhouse/validators'
 <% } %>
 
-import { <%= h.changeCase.pascal(name) %>Req, <%= h.changeCase.pascal(name) %>Res } from '@src/generated'
+import { ActionResult, Context } from '<%= relativeInterfacePath %>'
 
-export default class <%= h.changeCase.pascal(name) %>Action implements GrpcAppAction<ActionContext<<%= h.changeCase.pascal(name) %>Req>> {
+export default class <%= h.changeCase.pascal(name) %>Action implements GrpcAppAction<Context> {
     constructor(private readonly service: unknown) {}
 
     readonly name: string = '<%= name %>'
 
     <% if (isActionWithValidation) { %>
-      readonly validationRules: ValidationSchema<<%= h.changeCase.pascal(name) %>Req> = {}
+      readonly validationRules: ValidationSchema<Context['params']> = {}
     <% } %>
       
-    async handler(args: ActionContext<<%= h.changeCase.pascal(name) %>Req>): Promise<<%= h.changeCase.pascal(name) %>Res> {
+    async handler(args: Context): Promise<ActionResult> {
         const {
             params: {},
         } = args

package/dist/_templates/add/action/01-interface.ts.t

@@ -0,0 +1,12 @@
+---
+to:  <%= interfacePath %>
+---
+
+import { ActionContext } from '@diia-inhouse/types'
+
+import { <%= h.changeCase.pascal(name) %>Req, <%= h.changeCase.pascal(name) %>Res } from '@src/generated'
+
+
+export type Context = ActionContext<<%= h.changeCase.pascal(name) %>Req>
+
+export type ActionResult = <%= h.changeCase.pascal(name) %>Res

package/dist/_templates/add/action/01-test.ts.t

@@ -7,16 +7,16 @@ import <%= h.changeCase.pascal(name) %>Action from '<%= relateActionPathFromTest
 
 import { getApp } from '@tests/utils/getApp'
 
-import { <%= h.changeCase.pascal(name) %>Req, <%= h.changeCase.pascal(name) %>Res } from '@src/generated'
+import { ActionResult } from '<%= relativeInterfacePath %>'
 
 describe(`Action ${<%= h.changeCase.pascal(name) %>Action.name}`, () => {
     let app: Awaited<ReturnType<typeof getApp>>
-    let <%= name %>Action: <%= h.changeCase.pascal(name) %>Action
+    let action: <%= h.changeCase.pascal(name) %>Action
     const testKit = new TestKit()
 
     beforeAll(async () => {
         app = await getApp()
-        <%= name %>Action = app.container.build(<%= h.changeCase.pascal(name) %>Action)
+        action = app.container.build(<%= h.changeCase.pascal(name) %>Action)
     })
 
     afterAll(async () => {
@@ -29,9 +29,9 @@ describe(`Action ${<%= h.changeCase.pascal(name) %>Action.name}`, () => {
         const session = testKit.session.getUserSession()
 
         // Act
-        const result = await <%= name %>Action.handler({session, headers, params: {}})
+        const result = await action.handler({session, headers, params: {}})
 
         // Assert
-        expect(result).toEqual<<%= h.changeCase.pascal(name) %>Res>({})
+        expect(result).toEqual<ActionResult>({})
     })
 })

package/dist/_templates/add/action/02-scriptRunner.t

@@ -1,3 +1,3 @@
 ---
-sh: "npx prettier --write <%= actionPath %> <%= testPath %>"
+sh: "npx prettier --write <%= actionPath %> <%= interfacePath %> <%= testPath %>"
 ---

package/dist/_templates/add/action/prompt.js

@@ -56,6 +56,8 @@ exports.default = {
         }
         const newActionPath = actionFolder === ROOT_ACTION ? node_path_1.default.join(normalizedVersion, actionName) : node_path_1.default.join(normalizedVersion, actionFolder, actionName);
         const finalActionPath = node_path_1.default.resolve(process.cwd(), 'src/actions', `${newActionPath}.ts`);
+        const finalInterfacePath = node_path_1.default.resolve(process.cwd(), 'src/interfaces/actions', `${newActionPath}.ts`);
+        const relativeInterfacePath = node_path_1.default.join('@interfaces/actions', newActionPath);
         const testPath = node_path_1.default.resolve(process.cwd(), 'tests/integration/actions/', `${newActionPath}.spec.ts`);
         const relateActionPathFromTest = node_path_1.default.join('@src/actions', newActionPath);
         const isActionWithValidation = await (0, prompt_1.promptYesNoSelect)({
@@ -65,6 +67,8 @@ exports.default = {
             name: actionName,
             version,
             actionPath: finalActionPath,
+            interfacePath: finalInterfacePath,
+            relativeInterfacePath,
             isActionWithValidation,
             testPath,
             relateActionPathFromTest,

package/dist/_templates/add/action/prompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../../src/_templates/add/action/prompt.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../../src/_templates/add/action/prompt.ts"],"names":[],"mappings":";;;;;AAAA,sDAAwB;AACxB,0DAA4B;AAI5B,4CAAuE;AAEvE,MAAM,WAAW,GAAG,GAAG,CAAA;AACvB,MAAM,UAAU,GAAG,YAAY,CAAA;AAE/B,SAAS,gBAAgB,CAAC,aAAqB;IAC3C,MAAM,uBAAuB,GAAG,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,aAAa,CAAC,CAAA;IAEzF,MAAM,2BAA2B,GAAG,iBAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAA;IAE1E,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAC/B,iBAAE,CAAC,SAAS,CAAC,uBAAuB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAE1D,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;IACpC,CAAC;IAED,MAAM,aAAa,GAAG,iBAAE;SACnB,WAAW,CAAC,uBAAuB,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;SAC7D,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;SACxC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAEvC,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC,CAAA;AACtD,CAAC;AAED,kBAAe;IACX,MAAM,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAU,EAAoB,EAAE;QACrD,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;YAC/C,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,8BAA8B;YACvC,QAAQ,EAAE,IAAI;SACjB,CAAC,CAAA;QACF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;YACtC,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,iCAAiC;YAC1C,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,CAAC,KAAa,EAAU,EAAE,CAAC,IAAI,KAAK,EAAE;SACjD,CAAC,CAAA;QAEF,MAAM,iBAAiB,GAAG,IAAI,OAAO,EAAE,CAAA;QAEvC,IAAI,YAAY,GAAG,MAAM,IAAA,2BAAkB,EAAC;YACxC,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE;UACX,WAAW;UACX,UAAU,0DAA0D;YAClE,OAAO,EAAE,gBAAgB,CAAC,iBAAiB,CAAC;SAC/C,CAAC,CAAA;QAEF,IAAI,YAAY,KAAK,UAAU,EAAE,CAAC;YAC9B,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;gBAC5C,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,eAAe;gBACrB,OAAO,EAAE,+BAA+B;gBACxC,QAAQ,EAAE,IAAI;aACjB,CAAC,CAAA;YAEF,YAAY,GAAG,aAAa,KAAK,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,mBAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAA;QACpH,CAAC;QAED,MAAM,aAAa,GACf,YAAY,KAAK,WAAW,CAAC,CAAC,CAAC,mBAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,mBAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;QAEpI,MAAM,eAAe,GAAG,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,GAAG,aAAa,KAAK,CAAC,CAAA;QACzF,MAAM,kBAAkB,GAAG,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,wBAAwB,EAAE,GAAG,aAAa,KAAK,CAAC,CAAA;QAEvG,MAAM,qBAAqB,GAAG,mBAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAAA;QAE7E,MAAM,QAAQ,GAAG,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,4BAA4B,EAAE,GAAG,aAAa,UAAU,CAAC,CAAA;QACtG,MAAM,wBAAwB,GAAG,mBAAI,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAAA;QAEzE,MAAM,sBAAsB,GAAG,MAAM,IAAA,0BAAiB,EAAC;YACnD,OAAO,EAAE,yBAAyB;SACrC,CAAC,CAAA;QAEF,OAAO;YACH,IAAI,EAAE,UAAU;YAChB,OAAO;YACP,UAAU,EAAE,eAAe;YAC3B,aAAa,EAAE,kBAAkB;YACjC,qBAAqB;YACrB,sBAAsB;YACtB,QAAQ;YACR,wBAAwB;SAC3B,CAAA;IACL,CAAC;CACJ,CAAA"}

package/dist/_templates/add/test/01-test.ts.t

@@ -2,4 +2,4 @@
 to:  <%= testPath %>
 ---
 
-<%- include(sharedTemplatePath, {name, relateActionPathFromTest}) %>
+<%- include(sharedTemplatePath, {name, relativeInterfacePath, relateActionPathFromTest}) %>

package/dist/_templates/add/test/prompt.js

@@ -33,11 +33,13 @@ exports.default = {
         });
         const actionName = node_path_1.default.basename(actionPath);
         const testPath = node_path_1.default.join('tests', 'integration', `${actionPath}.spec.ts`);
+        const relativeInterfacePathFromTest = node_path_1.default.join('@interfaces', actionPath);
         const relateActionPathFromTest = node_path_1.default.join('@src', actionPath);
         const result = {
             sharedTemplatePath: (0, utils_1.getSharedTemplate)('actionTest.t'),
             testPath,
             name: actionName,
+            relativeInterfacePath: relativeInterfacePathFromTest,
             relateActionPathFromTest,
         };
         return result;

package/dist/_templates/add/test/prompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../../src/_templates/add/test/prompt.ts"],"names":[],"mappings":";;;;;AAAA,sDAAwB;AACxB,0DAA4B;AAG5B,+DAAiE;AACjE,0CAAkD;AAElD,KAAK,UAAU,MAAM;IACjB,MAAM,GAAG,GAAa,EAAE,CAAA;IACxB,MAAM,qBAAqB,GAAG,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,CAAA;IAExE,MAAM,EAAE,GAAG,KAAK,EAAE,iBAAyB,EAAiB,EAAE;QAC1D,MAAM,aAAa,GAAG,iBAAE,CAAC,WAAW,CAAC,iBAAiB,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAA;QAEhF,KAAK,MAAM,IAAI,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;YACnE,MAAM,IAAI,GAAG,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,CAAA;YAC/C,MAAM,eAAe,GAAG,mBAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,mBAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAA;YAEhF,MAAM,gBAAgB,GAAG,mBAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,CAAA;YAE7D,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAC9B,CAAC;QAED,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,mBAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;QAEjI,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAC1D,CAAC,CAAA;IAED,MAAM,EAAE,CAAC,qBAAqB,CAAC,CAAA;IAE/B,OAAO,GAAG,CAAA;AACd,CAAC;AAED,kBAAe;IACX,MAAM,EAAE,KAAK,IAAsB,EAAE;QACjC,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAkB,EAAC;YACxC,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,sBAAsB;YAC/B,OAAO,EAAE,MAAM,MAAM,EAAE;SAC1B,CAAC,CAAA;QAEF,MAAM,UAAU,GAAG,mBAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;QAE5C,MAAM,QAAQ,GAAG,mBAAI,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,UAAU,UAAU,CAAC,CAAA;QAC3E,MAAM,wBAAwB,GAAG,mBAAI,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;QAE9D,MAAM,MAAM,GAAG;YACX,kBAAkB,EAAE,IAAA,yBAAiB,EAAC,cAAc,CAAC;YAErD,QAAQ;YACR,IAAI,EAAE,UAAU;YAChB,wBAAwB;SAC3B,CAAA;QAED,OAAO,MAAM,CAAA;IACjB,CAAC;CACJ,CAAA"}
+{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../../src/_templates/add/test/prompt.ts"],"names":[],"mappings":";;;;;AAAA,sDAAwB;AACxB,0DAA4B;AAG5B,+DAAiE;AACjE,0CAAkD;AAElD,KAAK,UAAU,MAAM;IACjB,MAAM,GAAG,GAAa,EAAE,CAAA;IACxB,MAAM,qBAAqB,GAAG,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,CAAA;IAExE,MAAM,EAAE,GAAG,KAAK,EAAE,iBAAyB,EAAiB,EAAE;QAC1D,MAAM,aAAa,GAAG,iBAAE,CAAC,WAAW,CAAC,iBAAiB,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAA;QAEhF,KAAK,MAAM,IAAI,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;YACnE,MAAM,IAAI,GAAG,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,CAAA;YAC/C,MAAM,eAAe,GAAG,mBAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,mBAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAA;YAEhF,MAAM,gBAAgB,GAAG,mBAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,CAAA;YAE7D,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAC9B,CAAC;QAED,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,mBAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;QAEjI,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAC1D,CAAC,CAAA;IAED,MAAM,EAAE,CAAC,qBAAqB,CAAC,CAAA;IAE/B,OAAO,GAAG,CAAA;AACd,CAAC;AAED,kBAAe;IACX,MAAM,EAAE,KAAK,IAAsB,EAAE;QACjC,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAkB,EAAC;YACxC,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,sBAAsB;YAC/B,OAAO,EAAE,MAAM,MAAM,EAAE;SAC1B,CAAC,CAAA;QAEF,MAAM,UAAU,GAAG,mBAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;QAE5C,MAAM,QAAQ,GAAG,mBAAI,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,UAAU,UAAU,CAAC,CAAA;QAC3E,MAAM,6BAA6B,GAAG,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,CAAA;QAC1E,MAAM,wBAAwB,GAAG,mBAAI,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;QAE9D,MAAM,MAAM,GAAG;YACX,kBAAkB,EAAE,IAAA,yBAAiB,EAAC,cAAc,CAAC;YAErD,QAAQ;YACR,IAAI,EAAE,UAAU;YAChB,qBAAqB,EAAE,6BAA6B;YACpD,wBAAwB;SAC3B,CAAA;QAED,OAAO,MAAM,CAAA;IACjB,CAAC;CACJ,CAAA"}

package/dist/_templates/init/service/01-src.actions.v1.getAddResult.ts.t

@@ -4,12 +4,11 @@ to:  <%= serviceName %>/src/actions/v1/getAddResult.ts
 
 import { GrpcAppAction } from '@diia-inhouse/diia-app'
 
-import { ActionContext } from '@diia-inhouse/types'
 import { ValidationSchema } from '@diia-inhouse/validators'
 
-import { GetAddResultReq, GetAddResultRes } from '@src/generated'
+import { ActionResult, Context } from '@interfaces/actions/v1/getAddResult'
 
-export default class GetAddResultAction implements GrpcAppAction<ActionContext<GetAddResultReq>> {
+export default class GetAddResultAction implements GrpcAppAction<Context> {
     readonly name = 'getAddResult'
 
     readonly validationRules: ValidationSchema<GetAddResultReq> = {
@@ -17,7 +16,7 @@ export default class GetAddResultAction implements GrpcAppAction<ActionContext<G
         b: {type: 'number'}
     }
 
-    async handler(args: ActionContext<GetAddResultReq>): Promise<GetAddResultRes> {
+    async handler(args: Context): Promise<ActionResult> {
         const { params: { a, b } } = args
 
         return { result: a + b }

package/dist/_templates/init/service/01-src.interfaces.actions.v1.getAddResult.ts.t

@@ -0,0 +1,11 @@
+---
+to:  <%= serviceName %>/src/interfaces/actions/v1/getAddResult.ts
+---
+
+import { ActionContext } from '@diia-inhouse/types'
+
+import { GetAddResultReq, GetAddResultRes } from '@src/generated'
+
+export type Context = ActionContext<GetAddResultReq>
+
+export type ActionResult = GetAddResultRes

package/dist/_templates/init/service/01-tests.integration.actionts.getAddResult.spec.ts.t

@@ -4,19 +4,20 @@ to:  <%= serviceName %>/tests/integration/actions/v1/getAddResult.spec.ts
 
 import TestKit from '@diia-inhouse/test'
 
+import { ActionResult } from '@interfaces/actions/v1/getAddResult'
+
 import GetAddResultAction from '@src/actions/v1/getAddResult'
-import { GetAddResultRes } from '@src/generated'
 
 import { getApp } from '@tests/utils/getApp'
 
 describe(`Action ${GetAddResultAction.name}`, () => {
     let app: Awaited<ReturnType<typeof getApp>>
-    let getAddResult: GetAddResultAction
+    let action: GetAddResultAction
     const testKit = new TestKit()
 
     beforeAll(async () => {
         app = await getApp()
-        getAddResult = app.container.build(GetAddResultAction)
+        action = app.container.build(GetAddResultAction)
     })
 
     afterAll(async () => {
@@ -32,9 +33,9 @@ describe(`Action ${GetAddResultAction.name}`, () => {
         const b = 3;
         
         // Act
-        const result = await getAddResult.handler({ params: { a, b }, session, headers })
+        const result = await action.handler({ params: { a, b }, session, headers })
 
         // Assert
-        expect(result).toEqual<GetAddResultRes>({ result: 5 })
+        expect(result).toEqual<ActionResult>({ result: 5 })
     })
 })

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@diia-inhouse/scaffold",
-    "version": "2.23.0",
+    "version": "2.24.0",
     "main": "dist/index.js",
     "engines": {
         "node": ">=20"