matterbridge 3.1.8-dev-20250727-662308b → 3.1.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1 -1
- package/dist/cli.d.ts +26 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +91 -2
- package/dist/cli.js.map +1 -0
- package/dist/cliEmitter.d.ts +34 -0
- package/dist/cliEmitter.d.ts.map +1 -0
- package/dist/cliEmitter.js +30 -0
- package/dist/cliEmitter.js.map +1 -0
- package/dist/clusters/export.d.ts +2 -0
- package/dist/clusters/export.d.ts.map +1 -0
- package/dist/clusters/export.js +2 -0
- package/dist/clusters/export.js.map +1 -0
- package/dist/defaultConfigSchema.d.ts +28 -0
- package/dist/defaultConfigSchema.d.ts.map +1 -0
- package/dist/defaultConfigSchema.js +24 -0
- package/dist/defaultConfigSchema.js.map +1 -0
- package/dist/deviceManager.d.ts +112 -0
- package/dist/deviceManager.d.ts.map +1 -0
- package/dist/deviceManager.js +94 -1
- package/dist/deviceManager.js.map +1 -0
- package/dist/devices/batteryStorage.d.ts +48 -0
- package/dist/devices/batteryStorage.d.ts.map +1 -0
- package/dist/devices/batteryStorage.js +48 -1
- package/dist/devices/batteryStorage.js.map +1 -0
- package/dist/devices/dishwasher.d.ts +91 -0
- package/dist/devices/dishwasher.d.ts.map +1 -0
- package/dist/devices/dishwasher.js +78 -3
- package/dist/devices/dishwasher.js.map +1 -0
- package/dist/devices/evse.d.ts +75 -0
- package/dist/devices/evse.d.ts.map +1 -0
- package/dist/devices/evse.js +74 -10
- package/dist/devices/evse.js.map +1 -0
- package/dist/devices/export.d.ts +11 -0
- package/dist/devices/export.d.ts.map +1 -0
- package/dist/devices/export.js +2 -0
- package/dist/devices/export.js.map +1 -0
- package/dist/devices/extractorHood.d.ts +46 -0
- package/dist/devices/extractorHood.d.ts.map +1 -0
- package/dist/devices/extractorHood.js +42 -0
- package/dist/devices/extractorHood.js.map +1 -0
- package/dist/devices/heatPump.d.ts +47 -0
- package/dist/devices/heatPump.d.ts.map +1 -0
- package/dist/devices/heatPump.js +50 -2
- package/dist/devices/heatPump.js.map +1 -0
- package/dist/devices/laundryDryer.d.ts +87 -0
- package/dist/devices/laundryDryer.d.ts.map +1 -0
- package/dist/devices/laundryDryer.js +83 -6
- package/dist/devices/laundryDryer.js.map +1 -0
- package/dist/devices/laundryWasher.d.ts +242 -0
- package/dist/devices/laundryWasher.d.ts.map +1 -0
- package/dist/devices/laundryWasher.js +91 -7
- package/dist/devices/laundryWasher.js.map +1 -0
- package/dist/devices/roboticVacuumCleaner.d.ts +112 -0
- package/dist/devices/roboticVacuumCleaner.d.ts.map +1 -0
- package/dist/devices/roboticVacuumCleaner.js +93 -7
- package/dist/devices/roboticVacuumCleaner.js.map +1 -0
- package/dist/devices/solarPower.d.ts +40 -0
- package/dist/devices/solarPower.d.ts.map +1 -0
- package/dist/devices/solarPower.js +38 -0
- package/dist/devices/solarPower.js.map +1 -0
- package/dist/devices/waterHeater.d.ts +111 -0
- package/dist/devices/waterHeater.d.ts.map +1 -0
- package/dist/devices/waterHeater.js +82 -2
- package/dist/devices/waterHeater.js.map +1 -0
- package/dist/dgram/coap.d.ts +205 -0
- package/dist/dgram/coap.d.ts.map +1 -0
- package/dist/dgram/coap.js +126 -13
- package/dist/dgram/coap.js.map +1 -0
- package/dist/dgram/dgram.d.ts +140 -0
- package/dist/dgram/dgram.d.ts.map +1 -0
- package/dist/dgram/dgram.js +113 -2
- package/dist/dgram/dgram.js.map +1 -0
- package/dist/dgram/mb_coap.d.ts +24 -0
- package/dist/dgram/mb_coap.d.ts.map +1 -0
- package/dist/dgram/mb_coap.js +41 -3
- package/dist/dgram/mb_coap.js.map +1 -0
- package/dist/dgram/mb_mdns.d.ts +24 -0
- package/dist/dgram/mb_mdns.d.ts.map +1 -0
- package/dist/dgram/mb_mdns.js +51 -13
- package/dist/dgram/mb_mdns.js.map +1 -0
- package/dist/dgram/mdns.d.ts +288 -0
- package/dist/dgram/mdns.d.ts.map +1 -0
- package/dist/dgram/mdns.js +298 -137
- package/dist/dgram/mdns.js.map +1 -0
- package/dist/dgram/multicast.d.ts +65 -0
- package/dist/dgram/multicast.d.ts.map +1 -0
- package/dist/dgram/multicast.js +60 -1
- package/dist/dgram/multicast.js.map +1 -0
- package/dist/dgram/unicast.d.ts +56 -0
- package/dist/dgram/unicast.d.ts.map +1 -0
- package/dist/dgram/unicast.js +54 -0
- package/dist/dgram/unicast.js.map +1 -0
- package/dist/frontend.d.ts +313 -0
- package/dist/frontend.d.ts.map +1 -0
- package/dist/frontend.js +449 -23
- package/dist/frontend.js.map +1 -0
- package/dist/globalMatterbridge.d.ts +59 -0
- package/dist/globalMatterbridge.d.ts.map +1 -0
- package/dist/globalMatterbridge.js +47 -0
- package/dist/globalMatterbridge.js.map +1 -0
- package/dist/helpers.d.ts +48 -0
- package/dist/helpers.d.ts.map +1 -0
- package/dist/helpers.js +53 -0
- package/dist/helpers.js.map +1 -0
- package/dist/index.d.ts +33 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +30 -1
- package/dist/index.js.map +1 -0
- package/dist/logger/export.d.ts +2 -0
- package/dist/logger/export.d.ts.map +1 -0
- package/dist/logger/export.js +1 -0
- package/dist/logger/export.js.map +1 -0
- package/dist/matter/behaviors.d.ts +2 -0
- package/dist/matter/behaviors.d.ts.map +1 -0
- package/dist/matter/behaviors.js +2 -0
- package/dist/matter/behaviors.js.map +1 -0
- package/dist/matter/clusters.d.ts +2 -0
- package/dist/matter/clusters.d.ts.map +1 -0
- package/dist/matter/clusters.js +2 -0
- package/dist/matter/clusters.js.map +1 -0
- package/dist/matter/devices.d.ts +2 -0
- package/dist/matter/devices.d.ts.map +1 -0
- package/dist/matter/devices.js +2 -0
- package/dist/matter/devices.js.map +1 -0
- package/dist/matter/endpoints.d.ts +2 -0
- package/dist/matter/endpoints.d.ts.map +1 -0
- package/dist/matter/endpoints.js +2 -0
- package/dist/matter/endpoints.js.map +1 -0
- package/dist/matter/export.d.ts +5 -0
- package/dist/matter/export.d.ts.map +1 -0
- package/dist/matter/export.js +3 -0
- package/dist/matter/export.js.map +1 -0
- package/dist/matter/types.d.ts +3 -0
- package/dist/matter/types.d.ts.map +1 -0
- package/dist/matter/types.js +3 -0
- package/dist/matter/types.js.map +1 -0
- package/dist/matterbridge.d.ts +463 -0
- package/dist/matterbridge.d.ts.map +1 -0
- package/dist/matterbridge.js +803 -50
- package/dist/matterbridge.js.map +1 -0
- package/dist/matterbridgeAccessoryPlatform.d.ts +42 -0
- package/dist/matterbridgeAccessoryPlatform.d.ts.map +1 -0
- package/dist/matterbridgeAccessoryPlatform.js +36 -0
- package/dist/matterbridgeAccessoryPlatform.js.map +1 -0
- package/dist/matterbridgeBehaviors.d.ts +1351 -0
- package/dist/matterbridgeBehaviors.d.ts.map +1 -0
- package/dist/matterbridgeBehaviors.js +65 -5
- package/dist/matterbridgeBehaviors.js.map +1 -0
- package/dist/matterbridgeDeviceTypes.d.ts +709 -0
- package/dist/matterbridgeDeviceTypes.d.ts.map +1 -0
- package/dist/matterbridgeDeviceTypes.js +579 -15
- package/dist/matterbridgeDeviceTypes.js.map +1 -0
- package/dist/matterbridgeDynamicPlatform.d.ts +42 -0
- package/dist/matterbridgeDynamicPlatform.d.ts.map +1 -0
- package/dist/matterbridgeDynamicPlatform.js +36 -0
- package/dist/matterbridgeDynamicPlatform.js.map +1 -0
- package/dist/matterbridgeEndpoint.d.ts +1348 -0
- package/dist/matterbridgeEndpoint.d.ts.map +1 -0
- package/dist/matterbridgeEndpoint.js +1214 -54
- package/dist/matterbridgeEndpoint.js.map +1 -0
- package/dist/matterbridgeEndpointHelpers.d.ts +406 -0
- package/dist/matterbridgeEndpointHelpers.d.ts.map +1 -0
- package/dist/matterbridgeEndpointHelpers.js +344 -12
- package/dist/matterbridgeEndpointHelpers.js.map +1 -0
- package/dist/matterbridgePlatform.d.ts +310 -0
- package/dist/matterbridgePlatform.d.ts.map +1 -0
- package/dist/matterbridgePlatform.js +233 -0
- package/dist/matterbridgePlatform.js.map +1 -0
- package/dist/matterbridgeTypes.d.ts +197 -0
- package/dist/matterbridgeTypes.d.ts.map +1 -0
- package/dist/matterbridgeTypes.js +25 -0
- package/dist/matterbridgeTypes.js.map +1 -0
- package/dist/pluginManager.d.ts +270 -0
- package/dist/pluginManager.d.ts.map +1 -0
- package/dist/pluginManager.js +249 -3
- package/dist/pluginManager.js.map +1 -0
- package/dist/shelly.d.ts +174 -0
- package/dist/shelly.d.ts.map +1 -0
- package/dist/shelly.js +168 -7
- package/dist/shelly.js.map +1 -0
- package/dist/storage/export.d.ts +2 -0
- package/dist/storage/export.d.ts.map +1 -0
- package/dist/storage/export.js +1 -0
- package/dist/storage/export.js.map +1 -0
- package/dist/update.d.ts +68 -0
- package/dist/update.d.ts.map +1 -0
- package/dist/update.js +63 -0
- package/dist/update.js.map +1 -0
- package/dist/utils/colorUtils.d.ts +117 -0
- package/dist/utils/colorUtils.d.ts.map +1 -0
- package/dist/utils/colorUtils.js +263 -2
- package/dist/utils/colorUtils.js.map +1 -0
- package/dist/utils/commandLine.d.ts +59 -0
- package/dist/utils/commandLine.d.ts.map +1 -0
- package/dist/utils/commandLine.js +54 -0
- package/dist/utils/commandLine.js.map +1 -0
- package/dist/utils/copyDirectory.d.ts +33 -0
- package/dist/utils/copyDirectory.d.ts.map +1 -0
- package/dist/utils/copyDirectory.js +38 -1
- package/dist/utils/copyDirectory.js.map +1 -0
- package/dist/utils/createDirectory.d.ts +34 -0
- package/dist/utils/createDirectory.d.ts.map +1 -0
- package/dist/utils/createDirectory.js +33 -0
- package/dist/utils/createDirectory.js.map +1 -0
- package/dist/utils/createZip.d.ts +39 -0
- package/dist/utils/createZip.d.ts.map +1 -0
- package/dist/utils/createZip.js +47 -2
- package/dist/utils/createZip.js.map +1 -0
- package/dist/utils/deepCopy.d.ts +32 -0
- package/dist/utils/deepCopy.d.ts.map +1 -0
- package/dist/utils/deepCopy.js +39 -0
- package/dist/utils/deepCopy.js.map +1 -0
- package/dist/utils/deepEqual.d.ts +54 -0
- package/dist/utils/deepEqual.d.ts.map +1 -0
- package/dist/utils/deepEqual.js +72 -1
- package/dist/utils/deepEqual.js.map +1 -0
- package/dist/utils/error.d.ts +44 -0
- package/dist/utils/error.d.ts.map +1 -0
- package/dist/utils/error.js +41 -0
- package/dist/utils/error.js.map +1 -0
- package/dist/utils/export.d.ts +12 -0
- package/dist/utils/export.d.ts.map +1 -0
- package/dist/utils/export.js +1 -0
- package/dist/utils/export.js.map +1 -0
- package/dist/utils/hex.d.ts +89 -0
- package/dist/utils/hex.d.ts.map +1 -0
- package/dist/utils/hex.js +123 -0
- package/dist/utils/hex.js.map +1 -0
- package/dist/utils/isvalid.d.ts +103 -0
- package/dist/utils/isvalid.d.ts.map +1 -0
- package/dist/utils/isvalid.js +101 -0
- package/dist/utils/isvalid.js.map +1 -0
- package/dist/utils/network.d.ts +74 -0
- package/dist/utils/network.d.ts.map +1 -0
- package/dist/utils/network.js +81 -5
- package/dist/utils/network.js.map +1 -0
- package/dist/utils/spawn.d.ts +33 -0
- package/dist/utils/spawn.d.ts.map +1 -0
- package/dist/utils/spawn.js +40 -0
- package/dist/utils/spawn.js.map +1 -0
- package/dist/utils/wait.d.ts +56 -0
- package/dist/utils/wait.d.ts.map +1 -0
- package/dist/utils/wait.js +62 -9
- package/dist/utils/wait.js.map +1 -0
- package/npm-shrinkwrap.json +2 -2
- package/package.json +2 -1
- package/vitest/matterbridge.test.ts +0 -218
package/dist/update.js
CHANGED
|
@@ -1,5 +1,36 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* This file contains the check updates functions.
|
|
3
|
+
*
|
|
4
|
+
* @file update.ts
|
|
5
|
+
* @author Luca Liguori
|
|
6
|
+
* @created 2025-02-24
|
|
7
|
+
* @version 1.0.0
|
|
8
|
+
* @license Apache-2.0
|
|
9
|
+
*
|
|
10
|
+
* Copyright 2025, 2026, 2027 Luca Liguori.
|
|
11
|
+
*
|
|
12
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
13
|
+
* you may not use this file except in compliance with the License.
|
|
14
|
+
* You may obtain a copy of the License at
|
|
15
|
+
*
|
|
16
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
17
|
+
*
|
|
18
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
19
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
20
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
21
|
+
* See the License for the specific language governing permissions and
|
|
22
|
+
* limitations under the License.
|
|
23
|
+
*/
|
|
24
|
+
// AnsiLogger module
|
|
1
25
|
import { db, nt, wr } from 'node-ansi-logger';
|
|
2
26
|
import { plg } from './matterbridgeTypes.js';
|
|
27
|
+
/**
|
|
28
|
+
* Checks for updates for Matterbridge and its plugins.
|
|
29
|
+
* If the 'shelly' parameter is present, also checks for Shelly updates.
|
|
30
|
+
*
|
|
31
|
+
* @param {Matterbridge} matterbridge - The Matterbridge instance.
|
|
32
|
+
* @returns {Promise<void>} A promise that resolves when the update checks are complete.
|
|
33
|
+
*/
|
|
3
34
|
export async function checkUpdates(matterbridge) {
|
|
4
35
|
const { hasParameter } = await import('./utils/commandLine.js');
|
|
5
36
|
const latestVersion = getMatterbridgeLatestVersion(matterbridge);
|
|
@@ -22,6 +53,13 @@ export async function checkUpdates(matterbridge) {
|
|
|
22
53
|
}
|
|
23
54
|
await Promise.all([latestVersion, devVersion, ...pluginsVersions, ...pluginsDevVersions, ...shellyUpdates]);
|
|
24
55
|
}
|
|
56
|
+
/**
|
|
57
|
+
* Retrieves the latest version of Matterbridge and updates the matterbridgeLatestVersion property.
|
|
58
|
+
* If there is an error retrieving the latest version, logs an error message.
|
|
59
|
+
*
|
|
60
|
+
* @param {Matterbridge} matterbridge - The Matterbridge instance.
|
|
61
|
+
* @returns {Promise<string | undefined>} A promise that resolves when the latest version is retrieved.
|
|
62
|
+
*/
|
|
25
63
|
export async function getMatterbridgeLatestVersion(matterbridge) {
|
|
26
64
|
const { getNpmPackageVersion } = await import('./utils/network.js');
|
|
27
65
|
try {
|
|
@@ -40,9 +78,17 @@ export async function getMatterbridgeLatestVersion(matterbridge) {
|
|
|
40
78
|
return version;
|
|
41
79
|
}
|
|
42
80
|
catch (error) {
|
|
81
|
+
// logError(matterbridge.log, `Error getting Matterbridge latest version`, error);
|
|
43
82
|
matterbridge.log.warn(`Error getting Matterbridge latest version: ${error instanceof Error ? error.message : error}`);
|
|
44
83
|
}
|
|
45
84
|
}
|
|
85
|
+
/**
|
|
86
|
+
* Retrieves the latest dev version of Matterbridge and updates the matterbridgeDevVersion property.
|
|
87
|
+
* If there is an error retrieving the latest version, logs an error message.
|
|
88
|
+
*
|
|
89
|
+
* @param {Matterbridge} matterbridge - The Matterbridge instance.
|
|
90
|
+
* @returns {Promise<string | undefined>} A promise that resolves when the latest dev version is retrieved.
|
|
91
|
+
*/
|
|
46
92
|
export async function getMatterbridgeDevVersion(matterbridge) {
|
|
47
93
|
const { getNpmPackageVersion } = await import('./utils/network.js');
|
|
48
94
|
try {
|
|
@@ -64,6 +110,14 @@ export async function getMatterbridgeDevVersion(matterbridge) {
|
|
|
64
110
|
matterbridge.log.warn(`Error getting Matterbridge latest dev version: ${error instanceof Error ? error.message : error}`);
|
|
65
111
|
}
|
|
66
112
|
}
|
|
113
|
+
/**
|
|
114
|
+
* Retrieves the latest version of a plugin and updates the plugin's latestVersion property.
|
|
115
|
+
* If there is an error retrieving the latest version, logs an error message.
|
|
116
|
+
*
|
|
117
|
+
* @param {Matterbridge} matterbridge - The Matterbridge instance.
|
|
118
|
+
* @param {RegisteredPlugin} plugin - The plugin for which to retrieve the latest version.
|
|
119
|
+
* @returns {Promise<string | undefined>} A promise that resolves when the latest version is retrieved.
|
|
120
|
+
*/
|
|
67
121
|
export async function getPluginLatestVersion(matterbridge, plugin) {
|
|
68
122
|
const { getNpmPackageVersion } = await import('./utils/network.js');
|
|
69
123
|
try {
|
|
@@ -82,6 +136,14 @@ export async function getPluginLatestVersion(matterbridge, plugin) {
|
|
|
82
136
|
matterbridge.log.warn(`Error getting plugin ${plg}${plugin.name}${wr} latest version: ${error instanceof Error ? error.message : error}`);
|
|
83
137
|
}
|
|
84
138
|
}
|
|
139
|
+
/**
|
|
140
|
+
* Retrieves the latest dev version of a plugin and updates the plugin's devVersion property.
|
|
141
|
+
* If there is an error retrieving the latest version, logs an error message.
|
|
142
|
+
*
|
|
143
|
+
* @param {Matterbridge} matterbridge - The Matterbridge instance.
|
|
144
|
+
* @param {RegisteredPlugin} plugin - The plugin for which to retrieve the latest version.
|
|
145
|
+
* @returns {Promise<string | undefined>} A promise that resolves when the latest dev version is retrieved.
|
|
146
|
+
*/
|
|
85
147
|
export async function getPluginDevVersion(matterbridge, plugin) {
|
|
86
148
|
const { getNpmPackageVersion } = await import('./utils/network.js');
|
|
87
149
|
try {
|
|
@@ -100,3 +162,4 @@ export async function getPluginDevVersion(matterbridge, plugin) {
|
|
|
100
162
|
matterbridge.log.debug(`Error getting plugin ${plg}${plugin.name}${db} latest dev version: ${error instanceof Error ? error.message : error}`);
|
|
101
163
|
}
|
|
102
164
|
}
|
|
165
|
+
//# sourceMappingURL=update.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../src/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* This file contains the color utilities.
|
|
3
|
+
*
|
|
4
|
+
* @file colorUtils.ts
|
|
5
|
+
* @author Luca Liguori
|
|
6
|
+
* @created 2023-10-05
|
|
7
|
+
* @version 1.3.0
|
|
8
|
+
* @license Apache-2.0
|
|
9
|
+
*
|
|
10
|
+
* Copyright 2023, 2024, 2025 Luca Liguori.
|
|
11
|
+
*
|
|
12
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
13
|
+
* you may not use this file except in compliance with the License.
|
|
14
|
+
* You may obtain a copy of the License at
|
|
15
|
+
*
|
|
16
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
17
|
+
*
|
|
18
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
19
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
20
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
21
|
+
* See the License for the specific language governing permissions and
|
|
22
|
+
* limitations under the License.
|
|
23
|
+
*/
|
|
24
|
+
export interface RGB {
|
|
25
|
+
r: number;
|
|
26
|
+
g: number;
|
|
27
|
+
b: number;
|
|
28
|
+
}
|
|
29
|
+
export interface XY {
|
|
30
|
+
x: number;
|
|
31
|
+
y: number;
|
|
32
|
+
}
|
|
33
|
+
export interface HSL {
|
|
34
|
+
h: number;
|
|
35
|
+
s: number;
|
|
36
|
+
l: number;
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Converts from HSL to RGB color space
|
|
40
|
+
*
|
|
41
|
+
* @param {number} hue - The hue value (0-360).
|
|
42
|
+
* @param {number} saturation - The saturation value (0-100).
|
|
43
|
+
* @param {number} luminance - The luminance value (0-100).
|
|
44
|
+
* @returns {RGB} An object containing the RGB values.
|
|
45
|
+
*/
|
|
46
|
+
export declare function hslColorToRgbColor(hue: number, saturation: number, luminance: number): RGB;
|
|
47
|
+
/**
|
|
48
|
+
* Converts RGB color space to CIE 1931 XY color space
|
|
49
|
+
*
|
|
50
|
+
* @param {RGB} rgb - The RGB color object.
|
|
51
|
+
* @returns {XY} An object containing the x and y values in CIE 1931 XY color space.
|
|
52
|
+
*/
|
|
53
|
+
export declare function rgbColorToXYColor(rgb: RGB): XY;
|
|
54
|
+
/**
|
|
55
|
+
* Converts CIE 1931 XY color space to RGB color space
|
|
56
|
+
*
|
|
57
|
+
* @param {number} x - The x value in CIE 1931 XY color space.
|
|
58
|
+
* @param {number} y - The y value in CIE 1931 XY color space.
|
|
59
|
+
* @param {number} [brightness] - The brightness value (1-254). Defaults to 254.
|
|
60
|
+
* @returns {RGB} An object containing the RGB values.
|
|
61
|
+
*/
|
|
62
|
+
export declare function xyColorToRgbColor(x: number, y: number, brightness?: number): RGB;
|
|
63
|
+
/**
|
|
64
|
+
* Converts RGB color space to HSL color space
|
|
65
|
+
*
|
|
66
|
+
* @param {RGB} rgb - The RGB color object.
|
|
67
|
+
* @returns {HSL} An object containing the HSL values.
|
|
68
|
+
*/
|
|
69
|
+
export declare function rgbColorToHslColor(rgb: RGB): HSL;
|
|
70
|
+
/**
|
|
71
|
+
* Converts CIE 1931 XY color space to HSL color space
|
|
72
|
+
*
|
|
73
|
+
* @param {number} x - The x value in CIE 1931 XY color space.
|
|
74
|
+
* @param {number} y - The y value in CIE 1931 XY color space.
|
|
75
|
+
* @returns {HSL} An object containing the HSL values.
|
|
76
|
+
*/
|
|
77
|
+
export declare function xyToHsl(x: number, y: number): HSL;
|
|
78
|
+
/**
|
|
79
|
+
* Converts mireds to kelvin.
|
|
80
|
+
*
|
|
81
|
+
* @param {number} mired - The mired value to convert.
|
|
82
|
+
* @returns {number} The converted kelvin value.
|
|
83
|
+
*/
|
|
84
|
+
export declare function miredToKelvin(mired: number): number;
|
|
85
|
+
/**
|
|
86
|
+
* Converts kelvin to mireds.
|
|
87
|
+
*
|
|
88
|
+
* @param {number} kelvin - The kelvin value to convert.
|
|
89
|
+
* @returns {number} The converted mired value.
|
|
90
|
+
*/
|
|
91
|
+
export declare function kelvinToMired(kelvin: number): number;
|
|
92
|
+
/**
|
|
93
|
+
* Converts kelvin to RGB color space.
|
|
94
|
+
*
|
|
95
|
+
* @param {number} kelvin - The kelvin value to convert (1000K to 40000K).
|
|
96
|
+
* @returns {RGB} An object containing the RGB values.
|
|
97
|
+
*/
|
|
98
|
+
export declare function kelvinToRGB(kelvin: number): RGB;
|
|
99
|
+
/**
|
|
100
|
+
* Converts CIE color space to RGB color space
|
|
101
|
+
*
|
|
102
|
+
* @param {number} x
|
|
103
|
+
* @param {number} y
|
|
104
|
+
* @param {number} brightness - Ranges from 1 to 254
|
|
105
|
+
* @returns {Array} Array that contains the color values for red, green and blue
|
|
106
|
+
* From: https://github.com/usolved/cie-rgb-converter/blob/master/cie_rgb_converter.js
|
|
107
|
+
*/
|
|
108
|
+
/**
|
|
109
|
+
* Converts RGB color space to CIE color space
|
|
110
|
+
*
|
|
111
|
+
* @param {number} red
|
|
112
|
+
* @param {number} green
|
|
113
|
+
* @param {number} blue
|
|
114
|
+
* @returns {Array} Array that contains the CIE color values for x and y
|
|
115
|
+
* From: https://github.com/usolved/cie-rgb-converter/blob/master/cie_rgb_converter.js
|
|
116
|
+
*/
|
|
117
|
+
//# sourceMappingURL=colorUtils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"colorUtils.d.ts","sourceRoot":"","sources":["../../src/utils/colorUtils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAIH,MAAM,WAAW,GAAG;IAClB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,EAAE;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,GAAG;IAClB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,GAAG,CA+C1F;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,EAAE,CA6B9C;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,SAAM,GAAG,GAAG,CAmD7E;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAmChD;AAED;;;;;;GAMG;AACH,wBAAgB,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,GAAG,CAGjD;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAsC/C;AAwDD;;;;;;;;GAQG;AAsDH;;;;;;;;GAQG"}
|
package/dist/utils/colorUtils.js
CHANGED
|
@@ -1,4 +1,35 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* This file contains the color utilities.
|
|
3
|
+
*
|
|
4
|
+
* @file colorUtils.ts
|
|
5
|
+
* @author Luca Liguori
|
|
6
|
+
* @created 2023-10-05
|
|
7
|
+
* @version 1.3.0
|
|
8
|
+
* @license Apache-2.0
|
|
9
|
+
*
|
|
10
|
+
* Copyright 2023, 2024, 2025 Luca Liguori.
|
|
11
|
+
*
|
|
12
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
13
|
+
* you may not use this file except in compliance with the License.
|
|
14
|
+
* You may obtain a copy of the License at
|
|
15
|
+
*
|
|
16
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
17
|
+
*
|
|
18
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
19
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
20
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
21
|
+
* See the License for the specific language governing permissions and
|
|
22
|
+
* limitations under the License.
|
|
23
|
+
*/
|
|
1
24
|
import { assert } from 'node:console';
|
|
25
|
+
/**
|
|
26
|
+
* Converts from HSL to RGB color space
|
|
27
|
+
*
|
|
28
|
+
* @param {number} hue - The hue value (0-360).
|
|
29
|
+
* @param {number} saturation - The saturation value (0-100).
|
|
30
|
+
* @param {number} luminance - The luminance value (0-100).
|
|
31
|
+
* @returns {RGB} An object containing the RGB values.
|
|
32
|
+
*/
|
|
2
33
|
export function hslColorToRgbColor(hue, saturation, luminance) {
|
|
3
34
|
if (hue === 360) {
|
|
4
35
|
hue = 0;
|
|
@@ -10,7 +41,7 @@ export function hslColorToRgbColor(hue, saturation, luminance) {
|
|
|
10
41
|
luminance /= 100;
|
|
11
42
|
let r, g, b;
|
|
12
43
|
if (saturation === 0) {
|
|
13
|
-
r = g = b = luminance;
|
|
44
|
+
r = g = b = luminance; // achromatic
|
|
14
45
|
}
|
|
15
46
|
else {
|
|
16
47
|
const hue2rgb = (p, q, t) => {
|
|
@@ -43,33 +74,54 @@ export function hslColorToRgbColor(hue, saturation, luminance) {
|
|
|
43
74
|
b: Math.ceil(b * 255),
|
|
44
75
|
};
|
|
45
76
|
}
|
|
77
|
+
/**
|
|
78
|
+
* Converts RGB color space to CIE 1931 XY color space
|
|
79
|
+
*
|
|
80
|
+
* @param {RGB} rgb - The RGB color object.
|
|
81
|
+
* @returns {XY} An object containing the x and y values in CIE 1931 XY color space.
|
|
82
|
+
*/
|
|
46
83
|
export function rgbColorToXYColor(rgb) {
|
|
47
84
|
let r = rgb.r / 255;
|
|
48
85
|
let g = rgb.g / 255;
|
|
49
86
|
let b = rgb.b / 255;
|
|
87
|
+
// Apply gamma correction
|
|
50
88
|
r = r > 0.04045 ? Math.pow((r + 0.055) / 1.055, 2.4) : r / 12.92;
|
|
51
89
|
g = g > 0.04045 ? Math.pow((g + 0.055) / 1.055, 2.4) : g / 12.92;
|
|
52
90
|
b = b > 0.04045 ? Math.pow((b + 0.055) / 1.055, 2.4) : b / 12.92;
|
|
91
|
+
// Scale the values to the D65 illuminant
|
|
53
92
|
r = r * 100;
|
|
54
93
|
g = g * 100;
|
|
55
94
|
b = b * 100;
|
|
95
|
+
// Convert RGB to XYZ
|
|
56
96
|
const X = r * 0.664511 + g * 0.154324 + b * 0.162028;
|
|
57
97
|
const Y = r * 0.283881 + g * 0.668433 + b * 0.047685;
|
|
58
98
|
const Z = r * 0.000088 + g * 0.07231 + b * 0.986039;
|
|
99
|
+
// Normalization
|
|
59
100
|
let x = X / (X + Y + Z);
|
|
60
101
|
let y = Y / (X + Y + Z);
|
|
102
|
+
// Round to 4 digits
|
|
61
103
|
x = Math.round(x * 10000) / 10000;
|
|
62
104
|
y = Math.round(y * 10000) / 10000;
|
|
63
105
|
return { x, y };
|
|
64
106
|
}
|
|
107
|
+
/**
|
|
108
|
+
* Converts CIE 1931 XY color space to RGB color space
|
|
109
|
+
*
|
|
110
|
+
* @param {number} x - The x value in CIE 1931 XY color space.
|
|
111
|
+
* @param {number} y - The y value in CIE 1931 XY color space.
|
|
112
|
+
* @param {number} [brightness] - The brightness value (1-254). Defaults to 254.
|
|
113
|
+
* @returns {RGB} An object containing the RGB values.
|
|
114
|
+
*/
|
|
65
115
|
export function xyColorToRgbColor(x, y, brightness = 254) {
|
|
66
116
|
const z = 1.0 - x - y;
|
|
67
117
|
const Y = (brightness / 254).toFixed(2);
|
|
68
118
|
const X = (Number(Y) / y) * x;
|
|
69
119
|
const Z = (Number(Y) / y) * z;
|
|
120
|
+
// Convert to RGB using Wide RGB D65 conversion
|
|
70
121
|
let red = X * 1.656492 - Number(Y) * 0.354851 - Z * 0.255038;
|
|
71
122
|
let green = -X * 0.707196 + Number(Y) * 1.655397 + Z * 0.036152;
|
|
72
123
|
let blue = X * 0.051713 - Number(Y) * 0.121364 + Z * 1.01153;
|
|
124
|
+
// If red, green or blue is larger than 1.0 set it back to the maximum of 1.0
|
|
73
125
|
if (red > blue && red > green && red > 1.0) {
|
|
74
126
|
green = green / red;
|
|
75
127
|
blue = blue / red;
|
|
@@ -85,23 +137,35 @@ export function xyColorToRgbColor(x, y, brightness = 254) {
|
|
|
85
137
|
green = green / blue;
|
|
86
138
|
blue = 1.0;
|
|
87
139
|
}
|
|
140
|
+
// Reverse gamma correction
|
|
88
141
|
red = red <= 0.0031308 ? 12.92 * red : (1.0 + 0.055) * Math.pow(red, 1.0 / 2.4) - 0.055;
|
|
89
142
|
green = green <= 0.0031308 ? 12.92 * green : (1.0 + 0.055) * Math.pow(green, 1.0 / 2.4) - 0.055;
|
|
90
143
|
blue = blue <= 0.0031308 ? 12.92 * blue : (1.0 + 0.055) * Math.pow(blue, 1.0 / 2.4) - 0.055;
|
|
144
|
+
// Convert normalized decimal to decimal
|
|
91
145
|
red = Math.round(red * 255);
|
|
92
146
|
green = Math.round(green * 255);
|
|
93
147
|
blue = Math.round(blue * 255);
|
|
148
|
+
// Normalize even if this code should never be reached...
|
|
94
149
|
if (isNaN(red) || red < 0) {
|
|
150
|
+
/* istanbul ignore next */
|
|
95
151
|
red = 0;
|
|
96
152
|
}
|
|
97
153
|
if (isNaN(green) || green < 0) {
|
|
154
|
+
/* istanbul ignore next */
|
|
98
155
|
green = 0;
|
|
99
156
|
}
|
|
100
157
|
if (isNaN(blue) || blue < 0) {
|
|
158
|
+
/* istanbul ignore next */
|
|
101
159
|
blue = 0;
|
|
102
160
|
}
|
|
103
161
|
return { r: Math.round(red), g: Math.round(green), b: Math.round(blue) };
|
|
104
162
|
}
|
|
163
|
+
/**
|
|
164
|
+
* Converts RGB color space to HSL color space
|
|
165
|
+
*
|
|
166
|
+
* @param {RGB} rgb - The RGB color object.
|
|
167
|
+
* @returns {HSL} An object containing the HSL values.
|
|
168
|
+
*/
|
|
105
169
|
export function rgbColorToHslColor(rgb) {
|
|
106
170
|
const r = rgb.r / 255;
|
|
107
171
|
const g = rgb.g / 255;
|
|
@@ -111,7 +175,7 @@ export function rgbColorToHslColor(rgb) {
|
|
|
111
175
|
let h = 0, s = 0;
|
|
112
176
|
const l = (max + min) / 2;
|
|
113
177
|
if (max === min) {
|
|
114
|
-
h = s = 0;
|
|
178
|
+
h = s = 0; // achromatic
|
|
115
179
|
}
|
|
116
180
|
else {
|
|
117
181
|
const d = max - min;
|
|
@@ -135,19 +199,46 @@ export function rgbColorToHslColor(rgb) {
|
|
|
135
199
|
l: Math.round(l * 100),
|
|
136
200
|
};
|
|
137
201
|
}
|
|
202
|
+
/**
|
|
203
|
+
* Converts CIE 1931 XY color space to HSL color space
|
|
204
|
+
*
|
|
205
|
+
* @param {number} x - The x value in CIE 1931 XY color space.
|
|
206
|
+
* @param {number} y - The y value in CIE 1931 XY color space.
|
|
207
|
+
* @returns {HSL} An object containing the HSL values.
|
|
208
|
+
*/
|
|
138
209
|
export function xyToHsl(x, y) {
|
|
139
210
|
const rgb = xyColorToRgbColor(x, y);
|
|
140
211
|
return rgbColorToHslColor(rgb);
|
|
141
212
|
}
|
|
213
|
+
/**
|
|
214
|
+
* Converts mireds to kelvin.
|
|
215
|
+
*
|
|
216
|
+
* @param {number} mired - The mired value to convert.
|
|
217
|
+
* @returns {number} The converted kelvin value.
|
|
218
|
+
*/
|
|
142
219
|
export function miredToKelvin(mired) {
|
|
143
220
|
return Math.round(1000000 / mired);
|
|
144
221
|
}
|
|
222
|
+
/**
|
|
223
|
+
* Converts kelvin to mireds.
|
|
224
|
+
*
|
|
225
|
+
* @param {number} kelvin - The kelvin value to convert.
|
|
226
|
+
* @returns {number} The converted mired value.
|
|
227
|
+
*/
|
|
145
228
|
export function kelvinToMired(kelvin) {
|
|
146
229
|
return Math.round(1000000 / kelvin);
|
|
147
230
|
}
|
|
231
|
+
/**
|
|
232
|
+
* Converts kelvin to RGB color space.
|
|
233
|
+
*
|
|
234
|
+
* @param {number} kelvin - The kelvin value to convert (1000K to 40000K).
|
|
235
|
+
* @returns {RGB} An object containing the RGB values.
|
|
236
|
+
*/
|
|
148
237
|
export function kelvinToRGB(kelvin) {
|
|
238
|
+
// Clamp the temperature to the range 1000K to 40000K
|
|
149
239
|
kelvin = Math.max(1000, Math.min(40000, kelvin)) / 100;
|
|
150
240
|
let r, g, b;
|
|
241
|
+
// Calculate red
|
|
151
242
|
if (kelvin <= 66) {
|
|
152
243
|
r = 255;
|
|
153
244
|
}
|
|
@@ -156,6 +247,7 @@ export function kelvinToRGB(kelvin) {
|
|
|
156
247
|
r = 329.698727446 * Math.pow(r, -0.1332047592);
|
|
157
248
|
r = Math.max(0, Math.min(255, r));
|
|
158
249
|
}
|
|
250
|
+
// Calculate green
|
|
159
251
|
if (kelvin <= 66) {
|
|
160
252
|
g = kelvin;
|
|
161
253
|
g = 99.4708025861 * Math.log(g) - 161.1195681661;
|
|
@@ -166,6 +258,7 @@ export function kelvinToRGB(kelvin) {
|
|
|
166
258
|
g = 288.1221695283 * Math.pow(g, -0.0755148492);
|
|
167
259
|
g = Math.max(0, Math.min(255, g));
|
|
168
260
|
}
|
|
261
|
+
// Calculate blue
|
|
169
262
|
if (kelvin >= 66) {
|
|
170
263
|
b = 255;
|
|
171
264
|
}
|
|
@@ -179,3 +272,171 @@ export function kelvinToRGB(kelvin) {
|
|
|
179
272
|
}
|
|
180
273
|
return { r: Math.round(r), g: Math.round(g), b: Math.round(b) };
|
|
181
274
|
}
|
|
275
|
+
/*
|
|
276
|
+
export function testColors(): void {
|
|
277
|
+
// this table has been checked with different apps and sites and is correct 100%
|
|
278
|
+
const colors = [
|
|
279
|
+
{ name: 'Pure Red 0', hsl: { h: 0, s: 100, l: 50 }, rgb: { r: 255, g: 0, b: 0 }, xy: { x: 0.7006, y: 0.2993 } },
|
|
280
|
+
{ name: 'Bright Orange 30', hsl: { h: 30, s: 100, l: 50 }, rgb: { r: 255, g: 128, b: 0 }, xy: { x: 0.6112, y: 0.375 } },
|
|
281
|
+
{ name: 'Pure Yellow 60', hsl: { h: 60, s: 100, l: 50 }, rgb: { r: 255, g: 255, b: 0 }, xy: { x: 0.4442, y: 0.5166 } },
|
|
282
|
+
{ name: 'Lime Green 90', hsl: { h: 90, s: 100, l: 50 }, rgb: { r: 128, g: 255, b: 0 }, xy: { x: 0.2707, y: 0.6635 } },
|
|
283
|
+
{ name: 'Pure Green 120', hsl: { h: 120, s: 100, l: 50 }, rgb: { r: 0, g: 255, b: 0 }, xy: { x: 0.1724, y: 0.7468 } },
|
|
284
|
+
{ name: 'Light Sea Green 150', hsl: { h: 150, s: 100, l: 50 }, rgb: { r: 0, g: 255, b: 128 }, xy: { x: 0.1642, y: 0.5886 } },
|
|
285
|
+
{ name: 'Pure Cyan 180', hsl: { h: 180, s: 100, l: 50 }, rgb: { r: 0, g: 255, b: 255 }, xy: { x: 0.1513, y: 0.3425 } },
|
|
286
|
+
{ name: 'Deep Sky Blue 210', hsl: { h: 210, s: 100, l: 50 }, rgb: { r: 0, g: 128, b: 255 }, xy: { x: 0.1406, y: 0.1382 } },
|
|
287
|
+
{ name: 'Pure Blue 240', hsl: { h: 240, s: 100, l: 50 }, rgb: { r: 0, g: 0, b: 255 }, xy: { x: 0.1355, y: 0.0399 } },
|
|
288
|
+
{ name: 'Blue Violet 270', hsl: { h: 270, s: 100, l: 50 }, rgb: { r: 128, g: 0, b: 255 }, xy: { x: 0.2181, y: 0.0778 } },
|
|
289
|
+
{ name: 'Pure Magenta 300', hsl: { h: 300, s: 100, l: 50 }, rgb: { r: 255, g: 0, b: 255 }, xy: { x: 0.3855, y: 0.1546 } },
|
|
290
|
+
{ name: 'Deep Pink 330', hsl: { h: 330, s: 100, l: 50 }, rgb: { r: 255, g: 0, b: 128 }, xy: { x: 0.5797, y: 0.2438 } },
|
|
291
|
+
|
|
292
|
+
{ name: 'Pure Red 50% 0', hsl: { h: 0, s: 50, l: 50 }, rgb: { r: 192, g: 64, b: 64 }, xy: { x: 0.6036, y: 0.3069 } },
|
|
293
|
+
{ name: 'Bright Orange 50% 30', hsl: { h: 30, s: 50, l: 50 }, rgb: { r: 192, g: 128, b: 64 }, xy: { x: 0.5194, y: 0.3928 } },
|
|
294
|
+
{ name: 'Pure Yellow 50% 60', hsl: { h: 60, s: 50, l: 50 }, rgb: { r: 192, g: 192, b: 64 }, xy: { x: 0.4258, y: 0.4883 } },
|
|
295
|
+
{ name: 'Lime Green 50% 90', hsl: { h: 90, s: 50, l: 50 }, rgb: { r: 128, g: 192, b: 64 }, xy: { x: 0.3159, y: 0.5639 } },
|
|
296
|
+
{ name: 'Pure Green 50% 120', hsl: { h: 120, s: 50, l: 50 }, rgb: { r: 64, g: 192, b: 64 }, xy: { x: 0.2127, y: 0.6349 } },
|
|
297
|
+
{ name: 'Light Sea Green 50% 150', hsl: { h: 150, s: 50, l: 50 }, rgb: { r: 64, g: 192, b: 128 }, xy: { x: 0.1932, y: 0.4845 } },
|
|
298
|
+
{ name: 'Pure Cyan 50% 180', hsl: { h: 180, s: 50, l: 50 }, rgb: { r: 64, g: 192, b: 192 }, xy: { x: 0.1745, y: 0.3407 } },
|
|
299
|
+
{ name: 'Deep Sky Blue 50% 210', hsl: { h: 210, s: 50, l: 50 }, rgb: { r: 64, g: 128, b: 192 }, xy: { x: 0.1752, y: 0.211 } },
|
|
300
|
+
{ name: 'Pure Blue 50% 240', hsl: { h: 240, s: 50, l: 50 }, rgb: { r: 64, g: 64, b: 192 }, xy: { x: 0.1758, y: 0.102 } },
|
|
301
|
+
{ name: 'Blue Violet 50% 270', hsl: { h: 270, s: 50, l: 50 }, rgb: { r: 128, g: 64, b: 192 }, xy: { x: 0.2688, y: 0.137 } },
|
|
302
|
+
{ name: 'Pure Magenta 50% 300', hsl: { h: 300, s: 50, l: 50 }, rgb: { r: 192, g: 64, b: 192 }, xy: { x: 0.3772, y: 0.1777 } },
|
|
303
|
+
{ name: 'Deep Pink 50% 330', hsl: { h: 330, s: 50, l: 50 }, rgb: { r: 192, g: 64, b: 128 }, xy: { x: 0.489, y: 0.2416 } },
|
|
304
|
+
];
|
|
305
|
+
|
|
306
|
+
colors.forEach((color) => {
|
|
307
|
+
// eslint-disable-next-line no-console
|
|
308
|
+
console.log(
|
|
309
|
+
`\x1b[48;2;${color.rgb.r};${color.rgb.g};${color.rgb.b}mColor: ${color.name}\x1b[0m, hsl: { h: ${color.hsl.h}, s: ${color.hsl.s}, l: ${color.hsl.l} }, rgb: { r: ${color.rgb.r}, g: ${color.rgb.g}, b: ${color.rgb.b} }, xy: { x: ${color.xy.x}, y: ${color.xy.y} }`,
|
|
310
|
+
);
|
|
311
|
+
|
|
312
|
+
const rgb = hslColorToRgbColor(color.hsl.h, color.hsl.s, color.hsl.l);
|
|
313
|
+
assert(rgb.r === color.rgb.r && rgb.g === color.rgb.g && rgb.b === color.rgb.b, `\x1b[48;2;${rgb.r};${rgb.g};${rgb.b}mColor: ${color.name}\x1b[0m hslColorToRgbColor { r: ${rgb.r}, g: ${rgb.g}, b: ${rgb.b} } conversion error`);
|
|
314
|
+
|
|
315
|
+
const hsl = rgbColorToHslColor({ r: color.rgb.r, g: color.rgb.g, b: color.rgb.b });
|
|
316
|
+
assert(hsl.h === color.hsl.h && hsl.s === color.hsl.s && hsl.l === color.hsl.l, `Color: ${color.name} rgbColorToHslColor conversion error`);
|
|
317
|
+
|
|
318
|
+
const xy = rgbColorToXYColor({ r: color.rgb.r, g: color.rgb.g, b: color.rgb.b });
|
|
319
|
+
assert(xy.x === color.xy.x && xy.y === color.xy.y, `Color: ${color.name} rgbColorToXYColor conversion error got x ${xy.x} y ${xy.y}`);
|
|
320
|
+
|
|
321
|
+
const rgb2 = xyColorToRgbColor(color.xy.x, color.xy.y);
|
|
322
|
+
assert(
|
|
323
|
+
rgb2.r === color.rgb.r && rgb2.g === color.rgb.g && rgb2.b === color.rgb.b,
|
|
324
|
+
`\x1b[48;2;${rgb2.r};${rgb2.g};${rgb2.b}mColor: ${color.name}\x1b[0m xyColorToRgbColor(${color.xy.x}, ${color.xy.y}) conversion error -> r: ${rgb2.r} g: ${rgb2.g} b: ${rgb2.g}`,
|
|
325
|
+
);
|
|
326
|
+
});
|
|
327
|
+
}
|
|
328
|
+
*/
|
|
329
|
+
/**
|
|
330
|
+
* Converts CIE color space to RGB color space
|
|
331
|
+
*
|
|
332
|
+
* @param {number} x
|
|
333
|
+
* @param {number} y
|
|
334
|
+
* @param {number} brightness - Ranges from 1 to 254
|
|
335
|
+
* @returns {Array} Array that contains the color values for red, green and blue
|
|
336
|
+
* From: https://github.com/usolved/cie-rgb-converter/blob/master/cie_rgb_converter.js
|
|
337
|
+
*/
|
|
338
|
+
/*
|
|
339
|
+
export function cie_to_rgb(x: number, y: number, brightness = 254): RGB {
|
|
340
|
+
// Set to maximum brightness if no custom value was given (Not the slick ECMAScript 6 way for compatibility reasons)
|
|
341
|
+
|
|
342
|
+
const z = 1.0 - x - y;
|
|
343
|
+
const Y = (brightness / 254).toFixed(2);
|
|
344
|
+
const X = (Number(Y) / y) * x;
|
|
345
|
+
const Z = (Number(Y) / y) * z;
|
|
346
|
+
|
|
347
|
+
// Convert to RGB using Wide RGB D65 conversion
|
|
348
|
+
let red = X * 1.656492 - Number(Y) * 0.354851 - Z * 0.255038;
|
|
349
|
+
let green = -X * 0.707196 + Number(Y) * 1.655397 + Z * 0.036152;
|
|
350
|
+
let blue = X * 0.051713 - Number(Y) * 0.121364 + Z * 1.01153;
|
|
351
|
+
|
|
352
|
+
// If red, green or blue is larger than 1.0 set it back to the maximum of 1.0
|
|
353
|
+
if (red > blue && red > green && red > 1.0) {
|
|
354
|
+
green = green / red;
|
|
355
|
+
blue = blue / red;
|
|
356
|
+
red = 1.0;
|
|
357
|
+
} else if (green > blue && green > red && green > 1.0) {
|
|
358
|
+
red = red / green;
|
|
359
|
+
blue = blue / green;
|
|
360
|
+
green = 1.0;
|
|
361
|
+
} else if (blue > red && blue > green && blue > 1.0) {
|
|
362
|
+
red = red / blue;
|
|
363
|
+
green = green / blue;
|
|
364
|
+
blue = 1.0;
|
|
365
|
+
}
|
|
366
|
+
|
|
367
|
+
// Reverse gamma correction
|
|
368
|
+
red = red <= 0.0031308 ? 12.92 * red : (1.0 + 0.055) * Math.pow(red, 1.0 / 2.4) - 0.055;
|
|
369
|
+
green = green <= 0.0031308 ? 12.92 * green : (1.0 + 0.055) * Math.pow(green, 1.0 / 2.4) - 0.055;
|
|
370
|
+
blue = blue <= 0.0031308 ? 12.92 * blue : (1.0 + 0.055) * Math.pow(blue, 1.0 / 2.4) - 0.055;
|
|
371
|
+
|
|
372
|
+
// Convert normalized decimal to decimal
|
|
373
|
+
red = Math.round(red * 255);
|
|
374
|
+
green = Math.round(green * 255);
|
|
375
|
+
blue = Math.round(blue * 255);
|
|
376
|
+
|
|
377
|
+
// Normalize
|
|
378
|
+
if (isNaN(red) || red < 0) {
|
|
379
|
+
red = 0;
|
|
380
|
+
}
|
|
381
|
+
if (isNaN(green) || green < 0) {
|
|
382
|
+
green = 0;
|
|
383
|
+
}
|
|
384
|
+
if (isNaN(blue) || blue < 0) {
|
|
385
|
+
blue = 0;
|
|
386
|
+
}
|
|
387
|
+
|
|
388
|
+
return { r: red, g: green, b: blue };
|
|
389
|
+
}
|
|
390
|
+
*/
|
|
391
|
+
/**
|
|
392
|
+
* Converts RGB color space to CIE color space
|
|
393
|
+
*
|
|
394
|
+
* @param {number} red
|
|
395
|
+
* @param {number} green
|
|
396
|
+
* @param {number} blue
|
|
397
|
+
* @returns {Array} Array that contains the CIE color values for x and y
|
|
398
|
+
* From: https://github.com/usolved/cie-rgb-converter/blob/master/cie_rgb_converter.js
|
|
399
|
+
*/
|
|
400
|
+
/*
|
|
401
|
+
export function rgb_to_cie(red: number, green: number, blue: number): XY {
|
|
402
|
+
// Apply a gamma correction to the RGB values, which makes the color more vivid and more the like the color displayed on the screen of your device
|
|
403
|
+
red = red > 0.04045 ? Math.pow((red + 0.055) / (1.0 + 0.055), 2.4) : red / 12.92;
|
|
404
|
+
green = green > 0.04045 ? Math.pow((green + 0.055) / (1.0 + 0.055), 2.4) : green / 12.92;
|
|
405
|
+
blue = blue > 0.04045 ? Math.pow((blue + 0.055) / (1.0 + 0.055), 2.4) : blue / 12.92;
|
|
406
|
+
|
|
407
|
+
// RGB values to XYZ using the Wide RGB D65 conversion formula
|
|
408
|
+
const X = red * 0.664511 + green * 0.154324 + blue * 0.162028;
|
|
409
|
+
const Y = red * 0.283881 + green * 0.668433 + blue * 0.047685;
|
|
410
|
+
const Z = red * 0.000088 + green * 0.07231 + blue * 0.986039;
|
|
411
|
+
|
|
412
|
+
// Calculate the xy values from the XYZ values
|
|
413
|
+
let x = (X / (X + Y + Z)).toFixed(4);
|
|
414
|
+
let y = (Y / (X + Y + Z)).toFixed(4);
|
|
415
|
+
|
|
416
|
+
if (isNaN(Number(x))) {
|
|
417
|
+
x = '0';
|
|
418
|
+
}
|
|
419
|
+
|
|
420
|
+
if (isNaN(Number(y))) {
|
|
421
|
+
y = '0';
|
|
422
|
+
}
|
|
423
|
+
|
|
424
|
+
return { x: Number(x), y: Number(y) };
|
|
425
|
+
}
|
|
426
|
+
*/
|
|
427
|
+
/*
|
|
428
|
+
testColors();
|
|
429
|
+
console.log('rgb_to_cie(0, 128, 255)', rgb_to_cie(0, 128, 255));
|
|
430
|
+
console.log('cie_to_rgb(0.1401, 0.1284, 254)', cie_to_rgb(0.1401, 0.1284, 254));
|
|
431
|
+
console.log('cie_to_rgb(0.1406, 0.1382, 254)', cie_to_rgb(0.1406, 0.1382, 254));
|
|
432
|
+
for (let h = 0; h < 360; h++) {
|
|
433
|
+
const rgb = hslColorToRgbColor(h, 100, 50);
|
|
434
|
+
const xy = rgbColorToXYColor({ r: rgb.r, g: rgb.g, b: rgb.b });
|
|
435
|
+
const rgb2 = cie_to_rgb(xy.x, xy.y, 254);
|
|
436
|
+
const hsl = rgbColorToHslColor({ r: rgb2.r, g: rgb2.g, b: rgb2.b });
|
|
437
|
+
assert(rgb.r === rgb2.r && rgb.g === rgb2.g && rgb.b === rgb2.b, 'Color rgb conversion error');
|
|
438
|
+
assert(h === hsl.h, 'Color hsl conversion error');
|
|
439
|
+
console.log(`\x1b[48;2;${rgb.r};${rgb.g};${rgb.b}mColor: r:${rgb.r} g:${rgb.g} b:${rgb.b}\x1b[0m => x:${xy.x} y:${xy.y} => \x1b[48;2;${rgb2.r};${rgb2.g};${rgb2.b}mColor: r:${rgb2.r} g:${rgb2.g} b:${rgb2.b} h:${hsl.h} s:${hsl.s}\x1b[0m\x1b[K`);
|
|
440
|
+
}
|
|
441
|
+
*/
|
|
442
|
+
//# sourceMappingURL=colorUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"colorUtils.js","sourceRoot":"","sources":["../../src/utils/colorUtils.ts"],"names":[],"mappings":"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"}
|