Compare commits
25 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 49a2df8cd4 | |||
| ccf3fcb043 | |||
| 341ef37205 | |||
| 0eab2630ad | |||
| 2f59a9d02e | |||
| ce2f32dd45 | |||
| ce40b5b1e7 | |||
| 2500bcdcf1 | |||
| db18c010aa | |||
| b292d5ed17 | |||
| a1ea8cdf67 | |||
| fbbe3c99ef | |||
| 1c1a3f6a6e | |||
| 2dce1ad9ac | |||
| cebfd2c508 | |||
| 7c5cf3535d | |||
| 847b493772 | |||
| b1005227ab | |||
| 3a389de72e | |||
| 151465aa65 | |||
| b103b6f786 | |||
| 3b486310de | |||
| 8699fb49ff | |||
| fdb29e7984 | |||
| 274c22bb83 |
12
.npmignore
Normal file
12
.npmignore
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
src
|
||||||
|
tests
|
||||||
|
.editorconfig
|
||||||
|
.gitignore
|
||||||
|
.gitmodules
|
||||||
|
.npmignore
|
||||||
|
CODEOWNERS
|
||||||
|
Dockerfile
|
||||||
|
index.html
|
||||||
|
jest.config.js
|
||||||
|
tsconfig.json
|
||||||
|
vite.config.js
|
||||||
19
index.html
Normal file
19
index.html
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
<!Doctype html>
|
||||||
|
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>@ztimson/utils sandbox</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<script type="module">
|
||||||
|
import {fromCsv, toCsv} from './dist/index.mjs';
|
||||||
|
|
||||||
|
const csv = '_id,any,boolean,date,file,foreignKey,formula,javaScript,number,string,_createdBy,_createdDate,_updatedBy,_updatedDate\n' +
|
||||||
|
'34,,true,,,,,,,,system,2024-11-09T12:06:50.023Z,system,2024-11-09T17:44:42.512Z\n' +
|
||||||
|
'37,,,,,,,,,,system,2024-11-09T18:53:21.793Z,system,2024-11-09T18:53:21.793Z\n' +
|
||||||
|
'38,,,,,,,,,,system,2024-11-09T18:53:21.796Z,system,2024-11-09T18:53:21.796Z';
|
||||||
|
|
||||||
|
console.log(fromCsv(csv));
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ztimson/utils",
|
"name": "@ztimson/utils",
|
||||||
"version": "0.20.3",
|
"version": "0.22.7",
|
||||||
"description": "Utility library",
|
"description": "Utility library",
|
||||||
"author": "Zak Timson",
|
"author": "Zak Timson",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
|||||||
17
src/aset.ts
17
src/aset.ts
@ -1,3 +1,5 @@
|
|||||||
|
import {isEqual} from './objects.ts';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An array which functions as a set. It guarantees unique elements
|
* An array which functions as a set. It guarantees unique elements
|
||||||
* and provides set functions for comparisons
|
* and provides set functions for comparisons
|
||||||
@ -24,6 +26,7 @@ export class ASet<T> extends Array {
|
|||||||
*/
|
*/
|
||||||
add(...items: T[]) {
|
add(...items: T[]) {
|
||||||
items.filter(el => !this.has(el)).forEach(el => this.push(el));
|
items.filter(el => !this.has(el)).forEach(el => this.push(el));
|
||||||
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -33,8 +36,9 @@ export class ASet<T> extends Array {
|
|||||||
delete(...items: T[]) {
|
delete(...items: T[]) {
|
||||||
items.forEach(el => {
|
items.forEach(el => {
|
||||||
const index = this.indexOf(el);
|
const index = this.indexOf(el);
|
||||||
if(index != -1) this.slice(index, 1);
|
if(index != -1) this.splice(index, 1);
|
||||||
})
|
})
|
||||||
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -55,6 +59,17 @@ export class ASet<T> extends Array {
|
|||||||
return this.indexOf(el) != -1;
|
return this.indexOf(el) != -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find index number of element, or -1 if it doesn't exist. Matches by equality not reference
|
||||||
|
*
|
||||||
|
* @param {T} search Element to find
|
||||||
|
* @param {number} fromIndex Starting index position
|
||||||
|
* @return {number} Element index number or -1 if missing
|
||||||
|
*/
|
||||||
|
indexOf(search: T, fromIndex?: number): number {
|
||||||
|
return super.findIndex((el: T) => isEqual(el, search), fromIndex);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create list of elements this set has in common with the comparison set
|
* Create list of elements this set has in common with the comparison set
|
||||||
* @param {ASet<T>} set Set to compare against
|
* @param {ASet<T>} set Set to compare against
|
||||||
|
|||||||
@ -25,7 +25,7 @@ export class Cache<K extends string | number | symbol, T> {
|
|||||||
* @param options
|
* @param options
|
||||||
*/
|
*/
|
||||||
constructor(public readonly key?: keyof T, public readonly options: CacheOptions = {}) {
|
constructor(public readonly key?: keyof T, public readonly options: CacheOptions = {}) {
|
||||||
if(options.storageKey && !options.storage)
|
if(options.storageKey && !options.storage && typeof(Storage) !== 'undefined')
|
||||||
options.storage = localStorage;
|
options.storage = localStorage;
|
||||||
if(options.storageKey && options.storage) {
|
if(options.storageKey && options.storage) {
|
||||||
const stored = options.storage.getItem(options.storageKey);
|
const stored = options.storage.getItem(options.storageKey);
|
||||||
|
|||||||
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
|
* 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
|
* @param {boolean} flatten Should nested object be flattened or treated as values
|
||||||
* @return {string} CSV string
|
* @return {string} CSV string
|
||||||
*/
|
*/
|
||||||
export function csv(target: any[], flatten=true) {
|
export function toCsv(target: any[], flatten=true) {
|
||||||
const headers = target.reduce((acc, row) => {
|
const headers = new ASet(target.reduce((acc, row) => [...acc, ...Object.keys(flatten ? flattenObj(row) : row)], []));
|
||||||
Object.keys(flatten ? flattenObj(row) : row)
|
|
||||||
.forEach(key => { if(!acc.includes(key)) acc.push(key); });
|
|
||||||
return acc;
|
|
||||||
}, []);
|
|
||||||
return [
|
return [
|
||||||
headers.join(','),
|
headers.join(','),
|
||||||
...target.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);
|
||||||
const type = typeof value;
|
return (typeof value == 'object' && value != null) ? '"' + JSONSanitize(value).replaceAll('"', '""') + '"' : value;
|
||||||
if(type == 'string' && value.includes(',')) return `"${value}"`;
|
|
||||||
if(type == 'object') return `"${JSON.stringify(value)}"`;
|
|
||||||
return value;
|
|
||||||
}).join(','))
|
}).join(','))
|
||||||
].join('\n');
|
].join('\n');
|
||||||
}
|
}
|
||||||
|
|||||||
@ -180,7 +180,6 @@ export class GatewayTimeoutError extends CustomError {
|
|||||||
* @return {CustomError} The proper error type
|
* @return {CustomError} The proper error type
|
||||||
*/
|
*/
|
||||||
export function errorFromCode(code: number, message?: string) {
|
export function errorFromCode(code: number, message?: string) {
|
||||||
if(code >= 200 && code < 300) return null;
|
|
||||||
switch(code) {
|
switch(code) {
|
||||||
case 400:
|
case 400:
|
||||||
return new BadRequestError(message);
|
return new BadRequestError(message);
|
||||||
|
|||||||
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
|
* Create timestamp intended for filenames from a date
|
||||||
*
|
*
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
import {TypedEmitter, TypedEvents} from './emitter';
|
import {TypedEmitter, TypedEvents} from './emitter';
|
||||||
|
import {JSONSanitize} from './objects.ts';
|
||||||
|
|
||||||
export const CliEffects = {
|
export const CliEffects = {
|
||||||
CLEAR: "\x1b[0m",
|
CLEAR: "\x1b[0m",
|
||||||
@ -64,49 +65,41 @@ export class Logger extends TypedEmitter<LoggerEvents> {
|
|||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
|
||||||
private pad(text: any, length: number, char: string, end = false) {
|
protected format(...text: any[]): string {
|
||||||
const t = text.toString();
|
|
||||||
const l = length - t.length;
|
|
||||||
if(l <= 0) return t;
|
|
||||||
const padding = Array(~~(l / char.length)).fill(char).join('');
|
|
||||||
return !end ? padding + t : t + padding;
|
|
||||||
}
|
|
||||||
|
|
||||||
private format(...text: string[]): string {
|
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
const timestamp = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()} ${this.pad(now.getHours().toString(), 2, '0')}:${this.pad(now.getMinutes().toString(), 2, '0')}:${this.pad(now.getSeconds().toString(), 2, '0')}.${this.pad(now.getMilliseconds().toString(), 3, '0', true)}`;
|
const timestamp = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()} ${now.getHours().toString().padStart(2, '0')}:${now.getMinutes().toString().padStart(2, '0')}:${now.getSeconds().toString().padStart(2, '0')}.${now.getMilliseconds().toString().padEnd(3, '0')}`;
|
||||||
return `${timestamp}${this.namespace ? ` [${this.namespace}]` : ''} ${text.join(' ')}`;
|
return `${timestamp}${this.namespace ? ` [${this.namespace}]` : ''} ${text.map(t => typeof t == 'string' ? t : JSONSanitize(t, 2)).join(' ')}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
debug(...args: string[]) {
|
debug(...args: any[]) {
|
||||||
if(Logger.LOG_LEVEL < LOG_LEVEL.DEBUG) return;
|
if(Logger.LOG_LEVEL < LOG_LEVEL.DEBUG) return;
|
||||||
const str = this.format(...args);
|
const str = this.format(...args);
|
||||||
Logger.emit(LOG_LEVEL.DEBUG, str);
|
Logger.emit(LOG_LEVEL.DEBUG, str);
|
||||||
console.debug(CliForeground.LIGHT_GREY + str + CliEffects.CLEAR);
|
console.debug(CliForeground.LIGHT_GREY + str + CliEffects.CLEAR);
|
||||||
}
|
}
|
||||||
|
|
||||||
log(...args: string[]) {
|
log(...args: any[]) {
|
||||||
if(Logger.LOG_LEVEL < LOG_LEVEL.LOG) return;
|
if(Logger.LOG_LEVEL < LOG_LEVEL.LOG) return;
|
||||||
const str = this.format(...args);
|
const str = this.format(...args);
|
||||||
Logger.emit(LOG_LEVEL.LOG, str);
|
Logger.emit(LOG_LEVEL.LOG, str);
|
||||||
console.log(CliEffects.CLEAR + str);
|
console.log(CliEffects.CLEAR + str);
|
||||||
}
|
}
|
||||||
|
|
||||||
info(...args: string[]) {
|
info(...args: any[]) {
|
||||||
if(Logger.LOG_LEVEL < LOG_LEVEL.INFO) return;
|
if(Logger.LOG_LEVEL < LOG_LEVEL.INFO) return;
|
||||||
const str = this.format(...args);
|
const str = this.format(...args);
|
||||||
Logger.emit(LOG_LEVEL.INFO, str);
|
Logger.emit(LOG_LEVEL.INFO, str);
|
||||||
console.info(CliForeground.BLUE + str + CliEffects.CLEAR);
|
console.info(CliForeground.BLUE + str + CliEffects.CLEAR);
|
||||||
}
|
}
|
||||||
|
|
||||||
warn(...args: string[]) {
|
warn(...args: any[]) {
|
||||||
if(Logger.LOG_LEVEL < LOG_LEVEL.WARN) return;
|
if(Logger.LOG_LEVEL < LOG_LEVEL.WARN) return;
|
||||||
const str = this.format(...args);
|
const str = this.format(...args);
|
||||||
Logger.emit(LOG_LEVEL.WARN, str);
|
Logger.emit(LOG_LEVEL.WARN, str);
|
||||||
console.warn(CliForeground.YELLOW + str + CliEffects.CLEAR);
|
console.warn(CliForeground.YELLOW + str + CliEffects.CLEAR);
|
||||||
}
|
}
|
||||||
|
|
||||||
error(...args: string[]) {
|
error(...args: any[]) {
|
||||||
if(Logger.LOG_LEVEL < LOG_LEVEL.ERROR) return;
|
if(Logger.LOG_LEVEL < LOG_LEVEL.ERROR) return;
|
||||||
const str = this.format(...args);
|
const str = this.format(...args);
|
||||||
Logger.emit(LOG_LEVEL.ERROR, str);
|
Logger.emit(LOG_LEVEL.ERROR, str);
|
||||||
|
|||||||
@ -29,10 +29,10 @@ export function clean<T>(obj: T, undefinedOnly = false): Partial<T> {
|
|||||||
* Should be replaced by `structuredClone` once released.
|
* Should be replaced by `structuredClone` once released.
|
||||||
* @param {T} value Object to copy
|
* @param {T} value Object to copy
|
||||||
* @returns {T} Type
|
* @returns {T} Type
|
||||||
* @deprecated Please use `structuredClone`
|
|
||||||
*/
|
*/
|
||||||
export function deepCopy<T>(value: T): T {
|
export function deepCopy<T>(value: T): T {
|
||||||
return structuredClone(value);
|
try {return structuredClone(value); }
|
||||||
|
catch { return JSON.parse(JSONSanitize(value)); }
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -91,7 +91,6 @@ export function dotNotation<T>(obj: any, prop: string, set?: T): T | undefined {
|
|||||||
}, obj);
|
}, obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert object into URL encoded query string
|
* 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 = {}) {
|
export function flattenObj(obj: any, parent?: any, result: any = {}) {
|
||||||
if(typeof obj === "object" && !Array.isArray(obj)) {
|
if(typeof obj === "object" && !Array.isArray(obj)) {
|
||||||
for(const key of Object.keys(obj)) {
|
for(const key of Object.keys(obj)) {
|
||||||
const propName = parent ? parent + '.' + key : key;
|
const propName = parent ? `${parent}.${key}` : key;
|
||||||
if(typeof obj[key] === 'object') {
|
if(typeof obj[key] === 'object' && obj[key] != null && !Array.isArray(obj[key])) {
|
||||||
|
console.log(propName, );
|
||||||
flattenObj(obj[key], propName, result);
|
flattenObj(obj[key], propName, result);
|
||||||
} else {
|
} else {
|
||||||
result[propName] = obj[key];
|
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
|
* 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
|
* @return {string | T} Object if successful, original string otherwise
|
||||||
*/
|
*/
|
||||||
export function JSONAttemptParse<T>(json: string): T | string {
|
export function JSONAttemptParse<T1, T2>(json: T2): T1 | T2 {
|
||||||
try { return JSON.parse(json); }
|
try { return JSON.parse(<any>json); }
|
||||||
catch { return json; }
|
catch { return json; }
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -234,10 +234,8 @@ export function JSONAttemptParse<T>(json: string): T | string {
|
|||||||
export function JSONSanitize(obj: any, space?: number): string {
|
export function JSONSanitize(obj: any, space?: number): string {
|
||||||
let cache: any[] = [];
|
let cache: any[] = [];
|
||||||
return JSON.stringify(obj, (key, value) => {
|
return JSON.stringify(obj, (key, value) => {
|
||||||
if (typeof value === 'object' && value !== null) {
|
if(typeof value === 'object' && value !== null)
|
||||||
if (cache.includes(value)) return;
|
if(!cache.includes(value)) cache.push(value);
|
||||||
cache.push(value);
|
|
||||||
}
|
|
||||||
return value;
|
return value;
|
||||||
}, space);
|
}, space);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -25,7 +25,7 @@ export type Method = '*' | 'n' | 'c' | 'r' | 'u' | 'd' | 'x';
|
|||||||
* @param {string} args
|
* @param {string} args
|
||||||
* @return {PathEvent} Event object
|
* @return {PathEvent} Event object
|
||||||
*/
|
*/
|
||||||
export function PE(str: TemplateStringsArray, ...args: string[]) {
|
export function PE(str: TemplateStringsArray, ...args: any[]) {
|
||||||
const combined = [];
|
const combined = [];
|
||||||
for(let i = 0; i < str.length || i < args.length; i++) {
|
for(let i = 0; i < str.length || i < args.length; i++) {
|
||||||
if(str[i]) combined.push(str[i]);
|
if(str[i]) combined.push(str[i]);
|
||||||
@ -52,6 +52,8 @@ export function PES(str: TemplateStringsArray, ...args: any[]) {
|
|||||||
return PathEvent.toString(paths, <any>methods?.split(''));
|
return PathEvent.toString(paths, <any>methods?.split(''));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class PathError extends Error { }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A event broken down into its core components for easy processing
|
* A event broken down into its core components for easy processing
|
||||||
* Event Structure: `module/path/name:property:method`
|
* Event Structure: `module/path/name:property:method`
|
||||||
@ -67,23 +69,30 @@ export class PathEvent {
|
|||||||
/** Last sagment of path */
|
/** Last sagment of path */
|
||||||
name!: string;
|
name!: string;
|
||||||
/** List of methods */
|
/** List of methods */
|
||||||
methods!: Method[];
|
methods!: ASet<Method>;
|
||||||
|
|
||||||
/** All/Wildcard specified */
|
/** All/Wildcard specified */
|
||||||
all!: boolean;
|
get all(): boolean { return this.methods.has('*') }
|
||||||
|
set all(v: boolean) { v ? new ASet<Method>(['*']) : this.methods.delete('*'); }
|
||||||
/** None specified */
|
/** None specified */
|
||||||
none!: boolean;
|
get none(): boolean { return this.methods.has('n') }
|
||||||
|
set none(v: boolean) { v ? this.methods = new ASet<Method>(['n']) : this.methods.delete('n'); }
|
||||||
/** Create method specified */
|
/** Create method specified */
|
||||||
create!: boolean;
|
get create(): boolean { return !this.methods.has('n') && (this.methods.has('*') || this.methods.has('c')) }
|
||||||
|
set create(v: boolean) { v ? this.methods.delete('n').add('c') : this.methods.delete('c'); }
|
||||||
/** Read method specified */
|
/** Read method specified */
|
||||||
read!: boolean;
|
get read(): boolean { return !this.methods.has('n') && (this.methods.has('*') || this.methods.has('r')) }
|
||||||
|
set read(v: boolean) { v ? this.methods.delete('n').add('r') : this.methods.delete('r'); }
|
||||||
/** Update method specified */
|
/** Update method specified */
|
||||||
update!: boolean;
|
get update(): boolean { return !this.methods.has('n') && (this.methods.has('*') || this.methods.has('u')) }
|
||||||
|
set update(v: boolean) { v ? this.methods.delete('n').add('u') : this.methods.delete('u'); }
|
||||||
/** Delete method specified */
|
/** Delete method specified */
|
||||||
delete!: boolean;
|
get delete(): boolean { return !this.methods.has('n') && (this.methods.has('*') || this.methods.has('d')) }
|
||||||
|
set delete(v: boolean) { v ? this.methods.delete('n').add('d') : this.methods.delete('d'); }
|
||||||
|
|
||||||
constructor(Event: string | PathEvent) {
|
constructor(Event: string | PathEvent) {
|
||||||
if(typeof Event == 'object') return Object.assign(this, Event);
|
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(!method) method = scope || '*';
|
||||||
if(p == '*' || !p && method == '*') {
|
if(p == '*' || !p && method == '*') {
|
||||||
p = '';
|
p = '';
|
||||||
@ -94,13 +103,7 @@ export class PathEvent {
|
|||||||
this.fullPath = p;
|
this.fullPath = p;
|
||||||
this.path = temp.join('/');
|
this.path = temp.join('/');
|
||||||
this.name = temp.pop() || '';
|
this.name = temp.pop() || '';
|
||||||
this.methods = <Method[]>method.split('');
|
this.methods = new ASet(<any>method.split(''));
|
||||||
this.all = method?.includes('*');
|
|
||||||
this.none = method?.includes('n');
|
|
||||||
this.create = !method?.includes('n') && (method?.includes('*') || method?.includes('w') || method?.includes('c'));
|
|
||||||
this.read = !method?.includes('n') && (method?.includes('*') || method?.includes('r'));
|
|
||||||
this.update = !method?.includes('n') && (method?.includes('*') || method?.includes('w') || method?.includes('u'));
|
|
||||||
this.delete = !method?.includes('n') && (method?.includes('*') || method?.includes('w') || method?.includes('d'));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -110,7 +113,7 @@ export class PathEvent {
|
|||||||
* @param {string | PathEvent} paths Events as strings or pre-parsed
|
* @param {string | PathEvent} paths Events as strings or pre-parsed
|
||||||
* @return {PathEvent} Final combined permission
|
* @return {PathEvent} Final combined permission
|
||||||
*/
|
*/
|
||||||
static combine(paths: (string | PathEvent)[]): PathEvent {
|
static combine(...paths: (string | PathEvent)[]): PathEvent {
|
||||||
let hitNone = false;
|
let hitNone = false;
|
||||||
const combined = paths.map(p => new PathEvent(p))
|
const combined = paths.map(p => new PathEvent(p))
|
||||||
.toSorted((p1, p2) => {
|
.toSorted((p1, p2) => {
|
||||||
@ -120,21 +123,30 @@ export class PathEvent {
|
|||||||
if(p.none) hitNone = true;
|
if(p.none) hitNone = true;
|
||||||
if(!acc) return p;
|
if(!acc) return p;
|
||||||
if(hitNone) return acc;
|
if(hitNone) return acc;
|
||||||
if(p.all) acc.all = true;
|
|
||||||
if(p.all || p.create) acc.create = true;
|
|
||||||
if(p.all || p.read) acc.read = true;
|
|
||||||
if(p.all || p.update) acc.update = true;
|
|
||||||
if(p.all || p.delete) acc.delete = true;
|
|
||||||
acc.methods = [...acc.methods, ...p.methods];
|
acc.methods = [...acc.methods, ...p.methods];
|
||||||
return acc;
|
return acc;
|
||||||
}, <any>null);
|
}, <any>null);
|
||||||
if(combined.all) combined.methods = ['*'];
|
combined.methods = new ASet<Method>(combined.methods);
|
||||||
if(combined.none) combined.methods = ['n'];
|
|
||||||
combined.methods = new ASet(combined.methods); // Make unique
|
|
||||||
combined.raw = PES`${combined.fullPath}:${combined.methods}`;
|
|
||||||
return combined;
|
return combined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Filter a set of paths based on the target
|
||||||
|
*
|
||||||
|
* @param {string | PathEvent | (string | PathEvent)[]} target Array of events that will filtered
|
||||||
|
* @param filter {...PathEvent} Must container one of
|
||||||
|
* @return {boolean} Whether there is any overlap
|
||||||
|
*/
|
||||||
|
static filter(target: string | PathEvent | (string | PathEvent)[], ...filter: (string | PathEvent)[]): PathEvent[] {
|
||||||
|
const parsedTarget = makeArray(target).map(pe => new PathEvent(pe));
|
||||||
|
const parsedFind = makeArray(filter).map(pe => new PathEvent(pe));
|
||||||
|
return parsedTarget.filter(t => {
|
||||||
|
if(!t.fullPath && t.all) return true;
|
||||||
|
return !!parsedFind.find(f => t.fullPath.startsWith(f.fullPath)
|
||||||
|
&& (f.all || t.all || t.methods.intersection(f.methods).length));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Squash 2 sets of paths & return true if any overlap is found
|
* Squash 2 sets of paths & return true if any overlap is found
|
||||||
*
|
*
|
||||||
@ -149,8 +161,8 @@ export class PathEvent {
|
|||||||
if(!r.fullPath && r.all) return true;
|
if(!r.fullPath && r.all) return true;
|
||||||
const filtered = parsedTarget.filter(p => r.fullPath.startsWith(p.fullPath));
|
const filtered = parsedTarget.filter(p => r.fullPath.startsWith(p.fullPath));
|
||||||
if(!filtered.length) return false;
|
if(!filtered.length) return false;
|
||||||
const combined = PathEvent.combine(filtered);
|
const combined = PathEvent.combine(...filtered);
|
||||||
return !combined.none && (combined.all || new ASet(combined.methods).intersection(new ASet(r.methods)).length);
|
return (!combined.none && (combined.all || r.all)) || combined.methods.intersection(r.methods).length;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -172,7 +184,7 @@ export class PathEvent {
|
|||||||
* @param has Target must have at least one of these path
|
* @param has Target must have at least one of these path
|
||||||
*/
|
*/
|
||||||
static hasFatal(target: string | PathEvent | (string | PathEvent)[], ...has: (string | PathEvent)[]): void {
|
static hasFatal(target: string | PathEvent | (string | PathEvent)[], ...has: (string | PathEvent)[]): void {
|
||||||
if(!PathEvent.has(target, ...has)) throw new Error(`Requires one of: ${makeArray(has).join(', ')}`);
|
if(!PathEvent.has(target, ...has)) throw new PathError(`Requires one of: ${makeArray(has).join(', ')}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -182,7 +194,7 @@ export class PathEvent {
|
|||||||
* @param has Target must have all these paths
|
* @param has Target must have all these paths
|
||||||
*/
|
*/
|
||||||
static hasAllFatal(target: string | PathEvent | (string | PathEvent)[], ...has: (string | PathEvent)[]): void {
|
static hasAllFatal(target: string | PathEvent | (string | PathEvent)[], ...has: (string | PathEvent)[]): void {
|
||||||
if(!PathEvent.hasAll(target, ...has)) throw new Error(`Requires all: ${makeArray(has).join(', ')}`);
|
if(!PathEvent.hasAll(target, ...has)) throw new PathError(`Requires all: ${makeArray(has).join(', ')}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -194,8 +206,19 @@ export class PathEvent {
|
|||||||
*/
|
*/
|
||||||
static toString(path: string | string[], methods: Method | Method[]): string {
|
static toString(path: string | string[], methods: Method | Method[]): string {
|
||||||
let p = makeArray(path).filter(p => p != null).join('/');
|
let p = makeArray(path).filter(p => p != null).join('/');
|
||||||
|
p = p?.trim().replaceAll(/\/{2,}/g, '/').replaceAll(/(^\/|\/$)/g, '');
|
||||||
if(methods?.length) p += `:${makeArray(methods).map(m => m.toLowerCase()).join('')}`;
|
if(methods?.length) p += `:${makeArray(methods).map(m => m.toLowerCase()).join('')}`;
|
||||||
return p?.trim().replaceAll(/\/{2,}/g, '/').replaceAll(/(^\/|\/$)/g, '');
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Filter a set of paths based on this event
|
||||||
|
*
|
||||||
|
* @param {string | PathEvent | (string | PathEvent)[]} target Array of events that will filtered
|
||||||
|
* @return {boolean} Whether there is any overlap
|
||||||
|
*/
|
||||||
|
filter(target: string | PathEvent | (string | PathEvent)[]): PathEvent[] {
|
||||||
|
return PathEvent.filter(target, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -1,24 +1,22 @@
|
|||||||
import {dotNotation, flattenObj} from './objects.ts';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* String of all letters
|
* String of all letters
|
||||||
*/
|
*/
|
||||||
const LETTER_LIST = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
|
export const LETTER_LIST = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* String of all numbers
|
* String of all numbers
|
||||||
*/
|
*/
|
||||||
const NUMBER_LIST = '0123456789';
|
export const NUMBER_LIST = '0123456789';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* String of all symbols
|
* String of all symbols
|
||||||
*/
|
*/
|
||||||
const SYMBOL_LIST = '~`!@#$%^&*()_-+={[}]|\\:;"\'<,>.?/';
|
export const SYMBOL_LIST = '~`!@#$%^&*()_-+={[}]|\\:;"\'<,>.?/';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* String of all letters, numbers & symbols
|
* 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
|
* Convert number of bytes into a human-readable size
|
||||||
@ -44,7 +42,7 @@ export function formatBytes(bytes: number, decimals = 2) {
|
|||||||
export function formatPhoneNumber(number: string) {
|
export function formatPhoneNumber(number: string) {
|
||||||
const parts = /(\+?1)?.*?(\d{3}).*?(\d{3}).*?(\d{4})/g.exec(number);
|
const parts = /(\+?1)?.*?(\d{3}).*?(\d{3}).*?(\d{4})/g.exec(number);
|
||||||
if(!parts) throw new Error(`Number cannot be parsed: ${number}`);
|
if(!parts) throw new Error(`Number cannot be parsed: ${number}`);
|
||||||
return `${parts[1] ?? ''} (${parts[2]}) ${parts[3]}-${parts[4]}`.trim();
|
return `${parts[1] ? '+1' : ''} (${parts[2]}) ${parts[3]}-${parts[4]}`.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -60,6 +58,7 @@ export function formatPhoneNumber(number: string) {
|
|||||||
* @param {string} str - Value that will be injected to parent
|
* @param {string} str - Value that will be injected to parent
|
||||||
* @param {number} index - Position to inject string at
|
* @param {number} index - Position to inject string at
|
||||||
* @returns {string} - New string
|
* @returns {string} - New string
|
||||||
|
* @deprecated use `strSplice()`
|
||||||
*/
|
*/
|
||||||
export function insertAt(target: string, str: string, index: number): String {
|
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)}`;
|
||||||
@ -150,6 +149,21 @@ export function randomStringBuilder(length: number, letters = false, numbers = f
|
|||||||
}).join('');
|
}).join('');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Splice a string together (Similar to Array.splice)
|
||||||
|
*
|
||||||
|
* @param {string} str String that will be modified
|
||||||
|
* @param {number} start Start index of splice
|
||||||
|
* @param {number} deleteCount Number of characters to remove in splice
|
||||||
|
* @param {string} insert Insert new string into splice
|
||||||
|
* @return {string} Returned spliced string
|
||||||
|
*/
|
||||||
|
export function strSplice(str: string, start: number, deleteCount: number, insert = '') {
|
||||||
|
const before = str.slice(0, start);
|
||||||
|
const after = str.slice(start + deleteCount);
|
||||||
|
return before + insert + after;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Find all substrings that match a given pattern.
|
* Find all substrings that match a given pattern.
|
||||||
*
|
*
|
||||||
@ -195,6 +209,7 @@ export type ParsedUrl = {
|
|||||||
*
|
*
|
||||||
* @param {string} url URL string that will be parsed
|
* @param {string} url URL string that will be parsed
|
||||||
* @returns {RegExpExecArray} Parts of URL
|
* @returns {RegExpExecArray} Parts of URL
|
||||||
|
* @deprecated Use built-in URL object: `new URL('...')`;
|
||||||
*/
|
*/
|
||||||
export function parseUrl(url: string): ParsedUrl {
|
export function parseUrl(url: string): ParsedUrl {
|
||||||
const processed = new RegExp(
|
const processed = new RegExp(
|
||||||
|
|||||||
134
src/time.ts
134
src/time.ts
@ -1,17 +1,135 @@
|
|||||||
|
import {strSplice} from './string.ts';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return date formated highest to lowest: YYYY-MM-DD H:mm AM
|
* Like setInterval but will adjust the timeout value to account for runtime
|
||||||
|
* @param {Function} cb Callback function that will be ran
|
||||||
|
* @param {number} ms Run function ever x seconds
|
||||||
|
* @return {() => void}
|
||||||
|
*/
|
||||||
|
export function adjustedInterval(cb: Function, ms: number) {
|
||||||
|
let cancel = false, timeout: any = null;
|
||||||
|
const p = async () => {
|
||||||
|
if (cancel) return;
|
||||||
|
const start = new Date().getTime();
|
||||||
|
await cb();
|
||||||
|
const end = new Date().getTime();
|
||||||
|
timeout = setTimeout(() => p(), ms - (end - start) || 1);
|
||||||
|
};
|
||||||
|
p();
|
||||||
|
return () => {
|
||||||
|
cancel = true;
|
||||||
|
if(timeout) clearTimeout(timeout);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Format date
|
||||||
*
|
*
|
||||||
* @param {Date | number | string} date Date or timestamp to convert to string
|
* @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`
|
||||||
* @return {string} Formated date
|
* @return {string} Formated date
|
||||||
*/
|
*/
|
||||||
export function formatDate(date: Date | number | string): string {
|
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);
|
if(typeof date == 'number' || typeof date == 'string') date = new Date(date);
|
||||||
let hours = date.getHours(), postfix = 'AM';
|
|
||||||
if(hours >= 12) {
|
function day(num: number): string {
|
||||||
if(hours > 12) hours -= 12;
|
switch(num) {
|
||||||
postfix = 'PM';
|
case(0): return 'Sunday';
|
||||||
} else if(hours == 0) hours = 12;
|
case(1): return 'Monday';
|
||||||
return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}, ${hours}:${date.getMinutes().toString().padStart(2, '0')} ${postfix}`;
|
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) {
|
||||||
|
const start = new Date(`${date.getFullYear()}-01-01 0:00:00`);
|
||||||
|
return Math.ceil((date.getTime() - start.getTime()) / (1000 * 60 * 60 * 24));
|
||||||
|
}
|
||||||
|
|
||||||
|
function month(num: number): string {
|
||||||
|
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) {
|
||||||
|
let n = num.toString();
|
||||||
|
switch(n.at(-1)) {
|
||||||
|
case('1'): return num + 'st';
|
||||||
|
case('2'): return num + 'nd';
|
||||||
|
case('3'): return num + 'rd';
|
||||||
|
default: return num + 'th';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function tzOffset(offset: number) {
|
||||||
|
const hours = ~~(offset / 60);
|
||||||
|
const minutes = offset % 60;
|
||||||
|
return (offset > 0 ? '-' : '') + `${hours}:${minutes.toString().padStart(2, '0')}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function timezone(date: Date): string {
|
||||||
|
const formatter = new Intl.DateTimeFormat('en-US', {timeZoneName: 'short'});
|
||||||
|
const formattedDate = formatter.format(date);
|
||||||
|
return formattedDate.split(' ').pop() || '';
|
||||||
|
}
|
||||||
|
|
||||||
|
return format
|
||||||
|
// Year
|
||||||
|
.replaceAll('YYYY', date.getFullYear().toString())
|
||||||
|
.replaceAll('YY', date.getFullYear().toString().slice(2))
|
||||||
|
// Month
|
||||||
|
.replaceAll('MMMM', month(date.getMonth()))
|
||||||
|
.replaceAll('MMM', month(date.getMonth()).slice(0, 2))
|
||||||
|
.replaceAll('MM', (date.getMonth() + 1).toString().padStart(2, '0'))
|
||||||
|
.replaceAll('M', (date.getMonth() + 1).toString())
|
||||||
|
// Day
|
||||||
|
.replaceAll('DDD', doy(date).toString())
|
||||||
|
.replaceAll('DD', date.getDate().toString().padStart(2, '0'))
|
||||||
|
.replaceAll('Do', suffix(date.getDate()))
|
||||||
|
.replaceAll('D', date.getDate().toString())
|
||||||
|
.replaceAll('dddd', day(date.getDay()))
|
||||||
|
.replaceAll('ddd', day(date.getDay()).slice(0, 2))
|
||||||
|
.replaceAll('dd', date.getDate().toString().padStart(2, '0'))
|
||||||
|
.replaceAll('d', date.getDay().toString())
|
||||||
|
// Hour
|
||||||
|
.replaceAll('HH', date.getHours().toString().padStart(2, '0'))
|
||||||
|
.replaceAll('H', date.getHours().toString())
|
||||||
|
.replaceAll('hh', (date.getHours() > 12 ? date.getHours() - 12 : date.getHours()).toString().padStart(2, '0'))
|
||||||
|
.replaceAll('h', (date.getHours() > 12 ? date.getHours() - 12 : date.getHours()).toString())
|
||||||
|
// Minute
|
||||||
|
.replaceAll('mm', date.getMinutes().toString().padStart(2, '0'))
|
||||||
|
.replaceAll('m', date.getMinutes().toString())
|
||||||
|
// Second
|
||||||
|
.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('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));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -15,6 +15,6 @@
|
|||||||
*
|
*
|
||||||
* @return {Array<keyof T>} Available keys
|
* @return {Array<keyof T>} Available keys
|
||||||
*/
|
*/
|
||||||
export function tyoeKeys<T extends object>() {
|
export function typeKeys<T extends object>() {
|
||||||
return Object.keys(<T>{}) as Array<keyof T>;
|
return Object.keys(<T>{}) as Array<keyof T>;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -13,7 +13,7 @@ export default defineConfig({
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
emptyOutDir: true,
|
emptyOutDir: true,
|
||||||
minify: true,
|
minify: false,
|
||||||
sourcemap: true
|
sourcemap: true
|
||||||
},
|
},
|
||||||
plugins: [dts()],
|
plugins: [dts()],
|
||||||
|
|||||||
Reference in New Issue
Block a user