@shuvi/platform-shared 1.0.37 → 1.0.39

package/esm/shared/application.d.ts

@@ -1,4 +1,4 @@
-import { IRouter, IPageRouteRecord } from './routerTypes';
+import { IRouter } from './routerTypes';
 import { Doura, Application, IAppContext, ApplicationInternalOptions, IRerenderConfig, IError } from './applicationTypes';
 export declare class ApplicationImpl<Config extends {} = {}> {
     private _router;
@@ -11,7 +11,7 @@ export declare class ApplicationImpl<Config extends {} = {}> {
     private _loader;
     private _getLoaders;
     constructor(options: ApplicationInternalOptions<Config>);
-    get router(): IRouter<IPageRouteRecord>;
+    get router(): IRouter;
     get config(): Config;
     get context(): IAppContext;
     get pluginManager(): import("@shuvi/hook").HookManager<import("./runtimPlugin").RuntimePluginHooks, void>;

package/esm/shared/application.js

@@ -62,8 +62,8 @@ export class ApplicationImpl {
         return __awaiter(this, void 0, void 0, function* () {
             yield this._initPlugin();
             yield this._initAppContext();
-            yield this._initAppComponent();
             this._router.init();
+            yield this._initAppComponent();
         });
     }
     get store() {
@@ -89,7 +89,9 @@ export class ApplicationImpl {
     }
     _initAppContext() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this._pluginManager.runner.appContext(this._context);
+            yield this._pluginManager.runner.appContext(this._context, {
+                router: this._router
+            });
         });
     }
     _initAppComponent() {

package/esm/shared/applicationTypes.d.ts

@@ -1,6 +1,6 @@
 import { Doura } from 'doura';
 import { CustomAppContext } from '@shuvi/runtime';
-import { IRouter, IPageRouteRecord } from './routerTypes';
+import { IRouter } from './routerTypes';
 import { IPluginList } from './runtimPlugin';
 import { Loader } from './loader';
 export declare type Loaders = Record<string, Loader>;
@@ -27,7 +27,7 @@ export declare type IAppState = {
 export interface Application<Config extends {} = {}> {
     readonly config: Config;
     readonly context: IAppContext;
-    readonly router: IRouter<IPageRouteRecord>;
+    readonly router: IRouter;
     readonly appComponent: any;
     readonly store: Doura;
     readonly error: IErrorState['error'];

package/esm/shared/helper/getFilesOfRoute.d.ts

@@ -1,4 +1,4 @@
-import type { IRouter, PathRecord } from '../router';
+import type { IRouter, PathRecord } from '../routerTypes';
 export declare type RouteFile = {
     id: string;
     url: string;

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

@@ -1,9 +1,10 @@
 import { IRouteMatch, IPageRouteRecord } from '../routerTypes';
-import { Loader, LoaderContextOptions, LoaderDataRecord } from './types';
+import { Loader, LoaderContextOptions, LoaderDataRecord, IRouteLoaderContext } from './types';
 interface Result<T> {
     error?: unknown;
     result?: T;
 }
 export declare function runInParallerAndBail<T>(fns: Array<() => Promise<T> | T>): Promise<Result<T>[]>;
-export declare function runLoaders(matches: IRouteMatch<IPageRouteRecord>[], loadersByRouteId: Record<string, Loader>, { pathname, query, params, req, getAppContext }: LoaderContextOptions): Promise<LoaderDataRecord>;
+export declare function createLoaderContext({ pathname, query, params, req, getAppContext }: LoaderContextOptions): IRouteLoaderContext;
+export declare function runLoaders(matches: IRouteMatch<IPageRouteRecord>[], loadersByRouteId: Record<string, Loader>, loaderContext: IRouteLoaderContext): Promise<LoaderDataRecord>;
 export {};

package/esm/shared/loader/loader.js

@@ -71,13 +71,17 @@ function errorHelper(msg, statusCode = 500) {
     invariant(statusCode >= 400 && statusCode < 600, 'status code should be 4xx and 5xx');
     throw response(msg, { status: statusCode });
 }
-export function runLoaders(matches, loadersByRouteId, { pathname, query, params, req, getAppContext }) {
+export function createLoaderContext({ pathname, query, params, req, getAppContext }) {
+    return Object.assign({ pathname,
+        params,
+        query, redirect: redirectHelper, error: errorHelper, appContext: getAppContext() }, (req ? { req } : {}));
+}
+export function runLoaders(matches, loadersByRouteId, loaderContext) {
     return __awaiter(this, void 0, void 0, function* () {
         const loaderDatas = {};
         if (!matches.length) {
             return loaderDatas;
         }
-        const appContext = getAppContext();
         const createLoader = (match) => () => __awaiter(this, void 0, void 0, function* () {
             const loaderFn = loadersByRouteId[match.route.id];
             if (typeof loaderFn !== 'function') {
@@ -86,9 +90,7 @@ export function runLoaders(matches, loadersByRouteId, { pathname, query, params,
             let res;
             let error;
             try {
-                const value = yield loaderFn(Object.assign({ pathname,
-                    params,
-                    query, redirect: redirectHelper, error: errorHelper, appContext }, (req ? { req } : {})));
+                const value = yield loaderFn(loaderContext);
                 if (value === undefined) {
                     error = new Error(`You defined a loader for route "${match.route.path}" but didn't return ` +
                         `anything from your \`loader\` function. Please return a value or \`null\`.`);

package/esm/shared/router.d.ts

@@ -1 +1 @@
-export { IRouter, PathRecord, matchPathname, rankRouteBranches, parseQuery, createRouter, createBrowserHistory, createHashHistory, createMemoryHistory } from '@shuvi/router';
+export { matchPathname, rankRouteBranches, parseQuery, createRouter, createBrowserHistory, createHashHistory, createMemoryHistory } from '@shuvi/router';

package/esm/shared/routerTypes.d.ts

@@ -1,7 +1,9 @@
 import { ParsedQuery, IParams, IRouteRecord } from '@shuvi/router';
-export { IRouter, IRoute, IRouteMatch } from '@shuvi/router';
+import { IRouter as IRouter_, IRoute, IRouteMatch, PathRecord } from '@shuvi/router';
+export { IRoute, IRouteMatch, PathRecord };
 export declare type IURLQuery = ParsedQuery;
 export declare type IURLParams = IParams;
+export declare type IRouter = IRouter_<IPageRouteRecord>;
 export interface IPageRouteRecord extends IRouteRecord {
     id: string;
     path: string;

package/esm/shared/runtimPlugin.d.ts

@@ -1,15 +1,19 @@
 import { IPluginInstance, IPluginHandlers, HookMap } from '@shuvi/hook';
 import { CustomRuntimePluginHooks } from '@shuvi/runtime';
 import { IAppContext } from './applicationTypes';
+import { IRouter } from './routerTypes';
 export declare type AppComponent = unknown;
+export declare type AppContextCtx = {
+    router: IRouter;
+};
 declare const init: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-declare const appContext: import("@shuvi/hook").AsyncSeriesHook<IAppContext, void, void>;
+declare const appContext: import("@shuvi/hook").AsyncSeriesHook<IAppContext, AppContextCtx, void>;
 declare const appComponent: import("@shuvi/hook").AsyncSeriesWaterfallHook<unknown, IAppContext>;
 declare const dispose: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
 export interface BuiltInRuntimePluginHooks extends HookMap {
     init: typeof init;
-    appComponent: typeof appComponent;
     appContext: typeof appContext;
+    appComponent: typeof appComponent;
     dispose: typeof dispose;
 }
 export interface RuntimePluginHooks extends BuiltInRuntimePluginHooks, CustomRuntimePluginHooks {

package/lib/shared/application.d.ts

@@ -1,4 +1,4 @@
-import { IRouter, IPageRouteRecord } from './routerTypes';
+import { IRouter } from './routerTypes';
 import { Doura, Application, IAppContext, ApplicationInternalOptions, IRerenderConfig, IError } from './applicationTypes';
 export declare class ApplicationImpl<Config extends {} = {}> {
     private _router;
@@ -11,7 +11,7 @@ export declare class ApplicationImpl<Config extends {} = {}> {
     private _loader;
     private _getLoaders;
     constructor(options: ApplicationInternalOptions<Config>);
-    get router(): IRouter<IPageRouteRecord>;
+    get router(): IRouter;
     get config(): Config;
     get context(): IAppContext;
     get pluginManager(): import("@shuvi/hook").HookManager<import("./runtimPlugin").RuntimePluginHooks, void>;

package/lib/shared/application.js

@@ -65,8 +65,8 @@ class ApplicationImpl {
         return __awaiter(this, void 0, void 0, function* () {
             yield this._initPlugin();
             yield this._initAppContext();
-            yield this._initAppComponent();
             this._router.init();
+            yield this._initAppComponent();
         });
     }
     get store() {
@@ -92,7 +92,9 @@ class ApplicationImpl {
     }
     _initAppContext() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this._pluginManager.runner.appContext(this._context);
+            yield this._pluginManager.runner.appContext(this._context, {
+                router: this._router
+            });
         });
     }
     _initAppComponent() {

package/lib/shared/applicationTypes.d.ts

@@ -1,6 +1,6 @@
 import { Doura } from 'doura';
 import { CustomAppContext } from '@shuvi/runtime';
-import { IRouter, IPageRouteRecord } from './routerTypes';
+import { IRouter } from './routerTypes';
 import { IPluginList } from './runtimPlugin';
 import { Loader } from './loader';
 export declare type Loaders = Record<string, Loader>;
@@ -27,7 +27,7 @@ export declare type IAppState = {
 export interface Application<Config extends {} = {}> {
     readonly config: Config;
     readonly context: IAppContext;
-    readonly router: IRouter<IPageRouteRecord>;
+    readonly router: IRouter;
     readonly appComponent: any;
     readonly store: Doura;
     readonly error: IErrorState['error'];

package/lib/shared/helper/getFilesOfRoute.d.ts

@@ -1,4 +1,4 @@
-import type { IRouter, PathRecord } from '../router';
+import type { IRouter, PathRecord } from '../routerTypes';
 export declare type RouteFile = {
     id: string;
     url: string;

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

@@ -1,9 +1,10 @@
 import { IRouteMatch, IPageRouteRecord } from '../routerTypes';
-import { Loader, LoaderContextOptions, LoaderDataRecord } from './types';
+import { Loader, LoaderContextOptions, LoaderDataRecord, IRouteLoaderContext } from './types';
 interface Result<T> {
     error?: unknown;
     result?: T;
 }
 export declare function runInParallerAndBail<T>(fns: Array<() => Promise<T> | T>): Promise<Result<T>[]>;
-export declare function runLoaders(matches: IRouteMatch<IPageRouteRecord>[], loadersByRouteId: Record<string, Loader>, { pathname, query, params, req, getAppContext }: LoaderContextOptions): Promise<LoaderDataRecord>;
+export declare function createLoaderContext({ pathname, query, params, req, getAppContext }: LoaderContextOptions): IRouteLoaderContext;
+export declare function runLoaders(matches: IRouteMatch<IPageRouteRecord>[], loadersByRouteId: Record<string, Loader>, loaderContext: IRouteLoaderContext): Promise<LoaderDataRecord>;
 export {};

package/lib/shared/loader/loader.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runLoaders = exports.runInParallerAndBail = void 0;
+exports.runLoaders = exports.createLoaderContext = exports.runInParallerAndBail = void 0;
 const invariant_1 = __importDefault(require("@shuvi/utils/invariant"));
 const response_1 = require("../response");
 // todo: add unit tests
@@ -78,13 +78,18 @@ function errorHelper(msg, statusCode = 500) {
     (0, invariant_1.default)(statusCode >= 400 && statusCode < 600, 'status code should be 4xx and 5xx');
     throw (0, response_1.response)(msg, { status: statusCode });
 }
-function runLoaders(matches, loadersByRouteId, { pathname, query, params, req, getAppContext }) {
+function createLoaderContext({ pathname, query, params, req, getAppContext }) {
+    return Object.assign({ pathname,
+        params,
+        query, redirect: redirectHelper, error: errorHelper, appContext: getAppContext() }, (req ? { req } : {}));
+}
+exports.createLoaderContext = createLoaderContext;
+function runLoaders(matches, loadersByRouteId, loaderContext) {
     return __awaiter(this, void 0, void 0, function* () {
         const loaderDatas = {};
         if (!matches.length) {
             return loaderDatas;
         }
-        const appContext = getAppContext();
         const createLoader = (match) => () => __awaiter(this, void 0, void 0, function* () {
             const loaderFn = loadersByRouteId[match.route.id];
             if (typeof loaderFn !== 'function') {
@@ -93,9 +98,7 @@ function runLoaders(matches, loadersByRouteId, { pathname, query, params, req, g
             let res;
             let error;
             try {
-                const value = yield loaderFn(Object.assign({ pathname,
-                    params,
-                    query, redirect: redirectHelper, error: errorHelper, appContext }, (req ? { req } : {})));
+                const value = yield loaderFn(loaderContext);
                 if (value === undefined) {
                     error = new Error(`You defined a loader for route "${match.route.path}" but didn't return ` +
                         `anything from your \`loader\` function. Please return a value or \`null\`.`);

package/lib/shared/router.d.ts

@@ -1 +1 @@
-export { IRouter, PathRecord, matchPathname, rankRouteBranches, parseQuery, createRouter, createBrowserHistory, createHashHistory, createMemoryHistory } from '@shuvi/router';
+export { matchPathname, rankRouteBranches, parseQuery, createRouter, createBrowserHistory, createHashHistory, createMemoryHistory } from '@shuvi/router';

package/lib/shared/routerTypes.d.ts

@@ -1,7 +1,9 @@
 import { ParsedQuery, IParams, IRouteRecord } from '@shuvi/router';
-export { IRouter, IRoute, IRouteMatch } from '@shuvi/router';
+import { IRouter as IRouter_, IRoute, IRouteMatch, PathRecord } from '@shuvi/router';
+export { IRoute, IRouteMatch, PathRecord };
 export declare type IURLQuery = ParsedQuery;
 export declare type IURLParams = IParams;
+export declare type IRouter = IRouter_<IPageRouteRecord>;
 export interface IPageRouteRecord extends IRouteRecord {
     id: string;
     path: string;

package/lib/shared/runtimPlugin.d.ts

@@ -1,15 +1,19 @@
 import { IPluginInstance, IPluginHandlers, HookMap } from '@shuvi/hook';
 import { CustomRuntimePluginHooks } from '@shuvi/runtime';
 import { IAppContext } from './applicationTypes';
+import { IRouter } from './routerTypes';
 export declare type AppComponent = unknown;
+export declare type AppContextCtx = {
+    router: IRouter;
+};
 declare const init: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-declare const appContext: import("@shuvi/hook").AsyncSeriesHook<IAppContext, void, void>;
+declare const appContext: import("@shuvi/hook").AsyncSeriesHook<IAppContext, AppContextCtx, void>;
 declare const appComponent: import("@shuvi/hook").AsyncSeriesWaterfallHook<unknown, IAppContext>;
 declare const dispose: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
 export interface BuiltInRuntimePluginHooks extends HookMap {
     init: typeof init;
-    appComponent: typeof appComponent;
     appContext: typeof appContext;
+    appComponent: typeof appComponent;
     dispose: typeof dispose;
 }
 export interface RuntimePluginHooks extends BuiltInRuntimePluginHooks, CustomRuntimePluginHooks {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-shared",
-  "version": "1.0.37",
+  "version": "1.0.39",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -83,16 +83,16 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@shuvi/hook": "1.0.37",
+    "@shuvi/hook": "1.0.39",
     "doura": "0.0.13",
-    "@shuvi/router": "1.0.37",
-    "@shuvi/runtime": "1.0.37",
-    "@shuvi/shared": "1.0.37",
-    "@shuvi/toolpack": "1.0.37",
-    "@shuvi/utils": "1.0.37"
+    "@shuvi/router": "1.0.39",
+    "@shuvi/runtime": "1.0.39",
+    "@shuvi/shared": "1.0.39",
+    "@shuvi/toolpack": "1.0.39",
+    "@shuvi/utils": "1.0.39"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.37"
+    "@shuvi/service": "1.0.39"
   },
   "devDependencies": {
     "@shuvi/service": "workspace:*",