fontdue-js 2.18.4 → 2.19.1

package/dist/reducer.js

@@ -82,6 +82,10 @@ 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;
+    // 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 (differences[key] === differences[smallest] && smallest === skuId && key !== skuId) return key;
     return smallest;
   }, null);
   if (collectionId) return [collectionId, differences[collectionId]];

package/dist/relay/environment.js

@@ -8,6 +8,7 @@ exports.responseCache = exports.networkFetch = void 0;
 exports.useCurrentEnvironment = useCurrentEnvironment;
 var _react = require("react");
 var _relayRuntime = require("relay-runtime");
+var _corsError = require("../corsError");
 var _package = require("../../package.json");
 // @ts-ignore - JSON import
 
@@ -22,35 +23,48 @@ const CACHE_TTL = 10 * 1000; // 10 seconds, to resolve preloaded results
 function createNetworkFetch(options) {
   return async function networkFetch(request, variables) {
     const url = (FONTDUE_URL && `${FONTDUE_URL}/graphql`) ?? ((options === null || options === void 0 ? void 0 : options.url) ?? '') + '/graphql';
-    const resp = await fetch(url + `?queryName=${request.name}`, {
-      method: 'POST',
-      credentials: 'include',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-        'fontdue-stripe-integration': STRIPE_INTEGRATION ?? ((options === null || options === void 0 ? void 0 : options.stripeIntegration) || 'dynamic'),
-        'fontdue-client-version': _package.version
-      },
-      body: JSON.stringify({
-        query: request.text,
-        variables
-      }),
-      // @ts-ignore
-      next: {
-        tags: ['graphql', `operation:${request.name}`]
+    let resp;
+    try {
+      resp = await fetch(url + `?queryName=${request.name}`, {
+        method: 'POST',
+        credentials: 'include',
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          'fontdue-stripe-integration': STRIPE_INTEGRATION ?? ((options === null || options === void 0 ? void 0 : options.stripeIntegration) || 'dynamic'),
+          'fontdue-client-version': _package.version
+        },
+        body: JSON.stringify({
+          query: request.text,
+          variables
+        }),
+        // @ts-ignore
+        next: {
+          tags: ['graphql', `operation:${request.name}`]
+        }
+      });
+    } catch (error) {
+      if ((0, _corsError.handlePossibleCorsError)(error, url)) {
+        return {
+          data: undefined,
+          errors: [{
+            message: 'Cross-origin request blocked'
+          }]
+        };
       }
-    });
+      throw error;
+    }
     const json = await resp.json();
 
     // GraphQL returns exceptions (for example, a missing required variable) in the "errors"
     // property of the response. If any exceptions occurred when processing the request,
     // throw an error to indicate to the developer what went wrong.
     if (Array.isArray(json.errors)) {
-      var _json$errors;
+      var _json$errors, _error$extensions;
       const error = (_json$errors = json.errors) === null || _json$errors === void 0 ? void 0 : _json$errors[0];
       console.error('GraphQL Error:', {
         message: error.message,
-        code: error.code,
+        code: (_error$extensions = error.extensions) === null || _error$extensions === void 0 ? void 0 : _error$extensions.code,
         path: error.path
       });
     }

package/dist/utils.js

@@ -47,8 +47,8 @@ const collectionSkuIdsDifferences = (state, skuId) => Object.keys(state.collecti
 }).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 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.18.4",
+  "version": "2.19.1",
   "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__'),
+    },
+  },
+});