@angular-wave/angular.ts 0.0.23 → 0.0.25
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.
- package/dist/angular-ts.esm.js +1 -1
- package/dist/angular-ts.umd.js +1 -1
- package/package.json +1 -1
- package/src/core/compile.js +2 -3
- package/src/core/parser/parse.js +2 -3
- package/src/router/directives/{stateDirectives.js → state-directives.js} +1 -2
- package/src/router/directives/{viewDirective.js → view-directive.js} +1 -1
- package/src/router/globals.js +1 -1
- package/src/router/hooks/{ignoredTransition.js → ignored-transition.js} +1 -1
- package/src/router/hooks/{redirectTo.js → redirect-to.js} +1 -1
- package/src/router/hooks/resolve.js +1 -1
- package/src/router/index.js +7 -9
- package/src/router/{locationServices.js → location-services.js} +3 -27
- package/src/router/params/{paramTypes.js → param-types.js} +3 -4
- package/src/router/params/param.js +1 -1
- package/src/router/path/{pathUtils.js → path-utils.js} +2 -2
- package/src/router/resolve/resolvable.js +2 -2
- package/src/router/resolve/{resolveContext.js → resolve-context.js} +1 -1
- package/src/router/router.js +11 -9
- package/src/router/services.js +25 -4
- package/src/router/state/{stateBuilder.js → state-builder.js} +2 -3
- package/src/router/state/{stateQueueManager.js → state-queue-manager.js} +2 -1
- package/src/router/state/{stateRegistry.js → state-registry.js} +3 -3
- package/src/router/state/{stateService.js → state-service.js} +8 -7
- package/src/router/state/views.js +1 -1
- package/src/router/{templateFactory.js → template-factory.js} +84 -48
- package/src/router/transition/{hookBuilder.js → hook-builder.js} +3 -3
- package/src/router/transition/{transitionEventType.js → transition-event-type.js} +1 -1
- package/src/router/transition/{transitionHook.js → transition-hook.js} +2 -2
- package/src/router/transition/{transitionService.js → transition-service.js} +12 -46
- package/src/router/transition/transition.js +8 -40
- package/src/router/url/{urlConfig.js → url-config.js} +1 -1
- package/src/router/url/{urlMatcherFactory.js → url-matcher-factory.js} +1 -1
- package/src/router/url/{urlMatcher.js → url-matcher.js} +0 -2
- package/src/router/url/{urlRouter.js → url-router.js} +1 -5
- package/src/router/url/{urlRule.js → url-rule.js} +4 -4
- package/src/router/url/{urlRules.js → url-rules.js} +3 -4
- package/src/router/url/{urlService.js → url-service.js} +10 -6
- package/src/router/view/view.js +1 -5
- package/src/shared/common.js +0 -2
- package/src/shared/strings.js +2 -2
- package/test/router/view.spec.js +5 -5
- package/test/test-utils.js +9 -0
- package/types/router/legacy/resolveService.d.ts +1 -1
- package/types/router/statebuilders/onEnterExitRetain.d.ts +1 -1
- package/types/router/statebuilders/views.d.ts +1 -2
- /package/src/router/hooks/{coreResolvables.js → core-resolvables.js} +0 -0
- /package/src/router/hooks/{invalidTransition.js → invalid-transition.js} +0 -0
- /package/src/router/hooks/{lazyLoad.js → lazy-load.js} +0 -0
- /package/src/router/hooks/{onEnterExitRetain.js → on-enter-exit-retain.js} +0 -0
- /package/src/router/hooks/{updateGlobals.js → update-globals.js} +0 -0
- /package/src/router/params/{paramType.js → param-type.js} +0 -0
- /package/src/router/params/{stateParams.js → state-params.js} +0 -0
- /package/src/router/path/{pathNode.js → path-node.js} +0 -0
- /package/src/router/state/{stateMatcher.js → state-matcher.js} +0 -0
- /package/src/router/state/{stateObject.js → state-object.js} +0 -0
- /package/src/router/state/{targetState.js → target-state.js} +0 -0
- /package/src/router/{stateFilters.js → state-filters.js} +0 -0
- /package/src/router/{stateProvider.js → state-provider.js} +0 -0
- /package/src/router/transition/{hookRegistry.js → hook-registry.js} +0 -0
- /package/src/router/transition/{rejectFactory.js → reject-factory.js} +0 -0
- /package/src/router/{viewScroll.js → view-scroll.js} +0 -0
package/package.json
CHANGED
package/src/core/compile.js
CHANGED
|
@@ -6,7 +6,6 @@ import {
|
|
|
6
6
|
assertNotHasOwnProperty,
|
|
7
7
|
createMap,
|
|
8
8
|
forEach,
|
|
9
|
-
identity,
|
|
10
9
|
isDefined,
|
|
11
10
|
isFunction,
|
|
12
11
|
isObject,
|
|
@@ -969,7 +968,7 @@ export function $CompileProvider($provide, $$sanitizeUriProvider) {
|
|
|
969
968
|
const endSymbol = $interpolate.endSymbol();
|
|
970
969
|
const denormalizeTemplate =
|
|
971
970
|
startSymbol === "{{" && endSymbol === "}}"
|
|
972
|
-
?
|
|
971
|
+
? (x) => x
|
|
973
972
|
: function denormalizeTemplate(template) {
|
|
974
973
|
return template
|
|
975
974
|
.replace(/\{\{/g, startSymbol)
|
|
@@ -2902,7 +2901,7 @@ export function $CompileProvider($provide, $$sanitizeUriProvider) {
|
|
|
2902
2901
|
const nodeName = nodeName_(node);
|
|
2903
2902
|
const trustedContext = getTrustedPropContext(nodeName, propName);
|
|
2904
2903
|
|
|
2905
|
-
let sanitizer =
|
|
2904
|
+
let sanitizer = (x) => x;
|
|
2906
2905
|
// Sanitize img[srcset] + source[srcset] values.
|
|
2907
2906
|
if (
|
|
2908
2907
|
propName === "srcset" &&
|
package/src/core/parser/parse.js
CHANGED
|
@@ -2,7 +2,6 @@ import {
|
|
|
2
2
|
createMap,
|
|
3
3
|
csp,
|
|
4
4
|
forEach,
|
|
5
|
-
identity,
|
|
6
5
|
isDefined,
|
|
7
6
|
isFunction,
|
|
8
7
|
minErr,
|
|
@@ -2213,7 +2212,7 @@ export function $ParseProvider() {
|
|
|
2213
2212
|
var unwatch, lastValue;
|
|
2214
2213
|
|
|
2215
2214
|
var exp = parsedExpression.$$intercepted || parsedExpression;
|
|
2216
|
-
var post = parsedExpression.$$interceptor ||
|
|
2215
|
+
var post = parsedExpression.$$interceptor || ((x) => x);
|
|
2217
2216
|
|
|
2218
2217
|
var useInputs = parsedExpression.inputs && !exp.inputs;
|
|
2219
2218
|
|
|
@@ -2476,7 +2475,7 @@ export function oneTimeWatchDelegate(
|
|
|
2476
2475
|
let lastValue;
|
|
2477
2476
|
|
|
2478
2477
|
const exp = parsedExpression.$$intercepted || parsedExpression;
|
|
2479
|
-
const post = parsedExpression.$$interceptor ||
|
|
2478
|
+
const post = parsedExpression.$$interceptor || ((x) => x);
|
|
2480
2479
|
|
|
2481
2480
|
const useInputs = parsedExpression.inputs && !exp.inputs;
|
|
2482
2481
|
|
|
@@ -9,7 +9,6 @@ import {
|
|
|
9
9
|
forEach,
|
|
10
10
|
tail,
|
|
11
11
|
unnestR,
|
|
12
|
-
identity,
|
|
13
12
|
uniqR,
|
|
14
13
|
inArray,
|
|
15
14
|
removeFrom,
|
|
@@ -642,7 +641,7 @@ export let uiSrefActiveDirective = [
|
|
|
642
641
|
}
|
|
643
642
|
// Update route state
|
|
644
643
|
function update() {
|
|
645
|
-
const splitClasses = (str) => str.split(/\s/).filter(
|
|
644
|
+
const splitClasses = (str) => str.split(/\s/).filter(Boolean);
|
|
646
645
|
const getClasses = (stateList) =>
|
|
647
646
|
stateList
|
|
648
647
|
.map((x) => x.activeClass)
|
|
@@ -3,7 +3,7 @@ import { isDefined, isFunction, isString } from "../../shared/utils";
|
|
|
3
3
|
import { kebobString } from "../../shared/strings";
|
|
4
4
|
|
|
5
5
|
import { parse } from "../../shared/hof";
|
|
6
|
-
import { ResolveContext } from "../resolve/
|
|
6
|
+
import { ResolveContext } from "../resolve/resolve-context";
|
|
7
7
|
import { trace } from "../common/trace";
|
|
8
8
|
import { getLocals } from "../services";
|
|
9
9
|
import { Ng1ViewConfig } from "../state/views";
|
package/src/router/globals.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { isString, isFunction } from "../../shared/utils";
|
|
2
2
|
import { services } from "../common/coreservices";
|
|
3
|
-
import { TargetState } from "../state/
|
|
3
|
+
import { TargetState } from "../state/target-state";
|
|
4
4
|
/**
|
|
5
5
|
* A [[TransitionHookFn]] that redirects to a different state or params
|
|
6
6
|
*
|
package/src/router/index.js
CHANGED
|
@@ -6,16 +6,16 @@ import {
|
|
|
6
6
|
runBlock,
|
|
7
7
|
watchDigests,
|
|
8
8
|
} from "./services";
|
|
9
|
-
import { TemplateFactory } from "./
|
|
9
|
+
import { TemplateFactory } from "./template-factory";
|
|
10
10
|
import { trace } from "./common/trace";
|
|
11
|
-
import { $ViewScrollProvider } from "./
|
|
12
|
-
import { $IsStateFilter, $IncludedByStateFilter } from "./
|
|
11
|
+
import { $ViewScrollProvider } from "./view-scroll";
|
|
12
|
+
import { $IsStateFilter, $IncludedByStateFilter } from "./state-filters";
|
|
13
13
|
import {
|
|
14
14
|
uiSrefActiveDirective,
|
|
15
15
|
uiStateDirective,
|
|
16
16
|
uiSrefDirective,
|
|
17
|
-
} from "./directives/
|
|
18
|
-
import { uiView, $ViewDirectiveFill } from "./directives/
|
|
17
|
+
} from "./directives/state-directives";
|
|
18
|
+
import { uiView, $ViewDirectiveFill } from "./directives/view-directive";
|
|
19
19
|
|
|
20
20
|
export function initRouter() {
|
|
21
21
|
window.angular
|
|
@@ -28,9 +28,7 @@ export function initRouter() {
|
|
|
28
28
|
return router.urlMatcherFactory;
|
|
29
29
|
},
|
|
30
30
|
])
|
|
31
|
-
.provider("$templateFactory",
|
|
32
|
-
return new TemplateFactory();
|
|
33
|
-
})
|
|
31
|
+
.provider("$templateFactory", TemplateFactory)
|
|
34
32
|
.provider("$stateRegistry", getProviderFor("stateRegistry"))
|
|
35
33
|
.provider("$routerGlobals", getProviderFor("globals"))
|
|
36
34
|
.provider("$transitions", getProviderFor("transitionService"))
|
|
@@ -38,7 +36,7 @@ export function initRouter() {
|
|
|
38
36
|
.provider("$uiViewScroll", $ViewScrollProvider)
|
|
39
37
|
.factory("$stateParams", [
|
|
40
38
|
"$router",
|
|
41
|
-
function
|
|
39
|
+
function ($router) {
|
|
42
40
|
return $router.globals.params;
|
|
43
41
|
},
|
|
44
42
|
])
|
|
@@ -14,36 +14,12 @@ export class Ng1LocationServices {
|
|
|
14
14
|
constructor($locationProvider) {
|
|
15
15
|
// .onChange() registry
|
|
16
16
|
this._urlListeners = [];
|
|
17
|
-
/** @type {angular.ILocationProvider} */
|
|
18
|
-
|
|
17
|
+
/** @type {angular.ILocationProvider} */
|
|
18
|
+
this.$locationProvider = $locationProvider;
|
|
19
19
|
const _lp = val($locationProvider);
|
|
20
20
|
createProxyFunctions(_lp, this, _lp, ["hashPrefix"]);
|
|
21
21
|
}
|
|
22
|
-
|
|
23
|
-
* Applys ng1-specific path parameter encoding
|
|
24
|
-
*
|
|
25
|
-
* The Angular 1 `$location` service is a bit weird.
|
|
26
|
-
* It doesn't allow slashes to be encoded/decoded bi-directionally.
|
|
27
|
-
*
|
|
28
|
-
* See the writeup at https://github.com/angular-ui/ui-router/issues/2598
|
|
29
|
-
*
|
|
30
|
-
* This code patches the `path` parameter type so it encoded/decodes slashes as ~2F
|
|
31
|
-
*
|
|
32
|
-
* @param router
|
|
33
|
-
*/
|
|
34
|
-
static monkeyPatchPathParameterType(router) {
|
|
35
|
-
const pathType = router.urlMatcherFactory.type("path");
|
|
36
|
-
pathType.encode = (x) =>
|
|
37
|
-
x != null
|
|
38
|
-
? x.toString().replace(/(~|\/)/g, (m) => ({ "~": "~~", "/": "~2F" })[m])
|
|
39
|
-
: x;
|
|
40
|
-
pathType.decode = (x) =>
|
|
41
|
-
x != null
|
|
42
|
-
? x
|
|
43
|
-
.toString()
|
|
44
|
-
.replace(/(~~|~2F)/g, (m) => ({ "~~": "~", "~2F": "/" })[m])
|
|
45
|
-
: x;
|
|
46
|
-
}
|
|
22
|
+
|
|
47
23
|
dispose() {}
|
|
48
24
|
|
|
49
25
|
onChange(callback) {
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
fromJson,
|
|
3
3
|
toJson,
|
|
4
|
-
identity,
|
|
5
4
|
equals,
|
|
6
5
|
inherit,
|
|
7
6
|
map,
|
|
@@ -11,7 +10,7 @@ import { isNullOrUndefined } from "../../shared/predicates";
|
|
|
11
10
|
import { isDefined } from "../../shared/utils";
|
|
12
11
|
import { is } from "../../shared/hof";
|
|
13
12
|
import { services } from "../common/coreservices";
|
|
14
|
-
import { ParamType } from "./
|
|
13
|
+
import { ParamType } from "./param-type";
|
|
15
14
|
/**
|
|
16
15
|
* A registry for parameter types.
|
|
17
16
|
*
|
|
@@ -153,8 +152,8 @@ function initDefaultTypes() {
|
|
|
153
152
|
}),
|
|
154
153
|
// does not encode/decode
|
|
155
154
|
any: makeDefaultType({
|
|
156
|
-
encode:
|
|
157
|
-
decode:
|
|
155
|
+
encode: (x) => x,
|
|
156
|
+
decode: (x) => x,
|
|
158
157
|
is: () => true,
|
|
159
158
|
equals: equals,
|
|
160
159
|
}),
|
|
@@ -3,7 +3,7 @@ import { prop } from "../../shared/hof";
|
|
|
3
3
|
import { isInjectable } from "../../shared/predicates";
|
|
4
4
|
import { isDefined, isUndefined, isString } from "../../shared/utils";
|
|
5
5
|
import { services } from "../common/coreservices";
|
|
6
|
-
import { ParamType } from "./
|
|
6
|
+
import { ParamType } from "./param-type";
|
|
7
7
|
const hasOwn = Object.prototype.hasOwnProperty;
|
|
8
8
|
const isShorthand = (cfg) =>
|
|
9
9
|
["value", "type", "squash", "array", "dynamic"].filter(hasOwn.bind(cfg || {}))
|
|
@@ -9,8 +9,8 @@ import {
|
|
|
9
9
|
arrayTuples,
|
|
10
10
|
} from "../../shared/common";
|
|
11
11
|
import { prop, propEq } from "../../shared/hof";
|
|
12
|
-
import { TargetState } from "../state/
|
|
13
|
-
import { PathNode } from "./
|
|
12
|
+
import { TargetState } from "../state/target-state";
|
|
13
|
+
import { PathNode } from "./path-node";
|
|
14
14
|
/**
|
|
15
15
|
* This class contains functions which convert TargetStates, Nodes and paths from one type to another.
|
|
16
16
|
*/
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isFunction, isObject } from "../../shared/utils";
|
|
2
2
|
import { services } from "../common/coreservices";
|
|
3
3
|
import { trace } from "../common/trace";
|
|
4
4
|
import { stringify } from "../../shared/strings";
|
|
@@ -87,7 +87,7 @@ export class Resolvable {
|
|
|
87
87
|
const node = resolveContext.findNode(this);
|
|
88
88
|
const state = node && node.state;
|
|
89
89
|
const asyncPolicy = this.getPolicy(state).async;
|
|
90
|
-
const customAsyncPolicy = isFunction(asyncPolicy) ? asyncPolicy :
|
|
90
|
+
const customAsyncPolicy = isFunction(asyncPolicy) ? asyncPolicy : (x) => x;
|
|
91
91
|
// After the final value has been resolved, update the state of the Resolvable
|
|
92
92
|
const applyResolvedValue = (resolvedValue) => {
|
|
93
93
|
this.data = resolvedValue;
|
|
@@ -3,7 +3,7 @@ import { propEq, not } from "../../shared/hof";
|
|
|
3
3
|
import { trace } from "../common/trace";
|
|
4
4
|
import { services } from "../common/coreservices";
|
|
5
5
|
import { Resolvable } from "./resolvable";
|
|
6
|
-
import { PathUtils } from "../path/
|
|
6
|
+
import { PathUtils } from "../path/path-utils";
|
|
7
7
|
import { stringify } from "../../shared/strings";
|
|
8
8
|
import { isUndefined } from "../../shared/utils";
|
|
9
9
|
|
package/src/router/router.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { UrlMatcherFactory } from "./url/
|
|
2
|
-
import { UrlRouter } from "./url/
|
|
3
|
-
import { TransitionService } from "./transition/
|
|
1
|
+
import { UrlMatcherFactory } from "./url/url-matcher-factory";
|
|
2
|
+
import { UrlRouter } from "./url/url-router";
|
|
3
|
+
import { TransitionService } from "./transition/transition-service";
|
|
4
4
|
import { ViewService } from "./view/view";
|
|
5
|
-
import { StateRegistry } from "./state/
|
|
6
|
-
import { StateService } from "./state/
|
|
5
|
+
import { StateRegistry } from "./state/state-registry";
|
|
6
|
+
import { StateService } from "./state/state-service";
|
|
7
7
|
import { UIRouterGlobals } from "./globals";
|
|
8
8
|
import { removeFrom } from "../shared/common";
|
|
9
9
|
import { isFunction } from "../shared/utils";
|
|
10
|
-
import { UrlService } from "./url/
|
|
10
|
+
import { UrlService } from "./url/url-service";
|
|
11
11
|
import { trace } from "./common/trace";
|
|
12
12
|
|
|
13
13
|
/**
|
|
@@ -26,11 +26,11 @@ export class UIRouter {
|
|
|
26
26
|
/**
|
|
27
27
|
* Creates a new `UIRouter` object
|
|
28
28
|
*
|
|
29
|
-
* @param {import('./
|
|
29
|
+
* @param {import('./location-services').Ng1LocationServices} locationService
|
|
30
30
|
*/
|
|
31
31
|
constructor(locationService) {
|
|
32
32
|
/**
|
|
33
|
-
* @type {import('./
|
|
33
|
+
* @type {import('./location-services').Ng1LocationServices}
|
|
34
34
|
*/
|
|
35
35
|
this.locationService = locationService;
|
|
36
36
|
/** @type {number} */ this.$id = routerId++;
|
|
@@ -102,7 +102,9 @@ export class UIRouter {
|
|
|
102
102
|
try {
|
|
103
103
|
typeof d.dispose === "function" && d.dispose(this);
|
|
104
104
|
removeFrom(this._disposables, d);
|
|
105
|
-
} catch (ignored) {
|
|
105
|
+
} catch (ignored) {
|
|
106
|
+
/* empty */
|
|
107
|
+
}
|
|
106
108
|
});
|
|
107
109
|
}
|
|
108
110
|
|
package/src/router/services.js
CHANGED
|
@@ -15,10 +15,11 @@ import { trace } from "./common/trace";
|
|
|
15
15
|
import { UIRouter } from "./router";
|
|
16
16
|
import { ng1ViewsBuilder, getNg1ViewConfigFactory } from "./state/views";
|
|
17
17
|
|
|
18
|
-
import { StateProvider } from "./
|
|
19
|
-
import { Ng1LocationServices } from "./
|
|
20
|
-
import { ResolveContext } from "./resolve/
|
|
18
|
+
import { StateProvider } from "./state-provider";
|
|
19
|
+
import { Ng1LocationServices } from "./location-services";
|
|
20
|
+
import { ResolveContext } from "./resolve/resolve-context";
|
|
21
21
|
|
|
22
|
+
/** @type {angular.UIRouter}} */
|
|
22
23
|
export let router = null;
|
|
23
24
|
$routerProvider.$inject = ["$locationProvider"];
|
|
24
25
|
/** This angular 1 provider instantiates a Router and exposes its services via the angular injector */
|
|
@@ -42,7 +43,27 @@ export function $routerProvider($locationProvider) {
|
|
|
42
43
|
// Disable decoding of params by UrlMatcherFactory because $location already handles this
|
|
43
44
|
router.urlService.config._decodeParams = false;
|
|
44
45
|
|
|
45
|
-
|
|
46
|
+
/**
|
|
47
|
+
* Applys ng1-specific path parameter encoding
|
|
48
|
+
*
|
|
49
|
+
* The Angular 1 `$location` service is a bit weird.
|
|
50
|
+
* It doesn't allow slashes to be encoded/decoded bi-directionally.
|
|
51
|
+
*
|
|
52
|
+
* See the writeup at https://github.com/angular-ui/ui-router/issues/2598
|
|
53
|
+
*
|
|
54
|
+
* This code patches the `path` parameter type so it encoded/decodes slashes as ~2F
|
|
55
|
+
*
|
|
56
|
+
*/
|
|
57
|
+
const pathType = router.urlMatcherFactory.type("path");
|
|
58
|
+
pathType.encode = (x) =>
|
|
59
|
+
x != null
|
|
60
|
+
? x.toString().replace(/(~|\/)/g, (m) => ({ "~": "~~", "/": "~2F" })[m])
|
|
61
|
+
: x;
|
|
62
|
+
pathType.decode = (x) =>
|
|
63
|
+
x != null
|
|
64
|
+
? x.toString().replace(/(~~|~2F)/g, (m) => ({ "~~": "~", "~2F": "/" })[m])
|
|
65
|
+
: x;
|
|
66
|
+
|
|
46
67
|
// backwards compat: also expose router instance as $routerProvider.router
|
|
47
68
|
router["router"] = router;
|
|
48
69
|
router["$get"] = $get;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
2
|
applyPairs,
|
|
3
|
-
identity,
|
|
4
3
|
inherit,
|
|
5
4
|
mapObj,
|
|
6
5
|
omit,
|
|
@@ -201,12 +200,12 @@ export function resolvablesBuilder(state) {
|
|
|
201
200
|
],
|
|
202
201
|
[
|
|
203
202
|
prop("useExisting"),
|
|
204
|
-
(p) => new Resolvable(getToken(p),
|
|
203
|
+
(p) => new Resolvable(getToken(p), (x) => x, [p.useExisting], p.policy),
|
|
205
204
|
],
|
|
206
205
|
]);
|
|
207
206
|
// prettier-ignore
|
|
208
207
|
const tuple2Resolvable = pattern([
|
|
209
|
-
[pipe(prop('val'), isString), (tuple) => new Resolvable(tuple.token,
|
|
208
|
+
[pipe(prop('val'), isString), (tuple) => new Resolvable(tuple.token, ((x) => x), [tuple.val], tuple.policy)],
|
|
210
209
|
[pipe(prop('val'), Array.isArray), (tuple) => new Resolvable(tuple.token, tail(tuple.val), tuple.val.slice(0, -1), tuple.policy)],
|
|
211
210
|
[pipe(prop('val'), isFunction), (tuple) => new Resolvable(tuple.token, tuple.val, annotate(tuple.val), tuple.policy)],
|
|
212
211
|
]);
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { inArray } from "../../shared/common";
|
|
2
2
|
import { prop } from "../../shared/hof";
|
|
3
3
|
import { isString } from "../../shared/utils";
|
|
4
|
-
import { StateObject } from "./
|
|
4
|
+
import { StateObject } from "./state-object";
|
|
5
|
+
|
|
5
6
|
export class StateQueueManager {
|
|
6
7
|
constructor(router, states, builder, listeners) {
|
|
7
8
|
this.router = router;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { StateMatcher } from "./
|
|
2
|
-
import { StateBuilder } from "./
|
|
3
|
-
import { StateQueueManager } from "./
|
|
1
|
+
import { StateMatcher } from "./state-matcher";
|
|
2
|
+
import { StateBuilder } from "./state-builder";
|
|
3
|
+
import { StateQueueManager } from "./state-queue-manager";
|
|
4
4
|
import { removeFrom } from "../../shared/common";
|
|
5
5
|
import { propEq } from "../../shared/hof";
|
|
6
6
|
/**
|
|
@@ -9,15 +9,15 @@ import {
|
|
|
9
9
|
import { isDefined, isObject, isString } from "../../shared/utils";
|
|
10
10
|
import { Queue } from "../common/queue";
|
|
11
11
|
import { services } from "../common/coreservices";
|
|
12
|
-
import { PathUtils } from "../path/
|
|
13
|
-
import { PathNode } from "../path/
|
|
14
|
-
import { defaultTransOpts } from "../transition/
|
|
15
|
-
import { Rejection, RejectType } from "../transition/
|
|
16
|
-
import { TargetState } from "./
|
|
12
|
+
import { PathUtils } from "../path/path-utils";
|
|
13
|
+
import { PathNode } from "../path/path-node";
|
|
14
|
+
import { defaultTransOpts } from "../transition/transition-service";
|
|
15
|
+
import { Rejection, RejectType } from "../transition/reject-factory";
|
|
16
|
+
import { TargetState } from "./target-state";
|
|
17
17
|
import { Param } from "../params/param";
|
|
18
18
|
import { Glob } from "../common/glob";
|
|
19
|
-
import { ResolveContext } from "../resolve/
|
|
20
|
-
import { lazyLoadState } from "../hooks/
|
|
19
|
+
import { ResolveContext } from "../resolve/resolve-context";
|
|
20
|
+
import { lazyLoadState } from "../hooks/lazy-load";
|
|
21
21
|
import { not, val } from "../../shared/hof";
|
|
22
22
|
/**
|
|
23
23
|
* Provides services related to ui-router states.
|
|
@@ -59,6 +59,7 @@ export class StateService {
|
|
|
59
59
|
}
|
|
60
60
|
|
|
61
61
|
constructor(router) {
|
|
62
|
+
/** @private */
|
|
62
63
|
this.router = router;
|
|
63
64
|
|
|
64
65
|
this.invalidCallbacks = [];
|
|
@@ -4,7 +4,7 @@ import { isInjectable } from "../../shared/predicates";
|
|
|
4
4
|
import { services } from "../common/coreservices";
|
|
5
5
|
import { trace } from "../common/trace";
|
|
6
6
|
import { ViewService } from "../view/view";
|
|
7
|
-
import { ResolveContext } from "../resolve/
|
|
7
|
+
import { ResolveContext } from "../resolve/resolve-context";
|
|
8
8
|
import { Resolvable } from "../resolve/resolvable";
|
|
9
9
|
|
|
10
10
|
export function getNg1ViewConfigFactory() {
|