Compare commits
No commits in common. "develop" and "0.23.9" have entirely different histories.
@ -6,10 +6,9 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<script type="module">
|
<script type="module">
|
||||||
import {PathEvent} from './dist/index.mjs';
|
import {formatDate} from './dist/index.mjs';
|
||||||
|
|
||||||
console.log(PathEvent.filter(['payments/ztimson:cr', 'logs/momentum:c', 'data/Testing:r'], 'data'));
|
console.log(formatDate('YYYY-01-01'));
|
||||||
console.log(PathEvent.filter(['data/Submissions/Test:r'], 'data/Submissions/Test/test.html'));
|
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ztimson/utils",
|
"name": "@ztimson/utils",
|
||||||
"version": "0.23.22",
|
"version": "0.23.9",
|
||||||
"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"
|
||||||
|
|||||||
16
src/cache.ts
16
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;
|
||||||
@ -38,12 +36,12 @@ 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
84
src/csv.ts
84
src/csv.ts
@ -1,59 +1,32 @@
|
|||||||
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';
|
||||||
|
|
||||||
/**
|
export function fromCsv<T = any>(csv: string, hasHeaders=true): T[] {
|
||||||
* Parse a CSV string into an array of objects
|
const row = csv.split('\n');
|
||||||
*
|
let headers: any = hasHeaders ? row.splice(0, 1)[0] : null;
|
||||||
* @param csv String with CSV
|
if(headers) headers = headers.match(/(?:[^,"']+|"[^"]*"|'[^']*')+/g);
|
||||||
* @param hasHeaders First line of CSV contains headers
|
return <T[]>row.map(r => {
|
||||||
* @return {T[]} Array of parsed objects
|
function parseLine(line: string): (string | null)[] {
|
||||||
*/
|
const parts = line.split(','), columns: string[] = [];
|
||||||
export function fromCsv<T = any>(csv: string, hasHeaders = true): T[] {
|
let quoted = false;
|
||||||
function parseLine(line: string): (string | null)[] {
|
for(const p of parts) {
|
||||||
const columns: string[] = [];
|
if(quoted) columns[columns.length - 1] = columns.at(-1) + ',' + p;
|
||||||
let current = '', inQuotes = false;
|
else columns.push(p);
|
||||||
for (let i = 0; i < line.length; i++) {
|
if(/[^"]"$/g.test(p)) {
|
||||||
const char = line[i];
|
quoted = false;
|
||||||
const nextChar = line[i + 1];
|
} else if(/^"[^"]/g.test(p)) {
|
||||||
if (char === '"') {
|
quoted = true;
|
||||||
if (inQuotes && nextChar === '"') {
|
}
|
||||||
current += '"'; // Handle escaped quotes
|
}
|
||||||
i++;
|
return columns;
|
||||||
} 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, '"'));
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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)];
|
||||||
letter += LETTER_LIST[i % 26];
|
letter += LETTER_LIST[i % 26];
|
||||||
return letter;
|
return letter;
|
||||||
}));
|
}));
|
||||||
@ -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);
|
||||||
|
|||||||
@ -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 => f.fullPath.startsWith(t.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)
|
||||||
*
|
*
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user