2.0.13

.gitea/workflows/default_nottags.yaml

@@ -0,0 +1,66 @@
+name: Default (not tags)
+
+on:
+  push:
+    tags-ignore:
+      - '**'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install pnpm and npmci
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+
+      - name: Run npm prepare
+        run: npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build

.gitea/workflows/default_tags.yaml

@@ -0,0 +1,124 @@
+name: Default (tags)
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build
+
+  release:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Release
+        run: |
+          npmci node install stable
+          npmci npm publish
+
+  metadata:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+    continue-on-error: true
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Code quality
+        run: |
+          npmci command npm install -g typescript
+          npmci npm install
+
+      - name: Trigger
+        run: npmci trigger
+
+      - name: Build docs and upload artifacts
+        run: |
+          npmci node install stable
+          npmci npm install
+          pnpm install -g @git.zone/tsdoc
+          npmci command tsdoc
+        continue-on-error: true

.gitlab-ci.yml

@@ -1,141 +0,0 @@
-# gitzone ci_default
-image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-cache:
-  paths:
-    - .npmci_cache/
-  key: '$CI_BUILD_STAGE'
-
-stages:
-  - security
-  - test
-  - release
-  - metadata
-
-before_script:
-  - npm install -g @shipzone/npmci
-
-# ====================
-# security stage
-# ====================
-mirror:
-  stage: security
-  script:
-    - npmci git mirror
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-auditProductionDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  stage: security
-  script:
-    - npmci npm prepare
-    - npmci command npm install --production --ignore-scripts
-    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high --only=prod --production
-  tags:
-    - docker
-  allow_failure: true
-
-auditDevDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  stage: security
-  script:
-    - npmci npm prepare
-    - npmci command npm install --ignore-scripts
-    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high --only=dev
-  tags:
-    - docker
-  allow_failure: true
-
-# ====================
-# test stage
-# ====================
-
-testStable:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-
-testBuild:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - npmci command npm run build
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-
-release:
-  stage: release
-  script:
-    - npmci node install stable
-    - npmci npm publish
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# metadata stage
-# ====================
-codequality:
-  stage: metadata
-  allow_failure: true
-  only:
-    - tags
-  script:
-    - npmci command npm install -g tslint typescript
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-  tags:
-    - lossless
-    - docker
-    - priv
-
-trigger:
-  stage: metadata
-  script:
-    - npmci trigger
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-pages:
-  stage: metadata
-  script:
-    - npmci node install lts
-    - npmci command npm install -g @gitzone/tsdoc
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command tsdoc
-  tags:
-    - lossless
-    - docker
-    - notpriv
-  only:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - public
-  allow_failure: true

license

@@ -1,4 +1,4 @@
-Copyright (c) 2019 Lossless GmbH (hello@lossless.com)
+Copyright (c) 2019 Task Venture Capital GmbH (hello@task.vc)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

npmextra.json

@@ -7,10 +7,10 @@
     "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "gitscope": "push.rocks",
       "gitrepo": "smartstate",
       "description": "a package that handles state in a good way",
-      "npmPackagename": "@pushrocks/smartstate",
+      "npmPackagename": "@push.rocks/smartstate",
       "license": "MIT"
     }
   }

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@pushrocks/smartstate",
+  "name": "@push.rocks/smartstate",
-  "version": "2.0.0",
+  "version": "2.0.13",
   "private": false,
   "description": "a package that handles state in a good way",
   "main": "dist_ts/index.js",
