Skip to content

CON-2075: replace merge-deep with deepmerge #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PavelLoparev wants to merge 3 commits into
base: master
Choose a base branch
from
+329 −177
Open

CON-2075: replace merge-deep with deepmerge #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d23ff5c
feat: CON-2075 replace merge-deep with deepmerge
PavelLoparev Apr 17, 2026
a1546c0
refactor: address PR review — extract merge helper and extend test co…
PavelLoparev Apr 17, 2026
a78c36a
test: assert key presence and value explicitly for undefined source m…
PavelLoparev Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/base/base-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import merge from "merge-deep";
import ua from "default-user-agent";
import FormData from "form-data";
import fetch from "cross-fetch";
Expand All @@ -7,6 +6,7 @@ import { Logger } from "../logger";
import { SmartlingException } from "../exception/index";
import { AccessTokenProvider } from "../auth/access-token-provider";
import { ResponseBodyType } from "./enum/response-body-type";
import { merge } from "./merge";

/* eslint-disable-next-line @typescript-eslint/no-var-requires */
const packageJson = require("../../package.json");
Expand Down
15 changes: 15 additions & 0 deletions api/base/merge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import deepmerge from "deepmerge";

// Deep-merge arrays as an ordered union: keep the target order, then append
// items from the source that aren't already present. Prevents header and
// option arrays from duplicating when a caller's values overlap the defaults.
const mergeOptions: deepmerge.Options = {
arrayMerge: (target, source) => source.reduce<unknown[]>(
(acc, item) => (acc.includes(item) ? acc : [...acc, item]),
[...target]
)
};

export function merge<T, U>(target: T, source: U): T & U {
return deepmerge<T, U>(target, source, mergeOptions);
}
181 changes: 11 additions & 170 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,20 @@
"@types/mocha": "^9.0.0",
"@types/node": "^18.19.115",
"cross-fetch": "^3.1.4",
"deepmerge": "^4.3.1",
"default-user-agent": "^1.0.0",
"form-data": "^4.0.4",
"merge-deep": "^3.0.3",
"querystring": "^0.2.1",
"semver": "^5.7.2",
"string-to-file-stream": "^2.0.0",
"typescript": "^4.9.5",
"semver": "^5.7.2"
"typescript": "^4.9.5"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^4.29.0",
"@typescript-eslint/parser": "^4.29.0",
"ansi-regex": "^5.0.1",
"babel-eslint": "^10.1.0",
"braces": "^3.0.3",
"eslint": "^7.31.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-plugin-flowtype": "^2.41.0",
Expand All @@ -52,13 +53,12 @@
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-promise": "^3.6.0",
"eslint-plugin-react": "^7.10.0",
"json5": "^1.0.2",
"mocha": "^10.0.0",
"mocha-junit-reporter": "^2.0.2",
"nyc": "^17.1.0",
"sinon": "^11.1.2",
"ts-mocha": "^10.0.0",
"braces": "^3.0.3",
"json5": "^1.0.2"
"ts-mocha": "^10.0.0"
},
"nyc": {
"reporter": [
Expand Down
Loading