cf fixes

.cfignore

@@ -1,5 +1,2 @@
 node_modules
-*.md
-**/node_modules
-**/node_modules
-server/dist
+*.md

server/package.json

@@ -38,15 +38,15 @@
     "@types/es6-promise": "^3.3.0",
     "@types/express": "^4.16.0",
     "@types/mocha": "^5.2.5",
-    "@types/node": "^10.5.5"
+    "@types/node": "^10.5.5",
+    "ts-node": "^7.0.0"
   },
   "devDependencies": {
     "@types/supertest": "^2.0.5",
     "jest": "^23.5.0",
     "mocha": "^5.2.0",
     "nodemon": "^1.18.3",
     "supertest": "^3.1.0",
-    "ts-node": "^7.0.0",
     "tslint-eslint-rules": "^5.4.0"
   }
 }

server/src/config/index.ts

@@ -3,6 +3,7 @@ dotenv.config();
 // tslint:disable-next-line:no-var-requires
 const vcapServices = require('vcap_services');
 const cloudantCreds = vcapServices.getCredentials('cloudantNoSQLDB');
+const ANALYSIS_DB: string = 'analysis_db';
 
 export const ENV = {
   dev: 'development',
@@ -13,12 +14,15 @@ export const ENV = {
 // tslint:disable:variable-name
 let cloudantUsername: string;
 let cloudantPassword: string;
+let cloudantDB: string;
 if (process.env.NODE_ENV === 'production') {
   cloudantUsername = cloudantCreds.username;
   cloudantPassword = cloudantCreds.password;
+  cloudantDB = ANALYSIS_DB;
 } else {
   cloudantUsername = process.env.CLOUDANT_USERNAME || '';
   cloudantPassword = process.env.CLOUDANT_PASSWORD || '';
+  cloudantDB = process.env.CLOUDANT_ANALYSIS_DB_NAME || '';
 }
 
 let config = {
@@ -28,7 +32,7 @@ let config = {
   log_level: process.env.LOGLEVEL,
   cloudant_username: cloudantUsername,
   cloudant_password: cloudantPassword,
-  cloudant_db: process.env.CLOUDANT_ANALYSIS_DB_NAME,
+  cloudant_db: cloudantDB,
   listenFor: process.env.TWITTER_LISTEN_FOR,
   listenTo: process.env.TWITTER_LISTEN_TO,
   filterContaining: process.env.TWITTER_FILTER_CONTAINING,

server/src/index.ts

@@ -11,7 +11,6 @@ import logger from './util/Logger';
 import { ConversationInitializer } from './setup/ConversationInitializer';
 import { EnrichmentPipeline } from './util/EnrichmentPipeline';
 import { CloudantDAO } from './dao/CloudantDAO';
-import { exitOnError } from 'winston';
 
 class App {
 

server/tsconfig.json

@@ -4,12 +4,52 @@
       "target": "es5",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', or 'ESNEXT'. */
       "module": "commonjs",                     /* Specify module code generation: 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
       "lib": ["es6","es2015","dom"],              /* Specify library files to be included in the compilation:  */
+      "allowJs": true,                          /* Allow javascript files to be compiled. */
+      // "checkJs": true,                       /* Report errors in .js files. */
+      // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+      // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+      // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+      // "outFile": "./",                       /* Concatenate and emit output to single file. */
       "outDir": "./dist",                        /* Redirect output structure to the directory. */
+      // "rootDir": "./",                          /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
       "removeComments": true,                /* Do not emit comments to output. */
+      // "noEmit": true,                        /* Do not emit outputs. */
+      // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+      // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+      // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
       /* Strict Type-Checking Options */
       "strict": true,                            /* Enable all strict type-checking options. */
+      // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+      // "strictNullChecks": true,              /* Enable strict null checks. */
+      // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+      // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+      // "resolveJsonModule": true,      
+      /* Additional Checks */
+      // "noUnusedLocals": true,                /* Report errors on unused locals. */
+      // "noUnusedParameters": true,            /* Report errors on unused parameters. */
+      // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+      // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+      /* Module Resolution Options */
+      // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+      // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+      // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+      // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+      // "typeRoots": [],                       /* List of folders to include type definitions from. */
+      // "types": []                            /* Type declaration files to be included in compilation. */
+      // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+
+      /* Source Map Options */
+      // "sourceRoot": "./",                    /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+      // "mapRoot": "./",                       /* Specify the location where debugger should locate map files instead of generated locations. */
+      // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+      // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+      /* Experimental Options */
+      // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+      // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
     },
     "exclude": [
-      "test/*.ts"
+      "test/*.ts",      
     ]
   }

server/tslint.json

@@ -9,8 +9,7 @@
             2
         ],
         "no-empty": [
-            true,
-            "allow-empty-catch",
+            true,            
             "allow-empty-functions"
         ],
         "ordered-imports": false,