Added `'dot-notation': ['error']` to `.eslint.cjs` (#5042) * Added 'dot-notation': ['error'], to `.eslint.cjs` * Ran `eslint --fix` to correct `dot-notation` errors. * Added `eslint-disable dot-notation` anywhere errors were caused. * Allowed dot-notation for uppercase properties: 'allowPattern': '[A-Z]\\w$' Check if `rule instanceof CSSStyleRule` https://github.com/SillyTavern/SillyTavern/pull/5042#discussion_r2711827148 * Fixed `await result.json();` types. * refactor: update dot-notation usage in CoquiTtsProvider and PresetManager --------- Co-authored-by: user <user@exmaple.com> Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>

a09c1a7a8405a4dc27cf787203da29ff1d5f738d

DeclineThyself <235079501+DeclineThyself@users.noreply.github.com>

Signed

Parents: 03f671ca72c1b42c40824d615b90cc08829d5b3f

.eslintrc.cjs+1 -1 Viewed

         'no-cond-assign': 'error',
         'no-unneeded-ternary': 'error',
         'no-irregular-whitespace': ['error', { skipStrings: true, skipTemplates: true }],
+        'dot-notation': ['error', { 'allowPattern': '[A-Z]\\w*$' }],
         // These rules should eventually be enabled.
         'no-async-promise-executor': 'off',
         'no-inner-declarations': 'off',

public/script.js+2 -2 Viewed

             chatInjects: injectedIndices?.map(index => arrMes[arrMes.length - index - 1])?.join('') || '',
             summarizeString: (extension_prompts['1_memory']?.value || ''),
             authorsNoteString: (extension_prompts['2_floating_prompt']?.value || ''),
-            smartContextString: (extension_prompts['chromadb']?.value || ''),
+            smartContextString: (extension_prompts.chromadb?.value || ''),
             chatVectorsString: (extension_prompts['3_vectors']?.value || ''),
             dataBankVectorsString: (extension_prompts['4_vectors_data_bank']?.value || ''),
             worldInfoString: worldInfoString,

         console.error(`Message #${mesId}'s DOM element is not valid.`);
         return;
+    }
-    const originalSwipeId = Number(chat[mesId]?.['swipe_id'] ?? 0);
+    const originalSwipeId = Number(chat[mesId]?.swipe_id ?? 0);
     let newSwipeId = Number(forceSwipeId ?? originalSwipeId);
     /**

public/scripts/extensions/tts/coqui.js+10 -10 Viewed

         // Check if already installed and propose to do it otherwise
         const model_id = modelDict[model_language][model_dataset][model_name].id;
         console.debug(DEBUG_PREFIX,'Check if model is already installed',model_id);
-        let result = await CoquiTtsProvider.checkmodel_state(model_id);
+        const result = await CoquiTtsProvider.checkmodel_state(model_id);
-        result = await result.json();
+        const resultJSON = await result.json();
-        const model_state = result['model_state'];
+        const model_state = resultJSON.model_state;
         console.debug(DEBUG_PREFIX, ' Model state:', model_state);

                     $('#coqui_api_model_install_status').text('Downloading model...');
                     $('#coqui_api_model_install_button').hide();
                     //toastr.info("For model "+model_id, DEBUG_PREFIX+" Started "+action, { timeOut: 10000, extendedTimeOut: 20000, preventDuplicates: true });
-                    let apiResult = await CoquiTtsProvider.installModel(model_id, action);
+                    const apiResult = await CoquiTtsProvider.installModel(model_id, action);
-                    apiResult = await apiResult.json();
+                    const apiResultJSON = await apiResult.json();
                     console.debug(DEBUG_PREFIX, 'Response:', apiResult);
-                    if (apiResult['status'] == 'done') {
+                    if (apiResultJSON.status == 'done') {
                         $('#coqui_api_model_install_status').text('Model installed and ready to use!');
                         $('#coqui_api_model_install_button').hide();
                         onModelNameChange_pointer();
+                    }
-                    if (apiResult['status'] == 'downloading') {
+                    if (apiResultJSON.status == 'downloading') {
                         toastr.error('Check extras console for progress', DEBUG_PREFIX + ' already downloading', { timeOut: 10000, extendedTimeOut: 20000, preventDuplicates: true });
                         $('#coqui_api_model_install_status').text('Already downloading a model, check extras console!');
                         $('#coqui_api_model_install_button').show();

     // Initialized local model once
     if (!coquiLocalModelsReceived) {
-        let result = await CoquiTtsProvider.getLocalModelList();
+        const result = await CoquiTtsProvider.getLocalModelList();
-        result = await result.json();
+        const resultJSON = await result.json();
-        coquiLocalModels = result['models_list'];
+        coquiLocalModels = resultJSON.models_list;
         $('#coqui_local_model_name').show();
         $('#coqui_local_model_name')

public/scripts/openai.js+1 -1 Viewed

     });
     // Smart Context (ChromaDB)
-    const smartContext = extensionPrompts['chromadb'];
+    const smartContext = extensionPrompts.chromadb;
     if (smartContext && smartContext.value) systemPrompts.push({
         role: 'system',
         content: smartContext.value,

public/scripts/preset-manager.js+3 -2 Viewed

             'show_hidden',
             'max_additions',
         ];
+        /** @type {Record<string, any>} */
         const settings = Object.assign({}, getSettingsByApiId(this.apiId));
         for (const key of filteredKeys) {

@@ -736,8 +737,8 @@ class PresetManager {
736	}	737	}
737		738
738	if (!this.isAdvancedFormatting() && this.apiId !== 'openai') {	739	if (!this.isAdvancedFormatting() && this.apiId !== 'openai') {
739	settings['genamt'] = amount_gen;	740	settings.genamt = amount_gen;
740	settings['max_length'] = max_context;	741	settings.max_length = max_context;
741	}	742	}
742		743
743	return settings;	744	return settings;

