@angular-wave/angular.ts 0.0.14 → 0.0.16
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/rollup.config.js +6 -2
- package/src/animations/animate-css.js +13 -218
- package/src/animations/animate.css.md +263 -0
- package/src/animations/animate.md +933 -0
- package/src/animations/module.js +0 -750
- package/src/animations/shared.js +0 -11
- package/src/core/compile.js +1 -1
- package/src/exts/messages.md +30 -30
- package/src/router/adapter/directives/stateDirectives.js +3 -4
- package/src/router/adapter/directives/viewDirective.js +3 -4
- package/src/router/adapter/services.js +4 -2
- package/src/router/adapter/statebuilders/onEnterExitRetain.js +1 -2
- package/src/router/adapter/statebuilders/views.js +4 -5
- package/src/router/core/common/common.js +10 -22
- package/src/router/core/common/safeConsole.js +1 -2
- package/src/router/core/hooks/resolve.js +3 -4
- package/src/router/core/hooks/views.js +3 -2
- package/src/router/core/params/param.js +5 -5
- package/src/router/core/params/paramType.js +3 -3
- package/src/router/core/params/paramTypes.js +6 -7
- package/src/router/core/params/stateParams.js +3 -3
- package/src/router/core/path/pathNode.js +2 -2
- package/src/router/core/path/pathUtils.js +4 -5
- package/src/router/core/resolve/resolvable.js +2 -2
- package/src/router/core/state/stateBuilder.js +1 -2
- package/src/router/core/state/stateService.js +2 -3
- package/src/router/core/state/targetState.js +8 -5
- package/src/router/core/transition/hookBuilder.js +2 -2
- package/src/router/core/transition/hookRegistry.js +2 -2
- package/src/router/core/transition/rejectFactory.js +2 -3
- package/src/router/core/transition/transition.js +5 -3
- package/src/router/core/url/urlMatcherFactory.js +2 -8
- package/src/router/core/url/urlRule.js +7 -4
- package/src/router/core/url/urlService.js +2 -2
- package/src/router/router.js +11 -10
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { assertPredicate, unnestR, identity } from "../common/common";
|
|
2
2
|
import { isArray } from "../common/predicates";
|
|
3
3
|
import { TransitionHookPhase, TransitionHookScope } from "./interface";
|
|
4
4
|
import { TransitionHook } from "./transitionHook";
|
|
@@ -57,7 +57,7 @@ export class HookBuilder {
|
|
|
57
57
|
const matchingNodes = matches[hookType.criteriaMatchPath.name];
|
|
58
58
|
// Return an array of HookTuples
|
|
59
59
|
return matchingNodes.map((node) => {
|
|
60
|
-
const _options =
|
|
60
|
+
const _options = Object.assign(
|
|
61
61
|
{
|
|
62
62
|
bind: hook.bind,
|
|
63
63
|
traceData: { hookType: hookType.name, context: node },
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { removeFrom, tail, identity, mapObj } from "../common/common";
|
|
2
2
|
import { isString, isFunction } from "../common/predicates";
|
|
3
3
|
import { Glob } from "../common/glob";
|
|
4
4
|
import {
|
|
@@ -114,7 +114,7 @@ export class RegisteredHook {
|
|
|
114
114
|
* ```
|
|
115
115
|
*/
|
|
116
116
|
_getMatchingNodes(treeChanges, transition) {
|
|
117
|
-
const criteria =
|
|
117
|
+
const criteria = Object.assign(
|
|
118
118
|
this._getDefaultMatchCriteria(),
|
|
119
119
|
this.matchCriteria,
|
|
120
120
|
);
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
import { extend, silentRejection } from "../common/common";
|
|
1
|
+
import { silentRejection } from "../common/common";
|
|
3
2
|
import { stringify } from "../common/strings";
|
|
4
3
|
import { is } from "../common/hof";
|
|
5
4
|
/** An enum for Transition Rejection reasons */
|
|
@@ -117,6 +116,6 @@ export class Rejection {
|
|
|
117
116
|
return `Transition Rejection($id: ${$id} type: ${type}, message: ${message}, detail: ${detail})`;
|
|
118
117
|
}
|
|
119
118
|
toPromise() {
|
|
120
|
-
return
|
|
119
|
+
return Object.assign(silentRejection(this), { _transitionRejection: this });
|
|
121
120
|
}
|
|
122
121
|
}
|
|
@@ -4,7 +4,6 @@ import { stringify } from "../common/strings";
|
|
|
4
4
|
import {
|
|
5
5
|
map,
|
|
6
6
|
find,
|
|
7
|
-
extend,
|
|
8
7
|
mergeR,
|
|
9
8
|
tail,
|
|
10
9
|
omit,
|
|
@@ -118,7 +117,10 @@ export class Transition {
|
|
|
118
117
|
throw new Error(targetState.error());
|
|
119
118
|
}
|
|
120
119
|
// current() is assumed to come from targetState.options, but provide a naive implementation otherwise.
|
|
121
|
-
this._options =
|
|
120
|
+
this._options = Object.assign(
|
|
121
|
+
{ current: val(this) },
|
|
122
|
+
targetState.options(),
|
|
123
|
+
);
|
|
122
124
|
this.$id = router.transitionService._transitionCount++;
|
|
123
125
|
const toPath = PathUtils.buildToPath(fromPath, targetState);
|
|
124
126
|
this._treeChanges = PathUtils.treeChanges(
|
|
@@ -496,7 +498,7 @@ export class Transition {
|
|
|
496
498
|
) {
|
|
497
499
|
redirectOpts.location = "replace";
|
|
498
500
|
}
|
|
499
|
-
const newOptions =
|
|
501
|
+
const newOptions = Object.assign(
|
|
500
502
|
{},
|
|
501
503
|
this.options(),
|
|
502
504
|
targetState.options(),
|
|
@@ -1,10 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
extend,
|
|
3
|
-
forEach,
|
|
4
|
-
isDefined,
|
|
5
|
-
isFunction,
|
|
6
|
-
isObject,
|
|
7
|
-
} from "../../../core/utils";
|
|
1
|
+
import { forEach, isDefined, isFunction, isObject } from "../../../core/utils";
|
|
8
2
|
import { UrlMatcher } from "./urlMatcher";
|
|
9
3
|
import { DefType, Param } from "../params/param";
|
|
10
4
|
|
|
@@ -93,7 +87,7 @@ export class UrlMatcherFactory {
|
|
|
93
87
|
pattern,
|
|
94
88
|
urlConfig.paramTypes,
|
|
95
89
|
this.paramFactory,
|
|
96
|
-
|
|
90
|
+
Object.assign(globalConfig, config),
|
|
97
91
|
);
|
|
98
92
|
}
|
|
99
93
|
/**
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { UrlMatcher } from "./urlMatcher";
|
|
2
2
|
import { isString, isDefined, isFunction } from "../common/predicates";
|
|
3
|
-
import { identity
|
|
3
|
+
import { identity } from "../common/common";
|
|
4
4
|
import { is, or, pattern } from "../common/hof";
|
|
5
5
|
import { StateObject } from "../state/stateObject";
|
|
6
6
|
/**
|
|
@@ -95,7 +95,7 @@ export class UrlRuleFactory {
|
|
|
95
95
|
return matched.length / optional.length;
|
|
96
96
|
}
|
|
97
97
|
const details = { urlMatcher, matchPriority, type: "URLMATCHER" };
|
|
98
|
-
return
|
|
98
|
+
return Object.assign(new BaseUrlRule(matchUrlParamters, _handler), details);
|
|
99
99
|
}
|
|
100
100
|
/**
|
|
101
101
|
* A UrlRule which matches a state by its url
|
|
@@ -130,7 +130,7 @@ export class UrlRuleFactory {
|
|
|
130
130
|
}
|
|
131
131
|
};
|
|
132
132
|
const details = { state, type: "STATE" };
|
|
133
|
-
return
|
|
133
|
+
return Object.assign(this.fromUrlMatcher(state.url, handler), details);
|
|
134
134
|
}
|
|
135
135
|
/**
|
|
136
136
|
* A UrlRule which matches based on a regular expression
|
|
@@ -181,7 +181,10 @@ export class UrlRuleFactory {
|
|
|
181
181
|
const _handler = isString(handler) ? redirectUrlTo : handler;
|
|
182
182
|
const matchParamsFromRegexp = (url) => regexp.exec(url.path);
|
|
183
183
|
const details = { regexp, type: "REGEXP" };
|
|
184
|
-
return
|
|
184
|
+
return Object.assign(
|
|
185
|
+
new BaseUrlRule(matchParamsFromRegexp, _handler),
|
|
186
|
+
details,
|
|
187
|
+
);
|
|
185
188
|
}
|
|
186
189
|
}
|
|
187
190
|
UrlRuleFactory.isUrlRule = (obj) =>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isString } from "../../../core/utils";
|
|
2
2
|
import { is, pattern } from "../common/hof";
|
|
3
3
|
import { UrlRules } from "./urlRules";
|
|
4
4
|
import { UrlConfig } from "./urlConfig";
|
|
@@ -243,7 +243,7 @@ export class UrlService {
|
|
|
243
243
|
* Return the result as a [[MatchResult]].
|
|
244
244
|
*/
|
|
245
245
|
match(url) {
|
|
246
|
-
url =
|
|
246
|
+
url = Object.assign({ path: "", search: {}, hash: "" }, url);
|
|
247
247
|
const rules = this.rules.rules();
|
|
248
248
|
// Checks a single rule. Returns { rule: rule, match: match, weight: weight } if it matched, or undefined
|
|
249
249
|
const checkRule = (rule) => {
|
package/src/router/router.js
CHANGED
|
@@ -36,7 +36,7 @@ export function initRouter() {
|
|
|
36
36
|
mod_util.provider("$urlService", getProviderFor("urlService"));
|
|
37
37
|
mod_util.provider("$urlMatcherFactory", [
|
|
38
38
|
"$uiRouterProvider",
|
|
39
|
-
function
|
|
39
|
+
function () {
|
|
40
40
|
return router.urlMatcherFactory;
|
|
41
41
|
},
|
|
42
42
|
]);
|
|
@@ -51,7 +51,7 @@ export function initRouter() {
|
|
|
51
51
|
.provider("$uiViewScroll", $ViewScrollProvider)
|
|
52
52
|
.factory("$stateParams", [
|
|
53
53
|
"$uiRouter",
|
|
54
|
-
function
|
|
54
|
+
function ($uiRouter) {
|
|
55
55
|
return $uiRouter.globals.params;
|
|
56
56
|
},
|
|
57
57
|
])
|
|
@@ -62,15 +62,16 @@ export function initRouter() {
|
|
|
62
62
|
.directive("uiSrefActiveEq", uiSrefActiveDirective)
|
|
63
63
|
.directive("uiState", uiStateDirective)
|
|
64
64
|
.directive("uiView", uiView)
|
|
65
|
-
.directive("uiView", $ViewDirectiveFill)
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
65
|
+
.directive("uiView", $ViewDirectiveFill)
|
|
66
|
+
.run(["$state", function () {}]);
|
|
67
|
+
mod_main
|
|
68
|
+
.factory("$view", function View() {
|
|
69
|
+
return router.viewService;
|
|
70
|
+
})
|
|
71
|
+
.service("$trace", function Trace() {
|
|
72
|
+
return trace;
|
|
73
|
+
});
|
|
72
74
|
mod_main.run(watchDigests);
|
|
73
75
|
mod_util.run(["$urlMatcherFactory", function MatcherFac() {}]);
|
|
74
|
-
mod_state.run(["$state", function State() {}]);
|
|
75
76
|
mod_init.run(runBlock);
|
|
76
77
|
}
|