@e-mc/types 0.10.6 → 0.11.1

package/index.js

@@ -44,11 +44,11 @@ exports.incrementUUID = incrementUUID;
 exports.hashKey = hashKey;
 exports.supported = supported;
 exports.importESM = importESM;
-const path = require("path");
-const fs = require("fs");
-const crypto = require("crypto");
+const path = require("node:path");
+const fs = require("node:fs");
+const crypto = require("node:crypto");
 const bytes = require("bytes");
-const url_1 = require("url");
+const node_url_1 = require("node:url");
 class AbortError extends Error {
     constructor() {
         super("This operation was aborted");
@@ -63,6 +63,21 @@ class AbortError extends Error {
         return 20;
     }
 }
+const PATTERN_CHARS = {
+    '&': '\\x26',
+    '!': '\\x21',
+    '#': '\\x23',
+    '%': '\\x25',
+    ',': '\\x2c',
+    ':': '\\x3a',
+    ';': '\\x3b',
+    '<': '\\x3c',
+    '=': '\\x3d',
+    '>': '\\x3e',
+    '@': '\\x40',
+    '`': '\\x60',
+    '~': '\\x7e'
+};
 const [VER_MAJOR, VER_MINOR, VER_PATCH] = process.version.substring(1).split('.').map(value => +value);
 const REGEXP_UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 const REGEXP_FUNCTION = /^(async\s+)?(function(?:\b|\s+)[\w_$]*\s*\(([^)]*)\)\s*\{(.*)\})$/s;
