diff --git a/dist/index.js b/dist/index.js index e686b55..766fd6b 100644 --- a/dist/index.js +++ b/dist/index.js @@ -32,7 +32,7 @@ let totalCount = 0; function getVersionIds(owner, repo, packageName, numVersions, cursor, token) { return version_1.getOldestVersions(owner, repo, packageName, numVersions, cursor, token).pipe(operators_1.expand(value => value.paginate ? version_1.getOldestVersions(owner, repo, packageName, numVersions, value.cursor, token) - : rxjs_1.EMPTY), operators_1.tap(value => console.log(`total3: ${totalCount}, value total3: ${value.totalCount}`)), operators_1.tap(value => (totalCount = totalCount === 0 ? value.totalCount : totalCount)), operators_1.map(value => value.versions)); + : rxjs_1.EMPTY), operators_1.tap(value => (totalCount = totalCount === 0 ? value.totalCount : totalCount)), operators_1.map(value => value.versions)); } exports.getVersionIds = getVersionIds; function finalIds(input) { @@ -47,20 +47,17 @@ function finalIds(input) { : RATE_LIMIT; console.log(`input.numOldVersionsToDelete: ${input.numOldVersionsToDelete}`); return getVersionIds(input.owner, input.repo, input.packageName, input.numOldVersionsToDelete, '', input.token).pipe(operators_1.map(value => { - console.log(`totalCount in numVersions: ${totalCount}`); value = value.filter(info => !input.ignoreVersions.test(info.version)); const temp = input.numOldVersionsToDelete; input.numOldVersionsToDelete = input.numOldVersionsToDelete - value.length <= 0 ? 0 : input.numOldVersionsToDelete - value.length; - console.log(`temp: ${temp}, numOldeVersions: ${input.numOldVersionsToDelete}`); return value.map(info => info.id).slice(0, temp); })); } else { return getVersionIds(input.owner, input.repo, input.packageName, RATE_LIMIT, '', input.token).pipe(operators_1.map(value => { - console.log(`total count: ${totalCount}`); totalCount = totalCount - value.filter(info => input.ignoreVersions.test(info.version)).length; @@ -80,11 +77,6 @@ function finalIds(input) { } else return []; - /* - if (toDelete > 0) { - input.numDeleted += toDelete - return value.map(info => info.id).slice(0, toDelete) - } else return []*/ })); } } @@ -103,10 +95,7 @@ function deleteVersions(input) { return rxjs_1.of(true); } const result = finalIds(input); - return result.pipe(operators_1.tap(() => { - if (input.numDeleted > 0) - console.log(`${input.numDeleted} versions will be deleted`); - }), operators_1.concatMap(ids => version_1.deletePackageVersions(ids, input.token))); + return result.pipe(operators_1.concatMap(ids => version_1.deletePackageVersions(ids, input.token))); } exports.deleteVersions = deleteVersions; @@ -191,21 +180,17 @@ const mutation = ` } }`; function deletePackageVersion(packageVersionId, token) { - if (deleted === 100) { - console.log(`reaching rate limit`); - operators_1.delay(5000); - } deleted += 1; return rxjs_1.from(graphql_1.graphql(token, mutation, { packageVersionId, headers: { Accept: 'application/vnd.github.package-deletes-preview+json' } - })).pipe(operators_1.catchError((err) => { + })).pipe(operators_1.catchError(err => { const msg = 'delete version mutation failed.'; return rxjs_1.throwError(err.errors && err.errors.length > 0 ? `${msg} ${err.errors[0].message}` - : `${msg} verify input parameters are correct// error123: ${err}`); + : `${msg} ${err.message}`); }), operators_1.map(response => response.deletePackageVersion.success)); } exports.deletePackageVersion = deletePackageVersion; @@ -214,7 +199,6 @@ function deletePackageVersions(packageVersionIds, token) { return rxjs_1.of(true); } const deletes = packageVersionIds.map(id => deletePackageVersion(id, token).pipe(operators_1.tap(result => { - console.log(`versions Deleted 0 : ${deleted}`); if (result) { console.log(`version with id: ${id}, deleted`); } @@ -222,7 +206,7 @@ function deletePackageVersions(packageVersionIds, token) { console.log(`version with id: ${id}, not deleted`); } }))); - console.log(`Versions Deleted Final2: ${deleted}`); + console.log(`Versions Deleted: ${deleted}`); return rxjs_1.merge(...deletes); } exports.deletePackageVersions = deletePackageVersions; diff --git a/src/delete.ts b/src/delete.ts index 9880e78..a3d53c4 100644 --- a/src/delete.ts +++ b/src/delete.ts @@ -34,9 +34,6 @@ export function getVersionIds( ) : EMPTY ), - tap(value => - console.log(`total3: ${totalCount}, value total3: ${value.totalCount}`) - ), tap( value => (totalCount = totalCount === 0 ? value.totalCount : totalCount) ), @@ -66,16 +63,12 @@ export function finalIds(input: Input): Observable { input.token ).pipe( map(value => { - console.log(`totalCount in numVersions: ${totalCount}`) value = value.filter(info => !input.ignoreVersions.test(info.version)) const temp = input.numOldVersionsToDelete input.numOldVersionsToDelete = input.numOldVersionsToDelete - value.length <= 0 ? 0 : input.numOldVersionsToDelete - value.length - console.log( - `temp: ${temp}, numOldeVersions: ${input.numOldVersionsToDelete}` - ) return value.map(info => info.id).slice(0, temp) }) ) @@ -89,7 +82,6 @@ export function finalIds(input: Input): Observable { input.token ).pipe( map(value => { - console.log(`total count: ${totalCount}`) totalCount = totalCount - value.filter(info => input.ignoreVersions.test(info.version)).length @@ -106,16 +98,10 @@ export function finalIds(input: Input): Observable { } return value.map(info => info.id).slice(0, toDelete) } else return [] - /* - if (toDelete > 0) { - input.numDeleted += toDelete - return value.map(info => info.id).slice(0, toDelete) - } else return []*/ }) ) } } - return throwError( "Could not get packageVersionIds. Explicitly specify using the 'package-version-ids' input" ) @@ -139,11 +125,5 @@ export function deleteVersions(input: Input): Observable { const result = finalIds(input) - return result.pipe( - tap(() => { - if (input.numDeleted > 0) - console.log(`${input.numDeleted} versions will be deleted`) - }), - concatMap(ids => deletePackageVersions(ids, input.token)) - ) + return result.pipe(concatMap(ids => deletePackageVersions(ids, input.token))) } diff --git a/src/version/delete-version.ts b/src/version/delete-version.ts index 4bf9125..ef1996d 100644 --- a/src/version/delete-version.ts +++ b/src/version/delete-version.ts @@ -1,6 +1,5 @@ import {from, Observable, merge, throwError, of} from 'rxjs' -import {catchError, delay, map, tap} from 'rxjs/operators' -import {GraphQlQueryResponse} from '@octokit/graphql/dist-types/types' +import {catchError, map, tap} from 'rxjs/operators' import {graphql} from './graphql' let deleted = 0 @@ -22,10 +21,6 @@ export function deletePackageVersion( packageVersionId: string, token: string ): Observable { - if (deleted === 100) { - console.log(`reaching rate limit`) - delay(5000) - } deleted += 1 return from( graphql(token, mutation, { @@ -35,12 +30,12 @@ export function deletePackageVersion( } }) as Promise ).pipe( - catchError((err: GraphQlQueryResponse) => { + catchError(err => { const msg = 'delete version mutation failed.' return throwError( err.errors && err.errors.length > 0 ? `${msg} ${err.errors[0].message}` - : `${msg} verify input parameters are correct// error123: ${err}` + : `${msg} ${err.message}` ) }), map(response => response.deletePackageVersion.success) @@ -58,7 +53,6 @@ export function deletePackageVersions( const deletes = packageVersionIds.map(id => deletePackageVersion(id, token).pipe( tap(result => { - console.log(`versions Deleted 0 : ${deleted}`) if (result) { console.log(`version with id: ${id}, deleted`) } else { @@ -67,6 +61,6 @@ export function deletePackageVersions( }) ) ) - console.log(`Versions Deleted Final2: ${deleted}`) + console.log(`Versions Deleted: ${deleted}`) return merge(...deletes) }