Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cd5741d6ab | |||
| 5b9e0714ce | |||
| a3b34ef03f | |||
| f755d8f5b8 | |||
| 35c471eef4 | |||
| fe9fdb9384 |
@ -6,9 +6,10 @@
|
||||
</head>
|
||||
<body>
|
||||
<script type="module">
|
||||
import {formatDate} from './dist/index.mjs';
|
||||
import {PathEvent} from './dist/index.mjs';
|
||||
|
||||
console.log(formatDate('D MMM, YYYY'));
|
||||
console.log(PathEvent.filter(['payments/ztimson:cr', 'logs/momentum:c', 'data/Testing:r'], 'data'));
|
||||
console.log(PathEvent.filter(['data/Submissions/Test:r'], 'data/Submissions/Test/test.html'));
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@ztimson/utils",
|
||||
"version": "0.23.8",
|
||||
"version": "0.23.14",
|
||||
"description": "Utility library",
|
||||
"author": "Zak Timson",
|
||||
"license": "MIT",
|
||||
|
||||
12
src/cache.ts
12
src/cache.ts
@ -1,3 +1,5 @@
|
||||
import {deepCopy} from './objects.ts';
|
||||
|
||||
export type CacheOptions = {
|
||||
/** Delete keys automatically after x amount of seconds */
|
||||
ttl?: number;
|
||||
@ -37,11 +39,11 @@ export class Cache<K extends string | number | symbol, T> {
|
||||
return new Proxy(this, {
|
||||
get: (target: this, prop: string | symbol) => {
|
||||
if(prop in target) return (target as any)[prop];
|
||||
return target.store[prop as K];
|
||||
return deepCopy(target.store[prop as K]);
|
||||
},
|
||||
set: (target: this, prop: string | symbol, value: any) => {
|
||||
if(prop in target) (target as any)[prop] = value;
|
||||
else target.store[prop as K] = value;
|
||||
else this.set(prop as K, value);
|
||||
return true;
|
||||
}
|
||||
});
|
||||
@ -58,7 +60,7 @@ export class Cache<K extends string | number | symbol, T> {
|
||||
* @return {T[]} Array of items
|
||||
*/
|
||||
all(): T[] {
|
||||
return Object.values(this.store);
|
||||
return deepCopy(Object.values(this.store));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -119,7 +121,7 @@ export class Cache<K extends string | number | symbol, T> {
|
||||
* @return {T} Cached item
|
||||
*/
|
||||
get(key: K): T {
|
||||
return this.store[key];
|
||||
return deepCopy(this.store[key]);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -137,7 +139,7 @@ export class Cache<K extends string | number | symbol, T> {
|
||||
* @return {Record<K, T>}
|
||||
*/
|
||||
map(): Record<K, T> {
|
||||
return structuredClone(this.store);
|
||||
return deepCopy(this.store);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* @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);
|
||||
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;
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
import {makeArray} from './array.ts';
|
||||
import {JSONAttemptParse} from './objects.ts';
|
||||
import {PromiseProgress} from './promise-progress';
|
||||
import {formatDate} from './time.ts';
|
||||
|
||||
/**
|
||||
* Download blob as a file
|
||||
@ -76,7 +77,7 @@ export function fileText(file: any): Promise<string | null> {
|
||||
*/
|
||||
export function timestampFilename(name?: string, date: Date | number | string = new Date()) {
|
||||
if(typeof date == 'number' || typeof date == 'string') date = new Date(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')}`;
|
||||
const timestamp = formatDate('YYYY-MM-DD_HH:mm:ss', date);
|
||||
return name ? name.replace('{{TIMESTAMP}}', timestamp) : timestamp;
|
||||
}
|
||||
|
||||
|
||||
29
src/http.ts
29
src/http.ts
@ -22,6 +22,22 @@ export type HttpDefaults = {
|
||||
url?: string;
|
||||
}
|
||||
|
||||
class HttpResponse<T = any> extends Response {
|
||||
data?: T
|
||||
ok!: boolean;
|
||||
redirected!: boolean;
|
||||
type!: ResponseType;
|
||||
url!: string;
|
||||
|
||||
constructor(resp: Response, stream: ReadableStream) {
|
||||
super(stream, {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 {
|
||||
private static interceptors: {[key: string]: HttpInterceptor} = {};
|
||||
|
||||
@ -101,18 +117,17 @@ export class Http {
|
||||
push();
|
||||
}).catch((error: any) => controller.error(error));
|
||||
}
|
||||
|
||||
push();
|
||||
}
|
||||
});
|
||||
|
||||
resp.data = new Response(stream);
|
||||
if(opts.decode == null || opts.decode) {
|
||||
resp = new HttpResponse<T>(resp, stream);
|
||||
if(opts.decode !== false) {
|
||||
const content = resp.headers.get('Content-Type')?.toLowerCase();
|
||||
if(content?.includes('form')) resp.data = <T>await resp.data.formData();
|
||||
else if(content?.includes('json')) resp.data = <T>await resp.data.json();
|
||||
else if(content?.includes('text')) resp.data = <T>await resp.data.text();
|
||||
else if(content?.includes('application')) resp.data = <T>await resp.data.blob();
|
||||
if(content?.includes('form')) resp.data = <T>await resp.formData();
|
||||
else if(content?.includes('json')) resp.data = <T>await resp.json();
|
||||
else if(content?.includes('text')) resp.data = <T>await resp.text();
|
||||
else if(content?.includes('application')) resp.data = <T>await resp.blob();
|
||||
}
|
||||
|
||||
if(resp.ok) res(resp);
|
||||
|
||||
@ -142,8 +142,9 @@ export class PathEvent {
|
||||
const parsedFind = makeArray(filter).map(pe => new PathEvent(pe));
|
||||
return parsedTarget.filter(t => {
|
||||
if(!t.fullPath && t.all) return true;
|
||||
return !!parsedFind.find(f => f.fullPath.startsWith(t.fullPath)
|
||||
&& (f.all || t.all || t.methods.intersection(f.methods).length));
|
||||
return !!parsedFind.find(f =>
|
||||
(t.fullPath.startsWith(f.fullPath) || f.fullPath.startsWith(t.fullPath)) &&
|
||||
(f.all || t.all || t.methods.intersection(f.methods).length));
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user