Skip to content

Commit f6675af

Browse files
author
Anatoly Ostrovsky
committed
Test fixes
1 parent f5a2cc1 commit f6675af

File tree

10 files changed

+56
-43
lines changed

10 files changed

+56
-43
lines changed

‎@types/core/di/ng-module/ng-module.d.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ export class NgModule {
1616
configFn?: ng.Injectable<any>,
1717
);
1818
/**
19+
* @public
1920
* Name of the current module.
2021
* @type {string}
2122
*/
22-
_name: string;
23+
public name: string;
2324
/**
2425
* Array of module names that this module depends on.
2526
* @type {string[]}

‎Makefile‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,15 @@ build: version
1313
fi
1414
@npm i
1515
./node_modules/.bin/rollup -c
16-
echo "Build output $$(stat -c %s dist/angular-ts.umd.min.js | numfmt --to=iec)"
16+
17+
check-size:
18+
./node_modules/.bin/rollup -c --configName min --silent
19+
@echo "Minified build output: $$(stat -c %s dist/angular-ts.umd.min.js) ~ $$(stat -c %s dist/angular-ts.umd.min.js | numfmt --to=iec)"
20+
@echo "Expected gzip: $$(gzip -c dist/angular-ts.umd.min.js | wc -c) ~ $$(gzip -c dist/angular-ts.umd.min.js | wc -c | numfmt --to=iec)"
21+
@git checkout -q $(BUILD_DIR)
22+
@git checkout -q ./docs
23+
@echo "Current build output: $$(stat -c %s dist/angular-ts.umd.min.js) ~ $$(stat -c %s dist/angular-ts.umd.min.js | numfmt --to=iec)"
24+
@echo "Current gzip: $$(gzip -c dist/angular-ts.umd.min.js | wc -c) ~ $$(gzip -c dist/angular-ts.umd.min.js | wc -c | numfmt --to=iec)"
1725

1826
version:
1927
@node utils/version.cjs

‎rollup.config.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import postcss from "postcss";
77
import { readFileSync, writeFileSync } from "fs";
88
import path from "path";
99
import { fileURLToPath } from "url";
10-
import fs from "fs";
1110

1211
const __filename = fileURLToPath(import.meta.url);
1312
const __dirname = path.dirname(__filename);
@@ -38,7 +37,9 @@ function cssMinifyPlugin() {
3837
const basePlugins = [resolve(), commonjs(), versionInjector()];
3938

4039
export default [
40+
// ---- Minified UMD ----
4141
{
42+
name: "min",
4243
input: baseInput,
4344
output: [
4445
{
@@ -67,12 +68,14 @@ export default [
6768
format: "umd",
6869
},
6970
],
70-
plugins: [...basePlugins, cssMinifyPlugin()],
71+
plugins: [...basePlugins],
7172
},
7273
{
74+
// ---- ES Module ----
75+
name: "es",
7376
input: baseInput,
7477
external: ["ms"],
7578
output: [{ file: pkg.module, format: "es" }],
76-
plugins: [versionInjector(), cssMinifyPlugin()],
79+
plugins: [...basePlugins, cssMinifyPlugin()],
7780
},
7881
];

‎src/angular.spec.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ describe("module loader", () => {
339339

340340
it("attaches the requires array to the registered module", () => {
341341
const myModule = angular.module("myModule", ["myOtherModule"]);
342-
expect(myModule.requires).toEqual(["myOtherModule"]);
342+
expect(myModule._requires).toEqual(["myOtherModule"]);
343343
});
344344

345345
it("replaces a module when registered with same name again", () => {
@@ -376,8 +376,8 @@ describe("module loader", () => {
376376
.run(run),
377377
).toBe(myModule);
378378

379-
expect(myModule.requires).toEqual(["other"]);
380-
expect(myModule.invokeQueue).toEqual([
379+
expect(myModule._requires).toEqual(["other"]);
380+
expect(myModule._invokeQueue).toEqual([
381381
["$provide", "constant", jasmine.objectContaining(["abc", 123])],
382382
["$provide", "provider", jasmine.objectContaining(["sk", "sv"])],
383383
["$provide", "factory", jasmine.objectContaining(["fk", "fv"])],
@@ -396,12 +396,12 @@ describe("module loader", () => {
396396
jasmine.objectContaining(["ctrl", "ccc"]),
397397
],
398398
]);
399-
expect(myModule.configBlocks).toEqual([
399+
expect(myModule._configBlocks).toEqual([
400400
["$injector", "invoke", jasmine.objectContaining([config])],
401401
["$provide", "decorator", jasmine.objectContaining(["dk", "dv"])],
402402
["$injector", "invoke", jasmine.objectContaining([init2])],
403403
]);
404-
expect(myModule.runBlocks).toEqual([run]);
404+
expect(myModule._runBlocks).toEqual([run]);
405405
});
406406

407407
it("should not throw error when `module.decorator` is declared before provider that it decorates", () => {

‎src/animations/runner/animate-runner.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ describe("AnimateRunner", () => {
196196
r2.complete();
197197
});
198198

199-
AnimateRunner.chain([r1, r2], (ok) => {
199+
AnimateRunner._chain([r1, r2], (ok) => {
200200
expect(ok).toBe(true);
201201
expect(order).toEqual(["r1", "r2"]);
202202
done();
@@ -210,7 +210,7 @@ describe("AnimateRunner", () => {
210210
const r1 = new AnimateRunner();
211211
const r2 = new AnimateRunner();
212212

213-
AnimateRunner.all([r1, r2], (ok) => {
213+
AnimateRunner._all([r1, r2], (ok) => {
214214
expect(ok).toBe(true);
215215
done();
216216
});

‎src/core/compile/compile.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15406,7 +15406,7 @@ describe("$compile", () => {
1540615406
$customAnnotation: "XXX",
1540715407
});
1540815408
initInjector("test1");
15409-
expect(myModule.invokeQueue.pop().pop()[1]).toEqual(
15409+
expect(myModule._invokeQueue.pop().pop()[1]).toEqual(
1541015410
jasmine.objectContaining({
1541115411
$canActivate: "canActivate",
1541215412
$routeConfig: "routeConfig",

‎src/core/di/ng-module/ng-module.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ export class NgModule {
2727
validate(isString, name, "name");
2828
validate(isArray, requires, "requires");
2929
/**
30+
* @public
3031
* Name of the current module.
3132
* @type {string}
3233
*/
33-
this._name = name;
34+
this.name = name;
3435

