Compare commits

...

5 Commits

Author SHA1 Message Date
e2b8c35535 more path event fixes.... i hope...
All checks were successful
Build / Build NPM Project (push) Successful in 44s
Build / Tag Version (push) Successful in 7s
Build / Publish Documentation (push) Successful in 37s
2025-06-24 22:05:39 -04:00
3b7d28de4b Fixed test
Some checks failed
Build / Build NPM Project (push) Failing after 39s
Build / Publish Documentation (push) Has been skipped
Build / Tag Version (push) Has been skipped
2025-06-24 20:55:12 -04:00
8f7e816571 path event fixes
Some checks failed
Build / Build NPM Project (push) Failing after 45s
Build / Publish Documentation (push) Has been skipped
Build / Tag Version (push) Has been skipped
2025-06-24 20:52:16 -04:00
8c1fb2d8cb Fixed filename timestamp
All checks were successful
Build / Build NPM Project (push) Successful in 1m20s
Build / Tag Version (push) Successful in 15s
Build / Publish Documentation (push) Successful in 56s
2025-06-23 18:08:25 -04:00
91dc17667e Better cache & database integration
All checks were successful
Build / Build NPM Project (push) Successful in 44s
Build / Tag Version (push) Successful in 13s
Build / Publish Documentation (push) Successful in 51s
2025-06-20 19:41:01 -04:00
5 changed files with 24 additions and 26 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "@ztimson/utils", "name": "@ztimson/utils",
"version": "0.25.13", "version": "0.25.16",
"description": "Utility library", "description": "Utility library",
"author": "Zak Timson", "author": "Zak Timson",
"license": "MIT", "license": "MIT",

View File

