Merge branch 'master' into siim/logger

Author: 2ndalpha

.yarn/releases/yarn-4.5.3.cjs .yarn/releases/yarn-4.6.0.cjs.yarn/releases/yarn-4.5.3.cjs renamed to .yarn/releases/yarn-4.6.0.cjs

@@ -1,2 +1,2 @@
 nodeLinker: node-modules
-yarnPath: .yarn/releases/yarn-4.5.3.cjs
+yarnPath: .yarn/releases/yarn-4.6.0.cjs

.yarnrc.yml

@@ -27,13 +27,13 @@
     "eslint-import-resolver-typescript": "^3.5.3",
     "eslint-plugin-import": "^2.27.5",
     "prettier": "2.8.8",
-    "typescript": "5.5.4"
+    "typescript": "5.7.2"
   },
   "workspaces": [
     "packages/*"
   ],
   "resolutions": {
-    "mock-socket": "9.2.1"
+    "mock-socket": "9.3.1"
   },
-  "packageManager": "yarn@4.5.3"
+  "packageManager": "yarn@4.6.0"
 }

package.json

@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "tsx": "^4.19.2",
-    "typescript": "5.5.4"
+    "typescript": "5.7.2"
   },
   "author": "Qminder <support@qminder.com> (https://www.qminder.com)",
   "license": "Apache-2.0"

packages/example-graphql-events/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qminder-api",
-  "version": "13.4.0",
+  "version": "14.0.0",
   "description": "Qminder Javascript API. Makes it easy to leverage Qminder capabilities in your system.",
   "scripts": {
     "test": "jest",
@@ -59,16 +59,16 @@
     "jest-fetch-mock": "^3.0.3",
     "jest-sinon": "1.1.0",
     "jest-websocket-mock": "^2.4.0",
-    "mock-socket": "9.2.1",
+    "mock-socket": "9.3.1",
     "rxjs": "7.8.1",
     "sinon": "15.1.0",
     "ts-jest": "^29.0.5",
     "ts-jest-resolver": "^2.0.0",
     "ts-loader": "^9.4.2",
-    "typedoc": "0.27.5",
-    "typescript": "5.5.4",
+    "typedoc": "0.27.6",
+    "typescript": "5.7.2",
     "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1"
+    "webpack-cli": "^6.0.0"
   },
   "peerDependencies": {
     "graphql": ">= 15.5.1",

packages/javascript-api/package.json

@@ -0,0 +1,5 @@
+export class ResponseValidationError extends Error {
+  constructor(message: string) {
+    super(message);
+  }
+}

packages/javascript-api/src/lib/model/errors/response-validation-error.ts

@@ -1,5 +1,3 @@
-import { ID } from '../../util/id-or-object';
-
 export interface TicketCreatedResponse {
-  id: ID;
+  id: string;
 }

packages/javascript-api/src/lib/model/ticket/ticket-created-response.ts

@@ -12,8 +12,8 @@ import { GraphqlResponse } from '../../model/graphql-response.js';
 import { calculateRandomizedExponentialBackoffTime } from '../../util/randomized-exponential-backoff/randomized-exponential-backoff.js';
 import { sleepMs } from '../../util/sleep-ms/sleep-ms.js';
 import { ApiBase, GraphqlQuery } from '../api-base/api-base.js';
-import { TemporaryApiKeyService } from '../temporary-api-key/temporary-api-key.service';
-import { Logger } from '../../util/logger/logger';
+import { TemporaryApiKeyService } from '../temporary-api-key/temporary-api-key.service.js';
+import { Logger } from '../../util/logger/logger.js';
 
 type QueryOrDocument = string | DocumentNode;
 
@@ -86,7 +86,7 @@ const CLIENT_SIDE_CLOSE_EVENT = 1000;
  * trying to import GraphQLService.
  */
 export class GraphqlService {
-  private logger: Logger = new Logger('GraphQL');
+  private logger = new Logger('GraphQL');
   private apiServer: string;
 
   private socket: WebSocket = null;

packages/javascript-api/src/lib/services/graphql/graphql.service.ts

@@ -1,9 +1,9 @@
-import { RequestInit } from '../../model/fetch';
-import { sleepMs } from '../../util/sleep-ms/sleep-ms';
-import { Logger } from '../../util/logger/logger';
+import { RequestInit } from '../../model/fetch.js';
+import { sleepMs } from '../../util/sleep-ms/sleep-ms.js';
+import { Logger } from '../../util/logger/logger.js';
 
 export class TemporaryApiKeyService {
-  private logger: Logger = new Logger('TemporaryKey');
+  private logger = new Logger('TemporaryKey');
   private readonly apiServer: string;
   private readonly permanentApiKey: string;
 

packages/javascript-api/src/lib/services/temporary-api-key/temporary-api-key.service.ts

@@ -4,6 +4,7 @@ import { TicketCreatedResponse } from '../../model/ticket/ticket-created-respons
 import { TicketCreationRequest } from '../../model/ticket/ticket-creation-request';
 import { Qminder } from '../../qminder';
 import { TicketService } from './ticket.service';
+import { ResponseValidationError } from '../../model/errors/response-validation-error';
 
 describe('Ticket service', function () {
   const JON_SNOW = {
@@ -29,7 +30,7 @@ describe('Ticket service', function () {
     };
 
     const ticketsWithMessages = {
-      data: tickets.data.map((each) => ({ ...each, messages: [] })),
+      data: tickets.data.map((each) => ({ ...each, messages: [] as any[] })),
     };
 
     it('searches based on lines', function (done) {
@@ -406,10 +407,6 @@ describe('Ticket service', function () {
       ],
     };
 
-    const ticketsWithMessages = {
-      data: tickets.data.map((each) => ({ ...each, messages: [] })),
-    };
-
     it('searches based on lines', function (done) {
       const request = { line: [123, 124, 125] };
       requestStub.onCall(0).resolves(tickets);
@@ -796,6 +793,21 @@ describe('Ticket service', function () {
       });
       expect(res).toEqual(SUCCESSFUL_RESPONSE);
     });
+
+    it('should throw when response does not contain ID', async () => {
+      requestStub.mockResolvedValue({});
+      const request: TicketCreationRequest = {
+        lineId: '41299290',
+        firstName: 'James',
+        lastName: 'Baxter',
+        email: 'foo@bar.com',
+      };
+      await expect(async () => {
+        await TicketService.create(request);
+      }).rejects.toThrow(
+        new ResponseValidationError('Response does not contain "id"'),
+      );
+    });
   });
 
   describe('details()', function () {