@ftschopp/dynatable-core 1.4.2 → 1.4.4

package/src/builders/scan/create-scan-builder.test.ts

@@ -1,416 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { DynamoDBClient } from '@aws-sdk/client-dynamodb';
-import { ScanCommand } from '@aws-sdk/lib-dynamodb';
-import { mockClient } from 'aws-sdk-client-mock';
-import { createScanBuilder } from './create-scan-builder';
-
-const ddbMock = mockClient(DynamoDBClient);
-
-describe('ScanBuilder', () => {
-  const client = new DynamoDBClient({});
-  const tableName = 'TestTable';
-
-  interface TestModel {
-    pk: string;
-    sk: string;
-    name?: string;
-    age?: number;
-    status?: string;
-    score?: number;
-  }
-
-  describe('Basic scan operations', () => {
-    test('should build params for basic scan', () => {
-      const params = createScanBuilder<TestModel>(tableName, client).dbParams();
-
-      expect(params.TableName).toBe(tableName);
-      expect(params.FilterExpression).toBeUndefined();
-      expect(params.ProjectionExpression).toBeUndefined();
-      expect(params.Limit).toBeUndefined();
-    });
-
-    test('should build params with filter', () => {
-      const params = createScanBuilder<TestModel>(tableName, client)
-        .filter((attr, op) => op.eq(attr.status, 'active'))
-        .dbParams();
-
-      expect(params.TableName).toBe(tableName);
-      expect(params.FilterExpression).toMatch(/#status = :status_\d+/);
-      expect(params.ExpressionAttributeNames).toEqual({
-        '#status': 'status',
-      });
-      expect(Object.values(params.ExpressionAttributeValues || {})).toContain('active');
-    });
-
-    test('should build params with multiple filters using AND', () => {
-      const params = createScanBuilder<TestModel>(tableName, client)
-        .filter((attr, op) => op.gt(attr.age, 18))
-        .filter((attr, op) => op.eq(attr.status, 'active'))
-        .dbParams();
-
-      expect(params.TableName).toBe(tableName);
-      expect(params.FilterExpression).toMatch(/\(#age > :age_\d+\) AND \(#status = :status_\d+\)/);
-      expect(params.ExpressionAttributeNames).toEqual({
-        '#age': 'age',
-        '#status': 'status',
-      });
-      expect(Object.values(params.ExpressionAttributeValues || {})).toContain(18);
-      expect(Object.values(params.ExpressionAttributeValues || {})).toContain('active');
-    });
-
-    test('should build params with OR filter', () => {
-      const params = createScanBuilder<TestModel>(tableName, client)
-        .filter((attr, op) => op.or(op.eq(attr.status, 'active'), op.eq(attr.status, 'pending')))
-        .dbParams();
-
-      expect(params.FilterExpression).toMatch(
-        /\(#status = :status_\d+\) OR \(#status = :status_\d+\)/
-      );
-      expect(Object.values(params.ExpressionAttributeValues || {})).toContain('active');
-      expect(Object.values(params.ExpressionAttributeValues || {})).toContain('pending');
-    });
-  });
-
-  describe('Projection', () => {
-    test('should build params with select', () => {
-      const params = createScanBuilder<TestModel>(tableName, client)
-        .select(['name', 'age', 'status'])
-        .dbParams();
-
-      expect(params.ProjectionExpression).toBe('#name, #age, #status');
-      expect(params.ExpressionAttributeNames).toEqual({
-        '#name': 'name',
-        '#age': 'age',
-        '#status': 'status',
-      });
-    });
-
-    test('should build params with select and filter, merging ExpressionAttributeNames', () => {
-      const params = createScanBuilder<TestModel>(tableName, client)
-        .select(['name', 'age'])
-        .filter((attr, op) => op.gt(attr.score, 50))
-        .dbParams();
-
-      expect(params.ProjectionExpression).toBe('#name, #age');
-      expect(params.FilterExpression).toMatch(/#score > :score_\d+/);
-      // Merged names from filter (#score) + projection (#name, #age)
-      expect(params.ExpressionAttributeNames).toEqual({
-        '#name': 'name',
-        '#age': 'age',
-        '#score': 'score',
-      });
-    });
-
-    test('placeholders survive when projected attribute is also referenced in the filter (no key collision)', () => {
-      const params = createScanBuilder<TestModel>(tableName, client)
-        .select(['name', 'age'])
-        .filter((attr, op) => op.eq(attr.name, 'alice'))
-        .dbParams();
-
-      expect(params.ProjectionExpression).toBe('#name, #age');
-      // #name resolves to "name" — filter and projection share the placeholder.
-      expect(params.ExpressionAttributeNames!['#name']).toBe('name');
-      expect(params.ExpressionAttributeNames!['#age']).toBe('age');
-    });
-
-    test('reserved DynamoDB words like "name", "date", "status", "type" can be projected', () => {
-      const params = createScanBuilder<TestModel>(tableName, client)
-        .select(['name', 'status'])
-        .dbParams();
-
-      expect(params.ProjectionExpression).toBe('#name, #status');
-      expect(params.ExpressionAttributeNames).toEqual({
-        '#name': 'name',
-        '#status': 'status',
-      });
-    });
-  });
-
-  describe('Limit', () => {
-    test('should build params with limit', () => {
-      const params = createScanBuilder<TestModel>(tableName, client).limit(100).dbParams();
-
-      expect(params.Limit).toBe(100);
-    });
-
-    test('should build params with limit and filter', () => {
-      const params = createScanBuilder<TestModel>(tableName, client)
-        .filter((attr, op) => op.eq(attr.status, 'active'))
-        .limit(50)
-        .dbParams();
-
-      expect(params.Limit).toBe(50);
-      expect(params.FilterExpression).toMatch(/#status = :status_\d+/);
-    });
-  });
-
-  describe('Consistent Read', () => {
-    test('should build params with consistent read', () => {
-      const params = createScanBuilder<TestModel>(tableName, client).consistentRead().dbParams();
-
-      expect(params.ConsistentRead).toBe(true);
-    });
-
-    test('should not set ConsistentRead by default', () => {
-      const params = createScanBuilder<TestModel>(tableName, client).dbParams();
-
-      expect(params.ConsistentRead).toBeUndefined();
-    });
-  });
-
-  describe('Index Scan', () => {
-    test('should build params with index name', () => {
-      const params = createScanBuilder<TestModel>(tableName, client).usingIndex('GSI1').dbParams();
-
-      expect(params.IndexName).toBe('GSI1');
-    });
-
-    test('should build params with index and filter', () => {
-      const params = createScanBuilder<TestModel>(tableName, client)
-        .usingIndex('GSI1')
-        .filter((attr, op) => op.gt(attr.score, 100))
-        .dbParams();
-
-      expect(params.IndexName).toBe('GSI1');
-      expect(params.FilterExpression).toMatch(/#score > :score_\d+/);
-    });
-  });
-
-  describe('Pagination', () => {
-    test('should build params with ExclusiveStartKey', () => {
-      const startKey = { pk: 'USER#1', sk: 'USER#1' };
-      const params = createScanBuilder<TestModel>(tableName, client).startFrom(startKey).dbParams();
-
-      expect(params.ExclusiveStartKey).toEqual(startKey);
-    });
-  });
-
-  describe('Parallel Scan', () => {
-    test('should build params with segment configuration', () => {
-      const params = createScanBuilder<TestModel>(tableName, client).segment(0, 4).dbParams();
-
-      expect(params.Segment).toBe(0);
-      expect(params.TotalSegments).toBe(4);
-    });
-
-    test('should build params with multiple segments', () => {
-      const params1 = createScanBuilder<TestModel>(tableName, client).segment(0, 3).dbParams();
-      const params2 = createScanBuilder<TestModel>(tableName, client).segment(1, 3).dbParams();
-      const params3 = createScanBuilder<TestModel>(tableName, client).segment(2, 3).dbParams();
-
-      expect(params1.Segment).toBe(0);
-      expect(params1.TotalSegments).toBe(3);
-      expect(params2.Segment).toBe(1);
-      expect(params2.TotalSegments).toBe(3);
-      expect(params3.Segment).toBe(2);
-      expect(params3.TotalSegments).toBe(3);
-    });
-  });
-
-  describe('Complex scenarios', () => {
-    test('should build params with all features', () => {
-      const params = createScanBuilder<TestModel>(tableName, client)
-        .filter((attr, op) => op.and(op.gt(attr.age, 18), op.eq(attr.status, 'active')))
-        .select(['name', 'age', 'status'])
-        .limit(100)
-        .consistentRead()
-        .usingIndex('GSI1')
-        .dbParams();
-
-      expect(params.TableName).toBe(tableName);
-      expect(params.FilterExpression).toMatch(/\(#age > :age_\d+\) AND \(#status = :status_\d+\)/);
-      expect(params.ProjectionExpression).toBe('#name, #age, #status');
-      expect(params.Limit).toBe(100);
-      expect(params.ConsistentRead).toBe(true);
-      expect(params.IndexName).toBe('GSI1');
-    });
-
-    test('should build params for parallel scan with filter and limit', () => {
-      const params = createScanBuilder<TestModel>(tableName, client)
-        .filter((attr, op) => op.exists(attr.name))
-        .limit(50)
-        .segment(1, 4)
-        .dbParams();
-
-      expect(params.FilterExpression).toMatch(/attribute_exists\(#name\)/);
-      expect(params.Limit).toBe(50);
-      expect(params.Segment).toBe(1);
-      expect(params.TotalSegments).toBe(4);
-    });
-  });
-
-  describe('Immutability', () => {
-    test('should create new builder instance on each method call', () => {
-      const builder1 = createScanBuilder<TestModel>(tableName, client);
-      const builder2 = builder1.filter((attr, op) => op.eq(attr.status, 'active'));
-      const builder3 = builder2.limit(50);
-
-      expect(builder1.dbParams().FilterExpression).toBeUndefined();
-      expect(builder1.dbParams().Limit).toBeUndefined();
-
-      expect(builder2.dbParams().FilterExpression).toMatch(/#status = :status_\d+/);
-      expect(builder2.dbParams().Limit).toBeUndefined();
-
-      expect(builder3.dbParams().FilterExpression).toMatch(/#status = :status_\d+/);
-      expect(builder3.dbParams().Limit).toBe(50);
-    });
-  });
-
-  describe('Advanced operators', () => {
-    test('should support contains operator', () => {
-      const params = createScanBuilder<TestModel>(tableName, client)
-        .filter((attr, op) => op.contains(attr.name, 'John'))
-        .dbParams();
-
-      expect(params.FilterExpression).toMatch(/contains\(#name, :name_\d+\)/);
-      expect(Object.values(params.ExpressionAttributeValues || {})).toContain('John');
-    });
-
-    test('should support IN operator', () => {
-      const params = createScanBuilder<TestModel>(tableName, client)
-        .filter((attr, op) => op.in(attr.status, ['active', 'pending', 'approved']))
-        .dbParams();
-
-      expect(params.FilterExpression).toContain('IN');
-      expect(Object.values(params.ExpressionAttributeValues || {})).toContain('active');
-      expect(Object.values(params.ExpressionAttributeValues || {})).toContain('pending');
-      expect(Object.values(params.ExpressionAttributeValues || {})).toContain('approved');
-    });
-
-    test('should support size operator', () => {
-      const params = createScanBuilder<TestModel>(tableName, client)
-        .filter((attr, op) => op.size(attr.name).gt(10))
-        .dbParams();
-
-      expect(params.FilterExpression).toMatch(/size\(#name\) > :name_size_\d+/);
-      expect(Object.values(params.ExpressionAttributeValues || {})).toContain(10);
-    });
-
-    test('should support between operator', () => {
-      const params = createScanBuilder<TestModel>(tableName, client)
-        .filter((attr, op) => op.between(attr.age, 18, 65))
-        .dbParams();
-
-      expect(params.FilterExpression).toMatch(/#age BETWEEN :age_low_\d+ AND :age_high_\d+/);
-      expect(Object.values(params.ExpressionAttributeValues || {})).toContain(18);
-      expect(Object.values(params.ExpressionAttributeValues || {})).toContain(65);
-    });
-  });
-
-  describe('executeWithPagination', () => {
-    beforeEach(() => {
-      ddbMock.reset();
-    });
-
-    test('returns items, lastEvaluatedKey and counts', async () => {
-      const items = [
-        { pk: 'USER#alice', sk: 'USER#alice', name: 'Alice' },
-        { pk: 'USER#bob', sk: 'USER#bob', name: 'Bob' },
-      ];
-      const lastKey = { pk: 'USER#bob', sk: 'USER#bob' };
-
-      ddbMock.on(ScanCommand).resolves({
-        Items: items,
-        LastEvaluatedKey: lastKey,
-        Count: 2,
-        ScannedCount: 5,
-      });
-
-      const result = await createScanBuilder<TestModel>(tableName, client).executeWithPagination();
-
-      expect(result.items).toEqual(items);
-      expect(result.lastEvaluatedKey).toEqual(lastKey);
-      expect(result.count).toBe(2);
-      expect(result.scannedCount).toBe(5);
-    });
-
-    test('returns undefined lastEvaluatedKey on the final page', async () => {
-      ddbMock.on(ScanCommand).resolves({ Items: [], Count: 0, ScannedCount: 0 });
-
-      const result = await createScanBuilder<TestModel>(tableName, client).executeWithPagination();
-
-      expect(result.items).toEqual([]);
-      expect(result.lastEvaluatedKey).toBeUndefined();
-    });
-  });
-
-  describe('iterate', () => {
-    beforeEach(() => {
-      ddbMock.reset();
-    });
-
-    test('walks every page transparently and yields items in order', async () => {
-      const page1 = [
-        { pk: 'USER#1', sk: 'USER#1', name: 'User 1' },
-        { pk: 'USER#2', sk: 'USER#2', name: 'User 2' },
-      ];
-      const page2 = [{ pk: 'USER#3', sk: 'USER#3', name: 'User 3' }];
-
-      ddbMock
-        .on(ScanCommand)
-        .resolvesOnce({ Items: page1, LastEvaluatedKey: { pk: 'USER#2', sk: 'USER#2' } })
-        .resolvesOnce({ Items: page2 });
-
-      const collected: TestModel[] = [];
-      for await (const item of createScanBuilder<TestModel>(tableName, client).iterate()) {
-        collected.push(item);
-      }
-
-      expect(collected.map((u) => u.name)).toEqual(['User 1', 'User 2', 'User 3']);
-      expect(ddbMock.calls()).toHaveLength(2);
-    });
-
-    test('forwards LastEvaluatedKey from each response into the next call', async () => {
-      const cursor1 = { pk: 'USER#2', sk: 'USER#2' };
-
-      ddbMock
-        .on(ScanCommand)
-        .resolvesOnce({ Items: [{ pk: 'USER#1', sk: 'USER#1' }], LastEvaluatedKey: cursor1 })
-        .resolvesOnce({ Items: [{ pk: 'USER#3', sk: 'USER#3' }] });
-
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      for await (const _ of createScanBuilder<TestModel>(tableName, client).iterate()) {
-        // drain
-      }
-
-      const calls = ddbMock.calls();
-      expect((calls[0]!.args[0].input as any).ExclusiveStartKey).toBeUndefined();
-      expect((calls[1]!.args[0].input as any).ExclusiveStartKey).toEqual(cursor1);
-    });
-
-    test('starts from the user-provided cursor on the first call', async () => {
-      const startKey = { pk: 'USER#10', sk: 'USER#10' };
-
-      ddbMock.on(ScanCommand).resolves({ Items: [{ pk: 'USER#11', sk: 'USER#11' }] });
-
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      for await (const _ of createScanBuilder<TestModel>(tableName, client)
-        .startFrom(startKey)
-        .iterate()) {
-        // drain
-      }
-
-      const calls = ddbMock.calls();
-      expect((calls[0]!.args[0].input as any).ExclusiveStartKey).toEqual(startKey);
-    });
-
-    test('break out of the loop stops further DynamoDB calls', async () => {
-      ddbMock.on(ScanCommand).resolvesOnce({
-        Items: [
-          { pk: 'USER#1', sk: 'USER#1' },
-          { pk: 'USER#2', sk: 'USER#2' },
-        ],
-        LastEvaluatedKey: { pk: 'USER#2', sk: 'USER#2' },
-      });
-
-      const collected: TestModel[] = [];
-      for await (const item of createScanBuilder<TestModel>(tableName, client).iterate()) {
-        collected.push(item);
-        if (collected.length >= 1) break;
-      }
-
-      expect(collected).toHaveLength(1);
-      expect(ddbMock.calls()).toHaveLength(1);
-    });
-  });
-});

package/src/builders/scan/create-scan-builder.ts

@@ -1,265 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { DynamoDBClient } from '@aws-sdk/client-dynamodb';
-import { ScanCommand } from '@aws-sdk/lib-dynamodb';
-import {
-  buildExpression,
-  AttrBuilder,
-  Condition,
-  createOpBuilder,
-  buildProjectionExpression,
-} from '../shared';
-import { ScanBuilder, ScanResult } from './types';
-import { DynamoDBLogger } from '../../utils/dynamodb-logger';
-
-/**
- * Creates a ScanBuilder for scanning a table or index.
- */
-export function createScanBuilder<Model>(
-  tableName: string,
-  client: DynamoDBClient,
-  filters: Condition[] = [],
-  projectionAttrs: (keyof Model)[] = [],
-  limitValue?: number,
-  isConsistentRead = false,
-  indexName?: string,
-  exclusiveStartKey?: Record<string, any>,
-  segmentConfig?: { segment: number; totalSegments: number },
-  logger?: DynamoDBLogger
-): ScanBuilder<Model> {
-  const build = (): ScanBuilder<Model> => ({
-    filter(fn) {
-      const attrs = new Proxy({} as AttrBuilder<Model>, {
-        get(_, prop: string) {
-          return { name: prop };
-        },
-      });
-      const opBuilder = createOpBuilder();
-      const condition = fn(attrs, opBuilder);
-      return createScanBuilder(
-        tableName,
-        client,
-        [...filters, condition],
-        projectionAttrs,
-        limitValue,
-        isConsistentRead,
-        indexName,
-        exclusiveStartKey,
-        segmentConfig,
-        logger
-      );
-    },
-
-    select(attrs) {
-      return createScanBuilder(
-        tableName,
-        client,
-        filters,
-        attrs,
-        limitValue,
-        isConsistentRead,
-        indexName,
-        exclusiveStartKey,
-        segmentConfig,
-        logger
-      );
-    },
-
-    limit(count) {
-      return createScanBuilder(
-        tableName,
-        client,
-        filters,
-        projectionAttrs,
-        count,
-        isConsistentRead,
-        indexName,
-        exclusiveStartKey,
-        segmentConfig,
-        logger
-      );
-    },
-
-    consistentRead() {
-      return createScanBuilder(
-        tableName,
-        client,
-        filters,
-        projectionAttrs,
-        limitValue,
-        true,
-        indexName,
-        exclusiveStartKey,
-        segmentConfig,
-        logger
-      );
-    },
-
-    usingIndex(index) {
-      return createScanBuilder(
-        tableName,
-        client,
-        filters,
-        projectionAttrs,
-        limitValue,
-        isConsistentRead,
-        index,
-        exclusiveStartKey,
-        segmentConfig,
-        logger
-      );
-    },
-
-    startFrom(key) {
-      return createScanBuilder(
-        tableName,
-        client,
-        filters,
-        projectionAttrs,
-        limitValue,
-        isConsistentRead,
-        indexName,
-        key,
-        segmentConfig,
-        logger
-      );
-    },
-
-    segment(segmentNumber, totalSegments) {
-      return createScanBuilder(
-        tableName,
-        client,
-        filters,
-        projectionAttrs,
-        limitValue,
-        isConsistentRead,
-        indexName,
-        exclusiveStartKey,
-        { segment: segmentNumber, totalSegments },
-        logger
-      );
-    },
-
-    dbParams() {
-      let filterExpression = '';
-      let expressionAttributeNames: Record<string, string> = {};
-      let expressionAttributeValues: Record<string, any> = {};
-
-      // Build FilterExpression from filters
-      if (filters.length > 0) {
-        const combinedFilter =
-          filters.length === 1 && filters[0]
-            ? filters[0]
-            : {
-                expression: '',
-                operator: 'AND' as const,
-                children: filters,
-              };
-
-        const result = buildExpression(combinedFilter);
-        filterExpression = result.expression;
-        expressionAttributeNames = result.names;
-        expressionAttributeValues = result.values;
-      }
-
-      // Build ProjectionExpression with placeholders so reserved words
-      // (name, date, status, type, …) don't blow up at DynamoDB.
-      let projectionExpression = '';
-      if (projectionAttrs.length > 0) {
-        const proj = buildProjectionExpression(projectionAttrs.map((attr) => String(attr)));
-        projectionExpression = proj.ProjectionExpression;
-        // Idempotent merge: filter and projection placeholders both map
-        // `#name → name`, so collisions resolve to the same value.
-        expressionAttributeNames = {
-          ...proj.ExpressionAttributeNames,
-          ...expressionAttributeNames,
-        };
-      }
-
-      const params: any = {
-        TableName: tableName,
-      };
-
-      if (filterExpression) {
-        params.FilterExpression = filterExpression;
-      }
-
-      if (Object.keys(expressionAttributeNames).length > 0) {
-        params.ExpressionAttributeNames = expressionAttributeNames;
-      }
-
-      if (Object.keys(expressionAttributeValues).length > 0) {
-        params.ExpressionAttributeValues = expressionAttributeValues;
-      }
-
-      if (projectionExpression) {
-        params.ProjectionExpression = projectionExpression;
-      }
-
-      if (limitValue !== undefined) {
-        params.Limit = limitValue;
-      }
-
-      if (isConsistentRead) {
-        params.ConsistentRead = true;
-      }
-
-      if (indexName) {
-        params.IndexName = indexName;
-      }
-
-      if (exclusiveStartKey) {
-        params.ExclusiveStartKey = exclusiveStartKey;
-      }
-
-      if (segmentConfig) {
-        params.Segment = segmentConfig.segment;
-        params.TotalSegments = segmentConfig.totalSegments;
-      }
-
-      return params;
-    },
-
-    /**
-     * ⚠️ Returns only the FIRST page of results. DynamoDB caps each Scan
-     * response at ~1MB (or `Limit` if set). If the matching set is larger,
-     * the remaining items are silently dropped.
-     *
-     * Use {@link executeWithPagination} when you need to drive pagination
-     * yourself, or {@link iterate} to walk every matching item lazily.
-     */
-    async execute() {
-      const params = build().dbParams();
-      const response = await client.send(new ScanCommand(params));
-      logger?.log('ScanCommand', params, response);
-      return (response.Items || []) as Model[];
-    },
-
-    async executeWithPagination(): Promise<ScanResult<Model>> {
-      const params = build().dbParams();
-      const response = await client.send(new ScanCommand(params));
-      logger?.log('ScanCommand', params, response);
-      return {
-        items: (response.Items ?? []) as Model[],
-        lastEvaluatedKey: response.LastEvaluatedKey,
-        count: response.Count,
-        scannedCount: response.ScannedCount,
-      };
-    },
-
-    async *iterate(): AsyncIterableIterator<Model> {
-      const baseParams = build().dbParams();
-      let cursor: Record<string, any> | undefined = baseParams.ExclusiveStartKey;
-      do {
-        const params = { ...baseParams, ExclusiveStartKey: cursor };
-        const response = await client.send(new ScanCommand(params));
-        logger?.log('ScanCommand', params, response);
-        for (const item of (response.Items ?? []) as Model[]) {
-          yield item;
-        }
-        cursor = response.LastEvaluatedKey;
-      } while (cursor);
-    },
-  });
-
-  return build();
-}

package/src/builders/scan/index.ts

@@ -1,2 +0,0 @@
-export * from './types';
-export * from './create-scan-builder';