ismx-nexo-node-app 0.4.17 → 0.4.19

package/dist/js/api/utils/ColorUtils.js

@@ -1,10 +1,54 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 class ColorUtils {
+    static hexToRgb(hex) {
+        hex = hex.replace(/^#/, '');
+        return {
+            r: parseInt(hex.slice(0, 2), 16),
+            g: parseInt(hex.slice(2, 4), 16),
+            b: parseInt(hex.slice(4, 6), 16),
+        };
+    }
+    static rgbToHex(r, g, b) {
+        return `#${((1 << 24) | (r << 16) | (g << 8) | b).toString(16).slice(1)}`;
+    }
+    static interpolate(color1, color2, ratio) {
+        const color1Rgb = ColorUtils.hexToRgb(color1);
+        const color2Rgb = ColorUtils.hexToRgb(color2);
+        // Interpolate each color component (r, g, b)
+        const r = Math.round(color1Rgb.r + (color2Rgb.r - color1Rgb.r) * ratio);
+        const g = Math.round(color1Rgb.g + (color2Rgb.g - color1Rgb.g) * ratio);
+        const b = Math.round(color1Rgb.b + (color2Rgb.b - color1Rgb.b) * ratio);
+        // Convert the resulting RGB back to hex
+        return ColorUtils.rgbToHex(r, g, b);
+    }
+    static contrast(color) {
+        // Ensure hex is in the correct format
+        color = color.replace(/^#/, '');
+        // Convert 3-digit hex to 6-digit
+        if (color.length === 3) {
+            color = color.split('').map(x => x + x).join('');
+        }
+        // Convert hex to RGB
+        let r = parseInt(color.substring(0, 2), 16) / 255;
+        let g = parseInt(color.substring(2, 4), 16) / 255;
+        let b = parseInt(color.substring(4, 6), 16) / 255;
+        // Apply gamma correction (sRGB)
+        r = r <= 0.03928 ? r / 12.92 : Math.pow((r + 0.055) / 1.055, 2.4);
+        g = g <= 0.03928 ? g / 12.92 : Math.pow((g + 0.055) / 1.055, 2.4);
+        b = b <= 0.03928 ? b / 12.92 : Math.pow((b + 0.055) / 1.055, 2.4);
+        // Calculate luminance
+        let luminance = 0.2126 * r + 0.7152 * g + 0.0722 * b;
+        // WCAG threshold for contrast readability (4.5:1)
+        return luminance > 0.4 ? '#111111' : '#FFFFFF';
+    }
     static transparency(color, transparency) {
-        if (!color || !transparency)
-            return undefined;
-        return color.substring(0, 7) + Math.ceil(transparency * 255).toString(16);
+        if (!/^#([0-9A-F]{3}){1,2}$/i.test(color))
+            throw new Error('Invalid hex color format');
+        if (color.length === 4)
+            color = '#' + color.slice(1).split('').map(x => x + x).join('');
+        let alphaHex = Math.round(transparency * 255).toString(16).padStart(2, '0');
+        return color + alphaHex;
     }
 }
 exports.default = ColorUtils;

package/dist/js/repository/RepositoryDatabasePostgres.js

@@ -152,11 +152,15 @@ class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
                 throw new Error(`table ${tableName} does not exist`);
             let table = this.tables[tableName];
             let schema = table[0].schema;
-            let columns = PostgresUtils_1.default.columns(table);
-            let params = columns.map((column, index) => `\$${index + 2}`).join(",");
-            let values = [id, ...columns.map((column) => object[PostgresUtils_1.default.stringToCamel(column)])];
-            let query = `UPDATE ${schema}.${tableName} SET (${columns.join(",")}) = (${params}) WHERE id = $1 `;
-            query += `RETURNING *`;
+            const columns = PostgresUtils_1.default.columns(table).filter(column => {
+                const camelKey = PostgresUtils_1.default.stringToCamel(column);
+                return Object.prototype.hasOwnProperty.call(object, camelKey);
+            });
+            if (columns.length === 0)
+                throw new Error(`No valid columns provided to update for table ${tableName}`);
+            const params = columns.map((_, index) => `\$${index + 2}`).join(",");
+            const values = [id, ...columns.map((column) => object[PostgresUtils_1.default.stringToCamel(column)])];
+            const query = `UPDATE ${schema}.${tableName} SET (${columns.join(",")}) = (${params}) WHERE id = $1 RETURNING *`;
             return this.query(query, values).then((result) => result[0]);
         });
     }

package/dist/types/api/utils/ColorUtils.d.ts

@@ -1,3 +1,11 @@
 export default abstract class ColorUtils {
-    static transparency(color?: string, transparency?: number): string | undefined;
+    static hexToRgb(hex: string): {
+        r: number;
+        g: number;
+        b: number;
+    };
+    static rgbToHex(r: number, g: number, b: number): string;
+    static interpolate(color1: string, color2: string, ratio: number): string;
+    static contrast(color: string): string;
+    static transparency(color: string, transparency: number): string;
 }

package/dist/types/repository/RepositoryDatabasePostgres.d.ts

