Merge pull request #1287 from opencomponents/reduce-lodash

[INTERNAL] reduce lodash usage on test/code

Author: ricardo-devis-agullo

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;

src/cli/facade/dev.ts

@@ -2,7 +2,6 @@ import colors from 'colors/safe';
 import getPortCb from 'getport';
 import livereload from 'livereload';
 import path from 'path';
-import _ from 'lodash';
 import { promisify } from 'util';
 import { fromPromise } from 'universalify';
 
@@ -127,7 +126,7 @@ const dev = ({ local, logger }: { logger: Logger; local: Local }) =>
         opts.components
       );
 
-      if (_.isEmpty(components)) {
+      if (!components.length) {
         const err = cliErrors.DEV_FAIL(cliErrors.COMPONENTS_NOT_FOUND);
         logger.err(err);
         throw err;
@@ -149,7 +148,8 @@ const dev = ({ local, logger }: { logger: Logger; local: Local }) =>
       await packageComponents(components);
 
       let liveReload: { refresher: () => void; port: number | undefined } = {
-        refresher: _.noop,
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        refresher: () => {},
         port: undefined
       };
       if (hotReloading) {

src/cli/facade/publish.ts

@@ -2,7 +2,6 @@ import colors from 'colors/safe';
 import path from 'path';
 import fs from 'fs-extra';
 import readCb from 'read';
-import _ from 'lodash';
 import { promisify } from 'util';
 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 _.pick(opts, 'username', 'password') as any;
+          const { username, password } = opts;
+          return { username, password };
         }
 
         logger.warn(strings.messages.cli.ENTER_USERNAME);
@@ -130,7 +130,7 @@ const publish = ({
             if (err.message) {
               // eslint-disable-next-line no-ex-assign
               err = err.message;
-            } else if (_.isObject(err)) {
+            } else if (err && typeof err === 'object') {
               try {
                 // eslint-disable-next-line no-ex-assign
                 err = JSON.stringify(err);

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 { Config, Repository } from '../types';
 
@@ -23,7 +22,8 @@ export default async function appStart(
     return;
   }
 
-  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(
@@ -40,7 +40,7 @@ export default async function appStart(
       )
     );
 
-    if (!_.includes(componentInfo, packageInfo.version)) {
+    if (!componentInfo.includes(packageInfo.version)) {
       logger.log(colors.yellow('Component not found. Publishing it...'));
 
       const pkgInfo = {

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 += '/';
   }

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';
@@ -80,7 +79,7 @@ export default function repository(conf: Config): Repository {
         ]);
       }
 
-      if (!_.includes(local.getComponents(), componentName)) {
+      if (!local.getComponents().includes(componentName)) {
         return Promise.reject(
           strings.errors.registry.COMPONENT_NOT_FOUND(
             componentName,
@@ -210,9 +209,7 @@ export default function repository(conf: Config): Repository {
 
       const res = await componentsCache.get();
 
-      return _.has(res.components, componentName)
-        ? res.components[componentName]
-        : [];
+      return res.components[componentName] ? res.components[componentName] : [];
     },
     async getDataProvider(componentName: string, componentVersion: string) {
       if (conf.local) {

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);

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)
             : '';

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;

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('/');
     }
   };