fix alias type definiton

crayon-js · May 10, 2021 · 723a94a · 723a94a
1 parent 3c06220
commit 723a94a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/deno_lib/styles.ts b/deno_lib/styles.ts
@@ -166,11 +166,11 @@ export const addStyleFunction = (
 
 export const addStyleAlias = (
 	alias: string,
-	aliased: CrayonStyle & string
+	aliased: CrayonStyle | string
 ): boolean => {
-	const style = styles[aliased]
+	const style = styles[aliased as CrayonStyle]
 
-	if (style) {
+	if (!style) {
 		crayonError(`Could not find style "${aliased}"`)
 		return false
 	}
@@ -181,13 +181,13 @@ export const addStyleAlias = (
 }
 
 export const addStyleAliases = (aliases: {
-	[name: string]: CrayonStyle & string
+	[name: string]: CrayonStyle | string
 }): boolean => {
 	let status = true
 
 	for (let alias in aliases) {
 		const aliased = aliases[alias]
-		const style = styles[aliased]
+		const style = styles[aliased as CrayonStyle]
 
 		if (!style) {
 			crayonError(`Could not find style "${aliased}"`)

diff --git a/lib/styles.d.ts b/lib/styles.d.ts
@@ -12,9 +12,9 @@ export declare const functions: {
 };
 export declare const styles: StyleObject;
 export declare const addStyleFunction: (name: string, func: (...any: any[]) => string) => boolean;
-export declare const addStyleAlias: (alias: string, aliased: CrayonStyle & string) => boolean;
+export declare const addStyleAlias: (alias: string, aliased: CrayonStyle | string) => boolean;
 export declare const addStyleAliases: (aliases: {
-    [name: string]: "black" | "red" | "green" | "yellow" | "blue" | "magenta" | "cyan" | "white" | "lightBlack" | "lightRed" | "lightGreen" | "lightYellow" | "lightBlue" | "lightMagenta" | "lightCyan" | "lightWhite" | "bgBlack" | "bgRed" | "bgGreen" | "bgYellow" | "bgBlue" | "bgMagenta" | "bgCyan" | "bgWhite" | "bgLightBlack" | "bgLightRed" | "bgLightGreen" | "bgLightYellow" | "bgLightBlue" | "bgLightMagenta" | "bgLightCyan" | "bgLightWhite" | "reset" | "bold" | "dim" | "italic" | "underline" | "blink" | "fastBlink" | "invert" | "hidden" | "strikethrough" | "boldOff" | "doubleUnderline" | "boldOrDimOff" | "italicOff" | "underlineOff" | "blinkOff" | "invertOff" | "hiddenOff" | "strikethroughOff";
+    [name: string]: string;
 }) => boolean;
 export declare const addStyle: (name: string, value: string) => boolean;
 export declare const addStyles: (styleObject: {

diff --git a/lib/styles.js b/lib/styles.js
diff --git a/src/styles.ts b/src/styles.ts
@@ -166,11 +166,11 @@ export const addStyleFunction = (
 
 export const addStyleAlias = (
 	alias: string,
-	aliased: CrayonStyle & string
+	aliased: CrayonStyle | string
 ): boolean => {
-	const style = styles[aliased]
+	const style = styles[aliased as CrayonStyle]
 
-	if (style) {
+	if (!style) {
 		crayonError(`Could not find style "${aliased}"`)
 		return false
 	}
@@ -181,13 +181,13 @@ export const addStyleAlias = (
 }
 
 export const addStyleAliases = (aliases: {
-	[name: string]: CrayonStyle & string
+	[name: string]: CrayonStyle | string
 }): boolean => {
 	let status = true
 
 	for (let alias in aliases) {
 		const aliased = aliases[alias]
-		const style = styles[aliased]
+		const style = styles[aliased as CrayonStyle]
 
 		if (!style) {
 			crayonError(`Could not find style "${aliased}"`)