Move string utils to shared module

827fce4542c646a401575b2c0da816d5d661af9d

Cohee <18619528+Cohee1207@users.noreply.github.com>

public/scripts/extensions/connection-manager/index.js+2 -4 Viewed

 import { enumIcons } from '../../slash-commands/SlashCommandCommonEnumsProvider.js';
 import { enumTypes, SlashCommandEnumValue } from '../../slash-commands/SlashCommandEnumValue.js';
 import { SlashCommandParser } from '../../slash-commands/SlashCommandParser.js';
-import { uuidv4 } from '../../utils.js';
+import { collapseSpaces, getUniqueName, uuidv4 } from '../../utils.js';
 const MODULE_NAME = 'connection-manager';
 const NONE = '<None>';

  */
 const escapeArgument = (a) => a.replace(/"/g, '\\"').replace(/\|/g, '\\|');
-const collapseSpaces = (s) => s.replace(/\s+/g, ' ').trim();
-const makeUnique = (s, f, i) => { if (!f(s)) { return s; } else { while (f(`${s} (${i})`)) { i++; } return `${s} (${i})`; } };
 /**
  * Finds the best match for the search value.

     const profileForDisplay = makeFancyProfile(profile);
     const template = await renderExtensionTemplateAsync(MODULE_NAME, 'profile', { profile: profileForDisplay });
     const checkName = (n) => extension_settings.connectionManager.profiles.some(p => p.name === n);
-    const suggestedName = makeUnique(collapseSpaces(`${profile.api ?? ''} ${profile.model ?? ''} - ${profile.preset ?? ''}`), checkName, 1);
+    const suggestedName = getUniqueName(collapseSpaces(`${profile.api ?? ''} ${profile.model ?? ''} - ${profile.preset ?? ''}`), checkName);
     const name = forceName ?? await callGenericPopup(template, POPUP_TYPE.INPUT, suggestedName, { rows: 2 });
     if (!name) {

public/scripts/utils.js+12 -3 Viewed

     });
+}
+/**
+ * Collapses multiple spaces in a strings into one.
+ * @param {string} s String to process
+ * @returns {string} String with collapsed spaces
+ */
+export function collapseSpaces(s) {
+    return s.replace(/\s+/g, ' ').trim();
+}
 function postProcessText(text, collapse = true) {
     // Remove carriage returns
     text = text.replace(/\r/g, '');

@@ -2041,7 +2050,7 @@ export async function fetchFaFile(name) {
2041	style.remove();	2050	style.remove();
2042	return [...sheet.cssRules]	2051	return [...sheet.cssRules]
2043	.filter(rule => rule.style?.content)	2052	.filter(rule => rule.style?.content)
2044	.map(rule => rule.selectorText.split(/,\s*/).map(selector=>selector.split('::').shift().slice(1)))	2053	.map(rule => rule.selectorText.split(/,\s*/).map(selector => selector.split('::').shift().slice(1)))
2045	;	2054	;
2046	}	2055	}
2047	export async function fetchFa() {	2056	export async function fetchFa() {

                 qry.placeholder = 'Filter icons';
                 qry.autofocus = true;
                 const qryDebounced = debounce(() => {
-                    const result = faList.filter(fa => fa.find(className=>className.includes(qry.value.toLowerCase())));
+                    const result = faList.filter(fa => fa.find(className => className.includes(qry.value.toLowerCase())));
                     for (const fa of faList) {
                         if (!result.includes(fa)) {
                             fas[fa].classList.add('hidden');

                     opt.classList.add('menu_button');
                     opt.classList.add('fa-solid');
                     opt.classList.add(fa[0]);
-                    opt.title = fa.map(it=>it.slice(3)).join(', ');
+                    opt.title = fa.map(it => it.slice(3)).join(', ');
                     opt.dataset.result = POPUP_RESULT.AFFIRMATIVE.toString();
                     opt.addEventListener('click', () => value = fa[0]);
                     grid.append(opt);