mirror of
https://github.com/Smaug123/WoofWare.Myriad
synced 2025-12-15 13:25:39 +00:00
Compare commits
21 Commits
WoofWare.M
...
WoofWare.M
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
67e051b6b3 | ||
|
|
6dee454229 | ||
|
|
e1767f5ed0 | ||
|
|
f95437aa48 | ||
|
|
e9edf9dabc | ||
|
|
d873850acf | ||
|
|
bd4905a236 | ||
|
|
62daa84b26 | ||
|
|
4d5830d147 | ||
|
|
6c2280c300 | ||
|
|
ecbe425f66 | ||
|
|
30eb28d00a | ||
|
|
62e1cf2c46 | ||
|
|
fa81119cec | ||
|
|
7907cefaee | ||
|
|
e83ec1f152 | ||
|
|
9d8cef8fdc | ||
|
|
1721ad1ac0 | ||
|
|
857bde0ba9 | ||
|
|
d10f608941 | ||
|
|
46effedfc4 |
@@ -9,7 +9,7 @@
|
||||
]
|
||||
},
|
||||
"fsharp-analyzers": {
|
||||
"version": "0.32.1",
|
||||
"version": "0.34.1",
|
||||
"commands": [
|
||||
"fsharp-analyzers"
|
||||
]
|
||||
|
||||
34
.github/workflows/dotnet.yaml
vendored
34
.github/workflows/dotnet.yaml
vendored
@@ -167,12 +167,12 @@ jobs:
|
||||
- name: Pack
|
||||
run: nix develop --command dotnet pack --configuration Release
|
||||
- name: Upload NuGet artifact (plugin)
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: nuget-package-plugin
|
||||
path: WoofWare.Myriad.Plugins/bin/Release/WoofWare.Myriad.Plugins.*.nupkg
|
||||
- name: Upload NuGet artifact (attributes)
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: nuget-package-attribute
|
||||
path: WoofWare.Myriad.Plugins.Attributes/bin/Release/WoofWare.Myriad.Plugins.Attributes.*.nupkg
|
||||
@@ -182,7 +182,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Download NuGet artifact (plugin)
|
||||
uses: actions/download-artifact@v5
|
||||
uses: actions/download-artifact@v6
|
||||
with:
|
||||
name: nuget-package-plugin
|
||||
path: packed-plugin
|
||||
@@ -190,7 +190,7 @@ jobs:
|
||||
# Verify that there is exactly one nupkg in the artifact that would be NuGet published
|
||||
run: if [[ $(find packed-plugin -maxdepth 1 -name 'WoofWare.Myriad.Plugins.*.nupkg' -printf c | wc -c) -ne "1" ]]; then exit 1; fi
|
||||
- name: Download NuGet artifact (attributes)
|
||||
uses: actions/download-artifact@v5
|
||||
uses: actions/download-artifact@v6
|
||||
with:
|
||||
name: nuget-package-attribute
|
||||
path: packed-attribute
|
||||
@@ -209,7 +209,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- name: Download NuGet artifact
|
||||
uses: actions/download-artifact@v5
|
||||
uses: actions/download-artifact@v6
|
||||
with:
|
||||
name: ${{ matrix.artifact }}
|
||||
- name: Compute package path
|
||||
@@ -249,7 +249,7 @@ jobs:
|
||||
contents: read
|
||||
steps:
|
||||
- name: Download NuGet artifact
|
||||
uses: actions/download-artifact@v5
|
||||
uses: actions/download-artifact@v6
|
||||
with:
|
||||
name: nuget-package-attribute
|
||||
path: packed
|
||||
@@ -268,7 +268,7 @@ jobs:
|
||||
contents: read
|
||||
steps:
|
||||
- name: Download NuGet artifact
|
||||
uses: actions/download-artifact@v5
|
||||
uses: actions/download-artifact@v6
|
||||
with:
|
||||
name: nuget-package-plugin
|
||||
path: packed
|
||||
@@ -294,19 +294,24 @@ jobs:
|
||||
extra_nix_config: |
|
||||
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
|
||||
- name: Download NuGet artifact
|
||||
uses: actions/download-artifact@v5
|
||||
uses: actions/download-artifact@v6
|
||||
with:
|
||||
name: nuget-package-attribute
|
||||
path: packed
|
||||
- name: Identify `dotnet`
|
||||
id: dotnet-identify
|
||||
run: nix develop --command bash -c 'echo "dotnet=$(which dotnet)" >> $GITHUB_OUTPUT'
|
||||
- name: Obtain NuGet key
|
||||
uses: NuGet/login@d22cc5f58ff5b88bf9bd452535b4335137e24544
|
||||
id: login
|
||||
with:
|
||||
user: ${{ secrets.NUGET_USER }}
|
||||
- name: Publish to NuGet
|
||||
id: publish-success
|
||||
uses: G-Research/common-actions/publish-nuget@2b7dc49cb14f3344fbe6019c14a31165e258c059
|
||||
with:
|
||||
package-name: WoofWare.Myriad.Plugins.Attributes
|
||||
nuget-key: ${{ secrets.NUGET_API_KEY }}
|
||||
nuget-key: ${{ steps.login.outputs.NUGET_API_KEY }}
|
||||
nupkg-dir: packed/
|
||||
dotnet: ${{ steps.dotnet-identify.outputs.dotnet }}
|
||||
|
||||
@@ -327,19 +332,24 @@ jobs:
|
||||
extra_nix_config: |
|
||||
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
|
||||
- name: Download NuGet artifact
|
||||
uses: actions/download-artifact@v5
|
||||
uses: actions/download-artifact@v6
|
||||
with:
|
||||
name: nuget-package-plugin
|
||||
path: packed
|
||||
- name: Identify `dotnet`
|
||||
id: dotnet-identify
|
||||
run: nix develop --command bash -c 'echo "dotnet=$(which dotnet)" >> $GITHUB_OUTPUT'
|
||||
- name: Obtain NuGet key
|
||||
uses: NuGet/login@d22cc5f58ff5b88bf9bd452535b4335137e24544
|
||||
id: login
|
||||
with:
|
||||
user: ${{ secrets.NUGET_USER }}
|
||||
- name: Publish to NuGet
|
||||
id: publish-success
|
||||
uses: G-Research/common-actions/publish-nuget@2b7dc49cb14f3344fbe6019c14a31165e258c059
|
||||
with:
|
||||
package-name: WoofWare.Myriad.Plugins
|
||||
nuget-key: ${{ secrets.NUGET_API_KEY }}
|
||||
nuget-key: ${{ steps.login.outputs.NUGET_API_KEY }}
|
||||
nupkg-dir: packed/
|
||||
dotnet: ${{ steps.dotnet-identify.outputs.dotnet }}
|
||||
|
||||
@@ -358,7 +368,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- name: Download NuGet artifact
|
||||
uses: actions/download-artifact@v5
|
||||
uses: actions/download-artifact@v6
|
||||
with:
|
||||
name: ${{ matrix.artifact }}
|
||||
- name: Compute package path
|
||||
|
||||
11
CHANGELOG.md
11
CHANGELOG.md
@@ -1,5 +1,16 @@
|
||||
Notable changes are recorded here.
|
||||
|
||||
# WoofWare.Myriad.Plugins 9.1.1, WoofWare.Myriad.Plugins.Attributes 3.8.1
|
||||
|
||||
Adds the `[<ArgumentNegateWithPrefix>]` attribute, which can be placed on a boolean or flag-valued field when using the `ArgParser` generator.
|
||||
This causes the boolean to be specifiable with the `--no-` prefix to negate its value.
|
||||
(For example, `Foo : bool` is normally specified as `--foo`; this new attribute lets the user additionally give `--no-foo` to get the same semantics as `--foo=false`.)
|
||||
|
||||
# WoofWare.Myriad.Plugins 9.0.1
|
||||
|
||||
Converts the `static member Empty` field on each generated mock (from `GeneratedMock`) into a function, so as to permit the `GeneratedCapturingMock` to have the same signature.
|
||||
(`GeneratedCapturingMock` contains mutable state, so must be created afresh each time.)
|
||||
|
||||
# WoofWare.Myriad.Plugins 8.1.1
|
||||
|
||||
Adds `GenerateCapturingMock`, which is `GenerateMock` but additionally records the calls made to each function.
|
||||
|
||||
@@ -44,7 +44,7 @@ git config blame.ignoreRevsFile .git-blame-ignore-revs
|
||||
## Dependencies
|
||||
|
||||
I try to keep this repository's dependencies as few as possible, because (for example) any consumer of the source generator will also consume this project via the attributes.
|
||||
When adding dependencies, you will need to `nix run .#fetchDeps` to obtain a new copy of [the dependency lockfile](./nix/deps.nix).
|
||||
When adding dependencies, you will need to `nix run .#fetchDeps` to obtain a new copy of [the dependency lockfile](./nix/deps.json).
|
||||
|
||||
## Branch strategy
|
||||
|
||||
|
||||
124
ConsumePlugin/ArgParserConflictTests.fs
Normal file
124
ConsumePlugin/ArgParserConflictTests.fs
Normal file
@@ -0,0 +1,124 @@
|
||||
namespace ConsumePlugin
|
||||
|
||||
open WoofWare.Myriad.Plugins
|
||||
|
||||
// This file contains test cases for conflict detection in the ArgParser generator.
|
||||
// These are expected to FAIL at build time with appropriate error messages.
|
||||
// Uncomment each section one at a time to test the specific conflict detection.
|
||||
|
||||
// ============================================================================
|
||||
// Test 1: Field named NoFooBar conflicts with FooBar's --no- variant
|
||||
// ============================================================================
|
||||
// Expected error: Argument name conflict: '--no-foo-bar' collides with the --no- variant
|
||||
// of field 'FooBar' (which has [<ArgumentNegateWithPrefix>])
|
||||
|
||||
(*
|
||||
[<ArgParser>]
|
||||
type ConflictingFieldNames =
|
||||
{
|
||||
[<ArgumentNegateWithPrefix>]
|
||||
FooBar : bool
|
||||
NoFooBar : bool
|
||||
}
|
||||
*)
|
||||
|
||||
// ============================================================================
|
||||
// Test 2: ArgumentLongForm "no-foo" conflicts with Foo's --no- variant
|
||||
// ============================================================================
|
||||
// Expected error: Argument name conflict: '--no-foo' collides with the --no- variant
|
||||
// of field 'Foo' (which has [<ArgumentNegateWithPrefix>])
|
||||
|
||||
(*
|
||||
[<ArgParser>]
|
||||
type ConflictingLongForm =
|
||||
{
|
||||
[<ArgumentNegateWithPrefix>]
|
||||
Foo : bool
|
||||
[<ArgumentLongForm "no-foo">]
|
||||
Bar : bool
|
||||
}
|
||||
*)
|
||||
|
||||
// ============================================================================
|
||||
// Test 3: Multiple ArgumentLongForm, one conflicts
|
||||
// ============================================================================
|
||||
// Expected error: Argument name conflict: '--no-verbose' collides with...
|
||||
|
||||
(*
|
||||
[<ArgParser>]
|
||||
type ConflictingMultipleLongForms =
|
||||
{
|
||||
[<ArgumentLongForm "verbose">]
|
||||
[<ArgumentLongForm "v">]
|
||||
[<ArgumentNegateWithPrefix>]
|
||||
VerboseMode : bool
|
||||
|
||||
[<ArgumentLongForm "no-verbose">]
|
||||
Quiet : bool
|
||||
}
|
||||
*)
|
||||
|
||||
// ============================================================================
|
||||
// Test 4: ArgumentNegateWithPrefix on non-boolean field
|
||||
// ============================================================================
|
||||
// Expected error: [<ArgumentNegateWithPrefix>] can only be applied to boolean
|
||||
// or flag DU fields, but was applied to field NotABool of type string
|
||||
|
||||
(*
|
||||
[<ArgParser>]
|
||||
type InvalidAttributeOnNonBool =
|
||||
{
|
||||
[<ArgumentNegateWithPrefix>]
|
||||
NotABool : string
|
||||
}
|
||||
*)
|
||||
|
||||
// ============================================================================
|
||||
// Test 5: ArgumentNegateWithPrefix on non-flag int field
|
||||
// ============================================================================
|
||||
// Expected error: [<ArgumentNegateWithPrefix>] can only be applied to boolean
|
||||
// or flag DU fields
|
||||
|
||||
(*
|
||||
[<ArgParser>]
|
||||
type InvalidAttributeOnInt =
|
||||
{
|
||||
[<ArgumentNegateWithPrefix>]
|
||||
NotAFlag : int
|
||||
}
|
||||
*)
|
||||
|
||||
// ============================================================================
|
||||
// Test 6: Complex conflict with custom names
|
||||
// ============================================================================
|
||||
// This tests a more complex scenario where a custom ArgumentLongForm creates
|
||||
// a conflict with a different field's negated form
|
||||
|
||||
(*
|
||||
[<ArgParser>]
|
||||
type ComplexConflict =
|
||||
{
|
||||
[<ArgumentLongForm "enable">]
|
||||
[<ArgumentNegateWithPrefix>]
|
||||
FeatureA : bool
|
||||
|
||||
[<ArgumentLongForm "no-enable">]
|
||||
DisableAll : bool
|
||||
}
|
||||
*)
|
||||
|
||||
// ============================================================================
|
||||
// Test 7: Valid usage - no conflicts (this SHOULD compile)
|
||||
// ============================================================================
|
||||
|
||||
[<ArgParser>]
|
||||
type NoConflict =
|
||||
{
|
||||
[<ArgumentNegateWithPrefix>]
|
||||
EnableFeature : bool
|
||||
|
||||
[<ArgumentNegateWithPrefix>]
|
||||
VerboseMode : bool
|
||||
|
||||
NormalField : string
|
||||
}
|
||||
48
ConsumePlugin/ArgParserNegationTests.fs
Normal file
48
ConsumePlugin/ArgParserNegationTests.fs
Normal file
@@ -0,0 +1,48 @@
|
||||
namespace ConsumePlugin
|
||||
|
||||
open WoofWare.Myriad.Plugins
|
||||
|
||||
// Test types for ArgumentNegateWithPrefix functionality
|
||||
|
||||
type TestDryRunMode =
|
||||
| [<ArgumentFlag false>] Wet
|
||||
| [<ArgumentFlag true>] Dry
|
||||
|
||||
[<ArgParser true>]
|
||||
type BoolNegation =
|
||||
{
|
||||
[<ArgumentNegateWithPrefix>]
|
||||
EnableFeature : bool
|
||||
}
|
||||
|
||||
[<ArgParser true>]
|
||||
type FlagNegation =
|
||||
{
|
||||
[<ArgumentNegateWithPrefix>]
|
||||
DryRun : TestDryRunMode
|
||||
}
|
||||
|
||||
[<ArgParser true>]
|
||||
type MultipleFormsNegation =
|
||||
{
|
||||
[<ArgumentLongForm "verbose">]
|
||||
[<ArgumentLongForm "v">]
|
||||
[<ArgumentNegateWithPrefix>]
|
||||
VerboseMode : bool
|
||||
}
|
||||
|
||||
[<ArgParser true>]
|
||||
type CombinedFeatures =
|
||||
{
|
||||
[<ArgumentNegateWithPrefix>]
|
||||
[<ArgumentDefaultFunction>]
|
||||
Verbose : Choice<bool, bool>
|
||||
|
||||
[<ArgumentNegateWithPrefix>]
|
||||
[<ArgumentHelpText "Enable debug mode">]
|
||||
Debug : bool
|
||||
|
||||
NormalBool : bool
|
||||
}
|
||||
|
||||
static member DefaultVerbose () = false
|
||||
@@ -89,6 +89,17 @@
|
||||
<Compile Include="GeneratedArgs.fs">
|
||||
<MyriadFile>Args.fs</MyriadFile>
|
||||
</Compile>
|
||||
<Compile Include="ArgParserNegationTests.fs" />
|
||||
<Compile Include="GeneratedArgParserNegationTests.fs">
|
||||
<MyriadFile>ArgParserNegationTests.fs</MyriadFile>
|
||||
</Compile>
|
||||
<!-- Not compiled, because by design they *don't* compile. That makes them very hard to test in an automated way! -->
|
||||
<None Include="ArgParserConflictTests.fs" />
|
||||
<!-- To run the conflict tests:
|
||||
<Compile Include="GeneratedArgParserConflictTests.fs">
|
||||
<MyriadFile>ArgParserConflictTests.fs</MyriadFile>
|
||||
</Compile>
|
||||
-->
|
||||
<None Include="swagger-gitea.json" />
|
||||
<Compile Include="GeneratedSwaggerGitea.fs">
|
||||
<MyriadFile>swagger-gitea.json</MyriadFile>
|
||||
|
||||
1029
ConsumePlugin/GeneratedArgParserNegationTests.fs
Normal file
1029
ConsumePlugin/GeneratedArgParserNegationTests.fs
Normal file
File diff suppressed because it is too large
Load Diff
@@ -37,7 +37,7 @@ type internal PublicTypeMock =
|
||||
}
|
||||
|
||||
/// An implementation where every non-unit method throws.
|
||||
static member Empty : PublicTypeMock =
|
||||
static member Empty () : PublicTypeMock =
|
||||
{
|
||||
Calls = PublicTypeMockCalls.Calls.Empty ()
|
||||
Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
|
||||
@@ -90,7 +90,7 @@ type public PublicTypeInternalFalseMock =
|
||||
}
|
||||
|
||||
/// An implementation where every non-unit method throws.
|
||||
static member Empty : PublicTypeInternalFalseMock =
|
||||
static member Empty () : PublicTypeInternalFalseMock =
|
||||
{
|
||||
Calls = PublicTypeInternalFalseMockCalls.Calls.Empty ()
|
||||
Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
|
||||
@@ -140,7 +140,7 @@ type internal InternalTypeMock =
|
||||
}
|
||||
|
||||
/// An implementation where every non-unit method throws.
|
||||
static member Empty : InternalTypeMock =
|
||||
static member Empty () : InternalTypeMock =
|
||||
{
|
||||
Calls = InternalTypeMockCalls.Calls.Empty ()
|
||||
Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
|
||||
@@ -185,7 +185,7 @@ type private PrivateTypeMock =
|
||||
}
|
||||
|
||||
/// An implementation where every non-unit method throws.
|
||||
static member Empty : PrivateTypeMock =
|
||||
static member Empty () : PrivateTypeMock =
|
||||
{
|
||||
Calls = PrivateTypeMockCalls.Calls.Empty ()
|
||||
Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
|
||||
@@ -230,7 +230,7 @@ type private PrivateTypeInternalFalseMock =
|
||||
}
|
||||
|
||||
/// An implementation where every non-unit method throws.
|
||||
static member Empty : PrivateTypeInternalFalseMock =
|
||||
static member Empty () : PrivateTypeInternalFalseMock =
|
||||
{
|
||||
Calls = PrivateTypeInternalFalseMockCalls.Calls.Empty ()
|
||||
Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
|
||||
@@ -487,7 +487,7 @@ type internal TypeWithInterfaceMock =
|
||||
}
|
||||
|
||||
/// An implementation where every non-unit method throws.
|
||||
static member Empty : TypeWithInterfaceMock =
|
||||
static member Empty () : TypeWithInterfaceMock =
|
||||
{
|
||||
Calls = TypeWithInterfaceMockCalls.Calls.Empty ()
|
||||
Dispose = (fun () -> ())
|
||||
@@ -541,7 +541,7 @@ type internal TypeWithPropertiesMock =
|
||||
}
|
||||
|
||||
/// An implementation where every non-unit method throws.
|
||||
static member Empty : TypeWithPropertiesMock =
|
||||
static member Empty () : TypeWithPropertiesMock =
|
||||
{
|
||||
Calls = TypeWithPropertiesMockCalls.Calls.Empty ()
|
||||
Dispose = (fun () -> ())
|
||||
|
||||
@@ -36,7 +36,7 @@ type internal PublicTypeNoAttrMock =
|
||||
}
|
||||
|
||||
/// An implementation where every non-unit method throws.
|
||||
static member Empty : PublicTypeNoAttrMock =
|
||||
static member Empty () : PublicTypeNoAttrMock =
|
||||
{
|
||||
Calls = PublicTypeNoAttrMockCalls.Calls.Empty ()
|
||||
Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
|
||||
@@ -88,7 +88,7 @@ type public PublicTypeInternalFalseNoAttrMock =
|
||||
}
|
||||
|
||||
/// An implementation where every non-unit method throws.
|
||||
static member Empty : PublicTypeInternalFalseNoAttrMock =
|
||||
static member Empty () : PublicTypeInternalFalseNoAttrMock =
|
||||
{
|
||||
Calls = PublicTypeInternalFalseNoAttrMockCalls.Calls.Empty ()
|
||||
Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
|
||||
@@ -137,7 +137,7 @@ type internal InternalTypeNoAttrMock =
|
||||
}
|
||||
|
||||
/// An implementation where every non-unit method throws.
|
||||
static member Empty : InternalTypeNoAttrMock =
|
||||
static member Empty () : InternalTypeNoAttrMock =
|
||||
{
|
||||
Calls = InternalTypeNoAttrMockCalls.Calls.Empty ()
|
||||
Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
|
||||
@@ -181,7 +181,7 @@ type private PrivateTypeNoAttrMock =
|
||||
}
|
||||
|
||||
/// An implementation where every non-unit method throws.
|
||||
static member Empty : PrivateTypeNoAttrMock =
|
||||
static member Empty () : PrivateTypeNoAttrMock =
|
||||
{
|
||||
Calls = PrivateTypeNoAttrMockCalls.Calls.Empty ()
|
||||
Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
|
||||
@@ -225,7 +225,7 @@ type private PrivateTypeInternalFalseNoAttrMock =
|
||||
}
|
||||
|
||||
/// An implementation where every non-unit method throws.
|
||||
static member Empty : PrivateTypeInternalFalseNoAttrMock =
|
||||
static member Empty () : PrivateTypeInternalFalseNoAttrMock =
|
||||
{
|
||||
Calls = PrivateTypeInternalFalseNoAttrMockCalls.Calls.Empty ()
|
||||
Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
|
||||
@@ -479,7 +479,7 @@ type internal TypeWithInterfaceNoAttrMock =
|
||||
}
|
||||
|
||||
/// An implementation where every non-unit method throws.
|
||||
static member Empty : TypeWithInterfaceNoAttrMock =
|
||||
static member Empty () : TypeWithInterfaceNoAttrMock =
|
||||
{
|
||||
Calls = TypeWithInterfaceNoAttrMockCalls.Calls.Empty ()
|
||||
Dispose = (fun () -> ())
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<WarnOn>FS3388,FS3559</WarnOn>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Nerdbank.GitVersioning" Version="3.8.38-alpha" PrivateAssets="all" />
|
||||
<PackageReference Include="Nerdbank.GitVersioning" Version="3.9.50" PrivateAssets="all" />
|
||||
<SourceLinkGitHubHost Include="github.com" ContentUrl="https://raw.githubusercontent.com" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup Condition="'$(GITHUB_ACTION)' != ''">
|
||||
|
||||
@@ -652,13 +652,13 @@ For example, [PureGymDto.fs](./ConsumePlugin/PureGymDto.fs) is a real-world set
|
||||
* In your `.fsproj` file, define a helper variable so that subsequent steps don't all have to be kept in sync:
|
||||
```xml
|
||||
<PropertyGroup>
|
||||
<WoofWareMyriadPluginVersion>2.0.1</WoofWareMyriadPluginVersion>
|
||||
<WoofWareMyriadPluginVersion>9.0.1</WoofWareMyriadPluginVersion>
|
||||
</PropertyGroup>
|
||||
```
|
||||
* Take a reference on `WoofWare.Myriad.Plugins.Attributes` (which has no other dependencies), to obtain access to the attributes which the generator will recognise:
|
||||
```xml
|
||||
<ItemGroup>
|
||||
<PackageReference Include="WoofWare.Myriad.Plugins.Attributes" Version="2.0.2" />
|
||||
<PackageReference Include="WoofWare.Myriad.Plugins.Attributes" Version="3.7.2" />
|
||||
</ItemGroup>
|
||||
```
|
||||
* Take a reference (with private assets, to prevent these from propagating to your own assembly) on `WoofWare.Myriad.Plugins`, to obtain the plugins which Myriad will run, and on `Myriad.Sdk`, to obtain the Myriad binary itself:
|
||||
|
||||
@@ -100,3 +100,24 @@ type ArgumentFlagAttribute (flagValue : bool) =
|
||||
[<AttributeUsage(AttributeTargets.Field, AllowMultiple = true)>]
|
||||
type ArgumentLongForm (s : string) =
|
||||
inherit Attribute ()
|
||||
|
||||
/// Attribute indicating that this boolean or flag field should accept `--no-` prefix for negation.
|
||||
/// When this attribute is present on a boolean or flag DU field, the generated parser will accept
|
||||
/// both --field-name and --no-field-name as argument forms.
|
||||
///
|
||||
/// For boolean fields:
|
||||
/// --field-name (or --field-name=true) sets the value to true
|
||||
/// --no-field-name (or --no-field-name=true) sets the value to false
|
||||
/// --field-name=false sets the value to false
|
||||
/// --no-field-name=false sets the value to true
|
||||
///
|
||||
/// For flag DU fields with [<ArgumentFlag>]:
|
||||
/// --field-name (or --field-name=true) sets to the case marked with [<ArgumentFlag true>]
|
||||
/// --no-field-name (or --no-field-name=true) sets to the case marked with [<ArgumentFlag false>]
|
||||
/// --field-name=false sets to the [<ArgumentFlag false>] case
|
||||
/// --no-field-name=false sets to the [<ArgumentFlag true>] case
|
||||
///
|
||||
/// This attribute can only be applied to bool fields or flag DU fields (two-case DUs with [<ArgumentFlag>]).
|
||||
[<AttributeUsage(AttributeTargets.Field, AllowMultiple = false)>]
|
||||
type ArgumentNegateWithPrefixAttribute () =
|
||||
inherit Attribute ()
|
||||
|
||||
@@ -13,6 +13,8 @@ WoofWare.Myriad.Plugins.ArgumentHelpTextAttribute inherit System.Attribute
|
||||
WoofWare.Myriad.Plugins.ArgumentHelpTextAttribute..ctor [constructor]: string
|
||||
WoofWare.Myriad.Plugins.ArgumentLongForm inherit System.Attribute
|
||||
WoofWare.Myriad.Plugins.ArgumentLongForm..ctor [constructor]: string
|
||||
WoofWare.Myriad.Plugins.ArgumentNegateWithPrefixAttribute inherit System.Attribute
|
||||
WoofWare.Myriad.Plugins.ArgumentNegateWithPrefixAttribute..ctor [constructor]: unit
|
||||
WoofWare.Myriad.Plugins.CreateCatamorphismAttribute inherit System.Attribute
|
||||
WoofWare.Myriad.Plugins.CreateCatamorphismAttribute..ctor [constructor]: string
|
||||
WoofWare.Myriad.Plugins.GenerateCapturingMockAttribute inherit System.Attribute
|
||||
|
||||
@@ -17,10 +17,10 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="ApiSurface" Version="5.0.1" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"/>
|
||||
<PackageReference Include="ApiSurface" Version="5.0.3" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1"/>
|
||||
<PackageReference Include="NUnit" Version="4.3.2"/>
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0"/>
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0"/>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "3.7",
|
||||
"version": "3.8",
|
||||
"publicReleaseRefSpec": [
|
||||
"^refs/heads/main$"
|
||||
],
|
||||
|
||||
@@ -0,0 +1,372 @@
|
||||
namespace WoofWare.Myriad.Plugins.Test
|
||||
|
||||
open System.Threading
|
||||
open NUnit.Framework
|
||||
open FsUnitTyped
|
||||
open ConsumePlugin
|
||||
|
||||
[<TestFixture>]
|
||||
module TestArgParserNegation =
|
||||
|
||||
[<Test>]
|
||||
let ``Boolean field with ArgumentNegateWithPrefix: --foo sets to true`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = BoolNegation.parse' getEnvVar [ "--enable-feature" ]
|
||||
|
||||
result.EnableFeature |> shouldEqual true
|
||||
|
||||
[<Test>]
|
||||
let ``Boolean field with ArgumentNegateWithPrefix: --foo=true sets to true`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = BoolNegation.parse' getEnvVar [ "--enable-feature=true" ]
|
||||
|
||||
result.EnableFeature |> shouldEqual true
|
||||
|
||||
[<Test>]
|
||||
let ``Boolean field with ArgumentNegateWithPrefix: --foo true sets to true`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = BoolNegation.parse' getEnvVar [ "--enable-feature" ; "true" ]
|
||||
|
||||
result.EnableFeature |> shouldEqual true
|
||||
|
||||
[<Test>]
|
||||
let ``Boolean field with ArgumentNegateWithPrefix: --foo=false sets to false`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = BoolNegation.parse' getEnvVar [ "--enable-feature=false" ]
|
||||
|
||||
result.EnableFeature |> shouldEqual false
|
||||
|
||||
[<Test>]
|
||||
let ``Boolean field with ArgumentNegateWithPrefix: --foo false sets to false`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = BoolNegation.parse' getEnvVar [ "--enable-feature" ; "false" ]
|
||||
|
||||
result.EnableFeature |> shouldEqual false
|
||||
|
||||
[<Test>]
|
||||
let ``Boolean field with ArgumentNegateWithPrefix: --no-foo sets to false`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = BoolNegation.parse' getEnvVar [ "--no-enable-feature" ]
|
||||
|
||||
result.EnableFeature |> shouldEqual false
|
||||
|
||||
[<Test>]
|
||||
let ``Boolean field with ArgumentNegateWithPrefix: --no-foo=true sets to false`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = BoolNegation.parse' getEnvVar [ "--no-enable-feature=true" ]
|
||||
|
||||
result.EnableFeature |> shouldEqual false
|
||||
|
||||
[<Test>]
|
||||
let ``Boolean field with ArgumentNegateWithPrefix: --no-foo true sets to false`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = BoolNegation.parse' getEnvVar [ "--no-enable-feature" ; "true" ]
|
||||
|
||||
result.EnableFeature |> shouldEqual false
|
||||
|
||||
[<Test>]
|
||||
let ``Boolean field with ArgumentNegateWithPrefix: --no-foo=false sets to true`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = BoolNegation.parse' getEnvVar [ "--no-enable-feature=false" ]
|
||||
|
||||
result.EnableFeature |> shouldEqual true
|
||||
|
||||
[<Test>]
|
||||
let ``Boolean field with ArgumentNegateWithPrefix: --no-foo false sets to true`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = BoolNegation.parse' getEnvVar [ "--no-enable-feature" ; "false" ]
|
||||
|
||||
result.EnableFeature |> shouldEqual true
|
||||
|
||||
[<Test>]
|
||||
let ``Flag DU with ArgumentNegateWithPrefix: --dry-run sets to Dry`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = FlagNegation.parse' getEnvVar [ "--dry-run" ]
|
||||
|
||||
result.DryRun |> shouldEqual TestDryRunMode.Dry
|
||||
|
||||
[<Test>]
|
||||
let ``Flag DU with ArgumentNegateWithPrefix: --dry-run=true sets to Dry`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = FlagNegation.parse' getEnvVar [ "--dry-run=true" ]
|
||||
|
||||
result.DryRun |> shouldEqual TestDryRunMode.Dry
|
||||
|
||||
[<Test>]
|
||||
let ``Flag DU with ArgumentNegateWithPrefix: --dry-run true sets to Dry`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = FlagNegation.parse' getEnvVar [ "--dry-run" ; "true" ]
|
||||
|
||||
result.DryRun |> shouldEqual TestDryRunMode.Dry
|
||||
|
||||
[<Test>]
|
||||
let ``Flag DU with ArgumentNegateWithPrefix: --dry-run=false sets to Wet`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = FlagNegation.parse' getEnvVar [ "--dry-run=false" ]
|
||||
|
||||
result.DryRun |> shouldEqual TestDryRunMode.Wet
|
||||
|
||||
[<Test>]
|
||||
let ``Flag DU with ArgumentNegateWithPrefix: --dry-run false sets to Wet`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = FlagNegation.parse' getEnvVar [ "--dry-run" ; "false" ]
|
||||
|
||||
result.DryRun |> shouldEqual TestDryRunMode.Wet
|
||||
|
||||
[<Test>]
|
||||
let ``Flag DU with ArgumentNegateWithPrefix: --no-dry-run sets to Wet`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = FlagNegation.parse' getEnvVar [ "--no-dry-run" ]
|
||||
|
||||
result.DryRun |> shouldEqual TestDryRunMode.Wet
|
||||
|
||||
[<Test>]
|
||||
let ``Flag DU with ArgumentNegateWithPrefix: --no-dry-run=true sets to Wet`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = FlagNegation.parse' getEnvVar [ "--no-dry-run=true" ]
|
||||
|
||||
result.DryRun |> shouldEqual TestDryRunMode.Wet
|
||||
|
||||
[<Test>]
|
||||
let ``Flag DU with ArgumentNegateWithPrefix: --no-dry-run true sets to Wet`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = FlagNegation.parse' getEnvVar [ "--no-dry-run" ; "true" ]
|
||||
|
||||
result.DryRun |> shouldEqual TestDryRunMode.Wet
|
||||
|
||||
[<Test>]
|
||||
let ``Flag DU with ArgumentNegateWithPrefix: --no-dry-run=false sets to Dry`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = FlagNegation.parse' getEnvVar [ "--no-dry-run=false" ]
|
||||
|
||||
result.DryRun |> shouldEqual TestDryRunMode.Dry
|
||||
|
||||
[<Test>]
|
||||
let ``Flag DU with ArgumentNegateWithPrefix: --no-dry-run false sets to Dry`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = FlagNegation.parse' getEnvVar [ "--no-dry-run" ; "false" ]
|
||||
|
||||
result.DryRun |> shouldEqual TestDryRunMode.Dry
|
||||
|
||||
[<Test>]
|
||||
let ``ArgumentNegateWithPrefix works with multiple ArgumentLongForm: --verbose`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = MultipleFormsNegation.parse' getEnvVar [ "--verbose" ]
|
||||
|
||||
result.VerboseMode |> shouldEqual true
|
||||
|
||||
[<Test>]
|
||||
let ``ArgumentNegateWithPrefix works with multiple ArgumentLongForm: --v`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = MultipleFormsNegation.parse' getEnvVar [ "--v" ]
|
||||
|
||||
result.VerboseMode |> shouldEqual true
|
||||
|
||||
[<Test>]
|
||||
let ``ArgumentNegateWithPrefix works with multiple ArgumentLongForm: --no-verbose`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = MultipleFormsNegation.parse' getEnvVar [ "--no-verbose" ]
|
||||
|
||||
result.VerboseMode |> shouldEqual false
|
||||
|
||||
[<Test>]
|
||||
let ``ArgumentNegateWithPrefix works with multiple ArgumentLongForm: --no-v`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = MultipleFormsNegation.parse' getEnvVar [ "--no-v" ]
|
||||
|
||||
result.VerboseMode |> shouldEqual false
|
||||
|
||||
[<Test>]
|
||||
let ``ArgumentNegateWithPrefix works with multiple ArgumentLongForm: --verbose=false`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = MultipleFormsNegation.parse' getEnvVar [ "--verbose=false" ]
|
||||
|
||||
result.VerboseMode |> shouldEqual false
|
||||
|
||||
[<Test>]
|
||||
let ``ArgumentNegateWithPrefix works with multiple ArgumentLongForm: --no-v=false`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = MultipleFormsNegation.parse' getEnvVar [ "--no-v=false" ]
|
||||
|
||||
result.VerboseMode |> shouldEqual true
|
||||
|
||||
[<Test>]
|
||||
let ``Help text shows both standard and negated forms for boolean`` () =
|
||||
let getEnvVar (_ : string) = failwith "do not call"
|
||||
|
||||
let exc =
|
||||
Assert.Throws<exn> (fun () -> BoolNegation.parse' getEnvVar [ "--help" ] |> ignore<BoolNegation>)
|
||||
|
||||
exc.Message
|
||||
|> shouldEqual
|
||||
"""Help text requested.
|
||||
--enable-feature / --no-enable-feature bool"""
|
||||
|
||||
[<Test>]
|
||||
let ``Help text shows both standard and negated forms for flag DU`` () =
|
||||
let getEnvVar (_ : string) = failwith "do not call"
|
||||
|
||||
let exc =
|
||||
Assert.Throws<exn> (fun () -> FlagNegation.parse' getEnvVar [ "--help" ] |> ignore<FlagNegation>)
|
||||
|
||||
exc.Message
|
||||
|> shouldEqual
|
||||
"""Help text requested.
|
||||
--dry-run / --no-dry-run bool"""
|
||||
|
||||
[<Test>]
|
||||
let ``Help text with multiple long forms shows all variants`` () =
|
||||
let getEnvVar (_ : string) = failwith "do not call"
|
||||
|
||||
let exc =
|
||||
Assert.Throws<exn> (fun () ->
|
||||
MultipleFormsNegation.parse' getEnvVar [ "--help" ]
|
||||
|> ignore<MultipleFormsNegation>
|
||||
)
|
||||
|
||||
exc.Message
|
||||
|> shouldEqual
|
||||
"""Help text requested.
|
||||
--verbose / --v / --no-verbose / --no-v bool"""
|
||||
|
||||
[<Test>]
|
||||
let ``Multiple occurrences error: --foo and --no-foo both supplied`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let exc =
|
||||
Assert.Throws<exn> (fun () ->
|
||||
BoolNegation.parse' getEnvVar [ "--enable-feature" ; "--no-enable-feature" ]
|
||||
|> ignore<BoolNegation>
|
||||
)
|
||||
|
||||
// Should report as duplicate argument
|
||||
exc.Message |> shouldContainText "supplied multiple times"
|
||||
|
||||
[<Test>]
|
||||
let ``Multiple occurrences error: --no-foo and --foo both supplied`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let exc =
|
||||
Assert.Throws<exn> (fun () ->
|
||||
BoolNegation.parse' getEnvVar [ "--no-enable-feature" ; "--enable-feature" ]
|
||||
|> ignore<BoolNegation>
|
||||
)
|
||||
|
||||
// Should report as duplicate argument
|
||||
exc.Message |> shouldContainText "supplied multiple times"
|
||||
|
||||
[<Test>]
|
||||
let ``Multiple occurrences error: --foo=true and --no-foo=false both supplied`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let exc =
|
||||
Assert.Throws<exn> (fun () ->
|
||||
BoolNegation.parse' getEnvVar [ "--enable-feature=true" ; "--no-enable-feature=false" ]
|
||||
|> ignore<BoolNegation>
|
||||
)
|
||||
|
||||
// Should report as duplicate argument
|
||||
exc.Message |> shouldContainText "supplied multiple times"
|
||||
|
||||
[<Test>]
|
||||
let ``CombinedFeatures: verbose with default value works with negation`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = CombinedFeatures.parse' getEnvVar [ "--debug" ; "--normal-bool" ]
|
||||
|
||||
result.Verbose |> shouldEqual (Choice2Of2 false)
|
||||
result.Debug |> shouldEqual true
|
||||
result.NormalBool |> shouldEqual true
|
||||
|
||||
[<Test>]
|
||||
let ``CombinedFeatures: can override default with --verbose`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result =
|
||||
CombinedFeatures.parse' getEnvVar [ "--verbose" ; "--debug" ; "--normal-bool" ]
|
||||
|
||||
result.Verbose |> shouldEqual (Choice1Of2 true)
|
||||
result.Debug |> shouldEqual true
|
||||
result.NormalBool |> shouldEqual true
|
||||
|
||||
[<Test>]
|
||||
let ``CombinedFeatures: can override default with --no-verbose`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result =
|
||||
CombinedFeatures.parse' getEnvVar [ "--no-verbose" ; "--debug" ; "--normal-bool" ]
|
||||
|
||||
result.Verbose |> shouldEqual (Choice1Of2 false)
|
||||
result.Debug |> shouldEqual true
|
||||
result.NormalBool |> shouldEqual true
|
||||
|
||||
[<Test>]
|
||||
let ``CombinedFeatures: --no-debug sets debug to false`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = CombinedFeatures.parse' getEnvVar [ "--no-debug" ; "--normal-bool" ]
|
||||
|
||||
result.Debug |> shouldEqual false
|
||||
|
||||
[<Test>]
|
||||
let ``CombinedFeatures: help text shows negation for fields with attribute`` () =
|
||||
let getEnvVar (_ : string) = failwith "do not call"
|
||||
|
||||
let exc =
|
||||
Assert.Throws<exn> (fun () -> CombinedFeatures.parse' getEnvVar [ "--help" ] |> ignore<CombinedFeatures>)
|
||||
|
||||
// Verbose and Debug should have --no- forms, NormalBool should not
|
||||
exc.Message |> shouldContainText "--verbose / --no-verbose"
|
||||
exc.Message |> shouldContainText "--debug / --no-debug"
|
||||
exc.Message |> shouldContainText "--normal-bool bool"
|
||||
exc.Message |> shouldNotContainText "--no-normal-bool"
|
||||
|
||||
[<Test>]
|
||||
let ``Case insensitivity: --NO-ENABLE-FEATURE works`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = BoolNegation.parse' getEnvVar [ "--NO-ENABLE-FEATURE" ]
|
||||
|
||||
result.EnableFeature |> shouldEqual false
|
||||
|
||||
[<Test>]
|
||||
let ``Case insensitivity: --No-Enable-Feature works`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = BoolNegation.parse' getEnvVar [ "--No-Enable-Feature" ]
|
||||
|
||||
result.EnableFeature |> shouldEqual false
|
||||
|
||||
[<Test>]
|
||||
let ``Case insensitivity: --NO-DRY-RUN works`` () =
|
||||
let getEnvVar (_ : string) = failwith "should not call"
|
||||
|
||||
let result = FlagNegation.parse' getEnvVar [ "--NO-DRY-RUN" ]
|
||||
|
||||
result.DryRun |> shouldEqual TestDryRunMode.Wet
|
||||
@@ -11,7 +11,7 @@ module TestCapturingMockGenerator =
|
||||
[<Test>]
|
||||
let ``Example of use: IPublicType`` () =
|
||||
let mock : IPublicType =
|
||||
{ PublicTypeMock.Empty with
|
||||
{ PublicTypeMock.Empty () with
|
||||
Mem1 = fun (s, count) -> List.replicate count s
|
||||
}
|
||||
:> _
|
||||
@@ -38,7 +38,7 @@ module TestCapturingMockGenerator =
|
||||
[<Test>]
|
||||
let ``Example of use: properties`` () =
|
||||
let mock : TypeWithProperties =
|
||||
{ TypeWithPropertiesMock.Empty with
|
||||
{ TypeWithPropertiesMock.Empty () with
|
||||
Mem1 = fun i -> async { return Option.toArray i }
|
||||
Prop1 = fun () -> 44
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ module TestCapturingMockGeneratorNoAttr =
|
||||
[<Test>]
|
||||
let ``Example of use: IPublicType`` () =
|
||||
let mock : IPublicTypeNoAttr =
|
||||
{ PublicTypeNoAttrMock.Empty with
|
||||
{ PublicTypeNoAttrMock.Empty () with
|
||||
Mem1 = fun (s, count) -> List.replicate count s
|
||||
}
|
||||
:> _
|
||||
|
||||
@@ -38,6 +38,7 @@
|
||||
<Compile Include="TestCataGenerator\TestMyList.fs" />
|
||||
<Compile Include="TestCataGenerator\TestMyList2.fs" />
|
||||
<Compile Include="TestArgParser\TestArgParser.fs" />
|
||||
<Compile Include="TestArgParser\TestArgParserNegation.fs" />
|
||||
<Compile Include="TestSwagger\TestSwaggerParse.fs" />
|
||||
<Compile Include="TestSwagger\TestOpenApi3Parse.fs" />
|
||||
<EmbeddedResource Include="TestSwagger\api-with-examples.json" />
|
||||
@@ -55,13 +56,13 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="ApiSurface" Version="5.0.1" />
|
||||
<PackageReference Include="FsCheck" Version="3.3.1" />
|
||||
<PackageReference Include="ApiSurface" Version="5.0.3" />
|
||||
<PackageReference Include="FsCheck" Version="3.3.2" />
|
||||
<PackageReference Include="FsUnit" Version="7.1.1" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
|
||||
<PackageReference Include="NUnit" Version="4.3.2" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
|
||||
<PackageReference Include="WoofWare.Expect" Version="0.8.2" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
|
||||
<PackageReference Include="WoofWare.Expect" Version="0.8.4" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -72,16 +72,38 @@ type private ParseFunction<'acc> =
|
||||
/// and choices and so on.
|
||||
TargetType : SynType
|
||||
Accumulation : 'acc
|
||||
/// If true, this boolean/flag field accepts --no- prefix for negation (has [<ArgumentNegateWithPrefix>])
|
||||
AcceptsNegation : bool
|
||||
}
|
||||
|
||||
/// A SynExpr of type `string` which we can display to the user at generated-program runtime to display all
|
||||
/// the ways they can refer to this arg.
|
||||
member arg.HumanReadableArgForm : SynExpr =
|
||||
let formatString = List.replicate arg.ArgForm.Length "--%s" |> String.concat " / "
|
||||
if arg.AcceptsNegation then
|
||||
// Include both standard and --no- variants
|
||||
// E.g., "--foo / --bar / --no-foo / --no-bar"
|
||||
let standardFormatString =
|
||||
List.replicate arg.ArgForm.Length "--%s" |> String.concat " / "
|
||||
|
||||
(SynExpr.applyFunction (SynExpr.createIdent "sprintf") (SynExpr.CreateConst formatString), arg.ArgForm)
|
||||
||> List.fold SynExpr.applyFunction
|
||||
|> SynExpr.paren
|
||||
let negatedFormatString =
|
||||
List.replicate arg.ArgForm.Length "--no-%s" |> String.concat " / "
|
||||
|
||||
let combinedFormatString = standardFormatString + " / " + negatedFormatString
|
||||
|
||||
// Apply all arg forms twice (once for standard, once for negated)
|
||||
let allArgForms = arg.ArgForm @ arg.ArgForm
|
||||
|
||||
(SynExpr.applyFunction (SynExpr.createIdent "sprintf") (SynExpr.CreateConst combinedFormatString),
|
||||
allArgForms)
|
||||
||> List.fold SynExpr.applyFunction
|
||||
|> SynExpr.paren
|
||||
else
|
||||
// Standard behavior: just --foo / --bar
|
||||
let formatString = List.replicate arg.ArgForm.Length "--%s" |> String.concat " / "
|
||||
|
||||
(SynExpr.applyFunction (SynExpr.createIdent "sprintf") (SynExpr.CreateConst formatString), arg.ArgForm)
|
||||
||> List.fold SynExpr.applyFunction
|
||||
|> SynExpr.paren
|
||||
|
||||
[<RequireQualifiedAccess>]
|
||||
type private ChoicePositional =
|
||||
@@ -222,8 +244,8 @@ module private ParseTree =
|
||||
nonPos @ nonPos2, Some pos
|
||||
|
||||
|> fun (nonPos, pos) ->
|
||||
let duplicateArgs =
|
||||
// This is best-effort. We can't necessarily detect all SynExprs here, but usually it'll be strings.
|
||||
// Extract all arg form strings for validation
|
||||
let allArgForms =
|
||||
Option.toList (pos |> Option.map _.ArgForm) @ (nonPos |> List.map _.ArgForm)
|
||||
|> Seq.concat
|
||||
|> Seq.choose (fun expr ->
|
||||
@@ -232,14 +254,57 @@ module private ParseTree =
|
||||
| _ -> None
|
||||
)
|
||||
|> List.ofSeq
|
||||
|
||||
// Check for direct duplicates
|
||||
let duplicateArgs =
|
||||
allArgForms
|
||||
|> List.groupBy id
|
||||
|> List.choose (fun (key, v) -> if v.Length > 1 then Some key else None)
|
||||
|
||||
match duplicateArgs with
|
||||
| [] -> nonPos, pos
|
||||
| dups ->
|
||||
| dups when not dups.IsEmpty ->
|
||||
let dups = dups |> String.concat " "
|
||||
failwith $"Duplicate args detected! %s{dups}"
|
||||
| _ ->
|
||||
|
||||
// Check for --no- prefix conflicts
|
||||
// Build a map of arg names that have AcceptsNegation=true
|
||||
let negatedForms =
|
||||
nonPos
|
||||
|> List.filter _.AcceptsNegation
|
||||
|> List.collect (fun pf ->
|
||||
pf.ArgForm
|
||||
|> List.choose (fun expr ->
|
||||
match expr |> SynExpr.stripOptionalParen with
|
||||
| SynExpr.Const (SynConst.String (s, _, _), _) -> Some (pf.FieldName.idText, s)
|
||||
| _ -> None
|
||||
)
|
||||
)
|
||||
|> List.map (fun (fieldName, argForm) -> $"no-%s{argForm}", fieldName)
|
||||
|> Map.ofList
|
||||
|
||||
// Check if any existing arg form conflicts with a --no- variant
|
||||
let conflicts =
|
||||
allArgForms
|
||||
|> List.choose (fun argForm ->
|
||||
match negatedForms.TryFind argForm with
|
||||
| Some fieldWithNegation -> Some (argForm, fieldWithNegation)
|
||||
| None -> None
|
||||
)
|
||||
|
||||
match conflicts with
|
||||
| [] -> ()
|
||||
| conflicts ->
|
||||
let conflictMessages =
|
||||
conflicts
|
||||
|> List.map (fun (argForm, fieldWithNegation) ->
|
||||
$"Argument name conflict: '--%s{argForm}' collides with the --no- variant of field '%s{fieldWithNegation}' (which has [<ArgumentNegateWithPrefix>])"
|
||||
)
|
||||
|> String.concat "\n"
|
||||
|
||||
failwith $"Conflicting argument names detected:\n%s{conflictMessages}"
|
||||
|
||||
nonPos, pos
|
||||
|
||||
/// Build the return value.
|
||||
let rec instantiate<'a> (tree : ParseTree<'a>) : SynExpr =
|
||||
@@ -615,6 +680,7 @@ module internal ArgParserGenerator =
|
||||
ArgForm = longForms
|
||||
Help = helpText
|
||||
BoolCases = isBoolLike
|
||||
AcceptsNegation = false
|
||||
}
|
||||
|> fun t -> ParseTree.PositionalLeaf (t, Teq.refl)
|
||||
| Accumulation.List Accumulation.Required ->
|
||||
@@ -627,6 +693,7 @@ module internal ArgParserGenerator =
|
||||
ArgForm = longForms
|
||||
Help = helpText
|
||||
BoolCases = isBoolLike
|
||||
AcceptsNegation = false
|
||||
}
|
||||
|> fun t -> ParseTree.PositionalLeaf (t, Teq.refl)
|
||||
| Accumulation.Choice _
|
||||
@@ -651,6 +718,27 @@ module internal ArgParserGenerator =
|
||||
Some (Choice2Of2 ())
|
||||
| parseTy -> identifyAsFlag flagDus parseTy |> Option.map Choice1Of2
|
||||
|
||||
let hasNegateAttr =
|
||||
attrs
|
||||
|> List.exists (fun attr ->
|
||||
match attr.TypeName with
|
||||
| SynLongIdent.SynLongIdent (ident, _, _) ->
|
||||
match (List.last ident).idText with
|
||||
| "ArgumentNegateWithPrefixAttribute"
|
||||
| "ArgumentNegateWithPrefix" -> true
|
||||
| _ -> false
|
||||
)
|
||||
|
||||
let acceptsNegation =
|
||||
if hasNegateAttr then
|
||||
match isBoolLike with
|
||||
| Some _ -> true
|
||||
| None ->
|
||||
failwith
|
||||
$"[<ArgumentNegateWithPrefix>] can only be applied to boolean or flag DU fields, but was applied to field %s{ident.idText} of type %O{fieldType}"
|
||||
else
|
||||
false
|
||||
|
||||
{
|
||||
FieldName = ident
|
||||
Parser = parser
|
||||
@@ -660,6 +748,7 @@ module internal ArgParserGenerator =
|
||||
ArgForm = longForms
|
||||
Help = helpText
|
||||
BoolCases = isBoolLike
|
||||
AcceptsNegation = acceptsNegation
|
||||
}
|
||||
|> fun t -> ParseTree.NonPositionalLeaf (t, Teq.refl)
|
||||
|> ParseTreeCrate.make
|
||||
@@ -773,6 +862,37 @@ module internal ArgParserGenerator =
|
||||
)
|
||||
|> SynBinding.basic [ Ident.create "helpText" ] [ SynPat.unit ]
|
||||
|
||||
/// Helper to create a negated parser for boolean/flag fields.
|
||||
/// Returns a SynExpr that represents: string -> (negated bool or negated flag DU)
|
||||
/// For booleans: `fun x -> not (Boolean.Parse x)`
|
||||
/// For flag DUs: `fun x -> FlagDu.FromBoolean flagDu (not (Boolean.Parse x))`
|
||||
let private createNegatedParser (arg : ParseFunction<'acc>) : SynExpr =
|
||||
match arg.BoolCases with
|
||||
| None -> failwith $"LOGIC ERROR: createNegatedParser called on non-boolean field %s{arg.FieldName.idText}"
|
||||
| Some (Choice2Of2 ()) ->
|
||||
// Boolean: parse and negate
|
||||
// fun x -> not (System.Boolean.Parse x)
|
||||
let parseExpr =
|
||||
SynExpr.createIdent "x"
|
||||
|> SynExpr.applyFunction (SynExpr.createLongIdent [ "System" ; "Boolean" ; "Parse" ])
|
||||
|> SynExpr.paren
|
||||
|
||||
parseExpr
|
||||
|> SynExpr.applyFunction (SynExpr.createIdent "not")
|
||||
|> SynExpr.createLambda "x"
|
||||
| Some (Choice1Of2 flagDu) ->
|
||||
// Flag DU: parse as bool, negate, then convert to flag DU
|
||||
// fun x -> x |> System.Boolean.Parse |> not |> FlagDu.FromBoolean flagDu
|
||||
let parseExpr =
|
||||
SynExpr.createIdent "x"
|
||||
|> SynExpr.applyFunction (SynExpr.createLongIdent [ "System" ; "Boolean" ; "Parse" ])
|
||||
|> SynExpr.paren
|
||||
|
||||
parseExpr
|
||||
|> SynExpr.applyFunction (SynExpr.createIdent "not")
|
||||
|> FlagDu.FromBoolean flagDu
|
||||
|> SynExpr.createLambda "x"
|
||||
|
||||
/// `let processKeyValue (key : string) (value : string) : Result<unit, string option> = ...`
|
||||
/// Returns a possible error.
|
||||
/// A parse failure might not be fatal (e.g. maybe the input was optionally of arity 0, and we failed to do
|
||||
@@ -786,109 +906,209 @@ module internal ArgParserGenerator =
|
||||
let args =
|
||||
args
|
||||
|> List.map (fun arg ->
|
||||
match arg.Accumulation with
|
||||
| Accumulation.Required
|
||||
| Accumulation.Choice _
|
||||
| Accumulation.Optional ->
|
||||
let multipleErrorMessage =
|
||||
SynExpr.createIdent "sprintf"
|
||||
|> SynExpr.applyTo (SynExpr.CreateConst "Argument '%s' was supplied multiple times: %s and %s")
|
||||
|> SynExpr.applyTo arg.HumanReadableArgForm
|
||||
|> SynExpr.applyTo (SynExpr.createIdent "x" |> SynExpr.callMethod "ToString" |> SynExpr.paren)
|
||||
|> SynExpr.applyTo (
|
||||
SynExpr.createIdent "value" |> SynExpr.callMethod "ToString" |> SynExpr.paren
|
||||
)
|
||||
let assignmentExpr =
|
||||
match arg.Accumulation with
|
||||
| Accumulation.Required
|
||||
| Accumulation.Choice _
|
||||
| Accumulation.Optional ->
|
||||
let multipleErrorMessage =
|
||||
SynExpr.createIdent "sprintf"
|
||||
|> SynExpr.applyTo (
|
||||
SynExpr.CreateConst "Argument '%s' was supplied multiple times: %s and %s"
|
||||
)
|
||||
|> SynExpr.applyTo arg.HumanReadableArgForm
|
||||
|> SynExpr.applyTo (
|
||||
SynExpr.createIdent "x" |> SynExpr.callMethod "ToString" |> SynExpr.paren
|
||||
)
|
||||
|> SynExpr.applyTo (
|
||||
SynExpr.createIdent "value" |> SynExpr.callMethod "ToString" |> SynExpr.paren
|
||||
)
|
||||
|
||||
let performAssignment =
|
||||
let performAssignment =
|
||||
[
|
||||
SynExpr.createIdent "value"
|
||||
|> SynExpr.pipeThroughFunction arg.Parser
|
||||
|> SynExpr.pipeThroughFunction (SynExpr.createIdent "Some")
|
||||
|> SynExpr.assign (SynLongIdent.createI arg.TargetVariable)
|
||||
|
||||
SynExpr.applyFunction (SynExpr.createIdent "Ok") (SynExpr.CreateConst ())
|
||||
]
|
||||
|> SynExpr.sequential
|
||||
|
||||
[
|
||||
SynMatchClause.create
|
||||
(SynPat.nameWithArgs "Some" [ SynPat.named "x" ])
|
||||
(SynExpr.sequential
|
||||
[
|
||||
multipleErrorMessage
|
||||
|> SynExpr.pipeThroughFunction (
|
||||
SynExpr.dotGet "Add" (SynExpr.createIdent' argParseErrors)
|
||||
)
|
||||
SynExpr.applyFunction (SynExpr.createIdent "Ok") (SynExpr.CreateConst ())
|
||||
])
|
||||
SynMatchClause.create
|
||||
(SynPat.named "None")
|
||||
(SynExpr.pipeThroughTryWith
|
||||
SynPat.anon
|
||||
(SynExpr.createLongIdent [ "exc" ; "Message" ]
|
||||
|> SynExpr.pipeThroughFunction (SynExpr.createIdent "Some")
|
||||
|> SynExpr.pipeThroughFunction (SynExpr.createIdent "Error"))
|
||||
performAssignment)
|
||||
]
|
||||
|> SynExpr.createMatch (SynExpr.createIdent' arg.TargetVariable)
|
||||
| Accumulation.List (Accumulation.List _)
|
||||
| Accumulation.List Accumulation.Optional
|
||||
| Accumulation.List (Accumulation.Choice _) ->
|
||||
failwith
|
||||
"WoofWare.Myriad invariant violated: expected a list to contain only a Required accumulation. Non-positional lists cannot be optional or Choice, nor can they themselves contain lists."
|
||||
| Accumulation.List Accumulation.Required ->
|
||||
[
|
||||
SynExpr.createIdent "value"
|
||||
|> SynExpr.pipeThroughFunction arg.Parser
|
||||
|> SynExpr.pipeThroughFunction (SynExpr.createIdent "Some")
|
||||
|> SynExpr.assign (SynLongIdent.createI arg.TargetVariable)
|
||||
|
||||
SynExpr.applyFunction (SynExpr.createIdent "Ok") (SynExpr.CreateConst ())
|
||||
|> SynExpr.pipeThroughFunction (
|
||||
SynExpr.createLongIdent' [ arg.TargetVariable ; Ident.create "Add" ]
|
||||
)
|
||||
SynExpr.CreateConst () |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Ok")
|
||||
]
|
||||
|> SynExpr.sequential
|
||||
|
||||
[
|
||||
SynMatchClause.create
|
||||
(SynPat.nameWithArgs "Some" [ SynPat.named "x" ])
|
||||
(SynExpr.sequential
|
||||
[
|
||||
multipleErrorMessage
|
||||
|> SynExpr.pipeThroughFunction (
|
||||
SynExpr.dotGet "Add" (SynExpr.createIdent' argParseErrors)
|
||||
)
|
||||
SynExpr.applyFunction (SynExpr.createIdent "Ok") (SynExpr.CreateConst ())
|
||||
])
|
||||
SynMatchClause.create
|
||||
(SynPat.named "None")
|
||||
(SynExpr.pipeThroughTryWith
|
||||
SynPat.anon
|
||||
(SynExpr.createLongIdent [ "exc" ; "Message" ]
|
||||
|> SynExpr.pipeThroughFunction (SynExpr.createIdent "Some")
|
||||
|> SynExpr.pipeThroughFunction (SynExpr.createIdent "Error"))
|
||||
performAssignment)
|
||||
]
|
||||
|> SynExpr.createMatch (SynExpr.createIdent' arg.TargetVariable)
|
||||
| Accumulation.List (Accumulation.List _)
|
||||
| Accumulation.List Accumulation.Optional
|
||||
| Accumulation.List (Accumulation.Choice _) ->
|
||||
failwith
|
||||
"WoofWare.Myriad invariant violated: expected a list to contain only a Required accumulation. Non-positional lists cannot be optional or Choice, nor can they themselves contain lists."
|
||||
| Accumulation.List Accumulation.Required ->
|
||||
[
|
||||
SynExpr.createIdent "value"
|
||||
|> SynExpr.pipeThroughFunction arg.Parser
|
||||
|> SynExpr.pipeThroughFunction (
|
||||
SynExpr.createLongIdent' [ arg.TargetVariable ; Ident.create "Add" ]
|
||||
)
|
||||
SynExpr.CreateConst () |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Ok")
|
||||
]
|
||||
|> SynExpr.sequential
|
||||
|> fun expr -> arg.ArgForm, expr
|
||||
// Return (argForms, assignmentExpr), argMetadata
|
||||
(arg.ArgForm, assignmentExpr), Some arg
|
||||
)
|
||||
|
||||
let posArg =
|
||||
match pos with
|
||||
| None -> []
|
||||
| Some pos ->
|
||||
[
|
||||
SynExpr.createIdent "value"
|
||||
|> SynExpr.pipeThroughFunction pos.Parser
|
||||
|> fun p ->
|
||||
match pos.Accumulation with
|
||||
| ChoicePositional.Choice _ ->
|
||||
p |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Choice1Of2")
|
||||
| ChoicePositional.Normal _ -> p
|
||||
|> SynExpr.pipeThroughFunction (
|
||||
SynExpr.createLongIdent' [ pos.TargetVariable ; Ident.create "Add" ]
|
||||
)
|
||||
SynExpr.CreateConst () |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Ok")
|
||||
]
|
||||
|> SynExpr.sequential
|
||||
|> fun expr -> pos.ArgForm, expr
|
||||
|> List.singleton
|
||||
let posExpr =
|
||||
[
|
||||
SynExpr.createIdent "value"
|
||||
|> SynExpr.pipeThroughFunction pos.Parser
|
||||
|> fun p ->
|
||||
match pos.Accumulation with
|
||||
| ChoicePositional.Choice _ ->
|
||||
p |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Choice1Of2")
|
||||
| ChoicePositional.Normal _ -> p
|
||||
|> SynExpr.pipeThroughFunction (
|
||||
SynExpr.createLongIdent' [ pos.TargetVariable ; Ident.create "Add" ]
|
||||
)
|
||||
SynExpr.CreateConst () |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Ok")
|
||||
]
|
||||
|> SynExpr.sequential
|
||||
|
||||
// Positional args don't support negation, so metadata is None
|
||||
[ (pos.ArgForm, posExpr), None ]
|
||||
|
||||
(SynExpr.applyFunction (SynExpr.createIdent "Error") (SynExpr.createIdent "None"), posArg @ args)
|
||||
||> List.fold (fun finalBranch (argForm, arg) ->
|
||||
||> List.fold (fun finalBranch ((argForm, arg), argMetadata) ->
|
||||
(finalBranch, argForm)
|
||||
||> List.fold (fun finalBranch argForm ->
|
||||
arg
|
||||
|> SynExpr.ifThenElse
|
||||
(SynExpr.applyFunction
|
||||
(SynExpr.createLongIdent [ "System" ; "String" ; "Equals" ])
|
||||
(SynExpr.tuple
|
||||
// Standard match: --argForm
|
||||
let standardMatch =
|
||||
arg
|
||||
|> SynExpr.ifThenElse
|
||||
(SynExpr.applyFunction
|
||||
(SynExpr.createLongIdent [ "System" ; "String" ; "Equals" ])
|
||||
(SynExpr.tuple
|
||||
[
|
||||
SynExpr.createIdent "key"
|
||||
SynExpr.applyFunction
|
||||
(SynExpr.applyFunction
|
||||
(SynExpr.createIdent "sprintf")
|
||||
(SynExpr.CreateConst "--%s"))
|
||||
argForm
|
||||
SynExpr.createLongIdent [ "System" ; "StringComparison" ; "OrdinalIgnoreCase" ]
|
||||
]))
|
||||
finalBranch
|
||||
|
||||
// If this arg accepts negation, also match --no-argForm
|
||||
match argMetadata with
|
||||
| None -> standardMatch
|
||||
| Some (parseFn : ParseFunctionNonPositional) when parseFn.AcceptsNegation ->
|
||||
// Create negated assignment (same structure as `arg` but with negated parser)
|
||||
let negatedParser = createNegatedParser parseFn
|
||||
|
||||
let negatedArg =
|
||||
match parseFn.Accumulation with
|
||||
| Accumulation.Required
|
||||
| Accumulation.Choice _
|
||||
| Accumulation.Optional ->
|
||||
let multipleErrorMessage =
|
||||
SynExpr.createIdent "sprintf"
|
||||
|> SynExpr.applyTo (
|
||||
SynExpr.CreateConst "Argument '%s' was supplied multiple times: %s and %s"
|
||||
)
|
||||
|> SynExpr.applyTo parseFn.HumanReadableArgForm
|
||||
|> SynExpr.applyTo (
|
||||
SynExpr.createIdent "x" |> SynExpr.callMethod "ToString" |> SynExpr.paren
|
||||
)
|
||||
|> SynExpr.applyTo (
|
||||
SynExpr.createIdent "value" |> SynExpr.callMethod "ToString" |> SynExpr.paren
|
||||
)
|
||||
|
||||
let performNegatedAssignment =
|
||||
[
|
||||
SynExpr.createIdent "value"
|
||||
|> SynExpr.pipeThroughFunction negatedParser
|
||||
|> SynExpr.pipeThroughFunction (SynExpr.createIdent "Some")
|
||||
|> SynExpr.assign (SynLongIdent.createI parseFn.TargetVariable)
|
||||
|
||||
SynExpr.applyFunction (SynExpr.createIdent "Ok") (SynExpr.CreateConst ())
|
||||
]
|
||||
|> SynExpr.sequential
|
||||
|
||||
[
|
||||
SynExpr.createIdent "key"
|
||||
SynExpr.applyFunction
|
||||
(SynExpr.applyFunction
|
||||
(SynExpr.createIdent "sprintf")
|
||||
(SynExpr.CreateConst "--%s"))
|
||||
argForm
|
||||
SynExpr.createLongIdent [ "System" ; "StringComparison" ; "OrdinalIgnoreCase" ]
|
||||
]))
|
||||
finalBranch
|
||||
SynMatchClause.create
|
||||
(SynPat.nameWithArgs "Some" [ SynPat.named "x" ])
|
||||
(SynExpr.sequential
|
||||
[
|
||||
multipleErrorMessage
|
||||
|> SynExpr.pipeThroughFunction (
|
||||
SynExpr.dotGet "Add" (SynExpr.createIdent' argParseErrors)
|
||||
)
|
||||
SynExpr.applyFunction (SynExpr.createIdent "Ok") (SynExpr.CreateConst ())
|
||||
])
|
||||
SynMatchClause.create
|
||||
(SynPat.named "None")
|
||||
(SynExpr.pipeThroughTryWith
|
||||
SynPat.anon
|
||||
(SynExpr.createLongIdent [ "exc" ; "Message" ]
|
||||
|> SynExpr.pipeThroughFunction (SynExpr.createIdent "Some")
|
||||
|> SynExpr.pipeThroughFunction (SynExpr.createIdent "Error"))
|
||||
performNegatedAssignment)
|
||||
]
|
||||
|> SynExpr.createMatch (SynExpr.createIdent' parseFn.TargetVariable)
|
||||
| Accumulation.List Accumulation.Required ->
|
||||
[
|
||||
SynExpr.createIdent "value"
|
||||
|> SynExpr.pipeThroughFunction negatedParser
|
||||
|> SynExpr.pipeThroughFunction (
|
||||
SynExpr.createLongIdent' [ parseFn.TargetVariable ; Ident.create "Add" ]
|
||||
)
|
||||
SynExpr.CreateConst () |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Ok")
|
||||
]
|
||||
|> SynExpr.sequential
|
||||
| _ ->
|
||||
failwith
|
||||
"WoofWare.Myriad invariant violated: unexpected accumulation type for negated arg"
|
||||
|
||||
// Match --no-argForm
|
||||
negatedArg
|
||||
|> SynExpr.ifThenElse
|
||||
(SynExpr.applyFunction
|
||||
(SynExpr.createLongIdent [ "System" ; "String" ; "Equals" ])
|
||||
(SynExpr.tuple
|
||||
[
|
||||
SynExpr.createIdent "key"
|
||||
SynExpr.applyFunction
|
||||
(SynExpr.applyFunction
|
||||
(SynExpr.createIdent "sprintf")
|
||||
(SynExpr.CreateConst "--no-%s"))
|
||||
argForm
|
||||
SynExpr.createLongIdent [ "System" ; "StringComparison" ; "OrdinalIgnoreCase" ]
|
||||
]))
|
||||
standardMatch
|
||||
| Some _ -> standardMatch
|
||||
)
|
||||
)
|
||||
|> SynBinding.basic
|
||||
@@ -909,6 +1129,34 @@ module internal ArgParserGenerator =
|
||||
|> PreXmlDoc.create'
|
||||
)
|
||||
|
||||
/// Try to extract a constant bool value from a SynExpr.
|
||||
/// Returns Some true/false if the expr is a constant bool, None otherwise.
|
||||
let private tryGetConstBool (expr : SynExpr) : bool option =
|
||||
match expr |> SynExpr.stripOptionalParen with
|
||||
| SynExpr.Const (SynConst.Bool v, _) -> Some v
|
||||
| _ -> None
|
||||
|
||||
/// Helper to get the "false" case for a boolean/flag field.
|
||||
/// For booleans: `false`
|
||||
/// For flag DUs: the case marked with [<ArgumentFlag false>]
|
||||
let private getFalseCase (flag : ParseFunction<'a>) : SynExpr =
|
||||
match flag.BoolCases with
|
||||
| None -> failwith $"LOGIC ERROR: getFalseCase called on non-boolean field %s{flag.FieldName.idText}"
|
||||
| Some (Choice2Of2 ()) ->
|
||||
// Boolean: return false
|
||||
SynExpr.CreateConst false
|
||||
| Some (Choice1Of2 flagDu) ->
|
||||
// Flag DU: return the case associated with false
|
||||
// Check which case has false as its arg
|
||||
match tryGetConstBool flagDu.Case1Arg, tryGetConstBool flagDu.Case2Arg with
|
||||
| Some false, _ -> SynExpr.createLongIdent' [ flagDu.Name ; flagDu.Case1Name ]
|
||||
| _, Some false -> SynExpr.createLongIdent' [ flagDu.Name ; flagDu.Case2Name ]
|
||||
| Some true, _ -> SynExpr.createLongIdent' [ flagDu.Name ; flagDu.Case2Name ]
|
||||
| _, Some true -> SynExpr.createLongIdent' [ flagDu.Name ; flagDu.Case1Name ]
|
||||
| None, None ->
|
||||
// Can't determine at compile time, use FlagDu.FromBoolean with false
|
||||
FlagDu.FromBoolean flagDu (SynExpr.CreateConst false)
|
||||
|
||||
/// `let setFlagValue (key : string) : bool = ...`
|
||||
/// The second member of the `flags` list tuple is the constant "true" with which we will interpret the
|
||||
/// arity-0 `--foo`. So in the case of a boolean-typed field, this is `true`; in the case of a Flag-typed field,
|
||||
@@ -949,21 +1197,72 @@ module internal ArgParserGenerator =
|
||||
|
||||
(finalExpr, flag.ArgForm)
|
||||
||> List.fold (fun finalExpr argForm ->
|
||||
SynExpr.ifThenElse
|
||||
(SynExpr.applyFunction
|
||||
(SynExpr.createLongIdent [ "System" ; "String" ; "Equals" ])
|
||||
(SynExpr.tuple
|
||||
[
|
||||
SynExpr.createIdent "key"
|
||||
SynExpr.applyFunction
|
||||
(SynExpr.applyFunction
|
||||
(SynExpr.createIdent "sprintf")
|
||||
(SynExpr.CreateConst "--%s"))
|
||||
argForm
|
||||
SynExpr.createLongIdent [ "System" ; "StringComparison" ; "OrdinalIgnoreCase" ]
|
||||
]))
|
||||
finalExpr
|
||||
matchFlag
|
||||
// Standard match: --argForm sets to trueCase
|
||||
let standardMatch =
|
||||
SynExpr.ifThenElse
|
||||
(SynExpr.applyFunction
|
||||
(SynExpr.createLongIdent [ "System" ; "String" ; "Equals" ])
|
||||
(SynExpr.tuple
|
||||
[
|
||||
SynExpr.createIdent "key"
|
||||
SynExpr.applyFunction
|
||||
(SynExpr.applyFunction
|
||||
(SynExpr.createIdent "sprintf")
|
||||
(SynExpr.CreateConst "--%s"))
|
||||
argForm
|
||||
SynExpr.createLongIdent [ "System" ; "StringComparison" ; "OrdinalIgnoreCase" ]
|
||||
]))
|
||||
finalExpr
|
||||
matchFlag
|
||||
|
||||
// If this flag accepts negation, also match --no-argForm sets to falseCase
|
||||
if flag.AcceptsNegation then
|
||||
let falseCase = getFalseCase flag
|
||||
|
||||
let matchNegatedFlag =
|
||||
[
|
||||
SynMatchClause.create
|
||||
(SynPat.nameWithArgs "Some" [ SynPat.named "x" ])
|
||||
// This is an error, but it's one we can gracefully report at the end.
|
||||
(SynExpr.sequential
|
||||
[
|
||||
multipleErrorMessage
|
||||
|> SynExpr.pipeThroughFunction (
|
||||
SynExpr.dotGet "Add" (SynExpr.createIdent' argParseErrors)
|
||||
)
|
||||
SynExpr.CreateConst true
|
||||
])
|
||||
|
||||
SynMatchClause.create
|
||||
(SynPat.named "None")
|
||||
([
|
||||
SynExpr.assign
|
||||
(SynLongIdent.createI flag.TargetVariable)
|
||||
(SynExpr.pipeThroughFunction (SynExpr.createIdent "Some") falseCase)
|
||||
SynExpr.CreateConst true
|
||||
]
|
||||
|> SynExpr.sequential)
|
||||
]
|
||||
|> SynExpr.createMatch (SynExpr.createIdent' flag.TargetVariable)
|
||||
|
||||
// Match --no-argForm
|
||||
SynExpr.ifThenElse
|
||||
(SynExpr.applyFunction
|
||||
(SynExpr.createLongIdent [ "System" ; "String" ; "Equals" ])
|
||||
(SynExpr.tuple
|
||||
[
|
||||
SynExpr.createIdent "key"
|
||||
SynExpr.applyFunction
|
||||
(SynExpr.applyFunction
|
||||
(SynExpr.createIdent "sprintf")
|
||||
(SynExpr.CreateConst "--no-%s"))
|
||||
argForm
|
||||
SynExpr.createLongIdent [ "System" ; "StringComparison" ; "OrdinalIgnoreCase" ]
|
||||
]))
|
||||
standardMatch
|
||||
matchNegatedFlag
|
||||
else
|
||||
standardMatch
|
||||
)
|
||||
)
|
||||
|> SynBinding.basic [ Ident.create "setFlagValue" ] [ SynPat.annotateType SynType.string (SynPat.named "key") ]
|
||||
|
||||
@@ -273,10 +273,7 @@ module internal CapturingInterfaceMockGenerator =
|
||||
let staticMemberEmpty =
|
||||
SynBinding.basic
|
||||
[ Ident.create "Empty" ]
|
||||
(if interfaceType.Generics.IsNone then
|
||||
[]
|
||||
else
|
||||
[ SynPat.unit ])
|
||||
[ SynPat.unit ]
|
||||
(SynExpr.createRecord None emptyRecordFieldInstantiations)
|
||||
|> SynBinding.withXmlDoc (PreXmlDoc.create "An implementation where every non-unit method throws.")
|
||||
|> SynBinding.withReturnAnnotation constructorReturnType
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Myriad.Core" Version="0.8.3" />
|
||||
<PackageReference Include="TypeEquality" Version="0.3.0" />
|
||||
<PackageReference Include="WoofWare.Whippet.Fantomas" Version="0.6.3" />
|
||||
<PackageReference Include="TypeEquality" Version="0.4.2" />
|
||||
<PackageReference Include="WoofWare.Whippet.Fantomas" Version="0.6.4" />
|
||||
<!-- the lowest version allowed by Myriad.Core -->
|
||||
<PackageReference Update="FSharp.Core" Version="6.0.1" PrivateAssets="all"/>
|
||||
</ItemGroup>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "8.1",
|
||||
"version": "9.1",
|
||||
"publicReleaseRefSpec": [
|
||||
"^refs/heads/main$"
|
||||
],
|
||||
|
||||
@@ -10,7 +10,8 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageDownload Include="G-Research.FSharp.Analyzers" Version="[0.17.0]" />
|
||||
<PackageDownload Include="WoofWare.FSharpAnalyzers" Version="[0.2.2]" />
|
||||
<PackageDownload Include="G-Research.FSharp.Analyzers" Version="[0.20.0]" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
6
flake.lock
generated
6
flake.lock
generated
@@ -20,11 +20,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1757746433,
|
||||
"narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=",
|
||||
"lastModified": 1763191728,
|
||||
"narHash": "sha256-esRhOS0APE6k40Hs/jjReXg+rx+J5LkWw7cuWFKlwYA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d",
|
||||
"rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
[
|
||||
{
|
||||
"pname": "ApiSurface",
|
||||
"version": "5.0.1",
|
||||
"hash": "sha256-0GMXEMFgWbbE2OGxW+6h4zGgQHg+IZy1aI13Dn97xSU="
|
||||
"version": "5.0.3",
|
||||
"hash": "sha256-uU5mqLL6zMt17oPYMzhB57ryYC6O6FzSjmdTFg7LvNo="
|
||||
},
|
||||
{
|
||||
"pname": "fantomas",
|
||||
@@ -26,13 +26,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "FsCheck",
|
||||
"version": "3.3.1",
|
||||
"hash": "sha256-k65ksdOSOGz+meRUUND+yuqJtm5ChaKuaxmRIdKzx2Y="
|
||||
"version": "3.3.2",
|
||||
"hash": "sha256-3ydyTGpqySynjbcWbmFVeCBnT3KDH3miPSJYJlyxrGs="
|
||||
},
|
||||
{
|
||||
"pname": "fsharp-analyzers",
|
||||
"version": "0.32.1",
|
||||
"hash": "sha256-le6rPnAF7cKGBZ2w8H2u9glK+6rT2ZjiAVnrkH2IhrM="
|
||||
"version": "0.34.1",
|
||||
"hash": "sha256-Y6PzfVGob2EgX29ZhZIde5EhiZ28Y1+U2pJ6ybIsHV0="
|
||||
},
|
||||
{
|
||||
"pname": "FSharp.Core",
|
||||
@@ -61,8 +61,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.ApplicationInsights",
|
||||
"version": "2.22.0",
|
||||
"hash": "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA="
|
||||
"version": "2.23.0",
|
||||
"hash": "sha256-5sf3bg7CZZjHseK+F3foOchEhmVeioePxMZVvS6Rjb0="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.App.Ref",
|
||||
@@ -91,13 +91,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeCoverage",
|
||||
"version": "17.14.1",
|
||||
"hash": "sha256-f8QytG8GvRoP47rO2KEmnDLxIpyesaq26TFjDdW40Gs="
|
||||
"version": "18.0.1",
|
||||
"hash": "sha256-G6y5iyHZ3R2shlLCW/uTusio/UqcnWT79X+UAbxvDQY="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NET.Test.Sdk",
|
||||
"version": "17.14.1",
|
||||
"hash": "sha256-mZUzDFvFp7x1nKrcnRd0hhbNu5g8EQYt8SKnRgdhT/A="
|
||||
"version": "18.0.1",
|
||||
"hash": "sha256-0c3/rp9di0w7E5UmfRh6Prrm3Aeyi8NOj5bm2i6jAh0="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Host.linux-arm64",
|
||||
@@ -166,43 +166,48 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Testing.Extensions.Telemetry",
|
||||
"version": "1.5.3",
|
||||
"hash": "sha256-bIXwPSa3jkr2b6xINOqMUs6/uj/r4oVFM7xq3uVIZDU="
|
||||
"version": "1.9.0",
|
||||
"hash": "sha256-JT91ThKLEyoRS/8ZJqZwlSTT7ofC2QhNqPFI3pYmMaw="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions",
|
||||
"version": "1.5.3",
|
||||
"hash": "sha256-IfMRfcyaIKEMRtx326ICKtinDBEfGw/Sv8ZHawJ96Yc="
|
||||
"version": "1.9.0",
|
||||
"hash": "sha256-oscZOEKw7gM6eRdDrOS3x+CwqIvXWRmfmi0ugCxBRw0="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Testing.Extensions.VSTestBridge",
|
||||
"version": "1.5.3",
|
||||
"hash": "sha256-XpM/yFjhLSsuzyDV+xKubs4V1zVVYiV05E0+N4S1h0g="
|
||||
"version": "1.9.0",
|
||||
"hash": "sha256-CadXLWD093sUDaWhnppzD9LvpxSRqqt93ZEOFiIAPyw="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Testing.Platform",
|
||||
"version": "1.5.3",
|
||||
"hash": "sha256-y61Iih6w5D79dmrj2V675mcaeIiHoj1HSa1FRit2BLM="
|
||||
"version": "1.9.0",
|
||||
"hash": "sha256-6nzjoYbJOh7v/GB7d+TDuM0l/xglCshFX6KWjg7+cFI="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Testing.Platform.MSBuild",
|
||||
"version": "1.5.3",
|
||||
"hash": "sha256-YspvjE5Jfi587TAfsvfDVJXNrFOkx1B3y1CKV6m7YLY="
|
||||
"version": "1.9.0",
|
||||
"hash": "sha256-/bileP4b+9RZp8yjgS6eynXwc2mohyyzf6p/0LZJd8I="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.TestPlatform.AdapterUtilities",
|
||||
"version": "17.13.0",
|
||||
"hash": "sha256-Vr+3Tad/h/nk7f/5HMExn3HvCGFCarehFAzJSfCBaOc="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.TestPlatform.ObjectModel",
|
||||
"version": "17.12.0",
|
||||
"hash": "sha256-3XBHBSuCxggAIlHXmKNQNlPqMqwFlM952Av6RrLw1/w="
|
||||
"version": "17.13.0",
|
||||
"hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.TestPlatform.ObjectModel",
|
||||
"version": "17.14.1",
|
||||
"hash": "sha256-QMf6O+w0IT+16Mrzo7wn+N20f3L1/mDhs/qjmEo1rYs="
|
||||
"version": "18.0.1",
|
||||
"hash": "sha256-oJbS7SZ46RzyOQ+gCysW7qJRy7V8RlQVa5d8uajb91M="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.TestPlatform.TestHost",
|
||||
"version": "17.14.1",
|
||||
"hash": "sha256-1cxHWcvHRD7orQ3EEEPPxVGEkTpxom1/zoICC9SInJs="
|
||||
"version": "18.0.1",
|
||||
"hash": "sha256-OXYf5vg4piDr10ve0bZ2ZSb+nb3yOiHayJV3cu5sMV4="
|
||||
},
|
||||
{
|
||||
"pname": "Myriad.Core",
|
||||
@@ -216,8 +221,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Nerdbank.GitVersioning",
|
||||
"version": "3.8.38-alpha",
|
||||
"hash": "sha256-gPMrVbjOZxXoofczF/pn6eVkLhjVSJIyQrLO2oljrDc="
|
||||
"version": "3.9.50",
|
||||
"hash": "sha256-BiBfXwr8ob2HTaFk2L5TwAgtvd/EPoqudSI9nhAjQPI="
|
||||
},
|
||||
{
|
||||
"pname": "NETStandard.Library",
|
||||
@@ -271,8 +276,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "NUnit3TestAdapter",
|
||||
"version": "5.0.0",
|
||||
"hash": "sha256-7jZM4qAbIzne3AcdFfMbvbgogqpxvVe6q2S7Ls8xQy0="
|
||||
"version": "5.2.0",
|
||||
"hash": "sha256-ybTutL4VkX/fq61mS+O3Ruh+adic4fpv+MKgQ0IZvGg="
|
||||
},
|
||||
{
|
||||
"pname": "RestEase",
|
||||
@@ -376,17 +381,17 @@
|
||||
},
|
||||
{
|
||||
"pname": "TypeEquality",
|
||||
"version": "0.3.0",
|
||||
"hash": "sha256-V50xAOzzyUJrY+MYPRxtnqW5MVeATXCes89wPprv1r4="
|
||||
"version": "0.4.2",
|
||||
"hash": "sha256-YxK6BGHjcuP76j5BbTDi814jxGqOevQSgS00IJcjZSA="
|
||||
},
|
||||
{
|
||||
"pname": "WoofWare.Expect",
|
||||
"version": "0.8.2",
|
||||
"hash": "sha256-iqt4FPkUr24/4dnRfh7P5nPNNlaPzaItP6/yrGRrQyo="
|
||||
"version": "0.8.4",
|
||||
"hash": "sha256-UI7f2nt4g4Gg1Ke/IChrA4fpVOYAChXpvR6zkKfkmzE="
|
||||
},
|
||||
{
|
||||
"pname": "WoofWare.Whippet.Fantomas",
|
||||
"version": "0.6.3",
|
||||
"hash": "sha256-FkW/HtVp8/HE2k6d7yFpnJcnP3FNNe9kGlkoIWmNgDw="
|
||||
"version": "0.6.4",
|
||||
"hash": "sha256-ScZ7EEcxLvXyam2ZVqDK58QlK3RcePWghzRvtLLLdZI="
|
||||
}
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user