Address PR #84 review: change .tp delimiter from ### to ---, refactor and add --single-file generate

- Replace ### section markers with --- to avoid collision with HTTP request separator
- Move .tp constants to dedicated TpConstants.cs (following AuthConstants.cs pattern)
- Use Constants.UnixEndOfLine/WindowsEndOfLine in TpFileParser
- Extract duplicate if blocks into SetVirtualScript() in InitializeTestCaseStep
- Add --single-file/-s flag to generate command for .tp scaffolding
- Allow omitting name on single --- TESTCASE marker (fallback to filename)
- Update Path descriptions in Explore/Test commands to mention .tp files
- Fix double whitespace in CompileScriptCommand
- Add descriptive comments to 004-Car-Operations.tp demo file
- Update all documentation and skill references
- Remove unnecessary comments from StructureExplorationIndex
- Add explanatory comments on early-return in ReadHttpFileStep/ReadScriptFileStep

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: Burgyn

.cursor/skills/teapie/SKILL.md

@@ -7,7 +7,7 @@ description: Comprehensive TeaPie framework expertise for API integration testin
 
 ## Overview
 
-TeaPie (TEsting API Extension) is a lightweight CLI tool for API testing that combines `.http` or `.tp` files with C# scripts for comprehensive integration testing. This skill provides expert knowledge on all TeaPie capabilities, syntax, and best practices.
+TeaPie (TEsting API Extension) is a lightweight CLI tool for API testing that combines `.http` files with C# scripts or uses `.tp` files that cover both types of files within one for comprehensive integration testing. This skill provides expert knowledge on all TeaPie capabilities, syntax, and best practices.
 
 ## Quick Reference
 
@@ -23,7 +23,7 @@ TeaPie supports two equivalent formats. Choose based on script complexity and st
 
 **Single-file format (`.tp`):**
 
-- **`<name>.tp`** - All sections in one file using markers: `### TESTCASE`, `### INIT`, `### HTTP`, `### TEST`, `### END`
+- **`<name>.tp`** - All sections in one file using markers: `--- TESTCASE`, `--- INIT`, `--- HTTP`, `--- TEST`, `--- END`
 
 ### Naming Convention
 

.cursor/skills/teapie/references/test-structure.md

@@ -19,7 +19,7 @@ TeaPie supports two equivalent formats. Choose based on script complexity and st
 
 ### Single-File Format (`.tp`)
 
-- **`<name>.tp`** - All sections in one file using markers: `### TESTCASE`, `### INIT`, `### HTTP`, `### TEST`, `### END`
+- **`<name>.tp`** - All sections in one file using markers: `--- TESTCASE`, `--- INIT`, `--- HTTP`, `--- TEST`, `--- END`
 - Optional alternative to multi-file format; supports single or multiple test cases per file
 
 ### File Naming Convention
@@ -99,9 +99,9 @@ Test cases are executed in alphabetical order (ensured by numeric prefixes):
 1. Structure exploration - Scans for test cases (`-req.http` files and `.tp` files) and related files
 2. Initialization script execution (if present)
 3. For each test case (in alphabetical order):
-   - Pre-request script execution (`-init.csx` or `### INIT` section in `.tp`)
-   - HTTP request(s) execution (`-req.http` or `### HTTP` section in `.tp`)
-   - Post-response script execution (`-test.csx` or `### TEST` section in `.tp`)
+   - Pre-request script execution (`-init.csx` or `--- INIT` section in `.tp`)
+   - HTTP request(s) execution (`-req.http` or `--- HTTP` section in `.tp`)
+   - Post-response script execution (`-test.csx` or `--- TEST` section in `.tp`)
 
 ## .teapie Folder Structure
 

demo/Tests/002-Cars/004-Car-Operations.tp

@@ -1,13 +1,24 @@
-### TESTCASE Add Another Car
-
-### INIT
+// This file uses the single-file (.tp) format. A .tp file can contain one or more test cases,
+// each defined by section markers: --- TESTCASE, --- INIT, --- HTTP, --- TEST, and --- END.
+//
+// --- TESTCASE <Name>  Starts a named test case (required when multiple test cases are in one file).
+// --- INIT             Pre-request C# script (optional). Same role as <name>-init.csx.
+// --- HTTP             HTTP request definition (required). Same format as .http files.
+// --- TEST             Post-response validation script (optional). Same role as <name>-test.csx.
+// --- END              Ends the current test case block.
+//
+// Both .tp and multi-file formats can co-exist in the same collection.
+
+--- TESTCASE Add Another Car
+
+--- INIT
 // Load the shared car generator definition.
 #load "$teapie/Definitions/GenerateNewCar.csx"
 
 var car = GenerateCar();
 tp.SetVariable("AnotherCar", car.ToJsonString(), "cars");
 
