devextreme-schematics 1.12.1 → 1.13.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 +2 -2
- package/src/add-app-template/schema.json +1 -1
- package/src/add-layout/files/src/app/__name__.html +3 -5
- package/src/add-layout/files/src/app/app-navigation.ts +3 -1
- package/src/add-layout/files/src/app/layouts/side-nav-inner-toolbar/side-nav-inner-toolbar.component.html +3 -2
- package/src/add-layout/files/src/app/layouts/side-nav-outer-toolbar/side-nav-outer-toolbar.component.html +1 -1
- package/src/add-layout/files/src/app/shared/components/change-password-form/change-password-form.component.html +4 -3
- package/src/add-layout/files/src/app/shared/components/create-account-form/create-account-form.component.html +4 -4
- package/src/add-layout/files/src/app/shared/components/header/header.component.html +6 -4
- package/src/add-layout/files/src/app/shared/components/login-form/login-form.component.html +4 -3
- package/src/add-layout/files/src/app/shared/components/reset-password-form/reset-password-form.component.html +4 -3
- package/src/add-layout/files/src/app/shared/components/user-panel/user-panel.component.html +3 -2
- package/src/add-layout/index.js +33 -5
- package/src/add-layout/index.js.map +1 -1
- package/src/add-layout/index.ts +42 -6
- package/src/add-layout/index_spec.js +1 -1
- package/src/add-layout/index_spec.ts +1 -1
- package/src/add-sample-views/index_spec.js +2 -1
- package/src/add-sample-views/index_spec.js.map +1 -1
- package/src/add-sample-views/index_spec.ts +3 -1
- package/src/add-view/index_spec.js +2 -1
- package/src/add-view/index_spec.js.map +1 -1
- package/src/add-view/index_spec.ts +3 -1
- package/src/install/schema.json +1 -1
- package/src/migrate-config-components/README.md +1 -1
- package/src/migrate-config-components/schema.json +4 -3
- package/src/migrate-config-components/template-migrator.js +5 -5
- package/src/migrate-config-components/template-migrator.js.map +1 -1
- package/src/migrate-config-components/template-migrator.ts +5 -5
- package/src/utility/change.js +4 -2
- package/src/utility/change.js.map +1 -1
- package/src/utility/change.ts +7 -2
- package/src/utility/latest-versions.js +2 -2
- package/src/utility/latest-versions.ts +2 -2
- package/src/utility/typescript-resolver.js +3 -3
- package/src/utility/typescript-resolver.js.map +1 -1
- package/src/utility/typescript-resolver.ts +3 -3
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "devextreme-schematics",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.13.0",
|
|
4
4
|
"description": "DevExtreme schematics",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "tsc -p tsconfig.json",
|
|
@@ -38,5 +38,5 @@
|
|
|
38
38
|
"tslint": "^5.20.1",
|
|
39
39
|
"typescript": "~5.2.1"
|
|
40
40
|
},
|
|
41
|
-
"gitHead": "
|
|
41
|
+
"gitHead": "51bbc8d2fbfa40b741792c6921e27429cdb04c6f"
|
|
42
42
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
@if (isAuthenticated()) {
|
|
2
2
|
<app-<%= layout %> title="{{appInfo.title}}">
|
|
3
3
|
<router-outlet></router-outlet>
|
|
4
4
|
<app-footer>
|
|
@@ -7,8 +7,6 @@
|
|
|
7
7
|
All trademarks or registered trademarks are property of their respective owners.
|
|
8
8
|
</app-footer>
|
|
9
9
|
</app-<%= layout %>>
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
<ng-template #unauthenticated>
|
|
10
|
+
} @else {
|
|
13
11
|
<app-unauthenticated-content></app-unauthenticated-content>
|
|
14
|
-
|
|
12
|
+
}
|
|
@@ -11,13 +11,13 @@
|
|
|
11
11
|
<app-side-navigation-menu
|
|
12
12
|
[compactMode]="!menuOpened"
|
|
13
13
|
[selectedItem]="selectedRoute"
|
|
14
|
-
[
|
|
14
|
+
[class]="swatchClassName"
|
|
15
15
|
*dxTemplate="let dataMenu of 'panel'"
|
|
16
16
|
(selectedItemChanged)="navigationChanged($event)"
|
|
17
17
|
(openMenu)="navigationClick()">
|
|
18
18
|
<dx-toolbar id="navigation-header">
|
|
19
|
+
@if (minMenuSize !== 0) {
|
|
19
20
|
<dxi-toolbar-item
|
|
20
|
-
*ngIf="minMenuSize !== 0"
|
|
21
21
|
location="before"
|
|
22
22
|
cssClass="menu-button"
|
|
23
23
|
widget="dxButton"
|
|
@@ -27,6 +27,7 @@
|
|
|
27
27
|
onClick: toggleMenu
|
|
28
28
|
}">
|
|
29
29
|
</dxi-toolbar-item>
|
|
30
|
+
}
|
|
30
31
|
<dxi-toolbar-item
|
|
31
32
|
location="before"
|
|
32
33
|
cssClass="header-title"
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
<app-side-navigation-menu
|
|
19
19
|
[compactMode]="!menuOpened"
|
|
20
20
|
[selectedItem]="selectedRoute"
|
|
21
|
-
[
|
|
21
|
+
[class]="swatchClassName"
|
|
22
22
|
*dxTemplate="let dataMenu of 'panel'"
|
|
23
23
|
(selectedItemChanged)="navigationChanged($event)"
|
|
24
24
|
(openMenu)="navigationClick()">
|
|
@@ -23,10 +23,11 @@
|
|
|
23
23
|
<ng-container *dxTemplate="let item of 'changePasswordTemplate'">
|
|
24
24
|
<div>
|
|
25
25
|
<span class="dx-button-text">
|
|
26
|
-
|
|
26
|
+
@if (loading) {
|
|
27
27
|
<dx-load-indicator width="24px" height="24px" [visible]="true"></dx-load-indicator>
|
|
28
|
-
|
|
29
|
-
|
|
28
|
+
} @else {
|
|
29
|
+
<div>Continue</div>
|
|
30
|
+
}
|
|
30
31
|
</span>
|
|
31
32
|
</div>
|
|
32
33
|
</ng-container>
|
|
@@ -37,11 +37,11 @@
|
|
|
37
37
|
<ng-container *dxTemplate="let item of 'createAccountTemplate'">
|
|
38
38
|
<div>
|
|
39
39
|
<span class="dx-button-text">
|
|
40
|
-
|
|
40
|
+
@if (loading) {
|
|
41
41
|
<dx-load-indicator width="24px" height="24px" [visible]="true"></dx-load-indicator>
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
42
|
+
} @else {
|
|
43
|
+
<div>Create a new account</div>
|
|
44
|
+
}
|
|
45
45
|
</span>
|
|
46
46
|
</div>
|
|
47
47
|
</ng-container>
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<header>
|
|
2
2
|
<dx-toolbar class="header-toolbar">
|
|
3
|
+
@if (menuToggleEnabled) {
|
|
3
4
|
<dxi-toolbar-item
|
|
4
|
-
*ngIf="menuToggleEnabled"
|
|
5
5
|
location="before"
|
|
6
6
|
widget="dxButton"
|
|
7
7
|
cssClass="menu-button"
|
|
@@ -11,18 +11,20 @@
|
|
|
11
11
|
onClick: toggleMenu
|
|
12
12
|
}">
|
|
13
13
|
</dxi-toolbar-item>
|
|
14
|
+
}
|
|
15
|
+
@if (title) {
|
|
14
16
|
<dxi-toolbar-item
|
|
15
17
|
location="before"
|
|
16
18
|
cssClass="header-title"
|
|
17
|
-
*ngIf="title"
|
|
18
19
|
[text]="title">
|
|
19
20
|
</dxi-toolbar-item>
|
|
21
|
+
}
|
|
20
22
|
<dxi-toolbar-item
|
|
21
23
|
location="after"
|
|
22
24
|
>
|
|
23
|
-
<
|
|
25
|
+
<div *dxTemplate>
|
|
24
26
|
<theme-switcher></theme-switcher>
|
|
25
|
-
</
|
|
27
|
+
</div>
|
|
26
28
|
</dxi-toolbar-item>
|
|
27
29
|
<dxi-toolbar-item
|
|
28
30
|
location="after"
|
|
@@ -27,10 +27,11 @@
|
|
|
27
27
|
<ng-container *dxTemplate="let item of 'signInTemplate'">
|
|
28
28
|
<div>
|
|
29
29
|
<span class="dx-button-text">
|
|
30
|
-
|
|
30
|
+
@if (loading) {
|
|
31
31
|
<dx-load-indicator width="24px" height="24px" [visible]="true"></dx-load-indicator>
|
|
32
|
-
|
|
33
|
-
|
|
32
|
+
} @else {
|
|
33
|
+
<div>Sign In</div>
|
|
34
|
+
}
|
|
34
35
|
</span>
|
|
35
36
|
</div>
|
|
36
37
|
</ng-container>
|
|
@@ -17,10 +17,11 @@
|
|
|
17
17
|
<ng-container *dxTemplate="let item of 'resetPasswordTemplate'">
|
|
18
18
|
<div>
|
|
19
19
|
<span class="dx-button-text">
|
|
20
|
-
|
|
20
|
+
@if (loading) {
|
|
21
21
|
<dx-load-indicator width="24px" height="24px" [visible]="true"></dx-load-indicator>
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
} @else {
|
|
23
|
+
<div>Reset my password</div>
|
|
24
|
+
}
|
|
24
25
|
</span>
|
|
25
26
|
</div>>
|
|
26
27
|
</ng-container>
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<div class="user-panel">
|
|
2
|
+
@if (menuMode !== 'list') {
|
|
2
3
|
<dx-drop-down-button
|
|
3
|
-
*ngIf="menuMode !== 'list'"
|
|
4
4
|
stylingMode="text"
|
|
5
5
|
[icon]="'https://js.devexpress.com/Demos/WidgetsGallery/JSDemos/images/employees/06.png'"
|
|
6
6
|
[showArrowIcon]="false"
|
|
@@ -10,11 +10,12 @@
|
|
|
10
10
|
[elementAttr]="{class: 'user-button'}"
|
|
11
11
|
[dropDownOptions]="{width: '150px'}">
|
|
12
12
|
</dx-drop-down-button>
|
|
13
|
+
} @else {
|
|
13
14
|
<dx-list
|
|
14
|
-
*ngIf="menuMode === 'list'"
|
|
15
15
|
displayExpr="text"
|
|
16
16
|
keyExpr="id"
|
|
17
17
|
width="130"
|
|
18
18
|
[items]="menuItems">
|
|
19
19
|
</dx-list>
|
|
20
|
+
}
|
|
20
21
|
</div>
|
package/src/add-layout/index.js
CHANGED
|
@@ -116,6 +116,24 @@ function updateBudgets(host, options) {
|
|
|
116
116
|
return host;
|
|
117
117
|
});
|
|
118
118
|
}
|
|
119
|
+
function addPolyfills(host, project, polyfills) {
|
|
120
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
121
|
+
const projectName = yield (0, project_1.getProjectName)(host, project);
|
|
122
|
+
(0, modify_json_file_1.modifyJSONFile)(host, './angular.json', config => {
|
|
123
|
+
const buildOptions = config.projects[projectName]['architect']['build']['options'];
|
|
124
|
+
if (!buildOptions.polyfills) {
|
|
125
|
+
buildOptions.polyfills = [];
|
|
126
|
+
}
|
|
127
|
+
polyfills.forEach((polyfill) => {
|
|
128
|
+
if (!buildOptions.polyfills.includes(polyfill)) {
|
|
129
|
+
buildOptions.polyfills.push(polyfill);
|
|
130
|
+
}
|
|
131
|
+
});
|
|
132
|
+
return config;
|
|
133
|
+
});
|
|
134
|
+
return host;
|
|
135
|
+
});
|
|
136
|
+
}
|
|
119
137
|
function addViewportToBody(sourcePath = '') {
|
|
120
138
|
return (host) => {
|
|
121
139
|
const indexPath = (0, path_1.join)(sourcePath, 'index.html');
|
|
@@ -135,8 +153,8 @@ function modifyFileRule(path, callback) {
|
|
|
135
153
|
return (0, change_1.applyChanges)(host, changes, path);
|
|
136
154
|
};
|
|
137
155
|
}
|
|
138
|
-
function updateAppComponent(
|
|
139
|
-
const appMComponentPath = sourcePath +
|
|
156
|
+
function updateAppComponent(sourcePath, templateOptions = {}) {
|
|
157
|
+
const appMComponentPath = sourcePath + templateOptions.name + '.ts';
|
|
140
158
|
const importSetter = (importName, path, alias) => {
|
|
141
159
|
return (source) => {
|
|
142
160
|
return [(0, ast_utils_1.insertImport)(source, appMComponentPath, importName, path, false, alias)];
|
|
@@ -171,11 +189,20 @@ function hasRouting(host, sourcePath) {
|
|
|
171
189
|
function addPackagesToDependency(globalNgCliVersion) {
|
|
172
190
|
const version = new semver_1.SemVer(globalNgCliVersion.replace(/\^|\~/g, ''));
|
|
173
191
|
return (host) => {
|
|
192
|
+
const zonejs = (0, dependencies_1.getPackageJsonDependency)(host, 'zone.js');
|
|
174
193
|
(0, dependencies_1.addPackageJsonDependency)(host, {
|
|
175
194
|
type: dependencies_1.NodeDependencyType.Default,
|
|
176
195
|
name: '@angular/cdk',
|
|
177
|
-
version:
|
|
196
|
+
version: version.raw.includes('next') || version.raw.includes('-rc')
|
|
197
|
+
? 'next' : `^${version.major}.0.0`
|
|
178
198
|
});
|
|
199
|
+
if (!zonejs) {
|
|
200
|
+
(0, dependencies_1.addPackageJsonDependency)(host, {
|
|
201
|
+
type: dependencies_1.NodeDependencyType.Default,
|
|
202
|
+
name: 'zone.js',
|
|
203
|
+
version: version.major > 18 ? '~0.15.0' : '~0.14.0'
|
|
204
|
+
});
|
|
205
|
+
}
|
|
179
206
|
return host;
|
|
180
207
|
};
|
|
181
208
|
}
|
|
@@ -280,11 +307,12 @@ function default_1(options) {
|
|
|
280
307
|
const rules = [
|
|
281
308
|
modifyContentByTemplate(sourcePath, projectFilesSource, null, templateOptions, modifyContent),
|
|
282
309
|
updateDevextremeConfig(sourcePath),
|
|
283
|
-
updateAppComponent(
|
|
310
|
+
updateAppComponent(appPath, templateOptions),
|
|
284
311
|
addBuildThemeScript(),
|
|
285
312
|
() => addCustomThemeStyles(host, options, sourcePath),
|
|
286
313
|
addViewportToBody(sourcePath),
|
|
287
|
-
addPackagesToDependency(options.globalNgCliVersion)
|
|
314
|
+
addPackagesToDependency(options.globalNgCliVersion),
|
|
315
|
+
() => addPolyfills(host, options.project, ['zone.js'])
|
|
288
316
|
];
|
|
289
317
|
if (options.updateBudgets) {
|
|
290
318
|
rules.push(() => updateBudgets(host, options));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
package/src/add-layout/index.ts
CHANGED
|
@@ -44,7 +44,8 @@ import {
|
|
|
44
44
|
|
|
45
45
|
import {
|
|
46
46
|
NodeDependencyType,
|
|
47
|
-
addPackageJsonDependency
|
|
47
|
+
addPackageJsonDependency,
|
|
48
|
+
getPackageJsonDependency,
|
|
48
49
|
} from '@schematics/angular/utility/dependencies';
|
|
49
50
|
|
|
50
51
|
import { getSourceFile } from '../utility/source';
|
|
@@ -173,6 +174,28 @@ async function updateBudgets(host: Tree, options: any) {
|
|
|
173
174
|
return host;
|
|
174
175
|
}
|
|
175
176
|
|
|
177
|
+
async function addPolyfills(host: Tree, project: string, polyfills: string[]) {
|
|
178
|
+
const projectName = await getProjectName(host, project);
|
|
179
|
+
|
|
180
|
+
modifyJSONFile(host, './angular.json', config => {
|
|
181
|
+
const buildOptions: Record<string, any> = config.projects[projectName]['architect']['build']['options'];
|
|
182
|
+
|
|
183
|
+
if (!buildOptions.polyfills) {
|
|
184
|
+
buildOptions.polyfills = [];
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
polyfills.forEach((polyfill) => {
|
|
188
|
+
if (!buildOptions.polyfills.includes(polyfill)) {
|
|
189
|
+
buildOptions.polyfills.push(polyfill);
|
|
190
|
+
}
|
|
191
|
+
});
|
|
192
|
+
|
|
193
|
+
return config;
|
|
194
|
+
});
|
|
195
|
+
|
|
196
|
+
return host;
|
|
197
|
+
}
|
|
198
|
+
|
|
176
199
|
function addViewportToBody(sourcePath: string = '') {
|
|
177
200
|
return (host: Tree) => {
|
|
178
201
|
const indexPath = join(sourcePath, 'index.html');
|
|
@@ -199,8 +222,8 @@ function modifyFileRule(path: string, callback: (source: SourceFile) => Change[]
|
|
|
199
222
|
};
|
|
200
223
|
}
|
|
201
224
|
|
|
202
|
-
function updateAppComponent(
|
|
203
|
-
const appMComponentPath = sourcePath +
|
|
225
|
+
function updateAppComponent(sourcePath: string, templateOptions: any = {}) {
|
|
226
|
+
const appMComponentPath = sourcePath + templateOptions.name + '.ts';
|
|
204
227
|
|
|
205
228
|
const importSetter = (importName: string, path: string, alias: string) => {
|
|
206
229
|
return (source: SourceFile) => {
|
|
@@ -250,13 +273,25 @@ function hasRouting(host: Tree, sourcePath: string) {
|
|
|
250
273
|
|
|
251
274
|
function addPackagesToDependency(globalNgCliVersion: string) {
|
|
252
275
|
const version = new SemVer(globalNgCliVersion.replace(/\^|\~/g, ''));
|
|
276
|
+
|
|
253
277
|
return (host: Tree) => {
|
|
278
|
+
const zonejs = getPackageJsonDependency(host, 'zone.js');
|
|
279
|
+
|
|
254
280
|
addPackageJsonDependency(host, {
|
|
255
281
|
type: NodeDependencyType.Default,
|
|
256
282
|
name: '@angular/cdk',
|
|
257
|
-
version:
|
|
283
|
+
version: version.raw.includes('next') || version.raw.includes('-rc')
|
|
284
|
+
? 'next' : `^${version.major}.0.0`
|
|
258
285
|
});
|
|
259
286
|
|
|
287
|
+
if (!zonejs) {
|
|
288
|
+
addPackageJsonDependency(host, {
|
|
289
|
+
type: NodeDependencyType.Default,
|
|
290
|
+
name: 'zone.js',
|
|
291
|
+
version: version.major > 18 ? '~0.15.0' : '~0.14.0'
|
|
292
|
+
});
|
|
293
|
+
}
|
|
294
|
+
|
|
260
295
|
return host;
|
|
261
296
|
};
|
|
262
297
|
}
|
|
@@ -389,11 +424,12 @@ export default function(options: any): Rule {
|
|
|
389
424
|
const rules = [
|
|
390
425
|
modifyContentByTemplate(sourcePath, projectFilesSource, null, templateOptions, modifyContent),
|
|
391
426
|
updateDevextremeConfig(sourcePath),
|
|
392
|
-
updateAppComponent(
|
|
427
|
+
updateAppComponent(appPath, templateOptions),
|
|
393
428
|
addBuildThemeScript(),
|
|
394
429
|
() => addCustomThemeStyles(host, options, sourcePath) as any,
|
|
395
430
|
addViewportToBody(sourcePath),
|
|
396
|
-
addPackagesToDependency(options.globalNgCliVersion)
|
|
431
|
+
addPackagesToDependency(options.globalNgCliVersion),
|
|
432
|
+
() => addPolyfills(host, options.project, ['zone.js'])
|
|
397
433
|
];
|
|
398
434
|
|
|
399
435
|
if (options.updateBudgets) {
|
|
@@ -169,7 +169,7 @@ describe('layout', () => {
|
|
|
169
169
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
170
170
|
const tree = yield runner.runSchematic('add-layout', options, appTree);
|
|
171
171
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
|
172
|
-
expect(packageConfig.dependencies['@angular/cdk']).toBe('
|
|
172
|
+
expect(packageConfig.dependencies['@angular/cdk']).toBe('^17.0.0');
|
|
173
173
|
}));
|
|
174
174
|
it('should update budgets if updateBudgets option is true', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
175
175
|
const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
|
|
@@ -174,7 +174,7 @@ describe('layout', () => {
|
|
|
174
174
|
const tree = await runner.runSchematic('add-layout', options, appTree);
|
|
175
175
|
const packageConfig = JSON.parse(tree.readContent('package.json'));
|
|
176
176
|
|
|
177
|
-
expect(packageConfig.dependencies['@angular/cdk']).toBe('
|
|
177
|
+
expect(packageConfig.dependencies['@angular/cdk']).toBe('^17.0.0');
|
|
178
178
|
});
|
|
179
179
|
|
|
180
180
|
it('should update budgets if updateBudgets option is true', async () => {
|
|
@@ -71,7 +71,8 @@ describe('sample views', () => {
|
|
|
71
71
|
expect(moduleContent).toMatch(/import { HomeComponent } from /);
|
|
72
72
|
const navigationContent = tree.readContent('/src/app/app-navigation.ts');
|
|
73
73
|
expect(navigationContent).toMatch(/text: 'Home'/);
|
|
74
|
-
expect(navigationContent).toContain(`
|
|
74
|
+
expect(navigationContent).toContain(`type NavigationItem = { path?: string, text: string, icon?: string, items?: NavigationItem[] };
|
|
75
|
+
export const navigation: NavigationItem[] = [
|
|
75
76
|
{
|
|
76
77
|
text: 'Home',
|
|
77
78
|
path: '/home',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gEAAuF;AAEvF,2CAA6B;AAE7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAElE,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,MAAM,UAAU,GAAQ;QACtB,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,KAAK;QACrB,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,KAAK;QACZ,SAAS,EAAE,KAAK;QAChB,eAAe,EAAE,KAAK;QACtB,UAAU,EAAE,KAAK;KAClB,CAAC;IAEF,MAAM,gBAAgB,GAAqB;QACzC,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,OAAO;KACjB,CAAC;IAEF,MAAM,kBAAkB,GAAQ;QAC9B,OAAO,EAAE,SAAS;KACnB,CAAC;IAEF,MAAM,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,wDAAwD,CAAC,CAAC;IAC9G,MAAM,eAAe,GAAG,IAAI,6BAAmB,CAAC,qBAAqB,EAAE,2BAA2B,CAAC,CAAC;IACpG,IAAI,OAAqB,CAAC;IAE1B,UAAU,CAAC,GAAS,EAAE;QACpB,OAAO,GAAI,MAAM,eAAe,CAAC,YAAY,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;QAC7E,OAAO,GAAG,MAAM,eAAe,CAAC,YAAY,CAAC,aAAa,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACnF,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,GAAS,EAAE;QACvC,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,IAAI,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,wBAAwB,EAAE,EAAE,OAAO,CAAC,CAAC;QAClG,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC;QAE/E,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC;QAEjE,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAC1D,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAE9C,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;QAEhE,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,4BAA4B,CAAC,CAAC;QACzE,MAAM,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAClD,MAAM,CAAC,iBAAiB,CAAC,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gEAAuF;AAEvF,2CAA6B;AAE7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAElE,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,MAAM,UAAU,GAAQ;QACtB,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,KAAK;QACrB,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,KAAK;QACZ,SAAS,EAAE,KAAK;QAChB,eAAe,EAAE,KAAK;QACtB,UAAU,EAAE,KAAK;KAClB,CAAC;IAEF,MAAM,gBAAgB,GAAqB;QACzC,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,OAAO;KACjB,CAAC;IAEF,MAAM,kBAAkB,GAAQ;QAC9B,OAAO,EAAE,SAAS;KACnB,CAAC;IAEF,MAAM,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,wDAAwD,CAAC,CAAC;IAC9G,MAAM,eAAe,GAAG,IAAI,6BAAmB,CAAC,qBAAqB,EAAE,2BAA2B,CAAC,CAAC;IACpG,IAAI,OAAqB,CAAC;IAE1B,UAAU,CAAC,GAAS,EAAE;QACpB,OAAO,GAAI,MAAM,eAAe,CAAC,YAAY,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;QAC7E,OAAO,GAAG,MAAM,eAAe,CAAC,YAAY,CAAC,aAAa,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACnF,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,GAAS,EAAE;QACvC,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,IAAI,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,wBAAwB,EAAE,EAAE,OAAO,CAAC,CAAC;QAClG,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC;QAE/E,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC;QAEjE,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAC1D,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAE9C,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;QAEhE,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,4BAA4B,CAAC,CAAC;QACzE,MAAM,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAClD,MAAM,CAAC,iBAAiB,CAAC,CAAC,SAAS,CACjC;;;;;;;;;;;;;;;;;;;;;GAqBH,CAAC,CAAC;IACH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -49,7 +49,9 @@ describe('sample views', () => {
|
|
|
49
49
|
|
|
50
50
|
const navigationContent = tree.readContent('/src/app/app-navigation.ts');
|
|
51
51
|
expect(navigationContent).toMatch(/text: 'Home'/);
|
|
52
|
-
expect(navigationContent).toContain(
|
|
52
|
+
expect(navigationContent).toContain(
|
|
53
|
+
`type NavigationItem = { path?: string, text: string, icon?: string, items?: NavigationItem[] };
|
|
54
|
+
export const navigation: NavigationItem[] = [
|
|
53
55
|
{
|
|
54
56
|
text: 'Home',
|
|
55
57
|
path: '/home',
|
|
@@ -127,7 +127,8 @@ describe('view', () => {
|
|
|
127
127
|
expect(moduleContent).toMatch(/icon: 'home'/);
|
|
128
128
|
expect(moduleContent).toMatch(/text: 'Test'/);
|
|
129
129
|
expect(moduleContent).toMatch(/icon: 'folder'/);
|
|
130
|
-
expect(moduleContent).toContain(`
|
|
130
|
+
expect(moduleContent).toContain(`type NavigationItem = { path?: string, text: string, icon?: string, items?: NavigationItem[] };
|
|
131
|
+
export const navigation: NavigationItem[] = [
|
|
131
132
|
{
|
|
132
133
|
text: 'Test',
|
|
133
134
|
path: '/pages/test',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -117,7 +117,9 @@ describe('view', () => {
|
|
|
117
117
|
expect(moduleContent).toMatch(/text: 'Test'/);
|
|
118
118
|
expect(moduleContent).toMatch(/icon: 'folder'/);
|
|
119
119
|
|
|
120
|
-
expect(moduleContent).toContain(
|
|
120
|
+
expect(moduleContent).toContain(
|
|
121
|
+
`type NavigationItem = { path?: string, text: string, icon?: string, items?: NavigationItem[] };
|
|
122
|
+
export const navigation: NavigationItem[] = [
|
|
121
123
|
{
|
|
122
124
|
text: 'Test',
|
|
123
125
|
path: '/pages/test',
|
package/src/install/schema.json
CHANGED
|
@@ -10,7 +10,7 @@ This schematic automatically migrates generic configuration components to named
|
|
|
10
10
|
|
|
11
11
|
### Via DevExtreme CLI (Recommended)
|
|
12
12
|
|
|
13
|
-
You can run the migration command from any directory,
|
|
13
|
+
You can run the migration command from any directory, both inside and outside Angular workspaces:
|
|
14
14
|
|
|
15
15
|
```bash
|
|
16
16
|
devextreme migrate angular-config-components
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "http://json-schema.org/schema",
|
|
3
3
|
"$id": "SchematicsDevextremeMigrateConfigComponents",
|
|
4
|
-
"title": "
|
|
4
|
+
"title": "Migrates DevExtreme Angular applications to named configuration components.",
|
|
5
5
|
"type": "object",
|
|
6
6
|
"properties": {
|
|
7
7
|
"include": {
|
|
@@ -16,13 +16,14 @@
|
|
|
16
16
|
{ "type": "array", "items": { "type": "string" } },
|
|
17
17
|
{ "type": "string" }
|
|
18
18
|
],
|
|
19
|
-
"description": "Glob(s) of TS/JS files to scan for inline templates (default: ['**/*.ts','**/*.js']
|
|
19
|
+
"description": "Glob(s) of TS/JS files to scan for inline templates (default: ['**/*.ts','**/*.js']). To disable, set to '' or []."
|
|
20
20
|
},
|
|
21
21
|
"dry": {
|
|
22
22
|
"oneOf": [
|
|
23
23
|
{ "type": "boolean", "default": false },
|
|
24
24
|
{ "type": "string", "enum": ["true", "false"], "default": "false" }
|
|
25
|
-
]
|
|
25
|
+
],
|
|
26
|
+
"description": "Run in dry mode to preview changes."
|
|
26
27
|
}
|
|
27
28
|
}
|
|
28
29
|
}
|
|
@@ -85,16 +85,16 @@ function applyInlineComponentTemplateMigrations(tree, runner, exec, scriptGlobs)
|
|
|
85
85
|
const errorDetails = tsResolutionErrors.length
|
|
86
86
|
? `Resolution attempts:\n${tsResolutionErrors.map(e => ' - ' + e).join('\n')}\n`
|
|
87
87
|
: '';
|
|
88
|
-
exec.logger.warn('[config-migrator]
|
|
88
|
+
exec.logger.warn('[config-migrator] Skipping inline template migration.\n' +
|
|
89
89
|
errorDetails +
|
|
90
|
-
'
|
|
90
|
+
'Failed to import TypeScript from the following locations:\n' +
|
|
91
91
|
' 1. Project node_modules\n' +
|
|
92
92
|
' 2. Global node_modules\n' +
|
|
93
93
|
' 3. Temporary installation (npm cache)\n\n' +
|
|
94
|
-
'To resolve this issue, install TypeScript.\n\n' +
|
|
95
|
-
'Project
|
|
94
|
+
'To resolve this issue, install TypeScript manually.\n\n' +
|
|
95
|
+
'Project installation:\n' +
|
|
96
96
|
' npm install typescript --save-dev\n\n' +
|
|
97
|
-
'Global
|
|
97
|
+
'Global installation:\n' +
|
|
98
98
|
' npm install -g typescript\n\n');
|
|
99
99
|
return;
|
|
100
100
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template-migrator.js","sourceRoot":"","sources":["template-migrator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAAiC;AACjC,0DAAkC;AAClC,wEAAmE;AAEnE,sFAAsF;AACtF,gFAAgF;AAChF,MAAM,YAAY,GAAG,IAAA,uCAAiB,GAAE,CAAC;AACzC,MAAM,EAAE,GAAQ,YAAY,CAAC,EAAE,CAAC;AAChC,MAAM,kBAAkB,GAAa,YAAY,CAAC,MAAM,CAAC;AAwBzD,kEAAkE;AAClE,SAAsB,gCAAgC,CACpD,IAAU,EACV,MAAqB,EACrB,IAAiB;;QAEjB,MAAM,OAAO,GAAG,IAAA,mBAAS,EAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;QAE5F,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YACpB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBACtB,OAAO;aACR;YACD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAC/B,OAAO;aACR;YAED,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACnC,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO;aACR;YAED,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACvC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YACzE,IAAI,WAAW,KAAK,CAAC,EAAE;gBACrB,OAAO;aACR;YACD,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,QAAQ,MAAM,WAAW,UAAU,CAAC,CAAC;aAChE;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,MAAM,WAAW,UAAU,CAAC,CAAC;gBACzD,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;aACnC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAhCD,4EAgCC;AAED,2EAA2E;AAC3E,SAAsB,sCAAsC,CAC1D,IAAU,EACV,MAAqB,EACrB,IAAiB,EACjB,WAAqB;;QAErB,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE;YACvB,OAAO;SACR;QACD,IAAI,CAAC,EAAE,EAAE;YACL,MAAM,YAAY,GAAG,kBAAkB,CAAC,MAAM;gBAC5C,CAAC,CAAC,yBAAyB,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;gBACjF,CAAC,CAAC,EAAE,CAAC;YACP,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,
|
|
1
|
+
{"version":3,"file":"template-migrator.js","sourceRoot":"","sources":["template-migrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -81,16 +81,16 @@ export async function applyInlineComponentTemplateMigrations(
|
|
|
81
81
|
? `Resolution attempts:\n${tsResolutionErrors.map(e => ' - ' + e).join('\n')}\n`
|
|
82
82
|
: '';
|
|
83
83
|
exec.logger.warn(
|
|
84
|
-
'[config-migrator]
|
|
84
|
+
'[config-migrator] Skipping inline template migration.\n' +
|
|
85
85
|
errorDetails +
|
|
86
|
-
'
|
|
86
|
+
'Failed to import TypeScript from the following locations:\n' +
|
|
87
87
|
' 1. Project node_modules\n' +
|
|
88
88
|
' 2. Global node_modules\n' +
|
|
89
89
|
' 3. Temporary installation (npm cache)\n\n' +
|
|
90
|
-
'To resolve this issue, install TypeScript.\n\n' +
|
|
91
|
-
'Project
|
|
90
|
+
'To resolve this issue, install TypeScript manually.\n\n' +
|
|
91
|
+
'Project installation:\n' +
|
|
92
92
|
' npm install typescript --save-dev\n\n' +
|
|
93
|
-
'Global
|
|
93
|
+
'Global installation:\n' +
|
|
94
94
|
' npm install -g typescript\n\n'
|
|
95
95
|
);
|
|
96
96
|
return;
|
package/src/utility/change.js
CHANGED
|
@@ -21,12 +21,14 @@ function insertItemToArray(host, filePath, node, item, options = { location: 'st
|
|
|
21
21
|
}
|
|
22
22
|
const nodeContent = node.getText();
|
|
23
23
|
const nodePosition = node.getStart();
|
|
24
|
-
const leftBracketPosition = nodePosition + nodeContent.indexOf('[');
|
|
24
|
+
const leftBracketPosition = nodePosition + nodeContent.indexOf('[', nodeContent.lastIndexOf('=') || 0);
|
|
25
25
|
const rightBracketPosition = nodePosition + nodeContent.lastIndexOf(']');
|
|
26
26
|
let itemPosition = leftBracketPosition + 1;
|
|
27
27
|
let fileRecorder = host.beginUpdate(filePath);
|
|
28
28
|
item = newLine + item;
|
|
29
|
-
const isNodeEmpty =
|
|
29
|
+
const isNodeEmpty = !(nodeContent.includes('=')
|
|
30
|
+
? /=\s*\[[\s\S]*\S+[\s\S]*\]/m
|
|
31
|
+
: /\[[\s\S]*\S+[\s\S]*\]/m).test(nodeContent);
|
|
30
32
|
if (isNodeEmpty) {
|
|
31
33
|
const formattedArray = `[${newLine}]`;
|
|
32
34
|
fileRecorder.remove(leftBracketPosition, rightBracketPosition - leftBracketPosition + 1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change.js","sourceRoot":"","sources":["change.ts"],"names":[],"mappings":";;;AAOA,MAAM,OAAO,GAAG;CACf,CAAC;AAEF,SAAgB,YAAY,CAAC,IAAU,EAAE,OAAiB,EAAE,QAAgB;IAC1E,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAE5C,OAAO,CAAC,OAAO,CAAC,CAAC,MAAoB,EAAE,EAAE;QACvC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAE5B,OAAO,IAAI,CAAC;AACd,CAAC;AAVD,oCAUC;AAED,gCAAgC;AAChC,2CAA2C;AAC3C,SAAgB,iBAAiB,CAC/B,IAAU,EACV,QAAgB,EAChB,IAAU,EACV,IAAY,EACZ,UAAyC,EAAE,QAAQ,EAAE,OAAO,EAAE;IAE9D,MAAM,WAAW,GAAG,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtD,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,IAAI,CAAC;KACb;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IACnC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IACrC,MAAM,mBAAmB,GAAG,YAAY,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"change.js","sourceRoot":"","sources":["change.ts"],"names":[],"mappings":";;;AAOA,MAAM,OAAO,GAAG;CACf,CAAC;AAEF,SAAgB,YAAY,CAAC,IAAU,EAAE,OAAiB,EAAE,QAAgB;IAC1E,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAE5C,OAAO,CAAC,OAAO,CAAC,CAAC,MAAoB,EAAE,EAAE;QACvC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAE5B,OAAO,IAAI,CAAC;AACd,CAAC;AAVD,oCAUC;AAED,gCAAgC;AAChC,2CAA2C;AAC3C,SAAgB,iBAAiB,CAC/B,IAAU,EACV,QAAgB,EAChB,IAAU,EACV,IAAY,EACZ,UAAyC,EAAE,QAAQ,EAAE,OAAO,EAAE;IAE9D,MAAM,WAAW,GAAG,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtD,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,IAAI,CAAC;KACb;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IACnC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IACrC,MAAM,mBAAmB,GAAG,YAAY,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IACvG,MAAM,oBAAoB,GAAG,YAAY,GAAG,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACzE,IAAI,YAAY,GAAG,mBAAmB,GAAG,CAAC,CAAC;IAC3C,IAAI,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAE9C,IAAI,GAAG,OAAO,GAAG,IAAI,CAAC;IAEtB,MAAM,WAAW,GAAG,CAAC,CACnB,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC;QACvB,CAAC,CAAC,4BAA4B;QAC9B,CAAC,CAAC,wBAAwB,CAC3B,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAEtB,IAAI,WAAW,EAAE;QACf,MAAM,cAAc,GAAG,IAAI,OAAO,GAAG,CAAC;QACtC,YAAY,CAAC,MAAM,CAAC,mBAAmB,EAAE,oBAAoB,GAAG,mBAAmB,GAAG,CAAC,CAAC,CAAC;QACzF,YAAY,CAAC,UAAU,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;QAC7D,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QAChC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;KAC3C;SAAM;QACL,IAAI,OAAO,CAAC,QAAQ,KAAK,KAAK,EAAE;YAC9B,YAAY,GAAG,YAAY,GAAG,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC/D,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC;SACnB;aAAM;YACL,IAAI,GAAG,IAAI,GAAG,GAAG,CAAC;SACnB;KACF;IAED,YAAY,CAAC,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC5C,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;IAEhC,OAAO,IAAI,CAAC;AACd,CAAC;AA9CD,8CA8CC"}
|
package/src/utility/change.ts
CHANGED
|
@@ -36,14 +36,19 @@ export function insertItemToArray(
|
|
|
36
36
|
|
|
37
37
|
const nodeContent = node.getText();
|
|
38
38
|
const nodePosition = node.getStart();
|
|
39
|
-
const leftBracketPosition = nodePosition + nodeContent.indexOf('[');
|
|
39
|
+
const leftBracketPosition = nodePosition + nodeContent.indexOf('[', nodeContent.lastIndexOf('=') || 0);
|
|
40
40
|
const rightBracketPosition = nodePosition + nodeContent.lastIndexOf(']');
|
|
41
41
|
let itemPosition = leftBracketPosition + 1;
|
|
42
42
|
let fileRecorder = host.beginUpdate(filePath);
|
|
43
43
|
|
|
44
44
|
item = newLine + item;
|
|
45
45
|
|
|
46
|
-
const isNodeEmpty =
|
|
46
|
+
const isNodeEmpty = !(
|
|
47
|
+
nodeContent.includes('=')
|
|
48
|
+
? /=\s*\[[\s\S]*\S+[\s\S]*\]/m
|
|
49
|
+
: /\[[\s\S]*\S+[\s\S]*\]/m
|
|
50
|
+
).test(nodeContent);
|
|
51
|
+
|
|
47
52
|
if (isNodeEmpty) {
|
|
48
53
|
const formattedArray = `[${newLine}]`;
|
|
49
54
|
fileRecorder.remove(leftBracketPosition, rightBracketPosition - leftBracketPosition + 1);
|
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.latestVersions = void 0;
|
|
4
4
|
// TODO: implement
|
|
5
5
|
exports.latestVersions = {
|
|
6
|
-
'devextreme': '25.
|
|
7
|
-
'devextreme-angular': '25.
|
|
6
|
+
'devextreme': '25.2.3',
|
|
7
|
+
'devextreme-angular': '25.2.3',
|
|
8
8
|
'devextreme-cli': 'latest',
|
|
9
9
|
'sass-embedded': '1.66.0'
|
|
10
10
|
};
|
|
@@ -46,7 +46,7 @@ function resolveTypeScript() {
|
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
catch (err) {
|
|
49
|
-
errors.push(`
|
|
49
|
+
errors.push(`Failed to import TypeScript from project: ${(err === null || err === void 0 ? void 0 : err.message) || err}`);
|
|
50
50
|
}
|
|
51
51
|
try {
|
|
52
52
|
const globalTs = tryResolveFromGlobal();
|
|
@@ -59,7 +59,7 @@ function resolveTypeScript() {
|
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
61
|
catch (err) {
|
|
62
|
-
errors.push(`
|
|
62
|
+
errors.push(`Failed to import TypeScript from global node_modules: ${(err === null || err === void 0 ? void 0 : err.message) || err}`);
|
|
63
63
|
}
|
|
64
64
|
try {
|
|
65
65
|
const tempTs = tryResolveViaTemporaryInstall();
|
|
@@ -72,7 +72,7 @@ function resolveTypeScript() {
|
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
catch (err) {
|
|
75
|
-
errors.push(`
|
|
75
|
+
errors.push(`Failed to import TypeScript from temporary installation (npm cache): ${(err === null || err === void 0 ? void 0 : err.message) || err}`);
|
|
76
76
|
}
|
|
77
77
|
return {
|
|
78
78
|
ts: null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript-resolver.js","sourceRoot":"","sources":["typescript-resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAyC;AACzC,2CAA6B;AAC7B,uCAAyB;AAQzB;;;;;GAKG;AACH,SAAgB,iBAAiB;IAC/B,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,IAAI;QACF,MAAM,SAAS,GAAG,qBAAqB,EAAE,CAAC;QAC1C,IAAI,SAAS,EAAE;YACb,OAAO;gBACL,EAAE,EAAE,SAAS;gBACb,gBAAgB,EAAE,SAAS;gBAC3B,MAAM,EAAE,EAAE;aACX,CAAC;SACH;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"typescript-resolver.js","sourceRoot":"","sources":["typescript-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ export function resolveTypeScript(): TypeScriptResolutionResult {
|
|
|
27
27
|
};
|
|
28
28
|
}
|
|
29
29
|
} catch (err) {
|
|
30
|
-
errors.push(`
|
|
30
|
+
errors.push(`Failed to import TypeScript from project: ${err?.message || err}`);
|
|
31
31
|
}
|
|
32
32
|
|
|
33
33
|
try {
|
|
@@ -40,7 +40,7 @@ export function resolveTypeScript(): TypeScriptResolutionResult {
|
|
|
40
40
|
};
|
|
41
41
|
}
|
|
42
42
|
} catch (err) {
|
|
43
|
-
errors.push(`
|
|
43
|
+
errors.push(`Failed to import TypeScript from global node_modules: ${err?.message || err}`);
|
|
44
44
|
}
|
|
45
45
|
|
|
46
46
|
try {
|
|
@@ -53,7 +53,7 @@ export function resolveTypeScript(): TypeScriptResolutionResult {
|
|
|
53
53
|
};
|
|
54
54
|
}
|
|
55
55
|
} catch (err) {
|
|
56
|
-
errors.push(`
|
|
56
|
+
errors.push(`Failed to import TypeScript from temporary installation (npm cache): ${err?.message || err}`);
|
|
57
57
|
}
|
|
58
58
|
|
|
59
59
|
return {
|