@lenne.tech/cli 0.0.68 → 0.0.73

package/build/commands/angular/create.js

@@ -19,7 +19,7 @@ const NewCommand = {
     hidden: false,
     run: (toolbox) => __awaiter(void 0, void 0, void 0, function* () {
         // Retrieve the tools we need
-        const { filesystem, git, helper, parameters, patching, print: { error, info, spin, success }, prompt: { confirm }, strings: { kebabCase }, system, } = toolbox;
+        const { filesystem, git, helper, parameters, print: { error, info, spin, success }, prompt: { confirm }, strings: { kebabCase }, system, } = toolbox;
         // Start timer
         const timer = system.startTimer();
         // Info
@@ -28,12 +28,6 @@ const NewCommand = {
         if (!(yield git.gitInstalled())) {
             return;
         }
-        // Check ng
-        if (!system.which('nx') && (yield confirm(`Install nx global?`))) {
-            const nxSpinner = spin('Install nx global');
-            yield system.run(`npm i -g @nrwl/cli`);
-            nxSpinner.succeed('nx global installed');
-        }
         // Get name of the workspace
         const name = yield helper.getInput(parameters.first, {
             name: 'workspace name',
@@ -50,88 +44,81 @@ const NewCommand = {
             error(`There's already a folder named "${projectDir}" here.`);
             return undefined;
         }
-        // Get name of the app
-        let appName = yield helper.getInput(parameters.second, {
-            name: 'app name',
-            showError: true,
-        });
-        if (!appName) {
-            appName = 'app';
-        }
         // Set preset
         // See https://github.com/nrwl/nx/blob/4bcd25ec01d793ca59e0ebaf1578bae275b6821d/packages/create-nx-workspace/bin/create-nx-workspace.ts#L32
-        const preset = parameters.third === 'true' || (!parameters.third && (yield confirm(`Add API (Nest server)?`)))
+        const preset = parameters.second === 'true' || (!parameters.second && (yield confirm(`Add API (Nest server)?`)))
             ? 'angular-nest'
             : 'angular';
-        // Init Workspace
-        // See https://github.com/nrwl/nx/blob/4bcd25ec01d793ca59e0ebaf1578bae275b6821d/packages/create-nx-workspace/bin/create-nx-workspace.ts#L163
-        const workspaceSpinner = spin(`Create ${preset} workspace ${projectDir} with ${appName} app`);
-        yield system.run(`npx create-nx-workspace ${projectDir} --preset='${preset}' --appName='${appName}' --style='scss' --linter='eslint' --packageManager='npm' --nxCloud=false --cli="nx"`);
+        let addToGit = yield confirm(`Add workspace to a new git repository?`);
+        let gitLink;
+        // Check if git init is active
+        if (addToGit) {
+            // Get name of the app
+            gitLink = yield helper.getInput(null, {
+                name: 'git repository link',
+                showError: true,
+            });
+            if (!gitLink) {
+                addToGit = false;
+            }
+        }
+        const workspaceSpinner = spin(`Create ${preset} workspace ${projectDir} with ${name} app`);
+        // Clone monorepo
+        yield system.run(`git clone https://github.com/lenneTech/lt-monorepo.git ${projectDir}`);
+        // Check for directory
         if (!filesystem.isDirectory(`./${projectDir}`)) {
             error(`The directory "${projectDir}" could not be created.`);
             return undefined;
         }
-        workspaceSpinner.succeed(`Create ${preset} workspace ${projectDir} for ${appName} created`);
+        workspaceSpinner.succeed(`Create ${preset} workspace ${projectDir} for ${name} created`);
         // Include example app
         const ngBaseSpinner = spin('Integrate example for Angular');
-        // Install packages
-        yield system.run(`cd ${projectDir} && npm i @lenne.tech/ng-base`);
-        // Extend ts config
-        yield patching.update(`./${projectDir}/tsconfig.base.json`, (config) => {
-            config.compilerOptions.resolveJsonModule = true;
-            config.compilerOptions.strictNullChecks = false;
-            return config;
-        });
-        // Get src files
-        yield system.run(`cd ${projectDir} && git clone https://github.com/lenneTech/angular-example temp`);
+        // Remove git folder after clone
+        yield system.run(`cd ${projectDir} && rm -rf .git`);
+        // Check if git init is active
+        if (addToGit) {
+            yield system.run(`cd ${projectDir} && git init --initial-branch=main`);
+            yield system.run(`cd ${projectDir} && git remote add origin ${gitLink}`);
+            yield system.run(`cd ${projectDir} && git add .`);
+            yield system.run(`cd ${projectDir} && git commit -m "Initial commit"`);
+            yield system.run(`cd ${projectDir} && git push -u origin main`);
+        }
+        // Clone ng-base-starter
+        yield system.run(`cd ${projectDir}/projects && git clone https://github.com/lenneTech/ng-base-starter.git app`);
+        // Remove gitkeep file
+        yield system.run(`cd ${projectDir}/projects && rm .gitkeep`);
+        // Remove git folder after clone
+        yield system.run(`cd ${projectDir}/projects/app && rm -rf .git`);
         // Integrate files
-        if (filesystem.isDirectory(`./${projectDir}/temp`)) {
-            filesystem.remove(`./${projectDir}/apps/${appName}/src`);
-            filesystem.copy(`./${projectDir}/temp/apps/example/src`, `./${projectDir}/apps/${appName}/src`, {
-                overwrite: true,
-            });
-            // Remove temp files
-            filesystem.remove(`./${projectDir}/temp`);
-            // Commit changes
-            yield system.run(`cd ${projectDir} && git add . && git commit -am "Angular example integrated"`);
+        if (filesystem.isDirectory(`./${projectDir}/projects/app`)) {
+            // Check if git init is active
+            if (addToGit) {
+                // Commit changes
+                yield system.run(`cd ${projectDir} && git add . && git commit -am "feat: Angular example integrated" && git push`);
+            }
             // Angular example integration done
             ngBaseSpinner.succeed('Example for Angular integrated');
             // Include files from https://github.com/lenneTech/nest-server-starter
             if (preset === 'angular-nest') {
                 // Init
                 const serverSpinner = spin(`Integrate Nest Server Starter`);
-                yield system.run(`cd ${projectDir} && npm i @lenne.tech/nest-server`);
-                yield system.run(`cd ${projectDir} && git clone https://github.com/lenneTech/nest-server-starter temp`);
+                // Clone api
+                yield system.run(`cd ${projectDir}/projects && git clone https://github.com/lenneTech/nest-server-starter api`);
                 // Integrate files
-                if (filesystem.isDirectory(`./${projectDir}/temp`)) {
-                    filesystem.remove(`./${projectDir}/apps/api/src`);
-                    filesystem.copy(`./${projectDir}/temp/src`, `./${projectDir}/apps/api/src`, { overwrite: true });
-                    filesystem.write(`./${projectDir}/apps/api/src/meta.json`, {
-                        name: `${appName}-api-server`,
-                        description: `API for ${appName} app`,
+                if (filesystem.isDirectory(`./${projectDir}/projects/api`)) {
+                    // Remove git folder from clone
+                    yield system.run(`cd ${projectDir}/projects/api && rm -rf .git`);
+                    // Prepare meta.json in api
+                    filesystem.write(`./${projectDir}/projects/api/src/meta.json`, {
+                        name: `${name}-api-server`,
+                        description: `API for ${name} app`,
                         version: '0.0.0',
                     });
-                    // Update proxy
-                    yield patching.update(`./${projectDir}/apps/${appName}/proxy.conf.json`, (config) => {
-                        config['/api']['target'] = 'http://localhost:3000';
-                        return config;
-                    });
-                    // Extend ts config
-                    yield patching.update(`./${projectDir}/apps/api/tsconfig.app.json`, (config) => {
-                        config.compilerOptions.resolveJsonModule = true;
-                        return config;
-                    });
-                    // Remove temp files
-                    filesystem.remove(`./${projectDir}/temp`);
-                    // Add scripts
-                    yield patching.update(`./${projectDir}/package.json`, (config) => {
-                        config.scripts['start:app'] = 'npm start';
-                        config.scripts['start:server'] = 'nx serve api';
-                        config.scripts['e2e'] = `nx e2e ${appName}-e2e`;
-                        return config;
-                    });
-                    // Commit changes
-                    yield system.run(`cd ${projectDir} && git add . && git commit -am "Nest Server Starter integrated"`);
+                    // Check if git init is active
+                    if (addToGit) {
+                        // Commit changes
+                        yield system.run(`cd ${projectDir} && git add . && git commit -am "feat: Nest Server Starter integrated" && git push`);
+                    }
                     // Done
                     serverSpinner.succeed('Nest Server Starter integrated');
                 }
@@ -139,27 +126,23 @@ const NewCommand = {
                     serverSpinner.warn('Nest Server Starter not integrated');
                 }
             }
+            // Install all packages
+            const installSpinner = spin('Install all packages');
+            yield system.run(`cd ${projectDir} && npm i && npm run init`);
+            installSpinner.succeed('Successfull installed all packages');
             // We're done, so show what to do next
             info(``);
-            success(`Generated ${preset} workspace ${projectDir} with ${appName} app in ${helper.msToMinutesAndSeconds(timer())}m.`);
+            success(`Generated ${preset} workspace ${projectDir} with ${name} app in ${helper.msToMinutesAndSeconds(timer())}m.`);
             info(``);
             info(`Next:`);
-            info(`  Run ${appName}`);
+            info(`  Run ${name}`);
             info(`  $ cd ${projectDir}`);
-            if (preset === 'angular-nest') {
-                info(`  $ npm run start:server`);
-                info(`  $ npm run start:app`);
-            }
-            else {
-                info(`  $ npm start`);
-            }
-            info(``);
-            info(`More infos about Nx and Angular: https://nx.dev/angular`);
+            info(`  $ npm run start`);
             info(``);
             // For tests
-            return `new workspace ${projectDir} with ${appName}`;
+            return `new workspace ${projectDir} with ${name}`;
         }
     }),
 };
 exports.default = NewCommand;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2FuZ3VsYXIvY3JlYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBR0E7O0dBRUc7QUFDSCxNQUFNLFVBQVUsR0FBbUI7SUFDakMsSUFBSSxFQUFFLFFBQVE7SUFDZCxLQUFLLEVBQUUsQ0FBQyxHQUFHLENBQUM7SUFDWixXQUFXLEVBQUUsNkNBQTZDO0lBQzFELE1BQU0sRUFBRSxLQUFLO0lBQ2IsR0FBRyxFQUFFLENBQU8sT0FBK0IsRUFBRSxFQUFFO1FBQzdDLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osVUFBVSxFQUNWLEdBQUcsRUFDSCxNQUFNLEVBQ04sVUFBVSxFQUNWLFFBQVEsRUFDUixLQUFLLEVBQUUsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsRUFDckMsTUFBTSxFQUFFLEVBQUUsT0FBTyxFQUFFLEVBQ25CLE9BQU8sRUFBRSxFQUFFLFNBQVMsRUFBRSxFQUN0QixNQUFNLEdBQ1AsR0FBRyxPQUFPLENBQUM7UUFFWixjQUFjO1FBQ2QsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBRWxDLE9BQU87UUFDUCxJQUFJLENBQUMsNENBQTRDLENBQUMsQ0FBQztRQUVuRCxZQUFZO1FBQ1osSUFBSSxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsWUFBWSxFQUFFLENBQUMsRUFBRTtZQUMvQixPQUFPO1NBQ1I7UUFFRCxXQUFXO1FBQ1gsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDLEVBQUU7WUFDaEUsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLG1CQUFtQixDQUFDLENBQUM7WUFDNUMsTUFBTSxNQUFNLENBQUMsR0FBRyxDQUFDLG9CQUFvQixDQUFDLENB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2FuZ3VsYXIvY3JlYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBR0E7O0dBRUc7QUFDSCxNQUFNLFVBQVUsR0FBbUI7SUFDakMsSUFBSSxFQUFFLFFBQVE7SUFDZCxLQUFLLEVBQUUsQ0FBQyxHQUFHLENBQUM7SUFDWixXQUFXLEVBQUUsNkNBQTZDO0lBQzFELE1BQU0sRUFBRSxLQUFLO0lBQ2IsR0FBRyxFQUFFLENBQU8sT0FBK0IsRUFBRSxFQUFFO1FBQzdDLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osVUFBVSxFQUNWLEdBQUcsRUFDSCxNQUFNLEVBQ04sVUFBVSxFQUNWLEtBQUssRUFBRSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUNyQyxNQUFNLEVBQUUsRUFBRSxPQUFPLEVBQUUsRUFDbkIsT0FBTyxFQUFFLEVBQUUsU0FBUyxFQUFFLEVBQ3RCLE1BQU0sR0FDUCxHQUFHLE9BQU8sQ0FBQztRQUVaLGNBQWM7UUFDZCxNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsVUFBVSxFQUFFLENBQUM7UUFFbEMsT0FBTztRQUNQLElBQUksQ0FBQyw0Q0FBNEMsQ0FBQyxDQUFDO1FBRW5ELFlBQVk7UUFDWixJQUFJLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxFQUFFO1lBQy9CLE9BQU87U0FDUjtRQUVELDRCQUE0QjtRQUM1QixNQUFNLElBQUksR0FBRyxNQUFNLE1BQU0sQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRTtZQUNuRCxJQUFJLEVBQUUsZ0JBQWdCO1lBQ3RCLFNBQVMsRUFBRSxJQUFJO1NBQ2hCLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxJQUFJLEVBQUU7WUFDVCxPQUFPO1NBQ1I7UUFFRCx3QkFBd0I7UUFDeEIsTUFBTSxVQUFV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

package/build/commands/server/module.js

@@ -95,14 +95,21 @@ const NewCommand = {
         const serverModule = (0, path_1.join)(path, 'src', 'server', 'server.module.ts');
         if (filesystem.exists(serverModule)) {
             const includeSpinner = spin('Include module into server');
+            // Import module
             yield patching.patch(serverModule, {
                 insert: `import { ${namePascal}Module } from './modules/${nameKebab}/${nameKebab}.module';\n`,
                 before: 'import',
             });
+            // Add Module
             yield patching.patch(serverModule, {
                 insert: `  ${namePascal}Module,\n  `,
                 after: new RegExp('imports:[^\\]]*', 'm'),
             });
+            // Add comma if necessary
+            yield patching.patch(serverModule, {
+                insert: '$1,$2',
+                replace: new RegExp('([^,\\s])(\\s*' + namePascal + 'Module,\\s*\\])'),
+            });
             if (filesystem.exists(prettier)) {
                 yield system.run(prettier + ' ' + serverModule);
             }
@@ -123,4 +130,4 @@ const NewCommand = {
     }),
 };
 exports.default = NewCommand;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL3NlcnZlci9tb2R1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFDQSwrQkFBNEI7QUFHNUI7O0dBRUc7QUFDSCxNQUFNLFVBQVUsR0FBbUI7SUFDakMsSUFBSSxFQUFFLFFBQVE7SUFDZCxLQUFLLEVBQUUsQ0FBQyxHQUFHLENBQUM7SUFDWixXQUFXLEVBQUUsNkJBQTZCO0lBQzFDLE1BQU0sRUFBRSxLQUFLO0lBQ2IsR0FBRyxFQUFFLENBQU8sT0FBK0IsRUFBRSxFQUFFO1FBQzdDLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osVUFBVSxFQUNWLE1BQU0sRUFDTixVQUFVLEVBQ1YsUUFBUSxFQUNSLEtBQUssRUFBRSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUNyQyxPQUFPLEVBQUUsRUFBRSxTQUFTLEVBQUUsVUFBVSxFQUFFLFNBQVMsRUFBRSxFQUM3QyxNQUFNLEVBQ04sUUFBUSxHQUNULEdBQUcsT0FBTyxDQUFDO1FBRVosY0FBYztRQUNkLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUVsQyxPQUFPO1FBQ1AsSUFBSSxDQUFDLDRCQUE0QixDQUFDLENBQUM7UUFFbkMsV0FBVztRQUNYLE1BQU0sSUFBSSxHQUFHLE1BQU0sTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFO1lBQ25ELElBQUksRUFBRSxhQUFhO1NBQ3BCLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxJQUFJLEVBQUU7WUFDVCxPQUFPO1NBQ1I7UUFFRCxnREFBZ0Q7UUFDaEQsTUFBTSxTQUFTLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2xDLE1BQU0sU0FBUyxHQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNsQyxNQUFNLFVBQVUsR0FB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL3NlcnZlci9tb2R1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFDQSwrQkFBNEI7QUFHNUI7O0dBRUc7QUFDSCxNQUFNLFVBQVUsR0FBbUI7SUFDakMsSUFBSSxFQUFFLFFBQVE7SUFDZCxLQUFLLEVBQUUsQ0FBQyxHQUFHLENBQUM7SUFDWixXQUFXLEVBQUUsNkJBQTZCO0lBQzFDLE1BQU0sRUFBRSxLQUFLO0lBQ2IsR0FBRyxFQUFFLENBQU8sT0FBK0IsRUFBRSxFQUFFO1FBQzdDLDZCQUE2QjtRQUM3QixNQUFNLEVBQ0osVUFBVSxFQUNWLE1BQU0sRUFDTixVQUFVLEVBQ1YsUUFBUSxFQUNSLEtBQUssRUFBRSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUNyQyxPQUFPLEVBQUUsRUFBRSxTQUFTLEVBQUUsVUFBVSxFQUFFLFNBQVMsRUFBRSxFQUM3QyxNQUFNLEVBQ04sUUFBUSxHQUNULEdBQUcsT0FBTyxDQUFDO1FBRVosY0FBYztRQUNkLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUVsQyxPQUFPO1FBQ1AsSUFBSSxDQUFDLDRCQUE0QixDQUFDLENBQUM7UUFFbkMsV0FBVztRQUNYLE1BQU0sSUFBSSxHQUFHLE1BQU0sTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFO1lBQ25ELElBQUksRUFBRSxhQUFhO1NBQ3BCLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxJQUFJLEVBQUU7WUFDVCxPQUFPO1NBQ1I7UUFFRCxnREFBZ0Q7UUFDaEQsTUFBTSxTQUFTLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2xDLE1BQU0sU0FBUyxHQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNsQyxNQUFNLFVBQVUsR0FB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

package/build/templates/model.ts.ejs

@@ -0,0 +1,3 @@
+module.exports = {
+  name: '<%= props.name %>'
+}

package/build/templates/nest-server-module/inputs/template-create.input.ts.ejs

@@ -0,0 +1,21 @@
+import { Field, InputType } from '@nestjs/graphql';
+import { IsOptional } from 'class-validator';
+import { <%= props.namePascal %>Input } from './<%= props.nameKebab %>.input';
+
+/**
+ * <%= props.namePascal %> create input
+ */
+@InputType({ description: 'Input data to create a new <%= props.namePascal %>' })
+export class <%= props.namePascal %>CreateInput extends <%= props.namePascal %>Input {
+
+  // ===================================================================================================================
+  // Properties
+  // ===================================================================================================================
+
+  /**
+   * Description of the property
+   */
+  @Field(() => [String], { description: 'Description of the property', nullable: true })
+  @IsOptional()
+  property?: string[];
+}

package/build/templates/nest-server-module/inputs/template.input.ts.ejs

@@ -0,0 +1,22 @@
+import { Restricted, RoleEnum } from '@lenne.tech/nest-server';
+import { Field, InputType } from '@nestjs/graphql';
+import { IsOptional } from 'class-validator';
+
+/**
+ * <%= props.namePascal %> input
+ */
+@InputType({ description: 'Input data to update an existing <%= props.namePascal %>' })
+export class <%= props.namePascal %>Input {
+
+  // ===================================================================================================================
+  // Properties
+  // ===================================================================================================================
+
+  /**
+   * Description of the property
+   */
+  @Restricted(RoleEnum.ADMIN, RoleEnum.S_CREATOR)
+  @Field(() => [String], { description: 'Description of the property', nullable: true })
+  @IsOptional()
+  property?: string[];
+}

package/build/templates/nest-server-module/template.model.ts.ejs

@@ -0,0 +1,63 @@
+import { mapClasses, Restricted, RoleEnum } from '@lenne.tech/nest-server';
+import { Field, ObjectType } from '@nestjs/graphql';
+import { Prop, Schema as MongooseSchema, SchemaFactory } from '@nestjs/mongoose';
+import { Document, Schema } from 'mongoose';
+import { PersistenceModel } from '../../common/models/persistence.model';
+import { User } from '../user/user.model';
+
+export type <%= props.namePascal %>Document = <%= props.namePascal %> & Document;
+
+/**
+ * <%= props.namePascal %> model
+ */
+@ObjectType({ description: '<%= props.namePascal %>' })
+@MongooseSchema({ timestamps: true })
+export class <%= props.namePascal %> extends PersistenceModel {
+
+  // ===================================================================================================================
+  // Properties
+  // ===================================================================================================================
+
+  /**
+   * Description of the property
+   */
+  @Restricted(RoleEnum.ADMIN, RoleEnum.S_CREATOR)
+  @Field(() => [String], { description: 'Properties of <%= props.namePascal %>', nullable: 'items'})
+  @Prop([String])
+  properties: string[] = undefined;
+
+  /**
+   * User how has tested the <%= props.namePascal %>
+   */
+  @Field(() => User, {
+    description: 'User who has tested the <%= props.namePascal %>',
+    nullable: true,
+  })
+  @Prop({ type: Schema.Types.ObjectId, ref: 'User' })
+  testedBy: User = undefined;
+
+  // ===================================================================================================================
+  // Methods
+  // ===================================================================================================================
+
+  /**
+   * Initialize instance with default values instead of undefined
+   */
+  init() {
+    super.init();
+    this.properties = [];
+    return this;
+  }
+
+  /**
+   * Map input
+   *
+   * Hint: Non-primitive variables should always be mapped (see mapClasses / mapClassesAsync in ModelHelper)
+   */
+  map(input) {
+    super.map(input);
+    return mapClasses(input, {user: User}, this);
+  }
+}
+
+export const <%= props.namePascal %>Schema = SchemaFactory.createForClass(<%= props.namePascal %>);

package/build/templates/nest-server-module/template.module.ts.ejs

@@ -0,0 +1,27 @@
+import { JSON } from '@lenne.tech/nest-server';
+import { Module } from '@nestjs/common';
+import { MongooseModule } from '@nestjs/mongoose';
+import { PubSub } from 'graphql-subscriptions';
+import { UserModule } from '../user/user.module';
+import { <%= props.namePascal %>, <%= props.namePascal %>Schema } from './<%= props.nameKebab %>.model';
+import { <%= props.namePascal %>Resolver } from './<%= props.nameKebab %>.resolver';
+import { <%= props.namePascal %>Service } from './<%= props.nameKebab %>.service';
+
+/**
+ * <%= props.namePascal %> module
+ */
+@Module({
+  imports: [MongooseModule.forFeature([{ name: <%= props.namePascal %>.name, schema: <%= props.namePascal %>Schema }]), UserModule],
+  controllers: [],
+  providers: [
+    <%= props.namePascal %>Resolver,
+    <%= props.namePascal %>Service,
+    JSON,
+    {
+      provide: 'PUB_SUB',
+      useValue: new PubSub(),
+    },
+  ],
+  exports: [MongooseModule, <%= props.namePascal %>Resolver, <%= props.namePascal %>Service]
+})
+export class <%= props.namePascal %>Module {}

package/build/templates/nest-server-module/template.resolver.ts.ejs

@@ -0,0 +1,136 @@
+import { FilterArgs, GraphQLUser, RoleEnum, Roles } from '@lenne.tech/nest-server';
+import { Inject } from '@nestjs/common';
+import { Args, Info, Mutation, Query, Resolver, Subscription } from '@nestjs/graphql';
+import { GraphQLResolveInfo } from 'graphql';
+import { PubSub } from 'graphql-subscriptions';
+import { User } from '../user/user.model';
+import { <%= props.namePascal %>CreateInput } from './inputs/<%= props.nameKebab %>-create.input';
+import { <%= props.namePascal %>Input } from './inputs/<%= props.nameKebab %>.input';
+import { <%= props.namePascal %> } from './<%= props.nameKebab %>.model';
+import { <%= props.namePascal %>Service } from './<%= props.nameKebab %>.service';
+
+/**
+ * Resolver to process with <%= props.namePascal %> data
+ */
+@Resolver(() => <%= props.namePascal %>)
+export class <%= props.namePascal %>Resolver {
+
+  /**
+   * Import services
+   */
+  constructor(
+    private readonly <%= props.nameCamel %>Service: <%= props.namePascal %>Service,
+    @Inject('PUB_SUB') protected readonly pubSub: PubSub
+  ) {}
+
+  // ===========================================================================
+  // Queries
+  // ===========================================================================
+
+  /**
+   * Get <%= props.namePascal %>s (via filter)
+   */
+   @Roles(RoleEnum.S_USER)
+   @Query(() => [<%= props.namePascal %>], { description: 'Find <%= props.namePascal %> (via filter)' })
+   async find<%= props.namePascal %>s(
+     @Info() info: GraphQLResolveInfo,
+     @GraphQLUser() user: User,
+     @Args() args?: FilterArgs
+   ) {
+     return await this.<%= props.nameCamel %>Service.find(args, {
+       currentUser: user,
+       fieldSelection: { info, select: 'find<%= props.namePascal %>s' },
+       inputType: FilterArgs
+     });
+   }
+
+  /**
+   * Get <%= props.namePascal %> via ID
+   */
+  @Roles(RoleEnum.S_USER)
+  @Query(() => <%= props.namePascal %>, { description: 'Get <%= props.namePascal %> with specified ID' })
+  async get<%= props.namePascal %>(
+    @Info() info: GraphQLResolveInfo,
+    @GraphQLUser() user: User,
+    @Args('id') id: string,
+  ): Promise<<%= props.namePascal %>> {
+    return await this.<%= props.nameCamel %>Service.get(id, {
+      currentUser: user,
+      fieldSelection: { info, select: 'get<%= props.namePascal %>' },
+    });
+  }
+
+  // ===========================================================================
+  // Mutations
+  // ===========================================================================
+
+  /**
+   * Create new <%= props.namePascal %>
+   */
+  @Roles(RoleEnum.S_USER)
+  @Mutation(() => <%= props.namePascal %>, { description: 'Create a new <%= props.namePascal %>' })
+  async create<%= props.namePascal %>(
+    @Info() info: GraphQLResolveInfo,
+    @GraphQLUser() user: User,
+    @Args('input') input: <%= props.namePascal %>CreateInput
+  ): Promise<<%= props.namePascal %>> {
+    return await this.<%= props.nameCamel %>Service.create(input, {
+      currentUser: user,
+      fieldSelection: { info, select: 'create<%= props.namePascal %>' },
+      inputType: <%= props.namePascal %>CreateInput
+    });
+  }
+
+  /**
+   * Delete existing <%= props.namePascal %>
+   */
+  @Roles(RoleEnum.S_USER)
+  @Mutation(() => <%= props.namePascal %>, { description: 'Delete existing <%= props.namePascal %>' })
+  async delete<%= props.namePascal %>(
+    @Info() info: GraphQLResolveInfo,
+    @GraphQLUser() user: User,
+    @Args('id') id: string
+  ): Promise<<%= props.namePascal %>> {
+    return await this.<%= props.nameCamel %>Service.delete(id, {
+      currentUser: user,
+      fieldSelection: { info, select: 'delete<%= props.namePascal %>' },
+      roles: [RoleEnum.ADMIN, RoleEnum.S_CREATOR]
+    });
+  }
+
+  /**
+   * Update existing <%= props.namePascal %>
+   */
+  @Roles(RoleEnum.S_USER)
+  @Mutation(() => <%= props.namePascal %>, { description: 'Update existing <%= props.namePascal %>' })
+  async update<%= props.namePascal %>(
+    @Info() info: GraphQLResolveInfo,
+    @GraphQLUser() user: User,
+    @Args('id') id: string,
+    @Args('input') input: <%= props.namePascal %>Input
+  ): Promise<<%= props.namePascal %>> {
+    return await this.<%= props.nameCamel %>Service.update(id, input, {
+      currentUser: user,
+      fieldSelection: { info, select: 'update<%= props.namePascal %>' },
+      inputType: <%= props.namePascal %>Input,
+      roles: [RoleEnum.ADMIN, RoleEnum.S_CREATOR]
+    });
+  }
+
+  // ===========================================================================
+  // Subscriptions
+  // ===========================================================================
+
+  /**
+   * Subscription for create <%= props.namePascal %>
+   */
+  @Subscription(() => <%= props.namePascal %>, {
+    filter(this: <%= props.namePascal %>Resolver, payload, variables, context) {
+      return context?.user?.hasRole?.(RoleEnum.ADMIN);
+    },
+    resolve: (value) => value,
+  })
+  async <%= props.nameCamel %>Created() {
+    return this.pubSub.asyncIterator('<%= props.nameCamel %>Created');
+  }
+}

package/build/templates/nest-server-module/template.service.ts.ejs

@@ -0,0 +1,74 @@
+import { assignPlain, CrudService, ServiceOptions } from '@lenne.tech/nest-server';
+import { Inject, Injectable, NotFoundException } from '@nestjs/common';
+import { InjectModel } from '@nestjs/mongoose';
+import { PubSub } from 'graphql-subscriptions';
+import { Model } from 'mongoose';
+import { <%= props.namePascal %>CreateInput } from './inputs/<%= props.nameKebab %>-create.input';
+import { <%= props.namePascal %>, <%= props.namePascal %>Document } from './<%= props.nameKebab %>.model';
+
+/**
+ * <%= props.namePascal %> service
+ */
+@Injectable()
+export class <%= props.namePascal %>Service extends CrudService<<%= props.namePascal %>> {
+
+  // ===================================================================================================================
+  // Properties
+  // ===================================================================================================================
+
+  // ===================================================================================================================
+  // Injections
+  // ===================================================================================================================
+
+  /**
+   * Constructor for injecting services
+   */
+  constructor(
+    @InjectModel('<%= props.namePascal %>') protected readonly <%= props.nameCamel %>Model: Model<<%= props.namePascal %>Document>,
+    @Inject('PUB_SUB') protected readonly pubSub: PubSub
+  ) {
+    super({mainDbModel: <%= props.nameCamel %>Model, mainModelConstructor: <%= props.namePascal %>});
+  }
+
+  // ===================================================================================================================
+  // Methods
+  // ===================================================================================================================
+
+  /**
+   * Create new <%= props.namePascal %>
+   * Overwrites create method from CrudService
+   */
+  async create(input: <%= props.namePascal %>CreateInput, serviceOptions?: ServiceOptions): Promise<<%= props.namePascal %>> {
+    // Get new <%= props.namePascal %>
+    const created<%= props.namePascal %> = await super.create(input, serviceOptions);
+
+    // Inform subscriber
+    if (serviceOptions?.pubSub === undefined || serviceOptions.pubSub) {
+      await this.pubSub.publish('<%= props.nameCamel %>Created', <%= props.namePascal %>.map(created<%= props.namePascal %>));
+    }
+
+    // Return created <%= props.namePascal %>
+    return created<%= props.namePascal %>;
+  }
+
+  /**
+   * Example method
+   * Extends the CrudService
+   */
+  async exampleMethode(id: string, input: Record<string, any>, serviceOptions?: ServiceOptions): Promise<<%= props.namePascal %>> {
+
+    // Get and check <%= props.namePascal %>
+    const <%= props.nameCamel %> = await this.mainDbModel.findById(id).exec();
+    if (!<%= props.nameCamel %>) {
+      throw new NotFoundException(`<%= props.namePascal %> not found with ID: ${id}`);
+    }
+
+    // Process input and output
+    return await this.process(async (data) => {
+
+      // Update, save and return <%= props.namePascal %>
+      return await assignPlain(<%= props.nameCamel %>, data.input).save();
+
+    }, {input, serviceOptions});
+  }
+}

package/build/templates/nest-server-starter/README.md.ejs

@@ -0,0 +1,61 @@
+# <%= props.name %>
+<%= props.description %>
+
+## Requirements
+
+- [Node.js incl. npm](https://nodejs.org):
+the runtime environment for your server
+
+- [MongoDB](https://docs.mongodb.com/manual/installation/#mongodb-community-edition-installation-tutorials)
+the database for your objects
+
+
+## Start the server
+
+`$ npm run start:dev`
+
+
+## Extend the server
+
+This server is based on [lenne.Tech Nest Server](https://github.com/lenneTech/nest-server).
+
+Since the lenne.Tech Nest Server is based on [Nest](https://nestjs.com/), you can find all information about extending
+the **<%= props.name %>** in the [documentation of Nest](https://docs.nestjs.com/).
+
+The documentation of the extensions and auxiliary classes that the
+[lenne.Tech Nest Server](https://github.com/lenneTech/nest-server) contains is currently under construction.
+As long as this is not yet available,have a look at the
+[source code](https://github.com/lenneTech/nest-server/tree/master/src/core).
+There you will find a lot of things that will help you to extend your server, such as:
+
+- [GraphQL scalars](https://github.com/lenneTech/nest-server/tree/master/src/core/common/scalars)
+- [Filter and pagination](https://github.com/lenneTech/nest-server/tree/master/src/core/common/args)
+- [Decorators for restrictions and roles](https://github.com/lenneTech/nest-server/tree/master/src/core/common/decorators)
+- [Authorisation handling](https://github.com/lenneTech/nest-server/tree/master/src/core/modules/auth)
+- [Ready to use user module](https://github.com/lenneTech/nest-server/tree/master/src/core/modules/user)
+- [Common helpers](https://github.com/lenneTech/nest-server/tree/master/src/core/common/helpers) and
+[helpers for tests](https://github.com/lenneTech/nest-server/blob/master/src/test/test.helper.ts)
+- ...
+
+
+## Further information
+
+### Running the app
+
+```bash
+# Development
+$ npm start
+
+# Watch mode
+$ npm run start:dev
+
+# Production mode
+$ npm run start:prod
+```
+
+### Test
+
+```bash
+# e2e tests
+$ npm run test:e2e
+```

package/build/templates/nest-server-tests/tests.e2e-spec.ts.ejs

@@ -0,0 +1,165 @@
+import { RoleEnum, TestGraphQLType, TestHelper } from '@lenne.tech/nest-server';
+import { Test, TestingModule } from '@nestjs/testing';
+import { PubSub } from 'graphql-subscriptions';
+import envConfig from '../src/config.env';
+import { User } from '../src/server/modules/user/user.model';
+import { UserService } from '../src/server/modules/user/user.service';
+import { ServerModule } from '../src/server/server.module';
+import { MongoClient, ObjectId } from 'mongodb';
+
+describe('<%= props.namePascal %> (e2e)', () => {
+  let app;
+  let testHelper: TestHelper;
+
+  // database
+  let connection;
+  let db;
+
+  // Global vars
+  let userService: UserService;
+  const users: Partial<User & { token: string }>[] = [];
+
+  // ===================================================================================================================
+  // Preparations
+  // ===================================================================================================================
+
+  /**
+   * Before all tests
+   */
+  beforeAll(async () => {
+    try {
+      const moduleFixture: TestingModule = await Test.createTestingModule({
+        imports: [ServerModule],
+        providers: [
+          UserService,
+          {
+            provide: 'PUB_SUB',
+            useValue: new PubSub(),
+          },
+        ],
+      }).compile();
+      app = moduleFixture.createNestApplication();
+      app.setBaseViewsDir(envConfig.templates.path);
+      app.setViewEngine(envConfig.templates.engine);
+      await app.init();
+      testHelper = new TestHelper(app);
+      userService = moduleFixture.get<UserService>(UserService);
+
+      // Connection to database
+      connection = await MongoClient.connect(envConfig.mongoose.uri);
+      db = await connection.db();
+    } catch (e) {
+      console.log('beforeAllError', e);
+    }
+  });
+
+  /**
+   * After all tests are finished
+   */
+  afterAll(async () => {
+    await connection.close();
+    await app.close();
+  });
+
+  // ===================================================================================================================
+  // Initialization tests
+  // ===================================================================================================================
+
+  /**
+   * Create and verify users for testing
+   */
+  it('createAndVerifyUsers', async () => {
+    const userCount = 2;
+    for (let i = 0; i < userCount; i++) {
+      const random = Math.random().toString(36).substring(7);
+      const input = {
+        password: random,
+        email: random + '@testusers.com',
+        firstName: 'Test' + random,
+        lastName: 'User' + random,
+      };
+
+      // Sign up user
+      const res: any = await testHelper.graphQl({
+        name: 'signUp',
+        type: TestGraphQLType.MUTATION,
+        arguments: { input },
+        fields: [{ user: ['id', 'email', 'firstName', 'lastName'] }],
+      });
+      res.user.password = input.password;
+      users.push(res.user);
+
+      // Verify user
+      await db.collection('users').updateOne({ _id: new ObjectId(res.id) }, { $set: { verified: true } });
+    }
+    expect(users.length).toBeGreaterThanOrEqual(userCount);
+  });
+
+  /**
+   * Sign in users
+   */
+  it('signInUsers', async () => {
+    for (const user of users) {
+      const res: any = await testHelper.graphQl({
+        name: 'signIn',
+        arguments: {
+          input: {
+            email: user.email,
+            password: user.password,
+          },
+        },
+        fields: ['token', { user: ['id', 'email'] }],
+      });
+      expect(res.user.id).toEqual(user.id);
+      expect(res.user.email).toEqual(user.email);
+      user.token = res.token;
+    }
+  });
+
+  /**
+   * Prepare users
+   */
+  it('prepareUsers', async () => {
+    await db
+      .collection('users')
+      .findOneAndUpdate({ _id: new ObjectId(users[0].id) }, { $set: { roles: [RoleEnum.ADMIN] } });
+  });
+
+  // ===================================================================================================================
+  // Tests for <%= props.namePascal %>
+  // ===================================================================================================================
+
+  /**
+   * Test
+   */
+  it('test', async () => {
+    console.log('Implement <%= props.namePascal %> test here');
+  });
+
+  // ===================================================================================================================
+  // Clean up tests
+  // ===================================================================================================================
+
+  /**
+   * Delete users
+   */
+  it('deleteUsers', async () => {
+    // Add admin role to user 2
+    await userService.setRoles(users[1].id, ['admin']);
+
+    for (const user of users) {
+      const res: any = await testHelper.graphQl(
+        {
+          name: 'deleteUser',
+          type: TestGraphQLType.MUTATION,
+          arguments: {
+            id: user.id,
+          },
+          fields: ['id'],
+        },
+        { token: users[1].token }
+      );
+      expect(res.id).toEqual(user.id);
+    }
+  });
+});

package/build/templates/typescript-starter/README.md.ejs

@@ -0,0 +1,30 @@
+# <%= props.name %>
+
+[![License](https://img.shields.io/github/license/<%= props.nameKebab %>)](/LICENSE) [![CircleCI](https://circleci.com/gh/<%= props.nameKebab %>/tree/master.svg?style=shield)](https://circleci.com/gh/<%= props.nameKebab %>/tree/master)
+[![Dependency Status](https://david-dm.org/<%= props.nameKebab %>.svg)](https://david-dm.org/<%= props.nameKebab %>) [![devDependency Status](https://david-dm.org/<%= props.nameKebab %>/dev-status.svg)](https://david-dm.org/<%= props.nameKebab %>?type=dev)
+
+<!--
+[![GitHub forks](https://img.shields.io/github/forks/<%= props.nameKebab %>)](https://github.com/<%= props.nameKebab %>/fork) [![GitHub stars](https://img.shields.io/github/stars/<%= props.nameKebab %>)](https://github.com/<%= props.nameKebab %>)
+-->
+
+
+## Requirements
+
+- [Node.js incl. npm](https://nodejs.org):
+the runtime environment for your project
+
+
+## Scripts
+
+```bash
+# Lint
+$ npm run lint
+
+# Test
+$ npm test
+$ npm run watch
+$ npm run coverage
+
+# Build
+$ npm build
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/cli",
-  "version": "0.0.68",
+  "version": "0.0.73",
   "description": "lenne.Tech CLI: lt",
   "keywords": [
     "lenne.Tech",
@@ -21,7 +21,7 @@
     "build": "npm run lint && npm run test && npm run clean-build && npm run compile && npm run copy-templates",
     "clean-build": "rimraf ./build",
     "compile": "tsc -p .",
-    "copy-templates": "path-exists ./src/templates && rimraf ./build/templates && cpy --parents --cwd=./src  templates/**/* ../build || echo 'No templates to copy'",
+    "copy-templates": "cp -R ./src/templates ./build/templates",
     "coverage": "jest --coverage",
     "format": "prettier --write 'src/**/*.{js,ts,tsx,json}' '!src/templates/**/*'",
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix --cache",
@@ -53,20 +53,20 @@
     "find-file-up": "2.0.1",
     "gluegun": "5.1.2",
     "open": "8.4.0",
-    "standard-version": "^9.3.2",
-    "ts-node": "10.7.0",
+    "standard-version": "9.5.0",
+    "ts-node": "10.8.0",
     "typescript": "4.6.4"
   },
   "devDependencies": {
     "@lenne.tech/npm-package-helper": "0.0.12",
-    "@types/jest": "27.5.0",
-    "@types/node": "16.11.33",
-    "@typescript-eslint/eslint-plugin": "5.22.0",
-    "@typescript-eslint/parser": "5.22.0",
+    "@types/jest": "27.5.1",
+    "@types/node": "16.11.36",
+    "@typescript-eslint/eslint-plugin": "5.25.0",
+    "@typescript-eslint/parser": "5.25.0",
     "cpy-cli": "4.1.0",
-    "eslint": "8.15.0",
+    "eslint": "8.16.0",
     "eslint-config-prettier": "8.5.0",
-    "husky": "7.0.4",
+    "husky": "8.0.1",
     "jest": "28.1.0",
     "path-exists-cli": "2.0.0",
     "prettier": "2.6.2",