|
1 | | -import { middlewarePipeline } from './helpers/middlewarePipeline' |
2 | | -import { retuenMiddlewareArray } from './helpers/returnMiddlewareArray' |
| 1 | +import { middlewarePipeline } from './core/middlewarePipeline' |
| 2 | +import { prepareMiddlewarePipelinePayload as preparePipelinePayload } from './helpers/prepareMiddlewareiPiplinePayload' |
3 | 3 | import { BasePluginError } from './lib/Exceptions/BasePluginError' |
4 | 4 | import { OptionsMissingPluginError } from './lib/Exceptions/OptionsMissingPluginError' |
5 | 5 | import { Middleware } from './types/MiddlewareTypes' |
@@ -31,7 +31,7 @@ export const install: Install<Router | PluginOptions> = ( |
31 | 31 |
|
32 | 32 | /* istanbul ignore if */ |
33 | 33 | if (middleware !== undefined) { |
34 | | - globalMiddlewares = retuenMiddlewareArray(middleware) |
| 34 | + globalMiddlewares = preparePipelinePayload(middleware) |
35 | 35 | } |
36 | 36 |
|
37 | 37 | if (_context !== undefined) { |
@@ -60,20 +60,20 @@ export const install: Install<Router | PluginOptions> = ( |
60 | 60 | if (typeof to.meta.middleware === 'object') { |
61 | 61 | let ignores: Middleware[] = [] |
62 | 62 | if ('attach' in to.meta.middleware) { |
63 | | - middlewares = retuenMiddlewareArray( |
| 63 | + middlewares = preparePipelinePayload( |
64 | 64 | to.meta.middleware.attach, |
65 | 65 | middlewares |
66 | 66 | ) |
67 | 67 | } |
68 | 68 | if ('ignore' in to.meta.middleware) { |
69 | | - ignores = retuenMiddlewareArray(to.meta.middleware.ignore) |
| 69 | + ignores = preparePipelinePayload(to.meta.middleware.ignore) |
70 | 70 | } |
71 | 71 |
|
72 | 72 | middlewares = middlewares.filter( |
73 | 73 | middleware => !ignores.includes(middleware) |
74 | 74 | ) |
75 | 75 | } else { |
76 | | - middlewares = retuenMiddlewareArray(to.meta.middleware, middlewares) |
| 76 | + middlewares = preparePipelinePayload(to.meta.middleware, middlewares) |
77 | 77 | } |
78 | 78 | } |
79 | 79 | if (middlewares.length) { |
|
0 commit comments