ng-alain 12.1.1 → 12.2.3
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/application/files/src/app/core/i18n/i18n.service.ts +7 -3
- package/application/files/src/app/routes/passport/register/register.component.html +1 -1
- package/application/files/src/app/routes/passport/register/register.component.ts +14 -18
- package/application/files/src/app/shared/index.ts +1 -1
- package/application/files/src/app/shared/json-schema/README.md +3 -0
- package/application/files/src/app/shared/json-schema/json-schema.module.ts +6 -16
- package/application/files/src/app/shared/json-schema/test/test.widget.ts +20 -0
- package/application/index.js +4 -19
- package/application/index.js.map +1 -1
- package/application/index.spec.ts +8 -0
- package/application/index.ts +4 -21
- package/ng-add/index.js +44 -37
- package/ng-add/index.js.map +1 -1
- package/ng-add/index.ts +60 -49
- package/package.json +1 -1
- package/tpl/schema.json +10 -1
- package/utils/lib-versions.js +1 -1
- package/utils/lib-versions.ts +1 -1
- package/utils/versions.js +5 -5
- package/utils/versions.ts +5 -5
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
_HttpClient,
|
|
15
15
|
AlainI18nBaseService
|
|
16
16
|
} from '@delon/theme';
|
|
17
|
+
import { AlainConfigService } from '@delon/util/config';
|
|
17
18
|
import { enUS as dfEn, zhCN as dfZhCn, zhTW as dfZhTw } from 'date-fns/locale';
|
|
18
19
|
import { NzSafeAny } from 'ng-zorro-antd/core/types';
|
|
19
20
|
import { en_US as zorroEnUS, NzI18nService, zh_CN as zorroZhCN, zh_TW as zorroZhTW } from 'ng-zorro-antd/i18n';
|
|
@@ -69,9 +70,10 @@ export class I18NService extends AlainI18nBaseService {
|
|
|
69
70
|
private settings: SettingsService,
|
|
70
71
|
private nzI18nService: NzI18nService,
|
|
71
72
|
private delonLocaleService: DelonLocaleService,
|
|
72
|
-
private platform: Platform
|
|
73
|
+
private platform: Platform,
|
|
74
|
+
cogSrv: AlainConfigService
|
|
73
75
|
) {
|
|
74
|
-
super();
|
|
76
|
+
super(cogSrv);
|
|
75
77
|
|
|
76
78
|
const defaultLang = this.getDefaultLang();
|
|
77
79
|
if (this._langs.findIndex(w => w.code === defaultLang)) {
|
|
@@ -86,7 +88,9 @@ export class I18NService extends AlainI18nBaseService {
|
|
|
86
88
|
if (this.settings.layout.lang) {
|
|
87
89
|
return this.settings.layout.lang;
|
|
88
90
|
}
|
|
89
|
-
|
|
91
|
+
let res = (navigator.languages ? navigator.languages[0] : null) || navigator.language;
|
|
92
|
+
const arr = res.split('-');
|
|
93
|
+
return arr.length <= 1 ? res : `${arr[0]}-${arr[1].toUpperCase()}`;
|
|
90
94
|
}
|
|
91
95
|
|
|
92
96
|
loadLangData(lang: string): Observable<NzSafeAny> {
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
</nz-input-group>
|
|
55
55
|
<ng-template #confirmErrorTip let-i>
|
|
56
56
|
<ng-container *ngIf="i.errors?.required">{{ 'validation.confirm-password.required' | i18n }}</ng-container>
|
|
57
|
-
<ng-container *ngIf="i.errors?.
|
|
57
|
+
<ng-container *ngIf="i.errors?.matchControl">{{ 'validation.password.twice' | i18n }}</ng-container>
|
|
58
58
|
</ng-template>
|
|
59
59
|
</nz-form-control>
|
|
60
60
|
</nz-form-item>
|
|
@@ -2,6 +2,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy } from
|
|
|
2
2
|
import { AbstractControl, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
|
|
3
3
|
import { Router } from '@angular/router';
|
|
4
4
|
import { _HttpClient } from '@delon/theme';
|
|
5
|
+
import { MatchControl } from '@delon/util/form';
|
|
5
6
|
import { NzSafeAny } from 'ng-zorro-antd/core/types';
|
|
6
7
|
import { finalize } from 'rxjs/operators';
|
|
7
8
|
|
|
@@ -13,14 +14,19 @@ import { finalize } from 'rxjs/operators';
|
|
|
13
14
|
})
|
|
14
15
|
export class UserRegisterComponent implements OnDestroy {
|
|
15
16
|
constructor(fb: FormBuilder, private router: Router, private http: _HttpClient, private cdr: ChangeDetectorRef) {
|
|
16
|
-
this.form = fb.group(
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
17
|
+
this.form = fb.group(
|
|
18
|
+
{
|
|
19
|
+
mail: [null, [Validators.required, Validators.email]],
|
|
20
|
+
password: [null, [Validators.required, Validators.minLength(6), UserRegisterComponent.checkPassword.bind(this)]],
|
|
21
|
+
confirm: [null, [Validators.required, Validators.minLength(6)]],
|
|
22
|
+
mobilePrefix: ['+86'],
|
|
23
|
+
mobile: [null, [Validators.required, Validators.pattern(/^1\d{10}$/)]],
|
|
24
|
+
captcha: [null, [Validators.required]]
|
|
25
|
+
},
|
|
26
|
+
{
|
|
27
|
+
validators: MatchControl('password', 'confirm')
|
|
28
|
+
}
|
|
29
|
+
);
|
|
24
30
|
}
|
|
25
31
|
|
|
26
32
|
// #region fields
|
|
@@ -80,16 +86,6 @@ export class UserRegisterComponent implements OnDestroy {
|
|
|
80
86
|
}
|
|
81
87
|
}
|
|
82
88
|
|
|
83
|
-
static passwordEquar(control: FormControl): { equar: boolean } | null {
|
|
84
|
-
if (!control || !control.parent!) {
|
|
85
|
-
return null;
|
|
86
|
-
}
|
|
87
|
-
if (control.value !== control.parent!.get('password')!.value) {
|
|
88
|
-
return { equar: true };
|
|
89
|
-
}
|
|
90
|
-
return null;
|
|
91
|
-
}
|
|
92
|
-
|
|
93
89
|
getCaptcha(): void {
|
|
94
90
|
if (this.mobile.invalid) {
|
|
95
91
|
this.mobile.markAsDirty({ onlySelf: true });
|
|
@@ -1,28 +1,18 @@
|
|
|
1
1
|
import { NgModule } from '@angular/core';
|
|
2
2
|
import { DelonFormModule, WidgetRegistry } from '@delon/form';
|
|
3
|
-
import { SharedModule } from '../shared.module';
|
|
4
3
|
|
|
5
|
-
|
|
6
|
-
|
|
4
|
+
import { SharedModule } from '../shared.module';
|
|
5
|
+
import { TestWidget } from './test/test.widget';
|
|
7
6
|
|
|
8
|
-
export const SCHEMA_THIRDS_COMPONENTS = [
|
|
9
|
-
// TinymceWidget,
|
|
10
|
-
// UEditorWidget
|
|
11
|
-
];
|
|
7
|
+
export const SCHEMA_THIRDS_COMPONENTS = [TestWidget];
|
|
12
8
|
|
|
13
9
|
@NgModule({
|
|
14
10
|
declarations: SCHEMA_THIRDS_COMPONENTS,
|
|
15
|
-
imports: [
|
|
16
|
-
|
|
17
|
-
DelonFormModule.forRoot()
|
|
18
|
-
],
|
|
19
|
-
exports: [
|
|
20
|
-
...SCHEMA_THIRDS_COMPONENTS
|
|
21
|
-
]
|
|
11
|
+
imports: [SharedModule, DelonFormModule.forRoot()],
|
|
12
|
+
exports: SCHEMA_THIRDS_COMPONENTS
|
|
22
13
|
})
|
|
23
14
|
export class JsonSchemaModule {
|
|
24
15
|
constructor(widgetRegistry: WidgetRegistry) {
|
|
25
|
-
|
|
26
|
-
// widgetRegistry.register(UEditorWidget.KEY, UEditorWidget);
|
|
16
|
+
widgetRegistry.register(TestWidget.KEY, TestWidget);
|
|
27
17
|
}
|
|
28
18
|
}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
|
|
2
|
+
import { ControlWidget } from '@delon/form';
|
|
3
|
+
|
|
4
|
+
@Component({
|
|
5
|
+
selector: 'test',
|
|
6
|
+
template: `
|
|
7
|
+
<sf-item-wrap [id]="id" [schema]="schema" [ui]="ui" [showError]="showError" [error]="error" [showTitle]="schema.title">
|
|
8
|
+
test widget
|
|
9
|
+
</sf-item-wrap>
|
|
10
|
+
`,
|
|
11
|
+
preserveWhitespaces: false,
|
|
12
|
+
changeDetection: ChangeDetectionStrategy.OnPush
|
|
13
|
+
})
|
|
14
|
+
export class TestWidget extends ControlWidget implements OnInit {
|
|
15
|
+
static readonly KEY = 'test';
|
|
16
|
+
|
|
17
|
+
ngOnInit(): void {
|
|
18
|
+
console.warn('init test widget');
|
|
19
|
+
}
|
|
20
|
+
}
|
package/application/index.js
CHANGED
|
@@ -9,16 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
const spinner_1 = require("@angular-devkit/build-angular/src/utils/spinner");
|
|
13
12
|
const core_1 = require("@angular-devkit/core");
|
|
14
13
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
15
|
-
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
16
14
|
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
17
15
|
const lang_config_1 = require("../core/lang.config");
|
|
18
16
|
const utils_1 = require("../utils");
|
|
19
17
|
const versions_1 = require("../utils/versions");
|
|
20
18
|
let project;
|
|
21
|
-
const spinner = new spinner_1.Spinner();
|
|
22
19
|
/** Remove files to be overwrite */
|
|
23
20
|
function removeOrginalFiles() {
|
|
24
21
|
return (tree) => {
|
|
@@ -208,13 +205,13 @@ function addFilesToRoot(options) {
|
|
|
208
205
|
]);
|
|
209
206
|
}
|
|
210
207
|
function fixLang(options) {
|
|
211
|
-
return (tree) => {
|
|
208
|
+
return (tree, context) => {
|
|
212
209
|
if (options.i18n)
|
|
213
210
|
return;
|
|
214
211
|
const langs = lang_config_1.getLangData(options.defaultLanguage);
|
|
215
212
|
if (!langs)
|
|
216
213
|
return;
|
|
217
|
-
|
|
214
|
+
context.logger.info(`Translating template into ${options.defaultLanguage} language, please wait...`);
|
|
218
215
|
tree.visit(p => {
|
|
219
216
|
if (~p.indexOf(`/node_modules/`))
|
|
220
217
|
return;
|
|
@@ -273,20 +270,10 @@ function fixVsCode() {
|
|
|
273
270
|
utils_1.writeJSON(tree, filePath, json);
|
|
274
271
|
};
|
|
275
272
|
}
|
|
276
|
-
function install() {
|
|
277
|
-
return (_host, context) => {
|
|
278
|
-
context.addTask(new tasks_1.NodePackageInstallTask());
|
|
279
|
-
};
|
|
280
|
-
}
|
|
281
|
-
function finished() {
|
|
282
|
-
return () => {
|
|
283
|
-
spinner.succeed(`Congratulations, NG-ALAIN scaffold generation complete.`);
|
|
284
|
-
};
|
|
285
|
-
}
|
|
286
273
|
function default_1(options) {
|
|
287
274
|
return (tree, context) => __awaiter(this, void 0, void 0, function* () {
|
|
288
275
|
project = (yield utils_1.getProject(tree, options.project)).project;
|
|
289
|
-
|
|
276
|
+
context.logger.info(`Generating NG-ALAIN scaffold...`);
|
|
290
277
|
return schematics_1.chain([
|
|
291
278
|
// @delon/* dependencies
|
|
292
279
|
addDependenciesToPackageJson(options),
|
|
@@ -307,9 +294,7 @@ function default_1(options) {
|
|
|
307
294
|
addStyle(),
|
|
308
295
|
fixLang(options),
|
|
309
296
|
fixVsCode(),
|
|
310
|
-
fixAngularJson(options)
|
|
311
|
-
install(),
|
|
312
|
-
finished()
|
|
297
|
+
fixAngularJson(options)
|
|
313
298
|
]);
|
|
314
299
|
});
|
|
315
300
|
}
|
package/application/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -108,4 +108,12 @@ describe('NgAlainSchematic: application', () => {
|
|
|
108
108
|
});
|
|
109
109
|
});
|
|
110
110
|
});
|
|
111
|
+
|
|
112
|
+
describe('#form', () => {
|
|
113
|
+
it(`should be export json-schema.ts in shared/index.ts`, async () => {
|
|
114
|
+
({ runner, tree } = await createAlainApp({ form: false }));
|
|
115
|
+
const content = tree.readContent('/projects/foo/src/app/shared/index.ts');
|
|
116
|
+
expect(content).not.toContain(`json-schema`);
|
|
117
|
+
});
|
|
118
|
+
});
|
|
111
119
|
});
|
package/application/index.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Spinner } from '@angular-devkit/build-angular/src/utils/spinner';
|
|
2
1
|
import { JsonObject, strings } from '@angular-devkit/core';
|
|
3
2
|
import { ProjectDefinition } from '@angular-devkit/core/src/workspace';
|
|
4
3
|
import {
|
|
@@ -15,7 +14,6 @@ import {
|
|
|
15
14
|
Tree,
|
|
16
15
|
url
|
|
17
16
|
} from '@angular-devkit/schematics';
|
|
18
|
-
import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
|
|
19
17
|
import { updateWorkspace } from '@schematics/angular/utility/workspace';
|
|
20
18
|
|
|
21
19
|
import { getLangData } from '../core/lang.config';
|
|
@@ -43,7 +41,6 @@ import { addESLintRule, UpgradeMainVersions } from '../utils/versions';
|
|
|
43
41
|
import { Schema as ApplicationOptions } from './schema';
|
|
44
42
|
|
|
45
43
|
let project: ProjectDefinition;
|
|
46
|
-
const spinner = new Spinner();
|
|
47
44
|
|
|
48
45
|
/** Remove files to be overwrite */
|
|
49
46
|
function removeOrginalFiles(): Rule {
|
|
@@ -275,12 +272,12 @@ function addFilesToRoot(options: ApplicationOptions): Rule {
|
|
|
275
272
|
}
|
|
276
273
|
|
|
277
274
|
function fixLang(options: ApplicationOptions): Rule {
|
|
278
|
-
return (tree: Tree) => {
|
|
275
|
+
return (tree: Tree, context: SchematicContext) => {
|
|
279
276
|
if (options.i18n) return;
|
|
280
277
|
const langs = getLangData(options.defaultLanguage!);
|
|
281
278
|
if (!langs) return;
|
|
282
279
|
|
|
283
|
-
|
|
280
|
+
context.logger.info(`Translating template into ${options.defaultLanguage} language, please wait...`);
|
|
284
281
|
|
|
285
282
|
tree.visit(p => {
|
|
286
283
|
if (~p.indexOf(`/node_modules/`)) return;
|
|
@@ -343,22 +340,10 @@ function fixVsCode(): Rule {
|
|
|
343
340
|
};
|
|
344
341
|
}
|
|
345
342
|
|
|
346
|
-
function install(): Rule {
|
|
347
|
-
return (_host: Tree, context: SchematicContext) => {
|
|
348
|
-
context.addTask(new NodePackageInstallTask());
|
|
349
|
-
};
|
|
350
|
-
}
|
|
351
|
-
|
|
352
|
-
function finished(): Rule {
|
|
353
|
-
return () => {
|
|
354
|
-
spinner.succeed(`Congratulations, NG-ALAIN scaffold generation complete.`);
|
|
355
|
-
};
|
|
356
|
-
}
|
|
357
|
-
|
|
358
343
|
export default function (options: ApplicationOptions): Rule {
|
|
359
344
|
return async (tree: Tree, context: SchematicContext) => {
|
|
360
345
|
project = (await getProject(tree, options.project)).project;
|
|
361
|
-
|
|
346
|
+
context.logger.info(`Generating NG-ALAIN scaffold...`);
|
|
362
347
|
return chain([
|
|
363
348
|
// @delon/* dependencies
|
|
364
349
|
addDependenciesToPackageJson(options),
|
|
@@ -379,9 +364,7 @@ export default function (options: ApplicationOptions): Rule {
|
|
|
379
364
|
addStyle(),
|
|
380
365
|
fixLang(options),
|
|
381
366
|
fixVsCode(),
|
|
382
|
-
fixAngularJson(options)
|
|
383
|
-
install(),
|
|
384
|
-
finished()
|
|
367
|
+
fixAngularJson(options)
|
|
385
368
|
]);
|
|
386
369
|
};
|
|
387
370
|
}
|
package/ng-add/index.js
CHANGED
|
@@ -1,40 +1,43 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
3
|
+
const color_1 = require("@angular/cli/utilities/color");
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
|
+
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
5
6
|
const fs_1 = require("fs");
|
|
6
7
|
const path_1 = require("path");
|
|
7
8
|
const utils_1 = require("../utils");
|
|
8
9
|
const V = 12;
|
|
9
10
|
function genRules(options) {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
11
|
+
return () => {
|
|
12
|
+
const rules = [];
|
|
13
|
+
const applicationOptions = Object.assign({}, options);
|
|
14
|
+
rules.push(schematics_1.schematic('application', applicationOptions));
|
|
15
|
+
if (options.codeStyle) {
|
|
16
|
+
rules.push(schematics_1.schematic('plugin', { name: 'codeStyle', type: 'add' }));
|
|
17
|
+
}
|
|
18
|
+
if (options.defaultLanguage) {
|
|
19
|
+
rules.push(schematics_1.schematic('plugin', {
|
|
20
|
+
name: 'defaultLanguage',
|
|
21
|
+
type: 'add',
|
|
22
|
+
defaultLanguage: options.defaultLanguage
|
|
23
|
+
}));
|
|
24
|
+
}
|
|
25
|
+
if (options.npm) {
|
|
26
|
+
rules.push(schematics_1.schematic('plugin', {
|
|
27
|
+
name: 'networkEnv',
|
|
28
|
+
type: 'add',
|
|
29
|
+
packageManager: 'npm'
|
|
30
|
+
}));
|
|
31
|
+
}
|
|
32
|
+
if (options.yarn) {
|
|
33
|
+
rules.push(schematics_1.schematic('plugin', {
|
|
34
|
+
name: 'networkEnv',
|
|
35
|
+
type: 'add',
|
|
36
|
+
packageManager: 'yarn'
|
|
37
|
+
}));
|
|
38
|
+
}
|
|
39
|
+
return schematics_1.chain(rules);
|
|
40
|
+
};
|
|
38
41
|
}
|
|
39
42
|
function getFiles() {
|
|
40
43
|
const nodeModulesPath = path_1.join(process.cwd(), 'node_modules');
|
|
@@ -47,8 +50,18 @@ function isUseCNPM() {
|
|
|
47
50
|
const res = ['_@angular', '_ng-zorro-antd'].every(prefix => names.findIndex(w => w.startsWith(prefix)) !== -1);
|
|
48
51
|
return res;
|
|
49
52
|
}
|
|
53
|
+
function finished() {
|
|
54
|
+
return (_, context) => {
|
|
55
|
+
context.addTask(new tasks_1.NodePackageInstallTask());
|
|
56
|
+
context.logger.info(color_1.colors.green(`
|
|
57
|
+
✓ Congratulations, NG-ALAIN scaffold generation complete 🎉.
|
|
58
|
+
|
|
59
|
+
NG-ALAIN documentation site: https://ng-alain.com
|
|
60
|
+
`));
|
|
61
|
+
};
|
|
62
|
+
}
|
|
50
63
|
function default_1(options) {
|
|
51
|
-
return (tree) => {
|
|
64
|
+
return (tree, context) => {
|
|
52
65
|
if (isUseCNPM()) {
|
|
53
66
|
throw new Error(`Sorry, Don't use cnpm to install dependencies, pls refer to: https://ng-alain.com/docs/faq#Installation`);
|
|
54
67
|
}
|
|
@@ -63,14 +76,8 @@ function default_1(options) {
|
|
|
63
76
|
if (!ngCoreVersion.startsWith(`${V}.`)) {
|
|
64
77
|
throw new Error(`Sorry, the current version only supports angular ${V}.x, pls downgrade the global Anguar-cli version: [yarn global add @angular/cli@${V}] (or via npm: [npm install -g @angular/cli@${V}])`);
|
|
65
78
|
}
|
|
66
|
-
return genRules(options);
|
|
79
|
+
return schematics_1.chain([genRules(options), finished()])(tree, context);
|
|
67
80
|
};
|
|
68
81
|
}
|
|
69
82
|
exports.default = default_1;
|
|
70
|
-
function finished(context) {
|
|
71
|
-
context.logger.info('');
|
|
72
|
-
context.logger.info(` ✓ Congratulations, NG-ALAIN scaffold generation complete. NG-ALAIN documentation site: https://ng-alain.com`);
|
|
73
|
-
context.logger.info('');
|
|
74
|
-
}
|
|
75
|
-
exports.finished = finished;
|
|
76
83
|
//# sourceMappingURL=index.js.map
|
package/ng-add/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
|
package/ng-add/index.ts
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
|
+
import { colors } from '@angular/cli/utilities/color';
|
|
2
|
+
|
|
1
3
|
import { chain, Rule, schematic, Tree, SchematicContext } from '@angular-devkit/schematics';
|
|
4
|
+
import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
|
|
2
5
|
import { readdirSync, statSync } from 'fs';
|
|
3
6
|
import { join } from 'path';
|
|
4
7
|
|
|
@@ -9,46 +12,48 @@ import { Schema as NgAddOptions } from './schema';
|
|
|
9
12
|
const V = 12;
|
|
10
13
|
|
|
11
14
|
function genRules(options: NgAddOptions): Rule {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
if (options.yarn) {
|
|
42
|
-
rules.push(
|
|
43
|
-
schematic('plugin', {
|
|
44
|
-
name: 'networkEnv',
|
|
45
|
-
type: 'add',
|
|
46
|
-
packageManager: 'yarn'
|
|
47
|
-
})
|
|
48
|
-
);
|
|
49
|
-
}
|
|
15
|
+
return () => {
|
|
16
|
+
const rules: Rule[] = [];
|
|
17
|
+
|
|
18
|
+
const applicationOptions: ApplicationOptions = { ...options };
|
|
19
|
+
rules.push(schematic('application', applicationOptions));
|
|
20
|
+
|
|
21
|
+
if (options.codeStyle) {
|
|
22
|
+
rules.push(schematic('plugin', { name: 'codeStyle', type: 'add' }));
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
if (options.defaultLanguage) {
|
|
26
|
+
rules.push(
|
|
27
|
+
schematic('plugin', {
|
|
28
|
+
name: 'defaultLanguage',
|
|
29
|
+
type: 'add',
|
|
30
|
+
defaultLanguage: options.defaultLanguage
|
|
31
|
+
})
|
|
32
|
+
);
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
if (options.npm) {
|
|
36
|
+
rules.push(
|
|
37
|
+
schematic('plugin', {
|
|
38
|
+
name: 'networkEnv',
|
|
39
|
+
type: 'add',
|
|
40
|
+
packageManager: 'npm'
|
|
41
|
+
})
|
|
42
|
+
);
|
|
43
|
+
}
|
|
50
44
|
|
|
51
|
-
|
|
45
|
+
if (options.yarn) {
|
|
46
|
+
rules.push(
|
|
47
|
+
schematic('plugin', {
|
|
48
|
+
name: 'networkEnv',
|
|
49
|
+
type: 'add',
|
|
50
|
+
packageManager: 'yarn'
|
|
51
|
+
})
|
|
52
|
+
);
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
return chain(rules);
|
|
56
|
+
};
|
|
52
57
|
}
|
|
53
58
|
|
|
54
59
|
function getFiles(): string[] {
|
|
@@ -63,8 +68,22 @@ function isUseCNPM(): boolean {
|
|
|
63
68
|
return res;
|
|
64
69
|
}
|
|
65
70
|
|
|
71
|
+
function finished(): Rule {
|
|
72
|
+
return (_: Tree, context: SchematicContext) => {
|
|
73
|
+
context.addTask(new NodePackageInstallTask());
|
|
74
|
+
|
|
75
|
+
context.logger.info(
|
|
76
|
+
colors.green(`
|
|
77
|
+
✓ Congratulations, NG-ALAIN scaffold generation complete 🎉.
|
|
78
|
+
|
|
79
|
+
NG-ALAIN documentation site: https://ng-alain.com
|
|
80
|
+
`)
|
|
81
|
+
);
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
|
|
66
85
|
export default function (options: NgAddOptions): Rule {
|
|
67
|
-
return (tree: Tree) => {
|
|
86
|
+
return (tree: Tree, context: SchematicContext) => {
|
|
68
87
|
if (isUseCNPM()) {
|
|
69
88
|
throw new Error(
|
|
70
89
|
`Sorry, Don't use cnpm to install dependencies, pls refer to: https://ng-alain.com/docs/faq#Installation`
|
|
@@ -87,14 +106,6 @@ export default function (options: NgAddOptions): Rule {
|
|
|
87
106
|
);
|
|
88
107
|
}
|
|
89
108
|
|
|
90
|
-
return genRules(options);
|
|
109
|
+
return chain([genRules(options), finished()])(tree, context);
|
|
91
110
|
};
|
|
92
111
|
}
|
|
93
|
-
|
|
94
|
-
export function finished(context: SchematicContext): void {
|
|
95
|
-
context.logger.info('');
|
|
96
|
-
context.logger.info(
|
|
97
|
-
` ✓ Congratulations, NG-ALAIN scaffold generation complete. NG-ALAIN documentation site: https://ng-alain.com`
|
|
98
|
-
);
|
|
99
|
-
context.logger.info('');
|
|
100
|
-
}
|
package/package.json
CHANGED
package/tpl/schema.json
CHANGED
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"description": "The name of the component.",
|
|
24
24
|
"$default": {
|
|
25
25
|
"$source": "argv",
|
|
26
|
-
"index":
|
|
26
|
+
"index": 1
|
|
27
27
|
},
|
|
28
28
|
"x-prompt": "What name would you like to use for the component?"
|
|
29
29
|
},
|
|
@@ -136,6 +136,15 @@
|
|
|
136
136
|
"alias": "m",
|
|
137
137
|
"x-prompt": "Specify which module name:"
|
|
138
138
|
},
|
|
139
|
+
"tplName": {
|
|
140
|
+
"type": "string",
|
|
141
|
+
"description": "指定模板名称 (Specifies template name)",
|
|
142
|
+
"$default": {
|
|
143
|
+
"$source": "argv",
|
|
144
|
+
"index": 0
|
|
145
|
+
},
|
|
146
|
+
"x-prompt": "What template name would you like to use for the component:"
|
|
147
|
+
},
|
|
139
148
|
"target": {
|
|
140
149
|
"type": "string",
|
|
141
150
|
"description": "指定目标路径，支持 `bus/list` 写法 (Specifies relative path, could be set like `bus/list`.)",
|
package/utils/lib-versions.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ZORROVERSION = exports.VERSION = void 0;
|
|
4
|
-
exports.VERSION = '^12.
|
|
4
|
+
exports.VERSION = '^12.2.3';
|
|
5
5
|
exports.ZORROVERSION = '^12.0.1';
|
|
6
6
|
//# sourceMappingURL=lib-versions.js.map
|
package/utils/lib-versions.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = '^12.
|
|
1
|
+
export const VERSION = '^12.2.3';
|
|
2
2
|
export const ZORROVERSION = '^12.0.1';
|
package/utils/versions.js
CHANGED
|
@@ -26,12 +26,12 @@ function UpgradeMainVersions(tree, version = lib_versions_1.VERSION) {
|
|
|
26
26
|
`@angular-eslint/eslint-plugin-template@~12.3.1`,
|
|
27
27
|
`@angular-eslint/schematics@~12.3.1`,
|
|
28
28
|
`@angular-eslint/template-parser@~12.3.1`,
|
|
29
|
-
`@typescript-eslint/eslint-plugin@~4.29.
|
|
30
|
-
`@typescript-eslint/parser@~4.29.
|
|
29
|
+
`@typescript-eslint/eslint-plugin@~4.29.2`,
|
|
30
|
+
`@typescript-eslint/parser@~4.29.2`,
|
|
31
31
|
`eslint@^7.32.0`,
|
|
32
32
|
`eslint-config-prettier@^2.2.1`,
|
|
33
|
-
`eslint-plugin-import@~2.
|
|
34
|
-
`eslint-plugin-jsdoc@~36.0.
|
|
33
|
+
`eslint-plugin-import@~2.24.1`,
|
|
34
|
+
`eslint-plugin-jsdoc@~36.0.7`,
|
|
35
35
|
`eslint-plugin-prefer-arrow@~1.2.3`,
|
|
36
36
|
`eslint-plugin-prettier@^2.2.1`,
|
|
37
37
|
`prettier@^2.2.1`,
|
|
@@ -42,7 +42,7 @@ function UpgradeMainVersions(tree, version = lib_versions_1.VERSION) {
|
|
|
42
42
|
`@angular/language-service@~12.2.0`,
|
|
43
43
|
`@delon/testing@${version}`
|
|
44
44
|
], 'devDependencies');
|
|
45
|
-
package_1.addPackage(tree, ['ajv@^8.6.2', 'ajv-formats@^2.1.
|
|
45
|
+
package_1.addPackage(tree, ['ajv@^8.6.2', 'ajv-formats@^2.1.1']);
|
|
46
46
|
}
|
|
47
47
|
exports.UpgradeMainVersions = UpgradeMainVersions;
|
|
48
48
|
function addESLintRule(context, showLog = true) {
|
package/utils/versions.ts
CHANGED
|
@@ -22,12 +22,12 @@ export function UpgradeMainVersions(tree: Tree, version: string = VERSION): void
|
|
|
22
22
|
`@angular-eslint/eslint-plugin-template@~12.3.1`,
|
|
23
23
|
`@angular-eslint/schematics@~12.3.1`,
|
|
24
24
|
`@angular-eslint/template-parser@~12.3.1`,
|
|
25
|
-
`@typescript-eslint/eslint-plugin@~4.29.
|
|
26
|
-
`@typescript-eslint/parser@~4.29.
|
|
25
|
+
`@typescript-eslint/eslint-plugin@~4.29.2`,
|
|
26
|
+
`@typescript-eslint/parser@~4.29.2`,
|
|
27
27
|
`eslint@^7.32.0`,
|
|
28
28
|
`eslint-config-prettier@^2.2.1`,
|
|
29
|
-
`eslint-plugin-import@~2.
|
|
30
|
-
`eslint-plugin-jsdoc@~36.0.
|
|
29
|
+
`eslint-plugin-import@~2.24.1`,
|
|
30
|
+
`eslint-plugin-jsdoc@~36.0.7`,
|
|
31
31
|
`eslint-plugin-prefer-arrow@~1.2.3`,
|
|
32
32
|
`eslint-plugin-prettier@^2.2.1`,
|
|
33
33
|
`prettier@^2.2.1`,
|
|
@@ -40,7 +40,7 @@ export function UpgradeMainVersions(tree: Tree, version: string = VERSION): void
|
|
|
40
40
|
],
|
|
41
41
|
'devDependencies'
|
|
42
42
|
);
|
|
43
|
-
addPackage(tree, ['ajv@^8.6.2', 'ajv-formats@^2.1.
|
|
43
|
+
addPackage(tree, ['ajv@^8.6.2', 'ajv-formats@^2.1.1']);
|
|
44
44
|
}
|
|
45
45
|
|
|
46
46
|
export function addESLintRule(context: SchematicContext, showLog: Boolean = true): Rule {
|