@diia-inhouse/scaffold 2.17.0 → 2.22.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 { ActionResult } from '<%= relativeInterfacePath %>'
+import { <%= h.changeCase.pascal(name) %>Res } from '@src/generated'
 
 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<ActionResult>({})
+        expect(result).toEqual<<%= h.changeCase.pascal(name) %>Res>({})
     })
 })

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

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

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

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

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

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

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

@@ -5,9 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
-const types_1 = require("@diia-inhouse/types");
 const prompt_1 = require("../../../prompt");
-const dict_1 = require("./dict");
 const ROOT_ACTION = '.';
 const NEW_FOLDER = 'new-folder';
 function getActionsFolder(versionFolder) {
@@ -58,28 +56,16 @@ 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)({
             message: 'Do you need validation?',
         });
-        const sessionType = await (0, prompt_1.promptAutoComplete)({
-            name: 'sessionType',
-            message: 'Pick SessionType for current action',
-            choices: Object.keys(types_1.SessionType),
-        });
-        const inheritedActionInterface = dict_1.mapSessionTypeToActionArguments[sessionType];
         return {
             name: actionName,
             version,
             actionPath: finalActionPath,
-            interfacePath: finalInterfacePath,
-            relativeInterfacePath,
             isActionWithValidation,
-            inheritedActionInterface,
-            sessionType,
             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":"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"}

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

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

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

@@ -33,13 +33,11 @@ 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,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"}
+{"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"}

package/dist/_templates/init/package/01-package.json.t

@@ -10,7 +10,7 @@ to:  <%= packageName %>/package.json
   "main": "dist/index.js",
   "types": "dist/types/index.d.ts",
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "scripts": {
     "build": "tsc",
@@ -23,7 +23,7 @@ to:  <%= packageName %>/package.json
     "test": "jest",
     "test:unit": "npm run test --selectProjects unit",
     "find-circulars": "madge --circular --extensions ts ./",
-    "lint:lockfile": "lockfile-lint --path package-lock.json --allowed-hosts registry.npmjs.org --validate-https"
+    "lint:lockfile": "lockfile-lint --path package-lock.json --allowed-hosts registry.npmjs.org gitlab.diia.org.ua --validate-https"
   },
   "files": ["dist"],
   "keywords": [],

package/dist/_templates/init/package/01-tsconfig.json.t

@@ -14,8 +14,7 @@ to:  <%= packageName %>/tsconfig.json
             "@interfaces/*": ["src/interfaces/*"],
             "@src/*": ["src/*"],
             "@tests/*": ["tests/*"]
-        },
-        "plugins": [{ "transform": "typescript-transform-paths" }, { "transform": "typescript-transform-paths", "afterDeclarations": true }]
+        }
     },
     "include": ["src/**/*"],
     "exclude": ["node_modules", "tests"]

package/dist/_templates/init/service/01-.env.example.t

@@ -2,7 +2,7 @@
 to:  <%= serviceName %>/.env.example
 ---
 NODE_ENV=local
-LOG_LEVEL=debug
+LOG_LEVEL=info
 
 TRANSPORT_TYPE=Redis
 TRANSPORT_OPTIONS={"host":"localhost","port":"6379"}
@@ -55,5 +55,6 @@ HEALTH_CHECK_IS_ENABLED=false
 HEALTH_CHECK_IS_PORT=4545
 
 GRPC_SERVER_ENABLED=true
+GRPC_REFLECTION_ENABLED=true
 GRPC_SERVICES=["ua.gov.diia.<%= h.changeCase.pascalCase(serviceName).toLowerCase() %>.<%= h.changeCase.pascalCase(serviceName) %>"]
 GRPC_SERVER_PORT=5<%= Math.floor(Math.random() * (999 - 100) + 100) %>

package/dist/_templates/init/service/01-.eslintignore.t

@@ -5,4 +5,5 @@ to:  <%= serviceName %>/.eslintignore
 node_modules
 dist
 coverage
-migrate-mongo-config.ts
+migrate-mongo-config.ts
+src/generated

package/dist/_templates/init/service/01-.prettierignore.t

@@ -3,4 +3,4 @@ to:  <%= serviceName %>/.prettierignore
 ---
 
 dist
-generated
+src/generated

package/dist/_templates/init/service/01-dockerfile.t

@@ -2,7 +2,7 @@
 to:  <%= serviceName %>/Dockerfile
 ---
 ### Stage 1
