@common-stack/generate-plugin 5.0.6-alpha.5 → 5.0.6-alpha.8

package/lib/generators/add-fullstack/files/tools/update-dependency-link.mjs

@@ -0,0 +1,138 @@
+import glob from 'glob';
+import { resolve, dirname, relative } from 'path';
+import { readFileSync, writeFileSync } from 'fs';
+import simpleGit from 'simple-git';
+import { runLintStaged } from './runLint.mjs';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+// matching prettier format
+const JSON_SPACING = 4;
+const ADD_END_NEWLINE = true; // Set to true to add a newline at the end of the file
+
+const git = simpleGit();
+
+const monorepoRoot = resolve(__dirname, '..');
+
+const findPackageJsonFiles = () => {
+    return new Promise((resolve, reject) => {
+        glob(
+            `${monorepoRoot}/+(servers|portable-devices|packages|packages-modules)/**/package.json`,
+            { onlyFiles: true, ignore: '**/node_modules/**' },
+            (err, files) => {
+                if (err) reject(`Unable to scan directory: ${err}`);
+                resolve(files);
+            },
+        );
+    });
+};
+
+const buildPackageMap = async () => {
+    const packageJsonFiles = await findPackageJsonFiles();
+    const packageMap = new Map();
+
+    packageJsonFiles.forEach((file) => {
+        const packageJson = JSON.parse(readFileSync(file, 'utf8'));
+        if (packageJson.name) {
+            packageMap.set(packageJson.name, {
+                path: dirname(file),
+                version: packageJson.version,
+            });
+        }
+    });
+
+    return packageMap;
+};
+
+const searchAndUpdate = (dependencies, filePath, obj, packageMap) => {
+    let modified = false;
+
+    for (const key in dependencies) {
+        if (packageMap.has(key)) {
+            const targetDir = packageMap.get(key).path;
+            const relativePath = `link:${relative(dirname(filePath), targetDir)}`;
+
+            if (dependencies[key] !== relativePath) {
+                dependencies[key] = relativePath;
+                modified = true;
+            }
+        }
+    }
+
+    if (modified) {
+        // Write the updated package.json back to disk with or without a newline at the end
+        let formattedJson = JSON.stringify(obj, null, JSON_SPACING);
+        if (ADD_END_NEWLINE) {
+            formattedJson += '\n';
+        }
+        writeFileSync(filePath, formattedJson, 'utf8');
+    }
+
+    return modified;
+};
+
+const updateDependencies = async () => {
+    const packageMap = await buildPackageMap();
+    const packageJsonFiles = await findPackageJsonFiles();
+    const modifiedFiles = [];
+
+    packageJsonFiles.forEach((file) => {
+        if (!file.includes('node_modules')) {
+            try {
+                const data = readFileSync(file, 'utf8');
+                const obj = JSON.parse(data);
+                const { dependencies, peerDependencies, devDependencies } = obj;
+
+                let modified = false;
+                modified = searchAndUpdate(dependencies, file, obj, packageMap) || modified;
+                modified = searchAndUpdate(peerDependencies, file, obj, packageMap) || modified;
+                modified = searchAndUpdate(devDependencies, file, obj, packageMap) || modified;
+
+                if (modified) {
+                    console.log('--PUSHING FILE=---', file);
+                    modifiedFiles.push(file);
+                }
+            } catch (err) {
+                console.error(`Unable to read file ${file}: ${err.message}`);
+            }
+        }
+    });
+
+    return modifiedFiles;
+};
+
+updateDependencies()
+    .then((modifiedFiles) => {
+        const addArray = modifiedFiles.map((file) => `./${relative(monorepoRoot, file)}`);
+        console.log('-- Modified Files --', modifiedFiles, addArray);
+        if (addArray.length === 0) {
+            console.log('No files to stage.');
+            return null;
+        }
+        return git.add(addArray).then(() => git.status()); // Stage files and then check status
+    })
+    .then((status) => {
+        if (status && status.modified.length) {
+            const fileArray = status.modified.filter((element) => element.includes('package.json'));
+            const addArray = fileArray.map((element) => `./${element}`);
+            return git
+                .add(addArray)
+                .then(runLintStaged)
+                .then(() => git.status()); // Run lint-staged after adding
+        } else {
+            console.log('No changes to lint or commit.');
+            return null;
+        }
+    })
+    .then((status) => {
+        if (status && status.modified.length > 0) {
+            return git.commit('Updated packages to use correct versions and linked dependencies');
+        } else {
+            console.log('No changes after linting. Nothing to commit.');
+        }
+    })
+    .catch((err) => {
+        console.error(err);
+    });

