Merge branch 'master' into feat/reflect-static-methods

plumier · Dec 5, 2022 · 1bd18fd · 1bd18fd
2 parents 7667cc7 + 4b96e88
commit 1bd18fd
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/packages/reflect/src/types.ts b/packages/reflect/src/types.ts
@@ -58,7 +58,7 @@ export interface ParameterPropertyReflection extends PropertyReflection {
     isParameter: boolean
 }
 export interface MethodReflection extends ReflectionBase {
-    kind: "Method",
+    kind: "Method" | "StaticMethod",
     parameters: ParameterReflection[],
     returnType: any,
     decorators: any[],

diff --git a/packages/reflect/tsconfig.build.json b/packages/reflect/tsconfig.build.json
@@ -1,13 +1,13 @@
 {
-    "extends": "./tsconfig.json",
+    "extends": "../../tsconfig.base.json",
     "compilerOptions": {
-        "target": "es6",
-        "outDir": "lib",
-        "declaration": true,
-        "inlineSourceMap": false
+      "declaration": true,
+      "rootDir": "src",
+      "outDir": "lib",
+      "sourceMap": false
     },
     "exclude": [
-        "test",
-        "lib"
+      "test",
+      "lib"
     ]
-}
+  }
diff --git a/packages/swagger/package.json b/packages/swagger/package.json
@@ -19,7 +19,7 @@
     "@types/swagger-ui-dist": "^3.30.1",
     "ejs": "^3.1.8",
     "openapi3-ts": "^2.0.2",
-    "swagger-ui-dist": "3.52.5"
+    "swagger-ui-dist": "^4.15.5"
   },
   "devDependencies": {
     "cpy-cli": "^3.1.1"

diff --git a/tests/manual/swagger/index.ts b/tests/manual/swagger/index.ts
@@ -16,7 +16,7 @@ export class UsersController {
     @route.get("")
     @meta.type([User])
     get(@api.description("Lorem ipsum dolor sit amet") @val.required() id: string) {
-        return 12
+        return [{ email: "abc@test.com", name: "Abc" }]
     }
 }
 

diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -7,6 +7,7 @@
     "esModuleInterop": true,
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
-    "useUnknownInCatchVariables": false
+    "useUnknownInCatchVariables": false,
+    "skipLibCheck": true
   }
 }