Update/cleaning 01

README.md

@@ -7,7 +7,7 @@
 Install the `payto-rl` package using npm or yarn:
 
 ```sh
-npm install payto-rl
+npm i payto-rl
 ```
 
 ```sh
@@ -69,6 +69,11 @@ const bankPayto = new Payto('payto://bic/DEUTDEFF500');
 console.log(bankPayto.bic);           // 'DEUTDEFF500'
 bankPayto.routingNumber = 123456789;  // Valid 9-digit routing number
 console.log(bankPayto.routingNumber); // 123456789
+
+// Convert to JSON object
+const jsonObj = payto.toJSONObject();
+console.log(jsonObj.colorForeground); // Access typed properties
+console.log(jsonObj['custom-field']); // Access custom properties
 ```
 
 ## API Reference
@@ -94,7 +99,7 @@ Creates a new Payto instance from a payto URL string.
 | `bic` | `string \| null` | Bank Identifier Code (8 or 11 characters) |
 | `colorBackground` | `string \| null` | Background color in hex format |
 | `colorForeground` | `string \| null` | Foreground color in hex format |
-| `currency` | `[string, string?, string?]` | Currency codes array |
+| `currency` | `[string \| null, string \| null]` | Currency codes array |
 | `deadline` | `number \| null` | Payment deadline (Unix timestamp) |
 | `donate` | `boolean \| null` | Donation flag |
 | `fiat` | `string \| null` | Fiat currency code |
@@ -131,7 +136,7 @@ Creates a new Payto instance from a payto URL string.
 |--------|-------------|-------------|
 | `toString()` | `string` | Returns the complete payto URL string |
 | `toJSON()` | `string` | Returns a JSON string representation |
-| `toJSONObject()` | `object` | Returns a plain object with all properties |
+| `toJSONObject()` | `PaytoJSON` | Returns a typed object with all properties and custom fields |
 
 ## Type Safety
 
@@ -145,6 +150,7 @@ The library includes TypeScript type definitions and runtime validation for:
 - Plus codes
 - Unix timestamps
 - Barcode formats
+- IBAN format
 
 ## Payment System Support
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "payto-rl",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "PayTo Resource Locator",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/index.ts

@@ -1,5 +1,6 @@
 export type PaytoJSON = {
 	[key: string]: any;
+	[key: number]: never;
 	port?: string;
 	host?: string;
 	hostname?: string;
@@ -40,13 +41,14 @@ export type PaytoJSON = {
 };
 
 class Payto {
+	private static readonly ACCOUNT_NUMBER_REGEX = /^(\d{7,14})$/;
 	private static readonly BIC_REGEX = /^[A-Z]{6}[A-Z0-9]{2}([A-Z0-9]{3})?$/i;
+	private static readonly EMAIL_REGEX = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+	private static readonly GEO_LOCATION_REGEX = /^(\+|-)?(?:90(?:\.0{1,6})?|(?:[0-9]|[1-8][0-9])(?:\.[0-9]{1,6})?),(\+|-)?(?:180(?:\.0{1,6})?|(?:[0-9]|[1-9][0-9]|1[0-7][0-9])(?:\.[0-9]{1,6})?)$/;
+	private static readonly IBAN_REGEX = /^[A-Z]{2}[0-9]{2}[A-Z0-9]{12,30}$/i;
+	private static readonly PLUS_CODE_REGEX = /^[23456789CFGHJMPQRVWX]{2,8}\+[23456789CFGHJMPQRVWX]{2,7}$/;
 	private static readonly ROUTING_NUMBER_REGEX = /^(\d{9})$/;
 	private static readonly UNIX_TIMESTAMP_REGEX = /^\d+$/;
-	private static readonly ACCOUNT_NUMBER_REGEX = /^(\d{7,14})$/;
-	private static readonly PLUS_CODE_REGEX = /^[23456789CFGHJMPQRVWX]{2,8}\+[23456789CFGHJMPQRVWX]{2,7}$/;
-	private static readonly GEO_LOCATION_REGEX = /^(\+|-)?(?:90(?:\.0{1,6})?|(?:[0-9]|[1-8][0-9])(?:\.[0-9]{1,6})?),(\+|-)?(?:180(?:\.0{1,6})?|(?:[0-9]|[1-9][0-9]|1[0-7][0-9])(?:\.[0-9]{1,6})?)$/;
-	private static readonly EMAIL_REGEX = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
 
 	private url: URL;
 
@@ -349,11 +351,15 @@ class Payto {
 	}
 
 	get iban(): string | null {
-		return this.getHostnameParts(this.pathname.split('/'), 'iban', 2);
+		const ibanStr = this.getHostnameParts(this.pathname.split('/'), 'iban', 2);
+		return ibanStr && Payto.IBAN_REGEX.test(ibanStr) ? ibanStr.toUpperCase() : null;
 	}
 
 	set iban(value: string | null) {
-		this.setHostnameParts(value, 2);
+		if (value && !Payto.IBAN_REGEX.test(value)) {
+			throw new Error('Invalid IBAN format');
+		}
+		this.setHostnameParts(value?.toUpperCase() ?? null, 2);
 	}
 
 	get item(): string | null {
@@ -369,7 +375,22 @@ class Payto {
 	}
 
 	get location(): string | null {
-		return this.searchParams.get('loc') as string | null;
+		const voidType = this.void;
+		if (!voidType) {
+			return null;
+		}
+
+		const value = this.searchParams.get('loc');
+		if (!value) return null;
+
+		if (voidType === 'geo') {
+			return Payto.GEO_LOCATION_REGEX.test(value) ? value : null;
+		}
+		if (voidType === 'plus') {
+			return Payto.PLUS_CODE_REGEX.test(value) ? value : null;
+		}
+
+		return value;
 	}
 
 	set location(value: string | null) {