@massimo-cassandro/minimo 1.11.0 → 1.11.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@massimo-cassandro/minimo",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "Light css framework & utilities",
   "type": "module",
   "main": "./index.js",
@@ -31,12 +31,12 @@
     "url": "git+https://github.com/massimo-cassandro/minimo.git"
   },
   "scripts": {
-    "test": "node --test \"test/**/*.test.mjs\"",
     "UPD-version": "npx update-version  # --config=./dev-utilities.config.mjs",
     "npm-publish": "npm publish",
     "upd@m": "npx upd@m",
     "build-tokens": "node ./design-tokens/utilities/build-tokens.mjs --config ./design-tokens/tokens-config.mjs",
     "check unresolved props": "node ./design-tokens/utilities/check-unresolved-custom-props.mjs --config ./design-tokens/tokens-config.mjs",
+    "test": "node --test \"test/**/*.test.mjs\"",
     "checkJS": "npx tsc --noEmit -p jsconfig.json",
     "checkJS ./src": "npx tsc --noEmit --allowJs --checkJs --target ES2023 --module ESNext --allowSyntheticDefaultImports --moduleResolution bundler declarations.d.ts src/**/*.js"
   },

package/src/components/form-reset-submit.js

@@ -1,5 +1,5 @@
 // import './form.css'; // included in the main CSS entry point
-import { enableSubmitBtns } from '../../index.js';
+import { enableSubmitBtns } from '../utilities/enable-submit-btns.js';
 
 /**
  * Wires up submit validation and button-disabling behaviour on all forms.

package/src/utilities/better-text.js

@@ -1,5 +1,41 @@
 // @ts-check
 
+// Italian particles/articles (plus a few English and topographic terms) whose casing is
+// enforced and after which spaces are turned into non-breaking spaces. Hoisted to module
+// scope with the regexes/lookup built from it below, since none of this depends on the
+// function's arguments and was previously rebuilt on every single betterText() call.
+const PARTICELLE = [
+  'e', 'ed',
+  'di', 'a', 'da', 'in', 'per', 'con', 'su', 'per', 'tra', 'fra',
+  'il', 'lo', 'la', 'i', 'gli', 'le',
+  'un', 'uno', 'una',
+  'del', 'dello', 'della', 'dei', 'degli', 'delle',
+  'al', 'allo', 'alla', 'ai', 'agli', 'alle',
+  'dal', 'dallo', 'dalla', 'dai', 'dagli', 'dalle',
+  'nel', 'nello', 'nella', 'nei', 'negli', 'nelle',
+  'col', 'collo', 'colla', 'con', 'coi', 'cogli', 'colle',
+  'sul', 'sullo', 'sulla', 'sui', 'sugli', 'sulle',
+
+  // topographic terms
+  'C.so', 'Corso', 'Via', 'P.za', 'Piazza', 'L.go', 'Largo', 'V.le', 'Viale',
+  'De', 'San', 'c/o', 'Loc.',
+
+  // English
+  'the', 'a', 'an', 'at', 'out', 'of',
+
+  // words used in geonames
+  'isola', 'isole'
+];
+
+// matches a particle followed by one-or-more spaces, to be turned into non-breaking spaces
+const NBSP_AFTER_PARTICLE_REGEX = new RegExp('\\b(' + PARTICELLE.join('|') + ')\\b +', 'gmi');
+
+// matches any particle regardless of case, to enforce its exact casing in a single pass
+const PARTICLE_CASING_REGEX = new RegExp('\\b(' + PARTICELLE.join('|') + ')\\b', 'gmi');
+
+// lowercased particle → its exact casing, for the replacer used with PARTICLE_CASING_REGEX
+const PARTICLE_CASING_MAP = new Map(PARTICELLE.map(term => [term.toLowerCase(), term]));
+
 /**
  * Improves a text string by fixing punctuation spacing, multiple spaces,
  * typographic quotes, non-breaking spaces after Italian particles/articles,
@@ -11,29 +47,6 @@
  */
 export function betterText(str, custom_words = []) {
 
-  const particelle = [
-    'e', 'ed',
-    'di', 'a', 'da', 'in', 'per', 'con', 'su', 'per', 'tra', 'fra',
-    'il', 'lo', 'la', 'i', 'gli', 'le',
-    'un', 'uno', 'una',
-    'del', 'dello', 'della', 'dei', 'degli', 'delle',
-    'al', 'allo', 'alla', 'ai', 'agli', 'alle',
-    'dal', 'dallo', 'dalla', 'dai', 'dagli', 'dalle',
-    'nel', 'nello', 'nella', 'nei', 'negli', 'nelle',
-    'col', 'collo', 'colla', 'con', 'coi', 'cogli', 'colle',
-    'sul', 'sullo', 'sulla', 'sui', 'sugli', 'sulle',
-
-    // topographic terms
-    'C.so', 'Corso', 'Via', 'P.za', 'Piazza', 'L.go', 'Largo', 'V.le', 'Viale',
-    'De', 'San', 'c/o', 'Loc.',
-
-    // English
-    'the', 'a', 'an', 'at', 'out', 'of',
-
-    // words used in geonames
-    'isola', 'isole'
-  ];
-
   if(str) {
     str = str.trim();
 
@@ -57,16 +70,12 @@ export function betterText(str, custom_words = []) {
     str = str.replace(/((^| )(l|un|d|all|dell|nell|sull)('|')) /gi, '$1' );
 
     // replace regular spaces with non-breaking spaces after Italian particles/articles
-    var re = new RegExp('\\b(' + particelle.join('|') + ')\\b +', 'gmi');
-    str = str.replace(re, function (match) {
+    str = str.replace(NBSP_AFTER_PARTICLE_REGEX, function (match) {
       return match.replace(/ +/g, '\u00A0');
     });
 
-    // enforce exact casing of each particle
-    particelle.forEach(term => {
-      const re = new RegExp('\\b(' + term + ')\\b', 'gmi');
-      str = str.replace(re, term);
-    });
+    // enforce exact casing of every particle in a single pass
+    str = str.replace(PARTICLE_CASING_REGEX, match => PARTICLE_CASING_MAP.get(match.toLowerCase()) ?? match);
 
     if(custom_words.length) {
       custom_words.forEach(item => {