refactor: code

Author: alexander-akait

src/index.js

@@ -15,7 +15,7 @@ const {
 } = require("./utils");
 
 const schema = require("./options.json");
-const { minify: minifyWorker } = require("./minify");
+const { minify } = require("./minify");
 
 /** @typedef {import("schema-utils/declarations/validate").Schema} Schema */
 /** @typedef {import("webpack").Compiler} Compiler */
@@ -134,7 +134,7 @@ const { minify: minifyWorker } = require("./minify");
 
 /**
  * @template T
- * @typedef {JestWorker & { transform: (options: string) => InternalResult, minify: (options: InternalOptions<T>) => InternalResult }} MinimizerWorker
+ * @typedef {JestWorker & { transform: (options: string) => Promise<InternalResult>, minify: (options: InternalOptions<T>) => Promise<InternalResult> }} MinimizerWorker
  */
 
 /**
@@ -578,7 +578,7 @@ class CssMinimizerPlugin {
           try {
             result = await (getWorker
               ? getWorker().transform(getSerializeJavascript()(options))
-              : minifyWorker(options));
+              : minify(options));
           } catch (error) {
             const hasSourceMap =
               inputSourceMap && CssMinimizerPlugin.isSourceMap(inputSourceMap);

src/minify.js

@@ -6,7 +6,7 @@
  * @param {import("./index.js").InternalOptions<T>} options
  * @returns {Promise<InternalResult>}
  */
-const minify = async (options) => {
+async function minify(options) {
   const minifyFns = Array.isArray(options.minimizer.implementation)
     ? options.minimizer.implementation
     : [options.minimizer.implementation];
@@ -59,7 +59,7 @@ const minify = async (options) => {
   }
 
   return result;
-};
+}
 
 /**
  * @param {string} options

src/utils.js

@@ -69,7 +69,7 @@ function throttleAll(limit, tasks) {
 /* istanbul ignore next */
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {RawSourceMap} [sourceMap]
  * @param {CustomOptions} [minimizerOptions]
  * @return {Promise<MinimizedResult>}
  */
@@ -191,7 +191,7 @@ cssnanoMinify.supportsWorkerThreads = () => true;
 /* istanbul ignore next */
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {RawSourceMap} [sourceMap]
  * @param {CustomOptions} [minimizerOptions]
  * @return {Promise<MinimizedResult>}
  */
@@ -220,7 +220,7 @@ cssoMinify.supportsWorkerThreads = () => true;
 /* istanbul ignore next */
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {RawSourceMap} [sourceMap]
  * @param {CustomOptions} [minimizerOptions]
  * @return {Promise<MinimizedResult>}
  */
@@ -265,7 +265,7 @@ cleanCssMinify.supportsWorkerThreads = () => true;
 /* istanbul ignore next */
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {RawSourceMap} [sourceMap]
  * @param {CustomOptions} [minimizerOptions]
  * @return {Promise<MinimizedResult>}
  */
@@ -359,7 +359,7 @@ esbuildMinify.supportsWorkerThreads = () => false;
 /* istanbul ignore next */
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {RawSourceMap} [sourceMap]
  * @param {CustomOptions} [minimizerOptions]
  * @return {Promise<MinimizedResult>}
  */
@@ -405,7 +405,7 @@ parcelCssMinify.supportsWorkerThreads = () => false;
 /* istanbul ignore next */
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {RawSourceMap} [sourceMap]
  * @param {CustomOptions} [minimizerOptions]
  * @return {Promise<MinimizedResult>}
  */
@@ -451,7 +451,7 @@ lightningCssMinify.supportsWorkerThreads = () => false;
 /* istanbul ignore next */
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {RawSourceMap} [sourceMap]
  * @param {CustomOptions} [minimizerOptions]
  * @return {Promise<MinimizedResult>}
  */

types/index.d.ts

@@ -222,8 +222,8 @@ type BasePluginOptions = {
   parallel?: Parallel;
 };
 type MinimizerWorker<T> = JestWorker & {
-  transform: (options: string) => InternalResult;
-  minify: (options: InternalOptions<T>) => InternalResult;
+  transform: (options: string) => Promise<InternalResult>;
+  minify: (options: InternalOptions<T>) => Promise<InternalResult>;
 };
 type ProcessOptionsExtender =
   | ProcessOptions