@@ -91,6 +106,9 @@ function fromObject(value, typedArray) {
         if (value instanceof RegExp) {
             return new RegExp(value);
         }
+        if (value instanceof URL) {
+            return new URL(value);
+        }
         if (typedArray) {
             if (value instanceof Buffer) {
                 return Buffer.from(value);
@@ -331,6 +349,12 @@ function parseStringDefault(value) {
     }
     return null;
 }
+function checkFlags(value, flags) {
+    if (isObject(value)) {
+        value = value.flags;
+    }
+    return typeof value === 'number' && (value & flags) === flags;
+}
 const padStart = (value, char) => value > 9 ? value.toString() : char + value;
 const convertScrypt = (key, iv, data) => crypto.scryptSync(key, iv, Math.ceil(data.length / 16) * 16);
 const isFunction = (value) => typeof value === 'function';
@@ -455,83 +479,6 @@ var THRESHOLD;
     THRESHOLD[THRESHOLD["WATCH_CHANGE"] = 100] = "WATCH_CHANGE";
 })(THRESHOLD || (exports.THRESHOLD = THRESHOLD = {}));
 exports.IMPORT_MAP = {
-    "@squared-functions/cloud": "@e-mc/cloud",
-    "@squared-functions/cloud/util": "@e-mc/cloud/util",
-    "@squared-functions/compress-v3": "@e-mc/compress",
-    "@squared-functions/core": "@e-mc/core",
-    "@squared-functions/db": "@e-mc/db",
-    "@squared-functions/db/pool": "@e-mc/db/pool",
-    "@squared-functions/db/util": "@e-mc/db/util",
-    "@squared-functions/document": "@e-mc/document",
-    "@squared-functions/document/parse": "@e-mc/document/parse",
-    "@squared-functions/document/parse/dom": "@e-mc/document/parse/dom",
-    "@squared-functions/document/transform": "@e-mc/document/transform",
-    "@squared-functions/document/asset": "@e-mc/document/asset",
-    "@squared-functions/document/util": "@e-mc/document/util",
-    "@squared-functions/file-manager": "@e-mc/file-manager",
-    "@squared-functions/file-manager/http/host": "@e-mc/request/http/host",
-    "@squared-functions/image-v3": "@e-mc/image",
-    "@squared-functions/module": "@e-mc/module",
-    "@squared-functions/task": "@e-mc/task",
-    "@squared-functions/types": "@e-mc/types",
-    "@squared-functions/watch": "@e-mc/watch",
-    "@squared-functions/watch/filegroup": "@e-mc/watch/filegroup",
-    "@squared-functions/document/android": "@pi-r/android",
-    "@squared-functions/document/android/extensions/app/manifest": "@pi-r/android/extensions/app/manifest",
-    "@squared-functions/document/android/extensions/gradle/dependencies": "@pi-r/android/extensions/gradle/dependencies",
-    "@squared-functions/document/android/extensions/gradle/settings": "@pi-r/android/extensions/gradle/settings",
-    "@squared-functions/document/android/extensions/task": "@pi-r/android/extensions/task",
-    "@squared-functions/document/chrome": "@pi-r/chrome",
-    "@squared-functions/image/jimp": "@pi-r/jimp",
-    "@squared-functions/image/jimp/util": "@pi-r/jimp/util",
-    "@squared-functions/image-v3/jimp": "@pi-r/jimp",
-    "@squared-functions/task/gulp": "@pi-r/gulp",
-    "@squared-functions/cloud/atlas": "@pi-r/atlas",
-    "@squared-functions/cloud/aws": "@pi-r/aws",
-    "@squared-functions/cloud/aws/download": "@pi-r/aws/download",
-    "@squared-functions/cloud/aws/upload": "@pi-r/aws/upload",
-    "@squared-functions/cloud/aws-v3": "@pi-r/aws-v3",
-    "@squared-functions/cloud/aws-v3/download": "@pi-r/aws-v3/download",
-    "@squared-functions/cloud/aws-v3/upload": "@pi-r/aws-v3/upload",
-    "@squared-functions/cloud/azure": "@pi-r/azure",
-    "@squared-functions/cloud/azure/download": "@pi-r/azure/download",
-    "@squared-functions/cloud/azure/upload": "@pi-r/azure/upload",
-    "@squared-functions/cloud/gcp": "@pi-r/gcp",
-    "@squared-functions/cloud/gcp/download": "@pi-r/gcp/download",
-    "@squared-functions/cloud/gcp/upload": "@pi-r/gcp/upload",
-    "@squared-functions/cloud/ibm": "@pi-r/ibm",
-    "@squared-functions/cloud/ibm/download": "@pi-r/ibm/download",
-    "@squared-functions/cloud/ibm/upload": "@pi-r/ibm/upload",
-    "@squared-functions/cloud/ibm-v1": "@pi-r/ibm",
-    "@squared-functions/cloud/ibm-v1/download": "@pi-r/ibm/download",
-    "@squared-functions/cloud/ibm-v1/upload": "@pi-r/ibm/upload",
-    "@squared-functions/cloud/minio": "@pi-r/minio",
-    "@squared-functions/cloud/minio/download": "@pi-r/minio/download",
-    "@squared-functions/cloud/minio/upload": "@pi-r/minio/upload",
-    "@squared-functions/cloud/oci": "@pi-r/oci",
-    "@squared-functions/cloud/oci/download": "@pi-r/oci/download",
-    "@squared-functions/cloud/oci/upload": "@pi-r/oci/upload",
-    "@squared-functions/db/mongodb": "@pi-r/mongodb",
-    "@squared-functions/db/mssql": "@pi-r/mssql",
-    "@squared-functions/db/mysql": "@pi-r/mysql",
-    "@squared-functions/db/oracle": "@pi-r/oracle",
-    "@squared-functions/db/postgres": "@pi-r/postgres",
-    "@squared-functions/db/redis": "@pi-r/redis",
-    "@squared-functions/document/packages/@babel/core": "@pi-r/babel",
-    "@squared-functions/document/packages/clean-css": "@pi-r/clean-css",
-    "@squared-functions/document/packages/eslint": "@pi-r/eslint",
-    "@squared-functions/document/packages/html-minifier": "@pi-r/html-minifier-terser",
-    "@squared-functions/document/packages/html-minifier-terser": "@pi-r/html-minifier-terser",
-    "@squared-functions/document/packages/html-validate": "@pi-r/html-validate",
-    "@squared-functions/document/packages/postcss": "@pi-r/postcss",
-    "@squared-functions/document/packages/posthtml": "@pi-r/posthtml",
-    "@squared-functions/document/packages/prettier": "@pi-r/prettier",
-    "@squared-functions/document/packages/rollup": "@pi-r/rollup",
-    "@squared-functions/document/packages/sass": "@pi-r/sass",
-    "@squared-functions/document/packages/stylelint": "@pi-r/stylelint",
-    "@squared-functions/document/packages/svgo": "@pi-r/svgo",
-    "@squared-functions/document/packages/terser": "@pi-r/terser",
-    "@squared-functions/document/packages/uglify-js": "@pi-r/uglify-js",
     "atlas": "@pi-r/atlas",
     "aws": "@pi-r/aws",
     "aws-v3": "@pi-r/aws-v3",
@@ -539,8 +486,6 @@ exports.IMPORT_MAP = {
     "azure": "@pi-r/azure",
     "gcloud": "@pi-r/gcp",
     "gcp": "@pi-r/gcp",
-    "ibm": "@pi-r/ibm",
-    "minio": "@pi-r/minio",
     "oci": "@pi-r/oci",
     "tinify": "@pi-r/tinify",
     "mariadb": "@pi-r/mariadb",
@@ -554,8 +499,6 @@ exports.IMPORT_MAP = {
     "clean-css": "@pi-r/clean-css",
     "csso": "@pi-r/csso",
     "eslint": "@pi-r/eslint",
-    "html-minifier": "@pi-r/html-minifier",
-    "html-minifier-terser": "@pi-r/html-minifier-terser",
     "html-validate": "@pi-r/html-validate",
     "postcss": "@pi-r/postcss",
     "posthtml": "@pi-r/posthtml",
@@ -563,8 +506,12 @@ exports.IMPORT_MAP = {
     "rollup": "@pi-r/rollup",
     "sass": "@pi-r/sass",
     "stylelint": "@pi-r/stylelint",
-    "svgo": "@pi-r/svgo",
     "terser": "@pi-r/terser",
+    "ibm": "@pi-r/ibm",
+    "minio": "@pi-r/minio",
+    "html-minifier": "@pi-r/html-minifier",
+    "html-minifier-terser": "@pi-r/html-minifier-terser",
+    "svgo": "@pi-r/svgo",
     "uglify-js": "@pi-r/uglify-js"
 };
 function createAbortError(reject) {
@@ -575,28 +522,28 @@ function hasBit(value, flags) {
     return typeof value === 'number' && (value & flags) > 0;
 }
 function ignoreFlag(value) {
-    return typeof value === 'number' && (value & 1) === 1;
+    return checkFlags(value, 1);
 }
 function cloneFlag(value) {
-    return typeof value === 'number' && (value & 2) === 2;
+    return checkFlags(value, 2);
 }
 function usingFlag(value) {
-    return typeof value === 'number' && (value & 4) === 4;
+    return checkFlags(value, 4);
 }
 function watchFlag(value) {
-    return typeof value === 'number' && (value & 8) === 8;
+    return checkFlags(value, 8);
 }
 function modifiedFlag(value) {
-    return typeof value === 'number' && (value & 16) === 16;
+    return checkFlags(value, 16);
 }
 function processFlag(value) {
-    return typeof value === 'number' && (value & 32) === 32;
+    return checkFlags(value, 32);
 }
 function mainFlag(value) {
-    return typeof value === 'number' && (value & 64) === 64;
+    return checkFlags(value, 64);
 }
 function existsFlag(value) {
-    return typeof value === 'number' && (value & 128) === 128;
+    return checkFlags(value, 128);
 }
 function getLogCurrent() {
     return LOG_CURRENT;
@@ -735,26 +682,30 @@ function formatTime(value, elapsed, char = ' ') {
     return result.join(char);
 }
 function convertTime(value, format) {
-    let result;
+    let result = 0;
     if (Array.isArray(value)) {
-        const time = Math.ceil((value[0] * 1000000000 + value[1]) / 1000000);
-        result = format ? formatTime(time) : time;
+        result = Math.ceil((value[0] * 1000000000 + value[1]) / 1000000);
+    }
+    else if (typeof value === 'bigint') {
+        result = Number(value / BigInt(1000000));
     }
     else {
-        result = parseTime(value);
+        return parseTime(value);
     }
-    return result;
+    return format ? formatTime(result) : result;
 }
 function hasGlob(value) {
     return REGEXP_GLOB.test(value);
 }
-function escapePattern(value, lookBehind) {
+function escapePattern(value, symbols) {
     switch (typeof value) {
         case 'string': {
             let result = '', j = 0;
             for (let i = 0, length = value.length, ch; i < length; ++i) {
                 switch (ch = value[i]) {
                     case '-':
+                        ch = '\\x2d';
+                        break;
                     case '.':
                     case '+':
                     case '*':
@@ -769,13 +720,16 @@ function escapePattern(value, lookBehind) {
                     case '}':
                     case '^':
                     case '$':
-                        if (lookBehind && value[i - 1] === '\\') {
-                            break;
+                        ch = '\\' + ch;
+                        break;
+                    default:
+                        if (!(symbols && (ch = PATTERN_CHARS[ch]))) {
+                            continue;
                         }
-                        result += value.substring(j, i) + (ch === '-' ? '\\x2d' : '\\' + ch);
-                        j = i + 1;
                         break;
                 }
+                result += value.substring(j, i) + ch;
+                j = i + 1;
             }
             return j > 0 ? result + value.substring(j) : value;
         }
@@ -868,7 +822,7 @@ function cascadeObject(data, query, fallback) {
     return fallback;
 }
 function cloneObject(data, options) {
-    let target, deep, deepIgnore, mergeArray, mergeDepth = Infinity, typedArray, inherited, nonenumerable, symbol, preserve;
+    let freezeDepth = -1, mergeDepth = Infinity, target, deep, deepIgnore, mergeArray, typedArray, inherited, nonenumerable, symbol, preserve;
     if (options === true) {
         deep = true;
     }
@@ -878,14 +832,20 @@ function cloneObject(data, options) {
     }
     else if (options) {
         ({ target, deep, deepIgnore, mergeArray, typedArray, inherited, nonenumerable, symbol, preserve } = options);
+        if (typeof options.freezeDepth === 'number') {
+            freezeDepth = options.freezeDepth - 1;
+        }
+        else if (options.freezeDepth) {
+            freezeDepth = Infinity;
+        }
         if (options.mergeDepth !== undefined) {
             mergeDepth = options.mergeDepth - 1;
         }
     }
     let nested;
-    if (deep) {
+    if (deep || freezeDepth > 0) {
         deepIgnore ||= new WeakSet();
-        nested = { deep, deepIgnore, mergeArray, mergeDepth, typedArray, preserve };
+        nested = { deep, deepIgnore, freezeDepth, mergeArray, mergeDepth, typedArray, preserve };
     }
     if (Array.isArray(data)) {
         deepIgnore?.add(data);
@@ -928,20 +888,23 @@ function cloneObject(data, options) {
             }
             const prop = target[attr];
             if (preserve && isPlainObject(prop) && isPlainObject(merge)) {
-                (function recurse(current, next) {
+                (function recurse(current, next, depth) {
                     for (const item of getProperties(next, inherited, nonenumerable, symbol)) {
                         const b = next[item];
                         if (item in current) {
                             const a = current[item];
                             if (isPlainObject(a) && isPlainObject(b)) {
-                                recurse(a, b);
+                                recurse(a, b, depth - 1);
                             }
                         }
                         else if (!(mergeArray && mergeDepth >= 0 && mergedArray(current, item, b, mergeArray))) {
                             current[item] = b;
                         }
                     }
-                })(prop, merge);
+                    if (depth >= 0) {
+                        Object.freeze(current);
+                    }
+                })(prop, merge, freezeDepth - 1);
             }
             else if (!(mergeArray && mergeDepth >= 0 && mergedArray(target, attr, merge, mergeArray))) {
                 target[attr] = merge;
@@ -951,6 +914,9 @@ function cloneObject(data, options) {
     else {
         return deep ? fromObject(data, typedArray) : data;
     }
+    if (freezeDepth >= 0) {
+        Object.freeze(target);
+    }
     return target;
 }
 function coerceObject(data, parseString, cache) {
@@ -1076,10 +1042,12 @@ function errorValue(value, hint) {
     return new Error(value + (hint ? ` (${hint})` : ''));
 }
 function errorMessage(title, value, hint) {
-    return new Error((title !== '' ? title + ': ' : '') + value + (hint ? ` (${hint})` : ''));
+    return new Error((isString(title) || typeof title === 'number' ? title + ': ' : '') + value + (hint ? ` (${hint})` : ''));
 }
 function purgeMemory(percent) {
     CACHE_COERCED = new WeakSet();
+    INCREMENT_COUNT = 65536;
+    LOG_CURRENT = null;
 }
 function incrementUUID(restart) {
     if (restart || INCREMENT_COUNT === 65536) {
@@ -1096,10 +1064,14 @@ function hashKey(data, algorithm = 'md5', encoding = 'base64') {
         return crypto.randomUUID();
     }
 }
-function supported(major, minor = 0, patch = 0, lts) {
+function supported(major, minor = 0, patch = 0, lts = false) {
     if (VER_MAJOR < major) {
         return false;
     }
+    if (typeof patch === 'boolean') {
+        lts = patch;
+        patch = 0;
+    }
     if (VER_MAJOR === major) {
         if (VER_MINOR < minor) {
             return false;
@@ -1113,7 +1085,7 @@ function supported(major, minor = 0, patch = 0, lts) {
 }
 async function importESM(name, isDefault, fromPath) {
     if (fromPath && path.isAbsolute(name)) {
-        name = (0, url_1.pathToFileURL)(name).toString();
+        name = (0, node_url_1.pathToFileURL)(name).toString();
     }
     const result = import(name);
     if (isDefault) {
@@ -1126,4 +1098,4 @@ async function importESM(name, isDefault, fromPath) {
 }
 exports.generateUUID = crypto.randomUUID.bind(crypto);
 SUPPORTED_DOMEXCEPTION = supported(17);
-SUPPORTED_HASHSINGLE = supported(20, 12, 0, true) || supported(21, 7);
+SUPPORTED_HASHSINGLE = supported(20, 12, true) || supported(21, 7);

package/lib/asset.d.ts

@@ -15,7 +15,7 @@ export interface BinaryAction {
 }
 
 export interface StreamAction {
-    minStreamSize?: NumString;
+    minStreamSize?: number | string;
 }
 
 export interface FileData<T extends ExternalAsset> extends MimeTypeAction {
@@ -58,7 +58,7 @@ export interface ExternalAsset extends FileAsset, BundleAction, BinaryAction, St
     id?: number;
     url?: URL;
     socketPath?: string;
-    buffer?: Null<Buffer>;
+    buffer?: Buffer | null;
     localUri?: string;
     fetchType?: FetchType;
     sourceUTF8?: string;
@@ -74,4 +74,4 @@ export interface ExternalAsset extends FileAsset, BundleAction, BinaryAction, St
     invalid?: boolean;
 }
 
-export type HashAlgorithm = "md5" | "sha1" | "sha256" | "sha224" | "sha384" | "sha512";
+export type HashAlgorithm = "md5" | "sha1" | "sha256" | "sha224" | "sha384" | "sha512" | "ripemd" | "ripemd-160";

package/lib/cloud.d.ts

@@ -7,6 +7,10 @@ export interface UploadAction {
     cloudUrl?: string;
 }
 
+export interface RecursiveAction {
+    recursive?: boolean;
+}
+
 export interface CloudAsset<T = CloudStorage> extends ExternalAsset, UploadAction, StorageAction<T> {}
 
 export interface CloudService<T = unknown, U = string> {
@@ -26,7 +30,7 @@ export interface CloudStorage<T = unknown, U = string> extends CloudService<T, U
 }
 
 export interface CloudStorageAdmin<T = unknown, U = string, V = unknown, W = unknown, X = unknown, Y = unknown> extends CloudStorageACL<U> {
-    emptyBucket?: boolean;
+    emptyBucket?: boolean | DeleteObjectsOptions;
     configBucket?: {
         create?: T;
         policy?: V;
@@ -36,6 +40,7 @@ export interface CloudStorageAdmin<T = unknown, U = string, V = unknown, W = unk
         cors?: X;
         lifecycle?: Y;
     };
+    /** @deprecated */
     recursive?: boolean;
     preservePath?: boolean;
 }
@@ -43,14 +48,14 @@ export interface CloudStorageAdmin<T = unknown, U = string, V = unknown, W = unk
 export interface CloudStorageAction<T = unknown, U = string, V = unknown, W = unknown, X = unknown, Y = unknown> extends Partial<LocationUri>, StreamAction {
     active?: boolean;
     overwrite?: boolean;
-    chunkSize?: NumString;
+    chunkSize?: number | string;
     chunkLimit?: number;
     flags?: number;
     admin?: CloudStorageAdmin<T, U, V, W, X, Y>;
 }
 
 export interface CloudStorageUpload<T = unknown, U = string, V = unknown, W = string, X = unknown, Y = unknown, Z = unknown> extends CloudStorageACL<U>, CloudStorageAction<V, W, unknown, X, Y, Z> {
-    buffer?: Null<Buffer>;
+    buffer?: Buffer | null;
     contentType?: string;
     metadata?: Record<string, string>;
     tags?: Record<string, string> | false;
@@ -81,6 +86,8 @@ export interface BucketWebsiteOptions {
     errorPath?: string;
 }
 
+export interface DeleteObjectsOptions extends RecursiveAction, PlainObject {}
+
 export interface UploadData<T = unknown, U = string, V = unknown, W = string, X = unknown, Y = unknown, Z = unknown> extends BucketAction {
     upload: CloudStorageUpload<T, U, V, W, X, Y, Z>;
     localUri: string;
@@ -102,6 +109,6 @@ export interface UploadAssetOptions {
 }
 
 export type UploadContent = [Bufferable, string, string?];
-export type CloudSource = "atlas" | "aws" | "aws-v3" | "az" | "azure" | "gcp" | "gcloud" | "ibm" | "oci" | "minio";
+export type CloudSource = "atlas" | "aws" | "aws-v3" | "az" | "azure" | "gcp" | "gcloud" | "oci";
 export type CloudFeatures = "storage" | "database";
 export type CloudFunctions = "upload" | "download";

package/lib/compress.d.ts

@@ -1,25 +1,26 @@
-import type { CompressFormat as ICompressFormat } from './squared';
+import type { CompressFormat as ICompressFormat, CompressLevel as ICompressLevel } from './squared';
 
 import type { LogBaseOptions, LogTime } from './logger';
+import type { ThrowsAction } from './module';
 
-type ResultCallback<T = Null<Buffer | Uint8Array>> = (err: unknown, data?: T, ext?: string) => void;
-type ResultData = Null<Buffer | Uint8Array> | string;
+type ResultCallback<T = Buffer | Uint8Array | null> = (err: unknown, data?: T, ext?: string) => void;
+type ResultData = Buffer | Uint8Array | string | null;
 
-export interface CompressFormat extends ICompressFormat, LogBaseOptions {
+export interface CompressFormat extends ICompressFormat, LogBaseOptions, ReadableOptions {
     filename?: string;
+    mimeType?: string;
     startTime?: LogTime;
     etag?: string;
-    proxyUrl?: string | ((uri: string) => Undef<string>);
     outExt?: string;
     outFile?: string;
 }
 
-export interface Woff {
-    toWoff(this: void, data: BufferLike): Buffer;
-    toSfnt(this: void, data: BufferLike): Buffer;
-}
+export interface CompressLevel extends ICompressLevel, ReadableOptions {}
+
+export interface ReadableOptions extends ThrowsAction {}
 
 export type BufferLike = Buffer | Uint8Array | ArrayBuffer | SharedArrayBuffer | readonly number[];
-export type TryFileCompressor = (data: string | Buffer, output: string, config: CompressFormat, callback?: ResultCallback<ResultData>) => Void<Promise<ResultData>>;
+export type TryFileCompressor = (data: string | Buffer, output: string, config: CompressFormat, callback?: ResultCallback<ResultData>) => Promise<ResultData | void>;
 export type TryFileCompressorAsync = (data: string | Buffer, output: string, config: CompressFormat) => Promise<ResultData>;
-export type BufferResult = Null<Buffer | Uint8Array>;
+export type BufferResult = Buffer | Uint8Array | null;
+export type PluginCompressor = FunctionArgs<[CompressFormat['options'], string?], FunctionArgs<[Buffer], Promise<Buffer | Uint8Array>>>;

package/lib/core.d.ts

@@ -1,5 +1,3 @@
-/* eslint @typescript-eslint/no-explicit-any: "off" */
-
 import type { DataSource, RequestBase } from './squared';
 
 import type { IExternalConfig, IExternalFunction, IHost, IModule, ModuleConstructor } from './index';
@@ -20,7 +18,7 @@ export interface AddEventListenerOptions {
 
 export interface IClient<T extends IHost, U extends ClientModule, V extends FunctionType<any, any> = FunctionType> extends IModule<T>, IExternalConfig<U, U extends ClientModule<infer W> ? W : unknown>, IExternalFunction<V> {
     init(...args: unknown[]): this;
-    getUserSettings<X>(): Null<X>;
+    getUserSettings<X>(): X | null;
     set cacheDir(value: string);
     get cacheDir(): string;
 }
@@ -35,14 +33,15 @@ export interface IClientDb<T extends IHost, U extends ClientModule<ClientDbSetti
     cacheExpires: number;
     add(item: V, state?: number): void;
     hasCache(source: string, sessionKey?: string): boolean;
-    hasCoerce(source: string, component: keyof DbCoerceSettings, uuidKey: Undef<string>): boolean;
+    hasCoerce(source: string, component: keyof DbCoerceSettings, uuidKey: string | undefined): boolean;
     hasCoerce(source: string, component: keyof DbCoerceSettings, credential?: unknown): boolean;
-    getQueryResult(source: string, credential: unknown, queryString: string, renewCache: boolean): Undef<QueryResult>;
-    getQueryResult(source: string, credential: unknown, queryString: string, sessionKey?: string, renewCache?: boolean): Undef<QueryResult>;
-    getQueryResult(source: string, credential: unknown, queryString: string, options?: CacheOptions | string, renewCache?: boolean): Undef<QueryResult>;
+    getQueryResult(source: string, credential: unknown, queryString: string, renewCache: boolean): QueryResult | undefined;
+    getQueryResult(source: string, credential: unknown, queryString: string, sessionKey?: string, renewCache?: boolean): QueryResult | undefined;
+    getQueryResult(source: string, credential: unknown, queryString: string, options?: CacheOptions | string, renewCache?: boolean): QueryResult | undefined;
     setQueryResult(source: string, credential: unknown, queryString: string, result: unknown, sessionKey?: string): QueryResult;
     setQueryResult(source: string, credential: unknown, queryString: string, result: unknown, options?: CacheOptions | string): QueryResult;
-    applyState(items: ArrayOf<V>, value: number, as?: boolean): void;
+    getCacheResult(source: string, credential: unknown, queryString: string, cacheValue: CacheOptions, ignoreCache?: IntBool | FirstOf<number, number>): QueryResult | undefined;
+    applyState(items: V | V[], value: number, as?: boolean): void;
     commit(items?: V[]): Promise<boolean>;
     valueOfKey(credential: unknown, name: keyof W, component?: keyof X): unknown;
     settingsOf(source: string, name: keyof W, component?: keyof X): unknown;
@@ -62,13 +61,13 @@ export interface ClientDbConstructor<T extends IHost = IHost, U extends ClientMo
     readonly TRANSACTION_ABORT: number;
     readonly TRANSACTION_FAIL: number;
     loadSettings(settings: Pick<Settings, "process" | "memory">, password?: string): boolean;
-    getTimeout(value: Undef<NumString | TimeoutAction>): number;
-    convertTime(value: NumString): number;
-    findResult(source: string, credential: unknown, queryString: string, timeout: number, sessionKey?: string | boolean, renewCache?: boolean): Undef<QueryResult>;
+    getTimeout(value: number | string | TimeoutAction | undefined): number;
+    convertTime(value: number | string): number;
+    findResult(source: string, credential: unknown, queryString: string, timeout: number, sessionKey?: string | boolean, renewCache?: boolean): QueryResult | undefined;
     storeResult(source: string, credential: unknown, queryString: string, result: QueryResult, options: StoreResultOptions): QueryResult;
     storeResult(source: string, credential: unknown, queryString: string, result: QueryResult, sessionKey: string, sessionExpires: number): QueryResult;
     storeResult(source: string, credential: unknown, queryString: string, result: QueryResult, cache: DbCacheValue): QueryResult;
-    storeResult(source: string, credential: unknown, queryString: string, result: QueryResult, cache: Undef<DbCacheValue>, options: StoreResultOptions): QueryResult;
+    storeResult(source: string, credential: unknown, queryString: string, result: QueryResult, cache: DbCacheValue | undefined, options: StoreResultOptions): QueryResult;
     purgeResult(prefix?: string): Promise<number>;
     extractUUID(credential: unknown): string;
     setPoolConfig(value: unknown): void;
@@ -91,14 +90,14 @@ export interface AbortComponentConstructor {
 }
 
 export interface IPermission {
-    setDiskRead(pathname?: ArrayOf<string>, enabled?: boolean): void;
-    setDiskWrite(pathname?: ArrayOf<string>, enabled?: boolean): void;
-    setUNCRead(pathname?: ArrayOf<string>, enabled?: boolean): void;
-    setUNCWrite(pathname?: ArrayOf<string>, enabled?: boolean): void;
-    getDiskRead(): ArrayOf<string>;
-    getDiskWrite(): ArrayOf<string>;
-    getUNCRead(): ArrayOf<string>;
-    getUNCWrite(): ArrayOf<string>;
+    setDiskRead(pathname?: string | string[], enabled?: boolean): void;
+    setDiskWrite(pathname?: string | string[], enabled?: boolean): void;
+    setUNCRead(pathname?: string | string[], enabled?: boolean): void;
+    setUNCWrite(pathname?: string | string[], enabled?: boolean): void;
+    getDiskRead(): string | string[];
+    getDiskWrite(): string | string[];
+    getUNCRead(): string | string[];
+    getUNCWrite(): string | string[];
     hasDiskRead(pathname: string): boolean;
     hasDiskWrite(pathname: string): boolean;
     hasUNCRead(pathname: string): boolean;
@@ -110,12 +109,12 @@ export interface IPermission {
 }
 
 export interface PermissionConstructor {
-    create(settings: PermittedDirectories, freeze?: boolean): Null<IPermission>;
-    create(settings: PermittedDirectories, parent: Null<IPermission>, freeze?: boolean): Null<IPermission>;
+    create(settings: PermittedDirectories, freeze?: boolean): IPermission | null;
+    create(settings: PermittedDirectories, parent: IPermission | null, freeze?: boolean): IPermission | null;
     validate(settings: unknown): settings is PermittedDirectories;
     clone(permission: IPermission, freeze?: boolean): IPermission;
-    match(pathname: string, pattern: ArrayOf<string>): boolean;
-    toPosix(value: unknown): ArrayOf<string>;
+    match(pathname: string, pattern: string | string[]): boolean;
+    toPosix<T>(value: T): T extends Array<unknown> ? string | string[] : string;
     readonly prototype: IPermission;
     new(freeze?: boolean): IPermission;
 }
@@ -131,20 +130,22 @@ export interface PermissionAction {
     permission?: PermittedDirectories;
 }
 
-export interface HostInitConfig extends PlainObject, RequestBase<HostInitLog> {
+export interface HostInitConfig<T extends HostInitLog = HostInitLog> extends PlainObject, RequestBase<T> {
     username?: string;
+    remoteIp?: string;
     ignoreModules?: string[];
 }
 
 export interface HostInitLog {
     enabled?: boolean;
-    level?: NumString;
-    exclude?: ArrayOf<string>;
+    level?: number | string;
+    exclude?: string | string[];
     useColor?: boolean;
+    silent?: boolean;
     showProgress?: boolean;
 }
 
-export interface PermittedDirectories extends PermissionReadWrite<ArrayOf<string>> {
+export interface PermittedDirectories extends PermissionReadWrite<string | string[]> {
     inherit?: boolean;
 }
 
@@ -158,7 +159,7 @@ export interface StoreResultOptions {
 export interface CacheOptions {
     value?: DbCacheValue;
     renewCache?: boolean;
-    exclusiveOf?: [number, number?, number?];
+    exclusiveOf?: FirstOf<number, number>;
     sessionKey?: string;
 }
 
@@ -167,7 +168,7 @@ export interface ThreadInfo {
     startTime: number;
     username?: string;
     sessionId?: string;
-    broadcastId?: ArrayOf<string>;
+    broadcastId?: string | string[];
 }
 
 export interface ThreadCountStat {