@unchainedshop/api 4.0.0-rc.2 → 4.0.0-rc.4

package/src/loaders/buildLocaleMap.test.ts

@@ -0,0 +1,65 @@
+import { describe, it } from 'node:test';
+import assert from 'node:assert';
+import buildLocaleMap from './buildLocaleMap.js';
+
+const testTexts = [
+  // 1 has translations in French and German
+  { locale: 'fr', _id: '1', entityId: '1' },
+  { locale: 'de', _id: '2', entityId: '1' },
+
+  // 2 only has Ialien translations
+  { locale: 'it', _id: '3', entityId: '2' },
+
+  // 3 only has English translations
+  { locale: 'en', _id: '4', entityId: '3' },
+
+  // 4 only has German translations
+  { locale: 'de', _id: '5', entityId: '4' },
+];
+
+describe('buildLocaleMap', () => {
+  it('Mixed usage of default locale and forced languages', () => {
+    const queries = [
+      { locale: new Intl.Locale('de-CH') },
+      { locale: new Intl.Locale('fr') },
+      { locale: new Intl.Locale('it') },
+    ];
+    const expected = {
+      de: ['de-CH', 'fr', 'it'],
+      fr: ['fr'],
+      it: ['it'],
+    };
+    const result = buildLocaleMap(queries, testTexts);
+    assert.deepStrictEqual(result, expected);
+  });
+
+  it('Mixed usage of forced languages', () => {
+    const queries = [{ locale: new Intl.Locale('fr') }, { locale: new Intl.Locale('it') }];
+    const expected = {
+      de: ['fr', 'it'],
+      fr: ['fr'],
+      it: ['it'],
+    };
+    const result = buildLocaleMap(queries, testTexts);
+    assert.deepStrictEqual(result, expected);
+  });
+
+  it('Only default locale', () => {
+    const queries = [{ locale: new Intl.Locale('de-CH') }];
+    const expected = {
+      de: ['de-CH'],
+    };
+    const result = buildLocaleMap(queries, testTexts);
+    assert.deepStrictEqual(result, expected);
+  });
+
+  it('Only one forced language locale', () => {
+    const queries = [{ locale: new Intl.Locale('fr') }];
+    const expected = {
+      fr: ['fr'],
+      de: ['fr'],
+    };
+    const result = buildLocaleMap(queries, testTexts);
+    assert.deepStrictEqual(result, expected);
+  });
+});

package/src/loaders/buildLocaleMap.ts

@@ -0,0 +1,73 @@
+import { systemLocale } from '@unchainedshop/utils';
+
+function getLocaleStrings(locale: Intl.Locale): string[] {
+  try {
+    const locales = new Set<string>();
+    locales.add(locale.baseName);
+    locales.add(locale.language);
+    locales.add(systemLocale.baseName);
+    locales.add(systemLocale.language);
+    return Array.from(locales);
+  } catch {
+    // Optimized Set creation and spread
+    const locales = new Set<string>();
+    locales.add(systemLocale.baseName);
+    locales.add(systemLocale.language);
+    return Array.from(locales);
+  }
+}
+export default function buildLocaleMap(
+  queries: readonly { locale: Intl.Locale }[],
+  texts: readonly { locale?: string }[],
+): Record<string, string[]> {
+  // key = texts.locale
+  // value = input query locale
+  const queryLocales = new Set(queries.map((q) => q.locale));
+  const textLocales = new Set(texts.map((t) => t.locale));
+  const localeMap: Record<string, string[]> = {};
+  for (const queryLocale of queryLocales) {
+    const potentialMatches = getLocaleStrings(queryLocale);
+    const matches = potentialMatches.filter((l) => textLocales.has(l));
+    for (const match of matches) {
+      if (!localeMap[match]) localeMap[match] = [];
+      localeMap[match].push(queryLocale.toString());
+    }
+  }
+  return localeMap;
+}
+
+// import { systemLocale } from '@unchainedshop/utils';
+
+// export function getLocaleStrings(locale: Intl.Locale) {
+//   try {
+//     return [
+//       ...new Set([locale.baseName, locale.language, systemLocale.baseName, systemLocale.language]),
+//     ];
+//   } catch {
+//     return [...new Set([systemLocale.baseName, systemLocale.language])];
+//   }
+// }
+
+// export function buildLocaleMap(
+//   queries: readonly { locale: Intl.Locale }[],
+//   texts: readonly { locale?: string }[],
+// ): Record<string, string[]> {
+//   // key = texts.locale
+//   // value = input query locale
+
+//   const queryLocales = Object.values(
+//     Object.fromEntries(queries.map((q) => [q.locale.baseName, q.locale])),
+//   );
+
+//   const textLocales: string[] = [...new Set(texts.map((t) => t.locale))];
+//   const localeMap = {};
+//   for (const queryLocale of queryLocales) {
+//     const potentialMatches = getLocaleStrings(queryLocale);
+//     const matches = potentialMatches.filter((l) => textLocales.includes(l));
+//     for (const match of matches) {
+//       if (!localeMap[match]) localeMap[match] = [];
+//       localeMap[match].push(queryLocale);
+//     }
+//   }
+//   return localeMap;
+// }

