chore: resolve conflicts

Author: kamilmysliwiec

.circleci/config.yml

@@ -3,23 +3,23 @@ version: 2
 aliases:
   - &restore-cache
     restore_cache:
-        name: Restore Yarn Package Cache
-        keys:
-          - yarn-packages-{{ checksum "yarn.lock" }}
+      name: Restore Yarn Package Cache
+      keys:
+        - yarn-packages-{{ checksum "yarn.lock" }}
   - &install-deps
     run:
-        name: Install dependencies
-        command: yarn
+      name: Install dependencies
+      command: yarn
   - &build-packages
     run:
-        name: Build
-        command: npm run build
+      name: Build
+      command: npm run build
 
 jobs:
   build:
     working_directory: ~/nest
     docker:
-      - image: cimg/node:17.9
+      - image: cimg/node:18.10
     steps:
       - checkout
       - restore_cache:
@@ -36,12 +36,12 @@ jobs:
             - ~/.cache/yarn
       - run:
           name: Build
-          command: npm run build    
-    
+          command: npm run build
+
   unit_tests:
     working_directory: ~/nest
     docker:
-      - image: cimg/node:17.9
+      - image: cimg/node:18.10
     steps:
       - checkout
       - restore_cache:
@@ -58,7 +58,7 @@ jobs:
             - ~/.cache/yarn
       - run:
           name: Tests
-          command: npm run test 
+          command: npm run test
 
 workflows:
   version: 2
@@ -67,4 +67,4 @@ workflows:
       - build
       - unit_tests:
           requires:
-            - build
+            - build

.eslintrc.js

@@ -8,8 +8,7 @@ module.exports = {
   extends: [
     'plugin:@typescript-eslint/eslint-recommended',
     'plugin:@typescript-eslint/recommended',
-    'prettier',
-    'prettier/@typescript-eslint'
+    'prettier'
   ],
   root: true,
   env: {

lib/azure-http.adapter.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/ban-types */
 import { Context, HttpRequest } from '@azure/functions';
 import { HttpServer, INestApplication } from '@nestjs/common';
 import { createHandlerAdapter } from './adapter/azure-adapter';
@@ -14,14 +15,18 @@ export class AzureHttpAdapterStatic {
     if (handler) {
       return handler(context, req);
     }
-    this.createHandler(createApp).then(fn => fn(context, req));
+    this.createHandler(createApp).then((fn) => fn(context, req));
   }
 
-  private async createHandler(createApp: () => Promise<INestApplication>) {
+  private async createHandler(
+    createApp: () => Promise<
+      Omit<INestApplication, 'startAllMicroservicesAsync' | 'listenAsync'>
+    >
+  ) {
     const app = await createApp();
     const adapter = app.getHttpAdapter();
     if (this.hasGetTypeMethod(adapter) && adapter.getType() === 'azure-http') {
-      return ((adapter as any) as AzureHttpRouter).handle.bind(adapter);
+      return (adapter as any as AzureHttpRouter).handle.bind(adapter);
     }
     const instance = app.getHttpAdapter().getInstance();
     handler = createHandlerAdapter(instance);

lib/router/azure-http.router.ts

@@ -1,6 +1,14 @@
+/* eslint-disable @typescript-eslint/ban-types */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable @typescript-eslint/no-empty-function */
-import { HttpStatus, RequestMethod } from '@nestjs/common';
+import {
+  HttpStatus,
+  InternalServerErrorException,
+  NotImplementedException,
+  RequestMethod,
+  VersioningOptions
+} from '@nestjs/common';
+import { VersionValue } from '@nestjs/common/interfaces';
 import { CorsOptions } from '@nestjs/common/interfaces/external/cors-options.interface';
 import { AbstractHttpAdapter } from '@nestjs/core';
 import { RouterMethodFactory } from '@nestjs/core/helpers/router-method-factory';
@@ -61,6 +69,10 @@ export class AzureHttpRouter extends AbstractHttpAdapter {
     response.statusCode = statusCode;
   }
 
+  public end(response: any, message?: string) {
+    return response.end(message);
+  }
+
   public getHttpServer<T = any>(): T {
     return this.instance as T;
   }
@@ -69,6 +81,10 @@ export class AzureHttpRouter extends AbstractHttpAdapter {
     return this.instance as T;
   }
 
+  public isHeadersSent(response: any): boolean {
+    return response.headersSent;
+  }
+
   public setHeader(response: any, name: string, value: string) {
     return response.setHeader(name, value);
   }
@@ -97,6 +113,17 @@ export class AzureHttpRouter extends AbstractHttpAdapter {
     return 'azure-http';
   }
 
+  public applyVersionFilter(
+    handler: Function,
+    version: VersionValue,
+    versioningOptions: VersioningOptions
+  ) {
+    throw new NotImplementedException();
+    return (req, res, next) => {
+      return () => {};
+    };
+  }
+
   public listen(port: any, ...args: any[]) {}
   public render(response: any, view: string, options: any) {}
   public redirect(response: any, statusCode: number, url: string) {}