1.0.23

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
+dist_*/
-dist_serve/
-dist_ts_web/
 
 # custom

.gitlab-ci.yml

@@ -3,14 +3,17 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
+    - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
+  - security
-- test
+  - test
-- release
+  - release
-- metadata
+  - metadata
+
+before_script:
+  - npm install -g @shipzone/npmci
 
 # ====================
 # security stage
@@ -18,21 +21,37 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
+  only:
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
-snyk:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
+    - npmci command npm install --production --ignore-scripts
-    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command snyk test
+    - npmci command npm audit --audit-level=high --only=prod --production
   tags:
-  - docker
+    - docker
-  - notpriv
+  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
@@ -41,37 +60,36 @@ snyk:
 testStable:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci npm prepare
-  - npmci node install stable
+    - npmci node install stable
-  - npmci npm install
+    - npmci npm install
-  - npmci npm test
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - docker
-  - priv
 
 testBuild:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci npm prepare
-  - npmci node install stable
+    - npmci node install stable
-  - npmci npm install
+    - npmci npm install
-  - npmci command npm run build
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - docker
-  - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install stable
+    - npmci node install stable
-  - npmci npm publish
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
@@ -79,35 +97,39 @@ release:
 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:
-  - docker
+    - lossless
-  - priv
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:stable-dind
   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:
@@ -115,5 +137,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

.vscode/launch.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "command": "npm test",
+      "name": "Run npm test",
+      "request": "launch",
+      "type": "node-terminal"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

npmextra.json

@@ -4,11 +4,12 @@
     "npmAccessLevel": "public"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "pushrocks",
       "gitrepo": "smartstate",
-      "shortDescription": "a package that handles state in a good way",
+      "description": "a package that handles state in a good way",
       "npmPackagename": "@pushrocks/smartstate",
       "license": "MIT"
     }

package.json

