Fix the names of type parameters that denote values.

Gremlinq · Nov 22, 2023 · 6332d54 · 6332d54
1 parent 27e5728
commit 6332d54
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 70 deletions.
diff --git a/src/Core/Queries/Interfaces/IEdgeGremlinQuery.cs b/src/Core/Queries/Interfaces/IEdgeGremlinQuery.cs
@@ -46,9 +46,9 @@ public interface IEdgeGremlinQueryBase<TEdge> :
         IInEdgeGremlinQuery<TEdge, TInVertex> To<TInVertex>(Func<IVertexGremlinQueryBase, IVertexGremlinQueryBase<TInVertex>> toVertexTraversal);
         IInEdgeGremlinQuery<TEdge, TInVertex> To<TInVertex>(StepLabel<TInVertex> stepLabel);
 
-        new IGremlinQuery<TTarget> Values<TTarget>(params Expression<Func<TEdge, TTarget>>[] projections);
+        new IGremlinQuery<TValue> Values<TValue>(params Expression<Func<TEdge, TValue>>[] projections);
 
-        IGremlinQuery<TTarget> Values<TTarget>(params Expression<Func<TEdge, Property<TTarget>>>[] projections);
+        IGremlinQuery<TValue> Values<TValue>(params Expression<Func<TEdge, Property<TValue>>>[] projections);
 
         IGremlinQuery<object> Values(params Expression<Func<TEdge, Property<object>>>[] projections);
     }

diff --git a/src/Core/Queries/Interfaces/IElementGremlinQuery.cs b/src/Core/Queries/Interfaces/IElementGremlinQuery.cs
@@ -35,8 +35,8 @@ public interface IElementGremlinQueryBase<TElement> :
 
         IMapGremlinQuery<IDictionary<string, TValue>> ValueMap<TValue>(params Expression<Func<TElement, TValue>>[] keys);
 
-        IGremlinQuery<TTarget> Values<TTarget>(params Expression<Func<TElement, TTarget>>[] projections);
-        IGremlinQuery<TTarget> Values<TTarget>(params Expression<Func<TElement, TTarget[]>>[] projections);
+        IGremlinQuery<TValue> Values<TValue>(params Expression<Func<TElement, TValue>>[] projections);
+        IGremlinQuery<TValue> Values<TValue>(params Expression<Func<TElement, TValue[]>>[] projections);
     }
 
     public interface IElementGremlinQueryBaseRec<TElement, TSelf> :

