dyno-table 2.3.1 → 2.3.3

package/README.md

@@ -273,9 +273,3 @@ const largeDinos = await dinoRepo.batchGet([
 - **[Issues](https://github.com/Kysumi/dyno-table/issues)** - Report bugs or request features
 - **[Discussions](https://github.com/Kysumi/dyno-table/discussions)** - Ask questions and share ideas
 - **[NPM](https://www.npmjs.com/package/dyno-table)** - Package information
-
----
-
-<div align="center">
-  <em>Built by developers who believe working with DynamoDB should be intuitive and type-safe</em>
-</div>

package/dist/{chunk-NTA6GDPP.cjs → chunk-3J5DY7KG.cjs}

@@ -500,46 +500,49 @@ function defineEntity(config) {
           builder.condition(chunk7UJJ7JXM_cjs.eq(entityTypeAttributeName, config.name));
           return createEntityAwareDeleteBuilder(builder, config.name);
         },
-        query: Object.entries(config.queries || {}).reduce((acc, [key, inputCallback]) => {
-          acc[key] = (input) => {
-            const queryEntity = {
-              scan: repository.scan,
-              get: (key2) => createEntityAwareGetBuilder(table.get(key2), config.name),
-              query: (keyCondition) => {
-                return table.query(keyCondition);
+        query: Object.entries(config.queries || {}).reduce(
+          (acc, [key, inputCallback]) => {
+            acc[key] = (input) => {
+              const queryEntity = {
+                scan: repository.scan,
+                get: (key2) => createEntityAwareGetBuilder(table.get(key2), config.name),
+                query: (keyCondition) => {
+                  return table.query(keyCondition);
+                }
+              };
+              const queryBuilderCallback = inputCallback(input);
+              const builder = queryBuilderCallback(queryEntity);
+              if (builder && typeof builder === "object" && "filter" in builder && typeof builder.filter === "function") {
+                builder.filter(chunk7UJJ7JXM_cjs.eq(entityTypeAttributeName, config.name));
               }
-            };
-            const queryBuilderCallback = inputCallback(input);
-            const builder = queryBuilderCallback(queryEntity);
-            if (builder && typeof builder === "object" && "filter" in builder && typeof builder.filter === "function") {
-              builder.filter(chunk7UJJ7JXM_cjs.eq(entityTypeAttributeName, config.name));
-            }
-            if (builder && typeof builder === "object" && "execute" in builder) {
-              const originalExecute = builder.execute;
-              builder.execute = async () => {
-                const queryFn = config.queries[key];
-                if (queryFn && typeof queryFn === "function") {
-                  const schema = queryFn.schema;
-                  if (schema?.["~standard"]?.validate && typeof schema["~standard"].validate === "function") {
-                    const validationResult = schema["~standard"].validate(input);
-                    if ("issues" in validationResult && validationResult.issues) {
-                      throw new Error(
-                        `Validation failed: ${validationResult.issues.map((issue) => issue.message).join(", ")}`
-                      );
+              if (builder && typeof builder === "object" && "execute" in builder) {
+                const originalExecute = builder.execute;
+                builder.execute = async () => {
+                  const queryFn = config.queries[key];
+                  if (queryFn && typeof queryFn === "function") {
+                    const schema = queryFn.schema;
+                    if (schema?.["~standard"]?.validate && typeof schema["~standard"].validate === "function") {
+                      const validationResult = schema["~standard"].validate(input);
+                      if ("issues" in validationResult && validationResult.issues) {
+                        throw new Error(
+                          `Validation failed: ${validationResult.issues.map((issue) => issue.message).join(", ")}`
+                        );
+                      }
                     }
                   }
-                }
-                const result = await originalExecute.call(builder);
-                if (!result) {
-                  throw new Error("Failed to execute query");
-                }
-                return result;
-              };
-            }
-            return builder;
-          };
-          return acc;
-        }, {}),
+                  const result = await originalExecute.call(builder);
+                  if (!result) {
+                    throw new Error("Failed to execute query");
+                  }
+                  return result;
+                };
+              }
+              return builder;
+            };
+            return acc;
+          },
+          {}
+        ),
         scan: () => {
           const builder = table.scan();
           builder.filter(chunk7UJJ7JXM_cjs.eq(entityTypeAttributeName, config.name));

package/dist/{chunk-2EWNZOUK.js → chunk-M5Y6JQJN.js}

@@ -498,46 +498,49 @@ function defineEntity(config) {
           builder.condition(eq(entityTypeAttributeName, config.name));
           return createEntityAwareDeleteBuilder(builder, config.name);
         },
-        query: Object.entries(config.queries || {}).reduce((acc, [key, inputCallback]) => {
-          acc[key] = (input) => {
-            const queryEntity = {
-              scan: repository.scan,
-              get: (key2) => createEntityAwareGetBuilder(table.get(key2), config.name),
-              query: (keyCondition) => {
-                return table.query(keyCondition);
+        query: Object.entries(config.queries || {}).reduce(
+          (acc, [key, inputCallback]) => {
+            acc[key] = (input) => {
+              const queryEntity = {
+                scan: repository.scan,
+                get: (key2) => createEntityAwareGetBuilder(table.get(key2), config.name),
+                query: (keyCondition) => {
+                  return table.query(keyCondition);
+                }
+              };
+              const queryBuilderCallback = inputCallback(input);
+              const builder = queryBuilderCallback(queryEntity);
+              if (builder && typeof builder === "object" && "filter" in builder && typeof builder.filter === "function") {
+                builder.filter(eq(entityTypeAttributeName, config.name));
               }
-            };
-            const queryBuilderCallback = inputCallback(input);
-            const builder = queryBuilderCallback(queryEntity);
-            if (builder && typeof builder === "object" && "filter" in builder && typeof builder.filter === "function") {
-              builder.filter(eq(entityTypeAttributeName, config.name));
-            }
-            if (builder && typeof builder === "object" && "execute" in builder) {
-              const originalExecute = builder.execute;
-              builder.execute = async () => {
-                const queryFn = config.queries[key];
-                if (queryFn && typeof queryFn === "function") {
-                  const schema = queryFn.schema;
-                  if (schema?.["~standard"]?.validate && typeof schema["~standard"].validate === "function") {
-                    const validationResult = schema["~standard"].validate(input);
-                    if ("issues" in validationResult && validationResult.issues) {
-                      throw new Error(
-                        `Validation failed: ${validationResult.issues.map((issue) => issue.message).join(", ")}`
-                      );
+              if (builder && typeof builder === "object" && "execute" in builder) {
+                const originalExecute = builder.execute;
+                builder.execute = async () => {
+                  const queryFn = config.queries[key];
+                  if (queryFn && typeof queryFn === "function") {
+                    const schema = queryFn.schema;
+                    if (schema?.["~standard"]?.validate && typeof schema["~standard"].validate === "function") {
+                      const validationResult = schema["~standard"].validate(input);
+                      if ("issues" in validationResult && validationResult.issues) {
+                        throw new Error(
+                          `Validation failed: ${validationResult.issues.map((issue) => issue.message).join(", ")}`
+                        );
+                      }
                     }
                   }
-                }
-                const result = await originalExecute.call(builder);
-                if (!result) {
-                  throw new Error("Failed to execute query");
-                }
-                return result;
-              };
-            }
-            return builder;
-          };
-          return acc;
-        }, {}),
+                  const result = await originalExecute.call(builder);
+                  if (!result) {
+                    throw new Error("Failed to execute query");
+                  }
+                  return result;
+                };
+              }
+              return builder;
+            };
+            return acc;
+          },
+          {}
+        ),
         scan: () => {
           const builder = table.scan();
           builder.filter(eq(entityTypeAttributeName, config.name));

package/dist/entity.cjs

@@ -1,19 +1,19 @@
 'use strict';
 
-var chunkNTA6GDPP_cjs = require('./chunk-NTA6GDPP.cjs');
+var chunk3J5DY7KG_cjs = require('./chunk-3J5DY7KG.cjs');
 require('./chunk-7UJJ7JXM.cjs');
 
 
 
 Object.defineProperty(exports, "createIndex", {
   enumerable: true,
-  get: function () { return chunkNTA6GDPP_cjs.createIndex; }
+  get: function () { return chunk3J5DY7KG_cjs.createIndex; }
 });
 Object.defineProperty(exports, "createQueries", {
   enumerable: true,
-  get: function () { return chunkNTA6GDPP_cjs.createQueries; }
+  get: function () { return chunk3J5DY7KG_cjs.createQueries; }
 });
 Object.defineProperty(exports, "defineEntity", {
   enumerable: true,
-  get: function () { return chunkNTA6GDPP_cjs.defineEntity; }
+  get: function () { return chunk3J5DY7KG_cjs.defineEntity; }
 });

package/dist/entity.d.cts

@@ -2,7 +2,7 @@ import { s as Path, t as PathType, a as Condition, b as ConditionOperator, c as
 import { P as PutBuilder, G as GetBuilder, U as UpdateBuilder, i as UpdateCommandParams, T as TransactionBuilder, D as DeleteBuilder, S as ScanBuilder, Q as QueryBuilder } from './index-DlN8G9hd.cjs';
 import { StandardSchemaV1 } from './standard-schema.cjs';
 import { Table } from './table.cjs';
-import { DynamoItem, TableConfig, Index } from './types.cjs';
+import { DynamoItem, Index, TableConfig } from './types.cjs';
 import '@aws-sdk/lib-dynamodb';
 
 type SetElementType<T> = T extends Set<infer U> ? U : T extends Array<infer U> ? U : never;
@@ -110,7 +110,10 @@ type QueryFunctionWithSchema<T extends DynamoItem, I, R> = QueryFunction<T, I, R
     schema?: StandardSchemaV1<I>;
 };
 type QueryRecord<T extends DynamoItem> = {
-    [K: string]: QueryFunctionWithSchema<T, any, ScanBuilder<T> | QueryBuilder<T, TableConfig> | GetBuilder<T>>;
+    [K: string]: QueryFunctionWithSchema<T, any, any>;
+};
+type MappedQueries<T extends DynamoItem, Q extends QueryRecord<T>> = {
+    [K in keyof Q]: Q[K] extends QueryFunctionWithSchema<T, infer I, infer R> ? (input: I) => R : never;
 };
 type QueryEntity<T extends DynamoItem> = {
     scan: () => ScanBuilder<T>;
@@ -195,7 +198,7 @@ Q extends QueryRecord<T> = QueryRecord<T>> {
     get: (key: I) => EntityAwareGetBuilder<T>;
     update: (key: I, data: Partial<T>) => EntityAwareUpdateBuilder<T>;
     delete: (key: I) => EntityAwareDeleteBuilder;
-    query: Q;
+    query: MappedQueries<T, Q>;
     scan: () => ScanBuilder<T>;
 }
 /**
@@ -221,7 +224,7 @@ declare function defineEntity<T extends DynamoItem, TInput extends DynamoItem =
 };
 declare function createQueries<T extends DynamoItem>(): {
     input: <I>(schema: StandardSchemaV1<I>) => {
-        query: <Q extends QueryRecord<T> = QueryRecord<T>, R = ScanBuilder<T, TableConfig> | QueryBuilder<T, TableConfig> | GetBuilder<T>>(handler: (params: {
+        query: <R extends ScanBuilder<T> | QueryBuilder<T, TableConfig> | GetBuilder<T>>(handler: (params: {
             input: I;
             entity: QueryEntity<T>;
         }) => R) => QueryFunctionWithSchema<T, I, R>;
@@ -255,4 +258,4 @@ declare function createIndex(): {
     };
 };
 
-export { type EntityConfig, type EntityRepository, type IndexDefinition, type QueryEntity, type QueryFunction, type QueryFunctionWithSchema, type QueryRecord, createIndex, createQueries, defineEntity };
+export { type EntityConfig, type EntityRepository, type IndexDefinition, type MappedQueries, type QueryEntity, type QueryFunction, type QueryFunctionWithSchema, type QueryRecord, createIndex, createQueries, defineEntity };

package/dist/entity.d.ts

@@ -2,7 +2,7 @@ import { s as Path, t as PathType, a as Condition, b as ConditionOperator, c as
 import { P as PutBuilder, G as GetBuilder, U as UpdateBuilder, i as UpdateCommandParams, T as TransactionBuilder, D as DeleteBuilder, S as ScanBuilder, Q as QueryBuilder } from './index-2cbm07Bi.js';
 import { StandardSchemaV1 } from './standard-schema.js';
 import { Table } from './table.js';
-import { DynamoItem, TableConfig, Index } from './types.js';
+import { DynamoItem, Index, TableConfig } from './types.js';
 import '@aws-sdk/lib-dynamodb';
 
 type SetElementType<T> = T extends Set<infer U> ? U : T extends Array<infer U> ? U : never;
@@ -110,7 +110,10 @@ type QueryFunctionWithSchema<T extends DynamoItem, I, R> = QueryFunction<T, I, R
     schema?: StandardSchemaV1<I>;
 };
 type QueryRecord<T extends DynamoItem> = {
-    [K: string]: QueryFunctionWithSchema<T, any, ScanBuilder<T> | QueryBuilder<T, TableConfig> | GetBuilder<T>>;
+    [K: string]: QueryFunctionWithSchema<T, any, any>;
+};
+type MappedQueries<T extends DynamoItem, Q extends QueryRecord<T>> = {
+    [K in keyof Q]: Q[K] extends QueryFunctionWithSchema<T, infer I, infer R> ? (input: I) => R : never;
 };
 type QueryEntity<T extends DynamoItem> = {
     scan: () => ScanBuilder<T>;
@@ -195,7 +198,7 @@ Q extends QueryRecord<T> = QueryRecord<T>> {
     get: (key: I) => EntityAwareGetBuilder<T>;
     update: (key: I, data: Partial<T>) => EntityAwareUpdateBuilder<T>;
     delete: (key: I) => EntityAwareDeleteBuilder;
-    query: Q;
+    query: MappedQueries<T, Q>;
     scan: () => ScanBuilder<T>;
 }
 /**
@@ -221,7 +224,7 @@ declare function defineEntity<T extends DynamoItem, TInput extends DynamoItem =
 };
 declare function createQueries<T extends DynamoItem>(): {
     input: <I>(schema: StandardSchemaV1<I>) => {
-        query: <Q extends QueryRecord<T> = QueryRecord<T>, R = ScanBuilder<T, TableConfig> | QueryBuilder<T, TableConfig> | GetBuilder<T>>(handler: (params: {
+        query: <R extends ScanBuilder<T> | QueryBuilder<T, TableConfig> | GetBuilder<T>>(handler: (params: {
             input: I;
             entity: QueryEntity<T>;
         }) => R) => QueryFunctionWithSchema<T, I, R>;
@@ -255,4 +258,4 @@ declare function createIndex(): {
     };
 };
 
-export { type EntityConfig, type EntityRepository, type IndexDefinition, type QueryEntity, type QueryFunction, type QueryFunctionWithSchema, type QueryRecord, createIndex, createQueries, defineEntity };
+export { type EntityConfig, type EntityRepository, type IndexDefinition, type MappedQueries, type QueryEntity, type QueryFunction, type QueryFunctionWithSchema, type QueryRecord, createIndex, createQueries, defineEntity };

package/dist/entity.js

@@ -1,2 +1,2 @@
-export { createIndex, createQueries, defineEntity } from './chunk-2EWNZOUK.js';
+export { createIndex, createQueries, defineEntity } from './chunk-M5Y6JQJN.js';
 import './chunk-2WIBY7PZ.js';

package/dist/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var chunkKA3VPIPS_cjs = require('./chunk-KA3VPIPS.cjs');
-var chunkNTA6GDPP_cjs = require('./chunk-NTA6GDPP.cjs');
+var chunk3J5DY7KG_cjs = require('./chunk-3J5DY7KG.cjs');
 var chunkPB7BBCZO_cjs = require('./chunk-PB7BBCZO.cjs');
 var chunkXYL43FDX_cjs = require('./chunk-XYL43FDX.cjs');
 var chunk7UJJ7JXM_cjs = require('./chunk-7UJJ7JXM.cjs');
@@ -14,15 +14,15 @@ Object.defineProperty(exports, "Table", {
 });
 Object.defineProperty(exports, "createIndex", {
   enumerable: true,
-  get: function () { return chunkNTA6GDPP_cjs.createIndex; }
+  get: function () { return chunk3J5DY7KG_cjs.createIndex; }
 });
 Object.defineProperty(exports, "createQueries", {
   enumerable: true,
-  get: function () { return chunkNTA6GDPP_cjs.createQueries; }
+  get: function () { return chunk3J5DY7KG_cjs.createQueries; }
 });
 Object.defineProperty(exports, "defineEntity", {
   enumerable: true,
-  get: function () { return chunkNTA6GDPP_cjs.defineEntity; }
+  get: function () { return chunk3J5DY7KG_cjs.defineEntity; }
 });
 Object.defineProperty(exports, "partitionKey", {
   enumerable: true,

package/dist/index.js

@@ -1,5 +1,5 @@
 export { Table } from './chunk-EODPMYPE.js';
-export { createIndex, createQueries, defineEntity } from './chunk-2EWNZOUK.js';
+export { createIndex, createQueries, defineEntity } from './chunk-M5Y6JQJN.js';
 export { partitionKey, sortKey } from './chunk-QVRMYGC4.js';
 export { BatchBuilder, BatchError, DeleteBuilder, PutBuilder, QueryBuilder, TransactionBuilder, UpdateBuilder } from './chunk-DTFJJASK.js';
 export { and, attributeExists, attributeNotExists, beginsWith, between, contains, eq, gt, gte, inArray, lt, lte, ne, not, or } from './chunk-2WIBY7PZ.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dyno-table",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "description": "A TypeScript library to simplify working with DynamoDB",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",