fix for arg input default value; better one-liner

averrin · Jul 19, 2022 · 6b07da4 · 6b07da4
1 parent 011d9f9
commit 6b07da4
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -33,6 +33,7 @@ It's not going to be MATT's alternative, so actions are pretty basic
 
 ## Plans
 - [ ] Documentation
+- [ ] Extension API
 - [ ] v10 support
 - [ ] Beginner / Expert UI mode
 - [ ] Better import / export

diff --git a/src/modules/Sequencer.js b/src/modules/Sequencer.js
@@ -22,6 +22,7 @@ export class DSequence {
   async prepare(overrides) {
     overrides = overrides || {};
     for (const [name, value] of Object.entries(overrides)) {
+      if (value === null) continue;
       const v = this.variables.find(v => v.name == name);
       if (v) {
         v.override(value)

diff --git a/src/view/components/ArgInput.svelte b/src/view/components/ArgInput.svelte
@@ -7,6 +7,7 @@
    import { XIcon } from "@rgossiaux/svelte-heroicons/solid";
    import { HsvPicker } from "svelte-color-picker";
    import { v4 as uuidv4 } from "uuid";
+   const dispatch = createEventDispatcher();
 
    export let id = uuidv4();
    export let value;
@@ -23,6 +24,7 @@
    let spec = argSpecs.find((s) => s.id == type);
    if (value === undefined || value === null || (value === "" && "default" in spec && value !== spec.default)) {
       resetValue();
+      debounce(dispatch("change", value), 200);
    }
 
    function selectFile() {
@@ -58,7 +60,6 @@
 
    import { createEventDispatcher } from "svelte";
 
-   const dispatch = createEventDispatcher();
    let options = additionalItems;
    if (spec && "options" in spec) {
       options = [...spec.options, ...additionalItems].flat();
@@ -98,7 +99,7 @@
    }
    function resetValue() {
       if (spec.options) {
-         value = spec.options[0];
+         value = spec.options[0].value;
       } else if ("default" in spec) {
          value = spec.default;
       } else {

diff --git a/src/view/components/SequencerTab.svelte b/src/view/components/SequencerTab.svelte
@@ -16,6 +16,7 @@
    export let onTagClick;
    let seq;
    let fullCode = "";
+   let oneliner = "";
    const unsubscribe = sequences.subscribe((seqs) => {
       if (!seq) {
          seq =
@@ -24,10 +25,12 @@
             new DSequence(uuidv4(), "New Sequence");
       }
       fullCode = getCode();
+      oneliner = getOnelliner();
       globalThis.game.settings.set(moduleId, SETTINGS.SELECTED_SEQ, seq.id);
    });
    $: debounce(() => {
       fullCode = getCode();
+      oneliner = getOnelliner();
    }, 200);
    onDestroy(unsubscribe);
 
@@ -36,6 +39,15 @@
       return seq.convertToCode();
    }
 
+   function getOnelliner() {
+      let vars = {};
+      for (const v of seq.variables) {
+         vars[v.name] = null;
+      }
+      vars = JSON.stringify(vars);
+      return `await Director.playSequence("${seq.title}", ${vars});`;
+   }
+
    function addSeq() {
       sequences.update((seqs) => {
          seq = new DSequence(uuidv4(), `New Sequence ${seqs.length}`);
@@ -126,7 +138,7 @@
                listAutoWidth={false}
             />
             <CopyToClipboard
-               text={`await Director.playSequence("${seq.title}")`}
+               text={oneliner}
                on:copy={(_) => globalThis.ui.notifications.info("Oneliner copied!")}
                let:copy
             >