@travetto/model-dynamodb 8.0.0-alpha.2 → 8.0.0-alpha.20

package/README.md

@@ -18,7 +18,7 @@ This module provides an [DynamoDB](https://aws.amazon.com/dynamodb/)-based imple
 Supported features:
    *  [CRUD](https://github.com/travetto/travetto/tree/main/module/model/src/types/crud.ts#L11)
    *  [Expiry](https://github.com/travetto/travetto/tree/main/module/model/src/types/expiry.ts#L10)
-   *  [Indexed](https://github.com/travetto/travetto/tree/main/module/model/src/types/indexed.ts#L11)
+   *  [Indexed](https://github.com/travetto/travetto/tree/main/module/model-indexed/src/types/service.ts#L16)
 
 Out of the box, by installing the module, everything should be wired up by default.If you need to customize any aspect of the source or config, you can override and register it with the [Dependency Injection](https://github.com/travetto/travetto/tree/main/module/di#readme "Dependency registration/management and injection support.") module.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-dynamodb",
-  "version": "8.0.0-alpha.2",
+  "version": "8.0.0-alpha.20",
   "type": "module",
   "description": "DynamoDB backing for the travetto model module.",
   "keywords": [
@@ -26,12 +26,13 @@
     "directory": "module/model-dynamodb"
   },
   "dependencies": {
-    "@aws-sdk/client-dynamodb": "^3.1004.0",
-    "@travetto/config": "^8.0.0-alpha.2",
-    "@travetto/model": "^8.0.0-alpha.2"
+    "@aws-sdk/client-dynamodb": "^3.1063.0",
+    "@travetto/config": "^8.0.0-alpha.18",
+    "@travetto/model": "^8.0.0-alpha.18",
+    "@travetto/model-indexed": "^8.0.0-alpha.20"
   },
   "peerDependencies": {
-    "@travetto/cli": "^8.0.0-alpha.3"
+    "@travetto/cli": "^8.0.0-alpha.23"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/service.ts

@@ -1,18 +1,27 @@
-import { type AttributeValue, DynamoDB, type PutItemCommandInput, type PutItemCommandOutput } from '@aws-sdk/client-dynamodb';
+import { type AttributeValue, DynamoDB, type PutItemCommandInput, type PutItemCommandOutput, type QueryCommandInput, type QueryCommandOutput } from '@aws-sdk/client-dynamodb';
 
-import { JSONUtil, ShutdownManager, TimeUtil, type Class, type DeepPartial } from '@travetto/runtime';
+import { castTo, JSONUtil, ShutdownManager, TimeUtil, type Class } from '@travetto/runtime';
 import { Injectable, PostConstruct } from '@travetto/di';
 import {
   type ModelCrudSupport, type ModelExpirySupport, ModelRegistryIndex, type ModelStorageSupport,
-  type ModelIndexedSupport, type ModelType, NotFoundError, ExistsError,
-  IndexNotSupported, type OptionalId,
-  ModelCrudUtil, ModelExpiryUtil, ModelIndexedUtil, ModelStorageUtil
+  type ModelType, NotFoundError, ExistsError, type OptionalId, ModelCrudUtil,
+  ModelExpiryUtil, ModelStorageUtil,
+  type ModelListOptions,
 } from '@travetto/model';
+import {
+  isModelIndexedIndex, ModelIndexedUtil, type KeyedIndexBody, type KeyedIndexSelection,
+  type ModelPageOptions, type ModelPageResult, type ModelIndexedSupport, type SingleItemIndex,
+  type FullKeyedIndexBody, type FullKeyedIndexWithPartialBody, type SortedIndex, type SortedIndexSelection,
+  ModelIndexedComputedIndex, type ModelIndexedSearchOptions, type SortedIndexSelectionType
+} from '@travetto/model-indexed';
 
 import type { DynamoDBModelConfig } from './config.ts';
 import { DynamoDBUtil } from './util.ts';
 
-const EXP_ATTR = 'expires_at__';
+const EXPIRES_ATTRIBUTE = 'expires_at__';
+
+const getKey = <T extends ModelType>(computed: ModelIndexedComputedIndex<T>): AttributeValue => DynamoDBUtil.toValue(computed.getKey() || 'NULL');
+const getSort = <T extends ModelType>(computed: ModelIndexedComputedIndex<T>): AttributeValue => DynamoDBUtil.toValue(computed.getSort());
 
 /**
  * A model service backed by DynamoDB
@@ -34,6 +43,109 @@ export class DynamoDBModelService implements ModelCrudSupport, ModelExpirySuppor
     return table;
   }
 
+  async * #scanCollection<T extends ModelType>(
+    cls: Class<T>,
+    query: (batchSize: number, lastKey: Record<string, AttributeValue> | undefined) => Promise<QueryCommandOutput>,
+    options?: ModelListOptions & ModelPageOptions<Record<string, AttributeValue>>,
+  ): AsyncIterable<{ items: T[], lastKey?: Record<string, AttributeValue> }> {
+    const batchSize = options?.batchSizeHint ?? 100;
+    const limit = options?.limit ?? Number.MAX_SAFE_INTEGER;
+    let startKey = options?.offset ?? undefined;
+    let produced = 0;
+    do {
+      const remaining = limit - produced;
+      const batch = await query(Math.min(remaining, batchSize), startKey);
+
+      if (batch.Count && batch.Items) {
+        produced += batch.Count;
+
+        const items = (produced > limit) ? batch.Items.slice(0, remaining) : batch.Items;
+        startKey = batch.LastEvaluatedKey;
+        yield {
+          items: await ModelCrudUtil.filterOutNotFound(
+            items.map(item => DynamoDBUtil.loadAndCheckExpiry(cls, item.body.S!))),
+          lastKey: startKey
+        };
+      } else {
+        startKey = undefined;
+      }
+    } while (startKey && produced < limit && !(options?.abort?.aborted));
+  }
+
+  async * #scanIndex<T extends ModelType>(
+    cls: Class<T>,
+    idx: SortedIndex<T>,
+    body: KeyedIndexBody<T>,
+    options?: ModelPageOptions<Record<string, AttributeValue>> & ModelListOptions,
+    transform?: (query: QueryCommandInput) => QueryCommandInput
+  ): AsyncIterable<{ items: T[], lastKey?: Record<string, AttributeValue> }> {
+    ModelCrudUtil.ensureNotSubType(cls);
+    const computed = ModelIndexedComputedIndex.get(idx, body).validate();
+    const { keyIndexName, keyIndexAttribute } = DynamoDBUtil.indexNames(idx.name);
+    const expression = { [`:${keyIndexName}`]: getKey(computed) };
+
+    const finalTransform = transform ?? ((query): QueryCommandInput => query);
+
+    yield* this.#scanCollection(cls, (batchSize, lastKey) => {
+      const finalized = finalTransform({
+        TableName: this.#resolveTable(cls),
+        IndexName: keyIndexName,
+        ProjectionExpression: 'body',
+        KeyConditionExpression: `${keyIndexAttribute} = :${keyIndexName}`,
+        ExpressionAttributeValues: expression,
+        Limit: batchSize,
+        ExclusiveStartKey: lastKey,
+      });
+      return this.client.query(finalized);
+    }, options);
+  }
+
+  async #getIdByIndex<
+    T extends ModelType,
+    K extends KeyedIndexSelection<T>,
+    S extends SortedIndexSelection<T>
+  >(cls: Class<T>, idx: SingleItemIndex<T, K, S>, body: FullKeyedIndexBody<T, K, S>): Promise<string> {
+    ModelCrudUtil.ensureNotSubType(cls);
+
+    const computed = ModelIndexedComputedIndex.get(idx, body).validate({ sort: true });
+
+    const { keyIndexName, keyIndexAttribute, sortIndexAttribute, sortIndexName } = DynamoDBUtil.indexNames(idx.name);
+    const sorted = idx.type === 'indexed:sorted';
+
+    const query: QueryCommandInput = {
+      TableName: this.#resolveTable(cls),
+      IndexName: keyIndexName,
+      ProjectionExpression: 'id',
+      KeyConditionExpression: [
+        ...(sorted ? [`${sortIndexAttribute} = :${sortIndexName}`] : []),
+        `${keyIndexAttribute} = :${keyIndexName}`
+      ]
+        .join(' and '),
+      ...(computed.idPart ? {
+        FilterExpression: 'id = :id'
+      } : {}),
+      ExpressionAttributeValues: {
+        [`:${keyIndexName}`]: getKey(computed),
+        ...(sorted ? { [`:${sortIndexName}`]: getSort(computed) } : {}),
+        ...(computed.idPart ? { ':id': DynamoDBUtil.toValue(computed.idPart.value) } : {})
+      }
+    };
+
+    try {
+      const result = await this.client.query(query);
+
+      if (result.Count && result.Items && result.Items[0]) {
+        return result.Items[0].id.S!;
+      }
+      throw new NotFoundError(`${cls.name} Index=${idx}`, computed.getKey({ sort: true }));
+    } catch (error) {
+      if (error instanceof Error && error.message.includes('The table does not have the specified index')) {
+        throw new NotFoundError(`${cls.name} Index=${idx}`, computed.getKey({ sort: true }));
+      }
+      throw error;
+    }
+  }
+
   async #putItem<T extends ModelType>(cls: Class<T>, id: string, item: T, mode: 'create' | 'update' | 'upsert'): Promise<PutItemCommandOutput> {
     const config = ModelRegistryIndex.getConfig(cls);
     let expiry: number | undefined;
@@ -48,12 +160,20 @@ export class DynamoDBModelService implements ModelCrudSupport, ModelExpirySuppor
     try {
       if (mode === 'create') {
         const indices: Record<string, unknown> = {};
-        for (const idx of config.indices ?? []) {
-          const { key, sort } = ModelIndexedUtil.computeIndexKey(cls, idx, item);
-          const property = DynamoDBUtil.simpleName(idx.name);
-          indices[`${property}__`] = DynamoDBUtil.toValue(key);
-          if (sort) {
-            indices[`${property}_sort__`] = DynamoDBUtil.toValue(+sort);
+        for (const idx of ModelRegistryIndex.getIndices(cls)) {
+          if (isModelIndexedIndex(idx)) {
+            const { keyIndexAttribute, sortIndexAttribute } = DynamoDBUtil.indexNames(idx.name);
+            const computed = ModelIndexedComputedIndex.get(idx, item).validate({ sort: true });
+            switch (idx.type) {
+              case 'indexed:keyed': indices[keyIndexAttribute] = getKey(computed); break;
+              case 'indexed:sorted': {
+                indices[keyIndexAttribute] = getKey(computed);
+                indices[sortIndexAttribute] = getSort(computed);
+                break;
+              }
+            }
+          } else {
+            console.warn('Unsupported index type on update', { cls: cls.name, idx });
           }
         }
         const query: PutItemCommandInput = {
@@ -62,7 +182,7 @@ export class DynamoDBModelService implements ModelCrudSupport, ModelExpirySuppor
           Item: {
             id: DynamoDBUtil.toValue(item.id),
             body: DynamoDBUtil.toValue(JSONUtil.toUTF8(item)),
-            ...(expiry !== undefined ? { [EXP_ATTR]: DynamoDBUtil.toValue(expiry) } : {}),
+            ...(expiry !== undefined ? { [EXPIRES_ATTRIBUTE]: DynamoDBUtil.toValue(expiry) } : {}),
             ...indices
           },
           ReturnValues: 'NONE'
@@ -71,14 +191,27 @@ export class DynamoDBModelService implements ModelCrudSupport, ModelExpirySuppor
       } else {
         const indices: Record<string, unknown> = {};
         const expr: string[] = [];
-        for (const idx of config.indices ?? []) {
-          const { key, sort } = ModelIndexedUtil.computeIndexKey(cls, idx, item);
-          const property = DynamoDBUtil.simpleName(idx.name);
-          indices[`:${property}`] = DynamoDBUtil.toValue(key);
-          expr.push(`${property}__ = :${property}`);
-          if (sort) {
-            indices[`:${property}_sort`] = DynamoDBUtil.toValue(+sort);
-            expr.push(`${property}_sort__ = :${property}_sort`);
+
+        for (const idx of ModelRegistryIndex.getIndices(cls)) {
+          if (isModelIndexedIndex(idx)) {
+            const { keyIndexAttribute, sortIndexAttribute, keyIndexName, sortIndexName } = DynamoDBUtil.indexNames(idx.name);
+            const computed = ModelIndexedComputedIndex.get(idx, item).validate({ sort: true });
+            switch (idx.type) {
+              case 'indexed:keyed': {
+                indices[`:${keyIndexName}`] = getKey(computed);
+                expr.push(`${keyIndexAttribute} = :${keyIndexName}`);
+                break;
+              }
+              case 'indexed:sorted': {
+                indices[`:${keyIndexName}`] = getKey(computed);
+                indices[`:${sortIndexName}`] = getSort(computed);
+                expr.push(`${keyIndexAttribute} = :${keyIndexName}`);
+                expr.push(`${sortIndexAttribute} = :${sortIndexName}`);
+                break;
+              }
+            }
+          } else {
+            console.warn('Unsupported index type on update', { cls: cls.name, idx });
           }
         }
 
@@ -88,7 +221,7 @@ export class DynamoDBModelService implements ModelCrudSupport, ModelExpirySuppor
           Key: { id: { S: id } },
           UpdateExpression: `SET ${[
             'body=:body',
-            expiry !== undefined ? `${EXP_ATTR}=:expr` : undefined,
+            expiry !== undefined ? `${EXPIRES_ATTRIBUTE}=:expr` : undefined,
             ...expr
           ].filter(part => !!part).join(', ')}`,
           ExpressionAttributeValues: {
@@ -168,7 +301,7 @@ export class DynamoDBModelService implements ModelCrudSupport, ModelExpirySuppor
     if (ttlEnabled !== ttlRequired) {
       await this.client.updateTimeToLive({
         TableName: table,
-        TimeToLiveSpecification: { AttributeName: ttlRequired ? EXP_ATTR : undefined, Enabled: ttlRequired }
+        TimeToLiveSpecification: { AttributeName: ttlRequired ? EXPIRES_ATTRIBUTE : undefined, Enabled: ttlRequired }
       });
     }
   }
@@ -253,32 +386,13 @@ export class DynamoDBModelService implements ModelCrudSupport, ModelExpirySuppor
     }
   }
 
-  async * list<T extends ModelType>(cls: Class<T>): AsyncIterable<T> {
-    let done = false;
-    let token: Record<string, AttributeValue> | undefined;
-    while (!done) {
-      const batch = await this.client.scan({
-        TableName: this.#resolveTable(cls),
-        ExclusiveStartKey: token
-      });
-
-      if (batch.Count && batch.Items) {
-        for (const item of batch.Items) {
-          try {
-            yield await DynamoDBUtil.loadAndCheckExpiry(cls, item.body.S!);
-          } catch (error) {
-            if (!(error instanceof NotFoundError)) {
-              throw error;
-            }
-          }
-        }
-      }
-
-      if (!batch.Count || !batch.LastEvaluatedKey) {
-        done = true;
-      } else {
-        token = batch.LastEvaluatedKey;
-      }
+  async * list<T extends ModelType>(cls: Class<T>, options?: ModelListOptions): AsyncIterable<T[]> {
+    for await (const { items } of this.#scanCollection(cls, (batchSize, lastKey) => this.client.scan({
+      TableName: this.#resolveTable(cls),
+      ExclusiveStartKey: lastKey,
+      Limit: batchSize
+    }), options)) {
+      yield items;
     }
   }
 
@@ -288,92 +402,118 @@ export class DynamoDBModelService implements ModelCrudSupport, ModelExpirySuppor
   }
 
   // Indexed
-  async #getIdByIndex<T extends ModelType>(cls: Class<T>, idx: string, body: DeepPartial<T>): Promise<string> {
-    ModelCrudUtil.ensureNotSubType(cls);
-
-    const idxConfig = ModelRegistryIndex.getIndex(cls, idx, ['sorted', 'unsorted']);
-
-    const { key, sort } = ModelIndexedUtil.computeIndexKey(cls, idxConfig, body);
-
-    if (idxConfig.type === 'sorted' && sort === undefined) {
-      throw new IndexNotSupported(cls, idxConfig, 'Sorted indices require the sort field');
-    }
-
-    const idxName = DynamoDBUtil.simpleName(idx);
-
-    const query = {
-      TableName: this.#resolveTable(cls),
-      IndexName: idxName,
-      ProjectionExpression: 'id',
-      KeyConditionExpression: [sort ? `${idxName}_sort__ = :${idxName}_sort` : '', `${idxName}__ = :${idxName}`]
-        .filter(expr => !!expr)
-        .join(' and '),
-      ExpressionAttributeValues: {
-        [`:${idxName}`]: DynamoDBUtil.toValue(key),
-        ...(sort ? { [`:${idxName}_sort`]: DynamoDBUtil.toValue(+sort) } : {})
-      }
-    };
-
-    const result = await this.client.query(query);
-
-    if (result.Count && result.Items && result.Items[0]) {
-      return result.Items[0].id.S!;
-    }
-    throw new NotFoundError(`${cls.name} Index=${idx}`, key);
-  }
-
-  // Indexed
-  async getByIndex<T extends ModelType>(cls: Class<T>, idx: string, body: DeepPartial<T>): Promise<T> {
+  async getByIndex<
+    T extends ModelType,
+    K extends KeyedIndexSelection<T>,
+    S extends SortedIndexSelection<T>
+  >(cls: Class<T>, idx: SingleItemIndex<T, K, S>, body: FullKeyedIndexBody<T, K, S>): Promise<T> {
     return this.get(cls, await this.#getIdByIndex(cls, idx, body));
   }
 
-  async deleteByIndex<T extends ModelType>(cls: Class<T>, idx: string, body: DeepPartial<T>): Promise<void> {
+  async deleteByIndex<
+    T extends ModelType,
+    K extends KeyedIndexSelection<T>,
+    S extends SortedIndexSelection<T>
+  >(cls: Class<T>, idx: SingleItemIndex<T, K, S>, body: FullKeyedIndexBody<T, K, S>): Promise<void> {
     return this.delete(cls, await this.#getIdByIndex(cls, idx, body));
   }
 
-  upsertByIndex<T extends ModelType>(cls: Class<T>, idx: string, body: OptionalId<T>): Promise<T> {
+  upsertByIndex<
+    T extends ModelType,
+    K extends KeyedIndexSelection<T>,
+    S extends SortedIndexSelection<T>
+  >(cls: Class<T>, idx: SingleItemIndex<T, K, S>, body: OptionalId<T>): Promise<T> {
     return ModelIndexedUtil.naiveUpsert(this, cls, idx, body);
   }
 
-  async * listByIndex<T extends ModelType>(cls: Class<T>, idx: string, body?: DeepPartial<T>): AsyncIterable<T> {
-    ModelCrudUtil.ensureNotSubType(cls);
+  async updateByIndex<
+    T extends ModelType,
+    K extends KeyedIndexSelection<T>,
+    S extends SortedIndexSelection<T>
+  >(cls: Class<T>, idx: SingleItemIndex<T, K, S>, body: T): Promise<T> {
+    return ModelIndexedUtil.naiveUpdate(this, cls, idx, body);
+  }
 
-    const config = ModelRegistryIndex.getIndex(cls, idx, ['sorted', 'unsorted']);
-    const { key } = ModelIndexedUtil.computeIndexKey(cls, config, body, { emptySortValue: null });
+  async updatePartialByIndex<
+    T extends ModelType,
+    K extends KeyedIndexSelection<T>,
+    S extends SortedIndexSelection<T>
+  >(cls: Class<T>, idx: SingleItemIndex<T, K, S>, body: FullKeyedIndexWithPartialBody<T, K, S>): Promise<T> {
+    const item = await ModelCrudUtil.naivePartialUpdate(cls, () => this.getByIndex(cls, idx, castTo(body)), castTo(body));
+    return this.update(cls, item);
+  }
 
-    const idxName = DynamoDBUtil.simpleName(idx);
+  async pageByIndex<
+    T extends ModelType,
+    K extends KeyedIndexSelection<T>,
+    S extends SortedIndexSelection<T>
+  >(
+    cls: Class<T>,
+    idx: SortedIndex<T, K, S>,
+    body: KeyedIndexBody<T, K>,
+    options?: ModelPageOptions,
+  ): Promise<ModelPageResult<T>> {
+    const output: T[] = [];
+    const offset = options?.offset ? JSONUtil.fromBase64<Record<string, AttributeValue>>(options.offset) : undefined;
+    for await (const { items } of this.#scanIndex(cls, idx, body, { limit: 100, ...options, offset })) {
+      output.push(...items);
+    }
 
-    let done = false;
-    let token: Record<string, AttributeValue> | undefined;
-    while (!done) {
-      const batch = await this.client.query({
-        TableName: this.#resolveTable(cls),
-        IndexName: idxName,
-        ProjectionExpression: 'body',
-        KeyConditionExpression: `${idxName}__ = :${idxName}`,
-        ExpressionAttributeValues: {
-          [`:${idxName}`]: DynamoDBUtil.toValue(key)
-        },
-        ExclusiveStartKey: token
+    let nextOffset;
+    if (output.length) {
+      const last: T = output.at(-1)!;
+      const computed = ModelIndexedComputedIndex.get(idx, last).validate();
+      const { keyIndexAttribute, sortIndexAttribute } = DynamoDBUtil.indexNames(idx.name);
+      nextOffset = JSONUtil.toBase64({
+        [keyIndexAttribute]: getKey(computed),
+        [sortIndexAttribute]: getSort(computed),
+        id: DynamoDBUtil.toValue(last.id)
       });
+    }
 
-      if (batch.Count && batch.Items) {
-        for (const item of batch.Items) {
-          try {
-            yield await DynamoDBUtil.loadAndCheckExpiry(cls, item.body.S!);
-          } catch (error) {
-            if (!(error instanceof NotFoundError)) {
-              throw error;
-            }
-          }
-        }
-      }
+    return { items: output, nextOffset };
+  }
 
-      if (!batch.Count || !batch.LastEvaluatedKey) {
-        done = true;
-      } else {
-        token = batch.LastEvaluatedKey;
-      }
+  async * listByIndex<
+    T extends ModelType,
+    K extends KeyedIndexSelection<T>,
+    S extends SortedIndexSelection<T>
+  >(
+    cls: Class<T>,
+    idx: SortedIndex<T, K, S>,
+    body: KeyedIndexBody<T, K>,
+    options?: ModelListOptions
+  ): AsyncIterable<T[]> {
+    for await (const { items } of this.#scanIndex(cls, idx, body, options)) {
+      yield items;
     }
   }
+
+  async suggestByIndex<
+    T extends ModelType,
+    S extends SortedIndexSelection<T>,
+    K extends KeyedIndexSelection<T>,
+    B extends SortedIndexSelectionType<T, S> & string
+  >(cls: Class<T>, idx: SortedIndex<T, K, S>, body: KeyedIndexBody<T, K>, prefix: B, options?: ModelIndexedSearchOptions): Promise<T[]> {
+    const results: T[] = [];
+
+    const { sortIndexAttribute } = DynamoDBUtil.indexNames(idx.name);
+
+    for await (const { items } of this.#scanIndex(cls, idx, body, { limit: 10, ...options },
+      (query) => ({
+        ...query,
+        KeyConditionExpression: [query.KeyConditionExpression, `begins_with(${sortIndexAttribute}, :prefix)`]
+          .filter(Boolean)
+          .join(' AND '),
+        ExpressionAttributeValues: {
+          ...query.ExpressionAttributeValues,
+          ':prefix': { S: prefix }
+        }
+      })
+    )) {
+      results.push(...items);
+    }
+
+    return results;
+  }
 }

package/src/util.ts

@@ -3,8 +3,10 @@ import type {
   GlobalSecondaryIndexUpdate, KeySchemaElement
 } from '@aws-sdk/client-dynamodb';
 
-import type { Class } from '@travetto/runtime';
+import { type Class, castTo } from '@travetto/runtime';
 import { ModelCrudUtil, ModelExpiryUtil, ModelRegistryIndex, NotFoundError, type ModelType } from '@travetto/model';
+import { isModelIndexedIndex, warnIfIndexedUniqueIndex, warnIfNonIndexedIndex } from '@travetto/model-indexed';
+import { SchemaRegistryIndex } from '@travetto/schema';
 
 /**
  * Configuration for DynamoDB indices
@@ -19,12 +21,15 @@ type DynamoIndexConfig = {
  */
 export class DynamoDBUtil {
 
-  /**
-   * Converts an index name to a simplified format by removing non-alphanumeric characters
-   */
-  static simpleName(idx: string): string {
-    return idx.replace(/[^A-Za-z0-9]/g, '');
-  }
+  static indexNames = (name: string): { keyIndexName: string, sortIndexName: string, keyIndexAttribute: string, sortIndexAttribute: string } => {
+    const base = name.toLowerCase().replace(/[^A-Za-z0-9]+/g, '_');
+    return {
+      keyIndexName: base,
+      sortIndexName: `${base}_sort`,
+      keyIndexAttribute: `${base}__`,
+      sortIndexAttribute: `${base}_sort__`
+    };
+  };
 
   /**
    * Converts a JavaScript value to a DynamoDB AttributeValue format
@@ -51,29 +56,50 @@ export class DynamoDBUtil {
    * Generates global secondary indices and attribute definitions based on the model's index configuration.
    */
   static computeIndexConfig<T extends ModelType>(cls: Class<T>): DynamoIndexConfig {
-    const config = ModelRegistryIndex.getConfig(cls);
+    const indexes = ModelRegistryIndex.getIndices(cls);
     const attributes: AttributeDefinition[] = [];
-    const indices: GlobalSecondaryIndex[] = [];
-
-    for (const idx of config.indices ?? []) {
-      const idxName = this.simpleName(idx.name);
-      attributes.push({ AttributeName: `${idxName}__`, AttributeType: 'S' });
-
-      const keys: KeySchemaElement[] = [{
-        AttributeName: `${idxName}__`,
-        KeyType: 'HASH'
-      }];
-
-      if (idx.type === 'sorted') {
-        keys.push({
-          AttributeName: `${idxName}_sort__`,
-          KeyType: 'RANGE'
-        });
-        attributes.push({ AttributeName: `${idxName}_sort__`, AttributeType: 'N' });
+    const toCreate: GlobalSecondaryIndex[] = [];
+
+    const filtered = indexes
+      .filter(idx => !warnIfIndexedUniqueIndex(this, cls, [idx]))
+      .filter(idx => !warnIfNonIndexedIndex(this, cls, [idx]))
+      .filter(isModelIndexedIndex);
+
+    for (const idx of filtered) {
+      const keys: KeySchemaElement[] = [];
+
+      const { keyIndexName, keyIndexAttribute, sortIndexAttribute } = this.indexNames(idx.name);
+
+      switch (idx.type) {
+        case 'indexed:sorted': {
+          const path = idx.sortTemplate[0].path;
+          let fieldType = cls;
+          for (const field of path) {
+            if (SchemaRegistryIndex.has(fieldType)) {
+              const schema = SchemaRegistryIndex.getConfig(fieldType);
+              if (field in schema.fields) {
+                fieldType = schema.fields[field].type;
+              }
+            } else {
+              break;
+            }
+          }
+
+          keys.push({ AttributeName: keyIndexAttribute, KeyType: 'HASH' });
+          keys.push({ AttributeName: sortIndexAttribute, KeyType: 'RANGE', });
+          attributes.push({ AttributeName: keyIndexAttribute, AttributeType: 'S' });
+          attributes.push({ AttributeName: sortIndexAttribute, AttributeType: castTo(fieldType) === String ? 'S' : 'N' });
+          break;
+        }
+        case 'indexed:keyed': {
+          keys.push({ AttributeName: keyIndexAttribute, KeyType: 'HASH' });
+          attributes.push({ AttributeName: keyIndexAttribute, AttributeType: 'S' });
+          break;
+        }
       }
 
-      indices.push({
-        IndexName: idxName,
+      toCreate.push({
+        IndexName: keyIndexName,
         // ProvisionedThroughput: '',
         Projection: {
           ProjectionType: 'INCLUDE',
@@ -83,7 +109,7 @@ export class DynamoDBUtil {
       });
     }
 
-    return { indices: indices.length ? indices : undefined, attributes };
+    return { indices: toCreate.length ? toCreate : undefined, attributes };
   }
 
   /**