Added adjusted interval & set errorFromCode to always return an error even on 200's

PathEvents has none fix
Added filter function to path events
2024-10-29 10:41:25 -04:00 · 2024-10-23 21:39:42 -04:00 · 2024-10-23 14:13:47 -04:00 · 2024-10-17 10:24:18 -04:00
8 changed files with 97 additions and 17 deletions
--- a/.npmignore
+++ b/.npmignore
@ -0,0 +1,12 @@
+src
+tests
+.editorconfig
+.gitignore
+.gitmodules
+.npmignore
+CODEOWNERS
+Dockerfile
+index.html
+jest.config.js
+tsconfig.json
+vite.config.js
--- a/index.html
+++ b/index.html
@ -0,0 +1,14 @@
+<!Doctype html>
+
+<html>
+	<head>
+		<title>@ztimson/utils sandbox</title>
+	</head>
+	<body>
+		<script type="module">
+			import {PathEvent} from './dist/index.mjs';
+
+			console.log(PathEvent.has(['data/Inventory:n', 'logs:c'], `logs/client:n`));
+		</script>
+	</body>
+</html>
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.21.0",
+	"version": "0.21.6",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",
--- a/src/aset.ts
+++ b/src/aset.ts
@ -1,3 +1,5 @@
+import {isEqual} from './objects.ts';
+
 /**
 * An array which functions as a set. It guarantees unique elements
 * and provides set functions for comparisons
@ -34,7 +36,7 @@ export class ASet<T> extends Array {
 	delete(...items: T[]) {
 		items.forEach(el => {
 			const index = this.indexOf(el);
-			if(index != -1) this.slice(index, 1);
+			if(index != -1) this.splice(index, 1);
 		})
 		return this;
 	}
@ -57,6 +59,17 @@ export class ASet<T> extends Array {
 		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
 	 * @param {ASet<T>} set Set to compare against
--- a/src/errors.ts
+++ b/src/errors.ts
@ -180,7 +180,6 @@ export class GatewayTimeoutError extends CustomError {
 * @return {CustomError} The proper error type
 */
 export function errorFromCode(code: number, message?: string) {
-	if(code >= 200 && code < 300) return null;
 	switch(code) {
 		case 400:
 			return new BadRequestError(message);
--- a/src/path-events.ts
+++ b/src/path-events.ts
@ -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,21 +123,30 @@ 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;
 	}

+	/**
+	 * 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
 	 *
@ -152,8 +161,8 @@ 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);
-			return !combined.none && (combined.all || new ASet(combined.methods).intersection(new ASet(r.methods)).length);
+			const combined = PathEvent.combine(...filtered);
+			return (!combined.none && (combined.all || r.all)) || combined.methods.intersection(r.methods).length;
 		});
 	}

@ -197,8 +206,19 @@ 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;
+	}
+
+	/**
+	 * 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);
 	}

 	/**
--- a/src/time.ts
+++ b/src/time.ts
@ -1,3 +1,25 @@
+/**
+ * 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);
+	}
+}
+
 /**
 * Return date formated highest to lowest: YYYY-MM-DD H:mm AM
 *
--- a/vite.config.ts
+++ b/vite.config.ts
@ -13,7 +13,7 @@ export default defineConfig({
 			}
 		},
 		emptyOutDir: true,
-		minify: true,
+		minify: false,
 		sourcemap: true
 	},
 	plugins: [dts()],
Author	SHA1	Message	Date
ztimson	db18c010aa	Added adjusted interval & set errorFromCode to always return an error even on 200's All checks were successful Build / Build NPM Project (push) Successful in 1m16s Details Build / Tag Version (push) Successful in 14s Details Build / Publish Documentation (push) Successful in 2m1s Details	2024-10-29 10:41:25 -04:00
ztimson	b292d5ed17	PathEvents has none fix All checks were successful Build / Build NPM Project (push) Successful in 36s Details Build / Tag Version (push) Successful in 10s Details Build / Publish Documentation (push) Successful in 1m47s Details	2024-10-23 21:39:42 -04:00
ztimson	a1ea8cdf67	Added filter function to 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 1m46s Details	2024-10-23 14:13:47 -04:00
ztimson	fbbe3c99ef	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	2024-10-17 10:24:18 -04:00