scrabble-solver 2.18.3 → 2.18.5

package/packages/scrabble-solver/.next/trace-build

@@ -1 +1 @@
-[{"name":"run-typescript","duration":160243,"timestamp":6454978890,"id":13,"parentId":1,"tags":{},"startTime":1787605800486,"traceId":"f92ac34b43b8b857"},{"name":"run-webpack","duration":5760453,"timestamp":6455141586,"id":15,"parentId":1,"tags":{},"startTime":1787605800649,"traceId":"f92ac34b43b8b857"},{"name":"static-check","duration":171530,"timestamp":6460973542,"id":2106,"parentId":1,"tags":{},"startTime":1787605806481,"traceId":"f92ac34b43b8b857"},{"name":"static-generation","duration":249530,"timestamp":6461155014,"id":2124,"parentId":1,"tags":{},"startTime":1787605806662,"traceId":"f92ac34b43b8b857"},{"name":"collect-build-traces","duration":4270405,"timestamp":6461145430,"id":2121,"parentId":1,"tags":{},"startTime":1787605806652,"traceId":"f92ac34b43b8b857"},{"name":"telemetry-flush","duration":19,"timestamp":6465417121,"id":2131,"parentId":1,"tags":{},"startTime":1787605810924,"traceId":"f92ac34b43b8b857"},{"name":"next-build","duration":10674125,"timestamp":6454743019,"id":1,"tags":{"buildMode":"default","version":"16.3.2","bundler":"webpack","has-custom-webpack-config":"true","use-build-worker":"false"},"startTime":1787605800250,"traceId":"f92ac34b43b8b857"}]
+[{"name":"run-typescript","duration":153375,"timestamp":751401682,"id":13,"parentId":1,"tags":{},"startTime":1791233328477,"traceId":"9c4936d30bc5d746"},{"name":"run-webpack","duration":5637250,"timestamp":751557904,"id":15,"parentId":1,"tags":{},"startTime":1791233328634,"traceId":"9c4936d30bc5d746"},{"name":"static-check","duration":170332,"timestamp":757256154,"id":2114,"parentId":1,"tags":{},"startTime":1791233334332,"traceId":"9c4936d30bc5d746"},{"name":"static-generation","duration":247370,"timestamp":757436827,"id":2132,"parentId":1,"tags":{},"startTime":1791233334512,"traceId":"9c4936d30bc5d746"},{"name":"collect-build-traces","duration":4178550,"timestamp":757426921,"id":2129,"parentId":1,"tags":{},"startTime":1791233334503,"traceId":"9c4936d30bc5d746"},{"name":"telemetry-flush","duration":22,"timestamp":761606654,"id":2139,"parentId":1,"tags":{},"startTime":1791233338682,"traceId":"9c4936d30bc5d746"},{"name":"next-build","duration":10437838,"timestamp":751168842,"id":1,"tags":{"buildMode":"default","version":"16.3.8","bundler":"webpack","has-custom-webpack-config":"true","use-build-worker":"false"},"startTime":1791233328244,"traceId":"9c4936d30bc5d746"}]

