Merge pull request #6 from Adrael/master

Adding interactive mode and optional feature prefix

Author: manfredsteyer

libs/ddd/README.md

@@ -23,7 +23,7 @@ Add this plugin to an Nx workspace:
 ng add @angular-architects/ddd
 ```
 
-Add domains and features:
+Add domains and features manually:
 
 ```
 ng g @angular-architects/ddd:domain booking
@@ -33,6 +33,42 @@ ng g @angular-architects/ddd:feature cancel --domain booking --app flight-app
 ng g @angular-architects/ddd:feature manage --domain boarding --app flight-app
 ```
 
+Add domains and features interactively:
+
+```
+ng g @angular-architects/ddd:domain
+> ? What is the name of the domain? booking
+> ? Would you like to add an associated application? (y/N) No
+
+ng g @angular-architects/ddd:domain
+> ? What is the name of the domain? boarding
+> ? Would you like to add an associated application? (y/N) No
+
+ng g @angular-architects/ddd:feature
+> ? What is the name of the library? search
+> ? What is the name of the associated domain? booking
+> ? Would you like to add the "feature-" prefix? (Y/n) Yes
+> ? Is this feature lazy loaded? (y/N) No
+> [Optional] What is the associated application? (Leave blank if none) flight-app
+> [Optional] What is the name of the entity to create for this feature? (Leave blank if none) flight
+
+ng g @angular-architects/ddd:feature
+> ? What is the name of the library? cancel
+> ? What is the name of the associated domain? booking
+> ? Would you like to add the "feature-" prefix? (Y/n) Yes
+> ? Is this feature lazy loaded? (y/N) No
+> [Optional] What is the associated application? (Leave blank if none) flight-app
+> [Optional] What is the name of the entity to create for this feature? (Leave blank if none)
+
+ng g @angular-architects/ddd:feature
+> ? What is the name of the library? manage
+> ? What is the name of the associated domain? boarding
+> ? Would you like to add the "feature-" prefix? (Y/n) Yes
+> ? Is this feature lazy loaded? (y/N) No
+> [Optional] What is the associated application? (Leave blank if none) flight-app
+> [Optional] What is the name of the entity to create for this feature? (Leave blank if none)
+```
+
 This example assumes that you have an app ``flight-app`` in place.
 
 These schematics also wire up the individual libs. To see the result, create a dependency graph:
@@ -86,4 +122,4 @@ see https://github.com/angular-architects/ddd-demo
 - [Recording of session about this architecture](https://www.youtube.com/watch?v=94HFD391zkE&t=1s)
 - [Article series about DDD with Angular](https://www.softwarearchitekt.at/aktuelles/sustainable-angular-architectures-1/)
 - [Our eBook about this architecture](https://leanpub.com/enterprise-angular)
-- [Thomas Burlison's article about facades in Angular](https://medium.com/@thomasburlesonIA/push-based-architectures-with-rxjs-81b327d7c32d)
+- [Thomas Burlison's article about facades in Angular](https://medium.com/@thomasburlesonIA/push-based-architectures-with-rxjs-81b327d7c32d)

libs/ddd/src/schematics/domain/schema.json

@@ -6,6 +6,7 @@
     "name": {
       "type": "string",
       "description": "Domain name",
+      "x-prompt": "What is the name of the domain?",
       "$default": {
         "$source": "argv",
         "index": 0
@@ -14,6 +15,7 @@
     "addApp": {
       "type": "boolean",
       "description": "Add an app for the domain?",
+      "x-prompt": "Would you like to add an associated application?",
       "default": false
     },
     "type": {

libs/ddd/src/schematics/feature/index.ts

@@ -21,11 +21,11 @@ function readIntoSourceFile(host: Tree, modulePath: string): ts.SourceFile {
 }
 
 function addImport(
-  modulePath: string, 
-  ngModuleToImportPath: string, 
-  ngModuleToImportName: string, 
+  modulePath: string,
+  ngModuleToImportPath: string,
+  ngModuleToImportName: string,
   optional = false): Rule {
-  
+
     return (host: Tree) => {
 
       if (optional && !host.exists(modulePath)) {
@@ -35,9 +35,9 @@ function addImport(
       const source = readIntoSourceFile(host, modulePath);
 
       const changes = addImportToModule(
-                        source, 
-                        modulePath, 
-                        ngModuleToImportName, 
+                        source,
+                        modulePath,
+                        ngModuleToImportName,
                         ngModuleToImportPath)
 
       const declarationRecorder = host.beginUpdate(modulePath);
@@ -51,16 +51,16 @@ function addImport(
 }
 
 function addDeclaration(
-  modulePath: string, 
-  componentToImportPath: string, 
+  modulePath: string,
+  componentToImportPath: string,
   componentToImportName: string): Rule {
-  
+
     return (host: Tree) => {
 
       const source = readIntoSourceFile(host, modulePath);
 
       const changes = addDeclarationToModule(
-                        source, 
+                        source,
                         modulePath,
                         componentToImportName,
                         componentToImportPath);
@@ -76,16 +76,16 @@ function addDeclaration(
 }
 
 function addExport(
-  modulePath: string, 
-  componentToImportPath: string, 
+  modulePath: string,
+  componentToImportPath: string,
   componentToImportName: string): Rule {
-  
+
     return (host: Tree) => {
 
       const source = readIntoSourceFile(host, modulePath);
 
       const changes = addExportToModule(
-                        source, 
+                        source,
                         modulePath,
                         componentToImportName,
                         componentToImportPath);
@@ -103,7 +103,7 @@ function addExport(
 function addTsExport(filePath: string, filesToExport: string[]): Rule {
   return (host: Tree) => {
     let content = host.read(filePath) + '\n';
-    
+
     for(const file of filesToExport) {
       content += `export * from '${file}';\n`;
     }
@@ -131,24 +131,22 @@ export default function(options: FeatureOptions): Rule {
 
     const workspaceName = readWorkspaceName(host);
 
-    const domainName = strings.dasherize(options.domain);
-    const domainFolderName = domainName;
+    const domainFolderName = strings.dasherize(options.domain);
     const domainPath = `libs/${domainFolderName}/domain/src/lib`;
-    const domainModulePath = `${domainPath}/${domainFolderName}-domain.module.ts`;
     const domainModuleClassName = strings.classify(options.domain) + "DomainModule";
     const domainImportPath = `${workspaceName}/${domainFolderName}/domain`;
     const domainIndexPath = `libs/${domainFolderName}/domain/src/index.ts`;
 
     const featureName = strings.dasherize(options.name);
-    const featureFolderName = 'feature-' + featureName;
+    const featureFolderName = (options.prefix ? 'feature-' : '') + featureName;
     const featurePath = `libs/${domainFolderName}/${featureFolderName}/src/lib`;
     const featureModulePath = `${featurePath}/${domainFolderName}-${featureFolderName}.module.ts`;
     const featureModuleClassName = strings.classify(`${options.domain}-${featureFolderName}Module`);
     const featureImportPath = `${workspaceName}/${domainFolderName}/${featureFolderName}`;
     const featureIndexPath = `libs/${domainFolderName}/${featureFolderName}/src/index.ts`;
 
     const entityName = options.entity ? strings.dasherize(options.entity) : '';
-    
+
     const featureComponentImportPath = `./${featureName}.component`;
     const featureComponentClassName = strings.classify(`${featureName}Component`);
 
@@ -185,14 +183,14 @@ export default function(options: FeatureOptions): Rule {
         buildable: options.type === 'buildable',
       }),
       addImport(featureModulePath, domainImportPath, domainModuleClassName),
-      (!options.lazy && host.exists(appModulePath)) ? 
+      (!options.lazy && host.exists(appModulePath)) ?
         chain([
           addImport(appModulePath, featureImportPath, featureModuleClassName, true),
           addImport(appModulePath, '@angular/common/http', 'HttpClientModule', true)
         ]) :
         noop(),
       mergeWith(domainTemplates),
-      (options.entity) ? 
+      (options.entity) ?
         addTsExport(domainIndexPath, [
           `./lib/entities/${entityName}`,
           `./lib/infrastructure/${entityName}.data.service`

libs/ddd/src/schematics/feature/schema.json

@@ -6,26 +6,37 @@
     "name": {
       "type": "string",
       "description": "Library name",
+      "x-prompt": "What is the name of the library?",
       "$default": {
         "$source": "argv",
         "index": 0
       }
     },
     "domain": {
       "type": "string",
+      "x-prompt": "What is the name of the associated domain?",
       "description": "Domain name"
     },
-    "app": {
-      "type": "string",
-      "description": "app name"
+    "prefix": {
+      "type": "boolean",
+      "description": "Apply the \"feature-\" prefix?",
+      "x-prompt": "Would you like to add the \"feature-\" prefix?",
+      "default": true
     },
     "lazy": {
       "type": "boolean",
       "description": "Is this feature module lazy loaded?",
+      "x-prompt": "Is this feature lazy loaded?",
       "default": false
     },
+    "app": {
+      "type": "string",
+      "x-prompt": "[Optional] What is the associated application? (Leave blank if none)",
+      "description": "app name"
+    },
     "entity": {
       "type": "string",
+      "x-prompt": "[Optional] What is the name of the entity to create for this feature? (Leave blank if none)",
       "description": "Optional entity to create for this feature"
     },
     "type": {

libs/ddd/src/schematics/feature/schema.ts

@@ -15,13 +15,17 @@ export interface FeatureOptions {
    */
   domain: string;
   /**
-   * app name
+   * Apply the "feature-" prefix?
    */
-  app?: string;
+  prefix?: boolean;
   /**
    * Is this feature module lazy loaded?
    */
   lazy?: boolean;
+  /**
+   * app name
+   */
+  app?: string;
   /**
    * Optional entity to create for this feature
    */