move domain/handle-dependencies to TS

Author: ricardo-devis-agullo

src/cli/domain/handle-dependencies/ensure-compiler-is-declared-as-devDependency.js renamed to src/cli/domain/handle-dependencies/ensure-compiler-is-declared-as-devDependency.ts

@@ -1,8 +1,13 @@
-'use strict';
+import strings from '../../../resources';
 
-const strings = require('../../../resources').default;
-
-module.exports = (options, cb) => {
+export default function ensureCompilerIsDeclaredAsDevDependency(
+  options: {
+    componentPath: string;
+    pkg: { devDependencies: Dictionary<string> };
+    template: string;
+  },
+  cb: Callback<string, string>
+) {
   const { componentPath, pkg, template } = options;
   const compilerDep = `${template}-compiler`;
   const isOk = pkg.devDependencies[compilerDep];
@@ -12,4 +17,4 @@ module.exports = (options, cb) => {
     : strings.errors.cli.TEMPLATE_DEP_MISSING(template, componentPath);
 
   cb(err, compilerDep);
-};
+}

src/cli/domain/handle-dependencies/get-compiler.js renamed to src/cli/domain/handle-dependencies/get-compiler.ts

@@ -1,11 +1,18 @@
-'use strict';
+import path from 'path';
 
-const path = require('path');
+import cleanRequire from '../../../utils/clean-require';
+import { Logger } from '../../logger';
+import installCompiler from './install-compiler';
 
-const cleanRequire = require('../../../utils/clean-require').default;
-const installCompiler = require('./install-compiler');
-
-module.exports = (options, cb) => {
+export default function getCompiler(
+  options: {
+    compilerDep: string;
+    componentPath: string;
+    logger: Logger;
+    pkg: { name: string; devDependencies: Dictionary<string> };
+  },
+  cb: Callback<string, string | number>
+) {
   const { compilerDep, componentPath, logger, pkg } = options;
   const compilerPath = path.join(componentPath, 'node_modules', compilerDep);
   const compiler = cleanRequire(compilerPath, { justTry: true });
@@ -28,4 +35,4 @@ module.exports = (options, cb) => {
   };
 
   installCompiler(installOptions, cb);
-};
+}

src/cli/domain/handle-dependencies/index.js renamed to src/cli/domain/handle-dependencies/index.ts

@@ -1,36 +1,48 @@
-'use strict';
+import async from 'async';
+import coreModules from 'builtin-modules';
+import fs from 'fs-extra';
+import path from 'path';
+import _ from 'lodash';
 
-const async = require('async');
-const coreModules = require('builtin-modules');
-const fs = require('fs-extra');
-const path = require('path');
-const _ = require('lodash');
+import ensureCompilerIsDeclaredAsDevDependency from './ensure-compiler-is-declared-as-devDependency';
+import getCompiler from './get-compiler';
+import installMissingDependencies from './install-missing-dependencies';
+import linkMissingDependencies from './link-missing-dependencies';
+import isTemplateLegacy from '../../../utils/is-template-legacy';
+import strings from '../../../resources';
+import { Logger } from '../../logger';
 
-const ensureCompilerIsDeclaredAsDevDependency = require('./ensure-compiler-is-declared-as-devDependency');
-const getCompiler = require('./get-compiler');
-const installMissingDependencies = require('./install-missing-dependencies');
-const linkMissingDependencies = require('./link-missing-dependencies');
-const isTemplateLegacy = require('../../../utils/is-template-legacy').default;
-const strings = require('../../../resources').default;
-
-const getComponentPackageJson = (componentPath, cb) =>
+const getComponentPackageJson = (componentPath: string, cb: Callback<any>) =>
   fs.readJson(path.join(componentPath, 'package.json'), cb);
 
-module.exports = (options, callback) => {
+export default function handleDependencies(
+  options: {
+    components: string[];
+    logger: Logger;
+    useComponentDependencies?: boolean;
+  },
+  callback: Callback<
+    {
+      modules: string[];
+      templates: Function[];
+    },
+    string
+  >
+) {
   const { components, logger, useComponentDependencies } = options;
 
   const dependencies = {};
-  const addDependencies = componentDependencies =>
+  const addDependencies = (componentDependencies: Dictionary<string>) =>
     _.each(componentDependencies || {}, (version, dependency) => {
       dependencies[dependency] = version;
     });
 
-  const templates = {};
-  const addTemplate = (templateName, template) => {
+  const templates: Dictionary<Function> = {};
+  const addTemplate = (templateName: string, template: Function) => {
     templates[templateName] = template;
   };
 
-  const setupComponentDependencies = (componentPath, done) =>
+  const setupComponentDependencies = (componentPath: string, done) =>
     async.waterfall(
       [
         cb => getComponentPackageJson(componentPath, cb),
@@ -67,7 +79,7 @@ module.exports = (options, callback) => {
   logger.warn(strings.messages.cli.CHECKING_DEPENDENCIES);
   async.eachSeries(components, setupComponentDependencies, err => {
     if (err) {
-      return callback(err);
+      return callback(err, undefined as any);
     }
 
     const result = {
@@ -76,9 +88,12 @@ module.exports = (options, callback) => {
     };
     const options = { dependencies, logger };
     if (useComponentDependencies) {
+      // @ts-ignore
       options.componentPath = components[0];
-      return linkMissingDependencies(options, err => callback(err, result));
+      return linkMissingDependencies(options as any, err =>
+        callback(err, result)
+      );
     }
     installMissingDependencies(options, err => callback(err, result));
   });
-};
+}

src/cli/domain/handle-dependencies/install-compiler.js renamed to src/cli/domain/handle-dependencies/install-compiler.ts

@@ -1,11 +1,18 @@
-'use strict';
+import cleanRequire from '../../../utils/clean-require';
+import isTemplateValid from '../../../utils/is-template-valid';
+import * as npm from '../../../utils/npm-utils';
+import strings from '../../../resources/index';
+import { Logger } from '../../logger';
 
-const cleanRequire = require('../../../utils/clean-require').default;
-const isTemplateValid = require('../../../utils/is-template-valid').default;
-const npm = require('../../../utils/npm-utils');
-const strings = require('../../../resources/index').default;
-
-module.exports = (options, cb) => {
+export default function installCompiler(
+  options: {
+    compilerPath: string;
+    componentPath: string;
+    dependency: string;
+    logger: Logger;
+  },
+  cb: Callback<string, string | number>
+) {
   const { compilerPath, componentPath, dependency, logger } = options;
 
   logger.warn(strings.messages.cli.INSTALLING_DEPS(dependency), true);
@@ -24,4 +31,4 @@ module.exports = (options, cb) => {
     const errorMsg = 'There was a problem while installing the compiler';
     cb(!err && isOk ? null : errorMsg, compiler);
   });
-};
+}

src/cli/domain/handle-dependencies/install-missing-dependencies.js renamed to src/cli/domain/handle-dependencies/install-missing-dependencies.ts

@@ -1,18 +1,21 @@
 'use strict';
 
-const path = require('path');
-const _ = require('lodash');
+import path from 'path';
 
-const getMissingDependencies = require('./get-missing-dependencies').default;
-const npm = require('../../../utils/npm-utils');
-const strings = require('../../../resources/index').default;
+import getMissingDependencies from './get-missing-dependencies';
+import * as npm from '../../../utils/npm-utils';
+import strings from '../../../resources/index';
+import { Logger } from '../../logger';
 
-module.exports = (options, callback) => {
+export default function installMissingDependencies(
+  options: { dependencies: Dictionary<string>; logger: Logger },
+  callback: (err: string | null) => void
+) {
   const { dependencies, logger } = options;
 
   const missing = getMissingDependencies(dependencies);
 
-  if (_.isEmpty(missing)) {
+  if (!missing.length) {
     return callback(null);
   }
 
@@ -26,11 +29,12 @@ module.exports = (options, callback) => {
   };
 
   npm.installDependencies(npmOptions, err => {
-    if (err || !_.isEmpty(getMissingDependencies(dependencies))) {
+    if (err || getMissingDependencies(dependencies).length) {
       logger.err('FAIL');
       return callback(strings.errors.cli.DEPENDENCIES_INSTALL_FAIL);
     }
+
     logger.ok('OK');
     callback(null);
   });
-};
+}

src/cli/domain/handle-dependencies/link-missing-dependencies.js renamed to src/cli/domain/handle-dependencies/link-missing-dependencies.ts

@@ -1,18 +1,24 @@
-'use strict';
+import _ from 'lodash';
+import path from 'path';
+import fs from 'fs-extra';
+import getMissingDependencies from './get-missing-dependencies';
+import strings from '../../../resources/index';
+import stripVersion from '../../../utils/strip-version';
+import { Logger } from '../../logger';
 
-const _ = require('lodash');
-const path = require('path');
-const fs = require('fs-extra');
-const getMissingDependencies = require('./get-missing-dependencies').default;
-const strings = require('../../../resources/index').default;
-const stripVersion = require('../../../utils/strip-version').default;
-
-module.exports = (options, callback) => {
+export default function linkMissingDependencies(
+  options: {
+    componentPath: string;
+    dependencies: Dictionary<string>;
+    logger: Logger;
+  },
+  callback: (err: string | null) => void
+) {
   const { componentPath, dependencies, logger } = options;
 
   const missingDependencies = getMissingDependencies(dependencies);
 
-  if (_.isEmpty(missingDependencies)) {
+  if (!missingDependencies.length) {
     return callback(null);
   }
 
@@ -23,7 +29,8 @@ module.exports = (options, callback) => {
 
   const symLinkType = 'dir';
   let symLinkError = false;
-  _.each(missingDependencies, dependency => {
+
+  for (const dependency of missingDependencies) {
     const moduleName = stripVersion(dependency);
     const pathToComponentModule = path.resolve(
       componentPath,
@@ -37,8 +44,9 @@ module.exports = (options, callback) => {
       symLinkError = true;
       logger.err(strings.errors.cli.DEPENDENCY_LINK_FAIL(moduleName, err));
     }
-  });
+  }
+
   return !symLinkError
     ? callback(null)
     : callback(strings.errors.cli.DEPENDENCIES_LINK_FAIL);
-};
+}

src/cli/domain/handle-dependencies/require-template.js renamed to src/cli/domain/handle-dependencies/require-template.ts

@@ -1,13 +1,16 @@
 'use strict';
 
-const path = require('path');
+import path from 'path';
 
-const cleanRequire = require('../../../utils/clean-require').default;
-const isTemplateLegacy = require('../../../utils/is-template-legacy').default;
-const isTemplateValid = require('../../../utils/is-template-valid').default;
-const strings = require('../../../resources').default;
+import cleanRequire from '../../../utils/clean-require';
+import isTemplateLegacy from '../../../utils/is-template-legacy';
+import isTemplateValid from '../../../utils/is-template-valid';
+import strings from '../../../resources';
 
-module.exports = function(template, options) {
+export default function requireTemplate(
+  template: string,
+  options: { compiler: boolean; componentPath: string }
+) {
   const requireOptions = options || {};
   let ocTemplate;
 
@@ -42,4 +45,4 @@ module.exports = function(template, options) {
   }
 
   return ocTemplate;
-};
+}

src/cli/domain/package-components.js

@@ -3,7 +3,8 @@
 const fs = require('fs-extra');
 const path = require('path');
 
-const requireTemplate = require('./handle-dependencies/require-template');
+const requireTemplate = require('./handle-dependencies/require-template')
+  .default;
 const validator = require('../../registry/domain/validators');
 
 module.exports = function() {

src/cli/facade/dev.js

@@ -8,7 +8,7 @@ const path = require('path');
 const _ = require('lodash');
 
 const getMockedPlugins = require('../domain/get-mocked-plugins');
-const handleDependencies = require('../domain/handle-dependencies');
+const handleDependencies = require('../domain/handle-dependencies').default;
 const oc = require('../../index');
 const strings = require('../../resources/index').default;
 const watch = require('../domain/watch');

src/cli/facade/package.js

@@ -2,7 +2,7 @@
 
 const strings = require('../../resources/index').default;
 const path = require('path');
-const handleDependencies = require('../domain/handle-dependencies');
+const handleDependencies = require('../domain/handle-dependencies').default;
 
 module.exports = function(dependencies) {
   const local = dependencies.local,