@@ -1,39 +1,45 @@
 {
   "name": "@pushrocks/smartstate",
-  "version": "1.0.13",
+  "version": "1.0.23",
   "private": false,
   "description": "a package that handles state in a good way",
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)",
+    "build": "(tsbuild --web && tsbundle npm)"
-    "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tsbuild": "^2.1.29",
-    "@gitzone/tstest": "^1.0.24",
+    "@gitzone/tsbundle": "^1.0.89",
-    "@pushrocks/tapbundle": "^3.0.13",
+    "@gitzone/tstest": "^1.0.60",
-    "@types/node": "^12.7.7",
+    "@pushrocks/tapbundle": "^3.2.9",
-    "tslint": "^5.20.0",
+    "@types/node": "^17.0.10",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/lik": "^3.0.11",
+    "@pushrocks/isohash": "^1.0.2",
-    "@pushrocks/smartpromise": "^3.0.5",
+    "@pushrocks/lik": "^5.0.1",
-    "rxjs": "^6.5.3"
+    "@pushrocks/smartjson": "^4.0.6",
+    "@pushrocks/smartpromise": "^3.1.6",
+    "@pushrocks/smartrx": "^2.0.20"
   },
   "files": [
-    "ts/*",
+    "ts/**/*",
-    "ts_web/*",
+    "ts_web/**/*",
-    "dist/*",
+    "dist/**/*",
-    "dist_web/*",
+    "dist_*/**/*",
-    "dist_ts_web/*",
+    "dist_ts/**/*",
-    "assets/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -8,16 +8,29 @@ a package that handles state in a good way
 * [docs (typedoc)](https://pushrocks.gitlab.io/smartstate/)
 
 ## Status for master
-[![build status](https://gitlab.com/pushrocks/smartstate/badges/master/build.svg)](https://gitlab.com/pushrocks/smartstate/commits/master)
+
-[![coverage report](https://gitlab.com/pushrocks/smartstate/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartstate/commits/master)
+Status Category | Status Badge
-[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartstate.svg)](https://www.npmjs.com/package/@pushrocks/smartstate)
+-- | --
-[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartstate/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartstate)
+GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartstate/badges/master/pipeline.svg)](https://lossless.cloud)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartstate/badges/master/coverage.svg)](https://lossless.cloud)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartstate)](https://lossless.cloud)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/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 (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartstate)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/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
 
+Use TypeScript for best in class intellisense.
+
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
 For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)

test/test.node.ts

@@ -1,49 +1,58 @@
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@pushrocks/tapbundle';
-import * as smartstate from '../ts/index';
+import * as smartstate from '../ts/index';
-
+
-type TMyStateParts = 'testStatePart';
+type TMyStateParts = 'testStatePart';
-interface TStatePartPayload {
+interface TStatePartPayload {
-  currentFavorites: string[];
+  currentFavorites: string[];
-  deep: {
+  deep: {
-    hi: number;
+    hi: number;
-  };
+  };
-}
+}
-
+
-let testState: smartstate.Smartstate<TMyStateParts>;
+let testState: smartstate.Smartstate<TMyStateParts>;
-let testStatePart: smartstate.StatePart<TMyStateParts, TStatePartPayload>;
+let testStatePart: smartstate.StatePart<TMyStateParts, TStatePartPayload>;
-
+
-tap.test('should create a new SmartState', async () => {
+tap.test('should create a new SmartState', async () => {
-  testState = new smartstate.Smartstate<TMyStateParts>();
+  testState = new smartstate.Smartstate<TMyStateParts>();
-  expect(testState).to.be.instanceOf(smartstate.Smartstate);
+  expect(testState).to.be.instanceOf(smartstate.Smartstate);
-});
+});
-
+
-tap.test('should create a new StatePart', async () => {
+tap.test('should create a new StatePart', async () => {
-  testStatePart = testState.getStatePart<TStatePartPayload>('testStatePart', {
+  testStatePart = testState.getStatePart<TStatePartPayload>('testStatePart', {
-    currentFavorites: [],
+    currentFavorites: [],
-    deep: {
+    deep: {
-      hi: 2
+      hi: 2,
-    }
+    },
-  });
+  });
-  expect(testStatePart).to.be.instanceOf(smartstate.StatePart);
+  expect(testStatePart).to.be.instanceOf(smartstate.StatePart);
-  console.log(testStatePart);
+  console.log(testStatePart);
-});
+});
-
+
-tap.test('should select something', async () => {
+tap.test('should select something', async () => {
-  testStatePart
+  testStatePart
-    .select(state => state.deep.hi)
+    .select((state) => state.deep.hi)
-    .subscribe(substate => {
+    .subscribe((substate) => {
-      expect(substate).to.equal(2);
+      expect(substate).to.equal(2);
-    });
+    });
-});
+});
-
+
-tap.test('should dispatch a state action', async () => {
+tap.test('should dispatch a state action', async (tools) => {
-  const addFavourite = testStatePart.createAction<string>(async (statePart, payload) => {
+  const done = tools.defer();
-    const currentState = statePart.getState();
+  const addFavourite = testStatePart.createAction<string>(async (statePart, payload) => {
-    currentState.currentFavorites.push(payload);
+    const currentState = statePart.getState();
-    return currentState;
+    currentState.currentFavorites.push(payload);
-  });
+    return currentState;
-  await testStatePart.dispatchAction(addFavourite, 'my favourite things');
+  });
-  expect(testStatePart.getState().currentFavorites).to.include('my favourite things');
+  testStatePart
-});
+    .waitUntilPresent((state) => {
-
+      return state.currentFavorites[0];
-tap.start();
+    })
+    .then(() => {
+      done.resolve();
+    });
+  await testStatePart.dispatchAction(addFavourite, 'my favourite things');
+  expect(testStatePart.getState().currentFavorites).to.include('my favourite things');
+  await done.promise;
+});
+
+tap.start();

ts/index.ts

@@ -1,5 +1,3 @@
-export * from './smartstate.classes.smartstate';
+export * from './smartstate.classes.smartstate';
-export * from './smartstate.classes.statepart';
+export * from './smartstate.classes.statepart';
-export * from './smartstate.classes.statecollection';
+export * from './smartstate.classes.stateaction';
-export * from './smartstate.classes.stateaction';
-export * from './smartstate.classes.stateobservable';

ts/smartstate.classes.smartstate.ts

@@ -1,52 +1,57 @@
-import * as plugins from './smartstate.plugins';
+import * as plugins from './smartstate.plugins';
-import { StatePart } from './smartstate.classes.statepart';
+import { StatePart } from './smartstate.classes.statepart';
-
+
-/**
+/**
- * Smartstate takes care of providing state
+ * Smartstate takes care of providing state
- */
+ */
-export class Smartstate<StatePartNameType> {
+export class Smartstate<StatePartNameType> {
-  public statePartMap: { [key: string]: StatePart<StatePartNameType, any> } = {};
+  public statePartMap: { [key: string]: StatePart<StatePartNameType, any> } = {};
-
+
-  constructor() {}
+  constructor() {}
-
+
-  public getStatePart<PayloadType>(
+  /**
-    statePartNameArg: StatePartNameType,
+   * Allows getting and initializing a new statepart
-    initialArg?: PayloadType
+   * initMode === 'soft' it will allow existing stateparts
-  ): StatePart<StatePartNameType, PayloadType> {
+   * initMode === 'mandatory' will fail if there is an exiting statepart
-    if (this.statePartMap[statePartNameArg as any]) {
+   * initMode === 'force' will overwrite any existing statepart
-      if (initialArg) {
+   * @param statePartNameArg
-        throw new Error(
+   * @param initialArg
-          `${statePartNameArg} already exists, yet you try to set an initial state again`
+   * @param initMode
-        );
+   */
-      }
+  public getStatePart<PayloadType>(
-      return this.statePartMap[statePartNameArg as any];
+    statePartNameArg: string & StatePartNameType,
-    } else {
+    initialArg?: PayloadType,
-      if (!initialArg) {
+    initMode?: 'soft' | 'mandatory' | 'force'
-        throw new Error(
+  ): StatePart<StatePartNameType, PayloadType> {
-          `${statePartNameArg} does not yet exist, yet you don't provide an initial state`
+    if (this.statePartMap[statePartNameArg as any]) {
-        );
+      if (initialArg && (!initMode || initMode !== 'soft')) {
-      }
+        throw new Error(
-      return this.createStatePart<PayloadType>(statePartNameArg, initialArg);
+          `${statePartNameArg} already exists, yet you try to set an initial state again`
-    }
+        );
-  }
+      }
-
+      return this.statePartMap[statePartNameArg] as StatePart<StatePartNameType, PayloadType>;
-  /**
+    } else {
-   * creates a statepart
+      if (!initialArg) {
-   * @param statePartName
+        throw new Error(
-   * @param initialPayloadArg
+          `${statePartNameArg} does not yet exist, yet you don't provide an initial state`
-   */
+        );
-  private createStatePart<PayloadType>(
+      }
-    statePartName: StatePartNameType,
+      return this.createStatePart<PayloadType>(statePartNameArg, initialArg);
-    initialPayloadArg: PayloadType
+    }
-  ): StatePart<StatePartNameType, PayloadType> {
+  }
-    const newState = new StatePart<StatePartNameType, PayloadType>(statePartName);
+
-    newState.setState(initialPayloadArg);
+  /**
-    this.statePartMap[statePartName as any] = newState;
+   * creates a statepart
-    return newState;
+   * @param statePartName
-  }
+   * @param initialPayloadArg
-
+   */
-  /**
+  private createStatePart<PayloadType>(
-   * dispatches an action on the main level
+    statePartName: StatePartNameType,
-   */
+    initialPayloadArg: PayloadType
-  public dispatch() {}
+  ): StatePart<StatePartNameType, PayloadType> {
-}
+    const newState = new StatePart<StatePartNameType, PayloadType>(statePartName);
+    newState.setState(initialPayloadArg);
+    this.statePartMap[statePartName as any] = newState;
+    return newState;
+  }
+}

