@devaloop/devalang 0.0.1-beta.1 → 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 (207) hide show
  1. package/.devalang +9 -10
  2. package/Cargo.toml +84 -80
  3. package/README.md +10 -7
  4. package/docs/CHANGELOG.md +83 -0
  5. package/docs/ROADMAP.md +6 -2
  6. package/docs/TODO.md +3 -14
  7. package/examples/bus.deva +10 -0
  8. package/examples/chain.deva +19 -0
  9. package/examples/effect.deva +2 -0
  10. package/examples/filter.deva +11 -0
  11. package/examples/lfo.deva +9 -0
  12. package/examples/plugin.deva +10 -10
  13. package/examples/routing.deva +23 -0
  14. package/examples/synth.deva +11 -1
  15. package/examples/synth_types.deva +17 -0
  16. package/out-tsc/bin/project-version.json +6 -0
  17. package/out-tsc/core/functions/index.d.ts +5 -0
  18. package/out-tsc/core/functions/index.js +11 -0
  19. package/out-tsc/pkg/devalang_core.d.ts +2 -0
  20. package/out-tsc/pkg/devalang_core.js +17 -2
  21. package/out-tsc/pkg/devalang_core_bg.wasm.d.ts +1 -0
  22. package/out-tsc/scripts/version/copy-to-binary.d.ts +1 -0
  23. package/out-tsc/scripts/version/copy-to-binary.js +79 -0
  24. package/package.json +23 -10
  25. package/project-version.json +3 -3
  26. package/rust/bindings/Cargo.toml +9 -0
  27. package/rust/bindings/src/lib.rs +86 -0
  28. package/rust/cli/addon/commands.rs +35 -0
  29. package/rust/cli/addon/download.rs +234 -0
  30. package/rust/cli/addon/install.rs +33 -0
  31. package/rust/cli/addon/list.rs +224 -0
  32. package/rust/cli/addon/metadata.rs +124 -0
  33. package/rust/cli/addon/mod.rs +8 -0
  34. package/rust/cli/addon/remove.rs +271 -0
  35. package/rust/cli/addon/update.rs +305 -0
  36. package/rust/cli/{install/addon.rs → addon/utils.rs} +34 -43
  37. package/rust/cli/build/commands.rs +153 -103
  38. package/rust/cli/build/mod.rs +2 -2
  39. package/rust/cli/build/process.rs +165 -146
  40. package/rust/cli/check/mod.rs +208 -208
  41. package/rust/cli/discover/commands.rs +53 -31
  42. package/rust/cli/discover/config.rs +2 -4
  43. package/rust/cli/discover/install.rs +139 -28
  44. package/rust/cli/discover/metadata.rs +3 -3
  45. package/rust/cli/login/commands.rs +124 -124
  46. package/rust/cli/me/commands.rs +52 -0
  47. package/rust/cli/me/mod.rs +1 -0
  48. package/rust/cli/mod.rs +2 -2
  49. package/rust/cli/parser.rs +76 -70
  50. package/rust/cli/play/commands.rs +375 -324
  51. package/rust/cli/play/mod.rs +5 -5
  52. package/rust/cli/play/process.rs +159 -150
  53. package/rust/cli/play/realtime.rs +91 -91
  54. package/rust/cli/telemetry/commands.rs +22 -22
  55. package/rust/cli/telemetry/event_creator.rs +80 -80
  56. package/rust/cli/telemetry/mod.rs +3 -3
  57. package/rust/cli/telemetry/send.rs +51 -51
  58. package/rust/cli/template/commands.rs +69 -69
  59. package/rust/config/driver.rs +112 -103
  60. package/rust/config/mod.rs +3 -3
  61. package/rust/config/ops.rs +26 -26
  62. package/rust/config/settings.rs +101 -101
  63. package/rust/core/audio/engine/driver.rs +237 -0
  64. package/rust/core/audio/engine/export.rs +169 -0
  65. package/rust/core/audio/engine/helpers.rs +178 -170
  66. package/rust/core/audio/engine/mod.rs +56 -7
  67. package/rust/core/audio/engine/notes/dsp.rs +88 -0
  68. package/rust/core/audio/engine/notes/mod.rs +53 -0
  69. package/rust/core/audio/engine/notes/params.rs +294 -0
  70. package/rust/core/audio/engine/sample/insert.rs +300 -0
  71. package/rust/core/audio/engine/sample/mod.rs +40 -0
  72. package/rust/core/audio/engine/sample/padding.rs +170 -0
  73. package/rust/core/audio/evaluator/condition.rs +61 -0
  74. package/rust/core/audio/evaluator/mod.rs +9 -0
  75. package/rust/core/audio/{evaluator.rs → evaluator/numeric.rs} +152 -310
  76. package/rust/core/audio/evaluator/rhs.rs +16 -0
  77. package/rust/core/audio/evaluator/string_expr.rs +94 -0
  78. package/rust/core/audio/interpreter/driver.rs +574 -542
  79. package/rust/core/audio/interpreter/mod.rs +2 -14
  80. package/rust/core/audio/interpreter/statements/arrow_call/interprete.rs +179 -0
  81. package/rust/core/audio/interpreter/statements/arrow_call/methods/chord.rs +398 -0
  82. package/rust/core/audio/interpreter/statements/arrow_call/methods/effects.rs +323 -0
  83. package/rust/core/audio/interpreter/statements/arrow_call/methods/mod.rs +3 -0
  84. package/rust/core/audio/interpreter/statements/arrow_call/methods/note.rs +371 -0
  85. package/rust/core/audio/interpreter/statements/arrow_call/mod.rs +3 -0
  86. package/rust/core/audio/interpreter/statements/arrow_call/types/arp.rs +192 -0
  87. package/rust/core/audio/interpreter/statements/arrow_call/types/mod.rs +24 -0
  88. package/rust/core/audio/interpreter/statements/arrow_call/types/pad.rs +116 -0
  89. package/rust/core/audio/interpreter/statements/arrow_call/types/pluck.rs +97 -0
  90. package/rust/core/audio/interpreter/statements/arrow_call/types/sub.rs +100 -0
  91. package/rust/core/audio/interpreter/{automate.rs → statements/automate.rs} +2 -4
  92. package/rust/core/audio/interpreter/{call.rs → statements/call.rs} +36 -5
  93. package/rust/core/audio/interpreter/{condition.rs → statements/condition.rs} +72 -71
  94. package/rust/core/audio/interpreter/{function.rs → statements/function.rs} +24 -26
  95. package/rust/core/audio/interpreter/{let_.rs → statements/let_.rs} +36 -38
  96. package/rust/core/audio/interpreter/{load.rs → statements/load.rs} +17 -19
  97. package/rust/core/audio/interpreter/{loop_.rs → statements/loop_.rs} +115 -114
  98. package/rust/core/audio/interpreter/statements/mod.rs +12 -0
  99. package/rust/core/audio/interpreter/{sleep.rs → statements/sleep.rs} +28 -28
  100. package/rust/core/audio/interpreter/{spawn.rs → statements/spawn.rs} +54 -4
  101. package/rust/core/audio/interpreter/{tempo.rs → statements/tempo.rs} +40 -40
  102. package/rust/core/audio/interpreter/{trigger.rs → statements/trigger.rs} +242 -239
  103. package/rust/core/audio/loader/trigger.rs +98 -97
  104. package/rust/core/audio/mod.rs +6 -7
  105. package/rust/core/audio/special/easing.rs +189 -189
  106. package/rust/core/audio/special/env.rs +45 -45
  107. package/rust/core/audio/special/math.rs +134 -134
  108. package/rust/core/audio/special/modulator.rs +143 -143
  109. package/rust/core/builder/mod.rs +129 -86
  110. package/rust/core/debugger/{module.rs → logs.rs} +52 -55
  111. package/rust/core/debugger/mod.rs +30 -30
  112. package/rust/core/debugger/store.rs +38 -40
  113. package/rust/core/error/mod.rs +269 -269
  114. package/rust/core/lexer/driver.rs +2 -4
  115. package/rust/core/mod.rs +9 -10
  116. package/rust/core/parser/driver/block.rs +111 -0
  117. package/rust/core/parser/driver/cursor.rs +82 -0
  118. package/rust/core/parser/driver/driver_impl.rs +159 -0
  119. package/rust/core/parser/driver/mod.rs +6 -0
  120. package/rust/core/parser/driver/parse_array.rs +120 -0
  121. package/rust/core/parser/driver/parse_map.rs +247 -0
  122. package/rust/core/parser/driver/parser.rs +160 -0
  123. package/rust/core/parser/handler/arrow_call.rs +90 -15
  124. package/rust/core/parser/handler/at.rs +279 -279
  125. package/rust/core/parser/handler/bank.rs +104 -104
  126. package/rust/core/parser/handler/condition.rs +83 -83
  127. package/rust/core/parser/handler/dot.rs +148 -148
  128. package/rust/core/parser/handler/identifier/automate.rs +254 -254
  129. package/rust/core/parser/handler/identifier/call.rs +91 -91
  130. package/rust/core/parser/handler/identifier/emit.rs +70 -70
  131. package/rust/core/parser/handler/identifier/function.rs +113 -113
  132. package/rust/core/parser/handler/identifier/group.rs +89 -89
  133. package/rust/core/parser/handler/identifier/let_.rs +173 -173
  134. package/rust/core/parser/handler/identifier/mod.rs +55 -55
  135. package/rust/core/parser/handler/identifier/on.rs +107 -107
  136. package/rust/core/parser/handler/identifier/print.rs +49 -49
  137. package/rust/core/parser/handler/identifier/sleep.rs +96 -43
  138. package/rust/core/parser/handler/identifier/spawn.rs +91 -91
  139. package/rust/core/parser/handler/identifier/synth.rs +39 -3
  140. package/rust/core/parser/handler/loop_.rs +194 -194
  141. package/rust/core/parser/handler/pattern.rs +25 -2
  142. package/rust/core/parser/handler/tempo.rs +105 -57
  143. package/rust/core/parser/statement.rs +10 -11
  144. package/rust/core/plugin/loader.rs +137 -137
  145. package/rust/core/plugin/runner/mod.rs +11 -0
  146. package/rust/core/plugin/{runner.rs → runner/non_wasm.rs} +206 -72
  147. package/rust/core/plugin/runner/wasm32.rs +44 -0
  148. package/rust/core/preprocessor/loader/inject.rs +313 -0
  149. package/rust/core/preprocessor/loader/loader_helpers.rs +110 -0
  150. package/rust/core/preprocessor/loader/mod.rs +235 -0
  151. package/rust/core/preprocessor/module.rs +55 -60
  152. package/rust/core/preprocessor/{processor.rs → processor/handlers.rs} +107 -114
  153. package/rust/core/preprocessor/processor/mod.rs +1 -0
  154. package/rust/core/preprocessor/resolver/function.rs +69 -69
  155. package/rust/core/preprocessor/resolver/group.rs +122 -94
  156. package/rust/core/preprocessor/resolver/pattern.rs +14 -2
  157. package/rust/core/store/global.rs +57 -61
  158. package/rust/core/store/mod.rs +1 -5
  159. package/rust/lib.rs +323 -308
  160. package/rust/macros/Cargo.toml +14 -0
  161. package/rust/macros/src/lib.rs +52 -0
  162. package/rust/main.rs +336 -143
  163. package/rust/types/Cargo.toml +1 -1
  164. package/rust/types/src/addons.rs +57 -55
  165. package/rust/types/src/config.rs +82 -74
  166. package/rust/types/src/lib.rs +15 -12
  167. package/rust/types/src/plugin.rs +20 -0
  168. package/rust/types/src/store.rs +139 -0
  169. package/rust/types/src/telemetry.rs +85 -85
  170. package/rust/utils/Cargo.toml +5 -2
  171. package/rust/utils/src/file.rs +477 -94
  172. package/rust/utils/src/first_usage.rs +97 -97
  173. package/rust/utils/src/lib.rs +9 -9
  174. package/rust/utils/src/logger.rs +200 -200
  175. package/rust/utils/src/path.rs +158 -88
  176. package/rust/utils/src/signature.rs +41 -41
  177. package/rust/utils/src/spinner.rs +20 -20
  178. package/rust/utils/src/version.rs +58 -27
  179. package/rust/utils/src/watcher.rs +46 -46
  180. package/rust/web/api.rs +5 -5
  181. package/rust/web/auth.rs +5 -0
  182. package/rust/web/cdn.rs +34 -34
  183. package/rust/web/forge.rs +5 -0
  184. package/rust/web/mod.rs +2 -0
  185. package/tests/integration.rs +21 -21
  186. package/typescript/core/functions/index.ts +11 -0
  187. package/typescript/pkg/devalang_core.ts +20 -4
  188. package/typescript/scripts/version/copy-to-binary.ts +82 -0
  189. package/rust/cli/bank/api.rs +0 -122
  190. package/rust/cli/bank/commands.rs +0 -275
  191. package/rust/cli/bank/mod.rs +0 -29
  192. package/rust/cli/install/bank.rs +0 -53
  193. package/rust/cli/install/commands.rs +0 -35
  194. package/rust/cli/install/mod.rs +0 -4
  195. package/rust/cli/install/plugin.rs +0 -61
  196. package/rust/core/audio/engine/sample.rs +0 -366
  197. package/rust/core/audio/engine/synth.rs +0 -325
  198. package/rust/core/audio/interpreter/arrow_call.rs +0 -311
  199. package/rust/core/audio/renderer.rs +0 -54
  200. package/rust/core/parser/driver.rs +0 -584
  201. package/rust/core/preprocessor/loader.rs +0 -637
  202. package/rust/core/store/export.rs +0 -28
  203. package/rust/core/store/function.rs +0 -40
  204. package/rust/core/store/import.rs +0 -28
  205. package/rust/core/store/variable.rs +0 -51
  206. package/rust/core/utils/mod.rs +0 -1
  207. package/rust/core/utils/path.rs +0 -37
