Merge pull request #260 from xcomponent/fixapilist

fix api list

Author: fredericcarre

.travis.yml

@@ -1,19 +1,18 @@
 language: node_js
 node_js:
-- '8'
-- '10'
-sudo: false
+  - '18'
+  - '20'
 os:
-- linux
+  - linux
 cache:
   directories:
-  - node_modules
+    - node_modules
 install:
-- yarn install
+  - yarn install
 script:
-- yarn run lint
-- yarn run test --coverage
-- yarn build
+  - yarn run lint
+  - yarn run test --coverage
+  - yarn build
 deploy:
   - provider: npm
     email: dev@xcomponent.com

package.json

@@ -102,7 +102,7 @@
         "tslint-loader": "^3.6.0",
         "tslint-plugin-prettier": "^2.0.0",
         "tslint-react": "^3.6.0",
-        "typescript": "^3.0.1"
+        "typescript": "^5.8.2"
     },
     "husky": {
         "hooks": {

src/communication/WebSocketBridgeCommunication.ts

@@ -37,7 +37,7 @@ export class WebSocketBridgeCommunication {
             });
         let commandData = {
             Command: command,
-            Data: {}
+            Data: {},
         };
         let input = thisWebSocketBridgeCommunication.serializer.convertCommandDataToWebsocketInputFormat(commandData);
         this.heartbeatTimer = setInterval(() => {
@@ -71,7 +71,7 @@ export class WebSocketBridgeCommunication {
             });
         const commandData = {
             Command: command,
-            Data: { Name: apiName }
+            Data: { Name: apiName },
         };
         const input = thisWebSocketBridgeCommunication.serializer.convertCommandDataToWebsocketInputFormat(commandData);
         this.webSocket.send(input);
@@ -86,7 +86,7 @@ export class WebSocketBridgeCommunication {
                 filter((data: DeserializedData) => data.command === command),
                 first(),
                 map((data: DeserializedData) => {
-                    this.logger.info('ApiList received successfully');
+                    this.logger.info('ApiList received successfully : ' + JSON.stringify(data));
                     return thisWebSocketBridgeCommunication.deserializer.getJsonDataFromGetXcApiListRequest(
                         data.stringData
                     );
@@ -95,7 +95,7 @@ export class WebSocketBridgeCommunication {
             .toPromise();
         const commandData = {
             Command: command,
-            Data: {}
+            Data: {},
         };
         this.webSocket.send(
             thisWebSocketBridgeCommunication.serializer.convertCommandDataToWebsocketInputFormat(commandData)
@@ -127,7 +127,7 @@ export class WebSocketBridgeCommunication {
             });
         const commandData = {
             Command: command,
-            Data: { Name: apiName }
+            Data: { Name: apiName },
         };
         this.webSocket.send(
             thisWebSocketBridgeCommunication.serializer.convertCommandDataToWebsocketInputFormat(commandData)

src/communication/xcomponentMessages.ts

@@ -66,7 +66,7 @@ export interface DeserializedData {
 
 export let getHeaderWithIncomingType = (): Header => {
     return {
-        IncomingEventType: 0
+        IncomingEventType: 0,
     };
 };
 
@@ -96,15 +96,15 @@ export class Deserializer {
                 components.push({
                     name: component.Name,
                     model: this.decodeServerMessage(component.Model)!,
-                    graphical: this.decodeServerMessage(component.Graphical)
+                    graphical: this.decodeServerMessage(component.Graphical),
                 });
             }
         }
         if (jsonData.ModelContent.Composition) {
             return {
                 projectName: jsonData.ModelContent.ProjectName,
                 components: components,
-                composition: this.decodeServerMessage(jsonData.ModelContent.Composition)!
+                composition: this.decodeServerMessage(jsonData.ModelContent.Composition)!,
             };
         }
 
@@ -139,7 +139,7 @@ export class Deserializer {
 
     public getJsonDataFromGetXcApiListRequest(data: string): Array<string> {
         let jsonData = this.getJsonData(data);
-        return jsonData.Apis;
+        return jsonData.Apis.$values;
     }
 
     // tslint:disable-next-line:no-any
@@ -159,7 +159,7 @@ export class Deserializer {
         return {
             command: command,
             topic: topic,
-            stringData: stringData
+            stringData: stringData,
         };
     }
 
@@ -170,7 +170,7 @@ export class Deserializer {
         return {
             command: command,
             topic: undefined,
-            stringData: stringData
+            stringData: stringData,
         };
     }
 }

tsconfig.json

@@ -19,7 +19,6 @@
         "noImplicitThis": true,
         "noImplicitAny": false,
         "strictNullChecks": true,
-        "suppressImplicitAnyIndexErrors": true,
         "noUnusedLocals": true,
         "skipLibCheck": true
     },

yarn.lock

@@ -5205,9 +5205,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@^3.0.1:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3.tgz#f1657fc7daa27e1a8930758ace9ae8da31403221"
+typescript@^5.8.2:
+  version "5.8.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.2.tgz#8170b3702f74b79db2e5a96207c15e65807999e4"
+  integrity sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==
 
 uglify-js@^3.1.4:
   version "3.7.3"