devextreme-schematics 1.10.1 → 1.11.0-beta.0
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/package.json +6 -6
- package/src/add-app-template/schema.json +1 -1
- package/src/add-layout/files/src/app/__name__.ts +37 -0
- package/src/add-layout/files/src/app/app.config.ts +20 -0
- package/src/add-layout/files/src/app/{app-routing.module.ts → app.routes.ts} +2 -10
- package/src/add-layout/files/src/app/layouts/side-nav-inner-toolbar/side-nav-inner-toolbar.component.ts +11 -10
- package/src/add-layout/files/src/app/layouts/side-nav-outer-toolbar/side-nav-outer-toolbar.component.ts +5 -10
- package/src/add-layout/files/src/app/layouts/single-card/single-card.component.ts +3 -11
- package/src/add-layout/files/src/app/not-authorized-container.ts +8 -13
- package/src/add-layout/files/src/app/shared/components/change-password-form/change-password-form.component.ts +8 -13
- package/src/add-layout/files/src/app/shared/components/create-account-form/create-account-form.component.ts +8 -13
- package/src/add-layout/files/src/app/shared/components/footer/footer.component.ts +2 -8
- package/src/add-layout/files/src/app/shared/components/header/header.component.scss +1 -1
- package/src/add-layout/files/src/app/shared/components/header/header.component.ts +14 -20
- package/src/add-layout/files/src/app/shared/components/login-form/login-form.component.ts +9 -14
- package/src/add-layout/files/src/app/shared/components/reset-password-form/reset-password-form.component.ts +8 -13
- package/src/add-layout/files/src/app/shared/components/side-navigation-menu/side-navigation-menu.component.ts +4 -10
- package/src/add-layout/files/src/app/shared/components/theme-switcher/theme-switcher.component.ts +3 -11
- package/src/add-layout/files/src/app/shared/components/user-panel/user-panel.component.ts +8 -15
- package/src/add-layout/files/src/app/unauthenticated-content.ts +8 -13
- package/src/add-layout/files/src/dx-styles.scss +3 -3
- package/src/add-layout/index.js +67 -43
- package/src/add-layout/index.js.map +1 -1
- package/src/add-layout/index.ts +79 -49
- package/src/add-layout/index_spec.js +27 -27
- package/src/add-layout/index_spec.js.map +1 -1
- package/src/add-layout/index_spec.ts +29 -33
- package/src/add-sample-views/files/pages/profile/profile.component.ts +3 -1
- package/src/add-sample-views/files/pages/tasks/tasks.component.ts +3 -2
- package/src/add-sample-views/index.js +1 -32
- package/src/add-sample-views/index.js.map +1 -1
- package/src/add-sample-views/index.ts +1 -42
- package/src/add-sample-views/index_spec.js +1 -2
- package/src/add-sample-views/index_spec.js.map +1 -1
- package/src/add-sample-views/index_spec.ts +1 -2
- package/src/add-view/index.js +8 -3
- package/src/add-view/index.js.map +1 -1
- package/src/add-view/index.ts +12 -5
- package/src/add-view/index_spec.js +4 -23
- package/src/add-view/index_spec.js.map +1 -1
- package/src/add-view/index_spec.ts +4 -23
- package/src/install/schema.json +1 -1
- package/src/utility/angular-version.d.ts +3 -0
- package/src/utility/angular-version.js +20 -0
- package/src/utility/angular-version.js.map +1 -0
- package/src/utility/angular-version.ts +18 -0
- package/src/utility/latest-versions.js +2 -2
- package/src/utility/latest-versions.js.map +1 -1
- package/src/utility/latest-versions.ts +2 -2
- package/src/utility/routing.d.ts +2 -1
- package/src/utility/routing.js +5 -4
- package/src/utility/routing.js.map +1 -1
- package/src/utility/routing.ts +4 -4
- package/src/add-layout/files/src/app/__name__.component.ts +0 -21
- /package/src/add-layout/files/src/app/{__name__.component.html → __name__.html} +0 -0
- /package/src/add-layout/files/src/app/{__name__.component.scss → __name__.scss} +0 -0
package/src/add-layout/index.js
CHANGED
@@ -24,6 +24,38 @@ const routing_1 = require("../utility/routing");
|
|
24
24
|
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
25
25
|
const workspace_1 = require("@schematics/angular/utility/workspace");
|
26
26
|
const patch_1 = require("../utility/patch");
|
27
|
+
const angular_version_1 = require("../utility/angular-version");
|
28
|
+
const routes = [
|
29
|
+
{
|
30
|
+
name: 'AuthGuardService',
|
31
|
+
type: 'service',
|
32
|
+
location: './shared/services'
|
33
|
+
},
|
34
|
+
{
|
35
|
+
name: 'LoginFormComponent',
|
36
|
+
path: 'login-form',
|
37
|
+
type: 'component',
|
38
|
+
location: './shared/components'
|
39
|
+
},
|
40
|
+
{
|
41
|
+
name: 'ResetPasswordFormComponent',
|
42
|
+
path: 'reset-password',
|
43
|
+
type: 'component',
|
44
|
+
location: './shared/components'
|
45
|
+
},
|
46
|
+
{
|
47
|
+
name: 'CreateAccountFormComponent',
|
48
|
+
path: 'create-account',
|
49
|
+
type: 'component',
|
50
|
+
location: './shared/components'
|
51
|
+
},
|
52
|
+
{
|
53
|
+
name: 'ChangePasswordFormComponent',
|
54
|
+
path: 'change-password/:recoveryCode',
|
55
|
+
type: 'component',
|
56
|
+
location: './shared/components'
|
57
|
+
}
|
58
|
+
];
|
27
59
|
const projectFilesSource = './files/src';
|
28
60
|
const workspaceFilesSource = './files';
|
29
61
|
function addScriptSafe(scripts, name, value) {
|
@@ -103,55 +135,38 @@ function modifyFileRule(path, callback) {
|
|
103
135
|
return (0, change_1.applyChanges)(host, changes, path);
|
104
136
|
};
|
105
137
|
}
|
106
|
-
function
|
107
|
-
const
|
108
|
-
const importSetter = (importName, path) => {
|
138
|
+
function updateAppComponent(host, sourcePath, templateOptions = {}) {
|
139
|
+
const appMComponentPath = sourcePath + ((0, angular_version_1.isAngularVersionHigherThan)(host, 20) ? 'app.ts' : 'app.component.ts');
|
140
|
+
const importSetter = (importName, path, alias) => {
|
109
141
|
return (source) => {
|
110
|
-
return (0, ast_utils_1.
|
111
|
-
};
|
112
|
-
};
|
113
|
-
const providerSetter = (importName, path) => {
|
114
|
-
return (source) => {
|
115
|
-
return (0, ast_utils_1.addProviderToModule)(source, appModulePath, importName, path);
|
142
|
+
return [(0, ast_utils_1.insertImport)(source, appMComponentPath, importName, path, false, alias)];
|
116
143
|
};
|
117
144
|
};
|
118
145
|
const rules = [
|
119
|
-
modifyFileRule(
|
120
|
-
|
121
|
-
|
122
|
-
modifyFileRule(appModulePath, importSetter('SingleCardModule', './layouts')),
|
123
|
-
modifyFileRule(appModulePath, importSetter('FooterModule', './shared/components')),
|
124
|
-
modifyFileRule(appModulePath, importSetter('ResetPasswordFormModule', './shared/components')),
|
125
|
-
modifyFileRule(appModulePath, importSetter('CreateAccountFormModule', './shared/components')),
|
126
|
-
modifyFileRule(appModulePath, importSetter('ChangePasswordFormModule', './shared/components')),
|
127
|
-
modifyFileRule(appModulePath, importSetter('LoginFormModule', './shared/components')),
|
128
|
-
modifyFileRule(appModulePath, providerSetter('AuthService', './shared/services')),
|
129
|
-
modifyFileRule(appModulePath, providerSetter('ScreenService', './shared/services')),
|
130
|
-
modifyFileRule(appModulePath, providerSetter('AppInfoService', './shared/services')),
|
131
|
-
modifyFileRule(appModulePath, importSetter('UnauthenticatedContentModule', './unauthenticated-content')),
|
146
|
+
modifyFileRule(appMComponentPath, importSetter(templateOptions.layout === 'side-nav-outer-toolbar'
|
147
|
+
? 'SideNavOuterToolbarComponent'
|
148
|
+
: 'SideNavInnerToolbarComponent', './layouts', 'SideNavToolbarComponent')),
|
132
149
|
];
|
133
|
-
if (!hasRoutingModule(host, sourcePath)) {
|
134
|
-
rules.push(modifyFileRule(appModulePath, importSetter('AppRoutingModule', './app-routing.module')));
|
135
|
-
}
|
136
150
|
return (0, schematics_1.chain)(rules);
|
137
151
|
}
|
138
152
|
function getComponentName(host, sourcePath) {
|
139
153
|
let name = '';
|
140
154
|
let index = 0;
|
141
|
-
if (!host.exists(sourcePath + 'app.component.ts')) {
|
155
|
+
if (!host.exists(sourcePath + 'app.component.ts') && !host.exists(sourcePath + 'app.ts')) {
|
142
156
|
name = 'app';
|
143
157
|
}
|
144
158
|
while (!name) {
|
145
159
|
index++;
|
146
160
|
const componentName = `app${index}`;
|
147
|
-
if (!host.exists(`${sourcePath}${componentName}.component.ts`)
|
161
|
+
if (!host.exists(`${sourcePath}${componentName}.component.ts`)
|
162
|
+
&& !host.exists(`${sourcePath}${componentName}.ts`)) {
|
148
163
|
name = componentName;
|
149
164
|
}
|
150
165
|
}
|
151
166
|
return name;
|
152
167
|
}
|
153
|
-
function
|
154
|
-
return host.exists(sourcePath + 'app
|
168
|
+
function hasRouting(host, sourcePath) {
|
169
|
+
return host.exists(sourcePath + 'app.routes.ts');
|
155
170
|
}
|
156
171
|
function addPackagesToDependency(globalNgCliVersion) {
|
157
172
|
const version = new semver_1.SemVer(globalNgCliVersion.replace(/\^|\~/g, ''));
|
@@ -209,19 +224,28 @@ function updateDevextremeConfig(sourcePath = '') {
|
|
209
224
|
};
|
210
225
|
return modifyContentByTemplate('./', workspaceFilesSource, devextremeConfigPath, templateOptions, modifyConfig);
|
211
226
|
}
|
212
|
-
const
|
227
|
+
const modifyRouting = (host, routingFilePath) => {
|
213
228
|
// TODO: Try to use the isolated host to generate the result string
|
214
|
-
let source = (0, source_1.getSourceFile)(host,
|
215
|
-
const
|
216
|
-
const
|
217
|
-
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
229
|
+
let source = (0, source_1.getSourceFile)(host, routingFilePath);
|
230
|
+
const importChanges = [];
|
231
|
+
for (const route of routes) {
|
232
|
+
importChanges.push((0, ast_utils_1.insertImport)(source, routingFilePath, route.name, route.location));
|
233
|
+
}
|
234
|
+
(0, change_1.applyChanges)(host, importChanges, routingFilePath);
|
235
|
+
for (const route of routes) {
|
236
|
+
if (route.type === 'component' && route.path) {
|
237
|
+
source = (0, source_1.getSourceFile)(host, routingFilePath);
|
238
|
+
const routeInSource = (0, routing_1.findRoutesInSource)(source);
|
239
|
+
if (!(0, routing_1.hasComponentInRoutes)(routeInSource, route.path)) {
|
240
|
+
const routeToAdd = (0, routing_1.getRoute)(route.name, route.name, route.path);
|
241
|
+
(0, change_1.insertItemToArray)(host, routingFilePath, routeInSource, routeToAdd);
|
242
|
+
}
|
243
|
+
}
|
223
244
|
}
|
224
245
|
};
|
246
|
+
function setPostfix(host, name) {
|
247
|
+
return name + ((0, angular_version_1.isAngularVersionHigherThan)(host, 20) ? '' : '.component');
|
248
|
+
}
|
225
249
|
function default_1(options) {
|
226
250
|
return (host) => __awaiter(this, void 0, void 0, function* () {
|
227
251
|
const project = yield (0, project_1.getProjectName)(host, options.project);
|
@@ -236,7 +260,7 @@ function default_1(options) {
|
|
236
260
|
const componentName = override ? 'app' : getComponentName(host, appPath);
|
237
261
|
const pathToCss = sourcePath === null || sourcePath === void 0 ? void 0 : sourcePath.replace(/\/?(\w)+\/?/g, '../');
|
238
262
|
const templateOptions = {
|
239
|
-
name: componentName,
|
263
|
+
name: setPostfix(host, componentName),
|
240
264
|
layout,
|
241
265
|
title,
|
242
266
|
strings: core_1.strings,
|
@@ -247,8 +271,8 @@ function default_1(options) {
|
|
247
271
|
if ((0, path_1.basename)(filePath) === 'styles.scss') {
|
248
272
|
return `${currentContent}\n${templateContent}`;
|
249
273
|
}
|
250
|
-
if ((0, path_1.basename)(filePath) === 'app
|
251
|
-
|
274
|
+
if ((0, path_1.basename)(filePath) === 'app.routes.ts' && hasRouting(host, appPath)) {
|
275
|
+
modifyRouting(host, filePath);
|
252
276
|
return currentContent;
|
253
277
|
}
|
254
278
|
return templateContent;
|
@@ -256,7 +280,7 @@ function default_1(options) {
|
|
256
280
|
const rules = [
|
257
281
|
modifyContentByTemplate(sourcePath, projectFilesSource, null, templateOptions, modifyContent),
|
258
282
|
updateDevextremeConfig(sourcePath),
|
259
|
-
|
283
|
+
updateAppComponent(host, appPath, templateOptions),
|
260
284
|
addBuildThemeScript(),
|
261
285
|
() => addCustomThemeStyles(host, options, sourcePath),
|
262
286
|
addViewportToBody(sourcePath),
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAcoC;AAMpC,+CAA+C;AAE/C,+BAAsC;AAEtC,mCAAgC;AAEhC,gDAI6B;AAE7B,8CAE2B;AAE3B,8CAE4B;AAE5B,kEAEsC;AAEtC,2EAGkD;AAElD,8CAAkD;AAElD,8CAG2B;AAE3B,gDAI4B;AAE5B,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
package/src/add-layout/index.ts
CHANGED
@@ -60,14 +60,45 @@ import {
|
|
60
60
|
findRoutesInSource
|
61
61
|
} from '../utility/routing';
|
62
62
|
|
63
|
-
import {
|
64
|
-
addImportToModule, addProviderToModule, insertImport
|
65
|
-
} from '@schematics/angular/utility/ast-utils';
|
63
|
+
import { insertImport } from '@schematics/angular/utility/ast-utils';
|
66
64
|
|
67
65
|
import { getWorkspace } from '@schematics/angular/utility/workspace';
|
68
66
|
import { Change } from '@schematics/angular/utility/change';
|
69
67
|
|
70
68
|
import { PatchNodePackageInstallTask } from '../utility/patch';
|
69
|
+
import { isAngularVersionHigherThan } from '../utility/angular-version';
|
70
|
+
|
71
|
+
const routes = [
|
72
|
+
{
|
73
|
+
name: 'AuthGuardService',
|
74
|
+
type: 'service',
|
75
|
+
location: './shared/services'
|
76
|
+
},
|
77
|
+
{
|
78
|
+
name: 'LoginFormComponent',
|
79
|
+
path: 'login-form',
|
80
|
+
type: 'component',
|
81
|
+
location: './shared/components'
|
82
|
+
},
|
83
|
+
{
|
84
|
+
name: 'ResetPasswordFormComponent',
|
85
|
+
path: 'reset-password',
|
86
|
+
type: 'component',
|
87
|
+
location: './shared/components'
|
88
|
+
},
|
89
|
+
{
|
90
|
+
name: 'CreateAccountFormComponent',
|
91
|
+
path: 'create-account',
|
92
|
+
type: 'component',
|
93
|
+
location: './shared/components'
|
94
|
+
},
|
95
|
+
{
|
96
|
+
name: 'ChangePasswordFormComponent',
|
97
|
+
path: 'change-password/:recoveryCode',
|
98
|
+
type: 'component',
|
99
|
+
location: './shared/components'
|
100
|
+
}
|
101
|
+
];
|
71
102
|
|
72
103
|
const projectFilesSource = './files/src';
|
73
104
|
const workspaceFilesSource = './files';
|
@@ -168,41 +199,25 @@ function modifyFileRule(path: string, callback: (source: SourceFile) => Change[]
|
|
168
199
|
};
|
169
200
|
}
|
170
201
|
|
171
|
-
function
|
172
|
-
const
|
173
|
-
|
174
|
-
const importSetter = (importName: string, path: string) => {
|
175
|
-
return (source: SourceFile) => {
|
176
|
-
return addImportToModule(source, appModulePath, importName, path);
|
177
|
-
};
|
178
|
-
};
|
202
|
+
function updateAppComponent(host: Tree, sourcePath: string, templateOptions: any = {}) {
|
203
|
+
const appMComponentPath = sourcePath + (isAngularVersionHigherThan(host, 20) ? 'app.ts' : 'app.component.ts');
|
179
204
|
|
180
|
-
const
|
205
|
+
const importSetter = (importName: string, path: string, alias: string) => {
|
181
206
|
return (source: SourceFile) => {
|
182
|
-
return
|
207
|
+
return [insertImport(source, appMComponentPath, importName, path, false, alias)];
|
183
208
|
};
|
184
209
|
};
|
185
210
|
|
186
211
|
const rules = [
|
187
|
-
modifyFileRule(
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
modifyFileRule(appModulePath, importSetter('ChangePasswordFormModule', './shared/components')),
|
195
|
-
modifyFileRule(appModulePath, importSetter('LoginFormModule', './shared/components')),
|
196
|
-
modifyFileRule(appModulePath, providerSetter('AuthService', './shared/services')),
|
197
|
-
modifyFileRule(appModulePath, providerSetter('ScreenService', './shared/services')),
|
198
|
-
modifyFileRule(appModulePath, providerSetter('AppInfoService', './shared/services')),
|
199
|
-
modifyFileRule(appModulePath, importSetter('UnauthenticatedContentModule', './unauthenticated-content')),
|
212
|
+
modifyFileRule(appMComponentPath, importSetter(
|
213
|
+
templateOptions.layout === 'side-nav-outer-toolbar'
|
214
|
+
? 'SideNavOuterToolbarComponent'
|
215
|
+
: 'SideNavInnerToolbarComponent',
|
216
|
+
'./layouts',
|
217
|
+
'SideNavToolbarComponent',
|
218
|
+
)),
|
200
219
|
];
|
201
220
|
|
202
|
-
if (!hasRoutingModule(host, sourcePath)) {
|
203
|
-
rules.push(modifyFileRule(appModulePath, importSetter('AppRoutingModule', './app-routing.module')));
|
204
|
-
}
|
205
|
-
|
206
221
|
return chain(rules);
|
207
222
|
}
|
208
223
|
|
@@ -210,7 +225,7 @@ function getComponentName(host: Tree, sourcePath: string) {
|
|
210
225
|
let name = '';
|
211
226
|
let index = 0;
|
212
227
|
|
213
|
-
if (!host.exists(sourcePath + 'app.component.ts')) {
|
228
|
+
if (!host.exists(sourcePath + 'app.component.ts') && !host.exists(sourcePath + 'app.ts')) {
|
214
229
|
name = 'app';
|
215
230
|
}
|
216
231
|
|
@@ -218,7 +233,10 @@ function getComponentName(host: Tree, sourcePath: string) {
|
|
218
233
|
index++;
|
219
234
|
const componentName = `app${index}`;
|
220
235
|
|
221
|
-
if (
|
236
|
+
if (
|
237
|
+
!host.exists(`${sourcePath}${componentName}.component.ts`)
|
238
|
+
&& !host.exists(`${sourcePath}${componentName}.ts`)
|
239
|
+
) {
|
222
240
|
name = componentName;
|
223
241
|
}
|
224
242
|
}
|
@@ -226,8 +244,8 @@ function getComponentName(host: Tree, sourcePath: string) {
|
|
226
244
|
return name;
|
227
245
|
}
|
228
246
|
|
229
|
-
function
|
230
|
-
return host.exists(sourcePath + 'app
|
247
|
+
function hasRouting(host: Tree, sourcePath: string) {
|
248
|
+
return host.exists(sourcePath + 'app.routes.ts');
|
231
249
|
}
|
232
250
|
|
233
251
|
function addPackagesToDependency(globalNgCliVersion: string) {
|
@@ -306,21 +324,32 @@ function updateDevextremeConfig(sourcePath: string = '') {
|
|
306
324
|
return modifyContentByTemplate('./', workspaceFilesSource, devextremeConfigPath, templateOptions, modifyConfig);
|
307
325
|
}
|
308
326
|
|
309
|
-
const
|
327
|
+
const modifyRouting = (host: Tree, routingFilePath: string) => {
|
310
328
|
// TODO: Try to use the isolated host to generate the result string
|
311
|
-
let source = getSourceFile(host,
|
312
|
-
const
|
313
|
-
|
314
|
-
|
315
|
-
|
316
|
-
source = getSourceFile(host, routingModulePath)!;
|
317
|
-
const routes = findRoutesInSource(source)!;
|
318
|
-
if (!hasComponentInRoutes(routes, 'login-form')) {
|
319
|
-
const loginFormRoute = getRoute('login-form');
|
320
|
-
insertItemToArray(host, routingModulePath, routes, loginFormRoute);
|
329
|
+
let source = getSourceFile(host, routingFilePath)!;
|
330
|
+
const importChanges = [];
|
331
|
+
for (const route of routes) {
|
332
|
+
importChanges.push(insertImport(source, routingFilePath, route.name, route.location));
|
321
333
|
}
|
334
|
+
|
335
|
+
applyChanges(host, importChanges, routingFilePath);
|
336
|
+
for (const route of routes) {
|
337
|
+
if (route.type === 'component' && route.path) {
|
338
|
+
source = getSourceFile(host, routingFilePath)!;
|
339
|
+
const routeInSource = findRoutesInSource(source)!;
|
340
|
+
if (!hasComponentInRoutes(routeInSource, route.path)) {
|
341
|
+
const routeToAdd = getRoute(route.name, route.name, route.path);
|
342
|
+
insertItemToArray(host, routingFilePath, routeInSource, routeToAdd);
|
343
|
+
}
|
344
|
+
}
|
345
|
+
}
|
346
|
+
|
322
347
|
};
|
323
348
|
|
349
|
+
function setPostfix(host: Tree, name: string) {
|
350
|
+
return name + (isAngularVersionHigherThan(host, 20) ? '' : '.component');
|
351
|
+
}
|
352
|
+
|
324
353
|
export default function(options: any): Rule {
|
325
354
|
return async (host: Tree) => {
|
326
355
|
const project = await getProjectName(host, options.project);
|
@@ -334,8 +363,9 @@ export default function(options: any): Rule {
|
|
334
363
|
const override = options.resolveConflicts === 'override';
|
335
364
|
const componentName = override ? 'app' : getComponentName(host, appPath);
|
336
365
|
const pathToCss = sourcePath?.replace(/\/?(\w)+\/?/g, '../');
|
366
|
+
|
337
367
|
const templateOptions = {
|
338
|
-
name: componentName,
|
368
|
+
name: setPostfix(host, componentName),
|
339
369
|
layout,
|
340
370
|
title,
|
341
371
|
strings,
|
@@ -348,8 +378,8 @@ export default function(options: any): Rule {
|
|
348
378
|
return `${currentContent}\n${templateContent}`;
|
349
379
|
}
|
350
380
|
|
351
|
-
if (basename(filePath) === 'app
|
352
|
-
|
381
|
+
if (basename(filePath) === 'app.routes.ts' && hasRouting(host, appPath)) {
|
382
|
+
modifyRouting(host, filePath);
|
353
383
|
return currentContent;
|
354
384
|
}
|
355
385
|
|
@@ -359,7 +389,7 @@ export default function(options: any): Rule {
|
|
359
389
|
const rules = [
|
360
390
|
modifyContentByTemplate(sourcePath, projectFilesSource, null, templateOptions, modifyContent),
|
361
391
|
updateDevextremeConfig(sourcePath),
|
362
|
-
|
392
|
+
updateAppComponent(host, appPath, templateOptions),
|
363
393
|
addBuildThemeScript(),
|
364
394
|
() => addCustomThemeStyles(host, options, sourcePath) as any,
|
365
395
|
addViewportToBody(sourcePath),
|
@@ -88,24 +88,17 @@ describe('layout', () => {
|
|
88
88
|
expect(styles[2]).toBe('src/themes/generated/theme.base.css');
|
89
89
|
expect(styles[3]).toBe('src/themes/generated/theme.additional.dark.css');
|
90
90
|
expect(styles[4]).toBe('src/themes/generated/theme.additional.css');
|
91
|
-
const moduleContent = tree.readContent('/src/app/app.module.ts');
|
92
|
-
expect(moduleContent).toContain('import { DxHttpModule }');
|
93
|
-
expect(moduleContent)
|
94
|
-
.toContain('import { SideNavOuterToolbarModule, SideNavInnerToolbarModule, SingleCardModule }');
|
95
|
-
expect(moduleContent)
|
96
|
-
.toContain(`import { AuthService, ScreenService, AppInfoService } from './shared/services';`);
|
97
|
-
expect(moduleContent).toContain('import { AppRoutingModule }');
|
98
|
-
expect(moduleContent)
|
99
|
-
.toContain('import { FooterModule, ' +
|
100
|
-
'ResetPasswordFormModule, ' +
|
101
|
-
'CreateAccountFormModule, ' +
|
102
|
-
'ChangePasswordFormModule, ' +
|
103
|
-
'LoginFormModule }');
|
104
91
|
const appContent = tree.readContent('/src/app/app.component.ts');
|
92
|
+
expect(appContent).toContain('import { DxHttpModule }');
|
93
|
+
expect(appContent)
|
94
|
+
.toContain('import { SideNavOuterToolbarComponent as SideNavToolbarComponent }');
|
95
|
+
expect(appContent)
|
96
|
+
.toContain(`import { AuthService, ScreenService, AppInfoService } from './shared/services';`);
|
97
|
+
expect(appContent)
|
98
|
+
.toContain('import { FooterComponent }');
|
105
99
|
expect(appContent).toContain('templateUrl: \'./app.component.html\',');
|
106
100
|
expect(appContent).toContain('styleUrls: [\'./app.component.scss\']');
|
107
101
|
expect(appContent).toContain('selector: \'app-root\',');
|
108
|
-
expect(appContent).toContain(`import { AuthService, ScreenService, AppInfoService } from './shared/services';`);
|
109
102
|
const navigationMenu = tree.readContent('/src/app/shared/components/side-navigation-menu/side-navigation-menu.component.ts');
|
110
103
|
expect(navigationMenu).toContain('@ViewChild(DxTreeViewComponent, { static: true })');
|
111
104
|
}));
|
@@ -198,21 +191,28 @@ describe('layout', () => {
|
|
198
191
|
expect(appInfo).toContain(`return 'TestApp';`);
|
199
192
|
}));
|
200
193
|
it('should add routing to layout', () => __awaiter(void 0, void 0, void 0, function* () {
|
201
|
-
let newAppTree = yield schematicRunner.runSchematic('workspace', workspaceOptions);
|
202
|
-
appOptions.routing = false;
|
203
|
-
newAppTree = yield schematicRunner.runSchematic('application', appOptions, newAppTree);
|
204
194
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
205
195
|
const tree = yield runner.runSchematic('add-layout', options, appTree);
|
206
|
-
expect(tree.files).toContain('/src/app/app
|
207
|
-
const
|
208
|
-
expect(
|
209
|
-
.
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
196
|
+
expect(tree.files).toContain('/src/app/app.routes.ts');
|
197
|
+
const routesContent = tree.readContent('/src/app/app.routes.ts');
|
198
|
+
expect(routesContent)
|
199
|
+
.toContain(`import { AuthGuardService } from './shared/services';`);
|
200
|
+
const loginFormComponentMatch = routesContent.match(/\bLoginFormComponent\b/g);
|
201
|
+
const resetPasswordFormComponentMatch = routesContent.match(/\bResetPasswordFormComponent\b/g);
|
202
|
+
const createAccountFormComponentMatch = routesContent.match(/\bCreateAccountFormComponent\b/g);
|
203
|
+
const changePasswordFormComponentMatch = routesContent.match(/\bChangePasswordFormComponent\b/g);
|
204
|
+
expect(loginFormComponentMatch === null || loginFormComponentMatch === void 0 ? void 0 : loginFormComponentMatch.length).toBe(2);
|
205
|
+
expect(resetPasswordFormComponentMatch === null || resetPasswordFormComponentMatch === void 0 ? void 0 : resetPasswordFormComponentMatch.length).toBe(2);
|
206
|
+
expect(createAccountFormComponentMatch === null || createAccountFormComponentMatch === void 0 ? void 0 : createAccountFormComponentMatch.length).toBe(2);
|
207
|
+
expect(changePasswordFormComponentMatch === null || changePasswordFormComponentMatch === void 0 ? void 0 : changePasswordFormComponentMatch.length).toBe(2);
|
208
|
+
expect(routesContent)
|
209
|
+
.toContain(`path: 'login-form'`);
|
210
|
+
expect(routesContent)
|
211
|
+
.toContain(`path: 'reset-password'`);
|
212
|
+
expect(routesContent)
|
213
|
+
.toContain(`path: 'create-account'`);
|
214
|
+
expect(routesContent)
|
215
|
+
.toContain(`path: 'change-password/:recoveryCode'`);
|
216
216
|
}));
|
217
217
|
it('should use selected layout', () => __awaiter(void 0, void 0, void 0, function* () {
|
218
218
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,gEAAuF;AAEvF,2EAIkD;AAClD,6BAA6B;AAE7B,kEAA6D;AAE7D,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAElE,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtB,MAAM,UAAU,GAAQ;QACtB,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,KAAK;QACrB,OAAO,EAAE,KAAK;QACd,KAAK,EAAE,MAAM;QACb,SAAS,EAAE,KAAK;QAChB,eAAe,EAAE,KAAK;QACtB,UAAU,EAAE,KAAK;KAClB,CAAC;IAEF,MAAM,gBAAgB,GAAqB;QACzC,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,QAAQ;KAClB,CAAC;IAEF,MAAM,OAAO,GAAQ;QACnB,MAAM,EAAE,wBAAwB;QAChC,gBAAgB,EAAE,UAAU;QAC5B,kBAAkB,EAAE,SAAS;KAC9B,CAAC;IAEF,MAAM,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,wDAAwD,CAAC,CAAC;IAC9G,MAAM,eAAe,GAAG,IAAI,6BAAmB,CAC7C,qBAAqB,EACrB,2BAA2B,CAC5B,CAAC;IACF,IAAI,OAAqB,CAAC;IAE1B,UAAU,CAAC,GAAS,EAAE;QACpB,OAAO,GAAG,MAAM,eAAe,CAAC,YAAY,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;QAC5E,OAAO,GAAG,MAAM,eAAe,CAAC,YAAY,CAAC,aAAa,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACnF,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,GAAS,EAAE;QAC/C,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEvE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACf,SAAS,CAAC,kBAAkB,CAAC,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACf,SAAS,CAAC,4BAA4B,CAAC,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACf,SAAS,CAAC,uDAAuD,CAAC,CAAC;QACtE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACf,SAAS,CAAC,+DAA+D,CAAC,CAAC;QAC9E,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACf,SAAS,CAAC,mFAAmF,CAAC,CAAC;QAClG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACf,SAAS,CAAC,8CAA8C,CAAC,CAAC;QAC7D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACf,SAAS,CAAC,0CAA0C,CAAC,CAAC;QACzD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACf,SAAS,CAAC,4CAA4C,CAAC,CAAC;QAC3D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACf,SAAS,CAAC,6EAA6E,CAAC,CAAC;QAC5F,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACf,SAAS,CAAC,6EAA6E,CAAC,CAAC;QAC5F,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACf,SAAS,CAAC,uDAAuD,CAAC,CAAC;QACtE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACf,SAAS,CAAC,gCAAgC,CAAC,CAAC;QAC/C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACf,SAAS,CAAC,sCAAsC,CAAC,CAAC;QAErD,MAAM,uBAAuB,GAAG,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;QACrE,MAAM,CAAC,uBAAuB,CAAC,CAAC,SAAS,CAAC,gCAAgC,CAAC,CAAC;QAC5E,MAAM,CAAC,uBAAuB,CAAC,CAAC,SAAS,CAAC,oDAAoD,CAAC,CAAC;QAChG,MAAM,CAAC,uBAAuB,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAEtD,MAAM,gBAAgB,GAAG,IAAI,CAAC,WAAW,CAAC,6BAA6B,CAAC,CAAC;QACzE,MAAM,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,sDAAsD,CAAC,CAAC;QAE3F,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;QAC9D,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAE9C,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;QACzD,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC;QAE3D,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAE9E,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;QACzE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;QACnE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;QAC9D,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;QACzE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QAEpE,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC;QACjE,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC;QAC3D,MAAM,CAAC,aAAa,CAAC;aAClB,SAAS,CAAC,mFAAmF,CAAC,CAAC;QAClG,MAAM,CAAC,aAAa,CAAC;aAClB,SAAS,CAAC,iFAAiF,CAAC,CAAC;QAChG,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,6BAA6B,CAAC,CAAC;QAC/D,MAAM,CAAC,aAAa,CAAC;aAClB,SAAS,CAAC,yBAAyB;YACpC,2BAA2B;YAC3B,2BAA2B;YAC3B,4BAA4B;YAC5B,mBAAmB,CAAC,CAAC;QAEvB,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,2BAA2B,CAAC,CAAC;QACjE,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;QACvE,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,uCAAuC,CAAC,CAAC;QACtE,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC;QACxD,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,iFAAiF,CAAC,CAAC;QAEhH,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,CACrC,mFAAmF,CAAC,CAAC;QACvF,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,CAAC,mDAAmD,CAAC,CAAC;IACxF,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,wBAAwB,EAAE,GAAS,EAAE;QACtC,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACvE,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC;QACnE,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACvE,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAC5E,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,wBAAwB,EAAE,GAAS,EAAE;QACtC,IAAA,0CAA2B,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QACtD,IAAA,uCAAwB,EAAC,OAAO,EAAE;YAChC,IAAI,EAAE,iCAAkB,CAAC,OAAO;YAChC,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACvE,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,CACrC,mFAAmF,CAAC,CAAC;QAEvF,MAAM,CAAC,cAAc,CAAC,CAAC,SAAS,CAAC,mDAAmD,CAAC,CAAC;IACxF,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,GAAS,EAAE;QAC7C,IAAA,iCAAc,EAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE;YACjD,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;YAElC,OAAO,CAAC,cAAc,CAAC,GAAG,cAAc,CAAC;YACzC,OAAO,CAAC,aAAa,CAAC,GAAG,cAAc,CAAC;YAExC,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACvE,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC;QACnE,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1E,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACzE,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;QACtG,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;IAC1G,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,GAAS,EAAE;QACjD,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACvE,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC;QAEnE,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACnE,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAS,EAAE;QACrE,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACvE,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC;QAEnE,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACrE,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAS,EAAE;QACrE,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,kCAC9C,OAAO,KACV,aAAa,EAAE,IAAI,KAClB,OAAO,CAAC,CAAC;QAEZ,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC;QACrE,MAAM,OAAO,GAAG,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC;QAElG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACzB,IAAI,EAAE,SAAS;YACf,cAAc,EAAE,KAAK;YACrB,YAAY,EAAE,KAAK;SACpB,CAAC,CAAC;IACL,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,2EAA2E,EAAE,GAAS,EAAE;QACzF,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEvE,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC;QACrE,MAAM,OAAO,GAAG,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC;QAClG,MAAM,aAAa,GAAG;YACpB,IAAI,EAAE,SAAS;YACf,cAAc,EAAE,OAAO;YACvB,YAAY,EAAE,KAAK;SACpB,CAAC;QAEF,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC5C,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAS,EAAE;QAClD,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QAErE,OAAO,CAAC,gBAAgB,GAAG,WAAW,CAAC;QACvC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEvE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC;QAE3D,MAAM,gBAAgB,GAAG,IAAI,CAAC,WAAW,CAAC,8BAA8B,CAAC,CAAC;QAC1E,MAAM,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,sDAAsD,CAAC,CAAC;QAE3F,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,2BAA2B,CAAC,CAAC;QACjE,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,uCAAuC,CAAC,CAAC;QACpE,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,mCAAmC,CAAC,CAAC;QAEhE,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,4BAA4B,CAAC,CAAC;QACrE,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,wCAAwC,CAAC,CAAC;QACxE,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,yCAAyC,CAAC,CAAC;QACzE,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,iFAAiF,CAAC,CAAC;QAEnH,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,8CAA8C,CAAC,CAAC;QACjF,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;IACjD,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,GAAS,EAAE;QAC5C,IAAI,UAAU,GAAG,MAAM,eAAe,CAAC,YAAY,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;QAEnF,UAAU,CAAC,OAAO,GAAG,KAAK,CAAC;QAC3B,UAAU,GAAG,MAAM,eAAe,CAAC,YAAY,CAC7C,aAAa,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAEzC,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEvE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,gCAAgC,CAAC,CAAC;QAC/D,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,gCAAgC,CAAC,CAAC;QACzE,MAAM,CAAC,aAAa,CAAC;aAClB,OAAO,CAAC,mEAAmE,CAAC,CAAC;QAEhF,MAAM,CAAC,aAAa,CAAC;aAClB,SAAS,CAAC;;;;IAIb,CAAC,CAAC;IACJ,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,4BAA4B,EAAE,GAAS,EAAE;QAC1C,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,OAAO,CAAC,MAAM,GAAG,wBAAwB,CAAC;QAC1C,OAAO,CAAC,gBAAgB,GAAG,UAAU,CAAC;QACtC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,6BAA6B,CAAC,CAAC;QAEhE,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,sDAAsD,CAAC,CAAC;IACpF,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,GAAS,EAAE;QACpD,OAAO,GAAG,MAAM,eAAe,CAAC,YAAY,CAAC,aAAa,kCACrD,UAAU,KACb,IAAI,EAAE,UAAU,EAChB,WAAW,EAAE,mBAAmB,EAChC,UAAU,EAAE,KAAK,KAChB,OAAO,CAAC,CAAC;QAEZ,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,kCAC9C,OAAO,KACV,OAAO,EAAE,UAAU,KAClB,OAAO,CAAC,CAAC;QAEZ,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACf,SAAS,CAAC,kBAAkB,CAAC,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACf,SAAS,CAAC,kDAAkD,CAAC,CAAC;IACnE,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAS,EAAE;QACnE,OAAO,GAAG,MAAM,eAAe,CAAC,YAAY,CAAC,aAAa,kCACrD,UAAU,KACb,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,mBAAmB,EAChC,UAAU,EAAE,KAAK,KAChB,OAAO,CAAC,CAAC;QAEZ,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,IAAI,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACrE,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,kCACxC,OAAO,KACV,OAAO,EAAE,UAAU,KAClB,OAAO,CAAC,CAAC;QAEZ,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,4CAA4C,CAAC,CAAC;QAClF,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;QAEzD,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;QACrD,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,+CAA+C,CAAC,CAAC;QAC3E,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,iEAAiE,CAAC,CAAC;IAC/F,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
1
|
+
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":"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"}
|