@common-stack/generate-plugin 6.0.6-alpha.6 → 6.0.6-alpha.60

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

@@ -10,86 +10,118 @@ const __dirname = fileURLToPath(new URL('.', import.meta.url));
 const JSON_SPACING = 4;
 const ADD_END_NEWLINE = true; // Set to true to add a newline at the end of the file
 
-// Paths to package.json files
-const backendPackagePath = resolve(__dirname, '../servers/backend-server/package.json');
-const frontendPackagePath = resolve(__dirname, '../servers/frontend-server/package.json');
+// Paths to package.json files (now using arrays to handle multiple paths for backend, frontend, and mobile)
+const packagePaths = {
+    backend: [
+        resolve(__dirname, '../servers/backend-server/package.json'),
+    ],
+    frontend: [
+        resolve(__dirname, '../servers/frontend-server/package.json'),
+    ],
+    mobile: [
+        resolve(__dirname, '../portable-devices/mobile/package.json'),
+    ]
+};
 
 // Packages to check
 const packagesToCheck = [
     '@common-stack/server-stack',
-    '@common-stack/frontend-stack-react'
+    '@common-stack/frontend-stack-react',
+    '@common-stack/mobile-stack-react'
 ];
 
+// Utility function to wrap `exec` in a promise for sequential execution
+const execCommand = (command, cwd) => {
+    return new Promise((resolve, reject) => {
+        exec(command, { cwd }, (err, stdout, stderr) => {
+            if (err) {
+                console.error(`Error executing command: ${command}\n${stderr}`);
+                return reject(err);
+            }
+            console.log(stdout);
+            resolve();
+        });
+    });
+};
+
 // Function to update dependencies
 const updateDependencies = async (targetPackagePath, sourcePackagePath) => {
-  const targetPackageJson = JSON.parse(await readFile(targetPackagePath, 'utf-8'));
-  const sourcePackageJson = JSON.parse(await readFile(sourcePackagePath, 'utf-8'));
-
-  const mergeDependencies = (targetDeps = {}, sourceDeps = {}) => ({
-    ...targetDeps,
-    ...sourceDeps
-  });
-
-  // Merge dependencies only
-  targetPackageJson.dependencies = mergeDependencies(
-    targetPackageJson.dependencies,
-    sourcePackageJson.dependencies
-  );
-
-  // Format the JSON string with the specified spacing
-  let jsonString = JSON.stringify(targetPackageJson, null, JSON_SPACING);
-
-  // Optionally add a newline at the end
-  if (ADD_END_NEWLINE) {
-    jsonString += '\n';
-  }
-
-  // Write the formatted JSON back to disk
-  await writeFile(targetPackagePath, jsonString, 'utf-8');
+    const targetPackageJson = JSON.parse(await readFile(targetPackagePath, 'utf-8'));
+    const sourcePackageJson = JSON.parse(await readFile(sourcePackagePath, 'utf-8'));
+
+    const mergeDependencies = (targetDeps = {}, sourceDeps = {}) => ({
+        ...targetDeps,
+        ...sourceDeps
+    });
+
+    // Merge dependencies only
+    targetPackageJson.dependencies = mergeDependencies(targetPackageJson.dependencies, sourcePackageJson.dependencies);
+
+    // Format the JSON string with the specified spacing
+    let jsonString = JSON.stringify(targetPackageJson, null, JSON_SPACING);
+
+    // Optionally add a newline at the end
+    if (ADD_END_NEWLINE) {
+        jsonString += '\n';
+    }
+
+    // Write the formatted JSON back to disk
+    await writeFile(targetPackagePath, jsonString, 'utf-8');
 };
 
