@heathenjs/taro-router 1.0.7 → 1.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -94,12 +94,12 @@ class Router {
94
94
  if (options.params) {
95
95
  page_data_1.PageData.setPageData(route_key, options.params);
96
96
  }
97
- const pages = ((_a = Router === null || Router === void 0 ? void 0 : Router['_pages']) !== null && _a !== void 0 ? _a : []);
97
+ const pathToPageObj = ((_a = Router === null || Router === void 0 ? void 0 : Router['_pathToPageMap']) !== null && _a !== void 0 ? _a : []);
98
98
  const context = {
99
99
  route,
100
100
  type: options.type,
101
101
  params: options.params,
102
- packageName: (_b = pages.find((page) => page.path === route.url)) === null || _b === void 0 ? void 0 : _b.packageName,
102
+ packageName: (_b = pathToPageObj[route.url]) === null || _b === void 0 ? void 0 : _b.packageName,
103
103
  };
104
104
  const middlewares = (0, middleware_1.getMiddlewares)(context);
105
105
  middlewares.push((_, next) => __awaiter(this, void 0, void 0, function* () {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@heathenjs/taro-router",
3
- "version": "1.0.7",
3
+ "version": "1.0.9",
4
4
  "description": "",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",
@@ -52,13 +52,13 @@ export class Router {
52
52
  PageData.setPageData(route_key, options.params);
53
53
  }
54
54
 
55
- const pages = (Router?.['_pages'] ?? []) as Page[];
55
+ const pathToPageObj = (Router?.['_pathToPageMap'] ?? []) as Record<string, Page>;
56
56
 
57
57
  const context: RouteContext = {
58
58
  route,
59
59
  type: options.type!,
60
60
  params: options.params,
61
- packageName: pages.find((page) => page.path === route.url)?.packageName,
61
+ packageName: pathToPageObj[route.url]?.packageName,
62
62
  };
63
63
 
64
64
  const middlewares = getMiddlewares(context);