Skip to content

Commit 955047d

Browse files
authored
Merge pull request #6 from panates/dev
Dev
2 parents fcc86af + 6008ed5 commit 955047d

5 files changed

Lines changed: 14 additions & 22 deletions

File tree

.github/workflows/test.yml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,7 @@ jobs:
5757

5858
- name: Send coverage to Coveralls
5959
uses: coverallsapp/github-action@v2
60+
# Run only once
61+
if: ${{ matrix.node == '22' }}
6062
with:
61-
flag-name: run-${{ join(matrix.*, '-') }}
62-
parallel: true
63-
64-
finish:
65-
needs: test
66-
if: ${{ always() }}
67-
runs-on: ubuntu-latest
68-
steps:
69-
- name: Coveralls Finished
70-
uses: coverallsapp/github-action@v2
71-
with:
72-
parallel-finished: true
73-
carryforward: "run-1,run-2"
7463
github-token: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
## Changelog
22

3-
### [v2.0.0](https://github.com/panates/jsopen-objects/compare/v1.6.3...v2.0.0) -
3+
### [v2.0.1](https://github.com/panates/jsopen-objects/compare/v2.0.0...v2.0.1) -
44

5-
#### 🚀 New Features
5+
#### 🛠 Refactoring and Updates
66

7-
- refactor: Refactored merge method. Stopping using function compilation. @Eray Hanoğlu
7+
- refactor: Made default "symbolKeys" option to true @Eray Hanoğlu
88

9-
#### 🛠 Refactoring and Updates
9+
#### 💬 General Changes
1010

11-
- refactor: Refactored merge method. Stopping using function compilation. @Eray Hanoğlu
11+
- dev: Coveralls parallel @Eray Hanoğlu
12+
- dev: Coveralls parallel @Eray Hanoğlu

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@jsopen/objects",
33
"description": "Helper utilities for working with JavaScript objects and arrays",
4-
"version": "2.0.0",
4+
"version": "2.0.1",
55
"author": "Panates",
66
"license": "MIT",
77
"private": true,

src/merge.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ export function merge(
7171
const _merge = (target: any, source: any, parentPath: string = '') => {
7272
if (!isObject(source)) return;
7373
const keys: (string | symbol)[] = Object.getOwnPropertyNames(source);
74-
if (options?.symbolKeys) keys.push(...Object.getOwnPropertySymbols(source));
74+
if (options?.symbolKeys ?? true)
75+
keys.push(...Object.getOwnPropertySymbols(source));
7576
let key: string | symbol | number;
7677
let descriptor: PropertyDescriptor | undefined;
7778
let srcVal: any;
@@ -254,6 +255,7 @@ export namespace merge {
254255
* Indicates whether symbol keys should be included.
255256
* If set to `true`, properties with symbol keys will be considered.
256257
* If `false` or `undefined`, symbol keys will be ignored.
258+
* @default true
257259
*/
258260
symbolKeys?: boolean;
259261

0 commit comments

Comments
 (0)