From 36894fd813ac8424cee4ecb6ade5d1426fb75206 Mon Sep 17 00:00:00 2001
From: Namrata Jha <namratajha@github.com>
Date: Thu, 16 Dec 2021 08:54:07 +0000
Subject: [PATCH] add logs

---
 dist/index.js | 23 ++++++++++++-----------
 src/delete.ts | 29 ++++++++++++++---------------
 src/input.ts  |  4 ++--
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 9867c58..3e65df9 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -48,6 +48,7 @@ function finalIds(input) {
                         ? 0
                         : input.numOldVersionsToDelete - value.length;
                 console.log(`temp: ${temp} numVersions: ${input.numOldVersionsToDelete} ignore-versions: ${input.ignoreVersions}`);
+                input.numDeleted += value.filter(info => !input.ignoreVersions.test(info.version)).length;
                 return value
                     .filter(info => !input.ignoreVersions.test(info.version))
                     .map(info => info.id)
@@ -64,19 +65,16 @@ function finalIds(input) {
                     input.minVersionsToKeep;
                 toDelete = toDelete > 100 ? 100 : toDelete;
                 value = value.filter(info => !input.ignoreVersions.test(info.version));
-                console.log(`toDelete: ${toDelete} numVersions: ${input.numOldVersionsToDelete} total count: ${totalCount}`);
-                if (toDelete > input.numOldVersionsToDelete &&
-                    input.numOldVersionsToDelete < 100) {
+                console.log(`toDelete: ${toDelete} numVersions: ${input.numDeleted} total count: ${totalCount}`);
+                if (toDelete > input.numDeleted && input.numDeleted < 100) {
                     //here input.numOldVersionsToDelete will never have user value hence using it to keep track of deleted versions
-                    input.numOldVersionsToDelete =
-                        input.numOldVersionsToDelete + value.length > 100
+                    input.numDeleted =
+                        input.numDeleted + value.length > 100
                             ? 100
-                            : input.numOldVersionsToDelete + value.length;
-                    return toDelete - input.numOldVersionsToDelete >= 0
+                            : input.numDeleted + value.length;
+                    return toDelete - input.numDeleted >= 0
                         ? value.map(info => info.id)
-                        : value
-                            .map(info => info.id)
-                            .slice(0, toDelete - input.numOldVersionsToDelete);
+                        : value.map(info => info.id).slice(0, toDelete - input.numDeleted);
                 }
                 else
                     return [];
@@ -97,7 +95,9 @@ function deleteVersions(input) {
         console.log('Number of old versions to delete input is 0 or less, no versions will be deleted');
         return rxjs_1.of(true);
     }
-    return finalIds(input).pipe(operators_1.concatMap(ids => version_1.deletePackageVersions(ids, input.token)));
+    const result = finalIds(input);
+    console.log(`${input.numDeleted} versions deleted`);
+    return result.pipe(operators_1.concatMap(ids => version_1.deletePackageVersions(ids, input.token)));
 }
 exports.deleteVersions = deleteVersions;
 
@@ -134,6 +134,7 @@ class Input {
         this.ignoreVersions = validatedParams.ignoreVersions;
         this.deletePreReleaseVersions = validatedParams.deletePreReleaseVersions;
         this.token = validatedParams.token;
+        this.numDeleted = 0;
     }
     hasOldestVersionQueryInfo() {
         return !!(this.owner &&
diff --git a/src/delete.ts b/src/delete.ts
index 9c44425..cc44a95 100644
--- a/src/delete.ts
+++ b/src/delete.ts
@@ -71,6 +71,9 @@ export function finalIds(input: Input): Observable<string[]> {
           console.log(
             `temp: ${temp} numVersions: ${input.numOldVersionsToDelete} ignore-versions: ${input.ignoreVersions}`
           )
+          input.numDeleted += value.filter(
+            info => !input.ignoreVersions.test(info.version)
+          ).length
           return value
             .filter(info => !input.ignoreVersions.test(info.version))
             .map(info => info.id)
@@ -98,22 +101,17 @@ export function finalIds(input: Input): Observable<string[]> {
           toDelete = toDelete > 100 ? 100 : toDelete
           value = value.filter(info => !input.ignoreVersions.test(info.version))
           console.log(
-            `toDelete: ${toDelete} numVersions: ${input.numOldVersionsToDelete} total count: ${totalCount}`
+            `toDelete: ${toDelete} numVersions: ${input.numDeleted} total count: ${totalCount}`
           )
-          if (
-            toDelete > input.numOldVersionsToDelete &&
-            input.numOldVersionsToDelete < 100
-          ) {
+          if (toDelete > input.numDeleted && input.numDeleted < 100) {
             //here input.numOldVersionsToDelete will never have user value hence using it to keep track of deleted versions
-            input.numOldVersionsToDelete =
-              input.numOldVersionsToDelete + value.length > 100
+            input.numDeleted =
+              input.numDeleted + value.length > 100
                 ? 100
-                : input.numOldVersionsToDelete + value.length
-            return toDelete - input.numOldVersionsToDelete >= 0
+                : input.numDeleted + value.length
+            return toDelete - input.numDeleted >= 0
               ? value.map(info => info.id)
-              : value
-                  .map(info => info.id)
-                  .slice(0, toDelete - input.numOldVersionsToDelete)
+              : value.map(info => info.id).slice(0, toDelete - input.numDeleted)
           } else return []
         })
       )
@@ -141,7 +139,8 @@ export function deleteVersions(input: Input): Observable<boolean> {
     return of(true)
   }
 
-  return finalIds(input).pipe(
-    concatMap(ids => deletePackageVersions(ids, input.token))
-  )
+  const result = finalIds(input)
+  console.log(`${input.numDeleted} versions deleted`)
+
+  return result.pipe(concatMap(ids => deletePackageVersions(ids, input.token)))
 }
diff --git a/src/input.ts b/src/input.ts
index dd996ca..35244d5 100644
--- a/src/input.ts
+++ b/src/input.ts
@@ -1,5 +1,3 @@
-import {throwError} from 'rxjs'
-
 export interface InputParams {
   packageVersionIds?: string[]
   owner?: string
@@ -34,6 +32,7 @@ export class Input {
   ignoreVersions: RegExp
   deletePreReleaseVersions: string
   token: string
+  numDeleted: number
 
   constructor(params?: InputParams) {
     const validatedParams: Required<InputParams> = {...defaultParams, ...params}
@@ -47,6 +46,7 @@ export class Input {
     this.ignoreVersions = validatedParams.ignoreVersions
     this.deletePreReleaseVersions = validatedParams.deletePreReleaseVersions
     this.token = validatedParams.token
+    this.numDeleted = 0
   }
 
   hasOldestVersionQueryInfo(): boolean {