ng-alain 13.0.0 → 13.2.1

package/module/index.js

@@ -45,6 +45,7 @@ function addDeclarationToNgModule(options) {
 }
 function addRoutingModuleToTop(options) {
     return (tree) => {
+        var _a;
         const modulePath = (0, core_1.normalize)(`${options.path}/routes-routing.module.ts`);
         if (!tree.exists(modulePath)) {
             return tree;
@@ -66,14 +67,33 @@ function addRoutingModuleToTop(options) {
         }
         const recorder = tree.beginUpdate(modulePath);
         const moduleName = core_1.strings.classify(`${options.name}Module`);
-        const code = `{ path: '${options.name}', loadChildren: () => import('./${options.name}/${options.name}.module').then((m) => m.${moduleName}) },`;
         let pos = childrenNode.parent.end;
+        const validLines = childrenNode.parent
+            .getText()
+            .trim()
+            .split('\n')
+            .map(v => v.trim())
+            .filter(v => v.length > 1 && !v.startsWith('//'));
+        const comma = ((_a = validLines.pop()) === null || _a === void 0 ? void 0 : _a.endsWith(',')) === false ? ', ' : '';
+        const code = `${comma} { path: '${options.name}', loadChildren: () => import('./${options.name}/${options.name}.module').then((m) => m.${moduleName}) }`;
         // Insert it just before the `]`.
-        recorder.insertRight(--pos, code);
+        recorder.insertRight(pos - 1, code);
         tree.commitUpdate(recorder);
         return tree;
     };
 }
+function addServiceToNgModule(options) {
+    return (tree) => {
+        if (options.service !== 'none')
+            return tree;
+        const basePath = `/${options.path}/${options.flat ? '' : `${core_1.strings.dasherize(options.name)}/`}${core_1.strings.dasherize(options.name)}`;
+        const servicePath = (0, core_1.normalize)(`${basePath}.service`);
+        const importModulePath = (0, core_1.normalize)(`${basePath}.module`);
+        const importServicePath = (0, find_module_1.buildRelativePath)(importModulePath, servicePath);
+        (0, utils_1.addProviderToModule)(tree, `${importModulePath}.ts`, core_1.strings.classify(`${options.name}Service`), importServicePath);
+        return tree;
+    };
+}
 function default_1(schema) {
     return (tree) => __awaiter(this, void 0, void 0, function* () {
         const proj = yield (0, utils_1.getProject)(tree, schema.project);
@@ -87,12 +107,18 @@ function default_1(schema) {
         schema.routing = true;
         schema.flat = false;
         const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
+            schema.service === 'ignore' ? (0, schematics_1.filter)(filePath => !filePath.endsWith('.service.ts.template')) : (0, schematics_1.noop)(),
             schema.routing ? (0, schematics_1.noop)() : (0, schematics_1.filter)(path => !path.endsWith('-routing.module.ts')),
             (0, schematics_1.applyTemplates)(Object.assign(Object.assign(Object.assign({}, core_1.strings), { 'if-flat': (s) => (schema.flat ? '' : s) }), schema)),
             (0, schematics_1.move)(parsedPath.path)
         ]);
         return (0, schematics_1.chain)([
-            (0, schematics_1.branchAndMerge)((0, schematics_1.chain)([addDeclarationToNgModule(schema), addRoutingModuleToTop(schema), (0, schematics_1.mergeWith)(templateSource)]))
+            (0, schematics_1.branchAndMerge)((0, schematics_1.chain)([
+                addDeclarationToNgModule(schema),
+                addRoutingModuleToTop(schema),
+                (0, schematics_1.mergeWith)(templateSource),
+                addServiceToNgModule(schema)
+            ]))
         ]);
     });
 }

