rajt 0.0.48 → 0.0.50

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

package/src/dynamodb/client.ts

@@ -21,7 +21,7 @@ import {
 } from '@aws-sdk/lib-dynamodb'
 import type { NativeAttributeValue } from '@aws-sdk/util-dynamodb'
 import AbstractModel from './model'
-import { Keys } from './types'
+import { Keys, KeySchema } from './types'
 
 const client = new DynamoDBClient(process.env?.AWS_SAM_LOCAL ? {
   region: process.env.AWS_REGION || "us-east-1",
@@ -45,18 +45,18 @@ export class Dynamodb {
 }
 
 export class RawClient {
-  static async get(TableName: string, key: Keys, sk?: string) {
+  static async get(TableName: string, key: Keys | Record<string, string>, sk?: string) {
     return DocumentClient.send(new GetCommand({
       TableName,
-      Key: this.#key(key, sk),
+      Key: this.key(key, sk),
     }))
   }
 
-  static async scan(TableName: string, filters: ScanCommandInput) {
+  static async scan(TableName: string, filters: Omit<ScanCommandInput, 'TableName'>) {
     return DocumentClient.send(new ScanCommand({ ...filters, TableName }))
   }
 
-  static async query(TableName: string, filters: QueryCommandInput) {
+  static async query(TableName: string, filters: Omit<QueryCommandInput, 'TableName'>) {
     return DocumentClient.send(new QueryCommand({ ...filters, TableName }))
   }
 
@@ -64,14 +64,19 @@ export class RawClient {
     return DocumentClient.send(new PutCommand({ TableName, Item }))
   }
 
-  static async update(TableName: string, filters: UpdateCommandInput, key: Keys, sk?: string) {
+  static async update(
+    TableName: string,
+    filters: Omit<UpdateCommandInput, 'TableName' | 'Key'>,
+    key: Keys | Record<string, string>,
+    sk?: string
+  ) {
     return DocumentClient.send(new UpdateCommand({
-      ...filters, TableName, Key: this.#key(key, sk),
+      ...filters, TableName, Key: this.key(key, sk),
     }))
   }
 
-  static async delete(TableName: string, key: Keys, sk?: string) {
-    return DocumentClient.send(new DeleteCommand({ TableName, Key: this.#key(key, sk) }))
+  static async delete(TableName: string, key: Keys | Record<string, string>, sk?: string) {
+    return DocumentClient.send(new DeleteCommand({ TableName, Key: this.key(key, sk) }))
   }
 
   static async batchGet(batch: BatchGetCommandInput) {
@@ -82,23 +87,41 @@ export class RawClient {
     return DocumentClient.send(new BatchWriteCommand(batch))
   }
 
-  static #key(key: Keys, sk?: string) {
-    if (typeof key == 'object' && key != null) return key
-
+  static key(
+    key: Keys | Record<string, string>,
+    sk?: string,
+    schema?: KeySchema,
+    defaultSK?: string,
+  ) {
     let pk: string
     let skValue: string | undefined
 
     if (Array.isArray(key)) {
       pk = key[0]
       skValue = key[1] ?? sk
+    } else if (typeof key == 'object' && key != null) {
+      return key
     } else {
       pk = key
       skValue = sk
     }
 
-    const keys = {PK: pk}
-    // @ts-ignore
-    if (skValue) keys.SK = skValue
+    if (!schema) {
+      const keys = {PK: pk}
+      // @ts-ignore
+      if (skValue) keys.SK = skValue
+      return keys
+    }
+
+    const keys = { [schema.PK]: pk }
+
+    if (schema?.SK) {
+      if (skValue) {
+        keys[schema.SK] = skValue
+      } else if (defaultSK) {
+        keys[schema.SK] = defaultSK
+      }
+    }
 
     return keys
   }

package/src/dynamodb/model.ts

@@ -1,6 +1,3 @@
-import {
-  UpdateCommandInput,
-} from '@aws-sdk/lib-dynamodb'
 import type { ModelMetadata, Keys, Model, Filter } from './types'
 import { getModelMetadata } from './decorators'
 import QueryBuilder from './query-builder'
@@ -78,7 +75,7 @@ export default class AbstractModel<T extends object> {
   }
 
   async get(key: Keys, sk?: string) {
-    const result = await RawClient.get(this.table, key, sk)
+    const result = await RawClient.get(this.table, this.#key(key, sk))
     return result.Item ? this.#processItem(result.Item) : undefined
   }
 
@@ -121,13 +118,13 @@ export default class AbstractModel<T extends object> {
       UpdateExpression,
       ExpressionAttributeValues,
       ExpressionAttributeNames,
-    } as UpdateCommandInput, key)
+    }, this.#key(key))
 
     return this.#processItem(attrs, keys)
   }
 
   async delete(key: Keys, sk?: string) {
-    return RawClient.delete(this.table, key, sk)
+    return RawClient.delete(this.table, this.#key(key, sk))
   }
 
   async batchGet(keys: Array<Keys>) {
@@ -160,28 +157,7 @@ export default class AbstractModel<T extends object> {
 
   #key(key: Keys, sk?: string) {
     if (!this.#meta.keys) return {}
-
-    let pk: string
-    let skValue: string | undefined
-    if (Array.isArray(key)) {
-      pk = key[0]
-      skValue = key[1] ?? sk
-    } else {
-      pk = key
-      skValue = sk
-    }
-
-    const keys = { [this.#meta.keys.PK]: pk }
-
-    if (this.#meta.keys?.SK) {
-      if (skValue) {
-        keys[this.#meta.keys.SK] = skValue
-      } else if (this.#meta.defaultSK) {
-        keys[this.#meta.keys.SK] = this.#meta.defaultSK
-      }
-    }
-
-    return keys
+    return RawClient.key(key, sk, this.#meta.keys, this.#meta.defaultSK)
   }
 
   #getItemKey(item: Partial<T>, key?: Keys): Record<string, string> {