@scrabble-solver/scrabble-solver 2.9.1 → 2.9.2

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2021 Kamil Mielnik <kamil.adam.mielnik@gmail.com>
+Copyright (c) 2022 Kamil Mielnik <kamil@kamilmielnik.com>
 
 Attribution-NonCommercial-NoDerivatives 4.0 International
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/scrabble-solver",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "description": "Scrabble Solver 2 - App",
   "engines": {
     "node": ">=16"
@@ -11,8 +11,8 @@
   },
   "author": {
     "name": "Kamil Mielnik",
-    "email": "kamil.adam.mielnik@gmail.com",
-    "url": "https://kamilmielnik.com/"
+    "email": "kamil@kamilmielnik.com",
+    "url": "https://kamilmielnik.com"
   },
   "license": "CC BY-NC-ND 4.0",
   "bugs": {
@@ -31,13 +31,13 @@
     "@kamilmielnik/trie": "^2.0.1",
     "@popperjs/core": "^2.11.6",
     "@reduxjs/toolkit": "^1.8.6",
-    "@scrabble-solver/configs": "^2.9.1",
-    "@scrabble-solver/constants": "^2.9.1",
-    "@scrabble-solver/dictionaries": "^2.9.1",
-    "@scrabble-solver/logger": "^2.9.1",
-    "@scrabble-solver/solver": "^2.9.1",
-    "@scrabble-solver/types": "^2.9.1",
-    "@scrabble-solver/word-definitions": "^2.9.1",
+    "@scrabble-solver/configs": "^2.9.2",
+    "@scrabble-solver/constants": "^2.9.2",
+    "@scrabble-solver/dictionaries": "^2.9.2",
+    "@scrabble-solver/logger": "^2.9.2",
+    "@scrabble-solver/solver": "^2.9.2",
+    "@scrabble-solver/types": "^2.9.2",
+    "@scrabble-solver/word-definitions": "^2.9.2",
     "classnames": "^2.3.2",
     "next": "^12.3.1",
     "normalize.css": "^8.0.1",
@@ -74,5 +74,5 @@
     "sass": "^1.55.0",
     "workbox-webpack-plugin": "^6.5.4"
   },
-  "gitHead": "4849b4d123131fe043174f000c523868f3bd68c5"
+  "gitHead": "f50d782088cb89544f0c2c504f31fca81a6ff409"
 }

package/src/components/Dictionary/Dictionary.module.scss

@@ -53,6 +53,7 @@
 
 .definition {
   margin-bottom: var(--spacing--s);
+  white-space: pre-wrap;
 
   &:last-child {
     margin-bottom: 0;

package/src/components/Dictionary/Dictionary.tsx

@@ -31,7 +31,7 @@ const Dictionary: FunctionComponent<Props> = ({ className }) => {
         </EmptyState>
       )}
 
-      {results.map(({ definitions, isAllowed, word }) => (
+      {results.map(({ definitions, exists, isAllowed, word }) => (
         <div
           className={classNames(styles.result, {
             [styles.isAllowed]: isAllowed === true,
@@ -51,7 +51,12 @@ const Dictionary: FunctionComponent<Props> = ({ className }) => {
 
               {isAllowed === true && (
                 <>
-                  {definitions.length === 0 && <div>{translate('dictionary.empty-state.no-definitions')}</div>}
+                  {definitions.length === 0 && (
+                    <>
+                      {exists && <div>{translate('dictionary.empty-state.no-definitions')}</div>}
+                      {!exists && <div>{translate('dictionary.empty-state.no-results')}</div>}
+                    </>
+                  )}
 
                   {definitions.length > 0 && (
                     <ul className={styles.definitions}>

package/src/i18n/en.json

@@ -15,9 +15,9 @@
   "common.word": "Word",
   "common.words": "Words",
   "dictionary.empty-state.no-definitions": "Word exists in the dictionary but it does not have a definition.",
-  "dictionary.empty-state.no-results": "Unable to find word definition in dictionary.",
+  "dictionary.empty-state.no-results": "Unable to find word definition in the dictionary.",
   "dictionary.empty-state.not-allowed": "This word is not allowed.",
-  "dictionary.empty-state.uninitialized": "Dictionary definition of the last highlighted word will be shown here.",
+  "dictionary.empty-state.uninitialized": "Dictionary definition of the most recently highlighted word will be shown here.",
   "dictionary.input.placeholder": "Search dictionary...",
   "empty-state.error": "Error",
   "empty-state.info": "Info",

package/src/pages/api/dictionary/[locale]/[word].ts

@@ -1,4 +1,5 @@
 import { scrabble } from '@scrabble-solver/configs';
+import { dictionaries } from '@scrabble-solver/dictionaries';
 import logger from '@scrabble-solver/logger';
 import { isLocale, Locale } from '@scrabble-solver/types';
 import { getWordDefinition } from '@scrabble-solver/word-definitions';
@@ -27,7 +28,8 @@ const dictionary = async (request: NextApiRequest, response: NextApiResponse): P
       },
     });
 
-    const results = await Promise.all(words.map((word) => getWordDefinition(locale, word)));
+    const trie = await dictionaries.get(locale);
+    const results = await Promise.all(words.map((word) => getWordDefinition(locale, word, trie.has(word))));
     response.status(200).send(results.map((result) => result.toJson()));
   } catch (error) {
     const message = error instanceof Error ? error.message : 'Unknown error';