package/module/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/module/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+CAAuF;AACvF,2DAaoC;AACpC,qEAAoF;AACpF,+DAAkE;AAClE,yEAAgF;AAChF,uEAAmE;AACnE,iCAAiC;AAEjC,oCAAuD;AAGvD,SAAS,wBAAwB,CAAC,OAAqB;IACrD,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACnB,OAAO,IAAI,CAAC;SACb;QAED,MAAM,UAAU,GAAG,IAAA,gBAAS,EAAC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAEnD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACnC,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,MAAM,IAAI,gCAAmB,CAAC,QAAQ,UAAU,kBAAkB,CAAC,CAAC;SACrE;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,EAAE,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAEzF,MAAM,gBAAgB,GAAG,IAAA,gBAAS,EAChC,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,cAAO,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,GAAG,cAAO,CAAC,SAAS,CAC/F,OAAO,CAAC,IAAI,CACb,SAAS,CACX,CAAC;QACF,MAAM,WAAW,GAAG,IAAA,eAAQ,EAAC,IAAA,cAAO,EAAC,UAAU,CAAC,EAAE,IAAA,cAAO,EAAC,gBAAgB,CAAC,CAAC,CAAC;QAE7E,MAAM,YAAY,GAAG,GAAG,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,WAAW,EAAE,IAAI,IAAA,eAAQ,EAChG,gBAAgB,CACjB,EAAE,CAAC;QACJ,MAAM,OAAO,GAAG,IAAA,6BAAiB,EAAC,MAAM,EAAE,UAAU,EAAE,cAAO,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,QAAQ,CAAC,EAAE,YAAY,CAAC,CAAC;QAE/G,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC9C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,MAAM,YAAY,qBAAY,EAAE;gBAClC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;aAC/C;SACF;QACD,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAqB;IAClD,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,UAAU,GAAG,IAAA,gBAAS,EAAC,GAAG,OAAO,CAAC,IAAI,2BAA2B,CAAC,CAAC;QACzE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YAC5B,OAAO,IAAI,CAAC;SACb;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,EAAE,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACzF,MAAM,UAAU,GAAG,IAAA,oBAAQ,EAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACxE,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,IAAI,IAAI,EAAE;YACnD,OAAO,IAAI,CAAC;SACb;QACD,MAAM,UAAU,GAAG,UAAU,CAAC,MAA+B,CAAC;QAC9D,IACE,UAAU,CAAC,WAAW,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,sBAAsB;YACpE,UAAU,CAAC,WAAW,CAAC,aAAa,EAAE,KAAK,CAAC,EAC5C;YACA,OAAO,IAAI,CAAC;SACb;QACD,MAAM,YAAY,GAAG,IAAA,oBAAQ,EAAC,UAAU,CAAC,WAAW,EAAE,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAC5F,IAAI,YAAY,IAAI,IAAI,IAAI,YAAY,CAAC,MAAM,IAAI,IAAI,EAAE;YACvD,OAAO,IAAI,CAAC;SACb;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,cAAO,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,QAAQ,CAAC,CAAC;QAC7D,MAAM,IAAI,GAAG,YAAY,OAAO,CAAC,IAAI,oCAAoC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,2BAA2B,UAAU,MAAM,CAAC;QACjJ,IAAI,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC;QAClC,iCAAiC;QACjC,QAAQ,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QAClC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED,mBAAyB,MAAoB;IAC3C,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAU,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAEpD,IAAA,uBAAe,EAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAEzD,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,MAAM,CAAC,MAAM,GAAG,IAAA,mCAAqB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACrD;QAED,MAAM,UAAU,GAAG,IAAA,sBAAS,EAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QAC9B,MAAM,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QAE9B,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;QACtB,MAAM,CAAC,IAAI,GAAG,KAAK,CAAC;QAEpB,MAAM,cAAc,GAAG,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,SAAS,CAAC,EAAE;YAC3C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE,CAAC,CAAC,CAAC,IAAA,mBAAM,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;YAC9E,IAAA,2BAAc,gDACT,cAAO,KACV,SAAS,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAC7C,MAAM,EACT;YACF,IAAA,iBAAI,EAAC,UAAU,CAAC,IAAI,CAAC;SACtB,CAAC,CAAC;QAEH,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,2BAAc,EACZ,IAAA,kBAAK,EAAC,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE,qBAAqB,CAAC,MAAM,CAAC,EAAE,IAAA,sBAAS,EAAC,cAAc,CAAC,CAAC,CAAC,CACpG;SACF,CAAC,CAAC;IACL,CAAC,CAAA,CAAC;AACJ,CAAC;AAjCD,4BAiCC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/module/index.ts"],"names":[],"mappings":"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"}

package/module/index.spec.ts

@@ -33,4 +33,20 @@ describe('NgAlainSchematic: module', () => {
     const content = tree.readContent('/projects/foo/src/app/app.module.ts');
     expect(content).toContain(`import { TradeModule } from './trade/trade.module';`);
   });
+
+  it('shuold be include service', async () => {
+    tree = await runner.runSchematicAsync('module', { ...defaultOptions, service: 'none' }, tree).toPromise();
+    const content = tree.readContent('/projects/foo/src/app/routes/trade/trade.service.ts');
+    const contentModule = tree.readContent('/projects/foo/src/app/routes/trade/trade.module.ts');
+    expect(content).toContain(`@Injectable()`);
+    expect(content).toContain(`TradeService`);
+    expect(contentModule).toContain(`import { TradeService } from './trade.service';`);
+  });
+
+  it('shuold be include root service', async () => {
+    tree = await runner.runSchematicAsync('module', { ...defaultOptions, service: 'root' }, tree).toPromise();
+    const content = tree.readContent('/projects/foo/src/app/routes/trade/trade.service.ts');
+    expect(content).toContain(`@Injectable({ providedIn: 'root' })`);
+    expect(content).toContain(`TradeService`);
+  });
 });

package/module/index.ts

@@ -15,11 +15,11 @@ import {
 } from '@angular-devkit/schematics';
 import { addImportToModule, findNode } from '@schematics/angular/utility/ast-utils';
 import { InsertChange } from '@schematics/angular/utility/change';
-import { findModuleFromOptions } from '@schematics/angular/utility/find-module';
+import { findModuleFromOptions, buildRelativePath } from '@schematics/angular/utility/find-module';
 import { parseName } from '@schematics/angular/utility/parse-name';
 import * as ts from 'typescript';
 
