@e-mc/types 0.7.8 → 0.7.10

package/constant.d.ts

@@ -1,5 +1,5 @@
 export const enum INTERNAL {
-    VERSION = '0.7.8',
+    VERSION = '0.7.10',
     TEMP_DIR = 'tmp',
     CJS = '__cjs__'
 }

package/index.js

@@ -1,9 +1,11 @@
 "use strict";
-exports.randomString = exports.decryptUTF8 = exports.encryptUTF8 = exports.getEncoding = exports.asFunction = exports.coerceObject = exports.cloneObject = exports.cascadeObject = exports.alignSize = exports.formatSize = exports.renameExt = exports.escapePattern = exports.hasGlob = exports.convertTime = exports.formatTime = exports.parseExpires = exports.parseTime = exports.isEmpty = exports.isString = exports.isObject = exports.isPlainObject = exports.isArray = exports.setTempDir = exports.getTempDir = exports.setLogCurrent = exports.getLogCurrent = exports.existsFlag = exports.mainFlag = exports.processFlag = exports.modifiedFlag = exports.watchFlag = exports.usingFlag = exports.cloneFlag = exports.ignoreFlag = exports.hasBit = exports.createAbortError = exports.IMPORT_MAP = exports.THRESHOLD = exports.READDIR_SORT = exports.WATCH_EVENT = exports.TRANSFER_TYPE = exports.DB_TRANSACTION = exports.DB_TYPE = exports.FETCH_TYPE = exports.DOWNLOAD_TYPE = exports.ERR_CODE = exports.ASSET_FLAG = exports.FILE_TYPE = exports.STATUS_TYPE = exports.LOG_TYPE = void 0;
-exports.generateUUID = exports.incrementUUID = exports.purgeMemory = exports.errorMessage = exports.errorValue = exports.validateUUID = void 0;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.errorValue = exports.validateUUID = exports.randomString = exports.decryptUTF8 = exports.encryptUTF8 = exports.getEncoding = exports.asFunction = exports.coerceObject = exports.cloneObject = exports.cascadeObject = exports.formatSize = exports.renameExt = exports.escapePattern = exports.hasGlob = exports.convertTime = exports.formatTime = exports.parseExpires = exports.parseTime = exports.isEmpty = exports.isString = exports.isObject = exports.isPlainObject = exports.isArray = exports.setTempDir = exports.getTempDir = exports.setLogCurrent = exports.getLogCurrent = exports.existsFlag = exports.mainFlag = exports.processFlag = exports.modifiedFlag = exports.watchFlag = exports.usingFlag = exports.cloneFlag = exports.ignoreFlag = exports.hasBit = exports.createAbortError = exports.IMPORT_MAP = exports.THRESHOLD = exports.READDIR_SORT = exports.WATCH_EVENT = exports.DB_TRANSACTION = exports.DB_TYPE = exports.FETCH_TYPE = exports.DOWNLOAD_TYPE = exports.ERR_CODE = exports.ASSET_FLAG = exports.FILE_TYPE = exports.STATUS_TYPE = exports.LOG_TYPE = void 0;
+exports.generateUUID = exports.purgeMemory = exports.errorMessage = void 0;
 const path = require("path");
 const fs = require("fs");
 const crypto = require("crypto");