-// Function to run `ncu`, update dependencies, and then run linting
+// Function to run `ncu`, `yarn` from the root, update dependencies, and then run linting
 export const runUpdateDependencies = async () => {
-  // Run `ncu` command to update the dependencies from the root level
-  await new Promise((resolve, reject) => {
-    exec('ncu -u -t minor "@common-stack*" && lerna exec "ncu -u -t minor /@common-stack*/"', { cwd: resolve(__dirname, '..') }, (err, stdout, stderr) => {
-      if (err) {
-        console.error(`Error running ncu and lerna: ${stderr}`);
-        return reject(err);
-      }
-      console.log(stdout);
-      resolve();
-    });
-  });
+    // Step 1: Run `ncu` to update the dependencies from the root level
+    console.log('Updating dependencies using `ncu`...');
+    await execCommand(
+        'ncu -u -t minor "@common-stack*" && lerna exec "ncu -u -t minor /@common-stack*/"',
+        resolve(__dirname, '..')
+    );
 
-  // Check for changes in the specified packages
-  for (const packageName of packagesToCheck) {
-    const packagePath = resolve(__dirname, `../node_modules/${packageName}/package.json`);
-    try {
-      await updateDependencies(
-        packageName.includes('server-stack') ? backendPackagePath : frontendPackagePath,
-        packagePath
-      );
-    } catch (error) {
-      console.warn(`Package ${packageName} not found or failed to update:`, error);
+    // Step 2: Run `yarn` to install updated packages from the root
+    console.log('Running yarn install...');
+    await execCommand('yarn', resolve(__dirname, '..'));
+
+    // Step 3: Update dependencies for each package
+    for (const packageName of packagesToCheck) {
+        const packagePath = resolve(__dirname, `../node_modules/${packageName}/package.json`);
+        let targetPaths;
+
+        // Determine the target package.json paths (array of paths)
+        if (packageName.includes('server-stack')) {
+            targetPaths = packagePaths.backend;
+        } else if (packageName.includes('mobile-stack-react')) {
+            targetPaths = packagePaths.mobile;
+        } else {
+            targetPaths = packagePaths.frontend;
+        }
+
+        // Iterate over all target paths in the corresponding array
+        for (const targetPackagePath of targetPaths) {
+            try {
+                await updateDependencies(targetPackagePath, packagePath);
+                console.log(`Updated dependencies for ${packageName} in ${targetPackagePath}`);
+            } catch (error) {
+                console.warn(`Package ${packageName} not found or failed to update in ${targetPackagePath}:`, error);
+            }
+        }
     }
-  }
 
-  console.log('Dependencies from @common-stack packages have been updated.');
+    console.log('Dependencies from @common-stack packages have been updated.');
 
-  // Run linting to apply Prettier
-  try {
-    await runLintStaged();
-    console.log('Prettier formatting applied.');
-  } catch (err) {
-    console.error('Failed to run Prettier:', err);
-  }
+    // Step 4: Run linting to apply Prettier
+    try {
+        await runLintStaged();
+        console.log('Prettier formatting applied.');
+    } catch (err) {
+        console.error('Failed to run Prettier:', err);
+    }
 };
 
 // Execute the function if this file is run directly
 if (import.meta.url === `file://${process.argv[1]}`) {
-  runUpdateDependencies().catch(err => {
-    console.error('Failed to update dependencies:', err);
-    process.exit(1);
-  });
+    runUpdateDependencies().catch((err) => {
+        console.error('Failed to update dependencies:', err);
+        process.exit(1);
+    });
 }

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

@@ -1,4 +1,4 @@
-import glob from 'glob';
+import { glob } from 'glob';
 import { resolve, dirname, relative } from 'path';
 import { readFileSync, writeFileSync } from 'fs';
 import simpleGit from 'simple-git';
@@ -8,25 +8,27 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
+const git = simpleGit();
+const monorepoRoot = 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 git = simpleGit();
-
-const monorepoRoot = resolve(__dirname, '..');
-
-const findPackageJsonFiles = () => {
-    return new Promise((resolve, reject) => {
-        glob(
+const findPackageJsonFiles = async () => {
+    try {
+        const findings = await 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}`);
+                if (err) reject();
                 resolve(files);
             },
         );
-    });
+        return findings;
+    } catch (err) {
+        throw new Error(`Unable to scan directory: ${err}`);
+    }
 };
 
 const buildPackageMap = async () => {

package/{src/generators/add-fullstack/files/tools/update-dependency-version.js → lib/generators/add-fullstack/files/tools/update-dependency-version.mjs}

@@ -1,26 +1,34 @@
-const path = require('path');
-const fs = require('fs');
-const simpleGit = require('simple-git');
-const glob = require('glob');
+import { glob } from 'glob';
+import { resolve, join, 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);
 
 const git = simpleGit();
-const monorepoRoot = path.resolve(__dirname, '..');
+const monorepoRoot = 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(
+const findPackageJsonFiles = async () => {
+    try {
+        const findings = await 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}`);
+                if (err) reject();
                 resolve(files);
             },
         );
-    });
+        return findings;
+    } catch (err) {
+        throw new Error(`Unable to scan directory: ${err}`);
+    }
 };
 
 const buildPackageMap = async () => {
@@ -28,10 +36,10 @@ const buildPackageMap = async () => {
     const packageMap = new Map();
 
     packageJsonFiles.forEach((file) => {
-        const packageJson = JSON.parse(fs.readFileSync(file, 'utf8'));
+        const packageJson = JSON.parse(readFileSync(file, 'utf8'));
         if (packageJson.name) {
             packageMap.set(packageJson.name, {
-                path: path.dirname(file),
+                path: dirname(file),
                 version: packageJson.version,
             });
         }
@@ -46,11 +54,11 @@ const searchAndUpdate = (dependencies, filePath, obj, packageMap) => {
     for (const key in dependencies) {
         if (dependencies[key].startsWith('link:')) {
             const relativeDepFolder = dependencies[key].split('link:')[1];
-            const dependencyFolder = path.join(path.dirname(filePath), relativeDepFolder);
+            const dependencyFolder = join(dirname(filePath), relativeDepFolder);
 
             try {
-                const packageJsonPath = path.join(dependencyFolder, 'package.json');
-                const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+                const packageJsonPath = join(dependencyFolder, 'package.json');
+                const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
                 if (dependencies[key] !== packageJson.version) {
                     dependencies[key] = packageJson.version;
                     modified = true;
@@ -74,7 +82,7 @@ const searchAndUpdate = (dependencies, filePath, obj, packageMap) => {
         if (ADD_END_NEWLINE) {
             formattedJson += '\n';
         }
-        fs.writeFileSync(filePath, formattedJson, 'utf8');
+        writeFileSync(filePath, formattedJson, 'utf8');
     }
 
     return modified;
@@ -88,7 +96,7 @@ const updateDependencies = async () => {
     packageJsonFiles.forEach((file) => {
         if (!file.includes('node_modules')) {
             try {
-                const data = fs.readFileSync(file, 'utf8');
+                const data = readFileSync(file, 'utf8');
                 const obj = JSON.parse(data);
                 const { dependencies, peerDependencies, devDependencies } = obj;
 
@@ -106,16 +114,39 @@ const updateDependencies = async () => {
         }
     });
 
-    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');
-    }
+    return modifiedFiles;
 };
 
 updateDependencies()
-    .then(() => {
-        console.log('Dependencies updated successfully.');
+    .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
     })
-    .catch((err) => console.error(`Error in updateDependencies: ${err.message}`));
+    .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');
+        } else {
+            console.log('No changes after linting. Nothing to commit.');
+        }
+    })
+    .catch((err) => {
+        console.error(err);
+    });

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

@@ -1,23 +1,36 @@
-'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) {
+'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'),lernaJsonUpdate=require('./updates/lernaJsonUpdate.cjs'),htmlPluginUpdate=require('./updates/htmlPluginUpdate.cjs'),licenseUpdate=require('./updates/licenseUpdate.cjs'),ignoreUpdate=require('./updates/ignoreUpdate.cjs'),generator$2=require('../add-frontend/generator.cjs'),generator$1=require('../add-backend/generator.cjs'),generator=require('../add-moleculer/generator.cjs'),generator$3=require('../add-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 basePath = options.path || '';
-        const projectRoot = path__namespace.join(basePath, (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : 'fullstack-pro');
+        const projectName = (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : 'fullstack-pro';
+        const projectRoot = path__namespace.join(basePath, projectName);
         console.log(`basePath: ${basePath}`);
+        // backup existing lerna values
+        const lernaBackup = lernaJsonUpdate.backupLernaJson(tree, projectRoot);
+        // backup files codegen.yaml
+        const filesToBackup = ['codegen.yml', 'values-dev.yaml', 'values-prod.yaml', 'values-stage.yaml'];
+        const filesBackup = ignoreUpdate.backupFiles(tree, projectRoot, filesToBackup);
         devkit.generateFiles(tree, path__namespace.join(__dirname, 'files'), projectRoot, options);
         // Update Jenkinsfile with dynamic values
-        const jenkinsFilePath = path__namespace.join(projectRoot, 'Jenkinsfile');
-        jenkinsfileUpdate.updateJenkinsFile(jenkinsFilePath, options.name);
+        jenkinsfileUpdate.updateJenkinsFile(tree, projectRoot, projectName);
         // Update package.json with the project name
-        packageJsonUpdate.updatePackageJson(tree, projectRoot, index.getValid(options.name));
+        packageJsonUpdate.updatePackageJson(tree, projectRoot, { name: projectName });
+        // Update tools/html-plugin-template
+        htmlPluginUpdate.updateHtmlPlugin(tree, projectRoot);
+        if (lernaBackup) {
+            // When update the existing lerna.json, it shouldn't overwrite version, allowbranch, packages
+            lernaJsonUpdate.restoreLernaJson(tree, projectRoot, lernaBackup);
+        }
+        // Restore files backup to ignore update
+        ignoreUpdate.restoreFiles(tree, projectRoot, filesBackup);
         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);
+                    const configs = JSON.parse(fs__namespace.readFileSync(configPath).toString());
                     configs.parent = projectRoot;
+                    configs.ns = projectName;
                     yield processConfigs(tree, configs);
                 }
                 catch (error) {
@@ -25,13 +38,16 @@
                 }
             }
         }
+        // Update license from package.json
+        licenseUpdate.updateLicense(tree, projectRoot);
     });
 }
-const generateServers = (tree, parent, servers) => tslib.__awaiter(void 0, void 0, void 0, function* () {
-    for (const [serverName, serverConfig] of Object.entries(servers)) {
+const generateServers = (tree, options) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+    for (const [serverName, serverConfig] of Object.entries(options.servers)) {
         const configs = serverConfig;
         configs.name = serverName;
-        configs.directory = path__namespace.join(parent, 'servers');
+        configs.directory = path__namespace.join(options.parent, 'servers');
+        configs.ns = options.ns;
         switch (configs === null || configs === void 0 ? void 0 : configs.type) {
             case 'frontend':
                 yield generator$2.generateFrontend(tree, configs);
@@ -45,32 +61,25 @@ const generateServers = (tree, parent, servers) => tslib.__awaiter(void 0, void
         }
     }
 });
-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 generateModules = (tree, options) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+    for (const [moduleName, moduleConfig] of Object.entries(options.packages.modules)) {
+        for (const [packageName, packageConfig] of Object.entries(moduleConfig)) {
+            const configs = Object.assign(Object.assign({}, packageConfig), { name: moduleName, directory: path__namespace.join(options.parent, 'packages'), ns: options.ns, type: packageName });
+            yield generator$3.generatePackage(tree, configs, false);
         }
     }
 });
 const processConfigs = (tree, configs) => tslib.__awaiter(void 0, void 0, void 0, function* () {
     if (configs.servers) {
-        yield generateServers(tree, configs.parent, configs.servers);
+        yield generateServers(tree, configs);
     }
     if (configs.packages && configs.packages.modules) {
-        yield generatePackages(tree, configs.parent, configs.packages.modules);
+        yield generateModules(tree, configs);
+    }
+    if (configs.license) {
+        packageJsonUpdate.updatePackageJson(tree, configs.parent, { license: index.getValid(configs.license) });
+    }
+    if (configs.repository) {
+        packageJsonUpdate.updateRepository(tree, configs.parent, configs.repository);
     }
 });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":["path","getValid","generateFiles","updateJenkinsFile","updatePackageJson","formatFiles","isValid","fs","__awaiter","generateFrontend","generateBackend","generateMoleculer","generateCorePackage","generateBrowserPackage","generateClientPackage","generateServerPackage"],"mappings":"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"}
+{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-fullstack/generator.ts"],"sourcesContent":[null],"names":["getValid","path","backupLernaJson","backupFiles","generateFiles","updateJenkinsFile","updatePackageJson","updateHtmlPlugin","restoreLernaJson","restoreFiles","formatFiles","isValid","fs","updateLicense","__awaiter","generateFrontend","generateBackend","generateMoleculer","generatePackage","updateRepository"],"mappings":"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"}

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

@@ -1,23 +1,36 @@
-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) {
+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,updateRepository}from'./updates/packageJsonUpdate.mjs';import {backupLernaJson,restoreLernaJson}from'./updates/lernaJsonUpdate.mjs';import {updateHtmlPlugin}from'./updates/htmlPluginUpdate.mjs';import {updateLicense}from'./updates/licenseUpdate.mjs';import {backupFiles,restoreFiles}from'./updates/ignoreUpdate.mjs';import {generateFrontend}from'../add-frontend/generator.mjs';import {generateBackend}from'../add-backend/generator.mjs';import {generateMoleculer}from'../add-moleculer/generator.mjs';import {generatePackage}from'../add-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 basePath = options.path || '';
-        const projectRoot = path.join(basePath, (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : 'fullstack-pro');
+        const projectName = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : 'fullstack-pro';
+        const projectRoot = path.join(basePath, projectName);
         console.log(`basePath: ${basePath}`);
+        // backup existing lerna values
+        const lernaBackup = backupLernaJson(tree, projectRoot);
+        // backup files codegen.yaml
+        const filesToBackup = ['codegen.yml', 'values-dev.yaml', 'values-prod.yaml', 'values-stage.yaml'];
+        const filesBackup = backupFiles(tree, projectRoot, filesToBackup);
         generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
         // Update Jenkinsfile with dynamic values
-        const jenkinsFilePath = path.join(projectRoot, 'Jenkinsfile');
-        updateJenkinsFile(jenkinsFilePath, options.name);
+        updateJenkinsFile(tree, projectRoot, projectName);
         // Update package.json with the project name
-        updatePackageJson(tree, projectRoot, getValid(options.name));
+        updatePackageJson(tree, projectRoot, { name: projectName });
+        // Update tools/html-plugin-template
+        updateHtmlPlugin(tree, projectRoot);
+        if (lernaBackup) {
+            // When update the existing lerna.json, it shouldn't overwrite version, allowbranch, packages
+            restoreLernaJson(tree, projectRoot, lernaBackup);
+        }
+        // Restore files backup to ignore update
+        restoreFiles(tree, projectRoot, filesBackup);
         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);
+                    const configs = JSON.parse(fs.readFileSync(configPath).toString());
                     configs.parent = projectRoot;
+                    configs.ns = projectName;
                     yield processConfigs(tree, configs);
                 }
                 catch (error) {
@@ -25,13 +38,16 @@ import {__awaiter}from'tslib';import {generateFiles,formatFiles}from'@nx/devkit'
                 }
             }
         }
