@devaloop/devalang 0.0.1-beta.2 → 0.0.1-beta.3

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.
Files changed (159) hide show
  1. package/Cargo.toml +84 -81
  2. package/README.md +3 -2
  3. package/docs/CHANGELOG.md +41 -0
  4. package/docs/ROADMAP.md +3 -3
  5. package/examples/chain.deva +19 -0
  6. package/examples/plugin.deva +10 -10
  7. package/examples/routing.deva +23 -0
  8. package/out-tsc/bin/project-version.json +6 -0
  9. package/out-tsc/pkg/devalang_core_bg.wasm.d.ts +8 -8
  10. package/out-tsc/scripts/version/copy-to-binary.d.ts +1 -0
  11. package/out-tsc/scripts/version/copy-to-binary.js +79 -0
  12. package/package.json +23 -10
  13. package/project-version.json +3 -3
  14. package/rust/bindings/Cargo.toml +9 -0
  15. package/rust/bindings/src/lib.rs +86 -0
  16. package/rust/cli/addon/commands.rs +35 -0
  17. package/rust/cli/addon/download.rs +234 -0
  18. package/rust/cli/addon/install.rs +33 -0
  19. package/rust/cli/addon/list.rs +224 -0
  20. package/rust/cli/addon/metadata.rs +124 -0
  21. package/rust/cli/addon/mod.rs +8 -0
  22. package/rust/cli/addon/remove.rs +271 -0
  23. package/rust/cli/addon/update.rs +305 -0
  24. package/rust/cli/{install/addon.rs → addon/utils.rs} +109 -118
  25. package/rust/cli/build/commands.rs +153 -153
  26. package/rust/cli/build/process.rs +165 -165
  27. package/rust/cli/check/mod.rs +208 -208
  28. package/rust/cli/discover/commands.rs +275 -253
  29. package/rust/cli/discover/config.rs +109 -111
  30. package/rust/cli/discover/fs.rs +19 -19
  31. package/rust/cli/discover/install.rs +214 -103
  32. package/rust/cli/discover/metadata.rs +48 -48
  33. package/rust/cli/discover/mod.rs +5 -5
  34. package/rust/cli/me/commands.rs +52 -0
  35. package/rust/cli/me/mod.rs +1 -0
  36. package/rust/cli/mod.rs +12 -12
  37. package/rust/cli/parser.rs +30 -69
  38. package/rust/cli/play/commands.rs +375 -375
  39. package/rust/cli/play/process.rs +159 -159
  40. package/rust/core/audio/engine/driver.rs +19 -2
  41. package/rust/core/audio/engine/export.rs +169 -169
  42. package/rust/core/audio/engine/mod.rs +56 -56
  43. package/rust/core/audio/engine/notes/dsp.rs +88 -85
  44. package/rust/core/audio/engine/notes/mod.rs +53 -44
  45. package/rust/core/audio/engine/notes/params.rs +294 -294
  46. package/rust/core/audio/engine/sample/insert.rs +148 -47
  47. package/rust/core/audio/engine/sample/mod.rs +40 -40
  48. package/rust/core/audio/engine/sample/padding.rs +170 -170
  49. package/rust/core/audio/evaluator/condition.rs +61 -61
  50. package/rust/core/audio/evaluator/numeric.rs +152 -152
  51. package/rust/core/audio/evaluator/rhs.rs +16 -16
  52. package/rust/core/audio/evaluator/string_expr.rs +94 -94
  53. package/rust/core/audio/interpreter/driver.rs +574 -574
  54. package/rust/core/audio/interpreter/mod.rs +2 -2
  55. package/rust/core/audio/interpreter/statements/arrow_call/interprete.rs +9 -5
  56. package/rust/core/audio/interpreter/statements/arrow_call/methods/chord.rs +398 -384
  57. package/rust/core/audio/interpreter/statements/arrow_call/methods/effects.rs +323 -0
  58. package/rust/core/audio/interpreter/statements/arrow_call/methods/mod.rs +1 -0
  59. package/rust/core/audio/interpreter/statements/arrow_call/methods/note.rs +66 -11
  60. package/rust/core/audio/interpreter/statements/arrow_call/mod.rs +3 -3
  61. package/rust/core/audio/interpreter/statements/arrow_call/types/arp.rs +192 -192
  62. package/rust/core/audio/interpreter/statements/arrow_call/types/mod.rs +24 -24
  63. package/rust/core/audio/interpreter/statements/arrow_call/types/pad.rs +116 -116
  64. package/rust/core/audio/interpreter/statements/arrow_call/types/pluck.rs +97 -97
  65. package/rust/core/audio/interpreter/statements/arrow_call/types/sub.rs +100 -100
  66. package/rust/core/audio/interpreter/statements/automate.rs +16 -16
  67. package/rust/core/audio/interpreter/statements/call.rs +31 -1
  68. package/rust/core/audio/interpreter/statements/condition.rs +72 -72
  69. package/rust/core/audio/interpreter/statements/function.rs +24 -24
  70. package/rust/core/audio/interpreter/statements/let_.rs +36 -36
  71. package/rust/core/audio/interpreter/statements/load.rs +17 -17
  72. package/rust/core/audio/interpreter/statements/loop_.rs +115 -115
  73. package/rust/core/audio/interpreter/statements/spawn.rs +51 -2
  74. package/rust/core/audio/interpreter/statements/trigger.rs +242 -239
  75. package/rust/core/audio/loader/trigger.rs +98 -98
  76. package/rust/core/audio/player.rs +70 -70
  77. package/rust/core/audio/special/mod.rs +9 -9
  78. package/rust/core/builder/mod.rs +129 -129
  79. package/rust/core/debugger/lexer.rs +27 -27
  80. package/rust/core/debugger/logs.rs +52 -52
  81. package/rust/core/debugger/preprocessor.rs +27 -27
  82. package/rust/core/debugger/store.rs +38 -38
  83. package/rust/core/lexer/driver.rs +59 -59
  84. package/rust/core/lexer/handler/arrow.rs +82 -82
  85. package/rust/core/lexer/handler/at.rs +21 -21
  86. package/rust/core/lexer/handler/brace.rs +41 -41
  87. package/rust/core/lexer/handler/colon.rs +21 -21
  88. package/rust/core/lexer/handler/comment.rs +30 -30
  89. package/rust/core/lexer/handler/dot.rs +21 -21
  90. package/rust/core/lexer/handler/driver.rs +337 -337
  91. package/rust/core/lexer/handler/identifier.rs +47 -47
  92. package/rust/core/lexer/handler/indent.rs +66 -66
  93. package/rust/core/lexer/handler/mod.rs +15 -15
  94. package/rust/core/lexer/handler/newline.rs +23 -23
  95. package/rust/core/lexer/handler/number.rs +31 -31
  96. package/rust/core/lexer/handler/operator.rs +46 -46
  97. package/rust/core/lexer/handler/parenthesis.rs +41 -41
  98. package/rust/core/lexer/handler/slash.rs +21 -21
  99. package/rust/core/lexer/handler/string.rs +63 -63
  100. package/rust/core/lexer/mod.rs +3 -3
  101. package/rust/core/mod.rs +9 -9
  102. package/rust/core/parser/driver/block.rs +111 -111
  103. package/rust/core/parser/driver/cursor.rs +82 -82
  104. package/rust/core/parser/driver/driver_impl.rs +21 -1
  105. package/rust/core/parser/driver/mod.rs +6 -6
  106. package/rust/core/parser/driver/parse_array.rs +120 -120
  107. package/rust/core/parser/driver/parse_map.rs +247 -223
  108. package/rust/core/parser/driver/parser.rs +160 -160
  109. package/rust/core/parser/handler/arrow_call.rs +65 -14
  110. package/rust/core/parser/handler/identifier/synth.rs +171 -135
  111. package/rust/core/parser/handler/mod.rs +9 -9
  112. package/rust/core/parser/handler/pattern.rs +24 -1
  113. package/rust/core/plugin/loader.rs +137 -137
  114. package/rust/core/plugin/mod.rs +2 -2
  115. package/rust/core/plugin/runner/non_wasm.rs +481 -297
  116. package/rust/core/plugin/runner/wasm32.rs +1 -0
  117. package/rust/core/preprocessor/loader/inject.rs +313 -278
  118. package/rust/core/preprocessor/loader/loader_helpers.rs +110 -110
  119. package/rust/core/preprocessor/loader/mod.rs +235 -235
  120. package/rust/core/preprocessor/module.rs +55 -55
  121. package/rust/core/preprocessor/processor/handlers.rs +107 -107
  122. package/rust/core/preprocessor/resolver/bank.rs +49 -49
  123. package/rust/core/preprocessor/resolver/call.rs +124 -124
  124. package/rust/core/preprocessor/resolver/condition.rs +95 -95
  125. package/rust/core/preprocessor/resolver/driver.rs +324 -324
  126. package/rust/core/preprocessor/resolver/function.rs +69 -69
  127. package/rust/core/preprocessor/resolver/group.rs +122 -122
  128. package/rust/core/preprocessor/resolver/let_.rs +32 -32
  129. package/rust/core/preprocessor/resolver/loop_.rs +318 -318
  130. package/rust/core/preprocessor/resolver/mod.rs +16 -16
  131. package/rust/core/preprocessor/resolver/pattern.rs +95 -83
  132. package/rust/core/preprocessor/resolver/spawn.rs +99 -99
  133. package/rust/core/preprocessor/resolver/synth.rs +54 -54
  134. package/rust/core/preprocessor/resolver/tempo.rs +48 -48
  135. package/rust/core/preprocessor/resolver/trigger.rs +116 -116
  136. package/rust/core/preprocessor/resolver/value.rs +176 -176
  137. package/rust/core/store/global.rs +57 -57
  138. package/rust/lib.rs +323 -323
  139. package/rust/macros/Cargo.toml +14 -0
  140. package/rust/macros/src/lib.rs +52 -0
  141. package/rust/main.rs +311 -142
  142. package/rust/types/Cargo.toml +1 -1
  143. package/rust/types/src/addons.rs +3 -1
  144. package/rust/types/src/config.rs +1 -3
  145. package/rust/utils/Cargo.toml +5 -2
  146. package/rust/utils/src/file.rs +397 -14
  147. package/rust/utils/src/path.rs +31 -2
  148. package/rust/utils/src/version.rs +38 -7
  149. package/rust/web/auth.rs +5 -0
  150. package/rust/web/forge.rs +5 -0
  151. package/rust/web/mod.rs +5 -3
  152. package/typescript/scripts/version/copy-to-binary.ts +82 -0
  153. package/rust/cli/bank/api.rs +0 -122
  154. package/rust/cli/bank/commands.rs +0 -306
  155. package/rust/cli/bank/mod.rs +0 -29
  156. package/rust/cli/install/bank.rs +0 -72
  157. package/rust/cli/install/commands.rs +0 -35
  158. package/rust/cli/install/mod.rs +0 -4
  159. package/rust/cli/install/plugin.rs +0 -80
