terser 5.25.0 → 5.27.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v5.27.0
+ - Created `minify_sync()` alternative to `minify()` since there's no async code left.
+
+## v5.26.0
+ - Do not take the `/*#__PURE__*/` annotation into account when the `side_effects` compress option is off.
+ - The `preserve_annotations` option now automatically opts annotation comments in, instead of requiring the `comments` option to be configured for this.
+ - Refuse to parse empty parenthesized expressions (`()`)
+
 ## v5.25.0
  - Regex properties added to reserved property mangler (#1471)
  - `pure_new` option added to drop unused `new` expressions.

package/README.md

@@ -424,7 +424,7 @@ Browser loading is also supported. It exposes a global variable `Terser` contain
 <script src="https://cdn.jsdelivr.net/npm/terser/dist/bundle.min.js"></script>
 ```
 
-There is a single async high level function, **`async minify(code, options)`**,
+There is an async high level function, **`async minify(code, options)`**,
 which will perform all minification [phases](#minify-options) in a configurable
 manner. By default `minify()` will enable [`compress`](#compress-options)
 and [`mangle`](#mangle-options). Example:
@@ -435,6 +435,8 @@ console.log(result.code);  // minified output: function add(n,d){return n+d}
 console.log(result.map);  // source map
 ```
 
+There is also a `minify_sync()` alternative version of it, which returns instantly.
+
 You can `minify` more than one JavaScript file at a time by using an object
 for the first argument where the keys are file names and the values are source
 code:

package/dist/bundle.min.js

@@ -2,7 +2,7 @@
 typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@jridgewell/source-map')) :
 typeof define === 'function' && define.amd ? define(['exports', '@jridgewell/source-map'], factory) :
 (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Terser = {}, global.sourceMap));
