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

package/lib/generators/add-fullstack/updates/nxSetup.cjs

@@ -0,0 +1,81 @@
+'use strict';var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),readline=require('readline');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 readline__namespace=/*#__PURE__*/_interopNamespaceDefault(readline);/**
+ * Prompts the user for AWS credentials and updates nx.json
+ */
+function setupNxConfig(tree, projectRoot) {
+    return tslib.__awaiter(this, void 0, void 0, function* () {
+        try {
+            // Create readline interface for user input
+            const rl = readline__namespace.createInterface({
+                input: process.stdin,
+                output: process.stdout
+            });
+            console.log('\nAWS Configuration for Nx Cache');
+            console.log('=============================');
+            console.log('This project uses AWS S3 for remote caching with Nx.');
+            console.log('Please provide your AWS credentials or press Enter to skip for now.');
+            // Prompt for the AWS access key ID
+            const awsAccessKeyId = yield new Promise((resolve) => {
+                rl.question('AWS Access Key ID: ', (answer) => {
+                    resolve(answer.trim());
+                });
+            });
+            // Prompt for the AWS secret access key if access key ID was provided
+            let awsSecretAccessKey = '';
+            if (awsAccessKeyId) {
+                awsSecretAccessKey = yield new Promise((resolve) => {
+                    rl.question('AWS Secret Access Key: ', (answer) => {
+                        resolve(answer.trim());
+                    });
+                });
+            }
+            // Prompt for the AWS region
+            const awsRegion = yield new Promise((resolve) => {
+                rl.question('AWS Region (default: us-east-1): ', (answer) => {
+                    resolve(answer.trim() || 'us-east-1');
+                });
+            });
+            // Prompt for the S3 bucket name
+            const awsBucket = yield new Promise((resolve) => {
+                rl.question('AWS S3 Bucket Name: ', (answer) => {
+                    resolve(answer.trim());
+                });
+            });
+            rl.close();
+            // Wait for the close event to ensure we don't proceed before input is complete
+            yield new Promise(resolve => rl.on('close', resolve));
+            // Update nx.json if it exists and AWS credentials were provided
+            if (awsAccessKeyId && awsSecretAccessKey && awsBucket) {
+                const nxJsonPath = path__namespace.join(projectRoot, 'nx.json');
+                if (tree.exists(nxJsonPath)) {
+                    devkit.updateJson(tree, nxJsonPath, (json) => {
+                        // Preserve the existing configuration, just update the AWS credentials
+                        if (!json.tasksRunnerOptions) {
+                            json.tasksRunnerOptions = {};
+                        }
+                        if (!json.tasksRunnerOptions.default) {
+                            json.tasksRunnerOptions.default = {
+                                runner: '@nx-aws-plugin/nx-aws-cache',
+                                options: {
+                                    runtimeCacheInputs: ['node --version']
+                                }
+                            };
+                        }
+                        // Update only the AWS credentials
+                        json.tasksRunnerOptions.default.options = Object.assign(Object.assign({}, json.tasksRunnerOptions.default.options), { awsAccessKeyId,
+                            awsSecretAccessKey,
+                            awsRegion,
+                            awsBucket });
+                        console.log('Updated nx.json with AWS configuration');
+                        return json;
+                    });
+                }
+            }
+            else {
+                console.log('Skipped AWS configuration for nx.json');
+            }
+        }
+        catch (error) {
+            console.error('Error setting up Nx configuration:', error);
+        }
+    });
+}exports.setupNxConfig=setupNxConfig;//# sourceMappingURL=nxSetup.cjs.map

package/lib/generators/add-fullstack/updates/nxSetup.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"nxSetup.cjs","sources":["../../../../src/generators/add-fullstack/updates/nxSetup.ts"],"sourcesContent":[null],"names":["readline","path","updateJson"],"mappings":"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"}

package/lib/generators/add-fullstack/updates/nxSetup.d.ts

@@ -0,0 +1,5 @@
+import { Tree } from '@nx/devkit';
+/**
+ * Prompts the user for AWS credentials and updates nx.json
+ */
+export declare function setupNxConfig(tree: Tree, projectRoot: string): Promise<void>;

package/lib/generators/add-fullstack/updates/nxSetup.mjs

