From 0028b4427a9b1f76c50e35a0dd4c292ff22b6369 Mon Sep 17 00:00:00 2001 From: Hitomi Hatsukaze Date: Wed, 3 Apr 2019 14:52:05 +0900 Subject: [PATCH 1/2] Fix and add static property, fix text --- types/marked/index.d.ts | 6 ++++-- types/marked/marked-tests.ts | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/types/marked/index.d.ts b/types/marked/index.d.ts index ad12e6d35e..04be591cb1 100644 --- a/types/marked/index.d.ts +++ b/types/marked/index.d.ts @@ -127,6 +127,7 @@ declare namespace marked { class Parser { constructor(options?: MarkedOptions); + static parse(src: TokensList, options?: MarkedOptions): string; parse(src: TokensList): string; next(): Token; peek(): Token | number; @@ -135,9 +136,10 @@ declare namespace marked { } class Lexer { - rules: Rules; - tokens: TokensList; constructor(options?: MarkedOptions); + static rules: Rules; + tokens: TokensList; + static lex(src: TokensList, options?: MarkedOptions): TokensList; lex(src: string): TokensList; } diff --git a/types/marked/marked-tests.ts b/types/marked/marked-tests.ts index 65cd72ee73..f909203245 100644 --- a/types/marked/marked-tests.ts +++ b/types/marked/marked-tests.ts @@ -41,7 +41,7 @@ console.log(marked.parser(tokens)); const lexer = new marked.Lexer(options); const tokens2 = lexer.lex(text); console.log(tokens2); -const re: RegExp | marked.Rules = lexer.rules['code']; +const re: RegExp | marked.Rules = marked.Lexer.rules['code']; const renderer = new marked.Renderer(); const slugger = new marked.Slugger(); @@ -56,6 +56,7 @@ const parseTestText = "- list1\n - list1.1\n\n listend"; const parseTestTokens: marked.TokensList = marked.lexer(parseTestText, options); const parser = new marked.Parser(); console.log(parser.parse(parseTestTokens)); +console.log(marked.Parser.parse(parseTestTokens)); const links = ['http', 'image']; const inlineLexer = new marked.InlineLexer(links); From 6e148dffb45786fcdace4c23843d83a53d16ee97 Mon Sep 17 00:00:00 2001 From: Hitomi Hatsukaze Date: Wed, 3 Apr 2019 15:18:05 +0900 Subject: [PATCH 2/2] fix property. --- types/marked/index.d.ts | 2 +- types/marked/marked-tests.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/types/marked/index.d.ts b/types/marked/index.d.ts index 04be591cb1..0cbdf0123e 100644 --- a/types/marked/index.d.ts +++ b/types/marked/index.d.ts @@ -138,9 +138,9 @@ declare namespace marked { class Lexer { constructor(options?: MarkedOptions); static rules: Rules; - tokens: TokensList; static lex(src: TokensList, options?: MarkedOptions): TokensList; lex(src: string): TokensList; + token(src: string, top: boolean): TokensList; } class Slugger { diff --git a/types/marked/marked-tests.ts b/types/marked/marked-tests.ts index f909203245..1e974cb72c 100644 --- a/types/marked/marked-tests.ts +++ b/types/marked/marked-tests.ts @@ -42,6 +42,7 @@ const lexer = new marked.Lexer(options); const tokens2 = lexer.lex(text); console.log(tokens2); const re: RegExp | marked.Rules = marked.Lexer.rules['code']; +console.log(lexer.token(text, true)); const renderer = new marked.Renderer(); const slugger = new marked.Slugger();