0.32.1 Upgrade package deps

GrandlineX · May 28, 2024 · 97d08df · 97d08df
1 parent 1ac779c
commit 97d08df
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 48 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -36,6 +36,7 @@
     "class-methods-use-this": "warn",
     "linebreak-style": "off",
     "no-restricted-properties": "warn",
+    "@typescript-eslint/no-explicit-any": "warn",
     "import/extensions": [
       "warn",
       "ignorePackages",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grandlinex/bundle-sqlight",
-  "version": "0.32.0",
+  "version": "0.32.1",
   "description": "",
   "type": "module",
   "exports": {
@@ -46,31 +46,31 @@
   "license": "BSD-3-Clause",
   "dependencies": {
     "@grandlinex/core": "0.32.0",
-    "better-sqlite3": "8.2.0",
-    "@types/better-sqlite3": "7.6.3"
+    "better-sqlite3": "10.0.0",
+    "@types/better-sqlite3": "7.6.10"
   },
   "devDependencies": {
-    "@types/jest": "29.5.0",
-    "@types/node": "18.15.11",
-    "@typescript-eslint/eslint-plugin": "5.57.1",
-    "@typescript-eslint/parser": "5.57.1",
+    "@types/jest": "29.5.12",
+    "@types/node": "20.12.12",
+    "@typescript-eslint/eslint-plugin": "7.11.0",
+    "@typescript-eslint/parser": "7.11.0",
     "cross-env": "7.0.3",
-    "eslint": "8.37.0",
+    "eslint": "8.57.0",
     "eslint-config-airbnb": "19.0.4",
-    "eslint-config-airbnb-typescript": "17.0.0",
-    "eslint-config-prettier": "8.8.0",
-    "eslint-plugin-import": "2.27.5",
-    "eslint-plugin-jest": "27.2.1",
-    "eslint-plugin-jsx-a11y": "6.7.1",
-    "eslint-plugin-prettier": "4.2.1",
-    "jest": "29.5.0",
-    "jest-junit": "15.0.0",
-    "prettier": "2.8.7",
-    "ts-jest": "29.1.0",
-    "ts-loader": "9.4.2",
-    "ts-node": "10.9.1",
-    "typedoc": "0.23.28",
-    "typescript": "5.0.3"
+    "eslint-config-airbnb-typescript": "18.0.0",
+    "eslint-config-prettier": "9.1.0",
+    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-jest": "28.5.0",
+    "eslint-plugin-jsx-a11y": "6.8.0",
+    "eslint-plugin-prettier": "5.1.3",
+    "jest": "29.7.0",
+    "jest-junit": "16.0.0",
+    "prettier": "3.2.5",
+    "ts-jest": "29.1.4",
+    "ts-loader": "9.5.1",
+    "ts-node": "10.9.2",
+    "typedoc": "0.25.13",
+    "typescript": "5.4.5"
   },
   "repository": {
     "type": "git",

diff --git a/src/class/SQLCon.ts b/src/class/SQLCon.ts
@@ -32,7 +32,7 @@ export default class SQLCon<
     T extends IDataBase<any, any> | null = any,
     P extends ICoreClient | null = any,
     C extends ICoreCache | null = any,
-    X extends ICorePresenter<any> | null = any
+    X extends ICorePresenter<any> | null = any,
   >
   extends CoreDBCon<DbType, RunResult, K, T, P, C, X>
   implements IDataBase<DbType, RunResult, K, T, P, C, X>
@@ -43,7 +43,7 @@ export default class SQLCon<
 
   constructor(
     module: ICoreKernelModule<any, any, any, any, any>,
-    dbversion: string
+    dbversion: string,
   ) {
     super(dbversion, 'main', module);
     const store = module.getKernel().getConfigStore();
@@ -58,12 +58,12 @@ export default class SQLCon<
 
   async createEntity<E extends CoreEntity>(
     config: EntityConfig<E>,
-    entity: EProperties<E>
+    entity: EProperties<E>,
   ): Promise<E> {
     const [keys, values, params] = objToTable(entity, config);
     const query: RawQuery = {
       exec: `INSERT INTO ${this.schemaName}.${config.className}(${keys.join(
-        ', '
+        ', ',
       )})
                    VALUES (${values.join(', ')})`,
       param: params,
@@ -78,7 +78,7 @@ export default class SQLCon<
   async updateEntity<E extends CoreEntity>(
     config: EntityConfig<E>,
     e_id: string,
-    entity: EUpDateProperties<E>
+    entity: EUpDateProperties<E>,
   ): Promise<boolean> {
     const [, values, params] = objToTable(entity, config, true);
     const result = await this.execScripts([
@@ -95,12 +95,12 @@ export default class SQLCon<
 
   async getEntityById<E extends CoreEntity>(
     config: EntityConfig<E>,
-    id: string
+    id: string,
   ): Promise<E | null> {
     const query = this.db?.prepare(
       `SELECT *
              FROM ${this.schemaName}.${config.className}
-             WHERE e_id = ?;`
+             WHERE e_id = ?;`,
     );
 
     const res = query?.get([id]);
@@ -112,7 +112,7 @@ export default class SQLCon<
 
   async findEntity<E extends CoreEntity>(
     config: EntityConfig<E>,
-    search: { [D in keyof E]?: E[D] | undefined }
+    search: { [D in keyof E]?: E[D] | undefined },
   ): Promise<E | null> {
     let searchQ = '';
     const param: any[] = [];
@@ -121,7 +121,7 @@ export default class SQLCon<
 
     const query = this.db?.prepare(
       `SELECT *
-             FROM ${this.schemaName}.${config.className} ${searchQ};`
+             FROM ${this.schemaName}.${config.className} ${searchQ};`,
     );
 
     const res = query?.get(param);
@@ -135,13 +135,13 @@ export default class SQLCon<
     const query = this.db?.prepare(
       `DELETE
              FROM ${this.schemaName}.${className}
-             WHERE e_id = ?;`
+             WHERE e_id = ?;`,
     );
     return query?.run([id]).changes === 1;
   }
 
   async getEntityList<E extends CoreEntity>(
-    q: QueryInterface<E>
+    q: QueryInterface<E>,
   ): Promise<E[]> {
     const { limit, search, config, order, offset } = q;
     if (limit === 0) {
@@ -167,7 +167,7 @@ export default class SQLCon<
              FROM ${this.schemaName}.${config.className} 
              ${searchQ} 
              ${orderByQ} 
-             ${range};`
+             ${range};`,
     );
 
     const res = query?.all(param);
@@ -179,7 +179,7 @@ export default class SQLCon<
 
   async initEntity<E extends CoreEntity>(
     className: string,
-    entity: E
+    entity: E,
   ): Promise<boolean> {
     await this.execScripts([
       {
@@ -257,9 +257,9 @@ export default class SQLCon<
     try {
       const query = this.db.prepare(
         `SELECT *
-                 FROM ${this.schemaName}.config;`
+                 FROM ${this.schemaName}.config;`,
       );
-      const result = query.all();
+      const result = query.all() as any[];
       const version = result.find((el) => {
         return el.c_key === 'dbversion';
       });
@@ -297,9 +297,9 @@ export default class SQLCon<
     const query = this.db?.prepare(
       `SELECT *
              FROM ${this.schemaName}.config
-             WHERE c_key = '${key}'`
+             WHERE c_key = '${key}'`,
     );
-    const exist = query?.get();
+    const exist = query?.get() as any;
     return !!exist && exist.c_key !== undefined && exist.c_value !== undefined;
   }
 
@@ -313,7 +313,7 @@ export default class SQLCon<
             c_key,
             c_value
             )
-            VALUES ('${key}', '${value}');`
+            VALUES ('${key}', '${value}');`,
     );
     if (query === undefined) {
       return false;
@@ -326,9 +326,9 @@ export default class SQLCon<
     const query = this.db?.prepare(
       `SELECT *
              FROM ${this.schemaName}.config
-             WHERE c_key = '${key}'`
+             WHERE c_key = '${key}'`,
     );
-    return query?.get();
+    return query?.get() as any;
   }
 
   async execScripts(list: RawQuery[]): Promise<RunResult[]> {
@@ -345,6 +345,7 @@ export default class SQLCon<
   }
 
   async disconnect(): Promise<boolean> {
+    this.db?.close();
     return true;
   }
 }
diff --git a/src/util/buildSearchQ.ts b/src/util/buildSearchQ.ts
@@ -5,7 +5,7 @@ export default function buildSearchQ<E>(
   config: EntityConfig<E>,
   search: { [P in keyof E]?: E[P] },
   param: any[],
-  searchQ: string
+  searchQ: string,
 ) {
   let temp = searchQ;
   const keys: (keyof E)[] = Object.keys(search) as (keyof E)[];

diff --git a/src/util/converter.ts b/src/util/converter.ts
@@ -9,7 +9,7 @@ export function convertSpecialFields<E>(
   meta: ColumnProps,
   clone: any,
   key: keyof E,
-  params: any[]
+  params: any[],
 ) {
   switch (meta.dataType) {
     case 'date':
@@ -34,7 +34,7 @@ export function convertSpecialFields<E>(
 export function objToTable<E extends CoreEntity>(
   entity: E | EUpDateProperties<E>,
   config: EntityConfig<E>,
-  update?: boolean
+  update?: boolean,
 ): [(keyof E)[], string[], unknown[]] {
   const clone: any = entity;
   const keysOriginal = Object.keys(entity) as (keyof E)[];
@@ -68,7 +68,7 @@ export function objToTable<E extends CoreEntity>(
 
 export function rowToObj<E extends CoreEntity>(
   config: EntityConfig<E>,
-  row: any
+  row: any,
 ): E {
   const clone: any = row;
   config.meta.forEach((value, key) => {
@@ -88,7 +88,7 @@ export function rowToObj<E extends CoreEntity>(
 
 export function tableToObj<E extends CoreEntity>(
   config: EntityConfig<E>,
-  table: any[]
+  table: any[],
 ): E[] {
   return table.map((row) => {
     return rowToObj(config, row);

diff --git a/src/util/mappingWithDataType.ts b/src/util/mappingWithDataType.ts
@@ -4,7 +4,7 @@ import resolveDBType from './resolveDBType.js';
 export default function mappingWithDataType<E extends CoreEntity>(
   meta: ColumnProps,
   out: string[],
-  key: keyof E
+  key: keyof E,
 ): void {
   if (!meta.dataType) {
     throw new Error('DataType not set');