diff --git a/src/API.ts b/src/API.ts index 3b406f6..5ad143b 100644 --- a/src/API.ts +++ b/src/API.ts @@ -9,10 +9,10 @@ import { import { tryEvaluate, evaluateOnce } from "./Evaluator"; import { DrunkWalk } from "./Utils/Drunk"; import { Editor } from "./main"; -import { SoundEvent } from "./classes/SoundEvent"; -import { MidiEvent, MidiParams } from "./classes/MidiEvent"; +import { SoundEvent } from "./Classes/SoundEvent"; +import { MidiEvent, MidiParams } from "./Classes/MidiEvent"; import { LRUCache } from "lru-cache"; -import { InputOptions, Player } from "./classes/ZPlayer"; +import { InputOptions, Player } from "./Classes/ZPlayer"; import { isGenerator, isGeneratorFunction, maybeToNumber } from "./Utils/Generic"; import { loadUniverse, @@ -27,12 +27,12 @@ import { soundMap, // @ts-ignore } from "superdough"; -import { Speaker } from "./extensions/StringExtensions"; +import { Speaker } from "./Extensions/StringExtensions"; import { getScaleNotes } from "zifferjs"; import { OscilloscopeConfig } from "./DOM/Visuals/Oscilloscope"; import { blinkScript } from "./DOM/Visuals/Blinkers"; -import { SkipEvent } from "./classes/SkipEvent"; -import { AbstractEvent, EventOperation } from "./classes/AbstractEvents"; +import { SkipEvent } from "./Classes/SkipEvent"; +import { AbstractEvent, EventOperation } from "./Classes/AbstractEvents"; import drums from "./tidal-drum-machines.json"; import { ShapeObject, createConicGradient, createLinearGradient, createRadialGradient, drawBackground, drawBall, drawBalloid, drawDonut, drawEquilateral, drawImage, drawPie, drawSmiley, drawStar, drawStroke, drawText, drawTriangular } from "./DOM/Visuals/CanvasVisuals"; diff --git a/src/DOM/Keyboard.ts b/src/DOM/Keyboard.ts index 34c9c47..56716cb 100644 --- a/src/DOM/Keyboard.ts +++ b/src/DOM/Keyboard.ts @@ -1,7 +1,7 @@ import { type Editor } from "../main"; import { vim } from "@replit/codemirror-vim"; import { tryEvaluate } from "../Evaluator"; -import { hideDocumentation, showDocumentation } from "../documentation/Documentation"; +import { hideDocumentation, showDocumentation } from "../Docs/Documentation"; import { openSettingsModal, openUniverseModal } from "../Editor/FileManagement"; export const registerFillKeys = (app: Editor) => { diff --git a/src/DOM/UILogic.ts b/src/DOM/UILogic.ts index 78f9f76..a3f86fd 100644 --- a/src/DOM/UILogic.ts +++ b/src/DOM/UILogic.ts @@ -8,7 +8,7 @@ import { hideDocumentation, showDocumentation, updateDocumentationContent, -} from "../documentation/Documentation"; +} from "../Docs/Documentation"; import { type Universe, template_universe, @@ -21,7 +21,7 @@ import { } from "../Editor/FileManagement"; import { loadSamples } from "../API"; import { tryEvaluate } from "../Evaluator"; -import { inlineHoveringTips } from "../documentation/inlineHelp"; +import { inlineHoveringTips } from "../Docs/inlineHelp"; import { lineNumbers } from "@codemirror/view"; import { jsCompletions } from "../Editor/EditorSetup"; import { saveState } from "./WindowBehavior"; diff --git a/src/DOM/Visuals/Blinkers.ts b/src/DOM/Visuals/Blinkers.ts index d14d765..70dc79e 100644 --- a/src/DOM/Visuals/Blinkers.ts +++ b/src/DOM/Visuals/Blinkers.ts @@ -1,4 +1,4 @@ -import { type Editor } from "../main"; +import { type Editor } from "../../main"; export const drawCircle = ( /** diff --git a/src/DOM/Visuals/Oscilloscope.ts b/src/DOM/Visuals/Oscilloscope.ts index 18309c9..e0be360 100644 --- a/src/DOM/Visuals/Oscilloscope.ts +++ b/src/DOM/Visuals/Oscilloscope.ts @@ -1,6 +1,6 @@ // @ts-ignore import { getAnalyser } from "superdough"; -import { Editor } from "../main"; +import { Editor } from "../../main"; export interface OscilloscopeConfig { enabled: boolean; diff --git a/src/documentation/Documentation.ts b/src/Docs/Documentation.ts similarity index 100% rename from src/documentation/Documentation.ts rename to src/Docs/Documentation.ts diff --git a/src/documentation/basics/TOPOS_COMMANDS.pdf b/src/Docs/basics/TOPOS_COMMANDS.pdf similarity index 100% rename from src/documentation/basics/TOPOS_COMMANDS.pdf rename to src/Docs/basics/TOPOS_COMMANDS.pdf diff --git a/src/documentation/basics/atelier.ts b/src/Docs/basics/atelier.ts similarity index 100% rename from src/documentation/basics/atelier.ts rename to src/Docs/basics/atelier.ts diff --git a/src/documentation/basics/code.ts b/src/Docs/basics/code.ts similarity index 100% rename from src/documentation/basics/code.ts rename to src/Docs/basics/code.ts diff --git a/src/documentation/basics/index.ts b/src/Docs/basics/index.ts similarity index 100% rename from src/documentation/basics/index.ts rename to src/Docs/basics/index.ts diff --git a/src/documentation/basics/interaction.ts b/src/Docs/basics/interaction.ts similarity index 100% rename from src/documentation/basics/interaction.ts rename to src/Docs/basics/interaction.ts diff --git a/src/documentation/basics/interface.ts b/src/Docs/basics/interface.ts similarity index 100% rename from src/documentation/basics/interface.ts rename to src/Docs/basics/interface.ts diff --git a/src/documentation/basics/keyboard.ts b/src/Docs/basics/keyboard.ts similarity index 100% rename from src/documentation/basics/keyboard.ts rename to src/Docs/basics/keyboard.ts diff --git a/src/documentation/basics/many_universes.svg b/src/Docs/basics/many_universes.svg similarity index 100% rename from src/documentation/basics/many_universes.svg rename to src/Docs/basics/many_universes.svg diff --git a/src/documentation/basics/mouse.ts b/src/Docs/basics/mouse.ts similarity index 100% rename from src/documentation/basics/mouse.ts rename to src/Docs/basics/mouse.ts diff --git a/src/documentation/basics/topos_arch.svg b/src/Docs/basics/topos_arch.svg similarity index 100% rename from src/documentation/basics/topos_arch.svg rename to src/Docs/basics/topos_arch.svg diff --git a/src/documentation/basics/welcome.ts b/src/Docs/basics/welcome.ts similarity index 100% rename from src/documentation/basics/welcome.ts rename to src/Docs/basics/welcome.ts diff --git a/src/documentation/excerpts.ts b/src/Docs/excerpts.ts similarity index 100% rename from src/documentation/excerpts.ts rename to src/Docs/excerpts.ts diff --git a/src/documentation/inlineHelp.ts b/src/Docs/inlineHelp.ts similarity index 100% rename from src/documentation/inlineHelp.ts rename to src/Docs/inlineHelp.ts diff --git a/src/documentation/learning/audio_engine/amplitude.ts b/src/Docs/learning/audio_engine/amplitude.ts similarity index 100% rename from src/documentation/learning/audio_engine/amplitude.ts rename to src/Docs/learning/audio_engine/amplitude.ts diff --git a/src/documentation/learning/audio_engine/audio_basics.ts b/src/Docs/learning/audio_engine/audio_basics.ts similarity index 100% rename from src/documentation/learning/audio_engine/audio_basics.ts rename to src/Docs/learning/audio_engine/audio_basics.ts diff --git a/src/documentation/learning/audio_engine/distortion.ts b/src/Docs/learning/audio_engine/distortion.ts similarity index 100% rename from src/documentation/learning/audio_engine/distortion.ts rename to src/Docs/learning/audio_engine/distortion.ts diff --git a/src/documentation/learning/audio_engine/effects.ts b/src/Docs/learning/audio_engine/effects.ts similarity index 100% rename from src/documentation/learning/audio_engine/effects.ts rename to src/Docs/learning/audio_engine/effects.ts diff --git a/src/documentation/learning/audio_engine/filters.ts b/src/Docs/learning/audio_engine/filters.ts similarity index 100% rename from src/documentation/learning/audio_engine/filters.ts rename to src/Docs/learning/audio_engine/filters.ts diff --git a/src/documentation/learning/audio_engine/index.ts b/src/Docs/learning/audio_engine/index.ts similarity index 100% rename from src/documentation/learning/audio_engine/index.ts rename to src/Docs/learning/audio_engine/index.ts diff --git a/src/documentation/learning/audio_engine/sampler.ts b/src/Docs/learning/audio_engine/sampler.ts similarity index 100% rename from src/documentation/learning/audio_engine/sampler.ts rename to src/Docs/learning/audio_engine/sampler.ts diff --git a/src/documentation/learning/audio_engine/synths.ts b/src/Docs/learning/audio_engine/synths.ts similarity index 100% rename from src/documentation/learning/audio_engine/synths.ts rename to src/Docs/learning/audio_engine/synths.ts diff --git a/src/documentation/learning/midi.ts b/src/Docs/learning/midi.ts similarity index 100% rename from src/documentation/learning/midi.ts rename to src/Docs/learning/midi.ts diff --git a/src/documentation/learning/osc.ts b/src/Docs/learning/osc.ts similarity index 100% rename from src/documentation/learning/osc.ts rename to src/Docs/learning/osc.ts diff --git a/src/documentation/learning/samples/index.ts b/src/Docs/learning/samples/index.ts similarity index 100% rename from src/documentation/learning/samples/index.ts rename to src/Docs/learning/samples/index.ts diff --git a/src/documentation/learning/samples/loading_samples.ts b/src/Docs/learning/samples/loading_samples.ts similarity index 100% rename from src/documentation/learning/samples/loading_samples.ts rename to src/Docs/learning/samples/loading_samples.ts diff --git a/src/documentation/learning/samples/sample_banks.ts b/src/Docs/learning/samples/sample_banks.ts similarity index 100% rename from src/documentation/learning/samples/sample_banks.ts rename to src/Docs/learning/samples/sample_banks.ts diff --git a/src/documentation/learning/samples/sample_list.ts b/src/Docs/learning/samples/sample_list.ts similarity index 100% rename from src/documentation/learning/samples/sample_list.ts rename to src/Docs/learning/samples/sample_list.ts diff --git a/src/documentation/learning/time/cyclical_time.ts b/src/Docs/learning/time/cyclical_time.ts similarity index 100% rename from src/documentation/learning/time/cyclical_time.ts rename to src/Docs/learning/time/cyclical_time.ts diff --git a/src/documentation/learning/time/linear_time.ts b/src/Docs/learning/time/linear_time.ts similarity index 100% rename from src/documentation/learning/time/linear_time.ts rename to src/Docs/learning/time/linear_time.ts diff --git a/src/documentation/learning/time/long_forms.ts b/src/Docs/learning/time/long_forms.ts similarity index 100% rename from src/documentation/learning/time/long_forms.ts rename to src/Docs/learning/time/long_forms.ts diff --git a/src/documentation/learning/time/pulses.svg b/src/Docs/learning/time/pulses.svg similarity index 100% rename from src/documentation/learning/time/pulses.svg rename to src/Docs/learning/time/pulses.svg diff --git a/src/documentation/learning/time/time.ts b/src/Docs/learning/time/time.ts similarity index 100% rename from src/documentation/learning/time/time.ts rename to src/Docs/learning/time/time.ts diff --git a/src/documentation/learning/time/times.svg b/src/Docs/learning/time/times.svg similarity index 100% rename from src/documentation/learning/time/times.svg rename to src/Docs/learning/time/times.svg diff --git a/src/documentation/more/about.ts b/src/Docs/more/about.ts similarity index 100% rename from src/documentation/more/about.ts rename to src/Docs/more/about.ts diff --git a/src/documentation/more/bonus.ts b/src/Docs/more/bonus.ts similarity index 100% rename from src/documentation/more/bonus.ts rename to src/Docs/more/bonus.ts diff --git a/src/documentation/more/index.ts b/src/Docs/more/index.ts similarity index 100% rename from src/documentation/more/index.ts rename to src/Docs/more/index.ts diff --git a/src/documentation/more/oscilloscope.ts b/src/Docs/more/oscilloscope.ts similarity index 100% rename from src/documentation/more/oscilloscope.ts rename to src/Docs/more/oscilloscope.ts diff --git a/src/documentation/more/synchronisation.ts b/src/Docs/more/synchronisation.ts similarity index 100% rename from src/documentation/more/synchronisation.ts rename to src/Docs/more/synchronisation.ts diff --git a/src/documentation/more/visualization.ts b/src/Docs/more/visualization.ts similarity index 100% rename from src/documentation/more/visualization.ts rename to src/Docs/more/visualization.ts diff --git a/src/documentation/patterns/chaining.ts b/src/Docs/patterns/chaining.ts similarity index 100% rename from src/documentation/patterns/chaining.ts rename to src/Docs/patterns/chaining.ts diff --git a/src/documentation/patterns/functions.ts b/src/Docs/patterns/functions.ts similarity index 100% rename from src/documentation/patterns/functions.ts rename to src/Docs/patterns/functions.ts diff --git a/src/documentation/patterns/generators.ts b/src/Docs/patterns/generators.ts similarity index 100% rename from src/documentation/patterns/generators.ts rename to src/Docs/patterns/generators.ts diff --git a/src/documentation/patterns/index.ts b/src/Docs/patterns/index.ts similarity index 100% rename from src/documentation/patterns/index.ts rename to src/Docs/patterns/index.ts diff --git a/src/documentation/patterns/lfos.ts b/src/Docs/patterns/lfos.ts similarity index 100% rename from src/documentation/patterns/lfos.ts rename to src/Docs/patterns/lfos.ts diff --git a/src/documentation/patterns/patterns.ts b/src/Docs/patterns/patterns.ts similarity index 100% rename from src/documentation/patterns/patterns.ts rename to src/Docs/patterns/patterns.ts diff --git a/src/documentation/patterns/probabilities.ts b/src/Docs/patterns/probabilities.ts similarity index 100% rename from src/documentation/patterns/probabilities.ts rename to src/Docs/patterns/probabilities.ts diff --git a/src/documentation/patterns/variables.ts b/src/Docs/patterns/variables.ts similarity index 100% rename from src/documentation/patterns/variables.ts rename to src/Docs/patterns/variables.ts diff --git a/src/documentation/patterns/ziffers/index.ts b/src/Docs/patterns/ziffers/index.ts similarity index 100% rename from src/documentation/patterns/ziffers/index.ts rename to src/Docs/patterns/ziffers/index.ts diff --git a/src/documentation/patterns/ziffers/ziffers_algorithmic.ts b/src/Docs/patterns/ziffers/ziffers_algorithmic.ts similarity index 100% rename from src/documentation/patterns/ziffers/ziffers_algorithmic.ts rename to src/Docs/patterns/ziffers/ziffers_algorithmic.ts diff --git a/src/documentation/patterns/ziffers/ziffers_basics.ts b/src/Docs/patterns/ziffers/ziffers_basics.ts similarity index 100% rename from src/documentation/patterns/ziffers/ziffers_basics.ts rename to src/Docs/patterns/ziffers/ziffers_basics.ts diff --git a/src/documentation/patterns/ziffers/ziffers_rhythm.ts b/src/Docs/patterns/ziffers/ziffers_rhythm.ts similarity index 100% rename from src/documentation/patterns/ziffers/ziffers_rhythm.ts rename to src/Docs/patterns/ziffers/ziffers_rhythm.ts diff --git a/src/documentation/patterns/ziffers/ziffers_scales.ts b/src/Docs/patterns/ziffers/ziffers_scales.ts similarity index 100% rename from src/documentation/patterns/ziffers/ziffers_scales.ts rename to src/Docs/patterns/ziffers/ziffers_scales.ts diff --git a/src/documentation/patterns/ziffers/ziffers_syncing.ts b/src/Docs/patterns/ziffers/ziffers_syncing.ts similarity index 100% rename from src/documentation/patterns/ziffers/ziffers_syncing.ts rename to src/Docs/patterns/ziffers/ziffers_syncing.ts diff --git a/src/documentation/patterns/ziffers/ziffers_tonnetz.ts b/src/Docs/patterns/ziffers/ziffers_tonnetz.ts similarity index 100% rename from src/documentation/patterns/ziffers/ziffers_tonnetz.ts rename to src/Docs/patterns/ziffers/ziffers_tonnetz.ts diff --git a/src/Editor/EditorSetup.ts b/src/Editor/EditorSetup.ts index 1794e2f..4078203 100644 --- a/src/Editor/EditorSetup.ts +++ b/src/Editor/EditorSetup.ts @@ -31,7 +31,7 @@ import { Compartment } from "@codemirror/state"; import { Editor } from "../main"; import { EditorView } from "codemirror"; import { javascript } from "@codemirror/lang-javascript"; -import { inlineHoveringTips, toposCompletions, soundCompletions } from "../documentation/inlineHelp"; +import { inlineHoveringTips, toposCompletions, soundCompletions } from "../Docs/inlineHelp"; import { javascriptLanguage } from "@codemirror/lang-javascript"; export const getCodeMirrorTheme = (theme: { [key: string]: string }): Extension => { diff --git a/src/Evaluator.ts b/src/Evaluator.ts index 07a5f3a..d2a55af 100644 --- a/src/Evaluator.ts +++ b/src/Evaluator.ts @@ -1,5 +1,5 @@ import type { Editor } from "./main"; -import type { File } from "./FileManagement"; +import type { File } from "./Editor/FileManagement"; const delay = (ms: number) => new Promise(resolve => setTimeout(resolve, ms)); const codeReplace = (code: string): string => code.replace(/->|::/g, "&&"); diff --git a/src/IO/MidiConnection.ts b/src/IO/MidiConnection.ts index fab9c44..8fbae25 100644 --- a/src/IO/MidiConnection.ts +++ b/src/IO/MidiConnection.ts @@ -1,5 +1,5 @@ import { UserAPI } from "../API"; -import { AppSettings } from "../FileManagement"; +import { AppSettings } from "../Editor/FileManagement"; export type MidiNoteEvent = { note: number; @@ -578,8 +578,7 @@ export class MidiConnection { if (typeof output === "number") { if (output < 0 || output >= this.midiOutputs.length) { console.error( - `Invalid MIDI output index. Index must be in the range 0-${ - this.midiOutputs.length - 1 + `Invalid MIDI output index. Index must be in the range 0-${this.midiOutputs.length - 1 }.`, ); return this.currentOutputIndex; @@ -608,8 +607,7 @@ export class MidiConnection { if (typeof input === "number") { if (input < 0 || input >= this.midiInputs.length) { console.error( - `Invalid MIDI input index. Index must be in the range 0-${ - this.midiInputs.length - 1 + `Invalid MIDI input index. Index must be in the range 0-${this.midiInputs.length - 1 }.`, ); return -1; diff --git a/src/classes/AbstractEvents.ts b/src/classes/AbstractEvents.ts index 14b65ab..7788cf2 100644 --- a/src/classes/AbstractEvents.ts +++ b/src/classes/AbstractEvents.ts @@ -6,8 +6,8 @@ import { resolvePitchBend, safeScale, } from "zifferjs"; -import { SkipEvent } from "./SkipEvent"; -import { SoundParams } from "./SoundEvent"; +import { SkipEvent } from "../Classes/SkipEvent"; +import { SoundParams } from "../Classes/SoundEvent"; import { centsToSemitones, edoToSemitones, ratiosToSemitones } from "zifferjs/src/scale"; import { safeMod } from "zifferjs/src/utils"; diff --git a/src/classes/ZPlayer.ts b/src/classes/ZPlayer.ts index 459c253..a8868a2 100644 --- a/src/classes/ZPlayer.ts +++ b/src/classes/ZPlayer.ts @@ -1,10 +1,10 @@ import { Chord, Pitch, Rest as ZRest, Ziffers } from "zifferjs"; import { Editor } from "../main"; -import { AbstractEvent } from "./AbstractEvents"; -import { SkipEvent } from "./SkipEvent"; -import { SoundEvent, SoundParams } from "./SoundEvent"; -import { MidiEvent, MidiParams } from "./MidiEvent"; -import { RestEvent } from "./RestEvent"; +import { AbstractEvent } from "../Classes/AbstractEvents"; +import { SkipEvent } from "../Classes/SkipEvent"; +import { SoundEvent, SoundParams } from "../Classes/SoundEvent"; +import { MidiEvent, MidiParams } from "../Classes/MidiEvent"; +import { RestEvent } from "../Classes/RestEvent"; import { arrayOfObjectsToObjectWithArrays, isGenerator } from "../Utils/Generic"; import { TonnetzSpaces } from "zifferjs/src/tonnetz"; import { safeMod } from "zifferjs/src/utils"; diff --git a/src/extensions/NumberExtensions.ts b/src/extensions/NumberExtensions.ts index 2d1de29..94167df 100644 --- a/src/extensions/NumberExtensions.ts +++ b/src/extensions/NumberExtensions.ts @@ -1,8 +1,8 @@ import { type UserAPI } from "../API"; -import { MidiEvent } from "../classes/MidiEvent"; -import { Player } from "../classes/ZPlayer"; -import { SoundEvent } from "../classes/SoundEvent"; -import { SkipEvent } from "../classes/SkipEvent"; +import { MidiEvent } from "../Classes/MidiEvent"; +import { Player } from "../Classes/ZPlayer"; +import { SoundEvent } from "../Classes/SoundEvent"; +import { SkipEvent } from "../Classes/SkipEvent"; declare global { diff --git a/src/extensions/StringExtensions.ts b/src/extensions/StringExtensions.ts index 081c85c..6a6f10d 100644 --- a/src/extensions/StringExtensions.ts +++ b/src/extensions/StringExtensions.ts @@ -1,6 +1,6 @@ import { noteNameToMidi } from "zifferjs"; import { type UserAPI } from "../API"; -import { Player } from "../classes/ZPlayer"; +import { Player } from "../Classes/ZPlayer"; export {}; // Extend String prototype diff --git a/src/main.ts b/src/main.ts index 704b5a0..07791a3 100644 --- a/src/main.ts +++ b/src/main.ts @@ -15,25 +15,25 @@ import { import { singleElements, buttonGroups, ElementMap, createDocumentationStyle } from "./DOM/DomElements"; import { registerFillKeys, registerOnKeyDown } from "./DOM/Keyboard"; import { installEditor } from "./Editor/EditorSetup"; -import { documentation_factory, documentation_pages, showDocumentation, updateDocumentationContent } from "./documentation/Documentation"; +import { documentation_factory, documentation_pages, showDocumentation, updateDocumentationContent } from "./Docs/Documentation"; import { EditorView } from "codemirror"; -import { Clock } from "./clock/Clock"; +import { Clock } from "./Clock/Clock"; import { loadSamples, UserAPI } from "./API"; import * as oeis from "jisg"; import * as zpatterns from "zifferjs/src/patterns.ts"; -import { makeArrayExtensions } from "./extensions/ArrayExtensions"; +import { makeArrayExtensions } from "./Extensions/ArrayExtensions"; import "./style.css"; import { Universes, File } from "./Editor/FileManagement"; import { tryEvaluate } from "./Evaluator"; // @ts-ignore import showdown from "showdown"; -import { makeStringExtensions } from "./extensions/StringExtensions"; +import { makeStringExtensions } from "./Extensions/StringExtensions"; import { installInterfaceLogic } from "./DOM/UILogic"; import { installWindowBehaviors } from "./DOM/WindowBehavior"; -import { makeNumberExtensions } from "./extensions/NumberExtensions"; +import { makeNumberExtensions } from "./Extensions/NumberExtensions"; import colors from "./Editor/colors.json"; // @ts-ignore -const images = import.meta.glob("./assets/*") +const images = import.meta.glob("./Assets/*") export class Editor { // Universes and settings