Skip to content
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

Jump to bottom

Add PackageJson and LiteralUnion types #5

Merged
merged 13 commits into from
Mar 15, 2019
Merged

Add PackageJson and LiteralUnion types #5

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3b7ab13
Add types for package.json and literal union workaround
BendingBender Mar 13, 2019
dc55038
Update npm.d.ts
sindresorhus Mar 13, 2019
cad2898
Update npm.d.ts
sindresorhus Mar 13, 2019
e08d042
Update npm.d.ts
sindresorhus Mar 13, 2019
ad5edfe
Fixes after review
BendingBender Mar 13, 2019
dece0d4
Fixes after review
BendingBender Mar 14, 2019
0d729df
Merge remote-tracking branch 'upstream/master' into package-json-types
BendingBender Mar 14, 2019
9a117ce
Improve docs for new types
BendingBender Mar 14, 2019
c334043
Update package-json.d.ts
sindresorhus Mar 15, 2019
184fede
Update readme.md
sindresorhus Mar 15, 2019
39afe46
Update index.d.ts
sindresorhus Mar 15, 2019
728668b
Update index.d.ts
sindresorhus Mar 15, 2019
399e26f
Update index.d.ts
sindresorhus Mar 15, 2019
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
14 changes: 14 additions & 0 deletions index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import * as Npm from './npm';

export {Npm};

// TODO: Add more examples

// TODO: This can just be `export type Primitive = not object` when the `not` keyword is out.
Expand Down Expand Up @@ -84,3 +88,13 @@ const ab: Merge<Foo, Bar> = {a: 1, b: 2};
```
*/
export type Merge<FirstType, SecondType> = Omit<FirstType, Extract<keyof FirstType, keyof SecondType>> & SecondType;

/**
This type is a workaround for the TypeScript issue https:/Microsoft/TypeScript/issues/29729.

BendingBender marked this conversation as resolved.
Show resolved Hide resolved
It will be removed as soon as it's not needed any more.
*/
export type LiteralUnion<
LiteralType extends BaseType,
BaseType extends Primitive
> = LiteralType | (BaseType & {_?: never});
1 change: 1 addition & 0 deletions index.test-d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint-disable import/no-unassigned-import */
import './test/omit';
import './test/merge';
import './test/npm';

// TODO: Add negative tests. Blocked by: https:/SamVerschueren/tsd-check/issues/2
Loading