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

package/src/generators/add-moleculer/files/_draftignore

@@ -0,0 +1,4 @@
+*.swp
+*.tmp
+*.temp
+.git*

package/src/generators/add-moleculer/files/_gitignore

@@ -0,0 +1,2 @@
+src/modules/module.ts
+common/

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

@@ -29,11 +29,11 @@
         "common": "link:./common"
     },
     "dependencies": {
-        "@common-stack/client-core": "6.0.8-alpha.31",
-        "@common-stack/core": "6.0.8-alpha.31",
-        "@common-stack/server-core": "6.0.8-alpha.31",
-        "@common-stack/server-stack": "6.0.8-alpha.66",
-        "@common-stack/store-mongo": "6.0.8-alpha.66",
+        "@common-stack/client-core": "7.0.4-alpha.0",
+        "@common-stack/core": "7.0.4-alpha.0",
+        "@common-stack/server-core": "7.0.4-alpha.0",
+        "@common-stack/server-stack": "7.0.4-alpha.0",
+        "@common-stack/store-mongo": "7.0.4-alpha.0",
         "@container-stack/mailing-api": "5.2.1-alpha.1",
         "helmet": "^3.21.2",
         "react": "18.2.0",

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

@@ -1,29 +1,53 @@
-import { addProjectConfiguration, updateJson, formatFiles, generateFiles, Tree } from '@nx/devkit';
+/* eslint-disable import/no-extraneous-dependencies */
+// eslint-disable-next-line jsonc/indent
+import { generateFiles, names, offsetFromRoot, Tree, stripIndents } from '@nx/devkit';
 import * as path from 'path';
+import { libraryGenerator } from '@nx/js';
 import { AddMoleculerGeneratorSchema } from './schema';
-import { isValid, getValid } from '../../utils';
-
-const DEFAULT_SERVER_NAME = 'moleculer-server';
+import { copyNpmrc, renameDotFiles } from '../../utils/copyDotfiles';
 
 export async function addMoleculerGenerator(tree: Tree, options: AddMoleculerGeneratorSchema) {
-    const projectName = isValid(options.name) ? `${getValid(options.name)}-server` : DEFAULT_SERVER_NAME;
-    const configs: any = {...options, name: projectName};
-
-    return await generateMoleculer(tree, configs);
-}
+    const libsDir = options.directory || 'servers';
+    const fullLibsDir = path.join(options.projectRoot || '', libsDir);
 
-export const generateMoleculer = async (tree: Tree, options: any) => {
-    let projectName = getValid(options.name) ?? DEFAULT_SERVER_NAME;
-    const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
-    projectName = isValid(options.ns) ? `${getValid(options.ns)}-${projectName}` : projectName;
+    const name = options.name || 'moleculer-server';
+    const normalizedName = names(name).fileName;
+    const fullName = path.join(fullLibsDir, normalizedName);
 
-    generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
-    updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
-        packageJson['name'] = projectName;
-        return packageJson;
+    // Run the Nx library generator to create the basic structure
+    await libraryGenerator(tree, {
+        name: normalizedName,
+        directory: fullLibsDir,
+        unitTestRunner: 'jest',
+        tags: `scope:moleculer,type:app`,
     });
 
-    await formatFiles(tree);
+    // Generate the custom files
+    const templateOptions = {
+        ...options,
+        ...names(name),
+        dot: '.',
+        offsetFromRoot: offsetFromRoot(fullName),
+        template: '',
+    };
+
+    generateFiles(tree, path.join(__dirname, 'files'), fullName, templateOptions);
+
+    // Rename underscore files to dotfiles
+    renameDotFiles(tree, fullName);
+
+    // Copy .npmrc from the project root
+    const projectRoot = options.projectRoot || '';
+    copyNpmrc(tree, projectRoot, fullName);
+
+    console.log(stripIndents`
+    Thank you for using the @common-stack moleculer-server generator!
+    
+    Next steps:
+    
+    - Run \`yarn\` to install dependencies
+    - Start application with \`yarn start\`
+  `);
 }
 
 export default addMoleculerGenerator;

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

@@ -0,0 +1,6 @@
+export interface AddMoleculerGeneratorSchema {
+    name?: string;
+    directory?: string;
+    ns?: string;
+    projectRoot?: string;
+}