package/lib/generators/add-fullstack/files/tools/update-dependency-version.js

@@ -1,106 +1,121 @@
-/* eslint-disable jest/require-hook */
-/* eslint-disable no-loop-func */
-/* eslint-disable no-undef */
-/* eslint-disable @typescript-eslint/no-var-requires */
-/* eslint-disable @typescript-eslint/no-floating-promises */
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable no-console */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
-/* eslint-disable consistent-return */
-const glob = require('glob');
 const path = require('path');
 const fs = require('fs');
-
-const SERVER_FOLDER = './servers';
 const simpleGit = require('simple-git');
+const glob = require('glob');
 
 const git = simpleGit();
+const monorepoRoot = path.resolve(__dirname, '..');
+
+// matching prettier format
+const JSON_SPACING = 4;
+const ADD_END_NEWLINE = true; // Set to true to add a newline at the end of the file
+
+const findPackageJsonFiles = () => {
+    return new Promise((resolve, reject) => {
+        glob(
+            `${monorepoRoot}/+(servers|portable-devices|packages|packages-modules)/**/package.json`,
+            { onlyFiles: true, ignore: '**/node_modules/**' },
+            (err, files) => {
+                if (err) reject(`Unable to scan directory: ${err}`);
+                resolve(files);
+            },
+        );
+    });
+};
+
+const buildPackageMap = async () => {
+    const packageJsonFiles = await findPackageJsonFiles();
+    const packageMap = new Map();
+
+    packageJsonFiles.forEach((file) => {
+        const packageJson = JSON.parse(fs.readFileSync(file, 'utf8'));
+        if (packageJson.name) {
+            packageMap.set(packageJson.name, {
+                path: path.dirname(file),
+                version: packageJson.version,
+            });
+        }
+    });
+
+    return packageMap;
+};
+
+const searchAndUpdate = (dependencies, filePath, obj, packageMap) => {
+    let modified = false;
 
-const searchAndUpdate = (dependencies, filePath, obj) => {
-    const fileWrie = filePath;
-    const packageDir = path.dirname(filePath);
-    console.log('---PACKAGE DIR', packageDir);
     for (const key in dependencies) {
-        if (dependencies[key].includes('link:')) {
+        if (dependencies[key].startsWith('link:')) {
             const relativeDepFolder = dependencies[key].split('link:')[1];
-            console.log('--FOLDER ROAD', relativeDepFolder);
-            const dependencyFolder = path.join(packageDir, relativeDepFolder);
+            const dependencyFolder = path.join(path.dirname(filePath), relativeDepFolder);
+
             try {
-                fs.readdirSync(dependencyFolder);
+                const packageJsonPath = path.join(dependencyFolder, 'package.json');
+                const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+                if (dependencies[key] !== packageJson.version) {
+                    dependencies[key] = packageJson.version;
+                    modified = true;
+                }
             } catch (err) {
-
-                console.log(`--- err ${err.message}`);
-                console.log(
-                    `err Search for dependency of ${filePath} with package path ${relativeDepFolder} not found`,
-                );
+                console.error(`Error updating ${key} in ${filePath}: ${err.message}`);
                 throw err;
             }
-            glob(`${dependencyFolder}/package.json`, { ignore: '**/node_modules/**' }, (err, files) => {
-                if (err) return console.error(`Unable to scan directory: ${err}`);
-                console.log(files);
-                files.forEach((file) => {
-                    fs.readFile(file, 'utf-8', (err, data) => {
-                        if (err) return console.error(`Unable to scan directory: ${err}`);
-                        try {
-                            const objVersion = JSON.parse(data);
-                            const { version } = objVersion;
-                            dependencies[key] = `${version}`;
-                            const str = JSON.stringify(obj, null, 2);
-                            fs.writeFileSync(fileWrie, str, 'ascii');
-                        } catch (err) {
-                            console.error(`Failed at file: ${file}`)
-                            throw (err);
-                        }
-
-                    });
-                });
-            });
+        } else if (packageMap.has(key)) {
+            const version = packageMap.get(key).version;
+            if (dependencies[key] !== version) {
+                dependencies[key] = version;
+                modified = true;
+            }
+        }
+    }
+
+    if (modified) {
+        // Write the updated package.json back to disk with or without a newline at the end
+        let formattedJson = JSON.stringify(obj, null, JSON_SPACING);
+        if (ADD_END_NEWLINE) {
+            formattedJson += '\n';
         }
+        fs.writeFileSync(filePath, formattedJson, 'utf8');
     }
+
+    return modified;
 };
 
-glob(
-    './+(servers|portable-devices|packages|packages-modules)/**/package.json',
-    { onlyFiles: false, ignore: '**/node_modules/**' },
-    (err, files) => {
-        if (err) return console.error(`Unable to scan directory: ${err}`);
-        files.forEach((file) => {
-            if (!file.includes('node_modules')) {
-                fs.readFile(file, 'utf-8', (err, data) => {
-                    if (err) return console.error(`Unable to scan directory: ${err}`);
-                    try {
-                        const obj = JSON.parse(data);
-                        const { dependencies, peerDependencies, devDependencies } = obj;
-                        searchAndUpdate(dependencies, file, obj);
-                        searchAndUpdate(peerDependencies, file, obj);
-                        searchAndUpdate(devDependencies, file, obj);
-                    } catch (err) {
-                        console.error(`Errored at ${file}`);
-                        console.error(err);
-                    }
-                });
+const updateDependencies = async () => {
+    const packageMap = await buildPackageMap();
+    const packageJsonFiles = await findPackageJsonFiles();
+    const modifiedFiles = [];
+
+    packageJsonFiles.forEach((file) => {
+        if (!file.includes('node_modules')) {
+            try {
+                const data = fs.readFileSync(file, 'utf8');
+                const obj = JSON.parse(data);
+                const { dependencies, peerDependencies, devDependencies } = obj;
+
+                let modified = false;
+                modified = searchAndUpdate(dependencies, file, obj, packageMap) || modified;
+                modified = searchAndUpdate(peerDependencies, file, obj, packageMap) || modified;
+                modified = searchAndUpdate(devDependencies, file, obj, packageMap) || modified;
+
+                if (modified) {
+                    modifiedFiles.push(file);
+                }
+            } catch (err) {
+                console.error(`Unable to read file ${file}: ${err.message}`);
             }
-        });
-        git.add('.')
-            .then(() => {
-                git.status()
-                    .then((status) => {
-                        console.log('POST GIT CHANGES', status);
-                        if (status.modified.length) {
-                            const fileArray = status.modified.filter((element) => element.includes('package.json'));
-                            const addArray = fileArray.map((element) => `./${element}`);
-                            git.add(addArray);
-                            git.commit('corrected packages version!');
-                        } else console.log('no change');
-                    })
-                    .catch((err) => {
-                        console.error(err);
-                    });
-            })
-            .catch((err) => console.error(err));
-    },
-);
+        }
+    });
+
+    if (modifiedFiles.length > 0) {
+        await git.add(modifiedFiles);
+        await git.commit('Updated packages to use correct versions and linked dependencies');
+    } else {
+        console.log('No changes detected');
+    }
+};
+
+updateDependencies()
+    .then(() => {
+        console.log('Dependencies updated successfully.');
+    })
+    .catch((err) => console.error(`Error in updateDependencies: ${err.message}`));

package/lib/generators/add-fullstack/files/tools/updateUtils.mjs

@@ -0,0 +1,77 @@
+import { resolve, dirname, join } from 'path';
+import { readFileSync, writeFileSync } from 'fs';
+import glob from 'glob';
+
+export const JSON_SPACING = 4;
+export const ADD_END_NEWLINE = true; // Set to true to add a newline at the end of the file
+
+export const monorepoRoot = resolve(dirname(import.meta.url), '..');
+
+export const findPackageJsonFiles = () => {
+    return new Promise((resolve, reject) => {
+        glob(
+            `${monorepoRoot}/+(servers|portable-devices|packages|packages-modules)/**/package.json`,
+            { onlyFiles: true, ignore: '**/node_modules/**' },
+            (err, files) => {
+                if (err) reject(`Unable to scan directory: ${err}`);
+                resolve(files);
+            },
+        );
+    });
+};
+
+export const buildPackageMap = async () => {
+    const packageJsonFiles = await findPackageJsonFiles();
+    const packageMap = new Map();
+
+    packageJsonFiles.forEach((file) => {
+        const packageJson = JSON.parse(readFileSync(file, 'utf8'));
+        if (packageJson.name) {
+            packageMap.set(packageJson.name, {
+                path: dirname(file),
+                version: packageJson.version,
+            });
+        }
+    });
+
+    return packageMap;
+};
+
+export const searchAndUpdate = (dependencies, filePath, obj, packageMap) => {
+    let modified = false;
+
+    for (const key in dependencies) {
+        if (dependencies[key].startsWith('link:')) {
+            const relativeDepFolder = dependencies[key].split('link:')[1];
+            const dependencyFolder = join(dirname(filePath), relativeDepFolder);
+
+            try {
+                const packageJsonPath = join(dependencyFolder, 'package.json');
+                const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
+                if (dependencies[key] !== packageJson.version) {
+                    dependencies[key] = packageJson.version;
+                    modified = true;
+                }
+            } catch (err) {
+                console.error(`Error updating ${key} in ${filePath}: ${err.message}`);
+                throw err;
+            }
+        } else if (packageMap.has(key)) {
+            const version = packageMap.get(key).version;
+            if (dependencies[key] !== version) {
+                dependencies[key] = version;
+                modified = true;
+            }
+        }
+    }
+
+    if (modified) {
+        let formattedJson = JSON.stringify(obj, null, JSON_SPACING);
+        if (ADD_END_NEWLINE) {
+            formattedJson += '\n';
+        }
+        writeFileSync(filePath, formattedJson, 'utf8');
+    }
+
+    return modified;
+};

package/lib/generators/add-fullstack/generator.cjs

@@ -1,18 +1,76 @@
-'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),index=require('../../utils/index.cjs');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);function addFullstackGenerator(tree, options) {
+'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),fs=require('fs'),index=require('../../utils/index.cjs'),jenkinsfileUpdate=require('./updates/jenkinsfileUpdate.cjs'),packageJsonUpdate=require('./updates/packageJsonUpdate.cjs'),generator$2=require('../add-frontend/generator.cjs'),generator$1=require('../add-backend/generator.cjs'),generator=require('../add-moleculer/generator.cjs'),generator$5=require('../add-browser-package/generator.cjs'),generator$4=require('../add-client-package/generator.cjs'),generator$6=require('../add-core-package/generator.cjs'),generator$3=require('../add-server-package/generator.cjs');require('../../executors/update-deploy-version/executor.cjs');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);var fs__namespace=/*#__PURE__*/_interopNamespaceDefault(fs);function addFullstackGenerator(tree, options) {
     return tslib.__awaiter(this, void 0, void 0, function* () {
         var _a;
-        const projectRoot = (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : 'fullstack-pro';
-        // addProjectConfiguration(tree, projectRoot, {
-        //     root: projectRoot,
-        //     projectType: 'library',
-        //     sourceRoot: `${projectRoot}/src`,
-        //     targets: {},
-        // });
+        const basePath = options.path || '';
+        const projectRoot = path__namespace.join(basePath, (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : 'fullstack-pro');
+        console.log(`basePath: ${basePath}`);
         devkit.generateFiles(tree, path__namespace.join(__dirname, 'files'), projectRoot, options);
-        devkit.updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
-            packageJson['name'] = projectRoot;
-            return packageJson;
-        });
+        // Update Jenkinsfile with dynamic values
+        const jenkinsFilePath = path__namespace.join(projectRoot, 'Jenkinsfile');
+        jenkinsfileUpdate.updateJenkinsFile(jenkinsFilePath, options.name);
+        // Update package.json with the project name
+        packageJsonUpdate.updatePackageJson(tree, projectRoot, index.getValid(options.name));
         yield devkit.formatFiles(tree);
+        if (index.isValid(options.config)) {
+            const configPath = path__namespace.resolve(basePath, index.getValid(options.config));
+            if (fs__namespace.existsSync(configPath)) {
+                try {
+                    const content = String(fs__namespace.readFileSync(configPath));
+                    const configs = JSON.parse(content);
+                    configs.parent = projectRoot;
+                    yield processConfigs(tree, configs);
+                }
+                catch (error) {
+                    console.error('Error while reading config.', error);
+                }
+            }
+        }
     });
-}exports.addFullstackGenerator=addFullstackGenerator;exports.default=addFullstackGenerator;//# sourceMappingURL=generator.cjs.map
+}
+const generateServers = (tree, parent, servers) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+    for (const [serverName, serverConfig] of Object.entries(servers)) {
+        const configs = serverConfig;
+        configs.name = serverName;
+        configs.directory = path__namespace.join(parent, 'servers');
+        switch (configs === null || configs === void 0 ? void 0 : configs.type) {
+            case 'frontend':
+                yield generator$2.generateFrontend(tree, configs);
+                break;
+            case 'backend':
+                yield generator$1.generateBackend(tree, configs);
+                break;
+            case 'moleculer':
+                yield generator.generateMoleculer(tree, configs);
+                break;
+        }
+    }
+});
+const generatePackages = (tree, parent, packages) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+    for (const [packageName, packageConfig] of Object.entries(packages)) {
+        const configs = packageConfig;
+        configs.name = packageName;
+        configs.directory = path__namespace.join(parent, 'packages');
+        switch (packageConfig === null || packageConfig === void 0 ? void 0 : packageConfig.type) {
+            case 'packages-core':
+                yield generator$6.generateCorePackage(tree, configs);
+                break;
+            case 'packages-browser':
+                yield generator$5.generateBrowserPackage(tree, configs);
+                break;
+            case 'packages-client':
+                yield generator$4.generateClientPackage(tree, configs);
+                break;
+            case 'packages-server':
+                yield generator$3.generateServerPackage(tree, configs);
+                break;
+        }
+    }
+});
+const processConfigs = (tree, configs) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+    if (configs.servers) {
+        yield generateServers(tree, configs.parent, configs.servers);
+    }
+    if (configs.packages && configs.packages.modules) {
+        yield generatePackages(tree, configs.parent, configs.packages.modules);
+    }
+});exports.addFullstackGenerator=addFullstackGenerator;exports.default=addFullstackGenerator;//# sourceMappingURL=generator.cjs.map

