@cenk1cenk2/oclif-common 3.7.0 → 3.7.2

package/dist/index.d.ts

@@ -254,6 +254,8 @@ declare class FileSystemService {
     removeSync(file: string, options?: fs.RmOptions): void;
     emptyDir(directory: string): Promise<void>;
     emptyDirSync(directory: string): void;
+    removeDir(directory: string): Promise<void>;
+    removeDirSync(directory: string): void;
     mkdir(directory: string): Promise<void>;
     mkdirSync(directory: string): void;
 }
@@ -332,7 +334,7 @@ declare class Command<Ctx extends ListrContext = ListrContext, Flags extends Rec
      * Deconstruct the class if you dont want to extend finally or catch.
      */
     shouldRunAfter(_ctx?: Ctx): void | Promise<void>;
-    run<T = void>(): Promise<T>;
+    run(): Promise<any>;
     _run<T>(): Promise<T | undefined>;
     exit(code?: number): void;
     /** Run all tasks from task manager. */
@@ -382,7 +384,7 @@ declare class ConfigCommand<CommandChoices extends string = string, LockFile = a
         annotation(text: string, annotation: string): void;
         flush(ms?: number): Promise<void>;
     };
-    run<T = void>(): Promise<T>;
+    run(): Promise<any>;
     setup(): ConfigCommandSetup<CommandChoices, LockFile> | Promise<ConfigCommandSetup<CommandChoices, LockFile>>;
     protected table(...options: Parameters<typeof CliUx.ux.table>): void;
     protected select(): Promise<string>;

package/dist/index.js

@@ -535,14 +535,28 @@ var FileSystemService = class {
     try {
       await import_fs_extra.default.emptyDir(directory);
     } catch (e) {
-      throw new Error(`Error while deleting the directory "${directory}": ${e.message}`);
+      throw new Error(`Error while emptying the directory "${directory}": ${e.message}`);
     }
   }
   emptyDirSync(directory) {
     try {
       import_fs_extra.default.emptyDirSync(directory);
     } catch (e) {
-      throw new Error(`Error while deleting the directory "${directory}": ${e.message}`);
+      throw new Error(`Error while emptying the directory "${directory}": ${e.message}`);
+    }
+  }
+  async removeDir(directory) {
+    try {
+      await import_fs_extra.default.rmdir(directory);
+    } catch (e) {
+      throw new Error(`Error while removing the directory "${directory}": ${e.message}`);
+    }
+  }
+  removeDirSync(directory) {
+    try {
+      import_fs_extra.default.rmdirSync(directory);
+    } catch (e) {
+      throw new Error(`Error while removing the directory "${directory}": ${e.message}`);
     }
   }
   async mkdir(directory) {
@@ -842,30 +856,28 @@ var LockerService = class {
   }
   async lock(...data) {
     let lock = await this.tryRead() ?? {};
-    await Promise.all(
-      data.map(async (d) => {
-        if (d?.enabled === false) {
-          return;
-        } else if (!d?.data || Array.isArray(d?.data) && d.data.length === 0 || typeof d?.data === "object" && Object.keys(d.data).length === 0) {
-          return;
-        }
-        const path = this.buildPath(d);
-        if (d?.merge) {
-          let parsed;
-          if (typeof d.data === "object") {
-            parsed = merge(d.merge, import_object_path_immutable2.default.get(lock, path) || Array.isArray(d.data) ? [] : {}, d.data);
-          } else {
-            this.logger.warn('"%s" path with type "%s" is not mergeable.', path, typeof d.data);
-            parsed = d.data;
-          }
-          lock = import_object_path_immutable2.default.set(lock, path, parsed);
-          this.logger.verbose("Merge lock: %s -> %o", path, parsed);
+    data.forEach((d) => {
+      if (d?.enabled === false) {
+        return;
+      } else if (!d?.data || Array.isArray(d?.data) && d.data.length === 0 || typeof d?.data === "object" && Object.keys(d.data).length === 0) {
+        return;
+      }
+      const path = this.buildPath(d);
+      if (d?.merge) {
+        let parsed;
+        if (typeof d.data === "object") {
+          parsed = merge(d.merge, import_object_path_immutable2.default.get(lock, path) || Array.isArray(d.data) ? [] : {}, d.data);
         } else {
-          lock = import_object_path_immutable2.default.set(lock, path, d.data);
-          this.logger.verbose("Override lock: %s -> %o", path, d.data);
+          this.logger.warn('"%s" path with type "%s" is not mergeable.', path, typeof d.data);
+          parsed = d.data;
         }
-      })
-    );
+        lock = import_object_path_immutable2.default.set(lock, path, parsed);
+        this.logger.verbose("Merge lock: %s -> %o", path, parsed);
+      } else {
+        lock = import_object_path_immutable2.default.set(lock, path, d.data);
+        this.logger.verbose("Override lock: %s -> %o", path, d.data);
+      }
+    });
     await this.write(lock);
   }
   async unlock(...data) {
@@ -875,16 +887,14 @@ var LockerService = class {
       return;
     }
     if (data.length > 0) {
-      await Promise.all(
-        data.map(async (d) => {
-          if (d?.enabled === false) {
-            return;
-          }
-          const path = this.buildPath(d);
-          lock = import_object_path_immutable2.default.del(lock, path);
-          this.logger.verbose("Unlocked: %s", path);
-        })
-      );
+      data.forEach((d) => {
+        if (d?.enabled === false) {
+          return;
+        }
+        const path = this.buildPath(d);
+        lock = import_object_path_immutable2.default.del(lock, path);
+        this.logger.verbose("Unlocked: %s", path);
+      });
     } else {
       lock = import_object_path_immutable2.default.del(lock, this.root);
       this.logger.verbose("Unlocked module: %s", this.root);
@@ -1040,7 +1050,7 @@ var Command = class extends import_core3.Command {
     this.args = {};
   }
   static get globalFlags() {
-    return { CLI_FLAGS, ...this._globalFlags };
+    return { ...CLI_FLAGS, ...this._globalFlags };
   }
   static set globalFlags(flags) {
     this._globalFlags = Object.assign({}, this.globalFlags, flags);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cenk1cenk2/oclif-common",
-  "version": "3.7.0",
+  "version": "3.7.2",
   "description": "Oclif common package for oclif2 projects.",
   "repository": "https://gitlab.kilic.dev/libraries/oclif-tools",
   "author": {