@e-mc/db 0.10.1 → 0.10.3

package/LICENSE

@@ -1,11 +1,11 @@
-Copyright 2024 An Pham
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
+Copyright 2024 An Pham
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/README.md

@@ -1,217 +1,217 @@
-# @e-mc/db
-
-* NodeJS 16
-* ES2020
-
-## General Usage
-
-* [Read the Docs](https://e-mc.readthedocs.io)
-
-## Interface
-
-* [View Source](https://www.unpkg.com/@e-mc/types@0.10.1/lib/index.d.ts)
-
-```typescript
-import type { DbDataSource } from "./squared";
-
-import type { IHost } from "./index";
-import type { ClientDbConstructor, IClientDb } from "./core";
-import type { BatchQueryResult, DB_TYPE, ErrorQueryCallback, ExecuteBatchQueryOptions, ExecuteQueryOptions, HandleFailOptions, ProcessRowsOptions, QueryResult, SQL_COMMAND } from "./db";
-import type { AuthValue } from "./http";
-import type { DbCoerceSettings, DbModule, DbSourceOptions, PoolConfig } from "./settings";
-
-import type { SecureContextOptions } from "tls";
-
-interface IDb extends IClientDb<IHost, DbModule, DbDataSource, DbSourceOptions, DbCoerceSettings> {
-    setCredential(item: DbDataSource): Promise<void>;
-    getCredential(item: DbDataSource): Record<string | number | symbol, unknown>;
-    hasSource(source: string, ...type: number[]): boolean;
-    applyCommand(...items: DbDataSource[]): void;
-    executeQuery(item: V, callback: ErrorQueryCallback): Promise<QueryResult>;
-    executeQuery(item: DbDataSource, sessionKey: string): Promise<QueryResult>;
-    executeQuery(item: DbDataSource, options?: ExecuteQueryOptions | string): Promise<QueryResult>;
-    executeBatchQuery(batch: DbDataSource[], callback: ErrorQueryCallback, outResult?: BatchQueryResult): Promise<BatchQueryResult>;
-    executeBatchQuery(batch: DbDataSource[], sessionKey: string, outResult?: BatchQueryResult): Promise<BatchQueryResult>;
-    executeBatchQuery(batch: DbDataSource[], options?: ExecuteBatchQueryOptions | string, outResult?: BatchQueryResult): Promise<BatchQueryResult>;
-    processRows(batch: DbDataSource[], tasks: Promise<QueryResult | null>[], parallel: boolean): Promise<BatchQueryResult>;
-    processRows(batch: DbDataSource[], tasks: Promise<QueryResult | null>[], options?: ProcessRowsOptions, outResult?: BatchQueryResult): Promise<BatchQueryResult>;
-    handleFail(err: unknown, item: DbDataSource, options?: HandleFailOptions): boolean;
-    readTLSCert(value: unknown, cache?: boolean): string;
-    readTLSConfig(options: SecureContextOptions, cache?: boolean): void;
-    settingsOf(source: string, name: keyof Omit<DbSourceOptions, "coerce">): unknown;
-    settingsOf(source: string, name: "coerce", component: keyof DbCoerceSettings): unknown;
-    settingsKey(source: string, name: keyof Omit<DbSourceOptions, "coerce">): unknown;
-    settingsKey(source: string, name: "coerce", component: keyof DbCoerceSettings): unknown;
-    getPoolConfig(source: string, uuidKey?: string): Required<PoolConfig> | undefined;
-    get sourceType(): DB_TYPE;
-    get commandType(): SQL_COMMAND;
-}
-
-interface DbConstructor extends ClientDbConstructor<IHost> {
-    setPoolConfig(value: Record<string, PoolConfig>): void;
-    getPoolConfig(source: string): Required<PoolConfig> | undefined;
-    readonly prototype: IDb;
-    new(module?: DbModule, database?: DbDataSource[], ...args: unknown[]): IDb;
-}
-
-interface IDbSourceClient {
-    DB_SOURCE_NAME: string;
-    DB_SOURCE_CLIENT: boolean;
-    DB_SOURCE_TYPE: number;
-    setCredential(this: IDb, item: DbDataSource): Promise<void>;
-    executeQuery(this: IDb, item: DbDataSource, options?: ExecuteQueryOptions | string): Promise<QueryResult>;
-    executeBatchQuery(this: IDb, batch: DbDataSource[], options?: ExecuteBatchQueryOptions | string, outResult?: BatchQueryResult): Promise<BatchQueryResult>;
-    checkTimeout?(this: IDbSourceClient, value: number, limit?: number): Promise<number>;
-}
-
-interface IDbPool {
-    client: unknown;
-    lastAccessed: number;
-    success: number;
-    failed: number;
-    poolKey: string;
-    uuidKey: AuthValue | null;
-    add(item: DbDataSource, uuidKey?: string): this;
-    has(item: DbDataSource): boolean;
-    getConnection(credential?: unknown): Promise<unknown>;
-    remove(): void;
-    detach(force?: boolean): Promise<void>;
-    close(): Promise<void>;
-    isIdle(timeout: number): boolean;
-    isEmpty(): boolean;
-    set connected(value: boolean);
-    get persist(): boolean;
-    get closed(): boolean;
-    get closeable(): boolean;
-    set parent(value: Record<string, IDbPool>);
-}
-
-interface DbPoolConstructor {
-    CACHE_UNUSED: readonly string[];
-    asString(credential: unknown): string;
-    sanitize(credential: unknown): unknown;
-    removeUUIDKey(credential: unknown): unknown;
-    findKey(pools: Record<string, IDbPool>, uuidKey: unknown, poolKey: string | undefined, ...items: DbDataSource[]): Record<string, IDbPool> | null;
-    validateKey(pools: Record<string, IDbPool>, username: string, uuidKey: unknown): [string, Record<string, IDbPool> | null];
-    checkTimeout(pools: Record<string, IDbPool>, value: number, limit?: number): Promise<number>;
-    readonly prototype: IDbPool;
-    new(pool: unknown, poolKey: string, uuidKey?: AuthValue | null): IDbPool;
-}
-```
-
-## Settings
-
-```typescript
-import type { DbSourceOptions, PurgeComponent } from "./settings";
-
-interface DbModule {
-    // handler: "@e-mc/db";
-    mariadb?: DbStoredCredentials;
-    mongodb?: DbStoredCredentials;
-    mssql?: DbStoredCredentials;
-    mysql?: DbStoredCredentials;
-    oracle?: DbStoredCredentials;
-    postgres?: DbStoredCredentials;
-    redis?: DbStoredCredentials;
-    settings?: {
-        broadcast_id?: string | string[];
-        users?: Record<string, Record<string, unknown>>;
-        cache_dir?: string;
-        session_expires?: number;
-        user_key?: Record<string, DbSourceOptions>;
-        imports?: StringMap;
-        purge?: PurgeComponent;
-        mariadb?: DbSourceOptions;
-        mongodb?: DbSourceOptions;
-        mssql?: DbSourceOptions;
-        mysql?: DbSourceOptions;
-        oracle?: DbSourceOptions;
-        postgres?: DbSourceOptions;
-        redis?: DbSourceOptions;
-    };
-}
-
-type DbStoredCredentials = Record<string, Record<string, unknown>>;
-```
-
-### Example usage
-
-```javascript
-const Db = require("@e-mc/db"); // Using @pi-r/mongodb
-
-const instance = new Db({
-    mongodb: {
-        main: {
-            server: "localhost:27017",
-            auth: {
-                username: "**********",
-                password: "**********"
-            },
-            authMechanism: "SCRAM-SHA-1"
-        }
-    },
-    settings: {
-        mongodb: {
-            pool: {
-                max: 10,
-                idle: 60 * 1000,
-                queue_max: 4,
-                queue_idle: 30 * 1000,
-                timeout: 10 * 1000
-            },
-            cache: {
-                timeout: "1d",
-                when_empty: false
-            },
-            coerce: {
-                credential: false,
-                options: true
-            }
-        }
-    }
-});
-// instance.host = new Host();
-instance.init();
-
-const item = {
-    source: "mongodb",
-    credential: "main",
-    table: "demo",
-    name: "nodejs",
-    query: {
-        id: {
-            "$eq": "1"
-        }
-    },
-    willAbort: true
-};
-await instance.setCredential(item);
-
-const rows = await instance.executeQuery(item, (err, item) => {
-    if (err.code === "E11000") {
-        return true; // throw err;
-    }
-    return false; // return [];
-});
-
-const [rows1, rows2] = await instance.executeBatchQuery([
-        { ...item, usePool: true },
-        { ...item, query: { id: { "$eq": "2" } } }
-    ],
-    { parallel: true, connectOnce: true }
-);
-```
-
-## References
-
-- https://www.unpkg.com/@e-mc/types@0.10.1/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.1/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.1/lib/db.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.1/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.1/lib/settings.d.ts
-
-* https://www.npmjs.com/package/@types/node
-
-## LICENSE
-
+# @e-mc/db
+
+* NodeJS 16
+* ES2020
+
+## General Usage
+
+* [Read the Docs](https://e-mc.readthedocs.io)
+
+## Interface
+
+* [View Source](https://www.unpkg.com/@e-mc/types@0.10.3/lib/index.d.ts)
+
+```typescript
+import type { DbDataSource } from "./squared";
+
+import type { IHost } from "./index";
+import type { ClientDbConstructor, IClientDb } from "./core";
+import type { BatchQueryResult, DB_TYPE, ErrorQueryCallback, ExecuteBatchQueryOptions, ExecuteQueryOptions, HandleFailOptions, ProcessRowsOptions, QueryResult, SQL_COMMAND } from "./db";
+import type { AuthValue } from "./http";
+import type { DbCoerceSettings, DbModule, DbSourceOptions, PoolConfig } from "./settings";
+
+import type { SecureContextOptions } from "tls";
+
+interface IDb extends IClientDb<IHost, DbModule, DbDataSource, DbSourceOptions, DbCoerceSettings> {
+    setCredential(item: DbDataSource): Promise<void>;
+    getCredential(item: DbDataSource): Record<string | number | symbol, unknown>;
+    hasSource(source: string, ...type: number[]): boolean;
+    applyCommand(...items: DbDataSource[]): void;
+    executeQuery(item: V, callback: ErrorQueryCallback): Promise<QueryResult>;
+    executeQuery(item: DbDataSource, sessionKey: string): Promise<QueryResult>;
+    executeQuery(item: DbDataSource, options?: ExecuteQueryOptions | string): Promise<QueryResult>;
+    executeBatchQuery(batch: DbDataSource[], callback: ErrorQueryCallback, outResult?: BatchQueryResult): Promise<BatchQueryResult>;
+    executeBatchQuery(batch: DbDataSource[], sessionKey: string, outResult?: BatchQueryResult): Promise<BatchQueryResult>;
+    executeBatchQuery(batch: DbDataSource[], options?: ExecuteBatchQueryOptions | string, outResult?: BatchQueryResult): Promise<BatchQueryResult>;
+    processRows(batch: DbDataSource[], tasks: Promise<QueryResult | null>[], parallel: boolean): Promise<BatchQueryResult>;
+    processRows(batch: DbDataSource[], tasks: Promise<QueryResult | null>[], options?: ProcessRowsOptions, outResult?: BatchQueryResult): Promise<BatchQueryResult>;
+    handleFail(err: unknown, item: DbDataSource, options?: HandleFailOptions): boolean;
+    readTLSCert(value: unknown, cache?: boolean): string;
+    readTLSConfig(options: SecureContextOptions, cache?: boolean): void;
+    settingsOf(source: string, name: keyof Omit<DbSourceOptions, "coerce">): unknown;
+    settingsOf(source: string, name: "coerce", component: keyof DbCoerceSettings): unknown;
+    settingsKey(source: string, name: keyof Omit<DbSourceOptions, "coerce">): unknown;
+    settingsKey(source: string, name: "coerce", component: keyof DbCoerceSettings): unknown;
+    getPoolConfig(source: string, uuidKey?: string): Required<PoolConfig> | undefined;
+    get sourceType(): DB_TYPE;
+    get commandType(): SQL_COMMAND;
+}
+
+interface DbConstructor extends ClientDbConstructor<IHost> {
+    setPoolConfig(value: Record<string, PoolConfig>): void;
+    getPoolConfig(source: string): Required<PoolConfig> | undefined;
+    readonly prototype: IDb;
+    new(module?: DbModule, database?: DbDataSource[], ...args: unknown[]): IDb;
+}
+
+interface IDbSourceClient {
+    DB_SOURCE_NAME: string;
+    DB_SOURCE_CLIENT: boolean;
+    DB_SOURCE_TYPE: number;
+    setCredential(this: IDb, item: DbDataSource): Promise<void>;
+    executeQuery(this: IDb, item: DbDataSource, options?: ExecuteQueryOptions | string): Promise<QueryResult>;
+    executeBatchQuery(this: IDb, batch: DbDataSource[], options?: ExecuteBatchQueryOptions | string, outResult?: BatchQueryResult): Promise<BatchQueryResult>;
+    checkTimeout?(this: IDbSourceClient, value: number, limit?: number): Promise<number>;
+}
+
+interface IDbPool {
+    client: unknown;
+    lastAccessed: number;
+    success: number;
+    failed: number;
+    poolKey: string;
+    uuidKey: AuthValue | null;
+    add(item: DbDataSource, uuidKey?: string): this;
+    has(item: DbDataSource): boolean;
+    getConnection(credential?: unknown): Promise<unknown>;
+    remove(): void;
+    detach(force?: boolean): Promise<void>;
+    close(): Promise<void>;
+    isIdle(timeout: number): boolean;
+    isEmpty(): boolean;
+    set connected(value: boolean);
+    get persist(): boolean;
+    get closed(): boolean;
+    get closeable(): boolean;
+    set parent(value: Record<string, IDbPool>);
+}
+
+interface DbPoolConstructor {
+    CACHE_UNUSED: readonly string[];
+    asString(credential: unknown): string;
+    sanitize(credential: unknown): unknown;
+    removeUUIDKey(credential: unknown): unknown;
+    findKey(pools: Record<string, IDbPool>, uuidKey: unknown, poolKey: string | undefined, ...items: DbDataSource[]): Record<string, IDbPool> | null;
+    validateKey(pools: Record<string, IDbPool>, username: string, uuidKey: unknown): [string, Record<string, IDbPool> | null];
+    checkTimeout(pools: Record<string, IDbPool>, value: number, limit?: number): Promise<number>;
+    readonly prototype: IDbPool;
+    new(pool: unknown, poolKey: string, uuidKey?: AuthValue | null): IDbPool;
+}
+```
+
+## Settings
+
+```typescript
+import type { DbSourceOptions, PurgeComponent } from "./settings";
+
+interface DbModule {
+    // handler: "@e-mc/db";
+    mariadb?: DbStoredCredentials;
+    mongodb?: DbStoredCredentials;
+    mssql?: DbStoredCredentials;
+    mysql?: DbStoredCredentials;
+    oracle?: DbStoredCredentials;
+    postgres?: DbStoredCredentials;
+    redis?: DbStoredCredentials;
+    settings?: {
+        broadcast_id?: string | string[];
+        users?: Record<string, Record<string, unknown>>;
+        cache_dir?: string;
+        session_expires?: number;
+        user_key?: Record<string, DbSourceOptions>;
+        imports?: StringMap;
+        purge?: PurgeComponent;
+        mariadb?: DbSourceOptions;
+        mongodb?: DbSourceOptions;
+        mssql?: DbSourceOptions;
+        mysql?: DbSourceOptions;
+        oracle?: DbSourceOptions;
+        postgres?: DbSourceOptions;
+        redis?: DbSourceOptions;
+    };
+}
+
+type DbStoredCredentials = Record<string, Record<string, unknown>>;
+```
+
+### Example usage
+
+```javascript
+const Db = require("@e-mc/db"); // Using @pi-r/mongodb
+
+const instance = new Db({
+    mongodb: {
+        main: {
+            server: "localhost:27017",
+            auth: {
+                username: "**********",
+                password: "**********"
+            },
+            authMechanism: "SCRAM-SHA-1"
+        }
+    },
+    settings: {
+        mongodb: {
+            pool: {
+                max: 10,
+                idle: 60 * 1000,
+                queue_max: 4,
+                queue_idle: 30 * 1000,
+                timeout: 10 * 1000
+            },
+            cache: {
+                timeout: "1d",
+                when_empty: false
+            },
+            coerce: {
+                credential: false,
+                options: true
+            }
+        }
+    }
+});
+// instance.host = new Host();
+instance.init();
+
+const item = {
+    source: "mongodb",
+    credential: "main",
+    table: "demo",
+    name: "nodejs",
+    query: {
+        id: {
+            "$eq": "1"
+        }
+    },
+    willAbort: true
+};
+await instance.setCredential(item);
+
+const rows = await instance.executeQuery(item, (err, item) => {
+    if (err.code === "E11000") {
+        return true; // throw err;
+    }
+    return false; // return [];
+});
+
+const [rows1, rows2] = await instance.executeBatchQuery([
+        { ...item, usePool: true },
+        { ...item, query: { id: { "$eq": "2" } } }
+    ],
+    { parallel: true, connectOnce: true }
+);
+```
+
+## References
+
+- https://www.unpkg.com/@e-mc/types@0.10.3/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.3/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.3/lib/db.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.3/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.3/lib/settings.d.ts
+
+* https://www.npmjs.com/package/@types/node
+
+## LICENSE
+
 BSD 3-Clause

package/index.d.ts

@@ -1,5 +1,5 @@
-import type { DbConstructor } from '../types/lib';
-
-declare const Db: DbConstructor;
-
+import type { DbConstructor } from '@e-mc/types/lib';
+
+declare const Db: DbConstructor;
+
 export = Db;

package/index.js

@@ -1,20 +1,20 @@
 "use strict";
 const path = require("path");
+const types_1 = require("@e-mc/types");
 const core_1 = require("@e-mc/core");
 const request_1 = require("@e-mc/request");
-const types_1 = require("@e-mc/types");
 const util_1 = require("@e-mc/db/util");
 const DB_CLIENT = new Map();
 const POOL_CONFIG = new Map();
 function sanitizePoolConfig(value) {
-    value.min ?? (value.min = -1);
-    value.max ?? (value.max = -1);
-    value.idle ?? (value.idle = -1);
-    value.queue_max ?? (value.queue_max = -1);
-    value.queue_idle ?? (value.queue_idle = -1);
-    value.purge ?? (value.purge = 0);
-    value.timeout ?? (value.timeout = -1);
-    value.socket_timeout ?? (value.socket_timeout = -1);
+    value.min ??= -1;
+    value.max ??= -1;
+    value.idle ??= -1;
+    value.queue_max ??= -1;
+    value.queue_idle ??= -1;
+    value.purge ??= 0;
+    value.timeout ??= -1;
+    value.socket_timeout ??= -1;
     return value;
 }
 function setCert(instance, items, cache) {
@@ -215,7 +215,7 @@ class Db extends core_1.ClientDb {
             return (0, types_1.createAbortError)(true);
         }
         const tasks = (items || this.pending).map(async (data) => {
-            data.ignoreCache ?? (data.ignoreCache = true);
+            data.ignoreCache ??= true;
             return this.executeQuery(data).catch(() => {
                 this.applyState([data], 16);
                 return [];
@@ -269,13 +269,13 @@ class Db extends core_1.ClientDb {
         const result = uuidKey && this.settingsKey(uuidKey, 'pool');
         if (result) {
             if (config) {
-                result.min ?? (result.min = config.min);
-                result.max ?? (result.max = config.max);
-                result.idle ?? (result.idle = config.idle);
-                result.queue_max ?? (result.queue_max = config.queue_max);
-                result.queue_idle ?? (result.queue_idle = config.queue_idle);
-                result.timeout ?? (result.timeout = config.timeout);
-                result.socket_timeout ?? (result.socket_timeout = config.socket_timeout);
+                result.min ??= config.min;
+                result.max ??= config.max;
+                result.idle ??= config.idle;
+                result.queue_max ??= config.queue_max;
+                result.queue_idle ??= config.queue_idle;
+                result.timeout ??= config.timeout;
+                result.socket_timeout ??= config.socket_timeout;
             }
             else {
                 sanitizePoolConfig(result);

package/package.json

@@ -1,27 +1,27 @@
-{
-  "name": "@e-mc/db",
-  "version": "0.10.1",
-  "description": "DB modules for E-mc.",
-  "main": "index.js",
-  "types": "index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/e-mc.git",
-    "directory": "src/db"
-  },
-  "keywords": [
-    "squared",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "BSD 3-Clause",
-  "homepage": "https://github.com/anpham6/e-mc#readme",
-  "dependencies": {
-    "@e-mc/core": "0.10.1",
-    "@e-mc/request": "0.10.1",
-    "@e-mc/types": "0.10.1"
-  }
-}
+{
+  "name": "@e-mc/db",
+  "version": "0.10.3",
+  "description": "DB modules for E-mc.",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/e-mc.git",
+    "directory": "src/db"
+  },
+  "keywords": [
+    "squared",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "BSD-3-Clause",
+  "homepage": "https://github.com/anpham6/e-mc#readme",
+  "dependencies": {
+    "@e-mc/core": "0.10.3",
+    "@e-mc/request": "0.10.3",
+    "@e-mc/types": "0.10.3"
+  }
+}

package/pool.d.ts

@@ -1,5 +1,5 @@
-import type { DbPoolConstructor } from '../types/lib/db';
-
-declare const DbPool: DbPoolConstructor;
-
+import type { DbPoolConstructor } from '@e-mc/types/lib/db';
+
+declare const DbPool: DbPoolConstructor;
+
 export = DbPool;

package/pool.js

@@ -16,7 +16,7 @@ class DbPool {
         for (let i = 0, length = properties.length; i < length; ++i) {
             const attr = properties[i];
             if (attr in credential) {
-                result || (result = { ...credential });
+                result ||= { ...credential };
                 result[attr] = undefined;
             }
         }
@@ -93,7 +93,7 @@ class DbPool {
     }
     add(item, uuidKey) {
         this[kItems].add(item);
-        if (uuidKey || (uuidKey = this.uuidKey?.password)) {
+        if (uuidKey ||= this.uuidKey?.password) {
             (0, util_1.setUUIDKey)(item, uuidKey);
         }
         this.lastAccessed = Date.now();

package/types/index.d.ts

@@ -1,14 +1,14 @@
-import type { DbDataSource } from '../../types/lib/squared';
-
-import type { IDb } from '../../types/lib';
-import type { BatchQueryResult, ExecuteBatchQueryOptions, ExecuteQueryOptions, QueryResult } from '../../types/lib/db';
-
-export interface IDbSourceClient<T extends DbDataSource = DbDataSource> {
-    DB_SOURCE_NAME: string;
-    DB_SOURCE_CLIENT: boolean;
-    DB_SOURCE_TYPE: number;
-    setCredential(this: IDb, item: T): Promise<void>;
-    executeQuery(this: IDb, item: T, options?: ExecuteQueryOptions | string): Promise<QueryResult>;
-    executeBatchQuery(this: IDb, batch: T[], options?: ExecuteBatchQueryOptions | string, outResult?: BatchQueryResult): Promise<BatchQueryResult>;
-    checkTimeout?(this: IDbSourceClient, value: number, limit?: number): Promise<number>;
+import type { DbDataSource } from '@e-mc/types/lib/squared';
+
+import type { IDb } from '@e-mc/types/lib';
+import type { BatchQueryResult, ExecuteBatchQueryOptions, ExecuteQueryOptions, QueryResult } from '@e-mc/types/lib/db';
+
+export interface IDbSourceClient<T extends DbDataSource = DbDataSource> {
+    DB_SOURCE_NAME: string;
+    DB_SOURCE_CLIENT: boolean;
+    DB_SOURCE_TYPE: number;
+    setCredential(this: IDb, item: T): Promise<void>;
+    executeQuery(this: IDb, item: T, options?: ExecuteQueryOptions | string): Promise<QueryResult>;
+    executeBatchQuery(this: IDb, batch: T[], options?: ExecuteBatchQueryOptions | string, outResult?: BatchQueryResult): Promise<BatchQueryResult>;
+    checkTimeout?(this: IDbSourceClient, value: number, limit?: number): Promise<number>;
 }

package/util.d.ts

@@ -1,20 +1,20 @@
-import type { DbDataSource } from '../types/lib/squared';
-
-import type { DbConnection, SQL_COMMAND, ServerAuth } from '../types/lib/db';
-import type { AuthValue } from '../types/lib/http';
-
-declare namespace util {
-    const SQL_COMMAND: SQL_COMMAND;
-    /** @deprecated Types.IMPORT_MAP */
-    const IMPORTS: Record<string, string | undefined>;
-    function getBasicAuth(auth: AuthValue): string;
-    function getBasicAuth(username: unknown, password?: unknown): string;
-    function hasBasicAuth(value: string): boolean;
-    function parseConnectionString(value: string, scheme?: string): Null<DbConnection>;
-    function parseServerAuth(value: ServerAuth, all: boolean): ServerAuth;
-    function parseServerAuth(value: ServerAuth, port?: number, all?: boolean): ServerAuth;
-    function checkEmpty(value: unknown): boolean;
-    function setUUIDKey(item: DbDataSource, value: unknown): void;
-}
-
+import type { DbDataSource } from '@e-mc/types/lib/squared';
+
+import type { DbConnection, SQL_COMMAND, ServerAuth } from '@e-mc/types/lib/db';
+import type { AuthValue } from '@e-mc/types/lib/http';
+
+declare namespace util {
+    const SQL_COMMAND: SQL_COMMAND;
+    /** @deprecated Types.IMPORT_MAP */
+    const IMPORTS: Record<string, string | undefined>;
+    function getBasicAuth(auth: AuthValue): string;
+    function getBasicAuth(username: unknown, password?: unknown): string;
+    function hasBasicAuth(value: string): boolean;
+    function parseConnectionString(value: string, scheme?: string): Null<DbConnection>;
+    function parseServerAuth(value: ServerAuth, all: boolean): ServerAuth;
+    function parseServerAuth(value: ServerAuth, port?: number, all?: boolean): ServerAuth;
+    function checkEmpty(value: unknown): boolean;
+    function setUUIDKey(item: DbDataSource, value: unknown): void;
+}
+
 export = util;

package/util.js

@@ -96,11 +96,10 @@ function checkEmpty(value) {
     return value === undefined || value === null ? false : value === 0 || (value instanceof Set || value instanceof Map ? value.size === 0 : (Array.isArray(value) || (0, types_1.isObject)(value)) && value.length === 0);
 }
 function setUUIDKey(item, value) {
-    var _a;
     if ((0, types_1.isString)(value)) {
         if (!(0, types_1.isPlainObject)(item.credential)) {
             item.credential = {};
         }
-        (_a = item.credential).uuidKey || (_a.uuidKey = value);
+        item.credential.uuidKey ||= value;
     }
 }