Skip to content

Commit 05b6cb2

Browse files
committed
fix type error and format
1 parent b388e15 commit 05b6cb2

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

package/src/lib/resolvers.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,9 @@ export function resolveTheme(themeInput: Theme | Themes): ThemeResult {
144144
? `multi-${Object.values(themeInput)
145145
.map(
146146
(theme) =>
147-
(typeof theme === 'string' ? theme : theme?.name) ||
148-
'custom'
147+
(typeof theme === 'string'
148+
? theme
149+
: (theme as { name?: string })?.name) || 'custom'
149150
)
150151
.sort()
151152
.join('-')}`

package/tests/component.test.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import React, { useRef } from 'react';
22
import { render, waitFor } from '@testing-library/react';
3-
import { ShikiHighlighter, createJavaScriptRegexEngine } from '../src/index';
3+
import {
4+
ShikiHighlighter,
5+
createJavaScriptRegexEngine,
6+
} from '../src/index';
47

58
// Test fixtures
69
const codeSample = 'console.log("Hello World");';
@@ -298,7 +301,7 @@ describe('ShikiHighlighter Component', () => {
298301

299302
const code = shikiContainer?.querySelector('code');
300303
const spans = code?.querySelectorAll('span');
301-
expect(spans && spans.length).toBeGreaterThan(0);
304+
expect(spans?.length).toBeGreaterThan(0);
302305
});
303306
});
304307
});

package/tests/hook.test.tsx

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import { render, waitFor } from '@testing-library/react';
22
import { vi } from 'vitest';
3-
import { useShikiHighlighter, createJavaScriptRegexEngine } from '../src/index';
3+
import {
4+
useShikiHighlighter,
5+
createJavaScriptRegexEngine,
6+
} from '../src/index';
47
import type { Language, Theme, Themes } from '../src/lib/types';
58
import type { ShikiTransformer } from 'shiki';
69
import { throttleHighlighting } from '../src/lib/utils';
@@ -372,7 +375,9 @@ describe('useShikiHighlighter Hook', () => {
372375
const container = getByTestId('highlighted');
373376
const pre = container.querySelector('pre');
374377
// Should have multi-theme CSS variables
375-
const spans = container.querySelectorAll('span[style*="--shiki-"]');
378+
const spans = container.querySelectorAll(
379+
'span[style*="--shiki-"]'
380+
);
376381
expect(spans.length).toBeGreaterThan(0);
377382
expect(pre).toBeInTheDocument();
378383
});
@@ -520,12 +525,12 @@ describe('useShikiHighlighter Hook', () => {
520525
// Verify HTML string contains syntax highlighting elements
521526
expect(capturedOutput).toContain('style=');
522527
expect(capturedOutput).toContain('color:');
523-
528+
524529
// Verify rendered DOM has highlighted spans
525530
const container = getByTestId('output');
526531
const spans = container.querySelectorAll('span[style*="color"]');
527532
expect(spans.length).toBeGreaterThan(0);
528-
533+
529534
// Verify the code content is preserved
530535
expect(container.textContent).toContain('const x = 1;');
531536
});
@@ -540,7 +545,7 @@ describe('useShikiHighlighter Hook', () => {
540545
'javascript',
541546
'github-dark',
542547
{
543-
engine: createJavaScriptRegexEngine()
548+
engine: createJavaScriptRegexEngine(),
544549
}
545550
);
546551

0 commit comments

Comments
 (0)