package/lib/generators/add-fullstack/generator.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-fullstack/generator.ts"],"sourcesContent":[null],"names":["getValid","generateFiles","path","updateJson","formatFiles"],"mappings":"whBAKsB,SAAA,qBAAqB,CAAC,IAAU,EAAE,OAAoC,EAAA;;;QACxF,MAAM,WAAW,GAAG,CAAA,EAAA,GAAAA,cAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,eAAe,CAAC;;;;;;;AAO9D,QAAAC,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACzEC,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,YAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,YAAA,OAAO,WAAW,CAAC;AACvB,SAAC,CAAC,CAAC;AACH,QAAA,MAAMC,kBAAW,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAA,CAAA;AAAA"}
+{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-fullstack/generator.ts"],"sourcesContent":[null],"names":["path","getValid","generateFiles","updateJenkinsFile","updatePackageJson","formatFiles","isValid","fs","__awaiter","generateFrontend","generateBackend","generateMoleculer","generateCorePackage","generateBrowserPackage","generateClientPackage","generateServerPackage"],"mappings":"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"}

package/lib/generators/add-fullstack/generator.mjs

@@ -1,18 +1,76 @@
-import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import {getValid}from'../../utils/index.mjs';function addFullstackGenerator(tree, options) {
+import {__awaiter}from'tslib';import {generateFiles,formatFiles}from'@nx/devkit';import*as path from'path';import*as fs from'fs';import {getValid,isValid}from'../../utils/index.mjs';import {updateJenkinsFile}from'./updates/jenkinsfileUpdate.mjs';import {updatePackageJson}from'./updates/packageJsonUpdate.mjs';import {generateFrontend}from'../add-frontend/generator.mjs';import {generateBackend}from'../add-backend/generator.mjs';import {generateMoleculer}from'../add-moleculer/generator.mjs';import {generateBrowserPackage}from'../add-browser-package/generator.mjs';import {generateClientPackage}from'../add-client-package/generator.mjs';import {generateCorePackage}from'../add-core-package/generator.mjs';import {generateServerPackage}from'../add-server-package/generator.mjs';import'../../executors/update-deploy-version/executor.mjs';function addFullstackGenerator(tree, options) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const projectRoot = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : 'fullstack-pro';
-        // addProjectConfiguration(tree, projectRoot, {
-        //     root: projectRoot,
-        //     projectType: 'library',
-        //     sourceRoot: `${projectRoot}/src`,
-        //     targets: {},
-        // });
+        const basePath = options.path || '';
+        const projectRoot = path.join(basePath, (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : 'fullstack-pro');
+        console.log(`basePath: ${basePath}`);
         generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
-        updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
-            packageJson['name'] = projectRoot;
-            return packageJson;
-        });
+        // Update Jenkinsfile with dynamic values
+        const jenkinsFilePath = path.join(projectRoot, 'Jenkinsfile');
+        updateJenkinsFile(jenkinsFilePath, options.name);
+        // Update package.json with the project name
+        updatePackageJson(tree, projectRoot, getValid(options.name));
         yield formatFiles(tree);
+        if (isValid(options.config)) {
+            const configPath = path.resolve(basePath, getValid(options.config));
+            if (fs.existsSync(configPath)) {
+                try {
+                    const content = String(fs.readFileSync(configPath));
+                    const configs = JSON.parse(content);
+                    configs.parent = projectRoot;
+                    yield processConfigs(tree, configs);
+                }
+                catch (error) {
+                    console.error('Error while reading config.', error);
+                }
+            }
+        }
     });
