move require-wrapper and dependencies handlers

Author: ricardo-devis-agullo

src/registry/domain/require-wrapper.js renamed to src/registry/domain/require-wrapper.ts

@@ -1,31 +1,29 @@
-'use strict';
+import coreModules from 'builtin-modules';
+import path from 'path';
+import requirePackageName from 'require-package-name';
+import tryRequire from 'try-require';
+import _ from 'lodash';
 
-const coreModules = require('builtin-modules');
-const path = require('path');
-const requirePackageName = require('require-package-name');
-const tryRequire = require('try-require');
-const _ = require('lodash');
+import strings from '../../resources';
 
-const strings = require('../../resources').default;
-
-const isCoreDependency = x => _.includes(coreModules, x);
-const requireCoreDependency = x =>
+const isCoreDependency = (x: string) => _.includes(coreModules, x);
+const requireCoreDependency = (x: string) =>
   (isCoreDependency(x) && tryRequire(x)) || undefined;
 
-const requireDependency = requirePath => {
+const requireDependency = (requirePath: string) => {
   const nodeModulesPath = path.resolve('.', 'node_modules');
   const modulePath = path.resolve(nodeModulesPath, requirePath);
   return tryRequire(modulePath);
 };
 
-const throwError = requirePath => {
+const throwError = (requirePath: string) => {
   throw {
     code: strings.errors.registry.DEPENDENCY_NOT_FOUND_CODE,
     missing: [requirePath]
   };
 };
 
-module.exports = injectedDependencies => requirePath => {
+export default (injectedDependencies: string[]) => (requirePath: string) => {
   const moduleName = requirePackageName(requirePath);
   const isAllowed = _.includes(injectedDependencies, moduleName);
 

src/registry/router.js

@@ -10,7 +10,7 @@ const IndexRoute = require('./routes');
 const PublishRoute = require('./routes/publish');
 const StaticRedirectorRoute = require('./routes/static-redirector');
 const PluginsRoute = require('./routes/plugins');
-const DependenciesRoute = require('./routes/dependencies');
+const DependenciesRoute = require('./routes/dependencies').default;
 const settings = require('../resources/settings').default;
 
 module.exports.create = function(app, conf, repository) {

src/registry/routes/dependencies.js renamed to src/registry/routes/dependencies.ts

@@ -1,13 +1,16 @@
-'use strict';
+import { Request, Response } from 'express';
+import { Config } from '../../types';
+import getAvailableDependencies from './helpers/get-available-dependencies';
 
-const getAvailableDependencies = require('./helpers/get-available-dependencies');
-
-module.exports = function(conf) {
-  return function(req, res) {
+export default function dependencies(conf: Config) {
+  return function(req: Request, res: Response): void {
     if (conf.discovery) {
       const dependencies = getAvailableDependencies(conf.dependencies).map(
         ({ core, name, version }) => {
-          const dep = { name, core };
+          const dep: { name: string; core: boolean; versions?: string[] } = {
+            name,
+            core
+          };
           if (!core && version) {
             // In the future this could be multiple versions
             dep.versions = [version];
@@ -21,4 +24,4 @@ module.exports = function(conf) {
       res.status(401);
     }
   };
-};
+}

src/registry/routes/helpers/get-available-dependencies.js renamed to src/registry/routes/helpers/get-available-dependencies.ts

@@ -1,12 +1,19 @@
-'use strict';
+import coreModules from 'builtin-modules';
+import _ from 'lodash';
 
-const coreModules = require('builtin-modules');
-const _ = require('lodash');
+import RequireWrapper from '../../domain/require-wrapper';
 
-const RequireWrapper = require('../../domain/require-wrapper');
+interface AvailableDependency {
+  core: boolean;
+  name: string;
+  version: string;
+  link: string;
+}
 
-module.exports = dependencies =>
-  _.map(dependencies, dependency => {
+export default function getAvailableDependencies(
+  dependencies: string[]
+): AvailableDependency[] {
+  return _.map(dependencies, dependency => {
     const requirer = RequireWrapper(dependencies);
     const core = _.includes(coreModules, dependency);
     const packageJson = !core && requirer(`${dependency}/package.json`);
@@ -17,3 +24,4 @@ module.exports = dependencies =>
 
     return { core, name: dependency, version, link };
   });
+}

src/registry/routes/helpers/get-component.js

@@ -15,7 +15,7 @@ const GetComponentRetrievingInfo = require('./get-component-retrieving-info')
 const getComponentFallback = require('./get-component-fallback');
 const isTemplateLegacy = require('../../../utils/is-template-legacy').default;
 const NestedRenderer = require('../../domain/nested-renderer');
-const RequireWrapper = require('../../domain/require-wrapper');
+const RequireWrapper = require('../../domain/require-wrapper').default;
 const sanitiser = require('../../domain/sanitiser');
 const settings = require('../../../resources/settings').default;
 const strings = require('../../../resources').default;

src/registry/routes/index.js

@@ -7,7 +7,8 @@ const _ = require('lodash');
 const dateStringified = require('../../utils/date-stringify').default;
 const getComponentsHistory = require('./helpers/get-components-history')
   .default;
-const getAvailableDependencies = require('./helpers/get-available-dependencies');
+const getAvailableDependencies = require('./helpers/get-available-dependencies')
+  .default;
 const indexView = require('../views');
 // @ts-ignore
 const packageInfo = require('../../../package.json');

test/unit/registry-domain-require-wrapper.js

@@ -4,7 +4,8 @@ const expect = require('chai').expect;
 const vm = require('vm');
 
 describe('registry : domain : require-wrapper', () => {
-  const RequireWrapper = require('../../dist/registry/domain/require-wrapper');
+  const RequireWrapper = require('../../dist/registry/domain/require-wrapper')
+    .default;
 
   describe('when using the require wrapper in a clear context', () => {
     let result, error;

test/unit/registry-routes-dependencies.js

@@ -26,7 +26,7 @@ describe('registry : routes : plugins', () => {
       './helpers/get-available-dependencies': list =>
         list.map(dep => dependencyMap[dep])
     }
-  );
+  ).default;
 
   const initialise = function() {
     resJsonStub = sinon.stub();

test/unit/registry-routes-helpers-get-available-dependencies.js

@@ -13,7 +13,7 @@ describe('registry : routes : helpers : get-available-dependencies', () => {
         homepage: `https://${pathToPackageJson.split('/')[0]}.com/`
       })
     }
-  );
+  ).default;
 
   describe('happy path', () => {
     let result;