Merge branch 'issue/109' into 'develop'

Issue #109: Upgrade node and modules

See merge request c3sl/blendb!90

.gitlab-ci.yml

-image: node:6.12.2
+image: node:10.16.3
 
 services:
     - postgres:latest

Dockerfile

 # Avoid the use of floating tags like: latest, boron, argon and carbon
-ARG VERSION=6.12.2
+ARG VERSION=10.16.3
 FROM node:$VERSION
 
 LABEL autor="C3SL - Centro de Computação Científica e Software Livre"

config/config.yaml.example

@@ -2,8 +2,12 @@
 # however a config file for tests in CI is required
 # so this example file in fact is the CI test file
 tags:
-    links: []
-    obj: []
+    links:
+        - config/market_tags.yaml.example
+    obj:
+        -
+            name: "noDescription"
+            description: "Related with seller"
 views:
     links:
         - config/market_views.yaml.example
@@ -12,6 +16,7 @@ views:
             alias: "view:Seller"
             data: "test/postgres/fixtures/seller.json"
             origin: true
+            aliasAsName: true
             dimensions:
                 - "dim:seller:name"
                 - "dim:seller:sex"
@@ -32,6 +37,9 @@ metrics:
             dataType: "float"
             aggregation: "avg"
             description: "The seller average age"
+            tags:
+                - "seller"
+                - "age"
 dimensions:
     links:
         - config/market_dimensions.yaml.example
@@ -40,6 +48,8 @@ dimensions:
             name: "dim:seller:name"
             dataType: "string"
             description: "Name of the seller from market"
+            tags:
+                - "seller"
 enumTypes:
     links:
         - config/market_enum.yaml.example
@@ -48,6 +58,7 @@ enumTypes:
 sources:
     links:
         - config/market_sources.yaml.example
+        - config/source_test_only.yaml.example
     obj:
         -
             name: "Seller"

package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "start": "env $(cat config/config.env ) node index",
     "lint": "tslint -s node_modules/tslint-stylish -t stylish src/**/*.ts test/**/*.ts",
-    "test": "env $(cat config/test.env) ts-node node_modules/istanbul/lib/cli.js cover -x \"**/*.spec.ts\" -e .ts _mocha",
+    "test": "env $(cat config/test.env) ts-node node_modules/nyc/bin/nyc.js mocha",
     "show-coverage": "xdg-open coverage/lcov-report/index.html",
     "doc-api": "raml2html -i specs/blendb-api-v1.raml -o doc/api-v1-reference.html",
     "schema": "env $(cat config/config.env ) ts-node scripts/schema.ts config/config.yaml schema.sql",
@@ -14,6 +14,14 @@
     "test-mode": "ts-node scripts/loadTest.ts && node index",
     "doc-code": "typedoc --mode 'file' --module 'commonjs' --target 'ES6' --ignoreCompilerErrors --exclude '**/*.spec.ts' --out 'doc/code' 'src'"
   },
+  "nyc": {
+    "include": ["src/**/*.ts"],
+    "extension": [".ts"],
+    "require": ["ts-node/register"],
+    "reporter": ["text-summary", "html"],
+    "sourceMap": true,
+    "instrument": true
+  },
   "repository": {
     "type": "git",
     "url": "git@gitlab.c3sl.ufpr.br:c3sl/blendb.git"
@@ -21,31 +29,35 @@
   "author": "Centro de Computação Científica e Software Livre (C3SL)",
   "license": "GPL-3.0",
   "dependencies": {
-    "@types/async": "^2.0.40",
-    "@types/chai": "^3.4.33",
-    "@types/express": "^4.0.33",
-    "@types/js-yaml": "^3.5.29",
-    "@types/pg": "^6.1.45",
-    "async": "=2.4.1",
-    "express": "^4.0.33",
-    "js-yaml": "^3.8.2",
-    "json-2-csv": "^3.5.5",
+    "@types/async": "^3.0.1",
+    "@types/chai": "^4.2.0",
+    "@types/express": "^4.17.1",
+    "@types/js-yaml": "^3.12.1",
+    "@types/pg": "^7.11.0",
+    "async": "^3.1.0",
+    "express": "^4.17.1",
+    "js-yaml": "^3.13.1",
+    "json-2-csv": "^3.5.6",
     "monetdb": "^1.1.4",
     "osprey": "^0.3.2",
-    "pg": "^6.1.5",
-    "ts-node": "^3.1.0",
-    "typescript": "^2.4.1"
+    "pg": "^7.12.1",
+    "raml-parser": "^0.8.18",
+    "ts-node": "^8.3.0",
+    "typescript": "^3.5.3"
   },
   "devDependencies": {
-    "@types/mocha": "^2.2.32",
-    "@types/supertest": "^2.0.0",
-    "chai": "^3.4.33",
-    "istanbul": "1.1.0-alpha.1",
-    "mocha": "^3.1.0",
-    "raml2html": "^3.0.1",
-    "supertest": "^3.0.0",
-    "tslint": "^3.15.1",
-    "tslint-stylish": "^2.1.0-beta",
-    "typedoc": "^0.11.1"
+    "@types/mocha": "^5.2.7",
+    "@types/supertest": "^2.0.8",
+    "chai": "^4.2.0",
+    "mocha": "^6.2.0",
+    "nyc": "^14.1.1",
+    "raml2html": "^7.4.0",
+    "supertest": "^4.0.2",
+    "tslint": "^5.19.0",
+    "tslint-stylish": "^2.1.0",
+    "typedoc": "^0.15.0"
+  },
+  "engines": {
+    "node": "^10.16.3"
   }
 }

src/common/types.ts

@@ -34,7 +34,7 @@ export enum AggregationType {
     MAX,
     /** Minimum aggregation function. The smallest value of all registers. */
     MIN
-};
+}
 
 /**
  * Available relationships between sub dimensions and its parents.
@@ -60,7 +60,7 @@ export enum RelationType {
      * the timestamp.
      */
     YEAR,
-};
+}
 
 /**
  * Available data types for metrics, dimensions and source members.
@@ -85,4 +85,4 @@ export enum DataType {
      * Custom enumeration defined in configuration file.
      */
     ENUMTYPE
-};
+}

src/util/configParser.ts

@@ -116,7 +116,7 @@ export interface ParsedConfig {
     /** SQL views build configuration. */
     buildViews: BuildView[];
     /** Quantity of database */
-    ndb: Number;
+    ndb: number;
 }
 
 /** Required information to connect in a generic database. */

test/mocha.opts

@@ -8,3 +8,4 @@
 --check-leaks
 --globals expect
 ./src/**/*.spec.ts
+--exit
\ No newline at end of file

tslint.json

@@ -8,6 +8,17 @@
     "trailing-comma": false,
     "interface-name": false,
     "max-line-length": false,
-    "member-ordering": false
+    "member-ordering": false,
+    "ordered-imports": false,
+    "prefer-const": false,
+    "prefer-for-of": false,
+    "only-arrow-functions": false,
+    "no-unused-expression": false,
+    "space-before-function-paren": false,
+    "object-literal-shorthand":false,
+    "array-type": false,
+    "arrow-parens": false,
+    "callable-types": false,
+    "no-shadowed-variable": false
   }
 }