Use macro per-test-file

Signed-off-by: Marcel Müller <neikos@neikos.email>

Cargo.lock

@@ -442,6 +442,7 @@ dependencies = [
  "insta",
  "serde",
  "serde_json",
+ "test_each_file",
  "thiserror",
  "winnow",
 ]
@@ -701,6 +702,18 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "test_each_file"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44619e49a1f62888c271dc50533f036363a7936f99c7cb467ca9d45224cf83b3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "unicode-ident",
+]
+
 [[package]]
 name = "thiserror"
 version = "2.0.18"

Cargo.toml

@@ -23,6 +23,7 @@ criterion = "0.8.2"
 insta = { version = "1.46.3", features = ["glob", "serde"] }
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"
+test_each_file = "0.3.7"
 
 [profile.dev.package]
 insta.opt-level = 3

src/ast/snapshots/nomo__ast__tests__check_nested_simple_if.snap

@@ -1,152 +0,0 @@
----
-source: src/ast/mod.rs
-expression: parsed
----
-ParsedTemplate {
-    tokens: [
-        TemplateToken {
-            kind: LeftDelim,
-            source: "{{" (0..2),
-        },
-        TemplateToken {
-            kind: Whitespace,
-            source: " " (2..3),
-        },
-        TemplateToken {
-            kind: ConditionalIf,
-            source: "if" (3..5),
-        },
-        TemplateToken {
-            kind: Whitespace,
-            source: " " (5..6),
-        },
-        TemplateToken {
-            kind: Ident,
-            source: "foo" (6..9),
-        },
-        TemplateToken {
-            kind: Whitespace,
-            source: " " (9..10),
-        },
-        TemplateToken {
-            kind: RightDelim,
-            source: "}}" (10..12),
-        },
-        TemplateToken {
-            kind: Whitespace,
-            source: "\n            " (12..25),
-        },
-        TemplateToken {
-            kind: LeftDelim,
-            source: "{{" (25..27),
-        },
-        TemplateToken {
-            kind: Whitespace,
-            source: " " (27..28),
-        },
-        TemplateToken {
-            kind: ConditionalIf,
-            source: "if" (28..30),
-        },
-        TemplateToken {
-            kind: Whitespace,
-            source: " " (30..31),
-        },
-        TemplateToken {
-            kind: Ident,
-            source: "bar" (31..34),
-        },
-        TemplateToken {
-            kind: Whitespace,
-            source: " " (34..35),
-        },
-        TemplateToken {
-            kind: RightDelim,
-            source: "}}" (35..37),
-        },
-        TemplateToken {
-            kind: Whitespace,
-            source: "\n                " (37..54),
-        },
-        TemplateToken {
-            kind: Content,
-            source: "Hiii" (54..58),
-        },
-        TemplateToken {
-            kind: Whitespace,
-            source: "\n            " (58..71),
-        },
-        TemplateToken {
-            kind: LeftDelim,
-            source: "{{" (71..73),
-        },
-        TemplateToken {
-            kind: Whitespace,
-            source: " " (73..74),
-        },
-        TemplateToken {
-            kind: End,
-            source: "end" (74..77),
-        },
-        TemplateToken {
-            kind: Whitespace,
-            source: " " (77..78),
-        },
-        TemplateToken {
-            kind: RightDelim,
-            source: "}}" (78..80),
-        },
-        TemplateToken {
-            kind: Whitespace,
-            source: "\n        " (80..89),
-        },
-        TemplateToken {
-            kind: LeftDelim,
-            source: "{{" (89..91),
-        },
-        TemplateToken {
-            kind: Whitespace,
-            source: " " (91..92),
-        },
-        TemplateToken {
-            kind: End,
-            source: "end" (92..95),
-        },
-        TemplateToken {
-            kind: Whitespace,
-            source: " " (95..96),
-        },
-        TemplateToken {
-            kind: RightDelim,
-            source: "}}" (96..98),
-        },
-        TemplateToken {
-            kind: Whitespace,
-            source: "\n\n        " (98..108),
-        },
-        TemplateToken {
-            kind: LeftDelim,
-            source: "{{" (108..110),
-        },
-        TemplateToken {
-            kind: Whitespace,
-            source: " " (110..111),
-        },
-        TemplateToken {
-            kind: Ident,
-            source: "value" (111..116),
-        },
-        TemplateToken {
-            kind: Whitespace,
-            source: " " (116..117),
-        },
-        TemplateToken {
-            kind: RightDelim,
-            source: "}}" (117..119),
-        },
-        TemplateToken {
-            kind: Whitespace,
-            source: "\n        " (119..128),
-        },
-    ],
-}

