refactor(scriptManager): change match and sort function for better readability and futures changes

Author: Koalhack

src/scriptManager.ts

@@ -2,15 +2,15 @@ import fs from 'node:fs';
 import path from 'node:path';
 import type { Metas } from './types.js';
 import { Script, type ScriptArguments } from './models/Script.js';
+import { ScriptExecution } from './models/ScriptExecution.js';
 import {
   defaultScriptPath,
   metaEndTerm,
   metaStartTerm,
   NOTIFY,
   SCRIPT_EXTENSION
 } from './const.js';
-import { matchesMetas, stringRange } from './utils/utils.js';
-import { ScriptExecution } from './models/ScriptExecution.js';
+import { matchesObject, sortByProperty, stringRange } from './utils/utils.js';
 import { Clipboard } from './utils/clipboard.js';
 import { FlowLauncher } from './utils/flowLauncher.js';
 
@@ -59,25 +59,23 @@ export class ScriptManager {
     const QUERY_CHAR_LIMIT = 20;
     const ALL_SCRIPTS_CHAR = '*';
     const QUERIES_SEPARATOR = ' ';
-
-    const metaNameSort = (a: Script, b: Script): 1 | -1 =>
-      (a.name || '') < (b.name || '') ? 1 : -1;
+    const SORT_PROPERTY = 'name';
 
     if (query.length > QUERY_CHAR_LIMIT) return [];
 
-    if (query === ALL_SCRIPTS_CHAR) return this.scripts.sort(metaNameSort);
+    if (query === ALL_SCRIPTS_CHAR)
+      return sortByProperty(this.scripts, SORT_PROPERTY);
 
-    const normalizeQuery = query.toLowerCase();
-    const queries = new Set(normalizeQuery.split(QUERIES_SEPARATOR));
+    const queries = query.split(QUERIES_SEPARATOR);
 
     const results = this.scripts.filter(script =>
-      matchesMetas(Array.from(queries), {
+      matchesObject(queries, {
         name: script.name,
         tags: script.tags
       })
     );
 
-    return results.sort(metaNameSort);
+    return sortByProperty(results, SORT_PROPERTY);
   }
 
   runScriptM(scriptArguments: ScriptArguments) {

src/utils/utils.ts

@@ -20,10 +20,33 @@ export function stringRange(str: string, start: string, end: string): string {
 /**
  * Return match bool based on queries and metas
  * @param queries The multiples search term.
- * @param metas The searched metas.
+ * @param object The searched datas.
  */
-export function matchesMetas(queries: string[], metas: Metas): boolean {
+export function matchesObject(queries: string[], object: Object): boolean {
   return queries.every(query =>
-    Object.values(metas).some(meta => meta.includes(query))
+    Object.values(object).some(item => item.includes(query))
   );
 }
+
+/**
+ * Sorts an array of objects based on a specified property.
+ * @template T - The type of objects in the array.
+ * @template K - The key of the property to sort by.
+ * @param arr - The array of objects to sort.
+ * @param property - The property key to sort by.
+ * @param ascending - Whether to sort in ascending order (default: true).
+ */
+export function sortByProperty<T, K extends keyof T>(
+  arr: T[],
+  property: K,
+  ascending: boolean = true
+): T[] {
+  return arr.sort((a, b) => {
+    const valueA = a[property];
+    const valueB = b[property];
+
+    if (valueA < valueB) return ascending ? -1 : 1;
+    if (valueA > valueB) return ascending ? 1 : -1;
+    return 0;
+  });
+}