refactor: increasing NodeNext compatibility

wellwelwel · wellwelwel · commit 75a7c4949595 · 2023-06-19T05:29:17.000-03:00
diff --git a/.eslintrc b/.eslintrc
@@ -45,7 +45,14 @@
       "plugins": ["@typescript-eslint"],
       "rules": {
         "@typescript-eslint/no-empty-interface": "off",
-        "@typescript-eslint/no-explicit-any": "off"
+        "@typescript-eslint/no-explicit-any": "off",
+        "no-restricted-syntax": [
+          "error",
+          {
+            "selector": "ImportDeclaration[source.value=/^\\./][source.value!=/\\.(js)$/]",
+            "message": "Local imports must have the explicit extension"
+          }
+        ]
       }
     },
     {
diff --git a/index.d.ts b/index.d.ts
@@ -1,11 +1,11 @@
-import * as mysql from './typings/mysql';
+import * as mysql from './typings/mysql/index.js';
 import {
   Connection as PromiseConnection,
   Pool as PromisePool,
   PoolConnection as PromisePoolConnection,
-} from './promise';
+} from './promise.js';
 
-export * from './typings/mysql';
+export * from './typings/mysql/index.js';
 
 export interface Connection extends mysql.Connection {
   execute<
diff --git a/promise.d.ts b/promise.d.ts
@@ -9,9 +9,9 @@ import {
   ConnectionOptions,
   PoolOptions,
   Pool as CorePool,
-} from './index';
+} from './index.js';
 
