refactor: better code maintenability + optimized script execution

Author: Koalhack

src/controllers/FlowViewController.ts

@@ -0,0 +1,29 @@
+import type { ScriptManager } from '../scriptManager.js';
+import { FlowLauncher, sendJsonRpcRequest } from '../utils/flowLauncher.js';
+
+type FlowViewControllerArguments = {
+  manager: ScriptManager;
+};
+
+export class FlowViewController {
+  scriptManager: ScriptManager;
+
+  constructor({ manager }: FlowViewControllerArguments) {
+    this.scriptManager = manager;
+  }
+
+  // ─── METHOD: query ───────────────────────────────────────────────────────────────────
+  queryScript(parameter: string = '') {
+    const results = this.scriptManager.search(parameter ?? '');
+    const resultsFmt = FlowLauncher.searchResultFormat(results);
+
+    // Send result to Flow laucher via JsonRPC
+    sendJsonRpcRequest({ result: resultsFmt });
+  }
+
+  // ─── METHOD: run ─────────────────────────────────────────────────────────────────────
+  runSelectedScript(parameters: string) {
+    const scriptArguments = JSON.parse(parameters);
+    this.scriptManager.runScriptM(scriptArguments);
+  }
+}

src/main.ts

@@ -1,29 +1,21 @@
 import process from 'node:process';
 import type { Arguments } from './types.js';
 import { ScriptManager } from './scriptManager.js';
-import { FlowLauncher, sendJsonRpcRequest } from './utils/flowLauncher.js';
-import { Clipboard } from './utils/clipboard.js';
-import type { Script } from './models/Script.js';
+import { FlowViewController } from './controllers/FlowViewController.js';
 
 const args: Arguments = JSON.parse(process.argv[2] ?? '{}');
 const { method, parameters } = args;
 
-let scriptManager = new ScriptManager();
-scriptManager.init();
+const scriptManager = new ScriptManager();
+const flowViewController = new FlowViewController({ manager: scriptManager });
 
 if (method === 'query') {
-  let results = FlowLauncher.searchResultFormat(
-    scriptManager.search(parameters[0] ?? '')
-  );
-  sendJsonRpcRequest({ result: results });
+  // Init scriptManager to load all scripts
+  scriptManager.init();
+
+  flowViewController.queryScript(parameters[0] as string);
 }
 
 if (method === 'run') {
-  let clip = Clipboard.get();
-  let activeScript = scriptManager.scripts.filter(
-    script => script.name === parameters[0]
-  )[0];
-  const result = scriptManager.runScript(activeScript as Script, clip);
-  Clipboard.copy(result);
-  FlowLauncher.showMessage('New Result Copied!', 'Yeah !!!');
+  flowViewController.runSelectedScript(parameters[0] as string);
 }

src/models/Script.ts

@@ -3,7 +3,7 @@ import type { Metas } from '../types.js';
 import { MAIN_FUNCTION_EXEC } from '../const.js';
 import type { ScriptExecution } from './ScriptExecution.js';
 
-type ScriptArguments = {
+export type ScriptArguments = {
   script: string;
   parameters: Metas;
   builtIn: boolean;
@@ -13,6 +13,10 @@ export class Script {
   isBuiltInt: boolean;
   scriptCode: string;
 
+  //TODO: Add icon support
+
+  metas: Metas;
+
   name: string | undefined;
   desc: string | undefined;
   tags: string[] | undefined;
@@ -27,6 +31,8 @@ export class Script {
     this.isBuiltInt = builtIn;
 
     // Define metas
+    this.metas = parameters;
+
     this.name = parameters['name'] as string;
     this.desc = parameters['description'] as string;
     this.tags = (parameters['tags'] as string).split(TAGS_SEPARATOR);

src/models/ScriptExecution.ts

@@ -1,9 +1,12 @@
-import { FlowLauncher } from '../utils/flowLauncher.js';
-
 type ScriptExecutionArguments = {
   text: string;
 };
 
+// ╭────────────────────────────────────────────────────────────────────────────────╮
+// │   TODO: postInfo and postError functions (notify user)                         │
+// │   TODO: insert function (clipboard + new value)                                │
+// ╰────────────────────────────────────────────────────────────────────────────────╯
+
 export class ScriptExecution {
   fullText: string;
   constructor({ text }: ScriptExecutionArguments) {

src/scriptManager.ts

@@ -1,10 +1,12 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import type { Metas } from './types.js';
-import { Script } from './models/Script.js';
+import { Script, type ScriptArguments } from './models/Script.js';
 import { defaultScriptPath, metaEndTerm, metaStartTerm } from './const.js';
 import { matchesMetas, stringRange } from './utils/utils.js';
 import { ScriptExecution } from './models/ScriptExecution.js';
+import { Clipboard } from './utils/clipboard.js';
+import { FlowLauncher } from './utils/flowLauncher.js';
 
 export class ScriptManager {
   scripts: Script[];
@@ -15,6 +17,7 @@ export class ScriptManager {
 
   init() {
     this.loadDefaultScripts();
+    //TODO: Manage users scripts
   }
 
   loadDefaultScripts() {
@@ -71,9 +74,33 @@ export class ScriptManager {
     return results.sort(metaNameSort);
   }
 
+  runScriptM(scriptArguments: ScriptArguments) {
+    // Get clipboard content
+    const clip = Clipboard.get();
+
+    const script = new Script(scriptArguments);
+
+    const result = this.runScript(script, clip);
+
+    this.replaceText(result, clip);
+  }
+
   runScript(script: Script, text: string) {
     let scriptExecution = new ScriptExecution({ text: text });
+
     script.run(scriptExecution);
-    return scriptExecution.text;
+
+    return scriptExecution.text ?? '';
+  }
+
+  replaceText(newText: string, originText: string) {
+    if (newText !== originText) {
+      // Update clipboard with new value
+      Clipboard.copy(newText);
+
+      //TODO: Possibly change location in futur
+      // Notify User from change
+      FlowLauncher.showMessage('test');
+    }
   }
 }

src/utils/flowLauncher.ts

@@ -12,7 +12,13 @@ export const FlowLauncher = {
       Subtitle: script.desc ?? 'No description',
       JsonRPCAction: {
         method: 'run',
-        parameters: [script.name ?? '']
+        parameters: [
+          JSON.stringify({
+            script: script.scriptCode,
+            parameters: script.metas,
+            builtIn: script.isBuiltInt
+          })
+        ]
       },
       IcoPath: 'icon\\app.png',
       score: 0