Merge pull request #1049 from amvanbaren/redundant-casts

Remove redundant assertions
eclipse · Nov 19, 2024 · 593029d · 593029d
2 parents b10ba78 + 700cb9d
commit 593029d
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 20 deletions.
diff --git a/cli/src/main.ts b/cli/src/main.ts
@@ -75,7 +75,6 @@ module.exports = function (argv: string[]): void {
             publish({ extensionFile, registryUrl, pat, targets: typeof target === 'string' ? [target] : target, packagePath: typeof packagePath === 'string' ? [packagePath] : packagePath, baseContentUrl, baseImagesUrl, yarn, preRelease, dependencies, skipDuplicate, packageVersion })
                 .then(results => {
                     const reasons = results.filter(result => result.status === 'rejected')
-                        .map(result => result as PromiseRejectedResult)
                         .map(rejectedResult => rejectedResult.reason);
 
                     if (reasons.length > 0) {

diff --git a/cli/src/registry.ts b/cli/src/registry.ts
@@ -168,9 +168,9 @@ export class Registry {
 
     private getProtocol(url: URL) {
         if (url.protocol === 'https:')
-            return followRedirects.https as typeof https;
+            return followRedirects.https
         else
-            return followRedirects.http as typeof http;
+            return followRedirects.http
     }
 
     private getRequestOptions(method?: string, headers?: http.OutgoingHttpHeaders, maxBodyLength?: number): http.RequestOptions {

diff --git a/cli/src/zip.ts b/cli/src/zip.ts
@@ -3,23 +3,23 @@ import { Readable } from 'stream';
 import { Manifest } from './util';
 
 async function bufferStream(stream: Readable): Promise<Buffer> {
-	return await new Promise((c, e) => {
+	return await new Promise((resolve, reject) => {
 		const buffers: Buffer[] = [];
 		stream.on('data', buffer => buffers.push(buffer));
-		stream.once('error', e);
-		stream.once('end', () => c(Buffer.concat(buffers)));
+		stream.once('error', reject);
+		stream.once('end', () => resolve(Buffer.concat(buffers)));
 	});
 }
 
 export async function readZip(packagePath: string, filter: (name: string) => boolean): Promise<Map<string, Buffer>> {
-	const zipfile = await new Promise<ZipFile>((c, e) =>
-		open(packagePath, { lazyEntries: true }, (err, zipfile) => (err ? e(err) : c(zipfile!)))
+	const zipfile = await new Promise<ZipFile>((resolve, reject) =>
+		open(packagePath, { lazyEntries: true }, (err, zipfile) => (err ? reject(err) : resolve(zipfile)))
 	);
 
-	return await new Promise((c, e) => {
+	return await new Promise((resolve, reject) => {
 		const result = new Map<string, Buffer>();
 
-		zipfile.once('close', () => c(result));
+		zipfile.once('close', () => resolve(result));
 
 		zipfile.readEntry();
 		zipfile.on('entry', (entry: Entry) => {
@@ -29,10 +29,10 @@ export async function readZip(packagePath: string, filter: (name: string) => boo
 				zipfile.openReadStream(entry, (err, stream) => {
 					if (err) {
 						zipfile.close();
-						return e(err);
+						return reject(err);
 					}
 
-					bufferStream(stream!).then(buffer => {
+					bufferStream(stream).then(buffer => {
 						result.set(name, buffer);
 						zipfile.readEntry();
 					});

diff --git a/webui/src/extension-registry-service.ts b/webui/src/extension-registry-service.ts
@@ -118,7 +118,7 @@ export class ExtensionRegistryService {
     getExtensionReadme(abortController: AbortController, extension: Extension): Promise<string> {
         return sendRequest({
             abortController,
-            endpoint: extension.files.readme!,
+            endpoint: extension.files.readme,
             headers: { 'Accept': 'text/plain' },
             followRedirect: true
         });
@@ -127,7 +127,7 @@ export class ExtensionRegistryService {
     getExtensionChangelog(abortController: AbortController, extension: Extension): Promise<string> {
         return sendRequest({
             abortController,
-            endpoint: extension.files.changelog!,
+            endpoint: extension.files.changelog,
             headers: { 'Accept': 'text/plain' },
             followRedirect: true
         });

diff --git a/webui/src/pages/admin-dashboard/publisher-revoke-dialog.tsx b/webui/src/pages/admin-dashboard/publisher-revoke-dialog.tsx
@@ -45,7 +45,7 @@ export const PublisherRevokeDialog: FunctionComponent<PublisherRevokeDialogProps
         try {
             setWorking(true);
             const user = props.publisherInfo.user;
-            const result = await service.admin.revokePublisherContributions(abortController.current, user.provider!, user.loginName);
+            const result = await service.admin.revokePublisherContributions(abortController.current, user.provider as string, user.loginName);
             if (isError(result)) {
                 throw result;
             }

diff --git a/webui/src/pages/extension-detail/extension-detail-reviews.tsx b/webui/src/pages/extension-detail/extension-detail-reviews.tsx
@@ -12,7 +12,7 @@ import React, { Fragment, FunctionComponent, ReactNode, useContext, useState, us
 import { Box, Typography, Divider, Link } from '@mui/material';
 import { MainContext } from '../../context';
 import { toLocalTime } from '../../utils';
-import { ExtensionReview, Extension, ExtensionReviewList, isEqualUser, isError } from '../../extension-registry-types';
+import { ExtensionReview, Extension, ExtensionReviewList, isEqualUser, isError, UserData } from '../../extension-registry-types';
 import { TextDivider } from '../../components/text-divider';
 import { DelayedLoadIndicator } from '../../components/delayed-load-indicator';
 import { ButtonWithProgress } from '../../components/button-with-progress';
@@ -67,7 +67,7 @@ export const ExtensionDetailReviews: FunctionComponent<ExtensionDetailReviewsPro
         if (!context.user || !reviewList) {
             return  '';
         }
-        const existingReview = reviewList.reviews.find(r => isEqualUser(r.user, context.user!));
+        const existingReview = reviewList.reviews.find(r => isEqualUser(r.user, context.user as UserData));
         if (existingReview) {
             const localTime = toLocalTime(existingReview.timestamp);
             return <ButtonWithProgress

diff --git a/webui/src/pages/user/user-namespace-extension-list.tsx b/webui/src/pages/user/user-namespace-extension-list.tsx
@@ -51,7 +51,7 @@ export const UserNamespaceExtensionListContainer: FunctionComponent<UserNamespac
         const extensionUnfiltered = await Promise.all(
             extensionsURLs.map((url: string) => getExtension(url))
         );
-        const extensions = extensionUnfiltered.filter(e => !!e) as Extension[];
+        const extensions = extensionUnfiltered.filter(e => e != null) as Extension[];
 
         setExtensions(extensions);
         setLoading(false);

diff --git a/webui/src/server-request.ts b/webui/src/server-request.ts
@@ -66,15 +66,15 @@ export async function sendRequest<Res>(req: ServerAPIRequest): Promise<Res> {
 
     const response = await fetchBuilder(fetch, options)(req.endpoint, param);
     if (response.ok) {
-        switch (req.headers!['Accept']) {
+        switch (req.headers['Accept']) {
             case 'application/json':
                 return response.json();
             case 'text/plain':
                 return response.text() as Promise<any>;
             case 'application/octet-stream':
                 return response.blob() as Promise<any>;
             default:
-                throw new Error(`Unsupported type ${req.headers!['Accept']}`);
+                throw new Error(`Unsupported type ${req.headers['Accept']}`);
         }
     } else if (response.status === 429) {
         const retrySeconds = response.headers.get('X-Rate-Limit-Retry-After-Seconds') || '0';