types/utils.d.ts

@@ -25,97 +25,97 @@ export function throttleAll<T>(limit: number, tasks: Task<T>[]): Promise<T[]>;
 export function memoize<T>(fn: (() => any) | undefined): () => T;
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {RawSourceMap} [sourceMap]
  * @param {CustomOptions} [minimizerOptions]
  * @return {Promise<MinimizedResult>}
  */
 export function cssnanoMinify(
   input: Input,
-  sourceMap: RawSourceMap | undefined,
+  sourceMap?: import("@jridgewell/trace-mapping").EncodedSourceMap | undefined,
   minimizerOptions?: import("./index.js").CustomOptions | undefined,
 ): Promise<MinimizedResult>;
 export namespace cssnanoMinify {
   function supportsWorkerThreads(): boolean;
 }
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {RawSourceMap} [sourceMap]
  * @param {CustomOptions} [minimizerOptions]
  * @return {Promise<MinimizedResult>}
  */
 export function cssoMinify(
   input: Input,
-  sourceMap: RawSourceMap | undefined,
+  sourceMap?: import("@jridgewell/trace-mapping").EncodedSourceMap | undefined,
   minimizerOptions?: import("./index.js").CustomOptions | undefined,
 ): Promise<MinimizedResult>;
 export namespace cssoMinify {
   function supportsWorkerThreads(): boolean;
 }
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {RawSourceMap} [sourceMap]
  * @param {CustomOptions} [minimizerOptions]
  * @return {Promise<MinimizedResult>}
  */
 export function cleanCssMinify(
   input: Input,
-  sourceMap: RawSourceMap | undefined,
+  sourceMap?: import("@jridgewell/trace-mapping").EncodedSourceMap | undefined,
   minimizerOptions?: import("./index.js").CustomOptions | undefined,
 ): Promise<MinimizedResult>;
 export namespace cleanCssMinify {
   function supportsWorkerThreads(): boolean;
 }
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {RawSourceMap} [sourceMap]
  * @param {CustomOptions} [minimizerOptions]
  * @return {Promise<MinimizedResult>}
  */
 export function esbuildMinify(
   input: Input,
-  sourceMap: RawSourceMap | undefined,
+  sourceMap?: import("@jridgewell/trace-mapping").EncodedSourceMap | undefined,
   minimizerOptions?: import("./index.js").CustomOptions | undefined,
 ): Promise<MinimizedResult>;
 export namespace esbuildMinify {
   function supportsWorkerThreads(): boolean;
 }
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {RawSourceMap} [sourceMap]
  * @param {CustomOptions} [minimizerOptions]
  * @return {Promise<MinimizedResult>}
  */
 export function parcelCssMinify(
   input: Input,
-  sourceMap: RawSourceMap | undefined,
+  sourceMap?: import("@jridgewell/trace-mapping").EncodedSourceMap | undefined,
   minimizerOptions?: import("./index.js").CustomOptions | undefined,
 ): Promise<MinimizedResult>;
 export namespace parcelCssMinify {
   function supportsWorkerThreads(): boolean;
 }
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {RawSourceMap} [sourceMap]
  * @param {CustomOptions} [minimizerOptions]
  * @return {Promise<MinimizedResult>}
  */
 export function lightningCssMinify(
   input: Input,
-  sourceMap: RawSourceMap | undefined,
+  sourceMap?: import("@jridgewell/trace-mapping").EncodedSourceMap | undefined,
   minimizerOptions?: import("./index.js").CustomOptions | undefined,
 ): Promise<MinimizedResult>;
 export namespace lightningCssMinify {
   function supportsWorkerThreads(): boolean;
 }
 /**
  * @param {Input} input
- * @param {RawSourceMap | undefined} sourceMap
+ * @param {RawSourceMap} [sourceMap]
  * @param {CustomOptions} [minimizerOptions]
  * @return {Promise<MinimizedResult>}
  */
 export function swcMinify(
   input: Input,
-  sourceMap: RawSourceMap | undefined,
+  sourceMap?: import("@jridgewell/trace-mapping").EncodedSourceMap | undefined,
   minimizerOptions?: import("./index.js").CustomOptions | undefined,
 ): Promise<MinimizedResult>;
 export namespace swcMinify {