feat: update for nx 17

Author: manfredsteyer

libs/ddd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/ddd",
-  "version": "3.1.1",
+  "version": "17.0.3",
   "license": "MIT",
   "author": "Manfred Steyer",
   "description": "Nx plugin for structuring a monorepo with domains and layers",
@@ -12,7 +12,7 @@
     "@ngrx/schematics": "^16.0.0"
   },
   "peerDependencies": {
-    "@nx/angular": ">=16.0.0"
+    "@nx/angular": "^17.0.0"
   },
   "main": "src/index.js",
   "schematics": "./collection.json",

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

@@ -3,6 +3,7 @@ import { libraryGenerator } from '@nx/angular/generators';
 import { ApiOptions } from './schema';
 import { strings } from '@angular-devkit/core';
 import { validateInputs } from '../utils/validate-inputs';
+import { deleteDefaultComponent } from '../utils/delete-default-component';
 
 export default async function (tree: Tree, options: ApiOptions) {
   validateInputs(options);
@@ -28,6 +29,13 @@ export default async function (tree: Tree, options: ApiOptions) {
     standalone: options.standalone,
   });
 
+  deleteDefaultComponent(
+    tree,
+    libDirectory,
+    libName,
+    options.name
+  );
+
   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 `
   );

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

@@ -1,14 +1,16 @@
 import {
   Tree,
   formatFiles,
-  readWorkspaceConfiguration,
   installPackagesTask,
   generateFiles,
   joinPathFragments,
-  readProjectConfiguration,
   addDependenciesToPackageJson,
   names,
+  readNxJson,
 } from '@nx/devkit';
+
+import { readPackageJson } from '@nx/workspace'
+
 import { libraryGenerator, applicationGenerator } from '@nx/angular/generators';
 import { strings } from '@angular-devkit/core';
 import { DomainOptions } from './schema';
@@ -18,6 +20,8 @@ import { insertImport } from '@nx/js';
 import { insertNgModuleImport } from '@nx/angular/src/generators/utils';
 import * as ts from 'typescript';
 import { NGRX_VERSION } from '../utils/ngrx-version';
+import { getNpmScope } from '../utils/npm';
+import { deleteDefaultComponent } from '../utils/delete-default-component';
 
 function convertToStandaloneApp(
   tree: Tree,
@@ -120,13 +124,16 @@ export default async function (tree: Tree, options: DomainOptions) {
     });
   }
 
-  const wsConfig = readWorkspaceConfiguration(tree);
+  const wsConfig = readNxJson(tree);
+  const npmScope = getNpmScope(tree);
+  // const wsConfig = readWorkspaceConfiguration(tree);
+  
   if (options.addApp && options.standalone) {
     convertToStandaloneApp(tree, {
       name: options.name,
       ngrx: options.ngrx || false,
       srcRoot: appSrcFolder,
-      npmScope: wsConfig.npmScope,
+      npmScope: npmScope,
     });
   }
 
@@ -164,6 +171,13 @@ export default async function (tree: Tree, options: DomainOptions) {
     );
   }
 
+  deleteDefaultComponent(
+    tree,
+    libNameAndDirectory,
+    'domain',
+    libName
+  );
+  
   await formatFiles(tree);
   return () => {
     installPackagesTask(tree);

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

@@ -18,6 +18,7 @@ import {
 import { addNgrxImportsToDomain } from '../utils/add-ngrx-imports-to-domain';
 import { fileContains } from '../utils/fileContains';
 import { getWorkspaceScope } from '../utils/get-workspace-scope';
+import { deleteDefaultComponent } from '../utils/delete-default-component';
 
 export default async function (tree: Tree, options: FeatureOptions) {
   options.app ??= options.domain;
@@ -101,11 +102,13 @@ export default async function (tree: Tree, options: FeatureOptions) {
     );
   }
 
+  const dir = featureDirectory
+    ? `${domainNameAndDirectory}/${featureDirectory}`
+    : `${domainNameAndDirectory}`;
+
   await libraryGenerator(tree, {
     name: featureFolderName,
-    directory: featureDirectory
-      ? `${domainNameAndDirectory}/${featureDirectory}`
-      : `${domainNameAndDirectory}`,
+    directory: dir,
     tags: `domain:${domainName},type:feature`,
     prefix: domainNameAndDirectoryDasherized,
     publishable: options.type === 'publishable',
@@ -171,6 +174,13 @@ export default async function (tree: Tree, options: FeatureOptions) {
     });
   }
 
+  deleteDefaultComponent(
+    tree,
+    dir,
+    featureFolderName,
+    domainNameAndDirectoryDasherized
+  );
+
   await formatFiles(tree);
   return () => {
     installPackagesTask(tree);

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

@@ -3,6 +3,7 @@ import { libraryGenerator } from '@nx/angular/generators';
 import { UiOptions } from './schema';
 import { strings } from '@angular-devkit/core';
 import { validateInputs } from '../utils/validate-inputs';
+import { deleteDefaultComponent } from '../utils/delete-default-component';
 
 export default async function (tree: Tree, options: UiOptions) {
   validateInputs(options);
@@ -24,5 +25,13 @@ export default async function (tree: Tree, options: UiOptions) {
     importPath: options.importPath,
     standalone: options.standalone,
   });
+
+  deleteDefaultComponent(
+    tree,
+    libDirectory,
+    libName,
+    options.name
+  );
+
   await formatFiles(tree);
 }

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

@@ -3,6 +3,7 @@ import { libraryGenerator } from '@nx/angular/generators';
 import { UtilOptions } from './schema';
 import { strings } from '@angular-devkit/core';
 import { validateInputs } from '../utils/validate-inputs';
+import { deleteDefaultComponent } from '../utils/delete-default-component';
 
 export default async function (tree: Tree, options: UtilOptions) {
   validateInputs(options);
@@ -25,5 +26,12 @@ export default async function (tree: Tree, options: UtilOptions) {
     standalone: options.standalone,
   });
 
+  deleteDefaultComponent(
+    tree,
+    libDirectory,
+    libName,
+    options.name
+  );
+
   await formatFiles(tree);
 }

libs/ddd/src/generators/utils/add-ngrx-imports-to-domain.ts

@@ -1,7 +1,7 @@
 import { insertNgModuleProperty } from '@nx/angular/src/generators/utils';
 import { Tree } from '@nx/devkit';
-import { classify, dasherize } from '@nx/workspace/src/utils/strings';
-import { addImportToNgModule, addImportToTsModule } from './addToNgModule';
+import { classify, dasherize } from '@nx/devkit/src/utils/string-utils';
+import { addImportToTsModule } from './addToNgModule';
 import { fileContains } from './fileContains';
 
 /**

libs/ddd/src/generators/utils/delete-default-component.ts

@@ -0,0 +1,20 @@
+import { Tree } from '@nx/devkit';
+import { dasherize } from '@nx/devkit/src/utils/string-utils';
+import * as path from 'path';
+
+export function deleteDefaultComponent(tree: Tree, directory: string, libName: string, prefix: string): void {
+    const dirToDel = path.join('libs', directory, dasherize(libName), 'src', 'lib', dasherize(directory + '-' + libName));
+    let deleted = false;
+    if (tree.exists(dirToDel)) {
+        tree.delete(dirToDel);
+        deleted = true;
+    }
+
+    const index = path.join('libs', directory, dasherize(libName), 'src', 'index.ts');
+    if (deleted && tree.exists(index)) {
+        const contents = tree.read(index, 'utf-8');
+        const rest = contents.split('\n').slice(1);
+        tree.write(index, (rest || []).join('\n'));
+    }
+
+}

libs/ddd/src/generators/utils/get-workspace-scope.ts

@@ -1,7 +1,6 @@
-import { Tree, readWorkspaceConfiguration } from '@nx/devkit';
+import { Tree } from '@nx/devkit';
+import { getNpmScope } from './npm';
 
 export function getWorkspaceScope(tree: Tree) {
-  const wsConfig = readWorkspaceConfiguration(tree);
-  const workspaceName = `@${wsConfig.npmScope}`;
-  return workspaceName;
+  return getNpmScope(tree);
 }

libs/ddd/src/generators/utils/npm.ts

@@ -0,0 +1,11 @@
+import { Tree, readJson } from "@nx/devkit";
+
+export function getNpmScope(tree: Tree) {
+    const { name } = tree.exists('package.json')
+      ? readJson<{ name?: string }>(tree, 'package.json')
+      : { name: null };
+  
+    if (name?.startsWith('@')) {
+      return name.split('/')[0];
+    }
+  }