Skip to content

Commit d727156

Browse files
reduce lodash functions where they are easy replaceable
1 parent 183fc20 commit d727156

File tree

11 files changed

+56
-57
lines changed

11 files changed

+56
-57
lines changed

src/cli/facade/registry-ls.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import _ from 'lodash';
2-
31
import strings from '../../resources/index';
42
import { RegistryCli } from '../../types';
53
import { Logger } from '../logger';
@@ -20,7 +18,7 @@ const registryLs =
2018
return callback(err, undefined as any);
2119
}
2220

23-
_.forEach(registries, registryLocation => logger.ok(registryLocation));
21+
registries.forEach(registryLocation => logger.ok(registryLocation));
2422

2523
callback(null, registries);
2624
}

src/cli/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ function processCommand(
9595
);
9696
}
9797

98-
_.forEach(commands.commands, (command, commandName) => {
98+
Object.entries(commands.commands).forEach(([commandName, command]) => {
9999
processCommand(command, commandName, cli);
100100
});
101101

src/cli/programmatic-api.ts

Lines changed: 42 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import _ from 'lodash';
21
import local from './domain/local';
32
import { Logger } from './logger';
43
import Registry from './domain/registry';
@@ -44,95 +43,101 @@ function getDeps(options: {
4443

4544
export default {
4645
dev: (
47-
options: Options<typeof dev> & { logger: Logger },
46+
{ logger, ...options }: Options<typeof dev> & { logger: Logger },
4847
cb: Cb<typeof dev>
4948
): void => {
50-
const deps = getDeps({ logger: options.logger });
51-
const opts = _.omit(options, 'logger');
49+
const deps = getDeps({ logger });
5250

53-
dev(deps)(opts, cb);
51+
dev(deps)(options, cb);
5452
},
5553
init: (
56-
options: Options<typeof init> & { logger: Logger },
54+
{ logger, ...options }: Options<typeof init> & { logger: Logger },
5755
cb: Cb<typeof init>
5856
): void => {
59-
const deps = getDeps({ logger: options.logger });
60-
const opts = _.omit(options, 'logger');
57+
const deps = getDeps({ logger });
6158

62-
init(deps)(opts, cb);
59+
init(deps)(options, cb);
6360
},
6461
mock: (
65-
options: Options<typeof mock> & { logger: Logger },
62+
{ logger, ...options }: Options<typeof mock> & { logger: Logger },
6663
cb: Cb<typeof mock>
6764
): void => {
68-
const deps = getDeps({ logger: options.logger });
69-
const opts = _.omit(options, 'logger');
65+
const deps = getDeps({ logger });
7066

71-
mock(deps)(opts, cb);
67+
mock(deps)(options, cb);
7268
},
7369
package: (
74-
options: Options<typeof packageScript> & { logger: Logger },
70+
{ logger, ...options }: Options<typeof packageScript> & { logger: Logger },
7571
cb: Cb<typeof packageScript>
7672
): void => {
77-
const deps = getDeps({ logger: options.logger });
78-
const opts = _.omit(options, 'logger');
73+
const deps = getDeps({ logger });
7974

80-
packageScript(deps)(opts, cb);
75+
packageScript(deps)(options, cb);
8176
},
8277
publish: (
83-
options: Options<typeof publish> & { logger: Logger; registry?: string },
78+
{
79+
logger,
80+
...options
81+
}: Options<typeof publish> & { logger: Logger; registry?: string },
8482
cb: Cb<typeof publish>
8583
): void => {
86-
const deps = getDeps({ logger: options.logger, withRegistry: true });
87-
const opts = _.omit(options, 'logger');
84+
const deps = getDeps({ logger, withRegistry: true });
8885

89-
publish(deps)(opts, cb);
86+
publish(deps)(options, cb);
9087
},
9188
preview: (
92-
options: Options<typeof preview> & { logger: Logger; registry?: string },
89+
{
90+
logger,
91+
...options
92+
}: Options<typeof preview> & { logger: Logger; registry?: string },
9393
cb: Cb<typeof preview>
9494
): void => {
95-
const deps = getDeps({ logger: options.logger, withRegistry: true });
96-
const opts = _.omit(options, 'logger');
95+
const deps = getDeps({ logger, withRegistry: true });
9796

98-
preview(deps)(opts, cb);
97+
preview(deps)(options, cb);
9998
},
10099
registry: {
101100
add: (
102-
options: Options<typeof registryAdd> & {
101+
{
102+
logger,
103+
...options
104+
}: Options<typeof registryAdd> & {
103105
logger: Logger;
104106
registry?: string;
105107
},
106108
cb: Cb<typeof registryAdd>
107109
): void => {
108-
const deps = getDeps({ logger: options.logger, withRegistry: true });
109-
const opts = _.omit(options, 'logger');
110+
const deps = getDeps({ logger, withRegistry: true });
110111

111-
registryAdd(deps)(opts, cb);
112+
registryAdd(deps)(options, cb);
112113
},
113114
ls: (
114-
options: Options<typeof registryLs> & {
115+
{
116+
logger,
117+
...options
118+
}: Options<typeof registryLs> & {
115119
logger: Logger;
116120
registry?: string;
117121
},
118122
cb: Cb<typeof registryLs>
119123
): void => {
120-
const deps = getDeps({ logger: options.logger, withRegistry: true });
121-
const opts = _.omit(options, 'logger');
124+
const deps = getDeps({ logger, withRegistry: true });
122125

123-
registryLs(deps)(opts, cb);
126+
registryLs(deps)(options, cb);
124127
},
125128
remove: (
126-
options: Options<typeof registryRemove> & {
129+
{
130+
logger,
131+
...options
132+
}: Options<typeof registryRemove> & {
127133
logger: Logger;
128134
registry?: string;
129135
},
130136
cb: Cb<typeof registryRemove>
131137
): void => {
132-
const deps = getDeps({ logger: options.logger, withRegistry: true });
133-
const opts = _.omit(options, 'logger');
138+
const deps = getDeps({ logger, withRegistry: true });
134139

135-
registryRemove(deps)(opts, cb);
140+
registryRemove(deps)(options, cb);
136141
}
137142
}
138143
};

src/registry/domain/components-details.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default function componentsDetails(conf: Config, cdn: Cdn) {
3030
options: { componentsList: ComponentsList; details: ComponentsDetails },
3131
callback: Callback<ComponentsDetails, Error | undefined>
3232
) => {
33-
const details = _.extend({}, _.cloneDeep(options.details));
33+
const details = Object.assign({}, _.cloneDeep(options.details));
3434
details.components = details.components || {};
3535

3636
const missing: Array<{ name: string; version: string }> = [];

src/registry/domain/require-wrapper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import _ from 'lodash';
66

77
import strings from '../../resources';
88

9-
const isCoreDependency = (x: string) => _.includes(coreModules, x);
9+
const isCoreDependency = (x: string) => coreModules.includes(x);
1010
const requireCoreDependency = (x: string) =>
1111
(isCoreDependency(x) && tryRequire(x)) || undefined;
1212

src/registry/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ export default function registry(inputOptions: Input) {
4242
plugin: Omit<Plugin, 'callback'>,
4343
callback?: (...args: any[]) => void
4444
) => {
45-
plugins.push(_.extend(plugin, { callback }));
45+
plugins.push(Object.assign(plugin, { callback }));
4646
};
4747

4848
const start = (
4949
callback: Callback<{ app: express.Express; server: http.Server }>
5050
) => {
5151
// eslint-disable-next-line no-console
5252
const ok = (msg: string) => console.log(colors.green(msg));
53-
if (!_.isFunction(callback)) {
53+
if (typeof callback !== 'function') {
5454
callback = _.noop;
5555
}
5656
router.create(app, options, repository);

src/registry/router.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import _ from 'lodash';
2-
31
import ComponentRoute from './routes/component';
42
import ComponentsRoute from './routes/components';
53
import ComponentInfoRoute from './routes/component-info';
@@ -81,7 +79,7 @@ export function create(
8179
app.get(`${prefix}:componentName`, routes.component);
8280

8381
if (conf.routes) {
84-
_.forEach(conf.routes, route =>
82+
conf.routes.forEach(route =>
8583
app[
8684
route.method.toLowerCase() as 'get' | 'post' | 'put' | 'patch' | 'head'
8785
](route.route, route.handler)

src/registry/routes/component-info.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ function componentInfo(
8282
});
8383
} else {
8484
res.status(200).json(
85-
_.extend(component, {
85+
Object.assign(component, {
8686
requestVersion: req.params.componentVersion || ''
8787
})
8888
);

src/registry/routes/component-preview.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import _ from 'lodash';
2-
31
import * as getComponentFallback from './helpers/get-component-fallback';
42
import previewView from '../views/preview';
53
import * as urlBuilder from '../domain/url-builder';
@@ -39,7 +37,7 @@ function componentPreview(
3937
);
4038
} else {
4139
res.status(200).json(
42-
_.extend(component, {
40+
Object.assign(component, {
4341
requestVersion: req.params.componentVersion || ''
4442
})
4543
);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export default function getComponent(conf: Config, repository: Repository) {
7979

8080
retrievingInfo.extend({ status: result.status });
8181

82-
_.extend(result.response, {
82+
Object.assign(result.response, {
8383
name: options.name,
8484
requestVersion: options.version || ''
8585
});

0 commit comments

Comments
 (0)