@@ -1,584 +0,0 @@
1
- use devalang_types::Value;
2
-
3
- use crate::core::{
4
- lexer::token::{Token, TokenKind},
5
- parser::{
6
- handler::{
7
- arrow_call::parse_arrow_call,
8
- at::parse_at_token,
9
- bank::parse_bank_token,
10
- condition::parse_condition_token,
11
- dot::parse_dot_token,
12
- identifier::{
13
- emit::parse_emit_token, function::parse_function_token, on::parse_on_token,
14
- parse_identifier_token,
15
- },
16
- loop_::parse_loop_token,
17
- pattern::parse_pattern_token,
18
- tempo::parse_tempo_token,
19
- },
20
- statement::Statement,
21
- },
22
- store::global::GlobalStore,
23
- };
24
-
25
- #[derive(Debug, Clone, PartialEq)]
26
- pub struct Parser {
27
- pub resolve_modules: bool,
28
- pub tokens: Vec<Token>,
29
- pub token_index: usize,
30
- pub current_module: String,
31
- pub previous: Option<Token>,
32
- }
33
-
34
- impl Default for Parser {
35
- fn default() -> Self {
36
- Self::new()
37
- }
38
- }
39
-
40
- impl Parser {
41
- pub fn new() -> Self {
42
- Parser {
43
- resolve_modules: false,
44
- tokens: Vec::new(),
45
- token_index: 0,
46
- current_module: String::new(),
47
- previous: None,
48
- }
49
- }
50
-
51
- pub fn set_current_module(&mut self, module_path: String) {
52
- self.current_module = module_path;
53
- }
54
-
55
- pub fn advance(&mut self) -> Option<&Token> {
56
- if self.is_eof() {
57
- return None;
58
- }
59
-
60
- self.previous = self.tokens.get(self.token_index).cloned();
61
- self.token_index += 1;
62
-
63
- self.tokens.get(self.token_index - 1)
64
- }
65
-
66
- pub fn peek_is(&self, expected: &str) -> bool {
67
- self.peek().is_some_and(|t| t.lexeme == expected)
68
- }
69
-
70
- pub fn peek_nth(&self, n: usize) -> Option<&Token> {
71
- if self.token_index + n < self.tokens.len() {
72
- self.tokens.get(self.token_index + n)
73
- } else {
74
- None
75
- }
76
- }
77
-
78
- pub fn peek_nth_kind(&self, n: usize) -> Option<TokenKind> {
79
- self.peek_nth(n).map(|t| t.kind.clone())
80
- }
81
-
82
- pub fn advance_if(&mut self, kind: TokenKind) -> bool {
83
- self.match_token(kind)
84
- }
85
-
86
- pub fn match_token(&mut self, kind: TokenKind) -> bool {
87
- if let Some(tok) = self.peek() {
88
- if tok.kind == kind {
89
- self.advance();
90
- return true;
91
- }
92
- }
93
- false
94
- }
95
-
96
- pub fn previous_clone(&self) -> Option<Token> {
97
- self.previous.clone()
98
- }
99
-
100
- pub fn parse_block(
101
- &self,
102
- tokens: Vec<Token>,
103
- global_store: &mut GlobalStore,
104
- ) -> Vec<Statement> {
105
- let mut inner_parser = Parser {
106
- resolve_modules: self.resolve_modules,
107
- tokens,
108
- token_index: 0,
109
- current_module: self.current_module.clone(),
110
- previous: None,
111
- };
112
-
113
- inner_parser.parse_tokens(inner_parser.tokens.clone(), global_store)
114
- }
115
-
116
- pub fn parse_tokens(
117
- &mut self,
118
- tokens: Vec<Token>,
119
- global_store: &mut GlobalStore,
120
- ) -> Vec<Statement> {
121
- // Filter out Whitespace tokens but keep Newline tokens because some constructs (e.g., print ...)
122
- // rely on end-of-line semantics.
123
- self.tokens = tokens
124
- .into_iter()
125
- .filter(|t| t.kind != TokenKind::Whitespace)
126
- .collect();
127
- self.token_index = 0;
128
-
129
- let mut statements = Vec::new();
130
-
131
- while !self.is_eof() {
132
- let token = match self.peek() {
133
- Some(t) => t.clone(),
134
- None => {
135
- break;
136
- }
137
- };
138
-
139
- if token.kind == TokenKind::Newline {
140
- self.advance();
141
- continue;
142
- }
143
-
144
- let statement = match &token.kind {
145
- TokenKind::At => parse_at_token(self, global_store),
146
- TokenKind::Identifier => {
147
- if let Some(next) = self.peek_nth(1).cloned() {
148
- if next.kind == TokenKind::Arrow {
149
- parse_arrow_call(self, global_store)
150
- } else {
151
- parse_identifier_token(self, global_store)
152
- }
153
- } else {
154
- parse_identifier_token(self, global_store)
155
- }
156
- }
157
- TokenKind::Dot => parse_dot_token(self, global_store),
158
- TokenKind::Tempo => parse_tempo_token(self, global_store),
159
- TokenKind::Bank => parse_bank_token(self, global_store),
160
- TokenKind::Pattern => parse_pattern_token(self, global_store),
161
- TokenKind::Loop => parse_loop_token(self, global_store),
162
- TokenKind::If => parse_condition_token(self, global_store),
163
- TokenKind::Function => parse_function_token(self, global_store),
164
- TokenKind::On => parse_on_token(self, global_store),
165
- TokenKind::Emit => parse_emit_token(self, token.clone(), global_store),
166
-
167
- | TokenKind::Else // Ignore else, already handled in `parse_condition_token`
168
- | TokenKind::Comment
169
- | TokenKind::Equals
170
- | TokenKind::Colon
171
- | TokenKind::Number
172
- | TokenKind::String
173
- | TokenKind::LBrace
174
- | TokenKind::RBrace
175
- | TokenKind::Comma
176
- | TokenKind::Dedent
177
- | TokenKind::Indent => {
178
- self.advance();
179
- continue;
180
- }
181
-
182
- TokenKind::EOF => {
183
- break;
184
- }
185
-
186
- _ => {
187
- self.advance();
188
- Statement::unknown_with_pos(token.indent, token.line, token.column)
189
- }
190
- };
191
-
192
- statements.push(statement);
193
- }
194
-
195
- statements
196
- }
197
-
198
- pub fn check_token(&self, kind: TokenKind) -> bool {
199
- self.peek().is_some_and(|t| t.kind == kind)
200
- }
201
-
202
- pub fn peek_kind(&self) -> Option<TokenKind> {
203
- self.peek().map(|t| t.kind.clone())
204
- }
205
-
206
- pub fn parse_map_value(&mut self) -> Option<Value> {
207
- let logger = devalang_utils::logger::Logger::new();
208
- use devalang_utils::logger::LogLevel;
209
- if !self.match_token(TokenKind::LBrace) {
210
- return None;
211
- }
212
-
213
- let mut map = std::collections::HashMap::new();
214
-
215
- while !self.check_token(TokenKind::RBrace) && !self.is_eof() {
216
- // Skip separators and formatting before the key
217
- while self.check_token(TokenKind::Newline)
218
- || self.check_token(TokenKind::Whitespace)
219
- || self.check_token(TokenKind::Indent)
220
- || self.check_token(TokenKind::Dedent)
221
- || self.check_token(TokenKind::Comma)
222
- {
223
- self.advance();
224
- }
225
-
226
- // Check if we are at the closing brace of the map
227
- if self.check_token(TokenKind::RBrace) {
228
- break;
229
- }
230
-
231
- let key = if let Some(token) = self.advance() {
232
- match token.kind {
233
- TokenKind::Whitespace
234
- | TokenKind::Indent
235
- | TokenKind::Dedent
236
- | TokenKind::Newline => {
237
- continue;
238
- }
239
- _ => token.lexeme.clone(),
240
- }
241
- } else {
242
- break;
243
- };
244
-
245
- // Skip newlines and whitespace before colon
246
- while self.check_token(TokenKind::Newline) || self.check_token(TokenKind::Whitespace) {
247
- self.advance();
248
- }
249
-
250
- if !self.match_token(TokenKind::Colon) {
251
- logger.log_message(
252
- LogLevel::Error,
253
- &format!("Expected ':' after map key '{}'", key),
254
- );
255
- break;
256
- }
257
-
258
- // Skip separators and formatting before value
259
- while self.check_token(TokenKind::Newline)
260
- || self.check_token(TokenKind::Whitespace)
261
- || self.check_token(TokenKind::Indent)
262
- || self.check_token(TokenKind::Dedent)
263
- || self.check_token(TokenKind::Comma)
264
- {
265
- self.advance();
266
- }
267
-
268
- let value = if let Some(token) = self.peek_clone() {
269
- match token.kind {
270
- TokenKind::String => {
271
- self.advance();
272
- Value::String(token.lexeme.clone())
273
- }
274
- TokenKind::Number => {
275
- let mut number_str = token.lexeme.clone();
276
- self.advance(); // consume the first number
277
-
278
- if let Some(dot_token) = self.peek_clone() {
279
- if dot_token.kind == TokenKind::Dot {
280
- self.advance(); // consume the dot
281
-
282
- if let Some(decimal_token) = self.peek_clone() {
283
- if decimal_token.kind == TokenKind::Number {
284
- self.advance(); // consume the number after the dot
285
- number_str.push('.');
286
- number_str.push_str(&decimal_token.lexeme);
287
- } else {
288
- logger.log_message(
289
- LogLevel::Error,
290
- &format!(
291
- "Expected number after dot, got {:?}",
292
- decimal_token
293
- ),
294
- );
295
- return Some(Value::Null);
296
- }
297
- } else {
298
- logger.log_message(
299
- LogLevel::Error,
300
- "Expected number after dot, but reached EOF",
301
- );
302
- return Some(Value::Null);
303
- }
304
- }
305
- }
306
-
307
- Value::Number(number_str.parse::<f32>().unwrap_or(0.0))
308
- }
309
-
310
- TokenKind::Identifier => {
311
- // Support dotted identifiers in map values: alias.param or nested
312
- let current_line = token.line;
313
- let mut parts: Vec<String> = vec![token.lexeme.clone()];
314
- self.advance();
315
- loop {
316
- let Some(next) = self.peek_clone() else { break };
317
- if next.line != current_line {
318
- break;
319
- }
320
- if next.kind == TokenKind::Dot {
321
- // Consume '.' and the following identifier/number on same line
322
- self.advance(); // dot
323
- if let Some(id2) = self.peek_clone() {
324
- if id2.line == current_line
325
- && (id2.kind == TokenKind::Identifier
326
- || id2.kind == TokenKind::Number)
327
- {
328
- parts.push(id2.lexeme.clone());
329
- self.advance(); // consume part
330
- continue;
331
- }
332
- }
333
- break;
334
- } else {
335
- break;
336
- }
337
- }
338
- Value::Identifier(parts.join("."))
339
- }
340
- _ => {
341
- logger.log_message(
342
- LogLevel::Error,
343
- &format!("Unexpected token in map value: {:?}", token),
344
- );
345
- Value::Null
346
- }
347
- }
348
- } else {
349
- Value::Null
350
- };
351
-
352
- map.insert(key, value);
353
-
354
- // Optionally skip a trailing comma after the value
355
- while self.check_token(TokenKind::Comma)
356
- || self.check_token(TokenKind::Whitespace)
357
- || self.check_token(TokenKind::Newline)
358
- {
359
- self.advance();
360
- }
361
- }
362
-
363
- if !self.match_token(TokenKind::RBrace) {
364
- logger.log_message(LogLevel::Error, "Expected '}' at end of map");
365
- }
366
-
367
- Some(Value::Map(map))
368
- }
369
-
370
- // Parse an array value like [1, 2, 3] or ["a", b]
371
- pub fn parse_array_value(&mut self) -> Option<Value> {
372
- let logger = devalang_utils::logger::Logger::new();
373
- use devalang_utils::logger::LogLevel;
374
- if !self.match_token(TokenKind::LBracket) {
375
- return None;
376
- }
377
-
378
- let mut arr: Vec<Value> = Vec::new();
379
-
380
- while !self.check_token(TokenKind::RBracket) && !self.is_eof() {
381
- // Skip formatting tokens
382
- while self.check_token(TokenKind::Newline)
383
- || self.check_token(TokenKind::Whitespace)
384
- || self.check_token(TokenKind::Indent)
385
- || self.check_token(TokenKind::Dedent)
386
- || self.check_token(TokenKind::Comma)
387
- {
388
- self.advance();
389
- }
390
-
391
- if self.check_token(TokenKind::RBracket) {
392
- break;
393
- }
394
-
395
- if let Some(token) = self.peek_clone() {
396
- let value = match token.kind {
397
- TokenKind::String => {
398
- self.advance();
399
- Value::String(token.lexeme.clone())
400
- }
401
- TokenKind::Number => {
402
- // Support simple decimals split as number '.' number
403
- let mut number_str = token.lexeme.clone();
404
- self.advance();
405
- if let Some(dot) = self.peek_clone() {
406
- if dot.kind == TokenKind::Dot {
407
- if let Some(next) = self.peek_nth(1).cloned() {
408
- if next.kind == TokenKind::Number {
409
- self.advance(); // consume dot
410
- self.advance(); // consume next number
411
- number_str.push('.');
412
- number_str.push_str(&next.lexeme);
413
- }
414
- }
415
- }
416
- }
417
- Value::Number(number_str.parse::<f32>().unwrap_or(0.0))
418
- }
419
- TokenKind::Identifier => {
420
- self.advance();
421
- Value::Identifier(token.lexeme.clone())
422
- }
423
- TokenKind::LBrace => {
424
- // Allow inline maps inside arrays
425
- if let Some(v) = self.parse_map_value() {
426
- v
427
- } else {
428
- Value::Null
429
- }
430
- }
431
- TokenKind::LBracket => {
432
- // Nested arrays
433
- if let Some(v) = self.parse_array_value() {
434
- v
435
- } else {
436
- Value::Null
437
- }
438
- }
439
- _ => {
440
- self.advance();
441
- Value::Null
442
- }
443
- };
444
-
445
- // Only push non-null (retain alignment with permissive parsing)
446
- if value != Value::Null {
447
- arr.push(value);
448
- }
449
-
450
- // Optional trailing comma handled by the skipper at loop start
451
- } else {
452
- break;
453
- }
454
- }
455
-
456
- if !self.match_token(TokenKind::RBracket) {
457
- logger.log_message(LogLevel::Error, "Expected ']' at end of array");
458
- }
459
-
460
- Some(Value::Array(arr))
461
- }
462
-
463
- pub fn peek(&self) -> Option<&Token> {
464
- self.tokens.get(self.token_index)
465
- }
466
-
467
- pub fn peek_clone(&self) -> Option<Token> {
468
- self.tokens.get(self.token_index).cloned()
469
- }
470
-
471
- pub fn expect(&mut self, kind: TokenKind) -> Result<&Token, String> {
472
- let tok = self.advance().ok_or("Unexpected end of input")?;
473
- if tok.kind == kind {
474
- Ok(tok)
475
- } else {
476
- Err(format!("Expected {:?}, got {:?}", kind, tok.kind))
477
- }
478
- }
479
-
480
- pub fn collect_block_tokens(&mut self, base_indent: usize) -> Vec<Token> {
481
- let mut tokens = Vec::new();
482
-
483
- while let Some(tok) = self.peek() {
484
- if tok.indent <= base_indent && tok.kind != TokenKind::Newline {
485
- break;
486
- }
487
- if let Some(t) = self.advance() {
488
- tokens.push(t.clone());
489
- } else {
490
- // Unexpected EOF while collecting block tokens: stop collecting
491
- break;
492
- }
493
- }
494
-
495
- tokens
496
- }
497
-
498
- pub fn collect_until<F>(&mut self, condition: F) -> Vec<Token>
499
- where
500
- F: Fn(&Token) -> bool,
501
- {
502
- let mut collected = Vec::new();
503
- while let Some(token) = self.peek() {
504
- if condition(token) {
505
- break;
506
- }
507
- if token.kind == TokenKind::EOF {
508
- break;
509
- }
510
- if let Some(t) = self.advance() {
511
- collected.push(t.clone());
512
- } else {
513
- break;
514
- }
515
- }
516
-
517
- collected
518
- }
519
-
520
- pub fn is_eof(&self) -> bool {
521
- self.token_index >= self.tokens.len()
522
- }
523
-
524
- pub fn parse_block_until_next_else(
525
- &mut self,
526
- base_indent: usize,
527
- global_store: &mut GlobalStore,
528
- ) -> Vec<Statement> {
529
- let mut block_tokens = Vec::new();
530
-
531
- while let Some(tok) = self.peek() {
532
- // Stop if we encounter an 'else' at same indent level
533
- if tok.lexeme == "else" && tok.indent == base_indent {
534
- break;
535
- }
536
- if let Some(t) = self.advance() {
537
- block_tokens.push(t.clone());
538
- } else {
539
- break;
540
- }
541
- }
542
-
543
- self.parse_block(block_tokens, global_store)
544
- }
545
-
546
- pub fn parse_condition_until_colon(&mut self) -> Option<Value> {
547
- let tokens = self.collect_until(|t| t.kind == TokenKind::Colon);
548
- if tokens.is_empty() {
549
- return None;
550
- }
551
-
552
- let condition = tokens
553
- .iter()
554
- .map(|t| t.lexeme.clone())
555
- .collect::<Vec<_>>()
556
- .join(" ");
557
-
558
- Some(Value::String(condition))
559
- }
560
-
561
- pub fn parse_block_until_else_or_dedent(
562
- &mut self,
563
- base_indent: usize,
564
- global_store: &mut GlobalStore,
565
- ) -> Vec<Statement> {
566
- let mut tokens = Vec::new();
567
-
568
- while let Some(tok) = self.peek() {
569
- if tok.lexeme == "else" && tok.indent == base_indent {
570
- break;
571
- }
572
- if tok.indent < base_indent && tok.kind != TokenKind::Newline {
573
- break;
574
- }
575
- if let Some(t) = self.advance() {
576
- tokens.push(t.clone());
577
- } else {
578
- break;
579
- }
580
- }
581
-
582
- self.parse_block(tokens, global_store)
583
- }
584
- }