Switch to dreamit graphql-server-base

dreamit-de · May 15, 2023 · e69e83f · e69e83f
1 parent f1bc8c3
commit e69e83f
Show file tree

Hide file tree

Showing 22 changed files with 26 additions and 26 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dreamit/graphql-server",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "A GraphQL server written in NodeJS/Typescript.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -35,8 +35,8 @@
     "jest-html-reporters": "3.1.4"
   },
   "peerDependencies": {
-    "graphql": "^16.0.0",
-    "@sgohlke/graphql-prom-metrics": "^1.0.2",
-    "@sgohlke/graphql-server-base": "^1.0.1"
+    "@dreamit/graphql-server-base": "^1.0.3",
+    "@sgohlke/graphql-prom-metrics": "^1.2.2",
+    "graphql": "^16.0.0"
   }
 }
diff --git a/src/error/DetermineGraphQLOrFetchError.ts b/src/error/DetermineGraphQLOrFetchError.ts
@@ -1,7 +1,7 @@
 import {
     FETCH_ERROR,
     GRAPHQL_ERROR
-} from '@sgohlke/graphql-server-base'
+} from '@dreamit/graphql-server-base'
 
 /**
  * Determines if an error is a GraphQLError or

diff --git a/src/error/DetermineValidationOrIntrospectionDisabledError.ts b/src/error/DetermineValidationOrIntrospectionDisabledError.ts
@@ -1,7 +1,7 @@
 import {
     INTROSPECTION_DISABLED_ERROR,
     VALIDATION_ERROR
-} from '@sgohlke/graphql-server-base'
+} from '@dreamit/graphql-server-base'
 
 /**
  * Determines if an error is a ValidationError or

diff --git a/src/index.ts b/src/index.ts
@@ -33,4 +33,4 @@ export * from './server/GraphQLServer'
 export * from './server/GraphQLServerOptions'
 
 // For backwards-compatibility with graphql-server v3 versions and extensions
-export * from '@sgohlke/graphql-server-base'
+export * from '@dreamit/graphql-server-base'
diff --git a/src/logger/JsonLogger.ts b/src/logger/JsonLogger.ts
@@ -1,4 +1,4 @@
-import {Logger} from '@sgohlke/graphql-server-base'
+import {Logger} from '@dreamit/graphql-server-base'
 import {Console} from 'node:console'
 import {
     LogEntry,

diff --git a/src/logger/TextLogger.ts b/src/logger/TextLogger.ts
@@ -1,4 +1,4 @@
-import {Logger} from '@sgohlke/graphql-server-base'
+import {Logger} from '@dreamit/graphql-server-base'
 import {
     LogLevel,
     LogEntry,

diff --git a/src/metrics/IncreaseFetchOrGraphQLErrorMetric.ts b/src/metrics/IncreaseFetchOrGraphQLErrorMetric.ts
@@ -1,7 +1,7 @@
 import { 
     Logger, 
     MetricsClient 
-} from '@sgohlke/graphql-server-base'
+} from '@dreamit/graphql-server-base'
 import {
     determineGraphQLOrFetchError,
 } from '..'

diff --git a/src/metrics/NoMetricsClient.ts b/src/metrics/NoMetricsClient.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
-import { MetricsClient } from '@sgohlke/graphql-server-base'
+import { MetricsClient } from '@dreamit/graphql-server-base'
 
 /**
  * Metrics client that does not collect any metrics.

diff --git a/src/metrics/SimpleMetricsClient.ts b/src/metrics/SimpleMetricsClient.ts
@@ -9,7 +9,7 @@ import {
     SCHEMA_VALIDATION_ERROR,
     SYNTAX_ERROR,
     VALIDATION_ERROR
-} from '@sgohlke/graphql-server-base'
+} from '@dreamit/graphql-server-base'
 
 /**
  * Simple metrics client.

diff --git a/src/request/ContentType.ts b/src/request/ContentType.ts
@@ -1,4 +1,4 @@
-import { ContentType } from '@sgohlke/graphql-server-base'
+import { ContentType } from '@dreamit/graphql-server-base'
 
 export function getContentType(contentType?: string): ContentType {
     if (contentType) {

diff --git a/src/request/DefaultRequestInformationExtractor.ts b/src/request/DefaultRequestInformationExtractor.ts
@@ -9,7 +9,7 @@ import {
     ContentType, 
     GraphQLRequestInfo, 
     GraphQLServerRequest 
-} from '@sgohlke/graphql-server-base'
+} from '@dreamit/graphql-server-base'
 
 /**
  * Default implementation of RequestInformationExtractor interface

diff --git a/src/request/RequestInformationExtractor.ts b/src/request/RequestInformationExtractor.ts
@@ -1,7 +1,7 @@
 import {
     GraphQLRequestInfo,
     GraphQLServerRequest
-} from '@sgohlke/graphql-server-base'
+} from '@dreamit/graphql-server-base'
 
 /**
  * Interface for RequestInformationExtractor.

diff --git a/src/response/DefaultResponseHandler.ts b/src/response/DefaultResponseHandler.ts
@@ -4,7 +4,7 @@ import {
     ResponseParameters
 } from '..'
 import {GraphQLError} from 'graphql'
-import { GraphQLExecutionResult } from '@sgohlke/graphql-server-base'
+import { GraphQLExecutionResult } from '@dreamit/graphql-server-base'
 
 /**
  * Default implementation of ResponseHandler interface

diff --git a/src/response/GraphQLExecutionResult.ts b/src/response/GraphQLExecutionResult.ts
@@ -1,7 +1,7 @@
 import {
     GraphQLError
 } from 'graphql'
-import {GraphQLExecutionResult} from '@sgohlke/graphql-server-base'
+import {GraphQLExecutionResult} from '@dreamit/graphql-server-base'
 
 export function getFirstErrorFromExecutionResult(result: GraphQLExecutionResult)
     : GraphQLError {

diff --git a/src/response/ResponseHandler.ts b/src/response/ResponseHandler.ts
@@ -1,7 +1,7 @@
 import {
     GraphQLExecutionResult,
     ResponseParameters
-} from '@sgohlke/graphql-server-base'
+} from '@dreamit/graphql-server-base'
 
 /**
  * Interface for ResponseHandler.

diff --git a/src/server/DefaultGraphQLServerOptions.ts b/src/server/DefaultGraphQLServerOptions.ts
@@ -32,7 +32,7 @@ import {
     GraphQLServerResponse, 
     Logger, 
     MetricsClient 
-} from '@sgohlke/graphql-server-base'
+} from '@dreamit/graphql-server-base'
 
 export const fallbackTextLogger = new TextLogger('fallback-logger', 'fallback-service')
 export const defaultRequestInformationExtractor = new DefaultRequestInformationExtractor()

diff --git a/src/server/GraphQLServer.ts b/src/server/GraphQLServer.ts
@@ -17,7 +17,7 @@ import {
     GraphQLRequestInfo,
     GraphQLExecutionResult,
     MetricsClient,
-}  from '@sgohlke/graphql-server-base'
+}  from '@dreamit/graphql-server-base'
 import {
     GraphQLServerOptions,
     isAggregateError,
@@ -114,7 +114,7 @@ export class GraphQLServer {
 
     // Gets the metrics for use in the response body.
     async getMetrics(): Promise<string> {
-        return this.options.metricsClient.getMetrics()
+        return await this.options.metricsClient.getMetrics()
     }
 
     /**

diff --git a/src/server/GraphQLServerOptions.ts b/src/server/GraphQLServerOptions.ts
@@ -4,7 +4,7 @@ import {
     MetricsClient,
     GraphQLServerRequest,
     GraphQLServerResponse,
-} from '@sgohlke/graphql-server-base'
+} from '@dreamit/graphql-server-base'
 import {
     RequestInformationExtractor,
     ResponseHandler

diff --git a/tests/ExampleSchemas.ts b/tests/ExampleSchemas.ts
@@ -1,4 +1,4 @@
-import {GraphQLRequestInfo} from '@sgohlke/graphql-server-base'
+import {GraphQLRequestInfo} from '@dreamit/graphql-server-base'
 import {
     buildSchema,
     GraphQLError,

diff --git a/tests/TestHelpers.ts b/tests/TestHelpers.ts
@@ -12,7 +12,7 @@ import {
 } from './ExampleSchemas'
 import fetch from 'cross-fetch'
 import {Console} from 'node:console'
-import { GraphQLRequestInfo } from '@sgohlke/graphql-server-base'
+import { GraphQLRequestInfo } from '@dreamit/graphql-server-base'
 
 export class NoStacktraceJsonLogger extends JsonLogger {
     loggerConsole: Console = new Console(process.stdout, process.stderr, false)

diff --git a/tests/metrics/MetricsClients.integration.test.ts b/tests/metrics/MetricsClients.integration.test.ts
@@ -11,7 +11,7 @@ import {
     SYNTAX_ERROR,
     VALIDATION_ERROR,
     MetricsClient,
-} from '@sgohlke/graphql-server-base'
+} from '@dreamit/graphql-server-base'
 import {
     GraphQLServer,
     SimpleMetricsClient,

diff --git a/tests/server/GraphQLServer.test.ts b/tests/server/GraphQLServer.test.ts
@@ -23,7 +23,7 @@ import {
 } from '../ExampleSchemas'
 import {TEXT_LOGGER} from '~/tests/TestHelpers'
 import {PromMetricsClient} from '@sgohlke/graphql-prom-metrics'
-import {GraphQLExecutionResult} from '@sgohlke/graphql-server-base'
+import {GraphQLExecutionResult} from '@dreamit/graphql-server-base'
 
 const graphQLErrorResponse: GraphQLExecutionResult = {
     executionResult: {