fix: Adds type definitions for external usage. (#71)

ryasmi · web-flow · commit a7b16bba79ea · 2018-02-15T16:54:59.000Z
diff --git a/src/apps/activities/app.ts b/src/apps/activities/app.ts
@@ -2,10 +2,11 @@
 import presenterFactory from '@learninglocker/xapi-activities/dist/expressPresenter';
 import serviceFactory from '@learninglocker/xapi-activities/dist/service';
 import enTranslator from '@learninglocker/xapi-activities/dist/translatorFactory/en';
+import { Router } from 'express';
 import AppConfig from './AppConfig';
 import repoFactory from './repo/factory';
 
-export default (appConfig: AppConfig) => {
+export default (appConfig: AppConfig): Router => {
   const translator = enTranslator;
   const repo = repoFactory({
     auth: {
diff --git a/src/apps/activities/repo/auth/factory.ts b/src/apps/activities/repo/auth/factory.ts
@@ -1,8 +1,9 @@
+import Repo from '@learninglocker/xapi-activities/dist/repoFactory/AuthRepo';
 import testAuthRepo from '@learninglocker/xapi-activities/dist/testAuthRepo';
 import mongoAuthRepo from '@learninglocker/xapi-agents/dist/mongoAuthRepo';
 import FactoryConfig from './FactoryConfig';
 
-export default (factoryConfig: FactoryConfig) => {
+export default (factoryConfig: FactoryConfig): Repo => {
   switch (factoryConfig.factoryName) {
     case 'test':
       return testAuthRepo(factoryConfig.test);
diff --git a/src/apps/activities/repo/factory.ts b/src/apps/activities/repo/factory.ts
@@ -1,9 +1,10 @@
+import Repo from '@learninglocker/xapi-activities/dist/repoFactory/Repo';
 import authFactory from './auth/factory';
 import FactoryConfig from './FactoryConfig';
 import modelsFactory from './models/factory';
 import storageFactory from './storage/factory';
 
-export default (factoryConfig: FactoryConfig) => {
+export default (factoryConfig: FactoryConfig): Repo => {
   const authFacade = authFactory(factoryConfig.auth);
   const modelsFacade = modelsFactory(factoryConfig.models);
   const storageFacade = storageFactory(factoryConfig.storage);
diff --git a/src/apps/activities/repo/models/factory.ts b/src/apps/activities/repo/models/factory.ts
@@ -1,8 +1,9 @@
 import memoryModelsRepo from '@learninglocker/xapi-activities/dist/memoryModelsRepo';
 import mongoModelsRepo from '@learninglocker/xapi-activities/dist/mongoModelsRepo';
+import Repo from '@learninglocker/xapi-activities/dist/repoFactory/ModelsRepo';
 import FactoryConfig from './FactoryConfig';
 
-export default (factoryConfig: FactoryConfig) => {
+export default (factoryConfig: FactoryConfig): Repo => {
   switch (factoryConfig.factoryName) {
     case 'mongo':
       return mongoModelsRepo(factoryConfig.mongo);
diff --git a/src/apps/activities/repo/storage/factory.ts b/src/apps/activities/repo/storage/factory.ts
@@ -2,10 +2,11 @@ import * as Storage from '@google-cloud/storage';
 import googleStorageRepo from '@learninglocker/xapi-activities/dist/googleStorageRepo';
 import localStorageRepo from '@learninglocker/xapi-activities/dist/localStorageRepo';
 import s3StorageRepo from '@learninglocker/xapi-activities/dist/s3StorageRepo';
+import Repo from '@learninglocker/xapi-agents/dist/repoFactory/StorageRepo';
 import { S3 } from 'aws-sdk';
 import FactoryConfig from './FactoryConfig';
 
-export default (factoryConfig: FactoryConfig) => {
+export default (factoryConfig: FactoryConfig): Repo => {
   switch (factoryConfig.factoryName) {
     case 's3':
       return s3StorageRepo({
diff --git a/src/apps/agents/app.ts b/src/apps/agents/app.ts
@@ -2,10 +2,11 @@
 import presenterFactory from '@learninglocker/xapi-agents/dist/expressPresenter';
 import serviceFactory from '@learninglocker/xapi-agents/dist/service';
 import enTranslator from '@learninglocker/xapi-agents/dist/translatorFactory/en';
+import { Router } from 'express';
 import AppConfig from './AppConfig';
 import repoFactory from './repo/factory';
 
-export default (appConfig: AppConfig) => {
+export default (appConfig: AppConfig): Router => {
   const translator = enTranslator;
   const repo = repoFactory({
     auth: {
diff --git a/src/apps/agents/repo/auth/factory.ts b/src/apps/agents/repo/auth/factory.ts
@@ -1,8 +1,9 @@
 import mongoAuthRepo from '@learninglocker/xapi-agents/dist/mongoAuthRepo';
+import Repo from '@learninglocker/xapi-agents/dist/repoFactory/AuthRepo';
 import testAuthRepo from '@learninglocker/xapi-agents/dist/testAuthRepo';
 import FactoryConfig from './FactoryConfig';
 
-export default (factoryConfig: FactoryConfig) => {
+export default (factoryConfig: FactoryConfig): Repo => {
   switch (factoryConfig.factoryName) {
     case 'test':
       return testAuthRepo(factoryConfig.test);
diff --git a/src/apps/agents/repo/factory.ts b/src/apps/agents/repo/factory.ts
@@ -1,9 +1,10 @@
+import Repo from '@learninglocker/xapi-agents/dist/repoFactory/Repo';
 import authFactory from './auth/factory';
 import FactoryConfig from './FactoryConfig';
 import modelsFactory from './models/factory';
 import storageFactory from './storage/factory';
 
-export default (factoryConfig: FactoryConfig) => {
+export default (factoryConfig: FactoryConfig): Repo => {
   const authFacade = authFactory(factoryConfig.auth);
   const modelsFacade = modelsFactory(factoryConfig.models);
   const storageFacade = storageFactory(factoryConfig.storage);
diff --git a/src/apps/agents/repo/models/factory.ts b/src/apps/agents/repo/models/factory.ts
@@ -1,8 +1,9 @@
 import memoryModelsRepo from '@learninglocker/xapi-agents/dist/memoryModelsRepo';
 import mongoModelsRepo from '@learninglocker/xapi-agents/dist/mongoModelsRepo';
+import Repo from '@learninglocker/xapi-agents/dist/repoFactory/ModelsRepo';
 import FactoryConfig from './FactoryConfig';
 
-export default (factoryConfig: FactoryConfig) => {
+export default (factoryConfig: FactoryConfig): Repo => {
   switch (factoryConfig.factoryName) {
     case 'mongo':
       return mongoModelsRepo(factoryConfig.mongo);
diff --git a/src/apps/agents/repo/storage/factory.ts b/src/apps/agents/repo/storage/factory.ts
@@ -1,11 +1,12 @@
 import * as Storage from '@google-cloud/storage';
 import googleStorageRepo from '@learninglocker/xapi-agents/dist/googleStorageRepo';
 import localStorageRepo from '@learninglocker/xapi-agents/dist/localStorageRepo';
+import Repo from '@learninglocker/xapi-agents/dist/repoFactory/StorageRepo';
 import s3StorageRepo from '@learninglocker/xapi-agents/dist/s3StorageRepo';
 import { S3 } from 'aws-sdk';
 import FactoryConfig from './FactoryConfig';
 
-export default (factoryConfig: FactoryConfig) => {
+export default (factoryConfig: FactoryConfig): Repo => {
   switch (factoryConfig.factoryName) {
     case 's3':
       return s3StorageRepo({
diff --git a/src/apps/app.ts b/src/apps/app.ts
@@ -5,7 +5,7 @@ import AppConfig from './AppConfig';
 import statementsApp from './statements/app';
 import statesApp from './states/app';
 
-export default (appConfig: AppConfig) => {
+export default (appConfig: AppConfig): Router => {
   const router = Router();
   const activitiesRouter = activitiesApp({
     logger: appConfig.logger,
diff --git a/src/apps/statements/app.ts b/src/apps/statements/app.ts
@@ -1,11 +1,11 @@
 /* tslint:disable:max-file-line-count */
-import presenterFactory from '@learninglocker/xapi-statements/dist/expressPresenter';
+import presenterFactory, { Result } from '@learninglocker/xapi-statements/dist/expressPresenter';
 import repoFactory from '@learninglocker/xapi-statements/dist/repo/facade';
 import serviceFactory from '@learninglocker/xapi-statements/dist/service';
 import enTranslator from '@learninglocker/xapi-statements/dist/translatorFactory/en';
 import AppConfig from './AppConfig';
 
-export default (appConfig: AppConfig) => {
+export default (appConfig: AppConfig): Result => {
   const translator = enTranslator;
   const repo = repoFactory({
     auth: {
diff --git a/src/apps/states/app.ts b/src/apps/states/app.ts
@@ -2,10 +2,11 @@
 import presenterFactory from '@learninglocker/xapi-state/dist/expressPresenter';
 import serviceFactory from '@learninglocker/xapi-state/dist/service';
 import enTranslator from '@learninglocker/xapi-state/dist/translatorFactory/en';
+import { Router } from 'express';
 import AppConfig from './AppConfig';
 import repoFactory from './repo/factory';
 
-export default (appConfig: AppConfig) => {
+export default (appConfig: AppConfig): Router => {
   const translator = enTranslator;
   const repo = repoFactory({
     auth: {
diff --git a/src/apps/states/repo/auth/factory.ts b/src/apps/states/repo/auth/factory.ts
@@ -1,8 +1,9 @@
 import mongoAuthRepo from '@learninglocker/xapi-state/dist/mongoAuthRepo';
+import Repo from '@learninglocker/xapi-state/dist/repoFactory/AuthRepo';
 import testAuthRepo from '@learninglocker/xapi-state/dist/testAuthRepo';
 import FactoryConfig from './FactoryConfig';
 
-export default (factoryConfig: FactoryConfig) => {
+export default (factoryConfig: FactoryConfig): Repo => {
   switch (factoryConfig.factoryName) {
     case 'test':
       return testAuthRepo(factoryConfig.test);
diff --git a/src/apps/states/repo/factory.ts b/src/apps/states/repo/factory.ts
@@ -1,9 +1,10 @@
+import Repo from '@learninglocker/xapi-state/dist/repoFactory/Repo';
 import authFactory from './auth/factory';
 import FactoryConfig from './FactoryConfig';
 import modelsFactory from './models/factory';
 import storageFactory from './storage/factory';
 
-export default (factoryConfig: FactoryConfig) => {
+export default (factoryConfig: FactoryConfig): Repo => {
   const authFacade = authFactory(factoryConfig.auth);
   const modelsFacade = modelsFactory(factoryConfig.models);
   const storageFacade = storageFactory(factoryConfig.storage);
diff --git a/src/apps/states/repo/models/factory.ts b/src/apps/states/repo/models/factory.ts
@@ -1,8 +1,9 @@
 import memoryModelsRepo from '@learninglocker/xapi-state/dist/memoryModelsRepo';
 import mongoModelsRepo from '@learninglocker/xapi-state/dist/mongoModelsRepo';
+import Repo from '@learninglocker/xapi-state/dist/repoFactory/ModelsRepo';
 import FactoryConfig from './FactoryConfig';
 
-export default (factoryConfig: FactoryConfig) => {
+export default (factoryConfig: FactoryConfig): Repo => {
   switch (factoryConfig.factoryName) {
     case 'mongo':
       return mongoModelsRepo(factoryConfig.mongo);
diff --git a/src/apps/states/repo/storage/factory.ts b/src/apps/states/repo/storage/factory.ts
@@ -1,11 +1,12 @@
 import * as Storage from '@google-cloud/storage';
 import googleStorageRepo from '@learninglocker/xapi-state/dist/googleStorageRepo';
 import localStorageRepo from '@learninglocker/xapi-state/dist/localStorageRepo';
+import Repo from '@learninglocker/xapi-state/dist/repoFactory/StorageRepo';
 import s3StorageRepo from '@learninglocker/xapi-state/dist/s3StorageRepo';
 import { S3 } from 'aws-sdk';
 import FactoryConfig from './FactoryConfig';
 
-export default (factoryConfig: FactoryConfig) => {
+export default (factoryConfig: FactoryConfig): Repo => {
   switch (factoryConfig.factoryName) {
     case 's3':
       return s3StorageRepo({
diff --git a/src/logger.ts b/src/logger.ts
@@ -1,7 +1,8 @@
 import commonWinston from 'jscommons/dist/winston';
+import { LoggerInstance } from 'winston';
 import config from './config';
 
-export default commonWinston({
+const logger: LoggerInstance = commonWinston({
   cloudWatch: {
     awsConfig: {
       accessKeyId: config.winston.cloudWatch.awsConfig.accessKeyId,
@@ -17,3 +18,5 @@ export default commonWinston({
     level: config.winston.console.level,
   },
 });
+
+export default logger;
diff --git a/src/utils/connectToMongoDb.ts b/src/utils/connectToMongoDb.ts
@@ -1,9 +1,10 @@
 import connectToDb from 'jscommons/dist/mongoRepo/utils/connectToDb';
 import { once } from 'lodash';
+import { Db } from 'mongodb';
 import config from '../config';
 import logger from '../logger';
 
-export default once(() => {
+export default once((): () => Promise<Db> => {
   return connectToDb({
     dbName: config.mongoModelsRepo.dbName,
     logger,
diff --git a/tsconfig.json b/tsconfig.json
@@ -11,8 +11,7 @@
     "typeRoots": [
       "./@types",
       "./node_modules/@types"
-    ],
-    "declaration": false
+    ]
   },
   "includes": [
     "src/**/*"
