@common-stack/generate-plugin 7.0.4-alpha.0 → 7.0.4-alpha.2

package/src/generators/add-fullstack/generator.ts

@@ -1,11 +1,11 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable import/no-cycle */
-import { addProjectConfiguration, formatFiles, generateFiles, Tree } from '@nx/devkit';
+import { formatFiles, generateFiles, Tree, updateJson } from '@nx/devkit';
 import * as path from 'path';
 import * as fs from 'fs';
 import { AddFullstackGeneratorSchema } from './schema';
 import { getValid, isValid } from '../../utils';
-import { 
+import {
     updateJenkinsFile,
     updatePackageJson,
     backupLernaJson,
@@ -15,13 +15,20 @@ import {
     backupFiles,
     restoreFiles,
     updateRepository,
+    renameDotFiles,
+    setupGit,
+    commitInitialFiles,
+    setupGitCrypt,
+    setupHusky,
+    prepareGitAttributes,
+    setupNpmAuth,
+    setupNxConfig,
 } from './updates';
-import {
-    generateBackend,
-    generateFrontend,
-    generateMoleculer,
-    generatePackage,
-} from '../../index';
+// import { generateBackend, generateFrontend } from '../../index';
+import { addBackendGenerator as generateBackend } from '../add-backend/generator';
+import { addFrontendGenerator as generateFrontend } from '../add-frontend/generator';
+import { addMoleculerGenerator as generateMoleculer } from '../add-moleculer/generator';
+import { addPackageGenerator as generatePackage } from '../add-package/generator';
 
 export async function addFullstackGenerator(tree: Tree, options: AddFullstackGeneratorSchema) {
     let projectPath = options.path || '';
@@ -37,31 +44,37 @@ export async function addFullstackGenerator(tree: Tree, options: AddFullstackGen
     // 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'];
+    // backup files including codegen.ts (instead of codegen.yml)
+    const filesToBackup = ['codegen.ts', '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
-    updateJenkinsFile(tree, projectRoot, projectName);
+    // Rename files that begin with underscore to dot files
+    renameDotFiles(tree, projectRoot);
 
-    // Update package.json with the project name
-    updatePackageJson(tree, projectRoot, { name: projectName });
+    // Handle gitattributes file (Tree-phase)
+    prepareGitAttributes(tree, projectRoot);
 
-    // Update tools/html-plugin-template
+    // First update files in the tree
+    updateJenkinsFile(tree, projectRoot, projectName);
+    updatePackageJson(tree, projectRoot, { name: projectName });
     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);
+    updateLicense(tree, projectRoot);
 
+    // Format all files
     await formatFiles(tree);
 
+    // Set a flag to perform Git operations after files are written
+    const performGitOperations = true;
+
+    // Process configurations if needed
     if (isValid(options.config)) {
         const configPath = path.resolve(projectPath, getValid(options.config));
         if (fs.existsSync(configPath)) {
@@ -77,8 +90,49 @@ export async function addFullstackGenerator(tree: Tree, options: AddFullstackGen
         }
     }
 
-    // Update license from package.json
-    updateLicense(tree, projectRoot);
+    // Add this before commitInitialFiles
+    await setupNxConfig(tree, projectRoot);
+
+    // Setup git and commit files
+    setupGit(tree, projectRoot);
+
+    // Step 2: Set up git-crypt
+    setupGitCrypt(tree, projectRoot);
+
+    // Step 3: Set up npm authentication
+    setupNpmAuth(tree, projectRoot);
+
+    // Step 4: Set up husky
+    setupHusky(tree, projectRoot);
+
+    // Step 5: Commit all files (they will be encrypted if they match patterns in .gitattributes)
+    commitInitialFiles(projectRoot);
+
+    console.log('Git setup completed.');
+
+    // Return function to execute after all files are written to disk
+    if (performGitOperations) {
+        return () => {
+            console.log('All files have been generated. Now setting up Git...');
+
+            // Step 1: Initialize git repository
+            setupGit(tree, projectRoot);
+
+            // Step 2: Set up git-crypt
+            setupGitCrypt(tree, projectRoot);
+
+            // Step 3: Set up npm authentication
+            setupNpmAuth(tree, projectRoot);
+
+            // Step 4: Set up husky
+            setupHusky(tree, projectRoot);
+
+            // Step 5: Commit all files (they will be encrypted if they match patterns in .gitattributes)
+            commitInitialFiles(projectRoot);
+
+            console.log('Git setup completed.');
+        };
+    }
 }
 
 const generateServers = async (tree: Tree, options: any) => {
@@ -114,7 +168,7 @@ const generateModules = async (tree: Tree, options: any) => {
                 ns: options.ns,
                 type: packageName,
             };
-            await generatePackage(tree, configs, false);
+            await generatePackage(tree, configs);
         }
     }
 };

package/src/generators/add-fullstack/schema.d.ts

@@ -1,5 +1,5 @@
 export interface AddFullstackGeneratorSchema {
     name: string;
     config?: string;
-    path?: string;  // Optional path property for specifying the base path
-}
+    path?: string; // Optional path property for specifying the base path
+}

package/src/generators/add-fullstack/updates/gitAttributesSetup.ts

@@ -0,0 +1,60 @@
+import { Tree } from '@nx/devkit';
+import * as path from 'path';
+import * as fs from 'fs';
+
+/**
+ * Renames _gitattributes to .gitattributes during the Tree modification phase
+ */
+export function prepareGitAttributes(tree: Tree, projectRoot: string) {
+    const gitattributesSrc = path.join(projectRoot, '_gitattributes');
+    const gitattributesDest = path.join(projectRoot, '.gitattributes');
+    
+    if (tree.exists(gitattributesSrc)) {
+        // Read content and write to destination
+        const content = tree.read(gitattributesSrc).toString();
+        tree.write(gitattributesDest, content);
+        // Remove the source file
+        tree.delete(gitattributesSrc);
+        console.log(`Renamed ${gitattributesSrc} to ${gitattributesDest}`);
+        return true;
+    }
+    
+    return false;
+}
+
+/**
+ * Updates .gitattributes with additional patterns if needed after files are on disk
+ */
+export function updateGitAttributes(projectRoot: string, attributesToAdd: Record<string, string>) {
+    try {
+        const gitattributesPath = path.join(projectRoot, '.gitattributes');
+        
+        if (!fs.existsSync(gitattributesPath)) {
+            console.log('.gitattributes file not found, skipping update');
+            return false;
+        }
+        
+        let gitattributesContent = fs.readFileSync(gitattributesPath, 'utf8');
+        let contentUpdated = false;
+        
+        // Add each attribute if not already present
+        Object.entries(attributesToAdd).forEach(([pattern, attribute]) => {
+            const attributeLine = `${pattern} ${attribute}`;
+            if (!gitattributesContent.includes(attributeLine)) {
+                contentUpdated = true;
+                gitattributesContent += `\n${attributeLine}`;
+            }
+        });
+        
+        // Write the file if we made changes
+        if (contentUpdated) {
+            fs.writeFileSync(gitattributesPath, gitattributesContent, 'utf8');
+            console.log('Updated .gitattributes file with additional patterns');
+        }
+        
+        return contentUpdated;
+    } catch (error) {
+        console.error('Error updating .gitattributes:', error);
+        return false;
+    }
+} 

package/src/generators/add-fullstack/updates/gitCryptSetup.ts

@@ -0,0 +1,77 @@
+import { Tree } from '@nx/devkit';
+import * as path from 'path';
+import { execSync } from 'child_process';
+import * as fs from 'fs';
+
+/**
+ * Set up git-crypt for encrypting sensitive files
+ */
+export function setupGitCrypt(tree: Tree, projectRoot: string) {
+    try {
+        // Navigate to the project directory
+        const originalDir = process.cwd();
+        process.chdir(projectRoot);
+        
+        console.log('Setting up git-crypt in:', projectRoot);
+        
+        // Check if git-crypt is installed
+        try {
+            execSync('git-crypt --version', { stdio: 'ignore' });
+        } catch (error) {
+            console.log('git-crypt not found. Please install git-crypt to encrypt sensitive files.');
+            console.log('Continuing without git-crypt setup.');
+            process.chdir(originalDir);
+            return;
+        }
+        
+        // Check if git-crypt is already initialized
+        const gitCryptDir = path.join(projectRoot, '.git-crypt');
+        const gitCryptConfigExists = fs.existsSync(gitCryptDir);
+        
+        if (gitCryptConfigExists) {
+            console.log('git-crypt is already initialized for this repository');
+        } else {
+            // Initialize git-crypt
+            try {
+                execSync('git-crypt init', { stdio: 'inherit' });
+                console.log('git-crypt initialized');
+            } catch (error) {
+                console.error('Error initializing git-crypt:', error);
+                process.chdir(originalDir);
+                return;
+            }
+        }
+        
+        // Create keys directory if it doesn't exist
+        const keysDir = path.join(projectRoot, '.git-crypt', 'keys');
+        if (!fs.existsSync(keysDir)) {
+            fs.mkdirSync(keysDir, { recursive: true });
+        }
+        
+        // Generate and export a key for sharing only if it doesn't exist
+        const keyFile = path.join(keysDir, 'default-git-crypt-key');
+        if (!fs.existsSync(keyFile)) {
+            try {
+                execSync(`git-crypt export-key ${keyFile}`, { stdio: 'inherit' });
+                console.log(`Generated git-crypt key at: ${keyFile}`);
+                console.log('Keep this key secure and share it with team members who need access to encrypted files.');
+            } catch (error) {
+                console.error('Error exporting git-crypt key:', error);
+            }
+        } else {
+            console.log(`git-crypt key already exists at: ${keyFile}`);
+        }
+        
+        console.log('Git-crypt setup completed - sensitive files will be encrypted');
+        
+        // Return to original directory
+        process.chdir(originalDir);
+    } catch (error) {
+        console.error('Error setting up git-crypt:', error);
+        // Continue even if there's an error to not block the overall process
+        const originalDir = process.cwd();
+        if (originalDir !== projectRoot) {
+            process.chdir(originalDir);
+        }
+    }
+}

package/src/generators/add-fullstack/updates/gitSetup.ts

@@ -0,0 +1,63 @@
+import { Tree } from '@nx/devkit';
+import { execSync } from 'child_process';
+
+/**
+ * Sets up git repository in the project
+ */
+export function setupGit(tree: Tree, projectRoot: string) {
+    try {
+        // Navigate to the project directory
+        const originalDir = process.cwd();
+        process.chdir(projectRoot);
+        
+        console.log('Setting up git in:', projectRoot);
+        
+        // Initialize git repository
+        execSync('git init', { stdio: 'inherit' });
+        console.log('Git repository initialized');
+        
+        // Return to original directory
+        process.chdir(originalDir);
+    } catch (error) {
+        console.error('Error setting up git:', error);
+        // Continue even if there's an error to not block the overall process
+        const originalDir = process.cwd();
+        if (originalDir !== projectRoot) {
+            process.chdir(originalDir);
+        }
+    }
+}
+
+/**
+ * Commit all initial files to git
+ */
+export function commitInitialFiles(projectRoot: string) {
+    try {
+        // Navigate to the project directory
+        const originalDir = process.cwd();
+        process.chdir(projectRoot);
+        
+        console.log('Staging initial files...');
+        
+        try {
+            // Add all files
+            execSync('git add .', { stdio: 'inherit' });
+            
+            // Commit with --no-verify to bypass husky hooks
+            execSync('git commit -m "Initial commit from @common-stack/generate-plugin" --no-verify', { stdio: 'inherit' });
+            console.log('Initial commit created (bypassing pre-commit hooks)');
+        } catch (error) {
+            console.error('Error committing files:', error);
+        }
+        
+        // Return to original directory
+        process.chdir(originalDir);
+    } catch (error) {
+        console.error('Error during git commit process:', error);
+        // Continue even if there's an error to not block the overall process
+        const originalDir = process.cwd();
+        if (originalDir !== projectRoot) {
+            process.chdir(originalDir);
+        }
+    }
+}

package/src/generators/add-fullstack/updates/htmlPluginUpdate.ts

@@ -1,5 +1,6 @@
 import { Tree } from '@nx/devkit';
 import * as path from 'path';
+import * as fs from 'fs';
 
 export function updateHtmlPlugin(tree: Tree, projectRoot: string) {
     const filePath = path.join(projectRoot, 'tools', 'html-plugin-template.ejs');
@@ -9,3 +10,33 @@ export function updateHtmlPlugin(tree: Tree, projectRoot: string) {
         tree.write(filePath, newContents);
     }
 }
+
+export function renameDotFiles(tree: Tree, projectRoot: string) {
+    // List of files that need to be renamed from _name to .name
+    const dotFiles = [
+        { src: '_gitignore', dest: '.gitignore' },
+        { src: '_browserslistrc', dest: '.browserslistrc' },
+        { src: '_eslintignore', dest: '.eslintignore' },
+        { src: '_eslintrc.js', dest: '.eslintrc.js' },
+        { src: '_nxignore', dest: '.nxignore' },
+        { src: '_markdownlint.json', dest: '.markdownlint.json' },
+        { src: '_markdownlintignore', dest: '.markdownlintignore' },
+        { src: '_npmrc', dest: '.npmrc' },
+    ];
+
+    // Process each file
+    dotFiles.forEach(({ src, dest }) => {
+        const srcPath = path.join(projectRoot, src);
+        const destPath = path.join(projectRoot, dest);
+        
+        // Check if the source file exists
+        if (tree.exists(srcPath)) {
+            // Read content and write to destination
+            const content = tree.read(srcPath).toString();
+            tree.write(destPath, content);
+            // Remove the source file
+            tree.delete(srcPath);
+            console.log(`Renamed ${srcPath} to ${destPath}`);
+        }
+    });
+}

package/src/generators/add-fullstack/updates/huskySetup.ts

@@ -0,0 +1,84 @@
+import { Tree } from '@nx/devkit';
+import * as path from 'path';
+import { execSync } from 'child_process';
+import * as fs from 'fs';
+
+export function setupHusky(tree: Tree, projectRoot: string) {
+    try {
+        // Navigate to the project directory
+        const originalDir = process.cwd();
+        process.chdir(projectRoot);
+        
+        console.log('Setting up husky in:', projectRoot);
+        
+        try {
+            // Initialize husky (creates .husky directory and prepares hooks)
+            execSync('npx husky init', { stdio: 'inherit' });
+            console.log('Husky initialized successfully');
+            
+            // Copy the husky hook files from _husky/ to .husky/
+            const sourceDir = path.join(projectRoot, '_husky');
+            const targetDir = path.join(projectRoot, '.husky');
+            
+            if (fs.existsSync(sourceDir) && fs.existsSync(targetDir)) {
+                // Read all files from _husky directory
+                const files = fs.readdirSync(sourceDir);
+                
+                // Copy each file to .husky directory
+                files.forEach(file => {
+                    const sourcePath = path.join(sourceDir, file);
+                    const targetPath = path.join(targetDir, file);
+                    
+                    if (fs.statSync(sourcePath).isFile()) {
+                        // Read content from our hook template
+                        const content = fs.readFileSync(sourcePath, 'utf8');
+                        
+                        // Remove any old shebang lines to avoid deprecation warnings
+                        const cleanContent = content
+                            .replace(/^#!\/usr\/bin\/env sh\n/, '')
+                            .replace(/^\. "\$\(dirname -- "\$0"\)\/\_\/husky\.sh"\n/, '')
+                            .trim();
+                        
+                        // Write the hook content
+                        fs.writeFileSync(targetPath, cleanContent, 'utf8');
+                        
+                        try {
+                            // Make the hook executable
+                            fs.chmodSync(targetPath, '755');
+                            console.log(`Made executable: ${file}`);
+                        } catch (error) {
+                            console.log(`Note: Could not set executable permissions for ${file}. This is normal on Windows.`);
+                        }
+                        
+                        console.log(`Copied: ${file} to .husky directory`);
+                    }
+                });
+                
+                // Remove the _husky directory after copying
+                try {
+                    fs.rmdirSync(sourceDir, { recursive: true });
+                    console.log('Removed _husky directory after copying');
+                } catch (error) {
+                    console.log('Could not remove _husky directory, but continuing...');
+                }
+            } else {
+                console.log('Source or target directory not found, skipping hook setup');
+            }
+            
+            console.log('Husky setup completed successfully');
+        } catch (error) {
+            console.error('Error running husky commands:', error);
+            console.log('Continuing despite husky setup failure');
+        }
+        
+        // Return to original directory
+        process.chdir(originalDir);
+    } catch (error) {
+        console.error('Error setting up husky:', error);
+        // Continue even if there's an error to not block the overall process
+        const originalDir = process.cwd();
+        if (originalDir !== projectRoot) {
+            process.chdir(originalDir);
+        }
+    }
+}

package/src/generators/add-fullstack/updates/index.ts

@@ -1,6 +1,13 @@
-export * from './jenkinsfileUpdate';
-export * from './packageJsonUpdate';
-export * from './lernaJsonUpdate';
-export * from './htmlPluginUpdate';
-export * from './licenseUpdate';
-export * from './ignoreUpdate';
+export { updateJenkinsFile } from './jenkinsUpdate';
+export { updatePackageJson } from './packageJsonUpdate';
+export { backupLernaJson, restoreLernaJson } from './lernaUpdate';
+export { updateLicense } from './licenseUpdate';
+export { backupFiles, restoreFiles } from './fileBackup';
+export { updateRepository } from './repositoryUpdate';
+export { updateHtmlPlugin, renameDotFiles } from './htmlPluginUpdate';
+export { setupGit, commitInitialFiles } from './gitSetup';
+export { setupGitCrypt } from './gitCryptSetup';
+export { setupHusky } from './huskySetup';
+export { prepareGitAttributes, updateGitAttributes } from './gitAttributesSetup';
+export { setupNpmAuth } from './npmAuthSetup';
+export * from './nxSetup';

package/src/generators/add-fullstack/updates/jenkinsUpdate.ts

@@ -0,0 +1,53 @@
+import { Tree } from '@nx/devkit';
+import * as path from 'path';
+
+export function updateJenkinsFile(tree: Tree, projectRoot: string, name: string) {
+    const filePath = path.join(projectRoot, 'Jenkinsfile');
+    const paramsToUpdate = {
+        BASE_NAMESPACE: name,
+        CONNECTION_ID: name,
+        WORKSPACE_ID: name,
+        UNIQUE_NAME: name,
+    };
+
+    if (tree.exists(filePath)) {
+        const jenkinsFileContent = tree.read(filePath).toString();
+        let labelExists = false;
+
+        const updatedContent = jenkinsFileContent.split('\n').map(line => {
+            // Check if the label is already defined and skip modifying it
+            if (line.includes('label') && line.includes('kubernetes')) {
+                labelExists = true;
+            }
+
+            // Update only the specified parameters
+            for (const param in paramsToUpdate) {
+                if (line.includes(`string(name: '${param}'`)) {
+                    return line.replace(/defaultValue: '.*'/, `defaultValue: '${paramsToUpdate[param]}'`);
+                }
+            }
+            return line;
+        }).join('\n');
+
+        let finalContent = updatedContent;
+        
+        // Add missing parameters if they don't exist
+        Object.keys(paramsToUpdate).forEach(param => {
+            if (!finalContent.includes(`string(name: '${param}'`)) {
+                finalContent = finalContent.concat(
+                    `string(name: '${param}', defaultValue: '${paramsToUpdate[param]}', description: '${param.replace(/_/g, ' ').toLowerCase()}')\n`
+                );
+            }
+        });
+
+        // Only write back to the file if we have made changes
+        if (!labelExists || Object.keys(paramsToUpdate).some(param => !finalContent.includes(`string(name: '${param}'`))) {
+            tree.write(filePath, finalContent);
+            console.log(`Updated Jenkinsfile with parameters for: ${name}`);
+        } else {
+            console.log('No changes needed in Jenkinsfile');
+        }
+    } else {
+        console.log('Jenkinsfile not found, skipping update');
+    }
+} 

package/src/generators/add-fullstack/updates/{lernaJsonUpdate.ts → lernaUpdate.ts}

@@ -19,15 +19,14 @@ export function backupLernaJson(tree: Tree, projectRoot: string) {
                     backup[param] = paramValue;
                     exists = true;
                 }
-            } else {
-                if (lernaJson[param]) {
-                    backup[param] = lernaJson[param];
-                    exists = true;
-                }
+            } else if (lernaJson[param]) {
+                backup[param] = lernaJson[param];
+                exists = true;
             }
         }
 
         if (exists) {
+            console.log('Backed up important values from lerna.json');
             return backup;
         }
     }
