Fix race condition between Inject and Injectable (#1589)

Urigo · Mar 2, 2021 · 2a68e78 · 2a68e78
1 parent 18fbe28
commit 2a68e78
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/packages/graphql-modules/src/di/decorators.ts b/packages/graphql-modules/src/di/decorators.ts
@@ -26,16 +26,19 @@ export function Injectable(options?: ProviderOptions): ClassDecorator {
     const existingMeta = readInjectableMetadata(target as any);
 
     const meta: InjectableMetadata = {
-      params: params.map((param, i) => {
-        const existingParam = existingMeta?.params?.[i];
-        return {
-          type: existingParam?.type || param,
-          optional:
-            typeof existingParam?.optional === 'boolean'
-              ? existingParam.optional
-              : false,
-        };
-      }),
+      params:
+        existingMeta?.params?.length > 0 && params.length === 0
+          ? existingMeta?.params
+          : params.map((param, i) => {
+              const existingParam = existingMeta?.params?.[i];
+              return {
+                type: existingParam?.type || param,
+                optional:
+                  typeof existingParam?.optional === 'boolean'
+                    ? existingParam.optional
+                    : false,
+              };
+            }),
       options: {
         ...(existingMeta?.options || {}),
         ...(options || {}),