Refactor: make save and generateMapping promise first

Author: JPeer264

__tests__/generateMapping.ts

@@ -91,7 +91,7 @@ test('should overwrite mapping files', (done) => {
 });
 
 test('should not overwrite mapping files', async () => {
-  await expect(generateMapping(testCwd.name)).resolves.toBeTruthy();
+  await expect(generateMapping(testCwd.name)).resolves.toBe(undefined);
   await expect(generateMapping(testCwd.name)).rejects.toBeTruthy();
 });
 

__tests__/processAuto.ts

@@ -82,9 +82,7 @@ test('should not overwrite original files', async () => {
       newPath: fixturesCwd,
       cwd: fixturesCwd,
     })
-  )).rejects.toEqual({
-    message: 'File exist and cannot be overwritten. Set the option overwrite to true to overwrite files.',
-  });
+  )).rejects.toEqual(new Error('File exist and cannot be overwritten. Set the option overwrite to true to overwrite files.'));
 });
 
 test('should fail', async () => {

__tests__/save.ts

@@ -29,17 +29,15 @@ test('should create a file within a non existing dir', (done) => {
   });
 });
 
-test('should not overwrite the same file', async (done) => {
+test('should not overwrite the same file', async () => {
   const filePath = path.join(testFiles, '/config.json');
   const filePathTest = path.join(testCwd.name, '/config.json');
   const oldFile = fs.readFileSync(filePath, 'utf8');
 
   await save(filePathTest, 'test content');
 
-  save(filePathTest, 'test content', (err) => {
-    expect(err.message).toBe('File exist and cannot be overwritten. Set the option overwrite to true to overwrite files.');
-    expect(fs.readFileSync(filePath, 'utf8')).toBe(oldFile);
-
-    done();
-  });
+  await expect(save(filePathTest, 'test content'))
+    .rejects
+    .toEqual(new Error('File exist and cannot be overwritten. Set the option overwrite to true to overwrite files.'));
+  expect(fs.readFileSync(filePath, 'utf8')).toBe(oldFile);
 });

lib/helper/save.ts

@@ -1,44 +1,23 @@
-import { fromCallback } from 'universalify';
+import { fromPromise } from 'universalify';
 import fs from 'fs-extra';
 import path from 'path';
 
 interface SaveOptions {
   overwrite?: boolean;
 }
 
-// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-const save = (
+const save = async (
   destinationPath: string,
   data: string,
-  opts: SaveOptions | Callback,
-  cb?: Callback,
-) => {
+  options: SaveOptions = {},
+): Promise<void> => {
   // @todo check if the filepath has an .ext
-  let callback = cb as Callback;
-  let options = opts;
-
-  // set cb if options are not set
-  if (typeof options === 'function') {
-    callback = options;
-    options = {};
-  }
-
   if (!options.overwrite && fs.existsSync(destinationPath)) {
-    // todo jpeer: throw error
-    return callback({
-      message: 'File exist and cannot be overwritten. Set the option overwrite to true to overwrite files.',
-    });
+    throw new Error('File exist and cannot be overwritten. Set the option overwrite to true to overwrite files.');
   }
 
-  return fs.mkdirs(path.dirname(destinationPath), () => {
-    fs.writeFile(destinationPath, data, (err) => {
-      if (err) {
-        return callback(err);
-      }
-
-      return callback(null, `Successfully wrote ${destinationPath}`);
-    });
-  });
+  await fs.mkdirs(path.dirname(destinationPath));
+  await fs.writeFile(destinationPath, data);
 }; // /save
 
-export default fromCallback(save);
+export default fromPromise(save);

lib/mapping/generateMapping.ts

@@ -14,11 +14,10 @@ export interface GenerateMappingOptions {
   overwrite?: boolean;
 }
 
-const generateMapping = (
+const generateMapping = async (
   pathString: string,
   opts: GenerateMappingOptions,
-  cb: Callback,
-): void => {
+): Promise<void> => {
   let fileName = 'renaming_map';
   let fileNameExt = '.json';
   let mappingName = 'CSS_NAME_MAPPING';
@@ -33,13 +32,6 @@ const generateMapping = (
     ...opts,
   };
 
-  let callback = cb;
-
-  // set cb if options are not set
-  if (typeof callback !== 'function') {
-    callback = options as () => void;
-  }
-
   if (options.cssMappingMin) {
     options.origValues = false;
     mappingName = 'CSS_NAME_MAPPING_MIN';
@@ -70,13 +62,7 @@ const generateMapping = (
     fileNameExt = '.js';
   }
 
-  save(`${newPath}${fileNameExt}`, writeData, { overwrite: options.overwrite }, (err: any, data: string) => {
-    if (err) {
-      callback(err);
-    }
-
-    callback(null, data);
-  });
+  await save(`${newPath}${fileNameExt}`, writeData, { overwrite: options.overwrite });
 }; // /generateMapping
 
 export default fromPromise(generateMapping);