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

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

@@ -0,0 +1,95 @@
+import { exec } from 'child_process';
+import { resolve } from 'path';
+import { readFile, writeFile } from 'fs/promises';
+import { fileURLToPath } from 'url';
+import { runLintStaged } from './runLint.mjs'; // Assuming updateLint.mjs exports this function
+
+const __dirname = fileURLToPath(new URL('.', import.meta.url));
+
+// Constants for JSON formatting
+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');
+
+// Packages to check
+const packagesToCheck = [
+    '@common-stack/server-stack',
+    '@common-stack/frontend-stack-react'
+];
+
+// 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');
+};
+
+// Function to run `ncu`, 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();
+    });
+  });
+
+  // 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);
+    }
+  }
+
+  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);
+  }
+};
+
+// 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);
+  });
+}

package/src/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/src/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/src/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/src/generators/add-fullstack/generator.ts

@@ -1,7 +1,17 @@
 import { addProjectConfiguration, formatFiles, generateFiles, Tree, updateJson } from '@nx/devkit';
 import * as path from 'path';
+import fs from 'fs';
 import { AddFullstackGeneratorSchema } from './schema';
-import { getValid } from '../../utils';
+import { getValid, isValid } from '../../utils';
+import { 
+    generateBackend, 
+    generateFrontend, 
+    generateMoleculer,
+    generateBrowserPackage,
+    generateClientPackage,
+    generateCorePackage,
+    generateServerPackage,
+} from '../../index';
 
 export async function addFullstackGenerator(tree: Tree, options: AddFullstackGeneratorSchema) {
     const projectRoot = getValid(options.name) ?? 'fullstack-pro';
@@ -17,6 +27,78 @@ export async function addFullstackGenerator(tree: Tree, options: AddFullstackGen
         return packageJson;
     });
     await formatFiles(tree);
+
+    if (isValid(options.config)) {
+        const configPath = getValid(options.config);
+        if (fs.existsSync(configPath)) {
+            try {
+                const content = String(fs.readFileSync(configPath));
+                const configs = JSON.parse(content);
+                configs.parent = projectRoot;
+
+                await processConfigs(tree, configs);
+            } catch(error) {
+                console.error('Error while reading config.', error);
+            }
+        }
+    }
+}
+
+const processConfigs = async (tree: Tree, configs: any) => {
+    if (configs.servers) {
+        await generateServers(tree, configs.parent, configs.servers);
+    }
+
+    if (configs.packages && configs.packages.modules) {
+        await generatePackages(tree, configs.parent, configs.packages.modules);
+    }
+}
+
+const generateServers = async (tree: Tree, parent: string, servers: any) => {
+    for (const [serverName, serverConfig] of Object.entries(servers)) {
+        const configs: any = serverConfig;
+        configs.name = serverName;
+        configs.directory = `${parent}/servers`;
+        
+        switch(configs?.type) {
+            case 'frontend':
+                await generateFrontend(tree, configs);
+                break;
+            case 'backend':
+                await generateBackend(tree, configs);
+                break;
+            case 'moleculer':
+                await generateMoleculer(tree, configs);
+                break;
+            default:
+                break;
+        }
+    }
+}
+
+const generatePackages = async (tree: Tree, parent: string, packages: any) => {
+    for (const [packageName, packageConfig] of Object.entries(packages)) {
+        const configs: any = packageConfig;
+        configs.name = packageName;
+        configs.directory = `${parent}/packages`;
+        
+        switch((packageConfig as any)?.type) {
+            case 'packages-core':
+                await generateCorePackage(tree, configs);
+                break;
+            case 'packages-browser':
+                await generateBrowserPackage(tree, configs);
+                break;
+            case 'packages-client':
+                await generateClientPackage(tree, configs);
+                break;
+            case 'packages-server':
+                await generateServerPackage(tree, configs);
+                break;
+            default:
+                break;
+        }
+    }
 }
 
 export default addFullstackGenerator;

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

@@ -1,3 +1,4 @@
 export interface AddFullstackGeneratorSchema {
     name: string;
+    config?: string;
 }

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

@@ -8,6 +8,10 @@
             "type": "string",
             "description": "",
             "x-prompt": "What name would you like to use?"
+        },
+        "config": {
+            "type": "string",
+            "description": "The absolute path of config file"
         }
     },
     "required": ["name"]

package/src/generators/add-moleculer/files/package.json

@@ -31,7 +31,7 @@
         "@common-stack/client-core": "5.0.6-alpha.3",
         "@common-stack/core": "5.0.6-alpha.3",
         "@common-stack/server-core": "5.0.6-alpha.3",
-        "@common-stack/server-stack": "5.0.6-alpha.3",
+        "@common-stack/server-stack": "5.0.6-alpha.7",
         "@common-stack/store-mongo": "5.0.6-alpha.3",
         "@container-stack/mailing-api": "5.2.1-alpha.1",
         "app-root-path": "^3.0.0",

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

@@ -4,19 +4,20 @@ import { AddMoleculerGeneratorSchema } from './schema';
 import { isValid, getValid } from '../../utils';
 
 export async function addMoleculerGenerator(tree: Tree, options: AddMoleculerGeneratorSchema) {
+    const configs: any = {...options};
+    return await generateMoleculer(tree, configs);
+}
+
+export const generateMoleculer = async (tree: Tree, options: any) => {
     const projectName = getValid(options.name) ?? 'moleculer-server';
     const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
-    // addProjectConfiguration(tree, options.name, {
-    //     root: projectRoot,
-    //     projectType: 'library',
-    //     sourceRoot: `${projectRoot}/src`,
-    //     targets: {},
-    // });
+
     generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
     updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
         packageJson['name'] = options.name;
         return packageJson;
     });
+
     await formatFiles(tree);
 }