Skip to content

Commit

Permalink
Revert "Allow to extend the deltaE methods" (#283)
Browse files Browse the repository at this point in the history
  • Loading branch information
LeaVerou authored Feb 8, 2023
1 parent 504979f commit da77a1b
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 23 deletions.
2 changes: 1 addition & 1 deletion src/deltaE.js
Original file line number Diff line number Diff line change
@@ -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)) {
Expand Down
9 changes: 0 additions & 9 deletions src/deltaE/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
1 change: 0 additions & 1 deletion src/index-fn.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
11 changes: 4 additions & 7 deletions types/src/deltaE/index.d.ts
Original file line number Diff line number Diff line change
@@ -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<typeof import("./index"), "default">;
export default deltaEMethods;

export type Methods = keyof typeof deltaEMethods extends `deltaE${infer Method}`
? Method
: string;
1 change: 0 additions & 1 deletion types/src/index-fn.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
3 changes: 1 addition & 2 deletions types/src/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
contrastDeltaPhi,
} from "./contrast/index";
import deltaE from "./deltaE";
import deltaEMethods, {
import {
deltaE76,
deltaECMC,
deltaE2000,
Expand Down Expand Up @@ -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<typeof mix>;
Expand Down

0 comments on commit da77a1b

Please sign in to comment.