update types

Author: ricardo-devis-agullo

src/cli/domain/get-mocked-plugins.ts

@@ -7,19 +7,25 @@ import strings from '../../resources/';
 import { Logger } from '../logger';
 
 interface MockedPlugin {
-  register: Function;
-  execute: Function;
+  register: (options: unknown, dependencies: unknown, next: () => void) => void;
+  execute: (...args: unknown[]) => unknown;
 }
 
 interface PluginMock {
   name: string;
   register: {
-    register: Function;
-    execute: Function;
+    register: (
+      options: unknown,
+      dependencies: unknown,
+      next: () => void
+    ) => void;
+    execute: (...args: unknown[]) => unknown;
   };
 }
 
-const isMockValid = (plugin: unknown): plugin is MockedPlugin | Function => {
+const isMockValid = (
+  plugin: unknown
+): plugin is MockedPlugin | ((...args: unknown[]) => unknown) => {
   const isFunction = typeof plugin === 'function';
   const isValidObject =
     !!plugin &&
@@ -34,9 +40,14 @@ const defaultRegister = (
   options: unknown,
   dependencies: unknown,
   next: () => void
-) => next();
+) => {
+  next();
+};
 
-const registerStaticMocks = (mocks, logger): PluginMock[] =>
+const registerStaticMocks = (
+  mocks: Dictionary<string>,
+  logger: Logger
+): PluginMock[] =>
   _.map(mocks, (mockedValue, pluginName) => {
     logger.ok(`├── ${pluginName} () => ${mockedValue}`);
 
@@ -49,7 +60,11 @@ const registerStaticMocks = (mocks, logger): PluginMock[] =>
     };
   });
 
