From 9cc56836ae277dea29053498c7ac1834918a98a4 Mon Sep 17 00:00:00 2001 From: Lea Verou Date: Wed, 8 Feb 2023 11:35:37 -0500 Subject: [PATCH] Revert "Allow to extend the deltaE methods (#280)" This reverts commit 504979f5a9a932526c4c629c7aedfbc319a75fe0. --- src/deltaE.js | 2 +- src/deltaE/index.js | 9 --------- src/index-fn.js | 1 - src/index.js | 3 +-- types/src/deltaE/index.d.ts | 11 ++++------- types/src/index-fn.d.ts | 1 - types/src/index.d.ts | 3 +-- 7 files changed, 7 insertions(+), 23 deletions(-) diff --git a/src/deltaE.js b/src/deltaE.js index b8617f528..942cc982c 100644 --- a/src/deltaE.js +++ b/src/deltaE.js @@ -1,7 +1,7 @@ import getColor from "./getColor.js"; import defaults from "./defaults.js"; import {isString} from "./util.js"; -import deltaEMethods from "./deltaE/index.js"; +import * as deltaEMethods from "./deltaE/index.js"; export default function deltaE (c1, c2, o = {}) { if (isString(o)) { diff --git a/src/deltaE/index.js b/src/deltaE/index.js index 715ad8d47..13fff887d 100644 --- a/src/deltaE/index.js +++ b/src/deltaE/index.js @@ -4,12 +4,3 @@ export {default as deltaE2000} from "./deltaE2000.js"; export {default as deltaEJz} from "./deltaEJz.js"; export {default as deltaEITP} from "./deltaEITP.js"; export {default as deltaEOK} from "./deltaEOK.js"; - -export default { - deltaE76, - deltaECMC, - deltaE2000, - deltaEJz, - deltaEITP, - deltaEOK, -}; diff --git a/src/index-fn.js b/src/index-fn.js index c653ea044..5b2a40c00 100644 --- a/src/index-fn.js +++ b/src/index-fn.js @@ -24,7 +24,6 @@ export {uv, xy} from "./chromaticity.js"; export * from "./contrast/index.js"; export {default as deltaE} from "./deltaE.js"; export * from "./deltaE/index.js"; -export {default as deltaEMethods} from "./deltaE/index.js"; export * from "./variations.js"; export { mix, steps, range, isRange diff --git a/src/index.js b/src/index.js index 1a94ad498..8c835b5ca 100644 --- a/src/index.js +++ b/src/index.js @@ -6,11 +6,10 @@ import "./spaces/index.js"; // Import all DeltaE methods import deltaE from "./deltaE.js"; -import deltaEMethods from "./deltaE/index.js"; +import * as deltaEMethods from "./deltaE/index.js"; Color.extend(deltaEMethods); Color.extend({deltaE}); -Object.assign(Color, {deltaEMethods}); // Import optional modules import * as variations from "./variations.js"; diff --git a/types/src/deltaE/index.d.ts b/types/src/deltaE/index.d.ts index 9113a8624..a2bdac4db 100644 --- a/types/src/deltaE/index.d.ts +++ b/types/src/deltaE/index.d.ts @@ -1,13 +1,10 @@ +export type Methods = keyof typeof import(".") extends `deltaE${infer Method}` + ? Method + : string; + export { default as deltaE76 } from "./deltaE76"; export { default as deltaECMC } from "./deltaECMC"; export { default as deltaE2000 } from "./deltaE2000"; export { default as deltaEJz } from "./deltaEJz"; export { default as deltaEITP } from "./deltaEITP"; export { default as deltaEOK } from "./deltaEOK"; - -declare const deltaEMethods: Omit; -export default deltaEMethods; - -export type Methods = keyof typeof deltaEMethods extends `deltaE${infer Method}` - ? Method - : string; diff --git a/types/src/index-fn.d.ts b/types/src/index-fn.d.ts index f0f788415..4d87137df 100644 --- a/types/src/index-fn.d.ts +++ b/types/src/index-fn.d.ts @@ -24,6 +24,5 @@ export { mix, steps, range, isRange } from "./interpolation"; export * from "./contrast/index"; export * from "./deltaE/index"; -export { default as deltaEMethods } from "./deltaE/index"; export * from "./variations"; export * from "./spaces/index-fn"; diff --git a/types/src/index.d.ts b/types/src/index.d.ts index 665838cbc..25325c0fb 100644 --- a/types/src/index.d.ts +++ b/types/src/index.d.ts @@ -10,7 +10,7 @@ import { contrastDeltaPhi, } from "./contrast/index"; import deltaE from "./deltaE"; -import deltaEMethods, { +import { deltaE76, deltaECMC, deltaE2000, @@ -64,7 +64,6 @@ declare module "./color" { static deltaEJz: typeof deltaEJz; static deltaEITP: typeof deltaEITP; static deltaEOK: typeof deltaEOK; - static deltaEMethods: typeof deltaEMethods; // interpolation mix: ToColorPrototype;