Skip to content

Commit

Permalink
fix: Adds type definitions for external usage. (#71)
Browse files Browse the repository at this point in the history
  • Loading branch information
ryasmi authored Feb 15, 2018
1 parent 347c9d4 commit a7b16bb
Show file tree
Hide file tree
Showing 20 changed files with 40 additions and 22 deletions.
3 changes: 2 additions & 1 deletion src/apps/activities/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
3 changes: 2 additions & 1 deletion src/apps/activities/repo/auth/factory.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
3 changes: 2 additions & 1 deletion src/apps/activities/repo/factory.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
3 changes: 2 additions & 1 deletion src/apps/activities/repo/models/factory.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
3 changes: 2 additions & 1 deletion src/apps/activities/repo/storage/factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
3 changes: 2 additions & 1 deletion src/apps/agents/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
3 changes: 2 additions & 1 deletion src/apps/agents/repo/auth/factory.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
3 changes: 2 additions & 1 deletion src/apps/agents/repo/factory.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
3 changes: 2 additions & 1 deletion src/apps/agents/repo/models/factory.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
3 changes: 2 additions & 1 deletion src/apps/agents/repo/storage/factory.ts
Original file line number Diff line number Diff line change
@@ -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({
Expand Down
2 changes: 1 addition & 1 deletion src/apps/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/apps/statements/app.ts
Original file line number Diff line number Diff line change
@@ -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: {
Expand Down
3 changes: 2 additions & 1 deletion src/apps/states/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
3 changes: 2 additions & 1 deletion src/apps/states/repo/auth/factory.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
3 changes: 2 additions & 1 deletion src/apps/states/repo/factory.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
3 changes: 2 additions & 1 deletion src/apps/states/repo/models/factory.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
3 changes: 2 additions & 1 deletion src/apps/states/repo/storage/factory.ts
Original file line number Diff line number Diff line change
@@ -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({
Expand Down
5 changes: 4 additions & 1 deletion src/logger.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -17,3 +18,5 @@ export default commonWinston({
level: config.winston.console.level,
},
});

export default logger;
3 changes: 2 additions & 1 deletion src/utils/connectToMongoDb.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
3 changes: 1 addition & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"typeRoots": [
"./@types",
"./node_modules/@types"
],
"declaration": false
]
},
"includes": [
"src/**/*"
Expand Down

0 comments on commit a7b16bb

Please sign in to comment.