dyno-table 2.0.0 → 2.0.2

package/dist/index.cjs

@@ -47,6 +47,25 @@ var not = (condition) => ({
 
 // src/expression.ts
 var generateAttributeName = (params, attr) => {
+  if (attr.includes(".")) {
+    const pathSegments = attr.split(".");
+    const segmentNames = [];
+    for (const segment of pathSegments) {
+      let segmentName;
+      for (const [existingName, existingAttr] of Object.entries(params.expressionAttributeNames)) {
+        if (existingAttr === segment) {
+          segmentName = existingName;
+          break;
+        }
+      }
+      if (!segmentName) {
+        segmentName = `#${Object.keys(params.expressionAttributeNames).length}`;
+        params.expressionAttributeNames[segmentName] = segment;
+      }
+      segmentNames.push(segmentName);
+    }
+    return segmentNames.join(".");
+  }
   for (const [existingName, existingAttr] of Object.entries(params.expressionAttributeNames)) {
     if (existingAttr === attr) {
       return existingName;
@@ -3758,6 +3777,25 @@ function createEntityAwareDeleteBuilder(builder, entityName) {
 // src/entity.ts
 function defineEntity(config) {
   const entityTypeAttributeName = config.settings?.entityTypeAttributeName ?? "entityType";
+  const buildIndexes = (dataForKeyGeneration, table) => {
+    return Object.entries(config.indexes ?? {}).reduce(
+      (acc, [indexName, index]) => {
+        const key = index.generateKey(dataForKeyGeneration);
+        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 wrapMethodWithPreparation = (originalMethod, prepareFn, context) => {
     const wrappedMethod = (...args) => {
       prepareFn();
@@ -3776,18 +3814,17 @@ function defineEntity(config) {
     }
     return wrappedMethod;
   };
-  const generateTimestamps = (timestampTypes) => {
+  const generateTimestamps = (timestampsToGenerate, data) => {
     if (!config.settings?.timestamps) return {};
     const timestamps = {};
     const now = /* @__PURE__ */ new Date();
     const unixTime = Math.floor(Date.now() / 1e3);
     const { createdAt, updatedAt } = config.settings.timestamps;
-    const typesToGenerate = timestampTypes || ["createdAt", "updatedAt"];
-    if (createdAt && typesToGenerate.includes("createdAt")) {
+    if (createdAt && timestampsToGenerate.includes("createdAt") && !data.createdAt) {
       const name = createdAt.attributeName ?? "createdAt";
       timestamps[name] = createdAt.format === "UNIX" ? unixTime : now.toISOString();
     }
-    if (updatedAt && typesToGenerate.includes("updatedAt")) {
+    if (updatedAt && timestampsToGenerate.includes("updatedAt") && !data.updatedAt) {
       const name = updatedAt.attributeName ?? "updatedAt";
       timestamps[name] = updatedAt.format === "UNIX" ? unixTime : now.toISOString();
     }
@@ -3800,36 +3837,22 @@ function defineEntity(config) {
         create: (data) => {
           const builder = table.create({});
           const prepareValidatedItemAsync = async () => {
-            const validationResult = config.schema["~standard"].validate(data);
-            const validatedData = validationResult instanceof Promise ? await validationResult : validationResult;
+            const validatedData = await config.schema["~standard"].validate(data);
             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 = {
+            const dataForKeyGeneration = {
               ...validatedData.value,
+              ...generateTimestamps(["createdAt", "updatedAt"], validatedData.value)
+            };
+            const primaryKey = config.primaryKey.generateKey(dataForKeyGeneration);
+            const indexes = buildIndexes(dataForKeyGeneration, table);
+            const validatedItem = {
+              ...dataForKeyGeneration,
               [entityTypeAttributeName]: config.name,
               [table.partitionKey]: primaryKey.pk,
               ...table.sortKey ? { [table.sortKey]: primaryKey.sk } : {},
-              ...indexes,
-              ...generateTimestamps(["createdAt", "updatedAt"])
+              ...indexes
             };
             Object.assign(builder, { item: validatedItem });
             return validatedItem;
@@ -3838,37 +3861,24 @@ function defineEntity(config) {
             const validationResult = config.schema["~standard"].validate(data);
             if (validationResult instanceof Promise) {
               throw new Error(
-                "Async validation is not supported in create method. The schema must support synchronous validation for transaction compatibility."
+                "Async validation is not supported in withBatch or withTransaction. The schema must support synchronous validation for 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 = {
+            const dataForKeyGeneration = {
               ...validationResult.value,
+              ...generateTimestamps(["createdAt", "updatedAt"], validationResult.value)
+            };
+            const primaryKey = config.primaryKey.generateKey(dataForKeyGeneration);
+            const indexes = buildIndexes(dataForKeyGeneration, table);
+            const validatedItem = {
+              ...dataForKeyGeneration,
               [entityTypeAttributeName]: config.name,
               [table.partitionKey]: primaryKey.pk,
               ...table.sortKey ? { [table.sortKey]: primaryKey.sk } : {},
-              ...indexes,
-              ...generateTimestamps(["createdAt", "updatedAt"])
+              ...indexes
             };
             Object.assign(builder, { item: validatedItem });
             return validatedItem;
@@ -3895,36 +3905,22 @@ function defineEntity(config) {
         upsert: (data) => {
           const builder = table.put({});
           const prepareValidatedItemAsync = async () => {
-            const validationResult = config.schema["~standard"].validate(data);
-            const validatedData = validationResult instanceof Promise ? await validationResult : validationResult;
+            const validatedData = await config.schema["~standard"].validate(data);
             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 dataForKeyGeneration = {
+              ...validatedData.value,
+              ...generateTimestamps(["createdAt", "updatedAt"], validatedData.value)
+            };
+            const primaryKey = config.primaryKey.generateKey(dataForKeyGeneration);
+            const indexes = buildIndexes(dataForKeyGeneration, table);
             const validatedItem = {
               [table.partitionKey]: primaryKey.pk,
               ...table.sortKey ? { [table.sortKey]: primaryKey.sk } : {},
-              ...validatedData.value,
+              ...dataForKeyGeneration,
               [entityTypeAttributeName]: config.name,
-              ...indexes,
-              ...generateTimestamps(["createdAt", "updatedAt"])
+              ...indexes
             };
             Object.assign(builder, { item: validatedItem });
             return validatedItem;
@@ -3932,36 +3928,25 @@ 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 withTransaction or withBatch. Use execute() instead."
+              );
             }
             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 dataForKeyGeneration = {
+              ...validationResult.value,
+              ...generateTimestamps(["createdAt", "updatedAt"], validationResult.value)
+            };
+            const primaryKey = config.primaryKey.generateKey(dataForKeyGeneration);
+            const indexes = buildIndexes(dataForKeyGeneration, table);
             const validatedItem = {
               [table.partitionKey]: primaryKey.pk,
               ...table.sortKey ? { [table.sortKey]: primaryKey.sk } : {},
-              ...validationResult.value,
+              ...dataForKeyGeneration,
               [entityTypeAttributeName]: config.name,
-              ...indexes,
-              ...generateTimestamps(["createdAt", "updatedAt"])
+              ...indexes
             };
             Object.assign(builder, { item: validatedItem });
             return validatedItem;
@@ -3994,7 +3979,7 @@ function defineEntity(config) {
           const primaryKeyObj = config.primaryKey.generateKey(key);
           const builder = table.update(primaryKeyObj);
           builder.condition(eq(entityTypeAttributeName, config.name));
-          const timestamps = generateTimestamps(["updatedAt"]);
+          const timestamps = generateTimestamps(["updatedAt"], data);
           builder.set({ ...data, ...timestamps });
           return builder;
         },