From 7bf9c8da5b7327eb8103da2ecfe60e4de27bcdc4 Mon Sep 17 00:00:00 2001
From: Aleksandar Stanisic <aleksandar@tuta.io>
Date: Tue, 24 Nov 2020 23:47:17 +0100
Subject: [PATCH] Add openapi3-ts as dev dependecy

Used for returning type of sdk.server.specs.oas
---
 packages/sdk-js/package-lock.json      | 52 ++++++++++++++++++++++++++
 packages/sdk-js/package.json           |  1 +
 packages/sdk-js/src/handlers/server.ts | 16 +-------
 3 files changed, 55 insertions(+), 14 deletions(-)
 create mode 100644 packages/sdk-js/package-lock.json

diff --git a/packages/sdk-js/package-lock.json b/packages/sdk-js/package-lock.json
new file mode 100644
index 0000000000..523d96e22a
--- /dev/null
+++ b/packages/sdk-js/package-lock.json
@@ -0,0 +1,52 @@
+{
+  "name": "@directus/sdk-js",
+  "version": "9.0.0-rc.17",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "axios": {
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
+      "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
+      "requires": {
+        "follow-redirects": "1.5.10"
+      }
+    },
+    "debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "follow-redirects": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+      "requires": {
+        "debug": "=3.1.0"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "openapi3-ts": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/openapi3-ts/-/openapi3-ts-2.0.0.tgz",
+      "integrity": "sha512-q4p8OX/mD7qXeDKkhdLhpEz1Zh/IxPBDWmuq7f07fQJpo7exUW20sMrHfws1xzihYPktTXVV5MDOZkG/1uguEg==",
+      "dev": true,
+      "requires": {
+        "yaml": "^1.10.0"
+      }
+    },
+    "yaml": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz",
+      "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==",
+      "dev": true
+    }
+  }
+}
diff --git a/packages/sdk-js/package.json b/packages/sdk-js/package.json
index 8152a94f67..bf2aacfbfa 100644
--- a/packages/sdk-js/package.json
+++ b/packages/sdk-js/package.json
@@ -28,6 +28,7 @@
   "devDependencies": {
     "chai": "^4.2.0",
     "mocha": "^8.2.0",
+    "openapi3-ts": "^2.0.0",
     "ts-node": "^9.0.0",
     "typescript": "^4.0.3"
   },
diff --git a/packages/sdk-js/src/handlers/server.ts b/packages/sdk-js/src/handlers/server.ts
index 82afa64130..e6b0815953 100644
--- a/packages/sdk-js/src/handlers/server.ts
+++ b/packages/sdk-js/src/handlers/server.ts
@@ -1,4 +1,5 @@
 import { AxiosInstance } from 'axios';
+import type { OpenAPIObject } from 'openapi3-ts';
 
 export type ServerInfo = {
 	project: {
@@ -15,19 +16,6 @@ export type ServerInfo = {
 	os: { totalmem: number; type: string; uptime: number; version: string };
 };
 
-export type OasData = {
-	openapi: string;
-	info: {
-		title: string;
-		description: string;
-		versions: string;
-	};
-	servers: { url: string; description: string }[];
-	tags: { name: string; description: string }[];
-	paths: Record<string, any>;
-	components: Record<string, any>;
-};
-
 export class ServerHandler {
 	private axios: AxiosInstance;
 
@@ -36,7 +24,7 @@ export class ServerHandler {
 	}
 
 	specs = {
-		oas: async (): Promise<OasData> => {
+		oas: async (): Promise<OpenAPIObject> => {
 			const result = await this.axios.get('/server/specs/oas');
 			return result.data;
 		},