Add prompt to request generation destination

Add Prompt for generation destination folder

Author: sha4be

libs/schematic/generators/ng-generate/components/shared/generators/components/index.ts

@@ -13,4 +13,3 @@
 
 export * from './chip-list/index';
 export * from './command-bar/index';
-export * from '../../../table/generators/components/export-dialog/index';

libs/schematic/generators/ng-generate/components/shared/generators/constants/semantic-explanation/index.ts

@@ -17,7 +17,7 @@ import {Values} from '../../../schema';
 import {getTableColumValues} from '../../../utils';
 
 export function generateSemanticExplanation(options: Values): Rule {
-  return (tree: Tree, _context: SchematicContext) => {
+  return (_tree: Tree, _context: SchematicContext) => {
     return mergeWith(
       apply(url('../shared/generators/constants/semantic-explanation/files'), [
         applyTemplates({
@@ -29,7 +29,7 @@ export function generateSemanticExplanation(options: Values): Rule {
           },
           name: options.name,
         }),
-        move('src/app/shared/constants'),
+        move(options.path),
       ]),
       options.overwrite ? MergeStrategy.Overwrite : MergeStrategy.Error
     );

libs/schematic/generators/ng-generate/components/shared/index.ts

@@ -118,11 +118,6 @@ export function prepareOptions(schema: Schema, componentType: ComponentType): Sc
     options.jsonAccessPath = `${options.jsonAccessPath}.`;
   }
 
-  options.path = options.path || 'src/app/shared/components';
-
-  console.log(options);
-  // throw new Error('Stop execution to check prepared options.');
-
   return options;
 }
 
@@ -243,7 +238,7 @@ export function generateGeneralFilesRules(): Array<Rule> {
   return [
     generateFilterService(options),
     generateGeneralStyle(options),
-    generateTranslationFiles(options),
+    generateTranslationFiles(options, false),
     wrapBuildComponentExecution(options),
     generateGeneralService(options),
     generateCustomService(options),

libs/schematic/generators/ng-generate/components/table/generators/services/storage/index.ts

@@ -24,7 +24,7 @@ export function generateStorageService(options: any): Rule {
           options: options,
           name: 'storage',
         }),
-        move('src/app/shared/services'),
+        move(options.path),
       ]),
       options.overwrite ? MergeStrategy.Overwrite : MergeStrategy.Error
     );

libs/schematic/generators/ng-generate/components/table/index.ts

@@ -34,6 +34,7 @@ import {generateConfigMenu} from './generators/components/config-menu/index';
 import {generateTableComponent} from './generators/components/table/index';
 import {generateDataSource} from './generators/data-source/index';
 import {TableSchema} from './schema';