ts/smartstate.classes.stateaction.ts

@@ -1,17 +1,20 @@
-import * as plugins from './smartstate.plugins';
+import * as plugins from './smartstate.plugins';
-import { StatePart } from './smartstate.classes.statepart';
+import { StatePart } from './smartstate.classes.statepart';
-
+
-export interface IActionDef<TStateType, TActionPayloadType> {
+export interface IActionDef<TStateType, TActionPayloadType> {
-  (stateArg: StatePart<any, TStateType>, actionPayload: TActionPayloadType): Promise<TStateType>;
+  (stateArg: StatePart<any, TStateType>, actionPayload: TActionPayloadType): Promise<TStateType>;
-}
+}
-
+
-/**
+/**
- * an actionmodifier for the state
+ * an actionmodifier for the state
- */
+ */
-export class StateAction<TStateType, TActionPayloadType> {
+export class StateAction<TStateType, TActionPayloadType> {
-  constructor(public statePartRef: StatePart<any, any>, public actionDef: IActionDef<TStateType, TActionPayloadType>) {}
+  constructor(
-
+    public statePartRef: StatePart<any, any>,
-  public trigger(payload: TActionPayloadType) {
+    public actionDef: IActionDef<TStateType, TActionPayloadType>
-    this.statePartRef.dispatchAction(this, payload);
+  ) {}
-  }
+
-}
+  public trigger(payload: TActionPayloadType) {
+    this.statePartRef.dispatchAction(this, payload);
+  }
+}

