Merge branch 'main' into feature/nested-tests

Author: niemyjski

.github/copilot-instructions.md

@@ -0,0 +1,30 @@
+# Copilot AI Coding Agent Instructions for Foundatio.Parsers
+
+## Key Principles
+
+All contributions must respect existing formatting and conventions specified in the `.editorconfig` file. You are a distinguished engineer and are expected to deliver high-quality code that adheres to the guidelines in the instruction files.
+
+Let's keep pushing for clarity, usability, and excellence—both in code and user experience.
+
+**See also:**
+- [General Coding Guidelines](instructions/general.instructions.md)
+- [Testing Guidelines](instructions/testing.instructions.md)
+
+## Key Directories & Files
+- `src/Foundatio.Parsers/` — Main library code for Parsers integration.
+- `tests/Foundatio.Parsers.Tests/` — Unit and integration tests for Parsers features.
+- `build/` — Shared build props, strong naming key, and assets.
+- `Foundatio.Parsers.slnx` — Solution file for development.
+
+## Developer Workflows
+- **Build:** Use the VS Code task `build` or run `dotnet build` at the repo root.
+- **Test:** Use the VS Code task `test` or run `dotnet test tests/Foundatio.Parsers.Tests`.
+- **Docker Compose:** For integration tests, run `docker compose up`.
+
+## References & Further Reading
+- [README.md](../README.md) — Full documentation, usage samples, and links to upstream Foundatio docs.
+- [FoundatioFx/Foundatio](https://github.com/FoundatioFx/Foundatio) — Core abstractions and additional implementations.
+
+---
+
+**If you are unsure about a pattern or workflow, check the README or look for similar patterns in the `src/` and `tests/` folders.**

.github/instructions/general.instructions.md

@@ -0,0 +1,73 @@
+---
+description: "General coding guidelines"
+applyTo: "**"
+---
+
+# General Coding Guidelines
+
+You are a distinguished engineer and are expected to deliver high-quality code that adheres to the guidelines below.
+All contributions must respect existing formatting and conventions specified in the `.editorconfig` file and
+Microsoft's [coding conventions](https://learn.microsoft.com/en-us/dotnet/csharp/fundamentals/coding-style/coding-conventions).
+
+Code can be formatted with `dotnet format` and checked for errors with `dotnet build`.
+
+Use context7 for documentation
+
+## Code Style & Minimal Diffs
+
+- Match the file's existing style; use `.editorconfig` when unsure.
+- Preserve extra spaces, comments, and minimize diffs.
+- Always ask before creating new files, directories, or changing existing structures.
+- Always look at existing usages before refactoring or changing code to prevent new code from breaking existing code.
+- Assume any existing uncommitted code is correct and ask before changing it.
+- Don't add code comments unless necessary. Code should be self-explanatory.
+- Don't use deprecated or insecure libraries, algorithms or features.
+
+## Modern Code Practices
+
+- Write complete, runnable code—no placeholders or TODOs.
+- Use modern language features, clear naming conventions, and defensive coding when necessary.
+- Follow SOLID, DRY, and clean code principles. Remove unused code.
+
+## Behavior Management
+
+- Flag any user-visible changes for review.
+- Deliver exactly what's requested—avoid adding unnecessary features unless explicitly instructed.
+
+## Security Guidelines
+
+- Sanitize all user inputs and rigorously validate data.
+- Follow OWASP guidelines and implement a robust Content Security Policy.
+- Adopt Shift-Left security practices to identify vulnerabilities early.
+
+## Developer Planning & Reflection
+
+### Pre-Coding Reflection
+
+1. Identify the problem or feature you're solving.
+2. Consider three possible approaches.
+3. Choose the simplest approach that satisfies all requirements.
+4. Clarify:
+    - Can the solution be modularized into smaller functions?
+    - Are there unnecessary abstractions?
+    - Will the implementation be clear to a junior developer?
+
+### Post-Coding Reflection
+
+1. Review for refactor opportunities—can clarity or maintainability be improved?
+2. Identify potential edge cases or areas prone to bugs.
+3. Verify robust error handling and validation mechanisms.
+
+## Code Reviews
+
+- Ensure adherence to complexity, consistency, and clean code standards.
+- Validate robust error handling and defensive coding practices.
+- Check for duplication and maintainable solutions.
+
+## Debugging Guidelines
+
+1. **Reproduce** the issue with minimal steps and code.
+2. **Understand** the underlying problem thoroughly.
+3. **Form Hypotheses** about the cause.
+4. **Test & Verify** potential solutions.
+5. **Document** fixes and adjustments clearly for future reference.

.github/instructions/testing.instructions.md

@@ -0,0 +1,36 @@
+---
+description: "C# testing guidelines"
+applyTo: "tests/**/*.cs"
+---
+
+# Testing Guidelines (C#)
+
+## Framework & Best Practices
+
+- Follow Microsoft's [unit testing best practices](https://learn.microsoft.com/en-us/dotnet/core/testing/unit-testing-best-practices).
+- Use xUnit as the primary testing framework.
+
+## Test Principles
+
+- **Fast & Isolated**: Tests should execute quickly and not depend on external factors or the order of execution.
+- **Repeatable & Self-Checking**: Tests must be consistent and validate their own outcomes without manual checks.
+- **Timely**: Write tests alongside your code to ensure relevance and improve design.
+
+## Test Structure & Naming
+
+- Write complete, runnable tests—no placeholders or TODOs.
+- Use clear, descriptive naming conventions for test methods:
+    - `MethodName_StateUnderTest_ExpectedBehavior`
+- Follow AAA pattern (Arrange, Act, Assert).
+
+## Test Organization
+
+- Use `[Theory]` and `[InlineData]` for parameterized tests.
+- Implement proper setup and teardown using constructors and `IDisposable`.
+- Tests are organized to mirror the main code structure (e.g., `Storage/` in both `src` and `tests`).
+
+## Integration Testing
+
+- Inject `ITestOutputHelper` into the test class constructor to get access to the test output.
+- Isolate dependencies using test containers, in-memory providers, or stubs to ensure reliable test execution.
+- Verify data persistence and side effects.

Dockerfile

@@ -0,0 +1,23 @@
+FROM mcr.microsoft.com/mssql/server:2022-latest
+
+ARG SSID_PID=Developer
+
+ENV ACCEPT_EULA=Y
+ENV SSID_PID=${SSID_PID}
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN=true
+
+USER root
+
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install -yq gnupg gnupg2 gnupg1 curl apt-transport-https && \
+    curl https://packages.microsoft.com/keys/microsoft.asc -o /var/opt/mssql/ms-key.cer && \
+    gpg --dearmor -o /etc/apt/trusted.gpg.d/microsoft.gpg /var/opt/mssql/ms-key.cer && \
+    curl https://packages.microsoft.com/config/ubuntu/22.04/mssql-server-2022.list -o /etc/apt/sources.list.d/mssql-server-2022.list && \
+    apt-get update && \
+    apt-get install -y mssql-server-fts && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists
+
+ENTRYPOINT [ "/opt/mssql/bin/sqlservr" ]

build/common.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <Product>Foundatio.Parsers</Product>
     <Description>A lucene style query parser that is extensible and allows additional syntax features.</Description>
     <PackageProjectUrl>https://github.com/FoundatioFx/Foundatio.Parsers</PackageProjectUrl>

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.18.3
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.19.5
     environment:
       discovery.type: single-node
       xpack.security.enabled: 'false'
@@ -19,7 +19,7 @@ services:
     depends_on:
       elasticsearch:
         condition: service_healthy
-    image: docker.elastic.co/kibana/kibana:8.18.3
+    image: docker.elastic.co/kibana/kibana:8.19.5
     ports:
       - 5601:5601
     networks:
@@ -30,7 +30,9 @@ services:
       test: curl --write-out 'HTTP %{http_code}' --fail --silent --output /dev/null http://localhost:5601/api/status
 
   sqlserver:
-    image: mcr.microsoft.com/mssql/server:2025-latest
+    build:
+      context: .
+      dockerfile: Dockerfile
     ports:
       - "1433:1433" # login with sa:P@ssword1
     environment:

src/Foundatio.Parsers.ElasticQueries/ElasticMappingResolver.cs

@@ -52,7 +52,6 @@ public FieldMapping GetMapping(string field, bool followAlias = false)
 
         if (_mappingCache.TryGetValue(field, out var mapping))
         {
-
             if (followAlias && mapping.Found && mapping.Property is IFieldAliasProperty fieldAlias)
             {
                 _logger.LogTrace("Cached alias mapping: {Field}={FieldPath}:{FieldType}", field, mapping.FullPath, mapping.Property?.Type);
@@ -461,7 +460,6 @@ public static ElasticMappingResolver Create<T>(Func<TypeMappingDescriptor<T>, IT
 
         return Create(mappingBuilder, client.Infer, () =>
         {
-            client.Indices.Refresh(Indices.Index<T>());
             var response = client.Indices.GetMapping(new GetMappingRequest(Indices.Index<T>()));
             logger.LogTrace("GetMapping: {Request}", response.GetRequest(false, true));
 
@@ -477,7 +475,6 @@ public static ElasticMappingResolver Create<T>(Func<TypeMappingDescriptor<T>, IT
 
         return Create(mappingBuilder, client.Infer, () =>
         {
-            client.Indices.Refresh(index);
             var response = client.Indices.GetMapping(new GetMappingRequest(index));
             logger.LogTrace("GetMapping: {Request}", response.GetRequest(false, true));
 
@@ -500,7 +497,6 @@ public static ElasticMappingResolver Create<T>(IElasticClient client, ILogger lo
 
         return Create(() =>
         {
-            client.Indices.Refresh(Indices.Index<T>());
             var response = client.Indices.GetMapping(new GetMappingRequest(Indices.Index<T>()));
             logger.LogTrace("GetMapping: {Request}", response.GetRequest(false, true));
 
@@ -516,7 +512,6 @@ public static ElasticMappingResolver Create(IElasticClient client, string index,
 
         return Create(() =>
         {
-            client.Indices.Refresh(index);
             var response = client.Indices.GetMapping(new GetMappingRequest(index));
             logger.LogTrace("GetMapping: {Request}", response.GetRequest(false, true));