tests/cases/4-output@condition.snap

@@ -1,6 +0,0 @@
----
-source: tests/file_tests.rs
-expression: output
-input_file: tests/cases/condition.nomo
----
-"\n    Hello World!\n\n\nmore"

tests/cases/4-output@identifiers.snap

@@ -1,6 +0,0 @@
----
-source: tests/file_tests.rs
-expression: output
-input_file: tests/cases/identifiers.nomo
----
-"Foo\nFoo\nFoo\nFoo\nFoo\nFoo"

tests/cases/4-output@if_else_if.snap

@@ -1,6 +0,0 @@
----
-source: tests/file_tests.rs
-expression: output
-input_file: tests/cases/if_else_if.nomo
----
-"\n    Hello World!\n"

tests/cases/4-output@multiple.snap

@@ -1,6 +0,0 @@
----
-source: tests/file_tests.rs
-expression: output
-input_file: tests/cases/multiple.nomo
----
-"Hi there! My name is Hemera Green"

tests/cases/4-output@trim_whitespace.snap

@@ -1,6 +0,0 @@
----
-source: tests/file_tests.rs
-expression: output
-input_file: tests/cases/trim_whitespace.nomo
----
-"Hello Hemera"

tests/cases/condition.1-parsed.snap

@@ -1,7 +1,11 @@
 ---
 source: tests/file_tests.rs
 expression: parsed
