fix: fix duplicate process in reset and resetDataFileSync file name

Author: ozum

package-lock.json

@@ -44,6 +44,7 @@
     "@types/lodash.isempty": "^4.4.3",
     "@types/lodash.isequal": "^4.5.2",
     "@types/lodash.set": "^4.3.3",
+    "@types/lodash.uniq": "^4.5.3",
     "@types/verror": "^1.10.3",
     "moe-scripts": "0.0.61"
   },
@@ -59,6 +60,7 @@
     "lodash.isempty": "^4.4.0",
     "lodash.isequal": "^4.5.0",
     "lodash.set": "^4.3.2",
+    "lodash.uniq": "^4.5.0",
     "resettable": "^0.1.18",
     "sort-keys": "^2.0.0",
     "verror": "^1.10.0",

package.json

@@ -2,8 +2,9 @@ import * as childProcess from "child_process";
 import path from "path";
 import fs from "fs-extra";
 import { promisify } from "util";
+import has from "lodash.has";
 
-import ResettableFile from "./resettable-file";
+import ResettableFile from "./index";
 import { stubLogger } from "./logger";
 import { BasicLogger } from "./@types";
 
@@ -60,7 +61,6 @@ beforeAll(async () => {
 afterAll(async () => {
   try {
     await Promise.all([clear(), clear(2)]);
-    // await exec(`rm -rf ${path.join(paths.project, "/")}auto-test-qx-*`);
   } catch (e) {
     console.error(e);
   }
@@ -255,6 +255,15 @@ describe("ResettableFile", () => {
       expect(dataObject.has("x")).toBe(false);
     });
 
+    // it("should reset data file", () => {
+    //   const dataObject = resettableFile.getDataObjectSync("data.json");
+    //   dataObject.set("x", 1);
+    //   resettableFile.saveSync();
+    //   resettableFile.resetFileSync("data.json");
+    //   const data = fs.readJsonSync(path.join(paths.project, "data.json"));
+    //   expect(has(data, "x")).toBe(false);
+    // });
+
     it("should throw if non-tracked file tried to be reset", () => {
       expect(() => resettableFile.resetFileSync("text.txt")).toThrow("Cannot reset file");
     });
@@ -708,7 +717,6 @@ describe("ResettableFile", () => {
       rf.saveSync();
       fs.writeFileSync(rf.fromRoot("alt-x"), "other");
       rf.resetSync();
-
       expect([rf.hasFileSync("registry.json"), rf.hasFileSync("alt-x.json"), rf.hasFileSync("alt-x")]).toEqual([true, false, true]);
     });
 

src/resettable-file.test.ts

@@ -6,6 +6,7 @@ import VError from "verror";
 import arrify from "arrify";
 import crypto from "crypto";
 import isEqual from "lodash.isEqual";
+import uniq from "lodash.uniq";
 import emptyDir from "empty-dir";
 import { clone, Operation } from "resettable";
 import { InternalDataInterface } from "internal-data";
@@ -234,10 +235,9 @@ export default class ResettableFile {
    */
   resetSync() {
     const internal = internalData.get(this);
-
     try {
       this.logger.info("Reset begins.");
-      const allFiles = Object.keys(internal.registry.files).concat(Object.keys(internal.dataFiles));
+      const allFiles = uniq(Object.keys(internal.registry.files).concat(Object.keys(internal.dataFiles)));
       allFiles.forEach(projectFile => this.resetFileSync(projectFile));
 
       // Delete created directories if they are empty.
@@ -434,14 +434,15 @@ export default class ResettableFile {
     const unapplied = dataObject.reset();
     const emptyData = isEqual(dataObject.data, {}) || !internal.registry.files[projectFile];
     const createdIndex = internal.registry.createdDataFiles.indexOf(projectFile);
+
     internal.registry.createdDataFiles.splice(createdIndex, 1);
 
     if (emptyData && createdIndex > -1) {
       fs.removeSync(file);
       this.logger.info(`Deleted data file after reset (empty object created by ResettableFile): ${file}`);
     } else {
       const { format, sortKeys } = dataObject;
-      this.writeFileSync(file, dataObject.data, { format, sortKeys, serialize: true, track: false, force: true }); // Track is false, because tracked data files are tracked key level and written partially.
+      this.writeFileSync(projectFile, dataObject.data, { format, sortKeys, serialize: true, track: false, force: true }); // Track is false, because tracked data files are tracked key level and written partially.
     }
 
     /* istanbul ignore next */
@@ -610,7 +611,6 @@ export default class ResettableFile {
     try {
       if (isSafe) {
         const content = serialize ? serializeData(data as object, serializeFormat, sortKeys).data : data;
-
         fs.outputFileSync(filePath, content);
 
         if (track) {