Fix some color space types

Remiscan · Nov 3, 2022 · dea2625 · dea2625
1 parent 8f8c063
commit dea2625
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/dist/colori.js b/dist/colori.js
diff --git a/dist/colori.min.js b/dist/colori.min.js
diff --git a/src/ts/color-spaces.ts b/src/ts/color-spaces.ts
@@ -8,13 +8,13 @@ interface ColorSpaceBase {
   links: string[],
 };
 
-interface ColorSpaceWithGamut extends ColorSpaceBase {
+export interface ColorSpaceWithGamut extends ColorSpaceBase {
   gamut: Array<number[]>,
   black?: number[],
   white?: number[]
 }
 
-interface ColorSpaceWithoutGamut extends ColorSpaceBase {
+export interface ColorSpaceWithoutGamut extends ColorSpaceBase {
   gamutSpace: string,
 }
 

diff --git a/src/ts/couleur.ts b/src/ts/couleur.ts
@@ -1,4 +1,4 @@
-import colorSpaces, { colorProperty, ColorSpace } from './color-spaces.js';
+import colorSpaces, { colorProperty, ColorSpace, ColorSpaceWithGamut, ColorSpaceWithoutGamut } from './color-spaces.js';
 import * as Contrasts from './contrasts.js';
 import * as Conversions from './conversion.js';
 import { Format as CSSFormat, Formats, RegExps as ValueRegExps } from './css-formats.js';
@@ -884,7 +884,11 @@ export default class Couleur {
    */
   public static inGamut(destinationSpaceID: colorSpaceOrID, values: number[] | Couleur, sourceSpaceID: colorSpaceOrID = 'srgb', { tolerance = .0001 } = {}): boolean {
     const destinationSpace = Couleur.getSpace(destinationSpaceID);
-    const gamutSpace = destinationSpace.gamutSpace ? Couleur.getSpace(destinationSpace.gamutSpace) : destinationSpace;
+    const gamutSpace = (
+      (destinationSpace as ColorSpaceWithoutGamut).gamutSpace
+        ? Couleur.getSpace((destinationSpace as ColorSpaceWithoutGamut).gamutSpace)
+        : destinationSpace
+    ) as ColorSpaceWithGamut;
     const convertedValues = values instanceof Couleur ? values.valuesTo(gamutSpace)
                                                       : Couleur.convert(sourceSpaceID, gamutSpace, values);
     return convertedValues.every((v, k) => v >= (gamutSpace.gamut[k][0] - tolerance) && v <= (gamutSpace.gamut[k][1] + tolerance));
@@ -902,7 +906,11 @@ export default class Couleur {
    */
   public static toGamut(destinationSpaceID: colorSpaceOrID, values: number[] | Couleur, sourceSpaceID: colorSpaceOrID = 'srgb', { method = 'okchroma' }: toGamutOptions = {}): number[] {
     const destinationSpace = Couleur.getSpace(destinationSpaceID);
-    const gamutSpace = destinationSpace.gamutSpace ? Couleur.getSpace(destinationSpace.gamutSpace) : destinationSpace;
+    const gamutSpace = (
+      (destinationSpace as ColorSpaceWithoutGamut).gamutSpace
+        ? Couleur.getSpace((destinationSpace as ColorSpaceWithoutGamut).gamutSpace)
+        : destinationSpace
+    ) as ColorSpaceWithGamut;
     const sourceSpace = Couleur.getSpace(sourceSpaceID);
     const _method = method.toLowerCase();
 
@@ -976,7 +984,6 @@ export default class Couleur {
   public toGamut(destinationSpaceID: colorSpaceOrID): Couleur {
     const destinationSpace = Couleur.getSpace(destinationSpaceID);
     const rgbClampedValues = Couleur.toGamut(destinationSpace, this, undefined);
-    //const rgbClampedValues = Couleur.convert(destinationSpace, 'srgb', destinationClampedValues);
     return new Couleur([...rgbClampedValues, this.a]);
   }