Skip to content

Revert "fix (merge funcs) optimize when both sides are same type" #144

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
Harris-Miller wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Revert "fix (merge funcs) optimize when both sides are same type" #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 0 additions & 25 deletions test/mergeDeepLeft.test.ts
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions test/mergeDeepRight.test.ts
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions test/mergeLeft.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,3 @@ const foo2 = { foo: 2 };

expectType<{ foo: string; bar: string; }>(mergeLeft(foo, bar));
expectType<{ foo: string; }>(mergeLeft(foo, foo2));

type TestType = {
foo: string;
bar: string;
};

const obj1 = {} as TestType;
const obj2 = {} as TestType;

expectType<TestType>(mergeLeft(obj1, obj2));
expectType<TestType>(mergeLeft(obj2, obj1));

expectType<TestType>(mergeLeft(obj1, { foo: '', bar: ''}));
expectType<TestType>(mergeLeft({ foo: '', bar: ''}, obj2));
14 changes: 0 additions & 14 deletions test/mergeRight.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,3 @@ const foo2 = { foo: 2 };

expectType<{ foo: string; bar: string; }>(mergeRight(foo, bar));
expectType<{ foo: number; }>(mergeRight(foo, foo2));

type TestType = {
foo: string;
bar: string;
};

const obj1 = {} as TestType;
const obj2 = {} as TestType;

expectType<TestType>(mergeRight(obj1, obj2));
expectType<TestType>(mergeRight(obj2, obj1));

expectType<TestType>(mergeRight(obj1, { foo: '', bar: ''}));
expectType<TestType>(mergeRight({ foo: '', bar: ''}, obj2));
2 changes: 0 additions & 2 deletions types/mergeDeepLeft.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import * as _ from 'ts-toolbelt';

export function mergeDeepLeft<U extends object>(l: U): (r: U) => U;
export function mergeDeepLeft<L extends object>(l: L): <R extends object>(r: R) => _.O.Assign<R, [L], 'deep'>;
export function mergeDeepLeft<U extends object>(l: U, r: U): U;
export function mergeDeepLeft<L extends object, R extends object>(l: L, r: R): _.O.Assign<R, [L], 'deep'>;
2 changes: 0 additions & 2 deletions types/mergeDeepRight.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import * as _ from 'ts-toolbelt';

export function mergeDeepRight<U extends object>(l: U): (r: U) => U;
export function mergeDeepRight<L extends object>(l: L): <R extends object>(r: R) => _.O.Assign<L, [R], 'deep'>;
export function mergeDeepRight<U extends object>(l: U, r: U): U;
export function mergeDeepRight<L extends object, R extends object>(l: L, r: R): _.O.Assign<L, [R], 'deep'>;
2 changes: 0 additions & 2 deletions types/mergeLeft.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import * as _ from 'ts-toolbelt';

// Note: ramda `mergeLeft` uses `Object.assign` in code, so we need to use `O.Assign` here, and not `O.Merge`
export function mergeLeft<U extends object>(l: U): (r: U) => U;
export function mergeLeft<L extends object>(l: L): <R extends object>(r: R) => _.O.Assign<R, [L], 'flat'>;
export function mergeLeft<U extends object>(l: U, r: U): U;
export function mergeLeft<L extends object, R extends object>(l: L, r: R): _.O.Assign<R, [L], 'flat'>;
2 changes: 0 additions & 2 deletions types/mergeRight.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import * as _ from 'ts-toolbelt';

// Note: ramda `mergeLeft` uses `Object.assign` in code, so we need to use `O.Assign` here, and not `O.Merge`
export function mergeRight<U extends object>(l: U): (r: U) => U;
export function mergeRight<L extends object>(l: L): <R extends object>(r: R) => _.O.Assign<L, [R], 'flat'>;
export function mergeRight<U extends object>(l: U, r: U): U;
export function mergeRight<L extends object, R extends object>(l: L, r: R): _.O.Assign<L, [R], 'flat'>;