package/src/loaders/buildTextMap.test.ts

@@ -0,0 +1,54 @@
+import { describe, it } from 'node:test';
+import assert from 'node:assert';
+import buildTextMap from './buildTextMap.js';
+
+const testTexts = [
+  // 1 has translations in French and German
+  { locale: 'fr', _id: 'french-1', entityId: '1' },
+  { locale: 'de', _id: 'german-1', entityId: '1' },
+
+  // 2 only has Ialien translations
+  { locale: 'it', _id: 'italian-2', entityId: '2' },
+
+  // 3 only has English translations
+  { locale: 'en', _id: 'english-3', entityId: '3' },
+
+  // 4 only has German translations
+  { locale: 'de', _id: 'german-4', entityId: '4' },
+];
+
+describe('buildTextMap', () => {
+  it('Generate a correct text map for all fallbacks', () => {
+    const localeMap = {
+      de: ['de-CH', 'fr', 'it'],
+      fr: ['fr'],
+      it: ['it'],
+    };
+    const expected = {
+      'de-CH1': {
+        _id: 'german-1',
+      },
+      fr1: {
+        _id: 'french-1',
+      },
+      it1: {
+        _id: 'german-1',
+      },
+      'de-CH4': {
+        _id: 'german-4',
+      },
+      fr4: {
+        _id: 'german-4',
+      },
+      it4: {
+        _id: 'german-4',
+      },
+      it2: {
+        _id: 'italian-2',
+      },
+    };
+    const result = buildTextMap(localeMap, testTexts, (text) => text.entityId);
+
+    assert.partialDeepStrictEqual(result, expected);
+  });
+});

package/src/loaders/buildTextMap.ts

@@ -1,17 +1,36 @@
 type ArrayElement<T> = T extends (infer U)[] ? U : never;
 
