Minor fixes and improvements

- Throw error if insert after line can't be found - #22
- Add drag & drop to macro commands
- Support user script member access in macros

Author: chhoumann

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "quickadd",
 	"name": "QuickAdd",
-	"version": "0.2.5",
+	"version": "0.2.6",
 	"minAppVersion": "0.12.00",
 	"description": "Quickly add new pages or content to your vault.",
 	"author": "Christian B. B. Houmann",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "quickadd",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Quickly add new pages or content to your vault.",
   "main": "main.js",
   "scripts": {

src/engine/MacroChoiceEngine.ts

@@ -16,13 +16,14 @@ import type QuickAdd from "../main";
 import type {IChoiceExecutor} from "../IChoiceExecutor";
 import {ChoiceType} from "../types/choices/choiceType";
 import type IMultiChoice from "../types/choices/IMultiChoice";
+import {getUserScriptMemberAccess} from "../utility";
 
 export class MacroChoiceEngine extends QuickAddChoiceEngine {
     public choice: IMacroChoice;
+    public params = {app: this.app, quickAddApi: QuickAddApi.GetApi(this.app), variables: {}};
     protected output: string;
     protected macros: IMacro[];
     protected choiceExecutor: IChoiceExecutor;
-    public params = {app: this.app, quickAddApi: QuickAddApi.GetApi(this.app), variables: {}};
     protected readonly plugin: QuickAdd;
 
     constructor(app: App, plugin: QuickAdd, choice: IMacroChoice, macros: IMacro[], choiceExecutor: IChoiceExecutor, variables: Map<string, string>) {
@@ -59,12 +60,12 @@ export class MacroChoiceEngine extends QuickAddChoiceEngine {
     // https://github.com/SilentVoid13/Templater/blob/master/src/UserTemplates/UserTemplateParser.ts
     protected async executeUserScript(command: IUserScript) {
         const userScript = await this.getUserScript(command);
-        if (!userScript || !userScript.default) {
+        if (!userScript) {
             log.logError(`failed to load user script ${command.path}.`);
             return;
         }
 
-        await this.userScriptDelegator(userScript.default);
+        await this.userScriptDelegator(userScript);
     }
 
     protected async userScriptDelegator(userScript: any) {
@@ -118,7 +119,20 @@ export class MacroChoiceEngine extends QuickAddChoiceEngine {
             }
 
             // @ts-ignore
-            return await import(filePath);
+            const userScript = await import(filePath);
+            if (!userScript || !userScript.default) return;
+
+            let script = userScript.default;
+
+            const {memberAccess} = getUserScriptMemberAccess(command.name);
+            if (memberAccess && memberAccess.length > 0) {
+                let member: string;
+                while(member = memberAccess.shift()) {
+                    script = script[member];
+                }
+            }
+
+            return script;
         }
     }
 

src/engine/SingleMacroEngine.ts

@@ -3,6 +3,7 @@ import type {IMacro} from "../types/macros/IMacro";
 import {MacroChoiceEngine} from "./MacroChoiceEngine";
 import type QuickAdd from "../main";
 import type {IChoiceExecutor} from "../IChoiceExecutor";
+import {getUserScriptMemberAccess} from "../utility";
 
 export class SingleMacroEngine extends MacroChoiceEngine {
     private memberAccess: string[];
@@ -12,12 +13,12 @@ export class SingleMacroEngine extends MacroChoiceEngine {
     }
 
     public async runAndGetOutput(macroName: string): Promise<string> {
-        const splitName: string[] = macroName.split('::');
-        const macro = this.macros.find(macro => macro.name === splitName[0]);
+        const {basename, memberAccess} = getUserScriptMemberAccess(macroName);
+        const macro = this.macros.find(macro => macro.name === basename);
         if (!macro) return;
 
-        if (splitName.length > 1) {
-            this.memberAccess = splitName.slice(1);
+        if (memberAccess && memberAccess.length > 0) {
+            this.memberAccess = memberAccess;
         }
 
         await this.executeCommands(macro.commands)

src/formatters/captureChoiceFormatter.ts

@@ -39,9 +39,8 @@ export class CaptureChoiceFormatter extends CompleteFormatter {
         if (this.choice.insertAfter.enabled) {
             const targetRegex = new RegExp(`\s*${this.choice.insertAfter.after}\s*`)
             const targetPosition = this.fileContent.split("\n").findIndex(line => targetRegex.test(line));
-            if (!targetPosition) {
-                log.logError(`unable to find insert after line in file.`);
-                return formatted;
+            if (targetPosition === -1) {
+                log.logError("unable to find insert after line in file.")
             }
 
             return this.insertTextAfterPositionInBody(formatted, this.fileContent, targetPosition);

src/gui/CommandList.svelte

@@ -1,36 +1,79 @@
 <script lang="ts">
-    import {faTrash} from "@fortawesome/free-solid-svg-icons";
+    import {faTrash, faBars} from "@fortawesome/free-solid-svg-icons";
     import Icon from "svelte-awesome/components/Icon.svelte";
     import type {ICommand} from "../types/macros/ICommand";
+    import {DndEvent, dndzone, SOURCES, SHADOW_PLACEHOLDER_ITEM_ID} from "svelte-dnd-action";
 
     export let commands: ICommand[];
     export let deleteCommand: (command: ICommand) => void;
+    let dragDisabled: boolean = true;
 
     export const updateCommandList = (newCommands: ICommand[]) => {
         commands = newCommands;
     }
+
+    function handleConsider(e: CustomEvent<DndEvent>) {
+        let {items: newItems} = e.detail;
+        commands = newItems as ICommand[];
+    }
+
+    function handleSort(e: CustomEvent<DndEvent>) {
+        let {items: newItems, info: {source}} = e.detail;
+
+        commands = newItems as ICommand[];
+
+        if (source === SOURCES.POINTER) {
+            dragDisabled = true;
+        }
+    }
+
+    function startDrag(e: CustomEvent<DndEvent>) {
+        e.preventDefault()
+        dragDisabled = false;
+    }
 </script>
 
-<div class="quickAddCommandList">
-    {#each commands as command, i}
+<ol class="quickAddCommandList"
+    use:dndzone={{items:commands, dragDisabled, dropTargetStyle: {}, type: "command"}}
+    on:consider={handleConsider}
+    on:finalize={handleSort}
+>
+    {#each commands.filter(c => c.id !== SHADOW_PLACEHOLDER_ITEM_ID) as command(command.id)}
         <div class="quickAddCommandListItem">
-            <span>{i+1}. {command.name}</span>
-            <span on:click={() => deleteCommand(command)} class="clickable">
-                <Icon data="{faTrash}" />
-            </span>
+            <li>{command.name}</li>
+            <div>
+                <span on:click={() => deleteCommand(command)} class="clickable">
+                    <Icon data="{faTrash}" />
+                </span>
+                <span on:mousedown={startDrag} on:touchstart={startDrag}
+                      aria-label="Drag-handle"
+                      style="{dragDisabled ? 'cursor: grab' : 'cursor: grabbing'};"
+                      tabindex={dragDisabled ? 0 : -1}
+                >
+                    <Icon data={faBars} />
+                </span>
+            </div>
         </div>
     {/each}
-</div>
+</ol>
 
 <style>
     .quickAddCommandListItem {
         display: flex;
+        flex: 1 1 auto;
         align-items: center;
         justify-content: space-between;
     }
 
     .quickAddCommandList {
+        display: grid;
+        grid-template-columns: auto;
+        width: auto;
+        border: 0 solid black;
+        overflow-y: auto;
+        height: auto;
         margin-bottom: 8px;
+        padding: 20px;
     }
 
     .clickable {

src/gui/MacroBuilder.ts

@@ -11,6 +11,7 @@ import CommandList from "./CommandList.svelte"
 import type IChoice from "../types/choices/IChoice";
 import {Choice} from "../types/choices/Choice";
 import {ChoiceCommand} from "../types/macros/ChoiceCommand";
+import {getUserScriptMemberAccess} from "../utility";
 
 export class MacroBuilder extends Modal {
     public macro: IMacro;
@@ -85,7 +86,9 @@ export class MacroBuilder extends Modal {
                 searchComponent.inputEl.addEventListener('keypress', (e: KeyboardEvent) => {
                     if (e.key === 'Enter') {
                         const value: string = searchComponent.getValue();
-                        const file = this.javascriptFiles.find(f => f.basename === value);
+                        const scriptBasename = getUserScriptMemberAccess(value).basename;
+
+                        const file = this.javascriptFiles.find(f => f.basename === scriptBasename);
                         if (!file) return;
 
                         this.macro.commands.push(new UserScript(value, file.path));

src/logger/logManager.ts

@@ -11,6 +11,7 @@ class LogManager {
 
     logError(message: string) {
         LogManager.loggers.forEach(logger => logger.logError(message));
+        throw new Error();
     }
 
     logWarning(message: string) {

src/utility.ts

@@ -89,4 +89,12 @@ export function getAllFolders(app: App): string[] {
     return app.vault.getAllLoadedFiles()
         .filter(f => f instanceof TFolder)
         .map(folder => folder.path);
+}
+
+export function getUserScriptMemberAccess(fullMemberPath: string): {basename: string | undefined, memberAccess: string[] | undefined} {
+    const fullMemberArray: string[] = fullMemberPath.split("::");
+    return {
+        basename: fullMemberArray[0],
+        memberAccess: fullMemberArray.slice(1)
+    }
 }

versions.json

@@ -1,3 +1,3 @@
 {
-	"0.2.5": "0.12.4"
+	"0.2.6": "0.12.4"
 }