Merge pull request #8 from bchainhub/update/functions-04

Updates
bchainhub · Jan 22, 2025 · ec41f3b · ec41f3b
2 parents a72c70d + c202514
commit ec41f3b
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -8,8 +8,8 @@
   "private": false,
   "sideEffects": false,
   "scripts": {
-    "test": "npm run build && node --import 'data:text/javascript,import { register } from \"node:module\"; import { pathToFileURL } from \"node:url\"; register(\"ts-node/esm\", pathToFileURL(\"./\"));' ./node_modules/uvu/bin.js test",
-    "build": "tsc",
+    "test": "npm run build && node --no-deprecation --import 'data:text/javascript,import { register } from \"node:module\"; import { pathToFileURL } from \"node:url\"; register(\"ts-node/esm\", pathToFileURL(\"./\"));' ./node_modules/uvu/bin.js test",
+    "build": "tsc --declaration --declarationDir ./dist",
     "dev": "node --import 'data:text/javascript,import { register } from \"node:module\"; import { pathToFileURL } from \"node:url\"; register(\"ts-node/esm\", pathToFileURL(\"./\"));' --inspect src/index.ts"
   },
   "repository": {

diff --git a/src/index.ts b/src/index.ts
@@ -1,3 +1,8 @@
+type JSONObject = {
+	[key: string]: any;
+	[key: number]: never;
+};
+
 class Payto {
 	private static readonly BIC_REGEX = /^[A-Z]{6}[A-Z0-9]{2}([A-Z0-9]{3})?$/i;
 	private static readonly ROUTING_NUMBER_REGEX = /^(\d{9})$/;
@@ -108,8 +113,12 @@ class Payto {
 		return this.currency[0];
 	}
 
-	set asset(value: string | undefined) {
-		this.currency = [value];
+	set asset(value: string | null) {
+		if (value === null) {
+			this.currency = [null, null, null];
+		} else {
+			this.currency = [value, null, null];
+		}
 	}
 
 	get barcode(): string | null {
@@ -176,7 +185,7 @@ class Payto {
 		return result;
 	}
 
-	set currency(value: [string?, string?, number?]) {
+	set currency(value: Array<string | number | null | undefined>) {
 		const [token, fiat, amount] = value;
 		const amountValue = this.searchParams.get('amount');
 		let oldToken, oldValue;
@@ -189,7 +198,9 @@ class Payto {
 				oldValue = amountArray[0];
 			}
 		}
-		if (fiat) this.fiat = fiat.toLowerCase();
+		if (fiat && typeof fiat === 'string') {
+			this.fiat = fiat.toLowerCase();
+		}
 		if (token) {
 			this.amount = `${token}:${amount || (oldValue || '')}`;
 		} else if (amount) {
@@ -634,8 +645,8 @@ class Payto {
 		return this.url.toJSON();
 	}
 
-	toJSONObject(): object {
-		const obj: { [key: string]: any } = {};
+	toJSONObject(): JSONObject {
+		const obj: JSONObject = {};
 
 		// URL properties
 		if (this.port) obj.port = this.port;

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,13 +1,23 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
-		"module": "Node16",
+		"target": "ESNext",
+		"module": "NodeNext",
 		"outDir": "./dist",
 		"strict": true,
 		"forceConsistentCasingInFileNames": true,
 		"removeComments": true,
 		"declaration": true,
-		"declarationDir": "./dist"
+		"declarationDir": "./dist",
+		"preserveConstEnums": true,
+		"useDefineForClassFields": true,
+		"stripInternal": true,
+		"verbatimModuleSyntax": true,
+		"noImplicitAny": true,
+		"noImplicitThis": true,
+		"strictFunctionTypes": true,
+		"strictPropertyInitialization": true,
+		"exactOptionalPropertyTypes": true,
+		"noUncheckedIndexedAccess": false
 	},
 	"include": ["src/**/*.ts"],
 	"exclude": ["node_modules", "test"]

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -1,3 +1,8 @@
+export type JSONObject = {
+	[key: string]: any;
+	[key: number]: never;
+};
+
 declare class Payto {
 	private url: URL;
 
@@ -33,8 +38,8 @@ declare class Payto {
 	get colorForeground(): string | null;
 	set colorForeground(value: string | null);
 
-	get currency(): [string, string?, string?];
-	set currency(value: [string, string?, string?]);
+	get currency(): [string | null, string | null];
+	set currency(value: Array<string | number | null | undefined>);
 
 	get deadline(): number | null;
 	set deadline(value: number | null);
@@ -120,7 +125,7 @@ declare class Payto {
 
 	toString(): string;
 	toJSON(): string;
-	toJSONObject(): Record<string, any>;
+	toJSONObject(): JSONObject;
 }
 
 export default Payto;