@lafken/dynamo 0.11.4 → 0.11.6

package/lib/service/query-builder/query-builder.types.d.ts

@@ -30,7 +30,7 @@ export type CommonExpression<E> = OnlyOne<{
     notEqual: E;
 } & NullExpression>;
 export type Filter<E> = {
-    [key in keyof E]?: E[key] extends PrimaryPartition<number> ? number | OnlyOne<OperationExpression<number> & CommonExpression<number> & InExpression<number>> : E[key] extends PrimaryPartition<string> ? string | OnlyOne<StringExpression & StringFilterExpression & CommonExpression<string> & InExpression<string>> : E[key] extends string | number | boolean | Date | null ? E[key] | (E[key] extends number ? OnlyOne<OperationExpression<number> & CommonExpression<number> & InExpression<number>> : E[key] extends boolean ? CommonExpression<boolean> : E[key] extends null ? NullExpression : OnlyOne<StringExpression & StringFilterExpression & CommonExpression<string> & InExpression<string>>) : DeepPartial<Filter<E[key]>>;
+    [key in keyof E]?: E[key] extends PrimaryPartition<number> ? E[key] | OnlyOne<OperationExpression<number> & CommonExpression<number> & InExpression<number>> : E[key] extends PrimaryPartition<string> ? E[key] | OnlyOne<StringExpression & StringFilterExpression & CommonExpression<string> & InExpression<string>> : E[key] extends string | number | boolean | Date | null ? E[key] | (E[key] extends number ? OnlyOne<OperationExpression<number> & CommonExpression<number> & InExpression<number>> : E[key] extends boolean ? CommonExpression<boolean> : E[key] extends null ? NullExpression : OnlyOne<StringExpression & StringFilterExpression & CommonExpression<string> & InExpression<string>>) : DeepPartial<Filter<E[key]>>;
 };
 export type OrFilter<E> = {
     OR: Array<Filter<E> | AndFilter<E>>;
@@ -42,7 +42,7 @@ export type SortDirectionType = 'asc' | 'desc';
 export type KeyCondition<E> = {
     partition: Partial<OnlyNumberString<E>>;
     sort?: {
-        [key in keyof E as E[key] extends number | string ? key : never]?: E[key] extends PrimaryPartition<number> ? number | OperationExpression<E[key]> : E[key] extends PrimaryPartition<string> ? string | OnlyOne<OperationExpression<E[key]> & StringExpression> : E[key] | (E[key] extends number ? OperationExpression<E[key]> : OnlyOne<OperationExpression<E[key]> | StringExpression>);
+        [key in keyof E as E[key] extends number | string ? key : never]?: E[key] extends PrimaryPartition<number> ? E[key] | OperationExpression<E[key]> : E[key] extends PrimaryPartition<string> ? E[key] | OnlyOne<OperationExpression<E[key]> & StringExpression> : E[key] | (E[key] extends number ? OperationExpression<E[key]> : OnlyOne<OperationExpression<E[key]> | StringExpression>);
     };
 };
 export type Item<E extends Function> = {
@@ -158,6 +158,8 @@ export type ReplaceValue<T> = {
 export type DeepReplaceValue<T> = {
     [K in keyof T]?: T[K] extends number | string | boolean | Array<any> | Date ? NumericOrExist<T[K]> : ExistValue<T[K]> | DeepReplaceValue<T[K]>;
 };
+export type ReturnValueOption = 'all_new' | 'updated_new' | 'all_old' | 'none';
+export type UpdateReturnType<E extends Function, R extends ReturnValueOption | undefined> = R extends 'all_new' | 'all_old' ? Item<E> : R extends 'updated_new' ? Partial<Item<E>> : undefined;
 export interface UpdateProps<E extends Function> extends UpsertProps<E> {
     /**
      * Specifies the key condition used to execute the update query.

package/lib/service/query-builder/update/update.d.ts

@@ -1,14 +1,14 @@
 import { type UpdateItemCommandInput } from '@aws-sdk/client-dynamodb';
 import type { ClassResource } from '@lafken/common';
 import { QueryBuilderBase } from '../base/base';
-import type { Item } from '../query-builder.types';
+import type { ReturnValueOption, UpdateReturnType } from '../query-builder.types';
 import type { UpdateBuilderProps } from './update.types';
-export declare class UpdateBuilder<E extends ClassResource> extends QueryBuilderBase<E> {
+export declare class UpdateBuilder<E extends ClassResource, R extends ReturnValueOption | undefined = undefined> extends QueryBuilderBase<E> {
     protected queryOptions: UpdateBuilderProps<E>;
     protected command: UpdateItemCommandInput;
     constructor(queryOptions: UpdateBuilderProps<E>);
     getCommand(): UpdateItemCommandInput;
-    then<T>(resolve: (value: Partial<Item<E>> | undefined) => Item<E>, reject: (reason: any) => T): Promise<T>;
+    then<T>(resolve: (value: UpdateReturnType<E, R>) => T, reject: (reason: any) => T): Promise<T>;
     private exec;
     protected prepare(): void;
     private setValues;

package/lib/service/query-builder/update/update.js

@@ -44,9 +44,9 @@ class UpdateBuilder extends base_1.QueryBuilderBase {
         this.command = {
             TableName: this.queryOptions.modelProps.name,
             Key: (0, util_dynamodb_1.marshall)(keyCondition),
+            ConditionExpression: condition ? this.getFilterExpression(condition) : undefined,
             UpdateExpression: `${setExpression ? `SET ${setExpression}` : ''} ${removeExpression ? `REMOVE ${removeExpression}` : ''}`.trim(),
             ...this.getAttributesAndNames(),
-            ConditionExpression: condition ? this.getFilterExpression(condition) : undefined,
             ReturnValues: this.queryOptions.inputProps.returnValue
                 ? this.queryOptions.inputProps.returnValue.toUpperCase()
                 : undefined,

package/lib/service/repository/repository.js

@@ -63,7 +63,7 @@ const createRepository = (model) => {
         update(inputProps) {
             return new update_1.UpdateBuilder({
                 ...queryBuilderProps,
-                inputProps,
+                inputProps: inputProps,
             });
         },
         delete(key) {

package/lib/service/repository/repository.types.d.ts

@@ -1,6 +1,6 @@
 import type { ClassResource } from '@lafken/common';
 import type { TablePartition } from '../../main';
-import type { FindProps, Item, QueryOneProps, QueryProps, UpdateProps, UpsertProps } from '../query-builder';
+import type { FindProps, Item, QueryOneProps, QueryProps, ReturnValueOption, UpdateProps, UpsertProps } from '../query-builder';
 import type { BulkCreateBuilder } from '../query-builder/bulk-create/bulk-create';
 import type { BulkDeleteBuilder } from '../query-builder/bulk-delete/bulk-delete';
 import type { CreateBuilder } from '../query-builder/create/create';
@@ -16,7 +16,9 @@ export type RepositoryReturn<E extends ClassResource> = {
     scan(inputProps?: FindProps<E>): ScanBuilder<E>;
     upsert(item: Item<E>, inputProps?: UpsertProps<E>): UpsertBuilder<E>;
     create(item: Item<E>): CreateBuilder<E>;
-    update(inputProps: UpdateProps<E>): UpdateBuilder<E>;
+    update<R extends ReturnValueOption | undefined = undefined>(inputProps: Omit<UpdateProps<E>, 'returnValue'> & {
+        returnValue?: R;
+    }): UpdateBuilder<E, R>;
     delete(key: TablePartition<Item<E>>): DeleteBuilder<E>;
     bulkCreate(items: Item<E>[]): BulkCreateBuilder<E>;
     bulkDelete(keys: TablePartition<Item<E>>[]): BulkDeleteBuilder<E>;

package/lib/service/transaction/transaction.types.d.ts

@@ -2,4 +2,4 @@ import type { CreateBuilder } from '../query-builder/create/create';
 import type { DeleteBuilder } from '../query-builder/delete/delete';
 import type { UpdateBuilder } from '../query-builder/update/update';
 import type { UpsertBuilder } from '../query-builder/upsert/upsert';
-export type QueryTransactions = CreateBuilder<any> | UpsertBuilder<any> | UpdateBuilder<any> | DeleteBuilder<any>;
+export type QueryTransactions = CreateBuilder<any> | UpsertBuilder<any> | UpdateBuilder<any, any> | DeleteBuilder<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lafken/dynamo",
-  "version": "0.11.4",
+  "version": "0.11.6",
   "private": false,
   "description": "Define DynamoDB tables using TypeScript decorators - type-safe, declarative infrastructure with Lafken",
   "keywords": [
@@ -60,7 +60,7 @@
     "@aws-sdk/util-dynamodb": "^3.996.2",
     "aws-xray-sdk": "^3.12.0",
     "reflect-metadata": "^0.2.2",
-    "@lafken/resolver": "0.11.4"
+    "@lafken/resolver": "0.11.6"
   },
   "devDependencies": {
     "@cdktn/provider-aws": "^23.5.0",
@@ -75,13 +75,13 @@
     "typescript": "6.0.2",
     "unplugin-swc": "^1.5.9",
     "vitest": "^4.1.2",
-    "@lafken/common": "0.11.4"
+    "@lafken/common": "0.11.6"
   },
   "peerDependencies": {
     "@cdktn/provider-aws": ">=23.0.0",
     "cdktn": ">=0.22.0",
     "constructs": "^10.4.5",
-    "@lafken/common": "0.11.4"
+    "@lafken/common": "0.11.6"
   },
   "engines": {
     "node": ">=20.19"