(chore) clean up types just a little

joshgoebel · joshgoebel · commit c5783d2ffca7 · 2020-06-16T12:14:32.000-04:00
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -3,7 +3,9 @@
 // eslint-disable-next-line
 declare const hljs : HLJSApi;
 
-interface HLJSApi {
+type HLJSApi = PublicApi & ModesAPI
+
+interface PublicApi {
     highlight: (languageName: string, code: string, ignoreIllegals?: boolean, continuation?: Mode) => HighlightResult
     highlightAuto: (code: string, languageSubset?: string[]) => AutoHighlightResult
     fixMarkup: (html: string) => string
@@ -24,7 +26,7 @@ interface HLJSApi {
     versionString: string
 }
 
-interface HLJSApi {
+interface ModesAPI {
     SHEBANG: (mode?: Partial<Mode> & {binary?: string | RegExp}) => Mode
     BACKSLASH_ESCAPE: Mode
     QUOTE_STRING_MODE: Mode
@@ -43,7 +45,7 @@ interface HLJSApi {
     UNDERSCORE_TITLE_MODE: Mode
     METHOD_GUARD: Mode
     END_SAME_AS_BEGIN: (mode: Mode) => Mode
-    // build in regex
+    // built in regex
     IDENT_RE: string
     UNDERSCORE_IDENT_RE: string
     NUMBER_RE: string
@@ -52,13 +54,7 @@ interface HLJSApi {
     RE_STARTERS_RE: string
 }
 
-type LanguageFn = (hljs: HLJSApi) => Language
-
-// interface RawLanguage {
-//     name?: string
-//     aliases?: string[]
-//     rawDefinition?: () => Language
-// }
+type LanguageFn = (hljs?: HLJSApi) => Language
 
 interface HighlightResult {
     relevance : number
@@ -73,23 +69,23 @@ interface HighlightResult {
     // * for auto-highlight
     second_best? : Omit<HighlightResult, 'second_best'>
 }
+interface AutoHighlightResult extends HighlightResult {}
 
 interface illegalData {
     msg: string
     context: string
     mode: CompiledMode
 }
 
-interface AutoHighlightResult extends HighlightResult {
-}
-
 type PluginEvent =
     'before:highlight'
     | 'after:highlight'
     | 'before:highlightBlock'
     | 'after:highlightBlock'
 
-type HLJSPlugin = { [K in PluginEvent]? : any }
+type HLJSPlugin = {
+    [K in PluginEvent]? : any
+}
 
 interface EmitterConstructor {
     new (opts: any): Emitter