@ -34,7 +34,12 @@ export class Cache<K extends string | number | symbol, T> {
if(options.storageKey && !options.storage && typeof(Storage) !== 'undefined') options.storage = localStorage; if(options.storageKey && !options.storage && typeof(Storage) !== 'undefined') options.storage = localStorage;
if(options.storage) { if(options.storage) {
if(options.storage instanceof Table) { if(options.storage instanceof Table) {
(async () => (await options.storage?.getAll()).forEach((v: any) => this.add(v)))() (async () => (await options.storage?.getAll()).forEach((v: any) => {
if(v) {
try { this.add(v) }
catch { }
}
}))()
} else if(options.storageKey) { } else if(options.storageKey) {
const stored = options.storage?.getItem(options.storageKey); const stored = options.storage?.getItem(options.storageKey);
if(stored != null) try { Object.assign(this.store, JSON.parse(stored)); } catch { } if(stored != null) try { Object.assign(this.store, JSON.parse(stored)); } catch { }
@ -55,6 +60,7 @@ export class Cache<K extends string | number | symbol, T> {
private getKey(value: T): K { private getKey(value: T): K {
if(!this.key) throw new Error('No key defined'); if(!this.key) throw new Error('No key defined');
if(value[this.key] === undefined) throw new Error(`${this.key.toString()} Doesn't exist on ${JSON.stringify(value, null, 2)}`);
return <K>value[this.key]; return <K>value[this.key];
} }

View File

@ -77,7 +77,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 = formatDate('YYYY-MM-DD_HH-mm', date);
return name ? name.replace('{{TIMESTAMP}}', timestamp) : timestamp; return name ? name.replace('{{TIMESTAMP}}', timestamp) : timestamp;
} }

View File

@ -99,7 +99,7 @@ export class PathEvent {
method = '*'; method = '*';
} }
let temp = p.split('/').filter(p => !!p); let temp = p.split('/').filter(p => !!p);
this.module = temp.splice(0, 1)[0]?.toLowerCase() || ''; this.module = temp.splice(0, 1)[0] || '';
this.path = temp.join('/'); this.path = temp.join('/');
this.fullPath = `${this.module}${this.module && this.path ? '/' : ''}${this.path}`; this.fullPath = `${this.module}${this.module && this.path ? '/' : ''}${this.path}`;
this.name = temp.pop() || ''; this.name = temp.pop() || '';
@ -140,13 +140,10 @@ export class PathEvent {
*/ */
static filter(target: string | PathEvent | (string | PathEvent)[], ...filter: (string | PathEvent)[]): PathEvent[] { static filter(target: string | PathEvent | (string | PathEvent)[], ...filter: (string | PathEvent)[]): PathEvent[] {
const parsedTarget = makeArray(target).map(pe => new PathEvent(pe)); const parsedTarget = makeArray(target).map(pe => new PathEvent(pe));
const parsedFind = makeArray(filter).map(pe => new PathEvent(pe)); const parsedFilter = makeArray(filter).map(pe => new PathEvent(pe));
return parsedTarget.filter(t => { return parsedTarget.filter(t => !!parsedFilter.find(f =>
if(!t.fullPath && t.all) return true; (t.fullPath == '*' || f.fullPath == '*' || t.fullPath.startsWith(f.fullPath) || f.fullPath.startsWith(t.fullPath)) &&
return !!parsedFind.find(f => (f.all || t.all || t.methods.intersection(f.methods).length)));
(t.fullPath.startsWith(f.fullPath) || f.fullPath.startsWith(t.fullPath)) &&
(f.all || t.all || t.methods.intersection(f.methods).length));
});
} }
/** /**
@ -157,15 +154,12 @@ export class PathEvent {
* @return {boolean} Whether there is any overlap * @return {boolean} Whether there is any overlap
*/ */
static has(target: string | PathEvent | (string | PathEvent)[], ...has: (string | PathEvent)[]): boolean { static has(target: string | PathEvent | (string | PathEvent)[], ...has: (string | PathEvent)[]): boolean {
const parsedRequired = makeArray(has).map(pe => new PathEvent(pe));
const parsedTarget = makeArray(target).map(pe => new PathEvent(pe)); const parsedTarget = makeArray(target).map(pe => new PathEvent(pe));
return !!parsedRequired.find(r => { const parsedRequired = makeArray(has).map(pe => new PathEvent(pe));
if(!r.fullPath && r.all) return true; return !!parsedRequired.find(r => !!parsedTarget.find(t =>
const filtered = parsedTarget.filter(p => r.fullPath.startsWith(p.fullPath)); (r.fullPath == '*' || t.fullPath == '*' || r.fullPath.startsWith(t.fullPath) || t.fullPath.startsWith(r.fullPath)) &&
if(!filtered.length) return false; (r.all || t.all || r.methods.intersection(t.methods).length)
const combined = PathEvent.combine(...filtered); ));
return (!combined.none && (combined.all || r.all)) || combined.methods.intersection(r.methods).length;
});
} }
/** /**
@ -265,7 +259,7 @@ export class PathEventEmitter implements IPathEventEmitter{
on(event: Event | Event[], listener: PathListener): PathUnsubscribe { on(event: Event | Event[], listener: PathListener): PathUnsubscribe {
makeArray(event).forEach(e => this.listeners.push([ makeArray(event).forEach(e => this.listeners.push([
new PathEvent(`${this.prefix}/${new PathEvent(e).toString()}`), new PathEvent(`${this.prefix}/${e}`),
listener listener
])); ]));
return () => this.off(listener); return () => this.off(listener);

View File

@ -27,7 +27,7 @@ describe('Path Events', () => {
describe('PathEvent', () => { describe('PathEvent', () => {
it('parses event string', () => { it('parses event string', () => {
const pe = new PathEvent('Users/system:cr'); const pe = new PathEvent('users/system:cr');
expect(pe.module).toBe('users'); expect(pe.module).toBe('users');
expect(pe.fullPath).toBe('users/system'); expect(pe.fullPath).toBe('users/system');
expect(pe.name).toBe('system'); expect(pe.name).toBe('system');
@ -103,11 +103,9 @@ describe('Path Events', () => {
}); });
it('has returns true for overlapping', () => { it('has returns true for overlapping', () => {
const events = [ const events = [new PathEvent('users/sys:cr')];
new PathEvent('users/sys:cr'), expect(PathEvent.has(events, 'users/sys:r')).toBeTruthy();
]; expect(PathEvent.has(events, 'users/nope:r')).toBeFalsy();
expect(PathEvent.has(events, 'users/sys:r')).toBe(true);
expect(PathEvent.has(events, 'users/nope:r')).toBe(false);
}); });
it('hasAll returns true only if all overlap', () => { it('hasAll returns true only if all overlap', () => {