-### HTTP
+--- HTTP
 ## TEST-EXPECT-STATUS: [201]
 ## TEST-HAS-BODY
 // Add a new car using data prepared in the INIT section.
@@ -17,7 +28,7 @@ Content-Type: application/json
 
 {{AnotherCar}}
 
-### TEST
+--- TEST
 await tp.Test("Newly added car should be returned with an assigned Id.", async () =>
 {
     dynamic responseJson = await tp.Responses["AddAnotherCarRequest"].GetBodyAsExpandoAsync();
@@ -28,22 +39,22 @@ await tp.Test("Newly added car should be returned with an assigned Id.", async (
     tp.SetVariable("AnotherCarId", (long)responseJson.Id, "cars");
 });
 
-### END
+--- END
 
-### TESTCASE Get All Cars
+--- TESTCASE Get All Cars
 
-### HTTP
+--- HTTP
 ## TEST-EXPECT-STATUS: [200]
 ## TEST-HAS-BODY
 // Retrieve the full list of cars.
 # @name GetAllCarsRequest
 GET {{ApiBaseUrl}}{{ApiCarsSection}}
 
-### TEST
+--- TEST
 tp.Test("Response body should not be empty.", () =>
 {
     NotNull(tp.Response);
     NotNull(tp.Response.Content);
 });
 
-### END
+--- END

demo/Tests/004-Health/001-Health-Check.tp

@@ -1,17 +1,17 @@
-### TESTCASE Health Check
+--- TESTCASE Health Check
 
-### HTTP
+--- HTTP
 ## TEST-EXPECT-STATUS: [200]
 ## TEST-HAS-BODY
 # This test case uses the .tp format - a single file combining HTTP request and test script.
 GET {{ApiBaseUrl}}/health
 
-### TEST
+--- TEST
 tp.Test("Health response should contain status field.", async () =>
 {
     dynamic responseJson = await tp.Response.GetBodyAsExpandoAsync();
     NotNull(responseJson);
     NotNull(responseJson.status);
 });
 
-### END
+--- END

docs/docs/introduction.md

@@ -8,7 +8,7 @@ To get started, visit **[Getting Started](getting-started.md)**.
 
 ✅ **Universal HTTP Request Definition** – Define API tests using `.http` files.
 
-✅ **Flexible Test Structure** – Choose multi-file or single-file (`.tp`) format depending on script complexity and structure preferences.
+✅ **Flexible Test Structure** – Choose multi-file or single-file (`.tp`) format depending on test case complexity and structure preferences.
 
 ✅ **Pre-Request & Post-Response Scripts** – Extend test cases with C# scripts for data setup and validation.
 

docs/docs/test-case/test-case.md

@@ -31,7 +31,7 @@ When running a test case, you can also reference:
 
 TeaPie supports two equivalent ways to define test cases. Use whichever fits your project better.
 
-The [**Single-File Format (`.tp`)**](tp-file.md) combines HTTP requests and C# scripts in one file using section markers. It is an optional alternative to the multi-file format. Both are fully supported; choose based on script complexity and how you prefer to structure tests.
+The [**Single-File Format (`.tp`)**](tp-file.md) combines HTTP requests and C# scripts in one file using section markers. It is an optional alternative to the multi-file format. Both formats are fully supported and can co-exist in the same project; choose based on test case complexity and how you prefer to structure tests.
 
 ## Running a Test Case
 
@@ -84,7 +84,13 @@ This command generates the multi-file format in the specified path (or the curre
 
 To **disable pre-request or post-response script generation**, set the `-i` and `-t` options to `false`.
 
-For the single-file format (`.tp`), create the file manually. See [Single-File Format (`.tp`)](tp-file.md) for details.
+To generate a **single-file test case (`.tp`)** instead, use the `--single-file` (or `-s`) flag:
+
+```sh
+teapie generate <test-case-name> [path] -s [-i] [-t]
+```
+
+This creates a `<test-case-name>.tp` file with `--- HTTP` section (and `--- INIT`/`--- TEST` if `-i`/`-t` are set). See [Single-File Format (`.tp`)](tp-file.md) for details.
 
 ## Exploring Test Case Structure
 

docs/docs/test-case/tp-file.md

@@ -5,62 +5,62 @@
 |----------------------|----------------|
 | **Definition**       | An optional alternative to the multi-file format. A `.tp` file combines HTTP requests and C# scripts in one file using section markers. |
 | **Naming Convention** | `<test-case-name>.tp` |
-| **Purpose**         | Define test cases with all sections in one place. Both `.tp` and multi-file formats are fully supported; choose based on script complexity and how you prefer to structure tests. |
+| **Purpose**         | Define test cases with all sections in one place. Both `.tp` and multi-file formats are fully supported and can co-exist in the same project; choose based on test case complexity and how you prefer to structure tests. |
 | **Example Usage**   | [Health Check](https://github.com/Kros-sk/TeaPie/blob/master/demo/Tests/004-Health/001-Health-Check.tp), [Car Operations](https://github.com/Kros-sk/TeaPie/blob/master/demo/Tests/002-Cars/004-Car-Operations.tp) |
 <!-- markdownlint-enable MD060 -->
 
-The `.tp` format is an **optional alternative** to the multi-file format. Both are fully supported; choose based on script complexity and how you prefer to structure tests.
+The `.tp` format is an **optional alternative** to the multi-file format. Both are fully supported and can co-exist in the same project; choose based on test case complexity and how you prefer to structure tests.
 
 ## Section Markers
 
-Sections are marked with `###` markers (case-insensitive):
+Sections are marked with `---` markers (case-insensitive):
 
 <!-- markdownlint-disable MD060 -->
 | Marker | Purpose |
 |--------|---------|
-| `### TESTCASE <Name>` | Starts a named test case. Required when defining multiple test cases in one file. |
-| `### INIT` | Pre-request C# script (optional). Same role as `-init.csx`. |
-| `### HTTP` | HTTP request(s) (required). Same format as `.http` files. |
-| `### TEST` | Post-response C# script (optional). Same role as `-test.csx`. |
-| `### END` | Ends the current test case block. |
+| `--- TESTCASE <Name>` | Starts a named test case. Required when defining multiple test cases in one file. |
+| `--- INIT` | Pre-request C# script (optional). Same role as `-init.csx`. |
+| `--- HTTP` | HTTP request(s) (required). Same format as `.http` files. |
+| `--- TEST` | Post-response C# script (optional). Same role as `-test.csx`. |
+| `--- END` | Ends the current test case block. |
 <!-- markdownlint-enable MD060 -->
 
 ## Single Test Case Example
 
 Use `## TEST-EXPECT-STATUS` and other directives in the HTTP section for status code validation. In the TEST section, focus on response body and business logic validation:
 
 ```text
-### TESTCASE Health Check
+--- TESTCASE Health Check
 
-### HTTP
+--- HTTP
 ## TEST-EXPECT-STATUS: [200]
 ## TEST-HAS-BODY
 GET {{ApiBaseUrl}}/health
 
-### TEST
+--- TEST
 tp.Test("Health response should contain status field.", async () =>
 {
     dynamic responseJson = await tp.Response.GetBodyAsExpandoAsync();
     NotNull(responseJson);
     NotNull(responseJson.status);
 });
 
-### END
+--- END
 ```
 
 ## Multiple Test Cases in One File
 
 A single `.tp` file can contain multiple test cases, each with its own sections:
 
 ```text
-### TESTCASE Add Another Car
+--- TESTCASE Add Another Car
 
-### INIT
+--- INIT
 #load "$teapie/Definitions/GenerateNewCar.csx"
 var car = GenerateCar();
 tp.SetVariable("AnotherCar", car.ToJsonString(), "cars");
 
-### HTTP
+--- HTTP
 ## TEST-EXPECT-STATUS: [201]
 ## TEST-HAS-BODY
 # @name AddAnotherCarRequest
@@ -69,7 +69,7 @@ Content-Type: application/json
 
 {{AnotherCar}}
 
-### TEST
+--- TEST
 await tp.Test("Newly added car should be returned with an assigned Id.", async () =>
 {
     dynamic responseJson = await tp.Responses["AddAnotherCarRequest"].GetBodyAsExpandoAsync();
@@ -78,38 +78,38 @@ await tp.Test("Newly added car should be returned with an assigned Id.", async (
     tp.SetVariable("AnotherCarId", (long)responseJson.Id, "cars");
 });
 
-### END
+--- END
 
-### TESTCASE Get All Cars
+--- TESTCASE Get All Cars
 
-### HTTP
+--- HTTP
 ## TEST-EXPECT-STATUS: [200]
 ## TEST-HAS-BODY
 # @name GetAllCarsRequest
 GET {{ApiBaseUrl}}{{ApiCarsSection}}
 
-### TEST
+--- TEST
 await tp.Test("Response should contain array of cars.", async () =>
 {
     var body = await tp.Response.Content.ReadAsStringAsync();
     NotNull(body);
     True(body.StartsWith("[") && body.EndsWith("]"));
 });
 
-### END
+--- END
 ```
 
 ## Implicit Mode
 
-If no `### TESTCASE` marker is present, the file is treated as a single test case. The test case name is derived from the filename (e.g. `001-Health-Check.tp` → `001-Health-Check`).
+If no `--- TESTCASE` marker is present, the file is treated as a single test case. The test case name is derived from the filename (e.g. `001-Health-Check.tp` → `001-Health-Check`).
 
 ## Rules
 
-- The `### HTTP` section is **required** for each test case.
-- `### INIT` and `### TEST` are optional.
-- Markers are **case-insensitive** (`### testcase`, `### http`, etc.).
-- Use `### END` to terminate each test case when defining multiple test cases.
-- HTTP content follows the same conventions as [Request File](request-file.md) (named requests, variables, etc.).
+- The `--- HTTP` section is **required** for each test case.
+- `--- INIT` and `--- TEST` are optional.
+- Markers are **case-insensitive** (`--- testcase`, `--- http`, etc.).
+- Use `--- END` to terminate each test case when defining multiple test cases.
+- HTTP content follows the same conventions as [Request File](request-file.md) (named requests, variables, etc.). The `###` request separator used in `.http` files works normally inside the `--- HTTP` section without any conflict.
 - For status code validation, use directives such as `## TEST-EXPECT-STATUS: [200, 201]` in the HTTP section rather than asserting in the TEST script. See [Directives](directives.md) for details.
 
 ## When to Use `.tp` vs Multi-File

src/TeaPie.DotnetTool/CompileScriptCommand.cs

@@ -76,7 +76,7 @@ private async Task<int> CompileTpScripts(string path, Settings settings)
 
             if (string.IsNullOrWhiteSpace(def.InitContent) && string.IsNullOrWhiteSpace(def.TestContent))
             {
-                AnsiConsole.MarkupLine("[grey]  No script sections to compile (HTTP only).[/]");
+                AnsiConsole.MarkupLine("[grey] No script sections to compile (HTTP only).[/]");
             }
         }
 

src/TeaPie.DotnetTool/ExploreCommand.cs

@@ -28,7 +28,7 @@ protected override ApplicationBuilder ConfigureApplication(Settings settings)
     public sealed class Settings : LoggingSettings
     {
         [CommandArgument(0, "[path]")]
-        [Description("Path to collection or test case which will be explored. Defaults to the current directory.")]
+        [Description("Path to collection, test case (.http) or single-file test case (.tp) which will be explored. Defaults to the current directory.")]
         public string? Path { get; init; }
 
         [CommandOption("--env-file|--environment-file")]

src/TeaPie.DotnetTool/GenerateCommand.cs

@@ -1,7 +1,9 @@
 using Spectre.Console;
 using Spectre.Console.Cli;
 using System.ComponentModel;
+using System.Text;
 using TeaPie.StructureExploration.Paths;
+using TeaPie.TestCases;
 
 namespace TeaPie.DotnetTool;
 
@@ -11,7 +13,14 @@ public override int Execute(CommandContext context, Settings settings)
     {
         var path = ResolvePathAndCreateDirectoryIfNeeded(settings);
 
-        GenerateFiles(settings, path);
+        if (settings.IsSingleFile)
+        {
+            GenerateSingleFile(settings, path);
+        }
+        else
+        {
+            GenerateFiles(settings, path);
+        }
 
         ReportSuccessfullCreation(settings, path);
 
@@ -74,6 +83,37 @@ private static string GetPreRequestFileName(string name)
     private static string GetPostResponseFileName(string name)
         => name + Constants.PostResponseSuffix + Constants.ScriptFileExtension;
 
+    private static void GenerateSingleFile(Settings settings, string path)
+    {
+        var filePath = Path.Combine(path, settings.Name + Constants.TestCaseFileExtension);
+        var sb = new StringBuilder();
+
+        sb.AppendLine($"{TpConstants.TestCaseMarker} {settings.Name}");
+        sb.AppendLine();
+
+        if (settings.HasPreRequestScript)
+        {
+            sb.AppendLine(TpConstants.InitMarker);
+            sb.AppendLine();
+            sb.AppendLine();
+        }
+
+        sb.AppendLine(TpConstants.HttpMarker);
+        sb.AppendLine();
+        sb.AppendLine();
+
+        if (settings.HasPostResponseScript)
+        {
+            sb.AppendLine(TpConstants.TestMarker);
+            sb.AppendLine();
+            sb.AppendLine();
+        }
+
+        sb.AppendLine(TpConstants.EndMarker);
+
+        System.IO.File.WriteAllText(filePath, sb.ToString());
+    }
+
     private static void ReportSuccessfullCreation(Settings settings, string path)
     {
         const string beginningOfSentence = "[green]Test case [/]";
@@ -115,5 +155,10 @@ public sealed class Settings : CommandSettings
         [DefaultValue(false)]
         [Description("Indicates whether to generate post-response script (with '-test' suffix).")]
         public bool HasPostResponseScript { get; init; }
+
+        [CommandOption("-s|--single-file")]
+        [DefaultValue(false)]
+        [Description("Generate a single-file test case (.tp) instead of multi-file format.")]
+        public bool IsSingleFile { get; init; }
     }
 }