rajt 0.0.31 → 0.0.33

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

package/src/auth/ability.ts

@@ -13,7 +13,7 @@ export class Ability {
   static fromRoutes(actions: Routes) {
     if (!actions?.length) return
 
-    const paths = actions?.map(a => Array.isArray(a) ? a[1] : a.path) ?? []
+    const paths = actions?.map(a => Array.isArray(a) ? a[0]+a[1] : a.method+a.path) || []
     const items = new Set(paths)
 
     if (items.size !== actions.length)

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/compact.ts

@@ -147,9 +147,10 @@ export default class Compact {
 
       return val
     }
-    const length = getLength(val, type)
 
-    if (type !== 'object' && length < 2) return val
+    const length = getLength(val, type)
+    if ([null, true, false].includes(val) || type != 'object' && length < 2)
+      return val
 
     const index = seen.indexOf(val)
     if (index !== -1)

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)
   }
 }

package/src/dynamodb/query-builder.ts

@@ -1,19 +1,24 @@
 import type { Condition, Operator } from './types'
 
 export default class QueryBuilder {
-  #conditions: Condition[] = []
+  #filters: Condition[] = []
+  #keyConditions: Condition[] = []
   #limit?: number
   #startKey?: Record<string, any>
   #index?: string
+  #attrCounter = 1
+  #valCounter = 1
+  #fieldAttrMap: Record<string, string> = {}
+  #fieldValMap: Record<string, string> = {}
 
   filter(field: string, operator: Operator, value: any = null) {
-    this.#conditions.push({ type: 'filter', field, operator, value })
+    this.#filters.push({ type: 'filter', field, operator, value })
     return this
   }
 
   keyCondition(field: string, operator: Operator | any, value?: any) {
     const noVal = value === undefined
-    this.#conditions.push({ type: 'keyCondition', field, operator: noVal ? '=' : operator, value: noVal ? operator : value })
+    this.#keyConditions.push({ type: 'keyCondition', field, operator: noVal ? '=' : operator, value: noVal ? operator : value })
     return this
   }
 
@@ -32,22 +37,45 @@ export default class QueryBuilder {
     return this
   }
 
-  buildExpression(type: 'filter' | 'keyCondition') {
+  private attrName(field: string) {
+    if (!this.#fieldAttrMap[field])
+      this.#fieldAttrMap[field] = '#a'+ this.#attrCounter++
+
+    return this.#fieldAttrMap[field]
+  }
+
+  private valName(val: any) {
+    val = String(val)
+    if (!this.#fieldValMap[val])
+      this.#fieldValMap[val] = ':v'+ this.#valCounter++
+
+    return this.#fieldValMap[val]
+  }
+
+  #resetCounters() {
+    this.#attrCounter = 0
+    this.#valCounter = 0
+    this.#fieldAttrMap = {}
+    this.#fieldValMap = {}
+  }
+
+  buildExpression(conditions: Condition[]) {
     const exprParts: string[] = []
     const values: Record<string, any> = {}
     const names: Record<string, string> = {}
 
-    let i = 0
-    for (const cond of this.#conditions.filter(c => c.type === type)) {
-      const attr = `#attr${i}`
-      const val = `:val${i}`
+    for (const cond of conditions) {
+      const attr = this.attrName(cond.field)
+      const val = Array.isArray(cond.value) ? '' : this.valName(cond.value)
       names[attr] = cond.field
 
       switch (cond.operator) {
         case 'between': {
-          exprParts.push(`${attr} BETWEEN ${val}a AND ${val}b`)
-          values[`${val}a`] = cond.value[0]
-          values[`${val}b`] = cond.value[1]
+          const val0 = this.valName(cond.value[0])
+          const val1 = this.valName(cond.value[1])
+          exprParts.push(`${attr} BETWEEN ${val0} AND ${val1}`)
+          values[val0] = cond.value[0]
+          values[val1] = cond.value[1]
           break
         }
         case 'begins_with': {
@@ -56,10 +84,10 @@ export default class QueryBuilder {
           break
         }
         case 'in': {
-          const inVals = cond.value.map((v: any, j: number) => {
-            const vKey = `${val}_${j}`
-            values[vKey] = v
-            return vKey
+          const inVals = cond.value.map((v: any) => {
+            const key = this.valName(v)
+            values[key] = v
+            return key
           })
           exprParts.push(`${attr} IN (${inVals.join(', ')})`)
           break
@@ -92,8 +120,6 @@ export default class QueryBuilder {
           values[val] = cond.value
         }
       }
-
-      i++
     }
 
     return {
@@ -104,7 +130,7 @@ export default class QueryBuilder {
   }
 
   get filters() {
-    const filter = this.buildExpression('filter')
+    const filter = this.buildExpression(this.#filters)
     const params: any = {}
 
     if (this.#limit)
@@ -126,7 +152,7 @@ export default class QueryBuilder {
   }
 
   get conditions() {
-    const keys = this.buildExpression('keyCondition')
+    const keys = this.buildExpression(this.#keyConditions)
     const filters = this.filters
 
     const params: any = { ...filters }