diff --git a/dist/index.js b/dist/index.js index 99233ee..7905c9c 100644 --- a/dist/index.js +++ b/dist/index.js @@ -62,17 +62,15 @@ function finalIds(input) { value.filter(info => input.ignoreVersions.test(info.version)) .length - input.minVersionsToKeep; + value = value.filter(info => !input.ignoreVersions.test(info.version)); console.log(`toDelete: ${toDelete} numVersions: ${input.numOldVersionsToDelete} total count: ${totalCount}`); if (toDelete > input.numOldVersionsToDelete) { //here input.numOldVersionsToDelete will never have user value hence using it to keep track of deleted versions input.numOldVersionsToDelete = input.numOldVersionsToDelete + value.length; return toDelete - input.numOldVersionsToDelete >= 0 - ? value - .filter(info => !input.ignoreVersions.test(info.version)) - .map(info => info.id) + ? value.map(info => info.id) : value - .filter(info => !input.ignoreVersions.test(info.version)) .map(info => info.id) .slice(0, toDelete - input.numOldVersionsToDelete); } diff --git a/src/delete.ts b/src/delete.ts index 8684c9f..4c0d85e 100644 --- a/src/delete.ts +++ b/src/delete.ts @@ -107,6 +107,7 @@ export function finalIds(input: Input): Observable { value.filter(info => input.ignoreVersions.test(info.version)) .length - input.minVersionsToKeep + value = value.filter(info => !input.ignoreVersions.test(info.version)) console.log( `toDelete: ${toDelete} numVersions: ${input.numOldVersionsToDelete} total count: ${totalCount}` ) @@ -115,11 +116,8 @@ export function finalIds(input: Input): Observable { input.numOldVersionsToDelete = input.numOldVersionsToDelete + value.length return toDelete - input.numOldVersionsToDelete >= 0 - ? value - .filter(info => !input.ignoreVersions.test(info.version)) - .map(info => info.id) + ? value.map(info => info.id) : value - .filter(info => !input.ignoreVersions.test(info.version)) .map(info => info.id) .slice(0, toDelete - input.numOldVersionsToDelete) } else return []