@karmaniverous/entity-manager 6.7.4 → 6.8.0

package/dist/index.d.ts

@@ -1,7 +1,17 @@
+import { EntityMap, TranscodeMap, FlattenEntityMap, Exactify, PropertiesOfType, TranscodableProperties, Transcodes, SortOrder } from '@karmaniverous/entity-tools';
 import { BatchProcessOptions } from '@karmaniverous/batch-process';
-import { Entity, Exactify, TranscodeMap, PropertiesOfType, TranscodableProperties, Transcodes, DefaultTranscodeMap, SortOrder } from '@karmaniverous/entity-tools';
 import { z } from 'zod';
 
+interface BaseConfigMap {
+    EntityMap: EntityMap;
+    HashKey: string;
+    RangeKey: string;
+    ShardedKeys: string;
+    UnshardedKeys: string;
+    TranscodedProperties: string;
+    TranscodeMap: TranscodeMap;
+}
+
 /**
  * Base EntityClient options.
  *
@@ -25,52 +35,49 @@ declare abstract class BaseEntityClient {
     /**
      * DynamoDB EntityClient constructor.
      *
-     * @param options - {@link EntityClientOptions | `EntityClientOptions`} object.
+     * @param options - {@link BaseEntityClientOptions | `BaseEntityClientOptions`} object.
      */
     constructor(options: BaseEntityClientOptions);
 }
 
 /**
- * The base EntityMap type. All EntityMaps should extend this type.
+ * Extracts a database-facing partial item type from a {@link BaseConfigMap | `ConfigMap`}.
  *
  * @category Entities
  */
-type EntityMap = Record<string, Entity>;
+type EntityItem<C extends BaseConfigMap> = Partial<FlattenEntityMap<C['EntityMap']> & Record<C['HashKey'] | C['RangeKey'] | C['ShardedKeys'] | C['UnshardedKeys'], string>> & Record<string, unknown>;
+
 /**
- * Tests a string literal type to determine whether it is a key of any {@link Entity | `Entity`} in an {@link EntityMap | `EntityMap`} or is a member of a union of reserved keys.
- *
- * @typeParam K - The string literal type to test.
- * @typeParam M - The {@link EntityMap | `EntityMap`}.
- * @typeParam R - The reserved set of string literal types.
- *
- * @returns `K` if `K` is exclusive or `never` otherwise.
+ * A result returned by a query across multiple shards, where each shard may
+ * receive multiple page queries via a dynamically-generated {@link ShardQueryFunction | `ShardQueryFunction`}.
  *
- * @category Config
- * @protected
+ * @category Query
  */
-type ExclusiveKey<K extends string, M extends EntityMap, R extends string = never> = keyof {
-    [E in keyof Exactify<M> as K extends keyof Exactify<M[E]> | R ? K : never]: never;
-} extends never ? K : never;
+interface QueryResult<C extends BaseConfigMap> {
+    /** Total number of records returned across all shards. */
+    count: number;
+    /** The returned records. */
+    items: EntityItem<C>[];
+    /**
+     * A compressed, two-layer map of page keys, used to query the next page of
+     * data for a given sort key on each shard of a given hash key.
+     */
+    pageKeyMap: string;
+}
+
 /**
- * Returns the `generated` property of a Config entity.
+ * Return a type with required property K of type O if C is not `never`, otherwise return a type where K is optional or accepts an empty object.
  *
- * @typeParam EntityToken - The {@link Entity | `Entity`} token.
- * @typeParam M - The {@link EntityMap | `EntityMap`}.
- * @typeParam T - The {@link TranscodeMap | `TranscodeMap`} identifying transcodable property types.
- *
- * @remarks
- * All Entity properties of type `never` must be represented, and no extra properties are allowed.
- *
- * @category Config
- * @protected
+ * @typeParam K - The property key.
+ * @typeParam C - The condition to check.
+ * @typeParam O - The type of the property.
  */
-type ConfigEntityGenerated<EntityToken extends keyof Exactify<M>, M extends EntityMap, T extends TranscodeMap> = ([PropertiesOfType<M[EntityToken], never>] extends [never] ? never : Record<PropertiesOfType<M[EntityToken], never>, {
-    atomic?: boolean;
-    elements: TranscodableProperties<M[EntityToken], T>[];
-    sharded?: boolean;
-}>) | ([PropertiesOfType<M[EntityToken], never>] extends [never] ? Record<string, never> : never);
+type ConditionalProperty<K extends PropertyKey, C, O extends object> = [
+    C
+] extends [never] ? Record<K, never> | Partial<Record<K, Record<PropertyKey, never>>> : Record<K, O>;
+
 /**
- * Defines a single time period in an {@link Entity | `Entity`} sharding strategy.
+ * Defines a single time period in an entity sharding strategy.
  *
  * @category Config
  * @protected
@@ -79,7 +86,7 @@ interface ShardBump {
     /**
      * The timestamp marking the beginning of the time period. Must be a non-negative integer.
      *
-     * This value must be unique across all {@link ShardBump | `ShardBumps`} for the {@link Entity | `Entity`}.
+     * This value must be unique across all {@link ShardBump | `ShardBumps`} for the entity.
      */
     timestamp: number;
     /**
@@ -96,351 +103,37 @@ interface ShardBump {
      */
     chars: number;
 }
