Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 2 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
## Changelog

### [v2.0.1](https://github.com/panates/jsopen-objects/compare/v2.0.0...v2.0.1) -
### [v2.0.2](https://github.com/panates/jsopen-objects/compare/v2.0.1...v2.0.2) -

#### 🛠 Refactoring and Updates

- refactor: Made default "symbolKeys" option to true @Eray Hanoğlu

#### 💬 General Changes

- dev: Coveralls parallel @Eray Hanoğlu
- dev: Coveralls parallel @Eray Hanoğlu
- refactor: Minor typing changes @Eray Hanoğlu
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@jsopen/objects",
"description": "Helper utilities for working with JavaScript objects and arrays",
"version": "2.0.1",
"version": "2.0.2",
"author": "Panates",
"license": "MIT",
"private": true,
Expand Down
35 changes: 19 additions & 16 deletions src/merge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,34 @@ import { isBuiltIn } from './type-guards.js';

const hasOwnProperty = Object.prototype.hasOwnProperty;

export function merge<A, B>(
target: A,
source: B,
options?: merge.Options,
): A & B;
export function merge<A, B, C>(
export function merge<A extends object, B extends object, C extends object>(
target: A,
source: [B, C],
options?: merge.Options,
): A & B & C;
export function merge<A, B, C, D>(
target: A,
source: [B, C, D],
options?: merge.Options,
): A & B & C & D;
export function merge<A, B, C, D, E>(
target: A,
source: [B, C, D, E],
options?: merge.Options,
): A & B & C & D & E;
export function merge<
A extends object,
B extends object,
C extends object,
D extends object,
>(target: A, source: [B, C, D], options?: merge.Options): A & B & C & D;
export function merge<
A extends object,
B extends object,
C extends object,
D extends object,
E extends object,
>(target: A, source: [B, C, D, E], options?: merge.Options): A & B & C & D & E;
export function merge<A, B, C, D, F>(
target: A,
source: [B, C, D, F],
options?: merge.Options,
): A & B & C & D & F;
export function merge<A extends object, B extends object>(
target: A,
source: B,
options?: merge.Options,
): A & B;
export function merge(
targetObject: any,
sourceObject: any,
Expand Down
65 changes: 49 additions & 16 deletions src/omit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ import {
} from 'ts-gems';
import { merge } from './merge.js';

export function omit<T, K extends keyof T>(obj: T, keys: K[]): Omit<T, K> {
export function omit<T extends object, K extends keyof T>(
obj: T,
keys: K[],
): Omit<T, K> {
const keysSet = new Set<any>(keys);
return merge({}, obj, {
deep: false,
Expand All @@ -20,23 +23,44 @@ export function omit<T, K extends keyof T>(obj: T, keys: K[]): Omit<T, K> {
});
}

export function omitUndefined<T>(obj: T, deep: true): DeepOmitUndefined<T>;
export function omitUndefined<T>(obj: T, deep: 'full'): DeeperOmitUndefined<T>;
export function omitUndefined<T>(obj: T, deep: false): OmitUndefined<T>;
export function omitUndefined<T>(obj: T): OmitUndefined<T>;
export function omitUndefined<T>(obj: T, deep?: boolean | 'full') {
export function omitUndefined<T extends object>(
obj: T,
deep: true,
): DeepOmitUndefined<T>;
export function omitUndefined<T extends object>(
obj: T,
deep: 'full',
): DeeperOmitUndefined<T>;
export function omitUndefined<T extends object>(
obj: T,
deep: false,
): OmitUndefined<T>;
export function omitUndefined<T extends object>(obj: T): OmitUndefined<T>;
export function omitUndefined<T extends object>(
obj: T,
deep?: boolean | 'full',
) {
return merge({}, obj, {
deep,
ignoreUndefined: true,
copyDescriptors: true,
});
}

export function omitNull<T>(obj: T, deep: true): DeepOmitTypes<T, null>;
export function omitNull<T>(obj: T, deep: 'full'): DeeperUnNullish<T>;
export function omitNull<T>(obj: T, deep: false): OmitTypes<T, null>;
export function omitNull<T>(obj: T): OmitTypes<T, null>;
export function omitNull<T>(obj: T, deep?: boolean | 'full') {
export function omitNull<T extends object>(
obj: T,
deep: true,
): DeepOmitTypes<T, null>;
export function omitNull<T extends object>(
obj: T,
deep: 'full',
): DeeperUnNullish<T>;
export function omitNull<T extends object>(
obj: T,
deep: false,
): OmitTypes<T, null>;
export function omitNull<T extends object>(obj: T): OmitTypes<T, null>;
export function omitNull<T extends object>(obj: T, deep?: boolean | 'full') {
return merge({}, obj, {
deep,
ignoreNulls: true,
Expand All @@ -45,11 +69,20 @@ export function omitNull<T>(obj: T, deep?: boolean | 'full') {
});
}

export function omitNullish<T>(obj: T, deep: true): DeepUnNullish<T>;
export function omitNullish<T>(obj: T, deep: 'full'): DeeperUnNullish<T>;
export function omitNullish<T>(obj: T, deep: false): UnNullish<T>;
export function omitNullish<T>(obj: T): UnNullish<T>;
export function omitNullish<T>(obj: T, deep?: boolean | 'full') {
export function omitNullish<T extends object>(
obj: T,
deep: true,
): DeepUnNullish<T>;
export function omitNullish<T extends object>(
obj: T,
deep: 'full',
): DeeperUnNullish<T>;
export function omitNullish<T extends object>(
obj: T,
deep: false,
): UnNullish<T>;
export function omitNullish<T extends object>(obj: T): UnNullish<T>;
export function omitNullish<T extends object>(obj: T, deep?: boolean | 'full') {
return merge({}, obj, {
deep,
ignoreNulls: true,
Expand Down