@@ -0,0 +1,81 @@
+import {__awaiter}from'tslib';import {updateJson}from'@nx/devkit';import*as path from'path';import*as readline from'readline';/**
+ * Prompts the user for AWS credentials and updates nx.json
+ */
+function setupNxConfig(tree, projectRoot) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            // Create readline interface for user input
+            const rl = readline.createInterface({
+                input: process.stdin,
+                output: process.stdout
+            });
+            console.log('\nAWS Configuration for Nx Cache');
+            console.log('=============================');
+            console.log('This project uses AWS S3 for remote caching with Nx.');
+            console.log('Please provide your AWS credentials or press Enter to skip for now.');
+            // Prompt for the AWS access key ID
+            const awsAccessKeyId = yield new Promise((resolve) => {
+                rl.question('AWS Access Key ID: ', (answer) => {
+                    resolve(answer.trim());
+                });
+            });
+            // Prompt for the AWS secret access key if access key ID was provided
+            let awsSecretAccessKey = '';
+            if (awsAccessKeyId) {
+                awsSecretAccessKey = yield new Promise((resolve) => {
+                    rl.question('AWS Secret Access Key: ', (answer) => {
+                        resolve(answer.trim());
+                    });
+                });
+            }
+            // Prompt for the AWS region
+            const awsRegion = yield new Promise((resolve) => {
+                rl.question('AWS Region (default: us-east-1): ', (answer) => {
+                    resolve(answer.trim() || 'us-east-1');
+                });
+            });
+            // Prompt for the S3 bucket name
+            const awsBucket = yield new Promise((resolve) => {
+                rl.question('AWS S3 Bucket Name: ', (answer) => {
+                    resolve(answer.trim());
+                });
+            });
+            rl.close();
+            // Wait for the close event to ensure we don't proceed before input is complete
+            yield new Promise(resolve => rl.on('close', resolve));
+            // Update nx.json if it exists and AWS credentials were provided
+            if (awsAccessKeyId && awsSecretAccessKey && awsBucket) {
+                const nxJsonPath = path.join(projectRoot, 'nx.json');
+                if (tree.exists(nxJsonPath)) {
+                    updateJson(tree, nxJsonPath, (json) => {
+                        // Preserve the existing configuration, just update the AWS credentials
+                        if (!json.tasksRunnerOptions) {
+                            json.tasksRunnerOptions = {};
+                        }
+                        if (!json.tasksRunnerOptions.default) {
+                            json.tasksRunnerOptions.default = {
+                                runner: '@nx-aws-plugin/nx-aws-cache',
+                                options: {
+                                    runtimeCacheInputs: ['node --version']
+                                }
+                            };
+                        }
+                        // Update only the AWS credentials
+                        json.tasksRunnerOptions.default.options = Object.assign(Object.assign({}, json.tasksRunnerOptions.default.options), { awsAccessKeyId,
+                            awsSecretAccessKey,
+                            awsRegion,
+                            awsBucket });
+                        console.log('Updated nx.json with AWS configuration');
+                        return json;
+                    });
+                }
+            }
+            else {
+                console.log('Skipped AWS configuration for nx.json');
+            }
+        }
+        catch (error) {
+            console.error('Error setting up Nx configuration:', error);
+        }
+    });
+}export{setupNxConfig};//# sourceMappingURL=nxSetup.mjs.map

package/lib/generators/add-fullstack/updates/nxSetup.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"nxSetup.mjs","sources":["../../../../src/generators/add-fullstack/updates/nxSetup.ts"],"sourcesContent":[null],"names":[],"mappings":"8HAIA;;AAEG;AACmB,SAAA,aAAa,CAAC,IAAU,EAAE,WAAmB,EAAA;;AAC/D,QAAA,IAAI;;AAEA,YAAA,MAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC;gBAChC,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;AACzB,aAAA,CAAC,CAAC;AAEH,YAAA,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;AAChD,YAAA,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;AAC7C,YAAA,OAAO,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAC;AACpE,YAAA,OAAO,CAAC,GAAG,CAAC,qEAAqE,CAAC,CAAC;;YAGnF,MAAM,cAAc,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,KAAI;gBACzD,EAAE,CAAC,QAAQ,CAAC,qBAAqB,EAAE,CAAC,MAAM,KAAI;AAC1C,oBAAA,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;AAC3B,iBAAC,CAAC,CAAC;AACP,aAAC,CAAC,CAAC;;YAGH,IAAI,kBAAkB,GAAG,EAAE,CAAC;YAC5B,IAAI,cAAc,EAAE;gBAChB,kBAAkB,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,KAAI;oBACvD,EAAE,CAAC,QAAQ,CAAC,yBAAyB,EAAE,CAAC,MAAM,KAAI;AAC9C,wBAAA,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;AAC3B,qBAAC,CAAC,CAAC;AACP,iBAAC,CAAC,CAAC;aACN;;YAGD,MAAM,SAAS,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,KAAI;gBACpD,EAAE,CAAC,QAAQ,CAAC,mCAAmC,EAAE,CAAC,MAAM,KAAI;oBACxD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,WAAW,CAAC,CAAC;AAC1C,iBAAC,CAAC,CAAC;AACP,aAAC,CAAC,CAAC;;YAGH,MAAM,SAAS,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,KAAI;gBACpD,EAAE,CAAC,QAAQ,CAAC,sBAAsB,EAAE,CAAC,MAAM,KAAI;AAC3C,oBAAA,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;AAC3B,iBAAC,CAAC,CAAC;AACP,aAAC,CAAC,CAAC;YAEH,EAAE,CAAC,KAAK,EAAE,CAAC;;AAGX,YAAA,MAAM,IAAI,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;;AAGtD,YAAA,IAAI,cAAc,IAAI,kBAAkB,IAAI,SAAS,EAAE;gBACnD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;AACrD,gBAAA,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;oBACzB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,IAAI,KAAI;;AAElC,wBAAA,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;AAC1B,4BAAA,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;yBAChC;AAED,wBAAA,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE;AAClC,4BAAA,IAAI,CAAC,kBAAkB,CAAC,OAAO,GAAG;AAC9B,gCAAA,MAAM,EAAE,6BAA6B;AACrC,gCAAA,OAAO,EAAE;oCACL,kBAAkB,EAAE,CAAC,gBAAgB,CAAC;AACzC,iCAAA;6BACJ,CAAC;yBACL;;AAGD,wBAAA,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,GAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,EAAA,EAChC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,KAC1C,cAAc;4BACd,kBAAkB;4BAClB,SAAS;AACT,4BAAA,SAAS,GACZ,CAAC;AAEF,wBAAA,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;AACtD,wBAAA,OAAO,IAAI,CAAC;AAChB,qBAAC,CAAC,CAAC;iBACN;aACJ;iBAAM;AACH,gBAAA,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;aACxD;SACJ;QAAC,OAAO,KAAK,EAAE;AACZ,YAAA,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;SAC9D;KACJ,CAAA,CAAA;AAAA"}

