@carlonicora/nextjs-jsonapi 1.141.3 → 1.142.0

package/dist/server/index.js

@@ -15,7 +15,7 @@ var _chunkIOLU4ASDjs = require('../chunk-IOLU4ASD.js');
 
 
 
-var _chunkAGKZCRG2js = require('../chunk-AGKZCRG2.js');
+var _chunk5SFFHIEEjs = require('../chunk-5SFFHIEE.js');
 require('../chunk-LXKSUWAV.js');
 require('../chunk-IBS6NI7D.js');
 
@@ -86,7 +86,7 @@ var ServerSession = class {
     if (!rawModules) return false;
     const modules = JSON.parse(_pako.ungzip.call(void 0, Buffer.from(rawModules, "base64"), { toText: true }));
     const selectedModule = modules.find((module) => module.id === params.module.moduleId);
-    return _chunkAGKZCRG2js.checkPermissionsFromServer.call(void 0, {
+    return _chunk5SFFHIEEjs.checkPermissionsFromServer.call(void 0, {
       module: params.module,
       action: params.action,
       data: params.data,
@@ -296,5 +296,5 @@ _chunk7QVYU63Ejs.__name.call(void 0, ServerJsonApiDelete, "ServerJsonApiDelete")
 
 
 
-exports.ServerAuthService = _chunkAGKZCRG2js.AuthService; exports.ServerCompanyService = _chunkAGKZCRG2js.CompanyService; exports.ServerContentService = _chunkAGKZCRG2js.ContentService; exports.ServerFeatureService = _chunkAGKZCRG2js.FeatureService; exports.ServerJsonApiDelete = ServerJsonApiDelete; exports.ServerJsonApiGet = ServerJsonApiGet; exports.ServerJsonApiPatch = ServerJsonApiPatch; exports.ServerJsonApiPost = ServerJsonApiPost; exports.ServerJsonApiPut = ServerJsonApiPut; exports.ServerNotificationService = _chunkAGKZCRG2js.NotificationService; exports.ServerPushService = _chunkAGKZCRG2js.PushService; exports.ServerRoleService = _chunkAGKZCRG2js.RoleService; exports.ServerS3Service = _chunkAGKZCRG2js.S3Service; exports.ServerSession = ServerSession; exports.ServerUserService = _chunkAGKZCRG2js.UserService; exports.configureServerJsonApi = configureServerJsonApi; exports.getServerApiUrl = getServerApiUrl; exports.getServerAppUrl = getServerAppUrl; exports.getServerToken = _chunkYUO55Q5Ajs.getServerToken; exports.getServerTrackablePages = getServerTrackablePages; exports.invalidateCacheTag = invalidateCacheTag; exports.invalidateCacheTags = invalidateCacheTags; exports.serverRequest = _chunkIOLU4ASDjs.serverRequest;
+exports.ServerAuthService = _chunk5SFFHIEEjs.AuthService; exports.ServerCompanyService = _chunk5SFFHIEEjs.CompanyService; exports.ServerContentService = _chunk5SFFHIEEjs.ContentService; exports.ServerFeatureService = _chunk5SFFHIEEjs.FeatureService; exports.ServerJsonApiDelete = ServerJsonApiDelete; exports.ServerJsonApiGet = ServerJsonApiGet; exports.ServerJsonApiPatch = ServerJsonApiPatch; exports.ServerJsonApiPost = ServerJsonApiPost; exports.ServerJsonApiPut = ServerJsonApiPut; exports.ServerNotificationService = _chunk5SFFHIEEjs.NotificationService; exports.ServerPushService = _chunk5SFFHIEEjs.PushService; exports.ServerRoleService = _chunk5SFFHIEEjs.RoleService; exports.ServerS3Service = _chunk5SFFHIEEjs.S3Service; exports.ServerSession = ServerSession; exports.ServerUserService = _chunk5SFFHIEEjs.UserService; exports.configureServerJsonApi = configureServerJsonApi; exports.getServerApiUrl = getServerApiUrl; exports.getServerAppUrl = getServerAppUrl; exports.getServerToken = _chunkYUO55Q5Ajs.getServerToken; exports.getServerTrackablePages = getServerTrackablePages; exports.invalidateCacheTag = invalidateCacheTag; exports.invalidateCacheTags = invalidateCacheTags; exports.serverRequest = _chunkIOLU4ASDjs.serverRequest;
 //# sourceMappingURL=index.js.map

package/dist/server/index.mjs

@@ -15,7 +15,7 @@ import {
   S3Service,
   UserService,
   checkPermissionsFromServer
-} from "../chunk-5GVY2M5X.mjs";
+} from "../chunk-KZHHKPQZ.mjs";
 import "../chunk-AUXK7QSA.mjs";
 import "../chunk-C7C7VY4F.mjs";
 import {

package/dist/{useSocket-BsbaGPqE.d.ts → useSocket-DgGAQW6h.d.ts}

@@ -1,4 +1,4 @@
-import { N as NotificationInterface } from './notification.interface-LKFmZndR.js';
+import { N as NotificationInterface } from './notification.interface--27exGde.js';
 
 interface UseSocketOptions {
     token: string;

package/dist/{useSocket-BSjn1Rlb.d.mts → useSocket-M3YY0aTS.d.mts}

@@ -1,4 +1,4 @@
-import { N as NotificationInterface } from './notification.interface-B3kNUTZs.mjs';
+import { N as NotificationInterface } from './notification.interface-CG1vqoxg.mjs';
 
 interface UseSocketOptions {
     token: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carlonicora/nextjs-jsonapi",
-  "version": "1.141.3",
+  "version": "1.142.0",
   "description": "Next.js JSON:API client with server/client support and caching",
   "author": "Carlo Nicora",
   "license": "GPL-3.0-or-later",

package/src/features/company/components/details/TokenStatusIndicator.tsx

@@ -31,12 +31,12 @@ export function TokenStatusIndicator({ className, size = "md", showExtraPages =
   // Don't render if no company data
   if (!company) return null;
 
-  const monthlyTokens = company.monthlyTokens;
-  const availableMonthlyTokens = company.availableMonthlyTokens;
-  const availableExtraTokens = company.availableExtraTokens;
+  const monthlyCredits = company.monthlyCredits;
+  const availableMonthlyCredits = company.availableMonthlyCredits;
+  const availableExtraCredits = company.availableExtraCredits;
 
   // Calculate percentage of available monthly pages
-  const percentage = monthlyTokens > 0 ? (availableMonthlyTokens / monthlyTokens) * 100 : 0;
+  const percentage = monthlyCredits > 0 ? (availableMonthlyCredits / monthlyCredits) * 100 : 0;
 
   const sizeClasses = {
     sm: "h-4 w-4",
@@ -91,7 +91,7 @@ export function TokenStatusIndicator({ className, size = "md", showExtraPages =
             {t("billing.tokens.monthly", { defaultValue: "Monthly Pages" })}:
           </span>
           <span className={cn("font-medium", getStatusColor())}>
-            {availableMonthlyTokens} / {monthlyTokens}
+            {availableMonthlyCredits} / {monthlyCredits}
           </span>
         </div>
         <div className="flex items-center justify-between gap-4">
@@ -108,7 +108,7 @@ export function TokenStatusIndicator({ className, size = "md", showExtraPages =
           <span className="text-muted-foreground">
             {t("billing.tokens.available_extra", { defaultValue: "Extra Pages" })}:
           </span>
-          <span className="font-medium text-blue-500">{availableExtraTokens}</span>
+          <span className="font-medium text-blue-500">{availableExtraCredits}</span>
         </div>
         <Link href="/settings/billing?action=subscribe" className="w-full flex justify-end my-4">
           <Button variant="outline" size="sm">
@@ -127,11 +127,11 @@ export function TokenStatusIndicator({ className, size = "md", showExtraPages =
           aria-label={t("billing.tokens.status", { defaultValue: "Page Status" })}
         >
           {getBatteryIcon()}
-          <span className={cn(textSize, "text-muted-foreground font-medium")}>{availableMonthlyTokens}</span>
-          {showExtraPages && availableExtraTokens > 0 && (
+          <span className={cn(textSize, "text-muted-foreground font-medium")}>{availableMonthlyCredits}</span>
+          {showExtraPages && availableExtraCredits > 0 && (
             <div className="inline-flex items-center gap-0.5">
               <PlusCircle className={cn(smallIconSize, "text-blue-500")} />
-              <span className={cn(textSize, "text-blue-500 font-medium")}>{availableExtraTokens}</span>
+              <span className={cn(textSize, "text-blue-500 font-medium")}>{availableExtraCredits}</span>
             </div>
           )}
         </div>

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

@@ -8,9 +8,9 @@ export type CompanyInput = {
   logo?: string;
   configurations?: any;
 
-  monthlyTokens?: number;
-  availableMonthlyTokens?: number;
-  availableExtraTokens?: number;
+  monthlyCredits?: number;
+  availableMonthlyCredits?: number;
+  availableExtraCredits?: number;
 
   featureIds?: string[];
   moduleIds?: string[];
@@ -34,9 +34,9 @@ export interface CompanyInterface extends ApiDataInterface {
 
   get isActiveSubscription(): boolean;
 
-  get monthlyTokens(): number;
-  get availableMonthlyTokens(): number;
-  get availableExtraTokens(): number;
+  get monthlyCredits(): number;
+  get availableMonthlyCredits(): number;
+  get availableExtraCredits(): number;
 
   get features(): FeatureInterface[];
   get modules(): ModuleInterface[];

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

@@ -11,9 +11,9 @@ export class Company extends AbstractApiData implements CompanyInterface {
 
   private _isActiveSubscription: boolean = false;
 
-  private _monthlyTokens: number = 0;
-  private _availableMonthlyTokens: number = 0;
-  private _availableExtraTokens: number = 0;
+  private _monthlyCredits: number = 0;
+  private _availableMonthlyCredits: number = 0;
+  private _availableExtraCredits: number = 0;
 
   private _features?: FeatureInterface[];
   private _modules?: ModuleInterface[];
@@ -46,16 +46,16 @@ export class Company extends AbstractApiData implements CompanyInterface {
     return this._isActiveSubscription ?? false;
   }
 
-  get monthlyTokens(): number {
-    return this._monthlyTokens ?? 0;
+  get monthlyCredits(): number {
+    return this._monthlyCredits ?? 0;
   }
 
-  get availableMonthlyTokens(): number {
-    return this._availableMonthlyTokens ?? 0;
+  get availableMonthlyCredits(): number {
+    return this._availableMonthlyCredits ?? 0;
   }
 
-  get availableExtraTokens(): number {
-    return this._availableExtraTokens ?? 0;
+  get availableExtraCredits(): number {
+    return this._availableExtraCredits ?? 0;
   }
 
   get features(): FeatureInterface[] {
@@ -120,9 +120,9 @@ export class Company extends AbstractApiData implements CompanyInterface {
     this._logo = data.jsonApi.attributes.logo;
     this._logoUrl = data.jsonApi.attributes.logoUrl;
     this._isActiveSubscription = data.jsonApi.attributes.isActiveSubscription ?? false;
-    this._monthlyTokens = data.jsonApi.attributes.monthlyTokens ?? 0;
-    this._availableMonthlyTokens = data.jsonApi.attributes.availableMonthlyTokens ?? 0;
-    this._availableExtraTokens = data.jsonApi.attributes.availableExtraTokens ?? 0;
+    this._monthlyCredits = data.jsonApi.attributes.monthlyCredits ?? 0;
+    this._availableMonthlyCredits = data.jsonApi.attributes.availableMonthlyCredits ?? 0;
+    this._availableExtraCredits = data.jsonApi.attributes.availableExtraCredits ?? 0;
 
     this._legal_address = data.jsonApi.attributes.legal_address;
     this._street_number = data.jsonApi.attributes.street_number;
@@ -156,11 +156,11 @@ export class Company extends AbstractApiData implements CompanyInterface {
     if (data.name) response.data.attributes.name = data.name;
     if (data.configurations) response.data.attributes.configurations = JSON.stringify(data.configurations);
     if (data.logo) response.data.attributes.logo = data.logo;
-    if (data.monthlyTokens !== undefined) response.data.attributes.monthlyTokens = data.monthlyTokens;
-    if (data.availableMonthlyTokens !== undefined)
-      response.data.attributes.availableMonthlyTokens = data.availableMonthlyTokens;
-    if (data.availableExtraTokens !== undefined)
-      response.data.attributes.availableExtraTokens = data.availableExtraTokens;
+    if (data.monthlyCredits !== undefined) response.data.attributes.monthlyCredits = data.monthlyCredits;
+    if (data.availableMonthlyCredits !== undefined)
+      response.data.attributes.availableMonthlyCredits = data.availableMonthlyCredits;
+    if (data.availableExtraCredits !== undefined)
+      response.data.attributes.availableExtraCredits = data.availableExtraCredits;
 
     if (data.legal_address !== undefined) response.data.attributes.legal_address = data.legal_address;
     if (data.street_number !== undefined) response.data.attributes.street_number = data.street_number;

package/src/features/user/contexts/CurrentUserContext.tsx

@@ -71,26 +71,26 @@ export const CurrentUserProvider = ({ children }: { children: React.ReactNode })
     [dehydratedUser],
   );
 
-  // Balances pushed by company:tokens_updated. Transient: a real user refresh is
+  // Balances pushed by company:credits_updated. Transient: a real user refresh is
   // authoritative and clears this.
-  const [tokenOverride, setTokenOverride] = useState<{
-    availableMonthlyTokens: number;
-    availableExtraTokens: number;
+  const [creditOverride, setCreditOverride] = useState<{
+    availableMonthlyCredits: number;
+    availableExtraCredits: number;
   } | null>(null);
 
   const company = useMemo<CompanyInterface | null>(() => {
     const c = currentUser?.company ?? null;
-    if (!c || !tokenOverride) return c;
+    if (!c || !creditOverride) return c;
     return Object.assign(Object.create(Object.getPrototypeOf(c)), c, {
-      _availableMonthlyTokens: tokenOverride.availableMonthlyTokens,
-      _availableExtraTokens: tokenOverride.availableExtraTokens,
+      _availableMonthlyCredits: creditOverride.availableMonthlyCredits,
+      _availableExtraCredits: creditOverride.availableExtraCredits,
     });
-  }, [currentUser, tokenOverride]);
+  }, [currentUser, creditOverride]);
 
   const setUser = (user?: UserInterface): void => {
     if (user) setDehydratedUser(user.dehydrate() as any);
     else setDehydratedUser(null);
-    setTokenOverride(null);
+    setCreditOverride(null);
   };
 
   const hasRole = (roleId: string): boolean => {
@@ -177,7 +177,7 @@ export const CurrentUserProvider = ({ children }: { children: React.ReactNode })
           }
 
           setDehydratedUser(fullUser.dehydrate() as any);
-          setTokenOverride(null);
+          setCreditOverride(null);
         }
       } catch (error) {
         console.error("Failed to refresh user data:", error);
@@ -206,15 +206,15 @@ export const CurrentUserProvider = ({ children }: { children: React.ReactNode })
 
     // Hot path: fires once per LLM call. Fully described by its payload — must
     // never trigger an HTTP request.
-    const handleTokensUpdated = (data: {
+    const handleCreditsUpdated = (data: {
       companyId: string;
-      availableMonthlyTokens: number;
-      availableExtraTokens: number;
+      availableMonthlyCredits: number;
+      availableExtraCredits: number;
     }) => {
       if (data.companyId !== currentUser.company?.id) return;
-      setTokenOverride({
-        availableMonthlyTokens: data.availableMonthlyTokens,
-        availableExtraTokens: data.availableExtraTokens,
+      setCreditOverride({
+        availableMonthlyCredits: data.availableMonthlyCredits,
+        availableExtraCredits: data.availableExtraCredits,
       });
     };
 
@@ -230,11 +230,11 @@ export const CurrentUserProvider = ({ children }: { children: React.ReactNode })
       }
     };
 
-    socket.on("company:tokens_updated", handleTokensUpdated);
+    socket.on("company:credits_updated", handleCreditsUpdated);
     socket.on("company:subscription_updated", handleSubscriptionUpdated);
 
     return () => {
-      socket.off("company:tokens_updated", handleTokensUpdated);
+      socket.off("company:credits_updated", handleCreditsUpdated);
       socket.off("company:subscription_updated", handleSubscriptionUpdated);
     };
   }, [socket, isConnected, currentUser?.company?.id]);

package/src/features/user/contexts/__tests__/CurrentUserContext.spec.tsx

@@ -39,14 +39,14 @@ vi.mock("../../../../core", () => {
   // exercise it.
   class FakeCompany {
     id = "";
-    monthlyTokens = 0;
-    _availableMonthlyTokens = 0;
-    _availableExtraTokens = 0;
-    get availableMonthlyTokens() {
-      return this._availableMonthlyTokens ?? 0;
+    monthlyCredits = 0;
+    _availableMonthlyCredits = 0;
+    _availableExtraCredits = 0;
+    get availableMonthlyCredits() {
+      return this._availableMonthlyCredits ?? 0;
     }
-    get availableExtraTokens() {
-      return this._availableExtraTokens ?? 0;
+    get availableExtraCredits() {
+      return this._availableExtraCredits ?? 0;
     }
   }
   return {
@@ -187,9 +187,9 @@ describe("CurrentUserProvider token updates", () => {
     modules: [],
     company: {
       id: "company-1",
-      monthlyTokens: 1000,
-      _availableMonthlyTokens: 900,
-      _availableExtraTokens: 50,
+      monthlyCredits: 1000,
+      _availableMonthlyCredits: 900,
+      _availableExtraCredits: 50,
     },
   };
 
@@ -197,7 +197,7 @@ describe("CurrentUserProvider token updates", () => {
     const { company } = useCurrentUserContext();
     return (
       <div data-testid="balances">
-        {company ? `${(company as any).availableMonthlyTokens}/${(company as any).availableExtraTokens}` : "null"}
+        {company ? `${(company as any).availableMonthlyCredits}/${(company as any).availableExtraCredits}` : "null"}
       </div>
     );
   }
@@ -208,7 +208,7 @@ describe("CurrentUserProvider token updates", () => {
     vi.clearAllMocks();
   });
 
-  it("patches balances from company:tokens_updated without refetching the user", async () => {
+  it("patches balances from company:credits_updated without refetching the user", async () => {
     localStorage.setItem("user", JSON.stringify(STORED_USER));
 
     const { getByTestId } = render(
@@ -221,11 +221,11 @@ describe("CurrentUserProvider token updates", () => {
     expect(getByTestId("balances").textContent).toBe("900/50");
 
     await act(async () => {
-      socketMock.emit("company:tokens_updated", {
-        type: "company:tokens_updated",
+      socketMock.emit("company:credits_updated", {
+        type: "company:credits_updated",
         companyId: "company-1",
-        availableMonthlyTokens: 750,
-        availableExtraTokens: 40,
+        availableMonthlyCredits: 750,
+        availableExtraCredits: 40,
       });
     });
 
@@ -233,7 +233,7 @@ describe("CurrentUserProvider token updates", () => {
     expect(UserService.findFullUser).not.toHaveBeenCalled();
   });
 
-  it("ignores company:tokens_updated for a different company", async () => {
+  it("ignores company:credits_updated for a different company", async () => {
     localStorage.setItem("user", JSON.stringify(STORED_USER));
 
     const { getByTestId } = render(
@@ -245,11 +245,11 @@ describe("CurrentUserProvider token updates", () => {
     await new Promise((resolve) => setTimeout(resolve, 50));
 
     await act(async () => {
-      socketMock.emit("company:tokens_updated", {
-        type: "company:tokens_updated",
+      socketMock.emit("company:credits_updated", {
+        type: "company:credits_updated",
         companyId: "someone-else",
-        availableMonthlyTokens: 1,
-        availableExtraTokens: 1,
+        availableMonthlyCredits: 1,
+        availableExtraCredits: 1,
       });
     });