diff --git a/src/lib/search.test.ts b/src/lib/search.test.ts index 0c5a390..a2743f3 100644 --- a/src/lib/search.test.ts +++ b/src/lib/search.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect } from "vitest"; -import { parseSearchString, createSearchRegexp, searchQueryToSaerchString } from "./search"; +import { parseSearchString, createSearchRegexp, searchQueryToSearchString } from "./search"; describe("parseInput", () => { it("引用符で囲まれた文字列は空白があっても区切られないこと", () => { @@ -134,7 +134,7 @@ describe("searchQueryToTerms", () => { }; const expected = "example test"; - expect(searchQueryToSaerchString(searchQuery)).toEqual(expected); + expect(searchQueryToSearchString(searchQuery)).toEqual(expected); }); it("オプションを含むクエリを文字列に変換できること", () => { @@ -144,7 +144,7 @@ describe("searchQueryToTerms", () => { options: { tag: ["exampleTag"], status: ["live"] }, }; const expected = "example tag:exampleTag status:live"; - expect(searchQueryToSaerchString(searchQuery)).toEqual(expected); + expect(searchQueryToSearchString(searchQuery)).toEqual(expected); }); it("ハッシュタグを含むクエリを文字列に変換できること", () => { @@ -154,7 +154,7 @@ describe("searchQueryToTerms", () => { options: {}, }; const expected = "example #tag1 #tag2"; - expect(searchQueryToSaerchString(searchQuery)).toEqual(expected); + expect(searchQueryToSearchString(searchQuery)).toEqual(expected); }); it("単語、オプション、ハッシュタグを含むクエリを文字列に変換できること", () => { @@ -164,7 +164,7 @@ describe("searchQueryToTerms", () => { options: { tag: ["exampleTag"], status: ["live"] }, }; const expected = "example test tag:exampleTag status:live #tag1"; - expect(searchQueryToSaerchString(searchQuery)).toEqual(expected); + expect(searchQueryToSearchString(searchQuery)).toEqual(expected); }); it("空のクエリを空文字列に変換できること", () => { @@ -174,7 +174,7 @@ describe("searchQueryToTerms", () => { options: {}, }; const expected = ""; - expect(searchQueryToSaerchString(searchQuery)).toEqual(expected); + expect(searchQueryToSearchString(searchQuery)).toEqual(expected); }); it("オプションが空の配列の場合は無視されること", () => { @@ -184,7 +184,7 @@ describe("searchQueryToTerms", () => { options: { tag: [] }, }; const expected = "example"; - expect(searchQueryToSaerchString(searchQuery)).toEqual(expected); + expect(searchQueryToSearchString(searchQuery)).toEqual(expected); }); it("空白を含むオプションの値がクォートされること", () => { @@ -194,6 +194,6 @@ describe("searchQueryToTerms", () => { options: { tag: ["example tag"] }, }; const expected = 'example "the space" tag:"example tag"'; - expect(searchQueryToSaerchString(searchQuery)).toEqual(expected); + expect(searchQueryToSearchString(searchQuery)).toEqual(expected); }); }); diff --git a/src/lib/search.ts b/src/lib/search.ts index d23cfe9..7001e02 100644 --- a/src/lib/search.ts +++ b/src/lib/search.ts @@ -58,7 +58,7 @@ function quoteIfSpace(str: string): string { } // SearchQueryを検索文字列に変換 -export function searchQueryToSaerchString(searchQuery: SearchQuery): string { +export function searchQueryToSearchString(searchQuery: SearchQuery): string { const { wordList, options, hashtagList } = searchQuery; const optionStr = Object.entries(options) .flatMap(([key, valueList]) => { diff --git a/src/store/searchStore.ts b/src/store/searchStore.ts index de97f49..dd1c809 100644 --- a/src/store/searchStore.ts +++ b/src/store/searchStore.ts @@ -1,7 +1,7 @@ import { acceptHMRUpdate, defineStore } from "pinia"; import { computed, ref } from "vue"; import { useScrollStore } from "./scrollStore"; -import { parseSearchString, searchQueryToSaerchString } from "@/lib/search"; +import { parseSearchString, searchQueryToSearchString } from "@/lib/search"; export const useSearchStore = defineStore("searchStore", () => { const scrollStore = useScrollStore(); @@ -62,7 +62,7 @@ export const useSearchStore = defineStore("searchStore", () => { } else { newStatusList = [...searchStatusList.value, "live"]; } - searchString.value = searchQueryToSaerchString({ + searchString.value = searchQueryToSearchString({ ...searchQuery.value, options: { ...options, status: newStatusList }, }); @@ -78,7 +78,7 @@ export const useSearchStore = defineStore("searchStore", () => { // 解除 if (talent === null) { - searchString.value = searchQueryToSaerchString({ + searchString.value = searchQueryToSearchString({ ...searchQuery.value, options: { ...options, talent: [] }, }); @@ -91,7 +91,7 @@ export const useSearchStore = defineStore("searchStore", () => { // セット newTalentList = [talent]; } - searchString.value = searchQueryToSaerchString({ + searchString.value = searchQueryToSearchString({ ...searchQuery.value, options: { ...options, talent: newTalentList }, });