type Registry, some routes and refine return types on some files

Author: ricardo-devis-agullo

src/cli/domain/get-components-by-dir.ts

@@ -2,7 +2,7 @@ import fs from 'fs-extra';
 import path from 'path';
 
 export default function getComponentsByDir() {
-  return function(componentsDir: string, callback: Callback<string[]>) {
+  return (componentsDir: string, callback: Callback<string[]>): void => {
     const isOcComponent = function(file: string) {
       const filePath = path.resolve(componentsDir, file),
         packagePath = path.join(filePath, 'package.json');

src/cli/domain/handle-dependencies/link-missing-dependencies.js

@@ -35,7 +35,9 @@ module.exports = (options, callback) => {
       fs.ensureSymlinkSync(pathToComponentModule, pathToModule, symLinkType);
     } catch (err) {
       symLinkError = true;
-      logger.err(strings.errors.cli.DEPENDENCY_LINK_FAIL(moduleName, err));
+      logger.err(
+        strings.errors.cli.DEPENDENCY_LINK_FAIL(moduleName, String(err))
+      );
     }
   });
   return !symLinkError

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

@@ -14,7 +14,7 @@ interface ScaffoldOptions {
 export default function scaffold(
   options: ScaffoldOptions,
   callback: Callback<{ ok: true }, string>
-) {
+): void {
   const {
     compiler,
     compilerPath,
@@ -25,14 +25,14 @@ export default function scaffold(
 
   const baseComponentPath = path.join(compilerPath, 'scaffold');
   const baseComponentFiles = path.join(baseComponentPath, 'src');
-  const compilerPackage = fs.readJSONSync(
+  const compilerPackage = fs.readJsonSync(
     path.join(compilerPath, 'package.json')
   );
 
   try {
     fs.copySync(baseComponentFiles, componentPath);
 
-    const componentPackage = fs.readJSONSync(
+    const componentPackage = fs.readJsonSync(
       path.join(componentPath, 'package.json')
     );
     componentPackage.name = componentName;
@@ -46,6 +46,8 @@ export default function scaffold(
     const url =
       (compilerPackage.bugs && compilerPackage.bugs.url) ||
       `the ${templateType} repo`;
-    return (callback as any)(strings.errors.cli.scaffoldError(url, error));
+    return (callback as any)(
+      strings.errors.cli.scaffoldError(url, String(error))
+    );
   }
 }

src/cli/validate-command.ts

@@ -5,11 +5,13 @@ import strings from '../resources';
 export default function validateCommand(argv: Arguments, level: number): true {
   let keys = Object.keys(commands.commands);
   if (level === 1) {
-    keys = Object.keys(commands.commands[argv._[0]].commands || {});
+    keys = Object.keys((commands as any).commands[argv._[0]].commands || {});
   }
 
-  if (argv._.length > level && !keys.includes(argv._[String(level)])) {
-    throw new Error(strings.messages.cli.NO_SUCH_COMMAND(argv._[level]));
+  if (argv._.length > level && !keys.includes((argv as any)._[String(level)])) {
+    throw new Error(
+      strings.messages.cli.NO_SUCH_COMMAND(String(argv._[level]))
+    );
   }
 
   return true;

src/registry/app-start.js renamed to src/registry/app-start.ts

@@ -1,13 +1,25 @@
-'use strict';
+import colors from 'colors/safe';
+import path from 'path';
+import _ from 'lodash';
+import fs from 'fs-extra';
+import { ComponentsDetails, Config, Repository } from '../types';
 
-const colors = require('colors/safe');
-const path = require('path');
-const _ = require('lodash');
+const packageInfo = fs.readJsonSync(
+  path.join(
+    __dirname,
+    '..',
+    'components',
+    'oc-client',
+    '_package',
+    'package.json'
+  )
+);
 
-// @ts-ignore
-const packageInfo = require('../components/oc-client/_package/package');
-
-module.exports = function(repository, options, callback) {
+export default function appStart(
+  repository: Repository,
+  options: Config,
+  callback: Callback<ComponentsDetails | string, any>
+): void {
   if (options.local) {
     return callback(null, 'ok');
   }
@@ -50,7 +62,9 @@ module.exports = function(repository, options, callback) {
           if (!err) {
             logger.log(colors.green('Component published.'));
           } else {
-            logger.log(colors.red(`Component not published: ${err.message}`));
+            logger.log(
+              colors.red(`Component not published: ${(err as any).message}`)
+            );
           }
 
           callback(err, res);
@@ -61,4 +75,4 @@ module.exports = function(repository, options, callback) {
       callback(null, 'ok');
     }
   });
-};
+}

src/registry/domain/extract-package.ts

@@ -4,7 +4,11 @@ import targz from 'targz';
 import getPackageJsonFromTempDir from './get-package-json-from-temp-dir';
 
 export default function extractPackage(
-  files: Express.Multer.File[],
+  files:
+    | Express.Multer.File[]
+    | {
+        [fieldname: string]: Express.Multer.File[];
+      },
   callback: Callback<{
     outputFolder: string;
     packageJson: any;