-FROM node:18-alpine as node-first
+FROM gitlab.diia.org.ua:5050/diia-inhouse/ci/node-builder:18-alpine as node-first
 
 WORKDIR /home/node/app
 

package/dist/_templates/init/service/01-package.json.t

@@ -15,8 +15,8 @@ to:  <%= serviceName %>/package.json
         "semantic-release": "semantic-release",
         "lint": "eslint --ext .ts . && prettier --check .",
         "lint-fix": "eslint --ext .ts --fix && prettier --write .",
-        "lint:lockfile": "lockfile-lint --path package-lock.json --allowed-hosts registry.npmjs.org --validate-https",
-        "test": "jest",
+        "lint:lockfile": "lockfile-lint --path package-lock.json --allowed-hosts registry.npmjs.org gitlab.diia.org.ua --validate-https",
+        "test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest",
         "test:integration": "npm run test --selectProjects integration --",
         <%if (h.isOptionSelected(selectedOptions, 'database')) {%>
         "migrate-deploy": "npm run migrate up",
@@ -31,8 +31,11 @@ to:  <%= serviceName %>/package.json
     },
     "keywords": [],
     "engines": {
-        "node": ">=18"
+        "node": ">=20"
     },
+    "files": [
+        "dist"
+    ],
     "_moduleAliases": {
         "@services": "dist/services",
         "@interfaces": "dist/interfaces",

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

@@ -4,24 +4,20 @@ to:  <%= serviceName %>/src/actions/v1/getAddResult.ts
 
 import { GrpcAppAction } from '@diia-inhouse/diia-app'
 
-import { ActionVersion, SessionType } from '@diia-inhouse/types'
+import { ActionContext } from '@diia-inhouse/types'
 import { ValidationSchema } from '@diia-inhouse/validators'
 
-import { ActionResult, CustomActionArguments } from '@interfaces/actions/v1/getAddResult'
-
-export default class GetAddResult implements GrpcAppAction {
-    readonly sessionType = SessionType.None
-
-    readonly actionVersion = ActionVersion.V1
+import { GetAddResultReq, GetAddResultRes } from '@src/generated'
 
+export default class GetAddResultAction implements GrpcAppAction<ActionContext<GetAddResultReq>> {
     readonly name = 'getAddResult'
 
-    readonly validationRules: ValidationSchema<CustomActionArguments['params']> = {
+    readonly validationRules: ValidationSchema<GetAddResultReq> = {
         a: {type: 'number'},
         b: {type: 'number'}
     }
 
-    async handler(args: CustomActionArguments): Promise<ActionResult> {
+    async handler(args: ActionContext<GetAddResultReq>): Promise<GetAddResultRes> {
         const { params: { a, b } } = args
 
         return { result: a + b }

package/dist/_templates/init/service/01-src.bootstrap.ts.t

@@ -14,5 +14,9 @@ export async function bootstrap(serviceName: string): Promise<void> {
     const app = new Application<ServiceContext<AppConfig, AppDeps>>(serviceName)
     
     await app.setConfig(configFactory)
-    await app.setDeps(deps).initialize().start()
+    await app.setDeps(deps)
+
+    const appOperator = await app.initialize()
+
+    await appOperator.start()
 }

package/dist/_templates/init/service/01-src.config.ts.t

@@ -2,10 +2,9 @@
 to:  <%= serviceName %>/src/config.ts
 ---
 
-import { BalancingStrategy, BaseConfig, MetricsConfig, TransporterConfig } from '@diia-inhouse/diia-app'
+import { BaseConfig } from '@diia-inhouse/diia-app'
 
 import { EnvService } from '@diia-inhouse/env'
-import { HealthCheckConfig } from '@diia-inhouse/healthcheck'
 
 <%if (h.isOptionSelected(selectedOptions, 'database')) {%>
 import { AppDbConfig, ReplicaSetNodeConfig } from '@diia-inhouse/db'
@@ -26,23 +25,23 @@ import {
 <%}%>
 
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-export default (envService: EnvService <%= h.isOptionSelected(selectedOptions, ['internal', 'external']) ? ", serviceName: string" : '' %>) => ({
-    transporter: <TransporterConfig>{
+export default async (envService: EnvService <%= h.isOptionSelected(selectedOptions, ['internal', 'external']) ? ", serviceName: string" : '' %>) => ({
+    transporter: {
         type: envService.getVar('TRANSPORT_TYPE'),
         options: envService.getVar('TRANSPORT_OPTIONS', 'object', {}),
     },
 
-    balancing: <BalancingStrategy>{
+    balancing: {
         strategy: envService.getVar('BALANCING_STRATEGY_NAME', 'string'),
         strategyOptions: envService.getVar('BALANCING_STRATEGY_OPTIONS', 'object', {}),
     },
 
-    healthCheck: <HealthCheckConfig>{
+    healthCheck: {
         isEnabled: envService.getVar('HEALTH_CHECK_IS_ENABLED', 'boolean'),
         port: envService.getVar('HEALTH_CHECK_IS_PORT', 'number', 4545),
     },
 
-    metrics: <MetricsConfig>{
+    metrics: {
         moleculer: {
             prometheus: {
                 isEnabled: envService.getVar('METRICS_MOLECULER_PROMETHEUS_IS_ENABLED', 'boolean', true),
@@ -63,10 +62,18 @@ export default (envService: EnvService <%= h.isOptionSelected(selectedOptions, [
         },
     },
 
+    grpcServer: {
+        isEnabled: envService.getVar('GRPC_SERVER_ENABLED', 'boolean', false),
+        port: envService.getVar('GRPC_SERVER_PORT', 'number', 5000),
+        services: envService.getVar('GRPC_SERVICES', 'object'),
+        isReflectionEnabled: envService.getVar('GRPC_REFLECTION_ENABLED', 'boolean', false),
+        maxReceiveMessageLength: envService.getVar('GRPC_SERVER_MAX_RECEIVE_MESSAGE_LENGTH', 'number', 1024 * 1024 * 4),
+    },
+
     grpc: {},
 
     <%if (h.isOptionSelected(selectedOptions, 'database')) {%>
-        db: <AppDbConfig>{
+        db: {
             database: envService.getVar('MONGO_DATABASE', 'string'),
             replicaSet: envService.getVar('MONGO_REPLICA_SET', 'string'),
             user: await envService.getSecret('MONGO_USER', { accessor: 'username', nullable: true }),
@@ -86,7 +93,7 @@ export default (envService: EnvService <%= h.isOptionSelected(selectedOptions, [
     <%}%>
 
     <%if (h.isOptionSelected(selectedOptions, 'external')) {%>
-        redis: <RedisConfig>{
+        redis: {
             readWrite: envService.getVar('REDIS_READ_WRITE_OPTIONS', 'object'),
 
             readOnly: envService.getVar('REDIS_READ_ONLY_OPTIONS', 'object'),
@@ -94,7 +101,7 @@ export default (envService: EnvService <%= h.isOptionSelected(selectedOptions, [
     <%}%>
 
     <%if (h.isOptionSelected(selectedOptions, 'redis')) {%>
-        store: <RedisConfig>{
+        store: {
             readWrite: envService.getVar('STORE_READ_WRITE_OPTIONS', 'object'),
 
             readOnly: envService.getVar('STORE_READ_ONLY_OPTIONS', 'object'),
@@ -102,7 +109,7 @@ export default (envService: EnvService <%= h.isOptionSelected(selectedOptions, [
     <%}%>
 
     <%if (h.isOptionSelected(selectedOptions, ['internal', 'external'])) {%>
-    rabbit: <QueueConnectionConfig>{
+    rabbit: {
         <%if (h.isOptionSelected(selectedOptions, 'internal')) {%>
         [QueueConnectionType.Internal]: {
                 connection: {

package/dist/_templates/init/service/01-src.deps.ts.t

@@ -7,8 +7,7 @@ import { DepsFactoryFn } from "@diia-inhouse/diia-app";
 import { AppDeps } from "@interfaces/deps";
 import { AppConfig } from "@interfaces/config";
 
-export default (
-  config: AppConfig
-): ReturnType<DepsFactoryFn<AppConfig, AppDeps>> => {
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export default async (_config: AppConfig): ReturnType<DepsFactoryFn<AppConfig, AppDeps>> => {
   return {};
 };

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

@@ -1,10 +1,11 @@
 ---
-to:  <%= serviceName %>/tests/integration/actions/v1/addAction.spec.ts
+to:  <%= serviceName %>/tests/integration/actions/v1/getAddResult.spec.ts
 ---
 
 import TestKit from '@diia-inhouse/test'
 
 import GetAddResultAction from '@src/actions/v1/getAddResult'
+import { GetAddResultRes } from '@src/generated'
 
 import { getApp } from '@tests/utils/getApp'
 
@@ -34,6 +35,6 @@ describe(`Action ${GetAddResultAction.name}`, () => {
         const result = await getAddResult.handler({ params: { a, b }, session, headers })
 
         // Assert
-        expect(result).toEqual({ result: 5 })
+        expect(result).toEqual<GetAddResultRes>({ result: 5 })
     })
 })

package/dist/_templates/init/service/01-tests.utils.getApp.ts.t

@@ -2,11 +2,7 @@
 to:  <%= serviceName %>/tests/utils/getApp.ts
 ---
 
-import { asClass } from 'awilix'
-
-import { Application, GrpcService, MoleculerService, ServiceContext, ServiceOperator } from '@diia-inhouse/diia-app'
-
-import { mockClass } from '@diia-inhouse/test'
+import { Application, ServiceContext, ServiceOperator } from '@diia-inhouse/diia-app'
 
 import config from '@src/config'
 
@@ -16,11 +12,15 @@ import deps from '@tests/utils/getDeps'
 import { AppConfig } from '@interfaces/config'
 import { AppDeps } from '@interfaces/deps'
 
-export function getApp(): ServiceOperator<AppConfig, AppDeps & TestDeps> {
+export async function getApp(): Promise<ServiceOperator<AppConfig, AppDeps & TestDeps>> {
     const app = new Application<ServiceContext<AppConfig, AppDeps & TestDeps>>('<%= h.changeCase.pascal(serviceName) %>')
-        .setConfig(config)
-        .setDeps(deps)
-        .initialize()
 
-    return app
+    await app.setConfig(config)
+    await app.setDeps(deps)
+
+    const appOperator = await app.initialize()
+
+    await appOperator.start()
+
+    return appOperator
 }

package/dist/_templates/init/service/01-tests.utils.getDeps.ts.t

@@ -1,11 +1,9 @@
 ---
 to:  <%= serviceName %>/tests/utils/getDeps.ts
 ---
-import { asClass } from 'awilix'
 
-import { DepsFactoryFn } from '@diia-inhouse/diia-app'
+import { DepsFactoryFn, asClass } from '@diia-inhouse/diia-app'
 
-import { IdentifierService } from '@diia-inhouse/crypto'
 import TestKit from '@diia-inhouse/test'
 
 import deps from '@src/deps'
@@ -15,9 +13,10 @@ import { TestDeps } from '@tests/interfaces'
 import { AppConfig } from '@interfaces/config'
 import { AppDeps } from '@interfaces/deps'
 
-export default (config: AppConfig): ReturnType<DepsFactoryFn<AppConfig, AppDeps & TestDeps>> => {
+export default async (config: AppConfig): ReturnType<DepsFactoryFn<AppConfig, AppDeps & TestDeps>> => {
     return {
-        ...deps(config),
+        ...(await deps(config)),
+
         testKit: asClass(TestKit).singleton(),
     }
 }

package/dist/_templates/init/service/01-tsconfig.json.t

@@ -18,8 +18,7 @@ to:  <%= serviceName %>/tsconfig.json
             "@actions/*": ["src/actions/*"],
             "@src/*": ["src/*"],
             "@tests/*": ["tests/*"]
-        },
-        "plugins": [{ "transform": "typescript-transform-paths" }, { "transform": "typescript-transform-paths", "afterDeclarations": true }]
+        }
     },
     "include": ["src/**/*", "tests/jest.d.ts"]
 }

package/dist/_templates/init/service/prompt.js

@@ -14,7 +14,7 @@ exports.default = {
         const { serviceName } = await prompter.prompt({
             type: 'input',
             name: 'serviceName',
-            message: "What's your new service name (e.g. super-gen)? Make sure new service is added to the ServiceName enum in the types package",
+            message: "What's your new service name (e.g. criminal-cert-service)?",
             required: true,
         });
         const { description } = await prompter.prompt({
@@ -27,7 +27,6 @@ exports.default = {
             message: 'Which external dependencies do you want use with that service?',
             choices,
         });
-        console.log(chalk_1.default.red.bold('\n!!! REMINDER !!!\r'));
         console.log(chalk_1.default.red.bold("Don't forget to add charts and envs to the infra repo manually\r"));
         const { devDeps, deps } = depsNames_1.serviceDependencies;
         return { serviceName, description, dependencies: { devDeps: devDeps.join(' '), deps: deps.join(' ') }, selectedOptions };

package/dist/_templates/init/service/prompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../../src/_templates/init/service/prompt.ts"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AAEzB,kDAAwD;AAExD,yEAAkF;AAElF,iDAAyD;AAEzD,MAAM,OAAO,GAAwB,MAAM,CAAC,MAAM,CAAC,qBAAW,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAA;AAEnG,kBAAe;IACX,MAAM,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAU,EAAoB,EAAE;QACrD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,8FAA8F,CAAC,CAAC,CAAA;QAEvH,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;YAC1C,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,aAAa;YACnB,OAAO,EACH,4HAA4H;YAChI,QAAQ,EAAE,IAAI;SACjB,CAAC,CAAA;QAEF,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;YAC1C,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,sCAAsC;YAC/C,QAAQ,EAAE,IAAI;SACjB,CAAC,CAAA;QAEF,MAAM,eAAe,GAAG,MAAM,IAAA,yBAAiB,EAAc;YACzD,OAAO,EAAE,gEAAgE;YACzE,OAAO;SACV,CAAC,CAAA;QAEF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAA;QACnD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,kEAAkE,CAAC,CAAC,CAAA;QAE/F,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,+BAAmB,CAAA;QAE7C,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,eAAe,EAAE,CAAA;IAC5H,CAAC;CACJ,CAAA"}
+{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../../src/_templates/init/service/prompt.ts"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AAEzB,kDAAwD;AAExD,yEAAkF;AAElF,iDAAyD;AAEzD,MAAM,OAAO,GAAwB,MAAM,CAAC,MAAM,CAAC,qBAAW,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAA;AAEnG,kBAAe;IACX,MAAM,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAU,EAAoB,EAAE;QACrD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,8FAA8F,CAAC,CAAC,CAAA;QAEvH,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;YAC1C,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,4DAA4D;YACrE,QAAQ,EAAE,IAAI;SACjB,CAAC,CAAA;QAEF,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;YAC1C,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,sCAAsC;YAC/C,QAAQ,EAAE,IAAI;SACjB,CAAC,CAAA;QAEF,MAAM,eAAe,GAAG,MAAM,IAAA,yBAAiB,EAAc;YACzD,OAAO,EAAE,gEAAgE;YACzE,OAAO;SACV,CAAC,CAAA;QAEF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,kEAAkE,CAAC,CAAC,CAAA;QAE/F,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,+BAAmB,CAAA;QAE7C,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,eAAe,EAAE,CAAA;IAC5H,CAAC;CACJ,CAAA"}

package/package.json

@@ -1,22 +1,20 @@
 {
     "name": "@diia-inhouse/scaffold",
-    "version": "2.17.0",
+    "version": "2.22.0",
     "main": "dist/index.js",
-    "license": "SEE LICENCE IN LICENCE.md",
-    "repository": "https://github.com/diia-open-source/be-scaffold.git",
     "engines": {
-        "node": ">=18"
+        "node": ">=20"
     },
     "scripts": {
         "lint": "eslint --ext .ts . && prettier --check .",
         "lint-fix": "eslint --ext .ts . --fix && prettier --write .",
         "lint:lockfile": "lockfile-lint --path package-lock.json --allowed-hosts registry.npmjs.org --validate-https",
-        "prebuild": "rimraf dist",
-        "build": "tsc && npm run cp:templates",
+        "build": "rimraf dist && tsc && npm run cp:templates",
         "clean:result": "rimraf generation-result",
         "cp:templates": "cd src && copyfiles _templates/**/*.t ../dist && copyfiles _sharedTemplates/**/*.t ../dist",
         "prepare": "npm run build",
-        "find-circulars": "madge --circular --extensions ts ./"
+        "find-circulars": "madge --circular --extensions ts ./",
+        "semantic-release": "semantic-release"
     },
     "bin": {
         "scaffold": "dist/bin.js"
@@ -26,7 +24,7 @@
     ],
     "author": "Diia",
     "dependencies": {
-        "@diia-inhouse/types": "6.24.0",
+        "@diia-inhouse/types": "6.35.2",
         "chalk": "4.1.2",
         "enquirer": "2.4.1",
         "execa": "5.1.1",
@@ -34,19 +32,19 @@
         "lodash": "4.17.21"
     },
     "devDependencies": {
-        "@diia-inhouse/configs": "1.31.1",
+        "@diia-inhouse/configs": "2.0.0",
         "@diia-inhouse/eslint-config": "5.1.0",
-        "@types/lodash": "4.14.201",
+        "@types/lodash": "4.17.6",
         "@types/node": "20.12.7",
         "copyfiles": "2.4.1",
         "eslint": "8.57.0",
         "eslint-plugin-prettier": "5.1.3",
-        "lockfile-lint": "4.13.2",
+        "lockfile-lint": "4.14.0",
         "madge": "7.0.0",
-        "prettier": "3.2.5",
+        "prettier": "3.3.2",
         "protobufjs": "7.2.5",
-        "rimraf": "5.0.7",
-        "semantic-release": "21.1.2",
+        "rimraf": "6.0.0",
+        "semantic-release": "24.0.0",
         "typescript": "5.4.5"
     },
     "release": {
@@ -62,5 +60,6 @@
     "madge": {
         "tsConfig": "./tsconfig.json"
     },
-    "peerDependencies": null
+    "repository": "https://github.com/diia-open-source/be-scaffold.git",
+    "license": "SEE LICENCE IN LICENCE.md"
 }

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

@@ -1,15 +0,0 @@
----
-to:  <%= interfacePath %>
----
-
-<% if (inheritedActionInterface) { %>
-    import { <%= inheritedActionInterface  %> } from '@diia-inhouse/types'
-<% } %>
-import { <%= h.changeCase.pascal(name) %>Req, <%= h.changeCase.pascal(name) %>Res } from '@src/generated'
-
-
-export interface CustomActionArguments <%= inheritedActionInterface ? `extends ${inheritedActionInterface}` : '' %> {
-    params: <%= h.changeCase.pascal(name) %>Req
-}
-
-export type ActionResult = <%= h.changeCase.pascal(name) %>Res

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

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapSessionTypeToActionArguments = void 0;
-const types_1 = require("@diia-inhouse/types");
-exports.mapSessionTypeToActionArguments = {
-    [types_1.SessionType.User]: 'UserActionArguments',
-    [types_1.SessionType.Partner]: 'PartnerActionArguments',
-    [types_1.SessionType.EResident]: 'EResidentActionArguments',
-    [types_1.SessionType.Acquirer]: 'AcquirerActionArguments',
-    [types_1.SessionType.Temporary]: 'TemporaryActionArguments',
-    [types_1.SessionType.PortalUser]: 'PortalUserActionArguments',
-    [types_1.SessionType.ServiceUser]: 'ServiceUserActionArguments',
-    [types_1.SessionType.EResidentApplicant]: 'UserActionArguments',
-    [types_1.SessionType.ServiceEntrance]: 'UserActionArguments',
-    [types_1.SessionType.CabinetUser]: 'UserActionArguments',
-    [types_1.SessionType.None]: 'ServiceActionArguments',
-};
-//# sourceMappingURL=dict.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"dict.js","sourceRoot":"","sources":["../../../../src/_templates/add/action/dict.ts"],"names":[],"mappings":";;;AAAA,+CAAiD;AAEpC,QAAA,+BAA+B,GAAgC;IACxE,CAAC,mBAAW,CAAC,IAAI,CAAC,EAAE,qBAAqB;IACzC,CAAC,mBAAW,CAAC,OAAO,CAAC,EAAE,wBAAwB;IAC/C,CAAC,mBAAW,CAAC,SAAS,CAAC,EAAE,0BAA0B;IACnD,CAAC,mBAAW,CAAC,QAAQ,CAAC,EAAE,yBAAyB;IACjD,CAAC,mBAAW,CAAC,SAAS,CAAC,EAAE,0BAA0B;IACnD,CAAC,mBAAW,CAAC,UAAU,CAAC,EAAE,2BAA2B;IACrD,CAAC,mBAAW,CAAC,WAAW,CAAC,EAAE,4BAA4B;IACvD,CAAC,mBAAW,CAAC,kBAAkB,CAAC,EAAE,qBAAqB;IACvD,CAAC,mBAAW,CAAC,eAAe,CAAC,EAAE,qBAAqB;IACpD,CAAC,mBAAW,CAAC,WAAW,CAAC,EAAE,qBAAqB;IAChD,CAAC,mBAAW,CAAC,IAAI,CAAC,EAAE,wBAAwB;CAC/C,CAAA"}

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

@@ -1,13 +0,0 @@
----
-to:  <%= serviceName %>/src/interfaces/actions/v1/getAddResult.ts
----
-
-import { UserActionArguments } from '@diia-inhouse/types'
-
-import { GetAddResultReq, GetAddResultRes } from '@src/generated'
-
-export interface CustomActionArguments extends UserActionArguments {
-    params: GetAddResultReq
-}
-
-export type ActionResult = GetAddResultRes