public/scripts/slash-commands/SlashCommandParser.js+6 -6 Viewed

             const pipeName = `_PARSER_PIPE_${uuidv4()}`;
             const storePipe = new SlashCommandExecutor(startIdx); {
                 storePipe.end = endIdx;
-                storePipe.command = this.commands['let'];
+                storePipe.command = this.commands.let;
                 storePipe.name = 'let';
                 const nameAss = new SlashCommandUnnamedArgumentAssignment();
                 nameAss.value = pipeName;

             const varName = `_PARSER_VAR_${uuidv4()}`;
             const setvar = new SlashCommandExecutor(startIdx); {
                 setvar.end = endIdx;
-                setvar.command = this.commands['let'];
+                setvar.command = this.commands.let;
                 setvar.name = 'let';
                 const nameAss = new SlashCommandUnnamedArgumentAssignment();
                 nameAss.value = varName;

             // return pipe
             const returnPipe = new SlashCommandExecutor(startIdx); {
                 returnPipe.end = endIdx;
-                returnPipe.command = this.commands['return'];
+                returnPipe.command = this.commands.return;
                 returnPipe.name = 'return';
                 const varAss = new SlashCommandUnnamedArgumentAssignment();
                 varAss.value = `{{var::${pipeName}}}`;

     parseBreakPoint() {
         const cmd = new SlashCommandBreakPoint();
         cmd.name = 'breakpoint';
-        cmd.command = this.commands['breakpoint'];
+        cmd.command = this.commands.breakpoint;
         cmd.start = this.index + 1;
         this.take('/breakpoint'.length);
         cmd.end = this.index;

     parseBreak() {
         const cmd = new SlashCommandBreak();
         cmd.name = 'break';
-        cmd.command = this.commands['break'];
+        cmd.command = this.commands.break;
         cmd.start = this.index + 1;
         this.take('/break'.length);
         this.discardWhitespace();

         const cmd = new SlashCommandExecutor(start);
         cmd.name = ':';
         cmd.unnamedArgumentList = [];
-        cmd.command = this.commands['run'];
+        cmd.command = this.commands.run;
         this.commandIndex.push(cmd);
         this.scopeIndex.push(this.scope.getCopy());
         this.take(2); //discard "/:"

public/scripts/utils.js+1 -1 Viewed

@@ -2456,7 +2456,7 @@ export async function fetchFaFile(name) {
2456	const sheet = style.sheet;	2456	const sheet = style.sheet;
2457	style.remove();	2457	style.remove();
2458	return [...sheet.cssRules]	2458	return [...sheet.cssRules]
2459	.filter(rule => rule['style']?.content)	2459	.filter(rule => (rule instanceof CSSStyleRule && rule.style?.content))
2460	.map(rule => rule['selectorText'].split(/,\s*/).map(selector => selector.split('::').shift().slice(1)))	2460	.map(rule => rule['selectorText'].split(/,\s*/).map(selector => selector.split('::').shift().slice(1)))
2461	;	2461	;
2462	}	2462	}

src/endpoints/backends/chat-completions.js+1 -0 Viewed

+/* eslint-disable dot-notation */
 import process from 'node:process';
 import util from 'node:util';
 import express from 'express';

src/endpoints/openai.js+2 -2 Viewed

             console.warn('ElectronHub models request failed', result.statusText, text);
             return response.status(500).send(text);
+        }
+        /** @type {any} */
         const data = await result.json();
-        const models = data && Array.isArray(data['data']) ? data['data'] : [];
+        const models = data && Array.isArray(data.data) ? data.data : [];
         return response.json(models);
     } catch (error) {
         console.error('ElectronHub models fetch failed', error);

src/endpoints/search.js+1 -1 Viewed

         } catch (e) {
             return undefined;
+        }
-    })()?.['playerCaptionsTracklistRenderer'];
+    })()?.playerCaptionsTracklistRenderer;
     if (!captions) {
         throw new Error('Transcript disabled');