Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b473ade178 | |||
| b3223661dd | |||
| c36af83918 | |||
| 9ec70430a5 | |||
| 397b165e55 | |||
| c1577c2106 | |||
| 2b12916246 | |||
| 5efb045f22 | |||
| 7119390681 | |||
| fd95c0c697 | |||
| 1ab8e6424b | |||
| 035a1d35cb |
@ -1,11 +1,9 @@
|
||||
<html>
|
||||
<body>
|
||||
<script type="module">
|
||||
import {PathEventEmitter} from './dist/index.mjs';
|
||||
import {PE} from './dist/index.mjs';
|
||||
|
||||
const emitter = new PathEventEmitter('data');
|
||||
emitter.on('*', console.log);
|
||||
emitter.emit('data/asd', {});
|
||||
console.log('data/Ts:n', PE`${'data/Ts'}:n`.methods);
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@ztimson/utils",
|
||||
"version": "0.26.5",
|
||||
"version": "0.26.17",
|
||||
"description": "Utility library",
|
||||
"author": "Zak Timson",
|
||||
"license": "MIT",
|
||||
|
||||
@ -80,7 +80,9 @@ export class Cache<K extends string | number | symbol, T> {
|
||||
if(persists.storage?.database != undefined) {
|
||||
(<Database>persists.storage).createTable({name: persists.key, key: <string>this.key}).then(table => {
|
||||
if(key) {
|
||||
table.set(this.get(key), key);
|
||||
const value = this.get(key);
|
||||
if(value != null) table.set(value, key);
|
||||
else table.delete(key);
|
||||
} else {
|
||||
table.clear();
|
||||
this.all().forEach(row => table.add(row));
|
||||
|
||||
@ -78,7 +78,7 @@ export class Http {
|
||||
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 || '');
|
||||
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) {
|
||||
const q = Array.isArray(opts.query) ? opts.query :
|
||||
Object.keys(opts.query).map(k => ({key: k, value: (<any>opts.query)[k]}))
|
||||
|
||||
11
src/misc.ts
11
src/misc.ts
@ -47,6 +47,17 @@ export function ipV6ToV4(ip: string) {
|
||||
return ipv4;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if IP is reserved, e.g. localhost, private IPs, etc.
|
||||
* @param {string} ip
|
||||
* @returns {boolean}
|
||||
*/
|
||||
export function reservedIp(ip: string): boolean {
|
||||
if(ip == 'localhost' || ip == '127.0.0.1') return true;
|
||||
return /\b(10\.(?:[0-9]{1,3}\.){2}[0-9]{1,3})\b|\b(172\.(?:1[6-9]|2[0-9]|3[0-1])\.(?:[0-9]{1,3}\.)[0-9]{1,3})\b|\b(192\.168\.(?:[0-9]{1,3}\.)[0-9]{1,3})\b/.test(ip);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Represents a function that listens for events and handles them accordingly.
|
||||
*
|
||||
|
||||
@ -325,10 +325,13 @@ export class PathEventEmitter implements IPathEventEmitter{
|
||||
}
|
||||
|
||||
on(event: Event | Event[], listener: PathListener): PathUnsubscribe {
|
||||
makeArray(event).forEach(e => this.listeners.push([
|
||||
e instanceof PathEvent ? e : new PathEvent(`${this.prefix}/${e}`),
|
||||
listener
|
||||
]));
|
||||
makeArray(event).forEach(e => {
|
||||
if(typeof e == 'string' && e[0] == '*' && this.prefix) e = e.slice(1);
|
||||
this.listeners.push([
|
||||
e instanceof PathEvent ? e : new PathEvent(`${this.prefix}/${e}`),
|
||||
listener
|
||||
])
|
||||
});
|
||||
return () => this.off(listener);
|
||||
}
|
||||
|
||||
|
||||
@ -13,8 +13,8 @@ export function search(rows: any[], search: string, regex?: boolean, transform:
|
||||
if(!rows) return [];
|
||||
return rows.filter(r => {
|
||||
// Empty search
|
||||
const value = transform(r);
|
||||
if(!search) return true;
|
||||
const value = transform(r);
|
||||
// Regex search
|
||||
if(regex) {
|
||||
return !!Object.values(value).filter((v: any) => {
|
||||
@ -22,7 +22,7 @@ export function search(rows: any[], search: string, regex?: boolean, transform:
|
||||
catch { return false; }
|
||||
}).length
|
||||
} else {
|
||||
return logicTest(r, search);
|
||||
return logicTest(value, search);
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -39,6 +39,8 @@ export function logicTest(target: object, condition: string): boolean {
|
||||
case '=':
|
||||
case '==': return a == b;
|
||||
case '!=': return a != b;
|
||||
case '+=': return a?.toString().includes(b);
|
||||
case '-=': return !a?.toString().includes(b);
|
||||
case '>': return a > b;
|
||||
case '>=': return a >= b;
|
||||
case '<': return a < b;
|
||||
@ -53,7 +55,7 @@ export function logicTest(target: object, condition: string): boolean {
|
||||
const and = p.split('&&').map(p => p.trim()).filter(p => !!p);
|
||||
return and.filter(p => {
|
||||
// Boolean operator
|
||||
const prop = /(\S+)\s*(==?|!=|>=|>|<=|<)\s*(\S+)/g.exec(p);
|
||||
const prop = /(\S+)\s*(==?|!=|\+=|-=|>=|>|<=|<)\s*(\S+)/g.exec(p);
|
||||
if(prop) {
|
||||
const key = Object.keys(target).find(k => k.toLowerCase() == prop[1].toLowerCase());
|
||||
return evalBoolean(dotNotation<any>(target, key || prop[1]), prop[2], JSONAttemptParse(prop[3]));
|
||||
|
||||
@ -43,6 +43,24 @@ export function formatBytes(bytes: number, decimals = 2) {
|
||||
return parseFloat((bytes / Math.pow(k, i)).toFixed(decimals)) + ' ' + sizes[i];
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert milliseconds to human-readable duration
|
||||
* @param {string} number milliseconds
|
||||
* @return {string} formated duration
|
||||
*/
|
||||
export function formatMs(number: string): string {
|
||||
const ms = parseInt(number, 10);
|
||||
if (isNaN(ms) || ms < 0) return "Invalid input";
|
||||
const seconds = ms / 1000;
|
||||
const minutes = seconds / 60;
|
||||
const hours = minutes / 60;
|
||||
const days = hours / 24;
|
||||
if (days >= 1) return `${days.toFixed(1)} days`;
|
||||
else if (hours >= 1) return `${hours.toFixed(1)} hours`;
|
||||
else if (minutes >= 1) return `${minutes.toFixed(1)} minutes`;
|
||||
else return `${seconds.toFixed(1)} seconds`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Extract numbers from a string & create a formated phone number: +1 (123) 456-7890
|
||||
*
|
||||
|
||||
@ -4,6 +4,7 @@ const rows = [
|
||||
{id: 1, name: 'Alice', age: 30},
|
||||
{id: 2, name: 'Bob', age: 24},
|
||||
{id: 3, name: 'Carol', age: 30},
|
||||
{id: 4, name: 'David', age: 35},
|
||||
];
|
||||
|
||||
describe('Search Utilities', () => {
|
||||
@ -37,6 +38,35 @@ describe('Search Utilities', () => {
|
||||
it('returns all if search is falsy and regex enabled', () => {
|
||||
expect(search(rows, '', true)).toEqual(rows);
|
||||
});
|
||||
|
||||
it('handles regex search with special characters', () => {
|
||||
expect(search(rows, '^[AC]', true)).toEqual([rows[0], rows[2]]);
|
||||
});
|
||||
|
||||
it('ignores case when regex is applied', () => {
|
||||
expect(search(rows, 'ALICE', true)).toEqual([]);
|
||||
});
|
||||
|
||||
it('performs partial matches for properties when regex=false', () => {
|
||||
expect(search(rows, 'Da')).toEqual([rows[3]]);
|
||||
});
|
||||
|
||||
it('handles empty array input gracefully', () => {
|
||||
expect(search([], 'test')).toEqual([]);
|
||||
});
|
||||
|
||||
it('handles numeric values with comparison logic in strings', () => {
|
||||
expect(search(rows, 'age < 31')).toEqual([rows[0], rows[1], rows[2]]);
|
||||
});
|
||||
|
||||
// New test cases for `+` and `-` operators
|
||||
it('filters rows using the + operator', () => {
|
||||
expect(search(rows, 'name += Al')).toEqual([rows[0]]);
|
||||
});
|
||||
|
||||
it('filters rows using the - operator', () => {
|
||||
expect(search(rows, 'name -= Al')).toEqual([rows[1], rows[2], rows[3]]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('logicTest', () => {
|
||||
@ -67,5 +97,46 @@ describe('Search Utilities', () => {
|
||||
it('returns false for unsupported operators', () => {
|
||||
expect(logicTest(obj, 'x === 10')).toBe(false);
|
||||
});
|
||||
|
||||
it('handles invalid condition strings gracefully', () => {
|
||||
expect(logicTest(obj, 'invalid condition')).toBe(false);
|
||||
});
|
||||
|
||||
it('supports numeric operations with ranges', () => {
|
||||
expect(logicTest(obj, 'x > 5 && x < 15')).toBe(true);
|
||||
expect(logicTest(obj, 'x > 15')).toBe(false);
|
||||
});
|
||||
|
||||
it('handles mixed case keys gracefully', () => {
|
||||
const mixedCaseObj = {TestKey: 123};
|
||||
expect(logicTest(mixedCaseObj, 'TestKey == 123')).toBe(true);
|
||||
expect(logicTest(mixedCaseObj, 'testkey == 123')).toBe(true);
|
||||
});
|
||||
|
||||
it('returns false if condition operators are missing', () => {
|
||||
expect(logicTest(obj, 'x 10')).toBe(false);
|
||||
});
|
||||
|
||||
// New test cases for `+` and `-` operators
|
||||
it('handles the + operator for inclusion', () => {
|
||||
expect(logicTest(obj, 'name += Alpha')).toBe(true);
|
||||
expect(logicTest(obj, 'name += Alp')).toBe(true);
|
||||
expect(logicTest(obj, 'name += Bet')).toBe(false);
|
||||
});
|
||||
|
||||
it('handles the - operator for exclusion', () => {
|
||||
expect(logicTest(obj, 'name -= Alpha')).toBe(false);
|
||||
expect(logicTest(obj, 'name -= Alp')).toBe(false);
|
||||
expect(logicTest(obj, 'name -= Bet')).toBe(true);
|
||||
});
|
||||
|
||||
it('includes partial matches correctly with +', () => {
|
||||
expect(logicTest(obj, 'name += lph')).toBe(true);
|
||||
});
|
||||
|
||||
it('excludes partial matches correctly with -', () => {
|
||||
expect(logicTest(obj, 'name -= lph')).toBe(false);
|
||||
expect(logicTest(obj, 'name -= xyz')).toBe(true);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user