Merge pull request #24 from Onix-Systems/feature/json-api

Feature/json api

Author: v-checha

generators/app/dependencies/dependencies.json

@@ -1,9 +1,9 @@
 {
  "mongodb": {
  "general": {
- "mongoose": "5.10.17",
+ "mongoose": "5.11.15",
  "@nestjs/mongoose": "7.1.2",
- "mongodb": "3.6.3"
+ "mongodb": "4.1.0"
  },
  "dev": { "@types/mongoose": "5.10.2" }
  },
@@ -14,5 +14,12 @@
  "typeorm": "0.2.30"
  },
  "dev": {}
+ },
+ "postgresql": {
+ "general": {
+ "pg": "8.7.1",
+ "@nestjs/typeorm": "7.1.5"
+ },
+ "dev": {}
  }
 }

generators/app/questions/db.js

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

generators/app/questions/index.js

@@ -11,6 +11,7 @@ const mailer = require('./mailer');
 const socket = require('./socket');
 const additionalMailerQuestions = require('./additionalMailerQuestions');
 const dependencies = require('./dependenciesVersions');
+const jsonapi = require('./jsonapi');
 
 module.exports = {
  packageManager,
@@ -30,4 +31,5 @@ module.exports = {
  additionalQuestions: additionalMailerQuestions,
  },
  socket,
+ jsonapi,
 };

generators/app/questions/jsonapi.js

@@ -0,0 +1,8 @@
+module.exports = [
+ {
+ type: 'list',
+ name: 'wantedJsonApi',
+ message: 'Add json:api',
+ choices: ['Yes', 'No'],
+ },
+]

generators/app/steps/prompting.js

@@ -45,6 +45,10 @@ module.exports = {
  );
  },
 
+ askAboutJsonApi() {
+ askQuestions.call(this, 'JSON:API', questions.jsonapi, this.async())
+ },
+
  askAboutDatabase() {
  askQuestions.call(this, 'Database', questions.db, this.async());
  },

generators/app/templates/package.json

@@ -39,7 +39,10 @@
  "rxjs": "6.6.3",
  "@nestjs/swagger": "4.6.1",
  "swagger-ui-express": "4.1.4",
- "open": "7.2.1"
+ "open": "7.2.1",
+ "jsonapi-serializer": "3.6.7",
+ "lodash": "4.17.21",
+ "nest-router": "1.0.9"
  },
  "devDependencies": {
  "@nestjs/cli": "7.5.1",
@@ -64,7 +67,9 @@
  "ts-loader": "6.2.2",
  "ts-node": "8.10.2",
  "tsconfig-paths": "3.9.0",
- "typescript": "4.0.3"
+ "typescript": "4.0.3",
+ "@types/jsonapi-serializer": "3.6.4",
+ "@types/lodash": "4.14.168"
  },
  "jest": {
  "moduleNameMapper": {
@@ -77,7 +82,9 @@
  "^@dto(.*)$": "<rootDir>/dto$1",
  "^@responses(.*)$": "<rootDir>/responses$1",
  "^@interceptors(.*)$": "<rootDir>/interceptors$1",
- "^@decorators(.*)$": "<rootDir>/decorators$1"
+ "^@decorators(.*)$": "<rootDir>/decorators$1",
+ "^@v1(.*)$": "<rootDir>/src/routes/v1$1",
+ "^@exceptions(.*)$": "<rootDir>/src/exceptions/v1$1"
  },
  "moduleFileExtensions": [
  "js",
@@ -107,7 +114,8 @@
  "@dto": "./dist/dto",
  "@responses": "./dist/responses",
  "@interceptors": "./dist/interceptors",
- "@decorators": "./dist/decorators"
+ "@decorators": "./dist/decorators",
+ "@utils": "./dist/utils"
  },
  "husky": {
  "hooks": {

generators/app/templates/tsconfig.json

@@ -24,7 +24,10 @@
  "@dto/*": ["./src/dto/*"],
  "@responses/*": ["./src/responses/*"],
  "@interceptors/*": ["./src/interceptors/*"],
- "@decorators/*": ["./src/decorators/*"]
+ "@decorators/*": ["./src/decorators/*"],
+ "@v1/*": ["src/routes/v1/*"],
+ "@exceptions/*": ["./src/exceptions/*"],
+ "@utils/*": ["./src/utils/*"]
  }
  }
 }

generators/auth/steps/end.js

@@ -4,7 +4,7 @@
  */
 
  module.exports = function() {
- const { wantedMailer, wantedSocket } = this.options.answers;
+ const { wantedMailer, wantedSocket, wantedJsonApi } = this.options.answers;
 
  if (wantedMailer === 'Yes') {
  this.composeWith('nest-js-boilerplate:mailer', {
@@ -17,4 +17,10 @@
  answers: this.options.answers,
  });
  }
+
+ if (wantedJsonApi === 'Yes') {
+ this.composeWith('nest-js-boilerplate:jsonapi', {
+ answers: this.options.answers,
+ });
+ }
 };

generators/auth/steps/writing.js

@@ -25,8 +25,8 @@ module.exports = function() {
  const rootFolder = answers.identifier;
 
  this.fs.copyTpl(
- this.templatePath(`${authFolder}/src/components/`),
- this.destinationPath(`${rootFolder}/src/components/`),
+ this.templatePath(`${authFolder}/src/routes/`),
+ this.destinationPath(`${rootFolder}/src/routes/`),
  payload,
  );
  this.fs.copyTpl(
@@ -109,6 +109,20 @@ module.exports = function() {
  payload,
  );
  }
+ if (fs.existsSync(`${fullPathToAuthFolder}/src/constants`)) {
+ this.fs.copyTpl(
+ this.templatePath(`${authFolder}/src/constants`),
+ this.destinationPath(`${rootFolder}/src/constants`),
+ payload,
+ );
+ }
+ if (fs.existsSync(`${fullPathToAuthFolder}/src/utils`)) {
+ this.fs.copyTpl(
+ this.templatePath(`${authFolder}/src/utils`),
+ this.destinationPath(`${rootFolder}/src/utils`),
+ payload,
+ );
+ }
 
  // DOCKER
  if (answers.wantedDocker.toLowerCase() === 'yes') {

generators/auth/templates/mongodb/jwt/src/_main.ts

@@ -6,7 +6,7 @@ import { ValidationPipe, ValidationError } from '@nestjs/common';
 import { SwaggerModule, DocumentBuilder } from '@nestjs/swagger';
 import ValidationExceptions from './exceptions/validation.exceptions';
 
-import AppModule from './components/app/app.module';
+import AppModule from './routes/app/app.module';
 
 import AllExceptionsFilter from './filters/all-exceptions.filter';