Skip to content

Commit 1442201

Browse files
committed
move 7.7 and make sure exporter can handle new cases
1 parent 7828a9c commit 1442201

File tree

4 files changed

+8168
-7155
lines changed

4 files changed

+8168
-7155
lines changed

src/Nest.TypescriptExporter/CsharpTypeInfoProvider.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public CsharpTypeInfoProvider()
4444
.GetTypes()
4545
.Where(TypeFilter)
4646
.Concat(ExposedInterfacesImplementations.Where(t=>!t.IsGenericType))
47+
.OrderBy(t=>t.Name)
4748
.ToArray();
4849

4950
var requestParams = lowLevelAssembly
@@ -59,7 +60,15 @@ public CsharpTypeInfoProvider()
5960

6061

6162
RequestParameters = requestParams
62-
.ToDictionary(t => t.Name.Replace("Parameters", ""));
63+
.ToDictionary(t =>
64+
{
65+
var tt = t.Name.Replace("Parameters", "");
66+
if (t.FullName.Contains("Eql")) tt = "Eql" + tt;
67+
if (t.FullName.Contains("Async")) tt = "Async" + tt;
68+
if (t.FullName.Contains("SearchableSnapshots")) tt = "SearchableSnapshots" + tt;
69+
return tt;
70+
}
71+
);
6372
}
6473

6574
public Dictionary<string, Type> RequestParameters { get; }

src/Nest.TypescriptExporter/Nest.TypescriptExporter.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageReference Include="ShellProgressBar" Version="5.0.0" />
1111
<!--<PackageReference Include="TypeLite" Version="1.1.0" />-->
1212
<Reference Include="TypeLite.dll" />
13-
<PackageReference Include="NEST" Version="7.4.0" />
13+
<PackageReference Include="NEST" Version="7.7.1" />
1414
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
1515
</ItemGroup>
1616
</Project>

src/Nest.TypescriptExporter/RestSpec.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,15 @@ private RestSpecMapping CreateMapping(FileInfo file)
8989
if (!_badDescriptorFors.Contains(typeName))
9090
specFileName = FindDescriptorForRemapping(file, specFileName);
9191

92-
specFileName = specFileName.SnakeCase().Replace("_", ".");
92+
specFileName = specFileName.SnakeCase().Replace("_", ".").Replace("async.search", "async_search");
9393
do
9494
{
9595
if (SpecificationFiles.TryGetValue(specFileName, out var f))
9696
return new RestSpecMapping {TypeName = $"I{typeName}", Json = f};
9797
}
9898
while (TryGetSpecTarget(specFileName, out specFileName));
9999

100-
throw new Exception($"{typeName} is not a known request in {RestSpecificationFolder}");
100+
throw new Exception($"{specFileName}: {typeName} is not a known request in {RestSpecificationFolder}");
101101
}
102102

103103
public bool SkipRequestImplementation(string typeName)

0 commit comments

Comments
 (0)