rajt 0.0.44 → 0.0.46

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rajt",
   "description": "A serverless bundler layer, fully typed for AWS Lambda (Node.js and LLRT) and Cloudflare Workers.",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "type": "module",
   "main": "dist/index.js",
   "exports": {

package/src/dynamodb/model.ts

@@ -13,6 +13,7 @@ import type { ModelMetadata, Keys, Model, Filter } from './types'
 import { getModelMetadata } from './decorators'
 import QueryBuilder from './query-builder'
 import Compact from './compact'
+import { isArraySchema } from './schema'
 import getLength from '../utils/lenght'
 
 export default class AbstractModel<T extends object> {
@@ -264,6 +265,9 @@ export default class AbstractModel<T extends object> {
   }
 
   #getItemWithoutKeys(item: Partial<T>): Partial<T> {
+    if (Array.isArray(item))
+      return item?.length ? item.map(i => this.#getItemWithoutKeys(i)) as T : [] as T
+
     if (!this.#meta.keys || !item) return { ...item }
 
     const { PK, SK } = this.#meta.keys
@@ -280,13 +284,23 @@ export default class AbstractModel<T extends object> {
 
   #processItem(item: any, keys?: Record<string, string>): T {
     if (this.#meta.zip && item?.V) {
-      const model = new this.cls!(Compact.decode<T>(item.V, this.#meta.fields))
+      const value = Compact.decode<T>(item.V, this.#meta.fields)
+      const model = isArraySchema(this.#meta.fields) && Array.isArray(value)
+        ? value.map(v => new this.cls!(v))
+        : new this.cls!(value)
+
       if (!keys) keys = this.#getItemKey(item)
 
-      // @ts-ignore
-      return model.withKey(keys[this.#meta.keys.PK], keys[this.#meta.keys.SK] || undefined)
+      return this.#withKey(model as T, keys)
     }
 
     return new this.cls!(item)
   }
+
+  #withKey(model: T, keys: Record<string, string>): T {
+    // @ts-ignore
+    if (Array.isArray(model)) return model.map(m => this.#withKey(m, keys))
+    // @ts-ignore
+    return model.withKey(keys[this.#meta.keys.PK], keys[this.#meta.keys.SK] || undefined)
+  }
 }