package/lib/generators/add-fullstack/updates/packageJsonUpdate.cjs

@@ -1,4 +1,4 @@
-'use strict';var 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 updatePackageJson(tree, projectRoot, json) {
+'use strict';var devkit=require('@nx/devkit'),path=require('path');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 updatePackageJson(tree, projectRoot, json) {
     const packageJsonPath = path__namespace.join(projectRoot, 'package.json');
     devkit.updateJson(tree, packageJsonPath, (packageJson) => {
         Object.entries(json).reduce((acc, [key, value]) => {
@@ -7,36 +7,4 @@
         }, packageJson);
         return packageJson;
     });
-}
-function updateRepository(tree, projectRoot, repository) {
-    if (repository.startsWith('http://')) {
-        repository = repository.replace('http://', 'https://');
-    }
-    // update in package.json
-    updatePackageJson(tree, projectRoot, {
-        "homepage": `${repository}#readme`,
-        "bugs": {
-            "url": `${repository}/issues`
-        },
-        "repository": {
-            "type": "git",
-            "url": `git+${repository}.git`
-        },
-    });
-    // update in Jenkinsfile
-    const filePath = path__namespace.join(projectRoot, 'Jenkinsfile');
-    if (tree.exists(filePath)) {
-        const jenkinsFileContent = tree.read(filePath).toString();
-        let paramExists = false;
-        const updatedContent = jenkinsFileContent.split('\n').map(line => {
-            if (line.includes(`string(name: 'REPOSITORY_SSH_URL'`)) {
-                paramExists = true;
-                return line.replace(/defaultValue: '.*'/, `defaultValue: '${index.convertHttpsToSsh(repository)}'`);
-            }
-            return line;
-        }).join('\n');
-        if (paramExists) {
-            tree.write(filePath, updatedContent);
-        }
-    }
-}exports.updatePackageJson=updatePackageJson;exports.updateRepository=updateRepository;//# sourceMappingURL=packageJsonUpdate.cjs.map
+}exports.updatePackageJson=updatePackageJson;//# sourceMappingURL=packageJsonUpdate.cjs.map

package/lib/generators/add-fullstack/updates/packageJsonUpdate.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"packageJsonUpdate.cjs","sources":["../../../../src/generators/add-fullstack/updates/packageJsonUpdate.ts"],"sourcesContent":[null],"names":["path","updateJson","convertHttpsToSsh"],"mappings":"odAIgB,iBAAiB,CAAC,IAAU,EAAE,WAAmB,EAAE,IAAS,EAAA;IACxE,MAAM,eAAe,GAAGA,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAE/DC,iBAAU,CAAC,IAAI,EAAE,eAAe,EAAE,CAAC,WAAgB,KAAI;AACnD,QAAA,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,KAAI;AAC9C,YAAA,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AACjB,YAAA,OAAO,GAAG,CAAC;SACd,EAAE,WAAW,CAAC,CAAC;AAChB,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AACP,CAAC;SAEe,gBAAgB,CAAC,IAAU,EAAE,WAAmB,EAAE,UAAkB,EAAA;AAChF,IAAA,IAAI,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QAClC,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;KAC1D;;AAGD,IAAA,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE;QACjC,UAAU,EAAE,CAAG,EAAA,UAAU,CAAS,OAAA,CAAA;AAClC,QAAA,MAAM,EAAE;YACJ,KAAK,EAAE,CAAG,EAAA,UAAU,CAAS,OAAA,CAAA;AAChC,SAAA;AACD,QAAA,YAAY,EAAE;AACV,YAAA,MAAM,EAAE,KAAK;YACb,KAAK,EAAE,CAAO,IAAA,EAAA,UAAU,CAAM,IAAA,CAAA;AACjC,SAAA;AACJ,KAAA,CAAC,CAAC;;IAGH,MAAM,QAAQ,GAAGD,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;AAEvD,IAAA,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QACvB,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC1D,IAAI,WAAW,GAAG,KAAK,CAAC;AACxB,QAAA,MAAM,cAAc,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,IAAG;AAC7D,YAAA,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAmC,iCAAA,CAAA,CAAC,EAAE;gBACpD,WAAW,GAAG,IAAI,CAAC;AACnB,gBAAA,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAkB,eAAA,EAAAE,uBAAiB,CAAC,UAAU,CAAC,CAAA,CAAA,CAAG,CAAC,CAAC;aACjG;AACD,YAAA,OAAO,IAAI,CAAC;AAChB,SAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,IAAI,WAAW,EAAE;AACb,YAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;SACxC;KACJ;AACL"}
+{"version":3,"file":"packageJsonUpdate.cjs","sources":["../../../../src/generators/add-fullstack/updates/packageJsonUpdate.ts"],"sourcesContent":[null],"names":["path","updateJson"],"mappings":"0aAGgB,iBAAiB,CAAC,IAAU,EAAE,WAAmB,EAAE,IAAS,EAAA;IACxE,MAAM,eAAe,GAAGA,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAE/DC,iBAAU,CAAC,IAAI,EAAE,eAAe,EAAE,CAAC,WAAgB,KAAI;AACnD,QAAA,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,KAAI;AAC9C,YAAA,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AACjB,YAAA,OAAO,GAAG,CAAC;SACd,EAAE,WAAW,CAAC,CAAC;AAChB,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AACP"}

