@shuvi/platform-shared 1.0.4 → 1.0.6

package/esm/shared/application.d.ts

@@ -1,5 +1,5 @@
 import { IRouter, IPageRouteRecord } from './routerTypes';
-import { RedoxStore, Application, IAppContext, ApplicationOptions, IRerenderConfig, IError } from './applicationTypes';
+import { Doura, Application, IAppContext, ApplicationOptions, IRerenderConfig, IError } from './applicationTypes';
 export declare class ApplicationImpl<Config extends {} = {}> {
     private _router;
     private _appComponent;
@@ -15,13 +15,13 @@ export declare class ApplicationImpl<Config extends {} = {}> {
     get context(): IAppContext;
     get pluginManager(): import("@shuvi/hook").HookManager<import("./runtimPlugin").RuntimePluginHooks, void>;
     get appComponent(): any;
-    get error(): IError | undefined;
+    get error(): IError | null;
     setError(err: IError): void;
     clearError(): void;
     getLoadersData(): Record<string, any>;
     setLoadersData(datas: Record<string, any>): void;
     init(): Promise<void>;
-    get store(): RedoxStore;
+    get store(): Doura;
     updateComponents({ AppComponent }?: IRerenderConfig): Promise<void>;
     dispose(): Promise<void>;
     private _initPlugin;

package/esm/shared/application.js

@@ -9,17 +9,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { getManager } from './runtimPlugin';
 import { initPlugins } from './runtimPlugin';
-import { redox } from '@shuvi/redox';
-import { errorModel } from './models/error';
-import { loaderModel } from './models/loader';
+import { doura } from 'doura';
+import { errorModel, errorModelName } from './models/error';
+import { loaderModel, loaderModelName } from './models/loader';
 export class ApplicationImpl {
     constructor(options) {
         this._config = options.config;
         this._router = options.router;
         this._context = {};
-        this._store = redox({ initialState: options.initialState });
-        this._error = this._store.getModel(errorModel);
-        this._loader = this._store.getModel(loaderModel);
+        this._store = doura({ initialState: options.initialState });
+        this._error = this._store.getModel(errorModelName, errorModel);
+        this._loader = this._store.getModel(loaderModelName, loaderModel);
         this._appComponent = options.AppComponent;
         this._pluginManager = getManager();
         initPlugins(this._pluginManager, options.plugins || []);

package/esm/shared/applicationTypes.d.ts

@@ -1,4 +1,4 @@
-import { RedoxStore } from '@shuvi/redox';
+import { Doura } from 'doura';
 import { CustomAppContext } from '@shuvi/runtime';
 import { IRouter, IPageRouteRecord } from './routerTypes';
 import { IPluginList } from './runtimPlugin';
@@ -8,7 +8,7 @@ export interface IAppContext extends CustomAppContext {
 export declare type IRerenderConfig = {
     AppComponent?: any;
 };
-export type { RedoxStore };
+export type { Doura };
 export declare type ErrorSource = 'server';
 export interface IError {
     code?: number;
@@ -18,18 +18,18 @@ export interface IError {
     source?: ErrorSource;
 }
 export interface IErrorState {
-    error?: IError;
+    error: IError | null;
 }
 export declare type IAppState = {
-    error?: IErrorState;
+    error: IErrorState;
 };
 export interface Application<Config extends {} = {}> {
     readonly config: Config;
     readonly context: IAppContext;
     readonly router: IRouter<IPageRouteRecord>;
     readonly appComponent: any;
-    readonly store: RedoxStore;
-    readonly error: IError | undefined;
+    readonly store: Doura;
+    readonly error: IErrorState['error'];
     setError(err: IError): void;
     clearError(): void;
     getLoadersData(): Record<string, any>;

package/esm/shared/index.d.ts

@@ -3,8 +3,8 @@ export * from './routerTypes';
 export * from './router';
 export * from './response';
 export * from './loader';
-export { errorModel } from './models/error';
-export { loaderModel } from './models/loader';
+export { errorModel, errorModelName } from './models/error';
+export { loaderModel, loaderModelName } from './models/loader';
 export * from './applicationTypes';
 export type { ApplicationImpl } from './application';
 export type { IRuntimeConfig } from './runtimeConfigTypes';

package/esm/shared/index.js

@@ -3,7 +3,7 @@ export * from './routerTypes';
 export * from './router';
 export * from './response';
 export * from './loader';
-export { errorModel } from './models/error';
-export { loaderModel } from './models/loader';
+export { errorModel, errorModelName } from './models/error';
+export { loaderModel, loaderModelName } from './models/loader';
 export * from './applicationTypes';
 export { createRuntimePlugin, createRuntimePluginBefore, createRuntimePluginAfter } from './runtimPlugin';

package/esm/shared/models/error.d.ts

@@ -1,13 +1,10 @@
 import { IErrorState, IError } from '../applicationTypes';
-export declare const errorModel: import("@shuvi/redox/esm/core/defineModel").DefineModel<"error", IErrorState, {
-    setError(_state: IErrorState, error?: IError): {
-        error: IError | undefined;
-    };
-}, {
-    set(payload?: IError): void;
+export declare const errorModelName = "error";
+export declare const errorModel: import("doura").DefineModel<IErrorState, {
+    set(error?: IError): void;
     clear(): void;
 }, {
-    errorObject(): IError | undefined;
+    errorObject(): IError | null;
     hasError(): boolean;
-}, {}>;
+}, unknown>;
 export declare type ErrorModel = typeof errorModel;

package/esm/shared/models/error.js

@@ -1,23 +1,18 @@
-import { defineModel } from '@shuvi/redox';
+import { defineModel } from 'doura';
 import { SHUVI_ERROR } from '@shuvi/shared/lib/constants';
-const DEFAULT_ERRORSTATE = {
-    error: undefined
+const DEFAULT_ERROR_STATE = {
+    error: null
 };
+export const errorModelName = 'error';
 export const errorModel = defineModel({
-    name: 'error',
-    state: DEFAULT_ERRORSTATE,
-    reducers: {
-        setError(_state, error) {
-            return Object.assign(Object.assign({}, _state), { error: error });
-        }
-    },
+    state: DEFAULT_ERROR_STATE,
     actions: {
-        set(payload) {
-            this.setError(payload || SHUVI_ERROR.APP_ERROR);
+        set(error = SHUVI_ERROR.APP_ERROR) {
+            this.error = error;
         },
         clear() {
             if (this.hasError) {
-                this.setError(undefined);
+                this.error = null;
             }
         }
     },
@@ -26,7 +21,7 @@ export const errorModel = defineModel({
             return this.error;
         },
         hasError() {
-            return typeof this.error !== 'undefined';
+            return this.error !== null;
         }
     }
 });

package/esm/shared/models/loader.d.ts

@@ -1,13 +1,10 @@
 export interface LoaderState {
     dataByRouteId: Record<string, any>;
 }
-export declare const loaderModel: import("@shuvi/redox/esm/core/defineModel").DefineModel<"loader", LoaderState, {
-    setDatas(state: LoaderState, newData: Record<string, any>): {
-        dataByRouteId: {
-            [x: string]: any;
-        };
-    };
-}, import("@shuvi/redox/esm/core/defineModel").ActionOptions, {
+export declare const loaderModelName = "loader";
+export declare const loaderModel: import("doura").DefineModel<LoaderState, {
+    setDatas(newData: Record<string, any>): void;
+}, {
     getAllData(): Record<string, any>;
-}, {}>;
+}, unknown>;
 export declare type LoaderModel = typeof loaderModel;

package/esm/shared/models/loader.js

@@ -1,20 +1,14 @@
-import { defineModel } from '@shuvi/redox';
+import { defineModel } from 'doura';
 const initState = {
     dataByRouteId: {}
 };
+export const loaderModelName = 'loader';
 export const loaderModel = defineModel({
-    name: 'loader',
     state: initState,
-    reducers: {
-        setDatas(state, newData) {
-            return Object.assign(Object.assign({}, state), { dataByRouteId: Object.assign(Object.assign({}, state.dataByRouteId), newData) });
+    actions: {
+        setDatas(newData) {
+            this.dataByRouteId = Object.assign(Object.assign({}, this.dataByRouteId), newData);
         }
-        // clearDatas(state) {
-        //   return {
-        //     ...state,
-        //     dataByRouteId: {}
-        //   };
-        // }
     },
     views: {
         getAllData() {

package/lib/shared/application.d.ts

@@ -1,5 +1,5 @@
 import { IRouter, IPageRouteRecord } from './routerTypes';
-import { RedoxStore, Application, IAppContext, ApplicationOptions, IRerenderConfig, IError } from './applicationTypes';
+import { Doura, Application, IAppContext, ApplicationOptions, IRerenderConfig, IError } from './applicationTypes';
 export declare class ApplicationImpl<Config extends {} = {}> {
     private _router;
     private _appComponent;
@@ -15,13 +15,13 @@ export declare class ApplicationImpl<Config extends {} = {}> {
     get context(): IAppContext;
     get pluginManager(): import("@shuvi/hook").HookManager<import("./runtimPlugin").RuntimePluginHooks, void>;
     get appComponent(): any;
-    get error(): IError | undefined;
+    get error(): IError | null;
     setError(err: IError): void;
     clearError(): void;
     getLoadersData(): Record<string, any>;
     setLoadersData(datas: Record<string, any>): void;
     init(): Promise<void>;
-    get store(): RedoxStore;
+    get store(): Doura;
     updateComponents({ AppComponent }?: IRerenderConfig): Promise<void>;
     dispose(): Promise<void>;
     private _initPlugin;

package/lib/shared/application.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApplicationImpl = void 0;
 const runtimPlugin_1 = require("./runtimPlugin");
 const runtimPlugin_2 = require("./runtimPlugin");
-const redox_1 = require("@shuvi/redox");
+const doura_1 = require("doura");
 const error_1 = require("./models/error");
 const loader_1 = require("./models/loader");
 class ApplicationImpl {
@@ -20,9 +20,9 @@ class ApplicationImpl {
         this._config = options.config;
         this._router = options.router;
         this._context = {};
-        this._store = (0, redox_1.redox)({ initialState: options.initialState });
-        this._error = this._store.getModel(error_1.errorModel);
-        this._loader = this._store.getModel(loader_1.loaderModel);
+        this._store = (0, doura_1.doura)({ initialState: options.initialState });
+        this._error = this._store.getModel(error_1.errorModelName, error_1.errorModel);
+        this._loader = this._store.getModel(loader_1.loaderModelName, loader_1.loaderModel);
         this._appComponent = options.AppComponent;
         this._pluginManager = (0, runtimPlugin_1.getManager)();
         (0, runtimPlugin_2.initPlugins)(this._pluginManager, options.plugins || []);

package/lib/shared/applicationTypes.d.ts

@@ -1,4 +1,4 @@
-import { RedoxStore } from '@shuvi/redox';
+import { Doura } from 'doura';
 import { CustomAppContext } from '@shuvi/runtime';
 import { IRouter, IPageRouteRecord } from './routerTypes';
 import { IPluginList } from './runtimPlugin';
@@ -8,7 +8,7 @@ export interface IAppContext extends CustomAppContext {
 export declare type IRerenderConfig = {
     AppComponent?: any;
 };
-export type { RedoxStore };
+export type { Doura };
 export declare type ErrorSource = 'server';
 export interface IError {
     code?: number;
@@ -18,18 +18,18 @@ export interface IError {
     source?: ErrorSource;
 }
 export interface IErrorState {
-    error?: IError;
+    error: IError | null;
 }
 export declare type IAppState = {
-    error?: IErrorState;
+    error: IErrorState;
 };
 export interface Application<Config extends {} = {}> {
     readonly config: Config;
     readonly context: IAppContext;
     readonly router: IRouter<IPageRouteRecord>;
     readonly appComponent: any;
-    readonly store: RedoxStore;
-    readonly error: IError | undefined;
+    readonly store: Doura;
+    readonly error: IErrorState['error'];
     setError(err: IError): void;
     clearError(): void;
     getLoadersData(): Record<string, any>;

package/lib/shared/index.d.ts

@@ -3,8 +3,8 @@ export * from './routerTypes';
 export * from './router';
 export * from './response';
 export * from './loader';
-export { errorModel } from './models/error';
-export { loaderModel } from './models/loader';
+export { errorModel, errorModelName } from './models/error';
+export { loaderModel, loaderModelName } from './models/loader';
 export * from './applicationTypes';
 export type { ApplicationImpl } from './application';
 export type { IRuntimeConfig } from './runtimeConfigTypes';

package/lib/shared/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRuntimePluginAfter = exports.createRuntimePluginBefore = exports.createRuntimePlugin = exports.loaderModel = exports.errorModel = void 0;
+exports.createRuntimePluginAfter = exports.createRuntimePluginBefore = exports.createRuntimePlugin = exports.loaderModelName = exports.loaderModel = exports.errorModelName = exports.errorModel = void 0;
 __exportStar(require("./helper"), exports);
 __exportStar(require("./routerTypes"), exports);
 __exportStar(require("./router"), exports);
@@ -22,8 +22,10 @@ __exportStar(require("./response"), exports);
 __exportStar(require("./loader"), exports);
 var error_1 = require("./models/error");
 Object.defineProperty(exports, "errorModel", { enumerable: true, get: function () { return error_1.errorModel; } });
+Object.defineProperty(exports, "errorModelName", { enumerable: true, get: function () { return error_1.errorModelName; } });
 var loader_1 = require("./models/loader");
 Object.defineProperty(exports, "loaderModel", { enumerable: true, get: function () { return loader_1.loaderModel; } });
+Object.defineProperty(exports, "loaderModelName", { enumerable: true, get: function () { return loader_1.loaderModelName; } });
 __exportStar(require("./applicationTypes"), exports);
 var runtimPlugin_1 = require("./runtimPlugin");
 Object.defineProperty(exports, "createRuntimePlugin", { enumerable: true, get: function () { return runtimPlugin_1.createRuntimePlugin; } });

package/lib/shared/models/error.d.ts

@@ -1,13 +1,10 @@
 import { IErrorState, IError } from '../applicationTypes';
-export declare const errorModel: import("@shuvi/redox/esm/core/defineModel").DefineModel<"error", IErrorState, {
-    setError(_state: IErrorState, error?: IError): {
-        error: IError | undefined;
-    };
-}, {
-    set(payload?: IError): void;
+export declare const errorModelName = "error";
+export declare const errorModel: import("doura").DefineModel<IErrorState, {
+    set(error?: IError): void;
     clear(): void;
 }, {
-    errorObject(): IError | undefined;
+    errorObject(): IError | null;
     hasError(): boolean;
-}, {}>;
+}, unknown>;
 export declare type ErrorModel = typeof errorModel;

package/lib/shared/models/error.js

@@ -1,26 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.errorModel = void 0;
-const redox_1 = require("@shuvi/redox");
+exports.errorModel = exports.errorModelName = void 0;
+const doura_1 = require("doura");
 const constants_1 = require("@shuvi/shared/lib/constants");
-const DEFAULT_ERRORSTATE = {
-    error: undefined
+const DEFAULT_ERROR_STATE = {
+    error: null
 };
-exports.errorModel = (0, redox_1.defineModel)({
-    name: 'error',
-    state: DEFAULT_ERRORSTATE,
-    reducers: {
-        setError(_state, error) {
-            return Object.assign(Object.assign({}, _state), { error: error });
-        }
-    },
+exports.errorModelName = 'error';
+exports.errorModel = (0, doura_1.defineModel)({
+    state: DEFAULT_ERROR_STATE,
     actions: {
-        set(payload) {
-            this.setError(payload || constants_1.SHUVI_ERROR.APP_ERROR);
+        set(error = constants_1.SHUVI_ERROR.APP_ERROR) {
+            this.error = error;
         },
         clear() {
             if (this.hasError) {
-                this.setError(undefined);
+                this.error = null;
             }
         }
     },
@@ -29,7 +24,7 @@ exports.errorModel = (0, redox_1.defineModel)({
             return this.error;
         },
         hasError() {
-            return typeof this.error !== 'undefined';
+            return this.error !== null;
         }
     }
 });

package/lib/shared/models/loader.d.ts

@@ -1,13 +1,10 @@
 export interface LoaderState {
     dataByRouteId: Record<string, any>;
 }
-export declare const loaderModel: import("@shuvi/redox/esm/core/defineModel").DefineModel<"loader", LoaderState, {
-    setDatas(state: LoaderState, newData: Record<string, any>): {
-        dataByRouteId: {
-            [x: string]: any;
-        };
-    };
-}, import("@shuvi/redox/esm/core/defineModel").ActionOptions, {
+export declare const loaderModelName = "loader";
+export declare const loaderModel: import("doura").DefineModel<LoaderState, {
+    setDatas(newData: Record<string, any>): void;
+}, {
     getAllData(): Record<string, any>;
-}, {}>;
+}, unknown>;
 export declare type LoaderModel = typeof loaderModel;

package/lib/shared/models/loader.js

@@ -1,23 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loaderModel = void 0;
-const redox_1 = require("@shuvi/redox");
+exports.loaderModel = exports.loaderModelName = void 0;
+const doura_1 = require("doura");
 const initState = {
     dataByRouteId: {}
 };
-exports.loaderModel = (0, redox_1.defineModel)({
-    name: 'loader',
+exports.loaderModelName = 'loader';
+exports.loaderModel = (0, doura_1.defineModel)({
     state: initState,
-    reducers: {
-        setDatas(state, newData) {
-            return Object.assign(Object.assign({}, state), { dataByRouteId: Object.assign(Object.assign({}, state.dataByRouteId), newData) });
+    actions: {
+        setDatas(newData) {
+            this.dataByRouteId = Object.assign(Object.assign({}, this.dataByRouteId), newData);
         }
-        // clearDatas(state) {
-        //   return {
-        //     ...state,
-        //     dataByRouteId: {}
-        //   };
-        // }
     },
     views: {
         getAllData() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-shared",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -83,17 +83,17 @@
     "node": ">= 12.0.0"
   },
   "dependencies": {
-    "@shuvi/hook": "1.0.4",
-    "@shuvi/redox": "0.0.7",
-    "@shuvi/router": "1.0.4",
-    "@shuvi/runtime": "1.0.4",
-    "@shuvi/shared": "1.0.4",
-    "@shuvi/toolpack": "1.0.4",
-    "@shuvi/utils": "1.0.4",
+    "@shuvi/hook": "1.0.6",
+    "doura": "0.0.3",
+    "@shuvi/router": "1.0.6",
+    "@shuvi/runtime": "1.0.6",
+    "@shuvi/shared": "1.0.6",
+    "@shuvi/toolpack": "1.0.6",
+    "@shuvi/utils": "1.0.6",
     "redux": "4.1.2"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.4"
+    "@shuvi/service": "1.0.6"
   },
   "devDependencies": {
     "@shuvi/service": "workspace:*",