Skip to content

fix: fix typing in theme overriding #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
B4nan merged 1 commit into from
Jun 25, 2025
Merged

fix: fix typing in theme overriding #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/SqlHighlighter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ import c from 'ansi-colors';
import { Token, Tokenizer } from './Tokenizer';
import { TokenType, HighlightSubject, TOKEN_TYPE_TO_HIGHLIGHT } from './enums';

type Theme = { [key in HighlightSubject]?: c.StyleFunction };

export class SqlHighlighter {

static readonly DEFAULT_THEME = {
static readonly DEFAULT_THEME: Theme = {
[HighlightSubject.QUOTE]: c.yellow,
[HighlightSubject.BACKTICK_QUOTE]: c.yellow,
[HighlightSubject.RESERVED]: c.white.bold,
Expand All @@ -16,11 +18,13 @@ export class SqlHighlighter {
[HighlightSubject.FUNCTIONS]: c.green.bold,
[HighlightSubject.BUILT_IN]: c.cyan,
[HighlightSubject.LITERAL]: c.cyan,
[HighlightSubject.WHITESPACE]: undefined,
[HighlightSubject.ERROR]: undefined,
};

private readonly tokenizer = new Tokenizer();

constructor(private readonly theme: { [K in keyof typeof HighlightSubject]?: string } = {}) {
constructor(private readonly theme: Theme = {}) {
this.theme = { ...SqlHighlighter.DEFAULT_THEME, ...this.theme };
}

Expand Down Expand Up @@ -50,11 +54,15 @@ export class SqlHighlighter {
}

private colorize(type: TokenType, value: string): string {
if (!TOKEN_TYPE_TO_HIGHLIGHT[type] || !this.theme[TOKEN_TYPE_TO_HIGHLIGHT[type]]) {
const subject = TOKEN_TYPE_TO_HIGHLIGHT[type];
if (!subject) {
return value;
}

return this.theme[TOKEN_TYPE_TO_HIGHLIGHT[type]](value);
const fct = this.theme[subject];
if (!fct) {
return value;
}
return fct(value);
}

}
6 changes: 5 additions & 1 deletion src/enums.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@ export enum HighlightSubject {
FUNCTIONS = 'functions',
LITERAL = 'literal',
BUILT_IN = 'builtIn',
WHITESPACE = 'whitespace',
ERROR = 'error',
}

export const TOKEN_TYPE_TO_HIGHLIGHT = {
export const TOKEN_TYPE_TO_HIGHLIGHT: Record<TokenType, HighlightSubject | undefined> = {
[TokenType.BOUNDARY]: HighlightSubject.BOUNDARY,
[TokenType.WORD]: HighlightSubject.WORD,
[TokenType.BACKTICK_QUOTE]: HighlightSubject.BACKTICK_QUOTE,
Expand All @@ -44,4 +46,6 @@ export const TOKEN_TYPE_TO_HIGHLIGHT = {
[TokenType.BLOCK_COMMENT]: HighlightSubject.COMMENT,
[TokenType.LITERAL]: HighlightSubject.LITERAL,
[TokenType.BUILT_IN]: HighlightSubject.BUILT_IN,
[TokenType.WHITESPACE]: HighlightSubject.WHITESPACE,
[TokenType.ERROR]: HighlightSubject.ERROR,
};