Merge pull request #55 from Vladyslav317/feature/casl/nestjs-version

feat(casl/nestjs): added casl and updated nestjs to version 9

Author: v-checha

generators/admin/dependencies/dependencies.json

@@ -1,10 +1,10 @@
 {
  "general": {
-   "@adminjs/express": "4.1.3",
-   "@adminjs/mongoose": "2.0.4",
-   "@adminjs/nestjs": "4.0.1",
-   "@adminjs/passwords": "2.0.2",
-   "adminjs": "5.10.4"
+   "@adminjs/express": "5.0.1",
+   "@adminjs/mongoose": "3.0.1",
+   "@adminjs/nestjs": "5.1.0",
+   "@adminjs/passwords": "3.0.1",
+   "adminjs": "6.7.5"
  },
  "dev": {}
 }

generators/admin/steps/writing.js

@@ -1,4 +1,5 @@
 module.exports = function() {
+  const fs = require('fs');
   const { answers } = this.options;
 
   const rootFolder = answers.identifier;
@@ -7,11 +8,14 @@ module.exports = function() {
     config: answers,
   };
 
-  this.fs.copyTpl(
-    this.templatePath(`${adminFolder}/src/modules`),
-    this.destinationPath(`${rootFolder}/src/modules`),
-    payload,
-  );
+  if (answers.wantedPrismaOrTypeOrmOrMongoose !== 'Prisma') {
+    this.fs.copyTpl(
+      this.templatePath(`${adminFolder}/src/modules`),
+      this.destinationPath(`${rootFolder}/src/modules`),
+      payload,
+    );
+  }
+
   this.fs.copyTpl(
     this.templatePath(`${adminFolder}/src/exceptions`),
     this.destinationPath(`${rootFolder}/src/exceptions`),

generators/app/dependencies/dependencies.json

@@ -1,26 +1,33 @@
 {
   "mongodb": {
     "general": {
-      "mongoose": "5.13.7",
-      "@nestjs/mongoose": "8.0.1",
-      "mongodb": "4.1.0"
+      "mongoose": "6.8.3",
+      "@nestjs/mongoose": "9.2.1",
+      "mongodb": "4.13.0"
     },
     "dev": {}
   },
   "mysql": {
     "general": {
       "mysql2": "2.3.3",
-      "@nestjs/typeorm": "8.0.2",
-      "typeorm": "0.2.37"
+      "@nestjs/typeorm": "9.0.1",
+      "typeorm": "0.3.11"
     },
     "dev": {}
   },
   "postgresql": {
     "general": {
       "pg": "8.7.1",
-      "@nestjs/typeorm": "8.0.2",
-      "typeorm": "0.2.37"
+      "@nestjs/typeorm": "9.0.1",
+      "typeorm": "0.3.11"
     },
     "dev": {}
+  },
+  "prisma": {
+    "general": {
+      "prisma": "4.8.1",
+      "@prisma/client": "4.8.1",
+      "typeorm": "0.3.11"
+    }
   }
 }

generators/app/questions/casl.js

@@ -0,0 +1,8 @@
+module.exports = [
+    {
+      type: 'list',
+      name: 'wantedCasl',
+      message: 'Do you want to use Casl?',
+      choices: ['Yes', 'No'],
+    },
+  ]

generators/app/questions/db.js

@@ -3,23 +3,23 @@ module.exports = {
     {
       type: 'list',
       name: 'db',
-      message: 'Choose db for your api.(Sql - Typeorm, Mongo - Mongoose)',
+      message: 'Choose db for your api.(Sql, Mongo)',
       choices: ['Mongodb', 'Mysql', 'Postgresql'],
     },
   ],
   oauth2: [
     {
       type: 'list',
       name: 'db',
-      message: 'Choose db for your api.(Sql - Typeorm, Mongo - Mongoose)',
+      message: 'Choose db for your api.(Sql, Mongo)',
       choices: ['Mongodb', 'Mysql'],
     },
   ],
   passportLocal: [
     {
       type: 'list',
       name: 'db',
-      message: 'Choose db for your api.(Sql - Typeorm, Mongo - Mongoose)',
+      message: 'Choose db for your api.(Sql, Mongo)',
       choices: ['Mongodb', 'Mysql'],
     },
   ],

generators/app/questions/deploy.js

@@ -2,7 +2,7 @@ module.exports = [
   {
     type: 'list',
     name: 'deploy:heroku',
-    message: 'Do you want to have a possibillity to deploy on heroku?',
+    message: 'Do you want to have a possibility to deploy on heroku?',
     default: 'No',
     choices: ['Yes', 'No'],
   },

generators/app/questions/index.js

@@ -11,6 +11,8 @@ const mailer = require('./mailer');
 const socket = require('./socket');
 const additionalMailerQuestions = require('./additionalMailerQuestions');
 const adminPanel = require('./admin');
+const casl = require('./casl');
+const orm = require('./orm');
 
 module.exports = {
   packageManager,
@@ -30,4 +32,6 @@ module.exports = {
   },
   socket,
   adminPanel,
+  casl,
+  orm,
 };

generators/app/questions/orm.js

@@ -0,0 +1,69 @@
+module.exports = {
+    Mongodb: {
+      jwt: [
+        {
+          type: 'list',
+          name: 'wantedPrismaOrTypeOrmOrMongoose',
+          message: 'Would you like to choose Prisma or Mongoose?',
+          choices: ['Mongoose', 'Prisma'],
+        }
+      ],
+      oauth2: [
+        {
+          type: 'list',
+          name: 'wantedPrismaOrTypeOrmOrMongoose',
+          message: 'Would you like to choose Prisma or Mongoose?',
+          choices: ['Mongoose', 'Prisma'],
+        }
+      ],
+      passportLocal: [
+        {
+          type: 'list',
+          name: 'wantedPrismaOrTypeOrmOrMongoose',
+          message: 'Would you like to choose Prisma or Mongoose?',
+          choices: ['Mongoose', 'Prisma'],
+        }
+      ],
+    },
+  
+    Mysql: {
+      jwt: [
+        {
+            type: 'list',
+            name: 'wantedPrismaOrTypeOrmOrMongoose',
+            message: 'Would you like to choose Prisma or TypeORM?',
+            choices: ['TypeOrm', 'Prisma'],
+        }
+      ],
+      oauth2: [
+        {
+            type: 'list',
+            name: 'wantedPrismaOrTypeOrmOrMongoose',
+            message: 'Would you like to choose Prisma or TypeORM?',
+            choices: ['TypeOrm', 'Prisma'],
+        }
+      ],
+      passportLocal: [
+        {
+            type: 'list',
+            name: 'wantedPrismaOrTypeOrmOrMongoose',
+            message: 'Would you like to choose Prisma or TypeORM?',
+            choices: ['TypeOrm', 'Prisma'],
+        }
+      ],
+    },
+  
+    Postgresql: {
+      jwt: [
+        {
+            type: 'list',
+            name: 'wantedPrismaOrTypeOrmOrMongoose',
+            message: 'Would you like to choose Prisma or TypeORM?',
+            choices: ['TypeOrm', 'Prisma'],
+        }
+      ],
+      oauth2: [],
+      passportLocal: [],
+    },
+  }
+  

generators/app/steps/prompting.js

@@ -45,6 +45,10 @@ module.exports = {
     askQuestions.call(this, 'Database', questions.db[this.answers.authType], this.async());
   },
 
+  askAboutOrm() {
+    askQuestions.call(this, 'Orm', questions.orm[this.answers.db][this.answers.authType], this.async())
+  },
+
   askAboutMailer() {
     askQuestions.call(
       this,
@@ -71,6 +75,10 @@ module.exports = {
     askQuestions.call(this, 'Admin panel', questions.adminPanel[this.answers.db][this.answers.authType], this.async());
   },
 
+  askAboutCasl() {
+    askQuestions.call(this, 'Casl', questions.casl, this.async());
+  },
+
   askWouldHeLikeDocker() {
     askQuestions.call(this, 'Docker', questions.docker, this.async());
   },

generators/app/templates/README.md

@@ -174,3 +174,11 @@ When you go by http://localhost:3000/google route, google'll ask you to authoriz
 
 [travis-image]: https://travis-ci.org/caiobsouza/generator-ts-node-api.svg?branch=master
 [travis-url]: https://travis-ci.org/caiobsouza/generator-ts-node-api
+
+## Running migrations for Prisma
+
+For Mongodb run:
+`npx prisma generate`
+
+For Mysql/Postgres run:
+`npm run db:migration`