ts/smartstate.classes.statecollection.ts

@@ -1,12 +0,0 @@
-import * as plugins from './smartstate.plugins';
-import { StatePart } from './smartstate.classes.statepart';
-
-/**
- * A StatePartCollection is a collection of StateParts.
- * It can be used for expressing interest in a certain set of StateParts.
- */
-export class StatePartCollection<StatePartNameType, T> extends StatePart<StatePartNameType, T> {
-  constructor(nameArg: StatePartNameType) {
-    super(nameArg);
-  }
-}

ts/smartstate.classes.stateobservable.ts

@@ -1,13 +0,0 @@
-import * as plugins from './smartstate.plugins';
-
-/**
- * State observable observes a StatePart and notifies everyone interested
- */
-export class StateObservable {
-  /**
-   * creates an observable from a StateCollection
-   */
-  public static fromStatePartCollection(filterArg?: () => any) {}
-
-  constructor() {}
-}

ts/smartstate.classes.statepart.ts

@@ -1,94 +1,104 @@
-import * as plugins from './smartstate.plugins';
+import * as plugins from './smartstate.plugins';
-
+import { StateAction, IActionDef } from './smartstate.classes.stateaction';
-import { Observable, Subject } from 'rxjs';
+
-import { startWith, takeUntil, map } from 'rxjs/operators';
+export class StatePart<TStatePartName, TStatePayload> {
-
+  public name: TStatePartName;
-import { StateAction, IActionDef } from './smartstate.classes.stateaction';
+  public state = new plugins.smartrx.rxjs.Subject<TStatePayload>();
-
+  public stateStore: TStatePayload;
-export class StatePart<TStatePartName, TStatePayload> {
+
-  public name: TStatePartName;
+  constructor(nameArg: TStatePartName) {
-  public state = new Subject<TStatePayload>();
+    this.name = nameArg;
-  public stateStore: TStatePayload;
+  }
-
+
-  constructor(nameArg: TStatePartName) {
+  /**
-    this.name = nameArg;
+   * gets the state from the state store
-  }
+   */
-
+  public getState(): TStatePayload {
-  /**
+    return this.stateStore;
-   * gets the state from the state store
+  }
-   */
+
-  public getState(): TStatePayload {
+  /**
-    return this.stateStore;
+   * sets the stateStore to the new state
-  }
+   * @param newStateArg
-
+   */
-  /**
+  public setState(newStateArg: TStatePayload) {
-   * sets the stateStore to the new state
+    this.stateStore = newStateArg;
-   * @param newStateArg
+    this.notifyChange();
-   */
+  }
-  public setState(newStateArg: TStatePayload) {
+
-    this.stateStore = newStateArg;
+  /**
-    this.notifyChange();
+   * notifies of a change on the state
-  }
+   */
-
+  public notifyChange() {
-  /**
+    const createStateHash = (stateArg: any) => {
-   * notifies of a change on the state
+      return plugins.isohash.sha256FromString(plugins.smartjson.stringify(stateArg));
-   */
+    };
-  public notifyChange() {
+    if (this.stateStore && this.lastStateNotificationPayloadHash && createStateHash(this.stateStore) === createStateHash(this.lastStateNotificationPayloadHash)) {
-    this.state.next(this.stateStore);
+      return;
-  }
+    } else {
-
+      this.lastStateNotificationPayloadHash = this.stateStore;
-  /**
+    }
-   * selects a state or a substate
+    this.state.next(this.stateStore);
-   */
+  }
-  public select<T = TStatePayload>(selectorFn?: (state: TStatePayload) => T): Observable<T> {
+  private lastStateNotificationPayloadHash: any;
-    if (!selectorFn) {
+
-      selectorFn = (state: TStatePayload) => <T>(<any>state);
+  /**
-    }
+   * selects a state or a substate
-
+   */
-    const mapped = this.state.pipe(
+  public select<T = TStatePayload>(
-      startWith(this.getState()),
+    selectorFn?: (state: TStatePayload) => T
-      map((stateArg) => {
+  ): plugins.smartrx.rxjs.Observable<T> {
-        try {
+    if (!selectorFn) {
-          return selectorFn(stateArg);
+      selectorFn = (state: TStatePayload) => <T>(<any>state);
-        } catch (e) {
+    }
-          // Nothing here
+
-        }
+    const mapped = this.state.pipe(
-      })
+      plugins.smartrx.rxjs.ops.startWith(this.getState()),
-    );
+      plugins.smartrx.rxjs.ops.map((stateArg) => {
-
+        try {
-    return mapped;
+          return selectorFn(stateArg);
-  }
+        } catch (e) {
-
+          // Nothing here
-  /**
+        }
-   * creates an action capable of modifying the state
+      })
-   */
+    );
-  public createAction<TActionPayload>(
+
-    actionDef: IActionDef<TStatePayload, TActionPayload>
+    return mapped;
-  ): StateAction<TStatePayload, TActionPayload> {
+  }
-    return new StateAction(this, actionDef);
+
-  }
+  /**
-
+   * creates an action capable of modifying the state
-  /**
+   */
-   * dispatches an action on the statepart level
+  public createAction<TActionPayload>(
-   */
+    actionDef: IActionDef<TStatePayload, TActionPayload>
-  public async dispatchAction<T>(stateAction: StateAction<TStatePayload, T>, actionPayload: T) {
+  ): StateAction<TStatePayload, TActionPayload> {
-    const newState = await stateAction.actionDef(this, actionPayload);
+    return new StateAction(this, actionDef);
-    this.setState(newState);
+  }
-  }
+
-
+  /**
-  /**
+   * dispatches an action on the statepart level
-   * waits until a certain part of the state becomes available
+   */
-   * @param selectorFn
+  public async dispatchAction<T>(stateAction: StateAction<TStatePayload, T>, actionPayload: T) {
-   */
+    const newState = await stateAction.actionDef(this, actionPayload);
-  public async waitUntilPresent<T = TStatePayload>(selectorFn?: (state: TStatePayload) => T): Promise<T> {
+    this.setState(newState);
-    const done = plugins.smartpromise.defer<T>();
+  }
-    const selectedObservable = this.select(selectorFn);
+
-    const subscription = selectedObservable.subscribe(value => {
+  /**
-      if (value) {
+   * waits until a certain part of the state becomes available
-        subscription.unsubscribe();
+   * @param selectorFn
-        done.resolve(value);
+   */
-      }
+  public async waitUntilPresent<T = TStatePayload>(
-    });
+    selectorFn?: (state: TStatePayload) => T
-    return await done.promise;
+  ): Promise<T> {
-  }
+    const done = plugins.smartpromise.defer<T>();
-}
+    const selectedObservable = this.select(selectorFn);
+    const subscription = selectedObservable.subscribe(async (value) => {
+      if (value) {
+        done.resolve(value);
+      }
+    });
+    const result = await done.promise;
+    subscription.unsubscribe();
+    return result;
+  }
+}

ts/smartstate.plugins.ts

@@ -1,13 +1,6 @@
-import { Observable } from 'rxjs';
+import * as isohash from '@pushrocks/isohash';
-
+import * as smartjson from '@pushrocks/smartjson';
-const rxjsPart = {
+import * as smartpromise from '@pushrocks/smartpromise';
-  Observable
+import * as smartrx from '@pushrocks/smartrx';
-};
+
-
+export { isohash, smartjson, smartpromise, smartrx };
-export { rxjsPart };
-
-import * as smartpromise from '@pushrocks/smartpromise';
-
-export {
-  smartpromise
-};