fix(config): generate artifacts by respecting the order of transforms…

… & sources
santino · Jun 10, 2022 · ed9ba7f · ed9ba7f
1 parent e8973be
commit ed9ba7f
Show file tree

Hide file tree

Showing 15 changed files with 76 additions and 75 deletions.
diff --git a/.changeset/khaki-berries-love.md b/.changeset/khaki-berries-love.md
@@ -0,0 +1,6 @@
+---
+"@graphql-mesh/types": patch
+"@graphql-mesh/utils": patch
+---
+
+Small improvements for relaxing event loop
diff --git a/.changeset/proud-terms-peel.md b/.changeset/proud-terms-peel.md
@@ -0,0 +1,5 @@
+---
+"@graphql-mesh/config": patch
+---
+
+fix(config): generate artifacts by respecting the order of transforms & sources
diff --git a/packages/cache/redis/src/index.ts b/packages/cache/redis/src/index.ts
@@ -44,15 +44,10 @@ export default class RedisCache<V = string> implements KeyValueCache<V> {
         return new LocalforageCache(options as any) as any;
       }
     }
-    const id$ = options.pubsub
-      .subscribe('destroy', () => {
-        this.client.disconnect(false);
-        id$.then(id => options.pubsub.unsubscribe(id)).catch(err => console.error(err));
-      })
-      .catch(err => {
-        console.error(err);
-        return 0;
-      });
+    const id = options.pubsub.subscribe('destroy', () => {
+      this.client.disconnect(false);
+      options.pubsub.unsubscribe(id);
+    });
   }
 
   async set(key: string, value: V, options?: KeyValueCacheSetOptions): Promise<void> {

diff --git a/packages/config/src/process.ts b/packages/config/src/process.ts
@@ -218,16 +218,14 @@ export async function processConfig(
                 if (options.generateCode) {
                   const transformImportName = pascalCase(transformName + '_Transform');
                   importCodes.push(`import ${transformImportName} from ${JSON.stringify(moduleName)};`);
-                  codes.push(`${transformsVariableName}.push(
-                new ${transformImportName}({
+                  codes.push(`${transformsVariableName}[${transformIndex}] = new ${transformImportName}({
                   apiName: ${JSON.stringify(source.name)},
                   config: ${JSON.stringify(transformConfig)},
                   baseDir,
                   cache,
                   pubsub,
                   importFn
-                })
-              );`);
+                });`);
                 }
 
                 return new TransformCtor({
@@ -243,11 +241,11 @@ export async function processConfig(
           ]);
 
           if (options.generateCode) {
-            codes.push(`sources.push({
+            codes.push(`sources[${sourceIndex}] = {
           name: '${source.name}',
           handler: ${handlerVariableName},
           transforms: ${transformsVariableName}
-        })`);
+        }`);
           }
 
           return {
@@ -273,16 +271,14 @@ export async function processConfig(
             const transformImportName = pascalCase(transformName + '_Transform');
             importCodes.push(`import ${transformImportName} from ${JSON.stringify(moduleName)};`);
 
-            codes.push(`transforms.push(
-          new (${transformImportName} as any)({
+            codes.push(`transforms[${transformIndex}] = new (${transformImportName} as any)({
             apiName: '',
             config: ${JSON.stringify(transformConfig)},
             baseDir,
             cache,
             pubsub,
             importFn
-          })
-        )`);
+          })`);
           }
           return new TransformLibrary({
             apiName: '',
@@ -302,7 +298,9 @@ export async function processConfig(
             const { importName, moduleName, pluginFactory } = ENVELOP_CORE_PLUGINS_MAP[pluginName];
             if (options.generateCode) {
               importCodes.push(`import { ${importName} } from ${JSON.stringify(moduleName)};`);
-              codes.push(`additionalEnvelopPlugins.push(${importName}(${JSON.stringify(pluginConfig, null, 2)}))`);
+              codes.push(
+                `additionalEnvelopPlugins[${pluginIndex}] = ${importName}(${JSON.stringify(pluginConfig, null, 2)}))`
+              );
             }
             return pluginFactory(pluginConfig);
           }
@@ -320,18 +318,20 @@ export async function processConfig(
             if (options.generateCode) {
               importName = pascalCase('use_' + pluginName);
               importCodes.push(`import ${importName} from ${JSON.stringify(moduleName)};`);
-              codes.push(`additionalEnvelopPlugins.push(${importName}({
+              codes.push(`additionalEnvelopPlugins[${pluginIndex}] = ${importName}({
           ...(${JSON.stringify(pluginConfig, null, 2)}),
           logger: logger.child(${JSON.stringify(pluginName)}),
-        }))`);
+        })`);
             }
           } else {
             Object.keys(possiblePluginFactory).forEach(key => {
               if (key.toString().startsWith('use') && typeof possiblePluginFactory[key] === 'function') {
                 pluginFactory = possiblePluginFactory[key];
                 if (options.generateCode) {
                   importCodes.push(`import { ${importName} } from ${JSON.stringify(moduleName)};`);
-                  codes.push(`additionalEnvelopPlugins.push(${importName}(${JSON.stringify(pluginConfig, null, 2)}])`);
+                  codes.push(
+                    `additionalEnvelopPlugins[${pluginIndex}] = ${importName}(${JSON.stringify(pluginConfig, null, 2)}]`
+                  );
                 }
               }
             });

diff --git a/packages/handlers/mysql/src/index.ts b/packages/handlers/mysql/src/index.ts
@@ -542,9 +542,9 @@ export default class MySQLHandler implements MeshHandler {
     );
     introspectionConnection.release();
 
-    const id$ = this.pubsub.subscribe('destroy', () => {
+    const id = this.pubsub.subscribe('destroy', () => {
       pool.end();
-      id$.then(id => this.pubsub.unsubscribe(id)).catch(err => console.error(err));
+      this.pubsub.unsubscribe(id);
     });
 
     // graphql-compose doesn't add @defer and @stream to the schema

diff --git a/packages/handlers/neo4j/src/index.ts b/packages/handlers/neo4j/src/index.ts
@@ -9,24 +9,19 @@ import { process } from '@graphql-mesh/cross-helpers';
 function getEventEmitterFromPubSub(pubsub: MeshPubSub): any {
   return {
     on(event: string | symbol, listener: (...args: any[]) => void) {
-      pubsub.subscribe(event.toString(), listener).catch(e => console.error(e));
+      pubsub.subscribe(event.toString(), listener);
       return this;
     },
     once(event: string | symbol, listener: (...args: any[]) => void) {
-      let id: number;
-      pubsub
-        .subscribe(event.toString(), data => {
-          listener(data);
-          pubsub.unsubscribe(id);
-        })
-        .then(subId => {
-          id = subId;
-        })
-        .catch(e => console.error(e));
+      const id = pubsub.subscribe(event.toString(), data => {
+        listener(data);
+        pubsub.unsubscribe(id);
+      });
+
       return this;
     },
     emit(event: string | symbol, ...args: any[]) {
-      pubsub.publish(event.toString(), args[0]).catch(e => console.error(e));
+      pubsub.publish(event.toString(), args[0]);
       return true;
     },
     addListener(event: string | symbol, listener: (...args: any[]) => void) {
@@ -75,17 +70,11 @@ export default class Neo4JHandler implements MeshHandler {
       },
     });
 
-    const id$ = this.pubsub.subscribe('destroy', () => {
+    const id = this.pubsub.subscribe('destroy', async () => {
+      this.pubsub.unsubscribe(id);
       this.logger.debug('Closing Neo4j');
-      driver
-        .close()
-        .then(() => {
-          this.logger.debug('Neo4j has been closed');
-        })
-        .catch(error => {
-          this.logger.debug(`Neo4j couldn't be closed: `, error);
-        });
-      id$.then(id => this.pubsub.unsubscribe(id)).catch(err => console.error(err));
+      await driver.close();
+      this.logger.debug('Neo4j closed');
     });
 
     const typeDefs = await this.getCachedTypeDefs(driver);

diff --git a/packages/handlers/postgraphile/src/index.ts b/packages/handlers/postgraphile/src/index.ts
@@ -66,10 +66,10 @@ export default class PostGraphileHandler implements MeshHandler {
       });
     }
 
-    const id$ = this.pubsub.subscribe('destroy', () => {
+    const id = this.pubsub.subscribe('destroy', () => {
+      this.pubsub.unsubscribe(id);
       this.logger.debug('Destroying PostgreSQL pool');
       pgPool.end();
-      id$.then(id => this.pubsub.unsubscribe(id)).catch(err => console.error(err));
     });
 
     const cacheKey = this.name + '_introspection.json';

diff --git a/packages/mergers/federation/src/index.ts b/packages/mergers/federation/src/index.ts
@@ -104,9 +104,9 @@ export default class FederationMerger implements MeshMerger {
       },
       batch: true,
     });
-    const id$ = this.pubsub.subscribe('destroy', () => {
-      gateway.stop().catch(err => this.logger.error(err));
-      id$.then(id => this.pubsub.unsubscribe(id)).catch(err => console.error(err));
+    const id = this.pubsub.subscribe('destroy', async () => {
+      this.pubsub.unsubscribe(id);
+      await gateway.stop();
     });
     this.logger.debug(`Applying additionalTypeDefs`);
     typeDefs?.forEach(typeDef => {

diff --git a/packages/testing/getTestMesh.ts b/packages/testing/getTestMesh.ts
@@ -18,9 +18,9 @@ export async function getTestMesh() {
     validate: false,
   });
   await yoga.start();
-  const subId$ = pubsub.subscribe('destroy', async () => {
+  const subId = pubsub.subscribe('destroy', async () => {
+    pubsub.unsubscribe(subId);
     await yoga.stop();
-    subId$.then(subId => pubsub.unsubscribe(subId)).catch(err => console.error(err));
   });
   const mesh = await getMesh({
     sources: [

diff --git a/packages/transforms/cache/src/index.ts b/packages/transforms/cache/src/index.ts
@@ -148,8 +148,8 @@ export default class CacheTransform implements MeshTransform {
 
   private waitAndReturn(pubsubTopic: string) {
     return new Promise((resolve, reject) => {
-      const subId$ = this.options.pubsub.subscribe(pubsubTopic, async ({ result, error }) => {
-        subId$.then(subId => this.options.pubsub.unsubscribe(subId));
+      const subId = this.options.pubsub.subscribe(pubsubTopic, ({ result, error }) => {
+        this.options.pubsub.unsubscribe(subId);
 
         if (error) {
           reject(error);

diff --git a/packages/transforms/rate-limit/src/index.ts b/packages/transforms/rate-limit/src/index.ts
@@ -16,9 +16,9 @@ export default class RateLimitTransform implements MeshTransform {
       });
     }
     if (options.pubsub) {
-      const id$ = options.pubsub.subscribe('destroy', () => {
+      const id = options.pubsub.subscribe('destroy', () => {
+        options.pubsub.unsubscribe(id);
         this.timeouts.forEach(timeout => clearTimeout(timeout));
-        id$.then(id => options.pubsub.unsubscribe(id)).catch(err => console.error(err));
       });
     }
   }

diff --git a/packages/transforms/rate-limit/tests/rate-limit.spec.ts b/packages/transforms/rate-limit/tests/rate-limit.spec.ts
@@ -15,9 +15,7 @@ describe('Rate Limit Transform', () => {
   });
 
   afterEach(() => {
-    pubsub
-      .publish('destroy', {} as any)
-      .catch(e => console.warn(`Error on emitting destroy: ${e.stack || e.message || e}`));
+    pubsub.publish('destroy', {} as any);
   });
 
   const baseDir = process.cwd();

diff --git a/packages/types/src/config-schema.json b/packages/types/src/config-schema.json
@@ -484,7 +484,7 @@
           "description": "Handler for gRPC and Protobuf schemas"
         },
         "jsonSchema": {
-          "description": "Handler for JSON Schema specification. Source could be a local json file, or a url to it. (Any of: JsonSchemaHandler, JsonSchemaHandlerBundle)",
+          "description": "Handler for JSON Schema specification.\nSource could be a local json file, or a url to it. (Any of: JsonSchemaHandler, JsonSchemaHandlerBundle)",
           "anyOf": [
             {
               "$ref": "#/definitions/JsonSchemaHandler"

diff --git a/packages/types/src/config.ts b/packages/types/src/config.ts
@@ -207,7 +207,8 @@ export interface Handler {
     | GraphQLHandlerMultipleHTTPConfiguration;
   grpc?: GrpcHandler;
   /**
-   * Handler for JSON Schema specification. Source could be a local json file, or a url to it. (Any of: JsonSchemaHandler, JsonSchemaHandlerBundle)
+   * Handler for JSON Schema specification.
+   * Source could be a local json file, or a url to it. (Any of: JsonSchemaHandler, JsonSchemaHandlerBundle)
    */
   jsonSchema?: JsonSchemaHandler | JsonSchemaHandlerBundle;
   mongoose?: MongooseHandler;

diff --git a/website/docs/generated-markdown/JsonSchemaHandler.generated.md b/website/docs/generated-markdown/JsonSchemaHandler.generated.md
@@ -4,16 +4,21 @@
 * `schemaHeaders` (type: `JSON`)
 * `operations` -  (required) Array of: 
   * `object`: 
-    * `field` (type: `String`, required)
-    * `description` (type: `String`)
-    * `type` (type: `String (Query | Mutation | Subscription)`, required)
-    * `requestSchema` (type: `Any`)
-    * `requestSample` (type: `Any`)
-    * `requestTypeName` (type: `String`)
-    * `requestBaseBody` (type: `Any`) - This body will be merged with the request body sent with the underlying HTTP request
-    * `responseSchema` (type: `Any`)
-    * `responseSample` (type: `Any`)
-    * `responseTypeName` (type: `String`)
+    * `field` (type: `String`, required) - This Field based on the field name of the URL path.
+Example: "https://MyAPIURL.com/FieldNameHere/",
+so we will set the "field: FieldNameHere".
+    * `description` (type: `String`) - Your chance to describe the operation!
+Make sure the description is clear and concise.
+    * `type` (type: `String (Query | Mutation | Subscription)`, required) - Type field is set the opertion type: Query, Mutation or Subscription.
+    * `requestSchema` (type: `Any`) - Your chance to provide request schema name.
+    * `requestSample` (type: `Any`) - The path definition of the JSON Schema sample.
+Example: "./jsons/questions.response.json".
+    * `requestTypeName` (type: `String`) - Inset any name for the type of the request body.
+    * `requestBaseBody` (type: `Any`) - This body will be merged with the request body sent with
+the underlying HTTP request
+    * `responseSchema` (type: `Any`) - Yay! Now you can provide the response schema name.
+    * `responseSample` (type: `Any`) - Did you use Sample? Provide the respone sample path.
+    * `responseTypeName` (type: `String`) - Inset any name for the type of the response body.
     * `responseByStatusCode` (type: `Any`) - You can define your response schemas by status codes;
 
 responseByStatusCode:
@@ -22,7 +27,8 @@ responseByStatusCode:
   404:
     responseSample: ./error-sample.json
     responseTypeName: MyError
-    * `argTypeMap` (type: `JSON`)
+    * `argTypeMap` (type: `JSON`) - Mapping the JSON Schema and define the arguments of the operation.
+Example: 'argTypeMap: ID: String'
     * `path` (type: `String`, required)
     * `method` (type: `String (GET | HEAD | POST | PUT | DELETE | CONNECT | OPTIONS | TRACE | PATCH)`)
     * `headers` (type: `JSON`)
@@ -36,7 +42,8 @@ unless you define an explicit Content-Type header
     * `requestSchema` (type: `Any`)
     * `requestSample` (type: `Any`)
     * `requestTypeName` (type: `String`)
-    * `requestBaseBody` (type: `Any`) - This body will be merged with the request body sent with the underlying HTTP request
+    * `requestBaseBody` (type: `Any`) - This body will be merged with the request body sent with
+the underlying HTTP request
     * `responseSchema` (type: `Any`)
     * `responseSample` (type: `Any`)
     * `responseTypeName` (type: `String`)