diff --git a/zenno/.prettierrc b/zenno/.prettierrc index 819fa57..752d91b 100644 --- a/zenno/.prettierrc +++ b/zenno/.prettierrc @@ -1,8 +1,8 @@ { "useTabs": true, "singleQuote": true, - "trailingComma": "none", - "printWidth": 100, + "trailingComma": "all", + "printWidth": 130, "plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"], "overrides": [ { diff --git a/zenno/eslint.config.js b/zenno/eslint.config.js index bf092d2..811179f 100644 --- a/zenno/eslint.config.js +++ b/zenno/eslint.config.js @@ -22,8 +22,8 @@ export default defineConfig( rules: { // typescript-eslint strongly recommend that you do not use the no-undef lint rule on TypeScript projects. // see: https://typescript-eslint.io/troubleshooting/faqs/eslint/#i-get-errors-from-the-no-undef-rule-about-global-variables-not-being-defined-even-though-there-are-no-typescript-errors - 'no-undef': 'off' - } + 'no-undef': 'off', + }, }, { files: ['**/*.svelte', '**/*.svelte.ts', '**/*.svelte.js'], @@ -32,8 +32,8 @@ export default defineConfig( projectService: true, extraFileExtensions: ['.svelte'], parser: ts.parser, - svelteConfig - } - } - } + svelteConfig, + }, + }, + }, ); diff --git a/zenno/src/lib/CharaPick.svelte b/zenno/src/lib/CharaPick.svelte index d0b7c94..77739f1 100644 --- a/zenno/src/lib/CharaPick.svelte +++ b/zenno/src/lib/CharaPick.svelte @@ -1,25 +1,25 @@ {#if label} - + {/if} - + {#if !required} + + {/if} + {#each character[region] as c} + + {/each} diff --git a/zenno/src/lib/data/character.ts b/zenno/src/lib/data/character.ts index 9e70798..d6b2a3a 100644 --- a/zenno/src/lib/data/character.ts +++ b/zenno/src/lib/data/character.ts @@ -1,5 +1,5 @@ -import type { RegionalName } from '$lib/regional-name' -import globalJSON from '../../../../global/character.json' +import type { RegionalName } from '$lib/regional-name'; +import globalJSON from '../../../../global/character.json'; /** * Character definitions. @@ -8,16 +8,19 @@ export interface Character { /** * Character ID. */ - chara_id: number + chara_id: number; /** * Regional name of the character. * E.g., Special Week for Global, or スペシャルウィーク for JP. */ - name: string + name: string; } export const character = { - global: globalJSON as Character[], -} + global: globalJSON as Character[], +}; -export const charaNames = globalJSON.reduce((m, c) => m.set(c.chara_id, {en: c.name}), new Map()); +export const charaNames = globalJSON.reduce( + (m, c) => m.set(c.chara_id, { en: c.name }), + new Map(), +); diff --git a/zenno/src/lib/data/convo.ts b/zenno/src/lib/data/convo.ts index bb3c6bd..11630d0 100644 --- a/zenno/src/lib/data/convo.ts +++ b/zenno/src/lib/data/convo.ts @@ -1,5 +1,5 @@ import type { RegionalName } from '$lib/regional-name'; -import globalJSON from '../../../../global/conversation.json' +import globalJSON from '../../../../global/conversation.json'; /** * Lobby conversation data. @@ -42,33 +42,36 @@ export interface Conversation { export const conversation = { global: globalJSON as Conversation[], -} +}; export const byChara = { - global: globalJSON.reduce((m, c) => m.set(c.chara_id, (m.get(c.chara_id) ?? []).concat(c as Conversation)), new Map()), -} + global: globalJSON.reduce( + (m, c) => m.set(c.chara_id, (m.get(c.chara_id) ?? []).concat(c as Conversation)), + new Map(), + ), +}; -export const locations: Record = { - 110: {name: {en: 'right side front'}, group: 1}, - 120: {name: {en: 'right side front'}, group: 1}, - 130: {name: {en: 'right side front'}, group: 1}, - 210: {name: {en: 'left side table'}, group: 2}, - 220: {name: {en: 'left side table'}, group: 2}, - 310: {name: {en: 'center back seat'}, group: 3}, - 410: {name: {en: 'center posters'}, group: 4}, - 420: {name: {en: 'center posters'}, group: 4}, - 430: {name: {en: 'center posters'}, group: 4}, - 510: {name: {en: 'left side school map'}, group: 5}, - 520: {name: {en: 'left side school map'}, group: 5}, - 530: {name: {en: 'left side school map'}, group: 5}, -} +export const locations: Record = { + 110: { name: { en: 'right side front' }, group: 1 }, + 120: { name: { en: 'right side front' }, group: 1 }, + 130: { name: { en: 'right side front' }, group: 1 }, + 210: { name: { en: 'left side table' }, group: 2 }, + 220: { name: { en: 'left side table' }, group: 2 }, + 310: { name: { en: 'center back seat' }, group: 3 }, + 410: { name: { en: 'center posters' }, group: 4 }, + 420: { name: { en: 'center posters' }, group: 4 }, + 430: { name: { en: 'center posters' }, group: 4 }, + 510: { name: { en: 'left side school map' }, group: 5 }, + 520: { name: { en: 'left side school map' }, group: 5 }, + 530: { name: { en: 'left side school map' }, group: 5 }, +}; function locCharas(convos: Conversation[], locGroup: 1 | 2 | 3 | 4 | 5) { const m = convos .filter((c) => locations[c.location].group === locGroup) .flatMap((c) => [c.chara_1, c.chara_2, c.chara_3].filter((x) => x != null)) - .reduce((m, id) => m.set(id, 1 + (m.get(id) ?? 0)), new Map()) - return [...m].toSorted((a, b) => b[1] - a[1]) // descending + .reduce((m, id) => m.set(id, 1 + (m.get(id) ?? 0)), new Map()); + return [...m].toSorted((a, b) => b[1] - a[1]); // descending } export const groupPopulars = { @@ -79,4 +82,4 @@ export const groupPopulars = { 4: locCharas(conversation.global, 4), 5: locCharas(conversation.global, 5), }, -} +}; diff --git a/zenno/src/lib/regional-name.ts b/zenno/src/lib/regional-name.ts index 6d6dd6d..669373f 100644 --- a/zenno/src/lib/regional-name.ts +++ b/zenno/src/lib/regional-name.ts @@ -3,5 +3,5 @@ * Currently English is the only supported language. */ export interface RegionalName { - en: string + en: string; } diff --git a/zenno/src/lib/vitest-examples/Welcome.svelte.spec.ts b/zenno/src/lib/vitest-examples/Welcome.svelte.spec.ts index e6e648c..4c9a61b 100644 --- a/zenno/src/lib/vitest-examples/Welcome.svelte.spec.ts +++ b/zenno/src/lib/vitest-examples/Welcome.svelte.spec.ts @@ -7,9 +7,7 @@ describe('Welcome.svelte', () => { it('renders greetings for host and guest', async () => { render(Welcome, { host: 'SvelteKit', guest: 'Vitest' }); - await expect - .element(page.getByRole('heading', { level: 1 })) - .toHaveTextContent('Hello, SvelteKit!'); + await expect.element(page.getByRole('heading', { level: 1 })).toHaveTextContent('Hello, SvelteKit!'); await expect.element(page.getByText('Hello, Vitest!')).toBeInTheDocument(); }); }); diff --git a/zenno/src/routes/+layout.svelte b/zenno/src/routes/+layout.svelte index 4328b1c..cd51f6b 100644 --- a/zenno/src/routes/+layout.svelte +++ b/zenno/src/routes/+layout.svelte @@ -7,22 +7,22 @@ -