+        // Update license from package.json
+        updateLicense(tree, projectRoot);
     });
 }
-const generateServers = (tree, parent, servers) => __awaiter(void 0, void 0, void 0, function* () {
-    for (const [serverName, serverConfig] of Object.entries(servers)) {
+const generateServers = (tree, options) => __awaiter(void 0, void 0, void 0, function* () {
+    for (const [serverName, serverConfig] of Object.entries(options.servers)) {
         const configs = serverConfig;
         configs.name = serverName;
-        configs.directory = path.join(parent, 'servers');
+        configs.directory = path.join(options.parent, 'servers');
+        configs.ns = options.ns;
         switch (configs === null || configs === void 0 ? void 0 : configs.type) {
             case 'frontend':
                 yield generateFrontend(tree, configs);
@@ -45,32 +61,25 @@ const generateServers = (tree, parent, servers) => __awaiter(void 0, void 0, voi
         }
     }
 });
-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 generateModules = (tree, options) => __awaiter(void 0, void 0, void 0, function* () {
+    for (const [moduleName, moduleConfig] of Object.entries(options.packages.modules)) {
+        for (const [packageName, packageConfig] of Object.entries(moduleConfig)) {
+            const configs = Object.assign(Object.assign({}, packageConfig), { name: moduleName, directory: path.join(options.parent, 'packages'), ns: options.ns, type: packageName });
+            yield generatePackage(tree, configs, false);
         }
     }
 });
 const processConfigs = (tree, configs) => __awaiter(void 0, void 0, void 0, function* () {
     if (configs.servers) {
-        yield generateServers(tree, configs.parent, configs.servers);
+        yield generateServers(tree, configs);
     }
     if (configs.packages && configs.packages.modules) {
-        yield generatePackages(tree, configs.parent, configs.packages.modules);
+        yield generateModules(tree, configs);
+    }
+    if (configs.license) {
+        updatePackageJson(tree, configs.parent, { license: getValid(configs.license) });
+    }
+    if (configs.repository) {
+        updateRepository(tree, configs.parent, configs.repository);
     }
 });export{addFullstackGenerator,addFullstackGenerator as default};//# sourceMappingURL=generator.mjs.map