@tsonic/efcore-npgsql 10.0.5 → 10.0.7

package/Npgsql.BackendMessages/internal/index.d.ts

@@ -6,10 +6,12 @@
 import type { sbyte, byte, short, ushort, int, uint, long, ulong, int128, uint128, half, float, double, decimal, nint, nuint, char } from '@tsonic/core/types.js';
 
 // Import types from other namespaces
-import * as System_Internal from "@tsonic/dotnet/System.js";
-import type { Int16, Int32, Object as ClrObject, String as ClrString } from "@tsonic/dotnet/System.js";
+import * as System_Internal from "@tsonic/dotnet/System/internal/index.js";
+import type { Int16, Int32, Object as ClrObject, String as ClrString } from "@tsonic/dotnet/System/internal/index.js";
 
 export interface FieldDescription$instance {
+    readonly __tsonic_type_Npgsql_BackendMessages_FieldDescription: never;
+
     TypeModifier: int;
     TypeSize: short;
     ToString(): string;

package/Npgsql.EntityFrameworkCore.PostgreSQL/internal/index.d.ts

@@ -7,13 +7,15 @@ import type { sbyte, byte, short, ushort, int, uint, long, ulong, int128, uint12
 
 // Import types from other namespaces
 import * as System_Internal from "@tsonic/dotnet/System.js";
-import type { ICollection } from "@tsonic/dotnet/System.Collections.Generic.js";
-import type { Boolean as ClrBoolean, Exception, Int32, String as ClrString, TimeSpan } from "@tsonic/dotnet/System.js";
-import type { DbContext } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.js";
-import * as Microsoft_EntityFrameworkCore_Storage_Internal from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Storage.js";
-import type { ExecutionStrategy, ExecutionStrategyDependencies, IExecutionStrategy } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Storage.js";
+import type { ICollection_1 } from "@tsonic/dotnet/System.Collections.Generic/internal/index.js";
+import type { Boolean as ClrBoolean, Exception, Int32, String as ClrString, TimeSpan } from "@tsonic/dotnet/System/internal/index.js";
+import * as Microsoft_EntityFrameworkCore_Storage_Internal from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Storage/internal/index.js";
+import type { ExecutionStrategy, ExecutionStrategyDependencies, IExecutionStrategy } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Storage/internal/index.js";
+import type { DbContext } from "@tsonic/efcore/Microsoft.EntityFrameworkCore/internal/index.js";
 
 export interface NpgsqlRetryingExecutionStrategy$instance extends ExecutionStrategy {
+    readonly __tsonic_type_Npgsql_EntityFrameworkCore_PostgreSQL_NpgsqlRetryingExecutionStrategy: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Storage_IExecutionStrategy: never;
 
     ShouldRetryOn(exception: Exception): boolean;
@@ -25,9 +27,9 @@ export const NpgsqlRetryingExecutionStrategy: {
     new(dependencies: ExecutionStrategyDependencies): NpgsqlRetryingExecutionStrategy;
     new(context: DbContext, maxRetryCount: int): NpgsqlRetryingExecutionStrategy;
     new(dependencies: ExecutionStrategyDependencies, maxRetryCount: int): NpgsqlRetryingExecutionStrategy;
-    new(dependencies: ExecutionStrategyDependencies, errorCodesToAdd: ICollection<System_Internal.String>): NpgsqlRetryingExecutionStrategy;
-    new(context: DbContext, maxRetryCount: int, maxRetryDelay: TimeSpan, errorCodesToAdd: ICollection<System_Internal.String>): NpgsqlRetryingExecutionStrategy;
-    new(dependencies: ExecutionStrategyDependencies, maxRetryCount: int, maxRetryDelay: TimeSpan, errorCodesToAdd: ICollection<System_Internal.String>): NpgsqlRetryingExecutionStrategy;
+    new(dependencies: ExecutionStrategyDependencies, errorCodesToAdd: ICollection_1<System_Internal.String>): NpgsqlRetryingExecutionStrategy;
+    new(context: DbContext, maxRetryCount: int, maxRetryDelay: TimeSpan, errorCodesToAdd: ICollection_1<System_Internal.String>): NpgsqlRetryingExecutionStrategy;
+    new(dependencies: ExecutionStrategyDependencies, maxRetryCount: int, maxRetryDelay: TimeSpan, errorCodesToAdd: ICollection_1<System_Internal.String>): NpgsqlRetryingExecutionStrategy;
 };
 
 

package/Npgsql.EntityFrameworkCore.PostgreSQL.Design.Internal/internal/index.d.ts

@@ -6,27 +6,29 @@
 import type { sbyte, byte, short, ushort, int, uint, long, ulong, int128, uint128, half, float, double, decimal, nint, nuint, char } from '@tsonic/core/types.js';
 
 // Import types from other namespaces
-import type { IDictionary, IReadOnlyList } from "@tsonic/dotnet/System.Collections.Generic.js";
-import * as System_Internal from "@tsonic/dotnet/System.js";
-import type { Boolean as ClrBoolean, Object as ClrObject, String as ClrString, Void } from "@tsonic/dotnet/System.js";
-import type { ValueComparer } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.ChangeTracking.js";
-import * as Microsoft_EntityFrameworkCore_Design_Internal_Internal from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Design.Internal.js";
-import type { CSharpRuntimeAnnotationCodeGeneratorDependencies, CSharpRuntimeAnnotationCodeGeneratorParameters, RelationalCSharpRuntimeAnnotationCodeGenerator, RelationalCSharpRuntimeAnnotationCodeGeneratorDependencies } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Design.Internal.js";
-import * as Microsoft_EntityFrameworkCore_Design_Internal from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Design.js";
-import type { AnnotationCodeGenerator, AnnotationCodeGeneratorDependencies, IAnnotationCodeGenerator, IDesignTimeServices, MethodCallCodeFragment } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Design.js";
-import type { IAnnotation } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Infrastructure.js";
-import type { IColumn, IEntityType, IIndex, IModel, IProperty, IRelationalModel, ITable, ITableIndex } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Metadata.js";
-import type { CoreTypeMapping } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Storage.js";
-import type { IServiceCollection } from "@tsonic/microsoft-extensions/Microsoft.Extensions.DependencyInjection.js";
+import type { IDictionary_2, IReadOnlyList_1 } from "@tsonic/dotnet/System.Collections.Generic/internal/index.js";
+import * as System_Internal from "@tsonic/dotnet/System/internal/index.js";
+import type { Boolean as ClrBoolean, Object as ClrObject, String as ClrString, Void } from "@tsonic/dotnet/System/internal/index.js";
+import type { ValueComparer } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.ChangeTracking/internal/index.js";
+import * as Microsoft_EntityFrameworkCore_Design_Internal_Internal from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Design.Internal/internal/index.js";
+import type { CSharpRuntimeAnnotationCodeGeneratorDependencies, CSharpRuntimeAnnotationCodeGeneratorParameters, RelationalCSharpRuntimeAnnotationCodeGenerator, RelationalCSharpRuntimeAnnotationCodeGeneratorDependencies } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Design.Internal/internal/index.js";
+import * as Microsoft_EntityFrameworkCore_Design_Internal from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Design/internal/index.js";
+import type { AnnotationCodeGenerator, AnnotationCodeGeneratorDependencies, IAnnotationCodeGenerator, IDesignTimeServices, MethodCallCodeFragment } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Design/internal/index.js";
+import type { IAnnotation } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Infrastructure/internal/index.js";
+import type { IColumn, IEntityType, IIndex, IModel, IProperty, IRelationalModel, ITable, ITableIndex } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Metadata/internal/index.js";
+import type { CoreTypeMapping } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Storage/internal/index.js";
+import type { IServiceCollection } from "@tsonic/microsoft-extensions/Microsoft.Extensions.DependencyInjection/internal/index.js";
 
 export interface NpgsqlAnnotationCodeGenerator$instance extends AnnotationCodeGenerator {
+    readonly __tsonic_type_Npgsql_EntityFrameworkCore_PostgreSQL_Design_Internal_NpgsqlAnnotationCodeGenerator: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Design_IAnnotationCodeGenerator: never;
 
     GenerateFluentApi(model: IModel, annotation: IAnnotation): MethodCallCodeFragment | undefined;
     GenerateFluentApi(entityType: IEntityType, annotation: IAnnotation): MethodCallCodeFragment | undefined;
     GenerateFluentApi(index: IIndex, annotation: IAnnotation): MethodCallCodeFragment | undefined;
-    GenerateFluentApiCalls(model: IModel, annotations: IDictionary<System_Internal.String, IAnnotation>): IReadOnlyList<MethodCallCodeFragment>;
-    GenerateFluentApiCalls(property: IProperty, annotations: IDictionary<System_Internal.String, IAnnotation>): IReadOnlyList<MethodCallCodeFragment>;
+    GenerateFluentApiCalls(model: IModel, annotations: IDictionary_2<System_Internal.String, IAnnotation>): IReadOnlyList_1<MethodCallCodeFragment>;
+    GenerateFluentApiCalls(property: IProperty, annotations: IDictionary_2<System_Internal.String, IAnnotation>): IReadOnlyList_1<MethodCallCodeFragment>;
     IsHandledByConvention(model: IModel, annotation: IAnnotation): boolean;
     IsHandledByConvention(index: IIndex, annotation: IAnnotation): boolean;
     IsHandledByConvention(property: IProperty, annotation: IAnnotation): boolean;
@@ -41,6 +43,8 @@ export const NpgsqlAnnotationCodeGenerator: {
 export type NpgsqlAnnotationCodeGenerator = NpgsqlAnnotationCodeGenerator$instance;
 
 export interface NpgsqlCSharpRuntimeAnnotationCodeGenerator$instance extends RelationalCSharpRuntimeAnnotationCodeGenerator {
+    readonly __tsonic_type_Npgsql_EntityFrameworkCore_PostgreSQL_Design_Internal_NpgsqlCSharpRuntimeAnnotationCodeGenerator: never;
+
     AddNpgsqlTypeMappingTweaks(typeMapping: CoreTypeMapping, parameters: CSharpRuntimeAnnotationCodeGeneratorParameters): void;
     Create(typeMapping: CoreTypeMapping, parameters: CSharpRuntimeAnnotationCodeGeneratorParameters, valueComparer?: ValueComparer, keyValueComparer?: ValueComparer, providerValueComparer?: ValueComparer): boolean;
     Generate(model: IModel, parameters: CSharpRuntimeAnnotationCodeGeneratorParameters): void;
@@ -62,6 +66,8 @@ export const NpgsqlCSharpRuntimeAnnotationCodeGenerator: {
 export type NpgsqlCSharpRuntimeAnnotationCodeGenerator = NpgsqlCSharpRuntimeAnnotationCodeGenerator$instance;
 
 export interface NpgsqlDesignTimeServices$instance {
+    readonly __tsonic_type_Npgsql_EntityFrameworkCore_PostgreSQL_Design_Internal_NpgsqlDesignTimeServices: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Design_IDesignTimeServices: never;
 
     ConfigureDesignTimeServices(serviceCollection: IServiceCollection): void;

package/Npgsql.EntityFrameworkCore.PostgreSQL.Diagnostics.Internal/internal/index.d.ts

@@ -7,10 +7,12 @@ import type { sbyte, byte, short, ushort, int, uint, long, ulong, int128, uint12
 
 // Import types from other namespaces
 import * as System_Internal from "@tsonic/dotnet/System.js";
-import * as Microsoft_EntityFrameworkCore_Diagnostics_Internal from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Diagnostics.js";
-import type { EventDefinitionBase, RelationalLoggingDefinitions } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Diagnostics.js";
+import * as Microsoft_EntityFrameworkCore_Diagnostics_Internal from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Diagnostics/internal/index.js";
+import type { EventDefinitionBase, RelationalLoggingDefinitions } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Diagnostics/internal/index.js";
 
 export interface NpgsqlLoggingDefinitions$instance extends RelationalLoggingDefinitions {
+    readonly __tsonic_type_Npgsql_EntityFrameworkCore_PostgreSQL_Diagnostics_Internal_NpgsqlLoggingDefinitions: never;
+
     LogFoundDefaultSchema: EventDefinitionBase | undefined;
     LogFoundColumn: EventDefinitionBase | undefined;
     LogFoundForeignKey: EventDefinitionBase | undefined;

package/Npgsql.EntityFrameworkCore.PostgreSQL.Extensions.Internal/internal/index.d.ts

@@ -9,10 +9,10 @@ import type { sbyte, byte, short, ushort, int, uint, long, ulong, int128, uint12
 import type { ptr } from "@tsonic/core/types.js";
 
 // Import types from other namespaces
-import * as System_Internal from "@tsonic/dotnet/System.js";
-import type { Boolean as ClrBoolean, Object as ClrObject } from "@tsonic/dotnet/System.js";
-import type { ShapedQueryExpression } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Query.js";
-import type { ColumnExpression, SqlExpression } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Query.SqlExpressions.js";
+import * as System_Internal from "@tsonic/dotnet/System/internal/index.js";
+import type { Boolean as ClrBoolean, Object as ClrObject } from "@tsonic/dotnet/System/internal/index.js";
+import type { ColumnExpression, SqlExpression } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Query.SqlExpressions/internal/index.js";
+import type { ShapedQueryExpression } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Query/internal/index.js";
 
 export abstract class NpgsqlShapedQueryExpressionExtensions$instance {
     static TryConvertToArray(source: ShapedQueryExpression, array: SqlExpression, ignoreOrderings?: boolean, ignorePredicate?: boolean): boolean;

package/Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure/internal/index.d.ts

@@ -10,13 +10,13 @@ import * as System_Internal from "@tsonic/dotnet/System.js";
 import * as Npgsql_EntityFrameworkCore_PostgreSQL_Infrastructure_Internal_Internal from "../../Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal/internal/index.js";
 import type { NpgsqlOptionsExtension } from "../../Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal/internal/index.js";
 import type { INpgsqlNameTranslator, NpgsqlDataSourceBuilder, ProvideClientCertificatesCallback, ProvidePasswordCallback } from "../../Npgsql/internal/index.js";
-import type { ICollection } from "@tsonic/dotnet/System.Collections.Generic.js";
-import type { Action, Boolean as ClrBoolean, Enum, Int32, Nullable, String as ClrString, TimeSpan, Type, ValueType, Version, Void } from "@tsonic/dotnet/System.js";
-import type { RemoteCertificateValidationCallback } from "@tsonic/dotnet/System.Net.Security.js";
-import * as Microsoft_EntityFrameworkCore_Infrastructure_Internal from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Infrastructure.js";
-import type { EntityFrameworkRelationalServicesBuilder, IRelationalDbContextOptionsBuilderInfrastructure, RelationalDbContextOptionsBuilder, ServiceCharacteristics } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Infrastructure.js";
-import type { DbContextOptionsBuilder } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.js";
-import type { IServiceCollection } from "@tsonic/microsoft-extensions/Microsoft.Extensions.DependencyInjection.js";
+import type { ICollection_1 } from "@tsonic/dotnet/System.Collections.Generic/internal/index.js";
+import type { RemoteCertificateValidationCallback } from "@tsonic/dotnet/System.Net.Security/internal/index.js";
+import type { Action_1, Boolean as ClrBoolean, Enum, Int32, Nullable_1, String as ClrString, TimeSpan, Type, ValueType, Version, Void } from "@tsonic/dotnet/System/internal/index.js";
+import * as Microsoft_EntityFrameworkCore_Infrastructure_Internal from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Infrastructure/internal/index.js";
+import type { EntityFrameworkRelationalServicesBuilder, IRelationalDbContextOptionsBuilderInfrastructure, RelationalDbContextOptionsBuilder_2, ServiceCharacteristics } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Infrastructure/internal/index.js";
+import type { DbContextOptionsBuilder } from "@tsonic/efcore/Microsoft.EntityFrameworkCore/internal/index.js";
+import type { IServiceCollection } from "@tsonic/microsoft-extensions/Microsoft.Extensions.DependencyInjection/internal/index.js";
 
 export interface INpgsqlDataSourceConfigurationPlugin$instance {
     readonly __tsonic_iface_Npgsql_EntityFrameworkCore_PostgreSQL_Infrastructure_INpgsqlDataSourceConfigurationPlugin: never;
@@ -28,7 +28,9 @@ export interface INpgsqlDataSourceConfigurationPlugin$instance {
 export type INpgsqlDataSourceConfigurationPlugin = INpgsqlDataSourceConfigurationPlugin$instance;
 
 export interface EntityFrameworkNpgsqlServicesBuilder$instance extends EntityFrameworkRelationalServicesBuilder {
-    TryGetServiceCharacteristics(serviceType: Type): Nullable<ServiceCharacteristics>;
+    readonly __tsonic_type_Npgsql_EntityFrameworkCore_PostgreSQL_Infrastructure_EntityFrameworkNpgsqlServicesBuilder: never;
+
+    TryGetServiceCharacteristics(serviceType: Type): Nullable_1<ServiceCharacteristics>;
 }
 
 
@@ -39,14 +41,16 @@ export const EntityFrameworkNpgsqlServicesBuilder: {
 
 export type EntityFrameworkNpgsqlServicesBuilder = EntityFrameworkNpgsqlServicesBuilder$instance;
 
-export interface NpgsqlDbContextOptionsBuilder$instance extends RelationalDbContextOptionsBuilder<NpgsqlDbContextOptionsBuilder, NpgsqlOptionsExtension> {
+export interface NpgsqlDbContextOptionsBuilder$instance extends RelationalDbContextOptionsBuilder_2<NpgsqlDbContextOptionsBuilder, NpgsqlOptionsExtension> {
+    readonly __tsonic_type_Npgsql_EntityFrameworkCore_PostgreSQL_Infrastructure_NpgsqlDbContextOptionsBuilder: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IRelationalDbContextOptionsBuilderInfrastructure: never;
 
-    ConfigureDataSource(dataSourceBuilderAction: Action<NpgsqlDataSourceBuilder>): NpgsqlDbContextOptionsBuilder;
+    ConfigureDataSource(dataSourceBuilderAction: Action_1<NpgsqlDataSourceBuilder>): NpgsqlDbContextOptionsBuilder;
     EnableRetryOnFailure(): NpgsqlDbContextOptionsBuilder;
     EnableRetryOnFailure(maxRetryCount: int): NpgsqlDbContextOptionsBuilder;
-    EnableRetryOnFailure(errorCodesToAdd: ICollection<System_Internal.String>): NpgsqlDbContextOptionsBuilder;
-    EnableRetryOnFailure(maxRetryCount: int, maxRetryDelay: TimeSpan, errorCodesToAdd: ICollection<System_Internal.String>): NpgsqlDbContextOptionsBuilder;
+    EnableRetryOnFailure(errorCodesToAdd: ICollection_1<System_Internal.String>): NpgsqlDbContextOptionsBuilder;
+    EnableRetryOnFailure(maxRetryCount: int, maxRetryDelay: TimeSpan, errorCodesToAdd: ICollection_1<System_Internal.String>): NpgsqlDbContextOptionsBuilder;
     MapEnum<T extends number>(enumName?: string, schemaName?: string, nameTranslator?: INpgsqlNameTranslator): NpgsqlDbContextOptionsBuilder;
     MapEnum(clrType: Type, enumName?: string, schemaName?: string, nameTranslator?: INpgsqlNameTranslator): NpgsqlDbContextOptionsBuilder;
     MapRange<TSubtype>(rangeName: string, schemaName?: string, subtypeName?: string): NpgsqlDbContextOptionsBuilder;

package/Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal/internal/index.d.ts

@@ -10,17 +10,17 @@ import type { ptr } from "@tsonic/core/types.js";
 
 // Import types from other namespaces
 import type { INpgsqlNameTranslator, NpgsqlDataSourceBuilder, ProvideClientCertificatesCallback, ProvidePasswordCallback } from "../../Npgsql/internal/index.js";
-import type { IReadOnlyDictionary, IReadOnlyList } from "@tsonic/dotnet/System.Collections.Generic.js";
-import type { DbConnection, DbDataSource } from "@tsonic/dotnet/System.Data.Common.js";
-import * as System_Internal from "@tsonic/dotnet/System.js";
-import type { Action, Boolean as ClrBoolean, IEquatable, Int32, Nullable, Object as ClrObject, String as ClrString, Type, Version, Void } from "@tsonic/dotnet/System.js";
-import type { RemoteCertificateValidationCallback } from "@tsonic/dotnet/System.Net.Security.js";
-import type { IDiagnosticsLogger } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Diagnostics.js";
-import * as Microsoft_EntityFrameworkCore_Infrastructure_Internal from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Infrastructure.js";
-import type { DbContextOptionsExtensionInfo, IDbContextOptions, IDbContextOptionsExtension, IModelValidator, ISingletonOptions, ModelValidatorDependencies, RelationalModelValidator, RelationalModelValidatorDependencies, RelationalOptionsExtension } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Infrastructure.js";
-import type { DbLoggerCategory$Model$Validation, ParameterTranslationMode } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.js";
-import type { IEntityType, IKey, IModel, IProperty, StoreObjectIdentifier } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Metadata.js";
-import type { IServiceCollection } from "@tsonic/microsoft-extensions/Microsoft.Extensions.DependencyInjection.js";
+import type { IReadOnlyDictionary_2, IReadOnlyList_1 } from "@tsonic/dotnet/System.Collections.Generic/internal/index.js";
+import type { DbConnection, DbDataSource } from "@tsonic/dotnet/System.Data.Common/internal/index.js";
+import type { RemoteCertificateValidationCallback } from "@tsonic/dotnet/System.Net.Security/internal/index.js";
+import * as System_Internal from "@tsonic/dotnet/System/internal/index.js";
+import type { Action_1, Boolean as ClrBoolean, IEquatable_1, Int32, Nullable_1, Object as ClrObject, String as ClrString, Type, Version, Void } from "@tsonic/dotnet/System/internal/index.js";
+import type { IDiagnosticsLogger_1 } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Diagnostics/internal/index.js";
+import * as Microsoft_EntityFrameworkCore_Infrastructure_Internal from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Infrastructure/internal/index.js";
+import type { DbContextOptionsExtensionInfo, IDbContextOptions, IDbContextOptionsExtension, IModelValidator, ISingletonOptions, ModelValidatorDependencies, RelationalModelValidator, RelationalModelValidatorDependencies, RelationalOptionsExtension } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Infrastructure/internal/index.js";
+import type { IEntityType, IKey, IModel, IProperty, StoreObjectIdentifier } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Metadata/internal/index.js";
+import type { DbLoggerCategory$Model$Validation, ParameterTranslationMode } from "@tsonic/efcore/Microsoft.EntityFrameworkCore/internal/index.js";
+import type { IServiceCollection } from "@tsonic/microsoft-extensions/Microsoft.Extensions.DependencyInjection/internal/index.js";
 
 export interface INpgsqlSingletonOptions$instance extends ISingletonOptions {
     readonly __tsonic_iface_Npgsql_EntityFrameworkCore_PostgreSQL_Infrastructure_Internal_INpgsqlSingletonOptions: never;
@@ -29,8 +29,8 @@ export interface INpgsqlSingletonOptions$instance extends ISingletonOptions {
     readonly IsPostgresVersionSet: boolean;
     readonly UseRedshift: boolean;
     readonly ReverseNullOrderingEnabled: boolean;
-    readonly EnumDefinitions: IReadOnlyList<EnumDefinition>;
-    readonly UserRangeDefinitions: IReadOnlyList<UserRangeDefinition>;
+    readonly EnumDefinitions: IReadOnlyList_1<EnumDefinition>;
+    readonly UserRangeDefinitions: IReadOnlyList_1<UserRangeDefinition>;
 }
 
 
@@ -39,10 +39,12 @@ export interface INpgsqlSingletonOptions$instance extends Microsoft_EntityFramew
 export type INpgsqlSingletonOptions = INpgsqlSingletonOptions$instance;
 
 export interface EnumDefinition$instance {
+    readonly __tsonic_type_Npgsql_EntityFrameworkCore_PostgreSQL_Infrastructure_Internal_EnumDefinition: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     readonly ClrType: Type;
-    readonly Labels: IReadOnlyDictionary<unknown, System_Internal.String>;
+    readonly Labels: IReadOnlyDictionary_2<unknown, System_Internal.String>;
     readonly NameTranslator: INpgsqlNameTranslator;
     readonly StoreTypeName: string;
     readonly StoreTypeSchema: string | undefined;
@@ -60,15 +62,17 @@ export const EnumDefinition: {
 export type EnumDefinition = EnumDefinition$instance;
 
 export interface NpgsqlModelValidator$instance extends RelationalModelValidator {
+    readonly __tsonic_type_Npgsql_EntityFrameworkCore_PostgreSQL_Infrastructure_Internal_NpgsqlModelValidator: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IModelValidator: never;
 
-    Validate(model: IModel, logger: IDiagnosticsLogger<DbLoggerCategory$Model$Validation>): void;
-    ValidateCompatible(property: IProperty, duplicateProperty: IProperty, columnName: string, storeObject: StoreObjectIdentifier, logger: IDiagnosticsLogger<DbLoggerCategory$Model$Validation>): void;
+    Validate(model: IModel, logger: IDiagnosticsLogger_1<DbLoggerCategory$Model$Validation>): void;
+    ValidateCompatible(property: IProperty, duplicateProperty: IProperty, columnName: string, storeObject: StoreObjectIdentifier, logger: IDiagnosticsLogger_1<DbLoggerCategory$Model$Validation>): void;
     ValidateIdentityVersionCompatibility(model: IModel): void;
     ValidateIndexIncludeProperties(model: IModel): void;
-    ValidateStoredProcedures(model: IModel, logger: IDiagnosticsLogger<DbLoggerCategory$Model$Validation>): void;
-    ValidateTypeMappings(model: IModel, logger: IDiagnosticsLogger<DbLoggerCategory$Model$Validation>): void;
-    ValidateValueGeneration(entityType: IEntityType, key: IKey, logger: IDiagnosticsLogger<DbLoggerCategory$Model$Validation>): void;
+    ValidateStoredProcedures(model: IModel, logger: IDiagnosticsLogger_1<DbLoggerCategory$Model$Validation>): void;
+    ValidateTypeMappings(model: IModel, logger: IDiagnosticsLogger_1<DbLoggerCategory$Model$Validation>): void;
+    ValidateValueGeneration(entityType: IEntityType, key: IKey, logger: IDiagnosticsLogger_1<DbLoggerCategory$Model$Validation>): void;
 }
 
 
@@ -80,18 +84,20 @@ export const NpgsqlModelValidator: {
 export type NpgsqlModelValidator = NpgsqlModelValidator$instance;
 
 export interface NpgsqlOptionsExtension$instance extends RelationalOptionsExtension {
+    readonly __tsonic_type_Npgsql_EntityFrameworkCore_PostgreSQL_Infrastructure_Internal_NpgsqlOptionsExtension: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IDbContextOptionsExtension: never;
 
     get AdminDatabase(): string | undefined;
     set AdminDatabase(value: string | undefined);
     get DataSource(): DbDataSource | undefined;
     set DataSource(value: DbDataSource | undefined);
-    get DataSourceBuilderAction(): Action<NpgsqlDataSourceBuilder> | undefined;
-    set DataSourceBuilderAction(value: Action<NpgsqlDataSourceBuilder> | undefined);
-    readonly EnumDefinitions: IReadOnlyList<EnumDefinition>;
+    get DataSourceBuilderAction(): Action_1<NpgsqlDataSourceBuilder> | undefined;
+    set DataSourceBuilderAction(value: Action_1<NpgsqlDataSourceBuilder> | undefined);
+    readonly EnumDefinitions: IReadOnlyList_1<EnumDefinition>;
     readonly Info: DbContextOptionsExtensionInfo;
     readonly IsPostgresVersionSet: boolean;
-    readonly MinBatchSize: Nullable<System_Internal.Int32>;
+    readonly MinBatchSize: Nullable_1<System_Internal.Int32>;
     readonly ParameterizedCollectionMode: ParameterTranslationMode;
     readonly PostgresVersion: Version;
     get ProvideClientCertificatesCallback(): ProvideClientCertificatesCallback | undefined;
@@ -102,7 +108,7 @@ export interface NpgsqlOptionsExtension$instance extends RelationalOptionsExtens
     set RemoteCertificateValidationCallback(value: RemoteCertificateValidationCallback | undefined);
     ReverseNullOrdering: boolean;
     UseRedshift: boolean;
-    readonly UserRangeDefinitions: IReadOnlyList<UserRangeDefinition>;
+    readonly UserRangeDefinitions: IReadOnlyList_1<UserRangeDefinition>;
     ApplyServices(services: IServiceCollection): void;
     Clone(): RelationalOptionsExtension;
     Validate(options: IDbContextOptions): void;
@@ -110,7 +116,7 @@ export interface NpgsqlOptionsExtension$instance extends RelationalOptionsExtens
     WithConnection(connection: DbConnection): RelationalOptionsExtension;
     WithConnectionString(connectionString: string): RelationalOptionsExtension;
     WithDataSource(dataSource: DbDataSource): RelationalOptionsExtension;
-    WithDataSourceConfiguration(dataSourceBuilderAction: Action<NpgsqlDataSourceBuilder>): NpgsqlOptionsExtension;
+    WithDataSourceConfiguration(dataSourceBuilderAction: Action_1<NpgsqlDataSourceBuilder>): NpgsqlOptionsExtension;
     WithEnumMapping(clrType: Type, enumName: string, schemaName: string, nameTranslator: INpgsqlNameTranslator): NpgsqlOptionsExtension;
     WithPostgresVersion(postgresVersion: Version): NpgsqlOptionsExtension;
     WithProvideClientCertificatesCallback(callback: ProvideClientCertificatesCallback): NpgsqlOptionsExtension;
@@ -133,6 +139,8 @@ export const NpgsqlOptionsExtension: {
 export type NpgsqlOptionsExtension = NpgsqlOptionsExtension$instance;
 
 export interface UserRangeDefinition$instance {
+    readonly __tsonic_type_Npgsql_EntityFrameworkCore_PostgreSQL_Infrastructure_Internal_UserRangeDefinition: never;
+
     readonly __tsonic_iface_System_IEquatable_1: never;
 
     readonly StoreTypeName: string;

package/Npgsql.EntityFrameworkCore.PostgreSQL.Internal/internal/index.d.ts

@@ -8,24 +8,26 @@ import type { sbyte, byte, short, ushort, int, uint, long, ulong, int128, uint12
 // Import types from other namespaces
 import * as Npgsql_EntityFrameworkCore_PostgreSQL_Infrastructure_Internal_Internal from "../../Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal/internal/index.js";
 import type { EnumDefinition, INpgsqlSingletonOptions, UserRangeDefinition } from "../../Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal/internal/index.js";
-import type { IReadOnlyList } from "@tsonic/dotnet/System.Collections.Generic.js";
-import * as System_Internal from "@tsonic/dotnet/System.js";
-import type { Boolean as ClrBoolean, Object as ClrObject, String as ClrString, Version, Void } from "@tsonic/dotnet/System.js";
-import type { EventDefinition, FallbackEventDefinition, IDiagnosticsLogger } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Diagnostics.js";
-import * as Microsoft_EntityFrameworkCore_Infrastructure_Internal from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Infrastructure.js";
-import type { IDbContextOptions, ISingletonOptions } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Infrastructure.js";
-import type { DbLoggerCategory$Scaffolding } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.js";
+import type { IReadOnlyList_1 } from "@tsonic/dotnet/System.Collections.Generic/internal/index.js";
+import * as System_Internal from "@tsonic/dotnet/System/internal/index.js";
+import type { Boolean as ClrBoolean, Object as ClrObject, String as ClrString, Version, Void } from "@tsonic/dotnet/System/internal/index.js";
+import type { EventDefinition_1, EventDefinition_2, EventDefinition_3, EventDefinition_4, EventDefinition_6, FallbackEventDefinition, IDiagnosticsLogger, IDiagnosticsLogger_1 } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Diagnostics/internal/index.js";
+import * as Microsoft_EntityFrameworkCore_Infrastructure_Internal from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Infrastructure/internal/index.js";
+import type { IDbContextOptions, ISingletonOptions } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Infrastructure/internal/index.js";
+import type { DbLoggerCategory$Scaffolding } from "@tsonic/efcore/Microsoft.EntityFrameworkCore/internal/index.js";
 
 export interface NpgsqlSingletonOptions$instance {
+    readonly __tsonic_type_Npgsql_EntityFrameworkCore_PostgreSQL_Internal_NpgsqlSingletonOptions: never;
+
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_ISingletonOptions: never;
     readonly __tsonic_iface_Npgsql_EntityFrameworkCore_PostgreSQL_Infrastructure_Internal_INpgsqlSingletonOptions: never;
 
-    EnumDefinitions: IReadOnlyList<EnumDefinition>;
+    EnumDefinitions: IReadOnlyList_1<EnumDefinition>;
     IsPostgresVersionSet: boolean;
     PostgresVersion: Version;
     ReverseNullOrderingEnabled: boolean;
     UseRedshift: boolean;
-    UserRangeDefinitions: IReadOnlyList<UserRangeDefinition>;
+    UserRangeDefinitions: IReadOnlyList_1<UserRangeDefinition>;
     Initialize(options: IDbContextOptions): void;
     Validate(options: IDbContextOptions): void;
 }
@@ -44,38 +46,38 @@ export type NpgsqlSingletonOptions = NpgsqlSingletonOptions$instance & __NpgsqlS
 
 
 export abstract class NpgsqlLoggerExtensions$instance {
-    static CollationFound(diagnostics: IDiagnosticsLogger<DbLoggerCategory$Scaffolding>, schema: string, collationName: string, lcCollate: string, lcCtype: string, provider: string, deterministic: boolean): void;
-    static ColumnFound(diagnostics: IDiagnosticsLogger<DbLoggerCategory$Scaffolding>, tableName: string, columnName: string, dataTypeName: string, nullable: boolean, identity: boolean, defaultValue: string, computedValue: string): void;
-    static EnumColumnSkippedWarning(diagnostics: IDiagnosticsLogger<DbLoggerCategory$Scaffolding>, columnName: string): void;
-    static ExpressionIndexSkippedWarning(diagnostics: IDiagnosticsLogger<DbLoggerCategory$Scaffolding>, indexName: string, tableName: string): void;
-    static ForeignKeyReferencesMissingPrincipalTableWarning(diagnostics: IDiagnosticsLogger<DbLoggerCategory$Scaffolding>, foreignKeyName: string, tableName: string, principalTableName: string): void;
-    static MissingSchemaWarning(diagnostics: IDiagnosticsLogger<DbLoggerCategory$Scaffolding>, schemaName: string): void;
-    static MissingTableWarning(diagnostics: IDiagnosticsLogger<DbLoggerCategory$Scaffolding>, tableName: string): void;
-    static UniqueConstraintFound(diagnostics: IDiagnosticsLogger<DbLoggerCategory$Scaffolding>, uniqueConstraintName: string, tableName: string): void;
-    static UnsupportedColumnConstraintSkippedWarning(diagnostics: IDiagnosticsLogger<DbLoggerCategory$Scaffolding>, indexName: string, tableName: string): void;
-    static UnsupportedColumnIndexSkippedWarning(diagnostics: IDiagnosticsLogger<DbLoggerCategory$Scaffolding>, indexName: string, tableName: string): void;
+    static CollationFound(diagnostics: IDiagnosticsLogger_1<DbLoggerCategory$Scaffolding>, schema: string, collationName: string, lcCollate: string, lcCtype: string, provider: string, deterministic: boolean): void;
+    static ColumnFound(diagnostics: IDiagnosticsLogger_1<DbLoggerCategory$Scaffolding>, tableName: string, columnName: string, dataTypeName: string, nullable: boolean, identity: boolean, defaultValue: string, computedValue: string): void;
+    static EnumColumnSkippedWarning(diagnostics: IDiagnosticsLogger_1<DbLoggerCategory$Scaffolding>, columnName: string): void;
+    static ExpressionIndexSkippedWarning(diagnostics: IDiagnosticsLogger_1<DbLoggerCategory$Scaffolding>, indexName: string, tableName: string): void;
+    static ForeignKeyReferencesMissingPrincipalTableWarning(diagnostics: IDiagnosticsLogger_1<DbLoggerCategory$Scaffolding>, foreignKeyName: string, tableName: string, principalTableName: string): void;
+    static MissingSchemaWarning(diagnostics: IDiagnosticsLogger_1<DbLoggerCategory$Scaffolding>, schemaName: string): void;
+    static MissingTableWarning(diagnostics: IDiagnosticsLogger_1<DbLoggerCategory$Scaffolding>, tableName: string): void;
+    static UniqueConstraintFound(diagnostics: IDiagnosticsLogger_1<DbLoggerCategory$Scaffolding>, uniqueConstraintName: string, tableName: string): void;
+    static UnsupportedColumnConstraintSkippedWarning(diagnostics: IDiagnosticsLogger_1<DbLoggerCategory$Scaffolding>, indexName: string, tableName: string): void;
+    static UnsupportedColumnIndexSkippedWarning(diagnostics: IDiagnosticsLogger_1<DbLoggerCategory$Scaffolding>, indexName: string, tableName: string): void;
 }
 
 
 export type NpgsqlLoggerExtensions = NpgsqlLoggerExtensions$instance;
 
 export abstract class NpgsqlResources$instance {
-    static LogEnumColumnSkipped(logger: IDiagnosticsLogger): EventDefinition<System_Internal.String>;
-    static LogExpressionIndexSkipped(logger: IDiagnosticsLogger): EventDefinition<System_Internal.String, System_Internal.String>;
-    static LogFoundCollation(logger: IDiagnosticsLogger): EventDefinition<System_Internal.String, System_Internal.String, System_Internal.String, System_Internal.String, string | undefined, System_Internal.Boolean>;
+    static LogEnumColumnSkipped(logger: IDiagnosticsLogger): EventDefinition_1<System_Internal.String>;
+    static LogExpressionIndexSkipped(logger: IDiagnosticsLogger): EventDefinition_2<System_Internal.String, System_Internal.String>;
+    static LogFoundCollation(logger: IDiagnosticsLogger): EventDefinition_6<System_Internal.String, System_Internal.String, System_Internal.String, System_Internal.String, string | undefined, System_Internal.Boolean>;
     static LogFoundColumn(logger: IDiagnosticsLogger): FallbackEventDefinition;
-    static LogFoundForeignKey(logger: IDiagnosticsLogger): EventDefinition<System_Internal.String, System_Internal.String, System_Internal.String, System_Internal.String>;
-    static LogFoundIndex(logger: IDiagnosticsLogger): EventDefinition<System_Internal.String, System_Internal.String, System_Internal.Boolean>;
-    static LogFoundPrimaryKey(logger: IDiagnosticsLogger): EventDefinition<System_Internal.String, System_Internal.String>;
+    static LogFoundForeignKey(logger: IDiagnosticsLogger): EventDefinition_4<System_Internal.String, System_Internal.String, System_Internal.String, System_Internal.String>;
+    static LogFoundIndex(logger: IDiagnosticsLogger): EventDefinition_3<System_Internal.String, System_Internal.String, System_Internal.Boolean>;
+    static LogFoundPrimaryKey(logger: IDiagnosticsLogger): EventDefinition_2<System_Internal.String, System_Internal.String>;
     static LogFoundSequence(logger: IDiagnosticsLogger): FallbackEventDefinition;
-    static LogFoundTable(logger: IDiagnosticsLogger): EventDefinition<System_Internal.String>;
-    static LogFoundUniqueConstraint(logger: IDiagnosticsLogger): EventDefinition<string | undefined, System_Internal.String>;
-    static LogMissingSchema(logger: IDiagnosticsLogger): EventDefinition<string | undefined>;
-    static LogMissingTable(logger: IDiagnosticsLogger): EventDefinition<string | undefined>;
-    static LogPrincipalColumnNotFound(logger: IDiagnosticsLogger): EventDefinition<System_Internal.String, System_Internal.String, System_Internal.String, System_Internal.String>;
-    static LogPrincipalTableNotInSelectionSet(logger: IDiagnosticsLogger): EventDefinition<string | undefined, string | undefined, string | undefined>;
-    static LogUnsupportedColumnConstraintSkipped(logger: IDiagnosticsLogger): EventDefinition<string | undefined, System_Internal.String>;
-    static LogUnsupportedColumnIndexSkipped(logger: IDiagnosticsLogger): EventDefinition<System_Internal.String, System_Internal.String>;
+    static LogFoundTable(logger: IDiagnosticsLogger): EventDefinition_1<System_Internal.String>;
+    static LogFoundUniqueConstraint(logger: IDiagnosticsLogger): EventDefinition_2<string | undefined, System_Internal.String>;
+    static LogMissingSchema(logger: IDiagnosticsLogger): EventDefinition_1<string | undefined>;
+    static LogMissingTable(logger: IDiagnosticsLogger): EventDefinition_1<string | undefined>;
+    static LogPrincipalColumnNotFound(logger: IDiagnosticsLogger): EventDefinition_4<System_Internal.String, System_Internal.String, System_Internal.String, System_Internal.String>;
+    static LogPrincipalTableNotInSelectionSet(logger: IDiagnosticsLogger): EventDefinition_3<string | undefined, string | undefined, string | undefined>;
+    static LogUnsupportedColumnConstraintSkipped(logger: IDiagnosticsLogger): EventDefinition_2<string | undefined, System_Internal.String>;
+    static LogUnsupportedColumnIndexSkipped(logger: IDiagnosticsLogger): EventDefinition_2<System_Internal.String, System_Internal.String>;
 }
 
 

package/Npgsql.EntityFrameworkCore.PostgreSQL.Metadata/internal/index.d.ts

@@ -6,11 +6,11 @@
 import type { sbyte, byte, short, ushort, int, uint, long, ulong, int128, uint128, half, float, double, decimal, nint, nuint, char } from '@tsonic/core/types.js';
 
 // Import types from other namespaces
-import type { IEnumerable, IReadOnlyList, List } from "@tsonic/dotnet/System.Collections.Generic.js";
-import * as System_Internal from "@tsonic/dotnet/System.js";
-import type { Boolean as ClrBoolean, Enum, IComparable, IConvertible, IFormattable, Int32, ISpanFormattable, Nullable, Object as ClrObject, String as ClrString } from "@tsonic/dotnet/System.js";
-import type { Annotatable, IReadOnlyAnnotatable } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Infrastructure.js";
-import type { IConventionAnnotatable, IMutableAnnotatable } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Metadata.js";
+import type { IEnumerable_1, IReadOnlyList_1, List_1 } from "@tsonic/dotnet/System.Collections.Generic/internal/index.js";
+import * as System_Internal from "@tsonic/dotnet/System/internal/index.js";
+import type { Boolean as ClrBoolean, Enum, IComparable, IConvertible, IFormattable, Int32, ISpanFormattable, Nullable_1, Object as ClrObject, String as ClrString } from "@tsonic/dotnet/System/internal/index.js";
+import type { Annotatable, IReadOnlyAnnotatable } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Infrastructure/internal/index.js";
+import type { IConventionAnnotatable, IMutableAnnotatable } from "@tsonic/efcore/Microsoft.EntityFrameworkCore.Metadata/internal/index.js";
 
 export enum NpgsqlValueGenerationStrategy {
     None = 0,
@@ -36,8 +36,10 @@ export enum SortOrder {
 
 
 export interface CockroachDbInterleaveInParent$instance {
+    readonly __tsonic_type_Npgsql_EntityFrameworkCore_PostgreSQL_Metadata_CockroachDbInterleaveInParent: never;
+
     readonly Annotatable: Annotatable;
-    InterleavePrefix: List<System_Internal.String>;
+    InterleavePrefix: List_1<System_Internal.String>;
     ParentTableName: string;
     get ParentTableSchema(): string | undefined;
     set ParentTableSchema(value: string | undefined);
@@ -52,8 +54,10 @@ export const CockroachDbInterleaveInParent: {
 export type CockroachDbInterleaveInParent = CockroachDbInterleaveInParent$instance;
 
 export interface PostgresCollation$instance {
+    readonly __tsonic_type_Npgsql_EntityFrameworkCore_PostgreSQL_Metadata_PostgresCollation: never;
+
     readonly Annotatable: Annotatable;
-    IsDeterministic: Nullable<System_Internal.Boolean>;
+    IsDeterministic: Nullable_1<System_Internal.Boolean>;
     LcCollate: string;
     LcCtype: string;
     readonly Name: string;
@@ -65,16 +69,18 @@ export interface PostgresCollation$instance {
 
 export const PostgresCollation: {
     FindCollation(annotatable: IReadOnlyAnnotatable, schema: string, name: string): PostgresCollation | undefined;
-    GetCollations(annotatable: IReadOnlyAnnotatable): IEnumerable<PostgresCollation>;
-    GetOrAddCollation(annotatable: IMutableAnnotatable, schema: string, name: string, lcCollate: string, lcCtype: string, provider?: string, deterministic?: Nullable<System_Internal.Boolean>): PostgresCollation;
+    GetCollations(annotatable: IReadOnlyAnnotatable): IEnumerable_1<PostgresCollation>;
+    GetOrAddCollation(annotatable: IMutableAnnotatable, schema: string, name: string, lcCollate: string, lcCtype: string, provider?: string, deterministic?: Nullable_1<System_Internal.Boolean>): PostgresCollation;
 };
 
 
 export type PostgresCollation = PostgresCollation$instance;
 
 export interface PostgresEnum$instance {
+    readonly __tsonic_type_Npgsql_EntityFrameworkCore_PostgreSQL_Metadata_PostgresEnum: never;
+
     readonly Annotatable: Annotatable;
-    Labels: IReadOnlyList<System_Internal.String>;
+    Labels: IReadOnlyList_1<System_Internal.String>;
     readonly Name: string;
     readonly Schema: string | undefined;
 }
@@ -85,13 +91,15 @@ export const PostgresEnum: {
     GetOrAddPostgresEnum(annotatable: IConventionAnnotatable, schema: string, name: string, labels: string[]): PostgresEnum;
     GetOrAddPostgresEnum(annotatable: IMutableAnnotatable, schema: string, name: string, labels: string[]): PostgresEnum;
     GetOrAddPostgresEnum(annotatable: IMutableAnnotatable, name: string, labels: string[]): PostgresEnum;
-    GetPostgresEnums(annotatable: IReadOnlyAnnotatable): IEnumerable<PostgresEnum>;
+    GetPostgresEnums(annotatable: IReadOnlyAnnotatable): IEnumerable_1<PostgresEnum>;
 };
 
 
 export type PostgresEnum = PostgresEnum$instance;
 
 export interface PostgresExtension$instance {
+    readonly __tsonic_type_Npgsql_EntityFrameworkCore_PostgreSQL_Metadata_PostgresExtension: never;
+
     readonly Annotatable: Annotatable;
     readonly Name: string;
     readonly Schema: string | undefined;
@@ -105,13 +113,15 @@ export const PostgresExtension: {
     GetOrAddPostgresExtension(annotatable: IConventionAnnotatable, schema: string, name: string, version: string): PostgresExtension;
     GetOrAddPostgresExtension(annotatable: IMutableAnnotatable, schema: string, name: string, version: string): PostgresExtension;
     GetOrAddPostgresExtension(annotatable: IMutableAnnotatable, name: string, version: string): PostgresExtension;
-    GetPostgresExtensions(annotatable: IReadOnlyAnnotatable): IEnumerable<PostgresExtension>;
+    GetPostgresExtensions(annotatable: IReadOnlyAnnotatable): IEnumerable_1<PostgresExtension>;
 };
 
 
 export type PostgresExtension = PostgresExtension$instance;
 
 export interface PostgresRange$instance {
+    readonly __tsonic_type_Npgsql_EntityFrameworkCore_PostgreSQL_Metadata_PostgresRange: never;
+
     readonly Annotatable: Annotatable;
     get CanonicalFunction(): string | undefined;
     set CanonicalFunction(value: string | undefined);
@@ -130,7 +140,7 @@ export interface PostgresRange$instance {
 export const PostgresRange: {
     FindPostgresRange(annotatable: IReadOnlyAnnotatable, schema: string, name: string): PostgresRange | undefined;
     GetOrAddPostgresRange(annotatable: IMutableAnnotatable, schema: string, name: string, subtype: string, canonicalFunction?: string, subtypeOpClass?: string, collation?: string, subtypeDiff?: string): PostgresRange;
-    GetPostgresRanges(annotatable: IReadOnlyAnnotatable): IEnumerable<PostgresRange>;
+    GetPostgresRanges(annotatable: IReadOnlyAnnotatable): IEnumerable_1<PostgresRange>;
 };
 
 
@@ -138,7 +148,7 @@ export type PostgresRange = PostgresRange$instance;
 
 export abstract class NpgsqlValueGenerationStrategyExtensions$instance {
     static IsIdentity(strategy: NpgsqlValueGenerationStrategy): boolean;
-    static IsIdentity(strategy: Nullable<NpgsqlValueGenerationStrategy>): boolean;
+    static IsIdentity(strategy: Nullable_1<NpgsqlValueGenerationStrategy>): boolean;
 }