refactor: typing improvements

pedrolamas · pedrolamas · commit 712e89a2e1d1 · 2025-03-10T10:41:07.000Z
Signed-off-by: Pedro Lamas &lt;pedrolamas@gmail.com&gt;
diff --git a/src/components/settings/PendingChangesDialog.vue b/src/components/settings/PendingChangesDialog.vue
@@ -32,7 +32,7 @@ export default class PendingChangesDialog extends Vue {
     const saveConfigPendingItems: KlipperPrinterConfig = this.$store.getters['printer/getSaveConfigPendingItems']
 
     const { changed, deleted } = Object.entries(saveConfigPendingItems)
-      .reduce((previous, [sectionName, sectionEntries]) => {
+      .reduce<{ changed: string[], deleted: string[] }>((previous, [sectionName, sectionEntries]) => {
         if (sectionEntries === null) {
           previous.deleted.push(`# [${sectionName}]`)
         } else {
@@ -43,7 +43,7 @@ export default class PendingChangesDialog extends Vue {
         }
 
         return previous
-      }, { changed: [], deleted: [] } as { changed: string[], deleted: string[] })
+      }, { changed: [], deleted: [] })
 
     const lines = [...changed]
 
diff --git a/src/components/widgets/filesystem/FileSystemBrowser.vue b/src/components/widgets/filesystem/FileSystemBrowser.vue
@@ -242,7 +242,7 @@ export default class FileSystemBrowser extends Mixins(FilesMixin) {
       for (let i = 0; i < sortBy.length; i++) {
         const sortKey = sortBy[i]
 
-        const sortValues = [
+        const sortValues: unknown[] = [
           get(a, sortKey),
           get(b, sortKey)
         ]
@@ -258,12 +258,17 @@ export default class FileSystemBrowser extends Mixins(FilesMixin) {
         }
 
         // If values are of type number, compare as number
-        if (sortValues.every(x => typeof (x) === 'number' && !isNaN(x))) {
+        if (
+          typeof sortValues[0] === 'number' &&
+          typeof sortValues[1] === 'number' &&
+          !isNaN(sortValues[0]) &&
+          !isNaN(sortValues[1])
+        ) {
           return sortValues[0] - sortValues[1]
         }
 
         const sortValuesAsString = sortValues
-          .map(s => (s || '').toString() as string)
+          .map(s => s?.toString() ?? '')
 
         if (this.textSortOrder === 'numeric-prefix') {
           const [sortA, sortB] = sortValuesAsString
diff --git a/src/components/widgets/filesystem/setupMonaco.ts b/src/components/widgets/filesystem/setupMonaco.ts
@@ -146,7 +146,7 @@ async function setupMonaco () {
       const linesContent = model.getLinesContent()
 
       const sectionBlocks = linesContent
-        .reduce((state, lineContent, index) => {
+        .reduce<ReduceState<{ sectionName: string, hash: string, range: monaco.IRange }>>((state, lineContent, index) => {
           const section = /^\[([^\]]+)\]/.exec(lineContent)
 
           if (section) {
@@ -177,7 +177,7 @@ async function setupMonaco () {
           }
 
           return state
-        }, { result: [] } as ReduceState<{ sectionName: string, hash: string, range: monaco.IRange }>)
+        }, { result: [] })
         .result
 
       return {
@@ -202,7 +202,7 @@ async function setupMonaco () {
       const linesContent = model.getLinesContent()
 
       const sectionBlocks = linesContent
-        .reduce((state, lineContent, index) => {
+        .reduce<ReduceState<monaco.languages.FoldingRange>>((state, lineContent, index) => {
           const isSection = /^\[[^\]]+\]/.test(lineContent)
 
           if (isSection) {
@@ -220,11 +220,11 @@ async function setupMonaco () {
           }
 
           return state
-        }, { result: [] } as ReduceState<monaco.languages.FoldingRange>)
+        }, { result: [] })
         .result
 
       const regionBlocks = linesContent
-        .reduce((state, lineContent, index) => {
+        .reduce<StackReduceState<number, monaco.languages.FoldingRange>>((state, lineContent, index) => {
           lineContent = lineContent.trim()
 
           if (lineContent.length > 0) {
@@ -246,11 +246,11 @@ async function setupMonaco () {
           }
 
           return state
-        }, { stack: [], result: [] } as StackReduceState<number, monaco.languages.FoldingRange>)
+        }, { stack: [], result: [] })
         .result
 
       const commentBlocks = linesContent
-        .reduce((state, lineContent, index) => {
+        .reduce<ReduceState<monaco.languages.FoldingRange>>((state, lineContent, index) => {
           lineContent = lineContent.trim()
 
           if (lineContent.length > 0) {
@@ -272,7 +272,7 @@ async function setupMonaco () {
           }
 
           return state
-        }, { result: [] } as ReduceState<monaco.languages.FoldingRange>)
+        }, { result: [] })
         .result
 
       return [
@@ -288,7 +288,7 @@ async function setupMonaco () {
       const linesContent = model.getLinesContent()
 
       const layerBlocks = linesContent
-        .reduce((state, lineContent, index) => {
+        .reduce<ReduceState<monaco.languages.FoldingRange>>((state, lineContent, index) => {
           const isLayer = /^\s*SET_PRINT_STATS_INFO .*CURRENT_LAYER=/i.test(lineContent)
 
           if (isLayer) {
@@ -306,11 +306,11 @@ async function setupMonaco () {
           }
 
           return state
-        }, { result: [] } as ReduceState<monaco.languages.FoldingRange>)
+        }, { result: [] })
         .result
 
       const objectBlocks = linesContent
-        .reduce((state, lineContent, index) => {
+        .reduce<ReduceState<monaco.languages.FoldingRange>>((state, lineContent, index) => {
           lineContent = lineContent.trim()
 
           if (lineContent.length > 0) {
@@ -338,11 +338,11 @@ async function setupMonaco () {
           }
 
           return state
-        }, { result: [] } as ReduceState<monaco.languages.FoldingRange>)
+        }, { result: [] })
         .result
 
       const thumbnailBlocks = linesContent
-        .reduce((state, lineContent, index) => {
+        .reduce<ReduceState<monaco.languages.FoldingRange>>((state, lineContent, index) => {
           if (lineContent.startsWith('; thumbnail')) {
             const type = lineContent.substring(11).split(' ')[1]
 
@@ -364,11 +364,11 @@ async function setupMonaco () {
           }
 
           return state
-        }, { result: [] } as ReduceState<monaco.languages.FoldingRange>)
+        }, { result: [] })
         .result
 
       const commentBlocks = linesContent
-        .reduce((state, lineContent, index) => {
+        .reduce<ReduceState<monaco.languages.FoldingRange>>((state, lineContent, index) => {
           lineContent = lineContent.trim()
 
           if (lineContent.length > 0) {
@@ -390,7 +390,7 @@ async function setupMonaco () {
           }
 
           return state
-        }, { result: [] } as ReduceState<monaco.languages.FoldingRange>)
+        }, { result: [] })
         .result
 
       return [
diff --git a/src/components/widgets/history/JobHistory.vue b/src/components/widgets/history/JobHistory.vue
@@ -144,15 +144,15 @@ export default class JobHistory extends Mixins(FilesMixin) {
 
   get auxiliaryDataHeaders (): AppDataTableHeader[] {
     const auxiliaryDataHeaders = this.history
-      .reduce((headers, item) => {
+      .reduce<Record<string, string>>((headers, item) => {
         if (item.auxiliary_data) {
           for (const auxiliaryDataItem of item.auxiliary_data) {
             headers[auxiliaryDataItem.name] = auxiliaryDataItem.description
           }
         }
 
         return headers
-      }, {} as Record<string, string>)
+      }, {})
 
     for (const sensor of this.sensors) {
       if (sensor.history_fields) {
diff --git a/src/components/widgets/spoolman/SpoolmanCard.vue b/src/components/widgets/spoolman/SpoolmanCard.vue
@@ -219,7 +219,7 @@ export default class SpoolmanCard extends Mixins(StateMixin) {
     return this.$store.getters['spoolman/getActiveSpool']
   }
 
-  get currency (): string | undefined {
+  get currency (): string | null {
     return this.$store.state.spoolman.currency
   }
 
diff --git a/src/store/printer/getters.ts b/src/store/printer/getters.ts
@@ -758,7 +758,7 @@ export const getters: GetterTree<PrinterState, RootState> = {
     ] as const
 
     const sensors = Object.keys(state.printer)
-      .reduce((groups, item) => {
+      .reduce<Record<string, Sensor>>((groups, item) => {
         const [type, nameFromSplit] = item.split(' ', 2)
         const name = nameFromSplit ?? item
 
@@ -790,7 +790,7 @@ export const getters: GetterTree<PrinterState, RootState> = {
         }
 
         return groups
-      }, {} as Record<string, Sensor>)
+      }, {})
 
     return Object.values(sensors)
       .sort((a, b) => a.type.localeCompare(b.type) || a.name.localeCompare(b.name))
@@ -1044,11 +1044,11 @@ export const getters: GetterTree<PrinterState, RootState> = {
     const knownCommands: GcodeHelp = rootGetters['console/getAllKnownCommands']
 
     return Object.entries(knownCommands)
-      .reduce((availableCommands, [key, help]) => {
+      .reduce<GcodeCommands>((availableCommands, [key, help]) => {
         availableCommands[key] = { help }
 
         return availableCommands
-      }, {} as GcodeCommands)
+      }, {})
   },
 
   getIsManualProbeActive: (state) => {
diff --git a/src/store/version/getters.ts b/src/store/version/getters.ts
@@ -68,7 +68,7 @@ export const getters: GetterTree<VersionState, RootState> = {
     const componentVersionInfo = state.version_info[component]
     if (componentVersionInfo && 'git_messages' in componentVersionInfo) {
       const result = [...componentVersionInfo.commits_behind]
-        .reduce((groups, commitItem) => {
+        .reduce<Record<number, CommitItem[]>>((groups, commitItem) => {
           const dateAndTime = new Date(+commitItem.date * 1000)
           const dateOnly = +(new Date(dateAndTime.getFullYear(), dateAndTime.getMonth(), dateAndTime.getDate()))
 
@@ -79,7 +79,7 @@ export const getters: GetterTree<VersionState, RootState> = {
           }
 
           return groups
-        }, {} as Record<number, CommitItem[]>)
+        }, {})
       return {
         keys: Object
           .keys(result)

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ export default class SpoolmanCard extends Mixins(StateMixin) {`
`219`	`219`	`return this.$store.getters['spoolman/getActiveSpool']`
`220`	`220`	`}`
`221`	`221`
`222`		`- get currency (): string \| undefined {`
	`222`	`+ get currency (): string \| null {`
`223`	`223`	`return this.$store.state.spoolman.currency`
`224`	`224`	`}`
`225`	`225`