-import { getProject, refreshPathRoot } from '../utils';
+import { addProviderToModule, getProject, refreshPathRoot } from '../utils';
 import { Schema as ModuleSchema } from './schema';
 
 function addDeclarationToNgModule(options: ModuleSchema): Rule {
@@ -86,15 +86,37 @@ function addRoutingModuleToTop(options: ModuleSchema): Rule {
     }
     const recorder = tree.beginUpdate(modulePath);
     const moduleName = strings.classify(`${options.name}Module`);
-    const code = `{ path: '${options.name}', loadChildren: () => import('./${options.name}/${options.name}.module').then((m) => m.${moduleName}) },`;
     let pos = childrenNode.parent.end;
+    const validLines = childrenNode.parent
+      .getText()
+      .trim()
+      .split('\n')
+      .map(v => v.trim())
+      .filter(v => v.length > 1 && !v.startsWith('//'));
+    const comma = validLines.pop()?.endsWith(',') === false ? ', ' : '';
+    const code = `${comma} { path: '${options.name}', loadChildren: () => import('./${options.name}/${options.name}.module').then((m) => m.${moduleName}) }`;
     // Insert it just before the `]`.
-    recorder.insertRight(--pos, code);
+    recorder.insertRight(pos - 1, code);
     tree.commitUpdate(recorder);
     return tree;
   };
 }
 
