bump version; fix types; update deps; implement better error handling (…

…closes #3);
sirixdb · Jan 19, 2022 · 57b0cca · 57b0cca
1 parent d2390d1
commit 57b0cca
Show file tree

Hide file tree

Showing 12 changed files with 2,162 additions and 6,256 deletions.
diff --git a/__tests__/auth.test.ts b/__tests__/auth.test.ts
@@ -1,11 +1,9 @@
-import {mocked} from "ts-jest/utils";
-
 let mockedFetch = jest.fn();
 jest.mock('fetch-ponyfill', () => {
     return () => ({fetch: mockedFetch})
 });
 const Response = jest.requireActual('fetch-ponyfill')().Response;
-mockedFetch = mocked(mockedFetch, true);
+mockedFetch = jest.mocked(mockedFetch, true);
 
 import Client from "../src/client";
 import {initClient} from '../src/auth';
@@ -55,7 +53,7 @@ describe("test authentication", () => {
             // an error should've already been thrown
             expect(true).toEqual(false);
         } catch (e) {
-            expect(e.message).toEqual("failed to retrieve an access token using credentials");
+            expect(e.message).toEqual("invalid credentials");
         }
         expect(errorSpy).toHaveBeenCalledWith("401, invalid credentials");
         expect(debugSpy).toHaveBeenCalledWith("failed to retrieve an access token using credentials. aborting");

diff --git a/__tests__/database.test.ts b/__tests__/database.test.ts
@@ -1,11 +1,9 @@
-import {mocked} from "ts-jest/utils";
-
 let mockedFetch = jest.fn();
 jest.mock('fetch-ponyfill', () => {
     return () => ({fetch: mockedFetch})
 });
 const Response = jest.requireActual('fetch-ponyfill')().Response;
-mockedFetch = mocked(mockedFetch, true);
+mockedFetch = jest.mocked(mockedFetch, true);
 
 import {Sirix, sirixInit} from "../src/sirix";
 import Database from "../src/database";

diff --git a/__tests__/resource.test.ts b/__tests__/resource.test.ts
@@ -1,11 +1,9 @@
-import {mocked} from "ts-jest/utils";
-
 let mockedFetch = jest.fn();
 jest.mock('fetch-ponyfill', () => {
     return () => ({fetch: mockedFetch})
 });
 const Response = jest.requireActual('fetch-ponyfill')().Response;
-mockedFetch = mocked(mockedFetch, true);
+mockedFetch = jest.mocked(mockedFetch, true);
 
 import {Sirix, sirixInit} from "../src/sirix";
 import Database from "../src/database";

diff --git a/__tests__/sirix.test.ts b/__tests__/sirix.test.ts
@@ -1,11 +1,9 @@
-import {mocked} from "ts-jest/utils";
-
 let mockedFetch = jest.fn();
 jest.mock('fetch-ponyfill', () => {
     return () => ({fetch: mockedFetch})
 });
 const Response = jest.requireActual('fetch-ponyfill')().Response;
-mockedFetch = mocked(mockedFetch, true);
+mockedFetch = jest.mocked(mockedFetch, true);
 
 import {Sirix, sirixInit} from "../src/sirix";
 import {token, postQuery} from "./data";

diff --git a/__tests__/xml.test.ts b/__tests__/xml.test.ts
@@ -2,7 +2,7 @@ import {Sirix, sirixInit} from "../src/sirix";
 import Database from "../src/database";
 import Resource from "../src/resource";
 import {DBType} from "../src/info";
-import {DOMParser} from "xmldom";
+import {DOMParser} from "@xmldom/xmldom";
 
 const domParser = new DOMParser();
 const xmlNode = domParser.parseFromString(`
@@ -39,4 +39,4 @@ describe('Test xml support', () => {
         console.log(res);
         expect(res).toEqual(xmlNode);*/
     });
-})
+})
diff --git a/index.ts b/index.ts
@@ -1,7 +1,7 @@
 import {Sirix, sirixInit} from "./src/sirix";
 import Database from "./src/database";
 import Resource from "./src/resource";
-import {Insert} from "./src/constants";
+import {Insert, ServerError, ServerErrorType} from "./src/constants";
 import {
     DBType,
     DatabaseInfo,
@@ -37,4 +37,6 @@ export {
     NodeType,
     MetaNode,
     Metadata,
+    ServerError,
+    ServerErrorType,
 };