refactor(jszip-cli): Use async/await (#1039)

Author: ffflorian

packages/jszip-cli/src/BuildService.test.ts

@@ -13,7 +13,7 @@ describe('BuildService', () => {
       },
     }));
     vi.mock('glob', () => ({
-      globSync: (params: string | string[]) => (typeof params === 'string' ? [params] : params),
+      glob: async (params: string | string[]) => (typeof params === 'string' ? [params] : params),
     }));
   });
 
@@ -33,7 +33,7 @@ describe('BuildService', () => {
 
   test('adds specified files', async () => {
     const files = ['a.js', 'b.js'];
-    const buildService = jsZipCLI.add(files);
+    const buildService = await jsZipCLI.add(files);
 
     addDefaultSpies(buildService);
 
@@ -53,7 +53,7 @@ describe('BuildService', () => {
       verbose: false,
     });
     const files = ['a.js', 'b.js', 'b.js.map'];
-    const buildService = jsZipCLI.add(files);
+    const buildService = await jsZipCLI.add(files);
 
     addDefaultSpies(buildService);
 
@@ -74,7 +74,7 @@ describe('BuildService', () => {
       verbose: false,
     });
     const files = ['a.js', 'b.js', 'b.js.map'];
-    const buildService = jsZipCLI.add(files);
+    const buildService = await jsZipCLI.add(files);
 
     addDefaultSpies(buildService);
 

packages/jszip-cli/src/BuildService.ts

@@ -3,7 +3,7 @@ import {promises as fs, Stats as fsStats} from 'node:fs';
 import JSZip from 'jszip';
 import logdown from 'logdown';
 import progress from 'progress';
-import {globSync} from 'glob';
+import {glob} from 'glob';
 
 import {FileService} from './FileService.js';
 import {Entry, TerminalOptions} from './interfaces.js';
@@ -42,17 +42,18 @@ export class BuildService {
     this.compressedFilesCount = 0;
   }
 
-  public add(rawEntries: string[]): BuildService {
+  public async add(rawEntries: string[]): Promise<BuildService> {
     this.logger.info(`Adding ${rawEntries.length} entr${rawEntries.length === 1 ? 'y' : 'ies'} to ZIP file.`);
     const normalizedEntries = this.normalizePaths(rawEntries);
-    this.entries = globSync(normalizedEntries).map(rawEntry => {
+    this.entries = [];
+    for (const rawEntry of await glob(normalizedEntries)) {
       const resolvedPath = path.resolve(rawEntry);
       const baseName = path.basename(rawEntry);
-      return {
+      this.entries.push({
         resolvedPath,
         zipPath: baseName,
-      };
-    });
+      });
+    }
     return this;
   }
 

packages/jszip-cli/src/JSZipCLI.ts

@@ -51,7 +51,7 @@ export class JSZipCLI {
    * @param rawEntries The entries (files, directories) to add.
    * If not specified, entries from configuration file are used.
    */
-  public add(rawEntries?: string[]): BuildService {
+  public add(rawEntries?: string[]): Promise<BuildService> {
     if (!rawEntries || !rawEntries.length) {
       if (this.options.entries) {
         rawEntries = this.options.entries;
@@ -87,7 +87,8 @@ export class JSZipCLI {
       throw new Error('No configuration file and no mode specified.');
     }
     if (this.options.mode === 'add') {
-      const {outputFile, compressedFilesCount} = await this.add().save();
+      const buildService = await this.add();
+      const {outputFile, compressedFilesCount} = await buildService.save();
 
       if (this.options.outputEntry && !this.options.quiet) {
         console.info(`Done compressing ${compressedFilesCount} files to "${outputFile}".`);

packages/jszip-cli/src/cli.ts

@@ -70,7 +70,7 @@ commander
         ...(options.quiet && {quiet: options.quiet}),
         ...(options.verbose && {verbose: options.verbose}),
       });
-      jszip.add(entries);
+      await jszip.add(entries);
       const {outputFile, compressedFilesCount} = await jszip.save();
 
       if (options.output && !options.quiet) {