Compare commits

...

4 Commits

Author SHA1 Message Date
188f8057bf 2.0.15 2023-10-03 19:19:54 +02:00
99cb86258e fix(core): update 2023-10-03 19:19:54 +02:00
83976fa3f4 2.0.14 2023-10-03 16:20:35 +02:00
fe81307ca6 fix(core): update 2023-10-03 16:20:34 +02:00
5 changed files with 20 additions and 14 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "@push.rocks/smartstate", "name": "@push.rocks/smartstate",
"version": "2.0.13", "version": "2.0.15",
"private": false, "private": false,
"description": "a package that handles state in a good way", "description": "a package that handles state in a good way",
"main": "dist_ts/index.js", "main": "dist_ts/index.js",

View File

@ -18,7 +18,7 @@ tap.test('should create a new SmartState', async () => {
}); });
tap.test('should create a new StatePart', async () => { tap.test('should create a new StatePart', async () => {
testStatePart = testState.getStatePart<TStatePartPayload>('testStatePart', { testStatePart = await testState.getStatePart<TStatePartPayload>('testStatePart', {
currentFavorites: [], currentFavorites: [],
deep: { deep: {
hi: 2, hi: 2,

View File

@ -3,6 +3,6 @@
*/ */
export const commitinfo = { export const commitinfo = {
name: '@push.rocks/smartstate', name: '@push.rocks/smartstate',
version: '2.0.13', version: '2.0.15',
description: 'a package that handles state in a good way' description: 'a package that handles state in a good way'
} }

View File

@ -20,11 +20,11 @@ export class Smartstate<StatePartNameType> {
* @param initialArg * @param initialArg
* @param initMode * @param initMode
*/ */
public getStatePart<PayloadType>( public async getStatePart<PayloadType>(
statePartNameArg: string & StatePartNameType, statePartNameArg: string & StatePartNameType,
initialArg?: PayloadType, initialArg?: PayloadType,
initMode?: TInitMode initMode?: TInitMode
): StatePart<StatePartNameType, PayloadType> { ): Promise<StatePart<StatePartNameType, PayloadType>> {
if (this.statePartMap[statePartNameArg as any]) { if (this.statePartMap[statePartNameArg as any]) {
if (initialArg && (!initMode || initMode !== 'soft')) { if (initialArg && (!initMode || initMode !== 'soft')) {
throw new Error( throw new Error(
@ -47,11 +47,11 @@ export class Smartstate<StatePartNameType> {
* @param statePartName * @param statePartName
* @param initialPayloadArg * @param initialPayloadArg
*/ */
private createStatePart<PayloadType>( private async createStatePart<PayloadType>(
statePartName: StatePartNameType, statePartName: StatePartNameType,
initialPayloadArg: PayloadType, initialPayloadArg: PayloadType,
initMode?: TInitMode initMode?: TInitMode
): StatePart<StatePartNameType, PayloadType> { ): Promise<StatePart<StatePartNameType, PayloadType>> {
const newState = new StatePart<StatePartNameType, PayloadType>( const newState = new StatePart<StatePartNameType, PayloadType>(
statePartName, statePartName,
initMode === 'persistent' ? { initMode === 'persistent' ? {
@ -59,7 +59,12 @@ export class Smartstate<StatePartNameType> {
storeName: statePartName as any, storeName: statePartName as any,
} : null } : null
); );
newState.setState(initialPayloadArg); await newState.init();
const currentState = newState.getState();
await newState.setState({
...initialPayloadArg,
...currentState,
});
this.statePartMap[statePartName as any] = newState; this.statePartMap[statePartName as any] = newState;
return newState; return newState;
} }

View File

@ -7,23 +7,24 @@ export class StatePart<TStatePartName, TStatePayload> {
public stateStore: TStatePayload; public stateStore: TStatePayload;
private cumulativeDeferred = plugins.smartpromise.cumulativeDefer(); private cumulativeDeferred = plugins.smartpromise.cumulativeDefer();
private webStoreOptions: plugins.webstore.IWebStoreOptions;
private webStore: plugins.webstore.WebStore<TStatePayload> | null = null; // Add WebStore instance private webStore: plugins.webstore.WebStore<TStatePayload> | null = null; // Add WebStore instance
constructor(nameArg: TStatePartName, webStoreOptions?: plugins.webstore.IWebStoreOptions) { constructor(nameArg: TStatePartName, webStoreOptionsArg?: plugins.webstore.IWebStoreOptions) {
this.name = nameArg; this.name = nameArg;
// Initialize WebStore if webStoreOptions are provided // Initialize WebStore if webStoreOptions are provided
if (webStoreOptions) { if (webStoreOptionsArg) {
this.webStore = new plugins.webstore.WebStore<TStatePayload>(webStoreOptions); this.webStoreOptions = webStoreOptionsArg;
this.initWebStore();
} }
} }
/** /**
* initializes the webstore * initializes the webstore
*/ */
private async initWebStore() { public async init() {
if (this.webStore) { if (this.webStoreOptions) {
this.webStore = new plugins.webstore.WebStore<TStatePayload>(this.webStoreOptions);
await this.webStore.init(); await this.webStore.init();
const storedState = await this.webStore.get(String(this.name)); const storedState = await this.webStore.get(String(this.name));
if (storedState) { if (storedState) {