3536
/**
3637
* Array of module names that this module depends on.

‎src/core/di/ng-module/ng-module.spec.js‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ describe("NgModule", () => {
1717
expect(ngModule).toBeDefined();
1818
expect(ngModule.name).toBeDefined();
1919
expect(ngModule.name).toEqual("test");
20-
expect(ngModule.requires).toEqual(["otherModule"]);
20+
expect(ngModule._requires).toEqual(["otherModule"]);
2121
});
2222

2323
it("can't be instantiated without name or dependencies", () => {
@@ -28,20 +28,20 @@ describe("NgModule", () => {
2828
it("can store constants", () => {
2929
// when contants are registered
3030
ngModule.constant("aConstant", 42);
31-
expect(ngModule.invokeQueue[0]).toEqual([
31+
expect(ngModule._invokeQueue[0]).toEqual([
3232
$t.$provide,
3333
"constant",
3434
["aConstant", 42],
3535
]);
3636

3737
// then they are prepended to invocation queue
3838
ngModule.constant("bConstant", 24);
39-
expect(ngModule.invokeQueue[0]).toEqual([
39+
expect(ngModule._invokeQueue[0]).toEqual([
4040
$t.$provide,
4141
"constant",
4242
["bConstant", 24],
4343
]);
44-
expect(ngModule.invokeQueue[1]).toEqual([
44+
expect(ngModule._invokeQueue[1]).toEqual([
4545
$t.$provide,
4646
"constant",
4747
["aConstant", 42],
@@ -51,20 +51,20 @@ describe("NgModule", () => {
5151
it("can store values", () => {
5252
// when value are registered
5353
ngModule.value("aValue", 42);
54-
expect(ngModule.invokeQueue[0]).toEqual([
54+
expect(ngModule._invokeQueue[0]).toEqual([
5555
$t.$provide,
5656
"value",
5757
["aValue", 42],
5858
]);
5959

6060
// then are pushed to invocation queue
6161
ngModule.value("bValue", 24);
62-
expect(ngModule.invokeQueue[1]).toEqual([
62+
expect(ngModule._invokeQueue[1]).toEqual([
6363
$t.$provide,
6464
"value",
6565
["bValue", 24],
6666
]);
67-
expect(ngModule.invokeQueue[0]).toEqual([
67+
expect(ngModule._invokeQueue[0]).toEqual([
6868
$t.$provide,
6969
"value",
7070
["aValue", 42],
@@ -83,19 +83,19 @@ describe("NgModule", () => {
8383
ngModule.config(fn2);
8484

8585
// then they are appended to config queue
86-
expect(ngModule.configBlocks[0]).toEqual([$t.$injector, "invoke", [fn1]]);
87-
expect(ngModule.configBlocks[1]).toEqual([$t.$injector, "invoke", [fn2]]);
86+
expect(ngModule._configBlocks[0]).toEqual([$t.$injector, "invoke", [fn1]]);
87+
expect(ngModule._configBlocks[1]).toEqual([$t.$injector, "invoke", [fn2]]);
8888
});
8989

9090
it("can store components", () => {
9191
ngModule.component("aComponent", a).component("bComponent", b);
92-
expect(ngModule.invokeQueue[0]).toEqual([
92+
expect(ngModule._invokeQueue[0]).toEqual([
9393
$t.$compileProvider,
9494
"component",
9595
["aComponent", a],
9696
]);
9797

98-
expect(ngModule.invokeQueue[1]).toEqual([
98+
expect(ngModule._invokeQueue[1]).toEqual([
9999
$t.$compileProvider,
100100
"component",
101101
["bComponent", b],
@@ -105,13 +105,13 @@ describe("NgModule", () => {
105105

106106
it("can store factories", () => {
107107
ngModule.factory("aFactory", a).factory("bFactory", b);
108-
expect(ngModule.invokeQueue[0]).toEqual([
108+
expect(ngModule._invokeQueue[0]).toEqual([
109109
$t.$provide,
110110
"factory",
111111
["aFactory", a],
112112
]);
113113

114-
expect(ngModule.invokeQueue[1]).toEqual([
114+
expect(ngModule._invokeQueue[1]).toEqual([
115115
$t.$provide,
116116
"factory",
117117
["bFactory", b],
@@ -120,13 +120,13 @@ describe("NgModule", () => {
120120

121121
it("can store services", () => {
122122
ngModule.service("aService", a).service("bService", b);
123-
expect(ngModule.invokeQueue[0]).toEqual([
123+
expect(ngModule._invokeQueue[0]).toEqual([
124124
$t.$provide,
125125
"service",
126126
["aService", a],
127127
]);
128128

129-
expect(ngModule.invokeQueue[1]).toEqual([
129+
expect(ngModule._invokeQueue[1]).toEqual([
130130
$t.$provide,
131131
"service",
132132
["bService", b],
@@ -135,13 +135,13 @@ describe("NgModule", () => {
135135

136136
it("can store providers", () => {
137137
ngModule.provider("aProvider", a).provider("bProvider", b);
138-
expect(ngModule.invokeQueue[0]).toEqual([
138+
expect(ngModule._invokeQueue[0]).toEqual([
139139
$t.$provide,
140140
"provider",
141141
["aProvider", a],
142142
]);
143143

144-
expect(ngModule.invokeQueue[1]).toEqual([
144+
expect(ngModule._invokeQueue[1]).toEqual([
145145
$t.$provide,
146146
"provider",
147147
["bProvider", b],
@@ -150,13 +150,13 @@ describe("NgModule", () => {
150150

151151
it("can store decorators", () => {
152152
ngModule.decorator("aDecorator", a).decorator("bDecorator", b);
153-
expect(ngModule.configBlocks[0]).toEqual([
153+
expect(ngModule._configBlocks[0]).toEqual([
154154
$t.$provide,
155155
"decorator",
156156
["aDecorator", a],
157157
]);
158158

159-
expect(ngModule.configBlocks[1]).toEqual([
159+
expect(ngModule._configBlocks[1]).toEqual([
160160
$t.$provide,
161161
"decorator",
162162
["bDecorator", b],
@@ -165,13 +165,13 @@ describe("NgModule", () => {
165165

166166
it("can store directives", () => {
167167
ngModule.directive("aDirective", a).directive("bDirective", b);
168-
expect(ngModule.invokeQueue[0]).toEqual([
168+
expect(ngModule._invokeQueue[0]).toEqual([
169169
$t.$compileProvider,
170170
"directive",
171171
["aDirective", a],
172172
]);
173173

174-
expect(ngModule.invokeQueue[1]).toEqual([
174+
expect(ngModule._invokeQueue[1]).toEqual([
175175
$t.$compileProvider,
176176
"directive",
177177
["bDirective", b],
@@ -180,13 +180,13 @@ describe("NgModule", () => {
180180

181181
it("can store animations", () => {
182182
ngModule.animation("aAnimation", a).animation("bAnimation", b);
183-
expect(ngModule.invokeQueue[0]).toEqual([
183+
expect(ngModule._invokeQueue[0]).toEqual([
184184
$t.$animateProvider,
185185
"register",
186186
["aAnimation", a],
187187
]);
188188

189-
expect(ngModule.invokeQueue[1]).toEqual([
189+
expect(ngModule._invokeQueue[1]).toEqual([
190190
$t.$animateProvider,
191191
"register",
192192
["bAnimation", b],
@@ -195,12 +195,12 @@ describe("NgModule", () => {
195195

196196
it("can store filters", () => {
197197
ngModule.filter("aFilter", cf).filter("bFilter", b);
198-
expect(ngModule.invokeQueue[0]).toEqual([
198+
expect(ngModule._invokeQueue[0]).toEqual([
199199
$t.$filterProvider,
200200
"register",
201201
["aFilter", cf],
202202
]);
203-
expect(ngModule.invokeQueue[1]).toEqual([
203+
expect(ngModule._invokeQueue[1]).toEqual([
204204
$t.$filterProvider,
205205
"register",
206206
["bFilter", b],
@@ -209,12 +209,12 @@ describe("NgModule", () => {
209209

210210
it("can store controllers", () => {
211211
ngModule.controller("aController", a).controller("bController", b);
212-
expect(ngModule.invokeQueue[0]).toEqual([
212+
expect(ngModule._invokeQueue[0]).toEqual([
213213
$t.$controllerProvider,
214214
"register",
215215
["aController", a],
216216
]);
217-
expect(ngModule.invokeQueue[1]).toEqual([
217+
expect(ngModule._invokeQueue[1]).toEqual([
218218
$t.$controllerProvider,
219219
"register",
220220
["bController", b],

‎src/directive/input/input.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ function baseInputType(_, element, attr, ctrl) {
191191
ctrl.$$hasNativeValidators &&
192192
type === attr.type
193193
) {
194-
element.addEventListener(PARTIAL_VALIDATION_EVENTS, function (ev) {
194+
element.addEventListener(PARTIAL_VALIDATION_EVENTS, (ev) => {
195195
if (!timeout) {
196196
// eslint-disable-next-line no-invalid-this
197197
const validity = this[VALIDITY_STATE_PROPERTY];

‎src/shared/utils.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@ function hasCustomOrDataAttribute(node, attr) {
12431243
export function isObjectEmpty(obj) {
12441244
if (!obj) return true;
12451245

1246-
return !Object.keys(obj).length;
1246+
return !keys(obj).length;
12471247
}
12481248

12491249
/**

0 commit comments

Comments
 (0)