piral-core 0.15.0-alpha.4314 → 0.15.0-alpha.4355

package/lib/state/createGlobalState.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createGlobalState = void 0;
-const react_atom_1 = require("@dbeining/react-atom");
-const defaults_1 = require("../defaults");
+const zustand_1 = require("zustand");
+const app_codegen_1 = require("../../app.codegen");
 function extend(defaultState, customState) {
     for (const key of Object.keys(customState)) {
         if (key === '__proto__' || key === 'constructor') {
@@ -16,31 +16,8 @@ function extend(defaultState, customState) {
     return defaultState;
 }
 function createGlobalState(customState = {}) {
-    const defaultState = {
-        app: {
-            error: undefined,
-            loading: typeof window !== 'undefined',
-            publicPath: process.env.PIRAL_PUBLIC_PATH || '/',
-        },
-        components: {
-            ErrorInfo: defaults_1.DefaultErrorInfo,
-            LoadingIndicator: defaults_1.DefaultLoadingIndicator,
-            Router: defaults_1.DefaultRouter,
-            RouteSwitch: defaults_1.DefaultRouteSwitch,
-            Layout: defaults_1.DefaultLayout,
-        },
-        errorComponents: {},
-        registry: {
-            extensions: {},
-            pages: {},
-            wrappers: {},
-        },
-        routes: {},
-        data: {},
-        portals: {},
-        modules: [],
-    };
-    return react_atom_1.Atom.of(extend(defaultState, customState));
+    const defaultState = (0, app_codegen_1.createDefaultState)();
+    return (0, zustand_1.default)(() => extend(defaultState, customState));
 }
 exports.createGlobalState = createGlobalState;
 //# sourceMappingURL=createGlobalState.js.map

package/lib/state/createGlobalState.js.map

@@ -1 +1 @@
-{"version":3,"file":"createGlobalState.js","sourceRoot":"","sources":["../../src/state/createGlobalState.ts"],"names":[],"mappings":";;;AAAA,qDAA4C;AAE5C,0CAMqB;AAErB,SAAS,MAAM,CAAI,YAAe,EAAE,WAA6B;IAC/D,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;QAC1C,IAAI,GAAG,KAAK,WAAW,IAAI,GAAG,KAAK,aAAa,EAAE;YAChD,SAAS;SACV;QAED,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,MAAM,GAAG,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC;QACzE,YAAY,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;KAC9D;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAgB,iBAAiB,CAAC,cAA0C,EAAE;IAC5E,MAAM,YAAY,GAAgB;QAChC,GAAG,EAAE;YACH,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,OAAO,MAAM,KAAK,WAAW;YACtC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,GAAG;SACjD;QACD,UAAU,EAAE;YACV,SAAS,EAAE,2BAAgB;YAC3B,gBAAgB,EAAE,kCAAuB;YACzC,MAAM,EAAE,wBAAa;YACrB,WAAW,EAAE,6BAAkB;YAC/B,MAAM,EAAE,wBAAa;SACtB;QACD,eAAe,EAAE,EAAE;QACnB,QAAQ,EAAE;YACR,UAAU,EAAE,EAAE;YACd,KAAK,EAAE,EAAE;YACT,QAAQ,EAAE,EAAE;SACb;QACD,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,EAAE;QACR,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,OAAO,iBAAI,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;AACpD,CAAC;AA3BD,8CA2BC"}
+{"version":3,"file":"createGlobalState.js","sourceRoot":"","sources":["../../src/state/createGlobalState.ts"],"names":[],"mappings":";;;AAAA,qCAA6B;AAC7B,mDAAuD;AAGvD,SAAS,MAAM,CAAI,YAAe,EAAE,WAA6B;IAC/D,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;QAC1C,IAAI,GAAG,KAAK,WAAW,IAAI,GAAG,KAAK,aAAa,EAAE;YAChD,SAAS;SACV;QAED,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,MAAM,GAAG,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC;QACzE,YAAY,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;KAC9D;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAgB,iBAAiB,CAAC,cAA0C,EAAE;IAC5E,MAAM,YAAY,GAAgB,IAAA,gCAAkB,GAAE,CAAC;IACvD,OAAO,IAAA,iBAAM,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;AACzD,CAAC;AAHD,8CAGC"}

package/lib/types/components.d.ts

@@ -192,6 +192,19 @@ export interface RouterProps {
      */
     children?: ReactNode;
 }
+/**
+ * Represents a path in the app registration.
+ */
+export interface AppPath {
+    /**
+     * The exact path to use.
+     */
+    path: string;
+    /**
+     * The component to register for this path.
+     */
+    Component: ComponentType<RouteComponentProps>;
+}
 /**
  * The props of the RouteSwitch component.
  */
@@ -203,14 +216,5 @@ export interface RouteSwitchProps extends SwitchProps {
     /**
      * The component to register for the different paths.
      */
-    paths: Array<{
-        /**
-         * The exact path to use.
-         */
-        path: string;
-        /**
-         * The component to register for this path.
-         */
-        Component: ComponentType<RouteComponentProps>;
-    }>;
+    paths: Array<AppPath>;
 }

package/lib/types/state.d.ts

@@ -1,7 +1,7 @@
 import type { ComponentType, ReactPortal, PropsWithChildren } from 'react';
 import type { RouteComponentProps } from 'react-router';
-import type { Atom } from '@dbeining/react-atom';
 import type { LoadPiletsOptions } from 'piral-base';
+import type { UseBoundStore } from 'zustand';
 import type { Dict, Without } from './common';
 import type { SharedDataItem, DataStoreTarget } from './data';
 import type { PiralCustomActions, PiralCustomState, PiralCustomRegistryState, PiralCustomComponentsState } from './custom';
@@ -12,7 +12,6 @@ export interface StateDispatcher<TState> {
 }
 declare module './components' {
     interface ComponentContext {
-        state: Atom<GlobalState>;
         readState: PiralActions['readState'];
     }
 }
@@ -314,6 +313,12 @@ export interface PiralActions extends PiralCustomActions {
      * @returns The desired part.
      */
     readState<S>(select: (state: GlobalState) => S): S;
+    /**
+     * Performs a navigation.
+     * @param path The path to navigate to.
+     * @param state The optional state for the navigation.
+     */
+    navigate(path: string, state?: any): void;
 }
 /**
  * The Piral app instance context.
@@ -323,7 +328,7 @@ export interface GlobalStateContext extends PiralActions, EventEmitter {
      * The global state context atom.
      * Changes to the state should always be dispatched via the `dispatch` action.
      */
-    state: Atom<GlobalState>;
+    state: UseBoundStore<GlobalState>;
     /**
      * The API objects created for the loaded pilets.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-core",
-  "version": "0.15.0-alpha.4314",
+  "version": "0.15.0-alpha.4355",
   "description": "The core library for creating a Piral instance.",
   "keywords": [
     "portal",
@@ -17,10 +17,7 @@
       "react-dom": "react-dom",
       "react-router": "react-router",
       "react-router-dom": "react-router-dom",
-      "history": "history",
-      "path-to-regexp": "path-to-regexp",
-      "@libre/atom": "@libre/atom",
-      "@dbeining/react-atom": "@dbeining/react-atom"
+      "history": "history"
     }
   },
   "author": "smapiot",
@@ -40,6 +37,10 @@
     "./lib/*": {
       "require": "./lib/*"
     },
+    "./_/*": {
+      "import": "./esm/*.js",
+      "require": "./lib/*.js"
+    },
     "./package.json": "./package.json"
   },
   "sideEffects": false,
@@ -47,10 +48,8 @@
     "esm",
     "lib",
     "src",
-    "debug.codegen",
-    "debug.codegen.*",
-    "dependencies.codegen",
-    "dependencies.codegen.*"
+    "app.codegen",
+    "app.codegen.d.ts"
   ],
   "funding": {
     "type": "github",
@@ -72,9 +71,9 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@dbeining/react-atom": "^4.0.0",
-    "piral-base": "0.15.0-alpha.4314",
-    "piral-debug-utils": "0.15.0-alpha.4314"
+    "piral-base": "0.15.0-alpha.4355",
+    "piral-debug-utils": "0.15.0-alpha.4355",
+    "zustand": "^3.0.0"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -99,10 +98,7 @@
     "react-router",
     "react-router-dom",
     "history",
-    "tslib",
-    "path-to-regexp",
-    "@libre/atom",
-    "@dbeining/react-atom"
+    "tslib"
   ],
-  "gitHead": "8bd59debe22a0fed137458a5295eb2ea43d9e0d3"
+  "gitHead": "a4dda359fe03992cd06bfb808df916747beb065d"
 }

package/src/Piral.test.tsx

@@ -5,11 +5,13 @@ import { Piral } from './Piral';
 import { RegisteredRouter } from './components';
 import { createInstance } from './createInstance';
 
-async function waitForComponentToPaint<P = {}>(wrapper: ReactWrapper<P>, amount = 0) {
-  await act(async () => {
-    await new Promise((resolve) => setTimeout(resolve, amount));
-    wrapper.update();
-  });
+function resolveAfter(time = 5) {
+  return new Promise<void>((resolve) => setTimeout(resolve, time));
+}
+
+async function waitForComponentToPaint<P = {}>(wrapper: ReactWrapper<P>, amount = 5) {
+  await act(resolveAfter);
+  wrapper.update();
 }
 
 describe('Piral Component', () => {

package/src/RootListener.test.tsx

@@ -9,6 +9,10 @@ jest.mock('./hooks/globalState', () => ({
   }),
 }));
 
+function resolveAfter(time = 5) {
+  return new Promise<void>(resolve => setTimeout(resolve, time));
+}
+
 describe('RootListener Component', () => {
   it('renders the RootListener instance with default settings', async () => {
     const element = document.createElement('div');
@@ -27,9 +31,9 @@ describe('RootListener Component', () => {
         },
       });
       element.dispatchEvent(event);
-      return Promise.resolve();
+      return resolveAfter();
     });
-    await act(() => Promise.resolve());
+    await act(resolveAfter);
     expect(removed).not.toHaveBeenCalled();
   });
 
@@ -39,9 +43,9 @@ describe('RootListener Component', () => {
     const root = createRoot(container);
     root.render(<RootListener />);
     document.body.removeEventListener = removed;
-    await act(() => Promise.resolve());
+    await act(resolveAfter);
     root.unmount();
-    await act(() => Promise.resolve());
+    await act(resolveAfter);
     expect(removed).toHaveBeenCalled();
   });
 });

package/src/actions/app.test.ts

@@ -1,6 +1,6 @@
+import create from 'zustand';
 import { mount } from 'enzyme';
 import { createElement } from 'react';
-import { Atom, deref } from '@dbeining/react-atom';
 import { createListener, Pilet } from 'piral-base';
 import {
   includeProvider,
@@ -23,27 +23,27 @@ const pilet: Pilet = {
 
 describe('App Actions Module', () => {
   it('initialize initializes state data', () => {
-    const state = Atom.of({
+    const state: any = create(() => ({
       app: {},
-    });
+    }));
     const ctx = createActions(state, createListener({}));
-    const modules = ['pilet 1', 'pilet 2', 'pilet 3'];
+    const modules: any = ['pilet 1', 'pilet 2', 'pilet 3'];
     initialize(ctx, false, undefined, modules);
-    expect(deref(state)).toEqual({
+    expect(state.getState()).toEqual({
       app: { error: undefined, loading: false },
       modules: ['pilet 1', 'pilet 2', 'pilet 3'],
     });
   });
 
   it('removePilet removes pilet', () => {
-    const state = Atom.of({
+    const state: any = create(() => ({
       app: {},
       modules: [pilet],
       registry: { 'my-pilet': pilet },
-    });
+    }));
     const ctx = createActions(state, createListener({}));
     removePilet(ctx, 'my-pilet');
-    expect(deref(state)).toEqual({ app: {}, modules: [], registry: { 'my-pilet': pilet } });
+    expect(state.getState()).toEqual({ app: {}, modules: [], registry: { 'my-pilet': pilet } });
   });
 
   it('injectPilet injects pilet', () => {
@@ -53,55 +53,55 @@ describe('App Actions Module', () => {
       link: undefined,
       custom: undefined,
     };
-    const state = Atom.of({
+    const state: any = create(() => ({
       app: {},
       modules: [pilet2],
       registry: { pilet2 },
-    });
+    }));
     const ctx = createActions(state, createListener({}));
     injectPilet(ctx, pilet);
-    expect(deref(state)).toEqual({ app: {}, modules: [pilet2, pilet], registry: { pilet2 } });
+    expect(state.getState()).toEqual({ app: {}, modules: [pilet2, pilet], registry: { pilet2 } });
   });
 
   it('setComponent set component', () => {
-    const state = Atom.of({
+    const state: any = create(() => ({
       components: {},
-    });
+    }));
     const ctx = createActions(state, createListener({}));
     const node = RootListener;
     setComponent(ctx, 'ComponentName', node);
-    expect(deref(state)).toEqual({ components: { ComponentName: RootListener } });
+    expect(state.getState()).toEqual({ components: { ComponentName: RootListener } });
   });
 
   it('setErrorComponent set error component', () => {
-    const state = Atom.of({
+    const state: any = create(() => ({
       errorComponents: {},
-    });
+    }));
     const ctx = createActions(state, createListener({}));
     const node = RootListener;
     setErrorComponent(ctx, 'ComponentName', node);
-    expect(deref(state)).toEqual({ errorComponents: { ComponentName: RootListener } });
+    expect(state.getState()).toEqual({ errorComponents: { ComponentName: RootListener } });
   });
 
   it('setRoute sets route', () => {
-    const state = Atom.of({
+    const state: any = create(() => ({
       routes: {},
-    });
+    }));
     const ctx = createActions(state, createListener({}));
     const node = RootListener;
     setRoute(ctx, './dist', RootListener);
-    expect(deref(state)).toEqual({ routes: { './dist': RootListener } });
+    expect(state.getState()).toEqual({ routes: { './dist': RootListener } });
   });
 
   it('allows using includeProvider once', () => {
-    const state = Atom.of({
+    const state: any = create(() => ({
       provider: undefined,
-    });
+    }));
     const Provider = (props) => createElement('div', props);
     const ctx = createActions(state, createListener({}));
     includeProvider(ctx, createElement(Provider));
 
-    const NewProvider = deref(state).provider;
+    const NewProvider = state.getState().provider;
     expect(NewProvider).not.toBeUndefined();
 
     const node = mount(createElement(NewProvider, undefined, 'Some text'));
@@ -110,16 +110,16 @@ describe('App Actions Module', () => {
   });
 
   it('allows using includeProvider twice', () => {
-    const state = Atom.of({
+    const state: any = create(() => ({
       provider: undefined,
-    });
+    }));
     const Provider1 = (props) => createElement('i', props);
     const Provider2 = (props) => createElement('b', props);
     const ctx = createActions(state, createListener({}));
     includeProvider(ctx, createElement(Provider1));
     includeProvider(ctx, createElement(Provider2));
 
-    const NewProvider = deref(state).provider;
+    const NewProvider = state.getState().provider;
     expect(NewProvider).not.toBeUndefined();
 
     const node = mount(createElement(NewProvider, undefined, 'Some text'));
@@ -129,14 +129,14 @@ describe('App Actions Module', () => {
   });
 
   it('allows using includeProvider with props', () => {
-    const state = Atom.of({
+    const state: any = create(() => ({
       provider: undefined,
-    });
+    }));
     const Provider = (props) => createElement('i', props, props.text, props.children);
     const ctx = createActions(state, createListener({}));
     includeProvider(ctx, createElement(Provider, { text: 'Icecream' }));
 
-    const NewProvider = deref(state).provider;
+    const NewProvider = state.getState().provider;
     expect(NewProvider).not.toBeUndefined();
 
     const node = mount(createElement(NewProvider, undefined, 'Some text'));
@@ -146,16 +146,16 @@ describe('App Actions Module', () => {
   });
 
   it('allows multiple includeProvider with props', () => {
-    const state = Atom.of({
+    const state: any = create(() => ({
       provider: undefined,
-    });
+    }));
     const Provider1 = (props) => createElement('i', props, props.text, props.children);
     const Provider2 = (props) => createElement('b', props, props.text, props.children);
     const ctx = createActions(state, createListener({}));
     includeProvider(ctx, createElement(Provider1, { text: 'Icecream' }));
     includeProvider(ctx, createElement(Provider2, { text: 'Chocolate' }));
 
-    const NewProvider = deref(state).provider;
+    const NewProvider = state.getState().provider;
     expect(NewProvider).not.toBeUndefined();
 
     const node = mount(createElement(NewProvider, undefined, 'Some text'));

package/src/actions/app.ts

@@ -24,6 +24,10 @@ export function initialize(ctx: GlobalStateContext, loading: boolean, error: Err
   }));
 }
 
+export function navigate(ctx: GlobalStateContext, path: string, state?: any) {
+  ctx.emit('navigate', { path, state });
+}
+
 export function addPilet(ctx: GlobalStateContext, meta: PiletEntry): Promise<void> {
   return ctx.options
     .loadPilet(meta)

package/src/actions/components.test.ts

@@ -1,20 +1,20 @@
-import { Atom, deref } from '@dbeining/react-atom';
+import create from 'zustand';
 import { createListener } from 'piral-base';
 import { registerExtension, registerPage, unregisterExtension, unregisterPage } from './components';
 import { createActions } from '../state';
 
 describe('Components Actions Module', () => {
   it('registerExtension and unregisterExtension', () => {
-    const state = Atom.of({
+    const state: any = create(() => ({
       foo: 5,
       registry: {
         foo: 5,
         extensions: {},
       },
-    });
+    }));
     const ctx = createActions(state, createListener({}));
     registerExtension(ctx, 'foo', 10 as any);
-    expect(deref(state)).toEqual({
+    expect(state.getState()).toEqual({
       foo: 5,
       registry: {
         foo: 5,
@@ -23,8 +23,8 @@ describe('Components Actions Module', () => {
         },
       },
     });
-    unregisterExtension(ctx, 'foo');
-    expect(deref(state)).toEqual({
+    unregisterExtension(ctx, 'foo', undefined);
+    expect(state.getState()).toEqual({
       foo: 5,
       registry: {
         foo: 5,
@@ -36,16 +36,16 @@ describe('Components Actions Module', () => {
   });
 
   it('registerPage and unregisterPage', () => {
-    const state = Atom.of({
+    const state: any = create(() => ({
       foo: 5,
       registry: {
         foo: 5,
         pages: {},
       },
-    });
+    }));
     const ctx = createActions(state, createListener({}));
     registerPage(ctx, 'foo', 10 as any);
-    expect(deref(state)).toEqual({
+    expect(state.getState()).toEqual({
       foo: 5,
       registry: {
         foo: 5,
@@ -55,7 +55,7 @@ describe('Components Actions Module', () => {
       },
     });
     unregisterPage(ctx, 'foo');
-    expect(deref(state)).toEqual({
+    expect(state.getState()).toEqual({
       foo: 5,
       registry: {
         foo: 5,