From 53672f906df7665a93f226c44e5275d65a13cfb1 Mon Sep 17 00:00:00 2001
From: Kamil Kisiela <kamil.kisiela@gmail.com>
Date: Wed, 15 Feb 2023 16:30:46 +0100
Subject: [PATCH 1/2] test: accessing global singleton provider (app) from
 global singleton provider (module)

---
 .../tests/di-providers.spec.ts                | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/packages/graphql-modules/tests/di-providers.spec.ts b/packages/graphql-modules/tests/di-providers.spec.ts
index a9942ab3b6..7ee8f031f7 100644
--- a/packages/graphql-modules/tests/di-providers.spec.ts
+++ b/packages/graphql-modules/tests/di-providers.spec.ts
@@ -1398,3 +1398,68 @@ test('Last operation-scoped provider in the list wins', async () => {
   expect(result.errors).not.toBeDefined();
   expect(result.data?.token).toEqual('last');
 });
+
+test('accessing global singleton provider (app) from global singleton provider (module)', async () => {
+  @Injectable({
+    scope: Scope.Singleton,
+    global: true,
+  })
+  class AppData {
+    public async uppercase(text: string) {
+      return text.toUpperCase();
+    }
+  }
+
+  @Injectable({
+    scope: Scope.Singleton,
+    global: true,
+  })
+  class ModuleData {
+    constructor(private appData: AppData) {}
+
+    public async uppercase(text: string) {
+      return this.appData.uppercase(text);
+    }
+  }
+
+  const fooModule = createModule({
+    id: 'foo',
+    providers: [ModuleData],
+    typeDefs: gql`
+      type Query {
+        uppercase(text: String!): String!
+      }
+    `,
+    resolvers: {
+      Query: {
+        uppercase(
+          _: {},
+          { text }: { text: string },
+          { injector }: GraphQLModules.ModuleContext
+        ) {
+          return injector.get(ModuleData).uppercase(text);
+        },
+      },
+    },
+  });
+
+  const app = createApplication({
+    modules: [fooModule],
+    providers: [AppData],
+  });
+
+  const result = await testkit.execute(app, {
+    contextValue: {},
+    variableValues: {
+      text: 'gil',
+    },
+    document: gql`
+      query up($text: String!) {
+        uppercase(text: $text)
+      }
+    `,
+  });
+
+  expect(result.errors).not.toBeDefined();
+  expect(result.data?.uppercase).toBe('GIL');
+});

From 78bbc971fb2005994161c3630aeca41964deabd0 Mon Sep 17 00:00:00 2001
From: Kamil Kisiela <kamil.kisiela@gmail.com>
Date: Wed, 15 Feb 2023 16:34:30 +0100
Subject: [PATCH 2/2] Also works

---
 .../tests/di-providers.spec.ts                | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/packages/graphql-modules/tests/di-providers.spec.ts b/packages/graphql-modules/tests/di-providers.spec.ts
index 7ee8f031f7..d3ec10129d 100644
--- a/packages/graphql-modules/tests/di-providers.spec.ts
+++ b/packages/graphql-modules/tests/di-providers.spec.ts
@@ -1463,3 +1463,79 @@ test('accessing global singleton provider (app) from global singleton provider (
   expect(result.errors).not.toBeDefined();
   expect(result.data?.uppercase).toBe('GIL');
 });
+
+test('accessing global singleton provider (app) from global singleton provider (module) that depends on non-global singleton (app)', async () => {
+  @Injectable({
+    scope: Scope.Singleton,
+  })
+  class TextTransforms {
+    uppercase(text: string) {
+      return text.toUpperCase();
+    }
+  }
+
+  @Injectable({
+    scope: Scope.Singleton,
+    global: true,
+  })
+  class AppData {
+    constructor(private textTransforms: TextTransforms) {}
+
+    public async uppercase(text: string) {
+      return this.textTransforms.uppercase(text);
+    }
+  }
+
+  @Injectable({
+    scope: Scope.Singleton,
+    global: true,
+  })
+  class ModuleData {
+    constructor(private appData: AppData) {}
+
+    public async uppercase(text: string) {
+      return this.appData.uppercase(text);
+    }
+  }
+
+  const fooModule = createModule({
+    id: 'foo',
+    providers: [ModuleData],
+    typeDefs: gql`
+      type Query {
+        uppercase(text: String!): String!
+      }
+    `,
+    resolvers: {
+      Query: {
+        uppercase(
+          _: {},
+          { text }: { text: string },
+          { injector }: GraphQLModules.ModuleContext
+        ) {
+          return injector.get(ModuleData).uppercase(text);
+        },
+      },
+    },
+  });
+
+  const app = createApplication({
+    modules: [fooModule],
+    providers: [AppData, TextTransforms],
+  });
+
+  const result = await testkit.execute(app, {
+    contextValue: {},
+    variableValues: {
+      text: 'gil',
+    },
+    document: gql`
+      query up($text: String!) {
+        uppercase(text: $text)
+      }
+    `,
+  });
+
+  expect(result.errors).not.toBeDefined();
+  expect(result.data?.uppercase).toBe('GIL');
+});