@greatapps/common 1.1.660 → 1.1.662

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@greatapps/common",
-  "version": "1.1.660",
+  "version": "1.1.662",
   "description": "Shared library for GreatApps frontend applications",
   "main": "./dist/index.mjs",
   "types": "./src/index.ts",
@@ -90,7 +90,6 @@
     "react-hook-form": "^7.72.0",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3",
-    "zod": "^4.3.6",
     "zustand": "^5.0.12"
   },
   "peerDependencies": {

package/src/infra/route/parse-numeric.ts

@@ -0,0 +1,16 @@
+export function parseNumericFields<T extends object>(
+  params: Partial<T>,
+  fields: readonly (keyof T)[]
+): Partial<T> {
+  const result: Partial<T> = { ...params };
+  for (const field of fields) {
+    const v = result[field] as unknown;
+    if (typeof v === 'string' && v !== '') {
+      const n = Number(v);
+      if (Number.isFinite(n)) {
+        result[field] = n as T[keyof T];
+      }
+    }
+  }
+  return result;
+}

package/src/modules/projects/handlers/list-all-account-users.handler.ts

@@ -1,16 +1,22 @@
 import 'server-only';
 
 import type { NextRequest } from 'next/server';
+import { parseNumericFields } from '../../../infra/route/parse-numeric';
 import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
 import { searchParamsToParams } from '../../../infra/route/search-params';
 import { projectUsersService } from '../services/project-users.service';
 import type { ListUsersParams } from '../types';
 
+const NUMERIC_FIELDS = ['page', 'limit'] as const;
+
 export function createListAllAccountUsersHandler() {
   return async function GET(req: NextRequest) {
     return safeRouteHandler(() =>
       projectUsersService.listAllAccountUsers(
-        searchParamsToParams<ListUsersParams>(req.nextUrl.searchParams)
+        parseNumericFields<ListUsersParams>(
+          searchParamsToParams<ListUsersParams>(req.nextUrl.searchParams),
+          NUMERIC_FIELDS
+        )
       )
     );
   };

package/src/modules/projects/handlers/list-available-users.handler.ts

@@ -2,18 +2,24 @@ import 'server-only';
 
 import type { NextRequest } from 'next/server';
 import { parseId } from '../../../infra/route/parse-id';
+import { parseNumericFields } from '../../../infra/route/parse-numeric';
 import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
 import { searchParamsToParams } from '../../../infra/route/search-params';
 import { projectUsersService } from '../services/project-users.service';
 import type { ListUsersParams } from '../types';
 
+const NUMERIC_FIELDS = ['page', 'limit'] as const;
+
 export function createListAvailableUsersHandler() {
   return async function GET(req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
     return safeRouteHandler(async () => {
       const { id } = await params;
       return projectUsersService.listNotInProject(
         parseId(id),
-        searchParamsToParams<ListUsersParams>(req.nextUrl.searchParams)
+        parseNumericFields<ListUsersParams>(
+          searchParamsToParams<ListUsersParams>(req.nextUrl.searchParams),
+          NUMERIC_FIELDS
+        )
       );
     });
   };

package/src/modules/projects/handlers/list-project-users.handler.ts

@@ -2,18 +2,24 @@ import 'server-only';
 
 import type { NextRequest } from 'next/server';
 import { parseId } from '../../../infra/route/parse-id';
+import { parseNumericFields } from '../../../infra/route/parse-numeric';
 import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
 import { searchParamsToParams } from '../../../infra/route/search-params';
 import { projectUsersService } from '../services/project-users.service';
 import type { ListUsersParams } from '../types';
 
+const NUMERIC_FIELDS = ['page', 'limit'] as const;
+
 export function createListProjectUsersHandler() {
   return async function GET(req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
     return safeRouteHandler(async () => {
       const { id } = await params;
       return projectUsersService.listInProject(
         parseId(id),
-        searchParamsToParams<ListUsersParams>(req.nextUrl.searchParams)
+        parseNumericFields<ListUsersParams>(
+          searchParamsToParams<ListUsersParams>(req.nextUrl.searchParams),
+          NUMERIC_FIELDS
+        )
       );
     });
   };

package/src/modules/projects/handlers/list-projects.handler.ts

@@ -1,16 +1,22 @@
 import 'server-only';
 
 import type { NextRequest } from 'next/server';
+import { parseNumericFields } from '../../../infra/route/parse-numeric';
 import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
 import { searchParamsToParams } from '../../../infra/route/search-params';
 import { projectsService } from '../services/projects.service';
 import type { ListProjectsActionParams } from '../actions/list-projects.action';
 
+const NUMERIC_FIELDS = ['page', 'limit', 'deleted'] as const;
+
 export function createListProjectsHandler() {
   return async function GET(req: NextRequest) {
     return safeRouteHandler(() =>
       projectsService.list(
-        searchParamsToParams<ListProjectsActionParams>(req.nextUrl.searchParams)
+        parseNumericFields<ListProjectsActionParams>(
+          searchParamsToParams<ListProjectsActionParams>(req.nextUrl.searchParams),
+          NUMERIC_FIELDS
+        )
       )
     );
   };

package/src/modules/users/hooks/messages.hook.ts

@@ -5,7 +5,7 @@ import { apiFetch } from '../../../infra/http/api-fetch';
 import { markMessageAsReadAction } from '../action/mark-message-as-read.action';
 import { markAllMessagesAsReadAction } from '../action/mark-all-messages-as-read.action';
 import { withAction } from '../../../utils/withAction';
-import type { FindMessagesParams, ListMessagesApiResponse } from '../schema/messages.schema';
+import type { FindMessagesParams, ListMessagesResult } from '../schema/messages.schema';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 export const MESSAGES_QUERY_KEY = ['messages'] as const;
@@ -18,7 +18,7 @@ export function useMessages(params?: Partial<FindMessagesParams>) {
   return useQuery({
     queryKey,
     queryFn: ({ signal }) =>
-      apiFetch<ListMessagesApiResponse>('/api/messages', { params, signal }),
+      apiFetch<ListMessagesResult>('/api/messages', { params, signal }),
   });
 }
 
@@ -28,7 +28,7 @@ export function useInfiniteMessages(params?: Partial<Omit<FindMessagesParams, 'p
   return useInfiniteQuery({
     queryKey,
     queryFn: ({ pageParam, signal }) =>
-      apiFetch<ListMessagesApiResponse>('/api/messages', {
+      apiFetch<ListMessagesResult>('/api/messages', {
         params: {
           ...params,
           page: pageParam as number,

package/src/modules/users/schema/messages.schema.ts

@@ -37,6 +37,8 @@ export interface ListMessagesApiResponse {
   message?: string;
 }
 
+export type ListMessagesResult = Omit<ListMessagesApiResponse, 'status' | 'message'>;
+
 export interface MarkAsReadApiResponse {
   status: 0 | 1;
   message?: string;

package/src/route.ts

@@ -1,3 +1,4 @@
 export { safeRouteHandler } from './infra/route/safe-route-handler';
 export { searchParamsToParams } from './infra/route/search-params';
 export { parseId } from './infra/route/parse-id';
+export { parseNumericFields } from './infra/route/parse-numeric';

package/src/server.ts

@@ -27,21 +27,14 @@ export { findUserById } from './modules/users/action/find-user-by-id.action';
 export { findCurrentAccount } from './modules/accounts/actions/find-current-account.action';
 export { getAccountTokenAction } from './modules/accounts/actions/get-account-token.action';
 export { listSubscriptionsAction } from './modules/subscriptions/actions/list-subscriptions.action';
-export { findPlanByIdAction } from './modules/plans/actions/find-plan-by-id.action';
-export { listPlansAction } from './modules/plans/actions/list-plans.action';
 export { calculateSubscriptionAction } from './modules/subscriptions/actions/calculate-subscription.action';
 export { updateSubscriptionPlanAction } from './modules/subscriptions/actions/update-subscription-plan.action';
 export { updateSubscriptionPaymentAction } from './modules/subscriptions/actions/update-subscription-payment.action';
-export { listCardsAction } from './modules/cards/actions/list-cards.action';
 export { createCardAction } from './modules/cards/actions/create-card.action';
 export { createSetupIntentAction } from './modules/cards/actions/create-setup-intent.action';
-export { listChargesAction } from './modules/charges/actions/list-charges.action';
-export { findChargeByIdAction } from './modules/charges/actions/find-charge-by-id.action';
 export { chargeActionAction } from './modules/charges/actions/charge-action.action';
 export { resolvePlanExtrasPrices } from './modules/subscriptions/utils/resolve-plan-extras-prices';
 export { hasSubscriptionExpired } from './modules/subscriptions/utils/has-subscription-expired';
-export { listIaCreditsAction } from './modules/ia-credits/actions/list-ia-credits.action';
-export { countPagesAction } from './modules/pages/actions/count-pages.action';
 
 // Project Services & Actions (server-only)
 export { projectsService } from './modules/projects/services/projects.service';
@@ -54,7 +47,6 @@ export { deleteProjectAction } from './modules/projects/actions/delete-project.a
 // Project Users Services & Actions (server-only)
 export { projectUsersService } from './modules/projects/services/project-users.service';
 export { listProjectUsersAction } from './modules/projects/actions/list-project-users.action';
-export { listAvailableUsersAction } from './modules/projects/actions/list-available-users.action';
 export { addProjectUserAction } from './modules/projects/actions/add-project-user.action';
 export { removeProjectUserAction } from './modules/projects/actions/remove-project-user.action';
 

package/src/modules/cards/actions/find-card-by-id.action.ts

@@ -1,8 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { cardsService } from '../services/cards.service';
-
-export async function findCardByIdAction(id: number) {
-  return safeServerAction(() => cardsService.findCardById(id));
-}

package/src/modules/cards/actions/list-cards.action.ts

@@ -1,8 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { cardsService } from '../services/cards.service';
-
-export async function listCardsAction() {
-  return safeServerAction(() => cardsService.listCards());
-}

package/src/modules/charges/actions/find-charge-by-id.action.ts

@@ -1,8 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { chargesService } from '../services/charges.service';
-
-export async function findChargeByIdAction(chargeId: string | number) {
-  return safeServerAction(() => chargesService.findChargeById(chargeId));
-}

package/src/modules/charges/actions/list-charges.action.ts

@@ -1,9 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import type { FindChargesParams } from '../types/charge.type';
-import { chargesService } from '../services/charges.service';
-
-export async function listChargesAction(params?: Partial<FindChargesParams>) {
-  return safeServerAction(() => chargesService.listCharges(params));
-}

package/src/modules/ia-credits/actions/list-ia-credits.action.ts

@@ -1,8 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { iaCreditsService } from '../services/ia-credits.service';
-
-export async function listIaCreditsAction(subscriptionId: number | string) {
-  return safeServerAction(() => iaCreditsService.listOperations(subscriptionId));
-}

package/src/modules/pages/actions/count-pages.action.ts

@@ -1,10 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { pagesService } from '../services/pages.service';
-
-export async function countPagesAction() {
-  return safeServerAction(async () => ({
-    total: await pagesService.countPages(),
-  }));
-}

package/src/modules/plans/actions/find-plan-by-id.action.ts

@@ -1,8 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { plansService } from '../services/plans.service';
-
-export async function findPlanByIdAction(idPlan: number | string) {
-  return safeServerAction(() => plansService.findById(idPlan));
-}

package/src/modules/plans/actions/list-plans.action.ts

@@ -1,17 +0,0 @@
-'use server';
-
-import { plansService, safeServerAction } from '@greatapps/common/server';
-
-export async function listPlansAction() {
-  return safeServerAction(async () => {
-    const { data: apiPlans } = await plansService.listPlans({
-      active: true,
-      search: 'client',
-      sort: 'id:ASC',
-    });
-
-    if (!apiPlans?.length) return [];
-
-    return [...apiPlans].sort((a, b) => a.value - b.value);
-  });
-}

package/src/modules/projects/actions/list-all-account-users.action.ts

@@ -1,9 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { projectUsersService } from '../services/project-users.service';
-import type { ListUsersParams } from '../types';
-
-export async function listAllAccountUsersAction(params: ListUsersParams = {}) {
-  return safeServerAction(() => projectUsersService.listAllAccountUsers(params));
-}

package/src/modules/projects/actions/list-available-users.action.ts

@@ -1,9 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { projectUsersService } from '../services/project-users.service';
-import type { ListUsersParams } from '../types';
-
-export async function listAvailableUsersAction(projectId: number, params: ListUsersParams = {}) {
-  return safeServerAction(() => projectUsersService.listNotInProject(projectId, params));
-}

package/src/modules/users/action/list-messages.action.ts

@@ -1,26 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { messagesService } from '../services/messages.service';
-import type { FindMessagesParams } from '../schema/messages.schema';
-import { findWhitelabel } from '../../whitelabel/actions/find-whitelabel.action';
-
-export async function listMessagesAction(params?: Partial<FindMessagesParams>) {
-  return safeServerAction(async () => {
-    const [result, whitelabel] = await Promise.all([
-      messagesService.listMessages(params),
-      findWhitelabel(),
-    ]);
-
-    const urlMap: Record<string, string> = {
-      pages_url: whitelabel?.pages_url ?? '',
-      accounts_url: whitelabel?.accounts_url ?? '',
-      editor_url: whitelabel?.editor_url ?? '',
-    };
-
-    return { data: result.data.map((message) => ({
-      ...message,
-      url: message.url.replace(/\{(pages_url|accounts_url|editor_url)\}/g, (_, key) => urlMap[key] ?? ''),
-    })), total: result.total, totalUnread: result.totalUnread };
-  });
-}