Skip to content

Commit f97f837

Browse files
committed
refactor: optimize code
1 parent 7b3cffe commit f97f837

File tree

2 files changed

+19
-21
lines changed

2 files changed

+19
-21
lines changed

src/utils.ts

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { isArray, isEmpty } from 'rattail'
1+
import { isArray } from 'rattail'
22
import type { Alias } from './types'
33

44
/**
@@ -158,9 +158,7 @@ export function normalizeAliasesToArray<T>(value: T[] | undefined) {
158158
* @returns {string}
159159
*/
160160
export function formatUnaliasCommand(aliases: Alias[]) {
161-
return aliases.reduce((acc, alias) => {
162-
return `${acc} ${alias.aliasName}`
163-
}, 'unalias')
161+
return aliases.reduce((acc, alias) => `${acc} ${alias.aliasName}`, 'unalias')
164162
}
165163

166164
/**
@@ -204,27 +202,20 @@ export function mergeAlias(source: Record<string, Alias[]>, target: Record<strin
204202
* @returns {Alias[]}
205203
*/
206204
export function filterAliases(content: string) {
207-
if (isEmpty(content)) {
205+
if (content.length === 0) {
208206
return []
209207
}
210208

211209
const aliases = content
212210
.split('\n')
211+
.map((text) => resolveAlias(text.trim()))
213212
.filter(Boolean)
214-
.map((text) => text.trim())
215-
.reduce((acc: Alias[], text) => {
216-
const alias = resolveAlias(text)
217-
if (alias) {
218-
const { aliasName, command } = alias
219-
acc.push({
220-
aliasName,
221-
command,
222-
frequency: 0,
223-
description: '',
224-
})
225-
}
226-
return acc
227-
}, [])
213+
.map((alias) => ({
214+
aliasName: alias!.aliasName,
215+
command: alias!.command,
216+
frequency: 0,
217+
description: '',
218+
}))
228219

229220
return aliases
230221
}

tests/utils.spec.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,15 @@ describe('test all values are not equal to target', () => {
174174
})
175175

176176
describe('test filter all alias from string', () => {
177-
it('no any alias', () => {
178-
expect(filterAliases(`al`)).toStrictEqual([])
177+
it('no any valid alias', () => {
178+
expect(
179+
filterAliases(`
180+
181+
test
182+
test
183+
# test
184+
alias c='clear' test`),
185+
).toStrictEqual([])
179186
})
180187

181188
it('all valid aliases', () => {

0 commit comments

Comments
 (0)