npm - dyno-table - Versions diffs - 1.5.0 → 1.6.0 - Mend

dyno-table 1.5.0 → 1.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/dist/index.js CHANGED Viewed

@@ -3341,39 +3341,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 } : {},
@@ -3386,11 +3380,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,
@@ -3429,25 +3443,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 });
@@ -3461,12 +3487,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 });