Rework

markedjs · May 29, 2023 · e671358 · e671358
1 parent f0ab10e
commit e671358
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 24 deletions.
diff --git a/docs/demo/preview.html b/docs/demo/preview.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>marked.ts preview</title>
+  <title>marked.js preview</title>
   <link rel="stylesheet" href="./demo.css" />
   <base target="_parent">
 </head>

diff --git a/lib/marked.cjs b/lib/marked.cjs
@@ -1845,7 +1845,7 @@ var _Parser = class {
           const errMsg = 'Token with "' + token.type + '" type was not found.';
           if (this.options.silent) {
             console.error(errMsg);
-            return;
+            return "";
           } else {
             throw new Error(errMsg);
           }
@@ -1915,7 +1915,7 @@ var _Parser = class {
           const errMsg = 'Token with "' + token.type + '" type was not found.';
           if (this.options.silent) {
             console.error(errMsg);
-            return;
+            return "";
           } else {
             throw new Error(errMsg);
           }

diff --git a/lib/marked.cjs.map b/lib/marked.cjs.map
diff --git a/lib/marked.d.ts b/lib/marked.d.ts
@@ -278,19 +278,19 @@ declare class _Parser {
     /**
      * Static Parse Method
      */
-    static parse(tokens: Token[], options?: MarkedOptions): string | undefined;
+    static parse(tokens: Token[], options?: MarkedOptions): string;
     /**
      * Static Parse Inline Method
      */
-    static parseInline(tokens: Token[], options?: MarkedOptions): string | undefined;
+    static parseInline(tokens: Token[], options?: MarkedOptions): string;
     /**
      * Parse Loop
      */
-    parse(tokens: Token[], top?: boolean): string | undefined;
+    parse(tokens: Token[], top?: boolean): string;
     /**
      * Parse Inline Tokens
      */
-    parseInline(tokens: Token[], renderer?: _Renderer | _TextRenderer): string | undefined;
+    parseInline(tokens: Token[], renderer?: _Renderer | _TextRenderer): string;
 }
 
 /**

diff --git a/lib/marked.esm.js b/lib/marked.esm.js
diff --git a/lib/marked.esm.js.map b/lib/marked.esm.js.map
diff --git a/lib/marked.umd.js b/lib/marked.umd.js
diff --git a/lib/marked.umd.js.map b/lib/marked.umd.js.map
diff --git a/marked.min.js b/marked.min.js
diff --git a/src/Lexer.ts b/src/Lexer.ts
@@ -3,7 +3,7 @@ import { _defaults } from './defaults.ts';
 import { block, inline } from './rules.ts';
 import { repeatString } from './helpers.ts';
 import type { Token, TokensList } from './Tokens.ts';
-import type { MarkedOptions, Rules } from './MarkedOptions.ts';
+import type { MarkedOptions, Rules, TokenizerExtension } from './MarkedOptions.ts';
 
 /**
  * smartypants text replacement
@@ -161,7 +161,7 @@ export class _Lexer {
     while (src) {
       if (this.options.extensions
         && this.options.extensions.block
-        && this.options.extensions.block.some((extTokenizer: any) => {
+        && this.options.extensions.block.some((extTokenizer: TokenizerExtension['tokenizer']) => {
           if (token = extTokenizer.call({ lexer: this }, src, tokens)) {
             src = src.substring(token.raw.length);
             tokens.push(token);

diff --git a/src/Parser.ts b/src/Parser.ts
@@ -44,7 +44,7 @@ export class _Parser {
   /**
    * Parse Loop
    */
-  parse(tokens: Token[], top = true): string | undefined {
+  parse(tokens: Token[], top = true): string {
     let out = '',
       i,
       j,
@@ -200,7 +200,7 @@ export class _Parser {
           const errMsg = 'Token with "' + token.type + '" type was not found.';
           if (this.options.silent) {
             console.error(errMsg);
-            return;
+            return '';
           } else {
             throw new Error(errMsg);
           }
@@ -214,7 +214,7 @@ export class _Parser {
   /**
    * Parse Inline Tokens
    */
-  parseInline(tokens: Token[], renderer?: _Renderer | _TextRenderer): string | undefined {
+  parseInline(tokens: Token[], renderer?: _Renderer | _TextRenderer): string {
     renderer = renderer || this.renderer;
     let out = '',
       i,
@@ -279,7 +279,7 @@ export class _Parser {
           const errMsg = 'Token with "' + token.type + '" type was not found.';
           if (this.options.silent) {
             console.error(errMsg);
-            return;
+            return '';
           } else {
             throw new Error(errMsg);
           }

diff --git a/src/Renderer.ts b/src/Renderer.ts
@@ -4,7 +4,7 @@ import {
   escape
 } from './helpers.ts';
 import type { MarkedOptions } from './MarkedOptions.ts';
-import { Slugger } from './marked.js';
+import { Slugger } from './marked.ts';
 
 /**
  * Renderer

diff --git a/src/helpers.ts b/src/helpers.ts
@@ -1,5 +1,5 @@
 import type { MarkedOptions, Rule } from './MarkedOptions.ts';
-import type { ResultCallback } from './marked.js';
+import type { ResultCallback } from './marked.ts';
 
 /**
  * Helpers
@@ -8,7 +8,7 @@ const escapeTest = /[&<>"']/;
 const escapeReplace = new RegExp(escapeTest.source, 'g');
 const escapeTestNoEncode = /[<>"']|&(?!(#\d{1,7}|#[Xx][a-fA-F0-9]{1,6}|\w+);)/;
 const escapeReplaceNoEncode = new RegExp(escapeTestNoEncode.source, 'g');
-const escapeReplacements: Record<string, string> = {
+const escapeReplacements = {
   '&': '&amp;',
   '<': '&lt;',
   '>': '&gt;',