package/lib/generators/add-fullstack/updates/packageJsonUpdate.d.ts

@@ -1,3 +1,2 @@
 import { Tree } from '@nx/devkit';
 export declare function updatePackageJson(tree: Tree, projectRoot: string, json: any): void;
-export declare function updateRepository(tree: Tree, projectRoot: string, repository: string): void;

package/lib/generators/add-fullstack/updates/packageJsonUpdate.mjs

@@ -1,4 +1,4 @@
-import {updateJson}from'@nx/devkit';import*as path from'path';import {convertHttpsToSsh}from'../../../utils/index.mjs';function updatePackageJson(tree, projectRoot, json) {
+import {updateJson}from'@nx/devkit';import*as path from'path';function updatePackageJson(tree, projectRoot, json) {
     const packageJsonPath = path.join(projectRoot, 'package.json');
     updateJson(tree, packageJsonPath, (packageJson) => {
         Object.entries(json).reduce((acc, [key, value]) => {
@@ -7,36 +7,4 @@ import {updateJson}from'@nx/devkit';import*as path from'path';import {convertHtt
         }, packageJson);
         return packageJson;
     });
-}
-function updateRepository(tree, projectRoot, repository) {
-    if (repository.startsWith('http://')) {
-        repository = repository.replace('http://', 'https://');
-    }
-    // update in package.json
-    updatePackageJson(tree, projectRoot, {
-        "homepage": `${repository}#readme`,
-        "bugs": {
-            "url": `${repository}/issues`
-        },
-        "repository": {
-            "type": "git",
-            "url": `git+${repository}.git`
-        },
-    });
-    // update in Jenkinsfile
-    const filePath = path.join(projectRoot, 'Jenkinsfile');
-    if (tree.exists(filePath)) {
-        const jenkinsFileContent = tree.read(filePath).toString();
-        let paramExists = false;
-        const updatedContent = jenkinsFileContent.split('\n').map(line => {
-            if (line.includes(`string(name: 'REPOSITORY_SSH_URL'`)) {
-                paramExists = true;
-                return line.replace(/defaultValue: '.*'/, `defaultValue: '${convertHttpsToSsh(repository)}'`);
-            }
-            return line;
-        }).join('\n');
-        if (paramExists) {
-            tree.write(filePath, updatedContent);
-        }
-    }
-}export{updatePackageJson,updateRepository};//# sourceMappingURL=packageJsonUpdate.mjs.map
+}export{updatePackageJson};//# sourceMappingURL=packageJsonUpdate.mjs.map

package/lib/generators/add-fullstack/updates/packageJsonUpdate.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"packageJsonUpdate.mjs","sources":["../../../../src/generators/add-fullstack/updates/packageJsonUpdate.ts"],"sourcesContent":[null],"names":[],"mappings":"gIAIgB,iBAAiB,CAAC,IAAU,EAAE,WAAmB,EAAE,IAAS,EAAA;IACxE,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAE/D,UAAU,CAAC,IAAI,EAAE,eAAe,EAAE,CAAC,WAAgB,KAAI;AACnD,QAAA,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,KAAI;AAC9C,YAAA,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AACjB,YAAA,OAAO,GAAG,CAAC;SACd,EAAE,WAAW,CAAC,CAAC;AAChB,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AACP,CAAC;SAEe,gBAAgB,CAAC,IAAU,EAAE,WAAmB,EAAE,UAAkB,EAAA;AAChF,IAAA,IAAI,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QAClC,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;KAC1D;;AAGD,IAAA,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE;QACjC,UAAU,EAAE,CAAG,EAAA,UAAU,CAAS,OAAA,CAAA;AAClC,QAAA,MAAM,EAAE;YACJ,KAAK,EAAE,CAAG,EAAA,UAAU,CAAS,OAAA,CAAA;AAChC,SAAA;AACD,QAAA,YAAY,EAAE;AACV,YAAA,MAAM,EAAE,KAAK;YACb,KAAK,EAAE,CAAO,IAAA,EAAA,UAAU,CAAM,IAAA,CAAA;AACjC,SAAA;AACJ,KAAA,CAAC,CAAC;;IAGH,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;AAEvD,IAAA,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QACvB,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC1D,IAAI,WAAW,GAAG,KAAK,CAAC;AACxB,QAAA,MAAM,cAAc,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,IAAG;AAC7D,YAAA,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAmC,iCAAA,CAAA,CAAC,EAAE;gBACpD,WAAW,GAAG,IAAI,CAAC;AACnB,gBAAA,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAkB,eAAA,EAAA,iBAAiB,CAAC,UAAU,CAAC,CAAA,CAAA,CAAG,CAAC,CAAC;aACjG;AACD,YAAA,OAAO,IAAI,CAAC;AAChB,SAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,IAAI,WAAW,EAAE;AACb,YAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;SACxC;KACJ;AACL"}
+{"version":3,"file":"packageJsonUpdate.mjs","sources":["../../../../src/generators/add-fullstack/updates/packageJsonUpdate.ts"],"sourcesContent":[null],"names":[],"mappings":"uEAGgB,iBAAiB,CAAC,IAAU,EAAE,WAAmB,EAAE,IAAS,EAAA;IACxE,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAE/D,UAAU,CAAC,IAAI,EAAE,eAAe,EAAE,CAAC,WAAgB,KAAI;AACnD,QAAA,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,KAAI;AAC9C,YAAA,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AACjB,YAAA,OAAO,GAAG,CAAC;SACd,EAAE,WAAW,CAAC,CAAC;AAChB,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AACP"}

