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

fix: lock Typescript to 3.6.0 #6810

Merged
merged 1 commit into from Sep 30, 2020
Merged

fix: lock Typescript to 3.6.0 #6810

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
Expand Up @@ -111,7 +111,7 @@
"sqlite3": "^5.0.0",
"ts-node": "^9.0.0",
"typeorm-aurora-data-api-driver": "^1.4.0",
"typescript": "^3.9.7"
"typescript": "~3.6.0"
},
"dependencies": {
"@sqltools/formatter": "1.2.2",
Expand Down
4 changes: 2 additions & 2 deletions src/entity-manager/MongoEntityManager.ts
View file
Open in desktop
Expand Up @@ -570,7 +570,7 @@ export class MongoEntityManager extends EntityManager {
if (!optionsOrConditions)
return undefined;

if (FindOptionsUtils.isFindManyOptions(optionsOrConditions))
if (FindOptionsUtils.isFindManyOptions<Entity>(optionsOrConditions))
// If where condition is passed as a string which contains sql we have to ignore
// as mongo is not a sql database
return typeof optionsOrConditions.where === "string"
Expand All @@ -587,7 +587,7 @@ export class MongoEntityManager extends EntityManager {
if (!optionsOrConditions)
return undefined;

if (FindOptionsUtils.isFindOneOptions(optionsOrConditions))
if (FindOptionsUtils.isFindOneOptions<Entity>(optionsOrConditions))
// If where condition is passed as a string which contains sql we have to ignore
// as mongo is not a sql database
return typeof optionsOrConditions.where === "string"
Expand Down
8 changes: 4 additions & 4 deletions src/find-options/FindOptionsUtils.ts
View file
Open in desktop
Expand Up @@ -17,8 +17,8 @@ export class FindOptionsUtils {
/**
* Checks if given object is really instance of FindOneOptions interface.
*/
static isFindOneOptions(obj: any): obj is FindOneOptions<any> {
const possibleOptions: FindOneOptions<any> = obj;
static isFindOneOptions<Entity = any>(obj: any): obj is FindOneOptions<Entity> {
const possibleOptions: FindOneOptions<Entity> = obj;
return possibleOptions &&
(
Array.isArray(possibleOptions.select) ||
Expand All @@ -41,8 +41,8 @@ export class FindOptionsUtils {
/**
* Checks if given object is really instance of FindManyOptions interface.
*/
static isFindManyOptions(obj: any): obj is FindManyOptions<any> {
const possibleOptions: FindManyOptions<any> = obj;
static isFindManyOptions<Entity = any>(obj: any): obj is FindManyOptions<Entity> {
const possibleOptions: FindManyOptions<Entity> = obj;
return possibleOptions && (
this.isFindOneOptions(possibleOptions) ||
typeof (possibleOptions as FindManyOptions<any>).skip === "number" ||
Expand Down
6 changes: 5 additions & 1 deletion tsconfig.json
View file
Open in desktop
@@ -1,5 +1,4 @@
{
"version": "2.1.1",
"compilerOptions": {
"lib": ["es5", "es6"],
"outDir": "build/compiled",
Expand All @@ -22,6 +21,11 @@
"noUnusedLocals": true,
"downlevelIteration": true
},
"include": [
"sample",
"src",
"test"
],
"exclude": [
"tmp",
"temp",
Expand Down