diff --git a/src/Core/Queries/Interfaces/IMapGremlinQuery.cs b/src/Core/Queries/Interfaces/IMapGremlinQuery.cs
@@ -11,7 +11,7 @@ public interface IMapGremlinQueryBase<TElement> :
         IMapGremlinQueryBase,
         IGremlinQueryBase<TElement>
     {
-        IGremlinQuery<TTargetValue> Select<TTargetValue>(Expression<Func<TElement, TTargetValue>> projection);
+        IGremlinQuery<TValue> Select<TValue>(Expression<Func<TElement, TValue>> projection);
 
         IMapGremlinQuery<(T1, T2)> Select<T1, T2>(Expression<Func<TElement, T1>> projection1, Expression<Func<TElement, T2>> projection2);
         IMapGremlinQuery<(T1, T2, T3)> Select<T1, T2, T3>(Expression<Func<TElement, T1>> projection1, Expression<Func<TElement, T2>> projection2, Expression<Func<TElement, T3>> projection3);

diff --git a/src/Core/Queries/Interfaces/IVertexGremlinQuery.cs b/src/Core/Queries/Interfaces/IVertexGremlinQuery.cs
@@ -60,16 +60,16 @@ public interface IVertexGremlinQueryBase<TVertex> :
 
         IVertexPropertyGremlinQuery<VertexProperty<TValue, TMeta>, TValue, TMeta> Properties<TValue, TMeta>(params Expression<Func<TVertex, VertexProperty<TValue, TMeta>[]>>[] projections);
 
-        new IGremlinQuery<TTarget> Values<TTarget>(params Expression<Func<TVertex, TTarget>>[] projections);
-        new IGremlinQuery<TTarget> Values<TTarget>(params Expression<Func<TVertex, TTarget[]>>[] projections);
+        new IGremlinQuery<TValue> Values<TValue>(params Expression<Func<TVertex, TValue>>[] projections);
+        new IGremlinQuery<TValue> Values<TValue>(params Expression<Func<TVertex, TValue[]>>[] projections);
 
-        IGremlinQuery<TTarget> Values<TTarget>(params Expression<Func<TVertex, VertexProperty<TTarget>>>[] projections);
+        IGremlinQuery<TValue> Values<TValue>(params Expression<Func<TVertex, VertexProperty<TValue>>>[] projections);
         IGremlinQuery<object> Values(params Expression<Func<TVertex, VertexProperty<object>>>[] projections);
 
-        IGremlinQuery<TTarget> Values<TTarget>(params Expression<Func<TVertex, VertexProperty<TTarget>[]>>[] projections);
+        IGremlinQuery<TValue> Values<TValue>(params Expression<Func<TVertex, VertexProperty<TValue>[]>>[] projections);
 
-        IGremlinQuery<TTarget> Values<TTarget, TMeta>(params Expression<Func<TVertex, VertexProperty<TTarget, TMeta>>>[] projections);
-        IGremlinQuery<TTarget> Values<TTarget, TMeta>(params Expression<Func<TVertex, VertexProperty<TTarget, TMeta>[]>>[] projections);
+        IGremlinQuery<TValue> Values<TValue, TMeta>(params Expression<Func<TVertex, VertexProperty<TValue, TMeta>>>[] projections);
+        IGremlinQuery<TValue> Values<TValue, TMeta>(params Expression<Func<TVertex, VertexProperty<TValue, TMeta>[]>>[] projections);
     }
 
     public interface IVertexGremlinQuery<TVertex> :

diff --git a/src/Core/Queries/Interfaces/IVertexPropertyGremlinQuery.cs b/src/Core/Queries/Interfaces/IVertexPropertyGremlinQuery.cs
@@ -9,8 +9,8 @@ public interface IVertexPropertyGremlinQueryBase : IElementGremlinQueryBase
 
         IPropertyGremlinQuery<Property<object>> Properties(params string[] keys);
 
-        new IGremlinQuery<TTarget> Values<TTarget>();
-        IGremlinQuery<TTarget> Values<TTarget>(params string[] keys);
+        new IGremlinQuery<TValue> Values<TValue>();
+        IGremlinQuery<TValue> Values<TValue>(params string[] keys);
         IGremlinQuery<object> Values(params string[] keys);
 
         new IMapGremlinQuery<IDictionary<string, TValue>> ValueMap<TValue>();
