dn-react-router-toolkit 0.9.4 → 0.9.6

package/dist/api/index.js

@@ -438,7 +438,11 @@ function putResourceHandler({
 // src/api/patch_resource_handler.ts
 var import_gw_response3 = require("gw-response");
 var import_drizzle_orm2 = require("drizzle-orm");
-function patchResourceHandler({ repository, validators }) {
+function patchResourceHandler({
+  repository,
+  validators,
+  primaryKey
+}) {
   return async (existing, request) => {
     const serilaizedParams = await request.json();
     const params = deserialize(serilaizedParams) || {};
@@ -457,8 +461,7 @@ function patchResourceHandler({ repository, validators }) {
         }
       }
     }
-    const item = await repository.save({
-      ...existing,
+    const item = await repository.update(existing[primaryKey], {
       ...params
     });
     return (0, import_gw_response3.httpCreated)(item);
@@ -473,7 +476,8 @@ function resourceHandler({
   existingConditions,
   injectUserId,
   roles,
-  isOwnedBy
+  isOwnedBy,
+  primaryKey
 }) {
   const loader = async ({ request }) => {
     return (0, import_gw_result.ok)({});
@@ -485,29 +489,34 @@ function resourceHandler({
         message: "\uAD8C\uD55C\uC774 \uC5C6\uC2B5\uB2C8\uB2E4."
       });
     }
-    const itemId = params.itemId;
-    if (itemId) {
-      const existing = await repository.find(itemId);
-      if (!existing) {
-        return (0, import_gw_response4.httpNotFound)();
-      }
-      if (isOwnedBy && (!auth || !isOwnedBy(auth, existing))) {
-        return (0, import_gw_response4.httpForbidden)();
-      }
-      switch (request.method) {
-        case "PATCH": {
-          const handler = patchResourceHandler({
-            repository,
-            validators
-          });
-          return handler(existing, request);
+    const pathname = new URL(request.url).pathname;
+    const segments = pathname.split("/").filter(Boolean);
+    if (segments.length === 3) {
+      const itemId = segments.at(-1);
+      if (itemId) {
+        const existing = await repository.find(itemId);
+        if (!existing) {
+          return (0, import_gw_response4.httpNotFound)();
         }
-        case "DELETE": {
-          await repository.delete(itemId);
-          return (0, import_gw_response4.httpNoContent)();
+        if (isOwnedBy && (!auth || !isOwnedBy(auth, existing))) {
+          return (0, import_gw_response4.httpForbidden)();
         }
-        default: {
-          return (0, import_gw_response4.httpMethodNotAllowed)();
+        switch (request.method) {
+          case "PATCH": {
+            const handler = patchResourceHandler({
+              repository,
+              validators,
+              primaryKey
+            });
+            return handler(existing, request);
+          }
+          case "DELETE": {
+            await repository.delete(itemId);
+            return (0, import_gw_response4.httpNoContent)();
+          }
+          default: {
+            return (0, import_gw_response4.httpMethodNotAllowed)();
+          }
         }
       }
     }

package/dist/api/index.mjs

@@ -434,7 +434,11 @@ function putResourceHandler({
 // src/api/patch_resource_handler.ts
 import { httpBadRequest as httpBadRequest2, httpCreated as httpCreated2 } from "gw-response";
 import "drizzle-orm";
-function patchResourceHandler({ repository, validators }) {
+function patchResourceHandler({
+  repository,
+  validators,
+  primaryKey
+}) {
   return async (existing, request) => {
     const serilaizedParams = await request.json();
     const params = deserialize(serilaizedParams) || {};
@@ -453,8 +457,7 @@ function patchResourceHandler({ repository, validators }) {
         }
       }
     }
-    const item = await repository.save({
-      ...existing,
+    const item = await repository.update(existing[primaryKey], {
       ...params
     });
     return httpCreated2(item);
@@ -469,7 +472,8 @@ function resourceHandler({
   existingConditions,
   injectUserId,
   roles,
-  isOwnedBy
+  isOwnedBy,
+  primaryKey
 }) {
   const loader = async ({ request }) => {
     return ok({});
@@ -481,29 +485,34 @@ function resourceHandler({
         message: "\uAD8C\uD55C\uC774 \uC5C6\uC2B5\uB2C8\uB2E4."
       });
     }
-    const itemId = params.itemId;
-    if (itemId) {
-      const existing = await repository.find(itemId);
-      if (!existing) {
-        return httpNotFound3();
-      }
-      if (isOwnedBy && (!auth || !isOwnedBy(auth, existing))) {
-        return httpForbidden2();
-      }
-      switch (request.method) {
-        case "PATCH": {
-          const handler = patchResourceHandler({
-            repository,
-            validators
-          });
-          return handler(existing, request);
+    const pathname = new URL(request.url).pathname;
+    const segments = pathname.split("/").filter(Boolean);
+    if (segments.length === 3) {
+      const itemId = segments.at(-1);
+      if (itemId) {
+        const existing = await repository.find(itemId);
+        if (!existing) {
+          return httpNotFound3();
         }
-        case "DELETE": {
-          await repository.delete(itemId);
-          return httpNoContent();
+        if (isOwnedBy && (!auth || !isOwnedBy(auth, existing))) {
+          return httpForbidden2();
         }
-        default: {
-          return httpMethodNotAllowed();
+        switch (request.method) {
+          case "PATCH": {
+            const handler = patchResourceHandler({
+              repository,
+              validators,
+              primaryKey
+            });
+            return handler(existing, request);
+          }
+          case "DELETE": {
+            await repository.delete(itemId);
+            return httpNoContent();
+          }
+          default: {
+            return httpMethodNotAllowed();
+          }
         }
       }
     }

package/dist/api/patch_resource_handler.d.mts

@@ -12,10 +12,11 @@ type PatchResourceValidators<T extends PgTableWithColumns<any>> = {
 type PatchResourceExistingConditions<T extends PgTableWithColumns<any>> = {
     [K in keyof InferSelectModel<T>]?: (value: InferSelectModel<T>[K]) => SQLWrapper;
 };
-type PatchResourceHandlerOptions<T extends PgTableWithColumns<any>, TSelect> = {
-    repository: TableRepository<T, TSelect>;
+type PatchResourceHandlerOptions<T extends PgTableWithColumns<any>, TSelect, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never> = {
+    repository: TableRepository<T, TSelect, TPrimaryKey>;
     validators?: PatchResourceValidators<T>;
+    primaryKey: TPrimaryKey;
 };
-declare function patchResourceHandler<T extends PgTableWithColumns<any>, TSelect>({ repository, validators }: PatchResourceHandlerOptions<T, TSelect>): (existing: TSelect, request: Request) => Promise<Response>;
+declare function patchResourceHandler<T extends PgTableWithColumns<any>, TSelect, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never>({ repository, validators, primaryKey, }: PatchResourceHandlerOptions<T, TSelect, TPrimaryKey>): (existing: TSelect, request: Request) => Promise<Response>;
 
 export { type PatchResourceExistingConditions, type PatchResourceHandlerOptions, type PatchResourceValidators, patchResourceHandler };

package/dist/api/patch_resource_handler.d.ts

@@ -12,10 +12,11 @@ type PatchResourceValidators<T extends PgTableWithColumns<any>> = {
 type PatchResourceExistingConditions<T extends PgTableWithColumns<any>> = {
     [K in keyof InferSelectModel<T>]?: (value: InferSelectModel<T>[K]) => SQLWrapper;
 };
-type PatchResourceHandlerOptions<T extends PgTableWithColumns<any>, TSelect> = {
-    repository: TableRepository<T, TSelect>;
+type PatchResourceHandlerOptions<T extends PgTableWithColumns<any>, TSelect, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never> = {
+    repository: TableRepository<T, TSelect, TPrimaryKey>;
     validators?: PatchResourceValidators<T>;
+    primaryKey: TPrimaryKey;
 };
-declare function patchResourceHandler<T extends PgTableWithColumns<any>, TSelect>({ repository, validators }: PatchResourceHandlerOptions<T, TSelect>): (existing: TSelect, request: Request) => Promise<Response>;
+declare function patchResourceHandler<T extends PgTableWithColumns<any>, TSelect, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never>({ repository, validators, primaryKey, }: PatchResourceHandlerOptions<T, TSelect, TPrimaryKey>): (existing: TSelect, request: Request) => Promise<Response>;
 
 export { type PatchResourceExistingConditions, type PatchResourceHandlerOptions, type PatchResourceValidators, patchResourceHandler };

package/dist/api/patch_resource_handler.js

@@ -140,7 +140,11 @@ var import_jsx_runtime6 = require("react/jsx-runtime");
 
 // src/api/patch_resource_handler.ts
 var import_drizzle_orm = require("drizzle-orm");
-function patchResourceHandler({ repository, validators }) {
+function patchResourceHandler({
+  repository,
+  validators,
+  primaryKey
+}) {
   return async (existing, request) => {
     const serilaizedParams = await request.json();
     const params = deserialize(serilaizedParams) || {};
@@ -159,8 +163,7 @@ function patchResourceHandler({ repository, validators }) {
         }
       }
     }
-    const item = await repository.save({
-      ...existing,
+    const item = await repository.update(existing[primaryKey], {
       ...params
     });
     return (0, import_gw_response.httpCreated)(item);

package/dist/api/patch_resource_handler.mjs

@@ -113,7 +113,11 @@ import { Fragment as Fragment2, jsx as jsx6, jsxs as jsxs2 } from "react/jsx-run
 
 // src/api/patch_resource_handler.ts
 import "drizzle-orm";
-function patchResourceHandler({ repository, validators }) {
+function patchResourceHandler({
+  repository,
+  validators,
+  primaryKey
+}) {
   return async (existing, request) => {
     const serilaizedParams = await request.json();
     const params = deserialize(serilaizedParams) || {};
@@ -132,8 +136,7 @@ function patchResourceHandler({ repository, validators }) {
         }
       }
     }
-    const item = await repository.save({
-      ...existing,
+    const item = await repository.update(existing[primaryKey], {
       ...params
     });
     return httpCreated(item);

package/dist/api/put_resource_handler.d.mts

@@ -13,13 +13,13 @@ type PutResourceValidators<T extends PgTableWithColumns<any>> = {
 type PutResourceExistingConditions<T extends PgTableWithColumns<any>> = {
     [K in keyof InferSelectModel<T>]?: (value: InferSelectModel<T>[K]) => SQLWrapper;
 };
-type PutResourceHandlerOptions<T extends PgTableWithColumns<any>, TSelect> = {
-    repository: TableRepository<T, TSelect>;
+type PutResourceHandlerOptions<T extends PgTableWithColumns<any>, TSelect, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never> = {
+    repository: TableRepository<T, TSelect, TPrimaryKey>;
     validators?: PutResourceValidators<T>;
     existingConditions?: PutResourceExistingConditions<T>;
     injectUserId?: boolean;
     isOwnedBy?: (auth: AccessTokenPayload, item: TSelect) => boolean;
 };
-declare function putResourceHandler<T extends PgTableWithColumns<any>, TSelect>({ repository, validators, existingConditions, injectUserId, isOwnedBy, }: PutResourceHandlerOptions<T, TSelect>): (auth: AccessTokenPayload | undefined, request: Request) => Promise<Response>;
+declare function putResourceHandler<T extends PgTableWithColumns<any>, TSelect, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never>({ repository, validators, existingConditions, injectUserId, isOwnedBy, }: PutResourceHandlerOptions<T, TSelect, TPrimaryKey>): (auth: AccessTokenPayload | undefined, request: Request) => Promise<Response>;
 
 export { type PutResourceExistingConditions, type PutResourceHandlerOptions, type PutResourceValidators, putResourceHandler };

package/dist/api/put_resource_handler.d.ts

@@ -13,13 +13,13 @@ type PutResourceValidators<T extends PgTableWithColumns<any>> = {
 type PutResourceExistingConditions<T extends PgTableWithColumns<any>> = {
     [K in keyof InferSelectModel<T>]?: (value: InferSelectModel<T>[K]) => SQLWrapper;
 };
-type PutResourceHandlerOptions<T extends PgTableWithColumns<any>, TSelect> = {
-    repository: TableRepository<T, TSelect>;
+type PutResourceHandlerOptions<T extends PgTableWithColumns<any>, TSelect, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never> = {
+    repository: TableRepository<T, TSelect, TPrimaryKey>;
     validators?: PutResourceValidators<T>;
     existingConditions?: PutResourceExistingConditions<T>;
     injectUserId?: boolean;
     isOwnedBy?: (auth: AccessTokenPayload, item: TSelect) => boolean;
 };
-declare function putResourceHandler<T extends PgTableWithColumns<any>, TSelect>({ repository, validators, existingConditions, injectUserId, isOwnedBy, }: PutResourceHandlerOptions<T, TSelect>): (auth: AccessTokenPayload | undefined, request: Request) => Promise<Response>;
+declare function putResourceHandler<T extends PgTableWithColumns<any>, TSelect, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never>({ repository, validators, existingConditions, injectUserId, isOwnedBy, }: PutResourceHandlerOptions<T, TSelect, TPrimaryKey>): (auth: AccessTokenPayload | undefined, request: Request) => Promise<Response>;
 
 export { type PutResourceExistingConditions, type PutResourceHandlerOptions, type PutResourceValidators, putResourceHandler };

package/dist/api/resource_handler.d.mts

@@ -9,16 +9,17 @@ import 'drizzle-orm';
 import 'drizzle-orm/node-postgres';
 import 'gw-auth/server';
 
-type APIHandlerOptions<T extends PgTableWithColumns<any>, TSelect> = {
+type APIHandlerOptions<T extends PgTableWithColumns<any>, TSelect, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never> = {
     withAuthAction: WithAuthHandler<ActionFunctionArgs>;
-    repository: TableRepository<T, TSelect>;
+    repository: TableRepository<T, TSelect, TPrimaryKey>;
+    primaryKey: TPrimaryKey;
     validators?: PutResourceValidators<T>;
     existingConditions?: PutResourceExistingConditions<T>;
     injectUserId?: boolean;
     roles?: string[];
     isOwnedBy?: (auth: AccessTokenPayload, item: TSelect) => boolean;
 };
-declare function resourceHandler<T extends PgTableWithColumns<any>, TSelect>({ withAuthAction, repository, validators, existingConditions, injectUserId, roles, isOwnedBy, }: APIHandlerOptions<T, TSelect>): {
+declare function resourceHandler<T extends PgTableWithColumns<any>, TSelect, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never>({ withAuthAction, repository, validators, existingConditions, injectUserId, roles, isOwnedBy, primaryKey, }: APIHandlerOptions<T, TSelect, TPrimaryKey>): {
     loader: ({ request }: LoaderFunctionArgs) => Promise<gw_result.Ok<{}>>;
     action: (arg: ActionFunctionArgs<any>) => Promise<unknown> | unknown;
 };

package/dist/api/resource_handler.d.ts

@@ -9,16 +9,17 @@ import 'drizzle-orm';
 import 'drizzle-orm/node-postgres';
 import 'gw-auth/server';
 
-type APIHandlerOptions<T extends PgTableWithColumns<any>, TSelect> = {
+type APIHandlerOptions<T extends PgTableWithColumns<any>, TSelect, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never> = {
     withAuthAction: WithAuthHandler<ActionFunctionArgs>;
-    repository: TableRepository<T, TSelect>;
+    repository: TableRepository<T, TSelect, TPrimaryKey>;
+    primaryKey: TPrimaryKey;
     validators?: PutResourceValidators<T>;
     existingConditions?: PutResourceExistingConditions<T>;
     injectUserId?: boolean;
     roles?: string[];
     isOwnedBy?: (auth: AccessTokenPayload, item: TSelect) => boolean;
 };
-declare function resourceHandler<T extends PgTableWithColumns<any>, TSelect>({ withAuthAction, repository, validators, existingConditions, injectUserId, roles, isOwnedBy, }: APIHandlerOptions<T, TSelect>): {
+declare function resourceHandler<T extends PgTableWithColumns<any>, TSelect, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never>({ withAuthAction, repository, validators, existingConditions, injectUserId, roles, isOwnedBy, primaryKey, }: APIHandlerOptions<T, TSelect, TPrimaryKey>): {
     loader: ({ request }: LoaderFunctionArgs) => Promise<gw_result.Ok<{}>>;
     action: (arg: ActionFunctionArgs<any>) => Promise<unknown> | unknown;
 };

package/dist/api/resource_handler.js

@@ -216,7 +216,11 @@ function putResourceHandler({
 // src/api/patch_resource_handler.ts
 var import_gw_response2 = require("gw-response");
 var import_drizzle_orm2 = require("drizzle-orm");
-function patchResourceHandler({ repository, validators }) {
+function patchResourceHandler({
+  repository,
+  validators,
+  primaryKey
+}) {
   return async (existing, request) => {
     const serilaizedParams = await request.json();
     const params = deserialize(serilaizedParams) || {};
@@ -235,8 +239,7 @@ function patchResourceHandler({ repository, validators }) {
         }
       }
     }
-    const item = await repository.save({
-      ...existing,
+    const item = await repository.update(existing[primaryKey], {
       ...params
     });
     return (0, import_gw_response2.httpCreated)(item);
@@ -251,7 +254,8 @@ function resourceHandler({
   existingConditions,
   injectUserId,
   roles,
-  isOwnedBy
+  isOwnedBy,
+  primaryKey
 }) {
   const loader = async ({ request }) => {
     return (0, import_gw_result.ok)({});
@@ -263,29 +267,34 @@ function resourceHandler({
         message: "\uAD8C\uD55C\uC774 \uC5C6\uC2B5\uB2C8\uB2E4."
       });
     }
-    const itemId = params.itemId;
-    if (itemId) {
-      const existing = await repository.find(itemId);
-      if (!existing) {
-        return (0, import_gw_response3.httpNotFound)();
-      }
-      if (isOwnedBy && (!auth || !isOwnedBy(auth, existing))) {
-        return (0, import_gw_response3.httpForbidden)();
-      }
-      switch (request.method) {
-        case "PATCH": {
-          const handler = patchResourceHandler({
-            repository,
-            validators
-          });
-          return handler(existing, request);
+    const pathname = new URL(request.url).pathname;
+    const segments = pathname.split("/").filter(Boolean);
+    if (segments.length === 3) {
+      const itemId = segments.at(-1);
+      if (itemId) {
+        const existing = await repository.find(itemId);
+        if (!existing) {
+          return (0, import_gw_response3.httpNotFound)();
         }
-        case "DELETE": {
-          await repository.delete(itemId);
-          return (0, import_gw_response3.httpNoContent)();
+        if (isOwnedBy && (!auth || !isOwnedBy(auth, existing))) {
+          return (0, import_gw_response3.httpForbidden)();
         }
-        default: {
-          return (0, import_gw_response3.httpMethodNotAllowed)();
+        switch (request.method) {
+          case "PATCH": {
+            const handler = patchResourceHandler({
+              repository,
+              validators,
+              primaryKey
+            });
+            return handler(existing, request);
+          }
+          case "DELETE": {
+            await repository.delete(itemId);
+            return (0, import_gw_response3.httpNoContent)();
+          }
+          default: {
+            return (0, import_gw_response3.httpMethodNotAllowed)();
+          }
         }
       }
     }

package/dist/api/resource_handler.mjs

@@ -202,7 +202,11 @@ function putResourceHandler({
 // src/api/patch_resource_handler.ts
 import { httpBadRequest as httpBadRequest2, httpCreated as httpCreated2 } from "gw-response";
 import "drizzle-orm";
-function patchResourceHandler({ repository, validators }) {
+function patchResourceHandler({
+  repository,
+  validators,
+  primaryKey
+}) {
   return async (existing, request) => {
     const serilaizedParams = await request.json();
     const params = deserialize(serilaizedParams) || {};
@@ -221,8 +225,7 @@ function patchResourceHandler({ repository, validators }) {
         }
       }
     }
-    const item = await repository.save({
-      ...existing,
+    const item = await repository.update(existing[primaryKey], {
       ...params
     });
     return httpCreated2(item);
@@ -237,7 +240,8 @@ function resourceHandler({
   existingConditions,
   injectUserId,
   roles,
-  isOwnedBy
+  isOwnedBy,
+  primaryKey
 }) {
   const loader = async ({ request }) => {
     return ok({});
@@ -249,29 +253,34 @@ function resourceHandler({
         message: "\uAD8C\uD55C\uC774 \uC5C6\uC2B5\uB2C8\uB2E4."
       });
     }
-    const itemId = params.itemId;
-    if (itemId) {
-      const existing = await repository.find(itemId);
-      if (!existing) {
-        return httpNotFound2();
-      }
-      if (isOwnedBy && (!auth || !isOwnedBy(auth, existing))) {
-        return httpForbidden2();
-      }
-      switch (request.method) {
-        case "PATCH": {
-          const handler = patchResourceHandler({
-            repository,
-            validators
-          });
-          return handler(existing, request);
+    const pathname = new URL(request.url).pathname;
+    const segments = pathname.split("/").filter(Boolean);
+    if (segments.length === 3) {
+      const itemId = segments.at(-1);
+      if (itemId) {
+        const existing = await repository.find(itemId);
+        if (!existing) {
+          return httpNotFound2();
         }
-        case "DELETE": {
-          await repository.delete(itemId);
-          return httpNoContent();
+        if (isOwnedBy && (!auth || !isOwnedBy(auth, existing))) {
+          return httpForbidden2();
         }
-        default: {
-          return httpMethodNotAllowed();
+        switch (request.method) {
+          case "PATCH": {
+            const handler = patchResourceHandler({
+              repository,
+              validators,
+              primaryKey
+            });
+            return handler(existing, request);
+          }
+          case "DELETE": {
+            await repository.delete(itemId);
+            return httpNoContent();
+          }
+          default: {
+            return httpMethodNotAllowed();
+          }
         }
       }
     }

package/dist/table/index.js

@@ -41,8 +41,8 @@ var BaseTableRepository = class {
     this.schema = db._.fullSchema[schema];
     this.pk = pk;
   }
-  async find(id) {
-    return await this.db.select().from(this.schema).where((0, import_drizzle_orm.eq)(this.schema[this.pk], id)).limit(1).then((res) => res[0]);
+  async find(pk) {
+    return await this.db.select().from(this.schema).where((0, import_drizzle_orm.eq)(this.schema[this.pk], pk)).limit(1).then((res) => res[0]);
   }
   async countTotal({ where }) {
     const [{ total }] = await this.db.select({ total: (0, import_drizzle_orm.count)() }).from(this.schema).where(where);
@@ -77,6 +77,10 @@ var BaseTableRepository = class {
   async delete(pk) {
     await this.db.delete(this.schema).where((0, import_drizzle_orm.eq)(this.schema[this.pk], pk));
   }
+  async update(pk, values) {
+    const [item] = await this.db.update(this.schema).set(values).where((0, import_drizzle_orm.eq)(this.schema[this.pk], pk)).returning();
+    return item;
+  }
   async select(key) {
     const rows = await this.db.select({ value: this.schema[key] }).from(this.schema).groupBy(this.schema[key]);
     return rows.map((row) => row.value);

package/dist/table/index.mjs

@@ -14,8 +14,8 @@ var BaseTableRepository = class {
     this.schema = db._.fullSchema[schema];
     this.pk = pk;
   }
-  async find(id) {
-    return await this.db.select().from(this.schema).where(eq(this.schema[this.pk], id)).limit(1).then((res) => res[0]);
+  async find(pk) {
+    return await this.db.select().from(this.schema).where(eq(this.schema[this.pk], pk)).limit(1).then((res) => res[0]);
   }
   async countTotal({ where }) {
     const [{ total }] = await this.db.select({ total: count() }).from(this.schema).where(where);
@@ -50,6 +50,10 @@ var BaseTableRepository = class {
   async delete(pk) {
     await this.db.delete(this.schema).where(eq(this.schema[this.pk], pk));
   }
+  async update(pk, values) {
+    const [item] = await this.db.update(this.schema).set(values).where(eq(this.schema[this.pk], pk)).returning();
+    return item;
+  }
   async select(key) {
     const rows = await this.db.select({ value: this.schema[key] }).from(this.schema).groupBy(this.schema[key]);
     return rows.map((row) => row.value);

package/dist/table/repository.d.mts

@@ -12,30 +12,32 @@ type FindAllOptions<T extends PgTableWithColumns<any>> = {
 type ColumnOf<T> = T extends PgTableWithColumns<infer TConfig> ? keyof TConfig["columns"] : never;
 type SelectModelOf<T> = T extends TableRepository<infer TSelect, any> ? TSelect : never;
 type InsertModelOf<T> = T extends TableRepository<any, infer TInsert> ? TInsert : never;
-interface TableRepository<T extends PgTableWithColumns<any>, TSelect = InferSelectModel<T>> {
+interface TableRepository<T extends PgTableWithColumns<any>, TSelect = InferSelectModel<T>, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never> {
     schema: T;
-    find: (id: string) => Promise<TSelect | undefined>;
+    find: (pk: TSelect[TPrimaryKey]) => Promise<TSelect | undefined>;
     countTotal: (options: {
         where?: SQL<unknown>;
     }) => Promise<number>;
     findAll: (options: FindAllOptions<T>) => Promise<TSelect[]>;
     save: (values: InferInsertModel<T>) => Promise<TSelect>;
-    delete: (id: string) => Promise<void>;
+    update: (pk: TSelect[TPrimaryKey], values: Partial<InferInsertModel<T>>) => Promise<TSelect>;
+    delete: (pk: TSelect[TPrimaryKey]) => Promise<void>;
     select(key: keyof InferSelectModel<T>): Promise<InferSelectModel<T>[typeof key][]>;
 }
 type SchemaOf<TDatabase extends NodePgDatabase<any>, TSchemaKey extends keyof TDatabase["_"]["fullSchema"]> = TDatabase["_"]["fullSchema"][TSchemaKey];
-declare class BaseTableRepository<TDatabase extends NodePgDatabase<any>, TSchemaKey extends keyof TDatabase["_"]["fullSchema"], TSelect = InferSelectModel<SchemaOf<TDatabase, TSchemaKey>>, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never> implements TableRepository<SchemaOf<TDatabase, TSchemaKey>> {
+declare class BaseTableRepository<TDatabase extends NodePgDatabase<any>, TSchemaKey extends keyof TDatabase["_"]["fullSchema"], TSelect = InferSelectModel<SchemaOf<TDatabase, TSchemaKey>>, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never> implements TableRepository<SchemaOf<TDatabase, TSchemaKey>, TSelect, TPrimaryKey> {
     db: TDatabase;
     schema: SchemaOf<TDatabase, TSchemaKey>;
     pk: TPrimaryKey;
     constructor(db: TDatabase, schema: TSchemaKey, pk?: TPrimaryKey);
-    find(id: string): Promise<TSelect | undefined>;
+    find(pk: TSelect[TPrimaryKey]): Promise<TSelect | undefined>;
     countTotal({ where }: {
         where?: SQL<unknown>;
     }): Promise<number>;
     findAll(options: FindAllOptions<SchemaOf<TDatabase, TSchemaKey>>): Promise<TSelect[]>;
     save(values: InferInsertModel<SchemaOf<TDatabase, TSchemaKey>>): Promise<TSelect>;
-    delete(pk: string): Promise<void>;
+    delete(pk: TSelect[TPrimaryKey]): Promise<void>;
+    update(pk: TSelect[TPrimaryKey], values: Partial<InferInsertModel<SchemaOf<TDatabase, TSchemaKey>>>): Promise<TSelect>;
     select(key: keyof InferSelectModel<SchemaOf<TDatabase, TSchemaKey>>): Promise<InferSelectModel<SchemaOf<TDatabase, TSchemaKey>>[typeof key][]>;
 }
 

package/dist/table/repository.d.ts

@@ -12,30 +12,32 @@ type FindAllOptions<T extends PgTableWithColumns<any>> = {
 type ColumnOf<T> = T extends PgTableWithColumns<infer TConfig> ? keyof TConfig["columns"] : never;
 type SelectModelOf<T> = T extends TableRepository<infer TSelect, any> ? TSelect : never;
 type InsertModelOf<T> = T extends TableRepository<any, infer TInsert> ? TInsert : never;
-interface TableRepository<T extends PgTableWithColumns<any>, TSelect = InferSelectModel<T>> {
+interface TableRepository<T extends PgTableWithColumns<any>, TSelect = InferSelectModel<T>, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never> {
     schema: T;
-    find: (id: string) => Promise<TSelect | undefined>;
+    find: (pk: TSelect[TPrimaryKey]) => Promise<TSelect | undefined>;
     countTotal: (options: {
         where?: SQL<unknown>;
     }) => Promise<number>;
     findAll: (options: FindAllOptions<T>) => Promise<TSelect[]>;
     save: (values: InferInsertModel<T>) => Promise<TSelect>;
-    delete: (id: string) => Promise<void>;
+    update: (pk: TSelect[TPrimaryKey], values: Partial<InferInsertModel<T>>) => Promise<TSelect>;
+    delete: (pk: TSelect[TPrimaryKey]) => Promise<void>;
     select(key: keyof InferSelectModel<T>): Promise<InferSelectModel<T>[typeof key][]>;
 }
 type SchemaOf<TDatabase extends NodePgDatabase<any>, TSchemaKey extends keyof TDatabase["_"]["fullSchema"]> = TDatabase["_"]["fullSchema"][TSchemaKey];
-declare class BaseTableRepository<TDatabase extends NodePgDatabase<any>, TSchemaKey extends keyof TDatabase["_"]["fullSchema"], TSelect = InferSelectModel<SchemaOf<TDatabase, TSchemaKey>>, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never> implements TableRepository<SchemaOf<TDatabase, TSchemaKey>> {
+declare class BaseTableRepository<TDatabase extends NodePgDatabase<any>, TSchemaKey extends keyof TDatabase["_"]["fullSchema"], TSelect = InferSelectModel<SchemaOf<TDatabase, TSchemaKey>>, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never> implements TableRepository<SchemaOf<TDatabase, TSchemaKey>, TSelect, TPrimaryKey> {
     db: TDatabase;
     schema: SchemaOf<TDatabase, TSchemaKey>;
     pk: TPrimaryKey;
     constructor(db: TDatabase, schema: TSchemaKey, pk?: TPrimaryKey);
-    find(id: string): Promise<TSelect | undefined>;
+    find(pk: TSelect[TPrimaryKey]): Promise<TSelect | undefined>;
     countTotal({ where }: {
         where?: SQL<unknown>;
     }): Promise<number>;
     findAll(options: FindAllOptions<SchemaOf<TDatabase, TSchemaKey>>): Promise<TSelect[]>;
     save(values: InferInsertModel<SchemaOf<TDatabase, TSchemaKey>>): Promise<TSelect>;
-    delete(pk: string): Promise<void>;
+    delete(pk: TSelect[TPrimaryKey]): Promise<void>;
+    update(pk: TSelect[TPrimaryKey], values: Partial<InferInsertModel<SchemaOf<TDatabase, TSchemaKey>>>): Promise<TSelect>;
     select(key: keyof InferSelectModel<SchemaOf<TDatabase, TSchemaKey>>): Promise<InferSelectModel<SchemaOf<TDatabase, TSchemaKey>>[typeof key][]>;
 }
 

package/dist/table/repository.js

@@ -33,8 +33,8 @@ var BaseTableRepository = class {
     this.schema = db._.fullSchema[schema];
     this.pk = pk;
   }
-  async find(id) {
-    return await this.db.select().from(this.schema).where((0, import_drizzle_orm.eq)(this.schema[this.pk], id)).limit(1).then((res) => res[0]);
+  async find(pk) {
+    return await this.db.select().from(this.schema).where((0, import_drizzle_orm.eq)(this.schema[this.pk], pk)).limit(1).then((res) => res[0]);
   }
   async countTotal({ where }) {
     const [{ total }] = await this.db.select({ total: (0, import_drizzle_orm.count)() }).from(this.schema).where(where);
@@ -69,6 +69,10 @@ var BaseTableRepository = class {
   async delete(pk) {
     await this.db.delete(this.schema).where((0, import_drizzle_orm.eq)(this.schema[this.pk], pk));
   }
+  async update(pk, values) {
+    const [item] = await this.db.update(this.schema).set(values).where((0, import_drizzle_orm.eq)(this.schema[this.pk], pk)).returning();
+    return item;
+  }
   async select(key) {
     const rows = await this.db.select({ value: this.schema[key] }).from(this.schema).groupBy(this.schema[key]);
     return rows.map((row) => row.value);

package/dist/table/repository.mjs

@@ -14,8 +14,8 @@ var BaseTableRepository = class {
     this.schema = db._.fullSchema[schema];
     this.pk = pk;
   }
-  async find(id) {
-    return await this.db.select().from(this.schema).where(eq(this.schema[this.pk], id)).limit(1).then((res) => res[0]);
+  async find(pk) {
+    return await this.db.select().from(this.schema).where(eq(this.schema[this.pk], pk)).limit(1).then((res) => res[0]);
   }
   async countTotal({ where }) {
     const [{ total }] = await this.db.select({ total: count() }).from(this.schema).where(where);
@@ -50,6 +50,10 @@ var BaseTableRepository = class {
   async delete(pk) {
     await this.db.delete(this.schema).where(eq(this.schema[this.pk], pk));
   }
+  async update(pk, values) {
+    const [item] = await this.db.update(this.schema).set(values).where(eq(this.schema[this.pk], pk)).returning();
+    return item;
+  }
   async select(key) {
     const rows = await this.db.select({ value: this.schema[key] }).from(this.schema).groupBy(this.schema[key]);
     return rows.map((row) => row.value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dn-react-router-toolkit",
-  "version": "0.9.4",
+  "version": "0.9.6",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.mjs",
   "module": "./dist/index.js",