@devaloop/devalang 0.0.1-alpha.9 → 0.0.1-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.cargo/config.toml +2 -0
- package/.devalang +10 -4
- package/.github/workflows/ci.yml +103 -0
- package/Cargo.toml +80 -48
- package/README.md +135 -154
- package/docs/CHANGELOG.md +386 -1
- package/docs/CONTRIBUTING.md +101 -0
- package/docs/ROADMAP.md +10 -7
- package/docs/TODO.md +21 -9
- package/examples/automation.deva +42 -0
- package/examples/bank.deva +7 -0
- package/examples/duration.deva +9 -0
- package/examples/events.deva +12 -0
- package/examples/function.deva +15 -0
- package/examples/index.deva +57 -12
- package/examples/loop.deva +5 -12
- package/examples/pattern.deva +8 -0
- package/examples/plugin.deva +16 -0
- package/examples/variables.deva +1 -1
- package/out-tsc/bin/index.d.ts +2 -0
- package/out-tsc/bin/index.js +51 -7
- package/out-tsc/core/functions/index.d.ts +37 -0
- package/out-tsc/core/functions/index.js +76 -0
- package/out-tsc/core/index.d.ts +6 -0
- package/out-tsc/core/index.js +22 -0
- package/out-tsc/core/types/index.d.ts +4 -0
- package/out-tsc/core/types/index.js +20 -0
- package/out-tsc/core/types/plugin.d.ts +18 -0
- package/out-tsc/core/types/plugin.js +2 -0
- package/out-tsc/core/types/result.d.ts +27 -0
- package/out-tsc/core/types/result.js +2 -0
- package/out-tsc/core/types/statement.d.ts +106 -0
- package/out-tsc/core/types/statement.js +2 -0
- package/out-tsc/core/types/value.d.ts +43 -0
- package/out-tsc/core/types/value.js +2 -0
- package/out-tsc/index.d.ts +7 -0
- package/out-tsc/index.js +42 -1
- package/out-tsc/pkg/devalang_core.d.ts +13 -0
- package/out-tsc/pkg/devalang_core.js +50 -0
- package/out-tsc/pkg/devalang_core_bg.wasm.d.ts +33 -0
- package/out-tsc/scripts/copy-wasm-dts.d.ts +1 -0
- package/out-tsc/scripts/copy-wasm-dts.js +73 -0
- package/out-tsc/scripts/postinstall.d.ts +1 -0
- package/out-tsc/scripts/postinstall.js +83 -0
- package/out-tsc/scripts/version/bump.d.ts +1 -0
- package/out-tsc/scripts/version/fetch.d.ts +1 -0
- package/out-tsc/scripts/version/index.d.ts +1 -0
- package/out-tsc/scripts/version/sync.d.ts +1 -0
- package/package.json +28 -7
- package/project-version.json +4 -4
- package/rust/cli/bank/api.rs +122 -0
- package/rust/cli/bank/commands.rs +275 -0
- package/rust/cli/bank/mod.rs +29 -0
- package/rust/cli/build/commands.rs +103 -0
- package/rust/cli/build/mod.rs +2 -0
- package/rust/cli/build/process.rs +146 -0
- package/rust/cli/check/mod.rs +208 -0
- package/rust/cli/discover/commands.rs +253 -0
- package/rust/cli/discover/config.rs +111 -0
- package/rust/cli/discover/fs.rs +19 -0
- package/rust/cli/discover/install.rs +103 -0
- package/rust/cli/discover/metadata.rs +48 -0
- package/rust/cli/discover/mod.rs +5 -0
- package/rust/cli/{init.rs → init/commands.rs} +32 -23
- package/rust/cli/init/mod.rs +1 -0
- package/rust/cli/install/addon.rs +118 -0
- package/rust/cli/install/bank.rs +53 -0
- package/rust/cli/install/commands.rs +35 -0
- package/rust/cli/install/mod.rs +4 -0
- package/rust/cli/install/plugin.rs +61 -0
- package/rust/cli/login/commands.rs +124 -0
- package/rust/cli/login/mod.rs +1 -0
- package/rust/cli/mod.rs +12 -205
- package/rust/cli/parser.rs +314 -0
- package/rust/cli/play/commands.rs +324 -0
- package/rust/cli/play/io.rs +17 -0
- package/rust/cli/play/mod.rs +5 -0
- package/rust/cli/play/process.rs +150 -0
- package/rust/cli/play/realtime.rs +91 -0
- package/rust/cli/play/utils.rs +23 -0
- package/rust/cli/telemetry/commands.rs +22 -0
- package/rust/cli/telemetry/event_creator.rs +80 -0
- package/rust/cli/telemetry/mod.rs +3 -0
- package/rust/cli/telemetry/send.rs +51 -0
- package/rust/cli/{template.rs → template/commands.rs} +69 -57
- package/rust/cli/template/mod.rs +1 -0
- package/rust/cli/update/commands.rs +6 -0
- package/rust/cli/update/mod.rs +1 -0
- package/rust/config/driver.rs +103 -0
- package/rust/config/mod.rs +3 -16
- package/rust/config/ops.rs +26 -0
- package/rust/config/settings.rs +101 -0
- package/rust/core/audio/engine/helpers.rs +170 -0
- package/rust/core/audio/engine/mod.rs +7 -0
- package/rust/core/audio/engine/sample.rs +366 -0
- package/rust/core/audio/engine/synth.rs +325 -0
- package/rust/core/audio/evaluator.rs +310 -31
- package/rust/core/audio/interpreter/arrow_call.rs +311 -129
- package/rust/core/audio/interpreter/automate.rs +18 -0
- package/rust/core/audio/interpreter/call.rs +294 -64
- package/rust/core/audio/interpreter/condition.rs +71 -69
- package/rust/core/audio/interpreter/driver.rs +542 -216
- package/rust/core/audio/interpreter/function.rs +26 -0
- package/rust/core/audio/interpreter/let_.rs +38 -19
- package/rust/core/audio/interpreter/load.rs +19 -18
- package/rust/core/audio/interpreter/loop_.rs +114 -67
- package/rust/core/audio/interpreter/mod.rs +14 -12
- package/rust/core/audio/interpreter/sleep.rs +28 -36
- package/rust/core/audio/interpreter/spawn.rs +252 -66
- package/rust/core/audio/interpreter/tempo.rs +40 -16
- package/rust/core/audio/interpreter/trigger.rs +239 -69
- package/rust/core/audio/loader/mod.rs +1 -1
- package/rust/core/audio/loader/trigger.rs +97 -52
- package/rust/core/audio/mod.rs +7 -6
- package/rust/core/audio/player.rs +70 -54
- package/rust/core/audio/renderer.rs +54 -54
- package/rust/core/audio/special/easing.rs +189 -0
- package/rust/core/audio/special/env.rs +45 -0
- package/rust/core/audio/special/math.rs +134 -0
- package/rust/core/audio/special/mod.rs +9 -0
- package/rust/core/audio/special/modulator.rs +143 -0
- package/rust/core/builder/mod.rs +86 -80
- package/rust/core/debugger/lexer.rs +27 -27
- package/rust/core/debugger/mod.rs +30 -21
- package/rust/core/debugger/module.rs +55 -0
- package/rust/core/debugger/preprocessor.rs +27 -27
- package/rust/core/debugger/store.rs +40 -25
- package/rust/core/error/mod.rs +269 -60
- package/rust/core/lexer/driver.rs +61 -0
- package/rust/core/lexer/handler/arrow.rs +82 -31
- package/rust/core/lexer/handler/at.rs +21 -21
- package/rust/core/lexer/handler/brace.rs +41 -41
- package/rust/core/lexer/handler/colon.rs +21 -21
- package/rust/core/lexer/handler/comment.rs +30 -30
- package/rust/core/lexer/handler/dot.rs +21 -21
- package/rust/core/lexer/handler/driver.rs +337 -226
- package/rust/core/lexer/handler/identifier.rs +47 -41
- package/rust/core/lexer/handler/indent.rs +66 -52
- package/rust/core/lexer/handler/mod.rs +15 -14
- package/rust/core/lexer/handler/newline.rs +23 -23
- package/rust/core/lexer/handler/number.rs +31 -31
- package/rust/core/lexer/handler/operator.rs +46 -44
- package/rust/core/lexer/handler/parenthesis.rs +41 -0
- package/rust/core/lexer/handler/slash.rs +21 -0
- package/rust/core/lexer/handler/string.rs +63 -63
- package/rust/core/lexer/mod.rs +3 -51
- package/rust/core/lexer/token.rs +17 -12
- package/rust/core/mod.rs +10 -10
- package/rust/core/parser/driver.rs +584 -331
- package/rust/core/parser/handler/arrow_call.rs +253 -126
- package/rust/core/parser/handler/at.rs +279 -162
- package/rust/core/parser/handler/bank.rs +104 -41
- package/rust/core/parser/handler/condition.rs +83 -74
- package/rust/core/parser/handler/dot.rs +148 -112
- package/rust/core/parser/handler/identifier/automate.rs +254 -0
- package/rust/core/parser/handler/identifier/call.rs +91 -41
- package/rust/core/parser/handler/identifier/emit.rs +70 -0
- package/rust/core/parser/handler/identifier/function.rs +113 -0
- package/rust/core/parser/handler/identifier/group.rs +89 -75
- package/rust/core/parser/handler/identifier/let_.rs +173 -133
- package/rust/core/parser/handler/identifier/mod.rs +55 -51
- package/rust/core/parser/handler/identifier/on.rs +107 -0
- package/rust/core/parser/handler/identifier/print.rs +49 -0
- package/rust/core/parser/handler/identifier/sleep.rs +43 -33
- package/rust/core/parser/handler/identifier/spawn.rs +91 -41
- package/rust/core/parser/handler/identifier/synth.rs +135 -65
- package/rust/core/parser/handler/loop_.rs +194 -72
- package/rust/core/parser/handler/mod.rs +9 -8
- package/rust/core/parser/handler/pattern.rs +74 -0
- package/rust/core/parser/handler/tempo.rs +57 -47
- package/rust/core/parser/mod.rs +3 -4
- package/rust/core/parser/statement.rs +11 -96
- package/rust/core/plugin/loader.rs +137 -0
- package/rust/core/plugin/mod.rs +2 -0
- package/rust/core/plugin/runner.rs +347 -0
- package/rust/core/preprocessor/loader.rs +637 -193
- package/rust/core/preprocessor/mod.rs +4 -4
- package/rust/core/preprocessor/module.rs +60 -50
- package/rust/core/preprocessor/processor.rs +114 -76
- package/rust/core/preprocessor/resolver/bank.rs +49 -47
- package/rust/core/preprocessor/resolver/call.rs +124 -123
- package/rust/core/preprocessor/resolver/condition.rs +95 -92
- package/rust/core/preprocessor/resolver/driver.rs +324 -227
- package/rust/core/preprocessor/resolver/function.rs +69 -0
- package/rust/core/preprocessor/resolver/group.rs +94 -61
- package/rust/core/preprocessor/resolver/let_.rs +32 -31
- package/rust/core/preprocessor/resolver/loop_.rs +318 -91
- package/rust/core/preprocessor/resolver/mod.rs +16 -14
- package/rust/core/preprocessor/resolver/pattern.rs +83 -0
- package/rust/core/preprocessor/resolver/spawn.rs +99 -58
- package/rust/core/preprocessor/resolver/synth.rs +54 -50
- package/rust/core/preprocessor/resolver/tempo.rs +48 -49
- package/rust/core/preprocessor/resolver/trigger.rs +116 -112
- package/rust/core/preprocessor/resolver/value.rs +176 -78
- package/rust/core/store/export.rs +28 -28
- package/rust/core/store/function.rs +40 -0
- package/rust/core/store/global.rs +61 -39
- package/rust/core/store/import.rs +28 -28
- package/rust/core/store/mod.rs +5 -4
- package/rust/core/store/variable.rs +51 -28
- package/rust/core/utils/mod.rs +1 -2
- package/rust/core/utils/path.rs +37 -31
- package/rust/lib.rs +308 -117
- package/rust/main.rs +364 -65
- package/rust/types/Cargo.toml +11 -0
- package/rust/types/src/addons.rs +55 -0
- package/rust/types/src/ast.rs +202 -0
- package/rust/types/src/config.rs +74 -0
- package/rust/types/src/lib.rs +12 -0
- package/rust/types/src/telemetry.rs +85 -0
- package/rust/utils/Cargo.toml +26 -0
- package/rust/utils/src/error.rs +186 -0
- package/rust/utils/src/file.rs +94 -0
- package/rust/utils/src/first_usage.rs +97 -0
- package/rust/utils/{mod.rs → src/lib.rs} +9 -6
- package/rust/utils/{logger.rs → src/logger.rs} +200 -123
- package/rust/utils/src/path.rs +88 -0
- package/rust/utils/src/signature.rs +41 -0
- package/rust/utils/{spinner.rs → src/spinner.rs} +20 -21
- package/rust/utils/src/version.rs +27 -0
- package/rust/utils/{watcher.rs → src/watcher.rs} +46 -33
- package/rust/web/api.rs +5 -0
- package/rust/web/cdn.rs +34 -0
- package/rust/web/mod.rs +3 -0
- package/rust/web/sso.rs +5 -0
- package/templates/minimal/README.md +143 -127
- package/templates/welcome/README.md +143 -127
- package/templates/welcome/src/index.deva +56 -8
- package/templates/welcome/src/variables.deva +2 -4
- package/tests/integration.rs +21 -0
- package/tests/rust/cli_check_build.rs +21 -0
- package/tests/rust/cli_help.rs +12 -0
- package/tests/rust/cli_template_list.rs +10 -0
- package/tests/rust/cli_version.rs +11 -0
- package/tests/typescript/index.spec.ts +136 -0
- package/tests/typescript/playhead.spec.ts +36 -0
- package/tests/typescript/render_e2e.spec.ts +77 -0
- package/tsconfig.json +12 -10
- package/typescript/bin/index.ts +19 -5
- package/typescript/core/functions/index.ts +83 -0
- package/typescript/core/index.ts +6 -0
- package/typescript/core/types/index.ts +4 -0
- package/typescript/core/types/plugin.ts +19 -0
- package/typescript/core/types/result.ts +29 -0
- package/typescript/core/types/statement.ts +47 -0
- package/typescript/core/types/value.ts +29 -0
- package/typescript/index.ts +8 -1
- package/typescript/pkg/devalang_core.d.ts +4 -0
- package/typescript/pkg/devalang_core.ts +49 -0
- package/typescript/scripts/copy-wasm-dts.ts +41 -0
- package/typescript/scripts/postinstall.ts +85 -0
- package/typescript/scripts/version/bump.ts +0 -1
- package/typescript/scripts/version/index.ts +0 -1
- package/docs/COMMANDS.md +0 -85
- package/docs/CONFIG.md +0 -30
- package/docs/SYNTAX.md +0 -210
- package/out-tsc/bin/devalang.exe +0 -0
- package/out-tsc/scripts/postbuild.js +0 -11
- package/rust/cli/build.rs +0 -137
- package/rust/cli/check.rs +0 -117
- package/rust/cli/play.rs +0 -193
- package/rust/config/loader.rs +0 -13
- package/rust/core/audio/engine.rs +0 -203
- package/rust/core/shared/duration.rs +0 -8
- package/rust/core/shared/mod.rs +0 -2
- package/rust/core/shared/value.rs +0 -18
- package/rust/core/utils/validation.rs +0 -37
- package/rust/utils/file.rs +0 -35
- package/rust/utils/signature.rs +0 -17
- package/rust/utils/version.rs +0 -15
- package/typescript/scripts/postbuild.ts +0 -8
|
@@ -1,129 +1,311 @@
|
|
|
1
|
-
use crate::core::{
|
|
2
|
-
audio::engine::AudioEngine,
|
|
3
|
-
parser::statement::{
|
|
4
|
-
|
|
5
|
-
store::variable::VariableTable,
|
|
6
|
-
};
|
|
7
|
-
|
|
8
|
-
use
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
if let StatementKind::ArrowCall {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
let Some(Value::
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
1
|
+
use crate::core::{
|
|
2
|
+
audio::engine::AudioEngine,
|
|
3
|
+
parser::statement::{Statement, StatementKind},
|
|
4
|
+
plugin::runner::WasmPluginRunner,
|
|
5
|
+
store::{global::GlobalStore, variable::VariableTable},
|
|
6
|
+
};
|
|
7
|
+
use devalang_types::Value;
|
|
8
|
+
use devalang_utils::logger::{LogLevel, Logger};
|
|
9
|
+
|
|
10
|
+
use std::collections::HashMap;
|
|
11
|
+
|
|
12
|
+
pub fn interprete_call_arrow_statement(
|
|
13
|
+
stmt: &Statement,
|
|
14
|
+
audio_engine: &mut AudioEngine,
|
|
15
|
+
variable_table: &VariableTable,
|
|
16
|
+
global_store: &GlobalStore,
|
|
17
|
+
base_bpm: f32,
|
|
18
|
+
base_duration: f32,
|
|
19
|
+
max_end_time: &mut f32,
|
|
20
|
+
mut cursor_time: Option<&mut f32>,
|
|
21
|
+
update_cursor: bool,
|
|
22
|
+
) -> (f32, f32) {
|
|
23
|
+
let cursor_copy = cursor_time.as_ref().map(|c| **c).unwrap_or(0.0);
|
|
24
|
+
|
|
25
|
+
if let StatementKind::ArrowCall {
|
|
26
|
+
target,
|
|
27
|
+
method,
|
|
28
|
+
args,
|
|
29
|
+
} = &stmt.kind
|
|
30
|
+
{
|
|
31
|
+
let Some(Value::Statement(synth_stmt)) = variable_table.get(target) else {
|
|
32
|
+
let logger = Logger::new();
|
|
33
|
+
logger.log_message(
|
|
34
|
+
LogLevel::Error,
|
|
35
|
+
&format!("Synth '{}' not found in variable table", target),
|
|
36
|
+
);
|
|
37
|
+
return (*max_end_time, cursor_copy);
|
|
38
|
+
};
|
|
39
|
+
|
|
40
|
+
let Value::Map(synth_map) = &synth_stmt.value else {
|
|
41
|
+
let logger = Logger::new();
|
|
42
|
+
logger.log_message(
|
|
43
|
+
LogLevel::Error,
|
|
44
|
+
&format!("Invalid synth statement for '{}', expected a map.", target),
|
|
45
|
+
);
|
|
46
|
+
return (*max_end_time, cursor_copy);
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
let Some(Value::String(entity)) = synth_map.get("entity") else {
|
|
50
|
+
let logger = Logger::new();
|
|
51
|
+
logger.log_message(
|
|
52
|
+
LogLevel::Error,
|
|
53
|
+
&format!("Missing 'entity' key in synth '{}'.", target),
|
|
54
|
+
);
|
|
55
|
+
return (*max_end_time, cursor_copy);
|
|
56
|
+
};
|
|
57
|
+
|
|
58
|
+
if entity != "synth" {
|
|
59
|
+
let logger = Logger::new();
|
|
60
|
+
logger.log_message(
|
|
61
|
+
LogLevel::Error,
|
|
62
|
+
&format!("'{}' is not a synth, entity is '{}'.", target, entity),
|
|
63
|
+
);
|
|
64
|
+
return (*max_end_time, cursor_copy);
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
let Some(Value::Map(value_map)) = synth_map.get("value") else {
|
|
68
|
+
let logger = Logger::new();
|
|
69
|
+
logger.log_message(
|
|
70
|
+
LogLevel::Error,
|
|
71
|
+
&format!("Missing 'value' map in synth '{}'.", target),
|
|
72
|
+
);
|
|
73
|
+
return (*max_end_time, cursor_copy);
|
|
74
|
+
};
|
|
75
|
+
|
|
76
|
+
let waveform_str = match value_map.get("waveform") {
|
|
77
|
+
Some(Value::String(s)) => s.clone(),
|
|
78
|
+
Some(Value::Identifier(s)) => s.clone(),
|
|
79
|
+
_ => {
|
|
80
|
+
let logger = Logger::new();
|
|
81
|
+
logger.log_message(
|
|
82
|
+
LogLevel::Error,
|
|
83
|
+
&format!("Missing or invalid 'waveform' in synth '{}'.", target),
|
|
84
|
+
);
|
|
85
|
+
return (*max_end_time, cursor_copy);
|
|
86
|
+
}
|
|
87
|
+
};
|
|
88
|
+
let Some(Value::Map(params)) = value_map.get("parameters") else {
|
|
89
|
+
println!("❌ Missing or invalid 'parameters' in synth '{}'.", target);
|
|
90
|
+
return (*max_end_time, cursor_copy);
|
|
91
|
+
};
|
|
92
|
+
|
|
93
|
+
// Synth parameters
|
|
94
|
+
let synth_params = params.clone();
|
|
95
|
+
let amp = extract_f32(&synth_params, "amp", base_bpm).unwrap_or(1.0);
|
|
96
|
+
|
|
97
|
+
if method == "note" {
|
|
98
|
+
let filtered_args: Vec<_> = args
|
|
99
|
+
.iter()
|
|
100
|
+
.filter(|arg| !matches!(arg, Value::Unknown))
|
|
101
|
+
.collect();
|
|
102
|
+
|
|
103
|
+
let Some(Value::Identifier(note_name)) = filtered_args.first().map(|v| (*v).clone())
|
|
104
|
+
else {
|
|
105
|
+
println!(
|
|
106
|
+
"❌ Invalid or missing argument for 'note' method on '{}'.",
|
|
107
|
+
target
|
|
108
|
+
);
|
|
109
|
+
return (*max_end_time, cursor_copy);
|
|
110
|
+
};
|
|
111
|
+
|
|
112
|
+
let mut note_params = HashMap::new();
|
|
113
|
+
if let Some(arg1) = filtered_args.get(1) {
|
|
114
|
+
if let Value::Map(map) = (*arg1).clone() {
|
|
115
|
+
for (key, value) in map {
|
|
116
|
+
note_params.insert(key, value);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
// Note parameters and calculations
|
|
122
|
+
let amp_note = extract_f32(¬e_params, "amp", base_bpm).unwrap_or(amp);
|
|
123
|
+
let duration_ms =
|
|
124
|
+
extract_f32(¬e_params, "duration", base_bpm).unwrap_or(base_duration * 1000.0);
|
|
125
|
+
|
|
126
|
+
let duration_secs = duration_ms / 1000.0;
|
|
127
|
+
let final_freq = note_to_freq(¬e_name);
|
|
128
|
+
let start_time = cursor_copy;
|
|
129
|
+
let end_time = start_time + duration_secs;
|
|
130
|
+
|
|
131
|
+
// Fetch automation map if present:
|
|
132
|
+
// - Global (per-synth): key "<target>__automation" => map with key "params"
|
|
133
|
+
// - Per-note: note parameter "automate" => map
|
|
134
|
+
let auto_key = format!("{}__automation", target);
|
|
135
|
+
let synth_automation = match variable_table.get(&auto_key) {
|
|
136
|
+
Some(Value::Map(map)) => match map.get("params") {
|
|
137
|
+
Some(Value::Map(p)) => Some(p.clone()),
|
|
138
|
+
_ => None,
|
|
139
|
+
},
|
|
140
|
+
_ => None,
|
|
141
|
+
};
|
|
142
|
+
|
|
143
|
+
let note_automation = match note_params.get("automate") {
|
|
144
|
+
Some(Value::Map(m)) => Some(m.clone()),
|
|
145
|
+
_ => None,
|
|
146
|
+
};
|
|
147
|
+
|
|
148
|
+
// Merge: per-note overrides synth automation per key (volume/pan/pitch)
|
|
149
|
+
let automation = match (synth_automation, note_automation) {
|
|
150
|
+
(Some(mut a), Some(n)) => {
|
|
151
|
+
for (k, v) in n {
|
|
152
|
+
a.insert(k, v);
|
|
153
|
+
}
|
|
154
|
+
Some(a)
|
|
155
|
+
}
|
|
156
|
+
(None, Some(n)) => Some(n),
|
|
157
|
+
(Some(a), None) => Some(a),
|
|
158
|
+
_ => None,
|
|
159
|
+
};
|
|
160
|
+
|
|
161
|
+
// If waveform references a plugin alias (e.g., alias.synth), use the WASM plugin runner
|
|
162
|
+
if waveform_str.contains('.') && waveform_str.ends_with(".synth") {
|
|
163
|
+
let alias = waveform_str.split('.').next().unwrap_or("");
|
|
164
|
+
if let Some(Value::String(uri)) = variable_table.get(alias) {
|
|
165
|
+
if let Some(id) = uri.strip_prefix("devalang://plugin/") {
|
|
166
|
+
let mut parts = id.split('.');
|
|
167
|
+
let author = parts.next().unwrap_or("");
|
|
168
|
+
let name = parts.next().unwrap_or("");
|
|
169
|
+
let key = format!("{}:{}", author, name);
|
|
170
|
+
if let Some((_info, wasm_bytes)) = global_store.plugins.get(&key) {
|
|
171
|
+
// Prepare buffer (stereo f32)
|
|
172
|
+
let sample_rate = 44100.0_f32;
|
|
173
|
+
let total_samples = ((duration_ms / 1000.0) * sample_rate) as usize;
|
|
174
|
+
let channels = 2usize;
|
|
175
|
+
let start_index = ((start_time * sample_rate) as usize) * channels;
|
|
176
|
+
let required_len = start_index + total_samples * channels;
|
|
177
|
+
if audio_engine.buffer.len() < required_len {
|
|
178
|
+
audio_engine.buffer.resize(required_len, 0);
|
|
179
|
+
}
|
|
180
|
+
let mut fbuf = vec![0.0f32; total_samples * channels];
|
|
181
|
+
let runner = WasmPluginRunner::new();
|
|
182
|
+
let mut params_num: std::collections::HashMap<String, f32> =
|
|
183
|
+
std::collections::HashMap::new();
|
|
184
|
+
let mut params_str: std::collections::HashMap<String, String> =
|
|
185
|
+
std::collections::HashMap::new();
|
|
186
|
+
for (k, v) in synth_params.iter() {
|
|
187
|
+
match v {
|
|
188
|
+
Value::Number(n) => {
|
|
189
|
+
params_num.insert(k.clone(), *n);
|
|
190
|
+
}
|
|
191
|
+
Value::String(s) => {
|
|
192
|
+
params_str.insert(k.clone(), s.clone());
|
|
193
|
+
}
|
|
194
|
+
Value::Identifier(s) => {
|
|
195
|
+
params_str.insert(k.clone(), s.clone());
|
|
196
|
+
}
|
|
197
|
+
_ => {}
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
let _ = runner.render_note_with_params_in_place(
|
|
201
|
+
wasm_bytes,
|
|
202
|
+
&mut fbuf,
|
|
203
|
+
None,
|
|
204
|
+
final_freq,
|
|
205
|
+
amp_note,
|
|
206
|
+
duration_ms as i32,
|
|
207
|
+
44100,
|
|
208
|
+
2,
|
|
209
|
+
¶ms_num,
|
|
210
|
+
Some(¶ms_str),
|
|
211
|
+
);
|
|
212
|
+
for (i, sample) in
|
|
213
|
+
fbuf.iter().enumerate().take(total_samples * channels)
|
|
214
|
+
{
|
|
215
|
+
let s = (sample.clamp(-1.0, 1.0) * (i16::MAX as f32)) as i16;
|
|
216
|
+
let idx = start_index + i;
|
|
217
|
+
audio_engine.buffer[idx] =
|
|
218
|
+
audio_engine.buffer[idx].saturating_add(s);
|
|
219
|
+
}
|
|
220
|
+
} else {
|
|
221
|
+
let logger = Logger::new();
|
|
222
|
+
logger.log_message(
|
|
223
|
+
LogLevel::Warning,
|
|
224
|
+
&format!(
|
|
225
|
+
"Plugin bytes not found for key '{}' (alias '{}').",
|
|
226
|
+
key, alias
|
|
227
|
+
),
|
|
228
|
+
);
|
|
229
|
+
}
|
|
230
|
+
} else {
|
|
231
|
+
let logger = Logger::new();
|
|
232
|
+
logger.log_message(
|
|
233
|
+
LogLevel::Warning,
|
|
234
|
+
&format!("Invalid plugin URI in alias '{}': {}", alias, uri),
|
|
235
|
+
);
|
|
236
|
+
}
|
|
237
|
+
} else {
|
|
238
|
+
let logger = Logger::new();
|
|
239
|
+
logger.log_message(
|
|
240
|
+
LogLevel::Warning,
|
|
241
|
+
&format!("Plugin alias '{}' not found in variable table.", alias),
|
|
242
|
+
);
|
|
243
|
+
}
|
|
244
|
+
} else {
|
|
245
|
+
audio_engine.insert_note(
|
|
246
|
+
waveform_str.clone(),
|
|
247
|
+
final_freq,
|
|
248
|
+
amp_note,
|
|
249
|
+
start_time * 1000.0,
|
|
250
|
+
duration_ms,
|
|
251
|
+
synth_params,
|
|
252
|
+
note_params,
|
|
253
|
+
automation,
|
|
254
|
+
);
|
|
255
|
+
}
|
|
256
|
+
|
|
257
|
+
*max_end_time = (*max_end_time).max(end_time);
|
|
258
|
+
|
|
259
|
+
if update_cursor {
|
|
260
|
+
if let Some(c) = cursor_time.as_mut() {
|
|
261
|
+
**c = end_time;
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
return (*max_end_time, end_time);
|
|
266
|
+
} else {
|
|
267
|
+
let logger = Logger::new();
|
|
268
|
+
logger.log_message(
|
|
269
|
+
LogLevel::Error,
|
|
270
|
+
&format!("Unknown method '{}' on synth '{}'.", method, target),
|
|
271
|
+
);
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
|
|
275
|
+
(*max_end_time, cursor_copy)
|
|
276
|
+
}
|
|
277
|
+
|
|
278
|
+
fn extract_f32(map: &HashMap<String, Value>, key: &str, base_bpm: f32) -> Option<f32> {
|
|
279
|
+
map.get(key).and_then(|v| match v {
|
|
280
|
+
Value::Number(n) => Some(*n),
|
|
281
|
+
Value::Beat(beat_str) => {
|
|
282
|
+
let parts: Vec<&str> = beat_str.split('/').collect();
|
|
283
|
+
if parts.len() == 2 {
|
|
284
|
+
let numerator = parts[0].parse::<f32>().ok()?;
|
|
285
|
+
let denominator = parts[1].parse::<f32>().ok()?;
|
|
286
|
+
|
|
287
|
+
Some((numerator / denominator) * ((60.0 / base_bpm) * 1000.0))
|
|
288
|
+
} else {
|
|
289
|
+
None
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
_ => None,
|
|
293
|
+
})
|
|
294
|
+
}
|
|
295
|
+
|
|
296
|
+
fn note_to_freq(note: &str) -> f32 {
|
|
297
|
+
let notes = [
|
|
298
|
+
"C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B",
|
|
299
|
+
];
|
|
300
|
+
|
|
301
|
+
if note.len() < 2 || note.len() > 3 {
|
|
302
|
+
return 440.0;
|
|
303
|
+
}
|
|
304
|
+
|
|
305
|
+
let (name, octave_str) = note.split_at(note.len() - 1);
|
|
306
|
+
let semitone = notes.iter().position(|&n| n == name).unwrap_or(9) as i32;
|
|
307
|
+
let octave = octave_str.parse::<i32>().unwrap_or(4);
|
|
308
|
+
let midi_note = (octave + 1) * 12 + semitone;
|
|
309
|
+
|
|
310
|
+
440.0 * (2.0_f32).powf(((midi_note as f32) - 69.0) / 12.0)
|
|
311
|
+
}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
use crate::core::{
|
|
2
|
+
parser::statement::{Statement, StatementKind},
|
|
3
|
+
store::variable::VariableTable,
|
|
4
|
+
};
|
|
5
|
+
|
|
6
|
+
// Store automation configuration into the variable table under a namespaced key
|
|
7
|
+
// Key: "<target>__automation" => Value::Map({ target, params })
|
|
8
|
+
pub fn interprete_automate_statement(
|
|
9
|
+
stmt: &Statement,
|
|
10
|
+
variable_table: &mut VariableTable,
|
|
11
|
+
) -> Option<VariableTable> {
|
|
12
|
+
if let StatementKind::Automate { target } = &stmt.kind {
|
|
13
|
+
let key = format!("{}__automation", target);
|
|
14
|
+
variable_table.set(key, stmt.value.clone());
|
|
15
|
+
return Some(variable_table.clone());
|
|
16
|
+
}
|
|
17
|
+
None
|
|
18
|
+
}
|