@@ -44,7 +44,7 @@ public interface IVertexPropertyGremlinQueryBase<TProperty, TValue, TMeta> :
     {
         new IElementGremlinQuery<TProperty> Lower();
 
-        IPropertyGremlinQuery<Property<TTarget>> Properties<TTarget>(params Expression<Func<TMeta, TTarget>>[] projections);
+        IPropertyGremlinQuery<Property<TMetaValue>> Properties<TMetaValue>(params Expression<Func<TMeta, TMetaValue>>[] projections);
 
         IVertexPropertyGremlinQuery<TProperty, TValue, TMeta> Property<TMetaValue>(Expression<Func<TMeta, TMetaValue>> projection, TMetaValue value);
 

diff --git a/test/PublicApi.Tests/PublicApiTests.Core.Core3_1.verified.cs b/test/PublicApi.Tests/PublicApiTests.Core.Core3_1.verified.cs
@@ -280,8 +280,8 @@ public interface IEdgeGremlinQueryBase<TEdge> : ExRam.Gremlinq.Core.IEdgeGremlin
         ExRam.Gremlinq.Core.IInEdgeGremlinQuery<TEdge, TInVertex> To<TInVertex>(System.Func<ExRam.Gremlinq.Core.IVertexGremlinQueryBase, ExRam.Gremlinq.Core.IVertexGremlinQueryBase<TInVertex>> toVertexTraversal);
         ExRam.Gremlinq.Core.IEdgeGremlinQuery<TEdge> Update(TEdge element);
         ExRam.Gremlinq.Core.IGremlinQuery<object> Values(params System.Linq.Expressions.Expression<System.Func<TEdge, ExRam.Gremlinq.Core.GraphElements.Property<object>>>[] projections);
-        ExRam.Gremlinq.Core.IGremlinQuery<TTarget> Values<TTarget>(params System.Linq.Expressions.Expression<System.Func<TEdge, ExRam.Gremlinq.Core.GraphElements.Property<TTarget>>>[] projections);
-        new ExRam.Gremlinq.Core.IGremlinQuery<TTarget> Values<TTarget>(params System.Linq.Expressions.Expression<System.Func<TEdge, TTarget>>[] projections);
+        ExRam.Gremlinq.Core.IGremlinQuery<TValue> Values<TValue>(params System.Linq.Expressions.Expression<System.Func<TEdge, ExRam.Gremlinq.Core.GraphElements.Property<TValue>>>[] projections);
+        new ExRam.Gremlinq.Core.IGremlinQuery<TValue> Values<TValue>(params System.Linq.Expressions.Expression<System.Func<TEdge, TValue>>[] projections);
     }
     public interface IEdgeGremlinQueryBase<TEdge, TOutVertex, TInVertex> : ExRam.Gremlinq.Core.IEdgeGremlinQueryBase, ExRam.Gremlinq.Core.IEdgeGremlinQueryBase<TEdge>, ExRam.Gremlinq.Core.IEdgeOrVertexGremlinQueryBase, ExRam.Gremlinq.Core.IEdgeOrVertexGremlinQueryBase<TEdge>, ExRam.Gremlinq.Core.IElementGremlinQueryBase, ExRam.Gremlinq.Core.IElementGremlinQueryBase<TEdge>, ExRam.Gremlinq.Core.IGremlinQueryBase, ExRam.Gremlinq.Core.IGremlinQueryBase<TEdge>, ExRam.Gremlinq.Core.IInEdgeGremlinQueryBase, ExRam.Gremlinq.Core.IInEdgeGremlinQueryBase<TEdge, TInVertex>, ExRam.Gremlinq.Core.IOutEdgeGremlinQueryBase, ExRam.Gremlinq.Core.IOutEdgeGremlinQueryBase<TEdge, TOutVertex>, ExRam.Gremlinq.Core.IStartGremlinQuery
     {
@@ -336,8 +336,8 @@ public interface IElementGremlinQueryBase<TElement> : ExRam.Gremlinq.Core.IEleme
     {
         ExRam.Gremlinq.Core.IElementGremlinQuery<TElement> Update(TElement element);
         ExRam.Gremlinq.Core.IMapGremlinQuery<System.Collections.Generic.IDictionary<string, TValue>> ValueMap<TValue>(params System.Linq.Expressions.Expression<System.Func<TElement, TValue>>[] keys);
-        ExRam.Gremlinq.Core.IGremlinQuery<TTarget> Values<TTarget>(params System.Linq.Expressions.Expression<System.Func<TElement, TTarget>>[] projections);
-        ExRam.Gremlinq.Core.IGremlinQuery<TTarget> Values<TTarget>(params System.Linq.Expressions.Expression<System.Func<TElement, TTarget[]>>[] projections);
+        ExRam.Gremlinq.Core.IGremlinQuery<TValue> Values<TValue>(params System.Linq.Expressions.Expression<System.Func<TElement, TValue>>[] projections);
+        ExRam.Gremlinq.Core.IGremlinQuery<TValue> Values<TValue>(params System.Linq.Expressions.Expression<System.Func<TElement, TValue[]>>[] projections);
     }
     public interface IElementGremlinQuery<TElement> : ExRam.Gremlinq.Core.IElementGremlinQueryBase, ExRam.Gremlinq.Core.IElementGremlinQueryBaseRec<ExRam.Gremlinq.Core.IElementGremlinQuery<TElement>>, ExRam.Gremlinq.Core.IElementGremlinQueryBaseRec<TElement, ExRam.Gremlinq.Core.IElementGremlinQuery<TElement>>, ExRam.Gremlinq.Core.IElementGremlinQueryBase<TElement>, ExRam.Gremlinq.Core.IGremlinQueryBase, ExRam.Gremlinq.Core.IGremlinQueryBaseRec<ExRam.Gremlinq.Core.IElementGremlinQuery<TElement>>, ExRam.Gremlinq.Core.IGremlinQueryBaseRec<TElement, ExRam.Gremlinq.Core.IElementGremlinQuery<TElement>>, ExRam.Gremlinq.Core.IGremlinQueryBase<TElement>, ExRam.Gremlinq.Core.IStartGremlinQuery { }
     public interface IEmitLoopBuilder<TQuery>
@@ -643,7 +643,7 @@ public interface IInOrOutEdgeGremlinQuery<TEdge, TAdjacentVertex> : ExRam.Gremli
     public interface IMapGremlinQueryBase : ExRam.Gremlinq.Core.IGremlinQueryBase, ExRam.Gremlinq.Core.IStartGremlinQuery { }
     public interface IMapGremlinQueryBase<TElement> : ExRam.Gremlinq.Core.IGremlinQueryBase, ExRam.Gremlinq.Core.IGremlinQueryBase<TElement>, ExRam.Gremlinq.Core.IMapGremlinQueryBase, ExRam.Gremlinq.Core.IStartGremlinQuery
     {
-        ExRam.Gremlinq.Core.IGremlinQuery<TTargetValue> Select<TTargetValue>(System.Linq.Expressions.Expression<System.Func<TElement, TTargetValue>> projection);
+        ExRam.Gremlinq.Core.IGremlinQuery<TValue> Select<TValue>(System.Linq.Expressions.Expression<System.Func<TElement, TValue>> projection);
         ExRam.Gremlinq.Core.IMapGremlinQuery<System.ValueTuple<T1, T2>> Select<T1, T2>(System.Linq.Expressions.Expression<System.Func<TElement, T1>> projection1, System.Linq.Expressions.Expression<System.Func<TElement, T2>> projection2);
         ExRam.Gremlinq.Core.IMapGremlinQuery<System.ValueTuple<T1, T2, T3>> Select<T1, T2, T3>(System.Linq.Expressions.Expression<System.Func<TElement, T1>> projection1, System.Linq.Expressions.Expression<System.Func<TElement, T2>> projection2, System.Linq.Expressions.Expression<System.Func<TElement, T3>> projection3);
         ExRam.Gremlinq.Core.IMapGremlinQuery<System.ValueTuple<T1, T2, T3, T4>> Select<T1, T2, T3, T4>(System.Linq.Expressions.Expression<System.Func<TElement, T1>> projection1, System.Linq.Expressions.Expression<System.Func<TElement, T2>> projection2, System.Linq.Expressions.Expression<System.Func<TElement, T3>> projection3, System.Linq.Expressions.Expression<System.Func<TElement, T4>> projection4);
@@ -964,12 +964,12 @@ ExRam.Gremlinq.Core.IInOrOutEdgeGremlinQuery<TEdge, TVertex> AddE<TEdge>()
         ExRam.Gremlinq.Core.IVertexPropertyGremlinQuery<ExRam.Gremlinq.Core.GraphElements.VertexProperty<TValue, TMeta>, TValue, TMeta> Properties<TValue, TMeta>(params System.Linq.Expressions.Expression<System.Func<TVertex, ExRam.Gremlinq.Core.GraphElements.VertexProperty<TValue, TMeta>[]>>[] projections);
         ExRam.Gremlinq.Core.IVertexGremlinQuery<TVertex> Update(TVertex element);
         ExRam.Gremlinq.Core.IGremlinQuery<object> Values(params System.Linq.Expressions.Expression<System.Func<TVertex, ExRam.Gremlinq.Core.GraphElements.VertexProperty<object>>>[] projections);
-        ExRam.Gremlinq.Core.IGremlinQuery<TTarget> Values<TTarget>(params System.Linq.Expressions.Expression<System.Func<TVertex, ExRam.Gremlinq.Core.GraphElements.VertexProperty<TTarget>>>[] projections);
-        ExRam.Gremlinq.Core.IGremlinQuery<TTarget> Values<TTarget>(params System.Linq.Expressions.Expression<System.Func<TVertex, ExRam.Gremlinq.Core.GraphElements.VertexProperty<TTarget>[]>>[] projections);
-        new ExRam.Gremlinq.Core.IGremlinQuery<TTarget> Values<TTarget>(params System.Linq.Expressions.Expression<System.Func<TVertex, TTarget>>[] projections);
-        new ExRam.Gremlinq.Core.IGremlinQuery<TTarget> Values<TTarget>(params System.Linq.Expressions.Expression<System.Func<TVertex, TTarget[]>>[] projections);
-        ExRam.Gremlinq.Core.IGremlinQuery<TTarget> Values<TTarget, TMeta>(params System.Linq.Expressions.Expression<System.Func<TVertex, ExRam.Gremlinq.Core.GraphElements.VertexProperty<TTarget, TMeta>>>[] projections);
-        ExRam.Gremlinq.Core.IGremlinQuery<TTarget> Values<TTarget, TMeta>(params System.Linq.Expressions.Expression<System.Func<TVertex, ExRam.Gremlinq.Core.GraphElements.VertexProperty<TTarget, TMeta>[]>>[] projections);
+        ExRam.Gremlinq.Core.IGremlinQuery<TValue> Values<TValue>(params System.Linq.Expressions.Expression<System.Func<TVertex, ExRam.Gremlinq.Core.GraphElements.VertexProperty<TValue>>>[] projections);
+        ExRam.Gremlinq.Core.IGremlinQuery<TValue> Values<TValue>(params System.Linq.Expressions.Expression<System.Func<TVertex, ExRam.Gremlinq.Core.GraphElements.VertexProperty<TValue>[]>>[] projections);
+        new ExRam.Gremlinq.Core.IGremlinQuery<TValue> Values<TValue>(params System.Linq.Expressions.Expression<System.Func<TVertex, TValue>>[] projections);
+        new ExRam.Gremlinq.Core.IGremlinQuery<TValue> Values<TValue>(params System.Linq.Expressions.Expression<System.Func<TVertex, TValue[]>>[] projections);
+        ExRam.Gremlinq.Core.IGremlinQuery<TValue> Values<TValue, TMeta>(params System.Linq.Expressions.Expression<System.Func<TVertex, ExRam.Gremlinq.Core.GraphElements.VertexProperty<TValue, TMeta>>>[] projections);
+        ExRam.Gremlinq.Core.IGremlinQuery<TValue> Values<TValue, TMeta>(params System.Linq.Expressions.Expression<System.Func<TVertex, ExRam.Gremlinq.Core.GraphElements.VertexProperty<TValue, TMeta>[]>>[] projections);
     }
     public interface IVertexGremlinQuery<TVertex> : ExRam.Gremlinq.Core.IEdgeOrVertexGremlinQueryBase, ExRam.Gremlinq.Core.IEdgeOrVertexGremlinQueryBaseRec<ExRam.Gremlinq.Core.IVertexGremlinQuery<TVertex>>, ExRam.Gremlinq.Core.IEdgeOrVertexGremlinQueryBaseRec<TVertex, ExRam.Gremlinq.Core.IVertexGremlinQuery<TVertex>>, ExRam.Gremlinq.Core.IEdgeOrVertexGremlinQueryBase<TVertex>, ExRam.Gremlinq.Core.IElementGremlinQueryBase, ExRam.Gremlinq.Core.IElementGremlinQueryBaseRec<ExRam.Gremlinq.Core.IVertexGremlinQuery<TVertex>>, ExRam.Gremlinq.Core.IElementGremlinQueryBaseRec<TVertex, ExRam.Gremlinq.Core.IVertexGremlinQuery<TVertex>>, ExRam.Gremlinq.Core.IElementGremlinQueryBase<TVertex>, ExRam.Gremlinq.Core.IGremlinQueryBase, ExRam.Gremlinq.Core.IGremlinQueryBaseRec<ExRam.Gremlinq.Core.IVertexGremlinQuery<TVertex>>, ExRam.Gremlinq.Core.IGremlinQueryBaseRec<TVertex, ExRam.Gremlinq.Core.IVertexGremlinQuery<TVertex>>, ExRam.Gremlinq.Core.IGremlinQueryBase<TVertex>, ExRam.Gremlinq.Core.IStartGremlinQuery, ExRam.Gremlinq.Core.IVertexGremlinQueryBase, ExRam.Gremlinq.Core.IVertexGremlinQueryBase<TVertex>
     {
@@ -983,8 +983,8 @@ public interface IVertexPropertyGremlinQueryBase : ExRam.Gremlinq.Core.IElementG
         new ExRam.Gremlinq.Core.IMapGremlinQuery<System.Collections.Generic.IDictionary<string, TValue>> ValueMap<TValue>();
         ExRam.Gremlinq.Core.IMapGremlinQuery<System.Collections.Generic.IDictionary<string, TValue>> ValueMap<TValue>(params string[] keys);
         ExRam.Gremlinq.Core.IGremlinQuery<object> Values(params string[] keys);
-        new ExRam.Gremlinq.Core.IGremlinQuery<TTarget> Values<TTarget>();
-        ExRam.Gremlinq.Core.IGremlinQuery<TTarget> Values<TTarget>(params string[] keys);
+        new ExRam.Gremlinq.Core.IGremlinQuery<TValue> Values<TValue>();
+        ExRam.Gremlinq.Core.IGremlinQuery<TValue> Values<TValue>(params string[] keys);
     }
     public interface IVertexPropertyGremlinQueryBase<TProperty, TValue> : ExRam.Gremlinq.Core.IElementGremlinQueryBase, ExRam.Gremlinq.Core.IElementGremlinQueryBase<TProperty>, ExRam.Gremlinq.Core.IGremlinQueryBase, ExRam.Gremlinq.Core.IGremlinQueryBase<TProperty>, ExRam.Gremlinq.Core.IStartGremlinQuery, ExRam.Gremlinq.Core.IVertexPropertyGremlinQueryBase
     {
@@ -996,7 +996,7 @@ public interface IVertexPropertyGremlinQueryBase<TProperty, TValue> : ExRam.Grem
     public interface IVertexPropertyGremlinQueryBase<TProperty, TValue, TMeta> : ExRam.Gremlinq.Core.IElementGremlinQueryBase, ExRam.Gremlinq.Core.IElementGremlinQueryBase<TProperty>, ExRam.Gremlinq.Core.IGremlinQueryBase, ExRam.Gremlinq.Core.IGremlinQueryBase<TProperty>, ExRam.Gremlinq.Core.IStartGremlinQuery, ExRam.Gremlinq.Core.IVertexPropertyGremlinQueryBase
     {
         ExRam.Gremlinq.Core.IElementGremlinQuery<TProperty> Lower();
-        ExRam.Gremlinq.Core.IPropertyGremlinQuery<ExRam.Gremlinq.Core.GraphElements.Property<TTarget>> Properties<TTarget>(params System.Linq.Expressions.Expression<System.Func<TMeta, TTarget>>[] projections);
+        ExRam.Gremlinq.Core.IPropertyGremlinQuery<ExRam.Gremlinq.Core.GraphElements.Property<TMetaValue>> Properties<TMetaValue>(params System.Linq.Expressions.Expression<System.Func<TMeta, TMetaValue>>[] projections);
         ExRam.Gremlinq.Core.IVertexPropertyGremlinQuery<TProperty, TValue, TMeta> Property<TMetaValue>(System.Linq.Expressions.Expression<System.Func<TMeta, TMetaValue>> projection, TMetaValue value);
         ExRam.Gremlinq.Core.IGremlinQuery<TValue> Value();
         ExRam.Gremlinq.Core.IGremlinQuery<TMeta> ValueMap();