-/**
- * Returns a Config entity index component type.
- *
- * @typeParam EntityToken - The {@link Entity | `Entity`} token.
- * @typeParam M - The {@link EntityMap | `EntityMap`}.
- * @typeParam HashKey - The property used across the configuration to store an {@link Entity | `Entity`}'s sharded hash key. Should be configured as the table hash key. Must not conflict with any {@link Entity | `Entity`} property.
- * @typeParam RangeKey - The property used across the configuration to store an {@link Entity | `Entity`}'s range key. Should be configured as the table range key. Must not conflict with any {@link Entity | `Entity`} property.
- * @typeParam T - The {@link TranscodeMap | `TranscodeMap`} identifying transcodable property types. Only {@link Entity | `Entity`} properties of these types can be components of an {@link ConfigEntity.indexes | index} or a {@link ConfigEntityGenerated | generated property}.
-
- * @category Config
- * @protected
- */
-type ConfigEntityIndexComponent<EntityToken extends keyof Exactify<M>, M extends EntityMap, HashKey extends string, RangeKey extends string, T extends TranscodeMap> = TranscodableProperties<M[EntityToken], T> | PropertiesOfType<M[EntityToken], never> | HashKey | RangeKey;
-/**
- * Returns a Config entity type.
- *
- * @typeParam EntityToken - The {@link Entity | `Entity`} token.
- * @typeParam M - The {@link EntityMap | `EntityMap`}.
- * @typeParam HashKey - The property used across the configuration to store an {@link Entity | `Entity`}'s sharded hash key. Should be configured as the table hash key. Must not conflict with any {@link Entity | `Entity`} property.
- * @typeParam RangeKey - The property used across the configuration to store an {@link Entity | `Entity`}'s range key. Should be configured as the table range key. Must not conflict with any {@link Entity | `Entity`} property.
- * @typeParam T - The {@link TranscodeMap | `TranscodeMap`} identifying transcodable property types. Only {@link Entity | `Entity`} properties of these types can be components of an {@link ConfigEntity.indexes | index} or a {@link ConfigEntityGenerated | generated property}.
-
- * @remarks
- * `generated` is optional if `E` has no properties of type `never`.
- *
- * @category Config
- * @protected
- */
-type ConfigEntity<EntityToken extends keyof Exactify<M>, M extends EntityMap, HashKey extends string, RangeKey extends string, T extends TranscodeMap> = {
-    /**
-     * The default maximum number of records to return from a query.
-     *
-     * @defaultValue `10`
-     *
-     * @remarks
-     * Can be overridden at {@link QueryOptions.limit | `QueryOptions.limit`}.
-     *
-     * In cross-shard queries, the actual number of records returned is heavily influenced by {@link QueryOptions.pageSize | query pageSize} and the number of shards queried. Actual results may significantly exceed this limit.
-     */
-    defaultLimit?: number;
-    /**
-     * The default maximum number of records to return per data page on an individual shard query.
-     *
-     * @defaultValue `10`
-     *
-     * @remarks
-     * Shard queries will be repeated internally until either the shard is exhausted or the number of records returned exceeds the {@link QueryOptions.limit | query limit}.
-     *
-     * Can be overridden at {@link QueryOptions.pageSize | `QueryOptions.pageSize`}.
-     */
-    defaultPageSize?: number;
-    /**
-     * This object assigns transcodes to {@link Entity | `Entity`} generated property & ungenerated index elements.
-     *
-     * These transcodes are used to encode and decode generated property values & pageKeys.
-     *
-     * The keys of this object must be transcodable properties of the {@link Entity | `Entity`}.
-     *
-     * The values of this object must be one of the keys of the {@link Config | `Config`} `T` type parameter (the config's {@link TranscodeMap | `TranscodeMap`}).
-     *
-     * The types of the related {@link Entity | `Entity`} and {@link TranscodeMap | `TranscodeMap`} properties should match.
-     *
-     * If any entity generated property element or ungenerated index element is not included here, the {@link Config | `Config`} object will fail to parse.
-     *
-     * @example
-     * ```
-     * // Default transcodable types.
-     * interface DefaultTranscodeMap extends TranscodeMap {
-     *   string: string;
-     *   number: number;
-     *   boolean: boolean;
-     *   bigint: bigint;
-     * }
-     *
-     * interface MyEntityMap extends EntityMap {
-     *   user: {
-     *    created: number;
-     *    data?: Json; // Not a Stringifiable type
-     *    userId: string;
-     *   };
-     * }
-     *
-     * // T type param defaults to DefaultTranscodeMap.
-     * const config: Config<MyEntityMap> = {
-     *   entities: {
-     *     user: {
-     *       ...,
-     *       types: { // All Stringafiable properties required!
-     *         created: 'number',
-     *         userId: 'string',
-     *         // 'data' not allowed: not a Stringifiable type
-     *       }
-     *     }
-     *   },
-     *   ...
-     * };
-     * ```
-     */
-    elementTranscodes?: ([TranscodableProperties<M[EntityToken], T>] extends [never] ? never : {
-        [P in TranscodableProperties<M[EntityToken], T>]?: PropertiesOfType<T, M[EntityToken][P]>;
-    }) | ([TranscodableProperties<M[EntityToken], T>] extends [never] ? Record<string, never> : never);
-    /**
-     * Indexes defined for the {@link Entity | `Entity`}. Should reflect the underlying database table indexes.
-     *
-     * Each key is the name of an index, and each value defines the hash key, range key, and projected properties of the index.
-     *
-     * hashKey and rangeKey types must align with the {@link Config | `Config`} `T` type parameter. Note that all {@link ConfigEntityGenerated | generated property} types are transcodable by definition.
-     */
-    indexes?: Record<string, {
-        hashKey: ConfigEntityIndexComponent<EntityToken, M, HashKey, RangeKey, T>;
-        rangeKey: ConfigEntityIndexComponent<EntityToken, M, HashKey, RangeKey, T>;
-        projections?: (keyof M[EntityToken])[];
-    }>;
-    /**
-     * An array of {@link ShardBump | `ShardBump`} objects representing the {@link Entity | `Entity`}'s sharding strategy.
-     *
-     * If omitted, or if configured without a zero-{@link ShardBump.timestamp | `timestamp`} {@link ShardBump | `ShardBump`}, this array will be initialized with the following {@link ShardBump | `ShardBump`} as its first member:
-     *
-     * ```
-     * { timestamp: 0, charBits: 0, chars: 1 }
-     * ```
-     *
-     * Members must be unique by {@link ShardBump.timestamp | `timestamp`}.
-     *
-     * {@link ShardBump.chars | `chars`} must increase monotonically with {@link ShardBump.timestamp | `timestamp`}
-     *
-     * Array will be sorted in ascending order by {@link ShardBump.timestamp | `timestamp`} on initialization.
-     *
-     * Future {@link ShardBump | `ShardBumps`} can be changed as required, but past {@link ShardBump | `ShardBumps`} should not be modified or data integrity will be compromised!
-     */
-    shardBumps?: ShardBump[];
-    /**
-     * Identifies the {@link Entity | `Entity`} property used as the timestamp for shard key calculations.
-     *
-     * This property must be of type `number`. Its value should not change over the life of the record. A `created` timestamp is ideal.
-     *
-     * Once in production, this configuration property should not be changed or data integrity will be compromised!
-     */
-    timestampProperty: PropertiesOfType<M[EntityToken], number>;
-    /**
-     * Identifies the {@link Entity | `Entity`} used as the basis for both shard key calculations and the table's {@link ConfigKeys.rangeKey | range key}.
-     *
-     * This property must be of type `string` or `number`. Its value should be a unique record identifier and should not change over the life of the record.
-     *
-     * Once in production, this configuration property should not be changed or data integrity will be compromised!
-     */
-    uniqueProperty: PropertiesOfType<M[EntityToken], number | string>;
-} & ([PropertiesOfType<M[EntityToken], never>] extends [never] ? {
-    generated?: ConfigEntityGenerated<EntityToken, M, T>;
-} : {
-    /**
-     * {@link Entity | `Entity`} properties whose values will be generated by EntityManager.
-     *
-     * These properties should be indicated by a `never` type in the {@link Config | `Config`} `EntityMap` type parameter.
-     *
-     * All such properties must be accounted for in the `generated` object, and no additional properties are permitted..
-     */
-    generated: ConfigEntityGenerated<EntityToken, M, T>;
-});
-/**
- * Returns the `entities` property of the {@link Config | `Config`} tyoe.
- *
- * @typeParam M - The {@link EntityMap | `EntityMap`} type that identitfies the {@link Entity | `Entity`} & related property types to be managed by EntityManager.
- * @typeParam HashKey - The property used across the configuration to store an {@link Entity | `Entity`}'s sharded hash key. Should be configured as the table hash key. Must not conflict with any {@link Entity | `Entity`} property.
- * @typeParam RangeKey - The property used across the configuration to store an {@link Entity | `Entity`}'s range key. Should be configured as the table range key. Must not conflict with any {@link Entity | `Entity`} property.
- * @typeParam T - The {@link TranscodeMap | `TranscodeMap`} identifying transcodable property types. Only {@link Entity | `Entity`} properties of these types can be components of an {@link ConfigEntity.indexes | index} or a {@link ConfigEntityGenerated | generated property}.
- *
- * @remarks
- * All properties of `M` must be represented, and no extra properties are allowed.
- *
- * @category Config
- * @protected
- */
-type ConfigEntities<M extends EntityMap, HashKey extends string, RangeKey extends string, T extends TranscodeMap> = ([keyof Exactify<M>] extends [never] ? never : {
-    [E in keyof Exactify<M>]: ConfigEntity<E, M, HashKey, RangeKey, T>;
-}) | Record<string, never>;
-/**
- * Returns variably-optional properties of the {@link Config | `Config`} type as optional.
 
- * @typeParam M - The {@link EntityMap | `EntityMap`} type that identitfies the {@link Entity | `Entity`} & related property types to be managed by EntityManager.
- * @typeParam HashKey - The property used across the configuration to store an {@link Entity | `Entity`}'s sharded hash key. Should be configured as the table hash key. Must not conflict with any {@link Entity | `Entity`} property.
- * @typeParam RangeKey - The property used across the configuration to store an {@link Entity | `Entity`}'s range key. Should be configured as the table range key. Must not conflict with any {@link Entity | `Entity`} property.
- * @typeParam T - The {@link TranscodeMap | `TranscodeMap`} identifying transcodable property types. Only {@link Entity | `Entity`} properties of these types can be components of an {@link ConfigEntity.indexes | index} or a {@link ConfigEntityGenerated | generated property}.
- *
- * @category Config
- * @protected
- */
-interface ConfigKeys<M extends EntityMap, HashKey extends string, RangeKey extends string, T extends TranscodeMap> {
-    /**
-     * Defines options for each {@link Entity | `Entity`} in the {@link Config | `Config`} `EntityMap` type parameter.
-     *
-     * The properties of this object must exactly match the keys of the {@link Config | `Config`} `EntityMap` type parameter.
-     */
-    entities?: ConfigEntities<M, HashKey, RangeKey, T>;
-    /**
-     * The property used across the configuration to store an {@link Entity | `Entity`}'s sharded hash key. Should be configured as the table hash key.
-     *
-     * This value must exactly match the {@link Config | `Config`} `HashKey` type parameter, and must not conflict with any {@link Entity | `Entity`} property.
-     *
-     * @defaultValue `'hashKey'`
-     *
-     * @category Config
-     * @protected
-     */
-    hashKey?: ExclusiveKey<HashKey, M, RangeKey>;
-    /**
-     * The property used across the configuration to store an {@link Entity | `Entity`}'s range key. Should be configured as the table range key.
-     *
-     * This value must exactly match the {@link Config | `Config`} `RangeKey` type parameter, and must not conflict with any {@link Entity | `Entity`} property.
-     *
-     * @defaultValue `'rangeKey'`
-     */
-    rangeKey?: ExclusiveKey<RangeKey, M, HashKey>;
-}
-/**
- * @category Config
- * @protected
- */
-type ConfigTranscodes<T extends TranscodeMap> = ([keyof Exactify<T>] extends [never] ? never : Transcodes<T>) | ([keyof Exactify<T>] extends [never] ? Record<string, never> : never);
-/**
- * EntityManager Config type.
- *
- * @typeParam M - The {@link EntityMap | `EntityMap`} type that identitfies the {@link Entity | `Entity`} & related property types to be managed by EntityManager.
- * @typeParam HashKey - The property used across the configuration to store an {@link Entity | `Entity`}'s sharded hash key. Should be configured as the table hash key. Must not conflict with any {@link Entity | `Entity`} property. Defaults to `'hashKey'`.
- * @typeParam RangeKey - The property used across the configuration to store an {@link Entity | `Entity`}'s range key. Should be configured as the table range key. Must not conflict with any {@link Entity | `Entity`} property. Defaults to `'rangeKey'`.
- * @typeParam T - The {@link TranscodeMap | `TranscodeMap`} identifying transcodable property types. Only {@link Entity | `Entity`} properties of these types can be components of an {@link ConfigEntity.indexes | index} or a {@link ConfigEntityGenerated | generated property}. Defaults to {@link DefaultTranscodeMap | `DefaultTranscodeMap`}.
- *
- * @remarks
- * `entities` is optional if `M` is empty.
- *
- * @category Config
- */
-type Config<M extends EntityMap = Record<string, never>, HashKey extends string = 'hashKey', RangeKey extends string = 'rangeKey', T extends TranscodeMap = DefaultTranscodeMap> = ([keyof Exactify<M>] extends [never] ? ConfigKeys<M, HashKey, RangeKey, T> : Required<ConfigKeys<M, HashKey, RangeKey, T>>) & {
-    /**
-     * Defines the delimiter used to separate key-value pairs in a generated property value.
-     *
-     * Must consist of one or more non-word characters, and must not intersect with {@link Config.generatedValueDelimiter | `generatedValueDelimiter`} or {@link Config.shardKeyDelimiter | `shardKeyDelimiter`}.
-     *
-     * @defaultValue `'|'`
-     */
+type Config<C extends BaseConfigMap> = ConditionalProperty<'entities', keyof Exactify<C['EntityMap']>, {
+    [E in keyof Exactify<C['EntityMap']>]: {
+        defaultLimit?: number;
+        defaultPageSize?: number;
+        shardBumps?: ShardBump[];
+        timestampProperty: C['TranscodedProperties'] & PropertiesOfType<C['EntityMap'][E], number> & TranscodableProperties<C['EntityMap'], C['TranscodeMap']>;
+        uniqueProperty: C['TranscodedProperties'] & keyof C['EntityMap'][E] & TranscodableProperties<C['EntityMap'], C['TranscodeMap']>;
+    };
+}> & ConditionalProperty<'generatedProperties', C['ShardedKeys'] | C['UnshardedKeys'], ConditionalProperty<'sharded', C['ShardedKeys'], Record<C['ShardedKeys'], (C['TranscodedProperties'] & TranscodableProperties<C['EntityMap'], C['TranscodeMap']>)[]>> & ConditionalProperty<'unsharded', C['UnshardedKeys'], Record<C['UnshardedKeys'], (C['TranscodedProperties'] & TranscodableProperties<C['EntityMap'], C['TranscodeMap']>)[]>>> & ConditionalProperty<'propertyTranscodes', C['TranscodedProperties'] & TranscodableProperties<C['EntityMap'], C['TranscodeMap']>, {
+    [P in C['TranscodedProperties'] & TranscodableProperties<C['EntityMap'], C['TranscodeMap']>]: PropertiesOfType<C['TranscodeMap'], FlattenEntityMap<C['EntityMap']>[P]>;
+}> & ConditionalProperty<'transcodes', keyof C['TranscodeMap'], Transcodes<C['TranscodeMap']>> & {
     generatedKeyDelimiter?: string;
-    /**
-     * Defines the delimiter used to separate keys & values in a generated property value.
-     *
-     * Must consist of one or more non-word characters, and must not intersect with {@link Config.generatedKeyDelimiter | `generatedKeyDelimiter`} or {@link Config.shardKeyDelimiter | `shardKeyDelimiter`}.
-     *
-     * @defaultValue `'#'`
-     */
     generatedValueDelimiter?: string;
-    /**
-     * Defines the delimiter used to construct an Entity's hashKey value from its Entity key and shard key.
-     *
-     * Must consist of one or more non-word characters, and must not intersect with {@link Config.generatedKeyDelimiter | `generatedKeyDelimiter`} or {@link Config.generatedValueDelimiter | `generatedValueDelimiter`}.
-     *
-     * @defaultValue `'!'`
-     */
+    hashKey: C['HashKey'];
+    indexes?: Record<string, {
+        hashKey: C['HashKey'] | C['ShardedKeys'];
+        rangeKey: C['RangeKey'] | C['UnshardedKeys'] | (C['TranscodedProperties'] & TranscodableProperties<C['EntityMap'], C['TranscodeMap']>);
+        projections?: string[];
+    }>;
+    rangeKey: C['RangeKey'];
     shardKeyDelimiter?: string;
-    /**
-     * The default maximum number of shards to query in parallel. Can be overridden at {@link QueryOptions.throttle | `QueryOptions.throttle`}.
-     *
-     * @defaultValue `10`
-     */
     throttle?: number;
-} & ([keyof Exactify<T>] extends [never] ? {
-    transcodes?: ConfigTranscodes<T>;
-} : DefaultTranscodeMap extends T ? {
-    transcodes?: ConfigTranscodes<T>;
-} : {
-    transcodes: ConfigTranscodes<T>;
-});
-/**
- * Flattens the top layer of logic in a type.
- *
- * @category Utility
- * @protected
- */
-type Unwrap<T> = {
-    [P in keyof T]: T[P];
-};
-/**
- * Extracts a map of {@link Entity | `Entity`} item types decorated with {@link ConfigKeys.hashKey | hashKey}, {@link ConfigKeys.rangeKey | rangeKey}, and {@link ConfigEntityGenerated | generated properties}.
- *
- * @typeParam M - The {@link EntityMap | `EntityMap`} type that identitfies the {@link Entity | `Entity`} & related property types to be managed by EntityManager.
- * @typeParam HashKey - The property used across the configuration to store an {@link Entity | `Entity`}'s sharded hash key. Should be configured as the table hash key. Must not conflict with any {@link Entity | `Entity`} property. Defaults to `'hashKey'`.
- * @typeParam RangeKey - The property used across the configuration to store an {@link Entity | `Entity`}'s range key. Should be configured as the table range key. Must not conflict with any {@link Entity | `Entity`} property. Defaults to `'rangeKey'`.
- *
- * @category Entities
- */
-type ItemMap<M extends EntityMap, HashKey extends string = 'hashKey', RangeKey extends string = 'rangeKey'> = {
-    [EntityToken in keyof Exactify<M>]: Unwrap<{
-        [P in keyof Exactify<M[EntityToken]>]: [
-            NonNullable<M[EntityToken][P]>
-        ] extends [never] ? string : M[EntityToken][P];
-    } & Partial<Record<HashKey | RangeKey, string>>>;
 };
 
-/**
- * A result returned by a query across multiple shards, where each shard may
- * receive multiple page queries via a dynamically-generated {@link ShardQueryFunction | `ShardQueryFunction`}.
- *
- * @category Query
- */
-interface QueryResult<Item extends ItemMap<M, HashKey, RangeKey>[EntityToken], EntityToken extends keyof Exactify<M> & string, M extends EntityMap, HashKey extends string, RangeKey extends string> {
-    /** Total number of records returned across all shards. */
-    count: number;
-    /** The returned records. */
-    items: Item[];
-    /**
-     * A compressed, two-layer map of page keys, used to query the next page of
-     * data for a given sort key on each shard of a given hash key.
-     */
-    pageKeyMap: string;
-}
+type EntityToken<C extends BaseConfigMap> = keyof Exactify<C['EntityMap']> & string;
 
 declare const configSchema: z.ZodEffects<z.ZodObject<{
-    entities: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEffects<z.ZodObject<{
+    entities: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
         defaultLimit: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
         defaultPageSize: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-        generated: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodOptional<z.ZodObject<{
-            atomic: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-            elements: z.ZodEffects<z.ZodArray<z.ZodString, "atleastone">, [string, ...string[]], [string, ...string[]]>;
-            sharded: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-        }, "strip", z.ZodTypeAny, {
-            atomic: boolean;
-            elements: [string, ...string[]];
-            sharded: boolean;
-        }, {
-            elements: [string, ...string[]];
-            atomic?: boolean | undefined;
-            sharded?: boolean | undefined;
-        }>>>>>;
-        elementTranscodes: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>>;
-        indexes: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
-            hashKey: z.ZodString;
-            rangeKey: z.ZodString;
-            projections: z.ZodOptional<z.ZodEffects<z.ZodArray<z.ZodString, "atleastone">, [string, ...string[]], [string, ...string[]]>>;
-        }, "strip", z.ZodTypeAny, {
-            hashKey: string;
-            rangeKey: string;
-            projections?: [string, ...string[]] | undefined;
-        }, {
-            hashKey: string;
-            rangeKey: string;
-            projections?: [string, ...string[]] | undefined;
-        }>>>>;
         shardBumps: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
             timestamp: z.ZodNumber;
             charBits: z.ZodNumber;
@@ -483,12 +176,6 @@ declare const configSchema: z.ZodEffects<z.ZodObject<{
     }, "strict", z.ZodTypeAny, {
         defaultLimit: number;
         defaultPageSize: number;
-        elementTranscodes: Record<string, string>;
-        indexes: Record<string, {
-            hashKey: string;
-            rangeKey: string;
-            projections?: [string, ...string[]] | undefined;
-        }>;
         shardBumps: {
             timestamp: number;
             charBits: number;
@@ -496,80 +183,46 @@ declare const configSchema: z.ZodEffects<z.ZodObject<{
         }[];
         timestampProperty: string;
         uniqueProperty: string;
-        generated: Record<string, {
-            atomic: boolean;
-            elements: [string, ...string[]];
-            sharded: boolean;
-        } | undefined>;
     }, {
         timestampProperty: string;
         uniqueProperty: string;
         defaultLimit?: number | undefined;
         defaultPageSize?: number | undefined;
-        elementTranscodes?: Record<string, string> | undefined;
-        indexes?: Record<string, {
-            hashKey: string;
-            rangeKey: string;
-            projections?: [string, ...string[]] | undefined;
-        }> | undefined;
         shardBumps?: {
             timestamp: number;
             charBits: number;
             chars: number;
         }[] | undefined;
-        generated?: Record<string, {
-            elements: [string, ...string[]];
-            atomic?: boolean | undefined;
-            sharded?: boolean | undefined;
-        } | undefined> | undefined;
-    }>, {
-        defaultLimit: number;
-        defaultPageSize: number;
-        elementTranscodes: Record<string, string>;
-        indexes: Record<string, {
-            hashKey: string;
-            rangeKey: string;
-            projections?: [string, ...string[]] | undefined;
-        }>;
-        shardBumps: {
-            timestamp: number;
-            charBits: number;
-            chars: number;
-        }[];
-        timestampProperty: string;
-        uniqueProperty: string;
-        generated: Record<string, {
-            atomic: boolean;
-            elements: [string, ...string[]];
-            sharded: boolean;
-        } | undefined>;
+    }>>>>;
+    generatedProperties: z.ZodDefault<z.ZodOptional<z.ZodObject<{
+        sharded: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEffects<z.ZodArray<z.ZodString, "atleastone">, [string, ...string[]], [string, ...string[]]>>>>;
+        unsharded: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEffects<z.ZodArray<z.ZodString, "atleastone">, [string, ...string[]], [string, ...string[]]>>>>;
+    }, "strip", z.ZodTypeAny, {
+        sharded: Record<string, [string, ...string[]]>;
+        unsharded: Record<string, [string, ...string[]]>;
     }, {
-        timestampProperty: string;
-        uniqueProperty: string;
-        defaultLimit?: number | undefined;
-        defaultPageSize?: number | undefined;
-        elementTranscodes?: Record<string, string> | undefined;
-        indexes?: Record<string, {
-            hashKey: string;
-            rangeKey: string;
-            projections?: [string, ...string[]] | undefined;
-        }> | undefined;
-        shardBumps?: {
-            timestamp: number;
-            charBits: number;
-            chars: number;
-        }[] | undefined;
-        generated?: Record<string, {
-            elements: [string, ...string[]];
-            atomic?: boolean | undefined;
-            sharded?: boolean | undefined;
-        } | undefined> | undefined;
+        sharded?: Record<string, [string, ...string[]]> | undefined;
+        unsharded?: Record<string, [string, ...string[]]> | undefined;
+    }>>>;
+    hashKey: z.ZodString;
+    indexes: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+        hashKey: z.ZodString;
+        rangeKey: z.ZodString;
+        projections: z.ZodOptional<z.ZodEffects<z.ZodArray<z.ZodString, "atleastone">, [string, ...string[]], [string, ...string[]]>>;
+    }, "strip", z.ZodTypeAny, {
+        hashKey: string;
+        rangeKey: string;
+        projections?: [string, ...string[]] | undefined;
+    }, {
+        hashKey: string;
+        rangeKey: string;
+        projections?: [string, ...string[]] | undefined;
     }>>>>;
     generatedKeyDelimiter: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     generatedValueDelimiter: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    propertyTranscodes: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>>;
+    rangeKey: z.ZodString;
     shardKeyDelimiter: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    hashKey: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    rangeKey: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     throttle: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
     transcodes: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
         encode: z.ZodFunction<z.ZodTuple<[z.ZodAny], z.ZodUnknown>, z.ZodString>;
@@ -583,17 +236,9 @@ declare const configSchema: z.ZodEffects<z.ZodObject<{
     }>>>>;
 }, "strict", z.ZodTypeAny, {
     throttle: number;
-    hashKey: string;
-    rangeKey: string;
     entities: Record<string, {
         defaultLimit: number;
         defaultPageSize: number;
-        elementTranscodes: Record<string, string>;
-        indexes: Record<string, {
-            hashKey: string;
-            rangeKey: string;
-            projections?: [string, ...string[]] | undefined;
-        }>;
         shardBumps: {
             timestamp: number;
             charBits: number;
@@ -601,47 +246,53 @@ declare const configSchema: z.ZodEffects<z.ZodObject<{
         }[];
         timestampProperty: string;
         uniqueProperty: string;
-        generated: Record<string, {
-            atomic: boolean;
-            elements: [string, ...string[]];
-            sharded: boolean;
-        } | undefined>;
+    }>;
+    generatedProperties: {
+        sharded: Record<string, [string, ...string[]]>;
+        unsharded: Record<string, [string, ...string[]]>;
+    };
+    hashKey: string;
+    rangeKey: string;
+    indexes: Record<string, {
+        hashKey: string;
+        rangeKey: string;
+        projections?: [string, ...string[]] | undefined;
     }>;
     generatedKeyDelimiter: string;
     generatedValueDelimiter: string;
+    propertyTranscodes: Record<string, string>;
     shardKeyDelimiter: string;
     transcodes: Record<string, {
         encode: (args_0: any, ...args: unknown[]) => string;
         decode: (args_0: string, ...args: unknown[]) => any;
     }>;
 }, {
+    hashKey: string;
+    rangeKey: string;
     throttle?: number | undefined;
-    hashKey?: string | undefined;
-    rangeKey?: string | undefined;
     entities?: Record<string, {
         timestampProperty: string;
         uniqueProperty: string;
         defaultLimit?: number | undefined;
         defaultPageSize?: number | undefined;
-        elementTranscodes?: Record<string, string> | undefined;
-        indexes?: Record<string, {
-            hashKey: string;
-            rangeKey: string;
-            projections?: [string, ...string[]] | undefined;
-        }> | undefined;
         shardBumps?: {
             timestamp: number;
             charBits: number;
             chars: number;
         }[] | undefined;
-        generated?: Record<string, {
-            elements: [string, ...string[]];
-            atomic?: boolean | undefined;
-            sharded?: boolean | undefined;
-        } | undefined> | undefined;
+    }> | undefined;
+    generatedProperties?: {
+        sharded?: Record<string, [string, ...string[]]> | undefined;
+        unsharded?: Record<string, [string, ...string[]]> | undefined;
+    } | undefined;
+    indexes?: Record<string, {
+        hashKey: string;
+        rangeKey: string;
+        projections?: [string, ...string[]] | undefined;
     }> | undefined;
     generatedKeyDelimiter?: string | undefined;
     generatedValueDelimiter?: string | undefined;
+    propertyTranscodes?: Record<string, string> | undefined;
     shardKeyDelimiter?: string | undefined;
     transcodes?: Record<string, {
         encode: (args_0: any, ...args: unknown[]) => string;
@@ -649,17 +300,9 @@ declare const configSchema: z.ZodEffects<z.ZodObject<{
     }> | undefined;
 }>, {
     throttle: number;
-    hashKey: string;
-    rangeKey: string;
     entities: Record<string, {
         defaultLimit: number;
         defaultPageSize: number;
-        elementTranscodes: Record<string, string>;
-        indexes: Record<string, {
-            hashKey: string;
-            rangeKey: string;
-            projections?: [string, ...string[]] | undefined;
-        }>;
         shardBumps: {
             timestamp: number;
             charBits: number;
@@ -667,47 +310,53 @@ declare const configSchema: z.ZodEffects<z.ZodObject<{
         }[];
         timestampProperty: string;
         uniqueProperty: string;
-        generated: Record<string, {
-            atomic: boolean;
-            elements: [string, ...string[]];
-            sharded: boolean;
-        } | undefined>;
+    }>;
+    generatedProperties: {
+        sharded: Record<string, [string, ...string[]]>;
+        unsharded: Record<string, [string, ...string[]]>;
+    };
+    hashKey: string;
+    rangeKey: string;
+    indexes: Record<string, {
+        hashKey: string;
+        rangeKey: string;
+        projections?: [string, ...string[]] | undefined;
     }>;
     generatedKeyDelimiter: string;
     generatedValueDelimiter: string;
+    propertyTranscodes: Record<string, string>;
     shardKeyDelimiter: string;
     transcodes: Record<string, {
         encode: (args_0: any, ...args: unknown[]) => string;
         decode: (args_0: string, ...args: unknown[]) => any;
     }>;
 }, {
+    hashKey: string;
+    rangeKey: string;
     throttle?: number | undefined;
-    hashKey?: string | undefined;
-    rangeKey?: string | undefined;
     entities?: Record<string, {
         timestampProperty: string;
         uniqueProperty: string;
         defaultLimit?: number | undefined;
         defaultPageSize?: number | undefined;
-        elementTranscodes?: Record<string, string> | undefined;
-        indexes?: Record<string, {
-            hashKey: string;
-            rangeKey: string;
-            projections?: [string, ...string[]] | undefined;
-        }> | undefined;
         shardBumps?: {
             timestamp: number;
             charBits: number;
             chars: number;
         }[] | undefined;
-        generated?: Record<string, {
-            elements: [string, ...string[]];
-            atomic?: boolean | undefined;
-            sharded?: boolean | undefined;
-        } | undefined> | undefined;
+    }> | undefined;
+    generatedProperties?: {
+        sharded?: Record<string, [string, ...string[]]> | undefined;
+        unsharded?: Record<string, [string, ...string[]]> | undefined;
+    } | undefined;
+    indexes?: Record<string, {
+        hashKey: string;
+        rangeKey: string;
+        projections?: [string, ...string[]] | undefined;
     }> | undefined;
     generatedKeyDelimiter?: string | undefined;
     generatedValueDelimiter?: string | undefined;
+    propertyTranscodes?: Record<string, string> | undefined;
     shardKeyDelimiter?: string | undefined;
     transcodes?: Record<string, {
         encode: (args_0: any, ...args: unknown[]) => string;
@@ -724,17 +373,15 @@ type ParsedConfig = z.infer<typeof configSchema>;
 /**
  * A result returned by a {@link ShardQueryFunction | `ShardQueryFunction`} querying an individual shard.
  *
- * @typeParam Item - The {@link Item | `Item`} type being queried.
-
-* @category Query
+ * @category Query
  */
-interface ShardQueryResult<Item extends Entity> {
+interface ShardQueryResult<C extends BaseConfigMap> {
     /** The number of records returned. */
     count: number;
     /** The returned records. */
-    items: Item[];
+    items: EntityItem<C>[];
     /** The page key for the next query on this shard. */
-    pageKey?: Partial<Item>;
+    pageKey?: EntityItem<C>;
 }
 
 /**
@@ -752,22 +399,22 @@ interface ShardQueryResult<Item extends Entity> {
  *
  * @category Query
  */
-type ShardQueryFunction<Item extends Entity> = (hashKey: string, pageKey?: Partial<Item>, pageSize?: number) => Promise<ShardQueryResult<Item>>;
+type ShardQueryFunction<C extends BaseConfigMap> = (hashKey: string, pageKey?: EntityItem<C>, pageSize?: number) => Promise<ShardQueryResult<C>>;
 
-type ShardQueryMap<Item extends Entity> = Record<string, ShardQueryFunction<Item>>;
+type ShardQueryMap<C extends BaseConfigMap> = Record<string, ShardQueryFunction<C>>;
 
 /**
- * Options passed to the {@link query | `query`} function.
+ * Options passed to the {@link EntityManager.query | `EntityManager.query`} method.
  *
  * @category Query
  */
-interface QueryOptions<Item extends ItemMap<M, HashKey, RangeKey>[EntityToken], EntityToken extends keyof Exactify<M> & string, M extends EntityMap, HashKey extends string, RangeKey extends string> {
-    /** Identifies the entity to be queried. Key of {@link Config | `EntityManager.config.entities`}. */
-    entityToken: EntityToken;
+interface QueryOptions<C extends BaseConfigMap> {
+    /** Identifies the entity to be queried. Key of {@link Config | `Config`} `entities`. */
+    entityToken: EntityToken<C>;
     /**
      * Partial item object sufficiently populated to generate index hash keys.
      */
-    item: Partial<Item>;
+    item: EntityItem<C>;
     /**
      * The target maximum number of records to be returned by the query across
      * all shards.
@@ -799,11 +446,11 @@ interface QueryOptions<Item extends ItemMap<M, HashKey, RangeKey>[EntityToken],
      * page key, e.g. to match the same string against `firstName` and `lastName`
      * properties without performing a table scan for either.
      */
-    shardQueryMap: ShardQueryMap<Item>;
+    shardQueryMap: ShardQueryMap<C>;
     /**
      * A {@link SortOrder | `SortOrder`} object specifying the sort order of the result set. Defaults to `[]`.
      */
-    sortOrder?: SortOrder<Item>;
+    sortOrder?: SortOrder<EntityItem<C>>;
     /**
      * Lower limit to query shard space.
      *
@@ -838,16 +485,16 @@ interface QueryOptions<Item extends ItemMap<M, HashKey, RangeKey>[EntityToken],
  *
  * @category Entity Manager
  */
-declare class EntityManager<M extends EntityMap, HashKey extends string, RangeKey extends string, T extends TranscodeMap> {
+declare class EntityManager<C extends BaseConfigMap> {
     #private;
-    logger: Pick<Console, 'debug' | 'error'>;
+    readonly logger: Pick<Console, 'debug' | 'error'>;
     /**
      * Create an EntityManager instance.
      *
      * @param config - EntityManager {@link Config | `Config`} object.
      * @param logger - Logger object (defaults to `console`, must support `debug` & `error` methods).
      */
-    constructor(config: Config<M, HashKey, RangeKey, T>, logger?: Pick<Console, 'debug' | 'error'>);
+    constructor(config: Config<C>, logger?: Pick<Console, 'debug' | 'error'>);
     /**
      * Get the current EntityManager {@link Config | `Config`} object.
      *
@@ -861,35 +508,35 @@ declare class EntityManager<M extends EntityMap, HashKey extends string, RangeKe
      */
     set config(value: ParsedConfig);
     /**
-     * Update generated properties, hash key, and range key on an {@link ItemMap | `ItemMap`} object.
+     * Update generated properties, hash key, and range key on an {@link EntityItem | `EntityItem`} object.
      *
-     * @param entityToken - {@link ConfigKeys.entities | `this.config.entities`} key.
-     * @param item - {@link ItemMap | `ItemMap`} object.
+     * @param entityToken - {@link Config | `Config`} `entities` key.
+     * @param item - {@link EntityItem | `EntityItem`} object.
      * @param overwrite - Overwrite existing properties (default `false`).
      *
      * @returns Shallow clone of `item` with updated properties.
      *
      * @throws `Error` if `entityToken` is invalid.
      */
-    addKeys<Item extends ItemMap<M, HashKey, RangeKey>[EntityToken], EntityToken extends keyof Exactify<M> & string>(entityToken: EntityToken, item: Partial<Item>, overwrite?: boolean): Partial<Item>;
+    addKeys(entityToken: EntityToken<C>, item: EntityItem<C>, overwrite?: boolean): EntityItem<C>;
     /**
-     * Strips generated properties, hash key, and range key from an {@link ItemMap | `ItemMap`} object.
+     * Strips generated properties, hash key, and range key from an {@link EntityItem | `EntityItem`} object.
      *
-     * @param entityToken - {@link ConfigKeys.entities | `this.config.entities`} key.
-     * @param item - {@link ItemMap | `ItemMap`} object.
+     * @param entityToken - {@link Config | `Config`} `entities` key.
+     * @param item - {@link EntityItem | `EntityItem`} object.
      *
      * @returns Shallow clone of `item` without generated properties, hash key or range key.
      *
      * @throws `Error` if `entityToken` is invalid.
      */
-    removeKeys<Item extends ItemMap<M, HashKey, RangeKey>[EntityToken], EntityToken extends keyof Exactify<M> & string>(entityToken: EntityToken, item: Partial<Item>): Partial<Item>;
+    removeKeys(entityToken: EntityToken<C>, item: EntityItem<C>): EntityItem<C>;
     /**
      * Query a database entity across shards in a provider-generic fashion.
      *
      * @remarks
      * The provided `shardQueryMap` performs the actual query of individual data pages on individual index/shard combinations.
      *
-     * Individual shard query results will be combined, deduped by {@link ConfigEntity.uniqueProperty} property value, and sorted by {@link QueryOptions.sortOrder | `sortOrder`}.
+     * Individual shard query results will be combined, deduped by {@link Config | `Config`} `uniqueProperty` value, and sorted by {@link QueryOptions.sortOrder | `sortOrder`}.
      *
      * In queries on sharded data, expect the leading and trailing edges of returned data pages to interleave somewhat with preceding & following pages.
      *
@@ -899,45 +546,45 @@ declare class EntityManager<M extends EntityMap, HashKey extends string, RangeKe
      *
      * @returns {@link QueryResult} object.
      *
-     * @throws Error if {@link QueryOptions.shardQueryMapBuilder | `shardQueryMapBuilder`} `pageKeyMap` keys do not match its `shardQueryMap` keys.
+     * @throws Error if `options` {@link QueryOptions.pageKeyMap | `pageKeyMap`} `pageKeyMap` keys do not match {@link QueryOptions.shardQueryMap | `shardQueryMap`} keys.
      */
-    query<Item extends ItemMap<M, HashKey, RangeKey>[EntityToken], EntityToken extends keyof Exactify<M> & string>(options: QueryOptions<Item, EntityToken, M, HashKey, RangeKey>): Promise<QueryResult<Item, EntityToken, M, HashKey, RangeKey>>;
+    query(options: QueryOptions<C>): Promise<QueryResult<C>>;
 }
 
 /**
- * Constructor options for {@link BaseShardQueryMapBuilder | `BaseShardQueryMapBuilder`}.
+ * Constructor options for {@link BaseQueryBuilder | `BaseQueryBuilder`}.
  *
- * @category ShardQueryMapBuilder
+ * @category QueryBuilder
  */
-interface BaseShardQueryMapBuilderOptions<EntityClient extends BaseEntityClient, EntityToken extends keyof Exactify<M> & string, M extends EntityMap, HashKey extends string, RangeKey extends string, T extends TranscodeMap> {
+interface BaseQueryBuilderOptions<C extends BaseConfigMap, EntityClient extends BaseEntityClient> {
     /** {@link BaseEntityClient | `EntityClient`} instance. */
     entityClient: EntityClient;
     /** {@link EntityManager | `EntityManager`} instance. */
-    entityManager: EntityManager<M, HashKey, RangeKey, T>;
+    entityManager: EntityManager<C>;
     /** Entity token. */
-    entityToken: EntityToken;
+    entityToken: EntityToken<C>;
     /** Hash key token. */
-    hashKeyToken: PropertiesOfType<M[EntityToken], never> | HashKey;
+    hashKeyToken: C['HashKey'] | C['ShardedKeys'];
     /** Dehydrated page key map. */
     pageKeyMap?: string;
 }
 
-type ShardQueryMapBuilderQueryOptions<Item extends ItemMap<M, HashKey, RangeKey>[EntityToken], EntityToken extends keyof Exactify<M> & string, M extends EntityMap, HashKey extends string, RangeKey extends string> = Omit<QueryOptions<Item, EntityToken, M, HashKey, RangeKey>, 'entityToken' | 'pageKeyMap' | 'shardQueryMap'>;
+type QueryBuilderQueryOptions<C extends BaseConfigMap> = Omit<QueryOptions<C>, 'entityToken' | 'pageKeyMap' | 'shardQueryMap'>;
 
 /**
  * Abstract base class supporting a fluent API for building a {@link ShardQueryMap | `ShardQueryMap`} using a database client.
  *
- * @category ShardQueryMapBuilder
+ * @category QueryBuilder
  */
-declare abstract class BaseShardQueryMapBuilder<IndexParams, EntityClient extends BaseEntityClient, Item extends ItemMap<M, HashKey, RangeKey>[EntityToken], EntityToken extends keyof Exactify<M> & string, M extends EntityMap, HashKey extends string, RangeKey extends string, T extends TranscodeMap> {
+declare abstract class BaseQueryBuilder<C extends BaseConfigMap, EntityClient extends BaseEntityClient, IndexParams> {
     /** {@link BaseEntityClient | `EntityClient`} instance. */
     readonly entityClient: EntityClient;
     /** {@link EntityManager | `EntityManager`} instance. */
-    readonly entityManager: EntityManager<M, HashKey, RangeKey, T>;
+    readonly entityManager: EntityManager<C>;
     /** Entity token. */
-    readonly entityToken: EntityToken;
+    readonly entityToken: EntityToken<C>;
     /** Hash key token. */
-    readonly hashKeyToken: PropertiesOfType<M[EntityToken], never> | HashKey;
+    readonly hashKeyToken: C['HashKey'] | C['ShardedKeys'];
     /** Dehydrated page key map. */
     readonly pageKeyMap?: string;
     /**
@@ -946,16 +593,16 @@ declare abstract class BaseShardQueryMapBuilder<IndexParams, EntityClient extend
      * @protected
      */
     readonly indexParamsMap: Record<string, IndexParams>;
-    /** BaseShardQueryMapBuilder constructor. */
-    constructor(options: BaseShardQueryMapBuilderOptions<EntityClient, EntityToken, M, HashKey, RangeKey, T>);
-    protected abstract getShardQueryFunction(indexToken: string): ShardQueryFunction<Item>;
+    /** BaseQueryBuilder constructor. */
+    constructor(options: BaseQueryBuilderOptions<C, EntityClient>);
+    protected abstract getShardQueryFunction(indexToken: string): ShardQueryFunction<C>;
     /**
      * Builds a {@link ShardQueryMap | `ShardQueryMap`} object.
      *
      * @returns - The {@link ShardQueryMap | `ShardQueryMap`} object.
      */
-    build(): ShardQueryMap<Item>;
-    query(options: ShardQueryMapBuilderQueryOptions<Item, EntityToken, M, HashKey, RangeKey>): Promise<QueryResult<Item, EntityToken, M, HashKey, RangeKey>>;
+    build(): ShardQueryMap<C>;
+    query(options: QueryBuilderQueryOptions<C>): Promise<QueryResult<C>>;
 }
 
 /**
@@ -971,4 +618,4 @@ declare abstract class BaseShardQueryMapBuilder<IndexParams, EntityClient extend
  */
 declare function conditionalize<F extends (...args: Parameters<F>) => ReturnType<F>>(fn: F, condition?: unknown): (...args: Parameters<F>) => ReturnType<F> | undefined;
 
-export { BaseEntityClient, type BaseEntityClientOptions, BaseShardQueryMapBuilder, type BaseShardQueryMapBuilderOptions, type Config, type ConfigEntities, type ConfigEntity, type ConfigEntityGenerated, type ConfigEntityIndexComponent, type ConfigKeys, type ConfigTranscodes, EntityManager, type EntityMap, type ExclusiveKey, type ItemMap, type ParsedConfig, type QueryOptions, type QueryResult, type ShardBump, type ShardQueryFunction, type ShardQueryMap, type ShardQueryMapBuilderQueryOptions, type ShardQueryResult, type Unwrap, conditionalize };
+export { type BaseConfigMap, BaseEntityClient, type BaseEntityClientOptions, BaseQueryBuilder, type BaseQueryBuilderOptions, type ConditionalProperty, type Config, type EntityItem, EntityManager, type EntityToken, type ParsedConfig, type QueryBuilderQueryOptions, type QueryOptions, type QueryResult, type ShardBump, type ShardQueryFunction, type ShardQueryMap, type ShardQueryResult, conditionalize };