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.

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

Address concerns around count typings #3249

Merged
merged 4 commits into from Jun 6, 2019
Merged

Address concerns around count typings #3249

merged 4 commits into from Jun 6, 2019

Conversation

lorefnon
Copy link
Collaborator

@lorefnon lorefnon commented Jun 3, 2019

Fixes: #3247

@lorefnon lorefnon mentioned this pull request Jun 3, 2019
Closed
@jpike88
Copy link

@jpike88 jpike88 commented Jun 5, 2019

#3260
#3259

^ these might be fixed too by this

lorefnon added 2 commits Jun 5, 2019
@lorefnon
Use number instead of number | string for return type of count
954f297 
Closes #3247
@lorefnon
Use an alias instead of interface for DeferredKeySelection
8c0496e 
This prevents typescript from complaining when it has to be used in an exported signature without us having to expose internal type as public

Closes #3259
@lorefnon lorefnon changed the title Restore number | string -> any in count typings [WIP] Restore number | string -> any in count typings Jun 5, 2019
@kibertoad
Copy link
Collaborator

@kibertoad kibertoad commented Jun 5, 2019

@lorefnon Could you also backport this to 0.17 branch? This fix would definitely warrant one more release in that branch.

@lorefnon lorefnon changed the title [WIP] Restore number | string -> any in count typings Address concerns around count typings Jun 5, 2019
@lorefnon
Copy link
Collaborator Author

@lorefnon lorefnon commented Jun 5, 2019

should we disable linting rule for "interface-over-type-literal"?

Yeah, done.

@lorefnon Could you also backport this to 0.17 branch? This fix would definitely warrant one more release in that branch.

Yes, I tried cherry picking the commits on that branch and there weren't any conflicts. Do you want me to create another PR against that branch ?

@kibertoad
Copy link
Collaborator

@kibertoad kibertoad commented Jun 5, 2019

Yup, would be perfect.

@kibertoad
Copy link
Collaborator

@kibertoad kibertoad commented Jun 5, 2019

@lorefnon Should this be WIP or can it be merged already? Also maybe it makes sense to add TypeScript section to knex documentation to explain the registry functionality? Probably most people won't check sources for it.

@lorefnon
Copy link
Collaborator Author

@lorefnon lorefnon commented Jun 6, 2019

I think this can be merged. I'll add a pr for ts specific docs in the documentation repo by end of the week.

@kibertoad kibertoad merged commit 501d58a into knex:master Jun 6, 2019
2 checks passed
@lorefnon lorefnon mentioned this pull request Jun 8, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

DistinctCount, Count return type is too complex
3 participants
@lorefnon @jpike88 @kibertoad