Skip to content

Commit 71da810

Browse files
Merge pull request #29 from sinProject-Inc/25-variable-and-function-names-to-snake_case
close #25
2 parents 471572d + e1f2899 commit 71da810

9 files changed

Lines changed: 121 additions & 51 deletions

File tree

.eslintrc.cjs

Lines changed: 75 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,85 @@ module.exports = {
66
ignorePatterns: ['*.cjs'],
77
overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }],
88
settings: {
9-
'svelte3/typescript': () => require('typescript')
9+
'svelte3/typescript': () => require('typescript'),
1010
},
1111
parserOptions: {
1212
sourceType: 'module',
13-
ecmaVersion: 2020
13+
ecmaVersion: 2020,
1414
},
1515
env: {
1616
browser: true,
1717
es2017: true,
18-
node: true
19-
}
20-
};
18+
node: true,
19+
},
20+
rules: {
21+
'@typescript-eslint/explicit-member-accessibility': ['error'],
22+
'@typescript-eslint/explicit-function-return-type': ['warn'],
23+
'@typescript-eslint/naming-convention': [
24+
'error',
25+
{
26+
selector: 'typeParameter',
27+
format: ['UPPER_CASE'],
28+
},
29+
{
30+
selector: ['class', 'interface', 'typeAlias'],
31+
format: ['PascalCase'],
32+
},
33+
{
34+
selector: ['method', 'function'],
35+
modifiers: ['private'],
36+
format: ['snake_case'],
37+
leadingUnderscore: 'require',
38+
},
39+
{
40+
selector: ['method', 'function'],
41+
modifiers: ['protected'],
42+
format: ['snake_case'],
43+
leadingUnderscore: 'require',
44+
},
45+
{
46+
selector: ['method', 'function'],
47+
format: ['snake_case'],
48+
},
49+
{
50+
selector: [
51+
'property',
52+
'accessor',
53+
'parameter',
54+
'parameterProperty',
55+
'variable',
56+
'enumMember',
57+
],
58+
modifiers: ['private'],
59+
format: ['snake_case'],
60+
leadingUnderscore: 'require',
61+
},
62+
{
63+
selector: [
64+
'property',
65+
'accessor',
66+
'parameter',
67+
'parameterProperty',
68+
'variable',
69+
'enumMember',
70+
],
71+
modifiers: ['protected'],
72+
format: ['snake_case'],
73+
leadingUnderscore: 'require',
74+
},
75+
{
76+
selector: ['accessor', 'parameter', 'parameterProperty', 'enumMember'],
77+
format: ['snake_case'],
78+
},
79+
{
80+
selector: ['variable'],
81+
format: ['snake_case', 'UPPER_CASE', 'camelCase'],
82+
},
83+
// {
84+
// selector: ['property'],
85+
// format: ['snake_case', 'UPPER_CASE', 'camelCase'],
86+
// },
87+
// TODO: 引数、関数、クラス、インターフェイス、enumのメンバー名のルール
88+
],
89+
},
90+
}

