From f489a978e2c4ea41b94eecc68930ca94f1acbfda Mon Sep 17 00:00:00 2001
From: Scraps <123112608+ScrapsPrograms@users.noreply.github.com>
Date: Wed, 11 Sep 2024 22:37:15 +0200
Subject: [PATCH] fix: Export types directly from sqlstring dependency

Signed-off-by: Scraps <123112608+ScrapsPrograms@users.noreply.github.com>
---
 package-lock.json        | 14 ++++++++++++++
 package.json             |  1 +
 typings/mysql/index.d.ts | 25 ++-----------------------
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ddd049ce4e..8a1d27b735 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,6 +21,7 @@
       },
       "devDependencies": {
         "@types/node": "^22.0.0",
+        "@types/sqlstring": "^2.3.2",
         "@typescript-eslint/eslint-plugin": "^5.42.1",
         "@typescript-eslint/parser": "^5.42.1",
         "assert-diff": "^3.0.2",
@@ -366,6 +367,13 @@
       "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==",
       "dev": true
     },
+    "node_modules/@types/sqlstring": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@types/sqlstring/-/sqlstring-2.3.2.tgz",
+      "integrity": "sha512-lVRe4Iz9UNgiHelKVo8QlC8fb5nfY8+p+jNQNE+UVsuuVlQnWhyWmQ/wF5pE8Ys6TdjfVpqTG9O9i2vi6E0+Sg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/unist": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz",
@@ -3692,6 +3700,12 @@
       "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==",
       "dev": true
     },
+    "@types/sqlstring": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@types/sqlstring/-/sqlstring-2.3.2.tgz",
+      "integrity": "sha512-lVRe4Iz9UNgiHelKVo8QlC8fb5nfY8+p+jNQNE+UVsuuVlQnWhyWmQ/wF5pE8Ys6TdjfVpqTG9O9i2vi6E0+Sg==",
+      "dev": true
+    },
     "@types/unist": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz",
diff --git a/package.json b/package.json
index af271ff824..68e198879e 100644
--- a/package.json
+++ b/package.json
@@ -70,6 +70,7 @@
   },
   "devDependencies": {
     "@types/node": "^22.0.0",
+    "@types/sqlstring": "^2.3.2",
     "@typescript-eslint/eslint-plugin": "^5.42.1",
     "@typescript-eslint/parser": "^5.42.1",
     "assert-diff": "^3.0.2",
diff --git a/typings/mysql/index.d.ts b/typings/mysql/index.d.ts
index 7dafa9cbf3..52bfd6d63c 100644
--- a/typings/mysql/index.d.ts
+++ b/typings/mysql/index.d.ts
@@ -21,6 +21,8 @@ import {
 } from './lib/protocol/sequences/Prepare.js';
 import { Server } from './lib/Server.js';
 
+export type * from "sqlstring";
+
 export {
   ConnectionOptions,
   SslOptions,
@@ -53,29 +55,6 @@ export function createPool(config: PoolOptions): BasePool;
 
 export function createPoolCluster(config?: PoolClusterOptions): PoolCluster;
 
-export function escape(value: any): string;
-
-export function escapeId(value: any): string;
-
-export function format(sql: string): string;
-export function format(
-  sql: string,
-  values: any[],
-  stringifyObjects?: boolean,
-  timeZone?: string,
-): string;
-
-export function format(
-  sql: string,
-  values: any,
-  stringifyObjects?: boolean,
-  timeZone?: string,
-): string;
-
-export function raw(sql: string): {
-  toSqlString: () => string;
-};
-
 export interface ConnectionConfig extends ConnectionOptions {
   mergeFlags(defaultFlags: string[], userFlags: string[] | string): number;
   getDefaultFlags(options?: ConnectionOptions): string[];