From d5559df52101820b85e12b120894a85ac5fb3989 Mon Sep 17 00:00:00 2001 From: Mishig Date: Mon, 22 Jan 2024 09:49:36 +0100 Subject: [PATCH] [JS] use shorthand notation (#711) * [JS] use shorthand notation * add `"object-shorthand": ["error", "always"],` * fix "Expected method shorthand object-shorthand" * format --- .eslintrc.cjs | 1 + src/lib/server/auth.ts | 2 +- src/lib/server/endpoints/openai/endpointOai.ts | 2 +- src/lib/server/sentenceSimilarity.ts | 2 +- src/lib/server/websearch/runWebSearch.ts | 4 ++-- src/lib/utils/loadClientCerts.ts | 2 +- src/routes/conversation/+server.ts | 2 +- src/routes/conversation/[id]/+page.svelte | 2 +- src/routes/conversation/[id]/+server.ts | 6 +++--- .../conversation/[id]/message/[messageId]/prompt/+server.ts | 2 +- src/routes/conversations/+page.server.ts | 2 +- src/routes/login/+page.server.ts | 2 +- src/routes/logout/+page.server.ts | 2 +- 13 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 93a488b1..1590a8c0 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -34,6 +34,7 @@ module.exports = { argsIgnorePattern: "^_", }, ], + "object-shorthand": ["error", "always"], }, env: { browser: true, diff --git a/src/lib/server/auth.ts b/src/lib/server/auth.ts index e4eec988..50ab3fdb 100644 --- a/src/lib/server/auth.ts +++ b/src/lib/server/auth.ts @@ -57,7 +57,7 @@ export function refreshSessionCookie(cookies: Cookies, sessionId: string) { } export async function findUser(sessionId: string) { - const session = await collections.sessions.findOne({ sessionId: sessionId }); + const session = await collections.sessions.findOne({ sessionId }); if (!session) { return null; diff --git a/src/lib/server/endpoints/openai/endpointOai.ts b/src/lib/server/endpoints/openai/endpointOai.ts index 93cf8776..c878b30e 100644 --- a/src/lib/server/endpoints/openai/endpointOai.ts +++ b/src/lib/server/endpoints/openai/endpointOai.ts @@ -30,7 +30,7 @@ export async function endpointOai( const openai = new OpenAI({ apiKey: apiKey ?? "sk-", - baseURL: baseURL, + baseURL, }); if (completion === "completions") { diff --git a/src/lib/server/sentenceSimilarity.ts b/src/lib/server/sentenceSimilarity.ts index 9d9386b4..90066ecc 100644 --- a/src/lib/server/sentenceSimilarity.ts +++ b/src/lib/server/sentenceSimilarity.ts @@ -28,7 +28,7 @@ export async function findSimilarSentences( (sentenceEmbedding: Embedding, index: number) => { return { distance: innerProduct(queryEmbedding, sentenceEmbedding), - index: index, + index, }; } ); diff --git a/src/lib/server/websearch/runWebSearch.ts b/src/lib/server/websearch/runWebSearch.ts index 76b5106f..c6448702 100644 --- a/src/lib/server/websearch/runWebSearch.ts +++ b/src/lib/server/websearch/runWebSearch.ts @@ -25,7 +25,7 @@ export async function runWebSearch( })() satisfies Message[]; const webSearch: WebSearch = { - prompt: prompt, + prompt, searchQuery: "", results: [], context: "", @@ -35,7 +35,7 @@ export async function runWebSearch( }; function appendUpdate(message: string, args?: string[], type?: "error" | "update") { - updatePad({ type: "webSearch", messageType: type ?? "update", message: message, args: args }); + updatePad({ type: "webSearch", messageType: type ?? "update", message, args }); } try { diff --git a/src/lib/utils/loadClientCerts.ts b/src/lib/utils/loadClientCerts.ts index feb8c01e..20135b66 100644 --- a/src/lib/utils/loadClientCerts.ts +++ b/src/lib/utils/loadClientCerts.ts @@ -42,7 +42,7 @@ export function loadClientCertificates( key: clientKey, ca: caCert, passphrase: clientKeyPassword, - rejectUnauthorized: rejectUnauthorized, + rejectUnauthorized, }, }); diff --git a/src/routes/conversation/+server.ts b/src/routes/conversation/+server.ts index 2870eddd..94901c6e 100644 --- a/src/routes/conversation/+server.ts +++ b/src/routes/conversation/+server.ts @@ -64,7 +64,7 @@ export const POST: RequestHandler = async ({ locals, request }) => { preprompt: preprompt === model?.preprompt ? model?.preprompt : preprompt, createdAt: new Date(), updatedAt: new Date(), - embeddingModel: embeddingModel, + embeddingModel, ...(locals.user ? { userId: locals.user._id } : { sessionId: locals.sessionId }), ...(values.fromShare ? { meta: { fromShareId: values.fromShare } } : {}), }); diff --git a/src/routes/conversation/[id]/+page.svelte b/src/routes/conversation/[id]/+page.svelte index 9dfcf5b8..b8633809 100644 --- a/src/routes/conversation/[id]/+page.svelte +++ b/src/routes/conversation/[id]/+page.svelte @@ -260,7 +260,7 @@ messages = messages.map((message) => { if (message.id === messageId) { oldScore = message.score; - return { ...message, score: score }; + return { ...message, score }; } return message; }); diff --git a/src/routes/conversation/[id]/+server.ts b/src/routes/conversation/[id]/+server.ts index 33c4c858..2e8c7484 100644 --- a/src/routes/conversation/[id]/+server.ts +++ b/src/routes/conversation/[id]/+server.ts @@ -39,7 +39,7 @@ export async function POST({ request, locals, params, getClientAddress }) { // register the event for ratelimiting await collections.messageEvents.insertOne({ - userId: userId, + userId, createdAt: new Date(), ip: getClientAddress(), }); @@ -265,7 +265,7 @@ export async function POST({ request, locals, params, getClientAddress }) { from: "assistant", content: output.token.text.trimStart(), webSearch: webSearchResults, - updates: updates, + updates, id: crypto.randomUUID(), createdAt: new Date(), updatedAt: new Date(), @@ -293,7 +293,7 @@ export async function POST({ request, locals, params, getClientAddress }) { { ...messages[messages.length - 1], content: output.generated_text, - updates: updates, + updates, updatedAt: new Date(), }, ]; diff --git a/src/routes/conversation/[id]/message/[messageId]/prompt/+server.ts b/src/routes/conversation/[id]/message/[messageId]/prompt/+server.ts index 5ecac0bb..421b2b06 100644 --- a/src/routes/conversation/[id]/message/[messageId]/prompt/+server.ts +++ b/src/routes/conversation/[id]/message/[messageId]/prompt/+server.ts @@ -40,7 +40,7 @@ export async function GET({ params, locals }) { preprompt: conv.preprompt, webSearch: messagesUpTo[messagesUpTo.length - 1].webSearch, messages: messagesUpTo, - model: model, + model, }); return new Response( diff --git a/src/routes/conversations/+page.server.ts b/src/routes/conversations/+page.server.ts index e4f7daae..31865de5 100644 --- a/src/routes/conversations/+page.server.ts +++ b/src/routes/conversations/+page.server.ts @@ -4,7 +4,7 @@ import { collections } from "$lib/server/database"; import { redirect } from "@sveltejs/kit"; export const actions = { - delete: async function ({ locals }) { + async delete({ locals }) { // double check we have a user to delete conversations for if (locals.user?._id || locals.sessionId) { await collections.conversations.deleteMany({ diff --git a/src/routes/login/+page.server.ts b/src/routes/login/+page.server.ts index 28692b53..ff4118b8 100644 --- a/src/routes/login/+page.server.ts +++ b/src/routes/login/+page.server.ts @@ -3,7 +3,7 @@ import { getOIDCAuthorizationUrl } from "$lib/server/auth"; import { base } from "$app/paths"; export const actions = { - default: async function ({ url, locals, request }) { + async default({ url, locals, request }) { // TODO: Handle errors if provider is not responding const referer = request.headers.get("referer"); const authorizationUrl = await getOIDCAuthorizationUrl( diff --git a/src/routes/logout/+page.server.ts b/src/routes/logout/+page.server.ts index bb42eeb8..5e91d6df 100644 --- a/src/routes/logout/+page.server.ts +++ b/src/routes/logout/+page.server.ts @@ -5,7 +5,7 @@ import { collections } from "$lib/server/database"; import { redirect } from "@sveltejs/kit"; export const actions = { - default: async function ({ cookies, locals }) { + async default({ cookies, locals }) { await collections.sessions.deleteOne({ sessionId: locals.sessionId }); cookies.delete(COOKIE_NAME, {