♻️ use nullish coalescing operator and optional chaining

zetaraku · Jul 16, 2023 · 3b270d9 · 3b270d9
1 parent de16c91
commit 3b270d9
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/components/SheetDataTable.vue b/components/SheetDataTable.vue
@@ -72,7 +72,7 @@ watch(sheets, () => {
       </template>
 
       <template #item.category="{ item: sheet }">
-        <span>{{ (sheet.category || '').replaceAll('|', '｜') }}</span>
+        <span>{{ (sheet.category ?? '').replaceAll('|', '｜') }}</span>
       </template>
       <template #item.title="{ item: sheet }">
         <v-btn

diff --git a/components/SheetDialog.vue b/components/SheetDialog.vue
@@ -152,7 +152,7 @@ watch(isOpened, () => {
               class="text-truncate"
               style="margin-right: 80px;"
             >
-              <span>{{ (sheet.category || 'N/A').replaceAll('|', '｜') }}</span>
+              <span>{{ (sheet.category ?? 'N/A').replaceAll('|', '｜') }}</span>
             </h3>
 
             <!-- Title -->
@@ -176,7 +176,7 @@ watch(isOpened, () => {
               class="pb-2 text-truncate"
               style="margin-right: 42px;"
             >
-              <span>{{ sheet.artist || 'N/A' }}</span>
+              <span>{{ sheet.artist ?? 'N/A' }}</span>
             </h4>
 
             <!-- Difficulty & Level -->
@@ -209,14 +209,14 @@ watch(isOpened, () => {
             <!-- Note Designer -->
             <h4 class="pt-2 text-truncate">
               <span v-text="$t('term.noteDesigner')" />:
-              <span>{{ sheet.noteDesigner || 'N/A' }}</span>
+              <span>{{ sheet.noteDesigner ?? 'N/A' }}</span>
             </h4>
 
             <!-- Release Date & Version -->
             <h4 class="pt-2 text-truncate">
               <span v-text="$t('term.releaseDate')" />:
-              <span>{{ sheet.releaseDate || '????-??-??' }}</span>
-              <span>({{ sheet.version || 'N/A' }})</span>
+              <span>{{ sheet.releaseDate ?? '????-??-??' }}</span>
+              <span>({{ sheet.version ?? 'N/A' }})</span>
             </h4>
           </div>
 

diff --git a/components/SheetFilter.vue b/components/SheetFilter.vue
@@ -75,7 +75,7 @@ const filterOptions: Ref<FilterOptions> = inject('filterOptions')!;
             :items="(!filters.useInternalLevel ? filterOptions.levels : filterOptions.internalLevels)"
             prepend-icon="mdi-numeric-9-plus-box-multiple-outline"
             :label="(!filters.useInternalLevel ? $t('term.minLevel') : $t('term.minInternalLevel'))"
-            :placeholder="(((!filters.useInternalLevel ? filterOptions.levels : filterOptions.internalLevels) || [])[0] || { text: '?' }).text"
+            :placeholder="((!filters.useInternalLevel ? filterOptions.levels : filterOptions.internalLevels)?.[0] ?? { text: '?' }).text"
             persistent-placeholder
             clearable
           />
@@ -85,7 +85,7 @@ const filterOptions: Ref<FilterOptions> = inject('filterOptions')!;
             v-model="filters.maxLevelValue"
             :items="(!filters.useInternalLevel ? filterOptions.levels : filterOptions.internalLevels)"
             :label="(!filters.useInternalLevel ? $t('term.maxLevel') : $t('term.maxInternalLevel'))"
-            :placeholder="(((!filters.useInternalLevel ? filterOptions.levels : filterOptions.internalLevels) || []).slice(-1)[0] || { text: '?' }).text"
+            :placeholder="((!filters.useInternalLevel ? filterOptions.levels : filterOptions.internalLevels)?.slice(-1)[0] ?? { text: '?' }).text"
             persistent-placeholder
             clearable
           />
@@ -210,7 +210,7 @@ const filterOptions: Ref<FilterOptions> = inject('filterOptions')!;
               :min="0"
               prepend-icon="mdi-metronome"
               :label="$t('term.minBPM')"
-              :placeholder="String(filterOptions.bpms[0] || 0)"
+              :placeholder="String(filterOptions.bpms[0] ?? 0)"
               persistent-placeholder
               clearable
             />
@@ -221,7 +221,7 @@ const filterOptions: Ref<FilterOptions> = inject('filterOptions')!;
               type="number"
               :min="0"
               :label="$t('term.maxBPM')"
-              :placeholder="String(filterOptions.bpms.slice(-1)[0] || 999)"
+              :placeholder="String(filterOptions.bpms.slice(-1)[0] ?? 999)"
               persistent-placeholder
               clearable
             />

diff --git a/components/SheetTile.vue b/components/SheetTile.vue
@@ -92,7 +92,7 @@ const {
 
             <!-- sheet title (if the default cover image is used) -->
             <span
-              v-if="(sheet.imageName || '').endsWith('default-cover.png') && !hideCover"
+              v-if="(sheet.imageName ?? '').endsWith('default-cover.png') && !hideCover"
               class="CoverTitle"
               v-text="sheet.title"
             />

diff --git a/layouts/default.vue b/layouts/default.vue
@@ -58,11 +58,11 @@ useHead(() => {
     siteDescriptionJp,
   } = context.$config;
 
-  const subSiteTitle = gameTitle.value ? `${gameTitle.value} | ${siteTitle}` : siteTitle;
+  const subSiteTitle = gameTitle.value != null ? `${gameTitle.value} | ${siteTitle}` : siteTitle;
   const pageUrl = new URL(`${gameCode.value ?? ''}/`, siteUrl).toString();
   const logoUrl = new URL('logo.png?v=1', siteUrl).toString();
-  const descriptionEn = String(siteDescriptionEn).replace('______', gameTitle.value || 'arcade games');
-  const descriptionJp = String(siteDescriptionJp).replace('______', gameTitle.value || '音ゲー');
+  const descriptionEn = String(siteDescriptionEn).replace('______', gameTitle.value ?? 'arcade games');
+  const descriptionJp = String(siteDescriptionJp).replace('______', gameTitle.value ?? '音ゲー');
 
   return {
     title: 'N/A',
@@ -238,7 +238,7 @@ export default defineComponent({
               v-text="$config.siteTitle"
             />
             <v-list-item-subtitle
-              v-text="gameTitle || 'made by @zetaraku'"
+              v-text="gameTitle ?? 'made by @zetaraku'"
             />
           </v-list-item-content>
         </v-toolbar-title>

diff --git a/pages/_gameCode/song.vue b/pages/_gameCode/song.vue
@@ -134,7 +134,7 @@ export default defineComponent({
                   <span v-text="$t('term.releaseDate')" />
                 </th>
                 <td>
-                  <span>{{ (song.releaseDate || '').replaceAll('-', '/') }}</span>
+                  <span>{{ (song.releaseDate ?? '').replaceAll('-', '/') }}</span>
                 </td>
               </tr>
               <tr>

diff --git a/pages/_gameCode/songs.vue b/pages/_gameCode/songs.vue
@@ -109,7 +109,7 @@ export default defineComponent({
       </template>
 
       <template #item.category="{ item: song }">
-        <span>{{ (song.category || '').replaceAll('|', '｜') }}</span>
+        <span>{{ (song.category ?? '').replaceAll('|', '｜') }}</span>
       </template>
       <template #item.title="{ item: song }">
         <router-link

diff --git a/utils/filter.ts b/utils/filter.ts
@@ -179,7 +179,7 @@ export function filterSheets(sheets: Sheet[], filters: Filters) {
   }
   if (filters.categories.length !== 0) {
     result = result.filter((sheet) => filters.categories.some(
-      (category) => sheet.category === category || (sheet.category?.split('|').includes(category) ?? false),
+      (category) => sheet.category === category || (sheet.category != null && sheet.category.split('|').includes(category)),
     ));
   }
   if (filters.title != null) {