dyno-table 1.5.0 → 1.7.0

package/dist/entity.js

@@ -6,9 +6,55 @@ var createComparisonCondition = (type) => (attr, value) => ({
 });
 var eq = createComparisonCondition("eq");
 
+// src/builders/entity-aware-builders.ts
+function createEntityAwareBuilder(builder, entityName) {
+  return new Proxy(builder, {
+    get(target, prop, receiver) {
+      if (prop === "entityName") {
+        return entityName;
+      }
+      if (prop === "withBatch" && typeof target[prop] === "function") {
+        return (batch, entityType) => {
+          const typeToUse = entityType ?? entityName;
+          const fn = target[prop];
+          return fn.call(target, batch, typeToUse);
+        };
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+}
+function createEntityAwarePutBuilder(builder, entityName) {
+  return createEntityAwareBuilder(builder, entityName);
+}
+function createEntityAwareGetBuilder(builder, entityName) {
+  return createEntityAwareBuilder(builder, entityName);
+}
+function createEntityAwareDeleteBuilder(builder, entityName) {
+  return createEntityAwareBuilder(builder, entityName);
+}
+
 // src/entity.ts
 function defineEntity(config) {
   const entityTypeAttributeName = config.settings?.entityTypeAttributeName ?? "entityType";
+  const wrapMethodWithPreparation = (originalMethod, prepareFn, context) => {
+    const wrappedMethod = (...args) => {
+      prepareFn();
+      return originalMethod.call(context, ...args);
+    };
+    Object.setPrototypeOf(wrappedMethod, originalMethod);
+    const propertyNames = Object.getOwnPropertyNames(originalMethod);
+    for (let i = 0; i < propertyNames.length; i++) {
+      const prop = propertyNames[i];
+      if (prop !== "length" && prop !== "name" && prop !== "prototype") {
+        const descriptor = Object.getOwnPropertyDescriptor(originalMethod, prop);
+        if (descriptor && descriptor.writable !== false && !descriptor.get) {
+          wrappedMethod[prop] = originalMethod[prop];
+        }
+      }
+    }
+    return wrappedMethod;
+  };
   const generateTimestamps = (timestampTypes) => {
     if (!config.settings?.timestamps) return {};
     const timestamps = {};
@@ -31,39 +77,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 +116,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,
@@ -99,45 +159,50 @@ function defineEntity(config) {
           };
           const originalWithTransaction = builder.withTransaction;
           if (originalWithTransaction) {
-            const wrappedWithTransaction = (transaction) => {
-              prepareValidatedItemSync();
-              return originalWithTransaction.call(builder, transaction);
-            };
-            Object.setPrototypeOf(wrappedWithTransaction, originalWithTransaction);
-            const propertyNames = Object.getOwnPropertyNames(originalWithTransaction);
-            for (let i = 0; i < propertyNames.length; i++) {
-              const prop = propertyNames[i];
-              if (prop !== "length" && prop !== "name" && prop !== "prototype") {
-                try {
-                  wrappedWithTransaction[prop] = originalWithTransaction[prop];
-                } catch (e) {
-                }
-              }
-            }
-            builder.withTransaction = wrappedWithTransaction;
+            builder.withTransaction = wrapMethodWithPreparation(
+              originalWithTransaction,
+              prepareValidatedItemSync,
+              builder
+            );
           }
-          return builder;
+          const originalWithBatch = builder.withBatch;
+          if (originalWithBatch) {
+            builder.withBatch = wrapMethodWithPreparation(originalWithBatch, prepareValidatedItemSync, builder);
+          }
+          return createEntityAwarePutBuilder(builder, config.name);
         },
         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 +216,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 });
@@ -173,26 +256,19 @@ function defineEntity(config) {
           };
           const originalWithTransaction = builder.withTransaction;
           if (originalWithTransaction) {
-            const wrappedWithTransaction = (transaction) => {
-              prepareValidatedItemSync();
-              return originalWithTransaction.call(builder, transaction);
-            };
-            Object.setPrototypeOf(wrappedWithTransaction, originalWithTransaction);
-            const propertyNames = Object.getOwnPropertyNames(originalWithTransaction);
-            for (let i = 0; i < propertyNames.length; i++) {
-              const prop = propertyNames[i];
-              if (prop !== "length" && prop !== "name" && prop !== "prototype") {
-                try {
-                  wrappedWithTransaction[prop] = originalWithTransaction[prop];
-                } catch (e) {
-                }
-              }
-            }
-            builder.withTransaction = wrappedWithTransaction;
+            builder.withTransaction = wrapMethodWithPreparation(
+              originalWithTransaction,
+              prepareValidatedItemSync,
+              builder
+            );
           }
-          return builder;
+          const originalWithBatch = builder.withBatch;
+          if (originalWithBatch) {
+            builder.withBatch = wrapMethodWithPreparation(originalWithBatch, prepareValidatedItemSync, builder);
+          }
+          return createEntityAwarePutBuilder(builder, config.name);
         },
-        get: (key) => table.get(config.primaryKey.generateKey(key)),
+        get: (key) => createEntityAwareGetBuilder(table.get(config.primaryKey.generateKey(key)), config.name),
         update: (key, data) => {
           const primaryKeyObj = config.primaryKey.generateKey(key);
           const builder = table.update(primaryKeyObj);
@@ -204,13 +280,13 @@ function defineEntity(config) {
         delete: (key) => {
           const builder = table.delete(config.primaryKey.generateKey(key));
           builder.condition(eq(entityTypeAttributeName, config.name));
-          return builder;
+          return createEntityAwareDeleteBuilder(builder, config.name);
         },
         query: Object.entries(config.queries || {}).reduce((acc, [key, inputCallback]) => {
           acc[key] = (input) => {
             const queryEntity = {
               scan: repository.scan,
-              get: (key2) => table.get(key2),
+              get: (key2) => createEntityAwareGetBuilder(table.get(key2), config.name),
               query: (keyCondition) => {
                 return table.query(keyCondition);
               }