@@ -1,116 +1,116 @@
1
- use devalang_types::Value;
2
- use std::collections::HashMap;
3
-
4
- pub fn apply_defaults(synth_params: &mut HashMap<String, Value>) {
5
- use devalang_types::Value as DV;
6
- // pad: long attack/release, high sustain (0.0-1.0)
7
- synth_params
8
- .entry("attack".to_string())
9
- .or_insert(DV::Number(600.0));
10
- synth_params
11
- .entry("decay".to_string())
12
- .or_insert(DV::Number(300.0));
13
- synth_params
14
- .entry("sustain".to_string())
15
- .or_insert(DV::Number(0.8));
16
- synth_params
17
- .entry("release".to_string())
18
- .or_insert(DV::Number(900.0));
19
- // optional unison/voices parameters
20
- synth_params
21
- .entry("voices".to_string())
22
- .or_insert(DV::Number(3.0));
23
- synth_params
24
- .entry("unison_detune".to_string())
25
- .or_insert(DV::Number(15.0));
26
- // slightly wider default chorus/depth for pads
27
- if !synth_params.contains_key("effects") {
28
- let mut ch: std::collections::HashMap<String, Value> = std::collections::HashMap::new();
29
- ch.insert("type".to_string(), Value::String("chorus".to_string()));
30
- ch.insert("depth".to_string(), Value::Number(0.12));
31
- ch.insert("rate".to_string(), Value::Number(0.25));
32
- synth_params.insert("effects".to_string(), DV::Array(vec![DV::Map(ch)]));
33
- }
34
- }
35
-
36
- // Prepare per-note modifications for pad: longer release/attack, gentle detune per-voice
37
- pub fn prepare_note(
38
- _note_name: &str,
39
- index: usize,
40
- total: usize,
41
- _start_time_ms: f32,
42
- _duration_ms: f32,
43
- amp: f32,
44
- synth_params: &HashMap<String, Value>,
45
- note_params: &HashMap<String, Value>,
46
- _automation: &Option<HashMap<String, Value>>,
47
- ) -> (f32, f32, f32, HashMap<String, Value>) {
48
- let mut params_out = note_params.clone();
49
- // inject pad envelope defaults if missing
50
- params_out
51
- .entry("attack".to_string())
52
- .or_insert(Value::Number(600.0));
53
- params_out
54
- .entry("release".to_string())
55
- .or_insert(Value::Number(900.0));
56
- params_out
57
- .entry("sustain".to_string())
58
- .or_insert(Value::Number(0.8));
59
-
60
- // propagate unison/voices into per-note params if synth provided
61
- if let Some(Value::Number(v)) = synth_params.get("voices") {
62
- params_out.insert("voices".to_string(), Value::Number(*v));
63
- }
64
- if let Some(Value::Number(d)) = synth_params.get("unison_detune") {
65
- params_out.insert("unison_detune".to_string(), Value::Number(*d));
66
- }
67
-
68
- // gentle detune based on index and synth param "detune" if present
69
- // gentle detune based on synth detune or unison settings
70
- let detune_base = match synth_params.get("detune") {
71
- Some(Value::Number(n)) => *n,
72
- _ => 0.0,
73
- };
74
- let mut detune = detune_base * ((index as f32) / (total as f32));
75
- // if unison used, spread voices around center
76
- if let Some(Value::Number(_voices)) = synth_params.get("voices") {
77
- if let Some(Value::Number(ud)) = synth_params.get("unison_detune") {
78
- // spread by a fraction based on voice index
79
- detune += (*ud) * (((index as f32) - (total as f32 - 1.0) / 2.0) / (total as f32));
80
- }
81
- }
82
-
83
- params_out.insert("detune".to_string(), Value::Number(detune));
84
-
85
- // compute frequency with detune in cents
86
- let freq = note_to_freq(_note_name) * (2.0_f32).powf(detune / 1200.0);
87
-
88
- // add a subtle chorus placeholder effect if none present (engine may ignore unknown effects)
89
- use devalang_types::Value as DV;
90
- if !params_out.contains_key("effects") {
91
- let mut ch: std::collections::HashMap<String, Value> = std::collections::HashMap::new();
92
- ch.insert("type".to_string(), Value::String("chorus".to_string()));
93
- ch.insert("depth".to_string(), Value::Number(0.15));
94
- ch.insert("rate".to_string(), Value::Number(0.25));
95
- params_out.insert("effects".to_string(), DV::Array(vec![DV::Map(ch)]));
96
- }
97
-
98
- (0.0, freq, amp, params_out)
99
- }
100
-
101
- fn note_to_freq(note: &str) -> f32 {
102
- let notes = [
103
- "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B",
104
- ];
105
-
106
- if note.len() < 2 || note.len() > 3 {
107
- return 440.0;
108
- }
109
-
110
- let (name, octave_str) = note.split_at(note.len() - 1);
111
- let semitone = notes.iter().position(|&n| n == name).unwrap_or(9) as i32;
112
- let octave = octave_str.parse::<i32>().unwrap_or(4);
113
- let midi_note = (octave + 1) * 12 + semitone;
114
-
115
- 440.0 * (2.0_f32).powf(((midi_note as f32) - 69.0) / 12.0)
116
- }
1
+ use devalang_types::Value;
2
+ use std::collections::HashMap;
3
+
4
+ pub fn apply_defaults(synth_params: &mut HashMap<String, Value>) {
5
+ use devalang_types::Value as DV;
6
+ // pad: long attack/release, high sustain (0.0-1.0)
7
+ synth_params
8
+ .entry("attack".to_string())
9
+ .or_insert(DV::Number(600.0));
10
+ synth_params
11
+ .entry("decay".to_string())
12
+ .or_insert(DV::Number(300.0));
13
+ synth_params
14
+ .entry("sustain".to_string())
15
+ .or_insert(DV::Number(0.8));
16
+ synth_params
17
+ .entry("release".to_string())
18
+ .or_insert(DV::Number(900.0));
19
+ // optional unison/voices parameters
20
+ synth_params
21
+ .entry("voices".to_string())
22
+ .or_insert(DV::Number(3.0));
23
+ synth_params
24
+ .entry("unison_detune".to_string())
25
+ .or_insert(DV::Number(15.0));
26
+ // slightly wider default chorus/depth for pads
27
+ if !synth_params.contains_key("effects") {
28
+ let mut ch: std::collections::HashMap<String, Value> = std::collections::HashMap::new();
29
+ ch.insert("type".to_string(), Value::String("chorus".to_string()));
30
+ ch.insert("depth".to_string(), Value::Number(0.12));
31
+ ch.insert("rate".to_string(), Value::Number(0.25));
32
+ synth_params.insert("effects".to_string(), DV::Array(vec![DV::Map(ch)]));
33
+ }
34
+ }
35
+
36
+ // Prepare per-note modifications for pad: longer release/attack, gentle detune per-voice
37
+ pub fn prepare_note(
38
+ _note_name: &str,
39
+ index: usize,
40
+ total: usize,
41
+ _start_time_ms: f32,
42
+ _duration_ms: f32,
43
+ amp: f32,
44
+ synth_params: &HashMap<String, Value>,
45
+ note_params: &HashMap<String, Value>,
46
+ _automation: &Option<HashMap<String, Value>>,
47
+ ) -> (f32, f32, f32, HashMap<String, Value>) {
48
+ let mut params_out = note_params.clone();
49
+ // inject pad envelope defaults if missing
50
+ params_out
51
+ .entry("attack".to_string())
52
+ .or_insert(Value::Number(600.0));
53
+ params_out
54
+ .entry("release".to_string())
55
+ .or_insert(Value::Number(900.0));
56
+ params_out
57
+ .entry("sustain".to_string())
58
+ .or_insert(Value::Number(0.8));
59
+
60
+ // propagate unison/voices into per-note params if synth provided
61
+ if let Some(Value::Number(v)) = synth_params.get("voices") {
62
+ params_out.insert("voices".to_string(), Value::Number(*v));
63
+ }
64
+ if let Some(Value::Number(d)) = synth_params.get("unison_detune") {
65
+ params_out.insert("unison_detune".to_string(), Value::Number(*d));
66
+ }
67
+
68
+ // gentle detune based on index and synth param "detune" if present
69
+ // gentle detune based on synth detune or unison settings
70
+ let detune_base = match synth_params.get("detune") {
71
+ Some(Value::Number(n)) => *n,
72
+ _ => 0.0,
73
+ };
74
+ let mut detune = detune_base * ((index as f32) / (total as f32));
75
+ // if unison used, spread voices around center
76
+ if let Some(Value::Number(_voices)) = synth_params.get("voices") {
77
+ if let Some(Value::Number(ud)) = synth_params.get("unison_detune") {
78
+ // spread by a fraction based on voice index
79
+ detune += (*ud) * (((index as f32) - (total as f32 - 1.0) / 2.0) / (total as f32));
80
+ }
81
+ }
82
+
83
+ params_out.insert("detune".to_string(), Value::Number(detune));
84
+
85
+ // compute frequency with detune in cents
86
+ let freq = note_to_freq(_note_name) * (2.0_f32).powf(detune / 1200.0);
87
+
88
+ // add a subtle chorus placeholder effect if none present (engine may ignore unknown effects)
89
+ use devalang_types::Value as DV;
90
+ if !params_out.contains_key("effects") {
91
+ let mut ch: std::collections::HashMap<String, Value> = std::collections::HashMap::new();
92
+ ch.insert("type".to_string(), Value::String("chorus".to_string()));
93
+ ch.insert("depth".to_string(), Value::Number(0.15));
94
+ ch.insert("rate".to_string(), Value::Number(0.25));
95
+ params_out.insert("effects".to_string(), DV::Array(vec![DV::Map(ch)]));
96
+ }
97
+
98
+ (0.0, freq, amp, params_out)
99
+ }
100
+
101
+ fn note_to_freq(note: &str) -> f32 {
102
+ let notes = [
103
+ "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B",
104
+ ];
105
+
106
+ if note.len() < 2 || note.len() > 3 {
107
+ return 440.0;
108
+ }
109
+
110
+ let (name, octave_str) = note.split_at(note.len() - 1);
111
+ let semitone = notes.iter().position(|&n| n == name).unwrap_or(9) as i32;
112
+ let octave = octave_str.parse::<i32>().unwrap_or(4);
113
+ let midi_note = (octave + 1) * 12 + semitone;
114
+
115
+ 440.0 * (2.0_f32).powf(((midi_note as f32) - 69.0) / 12.0)
116
+ }
@@ -1,97 +1,97 @@
1
- use devalang_types::Value;
2
- use std::collections::HashMap;
3
-
4
- pub fn apply_defaults(synth_params: &mut HashMap<String, Value>) {
5
- use devalang_types::Value as DV;
6
- // pluck: very short attack, short decay, very low sustain, short release
7
- synth_params
8
- .entry("attack".to_string())
9
- .or_insert(DV::Number(2.0));
10
- synth_params
11
- .entry("decay".to_string())
12
- .or_insert(DV::Number(80.0));
13
- synth_params
14
- .entry("sustain".to_string())
15
- .or_insert(DV::Number(0.0));
16
- synth_params
17
- .entry("release".to_string())
18
- .or_insert(DV::Number(120.0));
19
- synth_params
20
- .entry("glide".to_string())
21
- .or_insert(DV::Boolean(false));
22
- synth_params
23
- .entry("slide".to_string())
24
- .or_insert(DV::Boolean(false));
25
- // small transient helper for plucks
26
- synth_params
27
- .entry("pluck_click".to_string())
28
- .or_insert(DV::Number(0.08));
29
- synth_params
30
- .entry("pluck_click_ms".to_string())
31
- .or_insert(DV::Number(8.0));
32
- }
33
-
34
- // Prepare per-note modifications for pluck: short attack/release, optional amp curve per-index
35
- pub fn prepare_note(
36
- _note_name: &str,
37
- index: usize,
38
- _total: usize,
39
- _start_time_ms: f32,
40
- _duration_ms: f32,
41
- amp: f32,
42
- _synth_params: &HashMap<String, Value>,
43
- note_params: &HashMap<String, Value>,
44
- _automation: &Option<HashMap<String, Value>>,
45
- ) -> (f32, f32, f32, HashMap<String, Value>) {
46
- // pluck slightly reduces amp for later notes by a tiny fraction
47
- let decay = 0.02 * (index as f32);
48
- let amp_out = (amp * (1.0 - decay)).max(0.0);
49
- let mut params_out = note_params.clone();
50
- // ensure short attack & short release to sound plucky
51
- params_out
52
- .entry("attack".to_string())
53
- .or_insert(Value::Number(1.0));
54
- params_out
55
- .entry("release".to_string())
56
- .or_insert(Value::Number(100.0));
57
- params_out
58
- .entry("sustain".to_string())
59
- .or_insert(Value::Number(0.0));
60
- // add a small "click" transient and a light resonant filter to emphasize the pluck
61
- use devalang_types::Value as DV;
62
- let freq = note_to_freq(_note_name);
63
- let mut filt: std::collections::HashMap<String, Value> = std::collections::HashMap::new();
64
- filt.insert("type".to_string(), Value::String("bandpass".to_string()));
65
- // center filter a bit above the note to give a bright pluck transient
66
- // use more explicit filter parameter names requested by user
67
- filt.insert(
68
- "cutoff".to_string(),
69
- Value::Number((freq * 2.0).min(10000.0)),
70
- );
71
- filt.insert("resonance".to_string(), Value::Number(6.0));
72
- // only insert filters if not already present
73
- if !params_out.contains_key("filters") {
74
- params_out.insert("filters".to_string(), DV::Array(vec![DV::Map(filt)]));
75
- }
76
- // frequency unchanged here; caller computes freq
77
- // stronger pitch drop for a plucky character
78
- let freq_end = freq * 0.98;
79
- (0.0, freq_end, amp_out, params_out)
80
- }
81
-
82
- fn note_to_freq(note: &str) -> f32 {
83
- let notes = [
84
- "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B",
85
- ];
86
-
87
- if note.len() < 2 || note.len() > 3 {
88
- return 440.0;
89
- }
90
-
91
- let (name, octave_str) = note.split_at(note.len() - 1);
92
- let semitone = notes.iter().position(|&n| n == name).unwrap_or(9) as i32;
93
- let octave = octave_str.parse::<i32>().unwrap_or(4);
94
- let midi_note = (octave + 1) * 12 + semitone;
95
-
96
- 440.0 * (2.0_f32).powf(((midi_note as f32) - 69.0) / 12.0)
97
- }
1
+ use devalang_types::Value;
2
+ use std::collections::HashMap;
3
+
4
+ pub fn apply_defaults(synth_params: &mut HashMap<String, Value>) {
5
+ use devalang_types::Value as DV;
6
+ // pluck: very short attack, short decay, very low sustain, short release
7
+ synth_params
8
+ .entry("attack".to_string())
9
+ .or_insert(DV::Number(2.0));
10
+ synth_params
11
+ .entry("decay".to_string())
12
+ .or_insert(DV::Number(80.0));
13
+ synth_params
14
+ .entry("sustain".to_string())
15
+ .or_insert(DV::Number(0.0));
16
+ synth_params
17
+ .entry("release".to_string())
18
+ .or_insert(DV::Number(120.0));
19
+ synth_params
20
+ .entry("glide".to_string())
21
+ .or_insert(DV::Boolean(false));
22
+ synth_params
23
+ .entry("slide".to_string())
24
+ .or_insert(DV::Boolean(false));
25
+ // small transient helper for plucks
26
+ synth_params
27
+ .entry("pluck_click".to_string())
28
+ .or_insert(DV::Number(0.08));
29
+ synth_params
30
+ .entry("pluck_click_ms".to_string())
31
+ .or_insert(DV::Number(8.0));
32
+ }
33
+
34
+ // Prepare per-note modifications for pluck: short attack/release, optional amp curve per-index
35
+ pub fn prepare_note(
36
+ _note_name: &str,
37
+ index: usize,
38
+ _total: usize,
39
+ _start_time_ms: f32,
40
+ _duration_ms: f32,
41
+ amp: f32,
42
+ _synth_params: &HashMap<String, Value>,
43
+ note_params: &HashMap<String, Value>,
44
+ _automation: &Option<HashMap<String, Value>>,
45
+ ) -> (f32, f32, f32, HashMap<String, Value>) {
46
+ // pluck slightly reduces amp for later notes by a tiny fraction
47
+ let decay = 0.02 * (index as f32);
48
+ let amp_out = (amp * (1.0 - decay)).max(0.0);
49
+ let mut params_out = note_params.clone();
50
+ // ensure short attack & short release to sound plucky
51
+ params_out
52
+ .entry("attack".to_string())
53
+ .or_insert(Value::Number(1.0));
54
+ params_out
55
+ .entry("release".to_string())
56
+ .or_insert(Value::Number(100.0));
57
+ params_out
58
+ .entry("sustain".to_string())
59
+ .or_insert(Value::Number(0.0));
60
+ // add a small "click" transient and a light resonant filter to emphasize the pluck
61
+ use devalang_types::Value as DV;
62
+ let freq = note_to_freq(_note_name);
63
+ let mut filt: std::collections::HashMap<String, Value> = std::collections::HashMap::new();
64
+ filt.insert("type".to_string(), Value::String("bandpass".to_string()));
65
+ // center filter a bit above the note to give a bright pluck transient
66
+ // use more explicit filter parameter names requested by user
67
+ filt.insert(
68
+ "cutoff".to_string(),
69
+ Value::Number((freq * 2.0).min(10000.0)),
70
+ );
71
+ filt.insert("resonance".to_string(), Value::Number(6.0));
72
+ // only insert filters if not already present
73
+ if !params_out.contains_key("filters") {
74
+ params_out.insert("filters".to_string(), DV::Array(vec![DV::Map(filt)]));
75
+ }
76
+ // frequency unchanged here; caller computes freq
77
+ // stronger pitch drop for a plucky character
78
+ let freq_end = freq * 0.98;
79
+ (0.0, freq_end, amp_out, params_out)
80
+ }
81
+
82
+ fn note_to_freq(note: &str) -> f32 {
83
+ let notes = [
84
+ "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B",
85
+ ];
86
+
87
+ if note.len() < 2 || note.len() > 3 {
88
+ return 440.0;
89
+ }
90
+
91
+ let (name, octave_str) = note.split_at(note.len() - 1);
92
+ let semitone = notes.iter().position(|&n| n == name).unwrap_or(9) as i32;
93
+ let octave = octave_str.parse::<i32>().unwrap_or(4);
94
+ let midi_note = (octave + 1) * 12 + semitone;
95
+
96
+ 440.0 * (2.0_f32).powf(((midi_note as f32) - 69.0) / 12.0)
97
+ }
@@ -1,100 +1,100 @@
1
- use devalang_types::Value;
2
- use std::collections::HashMap;
3
-
4
- pub fn apply_defaults(synth_params: &mut HashMap<String, Value>) {
5
- use devalang_types::Value as DV;
6
- // sub bass: strong sustain, lowpass emphasis
7
- synth_params
8
- .entry("attack".to_string())
9
- .or_insert(DV::Number(10.0));
10
- synth_params
11
- .entry("decay".to_string())
12
- .or_insert(DV::Number(80.0));
13
- // sustain stored as 0.0-1.0 for consistency
14
- synth_params
15
- .entry("sustain".to_string())
16
- .or_insert(DV::Number(1.0));
17
- synth_params
18
- .entry("release".to_string())
19
- .or_insert(DV::Number(300.0));
20
- synth_params
21
- .entry("detune".to_string())
22
- .or_insert(DV::Number(0.0));
23
- synth_params
24
- .entry("lowpass".to_string())
25
- .or_insert(DV::Number(150.0));
26
- // octave stacking and drive for extra body
27
- synth_params
28
- .entry("octaves".to_string())
29
- .or_insert(DV::Number(1.0));
30
- synth_params
31
- .entry("drive".to_string())
32
- .or_insert(DV::Number(0.0));
33
- // encourage a lowpass default if none provided
34
- synth_params
35
- .entry("lowpass".to_string())
36
- .or_insert(DV::Number(120.0));
37
- }
38
-
39
- // prepare_note for sub: shift note one or two octaves down and set stronger amp
40
- pub fn prepare_note(
41
- note_name: &str,
42
- _index: usize,
43
- _total: usize,
44
- _start_time_ms: f32,
45
- _duration_ms: f32,
46
- amp: f32,
47
- _synth_params: &HashMap<String, Value>,
48
- note_params: &HashMap<String, Value>,
49
- _automation: &Option<HashMap<String, Value>>,
50
- ) -> (f32, f32, f32, HashMap<String, Value>) {
51
- let mut params_out = note_params.clone();
52
- params_out
53
- .entry("attack".to_string())
54
- .or_insert(Value::Number(5.0));
55
- params_out
56
- .entry("release".to_string())
57
- .or_insert(Value::Number(200.0));
58
- params_out
59
- .entry("sustain".to_string())
60
- .or_insert(Value::Number(1.0));
61
-
62
- // compute deep-frequency one octave down by default
63
- let freq = note_to_freq(note_name) * 0.5;
64
- // allow stacking additional octaves for extra body
65
- if let Some(Value::Number(o)) = _synth_params.get("octaves") {
66
- let oct = (*o as i32).max(1);
67
- if oct >= 2 {
68
- // add lower harmonic by halving frequency again (engine may layer if octaves param is observed)
69
- // we still return the primary frequency but advertise octaves in params
70
- params_out.insert("octaves".to_string(), Value::Number(*o));
71
- }
72
- }
73
-
74
- // boost amplitude a little for sub
75
- let amp_out = (amp * 1.5).min(1.0);
76
-
77
- // advertise drive if present so engine/effects can apply soft clipping
78
- if let Some(Value::Number(d)) = _synth_params.get("drive") {
79
- params_out.insert("drive".to_string(), Value::Number(*d));
80
- }
81
-
82
- (0.0, freq, amp_out, params_out)
83
- }
84
-
85
- fn note_to_freq(note: &str) -> f32 {
86
- let notes = [
87
- "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B",
88
- ];
89
-
90
- if note.len() < 2 || note.len() > 3 {
91
- return 440.0;
92
- }
93
-
94
- let (name, octave_str) = note.split_at(note.len() - 1);
95
- let semitone = notes.iter().position(|&n| n == name).unwrap_or(9) as i32;
96
- let octave = octave_str.parse::<i32>().unwrap_or(4);
97
- let midi_note = (octave + 1) * 12 + semitone;
98
-
99
- 440.0 * (2.0_f32).powf(((midi_note as f32) - 69.0) / 12.0)
100
- }
1
+ use devalang_types::Value;
2
+ use std::collections::HashMap;
3
+
4
+ pub fn apply_defaults(synth_params: &mut HashMap<String, Value>) {
5
+ use devalang_types::Value as DV;
6
+ // sub bass: strong sustain, lowpass emphasis
7
+ synth_params
8
+ .entry("attack".to_string())
9
+ .or_insert(DV::Number(10.0));
10
+ synth_params
11
+ .entry("decay".to_string())
12
+ .or_insert(DV::Number(80.0));
13
+ // sustain stored as 0.0-1.0 for consistency
14
+ synth_params
15
+ .entry("sustain".to_string())
16
+ .or_insert(DV::Number(1.0));
17
+ synth_params
18
+ .entry("release".to_string())
19
+ .or_insert(DV::Number(300.0));
20
+ synth_params
21
+ .entry("detune".to_string())
22
+ .or_insert(DV::Number(0.0));
23
+ synth_params
24
+ .entry("lowpass".to_string())
25
+ .or_insert(DV::Number(150.0));
26
+ // octave stacking and drive for extra body
27
+ synth_params
28
+ .entry("octaves".to_string())
29
+ .or_insert(DV::Number(1.0));
30
+ synth_params
31
+ .entry("drive".to_string())
32
+ .or_insert(DV::Number(0.0));
33
+ // encourage a lowpass default if none provided
34
+ synth_params
35
+ .entry("lowpass".to_string())
36
+ .or_insert(DV::Number(120.0));
37
+ }
38
+
39
+ // prepare_note for sub: shift note one or two octaves down and set stronger amp
40
+ pub fn prepare_note(
41
+ note_name: &str,
42
+ _index: usize,
43
+ _total: usize,
44
+ _start_time_ms: f32,
45
+ _duration_ms: f32,
46
+ amp: f32,
47
+ _synth_params: &HashMap<String, Value>,
48
+ note_params: &HashMap<String, Value>,
49
+ _automation: &Option<HashMap<String, Value>>,
50
+ ) -> (f32, f32, f32, HashMap<String, Value>) {
51
+ let mut params_out = note_params.clone();
52
+ params_out
53
+ .entry("attack".to_string())
54
+ .or_insert(Value::Number(5.0));
55
+ params_out
56
+ .entry("release".to_string())
57
+ .or_insert(Value::Number(200.0));
58
+ params_out
59
+ .entry("sustain".to_string())
60
+ .or_insert(Value::Number(1.0));
61
+
62
+ // compute deep-frequency one octave down by default
63
+ let freq = note_to_freq(note_name) * 0.5;
64
+ // allow stacking additional octaves for extra body
65
+ if let Some(Value::Number(o)) = _synth_params.get("octaves") {
66
+ let oct = (*o as i32).max(1);
67
+ if oct >= 2 {
68
+ // add lower harmonic by halving frequency again (engine may layer if octaves param is observed)
69
+ // we still return the primary frequency but advertise octaves in params
70
+ params_out.insert("octaves".to_string(), Value::Number(*o));
71
+ }
72
+ }
73
+
74
+ // boost amplitude a little for sub
75
+ let amp_out = (amp * 1.5).min(1.0);
76
+
77
+ // advertise drive if present so engine/effects can apply soft clipping
78
+ if let Some(Value::Number(d)) = _synth_params.get("drive") {
79
+ params_out.insert("drive".to_string(), Value::Number(*d));
80
+ }
81
+
82
+ (0.0, freq, amp_out, params_out)
83
+ }
84
+
85
+ fn note_to_freq(note: &str) -> f32 {
86
+ let notes = [
87
+ "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B",
88
+ ];
89
+
90
+ if note.len() < 2 || note.len() > 3 {
91
+ return 440.0;
92
+ }
93
+
94
+ let (name, octave_str) = note.split_at(note.len() - 1);
95
+ let semitone = notes.iter().position(|&n| n == name).unwrap_or(9) as i32;
96
+ let octave = octave_str.parse::<i32>().unwrap_or(4);
97
+ let midi_note = (octave + 1) * 12 + semitone;
98
+
99
+ 440.0 * (2.0_f32).powf(((midi_note as f32) - 69.0) / 12.0)
100
+ }
@@ -1,16 +1,16 @@
1
- use crate::core::parser::statement::{Statement, StatementKind};
2
- use devalang_types::VariableTable;
3
-
4
- // Store automation configuration into the variable table under a namespaced key
5
- // Key: "<target>__automation" => Value::Map({ target, params })
6
- pub fn interprete_automate_statement(
7
- stmt: &Statement,
8
- variable_table: &mut VariableTable,
9
- ) -> Option<VariableTable> {
10
- if let StatementKind::Automate { target } = &stmt.kind {
11
- let key = format!("{}__automation", target);
12
- variable_table.set(key, stmt.value.clone());
13
- return Some(variable_table.clone());
14
- }
15
- None
16
- }
1
+ use crate::core::parser::statement::{Statement, StatementKind};
2
+ use devalang_types::VariableTable;
3
+
4
+ // Store automation configuration into the variable table under a namespaced key
5
+ // Key: "<target>__automation" => Value::Map({ target, params })
6
+ pub fn interprete_automate_statement(
7
+ stmt: &Statement,
8
+ variable_table: &mut VariableTable,
9
+ ) -> Option<VariableTable> {
10
+ if let StatementKind::Automate { target } = &stmt.kind {
11
+ let key = format!("{}__automation", target);
12
+ variable_table.set(key, stmt.value.clone());
13
+ return Some(variable_table.clone());
14
+ }
15
+ None
16
+ }