scrabble-solver 2.13.13 → 2.14.0

package/cypress/e2e/app.spec.cy.ts

@@ -13,95 +13,106 @@ import {
   getTooltip,
   solve,
   typeRack,
+  unregisterServiceWorkers,
   visitIndex,
 } from '../support';
 
-it('has title', () => {
-  visitIndex();
-
-  cy.title().should('equal', 'Scrabble Solver 2 by Kamil Mielnik');
-});
+describe('app', () => {
+  beforeEach(async () => {
+    await unregisterServiceWorkers();
+  });
 
-it('has default setting values', () => {
-  visitIndex();
-  getSettingsButton().realClick();
+  afterEach(() => {
+    cy.clearLocalStorage();
+  });
 
-  getSettingOption('Game', 'Scrabble').should('be.checked');
-  getSettingOption('Language', 'English (US)').should('be.checked');
-  getSettingOption('Coordinates', 'Hidden').should('be.checked');
-  getSettingOption('Input mode', 'Keyboard').should('be.checked');
-  getSettingOption('Group remaining tiles', 'Do not group').should('be.checked');
-});
+  it('has title', () => {
+    visitIndex();
 
-describe('full app test', () => {
-  beforeEach(() => {
-    cy.intercept('/api/solve').as('solve');
-    cy.intercept('/api/dictionary/**/*').as('dictionary');
+    cy.title().should('equal', 'Scrabble Solver 2 by Kamil Mielnik');
   });
 
-  it('Scrabble - Polish', () => {
+  it('has default setting values', () => {
     visitIndex();
     getSettingsButton().realClick();
-    getSettingOption('Language', 'Polski').check();
-    getSettingOption('Współrzędne', 'Oryginalne').check();
-    closeModal();
-    typeRack('abł');
-    solve();
 
-    assertResult(0, 'bał', 14);
-    getResult(0).realHover();
-    getLoading().should('be.visible');
-    cy.wait('@dictionary');
-    getRackTile(0).parent().should('have.attr', 'role', 'mark');
-    getRackTile(1).parent().should('have.attr', 'role', 'mark');
-    getRackTile(2).parent().should('have.attr', 'role', 'mark');
-    getBoardTile(5, 7).should('have.value', 'b');
-    getBoardTile(6, 7).should('have.value', 'a');
-    getBoardTile(7, 7).should('have.value', 'ł');
-    getBoardTile(5, 7).parent().should('have.attr', 'role', 'mark');
-    getBoardTile(6, 7).parent().should('have.attr', 'role', 'mark');
-    getBoardTile(7, 7).parent().should('have.attr', 'role', 'mark');
-    getDictionaryInput().should('have.value', 'bał');
-    getLoading().should('not.exist');
-    getDictionaryTitles().should('have.length', 1).and('have.text', 'bał');
-    getDictionary()
-      .should('include.text', 'bać się')
-      .and('include.text', 'odczuwać lęk, strach')
-      .and('include.text', 'być niespokojnym o kogoś lub o coś')
-      .and('include.text', 'nie śmieć, nie odważać się na coś');
+    getSettingOption('Game', 'Scrabble').should('be.checked');
+    getSettingOption('Language', 'English (US)').should('be.checked');
+    getSettingOption('Coordinates', 'Hidden').should('be.checked');
+    getSettingOption('Input mode', 'Keyboard').should('be.checked');
+    getSettingOption('Group remaining tiles', 'Do not group').should('be.checked');
+  });
+
+  describe('full app test', () => {
+    beforeEach(() => {
+      cy.intercept('/api/solve').as('solve');
+      cy.intercept('/api/dictionary/**/*').as('dictionary');
+    });
+
+    it('Scrabble - Polish', () => {
+      visitIndex();
+      getSettingsButton().realClick();
+      getSettingOption('Language', 'Polski').check();
+      getSettingOption('Współrzędne', 'Oryginalne').check();
+      closeModal();
+      typeRack('abł');
+      solve();
+
+      assertResult(0, 'bał', 14);
+      getResult(0).realHover();
+      getLoading().should('be.visible');
+      cy.wait('@dictionary');
+      getRackTile(0).parent().should('have.attr', 'role', 'mark');
+      getRackTile(1).parent().should('have.attr', 'role', 'mark');
+      getRackTile(2).parent().should('have.attr', 'role', 'mark');
+      getBoardTile(5, 7).should('have.value', 'b');
+      getBoardTile(6, 7).should('have.value', 'a');
+      getBoardTile(7, 7).should('have.value', 'ł');
+      getBoardTile(5, 7).parent().should('have.attr', 'role', 'mark');
+      getBoardTile(6, 7).parent().should('have.attr', 'role', 'mark');
+      getBoardTile(7, 7).parent().should('have.attr', 'role', 'mark');
+      getDictionaryInput().should('have.value', 'bał');
+      getLoading().should('not.exist');
+      getDictionaryTitles().should('have.length', 1).and('have.text', 'bał');
+      getDictionary()
+        .should('include.text', 'bać się')
+        .and('include.text', 'odczuwać lęk, strach')
+        .and('include.text', 'być niespokojnym o kogoś lub o coś')
+        .and('include.text', 'nie śmieć, nie odważać się na coś');
 
-    cy.findByLabelText('Punkty').realClick();
-    getTooltip().should('be.visible').and('have.text', 'Punkty');
-    assertResult(0, 'ba', 8);
-    getResult(0).realHover();
-    getRackTile(0).parent().should('have.attr', 'role', 'mark');
-    getRackTile(1).parent().should('have.attr', 'role', 'mark');
-    getRackTile(2).parent().should('not.have.attr', 'role', 'mark');
-    getBoardTile(5, 7).should('not.have.value');
-    getBoardTile(6, 7).should('have.value', 'b');
-    getBoardTile(7, 7).should('have.value', 'a');
-    getBoardTile(5, 7).parent().should('not.have.attr', 'role', 'mark');
-    getBoardTile(6, 7).parent().should('have.attr', 'role', 'mark');
-    getBoardTile(7, 7).parent().should('have.attr', 'role', 'mark');
-    getDictionaryInput().should('have.value', 'ba');
-    getLoading().should('be.visible');
-    cy.wait('@dictionary');
-    getLoading().should('not.exist');
-    getDictionaryTitles().should('have.length', 1).and('have.text', 'ba');
-    getDictionary()
-      .should('include.text', 'wykrzyknik, który wyraża głównie podziw, zdziwienie')
-      .and('include.text', 'w wierzeniach staroegipskich: dusza ludzka ginąca wraz z ciałem');
+      cy.findByLabelText('Punkty').realClick();
+      getTooltip().should('be.visible').and('have.text', 'Punkty');
+      assertResult(0, 'ba', 8);
+      getResult(0).realHover();
+      getRackTile(0).parent().should('have.attr', 'role', 'mark');
+      getRackTile(1).parent().should('have.attr', 'role', 'mark');
+      getRackTile(2).parent().should('not.have.attr', 'role', 'mark');
+      getBoardTile(5, 7).should('not.have.value');
+      getBoardTile(6, 7).should('have.value', 'b');
+      getBoardTile(7, 7).should('have.value', 'a');
+      getBoardTile(5, 7).parent().should('not.have.attr', 'role', 'mark');
+      getBoardTile(6, 7).parent().should('have.attr', 'role', 'mark');
+      getBoardTile(7, 7).parent().should('have.attr', 'role', 'mark');
+      getDictionaryInput().should('have.value', 'ba');
+      getLoading().should('be.visible');
+      cy.wait('@dictionary');
+      getLoading().should('not.exist');
+      getDictionaryTitles().should('have.length', 1).and('have.text', 'ba');
+      getDictionary()
+        .should('include.text', 'wykrzyknik, który wyraża głównie podziw, zdziwienie')
+        .and('include.text', 'w wierzeniach staroegipskich: dusza ludzka ginąca wraz z ciałem');
 
-    getResult(0).realClick();
-    getRackTile(0).parent().should('not.have.attr', 'role', 'mark');
-    getRackTile(1).parent().should('not.have.attr', 'role', 'mark');
-    getRackTile(2).parent().should('not.have.attr', 'role', 'mark');
-    getRackTile(0).should('not.have.value');
-    getRackTile(1).should('not.have.value');
-    getRackTile(2).should('have.value', 'ł');
-    getBoardTile(6, 7).should('have.value', 'b');
-    getBoardTile(7, 7).should('have.value', 'a');
+      getResult(0).realClick();
+      getRackTile(0).parent().should('not.have.attr', 'role', 'mark');
+      getRackTile(1).parent().should('not.have.attr', 'role', 'mark');
+      getRackTile(2).parent().should('not.have.attr', 'role', 'mark');
+      getRackTile(0).should('not.have.value');
+      getRackTile(1).should('not.have.value');
+      getRackTile(2).should('have.value', 'ł');
+      getBoardTile(6, 7).should('have.value', 'b');
+      getBoardTile(7, 7).should('have.value', 'a');
 
-    cy.findByLabelText('Rozwiąż').should('be.visible').and('be.enabled');
+      cy.findByLabelText('Rozwiąż').should('be.visible').and('be.enabled');
+    });
   });
 });

package/cypress/e2e/bugs/112-character-bonus.ts

@@ -0,0 +1,40 @@
+import {
+  assertResult,
+  closeModal,
+  getSettingOption,
+  getSettingsButton,
+  solve,
+  typeRack,
+  unregisterServiceWorkers,
+  visitIndex,
+} from '../../support';
+
+/*
+ * @see https://github.com/kamilmielnik/scrabble-solver/issues/112
+ */
+describe('#112 - Scrabble - Character bonus not applied', () => {
+  beforeEach(async () => {
+    await unregisterServiceWorkers();
+  });
+
+  afterEach(() => {
+    cy.clearLocalStorage();
+  });
+
+  it('correctly shows points for a result which gets a character bonus', () => {
+    visitIndex();
+
+    getSettingsButton().realClick();
+    getSettingOption('Language', 'Français').check();
+    closeModal();
+    typeRack('jours');
+    solve();
+
+    assertResult(0, 'jours', 40);
+    assertResult(1, 'jours', 40);
+    assertResult(2, 'jours', 26);
+    assertResult(3, 'jours', 26);
+    assertResult(4, 'jours', 24);
+    assertResult(5, 'jours', 24);
+  });
+});

package/cypress/e2e/bugs/129-esc-sidebar.ts

@@ -0,0 +1,23 @@
+import { getModal, getSettingsButton, typeRack, unregisterServiceWorkers, visitIndex } from '../../support';
+
+/*
+ * @see https://github.com/kamilmielnik/scrabble-solver/issues/129
+ */
+describe('#129 - Esc does not close the sidebar when letters input is focused', () => {
+  beforeEach(async () => {
+    await unregisterServiceWorkers();
+  });
+
+  afterEach(() => {
+    cy.clearLocalStorage();
+  });
+
+  it('Esc key closes the sidebar when rack is focused', () => {
+    visitIndex();
+    getSettingsButton().realClick();
+    typeRack('a');
+    cy.realPress('Escape');
+
+    getModal().should('not.exist');
+  });
+});

package/cypress/e2e/bugs/2-q-tile-in-english.ts

@@ -0,0 +1,33 @@
+import {
+  assertResult,
+  getResults,
+  solve,
+  typeBoard,
+  typeRack,
+  unregisterServiceWorkers,
+  visitIndex,
+} from '../../support';
+
+/*
+ * @see https://github.com/kamilmielnik/scrabble-solver/issues/2
+ */
+describe('#2 - "Q" tile does not work', () => {
+  beforeEach(async () => {
+    await unregisterServiceWorkers();
+  });
+
+  afterEach(() => {
+    cy.clearLocalStorage();
+  });
+
+  it('accepts "Q" tile in English', () => {
+    visitIndex();
+    typeBoard('i', 'horizontal', 7, 7);
+    typeRack('q');
+    solve();
+
+    getResults().should('have.length', 2);
+    assertResult(0, 'qi', 11);
+    assertResult(1, 'qi', 11);
+  });
+});

package/cypress/e2e/bugs/3-x-tile-in-polish.ts

@@ -0,0 +1,33 @@
+import {
+  closeModal,
+  getSettingOption,
+  getSettingsButton,
+  typeBoard,
+  typeRack,
+  unregisterServiceWorkers,
+  visitIndex,
+} from '../../support';
+
+/*
+ * @see https://github.com/kamilmielnik/scrabble-solver/issues/3
+ */
+describe('#3 - "X" tile is allowed in Polish', () => {
+  beforeEach(async () => {
+    await unregisterServiceWorkers();
+  });
+
+  afterEach(() => {
+    cy.clearLocalStorage();
+  });
+
+  it('does not accept "X" tile in Polish', () => {
+    visitIndex();
+    getSettingsButton().realClick();
+    getSettingOption('Language', 'Polski').check();
+    closeModal();
+    typeBoard('x', 'horizontal', 7, 7);
+    typeRack('x');
+
+    cy.findByText('x').should('not.exist');
+  });
+});

package/cypress/e2e/bugs/30-click-inside-radio-icon.ts

@@ -0,0 +1,26 @@
+import { getSettingOption, getSettingsButton, unregisterServiceWorkers, visitIndex } from '../../support';
+
+/*
+ * @see https://github.com/kamilmielnik/scrabble-solver/issues/30
+ */
+describe('#30 - Clicking inside an icon of non-first unchecked radio button does not select that option', () => {
+  beforeEach(async () => {
+    await unregisterServiceWorkers();
+  });
+
+  afterEach(() => {
+    cy.clearLocalStorage();
+  });
+
+  it('Clicking inside an icon of first unchecked radio button selects it', () => {
+    visitIndex();
+    getSettingsButton().realClick();
+    getSettingOption('Language', 'English (GB)').click();
+    getSettingOption('Language', 'English (US)') // first unchecked radio button
+      .parent('label')
+      .findAllByRole('img', { hidden: true })
+      .first()
+      .realHover({ position: 'center' })
+      .realClick({ position: 'center' });
+  });
+});

package/cypress/e2e/bugs/333-disabled-radio-cursor.ts

@@ -0,0 +1,24 @@
+import { getSettingOption, getSettingsButton, unregisterServiceWorkers, visitIndex } from '../../support';
+
+/*
+ * @see https://github.com/kamilmielnik/scrabble-solver/issues/333
+ */
+describe('#333 - Disabled radio button has cursor: pointer', () => {
+  beforeEach(async () => {
+    await unregisterServiceWorkers();
+  });
+
+  afterEach(() => {
+    cy.clearLocalStorage();
+  });
+
+  it('Disabled radio button has cursor: not-allowed', () => {
+    visitIndex();
+    getSettingsButton().realClick();
+    getSettingOption('Language', 'Polski').check();
+    getSettingOption('Gra', 'Scrabble').scrollIntoView();
+
+    getSettingOption('Gra', 'Super Scrabble').should('be.disabled');
+    getSettingOption('Gra', 'Super Scrabble').should('have.css', 'cursor', 'not-allowed');
+  });
+});

package/cypress/e2e/bugs/342-results-sorting.ts

@@ -0,0 +1,48 @@
+import {
+  assertResult,
+  closeModal,
+  getResult,
+  getResultsFilterInput,
+  getSettingOption,
+  getSettingsButton,
+  solve,
+  typeBoard,
+  typeRack,
+  unregisterServiceWorkers,
+  visitIndex,
+} from '../../support';
+
+/*
+ * @see https://github.com/kamilmielnik/scrabble-solver/issues/342
+ */
+describe('#342 - Incorrect sorting when filtering', () => {
+  beforeEach(async () => {
+    await unregisterServiceWorkers();
+  });
+
+  afterEach(() => {
+    cy.clearLocalStorage();
+  });
+
+  it('correctly sorts valid results first when text filter is active', () => {
+    visitIndex();
+    getSettingsButton().realClick();
+    getSettingOption('Language', 'Polski').check();
+    closeModal();
+    typeBoard('bopie', 'horizontal', 6, 3);
+    typeBoard('apu', 'vertical', 8, 4);
+    typeBoard('o', 'vertical', 10, 4);
+    typeRack('oe');
+    solve();
+    getResultsFilterInput().type('p');
+
+    assertResult(0, 'po', 5);
+    assertResult(1, 'pe', 5);
+    assertResult(2, 'op', 3);
+    assertResult(3, 'eo', 6);
+    getResult(0).should('not.have.attr', 'aria-hidden');
+    getResult(1).should('not.have.attr', 'aria-hidden');
+    getResult(2).should('not.have.attr', 'aria-hidden');
+    getResult(3).should('have.attr', 'aria-hidden', 'true');
+  });
+});

package/cypress/e2e/bugs/348-results-word-padding.ts

@@ -0,0 +1,74 @@
+import {
+  closeModal,
+  getResult,
+  getSettingOption,
+  getSettingsButton,
+  solve,
+  typeRack,
+  unregisterServiceWorkers,
+  visitIndex,
+} from '../../support';
+
+/*
+ * @see https://github.com/kamilmielnik/scrabble-solver/issues/348
+ */
+describe('#348 - Missing result word padding when coordinates are not shown', () => {
+  beforeEach(async () => {
+    await unregisterServiceWorkers();
+  });
+
+  afterEach(() => {
+    cy.clearLocalStorage();
+  });
+
+  it('sets proper padding on result cells depending on coordinates setting (LTR language)', () => {
+    visitIndex();
+    typeRack('ab');
+    solve();
+
+    getResult(0).then(([$result]) => {
+      const $span = $result.children[0];
+      const wordCell = $span.children[0];
+
+      expect(window.getComputedStyle(wordCell).paddingLeft).to.equal('15px');
+    });
+
+    getSettingsButton().realClick();
+    getSettingOption('Coordinates', 'Original').check();
+    closeModal();
+
+    getResult(0).then(([$result]) => {
+      const $span = $result.children[0];
+      const wordCell = $span.children[1];
+
+      expect(window.getComputedStyle(wordCell).paddingLeft).to.equal('15px');
+    });
+  });
+
+  it('sets proper padding on result cells depending on coordinates setting (RTL language)', () => {
+    visitIndex();
+    getSettingsButton().realClick();
+    getSettingOption('Language', 'فارسی').check();
+    closeModal();
+    typeRack('فا');
+    solve();
+
+    getResult(0).then(([$result]) => {
+      const $span = $result.children[0];
+      const wordCell = $span.children[0];
+
+      expect(window.getComputedStyle(wordCell).paddingRight).to.equal('15px');
+    });
+
+    getSettingsButton().realClick();
+    getSettingOption('مختصات', 'إبداعي').check();
+    closeModal();
+
+    getResult(0).then(([$result]) => {
+      const $span = $result.children[0];
+      const wordCell = $span.children[1];
+
+      expect(window.getComputedStyle(wordCell).paddingRight).to.equal('15px');
+    });
+  });
+});

package/cypress/e2e/bugs.spec.cy.ts

@@ -0,0 +1,8 @@
+import './bugs/2-q-tile-in-english';
+import './bugs/3-x-tile-in-polish';
+import './bugs/112-character-bonus';
+import './bugs/129-esc-sidebar';
+import './bugs/30-click-inside-radio-icon';
+import './bugs/333-disabled-radio-cursor';
+import './bugs/342-results-sorting';
+import './bugs/348-results-word-padding';

package/lerna.json

@@ -6,5 +6,5 @@
     "access": "public"
   },
   "tagVersionPrefix": "",
-  "version": "2.13.13"
+  "version": "2.14.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scrabble-solver",
-  "version": "2.13.13",
+  "version": "2.14.0",
   "description": "Scrabble Solver 2 - Free, open-source, cross-platform, and multi-language analysis tool for Scrabble, Super Scrabble & Literaki. Quickly find top scoring words using given board & tiles.",
   "keywords": [
     "Scrabble",
@@ -84,36 +84,36 @@
     "packages/scrabble-solver"
   ],
   "dependencies": {
-    "@scrabble-solver/scrabble-solver": "^2.13.13",
+    "@scrabble-solver/scrabble-solver": "^2.14.0",
     "concurrently": "^8.2.2",
     "open-cli": "^8.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.24.8",
+    "@babel/core": "^7.25.2",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/preset-env": "^7.24.8",
+    "@babel/preset-env": "^7.25.3",
     "@testing-library/cypress": "^10.0.2",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.14.10",
     "@typescript-eslint/eslint-plugin": "^7.16.0",
     "@typescript-eslint/parser": "^7.16.0",
-    "cypress": "^13.13.0",
+    "cypress": "^13.13.2",
     "cypress-real-events": "^1.13.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-node": "^0.3.9",
-    "eslint-plugin-cypress": "^3.3.0",
+    "eslint-plugin-cypress": "^3.4.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-mocha": "^10.4.3",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-react": "^7.34.3",
+    "eslint-plugin-mocha": "^10.5.0",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-react": "^7.35.0",
     "eslint-plugin-react-hooks": "^4.6.2",
     "jest": "29.7.0",
-    "lerna": "^8.1.6",
-    "np": "^10.0.6",
-    "prettier": "^3.3.2",
+    "lerna": "^8.1.7",
+    "np": "^10.0.7",
+    "prettier": "^3.3.3",
     "rimraf": "^6.0.1",
-    "ts-jest": "^29.2.2",
-    "typescript": "^5.5.3"
+    "ts-jest": "^29.2.4",
+    "typescript": "^5.5.4"
   }
 }

package/packages/configs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/configs",
-  "version": "2.13.13",
+  "version": "2.14.0",
   "description": "Scrabble Solver 2 - Configs",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -23,8 +23,8 @@
     "clean": "rimraf build/"
   },
   "dependencies": {
-    "@scrabble-solver/constants": "^2.13.13",
-    "@scrabble-solver/types": "^2.13.13"
+    "@scrabble-solver/constants": "^2.14.0",
+    "@scrabble-solver/types": "^2.14.0"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

package/packages/constants/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/constants",
-  "version": "2.13.13",
+  "version": "2.14.0",
   "description": "Scrabble Solver 2 - Constants",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/packages/dictionaries/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/dictionaries",
-  "version": "2.13.13",
+  "version": "2.14.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/dictionaries",
-      "version": "2.13.13",
+      "version": "2.14.0",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "@kamilmielnik/trie": "^3.0.0"

package/packages/dictionaries/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/dictionaries",
-  "version": "2.13.13",
+  "version": "2.14.0",
   "description": "Scrabble Solver 2 - Dictionaries",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -30,9 +30,9 @@
   },
   "dependencies": {
     "@kamilmielnik/trie": "^3.0.0",
-    "@scrabble-solver/logger": "^2.13.13",
-    "@scrabble-solver/types": "^2.13.13",
-    "@scrabble-solver/word-lists": "^2.13.13"
+    "@scrabble-solver/logger": "^2.14.0",
+    "@scrabble-solver/types": "^2.14.0",
+    "@scrabble-solver/word-lists": "^2.14.0"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

package/packages/logger/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/logger",
-  "version": "2.13.13",
+  "version": "2.14.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/logger",
-      "version": "2.13.13",
+      "version": "2.14.0",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "winston": "^3.13.1"