dyno-table 1.4.0 → 1.6.0

package/dist/entity.d.cts

@@ -1,11 +1,11 @@
 import { DeleteBuilder } from './builders/delete-builder.cjs';
-import { S as ScanBuilder, G as GetBuilder, T as Table } from './table-CmIQe-jD.cjs';
+import { S as ScanBuilder, G as GetBuilder, T as Table } from './table-CY9byPEg.cjs';
 import { PutBuilder } from './builders/put-builder.cjs';
 import { UpdateBuilder } from './builders/update-builder.cjs';
 import { StandardSchemaV1 } from './standard-schema.cjs';
 import { DynamoItem, TableConfig, Index } from './types.cjs';
-import { P as PrimaryKeyWithoutExpression, a as PrimaryKey } from './conditions-x6kGWMR7.cjs';
-import { Q as QueryBuilder } from './query-builder-Dg9Loeco.cjs';
+import { r as PrimaryKeyWithoutExpression, P as PrimaryKey } from './conditions-3ae5znV_.cjs';
+import { Q as QueryBuilder } from './query-builder-CbHvimBk.cjs';
 import './builders/transaction-builder.cjs';
 import '@aws-sdk/lib-dynamodb';
 import './builder-types-DlaUSc-b.cjs';
@@ -72,9 +72,9 @@ interface Settings {
         };
     };
 }
