Merge pull request #916 from amvanbaren/nullish-coalescing

Use nullish coalescing

Author: amvanbaren

cli/src/registry.ts

@@ -34,8 +34,8 @@ export class Registry {
             this.url = options.registryUrl;
         else
             this.url = DEFAULT_URL;
-        this.maxNamespaceSize = options.maxNamespaceSize || DEFAULT_NAMESPACE_SIZE;
-        this.maxPublishSize = options.maxPublishSize || DEFAULT_PUBLISH_SIZE;
+        this.maxNamespaceSize = options.maxNamespaceSize ?? DEFAULT_NAMESPACE_SIZE;
+        this.maxPublishSize = options.maxPublishSize ?? DEFAULT_PUBLISH_SIZE;
         this.username = options.username;
         this.password = options.password;
     }

cli/src/util.ts

@@ -99,7 +99,7 @@ export function statusError(response: http.IncomingMessage): Error {
 export function readFile(name: string, packagePath?: string, encoding: BufferEncoding = 'utf-8'): Promise<string> {
     return new Promise((resolve, reject) => {
         fs.readFile(
-            path.join(packagePath || process.cwd(), name),
+            path.join(packagePath ?? process.cwd(), name),
             { encoding },
             (err, content) => {
                 if (err) {
@@ -132,7 +132,7 @@ export function validateManifest(manifest: Manifest): void {
 export function writeFile(name: string, content: string, packagePath?: string, encoding: BufferEncoding = 'utf-8'): Promise<void> {
     return new Promise((resolve, reject) => {
         fs.writeFile(
-            path.join(packagePath || process.cwd(), name),
+            path.join(packagePath ?? process.cwd(), name),
             content,
             { encoding },
             err => {

webui/src/pages/extension-detail/extension-detail.tsx

@@ -216,12 +216,12 @@ export const ExtensionDetail: FunctionComponent = () => {
 
     const renderExtension = (extension: Extension): ReactNode => {
         const tab = versionPointsToTab(version) ? version as string : 'overview';
-        const headerTheme = extension.galleryTheme || pageSettings.themeType || 'light';
+        const headerTheme = extension.galleryTheme ?? pageSettings.themeType ?? 'light';
         const headerColor = headerTheme === 'dark' ? '#fff' : '#151515';
         return <>
             <Box
                 sx={{
-                    bgcolor: extension.galleryColor || 'neutral.dark',
+                    bgcolor: extension.galleryColor ?? 'neutral.dark',
                     color: headerColor
                 }}
             >
@@ -240,7 +240,7 @@ export const ExtensionDetail: FunctionComponent = () => {
                             <Box
                                 component='img'
                                 src={icon || pageSettings.urls.extensionDefaultIcon }
-                                alt={extension.displayName || extension.name}
+                                alt={extension.displayName ?? extension.name}
                                 sx={{
                                     height: '7.5rem',
                                     maxWidth: '9rem',
@@ -289,7 +289,7 @@ export const ExtensionDetail: FunctionComponent = () => {
             >
                 <WarningIcon fontSize='large' />
                 <Box ml={1}>
-                    This version of the &ldquo;{extension.displayName || extension.name}&rdquo; extension was published
+                    This version of the &ldquo;{extension.displayName ?? extension.name}&rdquo; extension was published
                     by <Link href={extension.publishedBy.homepage}>
                         {extension.publishedBy.loginName}
                     </Link>. That user account is not a verified publisher of
@@ -320,7 +320,7 @@ export const ExtensionDetail: FunctionComponent = () => {
         <Box overflow='auto' sx={{ pt: 1, overflow: 'visible' }}>
             <Badge color='secondary' badgeContent='Preview' invisible={!extension.preview} sx={previewBadgeStyle}>
                 <Typography variant='h5' sx={{ fontWeight: 'bold', mb: 1 }}>
-                    { extension.displayName || extension.name}
+                    { extension.displayName ?? extension.name}
                 </Typography>
             </Badge>
             <Box
@@ -335,7 +335,7 @@ export const ExtensionDetail: FunctionComponent = () => {
                     <StyledRouteLink
                         to={createRoute([NamespaceDetailRoutes.ROOT, extension.namespace])}
                         style={{ color: themeColor }}>
-                        {extension.namespaceDisplayName || extension.namespace}
+                        {extension.namespaceDisplayName ?? extension.namespace}
                     </StyledRouteLink>
                 </Box>
                 <TextDivider themeType={themeType} collapseSmall={true} />
@@ -373,7 +373,7 @@ export const ExtensionDetail: FunctionComponent = () => {
                             `Average rating: ${getRoundedRating(extension.averageRating)} out of 5 (${extension.reviewCount} reviews)`
                             : 'Not rated yet'
                     }>
-                    <ExportRatingStars number={extension.averageRating || 0} fontSize='small' />
+                    <ExportRatingStars number={extension.averageRating ?? 0} fontSize='small' />
                     ({reviewCountFormatted})
                 </StyledLink>
                 </Box>
@@ -410,7 +410,7 @@ export const ExtensionDetail: FunctionComponent = () => {
                 user.avatarUrl ?
                 <Avatar
                     src={user.avatarUrl}
-                    alt={user.fullName || user.loginName}
+                    alt={user.fullName ?? user.loginName}
                     variant='rounded'
                     sx={{ width: '60px', height: '60px' }} />
                 : null
@@ -449,7 +449,7 @@ export const ExtensionDetail: FunctionComponent = () => {
                 href={extension.files.license}
                 sx={{ color: themeColor }}
                 title={extension.license ? 'License type' : undefined} >
-                {extension.license || 'Provided license'}
+                {extension.license ?? 'Provided license'}
             </StyledLink>;
         } else if (extension.license) {
             return extension.license;

webui/src/pages/extension-list/extension-list-container.tsx

@@ -33,10 +33,10 @@ export const ExtensionListContainer: FunctionComponent = () => {
 
     useEffect(() => {
         const searchParams = new URLSearchParams(search);
-        setSearchQuery(searchParams.get('search') || '');
-        setCategory(searchParams.get('category') as ExtensionCategory || '');
-        setSortBy(searchParams.get('sortBy') as SortBy || 'relevance');
-        setSortOrder(searchParams.get('sortOrder') as SortOrder || 'desc');
+        setSearchQuery(searchParams.get('search') ?? '');
+        setCategory(searchParams.get('category') as ExtensionCategory ?? '');
+        setSortBy(searchParams.get('sortBy') as SortBy ?? 'relevance');
+        setSortOrder(searchParams.get('sortOrder') as SortOrder ?? 'desc');
     }, []);
 
     const onSearchChanged = (searchQuery: string): void => {

webui/src/pages/namespace-detail/namespace-detail.tsx

@@ -120,19 +120,19 @@ export const NamespaceDetail: FunctionComponent = () => {
                             <Grid item>
                                 <Box
                                     component='img'
-                                    src={namespaceDetails.logo || pageSettings.urls.extensionDefaultIcon}
+                                    src={namespaceDetails.logo ?? pageSettings.urls.extensionDefaultIcon}
                                     sx={{
                                         height: '7.5rem',
                                         maxWidth: '9rem',
                                         mr: { xs: 0, sm: 0, md: '2rem', lg: '2rem', xl: '2rem' },
                                         pt: 1
                                     }}
-                                    alt={namespaceDetails.displayName || namespaceDetails.name} />
+                                    alt={namespaceDetails.displayName ?? namespaceDetails.name} />
                             </Grid>
                             <Grid item xs={7}>
                                 <Grid container spacing={2}>
                                     <Grid item xs={12}>
-                                        <Typography variant='h5'>{namespaceDetails.displayName || namespaceDetails.name}</Typography>
+                                        <Typography variant='h5'>{namespaceDetails.displayName ?? namespaceDetails.name}</Typography>
                                     </Grid>
                                     <Grid item xs={12} sx={{ pr: '0 !important' }}>
                                         {

webui/src/pages/user/user-namespace-details.tsx

@@ -188,7 +188,7 @@ export const UserNamespaceDetails: FunctionComponent<UserNamespaceDetailsProps>
 
             setDetailsUpdated(true);
             setCurrentDetails(copy(details));
-            setBannerNamespaceName(details.displayName || details.name);
+            setBannerNamespaceName(details.displayName ?? details.name);
         } catch (err) {
             context.handleError(err);
         } finally {

webui/src/utils.ts

@@ -196,5 +196,5 @@ export function getTargetPlatformDisplayName(targetPlatform: string): string {
         [TargetPlatform.WEB, 'Web']
     ]);
 
-    return targetPlatformDisplayNames.get(targetPlatform) || '';
+    return targetPlatformDisplayNames.get(targetPlatform) ?? '';
 }