Generate types file to the correct directory

Author: sha4be

libs/schematic/generators/ng-generate/components/table/generators/components/table/files/__name@dasherize__.component.ts.template

@@ -46,7 +46,7 @@ import {
     <% if (options.isEnumQuickFilter) { %>
         , <%= enumProperties %>
     <% } %>
-} from '<%= options.typePath %>';
+} from './<%= dasherize(options.aspectModelTypeName) %>.types';
 import {<%= tableDataSourceName %>, EsmfPaginatorSelectConfigInjector, EsmfLocalStorageService, Config} from '@esmf/semantic-ui-schematic';
 
 <% if (options.isDateQuickFilter) { %>

libs/schematic/generators/ng-generate/types/aspect-model-type-generator-visitor.ts

@@ -33,19 +33,16 @@ import {isLangString, processType, resolveJsPropertyType} from '../components/sh
 import {
   MultiLanguageText
 } from '@esmf/aspect-model-loader/dist/instantiator/characteristic/characteristic-instantiator-util';
+import {ComponentType} from '../components/shared/schema';
 
 export function visitAspectModel(options: TypesSchema): Rule {
   return async (tree: Tree) => {
     const visitor = new AspectModelTypeGeneratorVisitor(options);
     const aspect: Aspect = options.aspectModel;
-    const aspectName = dasherize(aspect.name);
-    const aspectModelVersion = 'v' + options.aspectModelVersion.replace(/\./g, '');
 
     visitor.visit(aspect);
     const generatedTypeDefinitions = visitor.getGeneratedTypeDefinitions();
-    const pathToFile = `${options.path}/${aspectName}${
-      options.enableVersionSupport ? '/' + aspectModelVersion : ''
-    }/${aspectName}.types.ts`;
+    const pathToFile = `${buildTypesFilePath(options)}/${buildTypesFileName(options)}`;
 
     if (tree.exists(pathToFile)) {
       tree.overwrite(pathToFile, generatedTypeDefinitions);
@@ -55,6 +52,25 @@ export function visitAspectModel(options: TypesSchema): Rule {
   };
 }
 
+export function buildTypesFilePath(options: TypesSchema): string {
+  const selectedModel = dasherize(options.selectedModelElement?.name).toLowerCase();
+  const aspectModelVersion = 'v' + options.aspectModelVersion.replace(/\./g, '');
+  const folderName = options.name === ComponentType.TYPES ? selectedModel : `${selectedModel}-${options.name}`;
+
+
+  return [
+    options.path,
+    folderName,
+    options.enableVersionSupport ? aspectModelVersion : null
+  ]
+    .filter(chunk => !!chunk)
+    .join('/');
+}
+
+function buildTypesFileName(options: TypesSchema): string {
+  return `${dasherize(options.aspectModel.name)}.types.ts`;
+}
+
 export class AspectModelTypeGeneratorVisitor extends DefaultAspectModelVisitor<BaseMetaModelElement, void> {
   // Key = Name of the generated data type
   // Value = Array of lines that define the data type

libs/schematic/generators/ng-generate/types/index.ts

@@ -11,13 +11,12 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import {dasherize} from '@angular-devkit/core/src/utils/strings';
 import {chain, Rule, SchematicContext} from '@angular-devkit/schematics';
 import ora from 'ora';
 import {loadAspectModel, loadRDF} from '../../utils/aspect-model';
 import {formatGeneratedFiles, loadAndApplyConfigFile} from '../../utils/file';
 import {TemplateHelper} from '../../utils/template-helper';
-import {visitAspectModel} from './aspect-model-type-generator-visitor';
+import {buildTypesFilePath, visitAspectModel} from './aspect-model-type-generator-visitor';
 import {TypesSchema} from './schema';
 import {generateComponent} from '../components/shared/index';
 import {Tree} from '@angular-devkit/schematics/src/tree/interface';
@@ -43,9 +42,7 @@ export default function (options: TypesSchema): Rule {
       formatGeneratedFiles(
         {
           getPath(options: TypesSchema) {
-            return [options.path, dasherize(options.selectedModelElement?.name).toLowerCase(), options.versionedAccessPrefix]
-              .filter(chunk => !!chunk)
-              .join('/');
+            return buildTypesFilePath(options);
           },
         },
         options

libs/schematic/generators/utils/template-helper.ts

@@ -41,6 +41,7 @@ export class TemplateHelper {
     options.filterServiceName = `${classify(options.name)}FilterService`;
     options.hasSearchBar = this.hasSearchBar(options);
     options.hasFilters = this.hasFilters(options);
+    // The line bellow is not applied to table component
     options.typePath = this.getTypesPath(options.enableVersionSupport, options.aspectModelVersion, options.aspectModel);
     options.dateProperties = this.getDateProperties(options).filter((property: Property) => this.isDateProperty(property));
     options.dateTimeStampProperties = this.getDateProperties(options).filter((property: Property) =>