@heathenjs/taro-router 1.0.12 → 1.1.0

package/dist/func/{getCurrentRouteKey.js → get-current-route-key.js}

@@ -13,4 +13,4 @@ function getCurrentRouteKey() {
     // TODO: taro官方缺少类型定义，as any过渡一下
     return taro_1.default.Current.page[constants_1.ROUTE_KEY];
 }
-//# sourceMappingURL=getCurrentRouteKey.js.map
+//# sourceMappingURL=get-current-route-key.js.map

package/dist/func/get-current-route-key.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-current-route-key.js","sourceRoot":"","sources":["../../src/func/get-current-route-key.ts"],"names":[],"mappings":";;;;;AAGA,gDAMC;AATD,wDAAgC;AAChC,4CAAyC;AAEzC,SAAgB,kBAAkB;IAChC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACvB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,gCAAgC;IAChC,OAAQ,cAAI,CAAC,OAAO,CAAC,IAAY,CAAC,qBAAS,CAAC,CAAC;AAC/C,CAAC"}

package/dist/func/index.d.ts

@@ -1,2 +1,3 @@
-export * from './getCurrentRouteKey';
-export * from './isNil';
+export * from './get-current-route-key';
+export * from './is-nil';
+export * from './merge-props';

package/dist/func/index.js

@@ -14,6 +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 });
-__exportStar(require("./getCurrentRouteKey"), exports);
-__exportStar(require("./isNil"), exports);
+__exportStar(require("./get-current-route-key"), exports);
+__exportStar(require("./is-nil"), exports);
+__exportStar(require("./merge-props"), exports);
 //# sourceMappingURL=index.js.map

package/dist/func/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/func/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAqC;AACrC,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/func/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0DAAwC;AACxC,2CAAyB;AACzB,gDAA8B"}

package/dist/func/{isNil.js → is-nil.js}

@@ -4,4 +4,4 @@ exports.isNil = isNil;
 function isNil(val) {
     return val === undefined || val === null;
 }
-//# sourceMappingURL=isNil.js.map
+//# sourceMappingURL=is-nil.js.map

package/dist/func/is-nil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-nil.js","sourceRoot":"","sources":["../../src/func/is-nil.ts"],"names":[],"mappings":";;AAAA,sBAEC;AAFD,SAAgB,KAAK,CAAC,GAAQ;IAC5B,OAAO,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,CAAC;AAC3C,CAAC"}

package/dist/func/merge-props.d.ts

@@ -0,0 +1,3 @@
+type MergeResult<T extends any[]> = T extends [infer First, ...infer Rest] ? First & MergeResult<Rest> : {};
+export declare function mergeProps<T extends object[]>(...items: [...T]): MergeResult<T>;
+export {};

package/dist/func/merge-props.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeProps = mergeProps;
+function mergeProps(...items) {
+    const result = {};
+    for (const item of items) {
+        for (const key in item) {
+            const value = item[key];
+            if (value !== undefined) {
+                result[key] = value;
+            }
+        }
+    }
+    return result;
+}
+//# sourceMappingURL=merge-props.js.map

package/dist/func/merge-props.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-props.js","sourceRoot":"","sources":["../../src/func/merge-props.ts"],"names":[],"mappings":";;AAEA,gCAaC;AAbD,SAAgB,UAAU,CAAqB,GAAG,KAAa;IAC7D,MAAM,MAAM,GAAQ,EAAE,CAAC;IAEvB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,KAAK,GAAI,IAAY,CAAC,GAAG,CAAC,CAAC;YACjC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACtB,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,MAAwB,CAAC;AAClC,CAAC"}

package/dist/router/index.d.ts

@@ -1,7 +1,12 @@
 import { NavigateOptions, Route } from './type';
 export { NavigateType } from './type';
 export type { NavigateOptions, Route } from './type';
