Merge pull request #55 from nexys-system/nodenext

Nodenext

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nexys/fetchr",
-  "version": "0.10.5",
+  "version": "0.11.4",
   "license": "AGPL-3.0-or-later",
   "main": "dist/index.js",
   "files": [
@@ -20,7 +20,7 @@
     "@types/koa-mount": "^4.0.0",
     "@types/koa-router": "^7.4.1",
     "@types/node": "^14.14.37",
-    "dotenv": "^8.2.0",
+    "dotenv": "^16.3.1",
     "graphql": "^16.5.0",
     "graphql-fields": "^2.0.3",
     "jest": "^26.6.3",
@@ -38,7 +38,7 @@
     "@types/pg": "^8.10.2",
     "@types/sqlstring": "^2.3.0",
     "crc-32": "^1.2.2",
-    "mysql2": "^2.3.3",
+    "mysql2": "^3.6.5",
     "pg": "^8.11.3",
     "sqlstring": "^2.3.2"
   },

src/lib/database/connection.ts

@@ -88,7 +88,7 @@ export class SQL {
               name: "OkPacket",
             },
             insertId: r.oid,
-            affectedRows: r.rowCount,
+            affectedRows: r.rowCount || 0,
             fieldCount: 0,
             changedRows: 0,
             serverStatus: 0,

src/lib/database/type.ts

@@ -1,11 +1,10 @@
 import {
   Pool as MPool,
-  OkPacket,
   ResultSetHeader,
   RowDataPacket,
   FieldPacket,
+  PoolOptions,
 } from "mysql2/promise";
-import { PoolOptions } from "mysql2/typings/mysql";
 
 export interface Database {
   host: string;
@@ -27,7 +26,7 @@ export interface DatabaseOut {
 export type Pool = MPool;
 
 export type Response = [
-  OkPacket | ResultSetHeader | RowDataPacket[] | RowDataPacket[][] | OkPacket[],
+  ResultSetHeader | RowDataPacket[] | RowDataPacket[][],
   FieldPacket[]
 ];
 

src/lib/query-service/abstract-service.ts

@@ -40,4 +40,6 @@ abstract class QueryService {
   abstract delete(a: any, b: any): Promise<TQ.Type.MutateResponseDelete>;
 }
 
+export { QueryService };
+
 export default QueryService;

tsconfig.json

@@ -4,17 +4,17 @@
 
     /* Basic Options */
     // "incremental": true,                         /* Enable incremental compilation */
-    "target": "es2019",                                /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
-    "module": "commonjs",                           /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
+    "target": "es2019" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
+    "module": "NodeNext" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
     // "lib": [],                                   /* Specify library files to be included in the compilation. */
-     "allowJs": false,                             /* Allow javascript files to be compiled. */
+    "allowJs": false /* Allow javascript files to be compiled. */,
     // "checkJs": true,                             /* Report errors in .js files. */
     // "jsx": "preserve",                           /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
     // "declaration": true,                         /* Generates corresponding '.d.ts' file. */
     // "declarationMap": true,                      /* Generates a sourcemap for each corresponding '.d.ts' file. */
     // "sourceMap": true,                           /* Generates corresponding '.map' file. */
     // "outFile": "./",                             /* Concatenate and emit output to single file. */
-     "outDir": "./dist",                              /* Redirect output structure to the directory. */
+    "outDir": "./dist" /* Redirect output structure to the directory. */,
     // "rootDir": "./",                             /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
     // "composite": true,                           /* Enable project compilation */
     // "tsBuildInfoFile": "./",                     /* Specify file to store incremental compilation information */
@@ -25,7 +25,7 @@
     // "isolatedModules": true,                     /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
 
     /* Strict Type-Checking Options */
-    "strict": true,                                 /* Enable all strict type-checking options. */
+    "strict": true /* Enable all strict type-checking options. */,
     // "noImplicitAny": true,                       /* Raise error on expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,                    /* Enable strict null checks. */
     // "strictFunctionTypes": true,                 /* Enable strict checking of function types. */
@@ -35,22 +35,22 @@
     // "alwaysStrict": true,                        /* Parse in strict mode and emit "use strict" for each source file. */
 
     /* Additional Checks */
-    "noUnusedLocals": true,                      /* Report errors on unused locals. */
-    "noUnusedParameters": true,                  /* Report errors on unused parameters. */
+    "noUnusedLocals": true /* Report errors on unused locals. */,
+    "noUnusedParameters": true /* Report errors on unused parameters. */,
     // "noImplicitReturns": true,                   /* Report error when not all code paths in function return a value. */
     // "noFallthroughCasesInSwitch": true,          /* Report errors for fallthrough cases in switch statement. */
     // "noUncheckedIndexedAccess": true,            /* Include 'undefined' in index signature results */
     // "noPropertyAccessFromIndexSignature": true,  /* Require undeclared properties from index signatures to use element accesses. */
 
     /* Module Resolution Options */
-    // "moduleResolution": "node",                  /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    "moduleResolution": "NodeNext" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
     // "baseUrl": "./",                             /* Base directory to resolve non-absolute module names. */
     // "paths": {},                                 /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
     // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */
     // "typeRoots": [],                             /* List of folders to include type definitions from. */
     //"types": ["node"],                                 /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "esModuleInterop": true,                        /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
     // "preserveSymlinks": true,                    /* Do not resolve the real path of symlinks. */
     // "allowUmdGlobalAccess": true,                /* Allow accessing UMD globals from modules. */
 
@@ -65,7 +65,7 @@
     // "emitDecoratorMetadata": true,               /* Enables experimental support for emitting type metadata for decorators. */
 
     /* Advanced Options */
-    "skipLibCheck": true,                           /* Skip type checking of declaration files. */
-    "forceConsistentCasingInFileNames": true        /* Disallow inconsistently-cased references to the same file. */
+    "skipLibCheck": true /* Skip type checking of declaration files. */,
+    "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
   }
 }