Update setup (#3)

* Configured prettier and a precommit hook

* Upgraded to typescript

* removed unused type definitions

* Generated file declarations

* added dockerfile

* Updated prettier and eslint configuration

* Updated tests and test running script

* Upgraded dependencies

* Updated type definitions on counties.ts

* Added travis CI

* Updated travis configuration

* Updated travis configuration

* Update nodjs version on travis

.eslintrc.js

@@ -0,0 +1,15 @@
+module.exports = {
+  env: {
+    es2021: true,
+    node: true,
+  },
+  extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
+  parser: "@typescript-eslint/parser",
+  parserOptions: {
+    ecmaVersion: 12,
+    sourceType: "module",
+  },
+  plugins: ["@typescript-eslint"],
+  rules: {},
+  ignorePatterns: ["dockerfile"],
+}

.prettierignore

@@ -0,0 +1,2 @@
+*.lock
+dockerfile

.prettierrc

@@ -0,0 +1,6 @@
+{
+  "semi": false,
+  "endOfLine": "lf",
+  "bracketSpacing": true,
+  "arrowParens": "always"
+}

.travis.yml

@@ -0,0 +1,9 @@
+language: node_js
+node_js:
+  - lts/*
+install:
+  - npm install
+script:
+  - npm run test -- --coverage
+after_success:
+  - bash <(curl -Ls https://coverage.codacy.com/get.sh) report -r ./coverage/lcov.info

dockerfile

@@ -0,0 +1,11 @@
+FROM node:alpine
+
+WORKDIR /usr/app
+
+COPY ./package.json ./
+
+RUN npm install
+
+COPY ./ ./
+
+CMD ["npm", "start"]

package.json

@@ -4,18 +4,57 @@
   "main": "index.js",
   "license": "MIT",
   "scripts": {
-    "dev": "nodemon index.js",
-    "start": "node index.js",
-    "test": "jest --watchAll"
+    "build": "tsc",
+    "build:types": "tsc --declaration",
+    "dev": "nodemon public/index.js",
+    "start": "node public/index.js",
+    "test": "jest",
+    "format": "prettier --write src/**/*",
+    "lint": "eslint --fix-dry-run src/**/*"
   },
   "jest": {
-    "testEnvironment": "node"
+    "testEnvironment": "node",
+    "roots": [
+      "<rootDir>/src"
+    ],
+    "testMatch": [
+      "**/__tests__/**/*.+(ts|tsx|js)",
+      "**/?(*.)+(spec|test).+(ts|tsx|js)"
+    ],
+    "transform": {
+      "^.+\\.(ts|tsx)$": "ts-jest"
+    }
   },
   "dependencies": {
-    "express": "^4.17.1"
+    "express": "^4.17.1",
+    "global": "^4.4.0",
+    "jest": "^26.6.3"
   },
   "devDependencies": {
-    "jest": "^25.3.0",
-    "supertest": "^4.0.2"
+    "@types/express": "^4.17.11",
+    "@types/jest": "^26.0.20",
+    "@types/node": "^14.14.34",
+    "@types/supertest": "^2.0.10",
+    "@typescript-eslint/eslint-plugin": "^4.17.0",
+    "@typescript-eslint/parser": "^4.17.0",
+    "eslint": "^7.22.0",
+    "husky": "=4",
+    "lint-staged": ">=10",
+    "nodemon": "^2.0.7",
+    "prettier": "^2.2.1",
+    "supertest": "^4.0.2",
+    "ts-jest": "^26.5.3",
+    "typescript": "^4.2.3"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "*": [
+      "prettier --write src/**/*",
+      "eslint --fix"
+    ]
   }
 }

public/app.d.ts

@@ -0,0 +1,2 @@
+declare const app: import("express-serve-static-core").Express
+export default app

public/app.js

@@ -0,0 +1,15 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = __importDefault(require("express"));
+const country_1 = __importDefault(require("./routers/country"));
+const counties_1 = __importDefault(require("./routers/counties"));
+const app = express_1.default();
+app.get("/", (req, res) => {
+    return res.json({ test: "Server is running" });
+});
+app.use("/api/v1/country", country_1.default);
+app.use("/api/v1/counties", counties_1.default);
+exports.default = app;

public/data/country.d.ts

@@ -0,0 +1,14 @@
+export declare const country: {
+  total: number
+  male: number
+  female: number
+  intersex: number
+  populationIn2009: number
+  popChange: number
+  households: number
+  averageHouseholds: number
+  popDensity: {
+    landArea: number
+    density: number
+  }
+}

public/data/country.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.country = void 0;
+exports.country = {
+    total: 47564296,
+    male: 23548056,
+    female: 24014716,
+    intersex: 1524,
+    populationIn2009: 512690,
+    popChange: 108551,
+    households: 12143913,
+    averageHouseholds: 3.9,
+    popDensity: { landArea: 9123, density: 68 },
+};

public/data/countyData.d.ts

@@ -0,0 +1,15 @@
+export interface Details {
+  male: number
+  female: number
+  intersex: number
+  households: number
+  averageHouseholds: number
+  popDensity: {
+    landArea: number
+    density: number
+  }
+}
+export interface County {
+  [key: string]: Details
+}
+export declare const counties: County