@tsonic/efcore 10.0.5 → 10.0.9

package/Microsoft.EntityFrameworkCore.Query/internal/index.d.ts

@@ -20,22 +20,22 @@ import type { AtTimeZoneExpression, CaseExpression, CaseWhenClause, CollateExpre
 import type { JsonReaderData } from "../../Microsoft.EntityFrameworkCore.Storage.Json/internal/index.js";
 import type { IExceptionDetector, IExecutionStrategy, IntTypeMapping, IParameterNameGeneratorFactory, IRelationalCommand, IRelationalCommandBuilder, IRelationalCommandBuilderFactory, IRelationalConnection, IRelationalTypeMappingSource, ISqlGenerationHelper, ITypeMappingSource, MaterializationContext, ReaderColumn, RelationalCommandBuilderDependencies, RelationalTypeMapping } from "../../Microsoft.EntityFrameworkCore.Storage/internal/index.js";
 import type { DbContext, DbLoggerCategory_Database_Command, DbLoggerCategory_Query, ParameterTranslationMode, QuerySplittingBehavior, QueryTrackingBehavior } from "../../Microsoft.EntityFrameworkCore/internal/index.js";
-import * as System_Collections_Generic_Internal from "@tsonic/dotnet/System.Collections.Generic.js";
-import type { Dictionary, HashSet, IAsyncEnumerable, ICollection, IEnumerable as IEnumerable__System_Collections_Generic, IEqualityComparer, IReadOnlyCollection, IReadOnlyDictionary, IReadOnlyList, IReadOnlySet, ISet, List } from "@tsonic/dotnet/System.Collections.Generic.js";
-import * as System_Collections_Internal from "@tsonic/dotnet/System.Collections.js";
-import type { IEnumerable } from "@tsonic/dotnet/System.Collections.js";
-import type { DbCommand, DbDataReader } from "@tsonic/dotnet/System.Data.Common.js";
-import * as System_Internal from "@tsonic/dotnet/System.js";
-import type { Action, Attribute, Boolean as ClrBoolean, Char, Enum, Exception, Func, IComparable, IConvertible, IDisposable, IEquatable, IFormattable, Int32, ISpanFormattable, Nullable, Object as ClrObject, ReadOnlySpan, String as ClrString, Type, ValueTuple, ValueType, Void } from "@tsonic/dotnet/System.js";
-import * as System_Linq_Expressions_Internal from "@tsonic/dotnet/System.Linq.Expressions.js";
-import type { BinaryExpression, BlockExpression, ConditionalExpression, ConstantExpression, DefaultExpression, Expression, ExpressionType, ExpressionVisitor, GotoExpression, IndexExpression, InvocationExpression, LabelExpression, LambdaExpression, ListInitExpression, LoopExpression, MemberExpression, MemberInitExpression, MethodCallExpression, NewArrayExpression, NewExpression, ParameterExpression, SwitchExpression, TryExpression, TypeBinaryExpression, UnaryExpression } from "@tsonic/dotnet/System.Linq.Expressions.js";
-import * as System_Linq_Internal from "@tsonic/dotnet/System.Linq.js";
-import type { IQueryable, IQueryProvider } from "@tsonic/dotnet/System.Linq.js";
-import type { MemberInfo, MethodInfo } from "@tsonic/dotnet/System.Reflection.js";
-import type { StringBuilder } from "@tsonic/dotnet/System.Text.js";
-import type { CancellationToken } from "@tsonic/dotnet/System.Threading.js";
-import type { Task } from "@tsonic/dotnet/System.Threading.Tasks.js";
-import type { IMemoryCache } from "@tsonic/microsoft-extensions/Microsoft.Extensions.Caching.Memory.js";
+import * as System_Collections_Generic_Internal from "@tsonic/dotnet/System.Collections.Generic/internal/index.js";
+import type { Dictionary_2, HashSet_1, IAsyncEnumerable_1, ICollection_1, IEnumerable_1, IEqualityComparer_1, IReadOnlyCollection_1, IReadOnlyDictionary_2, IReadOnlyList_1, IReadOnlySet_1, ISet_1, List_1 } from "@tsonic/dotnet/System.Collections.Generic/internal/index.js";
+import * as System_Collections_Internal from "@tsonic/dotnet/System.Collections/internal/index.js";
+import type { IEnumerable } from "@tsonic/dotnet/System.Collections/internal/index.js";
+import type { DbCommand, DbDataReader } from "@tsonic/dotnet/System.Data.Common/internal/index.js";
+import * as System_Linq_Expressions_Internal from "@tsonic/dotnet/System.Linq.Expressions/internal/index.js";
+import type { BinaryExpression, BlockExpression, ConditionalExpression, ConstantExpression, DefaultExpression, Expression, Expression_1, ExpressionType, ExpressionVisitor, GotoExpression, IndexExpression, InvocationExpression, LabelExpression, LambdaExpression, ListInitExpression, LoopExpression, MemberExpression, MemberInitExpression, MethodCallExpression, NewArrayExpression, NewExpression, ParameterExpression, SwitchExpression, TryExpression, TypeBinaryExpression, UnaryExpression } from "@tsonic/dotnet/System.Linq.Expressions/internal/index.js";
+import * as System_Linq_Internal from "@tsonic/dotnet/System.Linq/internal/index.js";
+import type { IQueryable, IQueryable_1, IQueryProvider } from "@tsonic/dotnet/System.Linq/internal/index.js";
+import type { MemberInfo, MethodInfo } from "@tsonic/dotnet/System.Reflection/internal/index.js";
+import type { StringBuilder } from "@tsonic/dotnet/System.Text/internal/index.js";
+import type { Task, Task_1 } from "@tsonic/dotnet/System.Threading.Tasks/internal/index.js";
+import type { CancellationToken } from "@tsonic/dotnet/System.Threading/internal/index.js";
+import * as System_Internal from "@tsonic/dotnet/System/internal/index.js";
+import type { Action_1, Action_2, Action_3, Attribute, Boolean as ClrBoolean, Char, Enum, Exception, Func_1, Func_2, Func_3, Func_4, Func_5, IComparable, IConvertible, IDisposable, IEquatable_1, IFormattable, Int32, ISpanFormattable, Nullable_1, Object as ClrObject, ReadOnlySpan_1, String as ClrString, Type, ValueTuple_2, ValueType, Void } from "@tsonic/dotnet/System/internal/index.js";
+import type { IMemoryCache } from "@tsonic/microsoft-extensions/Microsoft.Extensions.Caching.Memory/internal/index.js";
 
 export enum ResultCardinality {
     Enumerable = 0,
@@ -47,7 +47,7 @@ export enum ResultCardinality {
 export interface IAggregateMethodCallTranslator$instance {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IAggregateMethodCallTranslator: never;
 
-    Translate(method: MethodInfo, source: EnumerableExpression, arguments: IReadOnlyList<SqlExpression>, logger: IDiagnosticsLogger_1<DbLoggerCategory_Query>): SqlExpression | undefined;
+    Translate(method: MethodInfo, source: EnumerableExpression, arguments: IReadOnlyList_1<SqlExpression>, logger: IDiagnosticsLogger_1<DbLoggerCategory_Query>): SqlExpression | undefined;
 }
 
 
@@ -56,7 +56,7 @@ export type IAggregateMethodCallTranslator = IAggregateMethodCallTranslator$inst
 export interface IAggregateMethodCallTranslatorPlugin$instance {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IAggregateMethodCallTranslatorPlugin: never;
 
-    readonly Translators: IEnumerable__System_Collections_Generic<IAggregateMethodCallTranslator>;
+    readonly Translators: IEnumerable_1<IAggregateMethodCallTranslator>;
 }
 
 
@@ -65,7 +65,7 @@ export type IAggregateMethodCallTranslatorPlugin = IAggregateMethodCallTranslato
 export interface IAggregateMethodCallTranslatorProvider$instance {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IAggregateMethodCallTranslatorProvider: never;
 
-    Translate(model: IModel, method: MethodInfo, source: EnumerableExpression, arguments: IReadOnlyList<SqlExpression>, logger: IDiagnosticsLogger_1<DbLoggerCategory_Query>): SqlExpression | undefined;
+    Translate(model: IModel, method: MethodInfo, source: EnumerableExpression, arguments: IReadOnlyList_1<SqlExpression>, logger: IDiagnosticsLogger_1<DbLoggerCategory_Query>): SqlExpression | undefined;
 }
 
 
@@ -117,20 +117,20 @@ export interface IEvaluatableExpressionFilterPlugin$instance {
 
 export type IEvaluatableExpressionFilterPlugin = IEvaluatableExpressionFilterPlugin$instance;
 
-export interface IIncludableQueryable_2$instance<TEntity, TProperty> extends IQueryable<TEntity>, IEnumerable__System_Collections_Generic<TEntity>, IEnumerable, IQueryable {
+export interface IIncludableQueryable_2$instance<TEntity, TProperty> extends IQueryable_1<TEntity>, IEnumerable_1<TEntity>, IEnumerable, IQueryable {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IIncludableQueryable_2: never;
 
 }
 
 
-export interface IIncludableQueryable_2$instance<TEntity, TProperty> extends System_Collections_Generic_Internal.IEnumerable<TEntity>, System_Linq_Internal.IQueryable<TEntity> {}
+export interface IIncludableQueryable_2$instance<TEntity, TProperty> extends System_Collections_Generic_Internal.IEnumerable_1<TEntity>, System_Linq_Internal.IQueryable_1<TEntity> {}
 
 export type IIncludableQueryable_2<TEntity, TProperty> = IIncludableQueryable_2$instance<TEntity, TProperty>;
 
 export interface ILiftableConstantFactory$instance {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_ILiftableConstantFactory: never;
 
-    CreateLiftableConstant(originalValue: unknown, resolverExpression: Expression<Func<MaterializerLiftableConstantContext, unknown>>, variableName: string, type: Type): Expression;
+    CreateLiftableConstant(originalValue: unknown, resolverExpression: Expression_1<Func_2<MaterializerLiftableConstantContext, unknown>>, variableName: string, type: Type): Expression;
 }
 
 
@@ -139,9 +139,9 @@ export type ILiftableConstantFactory = ILiftableConstantFactory$instance;
 export interface ILiftableConstantProcessor$instance {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_ILiftableConstantProcessor: never;
 
-    readonly LiftedConstants: IReadOnlyList<ValueTuple<ParameterExpression, Expression>>;
+    readonly LiftedConstants: IReadOnlyList_1<ValueTuple_2<ParameterExpression, Expression>>;
     InlineConstants(expression: Expression, supportsPrecompiledQuery: boolean): Expression;
-    LiftConstants(expression: Expression, contextParameter: ParameterExpression, variableNames: HashSet<System_Internal.String>): Expression;
+    LiftConstants(expression: Expression, contextParameter: ParameterExpression, variableNames: HashSet_1<System_Internal.String>): Expression;
 }
 
 
@@ -159,7 +159,7 @@ export type IMemberTranslator = IMemberTranslator$instance;
 export interface IMemberTranslatorPlugin$instance {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IMemberTranslatorPlugin: never;
 
-    readonly Translators: IEnumerable__System_Collections_Generic<IMemberTranslator>;
+    readonly Translators: IEnumerable_1<IMemberTranslator>;
 }
 
 
@@ -177,7 +177,7 @@ export type IMemberTranslatorProvider = IMemberTranslatorProvider$instance;
 export interface IMethodCallTranslator$instance {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IMethodCallTranslator: never;
 
-    Translate(instance: SqlExpression, method: MethodInfo, arguments: IReadOnlyList<SqlExpression>, logger: IDiagnosticsLogger_1<DbLoggerCategory_Query>): SqlExpression | undefined;
+    Translate(instance: SqlExpression, method: MethodInfo, arguments: IReadOnlyList_1<SqlExpression>, logger: IDiagnosticsLogger_1<DbLoggerCategory_Query>): SqlExpression | undefined;
 }
 
 
@@ -186,7 +186,7 @@ export type IMethodCallTranslator = IMethodCallTranslator$instance;
 export interface IMethodCallTranslatorPlugin$instance {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IMethodCallTranslatorPlugin: never;
 
-    readonly Translators: IEnumerable__System_Collections_Generic<IMethodCallTranslator>;
+    readonly Translators: IEnumerable_1<IMethodCallTranslator>;
 }
 
 
@@ -195,7 +195,7 @@ export type IMethodCallTranslatorPlugin = IMethodCallTranslatorPlugin$instance;
 export interface IMethodCallTranslatorProvider$instance {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IMethodCallTranslatorProvider: never;
 
-    Translate(model: IModel, instance: SqlExpression, method: MethodInfo, arguments: IReadOnlyList<SqlExpression>, logger: IDiagnosticsLogger_1<DbLoggerCategory_Query>): SqlExpression | undefined;
+    Translate(model: IModel, instance: SqlExpression, method: MethodInfo, arguments: IReadOnlyList_1<SqlExpression>, logger: IDiagnosticsLogger_1<DbLoggerCategory_Query>): SqlExpression | undefined;
 }
 
 
@@ -287,8 +287,8 @@ export type IQueryTranslationPreprocessorFactory = IQueryTranslationPreprocessor
 export interface IRelationalLiftableConstantFactory$instance extends ILiftableConstantFactory {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IRelationalLiftableConstantFactory: never;
 
-    CreateLiftableConstant(originalValue: unknown, resolverExpression: Expression<Func<MaterializerLiftableConstantContext, unknown>>, variableName: string, type: Type): Expression;
-    CreateLiftableConstant(originalValue: unknown, resolverExpression: Expression<Func<RelationalMaterializerLiftableConstantContext, unknown>>, variableName: string, type: Type): LiftableConstantExpression;
+    CreateLiftableConstant(originalValue: unknown, resolverExpression: Expression_1<Func_2<MaterializerLiftableConstantContext, unknown>>, variableName: string, type: Type): Expression;
+    CreateLiftableConstant(originalValue: unknown, resolverExpression: Expression_1<Func_2<RelationalMaterializerLiftableConstantContext, unknown>>, variableName: string, type: Type): LiftableConstantExpression;
 }
 
 
@@ -356,8 +356,8 @@ export interface ISqlExpressionFactory$instance {
     Add(left: SqlExpression, right: SqlExpression, typeMapping?: RelationalTypeMapping): SqlExpression;
     ApplyDefaultTypeMapping(sqlExpression: SqlExpression): SqlExpression | undefined;
     ApplyTypeMapping(sqlExpression: SqlExpression, typeMapping: RelationalTypeMapping): SqlExpression | undefined;
-    Case(operand: SqlExpression, whenClauses: IReadOnlyList<CaseWhenClause>, elseResult: SqlExpression, existingExpression?: SqlExpression): SqlExpression;
-    Case(whenClauses: IReadOnlyList<CaseWhenClause>, elseResult: SqlExpression): SqlExpression;
+    Case(operand: SqlExpression, whenClauses: IReadOnlyList_1<CaseWhenClause>, elseResult: SqlExpression, existingExpression?: SqlExpression): SqlExpression;
+    Case(whenClauses: IReadOnlyList_1<CaseWhenClause>, elseResult: SqlExpression): SqlExpression;
     Constant(value: unknown, typeMapping?: RelationalTypeMapping): SqlExpression;
     Constant(value: unknown, sensitive: boolean, typeMapping?: RelationalTypeMapping): SqlExpression;
     Constant(value: unknown, type: Type, typeMapping?: RelationalTypeMapping): SqlExpression;
@@ -366,12 +366,12 @@ export interface ISqlExpressionFactory$instance {
     Equal(left: SqlExpression, right: SqlExpression): SqlExpression;
     Exists(subquery: SelectExpression): SqlExpression;
     Fragment(sql: string, type?: Type, typeMapping?: RelationalTypeMapping): SqlExpression;
-    Function(instance: SqlExpression, name: string, arguments: IEnumerable__System_Collections_Generic<SqlExpression>, nullable: boolean, instancePropagatesNullability: boolean, argumentsPropagateNullability: IEnumerable__System_Collections_Generic<System_Internal.Boolean>, returnType: Type, typeMapping?: RelationalTypeMapping): SqlExpression;
-    Function(name: string, arguments: IEnumerable__System_Collections_Generic<SqlExpression>, nullable: boolean, argumentsPropagateNullability: IEnumerable__System_Collections_Generic<System_Internal.Boolean>, returnType: Type, typeMapping?: RelationalTypeMapping): SqlExpression;
-    Function(schema: string, name: string, arguments: IEnumerable__System_Collections_Generic<SqlExpression>, nullable: boolean, argumentsPropagateNullability: IEnumerable__System_Collections_Generic<System_Internal.Boolean>, returnType: Type, typeMapping?: RelationalTypeMapping): SqlExpression;
+    Function(instance: SqlExpression, name: string, arguments: IEnumerable_1<SqlExpression>, nullable: boolean, instancePropagatesNullability: boolean, argumentsPropagateNullability: IEnumerable_1<System_Internal.Boolean>, returnType: Type, typeMapping?: RelationalTypeMapping): SqlExpression;
+    Function(name: string, arguments: IEnumerable_1<SqlExpression>, nullable: boolean, argumentsPropagateNullability: IEnumerable_1<System_Internal.Boolean>, returnType: Type, typeMapping?: RelationalTypeMapping): SqlExpression;
+    Function(schema: string, name: string, arguments: IEnumerable_1<SqlExpression>, nullable: boolean, argumentsPropagateNullability: IEnumerable_1<System_Internal.Boolean>, returnType: Type, typeMapping?: RelationalTypeMapping): SqlExpression;
     In(item: SqlExpression, subquery: SelectExpression): SqlExpression;
     In(item: SqlExpression, valuesParameter: SqlParameterExpression): SqlExpression;
-    In(item: SqlExpression, values: IReadOnlyList<SqlExpression>): SqlExpression;
+    In(item: SqlExpression, values: IReadOnlyList_1<SqlExpression>): SqlExpression;
     Like(match: SqlExpression, pattern: SqlExpression, escapeChar?: SqlExpression): SqlExpression;
     MakeBinary(operatorType: ExpressionType, left: SqlExpression, right: SqlExpression, typeMapping: RelationalTypeMapping, existingExpression?: SqlExpression): SqlExpression | undefined;
     MakeUnary(operatorType: ExpressionType, operand: SqlExpression, type: Type, typeMapping?: RelationalTypeMapping, existingExpression?: SqlExpression): SqlExpression | undefined;
@@ -387,20 +387,22 @@ export interface IStructuralTypeMaterializerSource$instance {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IStructuralTypeMaterializerSource: never;
 
     CreateMaterializeExpression(parameters: StructuralTypeMaterializerSourceParameters, materializationExpression: Expression): Expression;
-    GetMaterializer(complexType: IComplexType): Func<MaterializationContext, unknown>;
-    GetMaterializer(entityType: IEntityType): Func<MaterializationContext, unknown>;
+    GetMaterializer(complexType: IComplexType): Func_2<MaterializationContext, unknown>;
+    GetMaterializer(entityType: IEntityType): Func_2<MaterializationContext, unknown>;
 }
 
 
 export type IStructuralTypeMaterializerSource = IStructuralTypeMaterializerSource$instance;
 
 export interface EntityMaterializerSourceParameters$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_EntityMaterializerSourceParameters: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     InstanceName: string;
-    QueryTrackingBehavior: Nullable<QueryTrackingBehavior>;
+    QueryTrackingBehavior: Nullable_1<QueryTrackingBehavior>;
     StructuralType: ITypeBase;
-    Deconstruct(StructuralType: ITypeBase, InstanceName: string, QueryTrackingBehavior: Nullable<QueryTrackingBehavior>): void;
+    Deconstruct(StructuralType: ITypeBase, InstanceName: string, QueryTrackingBehavior: Nullable_1<QueryTrackingBehavior>): void;
     Equals(obj: unknown): boolean;
     Equals(other: EntityMaterializerSourceParameters): boolean;
     GetHashCode(): int;
@@ -409,13 +411,15 @@ export interface EntityMaterializerSourceParameters$instance {
 
 
 export const EntityMaterializerSourceParameters: {
-    new(StructuralType: ITypeBase, InstanceName: string, QueryTrackingBehavior: Nullable<QueryTrackingBehavior>): EntityMaterializerSourceParameters;
+    new(StructuralType: ITypeBase, InstanceName: string, QueryTrackingBehavior: Nullable_1<QueryTrackingBehavior>): EntityMaterializerSourceParameters;
 };
 
 
 export type EntityMaterializerSourceParameters = EntityMaterializerSourceParameters$instance;
 
-export interface PathSegment$instance {
+export interface PathSegment$instance extends IRelationalQuotableExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_PathSegment: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IRelationalQuotableExpression: never;
 
     readonly ArrayIndex: SqlExpression | undefined;
@@ -437,20 +441,20 @@ export interface __PathSegment$views {
     As_IRelationalQuotableExpression(): IRelationalQuotableExpression$instance;
 }
 
-export interface PathSegment$instance extends IRelationalQuotableExpression$instance {}
-
 export type PathSegment = PathSegment$instance & __PathSegment$views;
 
 
 export interface StructuralTypeMaterializerSourceParameters$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_StructuralTypeMaterializerSourceParameters: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     ClrType: Type;
     InstanceName: string;
     IsNullable: boolean;
-    QueryTrackingBehavior: Nullable<QueryTrackingBehavior>;
+    QueryTrackingBehavior: Nullable_1<QueryTrackingBehavior>;
     StructuralType: ITypeBase;
-    Deconstruct(StructuralType: ITypeBase, InstanceName: string, ClrType: Type, IsNullable: boolean, QueryTrackingBehavior: Nullable<QueryTrackingBehavior>): void;
+    Deconstruct(StructuralType: ITypeBase, InstanceName: string, ClrType: Type, IsNullable: boolean, QueryTrackingBehavior: Nullable_1<QueryTrackingBehavior>): void;
     Equals(obj: unknown): boolean;
     Equals(other: StructuralTypeMaterializerSourceParameters): boolean;
     GetHashCode(): int;
@@ -459,13 +463,15 @@ export interface StructuralTypeMaterializerSourceParameters$instance {
 
 
 export const StructuralTypeMaterializerSourceParameters: {
-    new(StructuralType: ITypeBase, InstanceName: string, ClrType: Type, IsNullable: boolean, QueryTrackingBehavior: Nullable<QueryTrackingBehavior>): StructuralTypeMaterializerSourceParameters;
+    new(StructuralType: ITypeBase, InstanceName: string, ClrType: Type, IsNullable: boolean, QueryTrackingBehavior: Nullable_1<QueryTrackingBehavior>): StructuralTypeMaterializerSourceParameters;
 };
 
 
 export type StructuralTypeMaterializerSourceParameters = StructuralTypeMaterializerSourceParameters$instance;
 
-export interface CollectionResultExpression$instance extends Expression {
+export interface CollectionResultExpression$instance extends Expression, IPrintableExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_CollectionResultExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
     readonly ElementType: Type;
@@ -490,12 +496,12 @@ export interface __CollectionResultExpression$views {
     As_IPrintableExpression(): IPrintableExpression$instance;
 }
 
-export interface CollectionResultExpression$instance extends IPrintableExpression$instance {}
-
 export type CollectionResultExpression = CollectionResultExpression$instance & __CollectionResultExpression$views;
 
 
-export interface CompiledQueryCacheKeyGenerator$instance {
+export interface CompiledQueryCacheKeyGenerator$instance extends ICompiledQueryCacheKeyGenerator$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_CompiledQueryCacheKeyGenerator: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_ICompiledQueryCacheKeyGenerator: never;
 
     readonly Dependencies: CompiledQueryCacheKeyGeneratorDependencies;
@@ -512,12 +518,12 @@ export interface __CompiledQueryCacheKeyGenerator$views {
     As_ICompiledQueryCacheKeyGenerator(): ICompiledQueryCacheKeyGenerator$instance;
 }
 
-export interface CompiledQueryCacheKeyGenerator$instance extends ICompiledQueryCacheKeyGenerator$instance {}
-
 export type CompiledQueryCacheKeyGenerator = CompiledQueryCacheKeyGenerator$instance & __CompiledQueryCacheKeyGenerator$views;
 
 
 export interface CompiledQueryCacheKeyGeneratorDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_CompiledQueryCacheKeyGeneratorDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     CurrentContext: ICurrentDbContext;
@@ -539,6 +545,8 @@ export const CompiledQueryCacheKeyGeneratorDependencies: {
 export type CompiledQueryCacheKeyGeneratorDependencies = CompiledQueryCacheKeyGeneratorDependencies$instance;
 
 export interface EntityQueryRootExpression$instance extends QueryRootExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_EntityQueryRootExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
     readonly CanReduce: boolean;
@@ -566,12 +574,14 @@ export interface __EntityQueryRootExpression$views {
 export type EntityQueryRootExpression = EntityQueryRootExpression$instance & __EntityQueryRootExpression$views;
 
 
-export interface EnumerableExpression$instance extends Expression {
+export interface EnumerableExpression$instance extends Expression, IPrintableExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_EnumerableExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
     readonly IsDistinct: boolean;
     readonly NodeType: ExpressionType;
-    readonly Orderings: IReadOnlyList<OrderingExpression>;
+    readonly Orderings: IReadOnlyList_1<OrderingExpression>;
     readonly Predicate: SqlExpression | undefined;
     readonly Selector: Expression;
     readonly Type: Type;
@@ -596,12 +606,12 @@ export interface __EnumerableExpression$views {
     As_IPrintableExpression(): IPrintableExpression$instance;
 }
 
-export interface EnumerableExpression$instance extends IPrintableExpression$instance {}
-
 export type EnumerableExpression = EnumerableExpression$instance & __EnumerableExpression$views;
 
 
-export interface EvaluatableExpressionFilter$instance {
+export interface EvaluatableExpressionFilter$instance extends IEvaluatableExpressionFilter$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_EvaluatableExpressionFilter: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IEvaluatableExpressionFilter: never;
 
     readonly Dependencies: EvaluatableExpressionFilterDependencies;
@@ -618,15 +628,15 @@ export interface __EvaluatableExpressionFilter$views {
     As_IEvaluatableExpressionFilter(): IEvaluatableExpressionFilter$instance;
 }
 
-export interface EvaluatableExpressionFilter$instance extends IEvaluatableExpressionFilter$instance {}
-
 export type EvaluatableExpressionFilter = EvaluatableExpressionFilter$instance & __EvaluatableExpressionFilter$views;
 
 
 export interface EvaluatableExpressionFilterDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_EvaluatableExpressionFilterDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
-    Plugins: IEnumerable__System_Collections_Generic<IEvaluatableExpressionFilterPlugin>;
+    Plugins: IEnumerable_1<IEvaluatableExpressionFilterPlugin>;
     _Clone_$(): EvaluatableExpressionFilterDependencies;
     Equals(obj: unknown): boolean;
     Equals(other: EvaluatableExpressionFilterDependencies): boolean;
@@ -636,13 +646,15 @@ export interface EvaluatableExpressionFilterDependencies$instance {
 
 
 export const EvaluatableExpressionFilterDependencies: {
-    new(plugins: IEnumerable__System_Collections_Generic<IEvaluatableExpressionFilterPlugin>): EvaluatableExpressionFilterDependencies;
+    new(plugins: IEnumerable_1<IEvaluatableExpressionFilterPlugin>): EvaluatableExpressionFilterDependencies;
 };
 
 
 export type EvaluatableExpressionFilterDependencies = EvaluatableExpressionFilterDependencies$instance;
 
 export interface ExpressionEqualityComparer$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_ExpressionEqualityComparer: never;
+
     readonly __tsonic_iface_System_Collections_Generic_IEqualityComparer_1: never;
 
     Equals(x: Expression, y: Expression): boolean;
@@ -658,19 +670,21 @@ export const ExpressionEqualityComparer: {
 export type ExpressionEqualityComparer = ExpressionEqualityComparer$instance;
 
 export interface ExpressionPrinter$instance extends ExpressionVisitor {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_ExpressionPrinter: never;
+
     Append(value: string): ExpressionPrinter;
     AppendLine(): ExpressionPrinter;
     AppendLine(value: string): ExpressionPrinter;
     AppendLines(value: string, skipFinalNewline?: boolean): ExpressionPrinter;
     GenerateBinaryOperator(expressionType: ExpressionType): string;
     Indent(): IDisposable;
-    PrintExpression(expression: Expression, characterLimit?: Nullable<System_Internal.Int32>): string;
+    PrintExpression(expression: Expression, characterLimit?: Nullable_1<System_Internal.Int32>): string;
     PrintExpressionDebug(expression: Expression): string;
     ToString(): string;
     Visit(expression: Expression): Expression | undefined;
     VisitBinary(binaryExpression: BinaryExpression): Expression;
     VisitBlock(blockExpression: BlockExpression): Expression;
-    VisitCollection<T extends Expression>(items: IReadOnlyCollection<T>, joinAction?: Action<ExpressionPrinter>): void;
+    VisitCollection<T extends Expression>(items: IReadOnlyCollection_1<T>, joinAction?: Action_1<ExpressionPrinter>): void;
     VisitConditional(conditionalExpression: ConditionalExpression): Expression;
     VisitConstant(constantExpression: ConstantExpression): Expression;
     VisitDefault(defaultExpression: DefaultExpression): Expression;
@@ -679,7 +693,7 @@ export interface ExpressionPrinter$instance extends ExpressionVisitor {
     VisitIndex(indexExpression: IndexExpression): Expression;
     VisitInvocation(invocationExpression: InvocationExpression): Expression;
     VisitLabel(labelExpression: LabelExpression): Expression;
-    VisitLambda<T>(lambdaExpression: Expression<T>): Expression;
+    VisitLambda<T>(lambdaExpression: Expression_1<T>): Expression;
     VisitLoop(loopExpression: LoopExpression): Expression;
     VisitMember(memberExpression: MemberExpression): Expression;
     VisitMemberInit(memberInitExpression: MemberInitExpression): Expression;
@@ -703,7 +717,9 @@ export const ExpressionPrinter: {
 
 export type ExpressionPrinter = ExpressionPrinter$instance;
 
-export interface GroupByShaperExpression$instance extends Expression {
+export interface GroupByShaperExpression$instance extends Expression, IPrintableExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_GroupByShaperExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
     readonly GroupingEnumerable: ShapedQueryExpression;
@@ -725,12 +741,12 @@ export interface __GroupByShaperExpression$views {
     As_IPrintableExpression(): IPrintableExpression$instance;
 }
 
-export interface GroupByShaperExpression$instance extends IPrintableExpression$instance {}
-
 export type GroupByShaperExpression = GroupByShaperExpression$instance & __GroupByShaperExpression$views;
 
 
-export interface IncludeExpression$instance extends Expression {
+export interface IncludeExpression$instance extends Expression, IPrintableExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_IncludeExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
     readonly EntityExpression: Expression;
@@ -754,25 +770,25 @@ export interface __IncludeExpression$views {
     As_IPrintableExpression(): IPrintableExpression$instance;
 }
 
-export interface IncludeExpression$instance extends IPrintableExpression$instance {}
-
 export type IncludeExpression = IncludeExpression$instance & __IncludeExpression$views;
 
 
 export interface InlineQueryRootExpression$instance extends QueryRootExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_InlineQueryRootExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
-    readonly Values: IReadOnlyList<Expression>;
+    readonly Values: IReadOnlyList_1<Expression>;
     DetachQueryProvider(): Expression;
     Print(expressionPrinter: ExpressionPrinter): void;
-    Update(values: IReadOnlyList<Expression>): InlineQueryRootExpression;
+    Update(values: IReadOnlyList_1<Expression>): InlineQueryRootExpression;
     VisitChildren(visitor: ExpressionVisitor): Expression;
 }
 
 
 export const InlineQueryRootExpression: {
-    new(asyncQueryProvider: IAsyncQueryProvider, values: IReadOnlyList<Expression>, elementType: Type): InlineQueryRootExpression;
-    new(values: IReadOnlyList<Expression>, elementType: Type): InlineQueryRootExpression;
+    new(asyncQueryProvider: IAsyncQueryProvider, values: IReadOnlyList_1<Expression>, elementType: Type): InlineQueryRootExpression;
+    new(values: IReadOnlyList_1<Expression>, elementType: Type): InlineQueryRootExpression;
 };
 
 
@@ -783,15 +799,17 @@ export interface __InlineQueryRootExpression$views {
 export type InlineQueryRootExpression = InlineQueryRootExpression$instance & __InlineQueryRootExpression$views;
 
 
-export interface JsonQueryExpression$instance extends Expression {
+export interface JsonQueryExpression$instance extends Expression, IPrintableExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_JsonQueryExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
     readonly IsCollection: boolean;
     readonly IsNullable: boolean;
     readonly JsonColumn: ColumnExpression;
-    readonly KeyPropertyMap: IReadOnlyDictionary<IProperty, ColumnExpression> | undefined;
+    readonly KeyPropertyMap: IReadOnlyDictionary_2<IProperty, ColumnExpression> | undefined;
     readonly NodeType: ExpressionType;
-    readonly Path: IReadOnlyList<PathSegment>;
+    readonly Path: IReadOnlyList_1<PathSegment>;
     readonly StructuralType: ITypeBase;
     readonly Type: Type;
     BindCollectionElement(collectionIndexExpression: SqlExpression): JsonQueryExpression;
@@ -801,14 +819,14 @@ export interface JsonQueryExpression$instance extends Expression {
     GetHashCode(): int;
     MakeNullable(): JsonQueryExpression;
     Print(expressionPrinter: ExpressionPrinter): void;
-    Update(jsonColumn: ColumnExpression, keyPropertyMap: IReadOnlyDictionary<IProperty, ColumnExpression>): JsonQueryExpression;
+    Update(jsonColumn: ColumnExpression, keyPropertyMap: IReadOnlyDictionary_2<IProperty, ColumnExpression>): JsonQueryExpression;
     VisitChildren(visitor: ExpressionVisitor): Expression;
 }
 
 
 export const JsonQueryExpression: {
-    new(structuralType: ITypeBase, jsonColumn: ColumnExpression, keyPropertyMap: IReadOnlyDictionary<IProperty, ColumnExpression>, type: Type, collection: boolean): JsonQueryExpression;
-    new(structuralType: ITypeBase, jsonColumn: ColumnExpression, keyPropertyMap: IReadOnlyDictionary<IProperty, ColumnExpression>, path: IReadOnlyList<PathSegment>, type: Type, collection: boolean, nullable: boolean): JsonQueryExpression;
+    new(structuralType: ITypeBase, jsonColumn: ColumnExpression, keyPropertyMap: IReadOnlyDictionary_2<IProperty, ColumnExpression>, type: Type, collection: boolean): JsonQueryExpression;
+    new(structuralType: ITypeBase, jsonColumn: ColumnExpression, keyPropertyMap: IReadOnlyDictionary_2<IProperty, ColumnExpression>, path: IReadOnlyList_1<PathSegment>, type: Type, collection: boolean, nullable: boolean): JsonQueryExpression;
 };
 
 
@@ -816,12 +834,12 @@ export interface __JsonQueryExpression$views {
     As_IPrintableExpression(): IPrintableExpression$instance;
 }
 
-export interface JsonQueryExpression$instance extends IPrintableExpression$instance {}
-
 export type JsonQueryExpression = JsonQueryExpression$instance & __JsonQueryExpression$views;
 
 
-export interface LiftableConstantExpression$instance extends Expression {
+export interface LiftableConstantExpression$instance extends Expression, IPrintableExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_LiftableConstantExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
     readonly NodeType: ExpressionType;
@@ -844,12 +862,12 @@ export interface __LiftableConstantExpression$views {
     As_IPrintableExpression(): IPrintableExpression$instance;
 }
 
-export interface LiftableConstantExpression$instance extends IPrintableExpression$instance {}
-
 export type LiftableConstantExpression = LiftableConstantExpression$instance & __LiftableConstantExpression$views;
 
 
 export interface LiftableConstantExpressionDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_LiftableConstantExpressionDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     _Clone_$(): LiftableConstantExpressionDependencies;
@@ -867,11 +885,13 @@ export const LiftableConstantExpressionDependencies: {
 
 export type LiftableConstantExpressionDependencies = LiftableConstantExpressionDependencies$instance;
 
-export interface LiftableConstantFactory$instance {
+export interface LiftableConstantFactory$instance extends ILiftableConstantFactory$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_LiftableConstantFactory: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_ILiftableConstantFactory: never;
 
     readonly Dependencies: LiftableConstantExpressionDependencies;
-    CreateLiftableConstant(originalValue: unknown, resolverExpression: Expression<Func<MaterializerLiftableConstantContext, unknown>>, variableName: string, type: Type): Expression;
+    CreateLiftableConstant(originalValue: unknown, resolverExpression: Expression_1<Func_2<MaterializerLiftableConstantContext, unknown>>, variableName: string, type: Type): Expression;
 }
 
 
@@ -884,19 +904,19 @@ export interface __LiftableConstantFactory$views {
     As_ILiftableConstantFactory(): ILiftableConstantFactory$instance;
 }
 
-export interface LiftableConstantFactory$instance extends ILiftableConstantFactory$instance {}
-
 export type LiftableConstantFactory = LiftableConstantFactory$instance & __LiftableConstantFactory$views;
 
 
 export interface LiftableConstantProcessor$instance extends ExpressionVisitor {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_LiftableConstantProcessor: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_ILiftableConstantProcessor: never;
 
-    LiftedConstants: IReadOnlyList<ValueTuple<ParameterExpression, Expression>>;
+    LiftedConstants: IReadOnlyList_1<ValueTuple_2<ParameterExpression, Expression>>;
     InlineConstant(liftableConstant: LiftableConstantExpression): ConstantExpression;
     InlineConstants(expression: Expression, supportsPrecompiledQuery: boolean): Expression;
     LiftConstant(liftableConstant: LiftableConstantExpression): ParameterExpression;
-    LiftConstants(expression: Expression, contextParameter: ParameterExpression, variableNames: HashSet<System_Internal.String>): Expression;
+    LiftConstants(expression: Expression, contextParameter: ParameterExpression, variableNames: HashSet_1<System_Internal.String>): Expression;
     VisitBinary(binaryExpression: BinaryExpression): Expression;
     VisitExtension(node: Expression): Expression;
 }
@@ -914,7 +934,9 @@ export interface __LiftableConstantProcessor$views {
 export type LiftableConstantProcessor = LiftableConstantProcessor$instance & __LiftableConstantProcessor$views;
 
 
-export interface MaterializeCollectionNavigationExpression$instance extends Expression {
+export interface MaterializeCollectionNavigationExpression$instance extends Expression, IPrintableExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_MaterializeCollectionNavigationExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
     readonly Navigation: INavigationBase;
@@ -935,12 +957,12 @@ export interface __MaterializeCollectionNavigationExpression$views {
     As_IPrintableExpression(): IPrintableExpression$instance;
 }
 
-export interface MaterializeCollectionNavigationExpression$instance extends IPrintableExpression$instance {}
-
 export type MaterializeCollectionNavigationExpression = MaterializeCollectionNavigationExpression$instance & __MaterializeCollectionNavigationExpression$views;
 
 
 export interface MaterializerLiftableConstantContext$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_MaterializerLiftableConstantContext: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     Dependencies: ShapedQueryCompilingExpressionVisitorDependencies;
@@ -962,7 +984,9 @@ export const MaterializerLiftableConstantContext: {
 
 export type MaterializerLiftableConstantContext = MaterializerLiftableConstantContext$instance;
 
-export interface NavigationExpansionExtensibilityHelper$instance {
+export interface NavigationExpansionExtensibilityHelper$instance extends INavigationExpansionExtensibilityHelper$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_NavigationExpansionExtensibilityHelper: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_INavigationExpansionExtensibilityHelper: never;
 
     readonly Dependencies: NavigationExpansionExtensibilityHelperDependencies;
@@ -981,12 +1005,12 @@ export interface __NavigationExpansionExtensibilityHelper$views {
     As_INavigationExpansionExtensibilityHelper(): INavigationExpansionExtensibilityHelper$instance;
 }
 
-export interface NavigationExpansionExtensibilityHelper$instance extends INavigationExpansionExtensibilityHelper$instance {}
-
 export type NavigationExpansionExtensibilityHelper = NavigationExpansionExtensibilityHelper$instance & __NavigationExpansionExtensibilityHelper$views;
 
 
 export interface NavigationExpansionExtensibilityHelperDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_NavigationExpansionExtensibilityHelperDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     _Clone_$(): NavigationExpansionExtensibilityHelperDependencies;
@@ -1005,6 +1029,8 @@ export const NavigationExpansionExtensibilityHelperDependencies: {
 export type NavigationExpansionExtensibilityHelperDependencies = NavigationExpansionExtensibilityHelperDependencies$instance;
 
 export interface NotParameterizedAttribute$instance extends Attribute {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_NotParameterizedAttribute: never;
+
 }
 
 
@@ -1016,6 +1042,8 @@ export const NotParameterizedAttribute: {
 export type NotParameterizedAttribute = NotParameterizedAttribute$instance;
 
 export interface ParameterQueryRootExpression$instance extends QueryRootExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_ParameterQueryRootExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
     readonly ParameterExpression: ParameterExpression;
@@ -1042,23 +1070,27 @@ export type ParameterQueryRootExpression = ParameterQueryRootExpression$instance
 
 
 export interface ParametersCacheDecorator$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_ParametersCacheDecorator: never;
+
     CanCache: boolean;
-    GetAndDisableCaching(): Dictionary<System_Internal.String, unknown | undefined>;
+    GetAndDisableCaching(): Dictionary_2<System_Internal.String, unknown | undefined>;
     IsNull(parameterName: string): boolean;
 }
 
 
 export const ParametersCacheDecorator: {
-    new(parameters: Dictionary<System_Internal.String, unknown>): ParametersCacheDecorator;
+    new(parameters: Dictionary_2<System_Internal.String, unknown>): ParametersCacheDecorator;
 };
 
 
 export type ParametersCacheDecorator = ParametersCacheDecorator$instance;
 
-export interface ProjectionBindingExpression$instance extends Expression {
+export interface ProjectionBindingExpression$instance extends Expression, IPrintableExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_ProjectionBindingExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
-    readonly Index: Nullable<System_Internal.Int32>;
+    readonly Index: Nullable_1<System_Internal.Int32>;
     readonly NodeType: ExpressionType;
     readonly ProjectionMember: ProjectionMember | undefined;
     readonly QueryExpression: Expression;
@@ -1079,12 +1111,12 @@ export interface __ProjectionBindingExpression$views {
     As_IPrintableExpression(): IPrintableExpression$instance;
 }
 
-export interface ProjectionBindingExpression$instance extends IPrintableExpression$instance {}
-
 export type ProjectionBindingExpression = ProjectionBindingExpression$instance & __ProjectionBindingExpression$views;
 
 
 export interface ProjectionMember$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_ProjectionMember: never;
+
     readonly Last: MemberInfo | undefined;
     Append(member: MemberInfo): ProjectionMember;
     Equals(obj: unknown): boolean;
@@ -1102,6 +1134,8 @@ export const ProjectionMember: {
 export type ProjectionMember = ProjectionMember$instance;
 
 export interface QueryableMethodTranslatingExpressionVisitor$instance extends ExpressionVisitor {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_QueryableMethodTranslatingExpressionVisitor: never;
+
     readonly Dependencies: QueryableMethodTranslatingExpressionVisitorDependencies;
     readonly QueryCompilationContext: QueryCompilationContext;
     get TranslationErrorDetails(): string | undefined;
@@ -1123,7 +1157,7 @@ export interface QueryableMethodTranslatingExpressionVisitor$instance extends Ex
     TranslateElementAtOrDefault(source: ShapedQueryExpression, index: Expression, returnDefault: boolean): ShapedQueryExpression | undefined;
     TranslateExcept(source1: ShapedQueryExpression, source2: ShapedQueryExpression): ShapedQueryExpression | undefined;
     TranslateExecuteDelete(source: ShapedQueryExpression): Expression | undefined;
-    TranslateExecuteUpdate(source: ShapedQueryExpression, setters: IReadOnlyList<QueryableMethodTranslatingExpressionVisitor_ExecuteUpdateSetter>): Expression | undefined;
+    TranslateExecuteUpdate(source: ShapedQueryExpression, setters: IReadOnlyList_1<QueryableMethodTranslatingExpressionVisitor_ExecuteUpdateSetter>): Expression | undefined;
     TranslateFirstOrDefault(source: ShapedQueryExpression, predicate: LambdaExpression, returnType: Type, returnDefault: boolean): ShapedQueryExpression | undefined;
     TranslateGroupBy(source: ShapedQueryExpression, keySelector: LambdaExpression, elementSelector: LambdaExpression, resultSelector: LambdaExpression): ShapedQueryExpression | undefined;
     TranslateGroupJoin(outer: ShapedQueryExpression, inner: ShapedQueryExpression, outerKeySelector: LambdaExpression, innerKeySelector: LambdaExpression, resultSelector: LambdaExpression): ShapedQueryExpression | undefined;
@@ -1167,6 +1201,8 @@ export const QueryableMethodTranslatingExpressionVisitor: (abstract new(dependen
 export type QueryableMethodTranslatingExpressionVisitor = QueryableMethodTranslatingExpressionVisitor$instance;
 
 export interface QueryableMethodTranslatingExpressionVisitor_ExecuteUpdateSetter$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_QueryableMethodTranslatingExpressionVisitor_ExecuteUpdateSetter: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     PropertySelector: LambdaExpression;
@@ -1188,6 +1224,8 @@ export const QueryableMethodTranslatingExpressionVisitor_ExecuteUpdateSetter: {
 export type QueryableMethodTranslatingExpressionVisitor_ExecuteUpdateSetter = QueryableMethodTranslatingExpressionVisitor_ExecuteUpdateSetter$instance;
 
 export interface QueryableMethodTranslatingExpressionVisitorDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_QueryableMethodTranslatingExpressionVisitorDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     _Clone_$(): QueryableMethodTranslatingExpressionVisitorDependencies;
@@ -1206,12 +1244,14 @@ export const QueryableMethodTranslatingExpressionVisitorDependencies: {
 export type QueryableMethodTranslatingExpressionVisitorDependencies = QueryableMethodTranslatingExpressionVisitorDependencies$instance;
 
 export interface QueryCompilationContext$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_QueryCompilationContext: never;
+
     readonly ContextOptions: IDbContextOptions;
     readonly ContextType: Type;
     readonly Dependencies: QueryCompilationContextDependencies;
     IgnoreAutoIncludes: boolean;
-    get IgnoredQueryFilters(): HashSet<System_Internal.String> | undefined;
-    set IgnoredQueryFilters(value: HashSet<System_Internal.String> | undefined);
+    get IgnoredQueryFilters(): HashSet_1<System_Internal.String> | undefined;
+    set IgnoredQueryFilters(value: HashSet_1<System_Internal.String> | undefined);
     IgnoreQueryFilters: boolean;
     readonly IsAsync: boolean;
     readonly IsBuffering: boolean;
@@ -1220,10 +1260,10 @@ export interface QueryCompilationContext$instance {
     readonly Model: IModel;
     QueryTrackingBehavior: QueryTrackingBehavior;
     readonly SupportsPrecompiledQuery: boolean;
-    readonly Tags: ISet<System_Internal.String>;
+    readonly Tags: ISet_1<System_Internal.String>;
     AddTag(tag: string): void;
-    CreateQueryExecutor<TResult>(query: Expression): Func<QueryContext, TResult>;
-    CreateQueryExecutorExpression<TResult>(query: Expression): Expression<Func<QueryContext, TResult>>;
+    CreateQueryExecutor<TResult>(query: Expression): Func_2<QueryContext, TResult>;
+    CreateQueryExecutorExpression<TResult>(query: Expression): Expression_1<Func_2<QueryContext, TResult>>;
     RegisterRuntimeParameter(name: string, valueExtractor: LambdaExpression): QueryParameterExpression;
 }
 
@@ -1239,6 +1279,8 @@ export const QueryCompilationContext: {
 export type QueryCompilationContext = QueryCompilationContext$instance;
 
 export interface QueryCompilationContextDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_QueryCompilationContextDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     readonly Context: DbContext;
@@ -1271,6 +1313,8 @@ export const QueryCompilationContextDependencies: {
 export type QueryCompilationContextDependencies = QueryCompilationContextDependencies$instance;
 
 export interface QueryContext$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_QueryContext: never;
+
     CancellationToken: CancellationToken;
     readonly CommandLogger: IDiagnosticsLogger_1<DbLoggerCategory_Database_Command> | IRelationalCommandDiagnosticsLogger;
     readonly ConcurrencyDetector: IConcurrencyDetector;
@@ -1278,7 +1322,7 @@ export interface QueryContext$instance {
     readonly Dependencies: QueryContextDependencies;
     readonly ExceptionDetector: IExceptionDetector;
     readonly ExecutionStrategy: IExecutionStrategy;
-    readonly Parameters: Dictionary<System_Internal.String, unknown | undefined>;
+    readonly Parameters: Dictionary_2<System_Internal.String, unknown | undefined>;
     readonly QueryLogger: IDiagnosticsLogger_1<DbLoggerCategory_Query>;
     InitializeStateManager(standAlone?: boolean): void;
     SetNavigationIsLoaded(entity: unknown, navigation: INavigationBase): void;
@@ -1294,6 +1338,8 @@ export const QueryContext: (abstract new(dependencies: QueryContextDependencies)
 export type QueryContext = QueryContext$instance;
 
 export interface QueryContextDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_QueryContextDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     CommandLogger: IDiagnosticsLogger_1<DbLoggerCategory_Database_Command>;
@@ -1318,13 +1364,15 @@ export const QueryContextDependencies: {
 
 export type QueryContextDependencies = QueryContextDependencies$instance;
 
-export interface QueryParameterExpression$instance extends Expression {
+export interface QueryParameterExpression$instance extends Expression, IPrintableExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_QueryParameterExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
     readonly IsNonNullableReferenceType: boolean;
     readonly Name: string;
     readonly NodeType: ExpressionType;
-    readonly TranslationMode: Nullable<ParameterTranslationMode>;
+    readonly TranslationMode: Nullable_1<ParameterTranslationMode>;
     readonly Type: Type;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
@@ -1336,7 +1384,7 @@ export interface QueryParameterExpression$instance extends Expression {
 export const QueryParameterExpression: {
     new(name: string, type: Type): QueryParameterExpression;
     new(name: string, type: Type, translationMode: ParameterTranslationMode): QueryParameterExpression;
-    new(name: string, type: Type, translationMode: Nullable<ParameterTranslationMode>, isNonNullableReferenceType: boolean): QueryParameterExpression;
+    new(name: string, type: Type, translationMode: Nullable_1<ParameterTranslationMode>, isNonNullableReferenceType: boolean): QueryParameterExpression;
 };
 
 
@@ -1344,12 +1392,12 @@ export interface __QueryParameterExpression$views {
     As_IPrintableExpression(): IPrintableExpression$instance;
 }
 
-export interface QueryParameterExpression$instance extends IPrintableExpression$instance {}
-
 export type QueryParameterExpression = QueryParameterExpression$instance & __QueryParameterExpression$views;
 
 
-export interface QueryRootExpression$instance extends Expression {
+export interface QueryRootExpression$instance extends Expression, IPrintableExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_QueryRootExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
     readonly CanReduce: boolean;
@@ -1373,12 +1421,12 @@ export interface __QueryRootExpression$views {
     As_IPrintableExpression(): IPrintableExpression$instance;
 }
 
-export interface QueryRootExpression$instance extends IPrintableExpression$instance {}
-
 export type QueryRootExpression = QueryRootExpression$instance & __QueryRootExpression$views;
 
 
 export interface QueryRootProcessor$instance extends ExpressionVisitor {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_QueryRootProcessor: never;
+
     ShouldConvertToInlineQueryRoot(expression: Expression): boolean;
     ShouldConvertToParameterQueryRoot(queryParameterExpression: QueryParameterExpression): boolean;
     VisitMethodCall(methodCallExpression: MethodCallExpression): Expression;
@@ -1393,11 +1441,13 @@ export const QueryRootProcessor: {
 export type QueryRootProcessor = QueryRootProcessor$instance;
 
 export interface QuerySqlGenerator$instance extends SqlExpressionVisitor {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_QuerySqlGenerator: never;
+
     readonly AliasSeparator: string;
     readonly Dependencies: QuerySqlGeneratorDependencies;
     readonly Sql: IRelationalCommandBuilder;
     CheckComposableSql(sql: string): void;
-    CheckComposableSqlTrimmed(sql: ReadOnlySpan<System_Internal.Char>): void;
+    CheckComposableSqlTrimmed(sql: ReadOnlySpan_1<System_Internal.Char>): void;
     GenerateEmptyProjection(selectExpression: SelectExpression): void;
     GenerateExists(existsExpression: ExistsExpression, negated: boolean): void;
     GenerateFrom(selectExpression: SelectExpression): void;
@@ -1411,7 +1461,7 @@ export interface QuerySqlGenerator$instance extends SqlExpressionVisitor {
     GenerateSetOperation(setOperation: SetOperationBase): void;
     GenerateSetOperationOperand(setOperation: SetOperationBase, operand: SelectExpression): void;
     GenerateTagsHeaderComment(selectExpression: SelectExpression): void;
-    GenerateTagsHeaderComment(tags: ISet<System_Internal.String>): void;
+    GenerateTagsHeaderComment(tags: ISet_1<System_Internal.String>): void;
     GenerateTop(selectExpression: SelectExpression): void;
     GenerateValues(valuesExpression: ValuesExpression): void;
     GetCommand(queryExpression: Expression): IRelationalCommand;
@@ -1466,6 +1516,8 @@ export const QuerySqlGenerator: {
 export type QuerySqlGenerator = QuerySqlGenerator$instance;
 
 export interface QuerySqlGeneratorDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_QuerySqlGeneratorDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     RelationalCommandBuilderFactory: IRelationalCommandBuilderFactory;
@@ -1486,6 +1538,8 @@ export const QuerySqlGeneratorDependencies: {
 export type QuerySqlGeneratorDependencies = QuerySqlGeneratorDependencies$instance;
 
 export interface QueryTranslationPostprocessor$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_QueryTranslationPostprocessor: never;
+
     readonly Dependencies: QueryTranslationPostprocessorDependencies;
     readonly QueryCompilationContext: QueryCompilationContext;
     Process(query: Expression): Expression;
@@ -1500,6 +1554,8 @@ export const QueryTranslationPostprocessor: {
 export type QueryTranslationPostprocessor = QueryTranslationPostprocessor$instance;
 
 export interface QueryTranslationPostprocessorDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_QueryTranslationPostprocessorDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     _Clone_$(): QueryTranslationPostprocessorDependencies;
@@ -1518,6 +1574,8 @@ export const QueryTranslationPostprocessorDependencies: {
 export type QueryTranslationPostprocessorDependencies = QueryTranslationPostprocessorDependencies$instance;
 
 export interface QueryTranslationPreprocessor$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_QueryTranslationPreprocessor: never;
+
     readonly Dependencies: QueryTranslationPreprocessorDependencies;
     readonly IsEfConstantSupported: boolean;
     readonly QueryCompilationContext: QueryCompilationContext;
@@ -1535,6 +1593,8 @@ export const QueryTranslationPreprocessor: {
 export type QueryTranslationPreprocessor = QueryTranslationPreprocessor$instance;
 
 export interface QueryTranslationPreprocessorDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_QueryTranslationPreprocessorDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     EvaluatableExpressionFilter: IEvaluatableExpressionFilter;
@@ -1555,12 +1615,14 @@ export const QueryTranslationPreprocessorDependencies: {
 
 export type QueryTranslationPreprocessorDependencies = QueryTranslationPreprocessorDependencies$instance;
 
-export interface RelationalAggregateMethodCallTranslatorProvider$instance {
+export interface RelationalAggregateMethodCallTranslatorProvider$instance extends IAggregateMethodCallTranslatorProvider$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalAggregateMethodCallTranslatorProvider: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IAggregateMethodCallTranslatorProvider: never;
 
     readonly Dependencies: RelationalAggregateMethodCallTranslatorProviderDependencies;
-    AddTranslators(translators: IEnumerable__System_Collections_Generic<IAggregateMethodCallTranslator>): void;
-    Translate(model: IModel, method: MethodInfo, source: EnumerableExpression, arguments: IReadOnlyList<SqlExpression>, logger: IDiagnosticsLogger_1<DbLoggerCategory_Query>): SqlExpression | undefined;
+    AddTranslators(translators: IEnumerable_1<IAggregateMethodCallTranslator>): void;
+    Translate(model: IModel, method: MethodInfo, source: EnumerableExpression, arguments: IReadOnlyList_1<SqlExpression>, logger: IDiagnosticsLogger_1<DbLoggerCategory_Query>): SqlExpression | undefined;
 }
 
 
@@ -1573,15 +1635,15 @@ export interface __RelationalAggregateMethodCallTranslatorProvider$views {
     As_IAggregateMethodCallTranslatorProvider(): IAggregateMethodCallTranslatorProvider$instance;
 }
 
-export interface RelationalAggregateMethodCallTranslatorProvider$instance extends IAggregateMethodCallTranslatorProvider$instance {}
-
 export type RelationalAggregateMethodCallTranslatorProvider = RelationalAggregateMethodCallTranslatorProvider$instance & __RelationalAggregateMethodCallTranslatorProvider$views;
 
 
 export interface RelationalAggregateMethodCallTranslatorProviderDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalAggregateMethodCallTranslatorProviderDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
-    Plugins: IEnumerable__System_Collections_Generic<IAggregateMethodCallTranslatorPlugin>;
+    Plugins: IEnumerable_1<IAggregateMethodCallTranslatorPlugin>;
     RelationalTypeMappingSource: IRelationalTypeMappingSource;
     SqlExpressionFactory: ISqlExpressionFactory;
     _Clone_$(): RelationalAggregateMethodCallTranslatorProviderDependencies;
@@ -1593,13 +1655,15 @@ export interface RelationalAggregateMethodCallTranslatorProviderDependencies$ins
 
 
 export const RelationalAggregateMethodCallTranslatorProviderDependencies: {
-    new(sqlExpressionFactory: ISqlExpressionFactory, plugins: IEnumerable__System_Collections_Generic<IAggregateMethodCallTranslatorPlugin>, typeMappingSource: IRelationalTypeMappingSource): RelationalAggregateMethodCallTranslatorProviderDependencies;
+    new(sqlExpressionFactory: ISqlExpressionFactory, plugins: IEnumerable_1<IAggregateMethodCallTranslatorPlugin>, typeMappingSource: IRelationalTypeMappingSource): RelationalAggregateMethodCallTranslatorProviderDependencies;
 };
 
 
 export type RelationalAggregateMethodCallTranslatorProviderDependencies = RelationalAggregateMethodCallTranslatorProviderDependencies$instance;
 
-export interface RelationalCollectionShaperExpression$instance extends Expression {
+export interface RelationalCollectionShaperExpression$instance extends Expression, IPrintableExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalCollectionShaperExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
     readonly ElementType: Type;
@@ -1607,11 +1671,11 @@ export interface RelationalCollectionShaperExpression$instance extends Expressio
     readonly Navigation: INavigationBase | undefined;
     readonly NodeType: ExpressionType;
     readonly OuterIdentifier: Expression;
-    readonly OuterIdentifierValueComparers: IReadOnlyList<ValueComparer>;
+    readonly OuterIdentifierValueComparers: IReadOnlyList_1<ValueComparer>;
     readonly ParentIdentifier: Expression;
-    readonly ParentIdentifierValueComparers: IReadOnlyList<ValueComparer>;
+    readonly ParentIdentifierValueComparers: IReadOnlyList_1<ValueComparer>;
     readonly SelfIdentifier: Expression;
-    readonly SelfIdentifierValueComparers: IReadOnlyList<ValueComparer>;
+    readonly SelfIdentifierValueComparers: IReadOnlyList_1<ValueComparer>;
     readonly Type: Type;
     Update(parentIdentifier: Expression, outerIdentifier: Expression, selfIdentifier: Expression, innerShaper: Expression): RelationalCollectionShaperExpression;
     VisitChildren(visitor: ExpressionVisitor): Expression;
@@ -1619,7 +1683,7 @@ export interface RelationalCollectionShaperExpression$instance extends Expressio
 
 
 export const RelationalCollectionShaperExpression: {
-    new(parentIdentifier: Expression, outerIdentifier: Expression, selfIdentifier: Expression, parentIdentifierValueComparers: IReadOnlyList<ValueComparer>, outerIdentifierValueComparers: IReadOnlyList<ValueComparer>, selfIdentifierValueComparers: IReadOnlyList<ValueComparer>, innerShaper: Expression, navigation: INavigationBase, elementType: Type): RelationalCollectionShaperExpression;
+    new(parentIdentifier: Expression, outerIdentifier: Expression, selfIdentifier: Expression, parentIdentifierValueComparers: IReadOnlyList_1<ValueComparer>, outerIdentifierValueComparers: IReadOnlyList_1<ValueComparer>, selfIdentifierValueComparers: IReadOnlyList_1<ValueComparer>, innerShaper: Expression, navigation: INavigationBase, elementType: Type): RelationalCollectionShaperExpression;
 };
 
 
@@ -1627,12 +1691,12 @@ export interface __RelationalCollectionShaperExpression$views {
     As_IPrintableExpression(): IPrintableExpression$instance;
 }
 
-export interface RelationalCollectionShaperExpression$instance extends IPrintableExpression$instance {}
-
 export type RelationalCollectionShaperExpression = RelationalCollectionShaperExpression$instance & __RelationalCollectionShaperExpression$views;
 
 
 export interface RelationalCompiledQueryCacheKeyGenerator$instance extends CompiledQueryCacheKeyGenerator$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalCompiledQueryCacheKeyGenerator: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_ICompiledQueryCacheKeyGenerator: never;
 
     readonly RelationalDependencies: RelationalCompiledQueryCacheKeyGeneratorDependencies;
@@ -1653,6 +1717,8 @@ export type RelationalCompiledQueryCacheKeyGenerator = RelationalCompiledQueryCa
 
 
 export interface RelationalCompiledQueryCacheKeyGeneratorDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalCompiledQueryCacheKeyGeneratorDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     ContextOptions: IDbContextOptions;
@@ -1672,6 +1738,8 @@ export const RelationalCompiledQueryCacheKeyGeneratorDependencies: {
 export type RelationalCompiledQueryCacheKeyGeneratorDependencies = RelationalCompiledQueryCacheKeyGeneratorDependencies$instance;
 
 export interface RelationalEvaluatableExpressionFilter$instance extends EvaluatableExpressionFilter$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalEvaluatableExpressionFilter: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IEvaluatableExpressionFilter: never;
 
     readonly RelationalDependencies: RelationalEvaluatableExpressionFilterDependencies;
@@ -1692,6 +1760,8 @@ export type RelationalEvaluatableExpressionFilter = RelationalEvaluatableExpress
 
 
 export interface RelationalEvaluatableExpressionFilterDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalEvaluatableExpressionFilterDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     _Clone_$(): RelationalEvaluatableExpressionFilterDependencies;
@@ -1709,12 +1779,14 @@ export const RelationalEvaluatableExpressionFilterDependencies: {
 
 export type RelationalEvaluatableExpressionFilterDependencies = RelationalEvaluatableExpressionFilterDependencies$instance;
 
-export interface RelationalGroupByResultExpression$instance extends Expression {
+export interface RelationalGroupByResultExpression$instance extends Expression, IPrintableExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalGroupByResultExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
     readonly ElementShaper: Expression;
     readonly KeyIdentifier: Expression;
-    readonly KeyIdentifierValueComparers: IReadOnlyList<ValueComparer>;
+    readonly KeyIdentifierValueComparers: IReadOnlyList_1<ValueComparer>;
     readonly KeyShaper: Expression;
     readonly NodeType: ExpressionType;
     readonly Type: Type;
@@ -1724,7 +1796,7 @@ export interface RelationalGroupByResultExpression$instance extends Expression {
 
 
 export const RelationalGroupByResultExpression: {
-    new(keyIdentifier: Expression, keyIdentifierValueComparers: IReadOnlyList<ValueComparer>, keyShaper: Expression, elementShaper: Expression): RelationalGroupByResultExpression;
+    new(keyIdentifier: Expression, keyIdentifierValueComparers: IReadOnlyList_1<ValueComparer>, keyShaper: Expression, elementShaper: Expression): RelationalGroupByResultExpression;
 };
 
 
@@ -1732,12 +1804,12 @@ export interface __RelationalGroupByResultExpression$views {
     As_IPrintableExpression(): IPrintableExpression$instance;
 }
 
-export interface RelationalGroupByResultExpression$instance extends IPrintableExpression$instance {}
-
 export type RelationalGroupByResultExpression = RelationalGroupByResultExpression$instance & __RelationalGroupByResultExpression$views;
 
 
 export interface RelationalGroupByShaperExpression$instance extends GroupByShaperExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalGroupByShaperExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
     readonly ElementSelector: Expression;
@@ -1759,6 +1831,8 @@ export type RelationalGroupByShaperExpression = RelationalGroupByShaperExpressio
 
 
 export interface RelationalLiftableConstantExpressionDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalLiftableConstantExpressionDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     _Clone_$(): RelationalLiftableConstantExpressionDependencies;
@@ -1777,11 +1851,13 @@ export const RelationalLiftableConstantExpressionDependencies: {
 export type RelationalLiftableConstantExpressionDependencies = RelationalLiftableConstantExpressionDependencies$instance;
 
 export interface RelationalLiftableConstantFactory$instance extends LiftableConstantFactory$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalLiftableConstantFactory: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_ILiftableConstantFactory: never;
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IRelationalLiftableConstantFactory: never;
 
     readonly RelationalDependencies: RelationalLiftableConstantExpressionDependencies;
-    CreateLiftableConstant(originalValue: unknown, resolverExpression: Expression<Func<MaterializerLiftableConstantContext, unknown>>, variableName: string, type: Type): Expression;
+    CreateLiftableConstant(originalValue: unknown, resolverExpression: Expression_1<Func_2<MaterializerLiftableConstantContext, unknown>>, variableName: string, type: Type): Expression;
 }
 
 
@@ -1799,11 +1875,13 @@ export type RelationalLiftableConstantFactory = RelationalLiftableConstantFactor
 
 
 export interface RelationalLiftableConstantProcessor$instance extends LiftableConstantProcessor$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalLiftableConstantProcessor: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_ILiftableConstantProcessor: never;
 
     InlineConstant(liftableConstant: LiftableConstantExpression): ConstantExpression;
     InlineConstants(expression: Expression, supportsPrecompiledQuery: boolean): Expression;
-    LiftConstants(expression: Expression, contextParameter: ParameterExpression, variableNames: HashSet<System_Internal.String>): Expression;
+    LiftConstants(expression: Expression, contextParameter: ParameterExpression, variableNames: HashSet_1<System_Internal.String>): Expression;
 }
 
 
@@ -1820,6 +1898,8 @@ export type RelationalLiftableConstantProcessor = RelationalLiftableConstantProc
 
 
 export interface RelationalMaterializerLiftableConstantContext$instance extends MaterializerLiftableConstantContext {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalMaterializerLiftableConstantContext: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     CommandBuilderDependencies: RelationalCommandBuilderDependencies;
@@ -1845,11 +1925,13 @@ export const RelationalMaterializerLiftableConstantContext: {
 
 export type RelationalMaterializerLiftableConstantContext = RelationalMaterializerLiftableConstantContext$instance;
 
-export interface RelationalMemberTranslatorProvider$instance {
+export interface RelationalMemberTranslatorProvider$instance extends IMemberTranslatorProvider$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalMemberTranslatorProvider: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IMemberTranslatorProvider: never;
 
     readonly Dependencies: RelationalMemberTranslatorProviderDependencies;
-    AddTranslators(translators: IEnumerable__System_Collections_Generic<IMemberTranslator>): void;
+    AddTranslators(translators: IEnumerable_1<IMemberTranslator>): void;
     Translate(instance: SqlExpression, member: MemberInfo, returnType: Type, logger: IDiagnosticsLogger_1<DbLoggerCategory_Query>): SqlExpression | undefined;
 }
 
@@ -1863,15 +1945,15 @@ export interface __RelationalMemberTranslatorProvider$views {
     As_IMemberTranslatorProvider(): IMemberTranslatorProvider$instance;
 }
 
-export interface RelationalMemberTranslatorProvider$instance extends IMemberTranslatorProvider$instance {}
-
 export type RelationalMemberTranslatorProvider = RelationalMemberTranslatorProvider$instance & __RelationalMemberTranslatorProvider$views;
 
 
 export interface RelationalMemberTranslatorProviderDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalMemberTranslatorProviderDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
-    Plugins: IEnumerable__System_Collections_Generic<IMemberTranslatorPlugin>;
+    Plugins: IEnumerable_1<IMemberTranslatorPlugin>;
     SqlExpressionFactory: ISqlExpressionFactory;
     _Clone_$(): RelationalMemberTranslatorProviderDependencies;
     Equals(obj: unknown): boolean;
@@ -1882,18 +1964,20 @@ export interface RelationalMemberTranslatorProviderDependencies$instance {
 
 
 export const RelationalMemberTranslatorProviderDependencies: {
-    new(sqlExpressionFactory: ISqlExpressionFactory, plugins: IEnumerable__System_Collections_Generic<IMemberTranslatorPlugin>): RelationalMemberTranslatorProviderDependencies;
+    new(sqlExpressionFactory: ISqlExpressionFactory, plugins: IEnumerable_1<IMemberTranslatorPlugin>): RelationalMemberTranslatorProviderDependencies;
 };
 
 
 export type RelationalMemberTranslatorProviderDependencies = RelationalMemberTranslatorProviderDependencies$instance;
 
-export interface RelationalMethodCallTranslatorProvider$instance {
+export interface RelationalMethodCallTranslatorProvider$instance extends IMethodCallTranslatorProvider$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalMethodCallTranslatorProvider: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IMethodCallTranslatorProvider: never;
 
     readonly Dependencies: RelationalMethodCallTranslatorProviderDependencies;
-    AddTranslators(translators: IEnumerable__System_Collections_Generic<IMethodCallTranslator>): void;
-    Translate(model: IModel, instance: SqlExpression, method: MethodInfo, arguments: IReadOnlyList<SqlExpression>, logger: IDiagnosticsLogger_1<DbLoggerCategory_Query>): SqlExpression | undefined;
+    AddTranslators(translators: IEnumerable_1<IMethodCallTranslator>): void;
+    Translate(model: IModel, instance: SqlExpression, method: MethodInfo, arguments: IReadOnlyList_1<SqlExpression>, logger: IDiagnosticsLogger_1<DbLoggerCategory_Query>): SqlExpression | undefined;
 }
 
 
@@ -1906,15 +1990,15 @@ export interface __RelationalMethodCallTranslatorProvider$views {
     As_IMethodCallTranslatorProvider(): IMethodCallTranslatorProvider$instance;
 }
 
-export interface RelationalMethodCallTranslatorProvider$instance extends IMethodCallTranslatorProvider$instance {}
-
 export type RelationalMethodCallTranslatorProvider = RelationalMethodCallTranslatorProvider$instance & __RelationalMethodCallTranslatorProvider$views;
 
 
 export interface RelationalMethodCallTranslatorProviderDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalMethodCallTranslatorProviderDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
-    Plugins: IEnumerable__System_Collections_Generic<IMethodCallTranslatorPlugin>;
+    Plugins: IEnumerable_1<IMethodCallTranslatorPlugin>;
     RelationalTypeMappingSource: IRelationalTypeMappingSource;
     SqlExpressionFactory: ISqlExpressionFactory;
     _Clone_$(): RelationalMethodCallTranslatorProviderDependencies;
@@ -1926,18 +2010,20 @@ export interface RelationalMethodCallTranslatorProviderDependencies$instance {
 
 
 export const RelationalMethodCallTranslatorProviderDependencies: {
-    new(sqlExpressionFactory: ISqlExpressionFactory, plugins: IEnumerable__System_Collections_Generic<IMethodCallTranslatorPlugin>, typeMappingSource: IRelationalTypeMappingSource): RelationalMethodCallTranslatorProviderDependencies;
+    new(sqlExpressionFactory: ISqlExpressionFactory, plugins: IEnumerable_1<IMethodCallTranslatorPlugin>, typeMappingSource: IRelationalTypeMappingSource): RelationalMethodCallTranslatorProviderDependencies;
 };
 
 
 export type RelationalMethodCallTranslatorProviderDependencies = RelationalMethodCallTranslatorProviderDependencies$instance;
 
 export interface RelationalParameterBasedSqlProcessor$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalParameterBasedSqlProcessor: never;
+
     readonly Dependencies: RelationalParameterBasedSqlProcessorDependencies;
     readonly Parameters: RelationalParameterBasedSqlProcessorParameters;
     ExpandFromSqlParameter(queryExpression: Expression, Decorator: ParametersCacheDecorator): Expression;
-    Optimize(queryExpression: Expression, parametersValues: IReadOnlyDictionary<System_Internal.String, unknown>, canCache: boolean): Expression;
-    Process(queryExpression: Expression, parameters: Dictionary<System_Internal.String, unknown>, canCache: boolean): Expression;
+    Optimize(queryExpression: Expression, parametersValues: IReadOnlyDictionary_2<System_Internal.String, unknown>, canCache: boolean): Expression;
+    Process(queryExpression: Expression, parameters: Dictionary_2<System_Internal.String, unknown>, canCache: boolean): Expression;
     Process(queryExpression: Expression, parametersDecorator: ParametersCacheDecorator): Expression;
     ProcessSqlNullability(queryExpression: Expression, Decorator: ParametersCacheDecorator): Expression;
 }
@@ -1951,6 +2037,8 @@ export const RelationalParameterBasedSqlProcessor: {
 export type RelationalParameterBasedSqlProcessor = RelationalParameterBasedSqlProcessor$instance;
 
 export interface RelationalParameterBasedSqlProcessorDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalParameterBasedSqlProcessorDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     ParameterNameGeneratorFactory: IParameterNameGeneratorFactory;
@@ -1973,6 +2061,8 @@ export const RelationalParameterBasedSqlProcessorDependencies: {
 export type RelationalParameterBasedSqlProcessorDependencies = RelationalParameterBasedSqlProcessorDependencies$instance;
 
 export interface RelationalParameterBasedSqlProcessorParameters$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalParameterBasedSqlProcessorParameters: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     CollectionParameterTranslationMode: ParameterTranslationMode;
@@ -1993,6 +2083,8 @@ export const RelationalParameterBasedSqlProcessorParameters: {
 export type RelationalParameterBasedSqlProcessorParameters = RelationalParameterBasedSqlProcessorParameters$instance;
 
 export interface RelationalQueryableMethodTranslatingExpressionVisitor$instance extends QueryableMethodTranslatingExpressionVisitor {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalQueryableMethodTranslatingExpressionVisitor: never;
+
     readonly RelationalDependencies: RelationalQueryableMethodTranslatingExpressionVisitorDependencies;
     CreateSelect(entityType: IEntityType): SelectExpression;
     CreateSelect(jsonQueryExpression: JsonQueryExpression, tableExpressionBase: TableExpressionBase, identifierColumnName: string, identifierColumnType: Type, identifierColumnTypeMapping: RelationalTypeMapping): SelectExpression;
@@ -2018,8 +2110,8 @@ export interface RelationalQueryableMethodTranslatingExpressionVisitor$instance
     TranslateExcept(source1: ShapedQueryExpression, source2: ShapedQueryExpression): ShapedQueryExpression;
     TranslateExecuteDelete(source: ShapedQueryExpression): DeleteExpression | undefined;
     TranslateExecuteDelete(source: ShapedQueryExpression): Expression | undefined;
-    TranslateExecuteUpdate(source: ShapedQueryExpression, setters: IReadOnlyList<QueryableMethodTranslatingExpressionVisitor_ExecuteUpdateSetter>): UpdateExpression | undefined;
-    TranslateExecuteUpdate(source: ShapedQueryExpression, setters: IReadOnlyList<QueryableMethodTranslatingExpressionVisitor_ExecuteUpdateSetter>): Expression | undefined;
+    TranslateExecuteUpdate(source: ShapedQueryExpression, setters: IReadOnlyList_1<QueryableMethodTranslatingExpressionVisitor_ExecuteUpdateSetter>): UpdateExpression | undefined;
+    TranslateExecuteUpdate(source: ShapedQueryExpression, setters: IReadOnlyList_1<QueryableMethodTranslatingExpressionVisitor_ExecuteUpdateSetter>): Expression | undefined;
     TranslateExpression(expression: Expression, applyDefaultTypeMapping?: boolean): SqlExpression | undefined;
     TranslateFirstOrDefault(source: ShapedQueryExpression, predicate: LambdaExpression, returnType: Type, returnDefault: boolean): ShapedQueryExpression | undefined;
     TranslateGroupBy(source: ShapedQueryExpression, keySelector: LambdaExpression, elementSelector: LambdaExpression, resultSelector: LambdaExpression): ShapedQueryExpression | undefined;
@@ -2053,7 +2145,7 @@ export interface RelationalQueryableMethodTranslatingExpressionVisitor$instance
     TranslateUnion(source1: ShapedQueryExpression, source2: ShapedQueryExpression): ShapedQueryExpression;
     TranslateWhere(source: ShapedQueryExpression, predicate: LambdaExpression): ShapedQueryExpression | undefined;
     TrySerializeScalarToJson(target: JsonScalarExpression, value: SqlExpression, jsonValue: SqlExpression): boolean;
-    TryTranslateSetters(source: ShapedQueryExpression, setters: IReadOnlyList<QueryableMethodTranslatingExpressionVisitor_ExecuteUpdateSetter>, columnSetters: IReadOnlyList<ColumnValueSetter>, targetTable: TableExpressionBase): boolean;
+    TryTranslateSetters(source: ShapedQueryExpression, setters: IReadOnlyList_1<QueryableMethodTranslatingExpressionVisitor_ExecuteUpdateSetter>, columnSetters: IReadOnlyList_1<ColumnValueSetter>, targetTable: TableExpressionBase): boolean;
     VisitExtension(extensionExpression: Expression): Expression;
     VisitMethodCall(methodCallExpression: MethodCallExpression): Expression;
 }
@@ -2069,6 +2161,8 @@ export const RelationalQueryableMethodTranslatingExpressionVisitor: {
 export type RelationalQueryableMethodTranslatingExpressionVisitor = RelationalQueryableMethodTranslatingExpressionVisitor$instance;
 
 export interface RelationalQueryableMethodTranslatingExpressionVisitorDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalQueryableMethodTranslatingExpressionVisitorDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     Model: IModel;
@@ -2091,7 +2185,9 @@ export const RelationalQueryableMethodTranslatingExpressionVisitorDependencies:
 export type RelationalQueryableMethodTranslatingExpressionVisitorDependencies = RelationalQueryableMethodTranslatingExpressionVisitorDependencies$instance;
 
 export interface RelationalQueryCompilationContext$instance extends QueryCompilationContext {
-    QuerySplittingBehavior: Nullable<QuerySplittingBehavior>;
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalQueryCompilationContext: never;
+
+    QuerySplittingBehavior: Nullable_1<QuerySplittingBehavior>;
     readonly RelationalDependencies: RelationalQueryCompilationContextDependencies;
     readonly SqlAliasManager: SqlAliasManager;
 }
@@ -2106,6 +2202,8 @@ export const RelationalQueryCompilationContext: {
 export type RelationalQueryCompilationContext = RelationalQueryCompilationContext$instance;
 
 export interface RelationalQueryCompilationContextDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalQueryCompilationContextDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     SqlAliasManagerFactory: ISqlAliasManagerFactory;
@@ -2125,6 +2223,8 @@ export const RelationalQueryCompilationContextDependencies: {
 export type RelationalQueryCompilationContextDependencies = RelationalQueryCompilationContextDependencies$instance;
 
 export interface RelationalQueryContext$instance extends QueryContext {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalQueryContext: never;
+
     readonly CommandLogger: IDiagnosticsLogger_1<DbLoggerCategory_Database_Command> | IRelationalCommandDiagnosticsLogger;
     readonly Connection: IRelationalConnection;
     readonly RelationalDependencies: RelationalQueryContextDependencies;
@@ -2140,6 +2240,8 @@ export const RelationalQueryContext: {
 export type RelationalQueryContext = RelationalQueryContext$instance;
 
 export interface RelationalQueryContextDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalQueryContextDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     RelationalConnection: IRelationalConnection;
@@ -2160,6 +2262,8 @@ export const RelationalQueryContextDependencies: {
 export type RelationalQueryContextDependencies = RelationalQueryContextDependencies$instance;
 
 export interface RelationalQueryRootProcessor$instance extends QueryRootProcessor {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalQueryRootProcessor: never;
+
     ShouldConvertToInlineQueryRoot(expression: Expression): boolean;
     ShouldConvertToParameterQueryRoot(queryParameterExpression: QueryParameterExpression): boolean;
     VisitExtension(node: Expression): Expression;
@@ -2175,6 +2279,8 @@ export const RelationalQueryRootProcessor: {
 export type RelationalQueryRootProcessor = RelationalQueryRootProcessor$instance;
 
 export interface RelationalQueryTranslationPostprocessor$instance extends QueryTranslationPostprocessor {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalQueryTranslationPostprocessor: never;
+
     readonly RelationalDependencies: RelationalQueryTranslationPostprocessorDependencies;
     readonly RelationalQueryCompilationContext: RelationalQueryCompilationContext;
     Process(query: Expression): Expression;
@@ -2191,6 +2297,8 @@ export const RelationalQueryTranslationPostprocessor: {
 export type RelationalQueryTranslationPostprocessor = RelationalQueryTranslationPostprocessor$instance;
 
 export interface RelationalQueryTranslationPostprocessorDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalQueryTranslationPostprocessorDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     SqlExpressionFactory: ISqlExpressionFactory;
@@ -2211,6 +2319,8 @@ export const RelationalQueryTranslationPostprocessorDependencies: {
 export type RelationalQueryTranslationPostprocessorDependencies = RelationalQueryTranslationPostprocessorDependencies$instance;
 
 export interface RelationalQueryTranslationPreprocessor$instance extends QueryTranslationPreprocessor {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalQueryTranslationPreprocessor: never;
+
     readonly IsEfConstantSupported: boolean;
     readonly RelationalDependencies: RelationalQueryTranslationPreprocessorDependencies;
     NormalizeQueryableMethod(expression: Expression): Expression;
@@ -2226,6 +2336,8 @@ export const RelationalQueryTranslationPreprocessor: {
 export type RelationalQueryTranslationPreprocessor = RelationalQueryTranslationPreprocessor$instance;
 
 export interface RelationalQueryTranslationPreprocessorDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalQueryTranslationPreprocessorDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     RelationalTypeMappingSource: IRelationalTypeMappingSource;
@@ -2245,10 +2357,12 @@ export const RelationalQueryTranslationPreprocessorDependencies: {
 export type RelationalQueryTranslationPreprocessorDependencies = RelationalQueryTranslationPreprocessorDependencies$instance;
 
 export interface RelationalShapedQueryCompilingExpressionVisitor$instance extends ShapedQueryCompilingExpressionVisitor {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalShapedQueryCompilingExpressionVisitor: never;
+
     readonly MaxNullableParametersForPregeneratedSql: int;
     readonly RelationalDependencies: RelationalShapedQueryCompilingExpressionVisitorDependencies;
-    AddStructuralTypeInitialization(shaper: StructuralTypeShaperExpression, instanceVariable: ParameterExpression, variables: List<ParameterExpression>, expressions: List<Expression>): void;
-    AddStructuralTypeInitialization(shaper: StructuralTypeShaperExpression, instanceVariable: ParameterExpression, variables: List<ParameterExpression>, expressions: List<Expression>): void;
+    AddStructuralTypeInitialization(shaper: StructuralTypeShaperExpression, instanceVariable: ParameterExpression, variables: List_1<ParameterExpression>, expressions: List_1<Expression>): void;
+    AddStructuralTypeInitialization(shaper: StructuralTypeShaperExpression, instanceVariable: ParameterExpression, variables: List_1<ParameterExpression>, expressions: List_1<Expression>): void;
     VisitExtension(extensionExpression: Expression): Expression;
     VisitShapedQuery(shapedQueryExpression: ShapedQueryExpression): Expression;
 }
@@ -2257,15 +2371,17 @@ export interface RelationalShapedQueryCompilingExpressionVisitor$instance extend
 export const RelationalShapedQueryCompilingExpressionVisitor: {
     new(dependencies: ShapedQueryCompilingExpressionVisitorDependencies, relationalDependencies: RelationalShapedQueryCompilingExpressionVisitorDependencies, queryCompilationContext: QueryCompilationContext): RelationalShapedQueryCompilingExpressionVisitor;
     NonQueryResult(relationalQueryContext: RelationalQueryContext, relationalCommandResolver: RelationalCommandResolver, contextType: Type, commandSource: CommandSource, threadSafetyChecksEnabled: boolean): int;
-    NonQueryResultAsync(relationalQueryContext: RelationalQueryContext, relationalCommandResolver: RelationalCommandResolver, contextType: Type, commandSource: CommandSource, threadSafetyChecksEnabled: boolean): Task<System_Internal.Int32>;
+    NonQueryResultAsync(relationalQueryContext: RelationalQueryContext, relationalCommandResolver: RelationalCommandResolver, contextType: Type, commandSource: CommandSource, threadSafetyChecksEnabled: boolean): Task_1<System_Internal.Int32>;
 };
 
 
 export type RelationalShapedQueryCompilingExpressionVisitor = RelationalShapedQueryCompilingExpressionVisitor$instance;
 
 export interface RelationalShapedQueryCompilingExpressionVisitor_ShaperProcessingExpressionVisitor$instance extends ExpressionVisitor {
-    ProcessRelationalGroupingResult(relationalGroupByResultExpression: RelationalGroupByResultExpression, relationalCommandResolver: Expression, readerColumns: IReadOnlyList<ReaderColumn>, keySelector: LambdaExpression, keyIdentifier: LambdaExpression, relatedDataLoaders: LambdaExpression, collectionId: int): LambdaExpression;
-    ProcessShaper(shaperExpression: Expression, relationalCommandResolver: Expression, readerColumns: IReadOnlyList<ReaderColumn>, relatedDataLoaders: LambdaExpression, collectionId: int): LambdaExpression;
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalShapedQueryCompilingExpressionVisitor_ShaperProcessingExpressionVisitor: never;
+
+    ProcessRelationalGroupingResult(relationalGroupByResultExpression: RelationalGroupByResultExpression, relationalCommandResolver: Expression, readerColumns: IReadOnlyList_1<ReaderColumn>, keySelector: LambdaExpression, keyIdentifier: LambdaExpression, relatedDataLoaders: LambdaExpression, collectionId: int): LambdaExpression;
+    ProcessShaper(shaperExpression: Expression, relationalCommandResolver: Expression, readerColumns: IReadOnlyList_1<ReaderColumn>, relatedDataLoaders: LambdaExpression, collectionId: int): LambdaExpression;
     VisitBinary(binaryExpression: BinaryExpression): Expression;
     VisitExtension(extensionExpression: Expression): Expression;
     VisitMethodCall(methodCallExpression: MethodCallExpression): Expression;
@@ -2273,27 +2389,27 @@ export interface RelationalShapedQueryCompilingExpressionVisitor_ShaperProcessin
 
 
 export const RelationalShapedQueryCompilingExpressionVisitor_ShaperProcessingExpressionVisitor: {
-    new(parentVisitor: RelationalShapedQueryCompilingExpressionVisitor, selectExpression: SelectExpression, tags: ISet<System_Internal.String>, splitQuery: boolean, indexMap: boolean): RelationalShapedQueryCompilingExpressionVisitor_ShaperProcessingExpressionVisitor;
+    new(parentVisitor: RelationalShapedQueryCompilingExpressionVisitor, selectExpression: SelectExpression, tags: ISet_1<System_Internal.String>, splitQuery: boolean, indexMap: boolean): RelationalShapedQueryCompilingExpressionVisitor_ShaperProcessingExpressionVisitor;
     readonly GetFieldValueMethod: MethodInfo;
     Any(source: IEnumerable): boolean;
-    IncludeJsonEntityCollection<TIncludingEntity, TIncludedCollectionElement>(queryContext: QueryContext, keyPropertyValues: unknown[], jsonReaderData: JsonReaderData, entity: TIncludingEntity, innerShaper: Func<QueryContext, unknown[], JsonReaderData, TIncludedCollectionElement>, getOrCreateCollectionObject: Action<TIncludingEntity>, fixup: Action<TIncludingEntity, TIncludedCollectionElement>, performFixup: boolean): void;
-    IncludeJsonEntityReference<TStructural, TRelatedStructural>(queryContext: QueryContext, keyPropertyValues: unknown[], jsonReaderData: JsonReaderData, structuralType: TStructural, innerShaper: Func<QueryContext, unknown[], JsonReaderData, TRelatedStructural>, fixup: Action<TStructural, TRelatedStructural>, performFixup: boolean): void;
-    IncludeReference<TEntity, TIncludingEntity extends TEntity, TIncludedEntity>(queryContext: QueryContext, entity: TEntity, relatedEntity: TIncludedEntity, navigation: INavigationBase, inverseNavigation: INavigationBase, fixup: Action<TIncludingEntity, TIncludedEntity>, trackingQuery: boolean): void;
-    InitializeCollection<TElement, TCollection extends ICollection<TElement>>(collectionId: int, queryContext: QueryContext, dbDataReader: DbDataReader, resultCoordinator: SingleQueryResultCoordinator, parentIdentifier: Func<QueryContext, DbDataReader, unknown[]>, outerIdentifier: Func<QueryContext, DbDataReader, unknown[]>, clrCollectionAccessor: IClrCollectionAccessor): TCollection;
-    InitializeIncludeCollection<TParent, TNavigationEntity extends TParent>(collectionId: int, queryContext: QueryContext, dbDataReader: DbDataReader, resultCoordinator: SingleQueryResultCoordinator, entity: TParent, parentIdentifier: Func<QueryContext, DbDataReader, unknown[]>, outerIdentifier: Func<QueryContext, DbDataReader, unknown[]>, navigation: INavigationBase, clrCollectionAccessor: IClrCollectionAccessor, trackingQuery: boolean, setLoaded: boolean): void;
-    InitializeSplitCollection<TElement, TCollection extends ICollection<TElement>>(collectionId: int, queryContext: QueryContext, parentDataReader: DbDataReader, resultCoordinator: SplitQueryResultCoordinator, parentIdentifier: Func<QueryContext, DbDataReader, unknown[]>, clrCollectionAccessor: IClrCollectionAccessor): TCollection;
-    InitializeSplitIncludeCollection<TParent, TNavigationEntity extends TParent>(collectionId: int, queryContext: QueryContext, parentDataReader: DbDataReader, resultCoordinator: SplitQueryResultCoordinator, entity: TParent, parentIdentifier: Func<QueryContext, DbDataReader, unknown[]>, navigation: INavigationBase, clrCollectionAccessor: IClrCollectionAccessor, trackingQuery: boolean, setLoaded: boolean): void;
-    InverseCollectionFixup<TCollectionElement, TEntity>(collection: ICollection<TCollectionElement>, entity: TEntity, elementFixup: Action<TCollectionElement, TEntity>): void;
-    MaterializeJsonEntityCollection<TEntity, TResult>(queryContext: QueryContext, keyPropertyValues: unknown[], jsonReaderData: JsonReaderData, structuralProperty: IPropertyBase, innerShaper: Func<QueryContext, unknown[], JsonReaderData, TEntity>): TResult | undefined;
-    MaterializeJsonNullableValueStructuralType<TStructural extends unknown>(queryContext: QueryContext, keyPropertyValues: unknown[], jsonReaderData: JsonReaderData, nullable: boolean, shaper: Func<QueryContext, unknown[], JsonReaderData, TStructural>): Nullable<TStructural>;
-    MaterializeJsonStructuralType<TStructural>(queryContext: QueryContext, keyPropertyValues: unknown[], jsonReaderData: JsonReaderData, nullable: boolean, shaper: Func<QueryContext, unknown[], JsonReaderData, TStructural>): TStructural | undefined;
-    PopulateCollection<TCollection extends ICollection<TElement>, TElement, TRelatedEntity extends TElement>(collectionId: int, queryContext: QueryContext, dbDataReader: DbDataReader, resultCoordinator: SingleQueryResultCoordinator, parentIdentifier: Func<QueryContext, DbDataReader, unknown[]>, outerIdentifier: Func<QueryContext, DbDataReader, unknown[]>, selfIdentifier: Func<QueryContext, DbDataReader, unknown[]>, parentIdentifierValueComparers: IReadOnlyList<Func<unknown, unknown, System_Internal.Boolean>>, outerIdentifierValueComparers: IReadOnlyList<Func<unknown, unknown, System_Internal.Boolean>>, selfIdentifierValueComparers: IReadOnlyList<Func<unknown, unknown, System_Internal.Boolean>>, innerShaper: Func<QueryContext, DbDataReader, ResultContext, SingleQueryResultCoordinator, TRelatedEntity>): void;
-    PopulateIncludeCollection<TIncludingEntity, TIncludedEntity>(collectionId: int, queryContext: QueryContext, dbDataReader: DbDataReader, resultCoordinator: SingleQueryResultCoordinator, parentIdentifier: Func<QueryContext, DbDataReader, unknown[]>, outerIdentifier: Func<QueryContext, DbDataReader, unknown[]>, selfIdentifier: Func<QueryContext, DbDataReader, unknown[]>, parentIdentifierValueComparers: IReadOnlyList<Func<unknown, unknown, System_Internal.Boolean>>, outerIdentifierValueComparers: IReadOnlyList<Func<unknown, unknown, System_Internal.Boolean>>, selfIdentifierValueComparers: IReadOnlyList<Func<unknown, unknown, System_Internal.Boolean>>, innerShaper: Func<QueryContext, DbDataReader, ResultContext, SingleQueryResultCoordinator, TIncludedEntity>, inverseNavigation: INavigationBase, fixup: Action<TIncludingEntity, TIncludedEntity>, trackingQuery: boolean): void;
-    PopulateSplitCollection<TCollection extends ICollection<TElement>, TElement, TRelatedEntity extends TElement>(collectionId: int, queryContext: RelationalQueryContext, executionStrategy: IExecutionStrategy, relationalCommandResolver: RelationalCommandResolver, readerColumns: IReadOnlyList<ReaderColumn>, detailedErrorsEnabled: boolean, resultCoordinator: SplitQueryResultCoordinator, childIdentifier: Func<QueryContext, DbDataReader, unknown[]>, identifierValueComparers: IReadOnlyList<Func<unknown, unknown, System_Internal.Boolean>>, innerShaper: Func<QueryContext, DbDataReader, ResultContext, SplitQueryResultCoordinator, TRelatedEntity>, relatedDataLoaders: Action<QueryContext, IExecutionStrategy, SplitQueryResultCoordinator>): void;
-    PopulateSplitCollectionAsync<TCollection extends ICollection<TElement>, TElement, TRelatedEntity extends TElement>(collectionId: int, queryContext: RelationalQueryContext, executionStrategy: IExecutionStrategy, relationalCommandResolver: RelationalCommandResolver, readerColumns: IReadOnlyList<ReaderColumn>, detailedErrorsEnabled: boolean, resultCoordinator: SplitQueryResultCoordinator, childIdentifier: Func<QueryContext, DbDataReader, unknown[]>, identifierValueComparers: IReadOnlyList<Func<unknown, unknown, System_Internal.Boolean>>, innerShaper: Func<QueryContext, DbDataReader, ResultContext, SplitQueryResultCoordinator, TRelatedEntity>, relatedDataLoaders: Func<QueryContext, IExecutionStrategy, SplitQueryResultCoordinator, Task>): Task;
-    PopulateSplitIncludeCollection<TIncludingEntity, TIncludedEntity>(collectionId: int, queryContext: RelationalQueryContext, executionStrategy: IExecutionStrategy, relationalCommandResolver: RelationalCommandResolver, readerColumns: IReadOnlyList<ReaderColumn>, detailedErrorsEnabled: boolean, resultCoordinator: SplitQueryResultCoordinator, childIdentifier: Func<QueryContext, DbDataReader, unknown[]>, identifierValueComparers: IReadOnlyList<Func<unknown, unknown, System_Internal.Boolean>>, innerShaper: Func<QueryContext, DbDataReader, ResultContext, SplitQueryResultCoordinator, TIncludedEntity>, relatedDataLoaders: Action<QueryContext, IExecutionStrategy, SplitQueryResultCoordinator>, inverseNavigation: INavigationBase, fixup: Action<TIncludingEntity, TIncludedEntity>, trackingQuery: boolean): void;
-    PopulateSplitIncludeCollectionAsync<TIncludingEntity, TIncludedEntity>(collectionId: int, queryContext: RelationalQueryContext, executionStrategy: IExecutionStrategy, relationalCommandResolver: RelationalCommandResolver, readerColumns: IReadOnlyList<ReaderColumn>, detailedErrorsEnabled: boolean, resultCoordinator: SplitQueryResultCoordinator, childIdentifier: Func<QueryContext, DbDataReader, unknown[]>, identifierValueComparers: IReadOnlyList<Func<unknown, unknown, System_Internal.Boolean>>, innerShaper: Func<QueryContext, DbDataReader, ResultContext, SplitQueryResultCoordinator, TIncludedEntity>, relatedDataLoaders: Func<QueryContext, IExecutionStrategy, SplitQueryResultCoordinator, Task>, inverseNavigation: INavigationBase, fixup: Action<TIncludingEntity, TIncludedEntity>, trackingQuery: boolean): Task;
-    TaskAwaiter(taskFactories: Func<Task>[]): Task;
+    IncludeJsonEntityCollection<TIncludingEntity, TIncludedCollectionElement>(queryContext: QueryContext, keyPropertyValues: unknown[], jsonReaderData: JsonReaderData, entity: TIncludingEntity, innerShaper: Func_4<QueryContext, unknown[], JsonReaderData, TIncludedCollectionElement>, getOrCreateCollectionObject: Action_1<TIncludingEntity>, fixup: Action_2<TIncludingEntity, TIncludedCollectionElement>, performFixup: boolean): void;
+    IncludeJsonEntityReference<TStructural, TRelatedStructural>(queryContext: QueryContext, keyPropertyValues: unknown[], jsonReaderData: JsonReaderData, structuralType: TStructural, innerShaper: Func_4<QueryContext, unknown[], JsonReaderData, TRelatedStructural>, fixup: Action_2<TStructural, TRelatedStructural>, performFixup: boolean): void;
+    IncludeReference<TEntity, TIncludingEntity extends TEntity, TIncludedEntity>(queryContext: QueryContext, entity: TEntity, relatedEntity: TIncludedEntity, navigation: INavigationBase, inverseNavigation: INavigationBase, fixup: Action_2<TIncludingEntity, TIncludedEntity>, trackingQuery: boolean): void;
+    InitializeCollection<TElement, TCollection extends ICollection_1<TElement>>(collectionId: int, queryContext: QueryContext, dbDataReader: DbDataReader, resultCoordinator: SingleQueryResultCoordinator, parentIdentifier: Func_3<QueryContext, DbDataReader, unknown[]>, outerIdentifier: Func_3<QueryContext, DbDataReader, unknown[]>, clrCollectionAccessor: IClrCollectionAccessor): TCollection;
+    InitializeIncludeCollection<TParent, TNavigationEntity extends TParent>(collectionId: int, queryContext: QueryContext, dbDataReader: DbDataReader, resultCoordinator: SingleQueryResultCoordinator, entity: TParent, parentIdentifier: Func_3<QueryContext, DbDataReader, unknown[]>, outerIdentifier: Func_3<QueryContext, DbDataReader, unknown[]>, navigation: INavigationBase, clrCollectionAccessor: IClrCollectionAccessor, trackingQuery: boolean, setLoaded: boolean): void;
+    InitializeSplitCollection<TElement, TCollection extends ICollection_1<TElement>>(collectionId: int, queryContext: QueryContext, parentDataReader: DbDataReader, resultCoordinator: SplitQueryResultCoordinator, parentIdentifier: Func_3<QueryContext, DbDataReader, unknown[]>, clrCollectionAccessor: IClrCollectionAccessor): TCollection;
+    InitializeSplitIncludeCollection<TParent, TNavigationEntity extends TParent>(collectionId: int, queryContext: QueryContext, parentDataReader: DbDataReader, resultCoordinator: SplitQueryResultCoordinator, entity: TParent, parentIdentifier: Func_3<QueryContext, DbDataReader, unknown[]>, navigation: INavigationBase, clrCollectionAccessor: IClrCollectionAccessor, trackingQuery: boolean, setLoaded: boolean): void;
+    InverseCollectionFixup<TCollectionElement, TEntity>(collection: ICollection_1<TCollectionElement>, entity: TEntity, elementFixup: Action_2<TCollectionElement, TEntity>): void;
+    MaterializeJsonEntityCollection<TEntity, TResult>(queryContext: QueryContext, keyPropertyValues: unknown[], jsonReaderData: JsonReaderData, structuralProperty: IPropertyBase, innerShaper: Func_4<QueryContext, unknown[], JsonReaderData, TEntity>): TResult | undefined;
+    MaterializeJsonNullableValueStructuralType<TStructural extends unknown>(queryContext: QueryContext, keyPropertyValues: unknown[], jsonReaderData: JsonReaderData, nullable: boolean, shaper: Func_4<QueryContext, unknown[], JsonReaderData, TStructural>): Nullable_1<TStructural>;
+    MaterializeJsonStructuralType<TStructural>(queryContext: QueryContext, keyPropertyValues: unknown[], jsonReaderData: JsonReaderData, nullable: boolean, shaper: Func_4<QueryContext, unknown[], JsonReaderData, TStructural>): TStructural | undefined;
+    PopulateCollection<TCollection extends ICollection_1<TElement>, TElement, TRelatedEntity extends TElement>(collectionId: int, queryContext: QueryContext, dbDataReader: DbDataReader, resultCoordinator: SingleQueryResultCoordinator, parentIdentifier: Func_3<QueryContext, DbDataReader, unknown[]>, outerIdentifier: Func_3<QueryContext, DbDataReader, unknown[]>, selfIdentifier: Func_3<QueryContext, DbDataReader, unknown[]>, parentIdentifierValueComparers: IReadOnlyList_1<Func_3<unknown, unknown, System_Internal.Boolean>>, outerIdentifierValueComparers: IReadOnlyList_1<Func_3<unknown, unknown, System_Internal.Boolean>>, selfIdentifierValueComparers: IReadOnlyList_1<Func_3<unknown, unknown, System_Internal.Boolean>>, innerShaper: Func_5<QueryContext, DbDataReader, ResultContext, SingleQueryResultCoordinator, TRelatedEntity>): void;
+    PopulateIncludeCollection<TIncludingEntity, TIncludedEntity>(collectionId: int, queryContext: QueryContext, dbDataReader: DbDataReader, resultCoordinator: SingleQueryResultCoordinator, parentIdentifier: Func_3<QueryContext, DbDataReader, unknown[]>, outerIdentifier: Func_3<QueryContext, DbDataReader, unknown[]>, selfIdentifier: Func_3<QueryContext, DbDataReader, unknown[]>, parentIdentifierValueComparers: IReadOnlyList_1<Func_3<unknown, unknown, System_Internal.Boolean>>, outerIdentifierValueComparers: IReadOnlyList_1<Func_3<unknown, unknown, System_Internal.Boolean>>, selfIdentifierValueComparers: IReadOnlyList_1<Func_3<unknown, unknown, System_Internal.Boolean>>, innerShaper: Func_5<QueryContext, DbDataReader, ResultContext, SingleQueryResultCoordinator, TIncludedEntity>, inverseNavigation: INavigationBase, fixup: Action_2<TIncludingEntity, TIncludedEntity>, trackingQuery: boolean): void;
+    PopulateSplitCollection<TCollection extends ICollection_1<TElement>, TElement, TRelatedEntity extends TElement>(collectionId: int, queryContext: RelationalQueryContext, executionStrategy: IExecutionStrategy, relationalCommandResolver: RelationalCommandResolver, readerColumns: IReadOnlyList_1<ReaderColumn>, detailedErrorsEnabled: boolean, resultCoordinator: SplitQueryResultCoordinator, childIdentifier: Func_3<QueryContext, DbDataReader, unknown[]>, identifierValueComparers: IReadOnlyList_1<Func_3<unknown, unknown, System_Internal.Boolean>>, innerShaper: Func_5<QueryContext, DbDataReader, ResultContext, SplitQueryResultCoordinator, TRelatedEntity>, relatedDataLoaders: Action_3<QueryContext, IExecutionStrategy, SplitQueryResultCoordinator>): void;
+    PopulateSplitCollectionAsync<TCollection extends ICollection_1<TElement>, TElement, TRelatedEntity extends TElement>(collectionId: int, queryContext: RelationalQueryContext, executionStrategy: IExecutionStrategy, relationalCommandResolver: RelationalCommandResolver, readerColumns: IReadOnlyList_1<ReaderColumn>, detailedErrorsEnabled: boolean, resultCoordinator: SplitQueryResultCoordinator, childIdentifier: Func_3<QueryContext, DbDataReader, unknown[]>, identifierValueComparers: IReadOnlyList_1<Func_3<unknown, unknown, System_Internal.Boolean>>, innerShaper: Func_5<QueryContext, DbDataReader, ResultContext, SplitQueryResultCoordinator, TRelatedEntity>, relatedDataLoaders: Func_4<QueryContext, IExecutionStrategy, SplitQueryResultCoordinator, Task>): Task;
+    PopulateSplitIncludeCollection<TIncludingEntity, TIncludedEntity>(collectionId: int, queryContext: RelationalQueryContext, executionStrategy: IExecutionStrategy, relationalCommandResolver: RelationalCommandResolver, readerColumns: IReadOnlyList_1<ReaderColumn>, detailedErrorsEnabled: boolean, resultCoordinator: SplitQueryResultCoordinator, childIdentifier: Func_3<QueryContext, DbDataReader, unknown[]>, identifierValueComparers: IReadOnlyList_1<Func_3<unknown, unknown, System_Internal.Boolean>>, innerShaper: Func_5<QueryContext, DbDataReader, ResultContext, SplitQueryResultCoordinator, TIncludedEntity>, relatedDataLoaders: Action_3<QueryContext, IExecutionStrategy, SplitQueryResultCoordinator>, inverseNavigation: INavigationBase, fixup: Action_2<TIncludingEntity, TIncludedEntity>, trackingQuery: boolean): void;
+    PopulateSplitIncludeCollectionAsync<TIncludingEntity, TIncludedEntity>(collectionId: int, queryContext: RelationalQueryContext, executionStrategy: IExecutionStrategy, relationalCommandResolver: RelationalCommandResolver, readerColumns: IReadOnlyList_1<ReaderColumn>, detailedErrorsEnabled: boolean, resultCoordinator: SplitQueryResultCoordinator, childIdentifier: Func_3<QueryContext, DbDataReader, unknown[]>, identifierValueComparers: IReadOnlyList_1<Func_3<unknown, unknown, System_Internal.Boolean>>, innerShaper: Func_5<QueryContext, DbDataReader, ResultContext, SplitQueryResultCoordinator, TIncludedEntity>, relatedDataLoaders: Func_4<QueryContext, IExecutionStrategy, SplitQueryResultCoordinator, Task>, inverseNavigation: INavigationBase, fixup: Action_2<TIncludingEntity, TIncludedEntity>, trackingQuery: boolean): Task;
+    TaskAwaiter(taskFactories: Func_1<Task>[]): Task;
     ThrowReadValueException<TValue>(exception: Exception, value: unknown, expectedType: Type, property?: IPropertyBase): TValue;
 };
 
@@ -2301,6 +2417,8 @@ export const RelationalShapedQueryCompilingExpressionVisitor_ShaperProcessingExp
 export type RelationalShapedQueryCompilingExpressionVisitor_ShaperProcessingExpressionVisitor = RelationalShapedQueryCompilingExpressionVisitor_ShaperProcessingExpressionVisitor$instance;
 
 export interface RelationalShapedQueryCompilingExpressionVisitorDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalShapedQueryCompilingExpressionVisitorDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     QuerySqlGeneratorFactory: IQuerySqlGeneratorFactory;
@@ -2321,12 +2439,14 @@ export const RelationalShapedQueryCompilingExpressionVisitorDependencies: {
 
 export type RelationalShapedQueryCompilingExpressionVisitorDependencies = RelationalShapedQueryCompilingExpressionVisitorDependencies$instance;
 
-export interface RelationalSplitCollectionShaperExpression$instance extends Expression {
+export interface RelationalSplitCollectionShaperExpression$instance extends Expression, IPrintableExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalSplitCollectionShaperExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
     readonly ChildIdentifier: Expression;
     readonly ElementType: Type;
-    readonly IdentifierValueComparers: IReadOnlyList<ValueComparer>;
+    readonly IdentifierValueComparers: IReadOnlyList_1<ValueComparer>;
     readonly InnerShaper: Expression;
     readonly Navigation: INavigationBase | undefined;
     readonly NodeType: ExpressionType;
@@ -2339,7 +2459,7 @@ export interface RelationalSplitCollectionShaperExpression$instance extends Expr
 
 
 export const RelationalSplitCollectionShaperExpression: {
-    new(parentIdentifier: Expression, childIdentifier: Expression, identifierValueComparers: IReadOnlyList<ValueComparer>, selectExpression: SelectExpression, innerShaper: Expression, navigation: INavigationBase, elementType: Type): RelationalSplitCollectionShaperExpression;
+    new(parentIdentifier: Expression, childIdentifier: Expression, identifierValueComparers: IReadOnlyList_1<ValueComparer>, selectExpression: SelectExpression, innerShaper: Expression, navigation: INavigationBase, elementType: Type): RelationalSplitCollectionShaperExpression;
 };
 
 
@@ -2347,18 +2467,18 @@ export interface __RelationalSplitCollectionShaperExpression$views {
     As_IPrintableExpression(): IPrintableExpression$instance;
 }
 
-export interface RelationalSplitCollectionShaperExpression$instance extends IPrintableExpression$instance {}
-
 export type RelationalSplitCollectionShaperExpression = RelationalSplitCollectionShaperExpression$instance & __RelationalSplitCollectionShaperExpression$views;
 
 
 export interface RelationalSqlTranslatingExpressionVisitor$instance extends ExpressionVisitor {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalSqlTranslatingExpressionVisitor: never;
+
     readonly Dependencies: RelationalSqlTranslatingExpressionVisitorDependencies;
     get TranslationErrorDetails(): string | undefined;
     set TranslationErrorDetails(value: string | undefined);
     AddTranslationErrorDetails(details: string): void;
-    GenerateGreatest(expressions: IReadOnlyList<SqlExpression>, resultType: Type): SqlExpression | undefined;
-    GenerateLeast(expressions: IReadOnlyList<SqlExpression>, resultType: Type): SqlExpression | undefined;
+    GenerateGreatest(expressions: IReadOnlyList_1<SqlExpression>, resultType: Type): SqlExpression | undefined;
+    GenerateLeast(expressions: IReadOnlyList_1<SqlExpression>, resultType: Type): SqlExpression | undefined;
     Translate(expression: Expression, applyDefaultTypeMapping?: boolean): SqlExpression | undefined;
     TranslateProjection(expression: Expression, applyDefaultTypeMapping?: boolean): Expression | undefined;
     TryBindMember(source: Expression, member: MemberIdentity, expression: Expression, property: IPropertyBase): boolean;
@@ -2368,7 +2488,7 @@ export interface RelationalSqlTranslatingExpressionVisitor$instance extends Expr
     VisitConstant(constantExpression: ConstantExpression): Expression;
     VisitExtension(extensionExpression: Expression): Expression;
     VisitInvocation(invocationExpression: InvocationExpression): Expression;
-    VisitLambda<T>(lambdaExpression: Expression<T>): Expression;
+    VisitLambda<T>(lambdaExpression: Expression_1<T>): Expression;
     VisitListInit(listInitExpression: ListInitExpression): Expression;
     VisitMember(memberExpression: MemberExpression): Expression;
     VisitMemberInit(memberInitExpression: MemberInitExpression): Expression;
@@ -2383,14 +2503,16 @@ export interface RelationalSqlTranslatingExpressionVisitor$instance extends Expr
 
 export const RelationalSqlTranslatingExpressionVisitor: {
     new(dependencies: RelationalSqlTranslatingExpressionVisitorDependencies, queryCompilationContext: QueryCompilationContext, queryableMethodTranslatingExpressionVisitor: QueryableMethodTranslatingExpressionVisitor): RelationalSqlTranslatingExpressionVisitor;
-    ParameterListValueExtractor<TEntity, TProperty>(context: QueryContext, baseParameterName: string, property: IProperty): List<TProperty | undefined> | undefined;
-    ParameterValueExtractor<T>(context: QueryContext, baseParameterName: string, complexPropertyChain: List<IComplexProperty>, property: IProperty): T | undefined;
+    ParameterListValueExtractor<TEntity, TProperty>(context: QueryContext, baseParameterName: string, property: IProperty): List_1<TProperty | undefined> | undefined;
+    ParameterValueExtractor<T>(context: QueryContext, baseParameterName: string, complexPropertyChain: List_1<IComplexProperty>, property: IProperty): T | undefined;
 };
 
 
 export type RelationalSqlTranslatingExpressionVisitor = RelationalSqlTranslatingExpressionVisitor$instance;
 
 export interface RelationalSqlTranslatingExpressionVisitorDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalSqlTranslatingExpressionVisitorDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     readonly AggregateMethodCallTranslatorProvider: IAggregateMethodCallTranslatorProvider;
@@ -2414,7 +2536,9 @@ export const RelationalSqlTranslatingExpressionVisitorDependencies: {
 
 export type RelationalSqlTranslatingExpressionVisitorDependencies = RelationalSqlTranslatingExpressionVisitorDependencies$instance;
 
-export interface RelationalSqlTranslatingExpressionVisitorFactory$instance {
+export interface RelationalSqlTranslatingExpressionVisitorFactory$instance extends IRelationalSqlTranslatingExpressionVisitorFactory$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalSqlTranslatingExpressionVisitorFactory: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IRelationalSqlTranslatingExpressionVisitorFactory: never;
 
     readonly Dependencies: RelationalSqlTranslatingExpressionVisitorDependencies;
@@ -2431,12 +2555,12 @@ export interface __RelationalSqlTranslatingExpressionVisitorFactory$views {
     As_IRelationalSqlTranslatingExpressionVisitorFactory(): IRelationalSqlTranslatingExpressionVisitorFactory$instance;
 }
 
-export interface RelationalSqlTranslatingExpressionVisitorFactory$instance extends IRelationalSqlTranslatingExpressionVisitorFactory$instance {}
-
 export type RelationalSqlTranslatingExpressionVisitorFactory = RelationalSqlTranslatingExpressionVisitorFactory$instance & __RelationalSqlTranslatingExpressionVisitorFactory$views;
 
 
-export interface RelationalStructuralTypeShaperExpression$instance extends StructuralTypeShaperExpression$instance {
+export interface RelationalStructuralTypeShaperExpression$instance extends StructuralTypeShaperExpression$instance, IPrintableExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalStructuralTypeShaperExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
     GenerateMaterializationCondition(type: ITypeBase, nullable: boolean): LambdaExpression;
@@ -2458,12 +2582,12 @@ export interface __RelationalStructuralTypeShaperExpression$views {
     As_IPrintableExpression(): IPrintableExpression$instance;
 }
 
-export interface RelationalStructuralTypeShaperExpression$instance extends IPrintableExpression$instance {}
-
 export type RelationalStructuralTypeShaperExpression = RelationalStructuralTypeShaperExpression$instance & __RelationalStructuralTypeShaperExpression$views;
 
 
 export interface RelationalTypeMappingPostprocessor$instance extends ExpressionVisitor {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_RelationalTypeMappingPostprocessor: never;
+
     readonly Dependencies: QueryTranslationPostprocessorDependencies;
     readonly QueryCompilationContext: RelationalQueryCompilationContext;
     readonly RelationalDependencies: RelationalQueryTranslationPostprocessorDependencies;
@@ -2482,6 +2606,8 @@ export const RelationalTypeMappingPostprocessor: {
 export type RelationalTypeMappingPostprocessor = RelationalTypeMappingPostprocessor$instance;
 
 export interface ReplacingExpressionVisitor$instance extends ExpressionVisitor {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_ReplacingExpressionVisitor: never;
+
     Visit(expression: Expression): Expression | undefined;
     VisitMember(memberExpression: MemberExpression): Expression;
     VisitMethodCall(methodCallExpression: MethodCallExpression): Expression;
@@ -2489,8 +2615,8 @@ export interface ReplacingExpressionVisitor$instance extends ExpressionVisitor {
 
 
 export const ReplacingExpressionVisitor: {
-    new(originals: IReadOnlyList<Expression>, replacements: IReadOnlyList<Expression>): ReplacingExpressionVisitor;
-    Replace(originals: IReadOnlyList<Expression>, replacements: IReadOnlyList<Expression>, tree: Expression): Expression;
+    new(originals: IReadOnlyList_1<Expression>, replacements: IReadOnlyList_1<Expression>): ReplacingExpressionVisitor;
+    Replace(originals: IReadOnlyList_1<Expression>, replacements: IReadOnlyList_1<Expression>, tree: Expression): Expression;
     Replace(original: Expression, replacement: Expression, tree: Expression): Expression;
 };
 
@@ -2498,9 +2624,11 @@ export const ReplacingExpressionVisitor: {
 export type ReplacingExpressionVisitor = ReplacingExpressionVisitor$instance;
 
 export interface ShapedQueryCompilingExpressionVisitor$instance extends ExpressionVisitor {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_ShapedQueryCompilingExpressionVisitor: never;
+
     readonly Dependencies: ShapedQueryCompilingExpressionVisitorDependencies;
     readonly QueryCompilationContext: QueryCompilationContext;
-    AddStructuralTypeInitialization(shaper: StructuralTypeShaperExpression, instanceVariable: ParameterExpression, variables: List<ParameterExpression>, expressions: List<Expression>): void;
+    AddStructuralTypeInitialization(shaper: StructuralTypeShaperExpression, instanceVariable: ParameterExpression, variables: List_1<ParameterExpression>, expressions: List_1<Expression>): void;
     InjectEntityMaterializers(expression: Expression): Expression;
     InjectStructuralTypeMaterializers(expression: Expression): Expression;
     VerifyNoClientConstant(expression: Expression): void;
@@ -2510,15 +2638,17 @@ export interface ShapedQueryCompilingExpressionVisitor$instance extends Expressi
 
 
 export const ShapedQueryCompilingExpressionVisitor: (abstract new(dependencies: ShapedQueryCompilingExpressionVisitorDependencies, queryCompilationContext: QueryCompilationContext) => ShapedQueryCompilingExpressionVisitor) & {
-    CreateNullKeyValueInNoTrackingQuery(entityType: IEntityType, properties: IReadOnlyList<IProperty>, keyValues: unknown[]): Exception;
-    SingleAsync<TSource>(asyncEnumerable: IAsyncEnumerable<TSource>, cancellationToken?: CancellationToken): Task<TSource>;
-    SingleOrDefaultAsync<TSource>(asyncEnumerable: IAsyncEnumerable<TSource>, cancellationToken?: CancellationToken): Task<TSource | undefined>;
+    CreateNullKeyValueInNoTrackingQuery(entityType: IEntityType, properties: IReadOnlyList_1<IProperty>, keyValues: unknown[]): Exception;
+    SingleAsync<TSource>(asyncEnumerable: IAsyncEnumerable_1<TSource>, cancellationToken?: CancellationToken): Task_1<TSource>;
+    SingleOrDefaultAsync<TSource>(asyncEnumerable: IAsyncEnumerable_1<TSource>, cancellationToken?: CancellationToken): Task_1<TSource | undefined>;
 };
 
 
 export type ShapedQueryCompilingExpressionVisitor = ShapedQueryCompilingExpressionVisitor$instance;
 
 export interface ShapedQueryCompilingExpressionVisitorDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_ShapedQueryCompilingExpressionVisitorDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     ContextServices: IDbContextServices;
@@ -2528,7 +2658,7 @@ export interface ShapedQueryCompilingExpressionVisitorDependencies$instance {
     MemoryCache: IMemoryCache;
     Model: IModel;
     QueryLogger: IDiagnosticsLogger_1<DbLoggerCategory_Query>;
-    SingletonInterceptors: IEnumerable__System_Collections_Generic<ISingletonInterceptor>;
+    SingletonInterceptors: IEnumerable_1<ISingletonInterceptor>;
     TypeMappingSource: ITypeMappingSource;
     _Clone_$(): ShapedQueryCompilingExpressionVisitorDependencies;
     Equals(obj: unknown): boolean;
@@ -2539,13 +2669,15 @@ export interface ShapedQueryCompilingExpressionVisitorDependencies$instance {
 
 
 export const ShapedQueryCompilingExpressionVisitorDependencies: {
-    new(entityMaterializerSource: IStructuralTypeMaterializerSource, typeMappingSource: ITypeMappingSource, memoryCache: IMemoryCache, coreSingletonOptions: ICoreSingletonOptions, model: IModel, liftableConstantFactory: ILiftableConstantFactory, queryLogger: IDiagnosticsLogger_1<DbLoggerCategory_Query>, singletonInterceptors: IEnumerable__System_Collections_Generic<ISingletonInterceptor>, contextServices: IDbContextServices): ShapedQueryCompilingExpressionVisitorDependencies;
+    new(entityMaterializerSource: IStructuralTypeMaterializerSource, typeMappingSource: ITypeMappingSource, memoryCache: IMemoryCache, coreSingletonOptions: ICoreSingletonOptions, model: IModel, liftableConstantFactory: ILiftableConstantFactory, queryLogger: IDiagnosticsLogger_1<DbLoggerCategory_Query>, singletonInterceptors: IEnumerable_1<ISingletonInterceptor>, contextServices: IDbContextServices): ShapedQueryCompilingExpressionVisitorDependencies;
 };
 
 
 export type ShapedQueryCompilingExpressionVisitorDependencies = ShapedQueryCompilingExpressionVisitorDependencies$instance;
 
-export interface ShapedQueryExpression$instance extends Expression {
+export interface ShapedQueryExpression$instance extends Expression, IPrintableExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_ShapedQueryExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
     readonly NodeType: ExpressionType;
@@ -2570,16 +2702,16 @@ export interface __ShapedQueryExpression$views {
     As_IPrintableExpression(): IPrintableExpression$instance;
 }
 
-export interface ShapedQueryExpression$instance extends IPrintableExpression$instance {}
-
 export type ShapedQueryExpression = ShapedQueryExpression$instance & __ShapedQueryExpression$views;
 
 
 export interface SqlAliasManager$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_SqlAliasManager: never;
+
     GenerateTableAlias(name: string): string;
     GenerateTableAlias(modelTable: ITableBase): string;
     PostprocessAliases(expression: Expression): Expression;
-    RemapTableAliases(usedAliases: IReadOnlySet<System_Internal.String>): Dictionary<System_Internal.String, System_Internal.String> | undefined;
+    RemapTableAliases(usedAliases: IReadOnlySet_1<System_Internal.String>): Dictionary_2<System_Internal.String, System_Internal.String> | undefined;
 }
 
 
@@ -2590,7 +2722,9 @@ export const SqlAliasManager: {
 
 export type SqlAliasManager = SqlAliasManager$instance;
 
-export interface SqlAliasManagerFactory$instance {
+export interface SqlAliasManagerFactory$instance extends ISqlAliasManagerFactory$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_SqlAliasManagerFactory: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_ISqlAliasManagerFactory: never;
 
     Create(): SqlAliasManager;
@@ -2606,12 +2740,12 @@ export interface __SqlAliasManagerFactory$views {
     As_ISqlAliasManagerFactory(): ISqlAliasManagerFactory$instance;
 }
 
-export interface SqlAliasManagerFactory$instance extends ISqlAliasManagerFactory$instance {}
-
 export type SqlAliasManagerFactory = SqlAliasManagerFactory$instance & __SqlAliasManagerFactory$views;
 
 
 export interface SqlExpressionFactory$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_SqlExpressionFactory: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_ISqlExpressionFactory: never;
 
     readonly Dependencies: SqlExpressionFactoryDependencies;
@@ -2620,8 +2754,8 @@ export interface SqlExpressionFactory$instance {
     AndAlso(left: SqlExpression, right: SqlExpression): SqlExpression;
     ApplyDefaultTypeMapping(sqlExpression: SqlExpression): SqlExpression | undefined;
     ApplyTypeMapping(sqlExpression: SqlExpression, typeMapping: RelationalTypeMapping): SqlExpression | undefined;
-    Case(operand: SqlExpression, whenClauses: IReadOnlyList<CaseWhenClause>, elseResult: SqlExpression, existingExpression?: SqlExpression): SqlExpression;
-    Case(whenClauses: IReadOnlyList<CaseWhenClause>, elseResult: SqlExpression): SqlExpression;
+    Case(operand: SqlExpression, whenClauses: IReadOnlyList_1<CaseWhenClause>, elseResult: SqlExpression, existingExpression?: SqlExpression): SqlExpression;
+    Case(whenClauses: IReadOnlyList_1<CaseWhenClause>, elseResult: SqlExpression): SqlExpression;
     Coalesce(left: SqlExpression, right: SqlExpression, typeMapping?: RelationalTypeMapping): SqlExpression;
     Constant(value: unknown, typeMapping?: RelationalTypeMapping): SqlExpression;
     Constant(value: unknown, type: Type, typeMapping?: RelationalTypeMapping): SqlExpression;
@@ -2632,13 +2766,13 @@ export interface SqlExpressionFactory$instance {
     Equal(left: SqlExpression, right: SqlExpression): SqlExpression;
     Exists(subquery: SelectExpression): SqlExpression;
     Fragment(sql: string, type?: Type, typeMapping?: RelationalTypeMapping): SqlExpression;
-    Function(name: string, arguments: IEnumerable__System_Collections_Generic<SqlExpression>, nullable: boolean, argumentsPropagateNullability: IEnumerable__System_Collections_Generic<System_Internal.Boolean>, returnType: Type, typeMapping?: RelationalTypeMapping): SqlExpression;
-    Function(schema: string, name: string, arguments: IEnumerable__System_Collections_Generic<SqlExpression>, nullable: boolean, argumentsPropagateNullability: IEnumerable__System_Collections_Generic<System_Internal.Boolean>, returnType: Type, typeMapping?: RelationalTypeMapping): SqlExpression;
-    Function(instance: SqlExpression, name: string, arguments: IEnumerable__System_Collections_Generic<SqlExpression>, nullable: boolean, instancePropagatesNullability: boolean, argumentsPropagateNullability: IEnumerable__System_Collections_Generic<System_Internal.Boolean>, returnType: Type, typeMapping?: RelationalTypeMapping): SqlExpression;
+    Function(name: string, arguments: IEnumerable_1<SqlExpression>, nullable: boolean, argumentsPropagateNullability: IEnumerable_1<System_Internal.Boolean>, returnType: Type, typeMapping?: RelationalTypeMapping): SqlExpression;
+    Function(schema: string, name: string, arguments: IEnumerable_1<SqlExpression>, nullable: boolean, argumentsPropagateNullability: IEnumerable_1<System_Internal.Boolean>, returnType: Type, typeMapping?: RelationalTypeMapping): SqlExpression;
+    Function(instance: SqlExpression, name: string, arguments: IEnumerable_1<SqlExpression>, nullable: boolean, instancePropagatesNullability: boolean, argumentsPropagateNullability: IEnumerable_1<System_Internal.Boolean>, returnType: Type, typeMapping?: RelationalTypeMapping): SqlExpression;
     GreaterThan(left: SqlExpression, right: SqlExpression): SqlExpression;
     GreaterThanOrEqual(left: SqlExpression, right: SqlExpression): SqlExpression;
     In(item: SqlExpression, subquery: SelectExpression): SqlExpression;
-    In(item: SqlExpression, values: IReadOnlyList<SqlExpression>): SqlExpression;
+    In(item: SqlExpression, values: IReadOnlyList_1<SqlExpression>): SqlExpression;
     In(item: SqlExpression, valuesParameter: SqlParameterExpression): SqlExpression;
     IsNotNull(operand: SqlExpression): SqlExpression;
     IsNull(operand: SqlExpression): SqlExpression;
@@ -2674,6 +2808,8 @@ export type SqlExpressionFactory = SqlExpressionFactory$instance & __SqlExpressi
 
 
 export interface SqlExpressionFactoryDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_SqlExpressionFactoryDependencies: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     Model: IModel;
@@ -2694,6 +2830,8 @@ export const SqlExpressionFactoryDependencies: {
 export type SqlExpressionFactoryDependencies = SqlExpressionFactoryDependencies$instance;
 
 export interface SqlExpressionVisitor$instance extends ExpressionVisitor {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_SqlExpressionVisitor: never;
+
     VisitAtTimeZone(atTimeZoneExpression: AtTimeZoneExpression): Expression;
     VisitCase(caseExpression: CaseExpression): Expression;
     VisitCollate(collateExpression: CollateExpression): Expression;
@@ -2741,6 +2879,8 @@ export const SqlExpressionVisitor: (abstract new() => SqlExpressionVisitor) & {
 export type SqlExpressionVisitor = SqlExpressionVisitor$instance;
 
 export interface SqlNullabilityProcessor$instance extends ExpressionVisitor {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_SqlNullabilityProcessor: never;
+
     readonly CollectionParameterTranslationMode: ParameterTranslationMode;
     readonly Dependencies: RelationalParameterBasedSqlProcessorDependencies;
     ParametersDecorator: ParametersCacheDecorator;
@@ -2751,8 +2891,8 @@ export interface SqlNullabilityProcessor$instance extends ExpressionVisitor {
     IsCollectionTable(table: TableExpressionBase, collection: Expression): boolean;
     OptimizeNotExpression(expression: SqlExpression): SqlExpression;
     Process(queryExpression: Expression, parametersDecorator: ParametersCacheDecorator): Expression;
-    ProcessValuesOrderingColumn(valuesExpression: ValuesExpression, expressions: IReadOnlyList<SqlExpression>, intTypeMapping: IntTypeMapping, counter: int): IReadOnlyList<SqlExpression>;
-    TryMakeNonNullable(selectExpression: SelectExpression, rewrittenSelectExpression: SelectExpression, foundNull: Nullable<System_Internal.Boolean>): boolean;
+    ProcessValuesOrderingColumn(valuesExpression: ValuesExpression, expressions: IReadOnlyList_1<SqlExpression>, intTypeMapping: IntTypeMapping, counter: int): IReadOnlyList_1<SqlExpression>;
+    TryMakeNonNullable(selectExpression: SelectExpression, rewrittenSelectExpression: SelectExpression, foundNull: Nullable_1<System_Internal.Boolean>): boolean;
     UpdateParameterCollection(table: TableExpressionBase, newCollectionParameter: SqlParameterExpression): TableExpressionBase;
     Visit(selectExpression: SelectExpression, visitProjection?: boolean): SelectExpression;
     Visit(sqlExpression: SqlExpression, nullable: boolean): SqlExpression | undefined;
@@ -2788,9 +2928,11 @@ export const SqlNullabilityProcessor: {
 export type SqlNullabilityProcessor = SqlNullabilityProcessor$instance;
 
 export interface SqlTreePruner$instance extends ExpressionVisitor {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_SqlTreePruner: never;
+
     get CurrentTableAlias(): string | undefined;
     set CurrentTableAlias(value: string | undefined);
-    readonly ReferencedColumnMap: IReadOnlyDictionary<System_Internal.String, HashSet<System_Internal.String>>;
+    readonly ReferencedColumnMap: IReadOnlyDictionary_2<System_Internal.String, HashSet_1<System_Internal.String>>;
     Prune(expression: Expression): Expression;
     PruneSelect(select: SelectExpression, preserveProjection: boolean): SelectExpression;
     PruneTopLevelSelect(select: SelectExpression): SelectExpression;
@@ -2807,11 +2949,13 @@ export const SqlTreePruner: {
 export type SqlTreePruner = SqlTreePruner$instance;
 
 export interface StructuralTypeProjectionExpression$instance extends Expression {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_StructuralTypeProjectionExpression: never;
+
     readonly DiscriminatorExpression: SqlExpression | undefined;
     readonly IsNullable: boolean;
     readonly NodeType: ExpressionType;
     readonly StructuralType: ITypeBase;
-    readonly TableMap: IReadOnlyDictionary<ITableBase, System_Internal.String>;
+    readonly TableMap: IReadOnlyDictionary_2<ITableBase, System_Internal.String>;
     readonly Type: Type;
     AddNavigationBinding(navigation: INavigation, shaper: StructuralTypeShaperExpression): void;
     BindComplexProperty(complexProperty: IComplexProperty): Expression;
@@ -2820,20 +2964,22 @@ export interface StructuralTypeProjectionExpression$instance extends Expression
     MakeNullable(): StructuralTypeProjectionExpression;
     ToString(): string;
     UpdateEntityType(derivedType: IEntityType): StructuralTypeProjectionExpression;
-    UpdateTableMap(newTableMap: IReadOnlyDictionary<ITableBase, System_Internal.String>): StructuralTypeProjectionExpression;
+    UpdateTableMap(newTableMap: IReadOnlyDictionary_2<ITableBase, System_Internal.String>): StructuralTypeProjectionExpression;
     VisitChildren(visitor: ExpressionVisitor): Expression;
 }
 
 
 export const StructuralTypeProjectionExpression: {
-    new(type: ITypeBase, propertyExpressionMap: IReadOnlyDictionary<IProperty, ColumnExpression>, tableMap: IReadOnlyDictionary<ITableBase, System_Internal.String>, nullable: boolean, discriminatorExpression: SqlExpression): StructuralTypeProjectionExpression;
-    new(type: ITypeBase, propertyExpressionMap: IReadOnlyDictionary<IProperty, ColumnExpression>, complexPropertyCache: Dictionary<IComplexProperty, Expression>, tableMap: IReadOnlyDictionary<ITableBase, System_Internal.String>, nullable: boolean, discriminatorExpression: SqlExpression): StructuralTypeProjectionExpression;
+    new(type: ITypeBase, propertyExpressionMap: IReadOnlyDictionary_2<IProperty, ColumnExpression>, tableMap: IReadOnlyDictionary_2<ITableBase, System_Internal.String>, nullable: boolean, discriminatorExpression: SqlExpression): StructuralTypeProjectionExpression;
+    new(type: ITypeBase, propertyExpressionMap: IReadOnlyDictionary_2<IProperty, ColumnExpression>, complexPropertyCache: Dictionary_2<IComplexProperty, Expression>, tableMap: IReadOnlyDictionary_2<ITableBase, System_Internal.String>, nullable: boolean, discriminatorExpression: SqlExpression): StructuralTypeProjectionExpression;
 };
 
 
 export type StructuralTypeProjectionExpression = StructuralTypeProjectionExpression$instance;
 
-export interface StructuralTypeShaperExpression$instance extends Expression {
+export interface StructuralTypeShaperExpression$instance extends Expression, IPrintableExpression$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_StructuralTypeShaperExpression: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Query_IPrintableExpression: never;
 
     readonly IsNullable: boolean;
@@ -2864,12 +3010,12 @@ export interface __StructuralTypeShaperExpression$views {
     As_IPrintableExpression(): IPrintableExpression$instance;
 }
 
-export interface StructuralTypeShaperExpression$instance extends IPrintableExpression$instance {}
-
 export type StructuralTypeShaperExpression = StructuralTypeShaperExpression$instance & __StructuralTypeShaperExpression$views;
 
 
 export interface UpdateSettersBuilder$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_UpdateSettersBuilder: never;
+
     BuildSettersExpression(): NewArrayExpression;
     SetProperty(propertyExpression: LambdaExpression, valueExpression: LambdaExpression): UpdateSettersBuilder;
     SetProperty(propertyExpression: LambdaExpression, valueExpression: Expression): UpdateSettersBuilder;
@@ -2884,8 +3030,10 @@ export const UpdateSettersBuilder: {
 export type UpdateSettersBuilder = UpdateSettersBuilder$instance;
 
 export interface UpdateSettersBuilder_1$instance<TSource> extends UpdateSettersBuilder {
-    SetProperty<TProperty>(propertyExpression: Expression<Func<TSource, TProperty>>, valueExpression: Expression<Func<TSource, TProperty>>): UpdateSettersBuilder_1<TSource>;
-    SetProperty<TProperty>(propertyExpression: Expression<Func<TSource, TProperty>>, valueExpression: TProperty): UpdateSettersBuilder_1<TSource>;
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_Query_UpdateSettersBuilder_1: never;
+
+    SetProperty<TProperty>(propertyExpression: Expression_1<Func_2<TSource, TProperty>>, valueExpression: Expression_1<Func_2<TSource, TProperty>>): UpdateSettersBuilder_1<TSource>;
+    SetProperty<TProperty>(propertyExpression: Expression_1<Func_2<TSource, TProperty>>, valueExpression: TProperty): UpdateSettersBuilder_1<TSource>;
     SetProperty(propertyExpression: LambdaExpression, valueExpression: LambdaExpression): UpdateSettersBuilder;
     SetProperty(propertyExpression: LambdaExpression, valueExpression: Expression): UpdateSettersBuilder;
 }
@@ -2900,7 +3048,7 @@ export type UpdateSettersBuilder_1<TSource> = UpdateSettersBuilder_1$instance<TS
 
 export abstract class ExpressionExtensions$instance {
     static InferTypeMapping(...expressions: SqlExpression[]): RelationalTypeMapping | undefined;
-    static InferTypeMapping(expressions: IReadOnlyList<SqlExpression>): RelationalTypeMapping | undefined;
+    static InferTypeMapping(expressions: IReadOnlyList_1<SqlExpression>): RelationalTypeMapping | undefined;
 }
 
 
@@ -2908,13 +3056,13 @@ export type ExpressionExtensions = ExpressionExtensions$instance;
 
 export abstract class LiftableConstantExpressionHelpers$instance {
     static BuildClrCollectionAccessor(structuralProperty: IPropertyBase, liftableConstantContextParameter: ParameterExpression): Expression;
-    static BuildClrCollectionAccessorLambda(structuralProperty: IPropertyBase): Expression<Func<MaterializerLiftableConstantContext, unknown>>;
+    static BuildClrCollectionAccessorLambda(structuralProperty: IPropertyBase): Expression_1<Func_2<MaterializerLiftableConstantContext, unknown>>;
     static BuildMemberAccessForEntityOrComplexType(targetType: ITypeBase, liftableConstantContextParameter: ParameterExpression): Expression;
     static BuildMemberAccessForProperty(property: IPropertyBase, liftableConstantContextParameter: ParameterExpression): Expression;
-    static BuildMemberAccessLambdaForProperty(property: IPropertyBase): Expression<Func<MaterializerLiftableConstantContext, unknown>>;
-    static BuildMemberAccessLambdaForStructuralType(type: ITypeBase): Expression<Func<MaterializerLiftableConstantContext, unknown>>;
+    static BuildMemberAccessLambdaForProperty(property: IPropertyBase): Expression_1<Func_2<MaterializerLiftableConstantContext, unknown>>;
+    static BuildMemberAccessLambdaForStructuralType(type: ITypeBase): Expression_1<Func_2<MaterializerLiftableConstantContext, unknown>>;
     static BuildStructuralPropertyAccess(structuralProperty: IPropertyBase, liftableConstantContextParameter: ParameterExpression): Expression;
-    static BuildStructuralPropertyAccessLambda(structuralProperty: IPropertyBase): Expression<Func<MaterializerLiftableConstantContext, unknown>>;
+    static BuildStructuralPropertyAccessLambda(structuralProperty: IPropertyBase): Expression_1<Func_2<MaterializerLiftableConstantContext, unknown>>;
     static IsLiteral(value: unknown): boolean;
 }
 
@@ -2995,10 +3143,10 @@ export abstract class QueryableMethods$instance {
 export type QueryableMethods = QueryableMethods$instance;
 
 export abstract class RelationalExpressionQuotingUtilities$instance {
-    static QuoteAnnotations(annotations: IReadOnlyDictionary<System_Internal.String, IAnnotation>): Expression;
+    static QuoteAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, IAnnotation>): Expression;
     static QuoteOrNull<T extends IRelationalQuotableExpression>(expression: T): Expression;
     static QuoteTableBase(tableBase: ITableBase): Expression;
-    static QuoteTags(tags: ISet<System_Internal.String>): Expression;
+    static QuoteTags(tags: ISet_1<System_Internal.String>): Expression;
     static QuoteTypeMapping(typeMapping: RelationalTypeMapping): Expression;
 }