package/packages/scrabble-solver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/scrabble-solver",
-  "version": "2.18.3",
+  "version": "2.18.5",
   "description": "Scrabble Solver web app: free word finder and board solver for Scrabble, Super Scrabble, Literaki, and more.",
   "keywords": [
     "scrabble",
@@ -55,28 +55,28 @@
   },
   "dependencies": {
     "@floating-ui/react": "^0.27.20",
-    "@kamilmielnik/gaddag": "^2.0.0",
-    "@reduxjs/toolkit": "^2.12.0",
-    "@scrabble-solver/configs": "^2.18.3",
-    "@scrabble-solver/constants": "^2.18.3",
-    "@scrabble-solver/dictionaries": "^2.18.3",
-    "@scrabble-solver/logger": "^2.18.3",
-    "@scrabble-solver/solver": "^2.18.3",
-    "@scrabble-solver/types": "^2.18.3",
-    "@scrabble-solver/word-definitions": "^2.18.3",
+    "@kamilmielnik/gaddag": "^3.0.0",
+    "@reduxjs/toolkit": "^2.13.0",
+    "@scrabble-solver/configs": "^2.18.5",
+    "@scrabble-solver/constants": "^2.18.5",
+    "@scrabble-solver/dictionaries": "^2.18.5",
+    "@scrabble-solver/logger": "^2.18.5",
+    "@scrabble-solver/solver": "^2.18.5",
+    "@scrabble-solver/types": "^2.18.5",
+    "@scrabble-solver/word-definitions": "^2.18.5",
     "classnames": "^2.5.1",
     "env-cmd": "^11.0.0",
     "include-media": "^2.0.0",
     "include-media-query-builder": "^1.1.0",
-    "next": "^16.3.2",
+    "next": "^16.3.8",
     "normalize.css": "^8.0.1",
-    "react": "^19.2.8",
+    "react": "^19.3.0",
     "react-cool-onclickoutside": "^1.7.0",
-    "react-dom": "^19.2.8",
+    "react-dom": "^19.3.0",
     "react-highlight-words": "^0.21.0",
     "react-modal": "^3.16.3",
     "react-redux": "^9.3.0",
-    "react-window": "^2.3.0",
+    "react-window": "^2.3.3",
     "redux-saga": "^1.5.1",
     "store2": "^2.14.4",
     "use-debounce": "^10.1.1",
@@ -88,13 +88,13 @@
   },
   "devDependencies": {
     "@svgr/webpack": "^8.1.0",
-    "@types/react": "^19.2.18",
-    "@types/react-dom": "^19.2.4",
+    "@types/react": "^19.3.0",
+    "@types/react-dom": "^19.3.0",
     "@types/react-highlight-words": "^0.20.1",
     "@types/react-modal": "^3.16.3",
     "@types/react-portal": "^4.0.7",
-    "postcss": "^8.5.26",
-    "sass": "^1.103.1"
+    "postcss": "^8.5.29",
+    "sass": "^1.105.1"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

package/packages/scrabble-solver/public/service-worker.js

@@ -1,2 +1,2 @@
 (()=>{"use strict";let e,t,s;var a,r={303:()=>{try{self["workbox:strategies:7.4.0"]&&_()}catch(e){}},448:()=>{try{self["workbox:routing:7.4.0"]&&_()}catch(e){}},693:()=>{try{self["workbox:core:7.4.0"]&&_()}catch(e){}},802:()=>{try{self["workbox:precaching:7.4.0"]&&_()}catch(e){}}},i={};function n(e){var t=i[e];if(void 0!==t)return t.exports;var s=i[e]={exports:{}},a=!0;try{r[e](s,s.exports,n),a=!1}finally{a&&delete i[e]}return s.exports}n(693);class l extends Error{constructor(e,t){super(((e,...t)=>{let s=e;return t.length>0&&(s+=` :: ${JSON.stringify(t)}`),s})(e,t)),this.name=e,this.details=t}}let c={googleAnalytics:"googleAnalytics",precache:"precache-v2",prefix:"workbox",runtime:"runtime",suffix:"u">typeof registration?registration.scope:""},h=e=>[c.prefix,e,c.suffix].filter(e=>e&&e.length>0).join("-"),o=e=>e||h(c.precache);function u(e,t){let s=t();return e.waitUntil(s),s}n(802);class f{constructor(){this.updatedURLs=[],this.notUpdatedURLs=[],this.handlerWillStart=async({request:e,state:t})=>{t&&(t.originalRequest=e)},this.cachedResponseWillBeUsed=async({event:e,state:t,cachedResponse:s})=>{if("install"===e.type&&t&&t.originalRequest&&t.originalRequest instanceof Request){let e=t.originalRequest.url;s?this.notUpdatedURLs.push(e):this.updatedURLs.push(e)}return s}}}class d{constructor({precacheController:e}){this.cacheKeyWillBeUsed=async({request:e,params:t})=>{let s=(null==t?void 0:t.cacheKey)||this._precacheController.getCacheKeyForURL(e.url);return s?new Request(s,{headers:e.headers}):e},this._precacheController=e}}async function p(t,s){let a=null;if(t.url&&(a=new URL(t.url).origin),a!==self.location.origin)throw new l("cross-origin-copy-response",{origin:a});let r=t.clone(),i={headers:new Headers(r.headers),status:r.status,statusText:r.statusText},n=s?s(i):i,c=!function(){if(void 0===e){let t=new Response("");if("body"in t)try{new Response(t.body),e=!0}catch(t){e=!1}e=!1}return e}()?await r.blob():r.body;return new Response(c,n)}function w(e,t){let s=new URL(e);for(let e of t)s.searchParams.delete(e);return s.href}async function y(e,t,s,a){let r=w(t.url,s);if(t.url===r)return e.match(t,a);let i=Object.assign(Object.assign({},a),{ignoreSearch:!0});for(let n of(await e.keys(t,i)))if(r===w(n.url,s))return e.match(n,a)}class g{constructor(){this.promise=new Promise((e,t)=>{this.resolve=e,this.reject=t})}}let m=new Set;async function R(){for(let e of m)await e()}function C(e){return"string"==typeof e?new Request(e):e}n(303);class b{constructor(e,t){for(const s of(this._cacheKeys={},Object.assign(this,t),this.event=t.event,this._strategy=e,this._handlerDeferred=new g,this._extendLifetimePromises=[],this._plugins=[...e.plugins],this._pluginStateMap=new Map,this._plugins))this._pluginStateMap.set(s,{});this.event.waitUntil(this._handlerDeferred.promise)}async fetch(e){let{event:t}=this,s=C(e);if("navigate"===s.mode&&t instanceof FetchEvent&&t.preloadResponse){let e=await t.preloadResponse;if(e)return e}let a=this.hasCallback("fetchDidFail")?s.clone():null;try{for(let e of this.iterateCallbacks("requestWillFetch"))s=await e({request:s.clone(),event:t})}catch(e){if(e instanceof Error)throw new l("plugin-error-request-will-fetch",{thrownErrorMessage:e.message})}let r=s.clone();try{let e;for(let a of(e=await fetch(s,"navigate"===s.mode?void 0:this._strategy.fetchOptions),this.iterateCallbacks("fetchDidSucceed")))e=await a({event:t,request:r,response:e});return e}catch(e){throw a&&await this.runCallbacks("fetchDidFail",{error:e,event:t,originalRequest:a.clone(),request:r.clone()}),e}}async fetchAndCachePut(e){let t=await this.fetch(e),s=t.clone();return this.waitUntil(this.cachePut(e,s)),t}async cacheMatch(e){let t,s=C(e),{cacheName:a,matchOptions:r}=this._strategy,i=await this.getCacheKey(s,"read"),n=Object.assign(Object.assign({},r),{cacheName:a});for(let e of(t=await caches.match(i,n),this.iterateCallbacks("cachedResponseWillBeUsed")))t=await e({cacheName:a,matchOptions:r,cachedResponse:t,request:i,event:this.event})||void 0;return t}async cachePut(e,t){let s=C(e);await new Promise(e=>setTimeout(e,0));let a=await this.getCacheKey(s,"write");if(!t)throw new l("cache-put-with-no-response",{url:new URL(String(a.url),location.href).href.replace(RegExp(`^${location.origin}`),"")});let r=await this._ensureResponseSafeToCache(t);if(!r)return!1;let{cacheName:i,matchOptions:n}=this._strategy,c=await self.caches.open(i),h=this.hasCallback("cacheDidUpdate"),o=h?await y(c,a.clone(),["__WB_REVISION__"],n):null;try{await c.put(a,h?r.clone():r)}catch(e){if(e instanceof Error)throw"QuotaExceededError"===e.name&&await R(),e}for(let e of this.iterateCallbacks("cacheDidUpdate"))await e({cacheName:i,oldResponse:o,newResponse:r.clone(),request:a,event:this.event});return!0}async getCacheKey(e,t){let s=`${e.url} | ${t}`;if(!this._cacheKeys[s]){let a=e;for(let e of this.iterateCallbacks("cacheKeyWillBeUsed"))a=C(await e({mode:t,request:a,event:this.event,params:this.params}));this._cacheKeys[s]=a}return this._cacheKeys[s]}hasCallback(e){for(let t of this._strategy.plugins)if(e in t)return!0;return!1}async runCallbacks(e,t){for(let s of this.iterateCallbacks(e))await s(t)}*iterateCallbacks(e){for(let t of this._strategy.plugins)if("function"==typeof t[e]){let s=this._pluginStateMap.get(t),a=a=>{let r=Object.assign(Object.assign({},a),{state:s});return t[e](r)};yield a}}waitUntil(e){return this._extendLifetimePromises.push(e),e}async doneWaiting(){for(;this._extendLifetimePromises.length;){let e=this._extendLifetimePromises.splice(0),t=(await Promise.allSettled(e)).find(e=>"rejected"===e.status);if(t)throw t.reason}}destroy(){this._handlerDeferred.resolve(null)}async _ensureResponseSafeToCache(e){let t=e,s=!1;for(let e of this.iterateCallbacks("cacheWillUpdate"))if(t=await e({request:this.request,response:t,event:this.event})||void 0,s=!0,!t)break;return!s&&t&&200!==t.status&&(t=void 0),t}}class v{constructor(e={}){this.cacheName=(e=>e||h(c.runtime))(e.cacheName),this.plugins=e.plugins||[],this.fetchOptions=e.fetchOptions,this.matchOptions=e.matchOptions}handle(e){let[t]=this.handleAll(e);return t}handleAll(e){e instanceof FetchEvent&&(e={event:e,request:e.request});let t=e.event,s="string"==typeof e.request?new Request(e.request):e.request,a=new b(this,{event:t,request:s,params:"params"in e?e.params:void 0}),r=this._getResponse(a,s,t),i=this._awaitComplete(r,a,s,t);return[r,i]}async _getResponse(e,t,s){let a;await e.runCallbacks("handlerWillStart",{event:s,request:t});try{if(!(a=await this._handle(t,e))||"error"===a.type)throw new l("no-response",{url:t.url})}catch(r){if(r instanceof Error){for(let i of e.iterateCallbacks("handlerDidError"))if(a=await i({error:r,event:s,request:t}))break}if(a);else throw r}for(let r of e.iterateCallbacks("handlerWillRespond"))a=await r({event:s,request:t,response:a});return a}async _awaitComplete(e,t,s,a){let r,i;try{r=await e}catch(e){}try{await t.runCallbacks("handlerDidRespond",{event:a,request:s,response:r}),await t.doneWaiting()}catch(e){e instanceof Error&&(i=e)}if(await t.runCallbacks("handlerDidComplete",{event:a,request:s,response:r,error:i}),t.destroy(),i)throw i}}class L extends v{constructor(e={}){e.cacheName=o(e.cacheName),super(e),this._fallbackToNetwork=!1!==e.fallbackToNetwork,this.plugins.push(L.copyRedirectedCacheableResponsesPlugin)}async _handle(e,t){let s=await t.cacheMatch(e);return s||(t.event&&"install"===t.event.type?await this._handleInstall(e,t):await this._handleFetch(e,t))}async _handleFetch(e,t){let s,a=t.params||{};if(this._fallbackToNetwork){let r=a.integrity,i=e.integrity,n=!i||i===r;s=await t.fetch(new Request(e,{integrity:"no-cors"!==e.mode?i||r:void 0})),r&&n&&"no-cors"!==e.mode&&(this._useDefaultCacheabilityPluginIfNeeded(),await t.cachePut(e,s.clone()))}else throw new l("missing-precache-entry",{cacheName:this.cacheName,url:e.url});return s}async _handleInstall(e,t){this._useDefaultCacheabilityPluginIfNeeded();let s=await t.fetch(e);if(!await t.cachePut(e,s.clone()))throw new l("bad-precaching-response",{url:e.url,status:s.status});return s}_useDefaultCacheabilityPluginIfNeeded(){let e=null,t=0;for(let[s,a]of this.plugins.entries())a!==L.copyRedirectedCacheableResponsesPlugin&&(a===L.defaultPrecacheCacheabilityPlugin&&(e=s),a.cacheWillUpdate&&t++);0===t?this.plugins.push(L.defaultPrecacheCacheabilityPlugin):t>1&&null!==e&&this.plugins.splice(e,1)}}L.defaultPrecacheCacheabilityPlugin={cacheWillUpdate:async({response:e})=>!e||e.status>=400?null:e},L.copyRedirectedCacheableResponsesPlugin={cacheWillUpdate:async({response:e})=>e.redirected?await p(e):e};class U{constructor({cacheName:e,plugins:t=[],fallbackToNetwork:s=!0}={}){this._urlsToCacheKeys=new Map,this._urlsToCacheModes=new Map,this._cacheKeysToIntegrities=new Map,this._strategy=new L({cacheName:o(e),plugins:[...t,new d({precacheController:this})],fallbackToNetwork:s}),this.install=this.install.bind(this),this.activate=this.activate.bind(this)}get strategy(){return this._strategy}precache(e){this.addToCacheList(e),this._installAndActiveListenersAdded||(self.addEventListener("install",this.install),self.addEventListener("activate",this.activate),this._installAndActiveListenersAdded=!0)}addToCacheList(e){let t=[];for(let s of e){"string"==typeof s?t.push(s):s&&void 0===s.revision&&t.push(s.url);let{cacheKey:e,url:a}=function(e){if(!e)throw new l("add-to-cache-list-unexpected-type",{entry:e});if("string"==typeof e){let t=new URL(e,location.href);return{cacheKey:t.href,url:t.href}}let{revision:t,url:s}=e;if(!s)throw new l("add-to-cache-list-unexpected-type",{entry:e});if(!t){let e=new URL(s,location.href);return{cacheKey:e.href,url:e.href}}let a=new URL(s,location.href),r=new URL(s,location.href);return a.searchParams.set("__WB_REVISION__",t),{cacheKey:a.href,url:r.href}}(s),r="string"!=typeof s&&s.revision?"reload":"default";if(this._urlsToCacheKeys.has(a)&&this._urlsToCacheKeys.get(a)!==e)throw new l("add-to-cache-list-conflicting-entries",{firstEntry:this._urlsToCacheKeys.get(a),secondEntry:e});if("string"!=typeof s&&s.integrity){if(this._cacheKeysToIntegrities.has(e)&&this._cacheKeysToIntegrities.get(e)!==s.integrity)throw new l("add-to-cache-list-conflicting-integrities",{url:a});this._cacheKeysToIntegrities.set(e,s.integrity)}this._urlsToCacheKeys.set(a,e),this._urlsToCacheModes.set(a,r),t.length>0&&console.warn(`Workbox is precaching URLs without revision info: ${t.join(", ")}
-This is generally NOT safe. Learn more at https://bit.ly/wb-precache`)}}install(e){return u(e,async()=>{let t=new f;for(let[s,a]of(this.strategy.plugins.push(t),this._urlsToCacheKeys)){let t=this._cacheKeysToIntegrities.get(a),r=this._urlsToCacheModes.get(s),i=new Request(s,{integrity:t,cache:r,credentials:"same-origin"});await Promise.all(this.strategy.handleAll({params:{cacheKey:a},request:i,event:e}))}let{updatedURLs:s,notUpdatedURLs:a}=t;return{updatedURLs:s,notUpdatedURLs:a}})}activate(e){return u(e,async()=>{let e=await self.caches.open(this.strategy.cacheName),t=await e.keys(),s=new Set(this._urlsToCacheKeys.values()),a=[];for(let r of t)s.has(r.url)||(await e.delete(r),a.push(r.url));return{deletedURLs:a}})}getURLsToCacheKeys(){return this._urlsToCacheKeys}getCachedURLs(){return[...this._urlsToCacheKeys.keys()]}getCacheKeyForURL(e){let t=new URL(e,location.href);return this._urlsToCacheKeys.get(t.href)}getIntegrityForCacheKey(e){return this._cacheKeysToIntegrities.get(e)}async matchPrecache(e){let t=e instanceof Request?e.url:e,s=this.getCacheKeyForURL(t);if(s)return(await self.caches.open(this.strategy.cacheName)).match(s)}createHandlerBoundToURL(e){let t=this.getCacheKeyForURL(e);if(!t)throw new l("non-precached-url",{url:e});return s=>(s.request=new Request(e),s.params=Object.assign({cacheKey:t},s.params),this.strategy.handle(s))}}let k=()=>(t||(t=new U),t);n(448);let T=e=>e&&"object"==typeof e?e:{handle:e};class K{constructor(e,t,s="GET"){this.handler=T(t),this.match=e,this.method=s}setCatchHandler(e){this.catchHandler=T(e)}}class x extends K{constructor(e,t,s){super(({url:t})=>{let s=e.exec(t.href);if(s)return t.origin!==location.origin&&0!==s.index?void 0:s.slice(1)},t,s)}}class P{constructor(){this._routes=new Map,this._defaultHandlerMap=new Map}get routes(){return this._routes}addFetchListener(){self.addEventListener("fetch",e=>{let{request:t}=e,s=this.handleRequest({request:t,event:e});s&&e.respondWith(s)})}addCacheListener(){self.addEventListener("message",e=>{if(e.data&&"CACHE_URLS"===e.data.type){let{payload:t}=e.data,s=Promise.all(t.urlsToCache.map(t=>{"string"==typeof t&&(t=[t]);let s=new Request(...t);return this.handleRequest({request:s,event:e})}));e.waitUntil(s),e.ports&&e.ports[0]&&s.then(()=>e.ports[0].postMessage(!0))}})}handleRequest({request:e,event:t}){let s,a=new URL(e.url,location.href);if(!a.protocol.startsWith("http"))return;let r=a.origin===location.origin,{params:i,route:n}=this.findMatchingRoute({event:t,request:e,sameOrigin:r,url:a}),l=n&&n.handler,c=e.method;if(!l&&this._defaultHandlerMap.has(c)&&(l=this._defaultHandlerMap.get(c)),!l)return;try{s=l.handle({url:a,request:e,event:t,params:i})}catch(e){s=Promise.reject(e)}let h=n&&n.catchHandler;return s instanceof Promise&&(this._catchHandler||h)&&(s=s.catch(async s=>{if(h)try{return await h.handle({url:a,request:e,event:t,params:i})}catch(e){e instanceof Error&&(s=e)}if(this._catchHandler)return this._catchHandler.handle({url:a,request:e,event:t});throw s})),s}findMatchingRoute({url:e,sameOrigin:t,request:s,event:a}){for(let r of this._routes.get(s.method)||[]){let i,n=r.match({url:e,sameOrigin:t,request:s,event:a});if(n)return Array.isArray(i=n)&&0===i.length||n.constructor===Object&&0===Object.keys(n).length?i=void 0:"boolean"==typeof n&&(i=void 0),{route:r,params:i}}return{}}setDefaultHandler(e,t="GET"){this._defaultHandlerMap.set(t,T(e))}setCatchHandler(e){this._catchHandler=T(e)}registerRoute(e){this._routes.has(e.method)||this._routes.set(e.method,[]),this._routes.get(e.method).push(e)}unregisterRoute(e){if(!this._routes.has(e.method))throw new l("unregister-route-but-not-found-with-method",{method:e.method});let t=this._routes.get(e.method).indexOf(e);if(t>-1)this._routes.get(e.method).splice(t,1);else throw new l("unregister-route-route-not-registered")}}function q(e,t,a){let r;if("string"==typeof e){let s=new URL(e,location.href);r=new K(({url:e})=>e.href===s.href,t,a)}else if(e instanceof RegExp)r=new x(e,t,a);else if("function"==typeof e)r=new K(e,t,a);else if(e instanceof K)r=e;else throw new l("unsupported-route-type",{moduleName:"workbox-routing",funcName:"registerRoute",paramName:"capture"});return(!s&&((s=new P).addFetchListener(),s.addCacheListener()),s).registerRoute(r),r}class E extends K{constructor(e,t){super(({request:s})=>{let a=e.getURLsToCacheKeys();for(let r of function*(e,{ignoreURLParametersMatching:t=[/^utm_/,/^fbclid$/],directoryIndex:s="index.html",cleanURLs:a=!0,urlManipulation:r}={}){let i=new URL(e,location.href);i.hash="",yield i.href;let n=function(e,t=[]){for(let s of[...e.searchParams.keys()])t.some(e=>e.test(s))&&e.searchParams.delete(s);return e}(i,t);if(yield n.href,s&&n.pathname.endsWith("/")){let e=new URL(n.href);e.pathname+=s,yield e.href}if(a){let e=new URL(n.href);e.pathname+=".html",yield e.href}if(r)for(let e of r({url:i}))yield e.href}(s.url,t)){let t=a.get(r);if(t){let s=e.getIntegrityForCacheKey(t);return{cacheKey:t,integrity:s}}}},e.strategy)}}let M="-precache-",N=async(e,t=M)=>{let s=(await self.caches.keys()).filter(s=>s.includes(t)&&s.includes(self.registration.scope)&&s!==e);return await Promise.all(s.map(e=>self.caches.delete(e))),s};class W extends K{constructor(e,{allowlist:t=[/./],denylist:s=[]}={}){super(e=>this._match(e),e),this._allowlist=t,this._denylist=s}_match({url:e,request:t}){if(t&&"navigate"!==t.mode)return!1;let s=e.pathname+e.search;for(let e of this._denylist)if(e.test(s))return!1;return!!this._allowlist.some(e=>e.test(s))}}let O="app-shell";async function I(){let e=await caches.open(O);await e.add("/")}async function S(e){let{request:t}=e;try{return await fetch(t)}catch(s){let e=await caches.open(O),t=await e.match("/");if(!t)throw s;return t}}self.addEventListener("install",e=>{e.waitUntil(I()),self.skipWaiting()}),self.addEventListener("activate",()=>{self.clients.claim()}),self.addEventListener("activate",e=>{let t=o();e.waitUntil(N(t).then(e=>{}))}),a=[{'revision':'7ff1410c91377c2902b6f6fe0db39603','url':'/_next/build-manifest.json'},{'revision':'a036716e317d81d10c012b6c3ffa0aa3','url':'/_next/dynamic-css-manifest.json'},{'revision':'5bcb03db5808df34cdd4b28037231e24','url':'/_next/react-loadable-manifest.json'},{'revision':'3d5934fd1505ea07b71d1cb13a79517e','url':'/_next/server/dynamic-css-manifest.js'},{'revision':'04f38494a9b67f8d7907cca6200f5bd3','url':'/_next/server/middleware-build-manifest.js'},{'revision':'564b2b3945a82387441eb7e4188247f3','url':'/_next/server/middleware-react-loadable-manifest.js'},{'revision':'9fce7989bff5d35b01e177447faca50d','url':'/_next/server/next-font-manifest.js'},{'revision':'d51420cd4aa5d37d6719849cf36d0d6f','url':'/_next/server/next-font-manifest.json'},{'revision':'4abe478b0264f8f354f6bd56940f305e','url':'/_next/static/8WnIUTe-yJvPD6stltvYI/_buildManifest.js'},{'revision':'b6652df95db52feb4daf4eca35380933','url':'/_next/static/8WnIUTe-yJvPD6stltvYI/_ssgManifest.js'},{'revision':null,'url':'/_next/static/chunks/100.305bdf9c75b1758f.js'},{'revision':null,'url':'/_next/static/chunks/101-829ab8a8d310e7a0.js'},{'revision':null,'url':'/_next/static/chunks/256.6a20b23a766cfebd.js'},{'revision':null,'url':'/_next/static/chunks/277.6785dfaf22fdb0b7.js'},{'revision':null,'url':'/_next/static/chunks/307.89e6100f58443679.js'},{'revision':null,'url':'/_next/static/chunks/341.79535ba85bf1986f.js'},{'revision':null,'url':'/_next/static/chunks/363.cec65b1f9668a75e.js'},{'revision':null,'url':'/_next/static/chunks/422.3e55b4c94e328701.js'},{'revision':null,'url':'/_next/static/chunks/541.dcd9e8b804f88da5.js'},{'revision':null,'url':'/_next/static/chunks/631.98d42abad0a60af6.js'},{'revision':null,'url':'/_next/static/chunks/663.bd2c45413fbca518.js'},{'revision':null,'url':'/_next/static/chunks/693.677c88e0eb1340b5.js'},{'revision':null,'url':'/_next/static/chunks/744.b06c9a3de4a1d877.js'},{'revision':null,'url':'/_next/static/chunks/820.823e9e885ebb66af.js'},{'revision':null,'url':'/_next/static/chunks/827.c81b92b383a748c9.js'},{'revision':null,'url':'/_next/static/chunks/865.59baba8296c9b116.js'},{'revision':null,'url':'/_next/static/chunks/912.077603e4f0bc6cca.js'},{'revision':null,'url':'/_next/static/chunks/939.2ad86b50405c7897.js'},{'revision':null,'url':'/_next/static/chunks/980.7ce17464fc56648a.js'},{'revision':null,'url':'/_next/static/chunks/990.61296e5870b91f11.js'},{'revision':null,'url':'/_next/static/chunks/framework-626cbd48ac5aca57.js'},{'revision':null,'url':'/_next/static/chunks/main-7e52da35a4beea0b.js'},{'revision':null,'url':'/_next/static/chunks/pages/_app-e3fe880e24c024ab.js'},{'revision':null,'url':'/_next/static/chunks/pages/_error-f0290a98eb3ed0ec.js'},{'revision':null,'url':'/_next/static/chunks/pages/index-b073a1686818dd26.js'},{'revision':null,'url':'/_next/static/chunks/pages/not-found-a59f9deeeff63d17.js'},{'revision':'846118c33b2c0e922d7b3a7676f81f6f','url':'/_next/static/chunks/polyfills-42372ed130431b0a.js'},{'revision':null,'url':'/_next/static/chunks/webpack-d7138f1ef6b8c9d6.js'}],k().precache(a),q(new E(k(),void 0)),q(new W(S,{denylist:[/^\/api\//]}))})();
+This is generally NOT safe. Learn more at https://bit.ly/wb-precache`)}}install(e){return u(e,async()=>{let t=new f;for(let[s,a]of(this.strategy.plugins.push(t),this._urlsToCacheKeys)){let t=this._cacheKeysToIntegrities.get(a),r=this._urlsToCacheModes.get(s),i=new Request(s,{integrity:t,cache:r,credentials:"same-origin"});await Promise.all(this.strategy.handleAll({params:{cacheKey:a},request:i,event:e}))}let{updatedURLs:s,notUpdatedURLs:a}=t;return{updatedURLs:s,notUpdatedURLs:a}})}activate(e){return u(e,async()=>{let e=await self.caches.open(this.strategy.cacheName),t=await e.keys(),s=new Set(this._urlsToCacheKeys.values()),a=[];for(let r of t)s.has(r.url)||(await e.delete(r),a.push(r.url));return{deletedURLs:a}})}getURLsToCacheKeys(){return this._urlsToCacheKeys}getCachedURLs(){return[...this._urlsToCacheKeys.keys()]}getCacheKeyForURL(e){let t=new URL(e,location.href);return this._urlsToCacheKeys.get(t.href)}getIntegrityForCacheKey(e){return this._cacheKeysToIntegrities.get(e)}async matchPrecache(e){let t=e instanceof Request?e.url:e,s=this.getCacheKeyForURL(t);if(s)return(await self.caches.open(this.strategy.cacheName)).match(s)}createHandlerBoundToURL(e){let t=this.getCacheKeyForURL(e);if(!t)throw new l("non-precached-url",{url:e});return s=>(s.request=new Request(e),s.params=Object.assign({cacheKey:t},s.params),this.strategy.handle(s))}}let k=()=>(t||(t=new U),t);n(448);let T=e=>e&&"object"==typeof e?e:{handle:e};class K{constructor(e,t,s="GET"){this.handler=T(t),this.match=e,this.method=s}setCatchHandler(e){this.catchHandler=T(e)}}class x extends K{constructor(e,t,s){super(({url:t})=>{let s=e.exec(t.href);if(s)return t.origin!==location.origin&&0!==s.index?void 0:s.slice(1)},t,s)}}class P{constructor(){this._routes=new Map,this._defaultHandlerMap=new Map}get routes(){return this._routes}addFetchListener(){self.addEventListener("fetch",e=>{let{request:t}=e,s=this.handleRequest({request:t,event:e});s&&e.respondWith(s)})}addCacheListener(){self.addEventListener("message",e=>{if(e.data&&"CACHE_URLS"===e.data.type){let{payload:t}=e.data,s=Promise.all(t.urlsToCache.map(t=>{"string"==typeof t&&(t=[t]);let s=new Request(...t);return this.handleRequest({request:s,event:e})}));e.waitUntil(s),e.ports&&e.ports[0]&&s.then(()=>e.ports[0].postMessage(!0))}})}handleRequest({request:e,event:t}){let s,a=new URL(e.url,location.href);if(!a.protocol.startsWith("http"))return;let r=a.origin===location.origin,{params:i,route:n}=this.findMatchingRoute({event:t,request:e,sameOrigin:r,url:a}),l=n&&n.handler,c=e.method;if(!l&&this._defaultHandlerMap.has(c)&&(l=this._defaultHandlerMap.get(c)),!l)return;try{s=l.handle({url:a,request:e,event:t,params:i})}catch(e){s=Promise.reject(e)}let h=n&&n.catchHandler;return s instanceof Promise&&(this._catchHandler||h)&&(s=s.catch(async s=>{if(h)try{return await h.handle({url:a,request:e,event:t,params:i})}catch(e){e instanceof Error&&(s=e)}if(this._catchHandler)return this._catchHandler.handle({url:a,request:e,event:t});throw s})),s}findMatchingRoute({url:e,sameOrigin:t,request:s,event:a}){for(let r of this._routes.get(s.method)||[]){let i,n=r.match({url:e,sameOrigin:t,request:s,event:a});if(n)return Array.isArray(i=n)&&0===i.length||n.constructor===Object&&0===Object.keys(n).length?i=void 0:"boolean"==typeof n&&(i=void 0),{route:r,params:i}}return{}}setDefaultHandler(e,t="GET"){this._defaultHandlerMap.set(t,T(e))}setCatchHandler(e){this._catchHandler=T(e)}registerRoute(e){this._routes.has(e.method)||this._routes.set(e.method,[]),this._routes.get(e.method).push(e)}unregisterRoute(e){if(!this._routes.has(e.method))throw new l("unregister-route-but-not-found-with-method",{method:e.method});let t=this._routes.get(e.method).indexOf(e);if(t>-1)this._routes.get(e.method).splice(t,1);else throw new l("unregister-route-route-not-registered")}}function q(e,t,a){let r;if("string"==typeof e){let s=new URL(e,location.href);r=new K(({url:e})=>e.href===s.href,t,a)}else if(e instanceof RegExp)r=new x(e,t,a);else if("function"==typeof e)r=new K(e,t,a);else if(e instanceof K)r=e;else throw new l("unsupported-route-type",{moduleName:"workbox-routing",funcName:"registerRoute",paramName:"capture"});return(!s&&((s=new P).addFetchListener(),s.addCacheListener()),s).registerRoute(r),r}class E extends K{constructor(e,t){super(({request:s})=>{let a=e.getURLsToCacheKeys();for(let r of function*(e,{ignoreURLParametersMatching:t=[/^utm_/,/^fbclid$/],directoryIndex:s="index.html",cleanURLs:a=!0,urlManipulation:r}={}){let i=new URL(e,location.href);i.hash="",yield i.href;let n=function(e,t=[]){for(let s of[...e.searchParams.keys()])t.some(e=>e.test(s))&&e.searchParams.delete(s);return e}(i,t);if(yield n.href,s&&n.pathname.endsWith("/")){let e=new URL(n.href);e.pathname+=s,yield e.href}if(a){let e=new URL(n.href);e.pathname+=".html",yield e.href}if(r)for(let e of r({url:i}))yield e.href}(s.url,t)){let t=a.get(r);if(t){let s=e.getIntegrityForCacheKey(t);return{cacheKey:t,integrity:s}}}},e.strategy)}}let M="-precache-",N=async(e,t=M)=>{let s=(await self.caches.keys()).filter(s=>s.includes(t)&&s.includes(self.registration.scope)&&s!==e);return await Promise.all(s.map(e=>self.caches.delete(e))),s};class W extends K{constructor(e,{allowlist:t=[/./],denylist:s=[]}={}){super(e=>this._match(e),e),this._allowlist=t,this._denylist=s}_match({url:e,request:t}){if(t&&"navigate"!==t.mode)return!1;let s=e.pathname+e.search;for(let e of this._denylist)if(e.test(s))return!1;return!!this._allowlist.some(e=>e.test(s))}}let O="app-shell";async function I(){let e=await caches.open(O);await e.add("/")}async function S(e){let{request:t}=e;try{return await fetch(t)}catch(s){let e=await caches.open(O),t=await e.match("/");if(!t)throw s;return t}}self.addEventListener("install",e=>{e.waitUntil(I()),self.skipWaiting()}),self.addEventListener("activate",()=>{self.clients.claim()}),self.addEventListener("activate",e=>{let t=o();e.waitUntil(N(t).then(e=>{}))}),a=[{'revision':'1960ebd3e6b0c7fc7bdc6186762dd2b7','url':'/_next/build-manifest.json'},{'revision':'723d2f2242ccfe388715c8fc0db5a426','url':'/_next/dynamic-css-manifest.json'},{'revision':'ea88ba9aba20e7d1d2b3d045cbb9e85d','url':'/_next/react-loadable-manifest.json'},{'revision':'d1fc43aadf1fda3b5fe27546d7621f66','url':'/_next/server/dynamic-css-manifest.js'},{'revision':'8021a311c8f857efd010322783930eda','url':'/_next/server/middleware-build-manifest.js'},{'revision':'3c03dfac5c2ba3615ebb74d6620de7ff','url':'/_next/server/middleware-react-loadable-manifest.js'},{'revision':'9fce7989bff5d35b01e177447faca50d','url':'/_next/server/next-font-manifest.js'},{'revision':'d51420cd4aa5d37d6719849cf36d0d6f','url':'/_next/server/next-font-manifest.json'},{'revision':'c4185ff37b2cb8cd5cede1a1781a9c15','url':'/_next/static/YHx536pklAqlc9UGAXCj8/_buildManifest.js'},{'revision':'b6652df95db52feb4daf4eca35380933','url':'/_next/static/YHx536pklAqlc9UGAXCj8/_ssgManifest.js'},{'revision':null,'url':'/_next/static/chunks/100.305bdf9c75b1758f.js'},{'revision':null,'url':'/_next/static/chunks/101-fee295c7587c0836.js'},{'revision':null,'url':'/_next/static/chunks/256.2a4fa7f278e0a97d.js'},{'revision':null,'url':'/_next/static/chunks/277.6785dfaf22fdb0b7.js'},{'revision':null,'url':'/_next/static/chunks/307.89e6100f58443679.js'},{'revision':null,'url':'/_next/static/chunks/341.79535ba85bf1986f.js'},{'revision':null,'url':'/_next/static/chunks/363.cec65b1f9668a75e.js'},{'revision':null,'url':'/_next/static/chunks/422.3e55b4c94e328701.js'},{'revision':null,'url':'/_next/static/chunks/541.dcd9e8b804f88da5.js'},{'revision':null,'url':'/_next/static/chunks/631.98d42abad0a60af6.js'},{'revision':null,'url':'/_next/static/chunks/663.bd2c45413fbca518.js'},{'revision':null,'url':'/_next/static/chunks/693.d295da7c7b873986.js'},{'revision':null,'url':'/_next/static/chunks/744.b06c9a3de4a1d877.js'},{'revision':null,'url':'/_next/static/chunks/820.823e9e885ebb66af.js'},{'revision':null,'url':'/_next/static/chunks/827.09f660ca0a951d12.js'},{'revision':null,'url':'/_next/static/chunks/865.59baba8296c9b116.js'},{'revision':null,'url':'/_next/static/chunks/912.077603e4f0bc6cca.js'},{'revision':null,'url':'/_next/static/chunks/939.2ad86b50405c7897.js'},{'revision':null,'url':'/_next/static/chunks/980.dd35e807b18063c1.js'},{'revision':null,'url':'/_next/static/chunks/990.61296e5870b91f11.js'},{'revision':null,'url':'/_next/static/chunks/framework-988fd6f19d2744e8.js'},{'revision':null,'url':'/_next/static/chunks/main-d397eb8af33c5163.js'},{'revision':null,'url':'/_next/static/chunks/pages/_app-0c68f165d6de8507.js'},{'revision':null,'url':'/_next/static/chunks/pages/_error-f0290a98eb3ed0ec.js'},{'revision':null,'url':'/_next/static/chunks/pages/index-ea21d96a88f25000.js'},{'revision':null,'url':'/_next/static/chunks/pages/not-found-a59f9deeeff63d17.js'},{'revision':'846118c33b2c0e922d7b3a7676f81f6f','url':'/_next/static/chunks/polyfills-42372ed130431b0a.js'},{'revision':null,'url':'/_next/static/chunks/webpack-31879a8fb6dcffd0.js'}],k().precache(a),q(new E(k(),void 0)),q(new W(S,{denylist:[/^\/api\//]}))})();

package/packages/scrabble-solver/src/api/BadRequestError.ts

@@ -0,0 +1,6 @@
+export class BadRequestError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'BadRequestError';
+  }
+}

package/packages/scrabble-solver/src/api/index.ts

@@ -1,5 +1,6 @@
-export { getServerLoggingData } from './getServerLoggingData';
+export { BadRequestError } from './BadRequestError';
 export { isBoardValid } from './isBoardValid';
 export { isCellValid } from './isCellValid';
 export { isCharacterValid } from './isCharacterValid';
 export { isRowValid } from './isRowValid';
+export { type ApiContext, withApiLog } from './withApiLog';

package/packages/scrabble-solver/src/api/withApiLog.ts

@@ -0,0 +1,85 @@
+import { type Operation, logError, logEvent } from '@scrabble-solver/logger';
+import { isObject } from '@scrabble-solver/types';
+import { type NextApiHandler, type NextApiRequest, type NextApiResponse } from 'next';
+
+import { BadRequestError } from './BadRequestError';
+
+export interface ApiContext {
+  ip: string | undefined;
+  ua: string | undefined;
+  getElapsedMs: () => number;
+}
+
+type ApiHandler = (request: NextApiRequest, response: NextApiResponse, context: ApiContext) => Promise<void> | void;
+
+interface ErrorResponse {
+  error: string;
+  message: string;
+}
+
+const INPUT_EXCERPT_LENGTH = 1024;
+const UA_MAX_LENGTH = 512;
+
+export function withApiLog(operation: Operation, handler: ApiHandler): NextApiHandler {
+  return async (request, response) => {
+    const startedAt = performance.now();
+    const context: ApiContext = {
+      ip: getClientIp(request),
+      ua: request.headers['user-agent']?.slice(0, UA_MAX_LENGTH),
+      getElapsedMs: () => Math.round(performance.now() - startedAt),
+    };
+
+    try {
+      await handler(request, response, context);
+    } catch (error) {
+      const { ip, ua } = context;
+      const input = getInputExcerpt(request);
+
+      if (error instanceof BadRequestError) {
+        logEvent({ type: 'error', level: 'warn', operation, ip, ua, message: error.message, input });
+        respond(response, 400, { error: 'Bad request', message: error.message });
+      } else {
+        logError(operation, error, { ip, ua, input });
+        respond(response, 500, {
+          error: 'Server error',
+          message: error instanceof Error ? error.message : 'Unknown error',
+        });
+      }
+    }
+  };
+}
+
+function respond(response: NextApiResponse, status: number, body: ErrorResponse): void {
+  if (!response.headersSent) {
+    response.status(status).send(body);
+  }
+}
+
+function getClientIp(request: NextApiRequest): string | undefined {
+  const forwardedFor = request.headers['x-forwarded-for'];
+  const header = Array.isArray(forwardedFor) ? forwardedFor.at(-1) : forwardedFor;
+  const ip = header?.split(',').at(-1)?.trim() || request.socket.remoteAddress;
+  return ip?.replace(/^::ffff:/, '');
+}
+
+function getInputExcerpt(request: NextApiRequest): string {
+  const input: unknown = request.method === 'GET' ? request.query : request.body;
+
+  try {
+    return JSON.stringify(sortFieldsBySize(input) ?? null).slice(0, INPUT_EXCERPT_LENGTH);
+  } catch (error) {
+    return `(unserializable: ${String(error)})`;
+  }
+}
+
+function sortFieldsBySize(input: unknown): unknown {
+  if (!isObject(input) || Array.isArray(input)) {
+    return input;
+  }
+
+  return Object.fromEntries(Object.entries(input).sort(([, a], [, b]) => getJsonSize(a) - getJsonSize(b)));
+}
+
+function getJsonSize(value: unknown): number {
+  return JSON.stringify(value ?? null).length;
+}

package/packages/scrabble-solver/src/components/Button/Button.module.scss

@@ -64,7 +64,7 @@
   gap: var(--spacing--l);
   line-height: var(--button--icon--size);
 
-  @include media('compact') {
+  @include media('<l') {
     gap: var(--spacing--m);
   }
 }

package/packages/scrabble-solver/src/components/Solver/Solver.module.scss

@@ -8,7 +8,7 @@
   display: flex;
   flex-direction: column;
 
-  @include media('compact', 'touch') {
+  @include media('<l', 'touch') {
     margin-bottom: calc(3 * var(--spacing--l) + var(--button--icon--size));
   }
 
@@ -31,7 +31,7 @@
   height: 100%;
   margin: 0 auto;
 
-  @include media('compact') {
+  @include media('<l') {
     grid-template-columns: 1fr;
   }
 }
@@ -54,7 +54,7 @@
   flex: 0 0 var(--solver-column--width);
   gap: var(--spacing);
 
-  @include media('compact') {
+  @include media('<l') {
     display: none;
   }
 }
@@ -106,7 +106,7 @@
   width: 100%;
   max-width: var(--controls-max-width);
 
-  @include media('desktop') {
+  @include media('>=l') {
     display: none;
   }
 }

package/packages/scrabble-solver/src/components/Solver/Solver.tsx

@@ -3,8 +3,8 @@ import classNames from 'classnames';
 import { type FunctionComponent, memo, type SyntheticEvent, useEffect, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
 
-import { useIsCompactLayout } from '@/hooks/useIsCompactLayout';
 import { useIsTouchDevice } from '@/hooks/useIsTouchDevice';
+import { useMediaQuery } from '@/hooks/useMediaQuery';
 import {
   resultsSlice,
   selectAreResultsOutdated,
@@ -37,7 +37,7 @@ const SolverBase: FunctionComponent<Props> = ({ className, onShowResults }) => {
   const dispatch = useDispatch();
   const translate = useTranslate();
   const isTouchDevice = useIsTouchDevice();
-  const showCompactControls = useIsCompactLayout();
+  const showCompactControls = useMediaQuery('<l');
   const error = useTypedSelector(selectSolveError);
   const isOutdated = useTypedSelector(selectAreResultsOutdated);
   const results = useTypedSelector(selectProcessedResults);

package/packages/scrabble-solver/src/hooks/useColumns.ts

@@ -5,7 +5,6 @@ import { LOCALE_FEATURES } from '@/i18n/constants';
 import { selectLocale, useTypedSelector } from '@/state';
 import { ResultColumnId } from '@/types';
 
-import { useIsCompactLayout } from './useIsCompactLayout';
 import { useMediaQueries } from './useMediaQueries';
 
 const COLUMNS_XS = [ResultColumnId.Coordinates, ResultColumnId.Word, ResultColumnId.Points];
@@ -14,7 +13,7 @@ const COLUMNS_S = [...COLUMNS_XS, ResultColumnId.BlanksCount, ResultColumnId.Wor
 
 const COLUMNS_M = [...COLUMNS_XS];
 
-const COLUMNS_COMPACT = [...COLUMNS_XS];
+const COLUMNS_L = [...COLUMNS_XS];
 
 const selectColumns = createSelector([selectLocale], (locale) => {
   const { consonants, vowels } = LOCALE_FEATURES[locale];
@@ -40,8 +39,7 @@ const selectColumns = createSelector([selectLocale], (locale) => {
 
 export const useColumns = (): Partial<Record<ResultColumnId, boolean>> => {
   const columns = useTypedSelector(selectColumns);
-  const { isLessThanXs, isLessThanS, isLessThanM } = useMediaQueries();
-  const isCompactLayout = useIsCompactLayout();
+  const { isLessThanXs, isLessThanS, isLessThanM, isLessThanL } = useMediaQueries();
 
   const filteredColumns = useMemo(() => {
     if (isLessThanXs) {
@@ -56,12 +54,12 @@ export const useColumns = (): Partial<Record<ResultColumnId, boolean>> => {
       return columns.filter((columnId) => COLUMNS_M.includes(columnId));
     }
 
-    if (isCompactLayout) {
-      return columns.filter((columnId) => COLUMNS_COMPACT.includes(columnId));
+    if (isLessThanL) {
+      return columns.filter((columnId) => COLUMNS_L.includes(columnId));
     }
 
     return columns;
-  }, [columns, isLessThanXs, isLessThanS, isLessThanM, isCompactLayout]);
+  }, [columns, isLessThanXs, isLessThanS, isLessThanM, isLessThanL]);
 
   const columnsMap = useMemo(() => {
     return Object.fromEntries(filteredColumns.map((column) => [column, true]));

package/packages/scrabble-solver/src/modals/ResultsModal/ResultsModal.tsx

@@ -6,8 +6,8 @@ import { Button } from '@/components/Button';
 import { Dictionary } from '@/components/Dictionary';
 import { Modal } from '@/components/Modal';
 import { Results } from '@/components/Results';
-import { useIsCompactLayout } from '@/hooks/useIsCompactLayout';
 import { useIsTouchDevice } from '@/hooks/useIsTouchDevice';
+import { useMediaQuery } from '@/hooks/useMediaQuery';
 import Check from '@/icons/Check.svg';
 import EyeFill from '@/icons/EyeFill.svg';
 import {
@@ -29,7 +29,7 @@ interface Props {
 const ResultsModalBase: FunctionComponent<Props> = ({ className, isOpen, onClose }) => {
   const dispatch = useDispatch();
   const translate = useTranslate();
-  const showResultsInModal = useIsCompactLayout();
+  const showResultsInModal = useMediaQuery('<l');
   const previewsOnRepeatedClick = useIsTouchDevice();
   const resultCandidate = useTypedSelector(selectResultCandidate);
   const highlightedIndex = useTypedSelector(selectResultCandidateIndex);

package/packages/scrabble-solver/src/modals/WordsModal/WordsModal.module.scss

@@ -18,7 +18,7 @@
   border: var(--border);
   border-radius: var(--border--radius);
 
-  @include media('desktop') {
+  @include media('>=l') {
     display: none;
   }
 }

package/packages/scrabble-solver/src/modals/WordsModal/WordsModal.tsx

@@ -4,7 +4,7 @@ import { useDispatch } from 'react-redux';
 import { Button } from '@/components/Button';
 import { Dictionary } from '@/components/Dictionary';
 import { Modal } from '@/components/Modal';
-import { useIsCompactLayout } from '@/hooks/useIsCompactLayout';
+import { useMediaQuery } from '@/hooks/useMediaQuery';
 import EyeFill from '@/icons/EyeFill.svg';
 import { hoveredWordSlice, selectHoveredWord, useTranslate, useTypedSelector } from '@/state';
 
@@ -22,7 +22,7 @@ const WordsModalBase: FunctionComponent<Props> = ({ className, isOpen, onClose,
   const dispatch = useDispatch();
   const translate = useTranslate();
   const hoveredWord = useTypedSelector(selectHoveredWord);
-  const showsPreviewButton = useIsCompactLayout();
+  const showsPreviewButton = useMediaQuery('<l');
   const keepsHighlightOnClose = useRef(false);
 
   const handlePreview = useCallback(() => {

package/packages/scrabble-solver/src/modals/WordsModal/components/WordsTable/WordsTable.tsx

@@ -6,8 +6,8 @@ import { List } from 'react-window';
 
 import { EmptyState } from '@/components/EmptyState';
 import { Header, HeaderButton, Search } from '@/components/Table';
-import { useIsCompactLayout } from '@/hooks/useIsCompactLayout';
 import { useIsTouchDevice } from '@/hooks/useIsTouchDevice';
+import { useMediaQuery } from '@/hooks/useMediaQuery';
 import { LOCALE_FEATURES } from '@/i18n/constants';
 import GeoAlt from '@/icons/GeoAlt.svg';
 import QuestionSquare from '@/icons/QuestionSquare.svg';
@@ -38,7 +38,7 @@ export const WordsTable: FunctionComponent<Props> = ({ className, isOpen, onPrev
   const dispatch = useDispatch();
   const translate = useTranslate();
   const isTouchDevice = useIsTouchDevice();
-  const isCompactLayout = useIsCompactLayout();
+  const isCompactLayout = useMediaQuery('<l');
   const highlightFollowsPointer = !isTouchDevice && !isCompactLayout;
   const locale = useTypedSelector(selectLocale);
   const { direction } = LOCALE_FEATURES[locale];

package/packages/scrabble-solver/src/pages/api/dictionary/[locale]/[word].ts

@@ -1,12 +1,12 @@
 import { games } from '@scrabble-solver/configs';
 import { COMMA_ARABIC, COMMA_LATIN } from '@scrabble-solver/constants';
 import { dictionaries } from '@scrabble-solver/dictionaries';
-import { logger } from '@scrabble-solver/logger';
+import { logEvent } from '@scrabble-solver/logger';
 import { type Locale, isLocale } from '@scrabble-solver/types';
 import { getWordDefinition } from '@scrabble-solver/word-definitions';
 import { type NextApiRequest, type NextApiResponse } from 'next';
 
-import { getServerLoggingData } from '@/api';
+import { type ApiContext, BadRequestError, withApiLog } from '@/api';
 
 interface RequestData {
   locale: Locale;
@@ -16,39 +16,33 @@ interface RequestData {
 const MAXIMUM_COLLISIONS_COUNT = Object.values(games).reduce((result, game) => Math.max(result, game.rackSize), 0);
 const MAXIMUM_WORDS_COUNT = MAXIMUM_COLLISIONS_COUNT + 1;
 
-const dictionary = async (request: NextApiRequest, response: NextApiResponse): Promise<void> => {
-  const meta = getServerLoggingData(request);
+export default withApiLog('definition', dictionary);
 
-  try {
-    const { locale, words } = parseRequest(request);
+async function dictionary(request: NextApiRequest, response: NextApiResponse, { ip, getElapsedMs }: ApiContext) {
+  const { locale, words } = parseRequest(request);
+  const gaddag = await dictionaries.get(locale);
+  const results = await Promise.all(words.map((word) => getWordDefinition(locale, word, gaddag.has(word))));
+  response.status(200).send(results.map((result) => result.toJson()));
 
-    logger.info('dictionary - request', {
-      meta,
-      payload: {
-        locale,
-        words,
-      },
-    });
-
-    const gaddag = await dictionaries.get(locale);
-    const results = await Promise.all(words.map((word) => getWordDefinition(locale, word, gaddag.has(word))));
-    response.status(200).send(results.map((result) => result.toJson()));
-  } catch (error) {
-    const message = error instanceof Error ? error.message : 'Unknown error';
-    logger.error('dictionary - error', { error, meta });
-    response.status(500).send({ error: 'Server error', message });
-  }
-};
+  logEvent({
+    type: 'definition',
+    ip,
+    ms: getElapsedMs(),
+    locale,
+    words: words.join(','),
+    found: results.filter((result) => result.definitions.length > 0).length,
+  });
+}
 
-const parseRequest = (request: NextApiRequest): RequestData => {
+function parseRequest(request: NextApiRequest): RequestData {
   const { locale, word } = request.query;
 
   if (!isLocale(locale)) {
-    throw new Error('Invalid "locale" parameter');
+    throw new BadRequestError('Invalid "locale" parameter');
   }
 
   if (typeof word !== 'string' || word.length === 0) {
-    throw new Error('Invalid "word" parameter');
+    throw new BadRequestError('Invalid "word" parameter');
   }
 
   const words = Array.from(
@@ -62,13 +56,11 @@ const parseRequest = (request: NextApiRequest): RequestData => {
   );
 
   if (words.length > MAXIMUM_WORDS_COUNT) {
-    throw new Error('Invalid "word" parameter');
+    throw new BadRequestError('Invalid "word" parameter');
   }
 
   return {
     locale,
     words,
   };
-};
-
-export default dictionary;
+}