+type RouterInitConfig = {
+    defaultExt: Record<any, any>;
+};
 export declare class Router {
+    private static defaultExt;
+    static init(initConfig: RouterInitConfig): void;
     /**
      * 页面跳转
      * @param route 目标路由对象

package/dist/router/index.js

@@ -44,6 +44,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Router = exports.NavigateType = void 0;
 const taro_1 = __importStar(require("@tarojs/taro"));
+const react_1 = require("react");
 const constants_1 = require("../constants");
 const no_page_1 = require("../exception/no-page");
 const func_1 = require("../func");
@@ -51,10 +52,12 @@ const middleware_1 = require("../middleware");
 const page_data_1 = require("../page-data");
 const router_back_listener_1 = require("../router-back-listener");
 const type_1 = require("./type");
-const react_1 = require("react");
 var type_2 = require("./type");
 Object.defineProperty(exports, "NavigateType", { enumerable: true, get: function () { return type_2.NavigateType; } });
 class Router {
+    static init(initConfig) {
+        this.defaultExt = initConfig.defaultExt;
+    }
     /**
      * 页面跳转
      * @param route 目标路由对象
@@ -96,7 +99,10 @@ class Router {
             }
             const pathToPageObj = ((_a = Router === null || Router === void 0 ? void 0 : Router['_pathToPagePackageNameObj']) !== null && _a !== void 0 ? _a : []);
             const context = {
-                route,
+                route: {
+                    url: route.url,
+                    ext: (0, func_1.mergeProps)(this.defaultExt, route.ext),
+                },
                 type: options.type,
                 params: options.params,
                 packageName: (_b = pathToPageObj[route.url]) === null || _b === void 0 ? void 0 : _b.packageName,
@@ -180,7 +186,7 @@ class Router {
         var _a;
         const urlParams = Object.assign({}, (_a = (0, taro_1.getCurrentInstance)().router) === null || _a === void 0 ? void 0 : _a.params);
         const routerParams = page_data_1.PageData.getPageData();
-        return Object.assign(Object.assign({}, urlParams), routerParams);
+        return (0, func_1.mergeProps)(urlParams, routerParams);
     }
     /**
      * 获取页面携带过来的数据，混合顺序为 路由参数 > URL参数

package/dist/router/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAiE;AACjE,iCAA+B;AAC/B,4CAAyC;AACzC,kDAAuD;AACvD,kCAAgE;AAChE,8CAA8E;AAC9E,4CAAwC;AACxC,kEAAiE;AACjE,iCAAoE;AAEpE,+BAAsC;AAA7B,oGAAA,YAAY,OAAA;AAOrB,MAAa,MAAM;IAGjB,MAAM,CAAC,IAAI,CAAC,UAA4B;QACtC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;IAC1C,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAO,QAAQ,CAAU,KAAY,EAAE,OAAyB;;;YACpE,OAAO,iBAAQ,EAAE,IAAI,EAAE,mBAAY,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,EAAK,OAAO,CAAE,CAAC;YAC3E,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YACnD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;YAElC,gCAAgC;YAC/B,cAAe,CAAC,OAAO,CAAC,GAAG,cAAO,CAAC,IAAI,CAAC;YACzC,MAAM,CAAC,gBAAgB,CAAC,cAAO,EAAE;gBAC/B,IAAI,EAAE;oBACJ,GAAG,EAAE,UAAU,IAAI;wBACjB,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;4BACxC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;4BAClB,OAAO;wBACT,CAAC;wBACD,IAAI,CAAC,IAAI,CAAC,qBAAS,CAAC,EAAE,CAAC;4BACrB,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC;4BACrC,IAAI,CAAC,QAAQ,GAAG;gCACd,cAAc,IAAI,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gCAC7C,oBAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gCAC7B,UAAU,CAAC,GAAG,EAAE,CAAC,IAAA,6CAAsB,EAAC,KAAK,CAAC,CAAC,CAAC;4BAClD,CAAC,CAAC;4BACF,IAAI,CAAC,qBAAS,CAAC,GAAG,SAAS,CAAC;wBAC9B,CAAC;wBACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;oBACpB,CAAC;oBACD,GAAG,EAAE;wBACH,OAAO,IAAI,CAAC,KAAK,CAAC;oBACpB,CAAC;iBACF;aACF,CAAC,CAAC;YAEH,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,oBAAQ,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YAClD,CAAC;YAED,MAAM,aAAa,GAAG,CAAC,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,2BAA2B,CAAC,mCAAI,EAAE,CAAyB,CAAC;YAE5F,MAAM,OAAO,GAAiB;gBAC5B,KAAK,EAAE;oBACL,GAAG,EAAE,KAAK,CAAC,GAAG;oBACd,GAAG,EAAE,IAAA,iBAAU,EAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC;iBAC5C;gBACD,IAAI,EAAE,OAAO,CAAC,IAAK;gBACnB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,WAAW,EAAE,MAAA,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,0CAAE,WAAW;aACnD,CAAC;YAEF,MAAM,WAAW,GAAG,IAAA,2BAAc,EAAC,OAAO,CAAC,CAAC;YAC5C,WAAW,CAAC,IAAI,CAAC,CAAO,CAAC,EAAE,IAAI,EAAE,EAAE;gBACjC,QAAQ,OAAQ,CAAC,IAAI,EAAE,CAAC;oBACtB,KAAK,mBAAY,CAAC,QAAQ;wBACxB,MAAM,cAAI,CAAC,QAAQ,CAAC;4BAClB,GAAG,EAAE,KAAK,CAAC,GAAG;4BACd,QAAQ,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ;4BAC3B,IAAI,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI;4BACnB,OAAO,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO;yBAC1B,CAAC,CAAC;wBACH,MAAM;oBACR,KAAK,mBAAY,CAAC,UAAU;wBAC1B,MAAM,cAAI,CAAC,UAAU,CAAC;4BACpB,GAAG,EAAE,KAAK,CAAC,GAAG;4BACd,QAAQ,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ;4BAC3B,IAAI,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI;4BACnB,OAAO,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO;yBAC1B,CAAC,CAAC;wBACH,MAAM;oBACR,KAAK,mBAAY,CAAC,SAAS;wBACzB,MAAM,cAAI,CAAC,SAAS,CAAC;4BACnB,GAAG,EAAE,KAAK,CAAC,GAAG;4BACd,QAAQ,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ;4BAC3B,IAAI,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI;4BACnB,OAAO,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO;yBAC1B,CAAC,CAAC;wBACH,MAAM;oBACR;wBACE,MAAM,cAAI,CAAC,UAAU,CAAC;4BACpB,GAAG,EAAE,KAAK,CAAC,GAAG;4BACd,QAAQ,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ;4BAC3B,IAAI,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI;4BACnB,OAAO,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO;yBAC1B,CAAC,CAAC;wBACH,MAAM;gBACV,CAAC;gBACD,IAAI,EAAE,CAAC;YACT,CAAC,CAAA,CAAC,CAAC;YAEH,OAAO,IAAI,OAAO,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;gBACpC,IAAI,CAAC;oBACH,oBAAQ,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;oBACjD,MAAM,IAAA,4BAAe,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBAC9C,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,GAAG,CAAC,GAAG,CAAC,CAAC;gBACX,CAAC;YACH,CAAC,CAAA,CAAC,CAAC;QACL,CAAC;KAAA;IAED;;;;OAIG;IACH,MAAM,CAAC,IAAI,CACT,MAAgB,EAChB,OAGC;QAED,IAAI,CAAC,IAAA,YAAK,EAAC,MAAM,CAAC,EAAE,CAAC;YACnB,oBAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC;QAED,MAAM,YAAY,GAAG,cAAI,CAAC,eAAe,EAAE,CAAC;QAC5C,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,OAAO,cAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,IAAI,yBAAe,EAAE,CAAC;IAC9B,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,aAAa,CAAC,MAAW;QAC9B,oBAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,SAAS;;QACd,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,MAAA,IAAA,yBAAkB,GAAE,CAAC,MAAM,0CAAE,MAAM,CAAM,CAAC;QAC9E,MAAM,YAAY,GAAG,oBAAQ,CAAC,WAAW,EAAK,CAAC;QAC/C,OAAO,IAAA,iBAAU,EAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IAC7C,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,SAAS;QACd,sDAAsD;QACtD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,cAAM,EAAC;YACzB,GAAG,EAAE,EAAO;YACZ,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,WAAW,KAAK,KAAK,EAAE,CAAC;YAClC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAC/B,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;QAC7B,CAAC;QACD,OAAO,OAAO,CAAC,GAAG,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,SAAS,CAAqC,KAAQ;QAC3D,MAAM,SAAS,GAAG,IAAA,yBAAkB,GAAE,CAAC;QACvC,oBAAQ,CAAC,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC;CACF;AA3KD,wBA2KC"}

package/dist/router-back-listener/index.d.ts

@@ -1,5 +1,5 @@
-import { RouterBackListener } from './type';
 import { Route } from '../router';
+import { RouterBackListener } from './type';
 export type { RouterBackListener };
 export declare const routerBackListenerCollection: RouterBackListener[];
 /** 注册全局路由返回监听 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heathenjs/taro-router",
-  "version": "1.0.12",
+  "version": "1.1.0",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/func/index.ts

@@ -1,2 +1,3 @@
-export * from './getCurrentRouteKey';
-export * from './isNil';
+export * from './get-current-route-key';
+export * from './is-nil';
+export * from './merge-props';

package/src/func/merge-props.ts

@@ -0,0 +1,16 @@
+type MergeResult<T extends any[]> = T extends [infer First, ...infer Rest] ? First & MergeResult<Rest> : {};
+
+export function mergeProps<T extends object[]>(...items: [...T]): MergeResult<T> {
+  const result: any = {};
+
+  for (const item of items) {
+    for (const key in item) {
+      const value = (item as any)[key];
+      if (value !== undefined) {
+        result[key] = value;
+      }
+    }
+  }
+
+  return result as MergeResult<T>;
+}

package/src/router/index.ts

@@ -1,17 +1,27 @@
 import Taro, { Current, getCurrentInstance } from '@tarojs/taro';
+import { useRef } from 'react';
 import { ROUTE_KEY } from '../constants';
 import { NoPageException } from '../exception/no-page';
-import { getCurrentRouteKey, isNil } from '../func';
+import { getCurrentRouteKey, isNil, mergeProps } from '../func';
 import { execMiddlewares, getMiddlewares, RouteContext } from '../middleware';
 import { PageData } from '../page-data';
 import { execRouterBackListener } from '../router-back-listener';
 import { NavigateOptions, NavigateType, Page, Route } from './type';
-import { useRef } from 'react';
 
 export { NavigateType } from './type';
 export type { NavigateOptions, Route } from './type';
 
+type RouterInitConfig = {
+  defaultExt: Record<any, any>;
+};
+
 export class Router {
+  private static defaultExt: object;
+
+  static init(initConfig: RouterInitConfig) {
+    this.defaultExt = initConfig.defaultExt;
+  }
+
   /**
    * 页面跳转
    * @param route 目标路由对象
@@ -55,7 +65,10 @@ export class Router {
     const pathToPageObj = (Router?.['_pathToPagePackageNameObj'] ?? []) as Record<string, Page>;
 
     const context: RouteContext = {
-      route,
+      route: {
+        url: route.url,
+        ext: mergeProps(this.defaultExt, route.ext),
+      },
       type: options.type!,
       params: options.params,
       packageName: pathToPageObj[route.url]?.packageName,
@@ -149,10 +162,7 @@ export class Router {
   static getParams<T extends Record<string, any> = {}>(): T {
     const urlParams = Object.assign({}, getCurrentInstance().router?.params) as T;
     const routerParams = PageData.getPageData<T>();
-    return {
-      ...urlParams,
-      ...routerParams,
-    };
+    return mergeProps(urlParams, routerParams);
   }
 
   /**

package/src/router-back-listener/index.ts

@@ -1,6 +1,6 @@
 import { Current } from '@tarojs/taro';
-import { RouterBackListener } from './type';
 import { Route } from '../router';
+import { RouterBackListener } from './type';
 
 export type { RouterBackListener };
 

package/dist/func/getCurrentRouteKey.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getCurrentRouteKey.js","sourceRoot":"","sources":["../../src/func/getCurrentRouteKey.ts"],"names":[],"mappings":";;;;;AAGA,gDAMC;AATD,wDAAgC;AAChC,4CAAyC;AAEzC,SAAgB,kBAAkB;IAChC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACvB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,gCAAgC;IAChC,OAAQ,cAAI,CAAC,OAAO,CAAC,IAAY,CAAC,qBAAS,CAAC,CAAC;AAC/C,CAAC"}

package/dist/func/isNil.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isNil.js","sourceRoot":"","sources":["../../src/func/isNil.ts"],"names":[],"mappings":";;AAAA,sBAEC;AAFD,SAAgB,KAAK,CAAC,GAAQ;IAC5B,OAAO,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,CAAC;AAC3C,CAAC"}