@graphql-mesh/mysql 1.0.0-alpha-20220804093904-8e2e41f7f → 1.0.0-alpha-20230420220344-25b6b92bf

package/{index.js → cjs/index.js}

@@ -1,19 +1,17 @@
-'use strict';
-
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
-const graphqlCompose = require('graphql-compose');
-const mysql = require('mysql');
-const mysqlUtilities = require('mysql-utilities');
-const graphqlFields = _interopDefault(require('graphql-fields'));
-const graphqlScalars = require('graphql-scalars');
-const graphql = require('graphql');
-const utils = require('@graphql-mesh/utils');
-const stringInterpolation = require('@graphql-mesh/string-interpolation');
-const store = require('@graphql-mesh/store');
-const delegate = require('@graphql-tools/delegate');
-const crossHelpers = require('@graphql-mesh/cross-helpers');
-
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const graphql_1 = require("graphql");
+const graphql_compose_1 = require("graphql-compose");
+const graphql_fields_1 = tslib_1.__importDefault(require("graphql-fields"));
+const graphql_scalars_1 = require("graphql-scalars");
+const mysql_1 = require("mysql");
+const mysql_utilities_1 = require("mysql-utilities");
+const cross_helpers_1 = require("@graphql-mesh/cross-helpers");
+const store_1 = require("@graphql-mesh/store");
+const string_interpolation_1 = require("@graphql-mesh/string-interpolation");
+const utils_1 = require("@graphql-mesh/utils");
+const delegate_1 = require("@graphql-tools/delegate");
 const SCALARS = {
     bigint: 'BigInt',
     'bigint unsigned': 'BigInt',
@@ -60,18 +58,18 @@ const SCALARS = {
     year: 'Int',
 };
 async function getPromisifiedConnection(pool) {
-    const getConnection = crossHelpers.util.promisify(pool.getConnection.bind(pool));
+    const getConnection = cross_helpers_1.util.promisify(pool.getConnection.bind(pool));
     const connection = await getConnection();
-    const getDatabaseTables = crossHelpers.util.promisify(connection.databaseTables.bind(connection));
-    const getTableFields = crossHelpers.util.promisify(connection.fields.bind(connection));
-    const getTableForeigns = crossHelpers.util.promisify(connection.foreign.bind(connection));
-    const getTablePrimaryKeyMetadata = crossHelpers.util.promisify(connection.primary.bind(connection));
-    const selectLimit = crossHelpers.util.promisify(connection.selectLimit.bind(connection));
-    const select = crossHelpers.util.promisify(connection.select.bind(connection));
-    const insert = crossHelpers.util.promisify(connection.insert.bind(connection));
-    const update = crossHelpers.util.promisify(connection.update.bind(connection));
-    const deleteRow = crossHelpers.util.promisify(connection.delete.bind(connection));
-    const count = crossHelpers.util.promisify(connection.count.bind(connection));
+    const getDatabaseTables = cross_helpers_1.util.promisify(connection.databaseTables.bind(connection));
+    const getTableFields = cross_helpers_1.util.promisify(connection.fields.bind(connection));
+    const getTableForeigns = cross_helpers_1.util.promisify(connection.foreign.bind(connection));
+    const getTablePrimaryKeyMetadata = cross_helpers_1.util.promisify(connection.primary.bind(connection));
+    const selectLimit = cross_helpers_1.util.promisify(connection.selectLimit.bind(connection));
+    const select = cross_helpers_1.util.promisify(connection.select.bind(connection));
+    const insert = cross_helpers_1.util.promisify(connection.insert.bind(connection));
+    const update = cross_helpers_1.util.promisify(connection.update.bind(connection));
+    const deleteRow = cross_helpers_1.util.promisify(connection.delete.bind(connection));
+    const count = cross_helpers_1.util.promisify(connection.count.bind(connection));
     const release = connection.release.bind(connection);
     return {
         connection,
@@ -89,7 +87,7 @@ async function getPromisifiedConnection(pool) {
     };
 }
 function getFieldsFromResolveInfo(info) {
-    const fieldMap = graphqlFields(info);
+    const fieldMap = (0, graphql_fields_1.default)(info);
     return Object.keys(fieldMap).filter(fieldName => Object.keys(fieldMap[fieldName]).length === 0 && fieldName !== '__typename');
 }
 class MySQLHandler {
@@ -107,12 +105,16 @@ class MySQLHandler {
                 if (methodName === 'release') {
                     return () => promisifiedConnection$ === null || promisifiedConnection$ === void 0 ? void 0 : promisifiedConnection$.then(promisifiedConnection => promisifiedConnection === null || promisifiedConnection === void 0 ? void 0 : promisifiedConnection.connection.release());
                 }
+                if (methodName === 'connection') {
+                    return promisifiedConnection$ === null || promisifiedConnection$ === void 0 ? void 0 : promisifiedConnection$.then(promisifiedConnection => promisifiedConnection === null || promisifiedConnection === void 0 ? void 0 : promisifiedConnection.connection);
+                }
                 return async (...args) => {
                     const cacheKey = [methodName, ...args].join('_');
-                    const cacheProxy = this.store.proxy(cacheKey, store.PredefinedProxyOptions.JsonWithoutValidation);
+                    const cacheProxy = this.store.proxy(cacheKey, store_1.PredefinedProxyOptions.JsonWithoutValidation);
                     return cacheProxy.getWithSet(async () => {
                         promisifiedConnection$ = promisifiedConnection$ || getPromisifiedConnection(pool);
                         const promisifiedConnection = await promisifiedConnection$;
+                        // @ts-expect-error - Weird error
                         return promisifiedConnection[methodName](...args);
                     });
                 };
@@ -121,41 +123,43 @@ class MySQLHandler {
     }
     async getMeshSource() {
         const { pool: configPool } = this.config;
-        const schemaComposer = new graphqlCompose.SchemaComposer();
+        const schemaComposer = new graphql_compose_1.SchemaComposer();
         const pool = configPool
             ? typeof configPool === 'string'
-                ? await utils.loadFromModuleExportExpression(configPool, {
+                ? await (0, utils_1.loadFromModuleExportExpression)(configPool, {
                     cwd: this.baseDir,
                     defaultExportName: 'default',
                     importFn: this.importFn,
                 })
                 : configPool
-            : mysql.createPool({
+            : (0, mysql_1.createPool)({
                 supportBigNumbers: true,
                 bigNumberStrings: true,
-                dateStrings: true,
-                trace: !!crossHelpers.process.env.DEBUG,
-                debug: !!crossHelpers.process.env.DEBUG,
-                host: this.config.host && stringInterpolation.stringInterpolator.parse(this.config.host, { env: crossHelpers.process.env }),
-                port: this.config.port && parseInt(stringInterpolation.stringInterpolator.parse(this.config.port.toString(), { env: crossHelpers.process.env })),
-                user: this.config.user && stringInterpolation.stringInterpolator.parse(this.config.user, { env: crossHelpers.process.env }),
-                password: this.config.password && stringInterpolation.stringInterpolator.parse(this.config.password, { env: crossHelpers.process.env }),
-                database: this.config.database && stringInterpolation.stringInterpolator.parse(this.config.database, { env: crossHelpers.process.env }),
+                trace: !!cross_helpers_1.process.env.DEBUG,
+                debug: !!cross_helpers_1.process.env.DEBUG,
+                host: this.config.host && string_interpolation_1.stringInterpolator.parse(this.config.host, { env: cross_helpers_1.process.env }),
+                port: this.config.port &&
+                    parseInt(string_interpolation_1.stringInterpolator.parse(this.config.port.toString(), { env: cross_helpers_1.process.env })),
+                user: this.config.user && string_interpolation_1.stringInterpolator.parse(this.config.user, { env: cross_helpers_1.process.env }),
+                password: this.config.password &&
+                    string_interpolation_1.stringInterpolator.parse(this.config.password, { env: cross_helpers_1.process.env }),
+                database: this.config.database &&
+                    string_interpolation_1.stringInterpolator.parse(this.config.database, { env: cross_helpers_1.process.env }),
                 ...this.config,
             });
         pool.on('connection', connection => {
-            mysqlUtilities.upgrade(connection);
-            mysqlUtilities.introspection(connection);
+            (0, mysql_utilities_1.upgrade)(connection);
+            (0, mysql_utilities_1.introspection)(connection);
         });
         const introspectionConnection = this.getCachedIntrospectionConnection(pool);
-        schemaComposer.add(graphqlScalars.GraphQLBigInt);
-        schemaComposer.add(graphqlScalars.GraphQLJSON);
-        schemaComposer.add(graphqlScalars.GraphQLDate);
-        schemaComposer.add(graphqlScalars.GraphQLTime);
-        schemaComposer.add(graphqlScalars.GraphQLDateTime);
-        schemaComposer.add(graphqlScalars.GraphQLTimestamp);
-        schemaComposer.add(graphqlScalars.GraphQLUnsignedInt);
-        schemaComposer.add(graphqlScalars.GraphQLUnsignedFloat);
+        schemaComposer.add(graphql_scalars_1.GraphQLBigInt);
+        schemaComposer.add(graphql_scalars_1.GraphQLJSON);
+        schemaComposer.add(graphql_scalars_1.GraphQLDate);
+        schemaComposer.add(graphql_scalars_1.GraphQLTime);
+        schemaComposer.add(graphql_scalars_1.GraphQLDateTime);
+        schemaComposer.add(graphql_scalars_1.GraphQLTimestamp);
+        schemaComposer.add(graphql_scalars_1.GraphQLUnsignedInt);
+        schemaComposer.add(graphql_scalars_1.GraphQLUnsignedFloat);
         schemaComposer.createEnumTC({
             name: 'OrderBy',
             values: {
@@ -169,17 +173,18 @@ class MySQLHandler {
         });
         const tables = await introspectionConnection.getDatabaseTables(pool.config.connectionConfig.database);
         const tableNames = this.config.tables || Object.keys(tables);
+        const typeMergingOptions = {};
         await Promise.all(tableNames.map(async (tableName) => {
             var _a, _b;
             if (this.config.tables && !this.config.tables.includes(tableName)) {
                 return;
             }
             const table = tables[tableName];
-            const objectTypeName = utils.sanitizeNameForGraphQL(table.TABLE_NAME);
-            const insertInputName = utils.sanitizeNameForGraphQL(table.TABLE_NAME + '_InsertInput');
-            const updateInputName = utils.sanitizeNameForGraphQL(table.TABLE_NAME + '_UpdateInput');
-            const whereInputName = utils.sanitizeNameForGraphQL(table.TABLE_NAME + '_WhereInput');
-            const orderByInputName = utils.sanitizeNameForGraphQL(table.TABLE_NAME + '_OrderByInput');
+            const objectTypeName = (0, utils_1.sanitizeNameForGraphQL)(table.TABLE_NAME);
+            const insertInputName = (0, utils_1.sanitizeNameForGraphQL)(table.TABLE_NAME + '_InsertInput');
+            const updateInputName = (0, utils_1.sanitizeNameForGraphQL)(table.TABLE_NAME + '_UpdateInput');
+            const whereInputName = (0, utils_1.sanitizeNameForGraphQL)(table.TABLE_NAME + '_WhereInput');
+            const orderByInputName = (0, utils_1.sanitizeNameForGraphQL)(table.TABLE_NAME + '_OrderByInput');
             const tableTC = schemaComposer.createObjectTC({
                 name: objectTypeName,
                 description: table.TABLE_COMMENT || undefined,
@@ -212,7 +217,8 @@ class MySQLHandler {
             });
             const primaryKeys = new Set();
             const fields = await introspectionConnection.getTableFields(tableName);
-            const fieldNames = ((_b = (_a = this.config.tableFields) === null || _a === void 0 ? void 0 : _a.find(({ table }) => table === tableName)) === null || _b === void 0 ? void 0 : _b.fields) || Object.keys(fields);
+            const fieldNames = ((_b = (_a = this.config.tableFields) === null || _a === void 0 ? void 0 : _a.find(({ table }) => table === tableName)) === null || _b === void 0 ? void 0 : _b.fields) ||
+                Object.keys(fields);
             await Promise.all(fieldNames.map(async (fieldName) => {
                 const tableField = fields[fieldName];
                 if (tableField.Key === 'PRI') {
@@ -225,11 +231,11 @@ class MySQLHandler {
                 let type = SCALARS[realTypeName];
                 if (realTypeName === 'enum' || realTypeName === 'set') {
                     const enumValues = typeDetails.split(`'`).join('').split(',');
-                    const enumTypeName = utils.sanitizeNameForGraphQL(tableName + '_' + fieldName);
+                    const enumTypeName = (0, utils_1.sanitizeNameForGraphQL)(tableName + '_' + fieldName);
                     schemaComposer.createEnumTC({
                         name: enumTypeName,
                         values: enumValues.reduce((prev, curr) => {
-                            const enumKey = utils.sanitizeNameForGraphQL(curr);
+                            const enumKey = (0, utils_1.sanitizeNameForGraphQL)(curr);
                             return {
                                 ...prev,
                                 [enumKey]: {
@@ -288,9 +294,9 @@ class MySQLHandler {
                 }
                 const foreignTableName = tableForeign.REFERENCED_TABLE_NAME;
                 const foreignColumnName = tableForeign.REFERENCED_COLUMN_NAME;
-                const foreignObjectTypeName = utils.sanitizeNameForGraphQL(foreignTableName);
-                const foreignWhereInputName = utils.sanitizeNameForGraphQL(foreignTableName + '_WhereInput');
-                const foreignOrderByInputName = utils.sanitizeNameForGraphQL(foreignTableName + '_OrderByInput');
+                const foreignObjectTypeName = (0, utils_1.sanitizeNameForGraphQL)(foreignTableName);
+                const foreignWhereInputName = (0, utils_1.sanitizeNameForGraphQL)(foreignTableName + '_WhereInput');
+                const foreignOrderByInputName = (0, utils_1.sanitizeNameForGraphQL)(foreignTableName + '_OrderByInput');
                 tableTC.addFields({
                     [foreignTableName]: {
                         type: '[' + foreignObjectTypeName + ']',
@@ -352,7 +358,7 @@ class MySQLHandler {
                                 [columnName]: root[foreignColumnName],
                                 ...args === null || args === void 0 ? void 0 : args.where,
                             };
-                            const fieldMap = graphqlFields(info);
+                            const fieldMap = (0, graphql_fields_1.default)(info);
                             const fields = [];
                             for (const fieldName in fieldMap) {
                                 if (fieldName !== '__typename') {
@@ -361,8 +367,9 @@ class MySQLHandler {
                                         fields.push(fieldName);
                                     }
                                     else {
-                                        const tableForeign = schemaComposer.getOTC(objectTypeName).getField(fieldName)
-                                            .extensions;
+                                        const tableForeign = schemaComposer
+                                            .getOTC(objectTypeName)
+                                            .getField(fieldName).extensions;
                                         fields.push(tableForeign.COLUMN_NAME);
                                     }
                                 }
@@ -379,6 +386,19 @@ class MySQLHandler {
                     },
                 });
             }));
+            typeMergingOptions[objectTypeName] = {
+                selectionSet: `{ ${[...primaryKeys].join(' ')} }`,
+                args: obj => {
+                    const where = {};
+                    for (const primaryKey of primaryKeys) {
+                        where[primaryKey] = obj[primaryKey];
+                    }
+                    return {
+                        where,
+                    };
+                },
+                valuesFromResults: results => results[0],
+            };
             schemaComposer.Query.addFields({
                 [tableName]: {
                     type: '[' + objectTypeName + ']',
@@ -397,7 +417,7 @@ class MySQLHandler {
                         },
                     },
                     resolve: (root, args, { mysqlConnection }, info) => {
-                        const fieldMap = graphqlFields(info);
+                        const fieldMap = (0, graphql_fields_1.default)(info);
                         const fields = [];
                         for (const fieldName in fieldMap) {
                             if (fieldName !== '__typename') {
@@ -478,19 +498,25 @@ class MySQLHandler {
                             type: whereInputName,
                         },
                     },
-                    resolve: (root, args, { mysqlConnection }) => mysqlConnection.deleteRow(tableName, args.where).then(result => !!(result === null || result === void 0 ? void 0 : result.affectedRows)),
+                    resolve: (root, args, { mysqlConnection }) => mysqlConnection
+                        .deleteRow(tableName, args.where)
+                        .then(result => !!(result === null || result === void 0 ? void 0 : result.affectedRows)),
                 },
             });
         }));
         introspectionConnection.release();
         const id = this.pubsub.subscribe('destroy', () => {
-            pool.end();
-            this.pubsub.unsubscribe(id);
+            pool.end(err => {
+                if (err) {
+                    console.error(err);
+                }
+                this.pubsub.unsubscribe(id);
+            });
         });
         // graphql-compose doesn't add @defer and @stream to the schema
-        graphql.specifiedDirectives.forEach(directive => schemaComposer.addDirective(directive));
+        graphql_1.specifiedDirectives.forEach(directive => schemaComposer.addDirective(directive));
         const schema = schemaComposer.buildSchema();
-        const executor = delegate.createDefaultExecutor(schema);
+        const executor = (0, delegate_1.createDefaultExecutor)(schema);
         return {
             schema,
             async executor(executionRequest) {
@@ -514,5 +540,4 @@ class MySQLHandler {
         };
     }
 }
-
-module.exports = MySQLHandler;
+exports.default = MySQLHandler;

package/cjs/package.json

@@ -0,0 +1 @@
+{"type":"commonjs"}

package/cjs/promisify.js

@@ -0,0 +1 @@
+"use strict";

package/{index.mjs → esm/index.js}

@@ -1,15 +1,14 @@
+import { specifiedDirectives } from 'graphql';
 import { SchemaComposer } from 'graphql-compose';
-import { createPool } from 'mysql';
-import { upgrade, introspection } from 'mysql-utilities';
 import graphqlFields from 'graphql-fields';
-import { GraphQLBigInt, GraphQLJSON, GraphQLDate, GraphQLTime, GraphQLDateTime, GraphQLTimestamp, GraphQLUnsignedInt, GraphQLUnsignedFloat } from 'graphql-scalars';
-import { specifiedDirectives } from 'graphql';
-import { loadFromModuleExportExpression, sanitizeNameForGraphQL } from '@graphql-mesh/utils';
-import { stringInterpolator } from '@graphql-mesh/string-interpolation';
+import { GraphQLBigInt, GraphQLDate, GraphQLDateTime, GraphQLJSON, GraphQLTime, GraphQLTimestamp, GraphQLUnsignedFloat, GraphQLUnsignedInt, } from 'graphql-scalars';
+import { createPool } from 'mysql';
+import { introspection, upgrade } from 'mysql-utilities';
+import { process, util } from '@graphql-mesh/cross-helpers';
 import { PredefinedProxyOptions } from '@graphql-mesh/store';
+import { stringInterpolator } from '@graphql-mesh/string-interpolation';
+import { loadFromModuleExportExpression, sanitizeNameForGraphQL } from '@graphql-mesh/utils';
 import { createDefaultExecutor } from '@graphql-tools/delegate';
-import { process, util } from '@graphql-mesh/cross-helpers';
-
 const SCALARS = {
     bigint: 'BigInt',
     'bigint unsigned': 'BigInt',
@@ -88,7 +87,7 @@ function getFieldsFromResolveInfo(info) {
     const fieldMap = graphqlFields(info);
     return Object.keys(fieldMap).filter(fieldName => Object.keys(fieldMap[fieldName]).length === 0 && fieldName !== '__typename');
 }
-class MySQLHandler {
+export default class MySQLHandler {
     constructor({ name, config, baseDir, pubsub, store, importFn, logger, }) {
         this.config = config;
         this.baseDir = baseDir;
@@ -103,12 +102,16 @@ class MySQLHandler {
                 if (methodName === 'release') {
                     return () => promisifiedConnection$ === null || promisifiedConnection$ === void 0 ? void 0 : promisifiedConnection$.then(promisifiedConnection => promisifiedConnection === null || promisifiedConnection === void 0 ? void 0 : promisifiedConnection.connection.release());
                 }
+                if (methodName === 'connection') {
+                    return promisifiedConnection$ === null || promisifiedConnection$ === void 0 ? void 0 : promisifiedConnection$.then(promisifiedConnection => promisifiedConnection === null || promisifiedConnection === void 0 ? void 0 : promisifiedConnection.connection);
+                }
                 return async (...args) => {
                     const cacheKey = [methodName, ...args].join('_');
                     const cacheProxy = this.store.proxy(cacheKey, PredefinedProxyOptions.JsonWithoutValidation);
                     return cacheProxy.getWithSet(async () => {
                         promisifiedConnection$ = promisifiedConnection$ || getPromisifiedConnection(pool);
                         const promisifiedConnection = await promisifiedConnection$;
+                        // @ts-expect-error - Weird error
                         return promisifiedConnection[methodName](...args);
                     });
                 };
@@ -129,14 +132,16 @@ class MySQLHandler {
             : createPool({
                 supportBigNumbers: true,
                 bigNumberStrings: true,
-                dateStrings: true,
                 trace: !!process.env.DEBUG,
                 debug: !!process.env.DEBUG,
                 host: this.config.host && stringInterpolator.parse(this.config.host, { env: process.env }),
-                port: this.config.port && parseInt(stringInterpolator.parse(this.config.port.toString(), { env: process.env })),
+                port: this.config.port &&
+                    parseInt(stringInterpolator.parse(this.config.port.toString(), { env: process.env })),
                 user: this.config.user && stringInterpolator.parse(this.config.user, { env: process.env }),
-                password: this.config.password && stringInterpolator.parse(this.config.password, { env: process.env }),
-                database: this.config.database && stringInterpolator.parse(this.config.database, { env: process.env }),
+                password: this.config.password &&
+                    stringInterpolator.parse(this.config.password, { env: process.env }),
+                database: this.config.database &&
+                    stringInterpolator.parse(this.config.database, { env: process.env }),
                 ...this.config,
             });
         pool.on('connection', connection => {
@@ -165,6 +170,7 @@ class MySQLHandler {
         });
         const tables = await introspectionConnection.getDatabaseTables(pool.config.connectionConfig.database);
         const tableNames = this.config.tables || Object.keys(tables);
+        const typeMergingOptions = {};
         await Promise.all(tableNames.map(async (tableName) => {
             var _a, _b;
             if (this.config.tables && !this.config.tables.includes(tableName)) {
@@ -208,7 +214,8 @@ class MySQLHandler {
             });
             const primaryKeys = new Set();
             const fields = await introspectionConnection.getTableFields(tableName);
-            const fieldNames = ((_b = (_a = this.config.tableFields) === null || _a === void 0 ? void 0 : _a.find(({ table }) => table === tableName)) === null || _b === void 0 ? void 0 : _b.fields) || Object.keys(fields);
+            const fieldNames = ((_b = (_a = this.config.tableFields) === null || _a === void 0 ? void 0 : _a.find(({ table }) => table === tableName)) === null || _b === void 0 ? void 0 : _b.fields) ||
+                Object.keys(fields);
             await Promise.all(fieldNames.map(async (fieldName) => {
                 const tableField = fields[fieldName];
                 if (tableField.Key === 'PRI') {
@@ -357,8 +364,9 @@ class MySQLHandler {
                                         fields.push(fieldName);
                                     }
                                     else {
-                                        const tableForeign = schemaComposer.getOTC(objectTypeName).getField(fieldName)
-                                            .extensions;
+                                        const tableForeign = schemaComposer
+                                            .getOTC(objectTypeName)
+                                            .getField(fieldName).extensions;
                                         fields.push(tableForeign.COLUMN_NAME);
                                     }
                                 }
@@ -375,6 +383,19 @@ class MySQLHandler {
                     },
                 });
             }));
+            typeMergingOptions[objectTypeName] = {
+                selectionSet: `{ ${[...primaryKeys].join(' ')} }`,
+                args: obj => {
+                    const where = {};
+                    for (const primaryKey of primaryKeys) {
+                        where[primaryKey] = obj[primaryKey];
+                    }
+                    return {
+                        where,
+                    };
+                },
+                valuesFromResults: results => results[0],
+            };
             schemaComposer.Query.addFields({
                 [tableName]: {
                     type: '[' + objectTypeName + ']',
@@ -474,14 +495,20 @@ class MySQLHandler {
                             type: whereInputName,
                         },
                     },
-                    resolve: (root, args, { mysqlConnection }) => mysqlConnection.deleteRow(tableName, args.where).then(result => !!(result === null || result === void 0 ? void 0 : result.affectedRows)),
+                    resolve: (root, args, { mysqlConnection }) => mysqlConnection
+                        .deleteRow(tableName, args.where)
+                        .then(result => !!(result === null || result === void 0 ? void 0 : result.affectedRows)),
                 },
             });
         }));
         introspectionConnection.release();
         const id = this.pubsub.subscribe('destroy', () => {
-            pool.end();
-            this.pubsub.unsubscribe(id);
+            pool.end(err => {
+                if (err) {
+                    console.error(err);
+                }
+                this.pubsub.unsubscribe(id);
+            });
         });
         // graphql-compose doesn't add @defer and @stream to the schema
         specifiedDirectives.forEach(directive => schemaComposer.addDirective(directive));
@@ -510,5 +537,3 @@ class MySQLHandler {
         };
     }
 }
-
-export default MySQLHandler;

package/esm/promisify.js

@@ -0,0 +1 @@
+"use strict";

package/package.json

@@ -1,24 +1,24 @@
 {
   "name": "@graphql-mesh/mysql",
-  "version": "1.0.0-alpha-20220804093904-8e2e41f7f",
+  "version": "1.0.0-alpha-20230420220344-25b6b92bf",
   "sideEffects": false,
   "peerDependencies": {
-    "@graphql-mesh/types": "0.79.0-alpha-20220804093904-8e2e41f7f",
-    "@graphql-mesh/utils": "1.0.0-alpha-20220804093904-8e2e41f7f",
-    "graphql": "*"
+    "@graphql-mesh/cross-helpers": "^0.3.4",
+    "@graphql-mesh/store": "1.0.0-alpha-20230420220344-25b6b92bf",
+    "@graphql-mesh/types": "1.0.0-alpha-20230420220344-25b6b92bf",
+    "@graphql-mesh/utils": "1.0.0-alpha-20230420220344-25b6b92bf",
+    "@graphql-tools/utils": "^9.2.1",
+    "graphql": "*",
+    "tslib": "^2.4.0"
   },
   "dependencies": {
-    "@graphql-mesh/cross-helpers": "0.2.0",
-    "@graphql-mesh/store": "1.0.0-alpha-20220804093904-8e2e41f7f",
-    "@graphql-mesh/string-interpolation": "0.3.0",
-    "@graphql-tools/delegate": "8.8.1",
-    "@graphql-tools/utils": "8.9.0",
-    "graphql-compose": "9.0.8",
+    "@graphql-mesh/string-interpolation": "0.4.4",
+    "@graphql-tools/delegate": "9.0.32",
+    "graphql-compose": "9.0.10",
     "graphql-fields": "2.0.3",
-    "graphql-scalars": "1.17.0",
+    "graphql-scalars": "^1.20.4",
     "mysql": "2.18.1",
-    "mysql-utilities": "1.1.4",
-    "tslib": "^2.4.0"
+    "mysql-utilities": "1.1.4"
   },
   "repository": {
     "type": "git",
@@ -26,21 +26,28 @@
     "directory": "packages/handlers/mysql"
   },
   "license": "MIT",
-  "main": "index.js",
-  "module": "index.mjs",
-  "typings": "index.d.ts",
+  "main": "cjs/index.js",
+  "module": "esm/index.js",
+  "typings": "typings/index.d.ts",
   "typescript": {
-    "definition": "index.d.ts"
+    "definition": "typings/index.d.ts"
   },
+  "type": "module",
   "exports": {
     ".": {
-      "require": "./index.js",
-      "import": "./index.mjs"
-    },
-    "./*": {
-      "require": "./*.js",
-      "import": "./*.mjs"
+      "require": {
+        "types": "./typings/index.d.cts",
+        "default": "./cjs/index.js"
+      },
+      "import": {
+        "types": "./typings/index.d.ts",
+        "default": "./esm/index.js"
+      },
+      "default": {
+        "types": "./typings/index.d.ts",
+        "default": "./esm/index.js"
+      }
     },
     "./package.json": "./package.json"
   }
-}
+}

package/typings/index.d.cts

@@ -0,0 +1,11 @@
+import { MeshHandler, MeshHandlerOptions, MeshSource, YamlConfig } from '@graphql-mesh/types';
+export default class MySQLHandler implements MeshHandler {
+    private config;
+    private baseDir;
+    private pubsub;
+    private store;
+    private importFn;
+    constructor({ name, config, baseDir, pubsub, store, importFn, logger, }: MeshHandlerOptions<YamlConfig.MySQLHandler>);
+    private getCachedIntrospectionConnection;
+    getMeshSource(): Promise<MeshSource>;
+}

package/{index.d.ts → typings/index.d.ts}

@@ -1,11 +1,11 @@
-import { GetMeshSourceOptions, MeshHandler, MeshSource, YamlConfig } from '@graphql-mesh/types';
+import { MeshHandler, MeshHandlerOptions, MeshSource, YamlConfig } from '@graphql-mesh/types';
 export default class MySQLHandler implements MeshHandler {
     private config;
     private baseDir;
     private pubsub;
     private store;
     private importFn;
-    constructor({ name, config, baseDir, pubsub, store, importFn, logger, }: GetMeshSourceOptions<YamlConfig.MySQLHandler>);
+    constructor({ name, config, baseDir, pubsub, store, importFn, logger, }: MeshHandlerOptions<YamlConfig.MySQLHandler>);
     private getCachedIntrospectionConnection;
     getMeshSource(): Promise<MeshSource>;
 }

package/typings/promisify.d.ts

@@ -0,0 +1,8 @@
+declare module 'util' {
+    function promisify<T>(f: (cb: (err: any, res: T) => void) => void, thisContext?: any): () => Promise<T>;
+    function promisify<A, T>(f: (arg: A, cb: (err: any, res: T) => void) => void, thisContext?: any): (arg: A) => Promise<T>;
+    function promisify<A, A2, T>(f: (arg: A, arg2: A2, cb: (err: any, res: T) => void) => void, thisContext?: any): (arg: A, arg2: A2) => Promise<T>;
+    function promisify<A, A2, A3, T>(f: (arg: A, arg2: A2, arg3: A3, cb: (err: any, res: T) => void) => void, thisContext?: any): (arg: A, arg2: A2, arg3: A3) => Promise<T>;
+    function promisify<A, A2, A3, A4, T>(f: (arg: A, arg2: A2, arg3: A3, arg4: A4, cb: (err: any, res: T) => void) => void, thisContext?: any): (arg: A, arg2: A2, arg3: A3, arg4: A4) => Promise<T>;
+    function promisify<A, A2, A3, A4, A5, T>(f: (arg: A, arg2: A2, arg3: A3, arg4: A4, arg5: A5, cb: (err: any, res: T) => void) => void, thisContext?: any): (arg: A, arg2: A2, arg3: A3, arg4: A4, arg5: A5) => Promise<T>;
+}