srleecode · srleecode · Jan 6, 2024 · Jan 6, 2024
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@srleecode/domain",
-  "version": "17.2.8",
+  "version": "17.2.9",
   "private": true,
   "description": "Nrwl nx plugin to allow operations at the domain level",
   "homepage": "https://github.com/srleecode/domain",

diff --git a/packages/domain/generators/cypress/domain-test/src/generator.ts b/packages/domain/generators/cypress/domain-test/src/generator.ts
@@ -12,6 +12,7 @@ import { SetupDomainTestGeneratorSchema } from './schema';
 // eslint-disable-next-line @nx/enforce-module-boundaries
 import {
   getDasherizedFolderPath,
+  getProcessedGroupingFolder,
   validateGroupingFolder,
 } from '../../../shared/utils';
 import { getTags } from './lib/get-domain-test-eslint-tags';
@@ -24,10 +25,8 @@ export async function setupDomainTestGenerator(
 ): Promise<void> {
   let { groupingFolder } = options;
   const { type } = options;
-  groupingFolder = groupingFolder.endsWith('/')
-    ? groupingFolder.slice(0, -1)
-    : groupingFolder;
   validateGroupingFolder(tree, groupingFolder);
+  groupingFolder = getProcessedGroupingFolder(groupingFolder);
   const dasherisedFolderPath = getDasherizedFolderPath(tree, groupingFolder);
   const projectName = `${type}-${dasherisedFolderPath}`;
   const directory = `${groupingFolder}/.${type}`;

diff --git a/packages/domain/generators/front-end/angular/application-layer/src/generator.spec.ts b/packages/domain/generators/front-end/angular/application-layer/src/generator.spec.ts
@@ -9,10 +9,10 @@ import { ApplicationType, getGroupingFolders } from '../../../../shared/utils';
 import { createDummyGroupingFolder } from '../../../../shared/test-utils';
 import { CreateApplicationLayerGeneratorSchema } from './schema';
 
-describe('createDomainLayerGenerator', () => {
+describe('createApplicationLayerGenerator', () => {
   let tree: Tree;
   const schema: CreateApplicationLayerGeneratorSchema = {
-    groupingFolder: 'libs/test-app/test-domain',
+    groupingFolder: 'libs/test-app/test-domain/',
     buildable: true,
     strict: false,
     enableIvy: true,
@@ -32,11 +32,11 @@ describe('createDomainLayerGenerator', () => {
       expect.anything(),
       '',
       'application',
-      schema.groupingFolder,
+      'libs/test-app/test-domain',
       groupingFolders.app,
       ApplicationType.Angular,
       true,
-      schema
+      schema,
     );
   });
   it('should add jest junit reporter config when addJestJunitReporter is true', async () => {

diff --git a/packages/domain/generators/front-end/angular/application-layer/src/generator.ts b/packages/domain/generators/front-end/angular/application-layer/src/generator.ts
@@ -6,14 +6,16 @@ import { addDomainLibrary } from '../../../shared';
 import {
   ApplicationType,
   getGroupingFolders,
+  getProcessedGroupingFolder,
   validateGroupingFolder,
 } from '../../../../shared/utils';
 
 export async function createApplicationLayerGenerator(
   tree: Tree,
-  options: CreateApplicationLayerGeneratorSchema
+  options: CreateApplicationLayerGeneratorSchema,
 ): Promise<void> {
-  const { groupingFolder } = options;
+  let { groupingFolder } = options;
+  groupingFolder = getProcessedGroupingFolder(groupingFolder);
   validateGroupingFolder(tree, groupingFolder);
   const groupingFolders = getGroupingFolders(tree, groupingFolder);
   await addDomainLibrary(
@@ -24,13 +26,13 @@ export async function createApplicationLayerGenerator(
     groupingFolders.app,
     ApplicationType.Angular,
     true,
-    options
+    options,
   );
   await formatFiles(tree);
 }
 
 export default createApplicationLayerGenerator;
 
 export const createApplicationLayerSchematic = convertNxGenerator(
-  createApplicationLayerGenerator
+  createApplicationLayerGenerator,
 );
diff --git a/packages/domain/generators/front-end/angular/component/src/default-options.constant.ts b/packages/domain/generators/front-end/angular/component/src/default-options.constant.ts
@@ -6,7 +6,7 @@ import { CreateComponentGeneratorSchema } from './schema';
 import { StyleType } from './model/style-type.enum';
 
 export const defaultOptions: CreateComponentGeneratorSchema = {
-  groupingFolder: 'libs/test-app/test-domain',
+  groupingFolder: 'libs/test-app/test-domain/',
   type: ComponentType.Feature,
   name: 'TestExample',
   viewEncapsulation: ViewEncapsulation.Emulated,

diff --git a/packages/domain/generators/front-end/angular/component/src/generator.ts b/packages/domain/generators/front-end/angular/component/src/generator.ts
@@ -4,23 +4,27 @@ import { addComponentFiles } from './lib/add-component-files/add-component-files
 // eslint-disable-next-line @nx/enforce-module-boundaries
 import createPresentationLayerGenerator from '../../presentation-layer/src/generator';
 // eslint-disable-next-line @nx/enforce-module-boundaries
-import { validateGroupingFolder } from '../../../../shared/utils';
+import {
+  getProcessedGroupingFolder,
+  validateGroupingFolder,
+} from '../../../../shared/utils';
 
 export async function createComponentGenerator(
   tree: Tree,
-  options: CreateComponentGeneratorSchema
+  options: CreateComponentGeneratorSchema,
 ): Promise<void> {
-  const { groupingFolder } = options;
+  let { groupingFolder } = options;
+  groupingFolder = getProcessedGroupingFolder(groupingFolder);
   validateGroupingFolder(tree, groupingFolder);
   if (tree.children(`${groupingFolder}/presentation`).length === 0) {
     await createPresentationLayerGenerator(tree, options);
   }
-  addComponentFiles(tree, options);
+  addComponentFiles(tree, options, groupingFolder);
   await formatFiles(tree);
 }
 
 export default createComponentGenerator;
 
 export const createComponentSchematic = convertNxGenerator(
-  createComponentGenerator
+  createComponentGenerator,
 );
diff --git a/...generators/front-end/angular/component/src/lib/add-component-files/add-component-files.ts b/...generators/front-end/angular/component/src/lib/add-component-files/add-component-files.ts
@@ -26,12 +26,13 @@ import { classify, dasherize } from '@angular-devkit/core/src/utils/strings';
 
 export const addComponentFiles = (
   tree: Tree,
-  options: CreateComponentGeneratorSchema
+  options: CreateComponentGeneratorSchema,
+  groupingFolder: string,
 ): void => {
-  const { groupingFolder, name, type, prefix } = options;
+  const { name, type, prefix } = options;
   const dasherisedGroupingFolder = `${getDasherizedFolderPath(
     tree,
-    groupingFolder
+    groupingFolder,
   )}`;
   const dasherizedName = dasherize(name);
   const projectName = dasherize(`${dasherisedGroupingFolder}-${type}-${name}`);
@@ -42,7 +43,7 @@ export const addComponentFiles = (
   });
 
   const target = normalize(
-    `${groupingFolder}/presentation/src/lib/${type}/${dasherizedName}`
+    `${groupingFolder}/presentation/src/lib/${type}/${dasherizedName}`,
   );
   const templateOptions = {
     ...options,
@@ -72,7 +73,7 @@ export const addComponentFiles = (
     tree,
     `${groupingFolder}/presentation`,
     type,
-    dasherizedName
+    dasherizedName,
   );
 };
 
@@ -87,7 +88,7 @@ const addComponentToIndex = (
   tree: Tree,
   libraryPath: string,
   type: ComponentType,
-  dasherizedName: string
+  dasherizedName: string,
 ): void => {
   const indexPath = `${libraryPath}/src/index.ts`;
   const source = getTsSourceFile(tree, indexPath);
@@ -104,7 +105,7 @@ const addComponentToIndex = (
   ];
   const newFile = applyChangesToString(
     tree.read(indexPath).toString(),
-    changes
+    changes,
   );
   tree.write(indexPath, newFile);
 };
diff --git a/packages/domain/generators/front-end/angular/directive/src/generator.ts b/packages/domain/generators/front-end/angular/directive/src/generator.ts
@@ -4,13 +4,17 @@ import { addDirectiveFiles } from './lib/add-directive-files/add-directive-files
 // eslint-disable-next-line @nx/enforce-module-boundaries
 import createPresentationLayerGenerator from '../../presentation-layer/src/generator';
 // eslint-disable-next-line @nx/enforce-module-boundaries
-import { validateGroupingFolder } from '../../../../shared/utils';
+import {
+  getProcessedGroupingFolder,
+  validateGroupingFolder,
+} from '../../../../shared/utils';
 
 export async function createDirectiveGenerator(
   tree: Tree,
-  options: CreateDirectiveGeneratorSchema
+  options: CreateDirectiveGeneratorSchema,
 ): Promise<void> {
-  const { groupingFolder } = options;
+  let { groupingFolder } = options;
+  groupingFolder = getProcessedGroupingFolder(groupingFolder);
   validateGroupingFolder(tree, groupingFolder);
   if (tree.children(`${groupingFolder}/presentation`).length === 0) {
     await createPresentationLayerGenerator(tree, options);
@@ -22,5 +26,5 @@ export async function createDirectiveGenerator(
 export default createDirectiveGenerator;
 
 export const createDirectiveSchematic = convertNxGenerator(
-  createDirectiveGenerator
+  createDirectiveGenerator,
 );
diff --git a/...generators/front-end/angular/directive/src/lib/add-directive-files/add-directive-files.ts b/...generators/front-end/angular/directive/src/lib/add-directive-files/add-directive-files.ts
@@ -17,23 +17,23 @@ import {
 
 export const addDirectiveFiles = (
   tree: Tree,
-  options: CreateDirectiveGeneratorSchema
+  options: CreateDirectiveGeneratorSchema,
 ): void => {
   const { groupingFolder, name, prefix } = options;
   const dasherisedGroupingFolder = `${getDasherizedFolderPath(
     tree,
-    groupingFolder
+    groupingFolder,
   )}`;
   const libraryName = getLibraryName({
     name,
     type: 'directive',
   });
   const libraryPath = `${groupingFolder}/${libraryName}`;
   const target = normalize(
-    `${groupingFolder}/presentation/src/lib/directive/${dasherize(name)}`
+    `${groupingFolder}/presentation/src/lib/directive/${dasherize(name)}`,
   );
   const projectName = dasherize(
-    `${dasherisedGroupingFolder}-directive-${name}`
+    `${dasherisedGroupingFolder}-directive-${name}`,
   );
   const selector = prefix
     ? `${prefix}${classify(name)}`

diff --git a/packages/domain/generators/front-end/angular/domain-layer/src/generator.spec.ts b/packages/domain/generators/front-end/angular/domain-layer/src/generator.spec.ts
@@ -40,7 +40,7 @@ describe('createDomainLayerGenerator', () => {
       expect.anything(),
       '',
       'domain',
-      schema.groupingFolder,
+      'libs/test-app/test-domain',
       groupingFolders.app,
       ApplicationType.Angular,
       true,

diff --git a/packages/domain/generators/front-end/angular/domain-layer/src/generator.ts b/packages/domain/generators/front-end/angular/domain-layer/src/generator.ts
@@ -6,14 +6,16 @@ import { addDomainLibrary } from '../../../shared';
 import {
   ApplicationType,
   getGroupingFolders,
+  getProcessedGroupingFolder,
   validateGroupingFolder,
 } from '../../../../shared/utils';
 
 export async function createDomainLayerGenerator(
   tree: Tree,
-  options: CreateDomainLayerGeneratorSchema
+  options: CreateDomainLayerGeneratorSchema,
 ): Promise<void> {
-  const { groupingFolder } = options;
+  let { groupingFolder } = options;
+  groupingFolder = getProcessedGroupingFolder(groupingFolder);
   validateGroupingFolder(tree, groupingFolder);
   const libraryName = 'domain';
   const groupingFolders = getGroupingFolders(tree, groupingFolder);
@@ -25,13 +27,13 @@ export async function createDomainLayerGenerator(
     groupingFolders.app,
     ApplicationType.Angular,
     true,
-    options
+    options,
   );
   await formatFiles(tree);
 }
 
 export default createDomainLayerGenerator;
 
 export const createDomainLayerSchematic = convertNxGenerator(
-  createDomainLayerGenerator
+  createDomainLayerGenerator,
 );
diff --git a/packages/domain/generators/front-end/angular/infrastructure-layer/src/generator.ts b/packages/domain/generators/front-end/angular/infrastructure-layer/src/generator.ts
@@ -6,14 +6,16 @@ import { addDomainLibrary } from '../../../shared';
 import {
   ApplicationType,
   getGroupingFolders,
+  getProcessedGroupingFolder,
   validateGroupingFolder,
 } from '../../../../shared/utils';
 
 export async function createInfrastructureLayerGenerator(
   tree: Tree,
-  options: CreateInfrastructureLayerGeneratorSchema
+  options: CreateInfrastructureLayerGeneratorSchema,
 ): Promise<void> {
-  const { groupingFolder } = options;
+  let { groupingFolder } = options;
+  groupingFolder = getProcessedGroupingFolder(groupingFolder);
   validateGroupingFolder(tree, groupingFolder);
   const groupingFolders = getGroupingFolders(tree, groupingFolder);
   await addDomainLibrary(
@@ -24,13 +26,13 @@ export async function createInfrastructureLayerGenerator(
     groupingFolders.app,
     ApplicationType.Angular,
     true,
-    options
+    options,
   );
   await formatFiles(tree);
 }
 
 export default createInfrastructureLayerGenerator;
 
 export const createInfrastructureLayeSchematic = convertNxGenerator(
-  createInfrastructureLayerGenerator
+  createInfrastructureLayerGenerator,
 );