package/lib/generators/add-fullstack/updates/repositoryUpdate.cjs

@@ -0,0 +1,35 @@
+'use strict';var path=require('path'),packageJsonUpdate=require('./packageJsonUpdate.cjs'),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 updateRepository(tree, projectRoot, repository) {
+    if (repository.startsWith('http://')) {
+        repository = repository.replace('http://', 'https://');
+    }
+    // update in package.json
+    packageJsonUpdate.updatePackageJson(tree, projectRoot, {
+        homepage: `${repository}#readme`,
+        bugs: {
+            url: `${repository}/issues`,
+        },
+        repository: {
+            type: 'git',
+            url: `git+${repository}.git`,
+        },
+    });
+    // update in Jenkinsfile
+    const filePath = path__namespace.join(projectRoot, 'Jenkinsfile');
+    if (tree.exists(filePath)) {
+        const jenkinsFileContent = tree.read(filePath).toString();
+        let paramExists = false;
+        const updatedContent = jenkinsFileContent
+            .split('\n')
+            .map((line) => {
+            if (line.includes(`string(name: 'REPOSITORY_SSH_URL'`)) {
+                paramExists = true;
+                return line.replace(/defaultValue: '.*'/, `defaultValue: '${index.convertHttpsToSsh(repository)}'`);
+            }
+            return line;
+        })
+            .join('\n');
+        if (paramExists) {
+            tree.write(filePath, updatedContent);
+        }
+    }
+}exports.updateRepository=updateRepository;//# sourceMappingURL=repositoryUpdate.cjs.map

package/lib/generators/add-fullstack/updates/repositoryUpdate.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"repositoryUpdate.cjs","sources":["../../../../src/generators/add-fullstack/updates/repositoryUpdate.ts"],"sourcesContent":[null],"names":["updatePackageJson","path","convertHttpsToSsh"],"mappings":"4eAMgB,gBAAgB,CAAC,IAAU,EAAE,WAAmB,EAAE,UAAkB,EAAA;AAChF,IAAA,IAAI,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QAClC,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;KAC1D;;AAGD,IAAAA,mCAAiB,CAAC,IAAI,EAAE,WAAW,EAAE;QACjC,QAAQ,EAAE,CAAG,EAAA,UAAU,CAAS,OAAA,CAAA;AAChC,QAAA,IAAI,EAAE;YACF,GAAG,EAAE,CAAG,EAAA,UAAU,CAAS,OAAA,CAAA;AAC9B,SAAA;AACD,QAAA,UAAU,EAAE;AACR,YAAA,IAAI,EAAE,KAAK;YACX,GAAG,EAAE,CAAO,IAAA,EAAA,UAAU,CAAM,IAAA,CAAA;AAC/B,SAAA;AACJ,KAAA,CAAC,CAAC;;IAGH,MAAM,QAAQ,GAAGC,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;AAEvD,IAAA,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QACvB,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC1D,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,MAAM,cAAc,GAAG,kBAAkB;aACpC,KAAK,CAAC,IAAI,CAAC;AACX,aAAA,GAAG,CAAC,CAAC,IAAI,KAAI;AACV,YAAA,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAmC,iCAAA,CAAA,CAAC,EAAE;gBACpD,WAAW,GAAG,IAAI,CAAC;AACnB,gBAAA,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAkB,eAAA,EAAAC,uBAAiB,CAAC,UAAU,CAAC,CAAA,CAAA,CAAG,CAAC,CAAC;aACjG;AACD,YAAA,OAAO,IAAI,CAAC;AAChB,SAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,CAAC;QAEhB,IAAI,WAAW,EAAE;AACb,YAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;SACxC;KACJ;AACL"}

