@ftschopp/dynatable-core 1.1.0 → 1.2.1

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## @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)
+
+
+### Bug Fixes
+
+* resolve GSI key attributes to KeyConditionExpression when using useIndex ([8b2ee35](https://github.com/ftschopp/dynatable/commit/8b2ee35ca56bae9a32c8f1fec764365e8496674d))
+
+## @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)
+
+
+### Bug Fixes
+
+* resolve GSI key attributes to KeyConditionExpression when using useIndex ([8b2ee35](https://github.com/ftschopp/dynatable/commit/8b2ee35ca56bae9a32c8f1fec764365e8496674d))
+
+# @ftschopp/dynatable-core [1.2.0](https://github.com/ftschopp/dynatable/compare/@ftschopp/dynatable-core@1.1.0...@ftschopp/dynatable-core@1.2.0) (2026-03-20)
+
+
+### Features
+
+* support nested objects and arrays schema ([c06e43e](https://github.com/ftschopp/dynatable/commit/c06e43e6b425bae09f127d2f767b5c8c62dd1142))
+
 # @ftschopp/dynatable-core [1.1.0](https://github.com/ftschopp/dynatable/compare/@ftschopp/dynatable-core@1.0.0...@ftschopp/dynatable-core@1.1.0) (2026-01-20)
 
 

package/README.md

@@ -130,6 +130,21 @@ const schema = {
         email: { type: String },
         userId: { type: String, generate: 'ulid' },
         followerCount: { type: Number, default: 0 },
+        // Nested object with typed schema
+        address: {
+          type: Object,
+          schema: {
+            street: { type: String },
+            city: { type: String, required: true },
+            country: { type: String, required: true },
+          },
+        },
+        // Typed array with item schema
+        tags: {
+          type: Array,
+          default: [],
+          items: { type: String },
+        },
       },
     },
   },
@@ -142,24 +157,85 @@ const schema = {
 } as const;
 ```
 
+### Nested Objects and Arrays
+
+Attributes support typed nested schemas for full TypeScript inference:
+
+```typescript
+Story: {
+  attributes: {
+    // Typed array of objects
+    frames: {
+      type: Array,
+      default: [],
+      items: {
+        type: Object,
+        schema: {
+          url: { type: String, required: true },
+          duration: { type: Number },
+          mediaType: { type: String },
+        },
+      },
+    },
+    // Nested object with a typed schema
+    location: {
+      type: Object,
+      schema: {
+        city: { type: String },
+        country: { type: String },
+        lat: { type: Number },
+        lng: { type: Number },
+      },
+    },
+  },
+}
+```
+
+Use `ArrayItem<T>` to extract item types from array attributes:
+
+```typescript
+import type { InferModelFromSchema, ArrayItem } from '@ftschopp/dynatable-core';
+
+type StoryEntity = InferModelFromSchema<typeof schema, 'Story'>;
+type StoryFrame = ArrayItem<StoryEntity['frames']>;
+// → { url: string; duration?: number; mediaType?: string }
+```
+
 ### Type Inference
 
 Extract types from your schema:
 
 ```typescript
-import type { InferModel, InferInput, InferKeyInput } from '@ftschopp/dynatable-core';
-
-// Full model type (includes timestamps if enabled)
-type User = InferModel<typeof schema.models.User>;
+import type {
+  InferModel,
+  InferInput,
+  InferKeyInput,
+  InferModelFromSchema,
+  InferInputFromSchema,
+  ArrayItem,
+} from '@ftschopp/dynatable-core';
+
+// Preferred: infer from the full schema (timestamps included automatically)
+type User = InferModelFromSchema<typeof schema, 'User'>;
 // { username: string; name: string; email?: string; userId: string; followerCount: number; createdAt: string; updatedAt: string }
 
-// Input type (excludes generated fields and timestamps)
-type UserInput = InferInput<typeof schema.models.User>;
-// { username: string; name: string; email?: string; userId?: string; followerCount?: number }
+type UserInput = InferInputFromSchema<typeof schema, 'User'>;
+// { username: string; name: string; email?: string; followerCount?: number }
+
+// Full model type (deprecated — use InferModelFromSchema)
+type UserLegacy = InferModel<typeof schema.models.User>;
+
+// Input type (deprecated — use InferInputFromSchema)
+type UserInputLegacy = InferInput<typeof schema.models.User>;
 
 // Key input type (only key template variables)
 type UserKey = InferKeyInput<typeof schema.models.User>;
 // { username: string }
+
+// Extract item type from an array attribute
+type StoryEntity = InferModelFromSchema<typeof schema, 'Story'>;
+type StoryFrame = ArrayItem<StoryEntity['frames']>;
+// → { url: string; duration?: number; mediaType?: string }
 ```
 
 ### Builder Operations
@@ -393,18 +469,28 @@ if (page1.lastEvaluatedKey) {
 
 ```typescript
 export {
-  Table,                      // Main Table class
-  type SchemaDefinition,      // Schema type
-  type ModelDefinition,       // Model type
-  type InferModel,            // Infer model type
-  type InferInput,            // Infer input type
-  type InferKeyInput,         // Infer key type
-  type InferModelFromSchema,  // Infer from schema
-  type InferInputFromSchema,  // Infer input from schema
-  type TimestampFields,       // Timestamp fields type
-  createDynamoDBLogger,       // Logger factory
-  type DynamoDBLogger,        // Logger type
-  type DynamoDBLoggerConfig,  // Logger config
+  Table,                           // Main Table class
+  type SchemaDefinition,           // Schema type
+  type ModelDefinition,            // Model type
+  type AttributeDefinition,        // Union of all attribute types
+  type ScalarAttributeDefinition,  // String/Number/Boolean/Date attribute
+  type ObjectAttributeDefinition,  // Nested object attribute with schema
+  type ArrayAttributeDefinition,   // Typed array attribute with items
+  type PrimaryKeyDefinition,       // PK + SK key definition
+  type KeyDefinition,              // Single key definition
+  type IndexDefinition,            // Index (hash + optional sort)
+  type IndexesDefinition,          // All table indexes
+  type SchemaParams,               // Global schema params
+  type InferModel,                 // Infer model type (deprecated)
+  type InferInput,                 // Infer input type (deprecated)
+  type InferKeyInput,              // Infer key type
+  type InferModelFromSchema,       // Infer from full schema (preferred)
+  type InferInputFromSchema,       // Infer input from full schema (preferred)
+  type TimestampFields,            // createdAt/updatedAt fields type
+  type ArrayItem,                  // Extract item type from array attribute
+  createDynamoDBLogger,            // Logger factory
+  type DynamoDBLogger,             // Logger type
+  type DynamoDBLoggerConfig,       // Logger config
 };
 ```
 

package/dist/builders/query/create-query-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-query-builder.d.ts","sourceRoot":"","sources":["../../../src/builders/query/create-query-builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAK1D,OAAO,EAAE,YAAY,EAA8B,MAAM,SAAS,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAiT7D;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EACtC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,cAAc,EACtB,KAAK,CAAC,EAAE,eAAe,EACvB,MAAM,CAAC,EAAE,cAAc,GACtB,YAAY,CAAC,KAAK,CAAC,CA4BrB"}
+{"version":3,"file":"create-query-builder.d.ts","sourceRoot":"","sources":["../../../src/builders/query/create-query-builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAK1D,OAAO,EAAE,YAAY,EAA8B,MAAM,SAAS,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAuU7D;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EACtC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,cAAc,EACtB,KAAK,CAAC,EAAE,eAAe,EACvB,MAAM,CAAC,EAAE,cAAc,GACtB,YAAY,CAAC,KAAK,CAAC,CA4BrB"}

package/dist/builders/query/create-query-builder.js

@@ -6,11 +6,20 @@ const operators_1 = require("../shared/operators");
 const conditions_1 = require("../shared/conditions");
 const model_utils_1 = require("../../utils/model-utils");
 /**
- * Determines if a field is a key field (used in pk/sk templates)
+ * Determines if a field is a key field (used in pk/sk or index key templates)
  */
-function isKeyField(fieldName, model) {
+function isKeyField(fieldName, model, indexName) {
     if (!model?.key)
         return false;
+    // When an index is specified, also check model.index for key templates
+    if (indexName && model.index) {
+        for (const [, keyDef] of Object.entries(model.index)) {
+            const templateVars = (0, model_utils_1.extractTemplateVars)(keyDef.value);
+            if (templateVars.includes(fieldName)) {
+                return true;
+            }
+        }
+    }
     const keyEntries = Object.entries(model.key);
     for (const [, keyDef] of keyEntries) {
         const templateVars = (0, model_utils_1.extractTemplateVars)(keyDef.value);
@@ -24,13 +33,22 @@ function isKeyField(fieldName, model) {
  * Maps a model attribute name to its corresponding DynamoDB key name (PK/SK)
  * Also returns the key template for value transformation
  */
-function getKeyNameForAttribute(fieldName, model) {
+function getKeyNameForAttribute(fieldName, model, indexName) {
     if (!model?.key)
         return null;
+    // When an index is specified, check model.index first for key templates
+    if (indexName && model.index) {
+        for (const [keyName, keyDef] of Object.entries(model.index)) {
+            const templateVars = (0, model_utils_1.extractTemplateVars)(keyDef.value);
+            if (templateVars.includes(fieldName)) {
+                return { keyName, template: keyDef.value };
+            }
+        }
+    }
     for (const [keyName, keyDef] of Object.entries(model.key)) {
         const templateVars = (0, model_utils_1.extractTemplateVars)(keyDef.value);
         if (templateVars.includes(fieldName)) {
-            return { keyName, template: keyDef.value }; // Returns "PK" and "UP#${username}"
+            return { keyName, template: keyDef.value };
         }
     }
     return null;
@@ -46,7 +64,7 @@ function applyKeyTemplate(template, fieldName, fieldValue) {
  * Separates a condition tree into key conditions and filter conditions
  * Key conditions are rewritten to use actual DynamoDB key names (PK/SK)
  */
-function separateConditions(condition, model) {
+function separateConditions(condition, model, indexName) {
     const keyConditions = [];
     const filterConditions = [];
     function traverse(cond) {
@@ -76,7 +94,7 @@ function separateConditions(condition, model) {
         const fieldMatch = cond.expression.match(/#(\w+)/);
         if (fieldMatch && fieldMatch[1]) {
             const fieldName = fieldMatch[1];
-            const keyInfo = getKeyNameForAttribute(fieldName, model);
+            const keyInfo = getKeyNameForAttribute(fieldName, model, indexName);
             if (keyInfo) {
                 // This is a key field - rewrite the condition to use the actual key name
                 // and apply the template to the value
@@ -178,7 +196,7 @@ function createQueryExecutor(state) {
                 throw new Error('No where condition specified');
             }
             // Separate key conditions from filter conditions
-            const { keyConditions, filterConditions } = separateConditions(state.condition, state.model);
+            const { keyConditions, filterConditions } = separateConditions(state.condition, state.model, state.indexName);
             // Build KeyConditionExpression (simple AND)
             const keyExpr = buildSimpleAndExpression(keyConditions);
             // Build FilterExpression (can be complex with OR, NOT, etc.)

package/dist/core/types.d.ts

@@ -23,19 +23,61 @@
  * ```
  */
 /**
- * Attribute definition for model attributes
- *
- * @property type - The JavaScript constructor for the attribute type
- * @property [required] - Whether the attribute is required
- * @property [generate] - Auto-generation strategy ('ulid', 'uuid')
- * @property [default] - Default value or generator function
+ * Scalar attribute definition (String, Number, Boolean, Date)
  */
-export type AttributeDefinition = {
+export type ScalarAttributeDefinition = {
     type: StringConstructor | NumberConstructor | BooleanConstructor | DateConstructor;
     required?: boolean;
     generate?: 'ulid' | 'uuid';
     default?: any;
+    nulls?: boolean;
+};
+/**
+ * Object attribute definition with a nested schema
+ *
+ * @example
+ * address: {
+ *   type: Object,
+ *   schema: {
+ *     street: { type: String },
+ *     city: { type: String, required: true },
+ *   }
+ * }
+ */
+export type ObjectAttributeDefinition = {
+    type: ObjectConstructor;
+    schema: Record<string, AttributeDefinition>;
+    required?: boolean;
+    default?: any;
+    nulls?: boolean;
+};
+/**
+ * Array attribute definition with a typed items schema
+ *
+ * @example
+ * history: {
+ *   type: Array,
+ *   default: [],
+ *   items: {
+ *     type: Object,
+ *     schema: {
+ *       date: { type: String },
+ *       status: { type: String },
+ *     }
+ *   }
+ * }
+ */
+export type ArrayAttributeDefinition = {
+    type: ArrayConstructor;
+    items: AttributeDefinition;
+    required?: boolean;
+    default?: any;
+    nulls?: boolean;
 };
+/**
+ * Attribute definition for model attributes — supports scalars, nested objects, and arrays
+ */
+export type AttributeDefinition = ScalarAttributeDefinition | ObjectAttributeDefinition | ArrayAttributeDefinition;
 /**
  * Key definition for primary and secondary indexes
  *
@@ -101,7 +143,39 @@ export type SchemaDefinition = {
     models: Record<string, ModelDefinition>;
     params?: SchemaParams;
 };
-type InferAttr<T> = T extends StringConstructor ? string : T extends NumberConstructor ? number : T extends BooleanConstructor ? boolean : T extends DateConstructor ? Date : unknown;
+/**
+ * Recursively infers the TypeScript type from an AttributeDefinition.
+ * - Object → infers the nested schema shape
+ * - Array  → infers an array of the items type
+ * - Scalars → maps to the corresponding primitive
+ */
+type InferAttr<A> = A extends {
+    type: ObjectConstructor;
+    schema: infer S;
+} ? InferObjectSchema<S> : A extends {
+    type: ArrayConstructor;
+    items: infer I;
+} ? Array<InferAttr<I>> : A extends {
+    type: StringConstructor;
+} ? string : A extends {
+    type: NumberConstructor;
+} ? number : A extends {
+    type: BooleanConstructor;
+} ? boolean : A extends {
+    type: DateConstructor;
+} ? Date : unknown;
+/**
+ * Infers the shape of a nested object schema, respecting required/optional fields.
+ */
+type InferObjectSchema<S> = {
+    [K in keyof S as S[K] extends {
+        required: true;
+    } ? K : never]: InferAttr<S[K]>;
+} & {
+    [K in keyof S as S[K] extends {
+        required: true;
+    } ? never : K]?: InferAttr<S[K]>;
+};
 /**
  * Non-generated attributes for input
  * Splits into required and optional based on the 'required' field
@@ -111,7 +185,7 @@ type NonGeneratedAttributes<M extends ModelDefinition> = {
         generate: string;
     } ? never : M['attributes'][K] extends {
         required: true;
-    } ? K : never]: InferAttr<M['attributes'][K]['type']>;
+    } ? K : never]: InferAttr<M['attributes'][K]>;
 } & {
     [K in keyof M['attributes'] as M['attributes'][K] extends {
         generate: string;
@@ -119,7 +193,7 @@ type NonGeneratedAttributes<M extends ModelDefinition> = {
         required: false;
     } ? K : M['attributes'][K] extends {
         required: true;
-    } ? never : K]?: InferAttr<M['attributes'][K]['type']>;
+    } ? never : K]?: InferAttr<M['attributes'][K]>;
 };
 /**
  * Generated-only attributes for internal use
@@ -127,7 +201,7 @@ type NonGeneratedAttributes<M extends ModelDefinition> = {
 type GeneratedAttributes<M extends ModelDefinition> = {
     [K in keyof M['attributes'] as M['attributes'][K] extends {
         generate: string;
-    } ? K : never]: InferAttr<M['attributes'][K]['type']>;
+    } ? K : never]: InferAttr<M['attributes'][K]>;
 };
 /**
  * Template string variable extraction
@@ -221,5 +295,15 @@ type KeyTemplateVars<M extends ModelDefinition> = PrimaryKeyVars<M>;
 export type InferKeyInput<M extends ModelDefinition> = {
     [K in KeyTemplateVars<M>]: string;
 };
+/**
+ * Extracts the item type from an array attribute.
+ *
+ * @example
+ * type StoryFrame = ArrayItem<StoryEntity['frames']>;
+ * // → { url: string; duration?: number; mediaType?: string }
+ *
+ * type HistoryEntry = ArrayItem<TransactionEntity['history']>;
+ */
+export type ArrayItem<T extends readonly unknown[] | undefined> = NonNullable<T>[number];
 export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/core/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 export * from './table';
-export { type SchemaDefinition, type ModelDefinition, type PrimaryKeyDefinition, type KeyDefinition, type AttributeDefinition, type IndexDefinition, type IndexesDefinition, type SchemaParams, type InferInput, type InferModel, type InferKeyInput, type InferModelFromSchema, type InferInputFromSchema, type TimestampFields, } from './core/types';
+export { type SchemaDefinition, type ModelDefinition, type PrimaryKeyDefinition, type KeyDefinition, type AttributeDefinition, type IndexDefinition, type IndexesDefinition, type SchemaParams, type InferInput, type InferModel, type InferKeyInput, type InferModelFromSchema, type InferInputFromSchema, type TimestampFields, type ArrayItem, } from './core/types';
 export { createDynamoDBLogger, type DynamoDBLogger, type DynamoDBLoggerConfig, } from './utils/dynamodb-logger';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACxB,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,KAAK,eAAe,GACrB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,oBAAoB,EACpB,KAAK,cAAc,EACnB,KAAK,oBAAoB,GAC1B,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACxB,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EACpB,KAAK,SAAS,GACf,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,oBAAoB,EACpB,KAAK,cAAc,EACnB,KAAK,oBAAoB,GAC1B,MAAM,yBAAyB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"model-utils.d.ts","sourceRoot":"","sources":["../../src/utils/model-utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAiB,eAAe,EAAE,MAAM,cAAc,CAAC;AAG1E;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAAI,UAAU,MAAM,KAAG,MAAM,EAG5D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAG,MAoB7E,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,eAAe,EACnD,OAAO,CAAC,EACR,OAAO,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,OAAM,KAAK,GAAG,OAAO,GAAG,MAAc,KACrC,MAAM,CAAC,MAAM,EAAE,MAAM,CAWvB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,eAAe,EACzD,OAAO,CAAC,EACR,eAAe,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAClC,UAAU;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,KACrD,UAAU,CAAC,CAAC,CAgCd,CAAC;AAOF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,SAAS,KAAG,CAAC,GAAG,CAAC,EAAE,GAAG,SAoB1E,CAAC"}
+{"version":3,"file":"model-utils.d.ts","sourceRoot":"","sources":["../../src/utils/model-utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAiB,eAAe,EAAE,MAAM,cAAc,CAAC;AAG1E;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAAI,UAAU,MAAM,KAAG,MAAM,EAG5D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAG,MAoB7E,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,eAAe,EACnD,OAAO,CAAC,EACR,OAAO,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,OAAM,KAAK,GAAG,OAAO,GAAG,MAAc,KACrC,MAAM,CAAC,MAAM,EAAE,MAAM,CAWvB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,eAAe,EACzD,OAAO,CAAC,EACR,eAAe,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAClC,UAAU;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,KACrD,UAAU,CAAC,CAAC,CAiCd,CAAC;AAOF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,SAAS,KAAG,CAAC,GAAG,CAAC,EAAE,GAAG,SAoB1E,CAAC"}

package/dist/utils/model-utils.js

@@ -60,10 +60,11 @@ const applyPostDefaults = (model, validatedItem, options) => {
     const result = { ...validatedItem };
     for (const [key, attr] of Object.entries(model.attributes)) {
         if (result[key] === undefined) {
-            if (attr.generate === 'ulid') {
+            const generate = 'generate' in attr ? attr.generate : undefined;
+            if (generate === 'ulid') {
                 result[key] = (0, ulid_1.ulid)();
             }
-            else if (attr.generate === 'uuid') {
+            else if (generate === 'uuid') {
                 result[key] = crypto.randomUUID();
             }
             else if (attr.default !== undefined) {

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

@@ -1,7 +1,8 @@
 import { AttributeDefinition, ModelDefinition } from '../core/types';
 import { ZodObject, ZodType } from 'zod';
 /**
- * Converts an attribute definition to a Zod schema type
+ * Converts an attribute definition to a Zod schema type.
+ * Supports scalars, nested objects (with schema), and arrays (with items).
  */
 export declare const typeToZod: (attr: AttributeDefinition) => ZodType;
 /**

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;;GAEG;AACH,eAAO,MAAM,SAAS,GAAI,MAAM,mBAAmB,KAAG,OAarD,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,OA+BrD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,UAAU,GAAI,OAAO,eAAe,KAAG,SAAS,CAAC,GAAG,CAMhE,CAAC"}

package/dist/utils/zod-utils.js

@@ -5,18 +5,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.modelToZod = exports.typeToZod = void 0;
 const zod_1 = require("zod");
 /**
- * Converts an attribute definition to a Zod schema type
+ * Converts an attribute definition to a Zod schema type.
+ * Supports scalars, nested objects (with schema), and arrays (with items).
  */
 const typeToZod = (attr) => {
-    const zodType = attr.type === String
-        ? zod_1.z.string()
-        : attr.type === Number
-            ? zod_1.z.number()
-            : attr.type === Boolean
-                ? zod_1.z.boolean()
-                : attr.type === Date
-                    ? zod_1.z.date()
-                    : zod_1.z.unknown();
+    let zodType;
+    if (attr.type === Object) {
+        const schema = attr.schema;
+        if (schema) {
+            const shape = {};
+            for (const [key, nestedAttr] of Object.entries(schema)) {
+                shape[key] = (0, exports.typeToZod)(nestedAttr);
+            }
+            zodType = zod_1.z.looseObject(shape);
+        }
+        else {
+            zodType = zod_1.z.record(zod_1.z.string(), zod_1.z.unknown());
+        }
+    }
+    else if (attr.type === Array) {
+        const items = attr.items;
+        zodType = items ? zod_1.z.array((0, exports.typeToZod)(items)) : zod_1.z.array(zod_1.z.unknown());
+    }
+    else {
+        zodType =
+            attr.type === String
+                ? zod_1.z.string()
+                : attr.type === Number
+                    ? zod_1.z.number()
+                    : attr.type === Boolean
+                        ? zod_1.z.boolean()
+                        : attr.type === Date
+                            ? zod_1.z.date()
+                            : zod_1.z.unknown();
+    }
     return attr.required ? zodType : zodType.optional();
 };
 exports.typeToZod = typeToZod;
@@ -30,6 +52,6 @@ const modelToZod = (model) => {
     for (const [key, attr] of Object.entries(model.attributes)) {
         shape[key] = (0, exports.typeToZod)(attr);
     }
-    return zod_1.z.object(shape).passthrough();
+    return zod_1.z.looseObject(shape);
 };
 exports.modelToZod = modelToZod;

package/package.json

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

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

@@ -228,3 +228,73 @@ describe('QueryBuilder - Pagination', () => {
     });
   });
 });
+
+describe('QueryBuilder - GSI key recognition', () => {
+  const client = new DynamoDBClient({});
+  const tableName = 'TestTable';
+
+  interface UserModel {
+    id: string;
+    email: string;
+    name?: string;
+  }
+
+  const modelWithIndex: ModelDefinition = {
+    key: {
+      PK: { type: String, value: 'USER#${id}' },
+      SK: { type: String, value: 'USER#${id}' },
+    },
+    index: {
+      GSI1PK: { type: String, value: 'EMAIL#${email}' },
+      GSI1SK: { type: String, value: 'EMAIL#${email}' },
+    },
+    attributes: {
+      id: { type: String, required: true },
+      email: { type: String, required: true },
+      name: { type: String },
+    },
+  };
+
+  test('should place GSI index attribute into KeyConditionExpression when useIndex is set', () => {
+    const params = createQueryBuilder<UserModel>(tableName, client, modelWithIndex)
+      .where((attr, op) => op.eq(attr.email, 'alice@example.com'))
+      .useIndex('GSI1')
+      .dbParams();
+
+    // email should be recognized as a key field via model.index and placed in KeyConditionExpression
+    expect(params.KeyConditionExpression).toBeDefined();
+    expect(params.KeyConditionExpression).toContain('#GSI1PK');
+    expect(params.ExpressionAttributeValues).toBeDefined();
+    // The value should have the template applied
+    expect(Object.values(params.ExpressionAttributeValues!)).toContain('EMAIL#alice@example.com');
+    // It should NOT be in FilterExpression
+    expect(params.FilterExpression).toBeUndefined();
+    expect(params.IndexName).toBe('GSI1');
+  });
+
+  test('should place GSI attribute into FilterExpression when NO index is specified', () => {
+    const params = createQueryBuilder<UserModel>(tableName, client, modelWithIndex)
+      .where((attr, op) => op.and(op.eq(attr.id, '123'), op.eq(attr.email, 'alice@example.com')))
+      .dbParams();
+
+    // id maps to PK -> KeyConditionExpression
+    expect(params.KeyConditionExpression).toBeDefined();
+    expect(params.KeyConditionExpression).toContain('#PK');
+    // email is NOT a primary key field, so without useIndex it goes to filter
+    expect(params.FilterExpression).toBeDefined();
+    expect(params.FilterExpression).toContain('#email');
+  });
+
+  test('should handle both primary key and GSI key fields together with useIndex', () => {
+    const params = createQueryBuilder<UserModel>(tableName, client, modelWithIndex)
+      .where((attr, op) => op.and(op.eq(attr.email, 'alice@example.com'), op.eq(attr.id, '123')))
+      .useIndex('GSI1')
+      .dbParams();
+
+    // Both should be key conditions: email via index, id via primary key
+    expect(params.KeyConditionExpression).toBeDefined();
+    expect(params.KeyConditionExpression).toContain('#GSI1PK');
+    expect(params.KeyConditionExpression).toContain('#PK');
+    expect(params.FilterExpression).toBeUndefined();
+  });
+});

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

@@ -27,11 +27,21 @@ type QueryState<Model> = {
 };
 
 /**
- * Determines if a field is a key field (used in pk/sk templates)
+ * Determines if a field is a key field (used in pk/sk or index key templates)
  */
-function isKeyField(fieldName: string, model?: ModelDefinition): boolean {
+function isKeyField(fieldName: string, model?: ModelDefinition, indexName?: string): boolean {
   if (!model?.key) return false;
 
+  // When an index is specified, also check model.index for key templates
+  if (indexName && model.index) {
+    for (const [, keyDef] of Object.entries(model.index)) {
+      const templateVars = extractTemplateVars(keyDef.value);
+      if (templateVars.includes(fieldName)) {
+        return true;
+      }
+    }
+  }
+
   const keyEntries = Object.entries(model.key);
   for (const [, keyDef] of keyEntries) {
     const templateVars = extractTemplateVars(keyDef.value);
@@ -48,14 +58,25 @@ function isKeyField(fieldName: string, model?: ModelDefinition): boolean {
  */
 function getKeyNameForAttribute(
   fieldName: string,
-  model?: ModelDefinition
+  model?: ModelDefinition,
+  indexName?: string
 ): { keyName: string; template: string } | null {
   if (!model?.key) return null;
 
+  // When an index is specified, check model.index first for key templates
+  if (indexName && model.index) {
+    for (const [keyName, keyDef] of Object.entries(model.index)) {
+      const templateVars = extractTemplateVars(keyDef.value);
+      if (templateVars.includes(fieldName)) {
+        return { keyName, template: keyDef.value };
+      }
+    }
+  }
+
   for (const [keyName, keyDef] of Object.entries(model.key)) {
     const templateVars = extractTemplateVars(keyDef.value);
     if (templateVars.includes(fieldName)) {
-      return { keyName, template: keyDef.value }; // Returns "PK" and "UP#${username}"
+      return { keyName, template: keyDef.value };
     }
   }
   return null;
@@ -75,7 +96,8 @@ function applyKeyTemplate(template: string, fieldName: string, fieldValue: any):
  */
 function separateConditions(
   condition: Condition,
-  model?: ModelDefinition
+  model?: ModelDefinition,
+  indexName?: string
 ): { keyConditions: Condition[]; filterConditions: Condition[] } {
   const keyConditions: Condition[] = [];
   const filterConditions: Condition[] = [];
@@ -106,7 +128,7 @@ function separateConditions(
     const fieldMatch = cond.expression.match(/#(\w+)/);
     if (fieldMatch && fieldMatch[1]) {
       const fieldName = fieldMatch[1];
-      const keyInfo = getKeyNameForAttribute(fieldName, model);
+      const keyInfo = getKeyNameForAttribute(fieldName, model, indexName);
 
       if (keyInfo) {
         // This is a key field - rewrite the condition to use the actual key name
@@ -231,7 +253,7 @@ function createQueryExecutor<Model>(state: QueryState<Model>): QueryExecutor<Mod
       }
 
       // Separate key conditions from filter conditions
-      const { keyConditions, filterConditions } = separateConditions(state.condition, state.model);
+      const { keyConditions, filterConditions } = separateConditions(state.condition, state.model, state.indexName);
 
       // Build KeyConditionExpression (simple AND)
       const keyExpr = buildSimpleAndExpression(keyConditions);

package/src/core/types.test.ts

@@ -504,3 +504,140 @@ describe('Timestamp Type Inference', () => {
     expect(timestamps.updatedAt).toBe('2024-01-01T00:00:00.000Z');
   });
 });
+
+// ============================================================================
+// Nested Object & Array Type Inference Tests
+// ============================================================================
+
+describe('Nested Object and Array Type Inference', () => {
+  const TransactionSchema = {
+    format: 'dynatable:1.0.0',
+    version: '1.0.0',
+    indexes: { primary: { hash: 'PK', sort: 'SK' } },
+    models: {
+      Transaction: {
+        key: {
+          PK: { type: String, value: 'USER#${userId}' },
+          SK: { type: String, value: 'TX#${txId}' },
+        },
+        attributes: {
+          userId: { type: String, required: true },
+          txId: { type: String, required: true },
+          status: { type: String, required: true },
+          // Nested object with schema
+          address: {
+            type: Object,
+            schema: {
+              street: { type: String },
+              city: { type: String, required: true },
+              country: { type: String, required: true },
+            },
+          },
+          // Array of scalar items
+          tags: {
+            type: Array,
+            items: { type: String },
+            default: [],
+          },
+          // Array of objects with schema (like history in the real example)
+          history: {
+            type: Array,
+            default: [],
+            items: {
+              type: Object,
+              schema: {
+                date: { type: String },
+                description: { type: String },
+                status: { type: String, required: true },
+              },
+            },
+          },
+          // Deeply nested object
+          amount: {
+            type: Object,
+            schema: {
+              value: { type: Number, required: true },
+              currency: { type: String, required: true },
+              breakdown: {
+                type: Object,
+                schema: {
+                  base: { type: Number, required: true },
+                  fees: { type: Number, required: true },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  } as const satisfies SchemaDefinition;
+
+  type Transaction = InferModelFromSchema<typeof TransactionSchema, 'Transaction'>;
+
+  test('schema with nested Object attribute compiles', () => {
+    expect(TransactionSchema.models.Transaction.attributes.address.type).toBe(Object);
+  });
+
+  test('schema with Array of objects compiles', () => {
+    expect(TransactionSchema.models.Transaction.attributes.history.type).toBe(Array);
+  });
+
+  test('inferred type accepts valid nested object', () => {
+    const tx: Transaction = {
+      userId: 'u1',
+      txId: 'tx1',
+      status: 'PENDING',
+      address: { city: 'Buenos Aires', country: 'AR' },
+      tags: ['fast', 'verified'],
+      history: [
+        { date: '2024-01-01', description: 'Created', status: 'PENDING' },
+        { status: 'COMPLETED' },
+      ],
+      amount: {
+        value: 100,
+        currency: 'USD',
+        breakdown: { base: 90, fees: 10 },
+      },
+    };
+
+    expect(tx.userId).toBe('u1');
+    expect(tx.address?.city).toBe('Buenos Aires');
+    expect(tx.history?.[0]?.status).toBe('PENDING');
+    expect(tx.amount?.breakdown?.base).toBe(90);
+    expect(tx.tags?.[0]).toBe('fast');
+  });
+
+  test('inferred nested object type requires its required fields', () => {
+    type Address = NonNullable<Transaction['address']>;
+
+    // city and country are required — this must compile
+    const validAddress: Address = { city: 'BA', country: 'AR' };
+    expect(validAddress.city).toBe('BA');
+
+    // Verify the shape: optional `street`, required `city` and `country`
+    type AddressKeys = keyof Required<Address>;
+    const _keys: AddressKeys[] = ['street', 'city', 'country'];
+    expect(_keys).toContain('city');
+  });
+
+  test('model with nested attributes satisfies ModelDefinition', () => {
+    const model = {
+      key: {
+        PK: { type: String, value: 'ITEM#${id}' },
+        SK: { type: String, value: 'ITEM#${id}' },
+      },
+      attributes: {
+        id: { type: String, required: true },
+        meta: {
+          type: Object,
+          schema: {
+            createdBy: { type: String },
+            tags: { type: Array, items: { type: String } },
+          },
+        },
+      },
+    } as const satisfies ModelDefinition;
+
+    expect(model.attributes.meta.type).toBe(Object);
+  });
+});

package/src/core/types.ts

@@ -28,20 +28,68 @@
 // -------------------- Type Definitions --------------------
 
 /**
- * Attribute definition for model attributes
- *
- * @property type - The JavaScript constructor for the attribute type
- * @property [required] - Whether the attribute is required
- * @property [generate] - Auto-generation strategy ('ulid', 'uuid')
- * @property [default] - Default value or generator function
+ * Scalar attribute definition (String, Number, Boolean, Date)
  */
-export type AttributeDefinition = {
+export type ScalarAttributeDefinition = {
   type: StringConstructor | NumberConstructor | BooleanConstructor | DateConstructor;
   required?: boolean;
   generate?: 'ulid' | 'uuid';
   default?: any;
+  nulls?: boolean;
+};
+
+/**
+ * Object attribute definition with a nested schema
+ *
+ * @example
+ * address: {
+ *   type: Object,
+ *   schema: {
+ *     street: { type: String },
+ *     city: { type: String, required: true },
+ *   }
+ * }
+ */
+export type ObjectAttributeDefinition = {
+  type: ObjectConstructor;
+  schema: Record<string, AttributeDefinition>;
+  required?: boolean;
+  default?: any;
+  nulls?: boolean;
 };
 
+/**
+ * Array attribute definition with a typed items schema
+ *
+ * @example
+ * history: {
+ *   type: Array,
+ *   default: [],
+ *   items: {
+ *     type: Object,
+ *     schema: {
+ *       date: { type: String },
+ *       status: { type: String },
+ *     }
+ *   }
+ * }
+ */
+export type ArrayAttributeDefinition = {
+  type: ArrayConstructor;
+  items: AttributeDefinition;
+  required?: boolean;
+  default?: any;
+  nulls?: boolean;
+};
+
+/**
+ * Attribute definition for model attributes — supports scalars, nested objects, and arrays
+ */
+export type AttributeDefinition =
+  | ScalarAttributeDefinition
+  | ObjectAttributeDefinition
+  | ArrayAttributeDefinition;
+
 /**
  * Key definition for primary and secondary indexes
  *
@@ -114,17 +162,34 @@ export type SchemaDefinition = {
   params?: SchemaParams;
 };
 
-type InferAttr<T> = T extends StringConstructor
-  ? string
-  : T extends NumberConstructor
-    ? number
-    : T extends BooleanConstructor
-      ? boolean
-      : T extends DateConstructor
-        ? Date
-        : unknown;
+/**
+ * Recursively infers the TypeScript type from an AttributeDefinition.
+ * - Object → infers the nested schema shape
+ * - Array  → infers an array of the items type
+ * - Scalars → maps to the corresponding primitive
+ */
+type InferAttr<A> = A extends { type: ObjectConstructor; schema: infer S }
+  ? InferObjectSchema<S>
+  : A extends { type: ArrayConstructor; items: infer I }
+    ? Array<InferAttr<I>>
+    : A extends { type: StringConstructor }
+      ? string
+      : A extends { type: NumberConstructor }
+        ? number
+        : A extends { type: BooleanConstructor }
+          ? boolean
+          : A extends { type: DateConstructor }
+            ? Date
+            : unknown;
 
-type IsOptional<T> = undefined extends T ? true : false;
+/**
+ * Infers the shape of a nested object schema, respecting required/optional fields.
+ */
+type InferObjectSchema<S> = {
+  [K in keyof S as S[K] extends { required: true } ? K : never]: InferAttr<S[K]>;
+} & {
+  [K in keyof S as S[K] extends { required: true } ? never : K]?: InferAttr<S[K]>;
+};
 
 /**
  * Non-generated attributes for input
@@ -135,7 +200,7 @@ type NonGeneratedAttributes<M extends ModelDefinition> = {
     ? never
     : M['attributes'][K] extends { required: true }
       ? K
-      : never]: InferAttr<M['attributes'][K]['type']>;
+      : never]: InferAttr<M['attributes'][K]>;
 } & {
   [K in keyof M['attributes'] as M['attributes'][K] extends { generate: string }
     ? never
@@ -143,7 +208,7 @@ type NonGeneratedAttributes<M extends ModelDefinition> = {
       ? K
       : M['attributes'][K] extends { required: true }
         ? never
-        : K]?: InferAttr<M['attributes'][K]['type']>;
+        : K]?: InferAttr<M['attributes'][K]>;
 };
 
 /**
@@ -152,7 +217,7 @@ type NonGeneratedAttributes<M extends ModelDefinition> = {
 type GeneratedAttributes<M extends ModelDefinition> = {
   [K in keyof M['attributes'] as M['attributes'][K] extends { generate: string }
     ? K
-    : never]: InferAttr<M['attributes'][K]['type']>;
+    : never]: InferAttr<M['attributes'][K]>;
 };
 
 /**
@@ -289,3 +354,14 @@ type KeyTemplateVars<M extends ModelDefinition> = PrimaryKeyVars<M>;
 export type InferKeyInput<M extends ModelDefinition> = {
   [K in KeyTemplateVars<M>]: string;
 };
+
+/**
+ * Extracts the item type from an array attribute.
+ *
+ * @example
+ * type StoryFrame = ArrayItem<StoryEntity['frames']>;
+ * // → { url: string; duration?: number; mediaType?: string }
+ *
+ * type HistoryEntry = ArrayItem<TransactionEntity['history']>;
+ */
+export type ArrayItem<T extends readonly unknown[] | undefined> = NonNullable<T>[number];

package/src/index.ts

@@ -14,6 +14,7 @@ export {
   type InferModelFromSchema,
   type InferInputFromSchema,
   type TimestampFields,
+  type ArrayItem,
 } from './core/types';
 export {
   createDynamoDBLogger,

package/src/utils/model-utils.ts

@@ -71,9 +71,10 @@ export const applyPostDefaults = <M extends ModelDefinition>(
 
   for (const [key, attr] of Object.entries(model.attributes)) {
     if (result[key] === undefined) {
-      if (attr.generate === 'ulid') {
+      const generate = 'generate' in attr ? attr.generate : undefined;
+      if (generate === 'ulid') {
         result[key] = ulid();
-      } else if (attr.generate === 'uuid') {
+      } else if (generate === 'uuid') {
         result[key] = crypto.randomUUID();
       } else if (attr.default !== undefined) {
         result[key] = typeof attr.default === 'function' ? attr.default() : attr.default;

package/src/utils/zod-utils.test.ts

@@ -71,9 +71,9 @@ describe('zod-utils', () => {
       expect(() => zodType.parse(undefined)).toThrow();
     });
 
-    it('should return z.unknown() for unknown types', () => {
+    it('should return z.unknown() for unrecognized types', () => {
       const attr: AttributeDefinition = {
-        type: Array as any,
+        type: Map as any,
         required: true,
       };
       const zodType = typeToZod(attr);
@@ -83,6 +83,101 @@ describe('zod-utils', () => {
       expect(() => zodType.parse(123)).not.toThrow();
       expect(() => zodType.parse([])).not.toThrow();
     });
+
+    it('should convert Object type with schema to z.looseObject()', () => {
+      const attr: AttributeDefinition = {
+        type: Object,
+        schema: {
+          city: { type: String, required: true },
+          zip: { type: String },
+        },
+        required: true,
+      };
+      const zodType = typeToZod(attr);
+
+      expect(() => zodType.parse({ city: 'BA' })).not.toThrow();
+      expect(() => zodType.parse({ city: 'BA', zip: '1000' })).not.toThrow();
+      expect(() => zodType.parse({ zip: '1000' })).toThrow(); // city required
+      expect(() => zodType.parse({})).toThrow();
+    });
+
+    it('should convert Object type without schema to z.record()', () => {
+      const attr: AttributeDefinition = {
+        type: Object,
+        schema: {},
+      };
+      const zodType = typeToZod(attr);
+      expect(() => zodType.parse({})).not.toThrow();
+    });
+
+    it('should convert Array type with scalar items', () => {
+      const attr: AttributeDefinition = {
+        type: Array,
+        items: { type: String },
+        required: true,
+      };
+      const zodType = typeToZod(attr);
+
+      expect(() => zodType.parse(['a', 'b'])).not.toThrow();
+      expect(() => zodType.parse([])).not.toThrow();
+      expect(() => zodType.parse([1, 2])).toThrow(); // numbers, not strings
+    });
+
+    it('should convert Array type with object items (like history)', () => {
+      const attr: AttributeDefinition = {
+        type: Array,
+        items: {
+          type: Object,
+          schema: {
+            date: { type: String },
+            status: { type: String, required: true },
+          },
+        },
+        required: true,
+      };
+      const zodType = typeToZod(attr);
+
+      expect(() => zodType.parse([{ status: 'PENDING' }])).not.toThrow();
+      expect(() =>
+        zodType.parse([{ date: '2024-01-01', status: 'DONE' }])
+      ).not.toThrow();
+      expect(() => zodType.parse([{ date: '2024-01-01' }])).toThrow(); // missing status
+    });
+
+    it('should handle optional Object attribute', () => {
+      const attr: AttributeDefinition = {
+        type: Object,
+        schema: { name: { type: String, required: true } },
+      };
+      const zodType = typeToZod(attr);
+
+      expect(() => zodType.parse(undefined)).not.toThrow();
+      expect(() => zodType.parse({ name: 'test' })).not.toThrow();
+    });
+
+    it('should handle deeply nested objects', () => {
+      const attr: AttributeDefinition = {
+        type: Object,
+        required: true,
+        schema: {
+          value: { type: Number, required: true },
+          breakdown: {
+            type: Object,
+            schema: {
+              base: { type: Number, required: true },
+              fees: { type: Number, required: true },
+            },
+          },
+        },
+      };
+      const zodType = typeToZod(attr);
+
+      expect(() =>
+        zodType.parse({ value: 100, breakdown: { base: 90, fees: 10 } })
+      ).not.toThrow();
+      expect(() => zodType.parse({ value: 100 })).not.toThrow(); // breakdown optional
+      expect(() => zodType.parse({})).toThrow(); // value required
+    });
   });
 
   describe('modelToZod', () => {

package/src/utils/zod-utils.ts

@@ -5,19 +5,38 @@ import { AttributeDefinition, ModelDefinition } from '@/core/types';
 import { z, ZodObject, ZodType } from 'zod';
 
 /**
- * Converts an attribute definition to a Zod schema type
+ * Converts an attribute definition to a Zod schema type.
+ * Supports scalars, nested objects (with schema), and arrays (with items).
  */
 export const typeToZod = (attr: AttributeDefinition): ZodType => {
-  const zodType: ZodType =
-    attr.type === String
-      ? z.string()
-      : attr.type === Number
-        ? z.number()
-        : attr.type === Boolean
-          ? z.boolean()
-          : attr.type === Date
-            ? z.date()
-            : z.unknown();
+  let zodType: ZodType;
+
+  if (attr.type === Object) {
+    const schema = (attr as { schema?: Record<string, AttributeDefinition> }).schema;
+    if (schema) {
+      const shape: Record<string, ZodType> = {};
+      for (const [key, nestedAttr] of Object.entries(schema)) {
+        shape[key] = typeToZod(nestedAttr);
+      }
+      zodType = z.looseObject(shape);
+    } else {
+      zodType = z.record(z.string(), z.unknown());
+    }
+  } else if (attr.type === Array) {
+    const items = (attr as { items?: AttributeDefinition }).items;
+    zodType = items ? z.array(typeToZod(items)) : z.array(z.unknown());
+  } else {
+    zodType =
+      attr.type === String
+        ? z.string()
+        : attr.type === Number
+          ? z.number()
+          : attr.type === Boolean
+            ? z.boolean()
+            : attr.type === Date
+              ? z.date()
+              : z.unknown();
+  }
 
   return attr.required ? zodType : zodType.optional();
 };
@@ -32,5 +51,5 @@ export const modelToZod = (model: ModelDefinition): ZodObject<any> => {
   for (const [key, attr] of Object.entries(model.attributes)) {
     shape[key] = typeToZod(attr);
   }
-  return z.object(shape).passthrough();
+  return z.looseObject(shape);
 };