+const uuid = require("uuid");
 const bytes = require("bytes");
 class AbortError extends Error {
     constructor() {
@@ -13,15 +15,11 @@ 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_ARROW = /^(async\s+)?(\(([^)]*)\)\s*=>\s*(?:\{([\S\s]*)\}|(?!\s|{)((?:(?<!return\s+)(?:"[^"\n]*"|'[^'\n]*'|`[^`]*`|[^\n;"'`]))*;)))$/;
-const REGEXP_GLOB = /(?<!\\)(?:(?:[^*]|^)\*{1,2}(?:[^*]|$)|\{[^}]+\}|\[[!^][^\]]+\]|[!?*+@]\([^)]+\))/;
+const REGEXP_FUNCTION = /^(async\s+)?(function(?:\b|\s+)([\w_$]*)\s*\(([^)]*)\)\s*\{([\S\s]*)\})$/;
 const ASYNC_FUNCTION = Object.getPrototypeOf(async () => { }).constructor;
 let CACHE_COERCED = new WeakSet();
 let LOG_CURRENT = null;
 let TEMP_DIR = path.join(process.cwd(), "tmp");
-let INCREMENT_COUNT = 65536;
-let INCREMENT_PREFIX = '';
 function fromObject(value, typedArray) {
     if (isObject(value)) {
         if (value instanceof Map) {
@@ -236,12 +234,6 @@ var DB_TRANSACTION;
     DB_TRANSACTION[DB_TRANSACTION["AUTH"] = 64] = "AUTH";
     DB_TRANSACTION[DB_TRANSACTION["CACHE"] = 128] = "CACHE";
 })(DB_TRANSACTION || (exports.DB_TRANSACTION = DB_TRANSACTION = {}));
-var TRANSFER_TYPE;
-(function (TRANSFER_TYPE) {
-    TRANSFER_TYPE[TRANSFER_TYPE["DISK"] = 1] = "DISK";
-    TRANSFER_TYPE[TRANSFER_TYPE["STREAM"] = 2] = "STREAM";
-    TRANSFER_TYPE[TRANSFER_TYPE["CHUNK"] = 4] = "CHUNK";
-})(TRANSFER_TYPE || (exports.TRANSFER_TYPE = TRANSFER_TYPE = {}));
 var WATCH_EVENT;
 (function (WATCH_EVENT) {
     WATCH_EVENT["MODIFIED"] = "modified";
@@ -341,9 +333,8 @@ var IMPORT_MAP;
     IMPORT_MAP["@squared-functions/document/packages/terser"] = "@pi-r/terser";
     IMPORT_MAP["@squared-functions/document/packages/uglify-js"] = "@pi-r/uglify-js";
 })(IMPORT_MAP || (exports.IMPORT_MAP = IMPORT_MAP = {}));
-function createAbortError(reject) {
-    const result = new AbortError();
-    return (reject ? Promise.reject(result) : result);
+function createAbortError() {
+    return new AbortError();
 }
 exports.createAbortError = createAbortError;
 function hasBit(value, flags) {
@@ -411,7 +402,7 @@ function isArray(value) {
 }
 exports.isArray = isArray;
 function isPlainObject(value) {
-    return typeof value === 'object' && value !== null && (value.constructor === Object || Object.getPrototypeOf(value) === null);
+    return value && typeof value === 'object' ? value.constructor === Object || Object.getPrototypeOf(value) === null : false;
 }
 exports.isPlainObject = isPlainObject;
 function isObject(value) {
@@ -429,8 +420,9 @@ exports.isEmpty = isEmpty;
 function parseTime(value, start = 0) {
     const seconds = +value;
     if (isNaN(seconds) && isString(value)) {
-        let result = 0;
-        for (const match of value.toLowerCase().matchAll(/\b([\d.]+)\s*(y|M|w|d|h|ms?|s)\b/g)) {
+        const pattern = /\b([\d.]+)\s*(y|M|w|d|h|ms?|s)\b/g;
+        let result = 0, match = null;
+        while (match = pattern.exec(value.toLowerCase())) {
             const n = +match[1];
             if (isNaN(n)) {
                 continue;
@@ -490,13 +482,13 @@ function formatTime(value, elapsed, char = ' ') {
     if (value < 1000) {
         return value + 'ms';
     }
-    if (value >= 3600000) {
-        const h = Math.floor(value / 3600000);
+    const h = Math.floor(value / 3600000);
+    if (h > 0) {
         value -= h * 3600000;
         result.push(h + 'h');
     }
-    if (value >= 60000) {
-        const m = Math.floor(value / 60000);
+    const m = Math.floor(value / 60000);
+    if (m > 0) {
         value -= m * 60000;
         result.push(m + 'm');
     }
@@ -507,19 +499,15 @@ function formatTime(value, elapsed, char = ' ') {
 }
 exports.formatTime = formatTime;
 function convertTime(value, format) {
-    let result;
     if (Array.isArray(value)) {
-        const time = Math.ceil((value[0] * 1000000000 + value[1]) / 1000000);
-        result = format ? formatTime(time) : time;
+        const result = Math.ceil((value[0] * 1000000000 + value[1]) / 1000000);
+        return format ? formatTime(result) : result;
     }
-    else {
-        result = parseTime(value);
-    }
-    return result;
+    return parseTime(value);
 }
 exports.convertTime = convertTime;
 function hasGlob(value) {
-    return REGEXP_GLOB.test(value);
+    return /(?<!\\)(?:(?:[^*]|^)\*{1,2}(?:[^*]|$)|\{[^}]+\}|\[[!^][^\]]+\]|[!?*+@]\([^)]+\))/.test(value);
 }
 exports.hasGlob = hasGlob;
 function escapePattern(value, lookBehind) {
@@ -581,46 +569,11 @@ function renameExt(value, ext, when) {
 }
 exports.renameExt = renameExt;
 function formatSize(value, options) {
-    let result;
-    if (typeof value === 'number') {
-        result = bytes(value, options) || ('0' + (options?.unitSeparator || '') + 'B');
-    }
-    else {
-        result = bytes(value) || 0;
-    }
-    return result;
+    return (typeof value === 'number' ? bytes(value, options) : bytes(value));
 }
 exports.formatSize = formatSize;
-function alignSize(value, kb = 0, factor = 0) {
-    if (value === undefined) {
-        return NaN;
-    }
-    let result = 0;
-    switch (typeof value) {
-        case 'number':
-            if (value < 0) {
-                return NaN;
-            }
-            result = Math.ceil(factor > 0 ? value * Math.pow(1024, factor) : value);
-            break;
-        case 'string':
-            result = formatSize(value);
-            if (result < 0) {
-                return NaN;
-            }
-            break;
-        default:
-            return NaN;
-    }
-    if (kb > 0) {
-        kb = Math.ceil(kb) * 1024;
-        return Math.ceil(result / kb) * kb;
-    }
-    return result;
-}
-exports.alignSize = alignSize;
 function cascadeObject(data, query, fallback) {
-    if (isObject(data)) {
+    if (isObject(data) && isString(query)) {
         const names = query.trim().split(/(?<!\\)\./).map(item => item.includes('.') ? item.replace(/\\(?=\.)/g, '') : item);
         for (let i = 0, length = names.length, match, current = data; i < length; ++i) {
             if (!(match = /^(.+?)(?:\[(.+)\])?$/.exec(names[i]))) {
@@ -753,16 +706,16 @@ function coerceObject(data, parseString, cache) {
     }
     if (!parseString) {
         parseString = (value) => {
-            if (value.length <= 8) {
-                return null;
-            }
-            switch (value.substring(0, 3)) {
-                case 'new': {
-                    const match = /^new\s+(Date|RegExp|URL|Map|WeakMap|Set|WeakSet)\(([\S\s]*)\)$/.exec(value.trimEnd());
-                    if (match) {
+            if (value.length > 8) {
+                switch (value.substring(0, 3)) {
+                    case 'new': {
+                        const match = /^new\s+(Date|RegExp|URL|Map|WeakMap|Set|WeakSet)\(([\S\s]*)\)$/.exec(value.trimEnd());
+                        if (!match) {
+                            break;
+                        }
                         try {
                             const removeQuotes = (content) => content.trim().replace(/^["']/g, '').replace(/["']$/g, '').trim();
-                            const errorCreate = () => errorValue("Invalid parameters", match[2].trim());
+                            const errorCreate = () => errorValue('Invalid parameters', match[2].trim());
                             switch (match[1]) {
                                 case 'Date':
                                     return new Date(match[2].replace(/["']/g, '').trim());
@@ -799,39 +752,39 @@ function coerceObject(data, parseString, cache) {
                         catch {
                             return undefined;
                         }
+                        break;
                     }
-                    break;
+                    case 'asy':
+                        if (value.substring(3, 5) === 'nc') {
+                            return asFunction(value);
+                        }
+                        break;
+                    case 'fun':
+                        if (value.substring(3, 8) === 'ction') {
+                            return asFunction(value);
+                        }
+                        break;
+                    case 'Num':
+                        switch (value) {
+                            case 'Number.EPSILON':
+                                return Number.EPSILON;
+                            case 'Number.MAX_SAFE_INTEGER':
+                                return Number.MAX_SAFE_INTEGER;
+                            case 'Number.MAX_VALUE':
+                                return Number.MAX_VALUE;
+                            case 'Number.MIN_SAFE_INTEGER':
+                                return Number.MIN_SAFE_INTEGER;
+                            case 'Number.MIN_VALUE':
+                                return Number.MIN_VALUE;
+                            case 'Number.NaN':
+                                return Number.NaN;
+                            case 'Number.NEGATIVE_INFINITY':
+                                return Number.NEGATIVE_INFINITY;
+                            case 'Number.POSITIVE_INFINITY':
+                                return Number.POSITIVE_INFINITY;
+                        }
+                        break;
                 }
-                case 'asy':
-                    if (value.substring(3, 5) === 'nc') {
-                        return asFunction(value);
-                    }
-                    break;
-                case 'fun':
-                    if (value.substring(3, 8) === 'ction') {
-                        return asFunction(value);
-                    }
-                    break;
-                case 'Num':
-                    switch (value) {
-                        case 'Number.EPSILON':
-                            return Number.EPSILON;
-                        case 'Number.MAX_SAFE_INTEGER':
-                            return Number.MAX_SAFE_INTEGER;
-                        case 'Number.MAX_VALUE':
-                            return Number.MAX_VALUE;
-                        case 'Number.MIN_SAFE_INTEGER':
-                            return Number.MIN_SAFE_INTEGER;
-                        case 'Number.MIN_VALUE':
-                            return Number.MIN_VALUE;
-                        case 'Number.NaN':
-                            return Number.NaN;
-                        case 'Number.NEGATIVE_INFINITY':
-                            return Number.NEGATIVE_INFINITY;
-                        case 'Number.POSITIVE_INFINITY':
-                            return Number.POSITIVE_INFINITY;
-                    }
-                    break;
             }
             return null;
         };
@@ -850,10 +803,10 @@ function asFunction(value, sync = true) {
         return value;
     }
     let match;
-    if (isString(value) && (match = REGEXP_FUNCTION.exec(value = value.trim()) || REGEXP_FUNCTION_ARROW.exec(value))) {
+    if (isString(value) && (match = REGEXP_FUNCTION.exec(value = value.trim()))) {
         if (!sync || match[1]) {
-            const args = match[3].trim().split(/\s*,\s*/);
-            args.push(match[4] || (match[5] && (match[5] = 'return ' + match[5])));
+            const args = match[4].trim().split(/\s*,\s*/);
+            args.push(match[5]);
             return new ASYNC_FUNCTION(...args);
         }
         try {
@@ -869,22 +822,7 @@ function asFunction(value, sync = true) {
 }
 exports.asFunction = asFunction;
 function getEncoding(value, fallback = 'utf-8') {
-    if (typeof value === 'string') {
-        switch (value = value.trim().toLowerCase()) {
-            case 'utf8':
-            case 'utf-8':
-            case 'utf16le':
-                return value;
-            case 'utf-16le':
-            case 'utf16':
-            case 'utf-16':
-                return 'utf16le';
-        }
-        if (Buffer.isEncoding(value)) {
-            return value;
-        }
-    }
-    return fallback;
+    return typeof value === 'string' && Buffer.isEncoding(value = value.trim().toLowerCase()) ? value : fallback;
 }
 exports.getEncoding = getEncoding;
 function encryptUTF8(algorithm, key, iv, data, encoding = 'hex') {
@@ -913,35 +851,40 @@ function randomString(format, dictionary) {
     if (format !== '8-4-4-4-12' || dictionary) {
         const match = format.match(/(\d+|[^\d]+)/g);
         if (match) {
-            dictionary || (dictionary = '0123456789abcdef');
-            const result = format.match(/(\d+|[^\d[]+|\[[^\]]+\]|\[)/g)?.reduce((a, b) => {
-                let length, available;
-                if (b.startsWith('[') && b.endsWith(']')) {
-                    length = 1;
-                    available = b.substring(1, b.length - 1);
-                }
-                else {
-                    if (isNaN(length = +b)) {
-                        return a + b;
+            try {
+                dictionary || (dictionary = '0123456789abcdef');
+                const result = format.match(/(\d+|[^\d[]+|\[[^\]]+\]|\[)/g).reduce((a, b) => {
+                    let length, available;
+                    if (b.startsWith('[') && b.endsWith(']')) {
+                        length = 1;
+                        available = b.substring(1, b.length - 1);
                     }
-                    available = dictionary;
-                }
-                const upperBound = available.length;
-                if (isFunction(crypto.getRandomValues) && length > 1 && length <= 65536) {
-                    const items = crypto.getRandomValues(new Uint32Array(length));
-                    for (let i = 0; i < length; i++) {
-                        a += available[items[i] % upperBound];
+                    else {
+                        length = +b;
+                        available = dictionary;
                     }
-                }
-                else {
-                    for (let i = 0; i < length; ++i) {
-                        a += available[Math.floor(Math.random() * upperBound)];
+                    if (!isNaN(length)) {
+                        const j = available.length;
+                        if (isFunction(crypto.getRandomValues) && length > 1) {
+                            const items = crypto.getRandomValues(new Uint32Array(length));
+                            for (let i = 0; i < length; i++) {
+                                a += available[items[i] % j];
+                            }
+                        }
+                        else {
+                            for (let i = 0; i < length; ++i) {
+                                a += available[Math.floor(Math.random() * j)];
+                            }
+                        }
+                        return a;
                     }
+                    return a + b;
+                }, '');
+                if (result) {
+                    return result;
                 }
-                return a;
-            }, '');
-            if (result) {
-                return result;
+            }
+            catch {
             }
         }
     }
@@ -964,12 +907,4 @@ function purgeMemory(percent) {
     CACHE_COERCED = new WeakSet();
 }
 exports.purgeMemory = purgeMemory;
-function incrementUUID(restart) {
-    if (restart || INCREMENT_COUNT === 65536) {
-        INCREMENT_COUNT = 0;
-        INCREMENT_PREFIX = (0, exports.generateUUID)().substring(0, 33);
-    }
-    return INCREMENT_PREFIX + (INCREMENT_COUNT++).toString(16).padStart(4, '0');
-}
-exports.incrementUUID = incrementUUID;
-exports.generateUUID = crypto.randomUUID.bind(crypto);
+exports.generateUUID = typeof crypto.randomUUID === 'function' ? crypto.randomUUID.bind(crypto) : uuid.v4;

package/lib/compress.d.ts

@@ -2,21 +2,21 @@ import type { CompressFormat as ICompressFormat } from './squared';
 
 import type { LogBaseOptions, LogTime } from './logger';
 
-interface CompressFormat extends ICompressFormat, LogBaseOptions {
+type ResultCallback<T = Null<Buffer | Uint8Array>> = (err: unknown, data?: T, ext?: string) => void;
+type ResultData = Null<Buffer | Uint8Array> | string;
+
+export interface CompressFormat extends ICompressFormat, LogBaseOptions {
     filename?: string;
     startTime?: LogTime;
     etag?: string;
     proxyUrl?: string | ((uri: string) => Undef<string>);
 }
 
-interface Woff {
+export interface Woff {
     toWoff(this: void, data: BufferLike): Buffer;
     toSfnt(this: void, data: BufferLike): Buffer;
 }
 
-type ResultCallback<T = Null<Buffer | Uint8Array>> = (err: unknown, data?: T, ext?: string) => void;
-type ResultData = Null<Buffer | Uint8Array> | string;
-
 export type BufferLike = Buffer | Uint8Array | ArrayBuffer | SharedArrayBuffer | readonly number[];
 export type TryFileCompressor = (data: string | Buffer, output: string, config: CompressFormat, callback?: TryFileResult) => Void<Promise<ResultData>>;
 export type TryFileCompressorAsync = (data: string | Buffer, output: string, config: CompressFormat) => Promise<ResultData>;

package/package.json

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