@@ -36,9 +36,7 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase {
     addAll<T>(tableName: string, objects: ({
         [key: string]: Primitive;
     } | any)[]): Promise<T[]>;
-    update<T>(tableName: string, id: string, object: {
-        [key: string]: Primitive;
-    } | any): Promise<T>;
+    update<T>(tableName: string, id: string, object: Partial<T>): Promise<T>;
     page<T>(tableName: string, sortKey: string, maxResults?: number, pageNumber?: number, filters?: {
         [key: string]: Primitive | Array<Primitive>;
     }): Promise<Pagination<T>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ismx-nexo-node-app",
-  "version": "0.4.17",
+  "version": "0.4.19",
   "description": "",
   "scripts": {
     "build": "rm -rf ./dist && npx tsc",

package/src/main/node/api/utils/ColorUtils.ts

@@ -1,8 +1,63 @@
 export default abstract class ColorUtils {
 
-	static transparency(color?: string, transparency?: number) {
-		if (!color || !transparency) return undefined;
-		return color.substring(0, 7) + Math.ceil(transparency*255).toString(16);
+	static hexToRgb(hex: string): { r: number; g: number; b: number }
+	{
+		hex = hex.replace(/^#/, '');
+		return {
+			r: parseInt(hex.slice(0, 2), 16),
+			g: parseInt(hex.slice(2, 4), 16),
+			b: parseInt(hex.slice(4, 6), 16),
+		};
 	}
 
+	static rgbToHex(r:number, g: number, b: number): string
+	{
+		return `#${((1 << 24) | (r << 16) | (g << 8) | b).toString(16).slice(1)}`;
+	}
+
+	static interpolate(color1: string, color2: string, ratio: number) {
+		const color1Rgb = ColorUtils.hexToRgb(color1);
+		const color2Rgb = ColorUtils.hexToRgb(color2);
+
+		// Interpolate each color component (r, g, b)
+		const r = Math.round(color1Rgb.r + (color2Rgb.r - color1Rgb.r) * ratio);
+		const g = Math.round(color1Rgb.g + (color2Rgb.g - color1Rgb.g) * ratio);
+		const b = Math.round(color1Rgb.b + (color2Rgb.b - color1Rgb.b) * ratio);
+
+		// Convert the resulting RGB back to hex
+		return ColorUtils.rgbToHex(r, g, b);
+	}
+
+	static contrast(color: string): string {
+		// Ensure hex is in the correct format
+		color = color.replace(/^#/, '');
+
+		// Convert 3-digit hex to 6-digit
+		if (color.length === 3) {
+			color = color.split('').map(x => x + x).join('');
+		}
+
+		// Convert hex to RGB
+		let r = parseInt(color.substring(0, 2), 16) / 255;
+		let g = parseInt(color.substring(2, 4), 16) / 255;
+		let b = parseInt(color.substring(4, 6), 16) / 255;
+
+		// Apply gamma correction (sRGB)
+		r = r <= 0.03928 ? r / 12.92 : Math.pow((r + 0.055) / 1.055, 2.4);
+		g = g <= 0.03928 ? g / 12.92 : Math.pow((g + 0.055) / 1.055, 2.4);
+		b = b <= 0.03928 ? b / 12.92 : Math.pow((b + 0.055) / 1.055, 2.4);
+
+		// Calculate luminance
+		let luminance = 0.2126 * r + 0.7152 * g + 0.0722 * b;
+
+		// WCAG threshold for contrast readability (4.5:1)
+		return luminance > 0.4 ? '#111111' : '#FFFFFF';
+	}
+
+	static transparency(color: string, transparency: number) {
+		if (!/^#([0-9A-F]{3}){1,2}$/i.test(color)) throw new Error('Invalid hex color format');
+		if (color.length === 4) color = '#' + color.slice(1).split('').map(x => x + x).join('');
+		let alphaHex = Math.round(transparency * 255).toString(16).padStart(2, '0');
+		return color + alphaHex;
+	}
 }

package/src/main/node/repository/RepositoryDatabasePostgres.ts

@@ -120,18 +120,22 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase
         return this.query(query, values);
     }
 
-    async update<T>(tableName: string, id: string, object: {[key:string]:Primitive}|any): Promise<T>
+    async update<T>(tableName: string, id: string, object: Partial<T>): Promise<T>
     {
         if (!id) throw new Error(`field 'id' is mandatory when updating ${tableName}`);
         if (!this.tables[tableName]) throw new Error(`table ${tableName} does not exist`);
         let table = this.tables[tableName];
         let schema = table[0].schema;
-        let columns = PostgresUtils.columns(table);
+        const columns = PostgresUtils.columns(table).filter(column => {
+            const camelKey = PostgresUtils.stringToCamel(column);
+            return Object.prototype.hasOwnProperty.call(object, camelKey);
+        });
+
+        if (columns.length === 0) throw new Error(`No valid columns provided to update for table ${tableName}`);
 
-        let params = columns.map((column, index) => `\$${index+2}`).join(",");
-        let values = [ id, ...columns.map((column) => object[PostgresUtils.stringToCamel(column)]) ];
-        let query = `UPDATE ${schema}.${tableName} SET (${columns.join(",")}) = (${params}) WHERE id = $1 `
-        query += `RETURNING *`;
+        const params = columns.map((_, index) => `\$${index + 2}`).join(",");
+        const values = [ id, ...columns.map((column) => object[PostgresUtils.stringToCamel(column) as keyof T]) ];
+        const query = `UPDATE ${schema}.${tableName} SET (${columns.join(",")}) = (${params}) WHERE id = $1 RETURNING *`;
 
         return this.query<T>(query, values).then((result) => result[0]);
     }