fontdue-js 2.19.0 → 2.19.2

package/dist/reducer.js

@@ -82,13 +82,27 @@ const collectionSkuIdWithDiscount = (state, skuId) => {
   const differences = (0, _utils.collectionSkuIdsDifferences)(state, skuId);
   const collectionId = Object.keys(differences).filter(collSkuId => differences[collSkuId] <= state.skuPrices[skuId]).reduce((smallest, key) => {
     if (!smallest || differences[key] < differences[smallest]) return key;
+    if (differences[key] === differences[smallest]) {
+      // When differences are equal, prefer a collection that is not the
+      // SKU being selected — this ensures collection bundles are preferred
+      // over selecting the family itself at the same price
+      if (smallest === skuId && key !== skuId) return key;
+      // Among non-self candidates, prefer the one covering more unique
+      // font styles — this ensures the most comprehensive collection wins
+      if (smallest !== skuId && key !== skuId) {
+        var _state$collectionStyl, _state$collectionStyl2;
+        const smallestStyles = new Set((_state$collectionStyl = state.collectionStyleSkus[smallest]) === null || _state$collectionStyl === void 0 ? void 0 : _state$collectionStyl.fontStyleSkuIds).size;
+        const keyStyles = new Set((_state$collectionStyl2 = state.collectionStyleSkus[key]) === null || _state$collectionStyl2 === void 0 ? void 0 : _state$collectionStyl2.fontStyleSkuIds).size;
+        if (keyStyles > smallestStyles) return key;
+      }
+    }
     return smallest;
   }, null);
   if (collectionId) return [collectionId, differences[collectionId]];
   return [null, null];
 };
 exports.collectionSkuIdWithDiscount = collectionSkuIdWithDiscount;
