making v2 ready

Author: manfredsteyer

libs/ddd/collection.json

@@ -29,6 +29,11 @@
       "schema": "./src/generators/ui/schema.json",
       "description": "adds a UI library to a domain or as a shared library"
     },
+    "api": {
+      "factory": "./src/generators/api/index",
+      "schema": "./src/generators/api/schema.json",
+      "description": "adds a API library to a domain or as a shared library"
+    },    
     "util": {
       "factory": "./src/generators/util/index",
       "schema": "./src/generators/util/schema.json",

libs/ddd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/ddd",
-  "version": "2.0.0-rc.1",
+  "version": "2.0.0",
   "license": "MIT",
   "author": "Manfred Steyer",
   "description": "Nx plugin for structuring a monorepo with domains and layers",

libs/ddd/src/generators/api/index.ts

@@ -0,0 +1,33 @@
+import { Tree, formatFiles } from '@nrwl/devkit';
+import { libraryGenerator } from '@nrwl/angular/generators';
+import { ApiOptions } from './schema';
+import { strings } from '@angular-devkit/core';
+import { validateInputs } from '../utils/validate-inputs';
+
+export default async function (tree: Tree, options: ApiOptions) {
+  validateInputs(options);
+
+  const libName = options.name ? 
+    `api-${strings.dasherize(options.name)}`
+    : 'api';
+
+  const domain = options.shared ? 'shared' : options.domain;
+  const libDirectory = options.directory
+    ? `${domain}/${options.directory}`
+    : domain;
+  const isPublishableLib = options.type === 'publishable';
+  
+  await libraryGenerator(tree, {
+    name: libName,
+    tags: `domain:${domain},domain:${domain}/${libName},type:api`,
+    prefix: options.name,
+    publishable: isPublishableLib,
+    buildable: options.type === 'buildable',
+    directory: libDirectory,
+    importPath: options.importPath
+  });
+
+  console.info(`\nHINT: Don\'t forget to extend the rules in your .eslintrc to allow selected domains to access this API.\nFor this, add the tag domain:${domain}/${libName} to the respective domains' rule sets.\n `);
+
+  await formatFiles(tree);
+}

libs/ddd/src/generators/api/schema.json

@@ -0,0 +1,39 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "cli": "nx",
+  "$id": "api",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "Name of the API library",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      }
+    },
+    "shared": {
+      "type": "boolean",
+      "description": "Whether the library should be shared across all domains.",
+      "default": false
+    },
+    "domain": {
+      "type": "string",
+      "description": "Domain name, if the library belongs to a certain domain."
+    },
+    "directory": {
+      "type": "string",
+      "description": "Subpath of the library beneath the domain or shared folder."
+    },
+    "importPath": {
+      "type": "string",
+      "description": "For publishable libs: Official package name used in import statements"
+    },     
+    "type": {
+      "type": "string",
+      "enum": ["internal", "buildable", "publishable"],
+      "description": "A type to determine if and how to build the library.",
+      "default": "buildable"
+    }
+  }
+}

libs/ddd/src/generators/api/schema.ts

@@ -0,0 +1,34 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by json-schema-to-typescript.
+ * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+ * and run json-schema-to-typescript to regenerate this file.
+ */
+
+export interface ApiOptions {
+  /**
+   * Name of the UI library
+   */
+  name: string;
+  /**
+   * Whether the library should be shared across all domains.
+   */
+  shared?: boolean;
+  /**
+   * Domain name, if the library belongs to a certain domain.
+   */
+  domain?: string;
+  /**
+   * Subpath of the library beneath the domain or shared folder.
+   */
+  directory?: string;
+  /**
+   * For publishable libs: Official package name used in import statements
+   */
+  importPath?: string;
+  /**
+   * A type to determine if and how to build the library.
+   */
+  type?: "internal" | "buildable" | "publishable";
+  [k: string]: any;
+}

libs/ddd/src/generators/domain/index.ts

@@ -10,7 +10,7 @@ import * as ts from 'typescript';
 import { NGRX_VERSION } from '../utils/ngrx-version';
 
 export default async function (tree: Tree, options: DomainOptions) {
-  
+
   const appName = strings.dasherize(options.name);
   const appNameAndDirectory = options.appDirectory
     ? `${options.appDirectory}/${appName}`
@@ -34,11 +34,11 @@ export default async function (tree: Tree, options: DomainOptions) {
   const libFolderPath = `libs/${libNameAndDirectory}`;
   const libLibFolder = `${libFolderPath}/domain/src/lib`;
 
-  if (options.ngrx && !options.addApp) {
-    throw new Error(
-      `The 'ngrx' option may only be used when the 'addApp' option is used.`
-    );
-  }
+  // if (options.ngrx && !options.addApp) {
+  //   throw new Error(
+  //     `The 'ngrx' option may only be used when the 'addApp' option is used.`
+  //   );
+  // }
 
   await libraryGenerator(tree, {
     name: 'domain',
@@ -79,25 +79,24 @@ export default async function (tree: Tree, options: DomainOptions) {
 
   if (options.addApp && options.ngrx) {
     const generateStore = wrapAngularDevkitSchematic('@ngrx/schematics', 'store');
-    
+
     await generateStore(tree, {
       project: appNameAndDirectoryDasherized,
       root: true,
       minimal: true,
       module: 'app.module.ts',
       name: 'state',
     });
-
+  
     addNgrxImportsToApp(tree, appModuleFilepath);
     addNgrxDependencies(tree);
-
-    await formatFiles(tree);
-    return () => {
-      installPackagesTask(tree);
-    };
-  
   }
 
+  await formatFiles(tree);
+  return () => {
+    installPackagesTask(tree);
+  };
+
 }
 
 function addNgrxDependencies(tree: Tree) {

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

@@ -80,7 +80,7 @@ export default async function (tree: Tree, options: FeatureOptions) {
   const appModulePath = `apps/${appDirectoryAndName}/src/app/app.module.ts`;
 
   const requiredAppModulePath = `apps/${appDirectoryAndName}/src/app/app.module.ts`;
-  if (!tree.exists(requiredAppModulePath)) {
+  if (!options.noApp && !tree.exists(requiredAppModulePath)) {
     throw new Error(
       `Specified app ${options.app} does not exist: ${requiredAppModulePath} expected!`
     );
@@ -112,7 +112,7 @@ export default async function (tree: Tree, options: FeatureOptions) {
     importPath: domainImportPath
   });
 
-  if (!options.lazy && tree.exists(appModulePath)) {
+  if (!options.noApp && !options.lazy && tree.exists(appModulePath)) {
     addImportToNgModule(tree, {
       filePath: appModulePath,
       importClassName: featureModuleClassName,

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

@@ -62,6 +62,11 @@
       "type": "boolean",
       "default": false,
       "description": "Add ngrx for the domain (entity required)"
+    },
+    "noApp": {
+      "type": "boolean",
+      "default": false,
+      "description": "Don't connect the feature lib to an app"
     }
   },
   "required": ["name", "domain"]

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

@@ -26,6 +26,10 @@ export interface FeatureOptions {
    * Domain name
    */
   domainDirectory?: string;
+  /**
+   * Don't connect this feature lib to an app
+   */
+  noApp?: boolean;
   /**
    * app name
    */