Refatora index sequelize e arquivos de ambiente refatorados para TS

Author: raphaellima8

.gitignore

@@ -17,3 +17,4 @@ coverage
 /server/config/env/development.env.js
 /server/config/env/test.env.js
 .vscode/
+build

package.json

@@ -9,7 +9,8 @@
     "dist-test": "mocha --require dist/config/tests/config/helpers.js --reporter spec --compilers js:babel-core/register dist/**/test.js",
     "start": "./node_modules/.bin/ts-node ./server/server.ts",
     "watch": "NODE_ENV=development ./node_modules/.bin/nodemon -w . --ext .ts --exec npm run start",
-    "test:coverage": "nyc npm run test"
+    "test:coverage": "nyc npm run test",
+    "run-builded": "NODE_ENV=development nodemon ./build/server.js" 
   },
   "repository": {
     "type": "git",

server/config/env/config.js

@@ -1,4 +1,2 @@
 /* jshint esversion:6*/
-module.exports = function () {
-	return require('../env/' + process.env.NODE_ENV + '.env.js');
-};
+module.exports = function () { return require("../env/" + process.env.NODE_ENV + ".env.js"); };

server/config/env/config.ts

@@ -0,0 +1,2 @@
+/* jshint esversion:6*/
+module.exports = () => require(`../env/${process.env.NODE_ENV}.env.js`)

server/config/env/development.env.js

@@ -1,13 +1,12 @@
-/* jshint esversion:6*/
 module.exports = {
-  env: "development",
-  db: "api",
-  dialect: "postgres",
-  username: "postgres",
-  password: "pgroot",
-  host: "localhost",
-  server_port: 3000,
-  pg_port: 5432,
-  db_url: "postgres://postgres:pgroot@localhost:5432/api",
-  secret: "xpto",
+    env: "development",
+    db: "api",
+    dialect: "postgres",
+    username: "postgres",
+    password: "pgroot",
+    host: "localhost",
+    server_port: 3000,
+    pg_port: 5432,
+    db_url: "postgres://postgres:pgroot@localhost:5432/api",
+    secret: "secret"
 };

server/config/env/development.env.ts

@@ -0,0 +1,12 @@
+module.exports = {
+  env: "development",
+  db: "api",
+  dialect: "postgres",
+  username: "postgres",
+  password: "pgroot",
+  host: "localhost",
+  server_port: 3000,
+  pg_port: 5432,
+  db_url: "postgres://postgres:pgroot@localhost:5432/api",
+  secret: "secret",
+};

server/config/env/test.env.js

@@ -1,13 +1,12 @@
-/* jshint esversion:6*/
 module.exports = {
-  env: "test",
-  db: "api_test",
-  dialect: "postgres",
-  username: "postgres",
-  password: "pgroot",
-  host: "localhost",
-  server_port: 3000,
-  pg_port: 5432,
-  db_url: "postgres://postgres:pgroot@localhost:5432/api",
-  secret: "xtpo",
+    env: "test",
+    db: "api",
+    dialect: "postgres",
+    username: "postgres",
+    password: "pgroot",
+    host: "localhost",
+    server_port: 3000,
+    pg_port: 5432,
+    db_url: "postgres://postgres:pgroot@localhost:5432/api",
+    secret: "secret"
 };

server/config/env/test.env.ts

@@ -0,0 +1,12 @@
+module.exports = {
+  env: "test",
+  db: "api",
+  dialect: "postgres",
+  username: "postgres",
+  password: "pgroot",
+  host: "localhost",
+  server_port: 3000,
+  pg_port: 5432,
+  db_url: "postgres://postgres:pgroot@localhost:5432/api",
+  secret: "secret",
+};

server/models/index.js

@@ -1,31 +1,31 @@
-  var fs = require('fs');
-  var path = require('path');
-  var Sequelize = require('sequelize');
-  var basename = path.basename(module.filename);
-  var config = require('../config/env/config')();
-  var env = config.env || 'development';
-  var db = {};
-  var sequelize;
-
-  if (config.db_url) {
+var fs = require('fs');
+var path = require('path');
+var Sequelize = require('sequelize');
+var basename = path.basename(module.filename);
+var config = require('../config/env/config')();
+var env = config.env || 'development';
+var db = {};
+var sequelize;
+if (config.db_url) {
     sequelize = new Sequelize(config.db_url);
-  } else {
+}
+else {
     sequelize = new Sequelize(config.db, config.username, config.password);
-  }
+}
 fs
-      .readdirSync(__dirname)
-      .filter(function (file) {
-        return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
-      })
-      .forEach(function (file) {
-        var model = sequelize['import'](path.join(__dirname, file));
-        db[model.name] = model;
-      });
+    .readdirSync(__dirname)
+    .filter(function (file) {
+    return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
+})
+    .forEach(function (file) {
+    var model = sequelize['import'](path.join(__dirname, file));
+    db[model.name] = model;
+});
 Object.keys(db).forEach(function (modelName) {
-      if (db[modelName].associate) {
-          db[modelName].associate(db);
-      }
-  });
-  db.sequelize = sequelize;
-  db.Sequelize = Sequelize;
-  module.exports = db;
+    if (db[modelName].associate) {
+        db[modelName].associate(db);
+    }
+});
+db.sequelize = sequelize;
+db.Sequelize = Sequelize;
+module.exports = db;

server/models/index.ts

@@ -0,0 +1,31 @@
+  var fs = require('fs');
+  var path = require('path');
+  var Sequelize = require('sequelize');
+  var basename = path.basename(module.filename);
+  var config = require('../config/env/config')();
+  var env = config.env || 'development';
+  var db = {};
+  var sequelize;
+
+  if (config.db_url) {
+    sequelize = new Sequelize(config.db_url);
+  } else {
+    sequelize = new Sequelize(config.db, config.username, config.password);
+  }
+fs
+      .readdirSync(__dirname)
+      .filter(function (file) {
+        return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
+      })
+      .forEach(function (file) {
+        var model = sequelize['import'](path.join(__dirname, file));
+        db[model.name] = model;
+      });
+Object.keys(db).forEach(function (modelName) {
+      if (db[modelName].associate) {
+          db[modelName].associate(db);
+      }
+  });
+  db.sequelize = sequelize;
+  db.Sequelize = Sequelize;
+  module.exports = db;

server/server.ts

@@ -17,7 +17,7 @@ models.sequelize.sync().then(() => {
   server.on('listening', listen);
 });
 
-Api.use(errorHandlerApi);
+Api.use(errorHandlerApi); 
 
 function listen():void {
   let address = server.address();

tsconfig.json

@@ -10,8 +10,7 @@
     ]
   },
   "include": [
-    "server/**/*.ts",
-    "config/**/*.ts"
+    "server/**/*.ts"
   ],
   "exclude": [
     "node_modules"