terser 5.26.0 → 5.27.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v5.27.1
+ - Fixed case where `collapse_vars` inlines `await` expressions into non-async functions.
+
+## 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.

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

@@ -16725,6 +16725,14 @@ function tighten_body(statements, compressor) {
             return found;
         }
 
+        function arg_is_injectable(arg) {
+            if (arg instanceof AST_Expansion) return false;
+            const contains_await = walk(arg, (node) => {
+                if (node instanceof AST_Await) return walk_abort;
+            });
+            if (contains_await) return false;
+            return true;
+        }
         function extract_args() {
             var iife, fn = compressor.self();
             if (is_func_expr(fn)
@@ -16733,7 +16741,8 @@ function tighten_body(statements, compressor) {
                 && !fn.pinned()
                 && (iife = compressor.parent()) instanceof AST_Call
                 && iife.expression === fn
-                && iife.args.every((arg) => !(arg instanceof AST_Expansion))) {
+                && iife.args.every(arg_is_injectable)
+            ) {
                 var fn_strict = compressor.has_directive("use strict");
                 if (fn_strict && !member(fn_strict, fn.body))
                     fn_strict = false;
@@ -21990,7 +21999,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,
@@ -22013,7 +22022,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];
@@ -30577,7 +30586,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"
@@ -30782,7 +30791,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,
@@ -30844,6 +30853,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 = {};
@@ -31334,5 +31372,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/tighten-body.js

@@ -574,6 +574,14 @@ export function tighten_body(statements, compressor) {
             return found;
         }
 
+        function arg_is_injectable(arg) {
+            if (arg instanceof AST_Expansion) return false;
+            const contains_await = walk(arg, (node) => {
+                if (node instanceof AST_Await) return walk_abort;
+            });
+            if (contains_await) return false;
+            return true;
+        }
         function extract_args() {
             var iife, fn = compressor.self();
             if (is_func_expr(fn)
@@ -582,7 +590,8 @@ export function tighten_body(statements, compressor) {
                 && !fn.pinned()
                 && (iife = compressor.parent()) instanceof AST_Call
                 && iife.expression === fn
-                && iife.args.every((arg) => !(arg instanceof AST_Expansion))) {
+                && iife.args.every(arg_is_injectable)
+            ) {
                 var fn_strict = compressor.has_directive("use strict");
                 if (fn_strict && !member(fn_strict, fn.body))
                     fn_strict = false;

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/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.26.0",
+  "version": "5.27.1",
   "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;