@@ -39,7 +38,7 @@ export function restoreLernaJson(tree: Tree, projectRoot: string, backup: any) {
     const lernaJsonPath = path.join(projectRoot, 'lerna.json');
     if (backup && fs.existsSync(lernaJsonPath)) {
         updateJson(tree, lernaJsonPath, (lernaJson: any) => {
-            Object.keys(backup).forEach(param => {
+            Object.keys(backup).forEach((param) => {
                 if (param.includes(':')) {
                     lernaJson = set(lernaJson, param.split(':'), backup[param]);
                 } else {
@@ -50,4 +49,4 @@ export function restoreLernaJson(tree: Tree, projectRoot: string, backup: any) {
         });
         console.log('Restored old values in lerna.json');
     }
-}
+}

package/src/generators/add-fullstack/updates/licenseUpdate.ts

@@ -5,11 +5,11 @@ export function updateLicense(tree: Tree, projectRoot: string) {
     const files = ['LICENSE-GNU', 'LICENSE-IST', 'LICENSE-MIT'];
     const packageJsonPath = path.join(projectRoot, 'package.json');
     const packageJson = readJson(tree, packageJsonPath);
-    
+
     if (packageJson.license) {
         const fileName = `LICENSE-${packageJson.license.toUpperCase()}`;
-        
-        files.forEach(file => {
+
+        files.forEach((file) => {
             const filePath = path.join(projectRoot, file);
             if (file === fileName) {
                 if (tree.exists(filePath)) {