reduce lodash usage on test/code

ricardo-devis-agullo · ricardo-devis-agullo · commit e8e4e1d65600 · 2022-01-17T13:09:06.000+01:00
diff --git a/src/cli/domain/get-mocked-plugins.ts b/src/cli/domain/get-mocked-plugins.ts
@@ -1,10 +1,10 @@
 import fs from 'fs-extra';
 import path from 'path';
-import _ from 'lodash';
 
 import settings from '../../resources/settings';
 import strings from '../../resources/';
 import { Logger } from '../logger';
+import { OcJsonConfig } from '../../types';
 
 interface MockedPlugin {
   register: (options: unknown, dependencies: unknown, next: () => void) => void;
@@ -48,7 +48,7 @@ const registerStaticMocks = (
   mocks: Record<string, string>,
   logger: Logger
 ): PluginMock[] =>
-  _.map(mocks, (mockedValue, pluginName) => {
+  Object.entries(mocks).map(([pluginName, mockedValue]) => {
     logger.ok(`├── ${pluginName} () => ${mockedValue}`);
 
     return {
@@ -65,31 +65,33 @@ const registerDynamicMocks = (
   mocks: Record<string, string>,
   logger: Logger
 ) =>
-  _.map(mocks, (source, pluginName) => {
-    let pluginMock;
-    try {
-      pluginMock = require(path.resolve(ocJsonLocation, source));
-    } catch (er) {
-      logger.err(String(er));
-      return;
-    }
+  Object.entries(mocks)
+    .map(([pluginName, source]) => {
+      let pluginMock;
+      try {
+        pluginMock = require(path.resolve(ocJsonLocation, source));
+      } catch (er) {
+        logger.err(String(er));
+        return;
+      }
 
-    if (!isMockValid(pluginMock)) {
-      logger.err(`├── ${pluginName} () => Error (skipping)`);
-      logger.err(strings.errors.cli.MOCK_PLUGIN_IS_NOT_VALID);
-      return;
-    }
+      if (!isMockValid(pluginMock)) {
+        logger.err(`├── ${pluginName} () => Error (skipping)`);
+        logger.err(strings.errors.cli.MOCK_PLUGIN_IS_NOT_VALID);
+        return;
+      }
 
-    const register = (pluginMock as MockedPlugin).register || defaultRegister;
-    const execute = (pluginMock as MockedPlugin).execute || pluginMock;
+      const register = (pluginMock as MockedPlugin).register || defaultRegister;
+      const execute = (pluginMock as MockedPlugin).execute || pluginMock;
 
-    logger.ok(`├── ${pluginName} () => [Function]`);
+      logger.ok(`├── ${pluginName} () => [Function]`);
 
-    return {
-      name: pluginName,
-      register: { execute, register }
-    };
-  }).filter((pluginMock): pluginMock is PluginMock => !!pluginMock);
+      return {
+        name: pluginName,
+        register: { execute, register }
+      };
+    })
+    .filter((pluginMock): pluginMock is PluginMock => !!pluginMock);
 
 const findPath = (
   pathToResolve: string,
@@ -128,7 +130,7 @@ export default function getMockedPlugins(
     return plugins;
   }
 
-  const content = fs.readJsonSync(ocJsonPath);
+  const content: OcJsonConfig = fs.readJsonSync(ocJsonPath);
   const ocJsonLocation = ocJsonPath.slice(0, -ocJsonFileName.length);
 
   if (!content.mocks || !content.mocks.plugins) {
@@ -138,10 +140,14 @@ export default function getMockedPlugins(
   logger.warn(strings.messages.cli.REGISTERING_MOCKED_PLUGINS);
 
   plugins = plugins.concat(
-    registerStaticMocks(content.mocks.plugins.static, logger)
+    registerStaticMocks(content.mocks.plugins.static ?? {}, logger)
   );
   plugins = plugins.concat(
-    registerDynamicMocks(ocJsonLocation, content.mocks.plugins.dynamic, logger)
+    registerDynamicMocks(
+      ocJsonLocation,
+      content.mocks.plugins.dynamic ?? {},
+      logger
+    )
   );
 
   return plugins;
diff --git a/src/cli/facade/dev.ts b/src/cli/facade/dev.ts
@@ -150,7 +150,7 @@ const dev =
         }
 
         logger.ok('OK');
-        _.forEach(components, component =>
+        components.forEach(component =>
           logger.log(colors.green('├── ') + component)
         );
 
diff --git a/src/cli/facade/publish.ts b/src/cli/facade/publish.ts
@@ -3,7 +3,6 @@ import colors from 'colors/safe';
 import path from 'path';
 import fs from 'fs-extra';
 import read from 'read';
-import _ from 'lodash';
 import { Logger } from '../logger';
 import { Component, RegistryCli, Local } from '../../types';
 
@@ -49,7 +48,8 @@ const publish =
     ) => {
       if (opts.username && opts.password) {
         logger.ok(strings.messages.cli.USING_CREDS);
-        return cb(null, _.pick(opts, 'username', 'password') as any);
+        const { username, password } = opts;
+        return cb(null, { username, password });
       }
 
       logger.warn(strings.messages.cli.ENTER_USERNAME);
@@ -149,7 +149,7 @@ const publish =
             logger.err(errorMessage);
             return cb(errorMessage, undefined as any);
           } else {
-            if (_.isObject(err)) {
+            if (err && typeof err === 'object') {
               try {
                 err = JSON.stringify(err);
               } catch (er) {}
diff --git a/src/registry/app-start.ts b/src/registry/app-start.ts
@@ -1,6 +1,5 @@
 import colors from 'colors/safe';
 import path from 'path';
-import _ from 'lodash';
 import fs from 'fs-extra';
 import { ComponentsDetails, Config, Repository } from '../types';
 
@@ -24,7 +23,8 @@ export default function appStart(
     return callback(null, 'ok');
   }
 
-  const logger = options.verbosity ? console : { log: _.noop };
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  const logger = options.verbosity ? console : { log: () => {} };
 
   logger.log(
     colors.yellow(
@@ -43,7 +43,7 @@ export default function appStart(
       )
     );
 
-    if (!_.includes(componentInfo, packageInfo.version)) {
+    if (!componentInfo.includes(packageInfo.version)) {
       logger.log(colors.yellow('Component not found. Publishing it...'));
 
       const pkgInfo = {
diff --git a/src/registry/domain/options-sanitiser.ts b/src/registry/domain/options-sanitiser.ts
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import settings from '../../resources/settings';
 import { Config } from '../../types';
 import * as auth from './authentication';
@@ -10,7 +9,7 @@ interface Input extends Partial<Omit<Config, 'beforePublish'>> {
 }
 
 export default function optionsSanitiser(input: Input): Config {
-  const options = _.clone(input);
+  const options = { ...input };
 
   if (!options.publishAuth) {
     (options as Config).beforePublish = (_req, _res, next) => next();
@@ -57,9 +56,13 @@ export default function optionsSanitiser(input: Input): Config {
     options.templates = [];
   }
 
+  if (!options.dependencies) {
+    options.dependencies = [];
+  }
+
   if (
     typeof options.fallbackRegistryUrl !== 'undefined' &&
-    _.last(options.fallbackRegistryUrl) !== '/'
+    !options.fallbackRegistryUrl.endsWith('/')
   ) {
     options.fallbackRegistryUrl += '/';
   }
diff --git a/src/registry/domain/repository.ts b/src/registry/domain/repository.ts
@@ -1,7 +1,6 @@
 import fs from 'fs-extra';
 import getUnixUtcTimestamp from 'oc-get-unix-utc-timestamp';
 import path from 'path';
-import _ from 'lodash';
 
 import ComponentsCache from './components-cache';
 import getComponentsDetails from './components-details';
@@ -84,7 +83,7 @@ export default function repository(conf: Config): Repository {
         ]);
       }
 
-      if (!_.includes(local.getComponents(), componentName)) {
+      if (!local.getComponents().includes(componentName)) {
         return callback(
           strings.errors.registry.COMPONENT_NOT_FOUND(
             componentName,
@@ -259,7 +258,7 @@ export default function repository(conf: Config): Repository {
       componentsCache.get((err, res) => {
         callback(
           err as any,
-          !!res && !!_.has(res.components, componentName)
+          !!res && !!res.components[componentName]
             ? res.components[componentName]
             : []
         );
diff --git a/src/registry/domain/require-wrapper.ts b/src/registry/domain/require-wrapper.ts
@@ -2,7 +2,6 @@ import coreModules from 'builtin-modules';
 import path from 'path';
 import requirePackageName from 'require-package-name';
 import tryRequire from 'try-require';
-import _ from 'lodash';
 
 import strings from '../../resources';
 
@@ -26,7 +25,7 @@ const throwError = (requirePath: string) => {
 export default (injectedDependencies: string[]) =>
   <T = unknown>(requirePath: string): T => {
     const moduleName = requirePackageName(requirePath);
-    const isAllowed = _.includes(injectedDependencies, moduleName);
+    const isAllowed = injectedDependencies.includes(moduleName);
 
     if (!isAllowed) {
       return throwError(requirePath);
diff --git a/src/registry/index.ts b/src/registry/index.ts
@@ -54,7 +54,8 @@ export default function registry(inputOptions: Input) {
     // eslint-disable-next-line no-console
     const ok = (msg: string) => console.log(colors.green(msg));
     if (typeof callback !== 'function') {
-      callback = _.noop;
+      // eslint-disable-next-line @typescript-eslint/no-empty-function
+      callback = () => {};
     }
     router.create(app, options, repository);
     async.waterfall(
diff --git a/src/registry/routes/components.ts b/src/registry/routes/components.ts
@@ -50,7 +50,7 @@ export default function components(
 
     if (!_.isEmpty(components)) {
       const errors = _.compact(
-        _.map(components, (component, index) => {
+        components.map((component, index) => {
           return !component.name
             ? registryErrors.BATCH_ROUTE_COMPONENT_NAME_MISSING(index)
             : '';
diff --git a/src/types.ts b/src/types.ts
@@ -44,6 +44,16 @@ export interface ComponentsList {
   lastEdit: number;
 }
 
+export interface OcJsonConfig {
+  registries?: string[];
+  mocks?: {
+    plugins?: {
+      dynamic?: Record<string, string>;
+      static?: Record<string, string>;
+    };
+  };
+}
+
 export interface OcParameter {
   default?: string | boolean | number;
   description?: string;
diff --git a/test/unit/cli-domain-get-components-by-dir.js b/test/unit/cli-domain-get-components-by-dir.js
@@ -4,7 +4,6 @@ const expect = require('chai').expect;
 const injectr = require('injectr');
 const path = require('path');
 const sinon = require('sinon');
-const _ = require('lodash');
 
 const initialise = function () {
   const fsMock = {
@@ -16,7 +15,7 @@ const initialise = function () {
     extname: path.extname,
     join: path.join,
     resolve: function () {
-      return _.toArray(arguments).join('/');
+      return Array.from(arguments).join('/');
     }
   };
 
diff --git a/test/unit/cli-domain-get-mocked-plugins.js b/test/unit/cli-domain-get-mocked-plugins.js
@@ -3,7 +3,8 @@
 const expect = require('chai').expect;
 const injectr = require('injectr');
 const sinon = require('sinon');
-const _ = require('lodash');
+
+const noop = () => {};
 
 describe('cli : domain : get-mocked-plugins', () => {
   const dynamicPluginModule = a => (a ? 'blarg' : 'flarg');
@@ -13,7 +14,7 @@ describe('cli : domain : get-mocked-plugins', () => {
     execute: () => 'result'
   };
 
-  const logMock = { err: _.noop, log: _.noop, ok: _.noop, warn: _.noop };
+  const logMock = { err: noop, log: noop, ok: noop, warn: noop };
   let fsMock;
   let getMockedPlugins;
 
@@ -28,7 +29,7 @@ describe('cli : domain : get-mocked-plugins', () => {
     };
 
     const fakePathFunc = function () {
-      return _.toArray(arguments)
+      return Array.from(arguments)
         .map(x => x.replace(/\.\//g, ''))
         .join('');
     };
diff --git a/test/unit/cli-domain-handle-dependencies-get-compiler.js b/test/unit/cli-domain-handle-dependencies-get-compiler.js
@@ -3,7 +3,6 @@
 const expect = require('chai').expect;
 const injectr = require('injectr');
 const sinon = require('sinon');
-const _ = require('lodash');
 
 describe('cli : domain : handle-dependencies : get-compiler', () => {
   let cleanRequireStub;
@@ -33,7 +32,7 @@ describe('cli : domain : handle-dependencies : get-compiler', () => {
       }
     ).default;
 
-    getCompiler(_.cloneDeep(options), err => {
+    getCompiler(options, err => {
       error = err;
       done();
     });
diff --git a/test/unit/cli-domain-handle-dependencies.js b/test/unit/cli-domain-handle-dependencies.js
@@ -4,7 +4,6 @@ const coreModules = require('builtin-modules');
 const expect = require('chai').expect;
 const injectr = require('injectr');
 const sinon = require('sinon');
-const _ = require('lodash');
 
 describe('cli : domain : handle-dependencies', () => {
   describe('happy path', () => {
@@ -92,7 +91,7 @@ describe('cli : domain : handle-dependencies', () => {
 
     it('should return modules plus the node.js core modules', () => {
       expect(result.modules).to.deep.equal(
-        _.union(coreModules, ['lodash', 'moment']).sort()
+        [...coreModules, ...['lodash', 'moment']].sort()
       );
     });
 
diff --git a/test/unit/cli-domain-mock.js b/test/unit/cli-domain-mock.js
@@ -4,7 +4,6 @@ const expect = require('chai').expect;
 const injectr = require('injectr');
 const path = require('path');
 const sinon = require('sinon');
-const _ = require('lodash');
 
 const initialise = function () {
   const fsMock = {
@@ -23,7 +22,7 @@ const initialise = function () {
     extname: path.extname,
     join: path.join,
     resolve: function () {
-      return _.toArray(arguments).join('/');
+      return Array.from(arguments).join('/');
     }
   };
 
diff --git a/test/unit/registry-domain-nested-renderer.js b/test/unit/registry-domain-nested-renderer.js
@@ -2,7 +2,6 @@
 
 const expect = require('chai').expect;
 const sinon = require('sinon');
-const _ = require('lodash');
 
 describe('registry : routes : helpers : nested-renderer', () => {
   const NestedRenderer =
@@ -15,7 +14,7 @@ describe('registry : routes : helpers : nested-renderer', () => {
     if (Array.isArray(rendererMocks)) {
       renderer = sinon.stub();
 
-      _.each(rendererMocks, (rendererMock, i) => {
+      rendererMocks.forEach((rendererMock, i) => {
         renderer.onCall(i).yields(rendererMock);
       });
     } else {
diff --git a/test/unit/registry-domain-options-sanitiser.js b/test/unit/registry-domain-options-sanitiser.js
diff --git a/test/unit/registry-domain-validator.js b/test/unit/registry-domain-validator.js
diff --git a/test/unit/registry-routes-component.js b/test/unit/registry-routes-component.js
diff --git a/test/unit/registry-routes-helpers-get-component.js b/test/unit/registry-routes-helpers-get-component.js

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ const dev =`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`logger.ok('OK');`
`153`		`- _.forEach(components, component =>`
	`153`	`+ components.forEach(component =>`
`154`	`154`	`logger.log(colors.green('├── ') + component)`
`155`	`155`	`);`
`156`	`156`