+/* This file has been optimized for performance to the last drop. Don't refactor! */
+
 export default function buildTextMap<T extends { locale?: string }[]>(
   localeMap: Record<string, string[]>,
   texts: Readonly<T>,
   buildId: (item: ArrayElement<T>) => string,
 ) {
-  const textsMap = {};
-  for (const [originLocale, localesForText] of Object.entries(localeMap)) {
-    for (const text of texts) {
+  const textsMap: Record<string, ArrayElement<T>> = {}; // Added type for textsMap
+  const localeMapKeys = Object.keys(localeMap);
+
+  // eslint-disable-next-line
+  for (let i = 0; i < localeMapKeys.length; i++) {
+    const originLocale = localeMapKeys[i];
+    const localesForText = localeMap[originLocale];
+
+    // eslint-disable-next-line
+    for (let j = 0; j < texts.length; j++) {
+      const text = texts[j];
       if (originLocale !== text.locale) continue;
-      for (const locale of localesForText) {
-        if (textsMap[locale + buildId(text as any)]) continue;
-        textsMap[locale + buildId(text as any)] = text;
+
+      const idPart = buildId(text as ArrayElement<T>); // Ensured correct type for buildId argument
+
+      // eslint-disable-next-line
+      for (let k = 0; k < localesForText.length; k++) {
+        const locale = localesForText[k];
+        const key = locale + idPart;
+        if (textsMap[key] && locale !== text.locale) {
+          // If the key already exists and the locale is a fallback, skip this text
+          continue;
+        }
+        textsMap[key] = text as ArrayElement<T>; // Ensured correct type for assignment
       }
     }
   }

package/src/loaders/filterTextLoader.ts

@@ -1,6 +1,6 @@
 import { UnchainedCore } from '@unchainedshop/core';
 import DataLoader from 'dataloader';
-import { buildLocaleMap } from './utils.js';
+import buildLocaleMap from './buildLocaleMap.js';
 import { FilterText } from '@unchainedshop/core-filters';
 import buildTextMap from './buildTextMap.js';
 

package/src/loaders/productMediaTextLoader.ts

@@ -1,7 +1,7 @@
 import { UnchainedCore } from '@unchainedshop/core';
 import DataLoader from 'dataloader';
-import { buildLocaleMap } from './utils.js';
 import { ProductMediaText } from '@unchainedshop/core-products';
+import buildLocaleMap from './buildLocaleMap.js';
 import buildTextMap from './buildTextMap.js';
 
 export default (unchainedAPI: UnchainedCore) =>

package/src/loaders/productTextLoader.ts

@@ -1,8 +1,8 @@
 import { UnchainedCore } from '@unchainedshop/core';
 import DataLoader from 'dataloader';
-import { buildLocaleMap } from './utils.js';
 import { ProductText } from '@unchainedshop/core-products';
 import buildTextMap from './buildTextMap.js';
+import buildLocaleMap from './buildLocaleMap.js';
 
 export default (unchainedAPI: UnchainedCore) =>
   new DataLoader<{ productId: string; locale: Intl.Locale }, ProductText>(async (queries) => {

package/src/locale-context.ts

@@ -1,9 +1,4 @@
-import {
-  resolveBestCountry,
-  resolveBestSupported,
-  resolveBestCurrency,
-  systemLocale,
-} from '@unchainedshop/utils';
+import { resolveBestCountry, resolveBestSupported, resolveBestCurrency } from '@unchainedshop/utils';
 import { UnchainedCore } from '@unchainedshop/core';
 import pMemoize from 'p-memoize';
 import ExpiryMap from 'expiry-map';
@@ -45,7 +40,7 @@ export const resolveDefaultContext = pMemoize(
       return accumulator.concat(added);
     }, []);
 
-    const locale = resolveBestSupported(acceptLang, supportedLocaleStrings, systemLocale.baseName);
+    const locale = resolveBestSupported(acceptLang, supportedLocaleStrings);
     const countryCode = resolveBestCountry(locale.region, acceptCountry, countries);
     const currencyCode = resolveBestCurrency(defaultCurrencyCodes[countryCode], currencies);
 

package/src/mcp/README.md

@@ -0,0 +1,25 @@
+# MCP Server
+
+This directory contains the Model Context Protocol (MCP) server implementation for Unchained Commerce.
+
+## Structure
+
+```
+mcp/
+├── index.ts              # Main MCP server setup
+├── types.ts              # Shared type definitions
+├── tools/                # Individual tool implementations
+│   ├── index.ts          # Re-exports for all tools
+│   └── listProducts.ts   # List products tool
+└── utils/                # Shared utilities
+    └── html.ts           # HTML generation utilities
+```
+
+## Adding New Tools
+
+To add a new tool:
+
+1. Create a new file in the `tools/` directory
+2. Export the schema and handler from the file
+3. Add the exports to `tools/index.ts`
+4. Register the tool in the main `index.ts` file