src/hooks.server.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ export const handle: Handle = async ({ event, resolve }) => {
99
const session_id = cookiesManager.session_id
1010
if (!session_id) return await resolve(event)
1111

12-
const auth_token = await Auth.findAuthToken(session_id)
12+
const auth_token = await Auth.find_auth_token(session_id)
1313
if (!auth_token) return await resolve(event)
1414

15-
await Auth.accessValid(auth_token.id, event.cookies)
15+
await Auth.access_valid(auth_token.id, event.cookies)
1616

1717
event.locals.user = {
1818
twitter_id: auth_token.user.twitter_id,

src/lib/auth.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import { CookiesManager } from "./cookies_manager"
44
import { Database, db } from "./database"
55

66
export class Auth {
7-
public static async getSessionLifetimeSec(): Promise<number> {
8-
return await Database.getAppSettingInt('session_lifetime_sec')
7+
public static async get_session_lifetime_sec(): Promise<number> {
8+
return await Database.get_app_setting_int('session_lifetime_sec')
99
}
1010

11-
public static getLimit(lifetime_sec: number): Date {
11+
public static get_limit(lifetime_sec: number): Date {
1212
const limit = new Date()
1313

1414
if (lifetime_sec == 0) console.warn('lifetime_sec is 0')
@@ -18,11 +18,11 @@ export class Auth {
1818
return limit
1919
}
2020

21-
public static async createAuthToken(
21+
public static async create_auth_token(
2222
user_id: number,
2323
session_lifetime_sec: number
2424
): Promise<AuthToken> {
25-
const session_limit = await Auth.getLimit(session_lifetime_sec)
25+
const session_limit = await Auth.get_limit(session_lifetime_sec)
2626

2727
const [auth_token] = await db.$transaction([
2828
db.authToken.create({
@@ -36,30 +36,30 @@ export class Auth {
3636
return auth_token
3737
}
3838

39-
public static async signIn(user_id: number, cookies: Cookies): Promise<void> {
40-
const session_lifetime_sec = await Auth.getSessionLifetimeSec()
41-
const auth_token = await Auth.createAuthToken(user_id, session_lifetime_sec)
39+
public static async sign_in(user_id: number, cookies: Cookies): Promise<void> {
40+
const session_lifetime_sec = await Auth.get_session_lifetime_sec()
41+
const auth_token = await Auth.create_auth_token(user_id, session_lifetime_sec)
4242

43-
new CookiesManager(cookies).setSessionId(auth_token.token)
43+
new CookiesManager(cookies).set_session_id(auth_token.token)
4444
}
4545

46-
public static async signOut(cookies: Cookies): Promise<void> {
46+
public static async sign_out(cookies: Cookies): Promise<void> {
4747
const cookiesManager = new CookiesManager(cookies)
4848

4949
await db.authToken.delete({ where: { token: cookiesManager.session_id } })
50-
cookiesManager.deleteSessionId()
50+
cookiesManager.delete_session_id()
5151
}
5252

53-
public static async findAuthToken(session_id: string): Promise<
53+
public static async find_auth_token(session_id: string): Promise<
5454
| (AuthToken & {
5555
user: User & {
5656
role: Role
5757
}
5858
})
5959
| null
6060
> {
61-
const session_lifetime_sec = await Auth.getSessionLifetimeSec()
62-
const session_limit = Auth.getLimit(session_lifetime_sec)
61+
const session_lifetime_sec = await Auth.get_session_lifetime_sec()
62+
const session_limit = Auth.get_limit(session_lifetime_sec)
6363

6464
const auth_token = await db.authToken.findFirst({
6565
where: {
@@ -78,7 +78,7 @@ export class Auth {
7878
return auth_token
7979
}
8080

81-
public static async updateAuthToken(auth_token_id: number): Promise<AuthToken> {
81+
public static async update_auth_token(auth_token_id: number): Promise<AuthToken> {
8282
const auth_token = await db.authToken.update({
8383
where: { id: auth_token_id },
8484
data: { updated_at: new Date() },
@@ -87,12 +87,12 @@ export class Auth {
8787
return auth_token
8888
}
8989

90-
public static async accessValid(auth_token_id: number, cookies?: Cookies): Promise<void> {
91-
const auth_token = await Auth.updateAuthToken(auth_token_id)
92-
const session_lifetime_sec = await Auth.getSessionLifetimeSec()
90+
public static async access_valid(auth_token_id: number, cookies?: Cookies): Promise<void> {
91+
const auth_token = await Auth.update_auth_token(auth_token_id)
92+
const session_lifetime_sec = await Auth.get_session_lifetime_sec()
9393

9494
if (cookies) {
95-
new CookiesManager(cookies).setSessionId(auth_token.token, session_lifetime_sec)
95+
new CookiesManager(cookies).set_session_id(auth_token.token, session_lifetime_sec)
9696
}
9797
}
9898
}

src/lib/cookies_manager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export class CookiesManager {
99
return this._cookies.get(CookiesManager._session_id_key) ?? ''
1010
}
1111

12-
public setSessionId(session_id: string, max_age_sec?: number): void {
12+
public set_session_id(session_id: string, max_age_sec?: number): void {
1313
this._cookies.set(CookiesManager._session_id_key, session_id, {
1414
path: '/',
1515
maxAge: max_age_sec,
@@ -20,7 +20,7 @@ export class CookiesManager {
2020
})
2121
}
2222

23-
public deleteSessionId(): void {
23+
public delete_session_id(): void {
2424
this._cookies.delete(CookiesManager._session_id_key)
2525
}
2626
}

src/lib/database.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ enum Roles {
88
export const db = new prisma.PrismaClient()
99

1010
export class Database {
11-
public static async upsertUser(twitter_id: string, access_token: string): Promise<User | undefined> {
11+
public static async upsert_user(twitter_id: string, access_token: string): Promise<User | undefined> {
1212
return await db.user.upsert({
1313
where: { twitter_id },
1414
update: { access_token },
1515
create: { twitter_id, access_token, role: { connect: { name: Roles.user } } },
1616
})
1717
}
1818

19-
public static async getAppSettingInt(key: string): Promise<number> {
19+
public static async get_app_setting_int(key: string): Promise<number> {
2020
const appSetting = await db.appSetting.findUnique({ where: { key } })
2121
const number_value = Number(appSetting?.value)
2222
const number_value_not_nan = Number.isNaN(number_value) ? 0 : number_value

src/routes/+page.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
console.log($page.data.user)
55
6-
function signInWithTwitter(): void {
6+
function sign_in_with_twitter(): void {
77
const form_element = document.getElementById('sign_in')
88
99
if (form_element instanceof HTMLFormElement) {
@@ -18,7 +18,7 @@
1818
</p>
1919

2020
<form method="POST" action="/sign_in" id="sign_in">
21-
<div class="sign_in" on:click={signInWithTwitter} on:keypress={signInWithTwitter}>
21+
<div class="sign_in" on:click={sign_in_with_twitter} on:keypress={sign_in_with_twitter}>
2222
<div class="flex_row_twitter">
2323
<img src="./twitter_social_icon_circle_blue.svg" alt="" width="20px" />
2424
<div>Sign in with Twitter</div>

src/routes/home/+page.svelte

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,20 @@
4646
4747
// console.log(timeline)
4848
49-
function toLocalDate(date?: string): string {
49+
function to_local_date(date?: string): string {
5050
if (!date) return ''
5151
5252
return new Date(date).toLocaleString('ja-JP')
5353
}
5454
55-
function isRetweet(tweet: components['schemas']['Tweet']): boolean {
55+
function is_retweet(tweet: components['schemas']['Tweet']): boolean {
5656
return (
5757
tweet.referenced_tweets?.some((referenced_tweet) => referenced_tweet.type === 'retweeted') ??
5858
false
5959
)
6060
}
6161
62-
function getTargetTweet(tweet: components['schemas']['Tweet']): components['schemas']['Tweet'] {
62+
function get_target_tweet(tweet: components['schemas']['Tweet']): components['schemas']['Tweet'] {
6363
if (tweet.referenced_tweets) {
6464
const referenced_tweet = tweet.referenced_tweets[0]
6565
@@ -72,17 +72,17 @@
7272
return tweet
7373
}
7474
75-
function getUser(
75+
function get_user(
7676
tweet: components['schemas']['Tweet'],
77-
isOriginal = false
77+
is_original = false
7878
): components['schemas']['User'] | undefined {
79-
const target_tweet = isOriginal ? tweet : getTargetTweet(tweet)
79+
const target_tweet = is_original ? tweet : get_target_tweet(tweet)
8080
8181
return user_map.get(target_tweet.author_id ?? '')
8282
}
8383
84-
function getText(tweet: components['schemas']['Tweet']): string {
85-
const target_tweet = getTargetTweet(tweet)
84+
function get_text(tweet: components['schemas']['Tweet']): string {
85+
const target_tweet = get_target_tweet(tweet)
8686
8787
return target_tweet.text ?? ''
8888
}
@@ -104,21 +104,21 @@
104104

105105
{#each tweets as tweet}
106106
<div class="element">
107-
{#if isRetweet(tweet)}
107+
{#if is_retweet(tweet)}
108108
<div class="retweet_row">
109109
<div class="avatar_above"><div class="retweet"><Retweet /></div></div>
110-
{getUser(tweet, true)?.name}さんがリツイートしました
110+
{get_user(tweet, true)?.name}さんがリツイートしました
111111
</div>
112112
{/if}
113113
<div class="tweet">
114-
<img class="avatar" src={getUser(tweet)?.profile_image_url} alt="avatar" />
114+
<img class="avatar" src={get_user(tweet)?.profile_image_url} alt="avatar" />
115115
<div class="text_column">
116116
<div class="username_row">
117-
<div class="name overflow_ellipsis">{getUser(tweet)?.name}</div>
118-
<div class="username overflow_ellipsis">@{getUser(tweet)?.username}</div>
119-
<div class="time">{toLocalDate(tweet.created_at)}</div>
117+
<div class="name overflow_ellipsis">{get_user(tweet)?.name}</div>
118+
<div class="username overflow_ellipsis">@{get_user(tweet)?.username}</div>
119+
<div class="time">{to_local_date(tweet.created_at)}</div>
120120
</div>
121-
{getText(tweet)}
121+
{get_text(tweet)}
122122
</div>
123123
</div>
124124
</div>

src/routes/sign_in/+server.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ export const GET: RequestHandler = async ({ cookies, url }) => {
5353

5454
// console.log(email)
5555

56-
const user = await Database.upsertUser(twitter_id, access_token)
56+
const user = await Database.upsert_user(twitter_id, access_token)
5757

5858
if (!user) return new Response('No user', { status: 500 })
5959

60-
await Auth.signIn(user.id, cookies)
60+
await Auth.sign_in(user.id, cookies)
6161

6262
throw redirect(302, '/')
6363
} catch (error) {

src/routes/sign_out/+page.server.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import { redirect, type Actions } from '@sveltejs/kit'
33
import type { PageServerLoad } from './$types'
44

55
export const load: PageServerLoad = async ({cookies}) => {
6-
await Auth.signOut(cookies)
6+
await Auth.sign_out(cookies)
77
throw redirect(302, '/')
88
}
99

1010
export const actions: Actions = {
1111
default: async ({ cookies }) => {
12-
await Auth.signOut(cookies)
12+
await Auth.sign_out(cookies)
1313
throw redirect(302, '/')
1414
},
1515
}

0 commit comments

Comments
 (0)