* Add CShells package references and integrate shell features into the application * Annotate shell features with `[ShellFeature]` attribute and update `TempElsaFeature` to use `ConfigureElsa`. * Revert "Annotate shell features with `[ShellFeature]` attribute and update `TempElsaFeature` to use `ConfigureElsa`." This reverts commit e8a875e8f9d14891c5403df50e8ac7e151db25dd. * Introduce `Elsa.ModularServer.Web` with a minimal API, restructure shell feature configuration, and remove obsolete `CShells` dependency * Update `CShells` package references, add Fody weaver, and configure new CShells package sources in `NuGet.Config`. * Adds CShells integration to Elsa Integrates CShells to enhance modularity and extensibility. - Adds CShells related projects to the solution. - Updates NuGet configuration to include CShells preview feed. - Creates initial app settings for CShells configuration. - Adds CShells.AspNetCore project reference. - Implements CShells extensions in the program file. - Creates shell feature classes in Elsa.Common. - Creates shell feature classes in Elsa.Expressions. - Creates shell feature classes in Elsa.Workflows.Core. - Creates shell feature classes in Elsa.Workflows.Management. - Creates shell feature classes in Elsa.Workflows.Runtime. - Creates shell feature classes in Elsa module. * Refactor CShells: enhance pipeline configuration and features Consolidated updates to CShells including a new `ResolverPipelineBuilder` for customizable resolver strategy pipelines. Improved assembly scanning, error handling in web routing, and streamlined shell feature dependencies for better clarity and functionality. * Add feature registration system and FastEndpoints integration Introduced a feature registration infrastructure with `IInstalledFeatureProvider` and related implementations. Added shell-based feature configurations such as caching, SAS tokens, workflows management, and a FastEndpoints integration module to support dynamic API registration. * Refactor shell routing and enhance global route handling Refactored `ShellEndpointRouteBuilder` to simplify initialization and support a combined shell/global route prefix. Enhanced `ShellEndpointRegistrationHandler` to include global route prefix logic and improved feature discovery using pre-resolved descriptors. Updated `Program.cs` for consistent middleware setup. * Refactor feature endpoints to use `IInstalledFeatureProvider` for improved dependency management and simplified implementation * Add display names, descriptions, and dependency enhancements to shell features Standardized `ShellFeature` attributes across `ElsaFeature`, `WorkflowRuntimeFeature`, and `WorkflowManagementFeature` by adding display names, descriptions, and improving dependency declarations. Updated `ElsaFeature` to register `IInstalledFeatureProvider` for feature bridging. * Add FastEndpoints references and update package versions Added project references to CShells.FastEndpoints and related projects in multiple csproj files. Updated FastEndpoints package versions in `Directory.Packages.props` for compatibility with .NET 8/9/10. Removed obsolete folder references from Elsa.Caching.csproj and refined the namespace in CShells.AspNetCore.Abstractions. * Add Identity and DefaultAuthentication features to appsettings.json configuration * Add project references for Elsa.Identity and CShells.FastEndpoints.Abstractions * Add `Identity` and `DefaultAuthentication` shell features with enhanced authentication and authorization support * Set default signing key in `IdentityTokenOptions` for identity configuration * Add service exclusion infrastructure for shell-specific contexts Introduce `IShellServiceExclusionProvider` and `IShellServiceExclusionRegistry` to manage excluded service types per-shell. Implement ASP.NET Core-specific providers for authentication and authorization to enable shell-specific configurations. Refactor `DefaultShellHost` to use the new exclusion registry for service inheritance filtering. * Refactor CShells authentication and authorization APIs Renamed and unified methods for shell authentication and authorization and added a new combined method `WithAuthenticationAndAuthorization`. Enhanced `AddShells` to automatically register a default configuration provider if none is specified. Updated usage in Elsa.ModularServer to utilize the new API. * Add Elsa-specific FastEndpoints configurator and feature Introduce `ElsaFastEndpointsConfigurator` to customize FastEndpoints serialization and value parsing for Elsa workflows. Register this functionality through the new `ElsaFastEndpointsFeature`, which integrates with the shell's dependency injection system using an `IFastEndpointsConfigurator` interface. * Update Workflow API feature dependency to `ElsaFastEndpoints` * Pass `cancellationToken` to `ReadToEndAsync` in `PostEndpoint` for improved request handling. * Add project references for CShells.AspNetCore and CShells.FastEndpoints.Abstractions * Update CShells package versions to `0.0.6-preview.30` and add `CShells.FastEndpoints.Abstractions` * Configures shell routing and features Enables path routing for shells to allow proper routing within each shell. Configures the ElsaFastEndpoints feature to depend on the FastEndpoints feature. This ensures that FastEndpoints is properly configured before Elsa's FastEndpoints configurations are applied. Registers activity types within the WorkflowManagementFeature. This ensures activities are available for workflow construction and execution. * Add shell lifecycle management and notification handlers Introduced interfaces and handlers for shell activation (`IShellActivatedHandler`) and deactivation (`IShellDeactivatingHandler`) to manage shell lifecycles. Added `ShellStartupHostedService` to coordinate shell activation on startup and deactivation on shutdown. Updated notification system to support new shell lifecycle events and renamed existing notification records for consistency. * Introduces EF Core persistence layer Adds base classes and implementations for EF Core persistence, including database provider configuration and shell feature integration. This change introduces a generic approach to configuring EF Core persistence for various Elsa modules, promoting code reuse and simplifying the process of supporting different database providers. It includes: - Base classes for database provider configurators and shell features. - Implementations for Sqlite, SQL Server, MySql, PostgreSql, and Oracle. - Shell features for Alterations, Identity, Labels, Management (Workflow Definitions and Instances), Runtime, and Tenants modules. * Add comprehensive feature configuration validation system Introduce a feature configuration system with support for binding, auto-configuration, and validation using DataAnnotations, FluentValidation, and composite patterns. Includes new validators, binding logic, and extensions to simplify configuration tasks while ensuring robustness and flexibility. * Add persistence shell features for MySql, Oracle, PostgreSql, and Sqlite Introduced new shell features to configure MySql, Oracle, PostgreSql, and Sqlite persistence for workflow definitions and runtime data. Updated `appsettings.json` to replace individual Sqlite features with a unified `SqliteWorkflowPersistence`. Made minor code cleanup in `FastEndpointsFeature`. * Configure shell features for persistence Added `IServiceCollection` configuration for MySql, Oracle, PostgreSql, and Sqlite shell features to set up persistence services. * Remove DatabaseProviderConfigurators and refactor persistence shell features Deleted DatabaseProviderConfigurator classes and restructured persistence shell features by integrating direct configuration logic for MySql, Oracle, PostgreSql, Sqlite, and SqlServer. Simplified configuration by inheriting from abstract shell feature base classes and removed redundant code. * Correct IWorkflowDefinitionPublisher registration to use WorkflowDefinitionPublisher implementation * Add resilience feature and scoped services configuration for Sqlite persistence - Integrated `Microsoft.Extensions.DependencyInjection` to shell features for Sqlite persistence. - Updated `appsettings.json` and project references to include a new 'Resilience' feature. - Changed `ICommitStateHandler` service registration in `WorkflowRuntimeFeature` to use an implementation. * Add `ResilienceShellFeature` for configuring resilience strategies - Implemented new `ResilienceShellFeature` class to manage services related to resilience features. - Added scoped and singleton service registrations for resilience strategies, exception detection, and activity invocation. - Configured expression options for resilience handling in workflows. * Add new shell features: Alterations, Blob Storage, Caching, Clustering, CSharp, Distributed Runtime, ElsaScript, Flowchart, HTTP, JavaScript, Key-Value, and Labels * Switch project references to package references for CShells libraries and update to version 0.0.7. * Potential fix for pull request finding 'Call to 'System.IO.Path.Combine' may silently drop its earlier arguments' Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com> * Fix shell feature discovery and remove duplicate service registrations (#7285) * Initial plan * Address PR review comments: Add ShellFeature attributes, fix duplicates, and improve security Co-authored-by: sfmskywalker <938393+sfmskywalker@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: sfmskywalker <938393+sfmskywalker@users.noreply.github.com> * Update dependencies and fix scoped services registration in `WorkflowRuntimeFeature` * Fix null reference and typo in shell feature provider (#7286) * Initial plan * Fix null StartupType guard in Find() and typo in variable descriptor Co-authored-by: sfmskywalker <938393+sfmskywalker@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: sfmskywalker <938393+sfmskywalker@users.noreply.github.com> --------- Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: sfmskywalker <938393+sfmskywalker@users.noreply.github.com> |
||
|---|---|---|
| .. | ||
| Ast | ||
| Compiler | ||
| Contracts | ||
| Extensions | ||
| Features | ||
| Helpers | ||
| Materializers | ||
| Parser | ||
| ShellFeatures | ||
| Elsa.Dsl.ElsaScript.csproj | ||
| FodyWeavers.xml | ||
| README.md | ||
ElsaScript DSL Implementation
This document provides an overview of the ElsaScript DSL implementation for Elsa Workflows.
Overview
ElsaScript is a JavaScript-inspired textual DSL for authoring Elsa 3 workflows. It provides a concise, code-centric alternative to C# WorkflowBuilder APIs and JSON workflow definitions.
Features Implemented
Parser (ElsaScriptParser)
The parser uses a simplified regex-based approach to parse ElsaScript source code into an Abstract Syntax Tree (AST).
Supported Syntax:
usestatements for namespaces and expression language configurationworkflow "Name" { ... }declarations- Variable declarations:
var,let,const - Activity invocations with positional and named arguments
- Expression literals (strings, numbers, booleans, arrays)
- Expression language prefixes (
=>,js =>,cs =>,py =>,liquid =>) listenkeyword for workflow triggers (partial support)
AST Nodes
Complete set of AST node types:
WorkflowNode- Root workflow definitionStatementNodebase class with implementations:VariableDeclarationNodeActivityInvocationNodeBlockNode(for sequences)IfNode,ForEachNode,ForNode,WhileNode,SwitchNodeFlowchartNode,ListenNode
ExpressionNodebase class with implementations:LiteralNode,IdentifierNode,ArrayLiteralNodeElsaExpressionNode(with language support)TemplateStringNode,BinaryExpressionNode,UnaryExpressionNode
ArgumentNodefor activity parametersUseNodefor import/configuration statements
Compiler (ElsaScriptCompiler)
Compiles AST to Elsa workflow activities:
- Traverses AST and constructs Elsa activity graphs
- Maps DSL constructs to Elsa activities:
- Blocks →
Sequence - Variables →
Variableinstances - Activity invocations → Elsa activity instances
- Control flow nodes → corresponding Elsa activities
- Blocks →
- Resolves activities via
IActivityRegistry - Binds expressions to Elsa expression system with language support
- Maps expression languages (js, cs, py, liquid) to Elsa providers
Dependency Injection
Integration with Elsa's module system:
ElsaScriptFeaturefor service registrationModuleExtensions.UseElsaScript()for easy setup- Registers
IElsaScriptParserandIElsaScriptCompilerservices
Example Usage
use Elsa.Activities.Console;
use expressions js;
workflow "HelloWorld" {
var greeting = "Hello";
WriteLine(=> greeting + " World");
WriteLine("Great to meet you!");
}
Integration Tests
Six integration tests demonstrate the implementation:
- Parser can parse a simple workflow definition - Verifies basic workflow parsing
- Parser can parse variable declarations - Tests var/let/const parsing
- Parser can parse activity invocations with named arguments - Tests argument parsing
- Compiler service is registered and available - Verifies DI setup
- Compiler can parse and analyze a workflow AST - Tests AST analysis
- Compiler recognizes variable declarations in AST - Tests variable compilation
Known Limitations
This is a foundation implementation with several areas for future enhancement:
Parser Limitations
- Uses regex instead of Parlot for parsing (simpler but less robust)
- Control flow parsing (if/foreach/while/for/switch) needs completion
- Block/sequence parsing needs enhancement
- Flowchart syntax not yet implemented
- Template string parsing incomplete
Compiler Limitations
- Dynamic activity instantiation needs refinement
- Control flow compilation stubs need full implementation
- For loop compilation not implemented
- Flowchart compilation not implemented
- Error handling and diagnostics minimal
Runtime Limitations
- End-to-end workflow execution not fully working
- Activity property setting needs enhancement
- Complex expression evaluation untested
Future Enhancements
Short Term
- Complete parser using Parlot for robust parsing
- Implement full control flow parsing and compilation
- Fix dynamic activity instantiation for runtime execution
- Add comprehensive error messages and diagnostics
Medium Term
- Implement flowchart parsing and compilation
- Support template strings with interpolation
- Add output capture syntax (
let result = Activity()) - Implement switch fallthrough options
- Add try/catch/finally support
Long Term
- IDE support (syntax highlighting, IntelliSense)
- Debugging support
- Performance optimizations
- Extended DSL features (custom operators, macros, etc.)
Testing Strategy
Current tests focus on:
- Parser correctness for basic constructs
- AST structure validation
- Compiler service availability
- Variable and activity node recognition
Additional testing needed for:
- Control flow execution
- Expression evaluation
- Error handling
- Edge cases and invalid syntax
Architecture Decisions
Why Regex-Based Parser?
The simplified regex-based parser was chosen to deliver a working proof-of-concept quickly. While less robust than a full Parlot implementation, it demonstrates the DSL concept and can be replaced with a more sophisticated parser later.
Why Separate AST and Compiler?
The separation allows for:
- Multiple compilation targets (if needed)
- AST analysis and transformation
- Better error reporting
- Easier testing of each component
Why Reuse Elsa's Expression System?
Rather than creating a new expression language, ElsaScript wraps Elsa's existing expression providers (JavaScript, C#, Python, Liquid). This provides:
- Consistency with existing Elsa workflows
- Proven expression evaluation
- No additional dependencies
- Familiar syntax for Elsa users
Files Added
Source Files
src/modules/Elsa.Dsl.ElsaScript/Ast/- AST node definitionsCompiler/- AST to Elsa workflow compilerContracts/- Service interfacesExtensions/- DI extension methodsFeatures/- Elsa feature moduleParser/- ElsaScript parserElsa.Dsl.ElsaScript.csproj- Project file
Test Files
test/integration/Elsa.Dsl.ElsaScript.IntegrationTests/ParserTests.cs- Parser integration testsCompilerTests.cs- Compiler integration testsElsa.Dsl.ElsaScript.IntegrationTests.csproj- Test project
Configuration
Directory.Packages.props- Added Parlot package reference
Summary
The ElsaScript DSL provides a solid foundation for text-based workflow authoring in Elsa 3. While this initial implementation has limitations, it demonstrates the core concepts and provides a framework for future enhancements. The modular architecture integrates cleanly with Elsa's existing systems and can be extended incrementally.