@@ -10,21 +10,24 @@
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild --web --allowimplicitany && tsbundle npm)"
+    "build": "(tsbuild --web --allowimplicitany && tsbundle npm)",
+    "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.61",
+    "@git.zone/tsbuild": "^2.1.70",
-    "@gitzone/tsbundle": "^1.0.101",
+    "@git.zone/tsbundle": "^2.0.8",
-    "@gitzone/tstest": "^1.0.70",
+    "@git.zone/tsrun": "^1.2.46",
-    "@pushrocks/tapbundle": "^5.0.3",
+    "@git.zone/tstest": "^1.0.81",
-    "@types/node": "^17.0.23"
+    "@push.rocks/tapbundle": "^5.0.15",
+    "@types/node": "^20.8.0"
   },
   "dependencies": {
-    "@pushrocks/isohash": "^2.0.0",
+    "@push.rocks/isohash": "^2.0.1",
-    "@pushrocks/lik": "^5.0.4",
+    "@push.rocks/lik": "^6.0.5",
-    "@pushrocks/smartjson": "^4.0.6",
+    "@push.rocks/smartjson": "^5.0.10",
-    "@pushrocks/smartpromise": "^3.1.7",
+    "@push.rocks/smartpromise": "^4.0.3",
-    "@pushrocks/smartrx": "^2.0.25"
+    "@push.rocks/smartrx": "^3.0.6",
+    "@push.rocks/webstore": "^2.0.13"
   },
   "files": [
     "ts/**/*",

readme.md

@@ -1,27 +1,26 @@
-# @pushrocks/smartstate
+# @push.rocks/smartstate
 a package that handles state in a good way
 
 ## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartstate)
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@push.rocks/smartstate)
-* [gitlab.com (source)](https://gitlab.com/pushrocks/smartstate)
+* [gitlab.com (source)](https://gitlab.com/push.rocks/smartstate)
-* [github.com (source mirror)](https://github.com/pushrocks/smartstate)
+* [github.com (source mirror)](https://github.com/push.rocks/smartstate)
-* [docs (typedoc)](https://pushrocks.gitlab.io/smartstate/)
+* [docs (typedoc)](https://push.rocks.gitlab.io/smartstate/)
 
 ## Status for master
 
 Status Category | Status Badge
 -- | --
-GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartstate/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipelines | [![pipeline status](https://gitlab.com/push.rocks/smartstate/badges/master/pipeline.svg)](https://lossless.cloud)
-GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartstate/badges/master/coverage.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/push.rocks/smartstate/badges/master/coverage.svg)](https://lossless.cloud)
-npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartstate)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@push.rocks/smartstate)](https://lossless.cloud)
-Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartstate)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/push.rocks/smartstate)](https://lossless.cloud)
 TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
 node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
 Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
-PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartstate)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@push.rocks/smartstate)](https://lossless.cloud)
-PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartstate)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@push.rocks/smartstate)](https://lossless.cloud)
-BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartstate)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@push.rocks/smartstate)](https://lossless.cloud)
-Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
@@ -33,7 +32,6 @@ We are always happy for code contributions. If you are not the code contributing
 
 For further information read the linked docs at the top of this readme.
 
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+## Legal
+> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
 | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
-
-[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.both.ts

@@ -1,4 +1,4 @@
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
 import * as smartstate from '../ts/index.js';
 
 type TMyStateParts = 'testStatePart';

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@push.rocks/smartstate',
+  version: '2.0.13',
+  description: 'a package that handles state in a good way'
+}

ts/smartstate.classes.smartstate.ts

@@ -1,6 +1,8 @@
 import * as plugins from './smartstate.plugins.js';
 import { StatePart } from './smartstate.classes.statepart.js';
 
+export type TInitMode = 'soft' | 'mandatory' | 'force' | 'persistent';
+
 /**
  * Smartstate takes care of providing state
  */
@@ -21,7 +23,7 @@ export class Smartstate<StatePartNameType> {
   public getStatePart<PayloadType>(
     statePartNameArg: string & StatePartNameType,
     initialArg?: PayloadType,
-    initMode?: 'soft' | 'mandatory' | 'force'
+    initMode?: TInitMode
   ): StatePart<StatePartNameType, PayloadType> {
     if (this.statePartMap[statePartNameArg as any]) {
       if (initialArg && (!initMode || initMode !== 'soft')) {
@@ -36,7 +38,7 @@ export class Smartstate<StatePartNameType> {
           `${statePartNameArg} does not yet exist, yet you don't provide an initial state`
         );
       }
-      return this.createStatePart<PayloadType>(statePartNameArg, initialArg);
+      return this.createStatePart<PayloadType>(statePartNameArg, initialArg, initMode);
     }
   }
 
@@ -47,9 +49,16 @@ export class Smartstate<StatePartNameType> {
    */
   private createStatePart<PayloadType>(
     statePartName: StatePartNameType,
-    initialPayloadArg: PayloadType
+    initialPayloadArg: PayloadType,
+    initMode?: TInitMode
   ): StatePart<StatePartNameType, PayloadType> {
-    const newState = new StatePart<StatePartNameType, PayloadType>(statePartName);
+    const newState = new StatePart<StatePartNameType, PayloadType>(
+      statePartName,
+      initMode === 'persistent' ? {
+        dbName: 'smartstate',
+        storeName: statePartName as any,
+      } : null
+    );
     newState.setState(initialPayloadArg);
     this.statePartMap[statePartName as any] = newState;
     return newState;

ts/smartstate.classes.statepart.ts

@@ -1,13 +1,36 @@
 import * as plugins from './smartstate.plugins.js';
-import { StateAction, IActionDef } from './smartstate.classes.stateaction.js';
+import { StateAction, type IActionDef } from './smartstate.classes.stateaction.js';
 
 export class StatePart<TStatePartName, TStatePayload> {
   public name: TStatePartName;
   public state = new plugins.smartrx.rxjs.Subject<TStatePayload>();
   public stateStore: TStatePayload;
+  private cumulativeDeferred = plugins.smartpromise.cumulativeDefer();
 
-  constructor(nameArg: TStatePartName) {
+  private webStore: plugins.webstore.WebStore<TStatePayload> | null = null; // Add WebStore instance
+
+  constructor(nameArg: TStatePartName, webStoreOptions?: plugins.webstore.IWebStoreOptions) {
     this.name = nameArg;
+
+    // Initialize WebStore if webStoreOptions are provided
+    if (webStoreOptions) {
+      this.webStore = new plugins.webstore.WebStore<TStatePayload>(webStoreOptions);
+      this.initWebStore();
+    }
+  }
+
+  /**
+   * initializes the webstore
+   */
+  private async initWebStore() {
+    if (this.webStore) {
+      await this.webStore.init();
+      const storedState = await this.webStore.get(String(this.name));
+      if (storedState) {
+        this.stateStore = storedState;
+        this.notifyChange();
+      }
+    }
   }
 
   /**
@@ -21,9 +44,14 @@ export class StatePart<TStatePartName, TStatePayload> {
    * sets the stateStore to the new state
    * @param newStateArg
    */
-  public setState(newStateArg: TStatePayload) {
+  public async setState(newStateArg: TStatePayload) {
     this.stateStore = newStateArg;
     this.notifyChange();
+    
+    // Save state to WebStore if initialized
+    if (this.webStore) {
+      await this.webStore.set(String(this.name), newStateArg);
+    }
   }
 
   /**
@@ -33,7 +61,11 @@ export class StatePart<TStatePartName, TStatePayload> {
     const createStateHash = (stateArg: any) => {
       return plugins.isohash.sha256FromString(plugins.smartjson.stringify(stateArg));
     };
-    if (this.stateStore && this.lastStateNotificationPayloadHash && createStateHash(this.stateStore) === createStateHash(this.lastStateNotificationPayloadHash)) {
+    if (
+      this.stateStore &&
+      this.lastStateNotificationPayloadHash &&
+      createStateHash(this.stateStore) === this.lastStateNotificationPayloadHash
+    ) {
       return;
     } else {
       this.lastStateNotificationPayloadHash = this.stateStore;
@@ -42,6 +74,14 @@ export class StatePart<TStatePartName, TStatePayload> {
   }
   private lastStateNotificationPayloadHash: any;
 
+  /**
+   * creates a cumulative notification by adding a change notification at the end of the call stack;
+   */
+  public notifyChangeCumulative() {
+    // TODO: check viability
+    setTimeout(() => this.state.next(this.stateStore), 0);
+  }
+
   /**
    * selects a state or a substate
    */
@@ -51,7 +91,6 @@ export class StatePart<TStatePartName, TStatePayload> {
     if (!selectorFn) {
       selectorFn = (state: TStatePayload) => <T>(<any>state);
     }
-
     const mapped = this.state.pipe(
       plugins.smartrx.rxjs.ops.startWith(this.getState()),
       plugins.smartrx.rxjs.ops.map((stateArg) => {
@@ -62,7 +101,6 @@ export class StatePart<TStatePartName, TStatePayload> {
         }
       })
     );
-
     return mapped;
   }
 
@@ -78,9 +116,11 @@ export class StatePart<TStatePartName, TStatePayload> {
   /**
    * dispatches an action on the statepart level
    */
-  public async dispatchAction<T>(stateAction: StateAction<TStatePayload, T>, actionPayload: T) {
+  public async dispatchAction<T>(stateAction: StateAction<TStatePayload, T>, actionPayload: T): Promise<TStatePayload> {
+    await this.cumulativeDeferred.promise;
     const newState = await stateAction.actionDef(this, actionPayload);
-    this.setState(newState);
+    await this.setState(newState);
+    return this.getState();
   }
 
   /**
@@ -101,4 +141,15 @@ export class StatePart<TStatePartName, TStatePayload> {
     subscription.unsubscribe();
     return result;
   }
+
+  /**
+   * is executed
+   */
+  public async stateSetup(
+    funcArg: (statePartArg?: StatePart<any, TStatePayload>) => Promise<TStatePayload>
+  ) {
+    const resultPromise = funcArg(this);
+    this.cumulativeDeferred.addPromise(resultPromise);
+    this.setState(await resultPromise);
+  }
 }

ts/smartstate.plugins.ts

@@ -1,6 +1,7 @@
-import * as isohash from '@pushrocks/isohash';
+import * as isohash from '@push.rocks/isohash';
-import * as smartjson from '@pushrocks/smartjson';
+import * as smartjson from '@push.rocks/smartjson';
-import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartpromise from '@push.rocks/smartpromise';
-import * as smartrx from '@pushrocks/smartrx';
+import * as smartrx from '@push.rocks/smartrx';
+import * as webstore from '@push.rocks/webstore';
 
-export { isohash, smartjson, smartpromise, smartrx };
+export { isohash, smartjson, smartpromise, smartrx, webstore };

tsconfig.json

@@ -3,7 +3,12 @@
     "experimentalDecorators": true,
     "useDefineForClassFields": false,
     "target": "ES2022",
-    "module": "ES2022",
+    "module": "NodeNext",
-    "moduleResolution": "nodenext"
+    "moduleResolution": "NodeNext",
-  }
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
 }