-interface EntityConfig<T extends DynamoItem, I extends DynamoItem = T, Q extends QueryRecord<T> = QueryRecord<T>> {
+interface EntityConfig<T extends DynamoItem, TInput extends DynamoItem = T, I extends DynamoItem = T, Q extends QueryRecord<T> = QueryRecord<T>> {
     name: string;
-    schema: StandardSchemaV1<T>;
+    schema: StandardSchemaV1<TInput, T>;
     primaryKey: IndexDefinition<I>;
     indexes?: Record<string, Index>;
     queries: Q;
@@ -82,9 +82,13 @@ interface EntityConfig<T extends DynamoItem, I extends DynamoItem = T, Q extends
 }
 interface EntityRepository<
 /**
- * The Entity Type
+ * The Entity Type (output type)
  */
 T extends DynamoItem, 
+/**
+ * The Input Type (for create operations)
+ */
+TInput extends DynamoItem = T, 
 /**
  * The Primary Index (Partition index) Type
  */
@@ -93,8 +97,8 @@ I extends DynamoItem = T,
  * The Queries object
  */
 Q extends QueryRecord<T> = QueryRecord<T>> {
-    create: (data: T) => PutBuilder<T>;
-    upsert: (data: T & I) => PutBuilder<T>;
+    create: (data: TInput) => PutBuilder<T>;
+    upsert: (data: TInput & I) => PutBuilder<T>;
     get: (key: I) => GetBuilder<T>;
     update: (key: I, data: Partial<T>) => UpdateBuilder<T>;
     delete: (key: I) => DeleteBuilder;
@@ -118,9 +122,9 @@ Q extends QueryRecord<T> = QueryRecord<T>> {
  * });
  * ```
  */
-declare function defineEntity<T extends DynamoItem, I extends DynamoItem = T, Q extends QueryRecord<T> = QueryRecord<T>>(config: EntityConfig<T, I, Q>): {
+declare function defineEntity<T extends DynamoItem, TInput extends DynamoItem = T, I extends DynamoItem = T, Q extends QueryRecord<T> = QueryRecord<T>>(config: EntityConfig<T, TInput, I, Q>): {
     name: string;
-    createRepository: (table: Table) => EntityRepository<T, I, Q>;
+    createRepository: (table: Table) => EntityRepository<T, TInput, I, Q>;
 };
 declare function createQueries<T extends DynamoItem>(): {
     input: <I>(schema: StandardSchemaV1<I>) => {

package/dist/entity.d.ts

@@ -1,11 +1,11 @@
 import { DeleteBuilder } from './builders/delete-builder.js';
-import { S as ScanBuilder, G as GetBuilder, T as Table } from './table-TI4ULfra.js';
+import { S as ScanBuilder, G as GetBuilder, T as Table } from './table-Des8C2od.js';
 import { PutBuilder } from './builders/put-builder.js';
 import { UpdateBuilder } from './builders/update-builder.js';
 import { StandardSchemaV1 } from './standard-schema.js';
 import { DynamoItem, TableConfig, Index } from './types.js';
-import { P as PrimaryKeyWithoutExpression, a as PrimaryKey } from './conditions-BIpBkh4m.js';
-import { Q as QueryBuilder } from './query-builder-H9Dn0qaS.js';
+import { r as PrimaryKeyWithoutExpression, P as PrimaryKey } from './conditions-BtynAviC.js';
+import { Q as QueryBuilder } from './query-builder-BhrR31oO.js';
 import './builders/transaction-builder.js';
 import '@aws-sdk/lib-dynamodb';
 import './builder-types-B_tCpn9F.js';
@@ -72,9 +72,9 @@ interface Settings {
         };
     };
 }
-interface EntityConfig<T extends DynamoItem, I extends DynamoItem = T, Q extends QueryRecord<T> = QueryRecord<T>> {
+interface EntityConfig<T extends DynamoItem, TInput extends DynamoItem = T, I extends DynamoItem = T, Q extends QueryRecord<T> = QueryRecord<T>> {
     name: string;
-    schema: StandardSchemaV1<T>;
+    schema: StandardSchemaV1<TInput, T>;
     primaryKey: IndexDefinition<I>;
     indexes?: Record<string, Index>;
     queries: Q;
@@ -82,9 +82,13 @@ interface EntityConfig<T extends DynamoItem, I extends DynamoItem = T, Q extends
 }
 interface EntityRepository<
 /**
- * The Entity Type
+ * The Entity Type (output type)
  */
 T extends DynamoItem, 
+/**
+ * The Input Type (for create operations)
+ */
+TInput extends DynamoItem = T, 
 /**
  * The Primary Index (Partition index) Type
  */
@@ -93,8 +97,8 @@ I extends DynamoItem = T,
  * The Queries object
  */
 Q extends QueryRecord<T> = QueryRecord<T>> {
-    create: (data: T) => PutBuilder<T>;
-    upsert: (data: T & I) => PutBuilder<T>;
+    create: (data: TInput) => PutBuilder<T>;
+    upsert: (data: TInput & I) => PutBuilder<T>;
     get: (key: I) => GetBuilder<T>;
     update: (key: I, data: Partial<T>) => UpdateBuilder<T>;
     delete: (key: I) => DeleteBuilder;
@@ -118,9 +122,9 @@ Q extends QueryRecord<T> = QueryRecord<T>> {
  * });
  * ```
  */
-declare function defineEntity<T extends DynamoItem, I extends DynamoItem = T, Q extends QueryRecord<T> = QueryRecord<T>>(config: EntityConfig<T, I, Q>): {
+declare function defineEntity<T extends DynamoItem, TInput extends DynamoItem = T, I extends DynamoItem = T, Q extends QueryRecord<T> = QueryRecord<T>>(config: EntityConfig<T, TInput, I, Q>): {
     name: string;
-    createRepository: (table: Table) => EntityRepository<T, I, Q>;
+    createRepository: (table: Table) => EntityRepository<T, TInput, I, Q>;
 };
 declare function createQueries<T extends DynamoItem>(): {
     input: <I>(schema: StandardSchemaV1<I>) => {

package/dist/entity.js

@@ -31,39 +31,33 @@ function defineEntity(config) {
     createRepository: (table) => {
       const repository = {
         create: (data) => {
-          const primaryKey = config.primaryKey.generateKey(data);
-          const indexes = Object.entries(config.indexes ?? {}).reduce(
-            (acc, [indexName, index]) => {
-              const key = index.generateKey(data);
-              const gsiConfig = table.gsis[indexName];
-              if (!gsiConfig) {
-                throw new Error(`GSI configuration not found for index: ${indexName}`);
-              }
-              if (key.pk) {
-                acc[gsiConfig.partitionKey] = key.pk;
-              }
-              if (key.sk && gsiConfig.sortKey) {
-                acc[gsiConfig.sortKey] = key.sk;
-              }
-              return acc;
-            },
-            {}
-          );
-          const builder = table.create({
-            ...data,
-            [entityTypeAttributeName]: config.name,
-            [table.partitionKey]: primaryKey.pk,
-            ...table.sortKey ? { [table.sortKey]: primaryKey.sk } : {},
-            ...indexes,
-            ...generateTimestamps(["createdAt", "updatedAt"])
-          });
+          const builder = table.create({});
           const prepareValidatedItemAsync = async () => {
-            const validationResult = await config.schema["~standard"].validate(data);
-            if ("issues" in validationResult && validationResult.issues) {
-              throw new Error(`Validation failed: ${validationResult.issues.map((i) => i.message).join(", ")}`);
+            const validationResult = config.schema["~standard"].validate(data);
+            const validatedData = validationResult instanceof Promise ? await validationResult : validationResult;
+            if ("issues" in validatedData && validatedData.issues) {
+              throw new Error(`Validation failed: ${validatedData.issues.map((i) => i.message).join(", ")}`);
             }
+            const primaryKey = config.primaryKey.generateKey(validatedData.value);
+            const indexes = Object.entries(config.indexes ?? {}).reduce(
+              (acc, [indexName, index]) => {
+                const key = index.generateKey(validatedData.value);
+                const gsiConfig = table.gsis[indexName];
+                if (!gsiConfig) {
+                  throw new Error(`GSI configuration not found for index: ${indexName}`);
+                }
+                if (key.pk) {
+                  acc[gsiConfig.partitionKey] = key.pk;
+                }
+                if (key.sk && gsiConfig.sortKey) {
+                  acc[gsiConfig.sortKey] = key.sk;
+                }
+                return acc;
+              },
+              {}
+            );
             const validatedItem = {
-              ...validationResult.value,
+              ...validatedData.value,
               [entityTypeAttributeName]: config.name,
               [table.partitionKey]: primaryKey.pk,
               ...table.sortKey ? { [table.sortKey]: primaryKey.sk } : {},
@@ -76,11 +70,31 @@ function defineEntity(config) {
           const prepareValidatedItemSync = () => {
             const validationResult = config.schema["~standard"].validate(data);
             if (validationResult instanceof Promise) {
-              throw new Error("Async validation is not supported in withTransaction. Use execute() instead.");
+              throw new Error(
+                "Async validation is not supported in create method. The schema must support synchronous validation for transaction compatibility."
+              );
             }
             if ("issues" in validationResult && validationResult.issues) {
               throw new Error(`Validation failed: ${validationResult.issues.map((i) => i.message).join(", ")}`);
             }
+            const primaryKey = config.primaryKey.generateKey(validationResult.value);
+            const indexes = Object.entries(config.indexes ?? {}).reduce(
+              (acc, [indexName, index]) => {
+                const key = index.generateKey(validationResult.value);
+                const gsiConfig = table.gsis[indexName];
+                if (!gsiConfig) {
+                  throw new Error(`GSI configuration not found for index: ${indexName}`);
+                }
+                if (key.pk) {
+                  acc[gsiConfig.partitionKey] = key.pk;
+                }
+                if (key.sk && gsiConfig.sortKey) {
+                  acc[gsiConfig.sortKey] = key.sk;
+                }
+                return acc;
+              },
+              {}
+            );
             const validatedItem = {
               ...validationResult.value,
               [entityTypeAttributeName]: config.name,
@@ -119,25 +133,37 @@ function defineEntity(config) {
           return builder;
         },
         upsert: (data) => {
-          const primaryKey = config.primaryKey.generateKey(data);
-          const builder = table.put({
-            [table.partitionKey]: primaryKey.pk,
-            ...table.sortKey ? { [table.sortKey]: primaryKey.sk } : {},
-            ...data,
-            [entityTypeAttributeName]: config.name,
-            ...generateTimestamps(["createdAt", "updatedAt"])
-          });
+          const builder = table.put({});
           const prepareValidatedItemAsync = async () => {
-            const validationResult = await config.schema["~standard"].validate(data);
-            if ("issues" in validationResult && validationResult.issues) {
-              throw new Error(`Validation failed: ${validationResult.issues.map((i) => i.message).join(", ")}`);
+            const validationResult = config.schema["~standard"].validate(data);
+            const validatedData = validationResult instanceof Promise ? await validationResult : validationResult;
+            if ("issues" in validatedData && validatedData.issues) {
+              throw new Error(`Validation failed: ${validatedData.issues.map((i) => i.message).join(", ")}`);
             }
-            const primaryKey2 = config.primaryKey.generateKey(validationResult.value);
+            const primaryKey = config.primaryKey.generateKey(validatedData.value);
+            const indexes = Object.entries(config.indexes ?? {}).reduce(
+              (acc, [indexName, index]) => {
+                const key = index.generateKey(validatedData.value);
+                const gsiConfig = table.gsis[indexName];
+                if (!gsiConfig) {
+                  throw new Error(`GSI configuration not found for index: ${indexName}`);
+                }
+                if (key.pk) {
+                  acc[gsiConfig.partitionKey] = key.pk;
+                }
+                if (key.sk && gsiConfig.sortKey) {
+                  acc[gsiConfig.sortKey] = key.sk;
+                }
+                return acc;
+              },
+              {}
+            );
             const validatedItem = {
-              [table.partitionKey]: primaryKey2.pk,
-              ...table.sortKey ? { [table.sortKey]: primaryKey2.sk } : {},
-              ...validationResult.value,
+              [table.partitionKey]: primaryKey.pk,
+              ...table.sortKey ? { [table.sortKey]: primaryKey.sk } : {},
+              ...validatedData.value,
               [entityTypeAttributeName]: config.name,
+              ...indexes,
               ...generateTimestamps(["createdAt", "updatedAt"])
             };
             Object.assign(builder, { item: validatedItem });
@@ -151,12 +177,30 @@ function defineEntity(config) {
             if ("issues" in validationResult && validationResult.issues) {
               throw new Error(`Validation failed: ${validationResult.issues.map((i) => i.message).join(", ")}`);
             }
-            const primaryKey2 = config.primaryKey.generateKey(validationResult.value);
+            const primaryKey = config.primaryKey.generateKey(validationResult.value);
+            const indexes = Object.entries(config.indexes ?? {}).reduce(
+              (acc, [indexName, index]) => {
+                const key = index.generateKey(validationResult.value);
+                const gsiConfig = table.gsis[indexName];
+                if (!gsiConfig) {
+                  throw new Error(`GSI configuration not found for index: ${indexName}`);
+                }
+                if (key.pk) {
+                  acc[gsiConfig.partitionKey] = key.pk;
+                }
+                if (key.sk && gsiConfig.sortKey) {
+                  acc[gsiConfig.sortKey] = key.sk;
+                }
+                return acc;
+              },
+              {}
+            );
             const validatedItem = {
-              [table.partitionKey]: primaryKey2.pk,
-              ...table.sortKey ? { [table.sortKey]: primaryKey2.sk } : {},
+              [table.partitionKey]: primaryKey.pk,
+              ...table.sortKey ? { [table.sortKey]: primaryKey.sk } : {},
               ...validationResult.value,
               [entityTypeAttributeName]: config.name,
+              ...indexes,
               ...generateTimestamps(["createdAt", "updatedAt"])
             };
             Object.assign(builder, { item: validatedItem });