package/lib/generators/add-fullstack/updates/repositoryUpdate.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export declare function updateRepository(tree: Tree, projectRoot: string, repository: string): void;

package/lib/generators/add-fullstack/updates/repositoryUpdate.mjs

@@ -0,0 +1,35 @@
+import*as path from'path';import {updatePackageJson}from'./packageJsonUpdate.mjs';import {convertHttpsToSsh}from'../../../utils/index.mjs';function updateRepository(tree, projectRoot, repository) {
+    if (repository.startsWith('http://')) {
+        repository = repository.replace('http://', 'https://');
+    }
+    // update in package.json
+    updatePackageJson(tree, projectRoot, {
+        homepage: `${repository}#readme`,
+        bugs: {
+            url: `${repository}/issues`,
+        },
+        repository: {
+            type: 'git',
+            url: `git+${repository}.git`,
+        },
+    });
+    // update in Jenkinsfile
+    const filePath = path.join(projectRoot, 'Jenkinsfile');
+    if (tree.exists(filePath)) {
+        const jenkinsFileContent = tree.read(filePath).toString();
+        let paramExists = false;
+        const updatedContent = jenkinsFileContent
+            .split('\n')
+            .map((line) => {
+            if (line.includes(`string(name: 'REPOSITORY_SSH_URL'`)) {
+                paramExists = true;
+                return line.replace(/defaultValue: '.*'/, `defaultValue: '${convertHttpsToSsh(repository)}'`);
+            }
+            return line;
+        })
+            .join('\n');
+        if (paramExists) {
+            tree.write(filePath, updatedContent);
+        }
+    }
+}export{updateRepository};//# sourceMappingURL=repositoryUpdate.mjs.map

package/lib/generators/add-fullstack/updates/repositoryUpdate.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"repositoryUpdate.mjs","sources":["../../../../src/generators/add-fullstack/updates/repositoryUpdate.ts"],"sourcesContent":[null],"names":[],"mappings":"oJAMgB,gBAAgB,CAAC,IAAU,EAAE,WAAmB,EAAE,UAAkB,EAAA;AAChF,IAAA,IAAI,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QAClC,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;KAC1D;;AAGD,IAAA,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE;QACjC,QAAQ,EAAE,CAAG,EAAA,UAAU,CAAS,OAAA,CAAA;AAChC,QAAA,IAAI,EAAE;YACF,GAAG,EAAE,CAAG,EAAA,UAAU,CAAS,OAAA,CAAA;AAC9B,SAAA;AACD,QAAA,UAAU,EAAE;AACR,YAAA,IAAI,EAAE,KAAK;YACX,GAAG,EAAE,CAAO,IAAA,EAAA,UAAU,CAAM,IAAA,CAAA;AAC/B,SAAA;AACJ,KAAA,CAAC,CAAC;;IAGH,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;AAEvD,IAAA,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QACvB,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC1D,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,MAAM,cAAc,GAAG,kBAAkB;aACpC,KAAK,CAAC,IAAI,CAAC;AACX,aAAA,GAAG,CAAC,CAAC,IAAI,KAAI;AACV,YAAA,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAmC,iCAAA,CAAA,CAAC,EAAE;gBACpD,WAAW,GAAG,IAAI,CAAC;AACnB,gBAAA,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAkB,eAAA,EAAA,iBAAiB,CAAC,UAAU,CAAC,CAAA,CAAA,CAAG,CAAC,CAAC;aACjG;AACD,YAAA,OAAO,IAAI,CAAC;AAChB,SAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,CAAC;QAEhB,IAAI,WAAW,EAAE;AACb,YAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;SACxC;KACJ;AACL"}

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

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

package/lib/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/lib/generators/add-moleculer/generator.cjs

