Merge pull request #453 from dreamit-de/446-graphql-testing

Use graphql-testing library #446
dreamit-de · Jan 28, 2025 · 6e40f0c · 6e40f0c
2 parents a042bce + d5eec40
commit 6e40f0c
Show file tree

Hide file tree

Showing 29 changed files with 1,617 additions and 1,943 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ on them.
 | ~~^15.2.0~~        |        ~~1.x~~         |          ~~n.a.~~           |    ~~n.a.~~     | [~~legacy-graphql15~~](https://github.com/dreamit-de/graphql-server/tree/legacy-graphql15) | end of life        |
 | ~~^16.0.0~~        |        ~~2.x~~         |          ~~n.a.~~           |    ~~n.a.~~     | [~~legacy-server-v2~~](https://github.com/dreamit-de/graphql-server/tree/legacy-server-v2) | end of life        |
 | ^16.0.0            |          3.x           |           ^1.0.1            |      n.a.       |   [legacy-server-v3](https://github.com/dreamit-de/graphql-server/tree/legacy-server-v3)   | maintenance        |
-| ^16.0.0            |          4.x           |            ^2.0             |      ^1.0       |                    [main](https://github.com/dreamit-de/graphql-server)                    | active             |
+| ^16.0.0            |          4.x           |            ^2.6             |      ^1.0       |                    [main](https://github.com/dreamit-de/graphql-server)                    | active             |
 
 ## Features
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dreamit/graphql-server",
-    "version": "4.12.2",
+    "version": "4.12.3",
     "description": "A GraphQL server written in NodeJS/Typescript.",
     "scripts": {
         "build": "tsup-node",
@@ -42,6 +42,7 @@
     },
     "homepage": "https://github.com/dreamit-de/graphql-server#readme",
     "devDependencies": {
+        "@dreamit/graphql-testing": "0.1.1",
         "@fast-check/vitest": "0.1.4",
         "@sgohlke/stryker-log-ignorer": "2.0.2",
         "@stryker-mutator/vitest-runner": "8.7.1",
@@ -59,7 +60,7 @@
     },
     "peerDependencies": {
         "@dreamit/funpara": "^1.0.0",
-        "@dreamit/graphql-server-base": "^2.1.4",
+        "@dreamit/graphql-server-base": "^2.6.0",
         "graphql": "^16.0.0"
     },
     "engines": {

diff --git a/src/error/AggregateError.ts b/src/error/AggregateError.ts
diff --git a/src/index.ts b/src/index.ts
@@ -4,7 +4,6 @@
  * It uses the standard graphql library to receive GraphQL
  * requests and send back appropriate responses.
  */
-export { AggregateError, isAggregateError } from './error/AggregateError'
 export { determineGraphQLOrFetchError } from './error/DetermineGraphQLOrFetchError'
 export { determineValidationOrIntrospectionDisabledError } from './error/DetermineValidationOrIntrospectionDisabledError'
 export {
@@ -15,9 +14,7 @@ export {
 export { createLogEntry } from './logger/CreateLogEntry'
 export { createISOTimestamp, createTimestamp } from './logger/CreateTimestamp'
 export { JsonLogger } from './logger/JsonLogger'
-export { LogEntry } from './logger/LogEntry'
-export { LogEntryInput } from './logger/LogEntryInput'
-export { LogLevel } from './logger/LogLevel'
+// NoLogger should be removed in v5, it is available in @dreamit/graphql-testing
 export { NoLogger } from './logger/NoLogger'
 export {
     VARIABLES_IN_MESSAGE_REGEX,
@@ -65,3 +62,12 @@ export {
 export { getRequestInformation } from './server/GetRequestInformation'
 export { GraphQLServer } from './server/GraphQLServer'
 export { GraphQLServerOptions } from './server/GraphQLServerOptions'
+
+// These exports are exported for compatibility with graphql-server v4 and will be removed in v5
+export {
+    AggregateError,
+    LogEntry,
+    LogEntryInput,
+    LogLevel,
+    isAggregateError,
+} from '@dreamit/graphql-server-base'
diff --git a/src/logger/CreateLogEntry.ts b/src/logger/CreateLogEntry.ts
@@ -1,8 +1,6 @@
+import { LogEntry, LogEntryInput, LogLevel } from '@dreamit/graphql-server-base'
 import { GraphQLError } from 'graphql'
 import { createISOTimestamp } from './CreateTimestamp'
-import { LogEntry } from './LogEntry'
-import { LogEntryInput } from './LogEntryInput'
-import { LogLevel } from './LogLevel'
 import { sanitizeMessage } from './SanitizeMessage'
 
 export function createLogEntry(logEntryInput: LogEntryInput): LogEntry {

diff --git a/src/logger/JsonLogger.ts b/src/logger/JsonLogger.ts
@@ -1,10 +1,12 @@
 import { DateFunction } from '@dreamit/funpara'
-import { Logger } from '@dreamit/graphql-server-base'
+import {
+    LogEntry,
+    LogEntryInput,
+    Logger,
+    LogLevel,
+} from '@dreamit/graphql-server-base'
 import { Console } from 'node:console'
 import { createLogEntry } from './CreateLogEntry'
-import { LogEntry } from './LogEntry'
-import { LogEntryInput } from './LogEntryInput'
-import { LogLevel } from './LogLevel'
 import { truncateLogMessage } from './TruncateLogMessage'
 
 /**

diff --git a/src/logger/LogEntry.ts b/src/logger/LogEntry.ts
diff --git a/src/logger/LogEntryInput.ts b/src/logger/LogEntryInput.ts
diff --git a/src/logger/LogLevel.ts b/src/logger/LogLevel.ts
diff --git a/src/logger/NoStacktraceJsonLogger.ts b/src/logger/NoStacktraceJsonLogger.ts
@@ -1,6 +1,5 @@
+import { LogEntry, LogEntryInput } from '@dreamit/graphql-server-base'
 import { JsonLogger } from './JsonLogger'
-import { LogEntry } from './LogEntry'
-import { LogEntryInput } from './LogEntryInput'
 
 export class NoStacktraceJsonLogger extends JsonLogger {
     createLogEntry(logEntryInput: LogEntryInput): LogEntry {

diff --git a/src/logger/NoStacktraceTextLogger.ts b/src/logger/NoStacktraceTextLogger.ts
@@ -1,4 +1,4 @@
-import { LogEntry } from './LogEntry'
+import { LogEntry } from '@dreamit/graphql-server-base'
 import { TextLogger } from './TextLogger'
 
 export class NoStacktraceTextLogger extends TextLogger {

diff --git a/src/logger/TextLogger.ts b/src/logger/TextLogger.ts
@@ -1,10 +1,12 @@
 import { DateFunction } from '@dreamit/funpara'
-import { Logger } from '@dreamit/graphql-server-base'
+import {
+    LogEntry,
+    LogEntryInput,
+    Logger,
+    LogLevel,
+} from '@dreamit/graphql-server-base'
 import { Console } from 'node:console'
 import { createLogEntry } from './CreateLogEntry'
-import { LogEntry } from './LogEntry'
-import { LogEntryInput } from './LogEntryInput'
-import { LogLevel } from './LogLevel'
 import { truncateLogMessage } from './TruncateLogMessage'
 
 /**

diff --git a/src/logger/TruncateLogMessage.ts b/src/logger/TruncateLogMessage.ts
@@ -1,4 +1,4 @@
-import { LogEntry } from './LogEntry'
+import { LogEntry } from '@dreamit/graphql-server-base'
 
 export function truncateLogMessage(
     logEntry: LogEntry,

diff --git a/src/server/GraphQLServer.ts b/src/server/GraphQLServer.ts
@@ -11,6 +11,7 @@ import {
     MetricsClient,
     SCHEMA_VALIDATION_ERROR,
     SYNTAX_ERROR,
+    isAggregateError,
     isGraphQLServerRequest,
 } from '@dreamit/graphql-server-base'
 import {
@@ -20,7 +21,6 @@ import {
     Source,
     getOperationAST,
 } from 'graphql'
-import { isAggregateError } from '../error/AggregateError'
 import { determineGraphQLOrFetchError } from '../error/DetermineGraphQLOrFetchError'
 import { determineValidationOrIntrospectionDisabledError } from '../error/DetermineValidationOrIntrospectionDisabledError'
 import { removeValidationRecommendationsFromErrors } from '../error/RemoveValidationRecommendationsFromErrors'