@ftschopp/dynatable-core 1.2.1 → 1.2.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## @ftschopp/dynatable-core [1.2.3](https://github.com/ftschopp/dynatable/compare/@ftschopp/dynatable-core@1.2.2...@ftschopp/dynatable-core@1.2.3) (2026-04-27)
+
+
+### Bug Fixes
+
+* resolve both required and optional keys in generate fields ([2c06b43](https://github.com/ftschopp/dynatable/commit/2c06b435d4578cb28f773798c80c19bf4eb9ef28))
+
+## @ftschopp/dynatable-core [1.2.2](https://github.com/ftschopp/dynatable/compare/@ftschopp/dynatable-core@1.2.1...@ftschopp/dynatable-core@1.2.2) (2026-04-15)
+
+
+### Bug Fixes
+
+* add filter type scan entity ([dddff15](https://github.com/ftschopp/dynatable/commit/dddff15228f84fd11b0c6d2daa6f5cc8d77c641d))
+
 ## @ftschopp/dynatable-core [1.2.1](https://github.com/ftschopp/dynatable/compare/@ftschopp/dynatable-core@1.2.0...@ftschopp/dynatable-core@1.2.1) (2026-04-15)
 
 

package/dist/entity/create-entity-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-entity-api.d.ts","sourceRoot":"","sources":["../../src/entity/create-entity-api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AActF,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAKtD;;;;;;;;;GASG;AACH,eAAO,MAAM,eAAe,GAAI,KAAK,SAAS,eAAe,EAC3D,WAAW,MAAM,EACjB,WAAW,MAAM,EACjB,OAAO,KAAK,EACZ,QAAQ,cAAc,EACtB,UAAS,gBAAqB,KAC7B,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC,KAAK,CAAC,CA8KtE,CAAC"}
+{"version":3,"file":"create-entity-api.d.ts","sourceRoot":"","sources":["../../src/entity/create-entity-api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AActF,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAMtD;;;;;;;;;GASG;AACH,eAAO,MAAM,eAAe,GAAI,KAAK,SAAS,eAAe,EAC3D,WAAW,MAAM,EACjB,WAAW,MAAM,EACjB,OAAO,KAAK,EACZ,QAAQ,cAAc,EACtB,UAAS,gBAAqB,KAC7B,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC,KAAK,CAAC,CAqLtE,CAAC"}

package/dist/entity/create-entity-api.js

@@ -38,8 +38,8 @@ const createEntityAPI = (tableName, modelName, model, client, options = {}) => {
                 isUpdate: false,
                 timestamps,
             });
-            // Resolve keys again with defaults
-            const fullKey = (0, model_utils_1.resolveKeys)(model, withDefaults);
+            // Resolve keys again with defaults (including GSI index keys)
+            const fullKey = (0, model_utils_1.resolveKeys)(model, withDefaults, 'both');
             // Combine keys and data into full item, adding _type field
             const fullItem = {
                 ...withDefaults,
@@ -54,7 +54,13 @@ const createEntityAPI = (tableName, modelName, model, client, options = {}) => {
             return (0, builders_1.createQueryBuilder)(tableName, client, model, logger);
         },
         scan() {
-            const builder = (0, builders_1.createScanBuilder)(tableName, client, [], [], undefined, false, undefined, undefined, undefined, logger);
+            // Auto-filter by entity type so scan only returns items for this entity
+            const typeFilter = {
+                expression: '#_type = :_type',
+                names: { '#_type': '_type' },
+                values: { ':_type': modelName },
+            };
+            const builder = (0, builders_1.createScanBuilder)(tableName, client, [typeFilter], [], undefined, false, undefined, undefined, undefined, logger);
             return (0, with_middleware_1.withMiddleware)(builder, (0, factories_1.createCleanKeysMiddleware)(cleanInternalKeys));
         },
         update(key) {
@@ -100,8 +106,8 @@ const createEntityAPI = (tableName, modelName, model, client, options = {}) => {
                     isUpdate: false,
                     timestamps,
                 });
-                // Resolve keys again with defaults
-                const fullKey = (0, model_utils_1.resolveKeys)(model, withDefaults);
+                // Resolve keys again with defaults (including GSI index keys)
+                const fullKey = (0, model_utils_1.resolveKeys)(model, withDefaults, 'both');
                 // Combine keys and data into full item, adding _type field
                 return {
                     ...withDefaults,

package/dist/utils/zod-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zod-utils.d.ts","sourceRoot":"","sources":["../../src/utils/zod-utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EAAK,SAAS,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAE5C;;;GAGG;AACH,eAAO,MAAM,SAAS,GAAI,MAAM,mBAAmB,KAAG,OA+BrD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,UAAU,GAAI,OAAO,eAAe,KAAG,SAAS,CAAC,GAAG,CAMhE,CAAC"}
+{"version":3,"file":"zod-utils.d.ts","sourceRoot":"","sources":["../../src/utils/zod-utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EAAK,SAAS,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAE5C;;;GAGG;AACH,eAAO,MAAM,SAAS,GAAI,MAAM,mBAAmB,KAAG,OAgCrD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,UAAU,GAAI,OAAO,eAAe,KAAG,SAAS,CAAC,GAAG,CAMhE,CAAC"}

package/dist/utils/zod-utils.js

@@ -39,7 +39,8 @@ const typeToZod = (attr) => {
                             ? zod_1.z.date()
                             : zod_1.z.unknown();
     }
-    return attr.required ? zodType : zodType.optional();
+    const isGenerated = 'generate' in attr;
+    return attr.required && !isGenerated ? zodType : zodType.optional();
 };
 exports.typeToZod = typeToZod;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ftschopp/dynatable-core",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "Core library for DynamoDB single table design",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/entity/create-entity-api.ts

@@ -18,6 +18,7 @@ import { EntityAPI, EntityAPIOptions } from './types';
 import { withMiddleware } from './middleware/with-middleware';
 import { createCleanKeysMiddleware } from './middleware/factories';
 import { validateKeyFields } from './validation/key-validation';
+import { Condition } from '@/builders/shared/types';
 
 /**
  * Creates an entity API instance with validation, key resolution, and builder creation.
@@ -70,8 +71,8 @@ export const createEntityAPI = <Model extends ModelDefinition>(
         timestamps,
       });
 
-      // Resolve keys again with defaults
-      const fullKey = resolveKeys(model, withDefaults);
+      // Resolve keys again with defaults (including GSI index keys)
+      const fullKey = resolveKeys(model, withDefaults, 'both');
 
       // Combine keys and data into full item, adding _type field
       const fullItem = {
@@ -90,10 +91,17 @@ export const createEntityAPI = <Model extends ModelDefinition>(
     },
 
     scan() {
+      // Auto-filter by entity type so scan only returns items for this entity
+      const typeFilter: Condition = {
+        expression: '#_type = :_type',
+        names: { '#_type': '_type' },
+        values: { ':_type': modelName },
+      };
+
       const builder = createScanBuilder<InferModel<Model>>(
         tableName,
         client,
-        [],
+        [typeFilter],
         [],
         undefined,
         false,
@@ -186,8 +194,8 @@ export const createEntityAPI = <Model extends ModelDefinition>(
           timestamps,
         });
 
-        // Resolve keys again with defaults
-        const fullKey = resolveKeys(model, withDefaults);
+        // Resolve keys again with defaults (including GSI index keys)
+        const fullKey = resolveKeys(model, withDefaults, 'both');
 
         // Combine keys and data into full item, adding _type field
         return {

package/src/utils/zod-utils.ts

@@ -38,7 +38,8 @@ export const typeToZod = (attr: AttributeDefinition): ZodType => {
               : z.unknown();
   }
 
-  return attr.required ? zodType : zodType.optional();
+  const isGenerated = 'generate' in attr;
+  return attr.required && !isGenerated ? zodType : zodType.optional();
 };
 
 /**

package/tests/integration/instagram-clone.integration.test.ts

@@ -726,7 +726,9 @@ describe('Should test dbParams function builder', () => {
     const params = await table.entities.User.scan().dbParams();
 
     expect(params.TableName).toBe('InstagramClone');
-    expect(params.FilterExpression).toBeUndefined();
+    expect(params.FilterExpression).toBe('#_type = :_type');
+    expect(params.ExpressionAttributeNames).toMatchObject({ '#_type': '_type' });
+    expect(params.ExpressionAttributeValues).toMatchObject({ ':_type': 'User' });
   });
 
   test('SCAN Users with filter', async () => {
@@ -736,10 +738,12 @@ describe('Should test dbParams function builder', () => {
 
     expect(params.TableName).toBe('InstagramClone');
     expect(params.FilterExpression).toMatch(/#followerCount > :followerCount_\d+/);
-    expect(params.ExpressionAttributeNames).toEqual({
+    expect(params.ExpressionAttributeNames).toMatchObject({
       '#followerCount': 'followerCount',
+      '#_type': '_type',
     });
     expect(Object.values(params.ExpressionAttributeValues || {})).toContain(100);
+    expect(Object.values(params.ExpressionAttributeValues || {})).toContain('User');
   });
 
   test('SCAN Users with multiple filters', async () => {
@@ -751,9 +755,10 @@ describe('Should test dbParams function builder', () => {
     expect(params.FilterExpression).toMatch(
       /\(#followerCount > :followerCount_\d+\) AND \(#followingCount > :followingCount_\d+\)/
     );
-    expect(params.ExpressionAttributeNames).toEqual({
+    expect(params.ExpressionAttributeNames).toMatchObject({
       '#followerCount': 'followerCount',
       '#followingCount': 'followingCount',
+      '#_type': '_type',
     });
   });
 
@@ -763,6 +768,8 @@ describe('Should test dbParams function builder', () => {
       .dbParams();
 
     expect(params.ProjectionExpression).toBe('username, photoId, likesCount');
+    expect(params.FilterExpression).toBe('#_type = :_type');
+    expect(params.ExpressionAttributeValues).toMatchObject({ ':_type': 'Photo' });
   });
 
   test('SCAN Photos with limit', async () => {
@@ -773,6 +780,8 @@ describe('Should test dbParams function builder', () => {
 
     expect(params.Limit).toBe(10);
     expect(params.FilterExpression).toMatch(/#likesCount > :likesCount_\d+/);
+    expect(params.FilterExpression).toMatch(/#_type = :_type/);
+    expect(params.ExpressionAttributeValues).toMatchObject({ ':_type': 'Photo' });
   });
 
   test('SCAN with IN operator', async () => {
@@ -781,9 +790,11 @@ describe('Should test dbParams function builder', () => {
       .dbParams();
 
     expect(params.FilterExpression).toContain('IN');
+    expect(params.FilterExpression).toMatch(/#_type = :_type/);
     expect(Object.values(params.ExpressionAttributeValues || {})).toContain('alice');
     expect(Object.values(params.ExpressionAttributeValues || {})).toContain('bob');
     expect(Object.values(params.ExpressionAttributeValues || {})).toContain('charlie');
+    expect(Object.values(params.ExpressionAttributeValues || {})).toContain('User');
   });
 
   test('SCAN with size operator', async () => {
@@ -792,7 +803,9 @@ describe('Should test dbParams function builder', () => {
       .dbParams();
 
     expect(params.FilterExpression).toMatch(/size\(#name\) > :name_size_\d+/);
+    expect(params.FilterExpression).toMatch(/#_type = :_type/);
     expect(Object.values(params.ExpressionAttributeValues || {})).toContain(5);
+    expect(Object.values(params.ExpressionAttributeValues || {})).toContain('User');
   });
 
   test('SCAN Comments with complex filter', async () => {
@@ -804,6 +817,8 @@ describe('Should test dbParams function builder', () => {
 
     expect(params.FilterExpression).toMatch(/attribute_exists\(#content\)/);
     expect(params.FilterExpression).toMatch(/size\(#content\) > :content_size_\d+/);
+    expect(params.FilterExpression).toMatch(/#_type = :_type/);
+    expect(params.ExpressionAttributeValues).toMatchObject({ ':_type': 'Comment' });
     expect(params.ProjectionExpression).toBe('photoId, commentId, content');
     expect(params.Limit).toBe(50);
   });