terser 5.23.0 → 5.24.0

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v5.24.0
+ - Improve formatting performance in V8 by keeping a small work string and a large output string
+
 ## v5.23.0
  - When top_retain will keep a variable assignment around, inline the assignee when it's shorter than the name (#1434)
  - Remove empty class `static {}` blocks.

package/dist/bundle.min.js

@@ -8928,7 +8928,6 @@ function left_is_object(node) {
 
  ***********************************************************************/
 
-const EXPECT_DIRECTIVE = /^$|[;{][\s\n]*$/;
 const CODE_LINE_BREAK = 10;
 const CODE_SPACE = 32;
 
@@ -8942,6 +8941,7 @@ function is_some_comments(comment) {
     );
 }
 
+const ROPE_COMMIT_WHEN = 8 * 1000;
 class Rope {
     constructor() {
         this.committed = "";
@@ -8949,7 +8949,13 @@ class Rope {
     }
 
     append(str) {
-        this.current += str;
+        /** When `this.current` is too long, commit it. */
+        if (this.current.length > ROPE_COMMIT_WHEN) {
+            this.committed += this.current + str;
+            this.current = "";
+        } else {
+            this.current += str;
+        }
     }
 
     insertAt(char, index) {
@@ -8971,14 +8977,45 @@ class Rope {
         return this.current[index - committed.length];
     }
 
-    curLength() {
-        return this.current.length;
+    charCodeAt(index) {
+        const { committed } = this;
+        if (index < committed.length) return committed.charCodeAt(index);
+        return this.current.charCodeAt(index - committed.length);
     }
 
     length() {
         return this.committed.length + this.current.length;
     }
 
+    expectDirective() {
+        // /^$|[;{][\s\n]*$/
+
+        let ch, n = this.length();
+
+        if (n <= 0) return true;
+
+        // Skip N whitespace from the end
+        while (
+            (ch = this.charCodeAt(--n))
+            && (ch == CODE_SPACE || ch == CODE_LINE_BREAK)
+        );
+
+        // either ";", or "{", or the string ended
+        return !ch || ch === 59 || ch === 123;
+    }
+
+    hasNLB() {
+        let n = this.length() - 1;
+        while (n >= 0) {
+            const code = this.charCodeAt(n--);
+
+            if (code === CODE_LINE_BREAK) return true;
+            if (code !== CODE_SPACE) return false;
+        }
+        return true;
+    }
+
+
     toString() {
         return this.committed + this.current;
     }
@@ -9184,9 +9221,9 @@ function OutputStream(options) {
         if (current_col > options.max_line_len) {
             if (might_add_newline) {
                 OUTPUT.insertAt("\n", might_add_newline);
-                const curLength = OUTPUT.curLength();
+                const len_after_newline = OUTPUT.length() - might_add_newline - 1;
                 if (mappings) {
-                    var delta = curLength - current_col;
+                    var delta = len_after_newline - current_col;
                     mappings.forEach(function(mapping) {
                         mapping.line++;
                         mapping.col += delta;
@@ -9194,7 +9231,7 @@ function OutputStream(options) {
                 }
                 current_line++;
                 current_pos++;
-                current_col = curLength;
+                current_col = len_after_newline;
             }
         }
         if (might_add_newline) {
@@ -9393,23 +9430,6 @@ function OutputStream(options) {
         return OUTPUT.toString();
     }
 
-    function has_nlb() {
-        const output = OUTPUT.toString();
-        let n = output.length - 1;
-        while (n >= 0) {
-            const code = output.charCodeAt(n);
-            if (code === CODE_LINE_BREAK) {
-                return true;
-            }
-
-            if (code !== CODE_SPACE) {
-                return false;
-            }
-            n--;
-        }
-        return true;
-    }
-
     function filter_comment(comment) {
         if (!options.preserve_annotations) {
             comment = comment.replace(r_annotation, " ");
@@ -9490,7 +9510,7 @@ function OutputStream(options) {
 
         comments = comments.filter(comment_filter, node).filter(c => !printed_comments.has(c));
         if (comments.length == 0) return;
-        var last_nlb = has_nlb();
+        var last_nlb = OUTPUT.hasNLB();
         comments.forEach(function(c, i) {
             printed_comments.add(c);
             if (!last_nlb) {
@@ -9548,7 +9568,7 @@ function OutputStream(options) {
                 print("\n");
                 indent();
                 need_newline_indented = false;
-            } else if (c.nlb && (i > 0 || !has_nlb())) {
+            } else if (c.nlb && (i > 0 || !OUTPUT.hasNLB())) {
                 print("\n");
                 indent();
             } else if (i > 0 || !tail) {
@@ -9610,7 +9630,7 @@ function OutputStream(options) {
             var encoded = encode_string(str, quote);
             if (escape_directive === true && !encoded.includes("\\")) {
                 // Insert semicolons to break directive prologue
-                if (!EXPECT_DIRECTIVE.test(OUTPUT.toString())) {
+                if (!OUTPUT.expectDirective()) {
                     force_semicolon();
                 }
                 force_semicolon();

package/lib/output.js

@@ -166,7 +166,6 @@ import {
     ALL_RESERVED_WORDS,
 } from "./parse.js";
 
-const EXPECT_DIRECTIVE = /^$|[;{][\s\n]*$/;
 const CODE_LINE_BREAK = 10;
 const CODE_SPACE = 32;
 
@@ -180,6 +179,7 @@ function is_some_comments(comment) {
     );
 }
 
+const ROPE_COMMIT_WHEN = 8 * 1000;
 class Rope {
     constructor() {
         this.committed = "";
@@ -187,7 +187,13 @@ class Rope {
     }
 
     append(str) {
-        this.current += str;
+        /** When `this.current` is too long, commit it. */
+        if (this.current.length > ROPE_COMMIT_WHEN) {
+            this.committed += this.current + str;
+            this.current = "";
+        } else {
+            this.current += str;
+        }
     }
 
     insertAt(char, index) {
@@ -209,14 +215,45 @@ class Rope {
         return this.current[index - committed.length];
     }
 
-    curLength() {
-        return this.current.length;
+    charCodeAt(index) {
+        const { committed } = this;
+        if (index < committed.length) return committed.charCodeAt(index);
+        return this.current.charCodeAt(index - committed.length);
     }
 
     length() {
         return this.committed.length + this.current.length;
     }
 
+    expectDirective() {
+        // /^$|[;{][\s\n]*$/
+
+        let ch, n = this.length();
+
+        if (n <= 0) return true;
+
+        // Skip N whitespace from the end
+        while (
+            (ch = this.charCodeAt(--n))
+            && (ch == CODE_SPACE || ch == CODE_LINE_BREAK)
+        );
+
+        // either ";", or "{", or the string ended
+        return !ch || ch === 59 || ch === 123;
+    }
+
+    hasNLB() {
+        let n = this.length() - 1;
+        while (n >= 0) {
+            const code = this.charCodeAt(n--);
+
+            if (code === CODE_LINE_BREAK) return true;
+            if (code !== CODE_SPACE) return false;
+        }
+        return true;
+    }
+
+
     toString() {
         return this.committed + this.current;
     }
@@ -422,9 +459,9 @@ function OutputStream(options) {
         if (current_col > options.max_line_len) {
             if (might_add_newline) {
                 OUTPUT.insertAt("\n", might_add_newline);
-                const curLength = OUTPUT.curLength();
+                const len_after_newline = OUTPUT.length() - might_add_newline - 1;
                 if (mappings) {
-                    var delta = curLength - current_col;
+                    var delta = len_after_newline - current_col;
                     mappings.forEach(function(mapping) {
                         mapping.line++;
                         mapping.col += delta;
@@ -432,7 +469,7 @@ function OutputStream(options) {
                 }
                 current_line++;
                 current_pos++;
-                current_col = curLength;
+                current_col = len_after_newline;
             }
         }
         if (might_add_newline) {
@@ -631,23 +668,6 @@ function OutputStream(options) {
         return OUTPUT.toString();
     }
 
-    function has_nlb() {
-        const output = OUTPUT.toString();
-        let n = output.length - 1;
-        while (n >= 0) {
-            const code = output.charCodeAt(n);
-            if (code === CODE_LINE_BREAK) {
-                return true;
-            }
-
-            if (code !== CODE_SPACE) {
-                return false;
-            }
-            n--;
-        }
-        return true;
-    }
-
     function filter_comment(comment) {
         if (!options.preserve_annotations) {
             comment = comment.replace(r_annotation, " ");
@@ -728,7 +748,7 @@ function OutputStream(options) {
 
         comments = comments.filter(comment_filter, node).filter(c => !printed_comments.has(c));
         if (comments.length == 0) return;
-        var last_nlb = has_nlb();
+        var last_nlb = OUTPUT.hasNLB();
         comments.forEach(function(c, i) {
             printed_comments.add(c);
             if (!last_nlb) {
@@ -786,7 +806,7 @@ function OutputStream(options) {
                 print("\n");
                 indent();
                 need_newline_indented = false;
-            } else if (c.nlb && (i > 0 || !has_nlb())) {
+            } else if (c.nlb && (i > 0 || !OUTPUT.hasNLB())) {
                 print("\n");
                 indent();
             } else if (i > 0 || !tail) {
@@ -848,7 +868,7 @@ function OutputStream(options) {
             var encoded = encode_string(str, quote);
             if (escape_directive === true && !encoded.includes("\\")) {
                 // Insert semicolons to break directive prologue
-                if (!EXPECT_DIRECTIVE.test(OUTPUT.toString())) {
+                if (!OUTPUT.expectDirective()) {
                     force_semicolon();
                 }
                 force_semicolon();

package/package.json

@@ -4,7 +4,7 @@
   "homepage": "https://terser.org",
   "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
   "license": "BSD-2-Clause",
-  "version": "5.23.0",
+  "version": "5.24.0",
   "engines": {
     "node": ">=10"
   },