Rewrite part of evaluation logic, run prettier

Bubobubobubobubo · Nov 26, 2023 · eb8ef87 · eb8ef87
1 parent 22b5245
commit eb8ef87
Show file tree

Hide file tree

Showing 56 changed files with 2,079 additions and 2,610 deletions.
diff --git a/src/API.ts b/src/API.ts
@@ -41,16 +41,28 @@ interface ControlChange {
 export async function loadSamples() {
   return Promise.all([
     initAudioOnFirstClick(),
-    samples("github:tidalcycles/Dirt-Samples/master", undefined, { tag: "Tidal" }).then(() =>
-      registerSynthSounds()
-    ),
+    samples("github:tidalcycles/Dirt-Samples/master", undefined, {
+      tag: "Tidal",
+    }).then(() => registerSynthSounds()),
     registerZZFXSounds(),
-    samples(drums, "github:ritchse/tidal-drum-machines/main/machines/", { tag: "Machines" }),
-    samples("github:Bubobubobubobubo/Dough-Fox/main", undefined, { tag: "FoxDot" }),
-    samples("github:Bubobubobubobubo/Dough-Samples/main", undefined, { tag: "Pack" }),
-    samples("github:Bubobubobubobubo/Dough-Amiga/main", undefined, { tag: "Amiga" }),
-    samples("github:Bubobubobubobubo/Dough-Amen/main", undefined, { tag: "Amen" }),
-    samples("github:Bubobubobubobubo/Dough-Waveforms/main", undefined, { tag: "Waveforms" }),
+    samples(drums, "github:ritchse/tidal-drum-machines/main/machines/", {
+      tag: "Machines",
+    }),
+    samples("github:Bubobubobubobubo/Dough-Fox/main", undefined, {
+      tag: "FoxDot",
+    }),
+    samples("github:Bubobubobubobubo/Dough-Samples/main", undefined, {
+      tag: "Pack",
+    }),
+    samples("github:Bubobubobubobubo/Dough-Amiga/main", undefined, {
+      tag: "Amiga",
+    }),
+    samples("github:Bubobubobubobubo/Dough-Amen/main", undefined, {
+      tag: "Amen",
+    }),
+    samples("github:Bubobubobubobubo/Dough-Waveforms/main", undefined, {
+      tag: "Waveforms",
+    }),
   ]);
 }
 
@@ -1281,7 +1293,7 @@ export class UserAPI {
     const results: boolean[] = nArray.map(
       (value) =>
         (this.app.clock.pulses_since_origin - Math.floor(nudge * this.ppqn())) %
-        Math.floor(value * this.ppqn()) ===
+          Math.floor(value * this.ppqn()) ===
         0
     );
     return results.some((value) => value === true);
@@ -1301,7 +1313,7 @@ export class UserAPI {
     const results: boolean[] = nArray.map(
       (value) =>
         (this.app.clock.pulses_since_origin - nudgeInPulses) %
-        Math.floor(value * barLength) ===
+          Math.floor(value * barLength) ===
         0
     );
     return results.some((value) => value === true);
@@ -1901,10 +1913,13 @@ export class UserAPI {
   // =============================================================
 
   register = (name: string, operation: EventOperation<AbstractEvent>): void => {
-    AbstractEvent.prototype[name] = function(this: AbstractEvent, ...args: any[]) {
+    AbstractEvent.prototype[name] = function (
+      this: AbstractEvent,
+      ...args: any[]
+    ) {
       return operation(this, ...args);
     };
-  }
+  };
 
   public shuffle = <T>(array: T[]): T[] => {
     /**

diff --git a/src/AudioVisualisation.ts b/src/AudioVisualisation.ts
@@ -14,7 +14,7 @@ export const drawCircle = (
   x: number,
   y: number,
   radius: number,
-  color: string
+  color: string,
 ): void => {
   // @ts-ignore
   const canvas: HTMLCanvasElement = app.interface.feedback;
@@ -36,7 +36,7 @@ export const drawCircle = (
 export const blinkScript = (
   app: Editor,
   script: "local" | "global" | "init",
-  no?: number
+  no?: number,
 ) => {
   if (no !== undefined && no < 1 && no > 9) return;
   const blinkDuration =
@@ -55,7 +55,7 @@ export const blinkScript = (
       horizontalOffset + shift,
       app.interface.feedback.clientHeight - 15,
       8,
-      "#fdba74"
+      "#fdba74",
     );
   };
 
@@ -91,7 +91,7 @@ export const blinkScript = (
           0,
           0,
           (app.interface.feedback as HTMLCanvasElement).width,
-          (app.interface.feedback as HTMLCanvasElement).height
+          (app.interface.feedback as HTMLCanvasElement).height,
         );
     }, blinkDuration);
   }
@@ -141,7 +141,7 @@ let lastRenderTime: number = 0;
  */
 export const runOscilloscope = (
   canvas: HTMLCanvasElement,
-  app: Editor
+  app: Editor,
 ): void => {
   let config = app.osc;
   let analyzer = getAnalyser(config.fftSize);
@@ -155,7 +155,7 @@ export const runOscilloscope = (
     width: number,
     height: number,
     offset_height: number,
-    offset_width: number
+    offset_width: number,
   ) {
     const maxFPS = 30;
     const now = performance.now();
@@ -169,10 +169,12 @@ export const runOscilloscope = (
     canvasCtx.clearRect(0, 0, width, height);
 
     const performanceFactor = 1;
-    const reducedDataSize = Math.floor(freqDataArray.length * performanceFactor);
+    const reducedDataSize = Math.floor(
+      freqDataArray.length * performanceFactor,
+    );
     const numBars = Math.min(
       reducedDataSize,
-      app.osc.orientation === "horizontal" ? width : height
+      app.osc.orientation === "horizontal" ? width : height,
     );
     const barWidth =
       app.osc.orientation === "horizontal" ? width / numBars : height / numBars;
@@ -184,30 +186,30 @@ export const runOscilloscope = (
 
     for (let i = 0; i < numBars; i++) {
       barHeight = Math.floor(
-        freqDataArray[Math.floor(i * freqDataArray.length / numBars)] * ((height / 256) * app.osc.size)
+        freqDataArray[Math.floor((i * freqDataArray.length) / numBars)] *
+          ((height / 256) * app.osc.size),
       );
 
       if (app.osc.orientation === "horizontal") {
         canvasCtx.fillRect(
           x + offset_width,
           (height - barHeight) / 2 + offset_height,
           barWidth + 1,
-          barHeight
+          barHeight,
         );
         x += barWidth;
       } else {
         canvasCtx.fillRect(
           (width - barHeight) / 2 + offset_width,
           y + offset_height,
           barHeight,
-          barWidth + 1
+          barWidth + 1,
         );
         y += barWidth;
       }
     }
   }
 
-
   function draw() {
     // Update the canvas position on each cycle
     const WIDTH = canvas.width;
@@ -230,7 +232,7 @@ export const runOscilloscope = (
         -OFFSET_WIDTH,
         -OFFSET_HEIGHT,
         WIDTH + 2 * OFFSET_WIDTH,
-        HEIGHT + 2 * OFFSET_HEIGHT
+        HEIGHT + 2 * OFFSET_HEIGHT,
       );
       return;
     }
@@ -250,7 +252,7 @@ export const runOscilloscope = (
         -OFFSET_WIDTH,
         -OFFSET_HEIGHT,
         WIDTH + 2 * OFFSET_WIDTH,
-        HEIGHT + 2 * OFFSET_HEIGHT
+        HEIGHT + 2 * OFFSET_HEIGHT,
       );
     }
     canvasCtx.lineWidth = app.osc.thickness;

diff --git a/src/Clock.ts b/src/Clock.ts
@@ -48,7 +48,10 @@ export class Clock {
   lastPlayPressTime: number;
   totalPauseTime: number;
 
-  constructor(public app: Editor, ctx: AudioContext) {
+  constructor(
+    public app: Editor,
+    ctx: AudioContext,
+  ) {
     this.time_position = { bar: 0, beat: 0, pulse: 0 };
     this.time_signature = [4, 4];
     this.logicalTime = 0;

diff --git a/src/Documentation.ts b/src/Documentation.ts
@@ -47,7 +47,7 @@ export const makeExampleFactory = (application: Editor): Function => {
   const make_example = (
     description: string,
     code: string,
-    open: boolean = false
+    open: boolean = false,
   ) => {
     const codeId = `codeExample${application.exampleCounter++}`;
     // Store the code snippet in the data structure
@@ -143,7 +143,7 @@ export const updateDocumentationContent = (app: Editor, bindings: any) => {
     extensions: [showdownHighlight({ auto_detection: true }), ...bindings],
   });
   const converted_markdown = converter.makeHtml(
-    app.docs[app.currentDocumentationPane]
+    app.docs[app.currentDocumentationPane],
   );
   document.getElementById("documentation-content")!.innerHTML =
     converted_markdown;

diff --git a/src/DomElements.ts b/src/DomElements.ts
@@ -1,17 +1,15 @@
 import { type Editor } from "./main";
 
-
 export type ElementMap = {
   [key: string]:
-  | HTMLElement
-  | HTMLButtonElement
-  | HTMLDivElement
-  | HTMLInputElement
-  | HTMLSelectElement
-  | HTMLCanvasElement
-  | HTMLFormElement
-  | HTMLInputElement
-  ;
+    | HTMLElement
+    | HTMLButtonElement
+    | HTMLDivElement
+    | HTMLInputElement
+    | HTMLSelectElement
+    | HTMLCanvasElement
+    | HTMLFormElement
+    | HTMLInputElement;
 };
 
 export const singleElements = {
@@ -92,6 +90,4 @@ export const createDocumentationStyle = (app: Editor) => {
     tr: "",
     box: "border bg-red-500",
   };
-}
-
-
+};
diff --git a/src/EditorSetup.ts b/src/EditorSetup.ts
@@ -20,7 +20,7 @@ import {
   bracketMatching,
 } from "@codemirror/language";
 import { defaultKeymap, historyKeymap, history } from "@codemirror/commands";
-import { searchKeymap, highlightSelectionMatches } from "@codemirror/search"
+import { searchKeymap, highlightSelectionMatches } from "@codemirror/search";
 import {
   autocompletion,
   closeBrackets,
@@ -34,15 +34,15 @@ import { toposTheme } from "./themes/toposTheme";
 import { javascript } from "@codemirror/lang-javascript";
 import { inlineHoveringTips } from "./documentation/inlineHelp";
 import { toposCompletions, soundCompletions } from "./documentation/inlineHelp";
-import { javascriptLanguage } from "@codemirror/lang-javascript"
+import { javascriptLanguage } from "@codemirror/lang-javascript";
 
 export const jsCompletions = javascriptLanguage.data.of({
-  autocomplete: toposCompletions
-})
+  autocomplete: toposCompletions,
+});
 
 export const toposSoundCompletions = javascriptLanguage.data.of({
-  autocomplete: soundCompletions
-})
+  autocomplete: soundCompletions,
+});
 
 export const editorSetup: Extension = (() => [
   highlightActiveLineGutter(),
@@ -95,7 +95,9 @@ export const installEditor = (app: Editor) => {
     app.withLineNumbers.of(lines),
     app.fontSize.of(fontModif),
     app.hoveringCompartment.of(app.settings.tips ? inlineHoveringTips : []),
-    app.completionsCompartment.of(app.settings.completions ? [jsCompletions, toposSoundCompletions] : []),
+    app.completionsCompartment.of(
+      app.settings.completions ? [jsCompletions, toposSoundCompletions] : [],
+    ),
     editorSetup,
     toposTheme,
     app.chosenLanguage.of(javascript()),
@@ -114,7 +116,7 @@ export const installEditor = (app: Editor) => {
               return true;
             },
           },
-        ])
+        ]),
       ),
       keymap.of([indentWithTab]),
     ],
@@ -139,7 +141,7 @@ export const installEditor = (app: Editor) => {
         ".cm-gutters": {
           fontSize: `${app.settings.font_size}px`,
         },
-      })
+      }),
     ),
   });
 };