lenix 1.8.4 → 1.8.6

package/nui/fetch.ts

@@ -1,5 +1,4 @@
 import type { NuiFetchGeneric, Request } from '../shared/types.ts'
-import { palette } from '../shared/palette.ts'
 
 declare function GetParentResourceName(): string
 
@@ -30,8 +29,11 @@ export const fetchNuiServer = async <T extends NuiFetchGeneric>(
 	timeout?: number,
 ): Promise<T[0]> => {
 	const { data, error } = await fetchNui<Request<{
-		data: T[0] | null
-		error: string | null
+		data: T[0]
+		error: null
+	} | {
+		data: null
+		error: string
 	}, '__nuiServer', {
 		id: T[1]
 		data: {
@@ -46,11 +48,11 @@ export const fetchNuiServer = async <T extends NuiFetchGeneric>(
 			requestData,
 		}
 	})
-	if (error) {
+	if (error !== null) {
 		const typeofError = typeof error
 		if (typeofError === 'string') throw error
 		
-		console.log(palette('wine', `Expected 'error' typeof 'string', got ${error} typeof ${typeofError}`))
+		throw `Expected 'error' typeof 'string', got ${error} typeof ${typeofError}`
 	}
 
 	return data

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lenix",
-  "version": "1.8.4",
+  "version": "1.8.6",
   "description": "Typed FiveM utilities for client, server, shared, and NUI scripts",
   "author": "Lenix",
   "license": "MIT",

package/shared/repeat.ts

@@ -1,32 +1,34 @@
 /*  */
-export function repeat<T>(
-	until: () => T,
-): Promise<T>
-export function repeat<T, const C extends T>(
-	until: () => T,
-	equal: C,
+export function repeat<T>(check: () => T): Promise<T>
+export function repeat<T, C extends T>(
+	check: () => T,
+	untilOrEqual: C | ((checked: T) => checked is C),
 	each?: number,
 ): Promise<C>
-export function repeat <T>(
-	until: () => T,
-	equal?: T,
-	each?: number
+export function repeat<T>(
+	check: () => T,
+	untilOrEqual?: T | ((checked: T) => boolean),
+	each?: number,
 ): Promise<T> {
+	const hasCondition = arguments.length > 1
+	const predicate = typeof untilOrEqual === 'function'
+		? untilOrEqual as (checked: T) => boolean
+		: undefined
+
 	return new Promise(resolve => {
 		const interval = setInterval(() => {
-			const result = until()
-
-			if (equal === undefined) {
-				if (result === undefined || result === null) return
-				resolve(result)
-				clearInterval(interval)
-				return
-			}
+			const checked = check()
 
-			if (result !== equal) return
+			const met = predicate
+				? predicate(checked)
+				: hasCondition
+					? checked === untilOrEqual
+					: checked !== undefined && checked !== null
 
-			resolve(equal ?? result)
+			if (!met) return
+			
 			clearInterval(interval)
+			resolve(checked)
 		}, each)
 	})
-}
+}