@carlonicora/nextjs-jsonapi 1.4.0 → 1.6.0

package/src/features/company/components/forms/CompanyLicense.tsx

@@ -25,9 +25,11 @@ import {
   Label,
   Link,
 } from "../../../../shadcnui";
-import { UserInterface, UserService } from "../../../user";
+import { UserInterface } from "../../../user";
+import { UserService } from "../../../user/data/user.service";
 import { useCurrentUserContext } from "../../../user/contexts";
-import { CompanyInput, CompanyService } from "../../data";
+import { CompanyInput } from "../../data";
+import { CompanyService } from "../../data/company.service";
 
 type TokenPayload = {
   userId: string;

package/src/features/company/components/lists/CompaniesList.tsx

@@ -5,7 +5,8 @@ import { ReactNode } from "react";
 import { ContentListTable } from "../../../../components";
 import { Modules } from "../../../../core";
 import { DataListRetriever, useDataListRetriever } from "../../../../hooks";
-import { CompanyFields, CompanyInterface, CompanyService } from "../../data";
+import { CompanyFields, CompanyInterface } from "../../data";
+import { CompanyService } from "../../data/company.service";
 import { CompanyEditor } from "../forms/CompanyEditor";
 
 export function CompaniesList() {

package/src/features/company/data/index.ts

@@ -1,4 +1,3 @@
 export * from "./company";
 export * from "./company.fields";
 export * from "./company.interface";
-export * from "./company.service";

package/src/features/content/components/lists/ContentsListById.tsx

@@ -4,7 +4,8 @@ import { useTranslations } from "next-intl";
 import { ContentListTable } from "../../../../components";
 import { Modules } from "../../../../core";
 import { DataListRetriever, useDataListRetriever } from "../../../../hooks";
-import { ContentFields, ContentInterface, ContentService } from "../../data";
+import { ContentFields, ContentInterface } from "../../data";
+import { ContentService } from "../../data/content.service";
 
 type ContentsListByIdProps = {
   contentIds: string[];

package/src/features/content/components/lists/RelevantContentsList.tsx

@@ -4,7 +4,8 @@ import { useTranslations } from "next-intl";
 import { ContentListTable } from "../../../../components";
 import { Modules } from "../../../../core";
 import { DataListRetriever, useDataListRetriever } from "../../../../hooks";
-import { ContentFields, ContentInterface, ContentService } from "../../data";
+import { ContentFields, ContentInterface } from "../../data";
+import { ContentService } from "../../data/content.service";
 
 type RelevantContentsListProps = {
   id: string;

package/src/features/content/data/index.ts

@@ -1,4 +1,3 @@
 export * from "./content";
 export * from "./content.fields";
 export * from "./content.interface";
-export * from "./content.service";

package/src/features/feature/data/index.ts

@@ -1,3 +1,2 @@
 export * from "./feature";
 export * from "./feature.interface";
-export * from "./feature.service";

package/src/features/notification/components/lists/NotificationsList.tsx

@@ -15,7 +15,8 @@ import {
   TooltipTrigger,
 } from "../../../../shadcnui";
 import { UserAvatar } from "../../../user/components";
-import { NotificationInterface, NotificationService } from "../../data";
+import { NotificationInterface } from "../../data";
+import { NotificationService } from "../../data/notification.service";
 import { generateNotificationData } from "../notifications/Notification";
 
 type NotificationsListProps = {

package/src/features/notification/contexts/NotificationContext.tsx

@@ -7,7 +7,8 @@ import { Modules } from "../../../core";
 import { useI18nRouter } from "../../../i18n";
 import { BreadcrumbItemData } from "../../../interfaces";
 import { NotificationMenuItem, NotificationToast } from "../components/notifications/Notification";
-import { NotificationInterface, NotificationService } from "../data";
+import { NotificationInterface } from "../data";
+import { NotificationService } from "../data/notification.service";
 
 interface NotificationContextType {
   notifications: NotificationInterface[];

package/src/features/notification/data/index.ts

@@ -1,4 +1,3 @@
 export * from "./notification";
 export * from "./notification.fields";
 export * from "./notification.interface";
-export * from "./notification.service";

package/src/features/push/data/index.ts

@@ -1,3 +1,2 @@
 export * from "./push";
 export * from "./push.interface";
-export * from "./push.service";

package/src/features/role/components/forms/RemoveUserFromRole.tsx

@@ -13,8 +13,10 @@ import {
   DialogTitle,
   DialogTrigger,
 } from "../../../../shadcnui";
-import { UserInterface, UserService } from "../../../user";
-import { RoleInterface, RoleService } from "../../data";
+import { UserInterface } from "../../../user";
+import { UserService } from "../../../user/data/user.service";
+import { RoleInterface } from "../../data";
+import { RoleService } from "../../data/role.service";
 
 type RemoveUserFromRoleProps = {
   user: UserInterface;

package/src/features/role/components/forms/UserRoleAdd.tsx

@@ -17,7 +17,8 @@ import {
   DialogTitle,
 } from "../../../../shadcnui";
 import { UserInterface } from "../../../user";
-import { RoleInterface, RoleService } from "../../data";
+import { RoleInterface } from "../../data";
+import { RoleService } from "../../data/role.service";
 
 type UserRoleAddProps = {
   user: UserInterface;

package/src/features/role/components/lists/RolesList.tsx

@@ -4,7 +4,8 @@ import { useTranslations } from "next-intl";
 import { ContentListTable } from "../../../../components";
 import { Modules } from "../../../../core";
 import { DataListRetriever, useDataListRetriever } from "../../../../hooks";
-import { RoleFields, RoleInterface, RoleService } from "../../data";
+import { RoleFields, RoleInterface } from "../../data";
+import { RoleService } from "../../data/role.service";
 import "../../hooks/useRoleTableStructure";
 
 export function RolesList() {

package/src/features/role/components/lists/UserRolesList.tsx

@@ -5,7 +5,8 @@ import { ContentListTable } from "../../../../components";
 import { Modules } from "../../../../core";
 import { DataListRetriever, useDataListRetriever } from "../../../../hooks";
 import { UserInterface } from "../../../user";
-import { RoleFields, RoleInterface, RoleService } from "../../data";
+import { RoleFields, RoleInterface } from "../../data";
+import { RoleService } from "../../data/role.service";
 
 type UserRolesListProps = {
   user: UserInterface;

package/src/features/role/data/index.ts

@@ -1,4 +1,3 @@
 export * from "./role";
 export * from "./role.fields";
 export * from "./role.interface";
-export * from "./role.service";

package/src/features/s3/data/index.ts

@@ -1,3 +1,2 @@
 export * from "./s3";
 export * from "./s3.interface";
-export * from "./s3.service";

package/src/features/user/components/forms/RoleUserAdd.tsx

@@ -10,9 +10,11 @@ import {
 } from "../../../../components";
 import { Modules } from "../../../../core";
 import { DataListRetriever, useDataListRetriever } from "../../../../hooks";
-import { RoleInterface, RoleService } from "../../../role";
+import { RoleInterface } from "../../../role";
+import { RoleService } from "../../../role/data/role.service";
 import { useCurrentUserContext } from "../../contexts";
-import { UserInterface, UserService } from "../../data";
+import { UserInterface } from "../../data";
+import { UserService } from "../../data/user.service";
 
 type AddUserToRoleProps = {
   role: RoleInterface;

package/src/features/user/components/forms/UserDeleter.tsx

@@ -7,7 +7,8 @@ import { useI18nRouter, usePageUrlGenerator } from "../../../../hooks";
 import { Action } from "../../../../permissions";
 import { getRoleId } from "../../../../roles";
 import { useCurrentUserContext } from "../../contexts";
-import { UserInterface, UserService } from "../../data";
+import { UserInterface } from "../../data";
+import { UserService } from "../../data/user.service";
 
 type UserDeleterProps = {
   user: UserInterface;

package/src/features/user/components/forms/UserEditor.tsx

@@ -24,10 +24,13 @@ import { Action } from "../../../../permissions";
 import { getRoleId } from "../../../../roles";
 import { Dialog, DialogContent, DialogTrigger, Form } from "../../../../shadcnui";
 import { CompanyInterface } from "../../../company";
-import { RoleInterface, RoleService } from "../../../role";
-import { S3Interface, S3Service } from "../../../s3";
+import { RoleInterface } from "../../../role";
+import { S3Interface } from "../../../s3";
+import { RoleService } from "../../../role/data/role.service";
+import { S3Service } from "../../../s3/data/s3.service";
 import { useCurrentUserContext } from "../../contexts";
-import { UserInput, UserInterface, UserService } from "../../data";
+import { UserInput, UserInterface } from "../../data";
+import { UserService } from "../../data/user.service";
 import { UserAvatarEditor } from "./UserAvatarEditor";
 import { UserDeleter } from "./UserDeleter";
 

package/src/features/user/components/forms/UserMultiSelect.tsx

@@ -16,7 +16,8 @@ import {
   MultiSelect,
 } from "../../../../shadcnui";
 import { useCurrentUserContext } from "../../contexts";
-import { UserInterface, UserService } from "../../data";
+import { UserInterface } from "../../data";
+import { UserService } from "../../data/user.service";
 
 // Type for user objects in the form
 type UserSelectType = {

package/src/features/user/components/forms/UserReactivator.tsx

@@ -16,7 +16,8 @@ import {
   DialogTrigger,
 } from "../../../../shadcnui";
 import { useCurrentUserContext } from "../../contexts";
-import { UserInterface, UserService } from "../../data";
+import { UserInterface } from "../../data";
+import { UserService } from "../../data/user.service";
 
 type UserReactivatorProps = {
   user: UserInterface;

package/src/features/user/components/forms/UserResentInvitationEmail.tsx

@@ -20,7 +20,8 @@ import {
   TooltipTrigger,
 } from "../../../../shadcnui";
 import { useCurrentUserContext } from "../../contexts";
-import { UserInterface, UserService } from "../../data";
+import { UserInterface } from "../../data";
+import { UserService } from "../../data/user.service";
 
 type UserResentInvitationEmailProps = {
   user: UserInterface;

package/src/features/user/components/forms/UserSelector.tsx

@@ -22,7 +22,8 @@ import {
   PopoverContent,
   PopoverTrigger,
 } from "../../../../shadcnui";
-import { UserInterface, UserService } from "../../data";
+import { UserInterface } from "../../data";
+import { UserService } from "../../data/user.service";
 import { UserAvatar } from "../widgets";
 
 type UserSelectorProps = {

package/src/features/user/components/lists/AdminUsersList.tsx

@@ -6,7 +6,8 @@ import { useCompanyContext } from "../../../../contexts";
 import { Modules } from "../../../../core";
 import { DataListRetriever, useDataListRetriever } from "../../../../hooks";
 import { CompanyInterface } from "../../../company";
-import { UserFields, UserInterface, UserService } from "../../data";
+import { UserFields, UserInterface } from "../../data";
+import { UserService } from "../../data/user.service";
 import { UserEditor } from "../forms";
 
 type AdminUsersListProps = {

package/src/features/user/components/lists/CompanyUsersList.tsx

@@ -6,7 +6,8 @@ import { ContentListTable } from "../../../../components";
 import { Modules } from "../../../../core";
 import { DataListRetriever, useDataListRetriever } from "../../../../hooks";
 import { useCurrentUserContext } from "../../contexts";
-import { UserFields, UserInterface, UserService } from "../../data";
+import { UserFields, UserInterface } from "../../data";
+import { UserService } from "../../data/user.service";
 import { UserEditor } from "../forms";
 
 type CompanyUsersListProps = {

package/src/features/user/components/lists/RelevantUsersList.tsx

@@ -4,7 +4,8 @@ import { useTranslations } from "next-intl";
 import { ContentListTable } from "../../../../components";
 import { Modules } from "../../../../core";
 import { DataListRetriever, useDataListRetriever } from "../../../../hooks";
-import { UserFields, UserInterface, UserService } from "../../data";
+import { UserFields, UserInterface } from "../../data";
+import { UserService } from "../../data/user.service";
 
 type RelevantUsersListProps = {
   id: string;

package/src/features/user/components/lists/RoleUsersList.tsx

@@ -5,7 +5,8 @@ import { ContentListTable } from "../../../../components";
 import { Modules } from "../../../../core";
 import { DataListRetriever, useDataListRetriever } from "../../../../hooks";
 import { RoleInterface } from "../../../role";
-import { UserFields, UserInterface, UserService } from "../../data";
+import { UserFields, UserInterface } from "../../data";
+import { UserService } from "../../data/user.service";
 
 type RoleUsersListProps = {
   role: RoleInterface;

package/src/features/user/components/lists/UsersListByContentIds.tsx

@@ -4,7 +4,8 @@ import { useTranslations } from "next-intl";
 import { ContentListTable } from "../../../../components";
 import { Modules } from "../../../../core";
 import { DataListRetriever, useDataListRetriever } from "../../../../hooks";
-import { UserFields, UserInterface, UserService } from "../../data";
+import { UserFields, UserInterface } from "../../data";
+import { UserService } from "../../data/user.service";
 
 type UsersListByContentIdsProps = {
   contentIds: string[];

package/src/features/user/data/index.ts

@@ -1,4 +1,3 @@
 export * from "./user";
 export * from "./user.fields";
 export * from "./user.interface";
-export * from "./user.service";

package/src/features/user/hooks/useUserSearch.ts

@@ -2,7 +2,8 @@
 
 import { useCallback, useEffect, useRef, useState } from "react";
 import { useDebounce } from "../../../hooks/useDebounce";
-import { UserInterface, UserService } from "../data";
+import { UserInterface } from "../data";
+import { UserService } from "../data/user.service";
 
 export const useUserSearch = () => {
   const [users, setUsers] = useState<UserInterface[]>([]);

package/src/features/user/index.ts

@@ -1,3 +1,4 @@
 export * from "./author.module";
+export * from "./components/forms";
 export * from "./data";
 export * from "./user.module";

package/src/hooks/useDataListRetriever.ts

@@ -1,7 +1,7 @@
 "use client";
 
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { AbstractService } from "../core";
+import { ClientAbstractService } from "../core/abstracts/ClientAbstractService";
 
 export type PageInfo = {
   startItem: number;
@@ -47,7 +47,7 @@ export function useDataListRetriever<T>(params: {
   const isFetchingRef = useRef(false);
 
   const resolvedType = params.module;
-  const resolvedService = AbstractService; // We'll just use AbstractService directly for pagination
+  const resolvedService = ClientAbstractService; // We'll just use ClientAbstractService directly for pagination
 
   // Helper to parse page params from pagination URLs
   const parsePageParams = useCallback((url: string | undefined): { offset: number; size: number } | null => {
@@ -152,7 +152,7 @@ export function useDataListRetriever<T>(params: {
         const selfRef = { self: undefined };
 
         if (nextPage && fetchParams?.callNext && fetchParams?.isRefine !== true) {
-          const ServiceClass = stableParams.service as typeof AbstractService;
+          const ServiceClass = stableParams.service as typeof ClientAbstractService;
 
           response = await ServiceClass.next<T[]>({
             type: stableParams.type,
@@ -162,7 +162,7 @@ export function useDataListRetriever<T>(params: {
             self: selfRef,
           });
         } else if (previousPage && fetchParams?.callPrevious && fetchParams?.isRefine !== true) {
-          const ServiceClass = stableParams.service as typeof AbstractService;
+          const ServiceClass = stableParams.service as typeof ClientAbstractService;
 
           response = await ServiceClass.previous<T[]>({
             type: stableParams.type,

package/src/hooks/usePageTracker.ts

@@ -4,7 +4,7 @@ import { useAtom } from "jotai";
 import { usePathname } from "next/navigation";
 import { useEffect } from "react";
 import { RecentPage, recentPagesAtom } from "../atoms";
-import { getTrackablePages } from "../unified/JsonApiRequest";
+import { getTrackablePages } from "../client/config";
 
 // Routes to exclude from tracking
 const EXCLUDED_ROUTES = ["/", "/login", "/register", "/forgot-password", "/reset-password", "/activate"];

package/src/hooks/usePushNotifications.ts

@@ -2,9 +2,10 @@
 
 import { useEffect } from "react";
 import { useCurrentUserContext } from "../contexts";
-import { PushService, UserInterface } from "../features";
+import { UserInterface } from "../features/user/data";
+import { PushService } from "../features/push/data/push.service";
 import { getRoleId } from "../roles";
-import { getAppUrl } from "../unified/JsonApiRequest";
+import { getAppUrl } from "../client/config";
 
 function urlBase64ToUint8Array(base64String: string): Uint8Array {
   const padding = "=".repeat((4 - (base64String.length % 4)) % 4);

package/src/hooks/useSocket.ts

@@ -3,7 +3,7 @@
 import { useEffect, useRef, useState } from "react";
 import io from "socket.io-client";
 import { Modules, rehydrate } from "../core";
-import { NotificationInterface } from "../features";
+import { NotificationInterface } from "../features/notification/data";
 
 type Socket = ReturnType<typeof io>;
 

package/src/index.ts

@@ -1,5 +1,6 @@
-// Unified API (auto-detects environment)
-export * from "./unified";
+// NOTE: "./unified" is NOT exported here because it contains dynamic imports
+// of server code which cannot be bundled with client components.
+// Services use unified internally via relative imports.
 
 // Core exports for convenience
 export * from "./core";
@@ -7,11 +8,15 @@ export * from "./core";
 // Permissions
 export * from "./permissions";
 
+// JSON:API configuration (client-safe)
+export { configureJsonApi, getApiUrl, getAppUrl, getTrackablePages } from "./client/config";
+
 // I18n configuration (NOT hooks - those are in /hooks with "use client")
 export { configureI18n } from "./i18n";
 export type { I18nConfig } from "./i18n";
 
 // Roles configuration
+export { configureDiscord } from "./discord";
 export { configureRoles, getRoleId, isRolesConfigured } from "./roles";
 export type { RoleIdConfig } from "./roles";
 

package/src/roles/config.ts

@@ -10,8 +10,6 @@ export interface RoleIdConfig {
 
 // Private storage for the injected role IDs
 let _roleId: RoleIdConfig | null = null;
-let _useDiscord: boolean = false;
-let _useInternalAuth: boolean = true;
 
 /**
  * Configure role IDs for the library
@@ -29,11 +27,6 @@ export function configureRoles(roleId: RoleIdConfig): void {
   _roleId = roleId;
 }
 
-export function configureDiscord(params: { useDiscord: boolean; useInternalAuth: boolean }): void {
-  _useDiscord = params.useDiscord;
-  _useInternalAuth = params.useInternalAuth;
-}
-
 /**
  * Get configured role IDs
  * @throws Error if roles not configured
@@ -51,11 +44,3 @@ export function getRoleId(): RoleIdConfig {
 export function isRolesConfigured(): boolean {
   return _roleId !== null;
 }
-
-export function isDiscordConfigured(): boolean {
-  return _useDiscord;
-}
-
-export function isInternalAuthConfigured(): boolean {
-  return _useInternalAuth;
-}

package/src/roles/index.ts

@@ -1,9 +1 @@
-export {
-  configureDiscord,
-  configureRoles,
-  getRoleId,
-  isDiscordConfigured,
-  isInternalAuthConfigured,
-  isRolesConfigured,
-  type RoleIdConfig,
-} from "./config";
+export { configureRoles, getRoleId, isRolesConfigured, type RoleIdConfig } from "./config";