From 3b959c7d8c033ad0305c7565bf8dc3b9a7a76aa7 Mon Sep 17 00:00:00 2001 From: Johan Nyman Date: Mon, 13 Nov 2023 13:41:19 +0100 Subject: [PATCH] chore: lint fixes --- packages/core/package.json | 2 +- packages/core/src/products.ts | 284 +++++++++--------- .../__snapshots__/xkeys.spec.ts.snap | 12 + packages/node/src/__tests__/lib.ts | 1 - packages/node/src/__tests__/xkeys.spec.ts | 7 +- packages/node/src/methods.ts | 2 +- packages/webhid-demo/src/app.ts | 2 +- 7 files changed, 159 insertions(+), 151 deletions(-) create mode 100644 packages/node/src/__tests__/__snapshots__/xkeys.spec.ts.snap diff --git a/packages/core/package.json b/packages/core/package.json index 9281407..c323ee7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -21,7 +21,7 @@ "scripts": { "build": "rimraf dist && yarn build:main", "build:main": "tsc -p tsconfig.build.json", - "__test": "jest" + "test": "jest" }, "files": [ "dist/**" diff --git a/packages/core/src/products.ts b/packages/core/src/products.ts index af0f07b..dbaf402 100644 --- a/packages/core/src/products.ts +++ b/packages/core/src/products.ts @@ -13,149 +13,145 @@ export interface Product { productId: number } - export const PRODUCTS: { [name: string]: Product } = { - "SpaceNavigator": literal({ - name: "SpaceNavigator", - vendorId: 0x46d, - productId: 0xc626 - }), - "SpaceMouse_Wireless": literal({ - name: "SpaceMouse Wireless", - vendorId: 0x256f, - productId: 0xc62e - }), - "SpaceMouse_Wireless_2": literal({ - name: "SpaceMouse Wireless", - vendorId: 0x256f, - productId: 0xc63a - }), - "SpaceNavigator_for_Notebooks": literal({ - name: "SpaceNavigator for Notebooks", - vendorId: 0x46d, - productId: 0xc628 - }), - "SpaceMouse_Compact": literal({ - name: "SpaceMouse Compact", - vendorId: 0x256f, - productId: 0xc635 - }), - "SpaceMouse_Module": literal({ - name: "SpaceMouse Module", - vendorId: 0x256f, - productId: 0xc636 - }), - "SpaceMouse_Pro": literal({ - name: "SpaceMouse Pro", - vendorId: 0x46d, - productId: 0xc62b - }), - "SpaceMouse_Pro_Wireless": literal({ - name: "SpaceMouse Pro Wireless", - vendorId: 0x256f, - productId: 0xc631 - }), - "SpaceMouse_Pro_Wireless_2": literal({ - name: "SpaceMouse Pro Wireless", - vendorId: 0x256f, - productId: 0xc638 - }), - "LIPARI": literal({ - name: "LIPARI", - vendorId: 0x256f, - productId: 0xc62c - }), - "SpacePilot_PRO": literal({ - name: "SpacePilot PRO", - vendorId: 0x46d, - productId: 0xc629 - }), - "SpaceMouse_Enterprise": literal({ - name: "SpaceMouse Enterprise", - vendorId: 0x256f, - productId: 0xc633 - - }), - "CadMouse": literal({ - name: "CadMouse", - vendorId: 0x256f, - productId: 0xc650 - }), - "CadMouse_Wireless": literal({ - name: "CadMouse Wireless", - vendorId: 0x256f, - productId: 0xc651 - }), - "CadMouse_Pro_Wireless": literal({ - name: "CadMouse Pro Wireless", - vendorId: 0x256f, - productId: 0xc654 - }), - "CadMouse_Compact": literal({ - name: "CadMouse Compact", - vendorId: 0x256f, - productId: 0xc655 - }), - "CadMouse_Pro": literal({ - name: "CadMouse Pro", - vendorId: 0x256f, - productId: 0xc656 - }), - "CadMouse_Pro_Wireless_Left": literal({ - name: "CadMouse Pro Wireless Left", - vendorId: 0x256f, - productId: 0xc657 - }), - "CadMouse_Compact_Wireless": literal({ - name: "CadMouse Compact Wireless", - vendorId: 0x256f, - productId: 0xc658 - }), - "Cassini": literal({ - name: "Cassini", - vendorId: 0x256f, - productId: 0xc659 - - }), - "Keyboard_Pro": literal({ - name: "Keyboard Pro", - vendorId: 0x256f, - productId: 0xc664 - }), - "Numpad_Pro": literal({ - name: "Numpad Pro", - vendorId: 0x256f, - productId: 0xc665 - }), - "Keyboard_Pro_2": literal({ - name: "Keyboard Pro", - vendorId: 0x256f, - productId: 0xc668 - }), - "SpaceMouse_Wireless_Receiver": literal({ - name: "SpaceMouse Wireless Receiver", - vendorId: 0x256f, - productId: 0xc62f - }), - "SpaceMouse_Pro_Wireless_Receiver": literal({ - name: "SpaceMouse Pro Wireless Receiver", - vendorId: 0x256f, - productId: 0xc632 - }), - "Universal_Receiver": literal({ - name: "Universal Receiver", - vendorId: 0x256f, - productId: 0xc652 - }), - "Universal_Receiver_2": literal({ - name: "Universal Receiver 2", - vendorId: 0x256f, - productId: 0xc65a - }), - "Universal_Receiver_2_2": literal({ - name: "Universal Receiver 2", - vendorId: 0x256f, - productId: 0xc65c - }) + SpaceNavigator: literal({ + name: 'SpaceNavigator', + vendorId: 0x46d, + productId: 0xc626, + }), + SpaceMouse_Wireless: literal({ + name: 'SpaceMouse Wireless', + vendorId: 0x256f, + productId: 0xc62e, + }), + SpaceMouse_Wireless_2: literal({ + name: 'SpaceMouse Wireless', + vendorId: 0x256f, + productId: 0xc63a, + }), + SpaceNavigator_for_Notebooks: literal({ + name: 'SpaceNavigator for Notebooks', + vendorId: 0x46d, + productId: 0xc628, + }), + SpaceMouse_Compact: literal({ + name: 'SpaceMouse Compact', + vendorId: 0x256f, + productId: 0xc635, + }), + SpaceMouse_Module: literal({ + name: 'SpaceMouse Module', + vendorId: 0x256f, + productId: 0xc636, + }), + SpaceMouse_Pro: literal({ + name: 'SpaceMouse Pro', + vendorId: 0x46d, + productId: 0xc62b, + }), + SpaceMouse_Pro_Wireless: literal({ + name: 'SpaceMouse Pro Wireless', + vendorId: 0x256f, + productId: 0xc631, + }), + SpaceMouse_Pro_Wireless_2: literal({ + name: 'SpaceMouse Pro Wireless', + vendorId: 0x256f, + productId: 0xc638, + }), + LIPARI: literal({ + name: 'LIPARI', + vendorId: 0x256f, + productId: 0xc62c, + }), + SpacePilot_PRO: literal({ + name: 'SpacePilot PRO', + vendorId: 0x46d, + productId: 0xc629, + }), + SpaceMouse_Enterprise: literal({ + name: 'SpaceMouse Enterprise', + vendorId: 0x256f, + productId: 0xc633, + }), + CadMouse: literal({ + name: 'CadMouse', + vendorId: 0x256f, + productId: 0xc650, + }), + CadMouse_Wireless: literal({ + name: 'CadMouse Wireless', + vendorId: 0x256f, + productId: 0xc651, + }), + CadMouse_Pro_Wireless: literal({ + name: 'CadMouse Pro Wireless', + vendorId: 0x256f, + productId: 0xc654, + }), + CadMouse_Compact: literal({ + name: 'CadMouse Compact', + vendorId: 0x256f, + productId: 0xc655, + }), + CadMouse_Pro: literal({ + name: 'CadMouse Pro', + vendorId: 0x256f, + productId: 0xc656, + }), + CadMouse_Pro_Wireless_Left: literal({ + name: 'CadMouse Pro Wireless Left', + vendorId: 0x256f, + productId: 0xc657, + }), + CadMouse_Compact_Wireless: literal({ + name: 'CadMouse Compact Wireless', + vendorId: 0x256f, + productId: 0xc658, + }), + Cassini: literal({ + name: 'Cassini', + vendorId: 0x256f, + productId: 0xc659, + }), + Keyboard_Pro: literal({ + name: 'Keyboard Pro', + vendorId: 0x256f, + productId: 0xc664, + }), + Numpad_Pro: literal({ + name: 'Numpad Pro', + vendorId: 0x256f, + productId: 0xc665, + }), + Keyboard_Pro_2: literal({ + name: 'Keyboard Pro', + vendorId: 0x256f, + productId: 0xc668, + }), + SpaceMouse_Wireless_Receiver: literal({ + name: 'SpaceMouse Wireless Receiver', + vendorId: 0x256f, + productId: 0xc62f, + }), + SpaceMouse_Pro_Wireless_Receiver: literal({ + name: 'SpaceMouse Pro Wireless Receiver', + vendorId: 0x256f, + productId: 0xc632, + }), + Universal_Receiver: literal({ + name: 'Universal Receiver', + vendorId: 0x256f, + productId: 0xc652, + }), + Universal_Receiver_2: literal({ + name: 'Universal Receiver 2', + vendorId: 0x256f, + productId: 0xc65a, + }), + Universal_Receiver_2_2: literal({ + name: 'Universal Receiver 2', + vendorId: 0x256f, + productId: 0xc65c, + }), } - diff --git a/packages/node/src/__tests__/__snapshots__/xkeys.spec.ts.snap b/packages/node/src/__tests__/__snapshots__/xkeys.spec.ts.snap new file mode 100644 index 0000000..7cf1435 --- /dev/null +++ b/packages/node/src/__tests__/__snapshots__/xkeys.spec.ts.snap @@ -0,0 +1,12 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Unit tests SpaceMouse methods 1`] = ` +Object { + "interface": 50726, + "name": "SpaceNavigator", + "productId": 1133, + "vendorId": 1133, +} +`; + +exports[`Unit tests SpaceMouse methods 2`] = `Array []`; diff --git a/packages/node/src/__tests__/lib.ts b/packages/node/src/__tests__/lib.ts index 5a958c4..b71e531 100644 --- a/packages/node/src/__tests__/lib.ts +++ b/packages/node/src/__tests__/lib.ts @@ -7,7 +7,6 @@ export function getSentData() { return sentData } -export function receiveData(hid: HID.HID, message: number[]) {} export function handleSpaceMouseMessages(hid: HID.HID, message: number[]) { // Replies to a few of the messages that are sent to the SpaceMouse diff --git a/packages/node/src/__tests__/xkeys.spec.ts b/packages/node/src/__tests__/xkeys.spec.ts index 6220db9..c3d0f6a 100644 --- a/packages/node/src/__tests__/xkeys.spec.ts +++ b/packages/node/src/__tests__/xkeys.spec.ts @@ -1,6 +1,6 @@ import * as HID from 'node-hid' import * as HIDMock from '../__mocks__/node-hid' -import { PRODUCTS, Rotation, setupSpaceMouse, SpaceMouse } from '../' +import { PRODUCTS, Rotation, setupSpaceMouse } from '../' import { getSentData, handleSpaceMouseMessages, resetSentData } from './lib' import { getMockHIDDevices } from '../__mocks__/node-hid' import { Translation } from '@spacemouse-lib/core' @@ -12,6 +12,7 @@ describe('Unit tests', () => { const hidDevice = { vendorId: PRODUCTS['SpaceNavigator'].vendorId, productId: PRODUCTS['SpaceNavigator'].productId, + interface: 0, path: 'mockPath', } as HID.Device @@ -58,7 +59,7 @@ describe('Unit tests', () => { expect(onError).toHaveBeenCalledTimes(0) expect(rotate).toEqual({ pitch: 50, - roll: -255, + roll: -1, yaw: 139, }) // Translation: @@ -67,7 +68,7 @@ describe('Unit tests', () => { expect(translate).toEqual({ x: 27, y: 21, - z: 94, + z: 350, }) }) }) diff --git a/packages/node/src/methods.ts b/packages/node/src/methods.ts index 4bfd9e8..95a1f2a 100644 --- a/packages/node/src/methods.ts +++ b/packages/node/src/methods.ts @@ -67,7 +67,7 @@ export async function setupSpaceMouse(devicePathOrHIDDevice?: HID.Device | HID.H device = new HID.HID(devicePath) // deviceInfo is set later } else { - throw new Error('setupSpaceMouse: invalid arguments') + throw new Error(`setupSpaceMouse: invalid arguments: ${JSON.stringify(devicePathOrHIDDevice)}`) } if (!deviceInfo) { diff --git a/packages/webhid-demo/src/app.ts b/packages/webhid-demo/src/app.ts index 83a66e7..e889874 100644 --- a/packages/webhid-demo/src/app.ts +++ b/packages/webhid-demo/src/app.ts @@ -1,4 +1,4 @@ -import { getOpenedSpaceMice, requestSpaceMice, setupSpaceMouse, SpaceMouse } from 'spaceMouse-webhid' +import { getOpenedSpaceMice, requestSpaceMice, setupSpaceMouse, SpaceMouse } from 'spacemouse-webhid' function appendLog(str: string) { const logElm = document.getElementById('log')