Skip to content

Commit 5488851

Browse files
committed
Fix StructuredDiff color diff loading in source mode
1 parent db96abf commit 5488851

1 file changed

Lines changed: 13 additions & 9 deletions

File tree

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import {
2-
ColorDiff,
3-
ColorFile,
4-
getSyntaxTheme as nativeGetSyntaxTheme,
2+
getNativeModule,
53
type SyntaxTheme,
6-
} from 'color-diff-napi'
4+
} from '../../native-ts/color-diff/index.js'
75
import { isEnvDefinedFalsy } from '../../utils/envUtils.js'
86

7+
type NativeColorModule = NonNullable<ReturnType<typeof getNativeModule>>
8+
99
export type ColorModuleUnavailableReason = 'env'
1010

1111
/**
@@ -22,16 +22,20 @@ export function getColorModuleUnavailableReason(): ColorModuleUnavailableReason
2222
return null
2323
}
2424

25-
export function expectColorDiff(): typeof ColorDiff | null {
26-
return getColorModuleUnavailableReason() === null ? ColorDiff : null
25+
export function expectColorDiff(): NativeColorModule['ColorDiff'] | null {
26+
return getColorModuleUnavailableReason() === null
27+
? (getNativeModule()?.ColorDiff ?? null)
28+
: null
2729
}
2830

29-
export function expectColorFile(): typeof ColorFile | null {
30-
return getColorModuleUnavailableReason() === null ? ColorFile : null
31+
export function expectColorFile(): NativeColorModule['ColorFile'] | null {
32+
return getColorModuleUnavailableReason() === null
33+
? (getNativeModule()?.ColorFile ?? null)
34+
: null
3135
}
3236

3337
export function getSyntaxTheme(themeName: string): SyntaxTheme | null {
3438
return getColorModuleUnavailableReason() === null
35-
? nativeGetSyntaxTheme(themeName)
39+
? (getNativeModule()?.getSyntaxTheme(themeName) ?? null)
3640
: null
3741
}

0 commit comments

Comments
 (0)