Compare commits
No commits in common. "develop" and "0.22.11" have entirely different histories.
@ -6,10 +6,10 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<script type="module">
|
<script type="module">
|
||||||
import {PathEvent} from './dist/index.mjs';
|
import {adjustTz, formatDate} from './dist/index.mjs';
|
||||||
|
|
||||||
console.log(PathEvent.filter(['payments/ztimson:cr', 'logs/momentum:c', 'data/Testing:r'], 'data'));
|
console.log(formatDate(new Date(), 'HH:mm:ss z'));
|
||||||
console.log(PathEvent.filter(['data/Submissions/Test:r'], 'data/Submissions/Test/test.html'));
|
console.log(formatDate(adjustTz(new Date(), 0), 'HH:mm:ss z', 'UTC'));
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ztimson/utils",
|
"name": "@ztimson/utils",
|
||||||
"version": "0.23.22",
|
"version": "0.22.11",
|
||||||
"description": "Utility library",
|
"description": "Utility library",
|
||||||
"author": "Zak Timson",
|
"author": "Zak Timson",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@ -14,9 +14,9 @@
|
|||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
"exports": {
|
"exports": {
|
||||||
".": {
|
".": {
|
||||||
"types": "./dist/index.d.ts",
|
|
||||||
"import": "./dist/index.mjs",
|
"import": "./dist/index.mjs",
|
||||||
"require": "./dist/index.cjs"
|
"require": "./dist/index.cjs",
|
||||||
|
"types": "./dist/index.d.ts"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@ -34,7 +34,7 @@
|
|||||||
"typedoc": "^0.26.7",
|
"typedoc": "^0.26.7",
|
||||||
"typescript": "^5.3.3",
|
"typescript": "^5.3.3",
|
||||||
"vite": "^5.0.12",
|
"vite": "^5.0.12",
|
||||||
"vite-plugin-dts": "^4.5.3"
|
"vite-plugin-dts": "^3.7.2"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"dist"
|
"dist"
|
||||||
|
|||||||
@ -1,141 +0,0 @@
|
|||||||
export type Arg<T = any> = {
|
|
||||||
/** Argument/property name */
|
|
||||||
name: string;
|
|
||||||
/** Argument description for help page */
|
|
||||||
desc: string;
|
|
||||||
/** Available shorthands */
|
|
||||||
flags?: string[];
|
|
||||||
/** Argument is not required */
|
|
||||||
optional?: boolean;
|
|
||||||
/** Default value if argument is not used */
|
|
||||||
default?: T;
|
|
||||||
/** Collects any unmatched arguments */
|
|
||||||
extras?: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class ArgParser {
|
|
||||||
commands: ArgParser[] = [];
|
|
||||||
args: Arg[] = [];
|
|
||||||
flags: Arg[] = [];
|
|
||||||
defaults!: {[key: string]: any};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a unix-like argument parser to extract flags from the argument list. Can also create help messages.
|
|
||||||
*
|
|
||||||
* @param {string} name Script name
|
|
||||||
* @param {string} desc Help description
|
|
||||||
* @param {(ArgParser | Arg[]} argList Array of CLI arguments
|
|
||||||
* @param {string[]} examples Additional examples to display
|
|
||||||
*/
|
|
||||||
constructor(public readonly name: string,
|
|
||||||
public readonly desc: string,
|
|
||||||
public readonly argList: (ArgParser | Arg)[] = [],
|
|
||||||
public readonly examples: string[] = []
|
|
||||||
) {
|
|
||||||
// Arguments
|
|
||||||
this.commands = argList.filter(arg => arg instanceof ArgParser);
|
|
||||||
this.args = <Arg[]>argList.filter(arg => !(arg instanceof ArgParser) && !arg.flags?.length);
|
|
||||||
this.flags = <Arg[]>[...argList.filter(arg => !(arg instanceof ArgParser) && arg.flags && arg.flags.length),
|
|
||||||
{name: 'help', desc: 'Display command\'s help message', flags: ['-h', '--help'], default: false}];
|
|
||||||
this.defaults = argList.reduce((acc, arg: any) => ({...acc, [arg.name]: arg['extras'] ? [] : (arg.default ?? null)}), {});
|
|
||||||
|
|
||||||
// Examples
|
|
||||||
this.examples = <string[]>[
|
|
||||||
...examples,
|
|
||||||
`[OPTIONS] ${this.args.map(arg => (arg.optional ? `[${arg.name.toUpperCase()}]` : arg.name.toUpperCase()) + (arg.extras ? '...' : '')).join(' ')}`,
|
|
||||||
this.commands.length ? `[OPTIONS] COMMAND` : null,
|
|
||||||
`--help ${this.commands.length ? '[COMMAND]' : ''}`
|
|
||||||
].filter(e => !!e);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Parse an array into an arguments dictionary using the configuration.
|
|
||||||
*
|
|
||||||
* @param {string[]} args Array of arguments to be parsed
|
|
||||||
* @returns {object} Dictionary of arguments with defaults applied
|
|
||||||
*/
|
|
||||||
parse(args: string[]) {
|
|
||||||
// Parse arguments
|
|
||||||
let extras = [], parsed: any = {...this.defaults, '_error': []}, queue = [...args];
|
|
||||||
while(queue.length) {
|
|
||||||
let arg = queue.splice(0, 1)[0];
|
|
||||||
if(arg[0] == '-') { // Flags
|
|
||||||
// Check for combined shorthand
|
|
||||||
if(arg[1] != '-' && arg.length > 2) {
|
|
||||||
queue = [...arg.substring(2).split('').map(a => `-${a}`), ...queue];
|
|
||||||
arg = `-${arg[1]}`;
|
|
||||||
}
|
|
||||||
// Find & add flag
|
|
||||||
const combined = arg.split('=');
|
|
||||||
const argDef = this.flags.find(flag => flag.flags?.includes(combined[0] || arg));
|
|
||||||
if(argDef == null) { // Not found, add to extras
|
|
||||||
extras.push(arg);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const value = argDef.default === false ? true :
|
|
||||||
argDef.default === true ? false :
|
|
||||||
queue.splice(queue.findIndex(q => q[0] != '-'), 1)[0] ||
|
|
||||||
argDef.default;
|
|
||||||
if(value == null) parsed['_error'].push(`Option missing value: ${argDef.name || combined[0]}`);
|
|
||||||
parsed[argDef.name] = value;
|
|
||||||
} else { // Command
|
|
||||||
const c = this.commands.find(command => command.name == arg);
|
|
||||||
if(!!c) {
|
|
||||||
const parsedCommand = c.parse(queue.splice(0, queue.length));
|
|
||||||
Object.keys(parsedCommand).forEach(key => {
|
|
||||||
if(parsed[key] != parsedCommand[key] && parsedCommand[key] == c.defaults[key])
|
|
||||||
delete parsedCommand[key];
|
|
||||||
});
|
|
||||||
parsed = {
|
|
||||||
...parsed,
|
|
||||||
...parsedCommand,
|
|
||||||
_command: c.name
|
|
||||||
};
|
|
||||||
} else extras.push(arg); // Not found, add to extras
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Arguments
|
|
||||||
this.args.filter(arg => !arg.extras).forEach(arg => {
|
|
||||||
if(!arg.optional && !extras.length) parsed['_error'].push(`Argument missing: ${arg.name.toUpperCase()}`);
|
|
||||||
if(extras.length) parsed[arg.name] = extras.splice(0, 1)[0];
|
|
||||||
});
|
|
||||||
// Extras
|
|
||||||
const extraKey = this.args.find(arg => arg.extras)?.name || '_extra';
|
|
||||||
parsed[extraKey] = extras;
|
|
||||||
return parsed;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create help message from the provided description & argument list.
|
|
||||||
*
|
|
||||||
* @returns {string} Help message
|
|
||||||
* @param opts Help options: command - display a commands help, message - override help description
|
|
||||||
*/
|
|
||||||
help(opts: {command?: string, message?: string} = {}): string {
|
|
||||||
const spacer = (text: string) => Array(24 - text.length || 1).fill(' ').join('');
|
|
||||||
|
|
||||||
// Help with specific command
|
|
||||||
if(opts.command) {
|
|
||||||
const argParser = this.commands.find(parser => parser.name == opts.command);
|
|
||||||
if(!argParser) throw new Error(`${opts.command.toUpperCase()} is not a command`)
|
|
||||||
return argParser.help({...opts, command: undefined});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Description
|
|
||||||
let msg = `\n\n${opts.message || this.desc}`;
|
|
||||||
// Examples
|
|
||||||
msg += '\n\nUsage:\t' + this.examples.map(ex => `${this.name} ${ex}`).join('\n\t');
|
|
||||||
// Arguments
|
|
||||||
if(this.args.length) msg += '\n\n\t' + this.args.map(arg =>
|
|
||||||
`${arg.name.toUpperCase()}${spacer(arg.name)}${arg.desc}`).join('\n\t');
|
|
||||||
// Flags
|
|
||||||
msg += '\n\nOptions:\n\t' + this.flags.map(flag => {
|
|
||||||
const flags = flag.flags?.join(', ') || '';
|
|
||||||
return `${flags}${spacer(flags)}${flag.desc}`;
|
|
||||||
}).join('\n\t');
|
|
||||||
// Commands
|
|
||||||
if(this.commands.length) msg += '\n\nCommands:\n\t' + this.commands.map(command =>
|
|
||||||
`${command.name}${spacer(command.name)}${command.desc}`).join('\n\t');
|
|
||||||
return `${msg}\n\n`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
12
src/cache.ts
12
src/cache.ts
@ -1,5 +1,3 @@
|
|||||||
import {deepCopy} from './objects.ts';
|
|
||||||
|
|
||||||
export type CacheOptions = {
|
export type CacheOptions = {
|
||||||
/** Delete keys automatically after x amount of seconds */
|
/** Delete keys automatically after x amount of seconds */
|
||||||
ttl?: number;
|
ttl?: number;
|
||||||
@ -39,11 +37,11 @@ export class Cache<K extends string | number | symbol, T> {
|
|||||||
return new Proxy(this, {
|
return new Proxy(this, {
|
||||||
get: (target: this, prop: string | symbol) => {
|
get: (target: this, prop: string | symbol) => {
|
||||||
if (prop in target) return (target as any)[prop];
|
if (prop in target) return (target as any)[prop];
|
||||||
return deepCopy(target.store[prop as K]);
|
return target.store[prop as K];
|
||||||
},
|
},
|
||||||
set: (target: this, prop: string | symbol, value: any) => {
|
set: (target: this, prop: string | symbol, value: any) => {
|
||||||
if (prop in target) (target as any)[prop] = value;
|
if (prop in target) (target as any)[prop] = value;
|
||||||
else this.set(prop as K, value);
|
else target.store[prop as K] = value;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -60,7 +58,7 @@ export class Cache<K extends string | number | symbol, T> {
|
|||||||
* @return {T[]} Array of items
|
* @return {T[]} Array of items
|
||||||
*/
|
*/
|
||||||
all(): T[] {
|
all(): T[] {
|
||||||
return deepCopy(Object.values(this.store));
|
return Object.values(this.store);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -121,7 +119,7 @@ export class Cache<K extends string | number | symbol, T> {
|
|||||||
* @return {T} Cached item
|
* @return {T} Cached item
|
||||||
*/
|
*/
|
||||||
get(key: K): T {
|
get(key: K): T {
|
||||||
return deepCopy(this.store[key]);
|
return this.store[key];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -139,7 +137,7 @@ export class Cache<K extends string | number | symbol, T> {
|
|||||||
* @return {Record<K, T>}
|
* @return {Record<K, T>}
|
||||||
*/
|
*/
|
||||||
map(): Record<K, T> {
|
map(): Record<K, T> {
|
||||||
return deepCopy(this.store);
|
return structuredClone(this.store);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
12
src/color.ts
12
src/color.ts
@ -1,12 +0,0 @@
|
|||||||
/**
|
|
||||||
* Determine if either black or white provides more contrast to the provided color
|
|
||||||
* @param {string} background Color to compare against
|
|
||||||
* @return {"white" | "black"} Color with the most contrast
|
|
||||||
*/
|
|
||||||
export function blackOrWhite(background: string): 'white' | 'black' {
|
|
||||||
const exploded = background?.match(background.length >= 6 ? /\w\w/g : /\w/g);
|
|
||||||
if(!exploded) return 'black';
|
|
||||||
const [r, g, b] = exploded.map(hex => parseInt(hex, 16));
|
|
||||||
const luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
|
|
||||||
return luminance > 0.5 ? 'black' : 'white';
|
|
||||||
}
|
|
||||||
76
src/csv.ts
76
src/csv.ts
@ -1,56 +1,29 @@
|
|||||||
import {makeArray} from './array.ts';
|
|
||||||
import {ASet} from './aset.ts';
|
import {ASet} from './aset.ts';
|
||||||
import {dotNotation, flattenObj, JSONSanitize} from './objects.ts';
|
import {dotNotation, flattenObj, JSONSanitize} from './objects.ts';
|
||||||
import {LETTER_LIST} from './string.ts';
|
import {LETTER_LIST} from './string.ts';
|
||||||
|
|
||||||
/**
|
|
||||||
* Parse a CSV string into an array of objects
|
|
||||||
*
|
|
||||||
* @param csv String with CSV
|
|
||||||
* @param hasHeaders First line of CSV contains headers
|
|
||||||
* @return {T[]} Array of parsed objects
|
|
||||||
*/
|
|
||||||
export function fromCsv<T = any>(csv: string, hasHeaders=true): T[] {
|
export function fromCsv<T = any>(csv: string, hasHeaders=true): T[] {
|
||||||
|
const row = csv.split('\n');
|
||||||
|
let headers: any = hasHeaders ? row.splice(0, 1)[0] : null;
|
||||||
|
if(headers) headers = headers.match(/(?:[^,"']+|"[^"]*"|'[^']*')+/g);
|
||||||
|
return <T[]>row.map(r => {
|
||||||
function parseLine(line: string): (string | null)[] {
|
function parseLine(line: string): (string | null)[] {
|
||||||
const columns: string[] = [];
|
const parts = line.split(','), columns: string[] = [];
|
||||||
let current = '', inQuotes = false;
|
let quoted = false;
|
||||||
for (let i = 0; i < line.length; i++) {
|
for(const p of parts) {
|
||||||
const char = line[i];
|
if(quoted) columns[columns.length - 1] = columns.at(-1) + ',' + p;
|
||||||
const nextChar = line[i + 1];
|
else columns.push(p);
|
||||||
if (char === '"') {
|
if(/[^"]"$/g.test(p)) {
|
||||||
if (inQuotes && nextChar === '"') {
|
quoted = false;
|
||||||
current += '"'; // Handle escaped quotes
|
} else if(/^"[^"]/g.test(p)) {
|
||||||
i++;
|
quoted = true;
|
||||||
} else inQuotes = !inQuotes;
|
|
||||||
} else if (char === ',' && !inQuotes) {
|
|
||||||
columns.push(current.trim()); // Trim column values
|
|
||||||
current = '';
|
|
||||||
} else current += char;
|
|
||||||
}
|
}
|
||||||
columns.push(current.trim()); // Trim last column value
|
}
|
||||||
return columns.map(col => col.replace(/^"|"$/g, '').replace(/""/g, '"'));
|
return columns;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Normalize line endings and split rows
|
|
||||||
const rows = [];
|
|
||||||
let currentRow = '', inQuotes = false;
|
|
||||||
for (const char of csv.replace(/\r\n/g, '\n')) { // Normalize \r\n to \n
|
|
||||||
if (char === '"') inQuotes = !inQuotes;
|
|
||||||
if (char === '\n' && !inQuotes) {
|
|
||||||
rows.push(currentRow.trim()); // Trim row
|
|
||||||
currentRow = '';
|
|
||||||
} else currentRow += char;
|
|
||||||
}
|
|
||||||
if (currentRow) rows.push(currentRow.trim()); // Trim last row
|
|
||||||
|
|
||||||
// Extract headers
|
|
||||||
let headers: any = hasHeaders ? rows.splice(0, 1)[0] : null;
|
|
||||||
if (headers) headers = headers.match(/(?:[^,"']+|"(?:[^"]|"")*"|'(?:[^']|'')*')+/g)?.map((h: any) => h.trim());
|
|
||||||
|
|
||||||
// Parse rows
|
|
||||||
return <T[]>rows.map(r => {
|
|
||||||
const props = parseLine(r);
|
const props = parseLine(r);
|
||||||
const h = headers || (Array(props.length).fill(null).map((_, i) => {
|
const h = headers || (Array(props.length).fill(null).map((r, i) => {
|
||||||
let letter = '';
|
let letter = '';
|
||||||
const first = i / 26;
|
const first = i / 26;
|
||||||
if(first > 1) letter += LETTER_LIST[Math.floor(first - 1)];
|
if(first > 1) letter += LETTER_LIST[Math.floor(first - 1)];
|
||||||
@ -61,28 +34,23 @@ export function fromCsv<T = any>(csv: string, hasHeaders = true): T[] {
|
|||||||
dotNotation(acc, h, props[i]);
|
dotNotation(acc, h, props[i]);
|
||||||
return acc;
|
return acc;
|
||||||
}, {});
|
}, {});
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert an array of objects to a CSV string
|
* Convert an object to a CSV string
|
||||||
*
|
*
|
||||||
* @param {any[]} target Array of objects to create CSV from
|
* @param {any[]} target Array of objects to create CSV from
|
||||||
* @param {boolean} flatten Should nested object be flattened or treated as values
|
* @param {boolean} flatten Should nested object be flattened or treated as values
|
||||||
* @return {string} CSV string
|
* @return {string} CSV string
|
||||||
*/
|
*/
|
||||||
export function toCsv(target: any, flatten=true) {
|
export function toCsv(target: any[], flatten=true) {
|
||||||
const t = makeArray(target);
|
const headers = new ASet(target.reduce((acc, row) => [...acc, ...Object.keys(flatten ? flattenObj(row) : row)], []));
|
||||||
const headers = new ASet(t.reduce((acc, row) => [...acc, ...Object.keys(flatten ? flattenObj(row) : row)], []));
|
|
||||||
return [
|
return [
|
||||||
headers.join(','),
|
headers.join(','),
|
||||||
...t.map(row => headers.map((h: string) => {
|
...target.map(row => headers.map((h: string) => {
|
||||||
const value = dotNotation<any>(row, h);
|
const value = dotNotation<any>(row, h);
|
||||||
if(value == null) return '';
|
return (typeof value == 'object' && value != null) ? '"' + JSONSanitize(value).replaceAll('"', '""') + '"' : value;
|
||||||
if(typeof value == 'object') return `"${JSONSanitize(value).replaceAll('"', '""')}"`;
|
|
||||||
if(typeof value == 'string' && /[\n",]/g.test(value)) return `"${value.replaceAll('"', '""')}"`;
|
|
||||||
return value;
|
|
||||||
}).join(','))
|
}).join(','))
|
||||||
].join('\n');
|
].join('\n');
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
import {makeArray} from './array.ts';
|
import {makeArray} from './array.ts';
|
||||||
import {JSONAttemptParse} from './objects.ts';
|
import {JSONAttemptParse} from './objects.ts';
|
||||||
import {PromiseProgress} from './promise-progress';
|
import {PromiseProgress} from './promise-progress';
|
||||||
import {formatDate} from './time.ts';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Download blob as a file
|
* Download blob as a file
|
||||||
@ -77,7 +76,7 @@ export function fileText(file: any): Promise<string | null> {
|
|||||||
*/
|
*/
|
||||||
export function timestampFilename(name?: string, date: Date | number | string = new Date()) {
|
export function timestampFilename(name?: string, date: Date | number | string = new Date()) {
|
||||||
if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
|
if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
|
||||||
const timestamp = formatDate('YYYY-MM-DD_HH:mm:ss', date);
|
const timestamp = `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}_${date.getHours().toString().padStart(2, '0')}-${date.getMinutes().toString().padStart(2, '0')}-${date.getSeconds().toString().padStart(2, '0')}`;
|
||||||
return name ? name.replace('{{TIMESTAMP}}', timestamp) : timestamp;
|
return name ? name.replace('{{TIMESTAMP}}', timestamp) : timestamp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
40
src/http.ts
40
src/http.ts
@ -22,28 +22,6 @@ export type HttpDefaults = {
|
|||||||
url?: string;
|
url?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
class HttpResponse<T = any> extends Response {
|
|
||||||
data?: T
|
|
||||||
ok!: boolean;
|
|
||||||
redirected!: boolean;
|
|
||||||
type!: ResponseType;
|
|
||||||
url!: string;
|
|
||||||
|
|
||||||
constructor(resp: Response, stream: ReadableStream) {
|
|
||||||
const body = [204, 205, 304].includes(resp.status) ? null : stream;
|
|
||||||
super(body, {
|
|
||||||
headers: resp.headers,
|
|
||||||
status: resp.status,
|
|
||||||
statusText: resp.statusText,
|
|
||||||
});
|
|
||||||
|
|
||||||
this.ok = resp.ok;
|
|
||||||
this.redirected = resp.redirected;
|
|
||||||
this.type = resp.type;
|
|
||||||
this.url = resp.url;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export class Http {
|
export class Http {
|
||||||
private static interceptors: {[key: string]: HttpInterceptor} = {};
|
private static interceptors: {[key: string]: HttpInterceptor} = {};
|
||||||
|
|
||||||
@ -76,9 +54,8 @@ export class Http {
|
|||||||
|
|
||||||
request<T>(opts: HttpRequestOptions = {}): PromiseProgress<DecodedResponse<T>> {
|
request<T>(opts: HttpRequestOptions = {}): PromiseProgress<DecodedResponse<T>> {
|
||||||
if(!this.url && !opts.url) throw new Error('URL needs to be set');
|
if(!this.url && !opts.url) throw new Error('URL needs to be set');
|
||||||
let url = opts.url?.startsWith('http') ? opts.url : (this.url || '') + (opts.url || '');
|
let url = (opts.url?.startsWith('http') ? opts.url : (this.url || '') + (opts.url || '')).replace(/([^:]\/)\/+/g, '$1');
|
||||||
url = url.replaceAll(/([^:]\/)\/+/g, '$1');
|
if(opts.fragment) url.includes('#') ? url.replace(/#.*(\?|\n)/g, (match, arg1) => `#${opts.fragment}${arg1}`) : url += '#' + opts.fragment;
|
||||||
if(opts.fragment) url.includes('#') ? url.replace(/#.*(\?|\n)/g, (match, arg1) => `#${opts.fragment}${arg1}`) : `${url}#${opts.fragment}`;
|
|
||||||
if(opts.query) {
|
if(opts.query) {
|
||||||
const q = Array.isArray(opts.query) ? opts.query :
|
const q = Array.isArray(opts.query) ? opts.query :
|
||||||
Object.keys(opts.query).map(k => ({key: k, value: (<any>opts.query)[k]}))
|
Object.keys(opts.query).map(k => ({key: k, value: (<any>opts.query)[k]}))
|
||||||
@ -124,17 +101,18 @@ export class Http {
|
|||||||
push();
|
push();
|
||||||
}).catch((error: any) => controller.error(error));
|
}).catch((error: any) => controller.error(error));
|
||||||
}
|
}
|
||||||
|
|
||||||
push();
|
push();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
resp = new HttpResponse<T>(resp, stream);
|
resp.data = new Response(stream);
|
||||||
if(opts.decode !== false) {
|
if(opts.decode == null || opts.decode) {
|
||||||
const content = resp.headers.get('Content-Type')?.toLowerCase();
|
const content = resp.headers.get('Content-Type')?.toLowerCase();
|
||||||
if(content?.includes('form')) resp.data = <T>await resp.formData();
|
if(content?.includes('form')) resp.data = <T>await resp.data.formData();
|
||||||
else if(content?.includes('json')) resp.data = <T>await resp.json();
|
else if(content?.includes('json')) resp.data = <T>await resp.data.json();
|
||||||
else if(content?.includes('text')) resp.data = <T>await resp.text();
|
else if(content?.includes('text')) resp.data = <T>await resp.data.text();
|
||||||
else if(content?.includes('application')) resp.data = <T>await resp.blob();
|
else if(content?.includes('application')) resp.data = <T>await resp.data.blob();
|
||||||
}
|
}
|
||||||
|
|
||||||
if(resp.ok) res(resp);
|
if(resp.ok) res(resp);
|
||||||
|
|||||||
@ -1,8 +1,6 @@
|
|||||||
export * from './arg-parser';
|
|
||||||
export * from './array';
|
export * from './array';
|
||||||
export * from './aset';
|
export * from './aset';
|
||||||
export * from './cache';
|
export * from './cache';
|
||||||
export * from './color';
|
|
||||||
export * from './csv';
|
export * from './csv';
|
||||||
export * from './files';
|
export * from './files';
|
||||||
export * from './emitter';
|
export * from './emitter';
|
||||||
|
|||||||
@ -224,17 +224,6 @@ export function JSONAttemptParse<T1, T2>(json: T2): T1 | T2 {
|
|||||||
catch { return json; }
|
catch { return json; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Stringifies objects & skips primitives
|
|
||||||
*
|
|
||||||
* @param {any} obj Object to convert to serializable value
|
|
||||||
* @return {string | T} Serialized value
|
|
||||||
*/
|
|
||||||
export function JSONSerialize<T1>(obj: T1): T1 | string {
|
|
||||||
if(typeof obj == 'object' && obj != null) return JSONSanitize(obj);
|
|
||||||
return obj;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert an object to a JSON string avoiding any circular references.
|
* Convert an object to a JSON string avoiding any circular references.
|
||||||
*
|
*
|
||||||
|
|||||||
@ -142,9 +142,8 @@ export class PathEvent {
|
|||||||
const parsedFind = makeArray(filter).map(pe => new PathEvent(pe));
|
const parsedFind = makeArray(filter).map(pe => new PathEvent(pe));
|
||||||
return parsedTarget.filter(t => {
|
return parsedTarget.filter(t => {
|
||||||
if(!t.fullPath && t.all) return true;
|
if(!t.fullPath && t.all) return true;
|
||||||
return !!parsedFind.find(f =>
|
return !!parsedFind.find(f => t.fullPath.startsWith(f.fullPath)
|
||||||
(t.fullPath.startsWith(f.fullPath) || f.fullPath.startsWith(t.fullPath)) &&
|
&& (f.all || t.all || t.methods.intersection(f.methods).length));
|
||||||
(f.all || t.all || t.methods.intersection(f.methods).length));
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -18,14 +18,6 @@ export const SYMBOL_LIST = '~`!@#$%^&*()_-+={[}]|\\:;"\'<,>.?/';
|
|||||||
*/
|
*/
|
||||||
export const CHAR_LIST = LETTER_LIST + LETTER_LIST.toLowerCase() + NUMBER_LIST + SYMBOL_LIST;
|
export const CHAR_LIST = LETTER_LIST + LETTER_LIST.toLowerCase() + NUMBER_LIST + SYMBOL_LIST;
|
||||||
|
|
||||||
/**
|
|
||||||
* Converts text to camelCase
|
|
||||||
*/
|
|
||||||
export function camelCase(str?: string) {
|
|
||||||
const text = pascalCase(str);
|
|
||||||
return text[0].toLowerCase() + text.slice(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert number of bytes into a human-readable size
|
* Convert number of bytes into a human-readable size
|
||||||
*
|
*
|
||||||
@ -72,17 +64,6 @@ export function insertAt(target: string, str: string, index: number): String {
|
|||||||
return `${target.slice(0, index)}${str}${target.slice(index + 1)}`;
|
return `${target.slice(0, index)}${str}${target.slice(index + 1)}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Converts text to kebab-case
|
|
||||||
*/
|
|
||||||
export function kebabCase(str: string) {
|
|
||||||
if(!str) return '';
|
|
||||||
return str.replaceAll(/(^[^a-zA-Z]+|[^a-zA-Z0-9-_])/g, '')
|
|
||||||
.replaceAll(/([A-Z]|[0-9]+)/g, (...args) => `-${args[0].toLowerCase()}`)
|
|
||||||
.replaceAll(/([0-9])([a-z])/g, (...args) => `${args[1]}-${args[2]}`)
|
|
||||||
.replaceAll(/[^a-z0-9]+(\w?)/g, (...args) => `-${args[1] ?? ''}`).toLowerCase();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add padding to string
|
* Add padding to string
|
||||||
*
|
*
|
||||||
@ -105,18 +86,6 @@ export function pad(text: any, length: number, char: string = ' ', start = true)
|
|||||||
return text.toString().padEnd(length, char);
|
return text.toString().padEnd(length, char);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Convert text to PascalCase
|
|
||||||
* @param {string} str
|
|
||||||
* @return {string}
|
|
||||||
*/
|
|
||||||
export function pascalCase(str?: string) {
|
|
||||||
if(!str) return '';
|
|
||||||
const text = str.replaceAll(/(^[^a-zA-Z]+|[^a-zA-Z0-9-_])/g, '')
|
|
||||||
.replaceAll(/[^a-zA-Z0-9]+(\w?)/g, (...args) => args[1]?.toUpperCase() || '');
|
|
||||||
return text[0].toUpperCase() + text.slice(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generate a random hexadecimal value
|
* Generate a random hexadecimal value
|
||||||
*
|
*
|
||||||
@ -180,17 +149,6 @@ export function randomStringBuilder(length: number, letters = false, numbers = f
|
|||||||
}).join('');
|
}).join('');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Converts text to snake_case
|
|
||||||
*/
|
|
||||||
export function snakeCase(str?: string) {
|
|
||||||
if(!str) return '';
|
|
||||||
return str.replaceAll(/(^[^a-zA-Z]+|[^a-zA-Z0-9-_])/g, '')
|
|
||||||
.replaceAll(/([A-Z]|[0-9]+)/g, (...args) => `_${args[0].toLowerCase()}`)
|
|
||||||
.replaceAll(/([0-9])([a-z])/g, (...args) => `${args[1]}_${args[2]}`)
|
|
||||||
.replaceAll(/[^a-z0-9]+(\w?)/g, (...args) => `_${args[1] ?? ''}`).toLowerCase();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Splice a string together (Similar to Array.splice)
|
* Splice a string together (Similar to Array.splice)
|
||||||
*
|
*
|
||||||
|
|||||||
170
src/time.ts
170
src/time.ts
@ -20,54 +20,34 @@ export function adjustedInterval(cb: Function, ms: number) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function adjustTz(date: Date, offset: number) {
|
||||||
|
const currentOffset = date.getTimezoneOffset();
|
||||||
|
const adjustedOffset = offset * 60;
|
||||||
|
return new Date(date.getTime() + (currentOffset - adjustedOffset) * 60000);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Format date
|
* Format date
|
||||||
*
|
*
|
||||||
|
* @param {Date | number | string} date Date or timestamp to convert to string
|
||||||
* @param {string} format How date string will be formatted, default: `YYYY-MM-DD H:mm A`
|
* @param {string} format How date string will be formatted, default: `YYYY-MM-DD H:mm A`
|
||||||
* @param {Date | number | string} date Date or timestamp, defaults to now
|
* @param tz Override timezone, can be either string or number
|
||||||
* @param tz Set timezone offset
|
|
||||||
* @return {string} Formated date
|
* @return {string} Formated date
|
||||||
*/
|
*/
|
||||||
export function formatDate(format = 'YYYY-MM-DD H:mm', date: Date | number | string = new Date(), tz?: string | number): string {
|
export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:mm', tz?: any): string {
|
||||||
const timezones = [
|
if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
|
||||||
['IDLW', -12],
|
|
||||||
['SST', -11],
|
|
||||||
['HST', -10],
|
|
||||||
['AKST', -9],
|
|
||||||
['PST', -8],
|
|
||||||
['MST', -7],
|
|
||||||
['CST', -6],
|
|
||||||
['EST', -5],
|
|
||||||
['AST', -4],
|
|
||||||
['BRT', -3],
|
|
||||||
['MAT', -2],
|
|
||||||
['AZOT', -1],
|
|
||||||
['UTC', 0],
|
|
||||||
['CET', 1],
|
|
||||||
['EET', 2],
|
|
||||||
['MSK', 3],
|
|
||||||
['AST', 4],
|
|
||||||
['PKT', 5],
|
|
||||||
['IST', 5.5],
|
|
||||||
['BST', 6],
|
|
||||||
['ICT', 7],
|
|
||||||
['CST', 8],
|
|
||||||
['JST', 9],
|
|
||||||
['AEST', 10],
|
|
||||||
['SBT', 11],
|
|
||||||
['FJT', 12],
|
|
||||||
['TOT', 13],
|
|
||||||
['LINT', 14]
|
|
||||||
];
|
|
||||||
|
|
||||||
function adjustTz(date: Date, gmt: number) {
|
|
||||||
const currentOffset = date.getTimezoneOffset();
|
|
||||||
const adjustedOffset = gmt * 60;
|
|
||||||
return new Date(date.getTime() + (adjustedOffset + currentOffset) * 60000);
|
|
||||||
}
|
|
||||||
|
|
||||||
function day(num: number): string {
|
function day(num: number): string {
|
||||||
return ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][num] || 'Unknown';
|
switch(num) {
|
||||||
|
case(0): return 'Sunday';
|
||||||
|
case(1): return 'Monday';
|
||||||
|
case(2): return 'Tuesday';
|
||||||
|
case(3): return 'Wednesday';
|
||||||
|
case(4): return 'Thursday';
|
||||||
|
case(5): return 'Friday';
|
||||||
|
case(6): return 'Saturday';
|
||||||
|
default: return 'Unknown';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function doy(date: Date) {
|
function doy(date: Date) {
|
||||||
@ -76,16 +56,30 @@ export function formatDate(format = 'YYYY-MM-DD H:mm', date: Date | number | str
|
|||||||
}
|
}
|
||||||
|
|
||||||
function month(num: number): string {
|
function month(num: number): string {
|
||||||
return ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'][num] || 'Unknown';
|
switch(num) {
|
||||||
|
case(0): return 'January';
|
||||||
|
case(1): return 'February';
|
||||||
|
case(2): return 'March';
|
||||||
|
case(3): return 'April';
|
||||||
|
case(4): return 'May';
|
||||||
|
case(5): return 'June';
|
||||||
|
case(6): return 'July';
|
||||||
|
case(7): return 'August';
|
||||||
|
case(8): return 'September';
|
||||||
|
case(9): return 'October';
|
||||||
|
case(10): return 'November';
|
||||||
|
case(11): return 'December';
|
||||||
|
default: return 'Unknown';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function suffix(num: number) {
|
function suffix(num: number) {
|
||||||
if (num % 100 >= 11 && num % 100 <= 13) return `${num}th`;
|
let n = num.toString();
|
||||||
switch (num % 10) {
|
switch(n.at(-1)) {
|
||||||
case 1: return `${num}st`;
|
case('1'): return num + 'st';
|
||||||
case 2: return `${num}nd`;
|
case('2'): return num + 'nd';
|
||||||
case 3: return `${num}rd`;
|
case('3'): return num + 'rd';
|
||||||
default: return `${num}th`;
|
default: return num + 'th';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -95,45 +89,51 @@ export function formatDate(format = 'YYYY-MM-DD H:mm', date: Date | number | str
|
|||||||
return (offset > 0 ? '-' : '') + `${hours}:${minutes.toString().padStart(2, '0')}`;
|
return (offset > 0 ? '-' : '') + `${hours}:${minutes.toString().padStart(2, '0')}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
|
function timezone(date: Date): string {
|
||||||
|
return new Intl.DateTimeFormat('en-US', {timeZoneName: 'short'})
|
||||||
|
.format(date).split(' ').pop() || '';
|
||||||
|
}
|
||||||
|
|
||||||
// Handle timezones
|
return format
|
||||||
let t!: [string, number];
|
// Year
|
||||||
if(tz == null) tz = -(date.getTimezoneOffset() / 60);
|
.replaceAll('YYYY', date.getFullYear().toString())
|
||||||
t = <any>timezones.find(t => isNaN(<any>tz) ? t[0] == tz : t[1] == tz);
|
.replaceAll('YY', date.getFullYear().toString().slice(2))
|
||||||
if(!t) throw new Error(`Unknown timezone: ${tz}`);
|
// Month
|
||||||
date = adjustTz(date, t[1]);
|
.replaceAll('MMMM', month(date.getMonth()))
|
||||||
|
.replaceAll('MMM', month(date.getMonth()).slice(0, 3))
|
||||||
// Token mapping
|
.replaceAll('MM', (date.getMonth() + 1).toString().padStart(2, '0'))
|
||||||
const tokens: Record<string, string> = {
|
.replaceAll('M', (date.getMonth() + 1).toString())
|
||||||
'YYYY': date.getFullYear().toString(),
|
// Day
|
||||||
'YY': date.getFullYear().toString().slice(2),
|
.replaceAll('DDD', doy(date).toString())
|
||||||
'MMMM': month(date.getMonth()),
|
.replaceAll('DD', date.getDate().toString().padStart(2, '0'))
|
||||||
'MMM': month(date.getMonth()).slice(0, 3),
|
.replaceAll('Do', suffix(date.getDate()))
|
||||||
'MM': (date.getMonth() + 1).toString().padStart(2, '0'),
|
.replaceAll('D', date.getDate().toString())
|
||||||
'M': (date.getMonth() + 1).toString(),
|
.replaceAll('dddd', day(date.getDay()))
|
||||||
'DDD': doy(date).toString(),
|
.replaceAll('ddd', day(date.getDay()).slice(0, 2))
|
||||||
'DD': date.getDate().toString().padStart(2, '0'),
|
.replaceAll('dd', date.getDate().toString().padStart(2, '0'))
|
||||||
'Do': suffix(date.getDate()),
|
.replaceAll('d', date.getDay().toString())
|
||||||
'D': date.getDate().toString(),
|
// Hour
|
||||||
'dddd': day(date.getDay()),
|
.replaceAll('HH', date.getHours().toString().padStart(2, '0'))
|
||||||
'ddd': day(date.getDay()).slice(0, 3),
|
.replaceAll('H', date.getHours().toString())
|
||||||
'HH': date.getHours().toString().padStart(2, '0'),
|
.replaceAll('hh', (date.getHours() > 12 ? date.getHours() - 12 : date.getHours()).toString().padStart(2, '0'))
|
||||||
'H': date.getHours().toString(),
|
.replaceAll('h', (date.getHours() > 12 ? date.getHours() - 12 : date.getHours()).toString())
|
||||||
'hh': (date.getHours() % 12 || 12).toString().padStart(2, '0'),
|
// Minute
|
||||||
'h': (date.getHours() % 12 || 12).toString(),
|
.replaceAll('mm', date.getMinutes().toString().padStart(2, '0'))
|
||||||
'mm': date.getMinutes().toString().padStart(2, '0'),
|
.replaceAll('m', date.getMinutes().toString())
|
||||||
'm': date.getMinutes().toString(),
|
// Second
|
||||||
'ss': date.getSeconds().toString().padStart(2, '0'),
|
.replaceAll('ss', date.getSeconds().toString().padStart(2, '0'))
|
||||||
's': date.getSeconds().toString(),
|
.replaceAll('s', date.getSeconds().toString())
|
||||||
'SSS': date.getMilliseconds().toString().padStart(3, '0'),
|
// Millisecond
|
||||||
'A': date.getHours() >= 12 ? 'PM' : 'AM',
|
.replaceAll('SSS', date.getMilliseconds().toString().padEnd(3, '0'))
|
||||||
'a': date.getHours() >= 12 ? 'pm' : 'am',
|
.replaceAll('SS', date.getMilliseconds().toString().slice(0, 1).padEnd(2, '0'))
|
||||||
'ZZ': tzOffset(t[1] * 60).replace(':', ''),
|
.replaceAll('S', date.getMilliseconds().toString()[0])
|
||||||
'Z': tzOffset(t[1] * 60),
|
// Period/Meridian (AM/PM)
|
||||||
'z': typeof tz == 'string' ? tz : (<any>t)[0]
|
.replaceAll('A', date.getHours() >= 12 ? 'PM' : 'AM')
|
||||||
};
|
.replaceAll('a', date.getHours() >= 12 ? 'pm' : 'am')
|
||||||
return format.replace(/YYYY|YY|MMMM|MMM|MM|M|DDD|DD|Do|D|dddd|ddd|HH|H|hh|h|mm|m|ss|s|SSS|A|a|ZZ|Z|z/g, token => tokens[token]);
|
// Timezone
|
||||||
|
.replaceAll('ZZ', tzOffset(isNaN(tz) ? date.getTimezoneOffset() : tz).replace(':', ''))
|
||||||
|
.replaceAll('Z', tzOffset(isNaN(tz) ? date.getTimezoneOffset() : tz))
|
||||||
|
.replaceAll('z', typeof tz == 'string' ? tz : timezone(date));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user