@cenk1cenk2/oclif-common 6.2.8 → 6.3.0

package/dist/index.d.ts

@@ -257,14 +257,20 @@ declare class LockerService<LockFile extends LockableData = LockableData> {
     hasUnlock(): boolean;
     addLock<T extends LockableData = LockFile>(...data: LockData<T>[]): void;
     addUnlock(...data: UnlockData[]): void;
+    applyLockAll<T extends LockableData = LockFile>(lock: T): Promise<T>;
     lockAll(): Promise<void>;
+    applyUnlockAll<T extends LockableData = LockFile>(lock: T): Promise<T>;
     unlockAll(): Promise<void>;
     all(): Promise<void>;
-    lock<T extends LockableData = LockFile>(...data: LockData<T>[]): Promise<void>;
-    unlock(...data: UnlockData[]): Promise<void>;
-    read(): Promise<LockFile>;
-    tryRead(): Promise<LockFile | undefined>;
-    write(data: LockFile): 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>;
+    tryRemove(): Promise<void>;
+    write<T extends LockableData = LockFile>(data: T): Promise<void>;
     private buildPath;
     private normalizePath;
 }

package/dist/index.js

@@ -1235,14 +1235,26 @@ var _LockerService = class _LockerService {
       ...data
     ];
   }
+  async applyLockAll(lock) {
+    if (this.hasLock()) {
+      return this.applyLock(lock, ...this.toLock);
+    }
+    return lock;
+  }
   async lockAll() {
     if (this.hasLock()) {
       await this.lock(...this.toLock);
       this.toLock = [];
     }
   }
+  async applyUnlockAll(lock) {
+    if (this.hasUnlock()) {
+      return this.applyUnlock(lock, ...this.toUnlock);
+    }
+    return lock;
+  }
   async unlockAll() {
-    if (this.toUnlock.length > 0) {
+    if (this.hasUnlock()) {
       await this.unlock(...this.toUnlock);
       this.toUnlock = [];
     }
@@ -1251,8 +1263,12 @@ var _LockerService = class _LockerService {
     await this.unlockAll();
     await this.lockAll();
   }
-  async lock(...data) {
-    let lock = await this.tryRead() ?? {};
+  async applyAll(lock) {
+    lock = await this.applyUnlockAll(lock);
+    lock = await this.applyLockAll(lock);
+    return lock;
+  }
+  async applyLock(lock, ...data) {
     data.forEach((d) => {
       if (d?.enabled === false) {
         return;
@@ -1275,12 +1291,15 @@ var _LockerService = class _LockerService {
         this.logger.verbose("Override lock: %s -> %o", path, d.data);
       }
     });
+    return lock;
+  }
+  async lock(...data) {
+    const lock = this.applyLock(await this.tryRead() ?? {}, ...data);
     await this.write(lock);
+    return lock;
   }
-  async unlock(...data) {
-    let lock = await this.tryRead();
+  async applyUnlock(lock, ...data) {
     if (!lock) {
-      this.logger.verbose("Lock file not found. Nothing to unlock.");
       return;
     }
     if (data.length > 0) {
@@ -1306,7 +1325,15 @@ var _LockerService = class _LockerService {
       lock = op2.del(lock, this.options.root);
       this.logger.verbose("Unlocked module: %s", this.options.root);
     }
-    await this.write(lock ?? {});
+  }
+  async unlock(...data) {
+    const lock = await this.applyUnlock(await this.tryRead(), ...data);
+    if (!lock) {
+      this.logger.verbose("Lock file not found. Nothing to unlock.");
+      return;
+    }
+    await this.write(lock);
+    return lock;
   }
   async read() {
     return this.parser.fetch(this.options.parser).parse(await this.fs.read(this.options.file));
@@ -1318,6 +1345,13 @@ var _LockerService = class _LockerService {
       this.logger.trace("Can not read lockfile: %s", this.options.file);
     }
   }
+  async tryRemove() {
+    try {
+      await this.fs.remove(this.options.file);
+    } catch {
+      this.logger.trace("Can not remove lockfile: %s", this.options.file);
+    }
+  }
   async write(data) {
     if (!data || Array.isArray(data) && data.length === 0 || typeof data === "object" && Object.keys(data).length === 0) {
       this.logger.trace("Trying to write empty lock file, deleting it instead: %s", this.options.file);

package/package.json

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