@@ -1,20 +1,32 @@
-'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);const DEFAULT_SERVER_NAME = 'moleculer-server';
-function addMoleculerGenerator(tree, options) {
+'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),js=require('@nx/js'),copyDotfiles=require('../../utils/copyDotfiles.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 addMoleculerGenerator(tree, options) {
     return tslib.__awaiter(this, void 0, void 0, function* () {
-        const projectName = index.isValid(options.name) ? `${index.getValid(options.name)}-server` : DEFAULT_SERVER_NAME;
-        const configs = Object.assign(Object.assign({}, options), { name: projectName });
-        return yield generateMoleculer(tree, configs);
+        const libsDir = options.directory || 'servers';
+        const fullLibsDir = path__namespace.join(options.projectRoot || '', libsDir);
+        const name = options.name || 'moleculer-server';
+        const normalizedName = devkit.names(name).fileName;
+        const fullName = path__namespace.join(fullLibsDir, normalizedName);
+        // Run the Nx library generator to create the basic structure
+        yield js.libraryGenerator(tree, {
+            name: normalizedName,
+            directory: fullLibsDir,
+            unitTestRunner: 'jest',
+            tags: `scope:moleculer,type:app`,
+        });
+        // Generate the custom files
+        const templateOptions = Object.assign(Object.assign(Object.assign({}, options), devkit.names(name)), { dot: '.', offsetFromRoot: devkit.offsetFromRoot(fullName), template: '' });
+        devkit.generateFiles(tree, path__namespace.join(__dirname, 'files'), fullName, templateOptions);
+        // Rename underscore files to dotfiles
+        copyDotfiles.renameDotFiles(tree, fullName);
+        // Copy .npmrc from the project root
+        const projectRoot = options.projectRoot || '';
+        copyDotfiles.copyNpmrc(tree, projectRoot, fullName);
+        console.log(devkit.stripIndents `
+    Thank you for using the @common-stack moleculer-server generator!
+    
+    Next steps:
+    
+    - Run \`yarn\` to install dependencies
+    - Start application with \`yarn start\`
+  `);
     });
-}
-const generateMoleculer = (tree, options) => tslib.__awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    let projectName = (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : DEFAULT_SERVER_NAME;
-    const projectRoot = index.isValid(options.directory) ? `${index.getValid(options.directory)}/${projectName}` : projectName;
-    projectName = index.isValid(options.ns) ? `${index.getValid(options.ns)}-${projectName}` : projectName;
-    devkit.generateFiles(tree, path__namespace.join(__dirname, 'files'), projectRoot, options);
-    devkit.updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
-        packageJson['name'] = projectName;
-        return packageJson;
-    });
-    yield devkit.formatFiles(tree);
-});exports.addMoleculerGenerator=addMoleculerGenerator;exports.default=addMoleculerGenerator;exports.generateMoleculer=generateMoleculer;//# sourceMappingURL=generator.cjs.map
+}exports.addMoleculerGenerator=addMoleculerGenerator;exports.default=addMoleculerGenerator;//# sourceMappingURL=generator.cjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-moleculer/generator.ts"],"sourcesContent":[null],"names":["isValid","getValid","__awaiter","generateFiles","path","updateJson","formatFiles"],"mappings":"whBAKA,MAAM,mBAAmB,GAAG,kBAAkB,CAAC;AAEzB,SAAA,qBAAqB,CAAC,IAAU,EAAE,OAAoC,EAAA;;QACxF,MAAM,WAAW,GAAGA,aAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,GAAGC,cAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,GAAG,mBAAmB,CAAC;QACrG,MAAM,OAAO,mCAAY,OAAO,CAAA,EAAA,EAAE,IAAI,EAAE,WAAW,GAAC,CAAC;AAErD,QAAA,OAAO,MAAM,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACjD,CAAA,CAAA;AAAA,CAAA;MAEY,iBAAiB,GAAG,CAAO,IAAU,EAAE,OAAY,KAAIC,eAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;;IAChE,IAAI,WAAW,GAAG,CAAA,EAAA,GAAAD,cAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,mBAAmB,CAAC;IAChE,MAAM,WAAW,GAAGD,aAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAGC,cAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;IAC/G,WAAW,GAAGD,aAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAG,EAAAC,cAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAI,CAAA,EAAA,WAAW,EAAE,GAAG,WAAW,CAAC;AAE3F,IAAAE,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACzEC,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AAEH,IAAA,MAAMC,kBAAW,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-moleculer/generator.ts"],"sourcesContent":[null],"names":["path","names","libraryGenerator","offsetFromRoot","generateFiles","renameDotFiles","copyNpmrc","stripIndents"],"mappings":"2jBAQsB,SAAA,qBAAqB,CAAC,IAAU,EAAE,OAAoC,EAAA;;AACxF,QAAA,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,IAAI,SAAS,CAAC;AAC/C,QAAA,MAAM,WAAW,GAAGA,eAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;AAElE,QAAA,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,kBAAkB,CAAC;QAChD,MAAM,cAAc,GAAGC,YAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QAC5C,MAAM,QAAQ,GAAGD,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;;QAGxD,MAAME,mBAAgB,CAAC,IAAI,EAAE;AACzB,YAAA,IAAI,EAAE,cAAc;AACpB,YAAA,SAAS,EAAE,WAAW;AACtB,YAAA,cAAc,EAAE,MAAM;AACtB,YAAA,IAAI,EAAE,CAA0B,wBAAA,CAAA;AACnC,SAAA,CAAC,CAAC;;QAGH,MAAM,eAAe,GACd,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,EAAA,EAAA,OAAO,CACP,EAAAD,YAAK,CAAC,IAAI,CAAC,CACd,EAAA,EAAA,GAAG,EAAE,GAAG,EACR,cAAc,EAAEE,qBAAc,CAAC,QAAQ,CAAC,EACxC,QAAQ,EAAE,EAAE,EAAA,CACf,CAAC;AAEF,QAAAC,oBAAa,CAAC,IAAI,EAAEJ,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;;AAG9E,QAAAK,2BAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;;AAG/B,QAAA,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC;AAC9C,QAAAC,sBAAS,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;AAEvC,QAAA,OAAO,CAAC,GAAG,CAACC,mBAAY,CAAA,CAAA;;;;;;;AAOzB,EAAA,CAAA,CAAC,CAAC;KACJ,CAAA,CAAA;AAAA"}

