@e-mc/types 0.8.1 → 0.8.2

package/README.md

@@ -1,5 +1,7 @@
 ### @e-mc/types
 
+https://e-mc.readthedocs.io
+
 ### LICENSE
 
 BSD 3-Clause

package/constant.d.ts

@@ -1,5 +1,5 @@
 export const enum INTERNAL {
-    VERSION = '0.8.1',
+    VERSION = '0.8.2',
     TEMP_DIR = 'tmp', // eslint-disable-line @typescript-eslint/no-shadow
     CJS = '__cjs__'
 }
@@ -153,6 +153,10 @@ export const enum ERR_IMAGE {
     METHOD_ARGS = 'Invalid method arguments'
 }
 
+export const enum ERR_HTTP {
+    HEADERS = 'Unable to process headers'
+}
+
 export const enum DB_TRANSACTION {
     ACTIVE = 1,
     PARTIAL = 2,

package/index.js

@@ -15,7 +15,8 @@ class AbortError extends Error {
     }
 }
 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\s]*)\})$/;
+const REGEXP_FUNCTION = /^(async\s+)?(function(?:\b|\s+)[\w_$]*\s*\(([^)]*)\)\s*\{([\S\s]*)\})$/;
+const REGEXP_FUNCTION_ARROW = /^(async\s+)?(\s*\(([^)]*)\)\s*=>\s*(?:\{([\S\s]*)\}|(?!\s|{)((?:(?<!return\s+)(?:"[^"\n]*"|'[^'\n]*'|`[^`]*`|[^\n;"'`]))*;)))$/;
 const ASYNC_FUNCTION = Object.getPrototypeOf(async () => { }).constructor;
 let CACHE_COERCED = new WeakSet();
 let LOG_CURRENT = null;
@@ -805,10 +806,10 @@ function asFunction(value, sync = true) {
         return value;
     }
     let match;
-    if (isString(value) && (match = REGEXP_FUNCTION.exec(value = value.trim()))) {
+    if (isString(value) && (match = REGEXP_FUNCTION.exec(value = value.trim()) || REGEXP_FUNCTION_ARROW.exec(value))) {
         if (!sync || match[1]) {
-            const args = match[4].trim().split(/\s*,\s*/);
-            args.push(match[5]);
+            const args = match[3].trim().split(/\s*,\s*/);
+            args.push(match[4] || (match[5] && (match[5] = 'return ' + match[5])));
             return new ASYNC_FUNCTION(...args);
         }
         try {
@@ -824,7 +825,22 @@ function asFunction(value, sync = true) {
 }
 exports.asFunction = asFunction;
 function getEncoding(value, fallback = 'utf-8') {
-    return typeof value === 'string' && Buffer.isEncoding(value = value.trim().toLowerCase()) ? value : fallback;
+    if (typeof value === 'string') {
+        switch (value = value.trim().toLowerCase()) {
+            case 'utf8':
+            case 'utf-8':
+            case 'utf16le':
+            case 'utf-16le':
+                return value;
+            case 'utf16':
+            case 'utf-16':
+                return 'utf-16le';
+        }
+        if (Buffer.isEncoding(value)) {
+            return value;
+        }
+    }
+    return fallback;
 }
 exports.getEncoding = getEncoding;
 function encryptUTF8(algorithm, key, iv, data, encoding = 'hex') {

package/lib/http.d.ts

@@ -45,6 +45,7 @@ export const enum HTTP_STATUS {
     UNPROCESSABLE_ENTITY = 422,
     LOCKED = 423,
     FAILED_DEPENDENCY = 424,
+    TOO_EARLY = 425,
     UPGRADE_REQUIRED = 426,
     PRECONDITION_REQUIRED = 428,
     TOO_MANY_REQUESTS = 429,
@@ -62,6 +63,7 @@ export const enum HTTP_STATUS {
     VARIANT_ALSO_NEGOTIATES = 506,
     INSUFFICIENT_STORAGE = 507,
     LOOP_DETECTED = 508,
+    BANDWIDTH_LIMIT_EXCEEDED = 509,
     NOT_EXTENDED = 510,
     NETWORK_AUTHENTICATION_REQUIRED = 511,
     WEB_SERVER_IS_DOWN = 521,

package/lib/index.d.ts

@@ -17,7 +17,7 @@ import type { CommandData, CropData, QualityData, ResizeData, RotateData, Transf
 import type { ExecCommand, LOG_TYPE, LogArguments, LogComponent, LogDate, LogFailOptions, LogMessageOptions, LogOptions, LogProcessOptions, LogTime, LogType, LogValue, STATUS_TYPE, StatusType } from './logger';
 import type { AsHashOptions, CheckSemVerOptions, CopyDirOptions, CopyDirResult, CopyFileOptions, CreateDirOptions, DeleteFileOptions, GetTempDirOptions, MoveFileOptions, NormalizeFlags, ParseFunctionOptions, PermissionOptions, ProtocolType, ReadBufferOptions, ReadFileCallback, ReadFileOptions, ReadHashOptions, ReadTextOptions, RemoveDirOptions, WriteFileOptions } from './module';
 import type { RequestData, Settings } from './node';
-import type { ApplyOptions, Aria2Options, BufferFormat, DataEncodedResult, DataObjectResult, FormDataPart, HeadersOnCallback, HostConfig, OpenOptions, PostOptions, ProxySettings, ReadExpectType, RequestInit } from './request';
+import type { ApplyOptions, Aria2Options, BufferFormat, DataEncodedResult, DataObjectResult, FormDataPart, HeadersOnCallback, HostConfig, OpenOptions, PostOptions, ProxySettings, ReadExpectType, RequestInit, StatusOnCallback } from './request';
 import type { ClientModule, CloudModule, CloudServiceOptions, CompressModule, CompressSettings, DbCoerceSettings, DbModule, DbSourceOptions, DnsLookupSettings, DocumentComponent, DocumentComponentOption, DocumentModule, HttpConnectSettings, HttpMemorySettings, ImageModule, RequestModule, RequestSettings, TaskModule, WatchModule } from './settings';
 import type { Command, SpawnResult } from './task';
 import type { IFileGroup, ModifiedPostFinalizeListener, SecureOptions, WatchInitResult } from './watch';
@@ -109,6 +109,7 @@ declare namespace functions {
         clamp(value: unknown, min?: number, max?: number): number;
         isBinary(mime: unknown): mime is string;
         toABGR(buffer: Uint8Array | Buffer): Buffer;
+        /* @deprecated IImage.using (v0.9) */
         using?<V extends ExternalAsset>(this: T, instance: IImage<T, U>, data: IFileThread<V>, command: string): Promise<unknown>;
         readonly prototype: IImage<T, U>;
         new(module?: U): IImage<T, U>;
@@ -126,6 +127,7 @@ declare namespace functions {
 
     interface TaskConstructor<T extends IHost = IHost, U extends TaskModule = TaskModule> extends ModuleConstructor {
         finalize<V extends ExternalAsset>(this: T, instance: ITask<T, U>, assets: V[]): Promise<unknown>;
+        /* @deprecated ITask.using (v0.9) */
         using?<V extends ExternalAsset>(this: T, instance: ITask<T, U>, assets: V[], preceding?: boolean): Promise<unknown>;
         readonly prototype: ITask<T, U>;
         new(module?: U, ...args: unknown[]): ITask<T, U>;
@@ -254,6 +256,7 @@ declare namespace functions {
         writeSourceMap(uri: string, data: SourceCode, options?: SourceMapOptions): Undef<string>;
         updateGradle(source: string, namespaces: string[], value: string, options?: UpdateGradleOptions | boolean): string;
         generateLintTable(messages: LintMessage[], options: GenerateLintTableOptions): LogComponent[];
+        /* @deprecated IDocument.using (v0.9) */
         using?(this: T, instance: IDocument<T, U, V, W, X, Y>, file: U): Promise<unknown>;
         cleanup?(this: T, instance: IDocument<T, U, V, W, X, Y>): Promise<unknown>;
         sanitizeAssets?(assets: U[], exclusions?: U[]): U[];
@@ -302,9 +305,12 @@ declare namespace functions {
         proxy: Null<ProxySettings>;
         init(config?: RequestInit): this;
         apply(options: ApplyOptions): this;
-        addDns(hostname: string, address: string, family?: NumString): void;
+        addDns(hostname: string, address: string, timeout: number): void;
+        addDns(hostname: string, address: string, family?: NumString, timeout?: number): void;
         lookupDns(hostname: string): LookupFunction;
         proxyOf(uri: string, localhost?: boolean): Undef<ProxySettings>;
+        statusOn(name: ArrayOf<number>, callback: StatusOnCallback): void;
+        statusOn(name: ArrayOf<number>, patternUrl: string, callback: StatusOnCallback): void;
         headersOn(name: ArrayOf<string>, callback: HeadersOnCallback): void;
         headersOn(name: ArrayOf<string>, patternUrl: string, callback: HeadersOnCallback): void;
         headersOf(uri: string): Undef<OutgoingHttpHeaders>;

package/lib/logger.d.ts

@@ -40,6 +40,7 @@ export interface LoggerFormat<T = NumString> {
     bold?: boolean;
     justify?: TextAlign;
     unit?: string;
+    as?: StringMap;
 }
 
 export interface LoggerStatus<T = boolean> {

package/lib/request.d.ts

@@ -128,4 +128,5 @@ export type BufferFormat = "json" | "yaml" | "json5" | "xml" | "toml";
 export type ReadExpectType = "always" | "string" | "none";
 export type DataEncodedResult<T extends { encoding?: BufferEncoding }> = T extends { encoding: BufferEncoding } ? string : Null<BufferContent>;
 export type DataObjectResult<T extends { format?: unknown; encoding?: BufferEncoding }> = T extends { format: string | PlainObject } ? Null<object> : DataEncodedResult<T>;
-export type HeadersOnCallback = (value: IncomingHttpHeaders, url?: URL) => Void<boolean>;
+export type StatusOnCallback = (code: number, headers: IncomingHttpHeaders, url?: URL) => Void<boolean>;
+export type HeadersOnCallback = (headers: IncomingHttpHeaders, url?: URL) => Void<boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/types",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Type definitions for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",