refactor: optimize code (#23)

* refactor: optimize code

* refactor: optimize code

Author: chouchouji

src/extension.ts

@@ -170,14 +170,11 @@ class AliasView implements vscode.TreeDataProvider<AliasItem> {
   }
 
   convertAliasToObject() {
-    const data = this.globalState.keys().reduce((acc: Record<string, Alias[]>, key: string) => {
-      const aliases = normalizeAliasesToArray<Alias>(this.globalState.get(key))
-      Reflect.set(acc, key, aliases)
-
-      return acc
-    }, {})
+    const aliases = this.globalState
+      .keys()
+      .map((key) => [key, normalizeAliasesToArray<Alias>(this.globalState.get(key))])
 
-    return data
+    return Object.fromEntries(aliases)
   }
 
   async exportAlias() {

src/utils.ts

@@ -1,4 +1,4 @@
-import { isArray, isEmpty } from 'rattail'
+import { isArray } from 'rattail'
 import type { Alias } from './types'
 
 /**
@@ -158,9 +158,7 @@ export function normalizeAliasesToArray<T>(value: T[] | undefined) {
  * @returns {string}
  */
 export function formatUnaliasCommand(aliases: Alias[]) {
-  return aliases.reduce((acc, alias) => {
-    return `${acc} ${alias.aliasName}`
-  }, 'unalias')
+  return aliases.reduce((acc, alias) => `${acc} ${alias.aliasName}`, 'unalias')
 }
 
 /**
@@ -200,31 +198,25 @@ export function mergeAlias(source: Record<string, Alias[]>, target: Record<strin
 
 /**
  * get all aliases from text
- * @param {string} content
+ * @param {string} text
  * @returns {Alias[]}
  */
-export function filterAliases(content: string) {
-  if (isEmpty(content)) {
+export function filterAliases(text: string) {
+  const trimText = text.trim()
+  if (trimText.length === 0) {
     return []
   }
 
-  const aliases = content
+  const aliases = trimText
     .split('\n')
+    .map((text) => resolveAlias(text.trim()))
     .filter(Boolean)
-    .map((text) => text.trim())
-    .reduce((acc: Alias[], text) => {
-      const alias = resolveAlias(text)
-      if (alias) {
-        const { aliasName, command } = alias
-        acc.push({
-          aliasName,
-          command,
-          frequency: 0,
-          description: '',
-        })
-      }
-      return acc
-    }, [])
+    .map((alias) => ({
+      aliasName: alias!.aliasName,
+      command: alias!.command,
+      frequency: 0,
+      description: '',
+    }))
 
   return aliases
 }

tests/utils.spec.ts

@@ -174,8 +174,24 @@ describe('test all values are not equal to target', () => {
 })
 
 describe('test filter all alias from string', () => {
-  it('no any alias', () => {
-    expect(filterAliases(`al`)).toStrictEqual([])
+  it('empty string', () => {
+    expect(
+      filterAliases(`
+
+
+        `),
+    ).toStrictEqual([])
+  })
+
+  it('no any valid alias', () => {
+    expect(
+      filterAliases(`
+
+        test
+test
+        # test   
+alias c='clear' test`),
+    ).toStrictEqual([])
   })
 
   it('all valid aliases', () => {