package/lib/generators/add-moleculer/generator.d.ts

@@ -1,5 +1,4 @@
 import { Tree } from '@nx/devkit';
 import { AddMoleculerGeneratorSchema } from './schema';
 export declare function addMoleculerGenerator(tree: Tree, options: AddMoleculerGeneratorSchema): Promise<void>;
-export declare const generateMoleculer: (tree: Tree, options: any) => Promise<void>;
 export default addMoleculerGenerator;

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

@@ -1,20 +1,32 @@
-import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import {isValid,getValid}from'../../utils/index.mjs';const DEFAULT_SERVER_NAME = 'moleculer-server';
-function addMoleculerGenerator(tree, options) {
+import {__awaiter}from'tslib';import {names,offsetFromRoot,generateFiles,stripIndents}from'@nx/devkit';import*as path from'path';import {libraryGenerator}from'@nx/js';import {renameDotFiles,copyNpmrc}from'../../utils/copyDotfiles.mjs';function addMoleculerGenerator(tree, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const projectName = isValid(options.name) ? `${getValid(options.name)}-server` : DEFAULT_SERVER_NAME;
-        const configs = Object.assign(Object.assign({}, options), { name: projectName });
-        return yield generateMoleculer(tree, configs);
+        const libsDir = options.directory || 'servers';
+        const fullLibsDir = path.join(options.projectRoot || '', libsDir);
+        const name = options.name || 'moleculer-server';
+        const normalizedName = names(name).fileName;
+        const fullName = path.join(fullLibsDir, normalizedName);
+        // Run the Nx library generator to create the basic structure
+        yield libraryGenerator(tree, {
+            name: normalizedName,
+            directory: fullLibsDir,
+            unitTestRunner: 'jest',
+            tags: `scope:moleculer,type:app`,
+        });
+        // Generate the custom files
+        const templateOptions = Object.assign(Object.assign(Object.assign({}, 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\`
+  `);
     });
-}
-const generateMoleculer = (tree, options) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    let projectName = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : DEFAULT_SERVER_NAME;
-    const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
-    projectName = isValid(options.ns) ? `${getValid(options.ns)}-${projectName}` : projectName;
-    generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
-    updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
-        packageJson['name'] = projectName;
-        return packageJson;
-    });
-    yield formatFiles(tree);
-});export{addMoleculerGenerator,addMoleculerGenerator as default,generateMoleculer};//# sourceMappingURL=generator.mjs.map
+}export{addMoleculerGenerator,addMoleculerGenerator as default};//# sourceMappingURL=generator.mjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-moleculer/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"2KAKA,MAAM,mBAAmB,GAAG,kBAAkB,CAAC;AAEzB,SAAA,qBAAqB,CAAC,IAAU,EAAE,OAAoC,EAAA;;QACxF,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,GAAG,mBAAmB,CAAC;QACrG,MAAM,OAAO,mCAAY,OAAO,CAAA,EAAA,EAAE,IAAI,EAAE,WAAW,GAAC,CAAC;AAErD,QAAA,OAAO,MAAM,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACjD,CAAA,CAAA;AAAA,CAAA;MAEY,iBAAiB,GAAG,CAAO,IAAU,EAAE,OAAY,KAAI,SAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;;IAChE,IAAI,WAAW,GAAG,CAAA,EAAA,GAAA,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,mBAAmB,CAAC;IAChE,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;IAC/G,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAG,EAAA,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAI,CAAA,EAAA,WAAW,EAAE,GAAG,WAAW,CAAC;AAE3F,IAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACzE,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AAEH,IAAA,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-moleculer/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"2OAQsB,SAAA,qBAAqB,CAAC,IAAU,EAAE,OAAoC,EAAA;;AACxF,QAAA,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,IAAI,SAAS,CAAC;AAC/C,QAAA,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;AAElE,QAAA,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,kBAAkB,CAAC;QAChD,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;;QAGxD,MAAM,gBAAgB,CAAC,IAAI,EAAE;AACzB,YAAA,IAAI,EAAE,cAAc;AACpB,YAAA,SAAS,EAAE,WAAW;AACtB,YAAA,cAAc,EAAE,MAAM;AACtB,YAAA,IAAI,EAAE,CAA0B,wBAAA,CAAA;AACnC,SAAA,CAAC,CAAC;;QAGH,MAAM,eAAe,GACd,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,EAAA,EAAA,OAAO,CACP,EAAA,KAAK,CAAC,IAAI,CAAC,CACd,EAAA,EAAA,GAAG,EAAE,GAAG,EACR,cAAc,EAAE,cAAc,CAAC,QAAQ,CAAC,EACxC,QAAQ,EAAE,EAAE,EAAA,CACf,CAAC;AAEF,QAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;;AAG9E,QAAA,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;;AAG/B,QAAA,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC;AAC9C,QAAA,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;AAEvC,QAAA,OAAO,CAAC,GAAG,CAAC,YAAY,CAAA,CAAA;;;;;;;AAOzB,EAAA,CAAA,CAAC,CAAC;KACJ,CAAA,CAAA;AAAA"}

package/lib/generators/add-moleculer/schema.d.ts

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