-const selectedCollectionSkuIdContainingSkuId = (state, skuId) => Object.keys(state.selectedSkuIds).filter(id => state.selectedSkuIds[id] === true).find(selectedSkuId => (0, _utils.collContainsSkuId)(state.collectionStyleSkus[selectedSkuId], skuId));
+const selectedCollectionSkuIdContainingSkuId = (state, skuId) => Object.keys(state.selectedSkuIds).filter(id => state.selectedSkuIds[id] === true).find(selectedSkuId => (0, _utils.collTransitivelyContainsSkuId)(state.collectionStyleSkus, selectedSkuId, skuId));
 const setKeysFalse = (acc, key) => {
   acc[key] = false;
   return acc;
@@ -100,12 +114,24 @@ const unselectedMembersSkuIds = (state, action) => {
     selected
   } = action;
   if (!selected) return {}; // only do this in case we are selecting something
-  const collectionMemberSkus = state.collectionStyleSkus[skuId];
-  if (!collectionMemberSkus) return {}; // we don't have data for this sku
-  return {
-    ...collectionMemberSkus.fontStyleSkuIds.reduce(setKeysFalse, {}),
-    ...collectionMemberSkus.childrenSkuIds.reduce(setKeysFalse, {})
+
+  // Recursively collect all descendant SKU IDs so that transitive
+  // selections (e.g., collection bundle → family → bundle) are all
+  // marked as false
+  const result = {};
+  const collectMembers = collSkuId => {
+    const members = state.collectionStyleSkus[collSkuId];
+    if (!members) return;
+    for (const id of members.fontStyleSkuIds) {
+      result[id] = false;
+    }
+    for (const id of members.childrenSkuIds) {
+      result[id] = false;
+      collectMembers(id);
+    }
   };
+  collectMembers(skuId);
+  return result;
 };
 const selectSkuId = (state, action) => {
   if (action.type !== 'SELECT_SKU_ID') return state;

package/dist/utils.d.ts

@@ -4,6 +4,9 @@ export declare const pluralize: (count: number, singular: string, plural?: strin
 export declare function notEmpty<TValue>(value: TValue | null | undefined): value is TValue;
 export declare function kebabToCamel(str: string): string;
 export declare const collContainsSkuId: (coll: CollectionStyleSkus | undefined, skuIdOrStyleId: string) => boolean;
+export declare const collTransitivelyContainsSkuId: (collectionStyleSkus: {
+    [key: string]: CollectionStyleSkus | undefined;
+}, collSkuId: string, skuIdOrStyleId: string) => boolean;
 interface CollectionSkuIdsDifferences {
     [collectionSkuId: string]: number;
 }

package/dist/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.compareVariableSettings = exports.collectionSkuIdsDifferences = exports.collContainsSkuId = void 0;
+exports.compareVariableSettings = exports.collectionSkuIdsDifferences = exports.collTransitivelyContainsSkuId = exports.collContainsSkuId = void 0;
 exports.getFeatureGlyphs = getFeatureGlyphs;
 exports.isSelected = exports.inspect = void 0;
 exports.kebabToCamel = kebabToCamel;
@@ -29,12 +29,25 @@ const collContainsSkuId = (coll, skuIdOrStyleId) => {
   if (!coll) return false;
   return coll.childrenSkuIds.indexOf(skuIdOrStyleId) >= 0 || coll.fontStyleSkuIds.indexOf(skuIdOrStyleId) >= 0 || coll.fontStyleIds.indexOf(skuIdOrStyleId) >= 0;
 };
+
+// Transitive containment check — walks the collection hierarchy to find
+// if a SKU is contained at any depth (e.g., collection bundle → family → bundle)
 exports.collContainsSkuId = collContainsSkuId;
+const collTransitivelyContainsSkuId = (collectionStyleSkus, collSkuId, skuIdOrStyleId) => {
+  const coll = collectionStyleSkus[collSkuId];
+  if (!coll) return false;
+  if (collContainsSkuId(coll, skuIdOrStyleId)) return true;
+  return coll.childrenSkuIds.some(childSkuId => collTransitivelyContainsSkuId(collectionStyleSkus, childSkuId, skuIdOrStyleId));
+};
+exports.collTransitivelyContainsSkuId = collTransitivelyContainsSkuId;
 const isSelected = skuIdOrStyleId => state => {
   if (!skuIdOrStyleId) return false;
-  // get the collections that contain this skuId as a fontStyle
-  const collectionSkuIds = Object.keys(state.collectionStyleSkus).filter(collSkuId => collContainsSkuId(state.collectionStyleSkus[collSkuId], skuIdOrStyleId));
-  return state.selectedSkuIds[skuIdOrStyleId] === true || collectionSkuIds.some(collSkuId => state.selectedSkuIds[collSkuId] === true);
+  if (state.selectedSkuIds[skuIdOrStyleId] === true) return true;
+  // get the collections that contain this skuId as a fontStyle or child
+  const parentCollectionSkuIds = Object.keys(state.collectionStyleSkus).filter(collSkuId => collContainsSkuId(state.collectionStyleSkus[collSkuId], skuIdOrStyleId));
+  // Recursively check ancestors — handles transitive selection
+  // (e.g., collection bundle → family → bundle)
+  return parentCollectionSkuIds.some(parentSkuId => isSelected(parentSkuId)(state));
 };
 
 // find any collection ancestors that contain this skuId,
@@ -42,13 +55,11 @@ const isSelected = skuIdOrStyleId => state => {
 // and return the delta between the collection price and the sum.
 exports.isSelected = isSelected;
 const collectionSkuIdsDifferences = (state, skuId) => Object.keys(state.collectionStyleSkus).filter(collectionSkuId => {
-  const coll = state.collectionStyleSkus[collectionSkuId];
-  return skuId === collectionSkuId || collContainsSkuId(coll, skuId);
+  return skuId === collectionSkuId || collTransitivelyContainsSkuId(state.collectionStyleSkus, collectionSkuId, skuId);
 }).reduce((acc, collectionSkuId) => {
-  const coll = state.collectionStyleSkus[collectionSkuId];
-  const selectedSkuIdsInColl = Object.keys(state.selectedSkuIds).filter(selectedSkuId => state.selectedSkuIds[selectedSkuId] === true && collContainsSkuId(coll, selectedSkuId));
-  const sumOfSelectedSkuIdsInColl = selectedSkuIdsInColl.map(selectedSkuId => state.skuPrices[selectedSkuId]).reduce((acc, price) => acc + price, 0);
-  acc[collectionSkuId] = state.skuPrices[collectionSkuId] - sumOfSelectedSkuIdsInColl;
+  const selectedSkuIdsInColl = Object.keys(state.selectedSkuIds).filter(selectedSkuId => state.selectedSkuIds[selectedSkuId] === true && collTransitivelyContainsSkuId(state.collectionStyleSkus, collectionSkuId, selectedSkuId));
+  const sumOfSelectedSkuIdsInColl = selectedSkuIdsInColl.map(selectedSkuId => state.skuPrices[selectedSkuId] ?? 0).reduce((acc, price) => acc + price, 0);
+  acc[collectionSkuId] = (state.skuPrices[collectionSkuId] ?? 0) - sumOfSelectedSkuIdsInColl;
   return acc;
 }, {});
 exports.collectionSkuIdsDifferences = collectionSkuIdsDifferences;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fontdue-js",
-  "version": "2.19.0",
+  "version": "2.19.2",
   "scripts": {
     "build": "npm run relay && run-p build-js build-css build-ts",
     "build-js": "babel src --out-dir dist --extensions .ts,.tsx,.js,.jsx",
@@ -8,6 +8,8 @@
     "build-css": "sass --load-path=node_modules --no-source-map src/index.scss dist/fontdue.css",
     "relay": "relay-compiler",
     "update-unicode-data": "node src/scripts/updateUnicodeData.js",
+    "test": "vitest run",
+    "test:watch": "vitest",
     "prepublishOnly": "npm run build"
   },
   "author": "Fontdue",
@@ -60,7 +62,8 @@
     "react-dom": "^19.0.0",
     "relay-compiler": "^18.0.0",
     "sass": "^1.62",
-    "typescript": "^5.9"
+    "typescript": "^5.9",
+    "vitest": "^4.1.1"
   },
   "relay": {
     "src": "./src",

package/vitest.config.ts

@@ -0,0 +1,10 @@
+import { defineConfig } from 'vitest/config';
+import path from 'path';
+
+export default defineConfig({
+  test: {
+    alias: {
+      '__generated__': path.resolve(__dirname, 'src/__generated__'),
+    },
+  },
+});