-}export{addFullstackGenerator,addFullstackGenerator as default};//# sourceMappingURL=generator.mjs.map
+}
+const generateServers = (tree, parent, servers) => __awaiter(void 0, void 0, void 0, function* () {
+    for (const [serverName, serverConfig] of Object.entries(servers)) {
+        const configs = serverConfig;
+        configs.name = serverName;
+        configs.directory = path.join(parent, 'servers');
+        switch (configs === null || configs === void 0 ? void 0 : configs.type) {
+            case 'frontend':
+                yield generateFrontend(tree, configs);
+                break;
+            case 'backend':
+                yield generateBackend(tree, configs);
+                break;
+            case 'moleculer':
+                yield generateMoleculer(tree, configs);
+                break;
+        }
+    }
+});
+const generatePackages = (tree, parent, packages) => __awaiter(void 0, void 0, void 0, function* () {
+    for (const [packageName, packageConfig] of Object.entries(packages)) {
+        const configs = packageConfig;
+        configs.name = packageName;
+        configs.directory = path.join(parent, 'packages');
+        switch (packageConfig === null || packageConfig === void 0 ? void 0 : packageConfig.type) {
+            case 'packages-core':
+                yield generateCorePackage(tree, configs);
+                break;
+            case 'packages-browser':
+                yield generateBrowserPackage(tree, configs);
+                break;
+            case 'packages-client':
+                yield generateClientPackage(tree, configs);
+                break;
+            case 'packages-server':
+                yield generateServerPackage(tree, configs);
+                break;
+        }
+    }
+});
+const processConfigs = (tree, configs) => __awaiter(void 0, void 0, void 0, function* () {
+    if (configs.servers) {
+        yield generateServers(tree, configs.parent, configs.servers);
+    }
+    if (configs.packages && configs.packages.modules) {
+        yield generatePackages(tree, configs.parent, configs.packages.modules);
+    }
+});export{addFullstackGenerator,addFullstackGenerator as default};//# sourceMappingURL=generator.mjs.map

package/lib/generators/add-fullstack/generator.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-fullstack/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"mKAKsB,SAAA,qBAAqB,CAAC,IAAU,EAAE,OAAoC,EAAA;;;QACxF,MAAM,WAAW,GAAG,CAAA,EAAA,GAAA,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,eAAe,CAAC;;;;;;;AAO9D,QAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACzE,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,YAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,YAAA,OAAO,WAAW,CAAC;AACvB,SAAC,CAAC,CAAC;AACH,QAAA,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAA,CAAA;AAAA"}
+{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-fullstack/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/lib/generators/add-fullstack/schema.json

@@ -8,6 +8,15 @@
             "type": "string",
             "description": "",
             "x-prompt": "What name would you like to use?"
+        },
+        "config": {
+            "type": "string",
+            "description": "The absolute path of config file"
+        },
+        "path": {
+            "type": "string",
+            "description": "The base path where the project will be created or updated",
+            "x-prompt": "Where do you want to create or update the project? (Leave empty for the current directory)"
         }
     },
     "required": ["name"]