fix "is not a module" #2603

tools/build_node.js

@@ -57,6 +57,7 @@ async function buildPackageJSON() {
     }
     return acc;
   }, []);
+  json.types = "./lib/index.d.ts";
   await fs.writeFile(`${process.env.BUILD_DIR}/package.json`, JSON.stringify(json, null, '   '));
 }
 
@@ -75,11 +76,14 @@ async function buildNode(options) {
   mkdir("lib/languages");
   mkdir("scss");
   mkdir("styles");
-  mkdir("types");
 
   install("./LICENSE", "LICENSE");
   install("./README.md","README.md");
-  install("./types/index.d.ts","types/index.d.ts");
+  install("./types/index.d.ts","lib/index.d.ts");
+  install("./types/types.ts","lib/types.ts");
+  install("./types/core.d.ts","lib/core.d.ts");
+  install("./types/highlight.d.ts","lib/highlight.d.ts");
+  install("./types/languages/basic.d.ts","lib/languages/basic.d.ts");
 
   log("Writing styles.");
   const styles = await fs.readdir("./src/styles/");

types/core.d.ts

@@ -0,0 +1,5 @@
+import './types';
+
+declare const hljs: HLJSApi;
+
+export = hljs;

types/highlight.d.ts

@@ -0,0 +1,5 @@
+import './types';
+
+declare const hljs: HLJSApi;
+
+export = hljs;

types/index.d.ts

@@ -1,212 +1,5 @@
-/* Public API */
+import './types';
 
-// eslint-disable-next-line
-declare const hljs : HLJSApi;
+declare const hljs: HLJSApi;
 
-interface HLJSApi {
-    highlight: (languageName: string, code: string, ignoreIllegals?: boolean, continuation?: Mode) => HighlightResult
-    highlightAuto: (code: string, languageSubset?: string[]) => AutoHighlightResult
-    fixMarkup: (html: string) => string
-    highlightBlock: (element: HTMLElement) => void
-    configure: (options: Partial<HLJSOptions>) => void
-    initHighlighting: () => void
-    initHighlightingOnLoad: () => void
-    registerLanguage: (languageName: string, language: LanguageFn) => void
-    listLanguages: () => string[]
-    registerAliases: (aliasList: string | string[], { languageName } : {languageName: string}) => void
-    getLanguage: (languageName: string) => Language | undefined
-    requireLanguage: (languageName: string) => Language | never
-    autoDetection: (languageName: string) => boolean
-    inherit: <T>(original: T, ...args: Record<string, any>[]) => T
-    addPlugin: (plugin: HLJSPlugin) => void
-    debugMode: () => void
-    safeMode: () => void
-    versionString: string
-}
-
-interface HLJSApi {
-    SHEBANG: (mode?: Partial<Mode> & {binary?: string | RegExp}) => Mode
-    BACKSLASH_ESCAPE: Mode
-    QUOTE_STRING_MODE: Mode
-    APOS_STRING_MODE: Mode
-    PHRASAL_WORDS_MODE: Mode
-    COMMENT: (begin: string | RegExp, end: string | RegExp, modeOpts?: Mode | {}) => Mode
-    C_LINE_COMMENT_MODE: Mode
-    C_BLOCK_COMMENT_MODE: Mode
-    HASH_COMMENT_MODE: Mode
-    NUMBER_MODE: Mode
-    C_NUMBER_MODE: Mode
-    BINARY_NUMBER_MODE: Mode
-    CSS_NUMBER_MODE: Mode
-    REGEXP_MODE: Mode
-    TITLE_MODE: Mode
-    UNDERSCORE_TITLE_MODE: Mode
-    METHOD_GUARD: Mode
-    END_SAME_AS_BEGIN: (mode: Mode) => Mode
-    // build in regex
-    IDENT_RE: string
-    UNDERSCORE_IDENT_RE: string
-    NUMBER_RE: string
-    C_NUMBER_RE: string
-    BINARY_NUMBER_RE: string
-    RE_STARTERS_RE: string
-}
-
-type LanguageFn = (hljs: HLJSApi) => Language
-
-// interface RawLanguage {
-//     name?: string
-//     aliases?: string[]
-//     rawDefinition?: () => Language
-// }
-
-interface HighlightResult {
-    relevance : number
-    value : string
-    language? : string
-    emitter : Emitter
-    illegal : boolean
-    top? : Language | CompiledMode
-    illegalBy? : illegalData
-    sofar? : string
-    errorRaised? : Error
-    // * for auto-highlight
-    second_best? : Omit<HighlightResult, 'second_best'>
-}
-
-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 }
-
-interface EmitterConstructor {
-    new (opts: any): Emitter
-}
-
-interface HLJSOptions {
-   noHighlightRe: RegExp
-   languageDetectRe: RegExp
-   classPrefix: string
-   tabReplace?: string
-   useBR: boolean
-   languages?: string[]
-   __emitter: EmitterConstructor
-}
-
-interface CallbackResponse {
-    data: Record<string, any>
-    ignoreMatch: () => void
-}
-
-/************
- PRIVATE API
- ************/
-
-/* for jsdoc annotations in the JS source files */
-
-type AnnotatedError = Error & {mode?: Mode | Language, languageName?: string, badRule?: Mode}
-
-type ModeCallback = (match: RegExpMatchArray, response: CallbackResponse) => void
-type HighlightedHTMLElement = HTMLElement & {result?: object, second_best?: object, parentNode: HTMLElement}
-type EnhancedMatch = RegExpMatchArray & {rule: CompiledMode, type: MatchType}
-type MatchType = "begin" | "end" | "illegal"
-
- interface Emitter {
-    addKeyword(text: string, kind: string): void
-    addText(text: string): void
-    toHTML(): string
-    finalize(): void
-    closeAllNodes(): void
-    openNode(kind: string): void
-    closeNode(): void
-    addSublanguage(emitter: Emitter, subLanguageName: string): void
- }
-
-/* modes */
-
- interface ModeCallbacks {
-     "on:end"?: Function,
-     "on:begin"?: Function,
- }
-
-interface Mode extends ModeCallbacks, ModeDetails {
-
-}
-
-interface LanguageDetail {
-    name?: string
-    rawDefinition?: () => Language
-    aliases?: string[]
-    disableAutodetect?: boolean
-    contains: ("self"|Mode)[]
-    case_insensitive?: boolean
-    keywords?: Record<string, any> | string
-    compiled?: boolean
-}
-
-type Language = LanguageDetail & Partial<Mode>
-
-interface CompiledLanguage extends LanguageDetail, CompiledMode {
-    compiled: true
-    contains: CompiledMode[]
-    keywords: Record<string, any>
-}
-
-type KeywordData = [string, number];
-type KeywordDict = Record<string, KeywordData>
-
-type CompiledMode = Omit<Mode, 'contains'> &
-    {
-        contains: CompiledMode[]
-        keywords: KeywordDict
-        data: Record<string, any>
-        terminator_end: string
-        keywordPatternRe: RegExp
-        beginRe: RegExp
-        endRe: RegExp
-        illegalRe: RegExp
-        matcher: any
-        compiled: true
-        starts?: CompiledMode
-        parent?: CompiledMode
-    }
-
-interface ModeDetails {
-    begin?: RegExp | string
-    end?: RegExp | string
-    className?: string
-    contains?: ("self" | Mode)[]
-    endsParent?: boolean
-    endsWithParent?: boolean
-    endSameAsBegin?: boolean
-    skip?: boolean
-    excludeBegin?: boolean
-    excludeEnd?: boolean
-    returnBegin?: boolean
-    returnEnd?: boolean
-    __beforeBegin?: Function
-    parent?: Mode
-    starts?:Mode
-    lexemes?: string | RegExp
-    keywords?: Record<string, any> | string
-    beginKeywords?: string
-    relevance?: number
-    illegal?: string | RegExp
-    variants?: Mode[]
-    cached_variants?: Mode[]
-    // parsed
-    subLanguage?: string | string[]
-    compiled?: boolean
-}
+export = hljs;

types/languages/basic.d.ts

@@ -0,0 +1,5 @@
+import './types';
+
+declare const basic: LanguageFn;
+
+export = basic;