+function addServiceToNgModule(options: ModuleSchema): Rule {
+  return (tree: Tree) => {
+    if (options.service !== 'none') return tree;
+
+    const basePath = `/${options.path}/${options.flat ? '' : `${strings.dasherize(options.name)}/`}${strings.dasherize(
+      options.name
+    )}`;
+    const servicePath = normalize(`${basePath}.service`);
+    const importModulePath = normalize(`${basePath}.module`);
+    const importServicePath = buildRelativePath(importModulePath, servicePath);
+    addProviderToModule(tree, `${importModulePath}.ts`, strings.classify(`${options.name}Service`), importServicePath);
+    return tree;
+  };
+}
+
 export default function (schema: ModuleSchema): Rule {
   return async (tree: Tree) => {
     const proj = await getProject(tree, schema.project);
@@ -113,6 +135,7 @@ export default function (schema: ModuleSchema): Rule {
     schema.flat = false;
 
     const templateSource = apply(url('./files'), [
+      schema.service === 'ignore' ? filter(filePath => !filePath.endsWith('.service.ts.template')) : noop(),
       schema.routing ? noop() : filter(path => !path.endsWith('-routing.module.ts')),
       applyTemplates({
         ...strings,
@@ -124,7 +147,12 @@ export default function (schema: ModuleSchema): Rule {
 
     return chain([
       branchAndMerge(
-        chain([addDeclarationToNgModule(schema), addRoutingModuleToTop(schema), mergeWith(templateSource)])
+        chain([
+          addDeclarationToNgModule(schema),
+          addRoutingModuleToTop(schema),
+          mergeWith(templateSource),
+          addServiceToNgModule(schema)
+        ])
       )
     ]);
   };

package/module/schema.json

@@ -63,6 +63,22 @@
       "description": "Apply lint fixes after generating the module.",
       "x-user-analytics": 15,
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
+    },
+    "service": {
+      "type": "string",
+      "description": "The service file to use in the new component.",
+      "default": "ignore",
+      "enum": ["ignore", "none", "root"],
+      "x-prompt": {
+        "message": "Which service injectors would you like to use?",
+        "type": "list",
+        "items": [
+          { "value": "ignore", "label": "Ignore generation of Service files" },
+          { "value": "root", "label": "Use \"@Injectable({ providedIn: 'root' })\"" },
+          { "value": "none", "label": "Use \"@Injectable()\" (Should be automatically register to the nearest module)" }
+        ]
+      },
+      "x-user-analytics": 20
     }
   },
   "required": ["name"]

package/module/schema.ts

@@ -1,3 +1,5 @@
 import { Schema as ModuleSchema } from '@schematics/angular/module/schema';
 
-export interface Schema extends ModuleSchema {}
+export interface Schema extends ModuleSchema {
+  service?: 'ignore' | 'none' | 'root';
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-alain",
-  "version": "13.0.0",
+  "version": "13.2.1",
   "description": "Schematics specific to ng-alain",
   "author": "cipchk<cipchk@qq.com>",
   "license": "MIT",

package/tpl/schema.json

@@ -44,7 +44,6 @@
       "description": "Include template inline in the component.ts file. By default, an external template file is created and referenced in the component.ts file.",
       "type": "boolean",
       "default": false,
-      "alias": "t",
       "x-user-analytics": 10
     },
     "viewEncapsulation": {

package/utils/alain.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildAlain = exports.addValueToVariable = exports.addImportToModule = exports.refreshPathRoot = void 0;
+exports.buildAlain = exports.addValueToVariable = exports.addProviderToModule = exports.addImportToModule = exports.refreshPathRoot = void 0;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
@@ -45,13 +45,17 @@ function buildSelector(schema, projectPrefix) {
     ret.push(core_1.strings.dasherize(schema.name));
     return ret.join('-');
 }
-function buildComponentName(schema, _projectPrefix) {
+function buildName(schema, prefix) {
     const ret = schema.withoutModulePrefixInComponentName === true ? [] : [schema.module];
     if (schema.target && schema.target.length > 0) {
         ret.push(...schema.target.split('/'));
     }
     ret.push(schema.name);
-    ret.push(`Component`);
+    // 服务类自动过滤 list, empty 两个页面的后缀
+    if (prefix === 'Service' && ['list', 'empty'].includes(schema.name)) {
+        ret.pop();
+    }
+    ret.push(prefix);
     return core_1.strings.classify(ret.join('-'));
 }
 function refreshPathRoot(project, schema, alainProject) {
@@ -101,11 +105,27 @@ function resolveSchema(tree, project, schema, alainProject) {
 function addImportToModule(tree, filePath, symbolName, fileName) {
     const source = (0, ast_1.getSourceFile)(tree, filePath);
     const change = (0, ast_utils_1.insertImport)(source, filePath, symbolName, fileName);
+    if (change.path == null)
+        return;
     const declarationRecorder = tree.beginUpdate(filePath);
     declarationRecorder.insertLeft(change.pos, change.toAdd);
     tree.commitUpdate(declarationRecorder);
 }
 exports.addImportToModule = addImportToModule;
+function addProviderToModule(tree, filePath, serviceName, importPath) {
+    const source = (0, ast_1.getSourceFile)(tree, filePath);
+    const changes = (0, ast_utils_1.addProviderToModule)(source, filePath, serviceName, importPath);
+    const declarationRecorder = tree.beginUpdate(filePath);
+    changes.forEach(change => {
+        if (change.path == null)
+            return;
+        if (change instanceof change_1.InsertChange) {
+            declarationRecorder.insertLeft(change.pos, change.toAdd);
+        }
+    });
+    tree.commitUpdate(declarationRecorder);
+}
+exports.addProviderToModule = addProviderToModule;
 function addValueToVariable(tree, filePath, variableName, text, needWrap = true) {
     const source = (0, ast_1.getSourceFile)(tree, filePath);
     const node = (0, ast_utils_1.findNode)(source, ts.SyntaxKind.Identifier, variableName);
@@ -120,8 +140,8 @@ function addValueToVariable(tree, filePath, variableName, text, needWrap = true)
     tree.commitUpdate(declarationRecorder);
 }
 exports.addValueToVariable = addValueToVariable;
-function getRelativePath(filePath, schema) {
-    const importPath = `/${schema.path}/${schema.flat ? '' : `${core_1.strings.dasherize(schema.name)}/`}${core_1.strings.dasherize(schema.name)}.component`;
+function getRelativePath(filePath, schema, prefix) {
+    const importPath = `/${schema.path}/${schema.flat ? '' : `${core_1.strings.dasherize(schema.name)}/`}${core_1.strings.dasherize(schema.name)}.${prefix}`;
     return (0, find_module_1.buildRelativePath)(filePath, importPath);
 }
 function addDeclaration(schema) {
@@ -130,14 +150,18 @@ function addDeclaration(schema) {
             return tree;
         }
         // imports
-        addImportToModule(tree, schema.importModulePath, schema.componentName, getRelativePath(schema.importModulePath, schema));
+        addImportToModule(tree, schema.importModulePath, schema.componentName, getRelativePath(schema.importModulePath, schema, 'component'));
         addValueToVariable(tree, schema.importModulePath, 'COMPONENTS', schema.componentName);
         // component
         if (schema.modal !== true) {
             // routing
-            addImportToModule(tree, schema.routerModulePath, schema.componentName, getRelativePath(schema.routerModulePath, schema));
+            addImportToModule(tree, schema.routerModulePath, schema.componentName, getRelativePath(schema.routerModulePath, schema, 'component'));
             addValueToVariable(tree, schema.routerModulePath, 'routes', `{ path: '${schema.name}', component: ${schema.componentName} }`);
         }
+        // service
+        if (schema.service === 'none') {
+            addProviderToModule(tree, schema.importModulePath, schema.serviceName, getRelativePath(schema.importModulePath, schema, 'service'));
+        }
         return tree;
     };
 }
@@ -149,11 +173,13 @@ function buildAlain(schema) {
         }
         const project = res.project;
         resolveSchema(tree, project, schema, res.alainProject);
-        schema.componentName = buildComponentName(schema, project.prefix);
+        schema.componentName = buildName(schema, 'Component');
+        schema.serviceName = buildName(schema, 'Service');
         // Don't support inline
         schema.inlineTemplate = false;
         const templateSource = (0, schematics_1.apply)((0, schematics_1.url)(schema._filesPath), [
             (0, schematics_1.filter)(filePath => !filePath.endsWith('.DS_Store')),
+            schema.service === 'ignore' ? (0, schematics_1.filter)(filePath => !filePath.endsWith('.service.ts.template')) : (0, schematics_1.noop)(),
             schema.skipTests ? (0, schematics_1.filter)(filePath => !filePath.endsWith('.spec.ts.template')) : (0, schematics_1.noop)(),
             schema.inlineStyle ? (0, schematics_1.filter)(filePath => !filePath.endsWith('.__style__.template')) : (0, schematics_1.noop)(),
             schema.inlineTemplate ? (0, schematics_1.filter)(filePath => !filePath.endsWith('.html.template')) : (0, schematics_1.noop)(),

package/utils/alain.js.map

@@ -1 +1 @@
-{"version":3,"file":"alain.js","sourceRoot":"","sources":["../../../schematics/utils/alain.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"alain.js","sourceRoot":"","sources":["../../../schematics/utils/alain.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA+C;AAE/C,2DAaoC;AAEpC,qEAI+C;AAC/C,+DAAkE;AAClE,yEAAkH;AAClH,uEAAmE;AACnE,uEAA8E;AAC9E,yBAAyB;AACzB,6BAA6B;AAC7B,iCAAiC;AAEjC,+BAAsC;AACtC,2CAAmE;AAEnE,MAAM,oBAAoB,GAAG,aAAa,CAAC;AAqB3C,SAAS,aAAa,CAAC,MAAoB,EAAE,aAAqB;IAChE,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;QACzB,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SACzB;aAAM,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,aAAa,EAAE;YACvD,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SACzB;KACF;IACD,cAAc;IACd,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;KACzB;IACD,cAAc;IACd,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;KACvC;IACD,OAAO;IACP,GAAG,CAAC,IAAI,CAAC,cAAO,CAAC,SAAS,CAAC,MAAM,CAAC,IAAK,CAAC,CAAC,CAAC;IAC1C,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACvB,CAAC;AAED,SAAS,SAAS,CAAC,MAAoB,EAAE,MAA+B;IACtE,MAAM,GAAG,GAAa,MAAM,CAAC,kCAAkC,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAO,CAAC,CAAC;IACjG,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QAC7C,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;KACvC;IACD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAK,CAAC,CAAC;IACvB,8BAA8B;IAC9B,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACnE,GAAG,CAAC,GAAG,EAAE,CAAC;KACX;IACD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjB,OAAO,cAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACzC,CAAC;AAED,SAAgB,eAAe,CAC7B,OAA0B,EAC1B,MAAoB,EACpB,YAAsC;;IAEtC,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAW,EAAE,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,UAAU,mCAAI,YAAY,CAAC,EAAE,CAAC;KAC9F;AACH,CAAC;AARD,0CAQC;AAED,SAAS,aAAa,CACpB,IAAU,EACV,OAA0B,EAC1B,MAAoB,EACpB,YAAsC;IAEtC,cAAc;IACd,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;QAClB,MAAM,IAAI,gCAAmB,CAAC,kFAAkF,CAAC,CAAC;KACnH;IACD,OAAO;IACP,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAE/C,MAAM,CAAC,IAAI,IAAI,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;IAEnC,MAAM,UAAU,GAAG,IAAA,sBAAS,EAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAK,CAAC,CAAC;IACxD,MAAM,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAC9B,MAAM,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IACpE,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;QAClE,MAAM,IAAI,gCAAmB,CAAC,kBAAkB,QAAQ,kBAAkB,CAAC,CAAC;KAC7E;IACD,MAAM,CAAC,gBAAgB,GAAG,IAAA,mCAAqB,EAAC,IAAI,EAAE,MAAkC,CAAC,CAAC;IAE1F,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;QACtB,+DAA+D;QAC/D,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,aAAc,CAAC,EAAE;YACrE,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,aAAa,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACzG,MAAM,YAAY,GAAG,GAAG,WAAW,sEAAsE,CAAC;YAC1G,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,YAAY,WAAW,CAAC,EAAE;gBACxE,6BAA6B;gBAC7B,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,GAAG,WAAW,CAAC;aAC3E;SACF;QACD,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,SAAS,CAAC;KACpD;IACD,cAAc;IACd,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,MAAM,CAAC,IAAI,IAAI,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;KACpC;IAED,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAiB,CAAC,OAAO,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;IAE/F,gBAAgB;IAChB,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAE3E,IAAA,iCAAoB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC;AAED,SAAgB,iBAAiB,CAAC,IAAU,EAAE,QAAgB,EAAE,UAAkB,EAAE,QAAgB;IAClG,MAAM,MAAM,GAAG,IAAA,mBAAa,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,IAAA,wBAAY,EAAC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAiB,CAAC;IACpF,IAAI,MAAM,CAAC,IAAI,IAAI,IAAI;QAAE,OAAO;IAChC,MAAM,mBAAmB,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACvD,mBAAmB,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACzD,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;AACzC,CAAC;AAPD,8CAOC;AAED,SAAgB,mBAAmB,CAAC,IAAU,EAAE,QAAgB,EAAE,WAAmB,EAAE,UAAkB;IACvG,MAAM,MAAM,GAAG,IAAA,mBAAa,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAA,+BAAoB,EAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IAChF,MAAM,mBAAmB,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACvD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACvB,IAAI,MAAM,CAAC,IAAI,IAAI,IAAI;YAAE,OAAO;QAChC,IAAI,MAAM,YAAY,qBAAY,EAAE;YAClC,mBAAmB,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;SAC1D;IACH,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;AACzC,CAAC;AAXD,kDAWC;AAED,SAAgB,kBAAkB,CAChC,IAAU,EACV,QAAgB,EAChB,YAAoB,EACpB,IAAY,EACZ,WAAoB,IAAI;IAExB,MAAM,MAAM,GAAG,IAAA,mBAAa,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC7C,MAAM,IAAI,GAAG,IAAA,oBAAQ,EAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACtE,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,gCAAmB,CAAC,uBAAuB,YAAY,uBAAuB,QAAQ,IAAI,CAAC,CAAC;KACvG;IACD,8DAA8D;IAC9D,MAAM,GAAG,GAAI,IAAI,CAAC,MAAc,CAAC,WAAwC,CAAC;IAE1E,MAAM,MAAM,GAAG,IAAI,qBAAY,CAC7B,QAAQ,EACR,GAAG,CAAC,GAAG,GAAG,CAAC,EACX,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CACxF,CAAC;IAEF,MAAM,mBAAmB,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACvD,mBAAmB,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACzD,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;AACzC,CAAC;AAxBD,gDAwBC;AAED,SAAS,eAAe,CAAC,QAAgB,EAAE,MAAoB,EAAE,MAA+B;IAC9F,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,cAAO,CAAC,SAAS,CAAC,MAAM,CAAC,IAAK,CAAC,GAAG,GAAG,cAAO,CAAC,SAAS,CAChH,MAAM,CAAC,IAAK,CACb,IAAI,MAAM,EAAE,CAAC;IACd,OAAO,IAAA,+BAAiB,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,cAAc,CAAC,MAAoB;IAC1C,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,IAAI,MAAM,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACvC,OAAO,IAAI,CAAC;SACb;QAED,UAAU;QACV,iBAAiB,CACf,IAAI,EACJ,MAAM,CAAC,gBAAiB,EACxB,MAAM,CAAC,aAAc,EACrB,eAAe,CAAC,MAAM,CAAC,gBAAiB,EAAE,MAAM,EAAE,WAAW,CAAC,CAC/D,CAAC;QACF,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,gBAAiB,EAAE,YAAY,EAAE,MAAM,CAAC,aAAc,CAAC,CAAC;QAExF,YAAY;QACZ,IAAI,MAAM,CAAC,KAAK,KAAK,IAAI,EAAE;YACzB,UAAU;YACV,iBAAiB,CACf,IAAI,EACJ,MAAM,CAAC,gBAAiB,EACxB,MAAM,CAAC,aAAc,EACrB,eAAe,CAAC,MAAM,CAAC,gBAAiB,EAAE,MAAM,EAAE,WAAW,CAAC,CAC/D,CAAC;YACF,kBAAkB,CAChB,IAAI,EACJ,MAAM,CAAC,gBAAiB,EACxB,QAAQ,EACR,YAAY,MAAM,CAAC,IAAI,iBAAiB,MAAM,CAAC,aAAa,IAAI,CACjE,CAAC;SACH;QAED,UAAU;QACV,IAAI,MAAM,CAAC,OAAO,KAAK,MAAM,EAAE;YAC7B,mBAAmB,CACjB,IAAI,EACJ,MAAM,CAAC,gBAAiB,EACxB,MAAM,CAAC,WAAY,EACnB,eAAe,CAAC,MAAM,CAAC,gBAAiB,EAAE,MAAM,EAAE,SAAS,CAAC,CAC7D,CAAC;SACH;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,UAAU,CAAC,MAAoB;IAC7C,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,MAAM,GAAG,GAAG,MAAM,IAAA,sBAAU,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QACnD,IAAI,MAAM,CAAC,OAAO,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,OAAO,EAAE;YACjD,MAAM,IAAI,gCAAmB,CAAC,yCAAyC,MAAM,CAAC,OAAO,eAAe,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;SACjH;QACD,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC5B,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;QAEvD,MAAM,CAAC,aAAa,GAAG,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACtD,MAAM,CAAC,WAAW,GAAG,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAElD,uBAAuB;QACvB,MAAM,CAAC,cAAc,GAAG,KAAK,CAAC;QAE9B,MAAM,cAAc,GAAG,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,MAAM,CAAC,UAAW,CAAC,EAAE;YACpD,IAAA,mBAAM,EAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YACnD,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,mBAAM,EAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE;YACrG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,mBAAM,EAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE;YACvF,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,mBAAM,EAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE;YAC3F,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,IAAA,mBAAM,EAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE;YACzF,6EAA6E;YAC7E,yFAAyF;YACzF,oFAAoF;YACpF,IAAA,2BAAc,gDACT,cAAO,KACV,SAAS,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAC7C,MAAM,EACT;YACF,IAAA,iBAAI,EAAC,IAAK,EAAE,GAAG,MAAM,CAAC,IAAI,GAAG,CAAC;SAC/B,CAAC,CAAC;QAEH,OAAO,IAAA,kBAAK,EAAC,CAAC,IAAA,2BAAc,EAAC,IAAA,kBAAK,EAAC,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,IAAA,sBAAS,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7F,CAAC,CAAA,CAAC;AACJ,CAAC;AAlCD,gCAkCC"}

package/utils/alain.ts

@@ -15,7 +15,11 @@ import {
   url
 } from '@angular-devkit/schematics';
 import { Schema as ComponentSchema } from '@schematics/angular/component/schema';
-import { findNode, insertImport } from '@schematics/angular/utility/ast-utils';
+import {
+  findNode,
+  insertImport,
+  addProviderToModule as _addProviderToModule
+} from '@schematics/angular/utility/ast-utils';
 import { InsertChange } from '@schematics/angular/utility/change';
 import { buildRelativePath, findModuleFromOptions, ModuleOptions } from '@schematics/angular/utility/find-module';
 import { parseName } from '@schematics/angular/utility/parse-name';
@@ -36,12 +40,14 @@ export interface CommonSchema extends ComponentSchema {
   schematicName?: string;
   target?: string;
   componentName?: string;
+  serviceName?: string;
   importModulePath?: string;
   routerModulePath?: string;
   selector?: string;
   withoutPrefix?: boolean;
   withoutModulePrefixInComponentName?: boolean;
   skipTests?: boolean;
+  service?: 'ignore' | 'none' | 'root';
   flat?: boolean;
   modal?: boolean;
 }
@@ -68,13 +74,17 @@ function buildSelector(schema: CommonSchema, projectPrefix: string): string {
   return ret.join('-');
 }
 
-function buildComponentName(schema: CommonSchema, _projectPrefix: string): string {
+function buildName(schema: CommonSchema, prefix: 'Component' | 'Service'): string {
   const ret: string[] = schema.withoutModulePrefixInComponentName === true ? [] : [schema.module!];
   if (schema.target && schema.target.length > 0) {
     ret.push(...schema.target.split('/'));
   }
   ret.push(schema.name!);
-  ret.push(`Component`);
+  // 服务类自动过滤 list, empty 两个页面的后缀
+  if (prefix === 'Service' && ['list', 'empty'].includes(schema.name)) {
+    ret.pop();
+  }
+  ret.push(prefix);
   return strings.classify(ret.join('-'));
 }
 
@@ -140,11 +150,25 @@ function resolveSchema(
 export function addImportToModule(tree: Tree, filePath: string, symbolName: string, fileName: string): void {
   const source = getSourceFile(tree, filePath);
   const change = insertImport(source, filePath, symbolName, fileName) as InsertChange;
+  if (change.path == null) return;
   const declarationRecorder = tree.beginUpdate(filePath);
   declarationRecorder.insertLeft(change.pos, change.toAdd);
   tree.commitUpdate(declarationRecorder);
 }
 
+export function addProviderToModule(tree: Tree, filePath: string, serviceName: string, importPath: string): void {
+  const source = getSourceFile(tree, filePath);
+  const changes = _addProviderToModule(source, filePath, serviceName, importPath);
+  const declarationRecorder = tree.beginUpdate(filePath);
+  changes.forEach(change => {
+    if (change.path == null) return;
+    if (change instanceof InsertChange) {
+      declarationRecorder.insertLeft(change.pos, change.toAdd);
+    }
+  });
+  tree.commitUpdate(declarationRecorder);
+}
+
 export function addValueToVariable(
   tree: Tree,
   filePath: string,
@@ -171,10 +195,10 @@ export function addValueToVariable(
   tree.commitUpdate(declarationRecorder);
 }
 
-function getRelativePath(filePath: string, schema: CommonSchema): string {
+function getRelativePath(filePath: string, schema: CommonSchema, prefix: 'component' | 'service'): string {
   const importPath = `/${schema.path}/${schema.flat ? '' : `${strings.dasherize(schema.name!)}/`}${strings.dasherize(
     schema.name!
-  )}.component`;
+  )}.${prefix}`;
   return buildRelativePath(filePath, importPath);
 }
 
@@ -189,7 +213,7 @@ function addDeclaration(schema: CommonSchema): Rule {
       tree,
       schema.importModulePath!,
       schema.componentName!,
-      getRelativePath(schema.importModulePath!, schema)
+      getRelativePath(schema.importModulePath!, schema, 'component')
     );
     addValueToVariable(tree, schema.importModulePath!, 'COMPONENTS', schema.componentName!);
 
@@ -200,7 +224,7 @@ function addDeclaration(schema: CommonSchema): Rule {
         tree,
         schema.routerModulePath!,
         schema.componentName!,
-        getRelativePath(schema.routerModulePath!, schema)
+        getRelativePath(schema.routerModulePath!, schema, 'component')
       );
       addValueToVariable(
         tree,
@@ -210,6 +234,16 @@ function addDeclaration(schema: CommonSchema): Rule {
       );
     }
 
+    // service
+    if (schema.service === 'none') {
+      addProviderToModule(
+        tree,
+        schema.importModulePath!,
+        schema.serviceName!,
+        getRelativePath(schema.importModulePath!, schema, 'service')
+      );
+    }
+
     return tree;
   };
 }
@@ -223,13 +257,15 @@ export function buildAlain(schema: CommonSchema): Rule {
     const project = res.project;
     resolveSchema(tree, project, schema, res.alainProject);
 
-    schema.componentName = buildComponentName(schema, project.prefix);
+    schema.componentName = buildName(schema, 'Component');
+    schema.serviceName = buildName(schema, 'Service');
 
     // Don't support inline
     schema.inlineTemplate = false;
 
     const templateSource = apply(url(schema._filesPath!), [
       filter(filePath => !filePath.endsWith('.DS_Store')),
+      schema.service === 'ignore' ? filter(filePath => !filePath.endsWith('.service.ts.template')) : noop(),
       schema.skipTests ? filter(filePath => !filePath.endsWith('.spec.ts.template')) : noop(),
       schema.inlineStyle ? filter(filePath => !filePath.endsWith('.__style__.template')) : noop(),
       schema.inlineTemplate ? filter(filePath => !filePath.endsWith('.html.template')) : noop(),

package/utils/code-style.js

@@ -4,6 +4,6 @@ exports.LINT_STAGED_CONFIG = exports.LINT_STAGED = void 0;
 exports.LINT_STAGED = 'lint-staged';
 exports.LINT_STAGED_CONFIG = {
     '(src)/**/*.{html,ts}': ['eslint --fix'],
-    '(src)/**/*.less': ['stylelint --syntax less --fix']
+    '(src)/**/*.less': ['npx stylelint --syntax less --fix']
 };
 //# sourceMappingURL=code-style.js.map

package/utils/code-style.js.map

@@ -1 +1 @@
-{"version":3,"file":"code-style.js","sourceRoot":"","sources":["../../../schematics/utils/code-style.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG,aAAa,CAAC;AAE5B,QAAA,kBAAkB,GAAG;IAChC,sBAAsB,EAAE,CAAC,cAAc,CAAC;IACxC,iBAAiB,EAAE,CAAC,+BAA+B,CAAC;CACrD,CAAC"}
+{"version":3,"file":"code-style.js","sourceRoot":"","sources":["../../../schematics/utils/code-style.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG,aAAa,CAAC;AAE5B,QAAA,kBAAkB,GAAG;IAChC,sBAAsB,EAAE,CAAC,cAAc,CAAC;IACxC,iBAAiB,EAAE,CAAC,mCAAmC,CAAC;CACzD,CAAC"}

package/utils/code-style.ts

@@ -2,5 +2,5 @@ export const LINT_STAGED = 'lint-staged';
 
 export const LINT_STAGED_CONFIG = {
   '(src)/**/*.{html,ts}': ['eslint --fix'],
-  '(src)/**/*.less': ['stylelint --syntax less --fix']
+  '(src)/**/*.less': ['npx stylelint --syntax less --fix']
 };

package/utils/lib-versions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZORROVERSION = exports.VERSION = void 0;
-exports.VERSION = '^13.0.0';
-exports.ZORROVERSION = '^13.0.0';
+exports.VERSION = '^13.2.1';
+exports.ZORROVERSION = '^13.1.1';
 //# sourceMappingURL=lib-versions.js.map

package/utils/lib-versions.ts

@@ -1,2 +1,2 @@
-export const VERSION = '^13.0.0';
-export const ZORROVERSION = '^13.0.0';
+export const VERSION = '^13.2.1';
+export const ZORROVERSION = '^13.1.1';

package/utils/versions.js

@@ -43,7 +43,7 @@ function UpgradeMainVersions(tree, version = lib_versions_1.VERSION) {
         `@delon/testing@${version}`
     ], 'devDependencies');
     (0, package_1.addPackage)(tree, [
-        `ng-zorro-antd@^13.0.0`,
+        `ng-zorro-antd@^13.1.1`,
         'ajv@^8.8.2',
         'ajv-formats@^2.1.1'
     ]);

package/utils/versions.ts

@@ -41,7 +41,7 @@ export function UpgradeMainVersions(tree: Tree, version: string = VERSION): void
     'devDependencies'
   );
   addPackage(tree, [
-    `ng-zorro-antd@^13.0.0`,
+    `ng-zorro-antd@^13.1.1`,
     'ajv@^8.8.2',
     'ajv-formats@^2.1.1'
   ]);

package/view/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.service.ts.template

@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+import { _HttpClient } from '@delon/theme';
+
+@Injectable(<% if(service === 'root') { %>{ providedIn: 'root' }<% } %>)
+export class <%= serviceName %> {
+
+  constructor(private http: _HttpClient) { }
+
+}

package/view/schema.json

@@ -44,7 +44,6 @@
       "description": "Include template inline in the component.ts file. By default, an external template file is created and referenced in the component.ts file.",
       "type": "boolean",
       "default": false,
-      "alias": "t",
       "x-user-analytics": 10
     },
     "viewEncapsulation": {
@@ -141,6 +140,22 @@
       "default": true,
       "description": "指定是否使用模态框 (Specifies using modal mode)",
       "x-prompt": "Would you like to modal mode?"
+    },
+    "service": {
+      "type": "string",
+      "description": "The service file to use in the new component.",
+      "default": "ignore",
+      "enum": ["ignore", "none", "root"],
+      "x-prompt": {
+        "message": "Which service injectors would you like to use?",
+        "type": "list",
+        "items": [
+          { "value": "ignore", "label": "Ignore generation of Service files" },
+          { "value": "root", "label": "Use \"@Injectable({ providedIn: 'root' })\"" },
+          { "value": "none", "label": "Use \"@Injectable()\" (Should be automatically register to the nearest module)" }
+        ]
+      },
+      "x-user-analytics": 20
     }
   },
   "required": ["name", "module"]

package/view/schema.ts

@@ -13,4 +13,5 @@ export interface Schema extends ComponentSchema {
    * 指定是否使用模态框 (Specifies using modal mode)
    */
   modal?: boolean;
+  service?: 'ignore' | 'none' | 'root';
 }