+import {LOG_COLOR} from '../../../utils/constants';
 
 export default function (tableSchema: TableSchema): Rule {
   return (tree: Tree, context: SchematicContext) => {
@@ -42,6 +43,8 @@ export default function (tableSchema: TableSchema): Rule {
 }
 
 export function generateTable(tableSchema: TableSchema): Rule {
+  console.log(LOG_COLOR, 'Start generating Table component...');
+
   prepareOptions(tableSchema, ComponentType.TABLE);
 
   return chain([

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

@@ -21,13 +21,20 @@ import {ComponentType, Schema} from '../components/shared/schema';
 
 import {loader, reorderAspectModelUrnToLoad, writeConfigAndExit} from './utils';
 import {virtualFs} from '@angular-devkit/core';
-import {anotherFile, configFileName, createOrImport, importConfigFile} from './prompts-questions/shared/prompt-simple-questions';
+import {
+  anotherFile,
+  configFileName,
+  createOrImport,
+  importConfigFile,
+  requestPath,
+} from './prompts-questions/shared/prompt-simple-questions';
 import {tablePrompterQuestions} from './prompts-questions/table/prompt-questions';
 import {pathDecision, requestAspectModelWithAspect} from './prompts-questions/shared/prompt-complex-questions';
 import {formPrompterQuestions} from './prompts-questions/form/prompt-questions';
 import {cardPrompterQuestions} from './prompts-questions/card/prompt-questions';
 import {typesPrompterQuestions} from './prompts-questions/types/prompt-questions';
 import {loadInquirer} from '../../utils/angular';
+import {LOG_COLOR} from '../../utils/constants';
 
 // Function to dynamically load inquirer-fuzzy-path and register the prompt
 async function registerFuzzyPathPrompt(): Promise<any> {
@@ -69,13 +76,16 @@ export let aspect: Aspect;
  * @throws {Error} - Will throw an error if an error occurs during execution.
  */
 export async function generate(subscriber: Subscriber<Tree>, tree: Tree, options: Schema, type: string) {
-  console.log('\x1b[33m%s\x1b[0m', 'Welcome to the TTL schematic UI generator, answer some questions to get you started:');
+  console.log(LOG_COLOR, 'Welcome to the TTL schematic UI generator, answer some questions to get you started:');
 
   inquirer = await registerFuzzyPathPrompt();
   generationType = type as ComponentType;
   initAnswers();
 
   runPrompts(subscriber, tree, new TemplateHelper(), options).finally(() => {
+    // "path" is the default options property for schematics to determine where to generate files
+    allAnswers.path = allAnswers.pathToSource;
+
     cleanUpOptionsObject(allAnswers);
     Object.assign(options, allAnswers);
 
@@ -180,7 +190,7 @@ async function runPrompts(subscriber: Subscriber<Tree>, tree: Tree, templateHelp
  * @returns {Promise<Object>} A promise that resolves to the answers from the user.
  */
 async function getConfigurationFileConfig(subscriber: Subscriber<Tree>, tree: Tree) {
-  const answerGeneralConfig = await inquirer.prompt([createOrImport, configFileName, importConfigFile, pathDecision(WIZARD_CONFIG_FILE)]);
+  const answerGeneralConfig = await inquirer.prompt([createOrImport, requestPath, configFileName, importConfigFile, pathDecision(WIZARD_CONFIG_FILE)]);
 
   if (answerGeneralConfig.importConfigFile) {
     importFileConfig(answerGeneralConfig.importConfigFile, subscriber, tree);
@@ -323,7 +333,8 @@ function cleanUpOptionsObject(allAnswers: any) {
       objectKey.startsWith('paths') ||
       objectKey.startsWith('anotherFile') ||
       objectKey.startsWith('createOrImport') ||
-      objectKey.startsWith('importConfigFile')
+      objectKey.startsWith('importConfigFile') ||
+      objectKey.startsWith('pathToSource')
     ) {
       delete allAnswers[objectKey];
     }

libs/schematic/generators/ng-generate/prompter/prompts-questions/shared/prompt-complex-questions.ts

@@ -204,7 +204,7 @@ export const requestAspectModelWithAspect = (allAnswers: any) => ({
   default: '',
 });
 
-export const pathDecision: any = (configFile: string, anotherFile: boolean = false) => ({
+export const pathDecision: any = (configFile: string, anotherFile = false) => ({
   type: 'fuzzypath',
   name: 'paths',
   excludeFilter: (nodePath: string) => !nodePath.endsWith('.ttl'),

libs/schematic/generators/ng-generate/prompter/prompts-questions/shared/prompt-simple-questions.ts

@@ -103,3 +103,13 @@ export const requestSetViewEncapsulation = {
   choices: [ViewEncapsulation.None, ViewEncapsulation.Emulated, ViewEncapsulation.ShadowDom],
   default: ViewEncapsulation.None,
 };
+
+export const requestPath = {
+  type: 'input',
+  name: 'pathToSource',
+  message: `Input the path to the source files where the component files should be generated (e.g., src/app/components):`,
+  filter: (input: string) => input.trim(),
+  default: 'src/app/shared',
+  when: answer => answer['createOrImport'],
+};
+

libs/schematic/generators/ng-generate/prompter/prompts-questions/table/prompt-questions.ts

@@ -64,7 +64,7 @@ export async function tablePrompterQuestions(
   combineAnswers: (...answers: any[]) => any,
   allAnswers: any
 ): Promise<void> {
-  const defaultConfiguration: ConfigurationDefaultsSchema = new TableDefaultsSchema();
+  const defaultConfiguration: ConfigurationDefaultsSchema = {};
 
   combineAnswers(
     answerConfigurationFileConfig,

libs/schematic/generators/ng-generate/prompter/utils.ts

@@ -17,6 +17,7 @@ import {Subscriber} from 'rxjs';
 import * as fs from 'fs';
 import * as util from 'util';
 import {WIZARD_CONFIG_FILE} from './index';
+import {LOG_COLOR} from '../../utils/constants';
 
 interface PropertyDetail {
   name: string;
@@ -81,12 +82,13 @@ export function handleComplexPropList(property: Property, complexPropList: Array
  * @param {any} config - The configuration to write to the file.
  * @param {boolean} [fromImport=false] - A flag to indicate if the operation is from an import.
  */
+// TODO add config file name as parameter
 export async function writeConfigAndExit(subscriber: Subscriber<Tree>, tree: Tree, config: any, fromImport = false) {
   const writeFileAsync = util.promisify(fs.writeFile);
   await writeFileAsync(WIZARD_CONFIG_FILE, JSON.stringify(config), 'utf8');
 
   console.log(
-    '\x1b[33m%s\x1b[0m',
+    LOG_COLOR,
     fromImport
       ? `The import was successful, the config used for your generation can be found here: ${WIZARD_CONFIG_FILE}`
       : `New config file was generated based on your choices, it can be found here: ${WIZARD_CONFIG_FILE}`