-const registerDynamicMocks = (ocJsonLocation: string, mocks, logger) =>
+const registerDynamicMocks = (
+  ocJsonLocation: string,
+  mocks: Dictionary<string>,
+  logger: Logger
+) =>
   _.map(mocks, (source, pluginName) => {
     let pluginMock;
     try {
@@ -87,7 +102,7 @@ const findPath = (
     if (pathToResolve === rootDir) {
       return undefined;
     } else {
-      const getParent = pathToResolve =>
+      const getParent = (pathToResolve: string) =>
         pathToResolve
           .split('/')
           .slice(0, -1)

src/cli/domain/init-template/index.ts

@@ -16,18 +16,18 @@ export default function initTemplate(
     logger: Logger;
   },
   callback: Callback<{ ok: true }, string>
-) {
+): void {
   const { compiler, componentPath } = options;
   const compilerPath = path.join(componentPath, 'node_modules', compiler);
   const npmOptions = { initPath: componentPath, silent: true };
 
   async.series(
     [
       cb => fs.ensureDir(componentPath, cb),
-      cb => npm.init(npmOptions, cb),
-      cb => installTemplate(options, cb),
-      cb => scaffold(Object.assign(options, { compilerPath }), cb)
+      cb => npm.init(npmOptions, cb as any),
+      cb => installTemplate(options, cb as any),
+      cb => scaffold(Object.assign(options, { compilerPath }), cb as any)
     ],
-    callback
+    callback as any
   );
 }

src/cli/domain/init-template/install-template.ts

@@ -15,7 +15,7 @@ interface Options {
 export default function installTemplate(
   options: Options,
   callback: Callback<{ ok: true }, string>
-) {
+): void {
   const { compiler, componentPath, logger, templateType } = options;
 
   const npmOptions = {

src/cli/domain/mock.ts

@@ -7,7 +7,7 @@ export default function mock() {
   return function(
     params: { targetType: string; targetValue: string; targetName: string },
     callback: (err: Error) => void
-  ) {
+  ): void {
     fs.readJson(settings.configFile.src, (err, localConfig) => {
       localConfig = localConfig || {};
 

src/registry/routes/helpers/get-component-fallback.ts

@@ -1,4 +1,5 @@
 import { Request, Response } from 'express';
+import { IncomingHttpHeaders } from 'http';
 import request from 'minimal-request';
 import url from 'url';
 import { Component, Config } from '../../../types';
@@ -42,7 +43,7 @@ function getComponentFallbackForViewType(
         accept: 'application/json'
       }
     },
-    (fallbackErr, fallbackResponse) => {
+    (fallbackErr, fallbackResponse: string) => {
       if (fallbackErr === 304) {
         return res.status(304).send('');
       }
@@ -74,8 +75,8 @@ function getComponentFallbackForViewType(
 
 export function getComponent(
   fallbackRegistryUrl: string,
-  headers: Dictionary<string>,
-  component: { name: string; version: string; parameters: Dictionary<string> },
+  headers: IncomingHttpHeaders,
+  component: { name: string; version: string; parameters: IncomingHttpHeaders },
   callback: (
     result:
       | {
@@ -84,7 +85,7 @@ export function getComponent(
         }
       | Component
   ) => void
-) {
+): void {
   return request(
     {
       method: 'post',
@@ -93,13 +94,13 @@ export function getComponent(
       json: true,
       body: { components: [component] }
     },
-    (err, res) => {
+    (err, res: Component[]) => {
       if (err || !res || res.length === 0) {
         return callback({
           status: 404,
           response: {
             code: 'NOT_FOUND',
-            error: err
+            error: err as any
           }
         });
       }
@@ -115,7 +116,7 @@ export function getComponentPreview(
   res: Response,
   registryError: string | null,
   callback: ComponentCallback
-) {
+): void {
   getComponentFallbackForViewType(
     urlBuilder.componentPreview,
     conf,
@@ -132,7 +133,7 @@ export function getComponentInfo(
   res: Response,
   registryError: string | null,
   callback: ComponentCallback
-) {
+): void {
   getComponentFallbackForViewType(
     urlBuilder.componentInfo,
     conf,

src/registry/routes/plugins.ts

@@ -2,7 +2,7 @@ import { Request, Response } from 'express';
 import { Config } from '../../types';
 
 export default function plugins(conf: Config) {
-  return function(req: Request, res: Response) {
+  return (req: Request, res: Response): void => {
     if (conf.discovery) {
       const plugins = Object.entries(conf.plugins).map(
         ([pluginName, pluginFn]) => ({

src/utils/clean-require.ts

@@ -2,8 +2,8 @@ import tryRequire from 'try-require';
 
 export default function cleanRequire(
   path: string,
-  { justTry = false, resolve = false }
-) {
+  { justTry = false, resolve = false }: { justTry?: boolean; resolve?: boolean }
+): any {
   const shouldThrow = !justTry;
 
   if (require.cache && !!require.cache[path]) {

src/utils/is-template-valid.ts

@@ -8,11 +8,10 @@ export default function isTemplateValid(
     return false;
   }
 
-  const api = ['getInfo', 'getCompiledTemplate', 'render'];
+  const templateApi = ['getInfo', 'getCompiledTemplate', 'render'] as const;
+  const compilerApi = [...templateApi, 'compile'] as const;
 
-  if (options && options.compiler === true) {
-    api.push('compile');
-  }
+  const api = options && options.compiler === true ? compilerApi : templateApi;
 
   return api.every(
     method => typeof (template as Template)[method] === 'function'

src/utils/npm-utils.ts

@@ -23,7 +23,7 @@ const buildInstallCommand = (options: {
 
 const executeCommand = (
   options: { command: string[]; path: string; silent?: boolean },
-  callback: NoParameterCallback<string | number>
+  callback: NoParameterCallback<string | number | null>
 ) => {
   const cmd = spawn('npm', [...options.command, '--no-package-lock'], {
     cwd: options.path,
@@ -44,8 +44,8 @@ const getFullPath = ({
 
 export const init = (
   options: { initPath: string; silent: boolean },
-  callback: NoParameterCallback<string | number>
-) => {
+  callback: NoParameterCallback<string | number | null>
+): void => {
   const { initPath, silent } = options;
   const npminit = ['init', '--yes'];
   const cmdOptions = { path: initPath, command: npminit, silent };
@@ -56,7 +56,7 @@ export const init = (
 export const installDependencies = (
   options: { dependencies: string[]; installPath: string; silent: boolean },
   callback: Callback<{ dest: string }, string | number>
-) => {
+): void => {
   const { dependencies, installPath, silent } = options;
   const npmi = buildInstallCommand(options);
   const cmdOptions = {
@@ -77,7 +77,7 @@ export const installDependencies = (
 export const installDependency = (
   options: { dependency: string; installPath: string; silent?: boolean },
   callback: Callback<{ dest: string }, string | number>
-) => {
+): void => {
   const { dependency, installPath, silent } = options;
   const npmi = buildInstallCommand(options);
   const cmdOptions = {

src/utils/pad-zero.ts

@@ -1,5 +1,3 @@
-'use strict';
-
-export default function padZero(length: number, data: number) {
+export default function padZero(length: number, data: number): string {
   return Array(length - String(data).length + 1).join('0') + data;
 }