-input_file: tests/cases/condition.nomo
+info:
+  input: "{{ if test }}\n    Hello World!\n{{ end }}\n\n{{= stuff }}"
+  context:
+    stuff: more
+    test: true
 ---
 ParsedTemplate {
     tokens: [

tests/cases/condition.2-ast.snap

@@ -1,7 +1,11 @@
 ---
 source: tests/file_tests.rs
 expression: ast
-input_file: tests/cases/condition.nomo
+info:
+  input: "{{ if test }}\n    Hello World!\n{{ end }}\n\n{{= stuff }}"
+  context:
+    stuff: more
+    test: true
 ---
 TemplateAst {
     root: [

tests/cases/condition.3-instructions.snap

@@ -1,7 +1,11 @@
 ---
 source: tests/file_tests.rs
 expression: emit
-input_file: tests/cases/condition.nomo
+info:
+  input: "{{ if test }}\n    Hello World!\n{{ end }}\n\n{{= stuff }}"
+  context:
+    stuff: more
+    test: true
 ---
 VMInstructions {
     labels: {

tests/cases/condition.4-output.snap

@@ -0,0 +1,10 @@
+---
+source: tests/file_tests.rs
+expression: output
+info:
+  input: "{{ if test }}\n    Hello World!\n{{ end }}\n\n{{= stuff }}"
+  context:
+    stuff: more
+    test: true
+---
+"\n    Hello World!\n\n\nmore"

tests/cases/identifiers.1-parsed.snap

@@ -4,13 +4,12 @@ expression: parsed
 info:
   input: "{{= _name }}\n{{= a_name }}\n{{= name }}\n{{= _name1 }}\n{{= _namE }}\n{{= name1 }}"
   context:
-    _namE: Foo
     name1: Foo
-    name: Foo
     _name: Foo
+    _namE: Foo
     a_name: Foo
+    name: Foo
     _name1: Foo
-input_file: tests/cases/identifiers.nomo
 ---
 ParsedTemplate {
     tokens: [

tests/cases/identifiers.2-ast.snap

@@ -4,13 +4,12 @@ expression: ast
 info:
   input: "{{= _name }}\n{{= a_name }}\n{{= name }}\n{{= _name1 }}\n{{= _namE }}\n{{= name1 }}"
   context:
-    _namE: Foo
     name1: Foo
-    name: Foo
     _name: Foo
+    _namE: Foo
     a_name: Foo
+    name: Foo
     _name1: Foo
-input_file: tests/cases/identifiers.nomo
 ---
 TemplateAst {
     root: [

tests/cases/identifiers.3-instructions.snap

@@ -4,13 +4,12 @@ expression: emit
 info:
   input: "{{= _name }}\n{{= a_name }}\n{{= name }}\n{{= _name1 }}\n{{= _namE }}\n{{= name1 }}"
   context:
-    _namE: Foo
     name1: Foo
-    name: Foo
     _name: Foo
+    _namE: Foo
     a_name: Foo
+    name: Foo
     _name1: Foo
-input_file: tests/cases/identifiers.nomo
 ---
 VMInstructions {
     labels: {},

tests/cases/identifiers.4-output.snap

@@ -0,0 +1,14 @@
+---
+source: tests/file_tests.rs
+expression: output
+info:
+  input: "{{= _name }}\n{{= a_name }}\n{{= name }}\n{{= _name1 }}\n{{= _namE }}\n{{= name1 }}"
+  context:
+    name1: Foo
+    _name: Foo
+    _namE: Foo
+    a_name: Foo
+    name: Foo
+    _name1: Foo
+---
+"Foo\nFoo\nFoo\nFoo\nFoo\nFoo"

tests/cases/if_else_if.1-parsed.snap

@@ -1,7 +1,12 @@
 ---
 source: tests/file_tests.rs
 expression: parsed
-input_file: tests/cases/if_else_if.nomo
+info:
+  input: "{{ if test }}\n    Not Hello World! :C\n{{ else if another_test }}\n    Hello World!\n{{ end }}"
+  context:
+    test: false
+    stuff: more
+    another_test: true
 ---
 ParsedTemplate {
     tokens: [

tests/cases/if_else_if.2-ast.snap

@@ -1,7 +1,12 @@
 ---
 source: tests/file_tests.rs
 expression: ast
-input_file: tests/cases/if_else_if.nomo
+info:
+  input: "{{ if test }}\n    Not Hello World! :C\n{{ else if another_test }}\n    Hello World!\n{{ end }}"
+  context:
+    test: false
+    stuff: more
+    another_test: true
 ---
 TemplateAst {
     root: [

tests/cases/if_else_if.3-instructions.snap

@@ -1,7 +1,12 @@
 ---
 source: tests/file_tests.rs
 expression: emit
-input_file: tests/cases/if_else_if.nomo
+info:
+  input: "{{ if test }}\n    Not Hello World! :C\n{{ else if another_test }}\n    Hello World!\n{{ end }}"
+  context:
+    test: false
+    stuff: more
+    another_test: true
 ---
 VMInstructions {
     labels: {

tests/cases/if_else_if.4-output.snap

@@ -0,0 +1,11 @@
+---
+source: tests/file_tests.rs
+expression: output
+info:
+  input: "{{ if test }}\n    Not Hello World! :C\n{{ else if another_test }}\n    Hello World!\n{{ end }}"
+  context:
+    test: false
+    stuff: more
+    another_test: true
+---
+"\n    Hello World!\n"

tests/cases/interpolation.1-parsed.snap

@@ -1,7 +1,10 @@
 ---
 source: tests/file_tests.rs
 expression: parsed
-input_file: tests/cases/interpolation.nomo
+info:
+  input: "Hello! I'm {{= name }}"
+  context:
+    name: Hemera
 ---
 ParsedTemplate {
     tokens: [

tests/cases/interpolation.2-ast.snap

@@ -1,7 +1,10 @@
 ---
 source: tests/file_tests.rs
 expression: ast
-input_file: tests/cases/interpolation.nomo
+info:
+  input: "Hello! I'm {{= name }}"
+  context:
+    name: Hemera
 ---
 TemplateAst {
     root: [

tests/cases/interpolation.3-instructions.snap

@@ -1,7 +1,10 @@
 ---
 source: tests/file_tests.rs
 expression: emit
-input_file: tests/cases/interpolation.nomo
+info:
+  input: "Hello! I'm {{= name }}"
+  context:
+    name: Hemera
 ---
 VMInstructions {
     labels: {},

tests/cases/interpolation.4-output.snap

@@ -1,6 +1,9 @@
 ---
 source: tests/file_tests.rs
 expression: output
-input_file: tests/cases/interpolation.nomo
+info:
+  input: "Hello! I'm {{= name }}"
+  context:
+    name: Hemera
 ---
 "Hello! I'm Hemera"

tests/cases/literals.1-parsed.snap

@@ -4,7 +4,6 @@ expression: parsed
 info:
   input: "{{ if true }}\n    Hello World!\n{{ end }}"
   context: {}
-input_file: tests/cases/literals.nomo
 ---
 ParsedTemplate {
     tokens: [

tests/cases/literals.2-ast.snap

@@ -4,7 +4,6 @@ expression: ast
 info:
   input: "{{ if true }}\n    Hello World!\n{{ end }}"
   context: {}
-input_file: tests/cases/literals.nomo
 ---
 TemplateAst {
     root: [

tests/cases/literals.3-instructions.snap

@@ -4,7 +4,6 @@ expression: emit
 info:
   input: "{{ if true }}\n    Hello World!\n{{ end }}"
   context: {}
-input_file: tests/cases/literals.nomo
 ---
 VMInstructions {
     labels: {

tests/cases/literals.4-output.snap

@@ -4,6 +4,5 @@ expression: output
 info:
   input: "{{ if true }}\n    Hello World!\n{{ end }}"
   context: {}
-input_file: tests/cases/literals.nomo
 ---
 "\n    Hello World!\n"

tests/cases/maths.1-parsed.snap

@@ -4,7 +4,6 @@ expression: parsed
 info:
   input: "{{= 5 * 3 }}\n{{= 2 * 3 + 4 * 3 }}\n{{= 3 / 3 + 3 }}"
   context: {}
-input_file: tests/cases/maths.nomo
 ---
 ParsedTemplate {
     tokens: [

tests/cases/maths.2-ast.snap

@@ -4,7 +4,6 @@ expression: ast
 info:
   input: "{{= 5 * 3 }}\n{{= 2 * 3 + 4 * 3 }}\n{{= 3 / 3 + 3 }}"
   context: {}
-input_file: tests/cases/maths.nomo
 ---
 TemplateAst {
     root: [

tests/cases/maths.3-instructions.snap

@@ -4,7 +4,6 @@ expression: emit
 info:
   input: "{{= 5 * 3 }}\n{{= 2 * 3 + 4 * 3 }}\n{{= 3 / 3 + 3 }}"
   context: {}
-input_file: tests/cases/maths.nomo
 ---
 VMInstructions {
     labels: {},

tests/cases/maths.4-output.snap

@@ -4,6 +4,5 @@ expression: output
 info:
   input: "{{= 5 * 3 }}\n{{= 2 * 3 + 4 * 3 }}\n{{= 3 / 3 + 3 }}"
   context: {}
-input_file: tests/cases/maths.nomo
 ---
 "15\n18\n4"

tests/cases/multiple.1-parsed.snap

@@ -1,7 +1,11 @@
 ---
 source: tests/file_tests.rs
 expression: parsed
-input_file: tests/cases/multiple.nomo
+info:
+  input: "Hi there! My name is {{= name }} {{= lastname }}"
+  context:
+    name: Hemera
+    lastname: Green
 ---
 ParsedTemplate {
     tokens: [

tests/cases/multiple.2-ast.snap

@@ -1,7 +1,11 @@
 ---
 source: tests/file_tests.rs
 expression: ast
-input_file: tests/cases/multiple.nomo
+info:
+  input: "Hi there! My name is {{= name }} {{= lastname }}"
+  context:
+    name: Hemera
+    lastname: Green
 ---
 TemplateAst {
     root: [

tests/cases/multiple.3-instructions.snap

@@ -1,7 +1,11 @@
 ---
 source: tests/file_tests.rs
 expression: emit
-input_file: tests/cases/multiple.nomo
+info:
+  input: "Hi there! My name is {{= name }} {{= lastname }}"
+  context:
+    name: Hemera
+    lastname: Green
 ---
 VMInstructions {
     labels: {},

tests/cases/multiple.4-output.snap

@@ -0,0 +1,10 @@
+---
+source: tests/file_tests.rs
+expression: output
+info:
+  input: "Hi there! My name is {{= name }} {{= lastname }}"
+  context:
+    name: Hemera
+    lastname: Green
+---
+"Hi there! My name is Hemera Green"

tests/cases/simple.1-parsed.snap

@@ -1,7 +1,9 @@
 ---
 source: tests/file_tests.rs
 expression: parsed
-input_file: tests/cases/simple.nomo
+info:
+  input: Hello World!
+  context: {}
 ---
 ParsedTemplate {
     tokens: [

tests/cases/simple.2-ast.snap

@@ -1,7 +1,9 @@
 ---
 source: tests/file_tests.rs
 expression: ast
-input_file: tests/cases/simple.nomo
+info:
+  input: Hello World!
+  context: {}
 ---
 TemplateAst {
     root: [

tests/cases/simple.3-instructions.snap

@@ -1,7 +1,9 @@
 ---
 source: tests/file_tests.rs
 expression: emit
-input_file: tests/cases/simple.nomo
+info:
+  input: Hello World!
+  context: {}
 ---
 VMInstructions {
     labels: {},

tests/cases/simple.4-output.snap

@@ -1,6 +1,8 @@
 ---
 source: tests/file_tests.rs
 expression: output
-input_file: tests/cases/simple.nomo
+info:
+  input: Hello World!
+  context: {}
 ---
 "Hello World!"

tests/cases/simple_for.1-parsed.snap

@@ -8,7 +8,6 @@ info:
     values:
       - one
       - two
-input_file: tests/cases/simple_for.nomo
 ---
 ParsedTemplate {
     tokens: [

tests/cases/simple_for.2-ast.snap

@@ -8,7 +8,6 @@ info:
     values:
       - one
       - two
-input_file: tests/cases/simple_for.nomo
 ---
 TemplateAst {
     root: [

tests/cases/simple_for.3-instructions.snap

@@ -8,7 +8,6 @@ info:
     values:
       - one
       - two
-input_file: tests/cases/simple_for.nomo
 ---
 VMInstructions {
     labels: {

tests/cases/simple_for.4-output.snap

@@ -8,6 +8,5 @@ info:
     values:
       - one
       - two
-input_file: tests/cases/simple_for.nomo
 ---
 "one\ntwo\n\nNo Values >:C"

tests/cases/trim_whitespace.1-parsed.snap

@@ -1,7 +1,11 @@
 ---
 source: tests/file_tests.rs
 expression: parsed
-input_file: tests/cases/trim_whitespace.nomo
+info:
+  input: "{{ if test -}}\n    Hello {{= stuff -}}\n{{- end }}"
+  context:
+    stuff: Hemera
+    test: true
 ---
 ParsedTemplate {
     tokens: [

tests/cases/trim_whitespace.2-ast.snap

@@ -1,7 +1,11 @@
 ---
 source: tests/file_tests.rs
 expression: ast
-input_file: tests/cases/trim_whitespace.nomo
+info:
+  input: "{{ if test -}}\n    Hello {{= stuff -}}\n{{- end }}"
+  context:
+    stuff: Hemera
+    test: true
 ---
 TemplateAst {
     root: [

tests/cases/trim_whitespace.3-instructions.snap

@@ -1,7 +1,11 @@
 ---
 source: tests/file_tests.rs
 expression: emit
-input_file: tests/cases/trim_whitespace.nomo
+info:
+  input: "{{ if test -}}\n    Hello {{= stuff -}}\n{{- end }}"
+  context:
+    stuff: Hemera
+    test: true
 ---
 VMInstructions {
     labels: {

tests/cases/trim_whitespace.4-output.snap

@@ -0,0 +1,10 @@
+---
+source: tests/file_tests.rs
+expression: output
+info:
+  input: "{{ if test -}}\n    Hello {{= stuff -}}\n{{- end }}"
+  context:
+    stuff: Hemera
+    test: true
+---
+"Hello Hemera"

tests/file_tests.rs

@@ -1,4 +1,5 @@
 use std::collections::HashMap;
+use std::path::Path;
 
 use nomo::Context;
 
@@ -8,14 +9,13 @@ struct Info {
     context: HashMap<String, serde_json::Value>,
 }
 
-#[test]
+test_each_file::test_each_path! { for ["nomo"] in "./tests/cases/" => check_for_input }
-fn check_cases() {
+fn check_for_input([path]: [&Path; 1]) {
-    insta::glob!("cases/*.nomo", |path| {
     let mut settings = insta::Settings::clone_current();
     settings.set_snapshot_path("cases");
-        settings.set_snapshot_suffix(path.file_stem().unwrap().display().to_string());
     settings.set_prepend_module_to_snapshot(false);
 
+    let basename = path.file_stem().unwrap().to_string_lossy();
     let input = std::fs::read_to_string(path).unwrap();
 
     let (context, input) = input.split_once("\n---\n").unwrap_or_else(|| ("", &input));
@@ -41,7 +41,7 @@ fn check_cases() {
 
     let _guard = settings.bind_to_scope();
 
-        insta::assert_debug_snapshot!("1-parsed", parsed);
+    insta::assert_debug_snapshot!(format!("{basename}.1-parsed"), parsed);
 
     let ast = match nomo::ast::parse(parsed.tokens()) {
         Ok(ast) => ast,
@@ -51,14 +51,13 @@ fn check_cases() {
         }
     };
 
-        insta::assert_debug_snapshot!("2-ast", ast);
+    insta::assert_debug_snapshot!(format!("{basename}.2-ast"), ast);
 
     let emit = nomo::emit::emit_machine(ast);
 
-        insta::assert_debug_snapshot!("3-instructions", emit);
+    insta::assert_debug_snapshot!(format!("{basename}.3-instructions"), emit);
 
     let output = nomo::eval::execute(&emit, &context).unwrap();
 
-        insta::assert_debug_snapshot!("4-output", output);
+    insta::assert_debug_snapshot!(format!("{basename}.4-output"), output);
-    });
 }