-export * from './index';
+export * from './index.js';
 
 export interface PreparedStatementInfo {
   close(): Promise<void>;
diff --git a/test/tsc-build/index.ts b/test/tsc-build/index.ts
@@ -11,7 +11,7 @@
  * For mysql/promise build tests:   './promise/...'
  */
 
-import mysql from '../../index';
-import mysqlp from '../../promise';
+import mysql from '../../index.js';
+import mysqlp from '../../promise.js';
 
 export { mysql, mysqlp };
diff --git a/test/tsc-build/mysql/baseConnection.ts b/test/tsc-build/mysql/baseConnection.ts
@@ -1,4 +1,4 @@
-import { mysql } from '../index';
+import { mysql } from '../index.js';
 
 export const access: mysql.ConnectionOptions = {
   host: '',
diff --git a/test/tsc-build/mysql/createConnection/callbacks/execute.ts b/test/tsc-build/mysql/createConnection/callbacks/execute.ts
@@ -1,5 +1,5 @@
-import { mysql } from '../../../index';
-import { access, sql, sqlPS, values } from '../../baseConnection';
+import { mysql } from '../../../index.js';
+import { access, sql, sqlPS, values } from '../../baseConnection.js';
 
 {
   const db = mysql.createConnection(access);
diff --git a/test/tsc-build/mysql/createConnection/callbacks/query.ts b/test/tsc-build/mysql/createConnection/callbacks/query.ts
@@ -1,5 +1,5 @@
-import { mysql } from '../../../index';
-import { access, sql, sqlPS, values } from '../../baseConnection';
+import { mysql } from '../../../index.js';
+import { access, sql, sqlPS, values } from '../../baseConnection.js';
 
 {
   const db = mysql.createConnection(access);
diff --git a/test/tsc-build/mysql/createConnection/promise/execute.ts b/test/tsc-build/mysql/createConnection/promise/execute.ts
@@ -1,5 +1,5 @@
-import { mysql } from '../../../index';
-import { access, sql, sqlPS, values } from '../../baseConnection';
+import { mysql } from '../../../index.js';
+import { access, sql, sqlPS, values } from '../../baseConnection.js';
 
 (async () => {
   const db = mysql.createConnection(access).promise();
diff --git a/test/tsc-build/mysql/createConnection/promise/query.ts b/test/tsc-build/mysql/createConnection/promise/query.ts
@@ -1,5 +1,5 @@
-import { mysql } from '../../../index';
-import { access, sql, sqlPS, values } from '../../baseConnection';
+import { mysql } from '../../../index.js';
+import { access, sql, sqlPS, values } from '../../baseConnection.js';
 
 (async () => {
   const db = mysql.createConnection(access).promise();
diff --git a/test/tsc-build/mysql/createPool/callbacks/connection.ts b/test/tsc-build/mysql/createPool/callbacks/connection.ts
@@ -1,5 +1,5 @@
-import { mysql } from '../../../index';
-import { access } from '../../baseConnection';
+import { mysql } from '../../../index.js';
+import { access } from '../../baseConnection.js';
 
 const pool = mysql.createPool(access);
 
diff --git a/test/tsc-build/mysql/createPool/callbacks/execute.ts b/test/tsc-build/mysql/createPool/callbacks/execute.ts
@@ -1,5 +1,5 @@
-import { mysql } from '../../../index';
-import { access, sql, sqlPS, values } from '../../baseConnection';
+import { mysql } from '../../../index.js';
+import { access, sql, sqlPS, values } from '../../baseConnection.js';
 
 {
   const db = mysql.createPool(access);
diff --git a/test/tsc-build/mysql/createPool/callbacks/getConnection.ts b/test/tsc-build/mysql/createPool/callbacks/getConnection.ts
@@ -1,5 +1,5 @@
-import { mysql } from '../../../index';
-import { access } from '../../baseConnection';
+import { mysql } from '../../../index.js';
+import { access } from '../../baseConnection.js';
 
 const pool = mysql.createPool(access);
 
diff --git a/test/tsc-build/mysql/createPool/callbacks/query.ts b/test/tsc-build/mysql/createPool/callbacks/query.ts
@@ -1,5 +1,5 @@
-import { mysql } from '../../../index';
-import { access, sql, sqlPS, values } from '../../baseConnection';
+import { mysql } from '../../../index.js';
+import { access, sql, sqlPS, values } from '../../baseConnection.js';
 
 {
   const db = mysql.createPool(access);
diff --git a/test/tsc-build/mysql/createPool/callbacks/release.ts b/test/tsc-build/mysql/createPool/callbacks/release.ts
@@ -1,5 +1,5 @@
-import { mysql } from '../../../index';
-import { access } from '../../baseConnection';
+import { mysql } from '../../../index.js';
+import { access } from '../../baseConnection.js';
 
 const pool = mysql.createPool(access);
 
diff --git a/test/tsc-build/mysql/createPool/callbacks/releaseConnection.ts b/test/tsc-build/mysql/createPool/callbacks/releaseConnection.ts
@@ -1,5 +1,5 @@
-import { mysql } from '../../../index';
-import { access } from '../../baseConnection';
+import { mysql } from '../../../index.js';
+import { access } from '../../baseConnection.js';
 
 const pool = mysql.createPool(access);
 
diff --git a/test/tsc-build/mysql/createPool/promise/connection.ts b/test/tsc-build/mysql/createPool/promise/connection.ts
@@ -1,5 +1,5 @@
-import { mysql } from '../../../index';
-import { access } from '../../baseConnection';
+import { mysql } from '../../../index.js';
+import { access } from '../../baseConnection.js';
 
 (async () => {
   const pool = mysql.createPool(access);
diff --git a/test/tsc-build/mysql/createPool/promise/execute.ts b/test/tsc-build/mysql/createPool/promise/execute.ts
@@ -1,5 +1,5 @@
-import { mysql } from '../../../index';
-import { access, sql, sqlPS, values } from '../../baseConnection';
+import { mysql } from '../../../index.js';
+import { access, sql, sqlPS, values } from '../../baseConnection.js';
 
 (async () => {
   const db = mysql.createPool(access).promise();
diff --git a/test/tsc-build/mysql/createPool/promise/getConnection.ts b/test/tsc-build/mysql/createPool/promise/getConnection.ts
@@ -1,5 +1,5 @@
-import { mysql } from '../../../index';
-import { access } from '../../baseConnection';
+import { mysql } from '../../../index.js';
+import { access } from '../../baseConnection.js';
 
 (async () => {
   const pool = mysql.createPool(access);
diff --git a/test/tsc-build/mysql/createPool/promise/promise.ts b/test/tsc-build/mysql/createPool/promise/promise.ts
@@ -1,5 +1,5 @@
-import { mysql, mysqlp } from '../../../index';
-import { access } from '../../baseConnection';
+import { mysql, mysqlp } from '../../../index.js';
+import { access } from '../../baseConnection.js';
 
 (async () => {
   let pool: mysql.Pool | null = null;
diff --git a/test/tsc-build/mysql/createPool/promise/query.ts b/test/tsc-build/mysql/createPool/promise/query.ts
@@ -1,5 +1,5 @@
-import { mysql } from '../../../index';
-import { access, sql, sqlPS, values } from '../../baseConnection';
+import { mysql } from '../../../index.js';
+import { access, sql, sqlPS, values } from '../../baseConnection.js';
 
 (async () => {
   const db = mysql.createPool(access).promise();
diff --git a/test/tsc-build/mysql/createPool/promise/release.ts b/test/tsc-build/mysql/createPool/promise/release.ts
@@ -1,5 +1,5 @@
-import { mysql } from '../../../index';
-import { access } from '../../baseConnection';
+import { mysql } from '../../../index.js';
+import { access } from '../../baseConnection.js';
 
 (async () => {
   const pool = mysql.createPool(access);
diff --git a/test/tsc-build/mysql/createPool/promise/releaseConnection.ts b/test/tsc-build/mysql/createPool/promise/releaseConnection.ts
@@ -1,5 +1,5 @@
-import { mysql } from '../../../index';
-import { access } from '../../baseConnection';
+import { mysql } from '../../../index.js';
+import { access } from '../../baseConnection.js';
 
 (async () => {
   const pool = mysql.createPool(access);
diff --git a/test/tsc-build/promise/baseConnection.ts b/test/tsc-build/promise/baseConnection.ts
@@ -1,4 +1,4 @@
-import { mysqlp as mysql } from '../index';
+import { mysqlp as mysql } from '../index.js';
 
 export const access: mysql.ConnectionOptions = {
   host: '',
diff --git a/test/tsc-build/promise/createConnection/execute.ts b/test/tsc-build/promise/createConnection/execute.ts
@@ -1,5 +1,5 @@
-import { mysqlp as mysql } from '../../index';
-import { access, sql, sqlPS, values } from '../baseConnection';
+import { mysqlp as mysql } from '../../index.js';
+import { access, sql, sqlPS, values } from '../baseConnection.js';
 
 (async () => {
   const db = await mysql.createConnection(access);
diff --git a/test/tsc-build/promise/createConnection/query.ts b/test/tsc-build/promise/createConnection/query.ts
@@ -1,5 +1,5 @@
-import { mysqlp as mysql } from '../../index';
-import { access, sql, sqlPS, values } from '../baseConnection';
+import { mysqlp as mysql } from '../../index.js';
+import { access, sql, sqlPS, values } from '../baseConnection.js';
 
 (async () => {
   const db = await mysql.createConnection(access);
diff --git a/test/tsc-build/promise/createPool/connection.ts b/test/tsc-build/promise/createPool/connection.ts
@@ -1,5 +1,5 @@
-import { mysqlp as mysql } from '../../index';
-import { access } from '../baseConnection';
+import { mysqlp as mysql } from '../../index.js';
+import { access } from '../baseConnection.js';
 
 (async () => {
   const pool = mysql.createPool(access);
diff --git a/test/tsc-build/promise/createPool/execute.ts b/test/tsc-build/promise/createPool/execute.ts
@@ -1,5 +1,5 @@
-import { mysqlp as mysql } from '../../index';
-import { access, sql, sqlPS, values } from '../baseConnection';
+import { mysqlp as mysql } from '../../index.js';
+import { access, sql, sqlPS, values } from '../baseConnection.js';
 
 (async () => {
   const db = mysql.createPool(access);
diff --git a/test/tsc-build/promise/createPool/getConnection.ts b/test/tsc-build/promise/createPool/getConnection.ts
@@ -1,5 +1,5 @@
-import { mysqlp as mysql } from '../../index';
-import { access } from '../baseConnection';
+import { mysqlp as mysql } from '../../index.js';
+import { access } from '../baseConnection.js';
 
 (async () => {
   const pool = mysql.createPool(access);
diff --git a/test/tsc-build/promise/createPool/query.ts b/test/tsc-build/promise/createPool/query.ts
@@ -1,5 +1,5 @@
-import { mysqlp as mysql } from '../../index';
-import { access, sql, sqlPS, values } from '../baseConnection';
+import { mysqlp as mysql } from '../../index.js';
+import { access, sql, sqlPS, values } from '../baseConnection.js';
 
 (async () => {
   const db = mysql.createPool(access);
diff --git a/test/tsc-build/promise/createPool/release.ts b/test/tsc-build/promise/createPool/release.ts
@@ -1,5 +1,5 @@
-import { mysqlp as mysql } from '../../index';
-import { access } from '../baseConnection';
+import { mysqlp as mysql } from '../../index.js';
+import { access } from '../baseConnection.js';
 
 (async () => {
   const pool = mysql.createPool(access);
diff --git a/test/tsc-build/promise/createPool/releaseConnection.ts b/test/tsc-build/promise/createPool/releaseConnection.ts
@@ -1,5 +1,5 @@
-import { mysqlp as mysql } from '../../index';
-import { access } from '../baseConnection';
+import { mysqlp as mysql } from '../../index.js';
+import { access } from '../baseConnection.js';
 
 (async () => {
   const pool = mysql.createPool(access);
diff --git a/typings/mysql/index.d.ts b/typings/mysql/index.d.ts
@@ -1,26 +1,26 @@
 import { RsaPublicKey, RsaPrivateKey, KeyLike } from 'crypto';
-import { Pool as BasePool, PoolOptions } from './lib/Pool';
+import { Pool as BasePool, PoolOptions } from './lib/Pool.js';
 import {
   Connection as BaseConnection,
   ConnectionOptions,
   SslOptions,
-} from './lib/Connection';
+} from './lib/Connection.js';
 import {
   Query as BaseQuery,
   QueryOptions,
   QueryError,
-} from './lib/protocol/sequences/Query';
+} from './lib/protocol/sequences/Query.js';
 import {
   PoolCluster as BasePoolCluster,
   PoolClusterOptions,
-} from './lib/PoolCluster';
-import { PoolConnection as BasePoolConnection } from './lib/PoolConnection';
+} from './lib/PoolCluster.js';
+import { PoolConnection as BasePoolConnection } from './lib/PoolConnection.js';
 import {
   Prepare as BasePrepare,
   PrepareStatementInfo,
-} from './lib/protocol/sequences/Prepare';
-import { Server } from './lib/Server';
-import { Connection as PromiseConnection } from '../../promise';
+} from './lib/protocol/sequences/Prepare.js';
+import { Server } from './lib/Server.js';
+import { Connection as PromiseConnection } from '../../promise.js';
 
 export {
   ConnectionOptions,
@@ -32,7 +32,7 @@ export {
   PrepareStatementInfo,
 };
 
-export * from './lib/protocol/packets/index';
+export * from './lib/protocol/packets/index.js';
 
 // Expose class interfaces
 export interface Connection extends BaseConnection {
diff --git a/typings/mysql/lib/Connection.d.ts b/typings/mysql/lib/Connection.d.ts
@@ -3,14 +3,14 @@
 // connection options relevant for multifactor authentication.
 // Modifications copyright (c) 2021, Oracle and/or its affiliates.
 
-import { Query, QueryError, QueryOptions } from './protocol/sequences/Query';
+import { EventEmitter } from 'events';
+import { Query, QueryError, QueryOptions } from './protocol/sequences/Query.js';
 import {
   OkPacket,
   FieldPacket,
   RowDataPacket,
   ResultSetHeader,
-} from './protocol/packets/index';
-import { EventEmitter } from 'events';
+} from './protocol/packets/index.js';
 
 export interface SslOptions {
   /**
diff --git a/typings/mysql/lib/Pool.d.ts b/typings/mysql/lib/Pool.d.ts
@@ -1,14 +1,14 @@
-import { Query, QueryError, QueryOptions } from './protocol/sequences/Query';
+import { EventEmitter } from 'events';
+import { Query, QueryError, QueryOptions } from './protocol/sequences/Query.js';
 import {
   OkPacket,
   RowDataPacket,
   FieldPacket,
   ResultSetHeader,
-} from './protocol/packets/index';
-import { ConnectionOptions } from './Connection';
-import { PoolConnection } from './PoolConnection';
-import { EventEmitter } from 'events';
-import { Pool as PromisePool } from '../../../promise';
+} from './protocol/packets/index.js';
+import { ConnectionOptions } from './Connection.js';
+import { PoolConnection } from './PoolConnection.js';
+import { Pool as PromisePool } from '../../../promise.js';
 
 export interface PoolOptions extends ConnectionOptions {
   /**
diff --git a/typings/mysql/lib/PoolCluster.d.ts b/typings/mysql/lib/PoolCluster.d.ts
@@ -1,6 +1,6 @@
-import { PoolConnection } from './PoolConnection';
 import { EventEmitter } from 'events';
-import { PoolOptions } from './Pool';
+import { PoolConnection } from './PoolConnection.js';
+import { PoolOptions } from './Pool.js';
 
 export interface PoolClusterOptions {
   /**
diff --git a/typings/mysql/lib/PoolConnection.d.ts b/typings/mysql/lib/PoolConnection.d.ts
@@ -1,4 +1,4 @@
-import { Connection } from './Connection';
+import { Connection } from './Connection.js';
 
 declare class PoolConnection extends Connection {
   connection: Connection;
diff --git a/typings/mysql/lib/Server.d.ts b/typings/mysql/lib/Server.d.ts
@@ -1,5 +1,5 @@
 import { EventEmitter } from 'events';
-import { Connection } from './Connection';
+import { Connection } from './Connection.js';
 
 declare class Server extends EventEmitter {
   connections: Array<Connection>;
diff --git a/typings/mysql/lib/protocol/packets/index.d.ts b/typings/mysql/lib/protocol/packets/index.d.ts
@@ -1,10 +1,10 @@
-import { OkPacket } from './OkPacket';
-import { RowDataPacket } from './RowDataPacket';
-import { FieldPacket } from './FieldPacket';
-import { Field } from './Field';
-import { ResultSetHeader } from './ResultSetHeader';
-import { OkPacketParams } from './params/OkPacketParams';
-import { ErrorPacketParams } from './params/ErrorPacketParams';
+import { OkPacket } from './OkPacket.js';
+import { RowDataPacket } from './RowDataPacket.js';
+import { FieldPacket } from './FieldPacket.js';
+import { Field } from './Field.js';
+import { ResultSetHeader } from './ResultSetHeader.js';
+import { OkPacketParams } from './params/OkPacketParams.js';
+import { ErrorPacketParams } from './params/ErrorPacketParams.js';
 
 export {
   OkPacket,
diff --git a/typings/mysql/lib/protocol/sequences/Prepare.d.ts b/typings/mysql/lib/protocol/sequences/Prepare.d.ts
diff --git a/typings/mysql/lib/protocol/sequences/Query.d.ts b/typings/mysql/lib/protocol/sequences/Query.d.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { mysql } from '../index';`
	`1`	`+import { mysql } from '../index.js';`
`2`	`2`
`3`	`3`	`export const access: mysql.ConnectionOptions = {`
`4`	`4`	`host: '',`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-import { mysql } from '../../../index';`
`2`		`-import { access, sql, sqlPS, values } from '../../baseConnection';`
	`1`	`+import { mysql } from '../../../index.js';`
	`2`	`+import { access, sql, sqlPS, values } from '../../baseConnection.js';`
`3`	`3`
`4`	`4`	`{`
`5`	`5`	`const db = mysql.createConnection(access);`