Skip to content

Commit

Permalink
fix: typecheck, bump versions
Browse files Browse the repository at this point in the history
  • Loading branch information
Nelfimov committed Dec 29, 2023
1 parent 0419777 commit 6e60814
Show file tree
Hide file tree
Showing 79 changed files with 895 additions and 2,002 deletions.
1,774 changes: 570 additions & 1,204 deletions .pnp.cjs

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
22 changes: 22 additions & 0 deletions .yarn/patches/@nestjs-common-npm-10.2.5-816dceeade.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/exceptions/http.exception.d.ts b/exceptions/http.exception.d.ts
index e56ede0b858313355b5c3950fbac2ba7b5b90fc8..0b1144345becd12f4f1bd2034419a5b3691f8e75 100644
--- a/exceptions/http.exception.d.ts
+++ b/exceptions/http.exception.d.ts
@@ -1,7 +1,7 @@
import { HttpExceptionBody, HttpExceptionBodyMessage } from '../interfaces/http/http-exception-body.interface';
export interface HttpExceptionOptions {
/** original cause of the error */
- cause?: unknown;
+ cause?: Error;
description?: string;
}
export interface DescriptionAndOptions {
@@ -55,7 +55,7 @@ export declare class HttpException extends Error {
* @param options An object used to add an error cause.
*/
constructor(response: string | Record<string, any>, status: number, options?: HttpExceptionOptions);
- cause: unknown;
+ cause: undefined;
/**
* Configures error chaining support
*
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
diff --git a/index.d.ts b/index.d.ts
index 0c63c8df26c8dec41937bfb7af33fafc2f59d454..b180242b829710d690de9fede42d7272cbe55f2f 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -1,5 +1,6 @@
import * as v1alpha2 from './ory/keto/relation_tuples/v1alpha2'

declare module '@ory/keto-grpc-client' {
+ // @ts-ignore
export default v1alpha2
}
diff --git a/ory/keto/relation_tuples/v1alpha2/index.d.ts b/ory/keto/relation_tuples/v1alpha2/index.d.ts
index 7e52c454dddc9314957b4015d1b0166f5f243c0d..27946e94c5eaf13dd77a58701b9fba756956afe9 100644
--- a/ory/keto/relation_tuples/v1alpha2/index.d.ts
+++ b/ory/keto/relation_tuples/v1alpha2/index.d.ts
@@ -8,6 +8,7 @@ import * as expandService from './expand_service_grpc_pb'
import * as read from './read_service_pb'
import * as readService from './read_service_grpc_pb'
declare module '@ory/keto-grpc-client/ory/keto/relation_tuples/v1alpha2' {
+ // @ts-ignore
export {
relationTuples,
write,
8 changes: 4 additions & 4 deletions examples/grpc-http-proxy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"@atls/nestjs-grpc-reflection": "workspace:0.0.6",
"@grpc/grpc-js": "^1.3.7",
"@grpc/proto-loader": "^0.6.4",
"@nestjs/common": "^8.0.5",
"@nestjs/core": "^8.0.5",
"@nestjs/microservices": "^8.0.5",
"@nestjs/testing": "^8.0.5",
"@nestjs/common": "patch:@nestjs/common@npm%3A10.2.5#~/.yarn/patches/@nestjs-common-npm-10.2.5-816dceeade.patch",
"@nestjs/core": "10.2.5",
"@nestjs/microservices": "10.2.5",
"@nestjs/testing": "10.2.5",
"@types/long": "^4.0.1",
"google-protobuf": "^3.17.3",
"long": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc-http-proxy/src/bootstrap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const bootstrap = async () => {
app.enableShutdownHooks()
app.enableCors()

await app.startAllMicroservicesAsync()
await app.startAllMicroservices()
await app.listen(3000)

if (module.hot) {
Expand Down
8 changes: 4 additions & 4 deletions examples/grpc-playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"@atls/nestjs-grpc-reflection": "workspace:0.0.6",
"@grpc/grpc-js": "^1.3.7",
"@grpc/proto-loader": "^0.6.4",
"@nestjs/common": "^8.0.5",
"@nestjs/core": "^8.0.5",
"@nestjs/microservices": "^8.0.5",
"@nestjs/testing": "^8.0.5",
"@nestjs/common": "patch:@nestjs/common@npm%3A10.2.5#~/.yarn/patches/@nestjs-common-npm-10.2.5-816dceeade.patch",
"@nestjs/core": "10.2.5",
"@nestjs/microservices": "10.2.5",
"@nestjs/testing": "10.2.5",
"@types/long": "^4.0.1",
"google-protobuf": "^3.17.3",
"long": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc-playground/src/bootstrap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const bootstrap = async () => {
app.enableShutdownHooks()
app.enableCors()

await app.startAllMicroservicesAsync()
await app.startAllMicroservices()
await app.listen(3000)

if (module.hot) {
Expand Down
8 changes: 4 additions & 4 deletions examples/grpc-reflection/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"@atls/nestjs-grpc-reflection": "workspace:0.0.6",
"@grpc/grpc-js": "^1.3.7",
"@grpc/proto-loader": "^0.6.4",
"@nestjs/common": "^8.0.5",
"@nestjs/core": "^8.0.5",
"@nestjs/microservices": "^8.0.5",
"@nestjs/testing": "^8.0.5",
"@nestjs/common": "patch:@nestjs/common@npm%3A10.2.5#~/.yarn/patches/@nestjs-common-npm-10.2.5-816dceeade.patch",
"@nestjs/core": "10.2.5",
"@nestjs/microservices": "10.2.5",
"@nestjs/testing": "10.2.5",
"@types/long": "^4.0.1",
"google-protobuf": "^3.17.3",
"long": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc-reflection/src/bootstrap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const bootstrap = async () => {

app.enableShutdownHooks()

await app.startAllMicroservicesAsync()
await app.startAllMicroservices()
await app.listen(3000)

if (module.hot) {
Expand Down
4 changes: 2 additions & 2 deletions packages/dataloader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"dataloader": "2.2.2"
},
"devDependencies": {
"@nestjs/common": "10.2.5",
"@nestjs/common": "patch:@nestjs/common@npm%3A10.2.5#~/.yarn/patches/@nestjs-common-npm-10.2.5-816dceeade.patch",
"@nestjs/core": "10.2.5",
"@nestjs/graphql": "12.0.9",
"@nestjs/microservices": "10.2.5",
Expand All @@ -25,7 +25,7 @@
"get-port": "7.0.0",
"graphql": "16.8.0",
"reflect-metadata": "0.1.13",
"rxjs": "7.8.1",
"rxjs": "7.5.4",
"supertest": "6.3.3",
"ts-morph": "19.0.0",
"ws": "8.14.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { GraphQLExecutionContext } from '@nestjs/graphql'

import { Observable } from 'rxjs'

import { GET_LOADER_CONTEXT_KEY } from '../constants'
import { NestDataLoader } from '../interfaces/nest-dataloader.interfaces'
import { GET_LOADER_CONTEXT_KEY } from '../constants'
import { NestDataLoader } from '../interfaces'

@Injectable()
export class DataLoaderInterceptor implements NestInterceptor {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import DataLoader from 'dataloader'

export interface NestDataLoader {
generateDataLoader(): DataLoader<any, any>
generateDataLoader(): DataLoader<any,any>
}
2 changes: 1 addition & 1 deletion packages/external-renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"node-fetch": "2.7.0"
},
"devDependencies": {
"@nestjs/common": "10.2.5",
"@nestjs/common": "patch:@nestjs/common@npm%3A10.2.5#~/.yarn/patches/@nestjs-common-npm-10.2.5-816dceeade.patch",
"@nestjs/core": "10.2.5",
"@nestjs/testing": "10.2.5",
"@types/node": "20.6.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ describe('ExpressExternalRendererView', () => {

beforeAll(async () => {
const view = new ExpressExternalRendererView('/test', {
root: 'http://localhost:3000',
root: `http://localhost:3000`,
})

render = (params = {}) => new Promise((resolve) => view.render(params, resolve))
Expand Down
2 changes: 1 addition & 1 deletion packages/gateway/integration/test/gateway.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ describe('gateway', () => {
await service.init()

await app.listen(appPort, '0.0.0.0')
await service.listenAsync()
await service.listen()

pubsub = app.get(PubSub)
url = await app.getUrl()
Expand Down
12 changes: 6 additions & 6 deletions packages/gateway/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
"protobufjs": "^6.11.2"
},
"devDependencies": {
"@nestjs/common": "^8.0.5",
"@nestjs/core": "^8.0.5",
"@nestjs/microservices": "^8.0.5",
"@nestjs/testing": "^8.0.5",
"@nestjs/common": "patch:@nestjs/common@npm%3A10.2.5#~/.yarn/patches/@nestjs-common-npm-10.2.5-816dceeade.patch",
"@nestjs/core": "10.2.5",
"@nestjs/microservices": "10.2.5",
"@nestjs/testing": "10.2.5",
"@types/lodash": "^4.14.178",
"@types/node": "^17.0.12",
"get-port": "^5.1.1",
Expand All @@ -59,8 +59,8 @@
"ws": "^8.4.2"
},
"peerDependencies": {
"@nestjs/common": "^8.0.0",
"@nestjs/core": "^8.0.0",
"@nestjs/common": "10.2.5",
"@nestjs/core": "10.2.5",
"graphql": "^15.5.0",
"reflect-metadata": "^0.1.12",
"rxjs": "^6.3.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/gateway/src/module/gateway.constants.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const GATEWAY_MODULE_OPTIONS = 'GATEWAY_MODULE_OPTIONS'
export const GATEWAY_MODULE_OPTIONS = `GATEWAY_MODULE_OPTIONS`
14 changes: 7 additions & 7 deletions packages/grpc-errors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"@grpc/grpc-js": "1.9.0"
},
"devDependencies": {
"@nestjs/common": "10.1.3",
"@nestjs/core": "10.1.3",
"@nestjs/microservices": "10.1.3",
"@nestjs/testing": "10.1.3",
"@nestjs/common": "patch:@nestjs/common@npm%3A10.2.5#~/.yarn/patches/@nestjs-common-npm-10.2.5-816dceeade.patch",
"@nestjs/core": "10.2.5",
"@nestjs/microservices": "10.2.5",
"@nestjs/testing": "10.2.5",
"class-transformer": "0.5.1",
"class-validator": "0.14.0",
"get-port": "6.1.2",
Expand All @@ -28,9 +28,9 @@
"supertest": "6.3.3"
},
"peerDependencies": {
"@nestjs/common": "10.1.3",
"@nestjs/core": "10.1.3",
"@nestjs/microservices": "10.1.3",
"@nestjs/common": "10.2.5",
"@nestjs/core": "10.2.5",
"@nestjs/microservices": "10.2.5",
"class-validator": "0.14.0",
"reflect-metadata": "0.1.13",
"rxjs": "7.8.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/grpc-errors/src/pipes/grpc-validation.pipe.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export class GrpcValidationPipe extends ValidationPipe {
constructor(options?) {
super({
...(options || {}),
transform: typeof options?.transform === 'undefined' ? true : options?.transform,
transform: typeof options?.transform === `undefined` ? true : options?.transform,
exceptionFactory: grpcValidationExceptionFactory || options?.exceptionFactory,
})
}
Expand Down
14 changes: 7 additions & 7 deletions packages/grpc-http-proxy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"uuid": "9.0.0"
},
"devDependencies": {
"@nestjs/common": "10.1.3",
"@nestjs/core": "10.1.3",
"@nestjs/microservices": "10.1.3",
"@nestjs/testing": "10.1.3",
"@nestjs/common": "patch:@nestjs/common@npm%3A10.2.5#~/.yarn/patches/@nestjs-common-npm-10.2.5-816dceeade.patch",
"@nestjs/core": "10.2.5",
"@nestjs/microservices": "10.2.5",
"@nestjs/testing": "10.2.5",
"@types/cookie": "0.5.1",
"@types/express": "4.17.13",
"@types/jsonwebtoken": "9.0.2",
Expand All @@ -40,9 +40,9 @@
"supertest": "6.3.3"
},
"peerDependencies": {
"@nestjs/common": "10.1.3",
"@nestjs/core": "10.1.3",
"@nestjs/microservices": "10.1.3",
"@nestjs/common": "10.2.5",
"@nestjs/core": "10.2.5",
"@nestjs/microservices": "10.2.5",
"reflect-metadata": "0.1.13",
"rxjs": "7.8.1"
},
Expand Down
4 changes: 1 addition & 3 deletions packages/grpc-http-proxy/src/proto/proto.client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ export class ProtoClient {
const metadata = new Metadata()

Object.keys(meta).forEach((key) => {
if (meta[key]) {
metadata.add(key, meta[key])
}
if (meta[key]) metadata.add(key, meta[key])
})

return new Promise((resolve, reject) => {
Expand Down
14 changes: 7 additions & 7 deletions packages/grpc-identity/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"jwks-rsa": "2.1.4"
},
"devDependencies": {
"@nestjs/common": "10.2.1",
"@nestjs/core": "10.2.1",
"@nestjs/microservices": "10.2.1",
"@nestjs/testing": "10.2.1",
"@nestjs/common": "patch:@nestjs/common@npm%3A10.2.5#~/.yarn/patches/@nestjs-common-npm-10.2.5-816dceeade.patch",
"@nestjs/core": "10.2.5",
"@nestjs/microservices": "10.2.5",
"@nestjs/testing": "10.2.5",
"@types/jsonwebtoken": "9.0.2",
"@types/jwk-to-pem": "2.0.1",
"get-port": "6.1.2",
Expand All @@ -30,9 +30,9 @@
"rxjs": "7.8.1"
},
"peerDependencies": {
"@nestjs/common": "10.2.1",
"@nestjs/core": "10.2.1",
"@nestjs/microservices": "10.2.1",
"@nestjs/common": "10.2.5",
"@nestjs/core": "10.2.5",
"@nestjs/microservices": "10.2.5",
"reflect-metadata": "0.1.13",
"rxjs": "7.8.1"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export class GrpcIdentityEnvConfig implements GrpcIdentityOptionsFactory {
const jwksUri = process.env.IDENTITY_JWKS_URI

if (!jwksUri) {
throw new Error('Identity JwksUri configuration not found.')
throw new Error(`Identity JwksUri configuration not found.`)
}

const options = {
Expand Down
10 changes: 5 additions & 5 deletions packages/grpc-keto/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
},
"dependencies": {
"@grpc/grpc-js": "1.9.13",
"@ory/keto-grpc-client": "0.11.1-alpha.0",
"@ory/keto-grpc-client": "patch:@ory/keto-grpc-client@npm%3A0.11.1-alpha.0#~/.yarn/patches/@ory-keto-grpc-client-npm-0.11.1-alpha.0-92da71e435.patch",
"grpc": "1.24.11"
},
"devDependencies": {
"@nestjs/common": "9.4.3",
"@nestjs/core": "9.4.3",
"@nestjs/graphql": "11.0.6",
"@nestjs/testing": "9.4.3",
"@nestjs/common": "patch:@nestjs/common@npm%3A10.2.5#~/.yarn/patches/@nestjs-common-npm-10.2.5-816dceeade.patch",
"@nestjs/core": "10.2.5",
"@nestjs/graphql": "12.0.10",
"@nestjs/testing": "10.2.5",
"@types/lodash": "4.14.178",
"@types/supertest": "2.0.16",
"graphql": "16.8.1",
Expand Down
14 changes: 7 additions & 7 deletions packages/grpc-playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
"node-fetch": "3.3.2"
},
"devDependencies": {
"@nestjs/common": "10.1.3",
"@nestjs/core": "10.1.3",
"@nestjs/microservices": "10.1.3",
"@nestjs/testing": "10.1.3",
"@nestjs/common": "patch:@nestjs/common@npm%3A10.2.5#~/.yarn/patches/@nestjs-common-npm-10.2.5-816dceeade.patch",
"@nestjs/core": "10.2.5",
"@nestjs/microservices": "10.2.5",
"@nestjs/testing": "10.2.5",
"get-port": "6.1.2",
"reflect-metadata": "0.1.13",
"rxjs": "7.8.1",
"supertest": "6.3.3"
},
"peerDependencies": {
"@nestjs/common": "10.1.3",
"@nestjs/core": "10.1.3",
"@nestjs/microservices": "10.1.3",
"@nestjs/common": "10.2.5",
"@nestjs/core": "10.2.5",
"@nestjs/microservices": "10.2.5",
"reflect-metadata": "0.1.13",
"rxjs": "7.8.1"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const GRPC_PLAYGROUND_MODULE_OPTIONS = 'GRPC_PLAYGROUND_MODULE_OPTIONS'
export const GRPC_PLAYGROUND_MODULE_OPTIONS = `GRPC_PLAYGROUND_MODULE_OPTIONS`
Loading

0 comments on commit 6e60814

Please sign in to comment.