ztimson/utils
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

Updated ASet & Path Events
All checks were successful
Build / Build NPM Project (push) Successful in 37s
Details
Build / Tag Version (push) Successful in 7s
Details
Build / Publish Documentation (push) Successful in 1m43s
Details

Browse Source
This commit is contained in:
Zakary Timson
2024-10-17 10:24:18 -04:00
parent 1c1a3f6a6e
commit fbbe3c99ef
7 changed files with 53 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/path-events.ts
View File

@ -113,7 +113,7 @@ export class PathEvent {
* @param {string | PathEvent} paths Events as strings or pre-parsed
* @return {PathEvent} Final combined permission
*/
static combine(paths: (string | PathEvent)[]): PathEvent {
static combine(...paths: (string | PathEvent)[]): PathEvent {
let hitNone = false;
const combined = paths.map(p => new PathEvent(p))
.toSorted((p1, p2) => {
@ -123,18 +123,10 @@ export class PathEvent {
if(p.none) hitNone = true;
if(!acc) return p;
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];
return acc;
}, <any>null);
if(combined.all) combined.methods = ['*'];
if(combined.none) combined.methods = ['n'];
combined.methods = new ASet(combined.methods); // Make unique
combined.raw = PES`${combined.fullPath}:${combined.methods}`;
combined.methods = new ASet<Method>(combined.methods);
return combined;
}
@ -152,7 +144,7 @@ export class PathEvent {
if(!r.fullPath && r.all) return true;
const filtered = parsedTarget.filter(p => r.fullPath.startsWith(p.fullPath));
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);
});
}
@ -197,8 +189,9 @@ export class PathEvent {
*/
static toString(path: string | string[], methods: Method | Method[]): string {
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('')}`;
return p?.trim().replaceAll(/\/{2,}/g, '/').replaceAll(/(^\/|\/$)/g, '');
return p;
}
/**