rajt 0.0.31 → 0.0.32

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.31",
+  "version": "0.0.32",
   "type": "module",
   "main": "dist/index.js",
   "exports": {

package/src/auth/token.ts

@@ -40,7 +40,7 @@ export class Token {
   }
 
   static parse(token: string) {
-    const host = this.host(Envir.get('FLOW_SERVER') || c.cx.req.header('host') || '')
+    const host = this.host(Envir.get('FLOW_SERVER'))
 
     return Factory.parse(token)
       .issuedBy(host)
@@ -67,8 +67,8 @@ export class Token {
     this.#name = name
   }
 
-  static host(url: string | null | undefined): string {
-    if (!url) return ''
+  static host(url?: string | null | undefined): string {
+    if (!url) url = c.cx.req.url || c.cx.req.header('host') || ''
 
     let formattedUrl = String(url)
     if (!formattedUrl.startsWith('http'))

package/src/dynamodb/model.ts

@@ -17,7 +17,7 @@ import getLength from '../utils/lenght'
 
 export default class AbstractModel<T extends object> {
   #meta: ModelMetadata
-  #cls!: Model<T>
+  cls?: Model<T>
   lastKey?: Record<string, any>
   #db: DynamoDBDocumentClient
   #queryBuilder?: QueryBuilder
@@ -35,6 +35,7 @@ export default class AbstractModel<T extends object> {
 
     if (typeof (cls as ModelMetadata).table === 'string') {
       this.#meta = cls as ModelMetadata
+      this.cls = model?.cls
       return
     }
 
@@ -43,7 +44,7 @@ export default class AbstractModel<T extends object> {
       throw new Error('Missing model metadata')
 
     this.#meta = meta
-    this.#cls = cls as Model<T>
+    this.cls = cls as Model<T>
   }
 
   get table(): string {
@@ -272,21 +273,20 @@ export default class AbstractModel<T extends object> {
   }
 
   #processItems(items: any[] | undefined, filterFn?: Filter<T>): T[] {
-    if (!items) return []
-
-    items = this.#meta.zip ? Compact.smartDecode<T[]>(items, this.#meta.fields) : items as T[]
+    if (!items || !items.length) return []
+    items = items.map(item => this.#processItem(item))
     return filterFn ? items.filter(filterFn) : items
   }
 
   #processItem(item: any, keys?: Record<string, string>): T {
     if (this.#meta.zip && item?.V) {
-      const model = new this.#cls(Compact.decode(item.V, this.#meta.fields))
+      const model = new this.cls!(Compact.decode<T>(item.V, this.#meta.fields))
       if (!keys) keys = this.#getItemKey(item)
 
       // @ts-ignore
       return model.withKey(keys[this.#meta.keys.PK], keys[this.#meta.keys.SK] || undefined)
     }
 
-    return new this.#cls(item)
+    return new this.cls!(item)
   }
 }