-}(this, (function (exports, sourceMap) { 'use strict';
+})(this, (function (exports, sourceMap) { 'use strict';
 
 /***********************************************************************
 
@@ -2475,9 +2475,7 @@ function parse($TEXT, options) {
                 var ex = async ? new AST_Call({
                     expression: async,
                     args: exprs
-                }) : exprs.length == 1 ? exprs[0] : new AST_Sequence({
-                    expressions: exprs
-                });
+                }) : to_expr_or_sequence(start, exprs);
                 if (ex.start) {
                     const outer_comments_before = start.comments_before.length;
                     outer_comments_before_counts.set(start, outer_comments_before);
@@ -3574,6 +3572,16 @@ function parse($TEXT, options) {
         return left;
     };
 
+    var to_expr_or_sequence = function(start, exprs) {
+        if (exprs.length === 1) {
+            return exprs[0];
+        } else if (exprs.length > 1) {
+            return new AST_Sequence({ start, expressions: exprs, end: peek() });
+        } else {
+            croak("Invalid parenthesized expression");
+        }
+    };
+
     var expression = function(commas, no_in) {
         var start = S.token;
         var exprs = [];
@@ -3583,11 +3591,7 @@ function parse($TEXT, options) {
             next();
             commas = true;
         }
-        return exprs.length == 1 ? exprs[0] : new AST_Sequence({
-            start       : start,
-            expressions : exprs,
-            end         : peek()
-        });
+        return to_expr_or_sequence(start, exprs);
     };
 
     function in_loop(cont) {
@@ -8931,7 +8935,7 @@ function left_is_object(node) {
 const CODE_LINE_BREAK = 10;
 const CODE_SPACE = 32;
 
-const r_annotation = /[@#]__(PURE|INLINE|NOINLINE)__/g;
+const r_annotation = /[@#]__(PURE|INLINE|NOINLINE)__/;
 
 function is_some_comments(comment) {
     // multiline comment
@@ -9083,6 +9087,13 @@ function OutputStream(options) {
         }
     }
 
+    if (options.preserve_annotations) {
+        let prev_comment_filter = comment_filter;
+        comment_filter = function (comment) {
+            return r_annotation.test(comment.value) || prev_comment_filter.apply(this, arguments);
+        };
+    }
+
     var indentation = 0;
     var current_col = 0;
     var current_line = 1;
@@ -14173,7 +14184,10 @@ AST_Call.DEFMETHOD("is_callee_pure", function(compressor) {
     if ((this instanceof AST_New) && compressor.option("pure_new")) {
         return true;
     }
-    return !!has_annotation(this, _PURE) || !compressor.pure_funcs(this);
+    if (compressor.option("side_effects") && has_annotation(this, _PURE)) {
+        return true;
+    }
+    return !compressor.pure_funcs(this);
 });
 
 // If I call this, is it a pure function?
@@ -21976,7 +21990,7 @@ def_optimize(AST_Destructuring, function(self, compressor) {
  ***********************************************************************/
 
 // a small wrapper around source-map and @jridgewell/source-map
-async function SourceMap(options) {
+function* SourceMap(options) {
     options = defaults(options, {
         file : null,
         root : null,
@@ -21999,7 +22013,7 @@ async function SourceMap(options) {
         // We support both @jridgewell/source-map (which has a sync
         // SourceMapConsumer) and source-map (which has an async
         // SourceMapConsumer).
-        orig_map = await new sourceMap.SourceMapConsumer(options.orig);
+        orig_map = yield new sourceMap.SourceMapConsumer(options.orig);
         if (orig_map.sourcesContent) {
             orig_map.sources.forEach(function(source, i) {
                 var content = orig_map.sourcesContent[i];
@@ -30563,7 +30577,7 @@ function log_input(files, options, fs, debug_folder) {
     fs.writeFileSync(log_path, "Options: \n" + options_str + "\n\nInput files:\n\n" + files_str(files) + "\n");
 }
 
-async function minify(files, options, _fs_module) {
+function* minify_sync_or_async(files, options, _fs_module) {
     if (
         _fs_module
         && typeof process === "object"
@@ -30768,7 +30782,7 @@ async function minify(files, options, _fs_module) {
             if (options.sourceMap.includeSources && files instanceof AST_Toplevel) {
                 throw new Error("original source content unavailable");
             }
-            format_options.source_map = await SourceMap({
+            format_options.source_map = yield* SourceMap({
                 file: options.sourceMap.filename,
                 orig: options.sourceMap.content,
                 root: options.sourceMap.root,
@@ -30830,6 +30844,35 @@ async function minify(files, options, _fs_module) {
     return result;
 }
 
+async function minify(files, options, _fs_module) {
+    const gen = minify_sync_or_async(files, options, _fs_module);
+
+    let yielded;
+    let val;
+    do {
+        val = gen.next(await yielded);
+        yielded = val.value;
+    } while (!val.done);
+
+    return val.value;
+}
+
+function minify_sync(files, options, _fs_module) {
+    const gen = minify_sync_or_async(files, options, _fs_module);
+
+    let yielded;
+    let val;
+    do {
+        if (yielded && typeof yielded.then === "function") {
+            throw new Error("minify_sync cannot be used with the legacy source-map module");
+        }
+        val = gen.next(yielded);
+        yielded = val.value;
+    } while (!val.done);
+
+    return val.value;
+}
+
 async function run_cli({ program, packageJson, fs, path }) {
     const skip_keys = new Set([ "cname", "parent_scope", "scope", "uses_eval", "uses_with" ]);
     var files = {};
@@ -31320,5 +31363,6 @@ async function infer_options(options) {
 exports._default_options = _default_options;
 exports._run_cli = run_cli;
 exports.minify = minify;
+exports.minify_sync = minify_sync;
 
-})));
+}));

package/lib/compress/inference.js

@@ -831,7 +831,10 @@ AST_Call.DEFMETHOD("is_callee_pure", function(compressor) {
     if ((this instanceof AST_New) && compressor.option("pure_new")) {
         return true;
     }
-    return !!has_annotation(this, _PURE) || !compressor.pure_funcs(this);
+    if (compressor.option("side_effects") && has_annotation(this, _PURE)) {
+        return true;
+    }
+    return !compressor.pure_funcs(this);
 });
 
 // If I call this, is it a pure function?

package/lib/minify.js

@@ -103,7 +103,7 @@ function log_input(files, options, fs, debug_folder) {
     fs.writeFileSync(log_path, "Options: \n" + options_str + "\n\nInput files:\n\n" + files_str(files) + "\n");
 }
 
-async function minify(files, options, _fs_module) {
+function* minify_sync_or_async(files, options, _fs_module) {
     if (
         _fs_module
         && typeof process === "object"
@@ -314,7 +314,7 @@ async function minify(files, options, _fs_module) {
             if (options.sourceMap.includeSources && files instanceof AST_Toplevel) {
                 throw new Error("original source content unavailable");
             }
-            format_options.source_map = await SourceMap({
+            format_options.source_map = yield* SourceMap({
                 file: options.sourceMap.filename,
                 orig: options.sourceMap.content,
                 root: options.sourceMap.root,
@@ -376,7 +376,37 @@ async function minify(files, options, _fs_module) {
     return result;
 }
 
+async function minify(files, options, _fs_module) {
+    const gen = minify_sync_or_async(files, options, _fs_module);
+
+    let yielded;
+    let val;
+    do {
+        val = gen.next(await yielded);
+        yielded = val.value;
+    } while (!val.done);
+
+    return val.value;
+}
+
+function minify_sync(files, options, _fs_module) {
+    const gen = minify_sync_or_async(files, options, _fs_module);
+
+    let yielded;
+    let val;
+    do {
+        if (yielded && typeof yielded.then === "function") {
+            throw new Error("minify_sync cannot be used with the legacy source-map module");
+        }
+        val = gen.next(yielded);
+        yielded = val.value;
+    } while (!val.done);
+
+    return val.value;
+}
+
 export {
   minify,
+  minify_sync,
   to_ascii,
 };

package/lib/output.js

@@ -169,7 +169,7 @@ import {
 const CODE_LINE_BREAK = 10;
 const CODE_SPACE = 32;
 
-const r_annotation = /[@#]__(PURE|INLINE|NOINLINE)__/g;
+const r_annotation = /[@#]__(PURE|INLINE|NOINLINE)__/;
 
 function is_some_comments(comment) {
     // multiline comment
@@ -321,6 +321,13 @@ function OutputStream(options) {
         }
     }
 
+    if (options.preserve_annotations) {
+        let prev_comment_filter = comment_filter;
+        comment_filter = function (comment) {
+            return r_annotation.test(comment.value) || prev_comment_filter.apply(this, arguments);
+        };
+    }
+
     var indentation = 0;
     var current_col = 0;
     var current_line = 1;

package/lib/parse.js

@@ -2330,9 +2330,7 @@ function parse($TEXT, options) {
                 var ex = async ? new AST_Call({
                     expression: async,
                     args: exprs
-                }) : exprs.length == 1 ? exprs[0] : new AST_Sequence({
-                    expressions: exprs
-                });
+                }) : to_expr_or_sequence(start, exprs);
                 if (ex.start) {
                     const outer_comments_before = start.comments_before.length;
                     outer_comments_before_counts.set(start, outer_comments_before);
@@ -3429,6 +3427,16 @@ function parse($TEXT, options) {
         return left;
     };
 
+    var to_expr_or_sequence = function(start, exprs) {
+        if (exprs.length === 1) {
+            return exprs[0];
+        } else if (exprs.length > 1) {
+            return new AST_Sequence({ start, expressions: exprs, end: peek() });
+        } else {
+            croak("Invalid parenthesized expression");
+        }
+    };
+
     var expression = function(commas, no_in) {
         var start = S.token;
         var exprs = [];
@@ -3438,11 +3446,7 @@ function parse($TEXT, options) {
             next();
             commas = true;
         }
-        return exprs.length == 1 ? exprs[0] : new AST_Sequence({
-            start       : start,
-            expressions : exprs,
-            end         : peek()
-        });
+        return to_expr_or_sequence(start, exprs);
     };
 
     function in_loop(cont) {

package/lib/sourcemap.js

@@ -47,7 +47,7 @@ import {SourceMapConsumer, SourceMapGenerator} from "@jridgewell/source-map";
 import {defaults, HOP} from "./utils/index.js";
 
 // a small wrapper around source-map and @jridgewell/source-map
-async function SourceMap(options) {
+function* SourceMap(options) {
     options = defaults(options, {
         file : null,
         root : null,
@@ -70,7 +70,7 @@ async function SourceMap(options) {
         // We support both @jridgewell/source-map (which has a sync
         // SourceMapConsumer) and source-map (which has an async
         // SourceMapConsumer).
-        orig_map = await new SourceMapConsumer(options.orig);
+        orig_map = yield new SourceMapConsumer(options.orig);
         if (orig_map.sourcesContent) {
             orig_map.sources.forEach(function(source, i) {
                 var content = orig_map.sourcesContent[i];

package/main.js

@@ -2,7 +2,7 @@ import "./lib/transform.js";
 import "./lib/mozilla-ast.js";
 import { minify } from "./lib/minify.js";
 
-export { minify } from "./lib/minify.js";
+export { minify, minify_sync } from "./lib/minify.js";
 export { run_cli as _run_cli } from "./lib/cli.js";
 
 export async function _default_options() {

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.25.0",
+  "version": "5.27.0",
   "engines": {
     "node": ">=10"
   },

package/tools/terser.d.ts

@@ -213,3 +213,4 @@ export interface SourceMapOptions {
 }
 
 export function minify(files: string | string[] | { [file: string]: string }, options?: MinifyOptions): Promise<MinifyOutput>;
+export function minify_sync(files: string | string[] | { [file: string]: string }, options?: MinifyOptions): MinifyOutput;