updated files

Signed-off-by: ItsRoy69 <[email protected]>

Author: ItsRoy69

apps/generator/lib/generator.js

@@ -14,7 +14,7 @@ const { isAsyncAPIDocument } = require('@asyncapi/parser/cjs/document');
 const { configureReact, renderReact, saveRenderedReactContent } = require('./renderer/react');
 const { configureNunjucks, renderNunjucks } = require('./renderer/nunjucks');
 const { validateTemplateConfig } = require('./templateConfig/validator');
-const { loadTemplateConfig } = require('./templateConfig/loader');
+const { loadTemplateConfig, loadDefaultValues } = require('./templateConfig/loader');
 const { isGenerationConditionMet } = require('./conditionalGeneration');
 const {
   convertMapToObject,
@@ -1005,10 +1005,19 @@ class Generator {
    * Loads the template configuration.
    * @private
    */
-  loadTemplateConfig() {
-    return loadTemplateConfig.call(this);
+  async loadTemplateConfig() {
+    this.templateConfig = await loadTemplateConfig(this.templateDir);
+    await this.loadDefaultValues();
   }
 
+  /**
+   * Loads default values of parameters from template config using the external loader.
+   * @private
+   */
+  async loadDefaultValues() {
+    loadDefaultValues(this.templateConfig, this.templateParams);
+  }
+  
   /**
    * Launches all the hooks registered at a given hook point/name.
    *

apps/generator/lib/templateConfig/loader.js

@@ -1,63 +1,66 @@
 const path = require('path');
-const log = require('loglevel');
 const { readFile } = require('../utils');
+const log = require('loglevel');
 
 const CONFIG_FILENAME = 'package.json';
 
 /**
- * Loads the template configuration.
- * @private
+ * Loads template configuration from either .ageneratorrc or package.json
+ * @param {string} templateDir - Path to the template directory
+ * @returns {Promise<Object>} Template configuration object
  */
-async function loadTemplateConfig() {
-    this.templateConfig = {};
+async function loadTemplateConfig(templateDir) {
+  let templateConfig = {};
 
-    // Try to load config from .ageneratorrc
-    try {
-      const rcConfigPath = path.resolve(this.templateDir, '.ageneratorrc');
-      const yaml = await readFile(rcConfigPath, { encoding: 'utf8' });
-      const yamlConfig = require('js-yaml').load(yaml);
-      this.templateConfig = yamlConfig || {};
+  // Try to load config from .ageneratorrc
+  try {
+    const rcConfigPath = path.resolve(templateDir, '.ageneratorrc');
+    const yaml = await readFile(rcConfigPath, { encoding: 'utf8' });
+    const yamlConfig = require('js-yaml').load(yaml);
+    templateConfig = yamlConfig || {};
 
-      await this.loadDefaultValues();
-      return;
-    } catch (rcError) {
-      // console.error('Could not load .ageneratorrc file:', rcError);
-      log.debug('Could not load .ageneratorrc file:', rcError);
-      // Continue to try package.json if .ageneratorrc fails
-    }
+    log.debug('Template configuration loaded from .ageneratorrc');
+    return templateConfig;
+  } catch (rcError) {
+    log.debug('Could not load .ageneratorrc file:', rcError);
+    // Continue to try package.json if .ageneratorrc fails
+  }
 
-    // Try to load config from package.json
-    try {
-      const configPath = path.resolve(this.templateDir, CONFIG_FILENAME);
-      const json = await readFile(configPath, { encoding: 'utf8' });
-      const generatorProp = JSON.parse(json).generator;
-      this.templateConfig = generatorProp || {};
-    } catch (packageError) {
-      // console.error('Could not load generator config from package.json:', packageError);
-      log.debug('Could not load generator config from package.json:', packageError);
-    }
+  // Try to load config from package.json
+  try {
+    const configPath = path.resolve(templateDir, CONFIG_FILENAME);
+    const json = await readFile(configPath, { encoding: 'utf8' });
+    const generatorProp = JSON.parse(json).generator;
+    templateConfig = generatorProp || {};
 
-    await this.loadDefaultValues();
+    log.debug('Template configuration loaded from package.json');
+  } catch (packageError) {
+    log.debug('Could not load generator config from package.json:', packageError);
   }
 
-  /**
-   * Loads default values of parameters from template config. If value was already set as parameter it will not be
-   * overriden.
-   * @private
-   */
-async function loadDefaultValues() {
-    const parameters = this.templateConfig.parameters;
-    const defaultValues = Object.keys(parameters || {}).filter(key => parameters[key].default);
+  return templateConfig;
+}
 
-    defaultValues.filter(dv => this.templateParams[dv] === undefined).forEach(dv =>
-      Object.defineProperty(this.templateParams, dv, {
+/**
+ * Loads default values of parameters from template config
+ * @param {Object} templateConfig - The template configuration object
+ * @param {Object} templateParams - The template parameters object to modify
+ */
+function loadDefaultValues(templateConfig, templateParams) {
+  const parameters = templateConfig.parameters;
+  const defaultValues = Object.keys(parameters || {}).filter(key => parameters[key].default);
+
+  defaultValues
+    .filter(dv => templateParams[dv] === undefined)
+    .forEach(dv => {
+      Object.defineProperty(templateParams, dv, {
         enumerable: true,
         get() {
           return parameters[dv].default;
         }
-      })
-    );
-  }
+      });
+    });
+}
 
 module.exports = {
   loadTemplateConfig,

apps/generator/test/generator.test.js

@@ -5,7 +5,6 @@ const Generator = require('../lib/generator');
 const log = require('loglevel');
 const unixify = require('unixify');
 const dummyYAML = fs.readFileSync(path.resolve(__dirname, './docs/dummy.yml'), 'utf8');
-const { loadDefaultValues } = require('../lib/templateConfig/loader');
 
 const logMessage = require('./../lib/logMessages.js');