Compare commits
15 Commits
Author | SHA1 | Date | |
---|---|---|---|
e8fdca8236 | |||
67ae86d69b | |||
87db4d4755 | |||
0fb1e13ba0 | |||
ff4401934c | |||
ce3c8d012a | |||
a86e8350ee | |||
7b4e17e4c4 | |||
fa66820c76 | |||
49a2df8cd4 | |||
ccf3fcb043 | |||
341ef37205 | |||
0eab2630ad | |||
2f59a9d02e | |||
ce2f32dd45 |
@ -6,9 +6,11 @@
|
||||
</head>
|
||||
<body>
|
||||
<script type="module">
|
||||
import {PathEvent} from './dist/index.mjs';
|
||||
import {formatDate} from './dist/index.mjs';
|
||||
|
||||
console.log(PathEvent.has(['data/Inventory:n', 'logs:c'], `logs/client:n`));
|
||||
console.log(formatDate(new Date(), 'HH:mm:ss z', 5));
|
||||
console.log(formatDate(new Date(), 'HH:mm:ss z', 0));
|
||||
console.log(formatDate(new Date(), 'HH:mm:ss z', -5));
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@ztimson/utils",
|
||||
"version": "0.22.1",
|
||||
"version": "0.23.1",
|
||||
"description": "Utility library",
|
||||
"author": "Zak Timson",
|
||||
"license": "MIT",
|
||||
|
52
src/csv.ts
52
src/csv.ts
@ -1,4 +1,41 @@
|
||||
import {dotNotation, flattenObj} from './objects.ts';
|
||||
import {ASet} from './aset.ts';
|
||||
import {dotNotation, flattenObj, JSONSanitize} from './objects.ts';
|
||||
import {LETTER_LIST} from './string.ts';
|
||||
|
||||
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)[] {
|
||||
const parts = line.split(','), columns: string[] = [];
|
||||
let quoted = false;
|
||||
for(const p of parts) {
|
||||
if(quoted) columns[columns.length - 1] = columns.at(-1) + ',' + p;
|
||||
else columns.push(p);
|
||||
if(/[^"]"$/g.test(p)) {
|
||||
quoted = false;
|
||||
} else if(/^"[^"]/g.test(p)) {
|
||||
quoted = true;
|
||||
}
|
||||
}
|
||||
return columns;
|
||||
}
|
||||
|
||||
const props = parseLine(r);
|
||||
const h = headers || (Array(props.length).fill(null).map((r, i) => {
|
||||
let letter = '';
|
||||
const first = i / 26;
|
||||
if(first > 1) letter += LETTER_LIST[Math.floor(first - 1)];
|
||||
letter += LETTER_LIST[i % 26];
|
||||
return letter;
|
||||
}));
|
||||
return h.reduce((acc: any, h: any, i: number) => {
|
||||
dotNotation(acc, h, props[i]);
|
||||
return acc;
|
||||
}, {});
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert an object to a CSV string
|
||||
@ -7,20 +44,13 @@ import {dotNotation, flattenObj} from './objects.ts';
|
||||
* @param {boolean} flatten Should nested object be flattened or treated as values
|
||||
* @return {string} CSV string
|
||||
*/
|
||||
export function csv(target: any[], flatten=true) {
|
||||
const headers = target.reduce((acc, row) => {
|
||||
Object.keys(flatten ? flattenObj(row) : row)
|
||||
.forEach(key => { if(!acc.includes(key)) acc.push(key); });
|
||||
return acc;
|
||||
}, []);
|
||||
export function toCsv(target: any[], flatten=true) {
|
||||
const headers = new ASet(target.reduce((acc, row) => [...acc, ...Object.keys(flatten ? flattenObj(row) : row)], []));
|
||||
return [
|
||||
headers.join(','),
|
||||
...target.map(row => headers.map((h: string) => {
|
||||
const value = dotNotation<any>(row, h);
|
||||
const type = typeof value;
|
||||
if(type == 'string' && value.includes(',')) return `"${value}"`;
|
||||
if(type == 'object') return `"${JSON.stringify(value)}"`;
|
||||
return value;
|
||||
return (typeof value == 'object' && value != null) ? '"' + JSONSanitize(value).replaceAll('"', '""') + '"' : value;
|
||||
}).join(','))
|
||||
].join('\n');
|
||||
}
|
||||
|
15
src/files.ts
15
src/files.ts
@ -52,6 +52,21 @@ export function fileBrowser(options: {accept?: string, multiple?: boolean} = {})
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Extract text from a file
|
||||
*
|
||||
* @param file File to extract text from
|
||||
* @return {Promise<string | null>} File contents
|
||||
*/
|
||||
export function fileText(file: any): Promise<string | null> {
|
||||
return new Promise((resolve, reject) => {
|
||||
const reader = new FileReader();
|
||||
reader.onload = () => resolve(<string>reader.result);
|
||||
reader.onerror = () => reject(reader.error);
|
||||
reader.readAsText(file);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Create timestamp intended for filenames from a date
|
||||
*
|
||||
|
@ -13,6 +13,7 @@ export * from './misc';
|
||||
export * from './objects';
|
||||
export * from './path-events';
|
||||
export * from './promise-progress';
|
||||
export * from './search';
|
||||
export * from './string';
|
||||
export * from './time';
|
||||
export * from './types';
|
||||
|
@ -91,7 +91,6 @@ export function dotNotation<T>(obj: any, prop: string, set?: T): T | undefined {
|
||||
}, obj);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Convert object into URL encoded query string
|
||||
*
|
||||
@ -128,8 +127,9 @@ export function encodeQuery(data: any): string {
|
||||
export function flattenObj(obj: any, parent?: any, result: any = {}) {
|
||||
if(typeof obj === "object" && !Array.isArray(obj)) {
|
||||
for(const key of Object.keys(obj)) {
|
||||
const propName = parent ? parent + '.' + key : key;
|
||||
if(typeof obj[key] === 'object') {
|
||||
const propName = parent ? `${parent}.${key}` : key;
|
||||
if(typeof obj[key] === 'object' && obj[key] != null && !Array.isArray(obj[key])) {
|
||||
console.log(propName, );
|
||||
flattenObj(obj[key], propName, result);
|
||||
} else {
|
||||
result[propName] = obj[key];
|
||||
@ -216,11 +216,11 @@ export function mixin(target: any, constructors: any[]) {
|
||||
/**
|
||||
* Parse JSON but return the original string if it fails
|
||||
*
|
||||
* @param {string} json JSON string to parse
|
||||
* @param {any} json JSON string to parse
|
||||
* @return {string | T} Object if successful, original string otherwise
|
||||
*/
|
||||
export function JSONAttemptParse<T>(json: string): T | string {
|
||||
try { return JSON.parse(json); }
|
||||
export function JSONAttemptParse<T1, T2>(json: T2): T1 | T2 {
|
||||
try { return JSON.parse(<any>json); }
|
||||
catch { return json; }
|
||||
}
|
||||
|
||||
|
@ -25,7 +25,7 @@ export type Method = '*' | 'n' | 'c' | 'r' | 'u' | 'd' | 'x';
|
||||
* @param {string} args
|
||||
* @return {PathEvent} Event object
|
||||
*/
|
||||
export function PE(str: TemplateStringsArray, ...args: string[]) {
|
||||
export function PE(str: TemplateStringsArray, ...args: any[]) {
|
||||
const combined = [];
|
||||
for(let i = 0; i < str.length || i < args.length; i++) {
|
||||
if(str[i]) combined.push(str[i]);
|
||||
@ -92,7 +92,7 @@ export class PathEvent {
|
||||
|
||||
constructor(Event: string | PathEvent) {
|
||||
if(typeof Event == 'object') return Object.assign(this, Event);
|
||||
let [p, scope, method] = Event.split(':');
|
||||
let [p, scope, method] = Event.replaceAll(/\/{2,}/g, '/').split(':');
|
||||
if(!method) method = scope || '*';
|
||||
if(p == '*' || !p && method == '*') {
|
||||
p = '';
|
||||
|
38
src/search.ts
Normal file
38
src/search.ts
Normal file
@ -0,0 +1,38 @@
|
||||
import {dotNotation, JSONAttemptParse} from './objects';
|
||||
|
||||
export function search(rows: any[], search: string, regex?: boolean, transform: Function = (r: any) => r) {
|
||||
if(!rows) return [];
|
||||
return rows.filter(r => {
|
||||
// Empty search
|
||||
const value = transform(r);
|
||||
if(!search) return true;
|
||||
// Regex search
|
||||
if(regex) {
|
||||
return !!Object.values(value).filter((v: any) => {
|
||||
try { return RegExp(search, 'gm').test(v.toString()); }
|
||||
catch { return false; }
|
||||
}).length
|
||||
}
|
||||
// Make sure at least one OR passes
|
||||
const or = search.split('||').map(p => p.trim()).filter(p => !!p);
|
||||
return -1 != or.findIndex(p => {
|
||||
// Make sure all ANDs pass
|
||||
const and = p.split('&&').map(p => p.trim()).filter(p => !!p);
|
||||
return and.filter(p => {
|
||||
// Boolean operator
|
||||
const prop = /(\w+)\s*(==?|!=|>=|>|<=|<)\s*(\w+)/g.exec(p);
|
||||
if(prop) {
|
||||
const a = JSON.stringify(JSONAttemptParse(dotNotation<any>(value, prop[1])));
|
||||
const operator = prop[2] == '=' ? '==' : prop[2];
|
||||
const b = JSON.stringify(JSONAttemptParse(prop[3]));
|
||||
return eval(`${a} ${operator} ${b}`);
|
||||
}
|
||||
// Case-sensitive
|
||||
const v = Object.values(value).join('');
|
||||
if(/[A-Z]/g.test(search)) return v.includes(p);
|
||||
// Case-insensitive
|
||||
return v.toLowerCase().includes(p);
|
||||
}).length == and.length;
|
||||
})
|
||||
});
|
||||
}
|
@ -1,22 +1,22 @@
|
||||
/**
|
||||
* String of all letters
|
||||
*/
|
||||
const LETTER_LIST = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
|
||||
export const LETTER_LIST = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
|
||||
|
||||
/**
|
||||
* String of all numbers
|
||||
*/
|
||||
const NUMBER_LIST = '0123456789';
|
||||
export const NUMBER_LIST = '0123456789';
|
||||
|
||||
/**
|
||||
* String of all symbols
|
||||
*/
|
||||
const SYMBOL_LIST = '~`!@#$%^&*()_-+={[}]|\\:;"\'<,>.?/';
|
||||
export const SYMBOL_LIST = '~`!@#$%^&*()_-+={[}]|\\:;"\'<,>.?/';
|
||||
|
||||
/**
|
||||
* String of all letters, numbers & symbols
|
||||
*/
|
||||
const CHAR_LIST = LETTER_LIST + NUMBER_LIST + SYMBOL_LIST;
|
||||
export const CHAR_LIST = LETTER_LIST + LETTER_LIST.toLowerCase() + NUMBER_LIST + SYMBOL_LIST;
|
||||
|
||||
/**
|
||||
* Convert number of bytes into a human-readable size
|
||||
|
105
src/time.ts
105
src/time.ts
@ -1,5 +1,3 @@
|
||||
import {strSplice} from './string.ts';
|
||||
|
||||
/**
|
||||
* Like setInterval but will adjust the timeout value to account for runtime
|
||||
* @param {Function} cb Callback function that will be ran
|
||||
@ -27,10 +25,46 @@ export function adjustedInterval(cb: Function, ms: number) {
|
||||
*
|
||||
* @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 tz Override timezone, can be either string or number
|
||||
* @return {string} Formated date
|
||||
*/
|
||||
export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:mm '): string {
|
||||
if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
|
||||
export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:mm', tz?: string | number): string {
|
||||
const timezones = [
|
||||
['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 {
|
||||
switch(num) {
|
||||
@ -84,37 +118,14 @@ export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:
|
||||
return (offset > 0 ? '-' : '') + `${hours}:${minutes.toString().padStart(2, '0')}`;
|
||||
}
|
||||
|
||||
function timezone(offset: number) {
|
||||
const hours = offset / 60;
|
||||
switch (hours) {
|
||||
case -12: return "IDLW";
|
||||
case -11: return "SST";
|
||||
case -10: return "HST";
|
||||
case -9: return "AKST";
|
||||
case -8: return "PST";
|
||||
case -7: return "MST";
|
||||
case -6: return "CST";
|
||||
case -5: return "EST";
|
||||
case -4: return "AST";
|
||||
case -3: return "ART";
|
||||
case -2: return "FNT";
|
||||
case -1: return "AZOT";
|
||||
case 0: return "UTC";
|
||||
case 1: return "CET";
|
||||
case 2: return "EET";
|
||||
case 3: return "MSK";
|
||||
case 4: return "SAMT";
|
||||
case 5: return "YEKT";
|
||||
case 6: return "OMST";
|
||||
case 7: return "KRAT";
|
||||
case 8: return "CST";
|
||||
case 9: return "JST";
|
||||
case 10: return "AEST";
|
||||
case 11: return "SBT";
|
||||
case 12: return "NZST";
|
||||
default: return '';
|
||||
}
|
||||
}
|
||||
if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
|
||||
|
||||
// Handle timezones
|
||||
let t!: [string, number];
|
||||
if(tz == null) tz = -(date.getTimezoneOffset() / 60);
|
||||
t = <any>timezones.find(t => isNaN(<any>tz) ? t[0] == tz : t[1] == tz);
|
||||
if(!t) throw new Error(`Unknown timezone: ${tz}`);
|
||||
date = adjustTz(date, t[1]);
|
||||
|
||||
return format
|
||||
// Year
|
||||
@ -122,7 +133,7 @@ export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:
|
||||
.replaceAll('YY', date.getFullYear().toString().slice(2))
|
||||
// Month
|
||||
.replaceAll('MMMM', month(date.getMonth()))
|
||||
.replaceAll('MMM', month(date.getMonth()).slice(0, 2))
|
||||
.replaceAll('MMM', month(date.getMonth()).slice(0, 3))
|
||||
.replaceAll('MM', (date.getMonth() + 1).toString().padStart(2, '0'))
|
||||
.replaceAll('M', (date.getMonth() + 1).toString())
|
||||
// Day
|
||||
@ -146,16 +157,28 @@ export function formatDate(date: Date | number | string, format = 'YYYY-MM-DD H:
|
||||
.replaceAll('ss', date.getSeconds().toString().padStart(2, '0'))
|
||||
.replaceAll('s', date.getSeconds().toString())
|
||||
// Millisecond
|
||||
.replaceAll('SSS', date.getMilliseconds().toString())
|
||||
.replaceAll('SS', date.getMilliseconds().toString().slice(0, 1))
|
||||
.replaceAll('SSS', date.getMilliseconds().toString().padEnd(3, '0'))
|
||||
.replaceAll('SS', date.getMilliseconds().toString().slice(0, 1).padEnd(2, '0'))
|
||||
.replaceAll('S', date.getMilliseconds().toString()[0])
|
||||
// Period/Meridian (AM/PM)
|
||||
.replaceAll('A', date.getHours() >= 12 ? 'PM' : 'AM')
|
||||
.replaceAll('a', date.getHours() >= 12 ? 'pm' : 'am')
|
||||
// Timezone
|
||||
.replaceAll('ZZ', tzOffset(date.getTimezoneOffset()).replace(':', ''))
|
||||
.replaceAll('Z', tzOffset(date.getTimezoneOffset()))
|
||||
.replaceAll('z', timezone(date.getTimezoneOffset()));
|
||||
.replaceAll('ZZ', tzOffset(t[1] * 60).replace(':', ''))
|
||||
.replaceAll('Z', tzOffset(t[1] * 60))
|
||||
.replaceAll('z', typeof tz == 'string' ? tz : (<any>t)[0]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Run a function immediately & repeat every x ms
|
||||
*
|
||||
* @param {() => any} fn Callback function
|
||||
* @param {number} interval Repeat in ms
|
||||
* @return {number} Clear Interval ID
|
||||
*/
|
||||
export function instantInterval(fn: () => any, interval: number) {
|
||||
fn();
|
||||
return setInterval(fn, interval);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user