@cenk1cenk2/oclif-common 6.3.0 → 6.3.2

package/dist/index.d.ts

@@ -255,22 +255,22 @@ declare class LockerService<LockFile extends LockableData = LockableData> {
     constructor(logger: LoggerService, fs: FileSystemService, parser: ParserService, options: LockerServiceOptions);
     hasLock(): boolean;
     hasUnlock(): boolean;
-    addLock<T extends LockableData = LockFile>(...data: LockData<T>[]): void;
+    addLock(...data: LockData<LockFile>[]): void;
     addUnlock(...data: UnlockData[]): void;
-    applyLockAll<T extends LockableData = LockFile>(lock: T): Promise<T>;
+    applyLockAll(lock: LockFile): Promise<LockFile>;
     lockAll(): Promise<void>;
-    applyUnlockAll<T extends LockableData = LockFile>(lock: T): Promise<T>;
+    applyUnlockAll(lock: LockFile): Promise<LockFile>;
     unlockAll(): Promise<void>;
     all(): Promise<void>;
-    applyAll<T extends LockableData = LockFile>(lock: T): Promise<T>;
-    applyLock<T extends LockableData = LockFile>(lock: T, ...data: LockData<T>[]): Promise<T>;
-    lock<T extends LockableData = LockFile>(...data: LockData<T>[]): Promise<T>;
-    applyUnlock<T extends LockableData = LockFile>(lock: T, ...data: UnlockData[]): Promise<T | undefined>;
-    unlock<T extends LockableData = LockFile>(...data: UnlockData[]): Promise<T | undefined>;
-    read<T extends LockableData = LockFile>(): Promise<T>;
-    tryRead<T extends LockableData = LockFile>(): Promise<T | undefined>;
+    applyAll(lock: LockFile): Promise<LockFile>;
+    applyLock(lock: LockFile, ...data: LockData<LockFile>[]): Promise<LockFile>;
+    lock(...data: LockData<LockFile>[]): Promise<LockFile>;
+    applyUnlock(lock: LockFile, ...data: UnlockData[]): Promise<LockFile>;
+    unlock(...data: UnlockData[]): Promise<LockFile | undefined>;
+    read(): Promise<LockFile>;
+    tryRead(): Promise<LockFile | undefined>;
     tryRemove(): Promise<void>;
-    write<T extends LockableData = LockFile>(data: T): Promise<void>;
+    write(data: LockFile): Promise<void>;
     private buildPath;
     private normalizePath;
 }

package/dist/index.js

@@ -1224,16 +1224,10 @@ var _LockerService = class _LockerService {
     return this.toUnlock.length > 0;
   }
   addLock(...data) {
-    this.toLock = [
-      ...this.toLock,
-      ...data
-    ];
+    this.toLock.push(...data);
   }
   addUnlock(...data) {
-    this.toUnlock = [
-      ...this.toUnlock,
-      ...data
-    ];
+    this.toUnlock.push(...data);
   }
   async applyLockAll(lock) {
     if (this.hasLock()) {
@@ -1294,14 +1288,11 @@ var _LockerService = class _LockerService {
     return lock;
   }
   async lock(...data) {
-    const lock = this.applyLock(await this.tryRead() ?? {}, ...data);
+    const lock = await this.applyLock(await this.tryRead() ?? {}, ...data);
     await this.write(lock);
     return lock;
   }
   async applyUnlock(lock, ...data) {
-    if (!lock) {
-      return;
-    }
     if (data.length > 0) {
       data.forEach((d) => {
         if (d?.enabled === false) {
@@ -1321,17 +1312,19 @@ var _LockerService = class _LockerService {
           }
         }
       });
-    } else {
-      lock = op2.del(lock, this.options.root);
-      this.logger.verbose("Unlocked module: %s", this.options.root);
+      return lock;
     }
+    lock = op2.del(lock, this.options.root);
+    this.logger.verbose("Unlocked module: %s", this.options.root);
+    return lock;
   }
   async unlock(...data) {
-    const lock = await this.applyUnlock(await this.tryRead(), ...data);
-    if (!lock) {
+    const state = await this.tryRead();
+    if (!state) {
       this.logger.verbose("Lock file not found. Nothing to unlock.");
       return;
     }
+    const lock = await this.applyUnlock(state, ...data);
     await this.write(lock);
     return lock;
   }
@@ -1339,18 +1332,20 @@ var _LockerService = class _LockerService {
     return this.parser.fetch(this.options.parser).parse(await this.fs.read(this.options.file));
   }
   async tryRead() {
-    try {
-      return this.parser.fetch(this.options.parser).parse(await this.fs.read(this.options.file));
-    } catch {
-      this.logger.trace("Can not read lockfile: %s", this.options.file);
+    const lock = await this.fs.read(this.options.file).catch((err) => {
+      this.logger.trace("Can not read lockfile: %s -> %s", this.options.file, err.message);
+    });
+    if (!lock) {
+      return;
     }
+    return this.parser.fetch(this.options.parser).parse(lock);
   }
   async tryRemove() {
-    try {
-      await this.fs.remove(this.options.file);
-    } catch {
-      this.logger.trace("Can not remove lockfile: %s", this.options.file);
-    }
+    return this.fs.remove(this.options.file).then(() => {
+      this.logger.trace("Removed lockfile: %s", this.options.file);
+    }).catch((err) => {
+      this.logger.trace("Can not remove lockfile: %s -> %s", this.options.file, err.message);
+    });
   }
   async write(data) {
     if (!data || Array.isArray(data) && data.length === 0 || typeof data === "object" && Object.keys(data).length === 0) {

package/package.json

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