From 690cb22306a8045fa7df1fa969cf6ac35f05d26d Mon Sep 17 00:00:00 2001 From: Hein Date: Sat, 7 Feb 2026 21:29:43 +0200 Subject: [PATCH] chore(release): bump version to 0.0.34 and update changelog --- CHANGELOG.md | 6 +++++ package.json | 2 +- src/GlobalStateStore/GlobalStateStore.ts | 27 ++++++++++++++++--- .../GlobalStateStore.types.ts | 24 ++++++++--------- 4 files changed, 42 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7acd6a0..0ec00a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # @warkypublic/zustandsyncstore +## 0.0.34 + +### Patch Changes + +- Better GlobalStateStore + ## 0.0.33 ### Patch Changes diff --git a/package.json b/package.json index df0cbb1..e9ab452 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@warkypublic/oranguru", "author": "Warky Devs", - "version": "0.0.33", + "version": "0.0.34", "type": "module", "types": "./dist/lib.d.ts", "main": "./dist/lib.cjs.js", diff --git a/src/GlobalStateStore/GlobalStateStore.ts b/src/GlobalStateStore/GlobalStateStore.ts index f476f82..6df7de8 100644 --- a/src/GlobalStateStore/GlobalStateStore.ts +++ b/src/GlobalStateStore/GlobalStateStore.ts @@ -158,6 +158,12 @@ const createComplexActions = (set: SetState, get: GetState) => ({ set((state: GlobalState) => ({ ...state, ...result, + layout: { ...state.layout, ...result?.layout }, + navigation: { ...state.navigation, ...result?.navigation }, + owner: { + ...state.owner, + ...result?.owner, + }, program: { ...state.program, ...result?.program, @@ -169,6 +175,10 @@ const createComplexActions = (set: SetState, get: GetState) => ({ connected: true, loading: false, }, + user: { + ...state.user, + ...result?.user, + }, })); } catch (e) { set((state: GlobalState) => ({ @@ -329,11 +339,11 @@ const setApiURL = (url: string) => { }; const getApiURL = (): string => { - return GlobalStateStore.getState().session.apiURL; + return GlobalStateStore.getState().session.apiURL ?? ''; }; const getAuthToken = (): string => { - return GlobalStateStore.getState().session.authToken; + return GlobalStateStore.getState().session.authToken ?? ''; }; const isLoggedIn = (): boolean => { @@ -346,6 +356,15 @@ const setAuthToken = (token: string) => { const GetGlobalState = (): GlobalStateStoreType => { return GlobalStateStore.getState(); -} +}; -export { getApiURL, getAuthToken, GetGlobalState, GlobalStateStore, isLoggedIn, setApiURL, setAuthToken, useGlobalStateStore }; +export { + getApiURL, + getAuthToken, + GetGlobalState, + GlobalStateStore, + isLoggedIn, + setApiURL, + setAuthToken, + useGlobalStateStore, +}; diff --git a/src/GlobalStateStore/GlobalStateStore.types.ts b/src/GlobalStateStore/GlobalStateStore.types.ts index 395a0a4..e1ec381 100644 --- a/src/GlobalStateStore/GlobalStateStore.types.ts +++ b/src/GlobalStateStore/GlobalStateStore.types.ts @@ -34,13 +34,13 @@ interface GlobalStateActions { login: (authToken?: string) => Promise; logout: () => Promise; // Callbacks for custom logic - onFetchSession?: (state: GlobalState) => Promise>; + onFetchSession?: (state: Partial) => Promise>; onLogin?: ( - state: GlobalState - ) => Promise | void>; + state: Partial + ) => Promise> | void>; onLogout?: ( - state: GlobalState - ) => Promise | void>; + state: Partial + ) => Promise> | void>; setApiURL: (url: string) => void; setAuthToken: (token: string) => void; @@ -98,7 +98,7 @@ interface NavigationState { interface OwnerState { guid?: string; - id: number; + id?: number; logo?: string; name: string; settings?: Record; @@ -125,21 +125,21 @@ interface ProgramState { logo?: string; meta?: Record; name: string; - slug: string; + slug?: string; tags?: string[]; updatedAt?: string; version?: string; } interface SessionState { - apiURL: string; - authToken: string; - connected: boolean; + apiURL?: string; + authToken?: string; + connected?: boolean; error?: string; expiryDate?: string; isSecurity?: boolean; - loading: boolean; - loggedIn: boolean; + loading?: boolean; + loggedIn?: boolean; meta?: Record; parameters?: Record; }