@justanarthur/payload-plugin-translator 3.3.4 → 3.4.0

package/dist/index.js

@@ -8,15 +8,15 @@ import {
   isTranslateMode,
   createTranslateTask2,
   createTranslateWorkflow2
-} from "./shared/chunk-g3rrecgk.js";
-import"./shared/chunk-8hqdxnxy.js";
+} from "./shared/chunk-k3q5eq41.js";
+import"./shared/chunk-m5jdmn2w.js";
 import {
   readLocales,
   parseEntityKey,
   hasTranslateWorkflow,
   queueBulkTranslation,
   runQueuedTranslations
-} from "./shared/chunk-8hm2r1wg.js";
+} from "./shared/chunk-9ky9w8k3.js";
 import {
   TRANSLATION_STATUS_SLUG2,
   REVIEW_VIEW_PATH

package/dist/jobs.js

@@ -3,11 +3,11 @@ import {
   createAutoTranslateGlobalHook2,
   createTranslateTask2,
   createTranslateWorkflow2
-} from "./shared/chunk-g3rrecgk.js";
+} from "./shared/chunk-k3q5eq41.js";
 import {
   TRANSLATE_TASK_SLUG2,
   TRANSLATE_WORKFLOW_SLUG2
-} from "./shared/chunk-8hqdxnxy.js";
+} from "./shared/chunk-m5jdmn2w.js";
 
 // src/exports/jobs.ts
 var jobs = {

package/dist/rsc.js

@@ -1,11 +1,11 @@
-import"./shared/chunk-8hqdxnxy.js";
+import"./shared/chunk-m5jdmn2w.js";
 import {
   readLocales,
   loadCollectionReview,
   loadGlobalsReview,
   loadEntityLocaleReview,
   loadJobsProgress
-} from "./shared/chunk-8hm2r1wg.js";
+} from "./shared/chunk-9ky9w8k3.js";
 import {
   REVIEW_VIEW_PATH
 } from "./shared/chunk-31qgv1zk.js";

package/dist/shared/{chunk-8hm2r1wg.js → chunk-9ky9w8k3.js}

@@ -1,13 +1,16 @@
 import {
   loadWrongLanguageCheck,
-  samePlaceholders,
   plainText,
+  buildCrossLocaleTexts,
+  crossLocaleMatch,
+  isOpaqueText,
   looksUntranslated,
-  TRANSLATE_WORKFLOW_SLUG2,
   collectTranslatableFields,
+  samePlaceholders,
+  TRANSLATE_WORKFLOW_SLUG2,
   entityKey,
   sourceHash
-} from "./chunk-8hqdxnxy.js";
+} from "./chunk-m5jdmn2w.js";
 import {
   TRANSLATION_STATUS_SLUG2
 } from "./chunk-31qgv1zk.js";
@@ -23,15 +26,15 @@ var classify = (field, sourceText, targetText) => {
     return "identical";
   return "ok";
 };
-var computeStatus = (fields, language) => {
+var computeStatus = (fields, options) => {
   const statuses = [];
   for (const field of fields) {
     const sourceText = plainText(field.source);
     if (!normalize(sourceText))
       continue;
-    const targetText = plainText(field.target);
+    const targetText = normalize(plainText(field.target));
     const state = classify(field, sourceText, targetText);
-    const detectedLanguage = state === "ok" && field.type !== "slug" && language?.check ? language.check(targetText, language.locale) ?? undefined : undefined;
+    const detectedLanguage = state === "ok" && field.type !== "slug" && !isOpaqueText(targetText) ? options?.check?.(targetText, options.locale) ?? (options?.crossLocale ? crossLocaleMatch(options.crossLocale, field.path, options.locale, targetText) : undefined) : undefined;
     statuses.push({
       ...field,
       sourceText,
@@ -80,19 +83,27 @@ var loadStatusRows = async (req, keys) => {
   return docs;
 };
 var loadLanguageCheck = (req) => pluginOptions(req)?.languageDetection === false ? Promise.resolve(null) : loadWrongLanguageCheck(readLocales(req).targetLocales.concat(readLocales(req).defaultLocale));
-var reviewLocale = (config, source, target, hash, row, req, locale, check) => {
-  const { fields, summary } = computeStatus(collectTranslatableFields({
-    config,
-    dataFrom: source,
-    dataTarget: target ?? {},
-    options: pluginOptions(req)?._options
-  }), { locale, check });
-  return {
-    fields,
-    summary,
-    stale: Boolean(row?.sourceHash) && row?.sourceHash !== hash,
-    reviewed: Boolean(row?.reviewedHash) && row?.reviewedHash === hash
-  };
+var reviewEntity = (config, source, targetByLocale, targetLocales, hash, rowByLocale, req, check) => {
+  const options = pluginOptions(req)?._options;
+  const fieldsPerLocale = targetLocales.map((locale) => ({
+    locale,
+    fields: collectTranslatableFields({
+      config,
+      dataFrom: source,
+      dataTarget: targetByLocale[locale] ?? {},
+      options
+    })
+  }));
+  const crossLocale = buildCrossLocaleTexts(fieldsPerLocale);
+  return Object.fromEntries(fieldsPerLocale.map(({ locale, fields }) => {
+    const row = rowByLocale(locale);
+    const { fields: _fields, ...review } = {
+      ...computeStatus(fields, { locale, check, crossLocale }),
+      stale: Boolean(row?.sourceHash) && row?.sourceHash !== hash,
+      reviewed: Boolean(row?.reviewedHash) && row?.reviewedHash === hash
+    };
+    return [locale, review];
+  }));
 };
 var labelOf = (config, doc) => {
   const title = doc[config.admin?.useAsTitle ?? "id"];
@@ -143,10 +154,7 @@ var loadCollectionReview = async ({ req, collectionSlug, page = 1, limit = 25 })
       label: labelOf(config, source),
       collectionSlug,
       id: source.id,
-      locales: Object.fromEntries(targetLocales.map((locale) => {
-        const { fields: _fields, ...review } = reviewLocale(config, source, targets[locale].get(String(source.id)), hash, rows.find((row) => row.entity === key && row.locale === locale), req, locale, check);
-        return [locale, review];
-      }))
+      locales: reviewEntity(config, source, Object.fromEntries(targetLocales.map((locale) => [locale, targets[locale].get(String(source.id))])), targetLocales, hash, (locale) => rows.find((row) => row.entity === key && row.locale === locale), req, check)
     };
   });
   return {
@@ -177,11 +185,11 @@ var loadGlobalsReview = async ({ req, globalSlugs }) => {
     const source = await read(defaultLocale);
     const hash = hashOf(config, source, req);
     const key = entityKey({ globalSlug });
-    const locales = {};
+    const targetByLocale = {};
     for (const locale of targetLocales) {
-      const { fields: _fields, ...review } = reviewLocale(config, source, await read(locale), hash, rows.find((row) => row.entity === key && row.locale === locale), req, locale, check);
-      locales[locale] = review;
+      targetByLocale[locale] = await read(locale);
     }
+    const locales = reviewEntity(config, source, targetByLocale, targetLocales, hash, (locale) => rows.find((row) => row.entity === key && row.locale === locale), req, check);
     entities.push({ key, label: globalLabel(config), globalSlug, locales });
   }
   return { entities, locales: targetLocales };
@@ -199,10 +207,14 @@ var loadEntityLocaleReview = async ({ req, entity, locale }) => {
     throw new Error(`unknown entity ${entity}`);
   const read = (readLocale) => globalSlug ? req.payload.findGlobal({ slug: globalSlug, locale: readLocale, fallbackLocale: false, depth: 0, overrideAccess: false, req }) : req.payload.findByID({ collection: collectionSlug, id, locale: readLocale, fallbackLocale: false, depth: 0, overrideAccess: false, req });
   const source = await read(defaultLocale);
-  const target = await read(locale);
   const rows = await loadStatusRows(req, [entity]);
   const row = rows.find((each) => each.locale === locale);
-  const review = reviewLocale(config, source, target, hashOf(config, source, req), row, req, locale, await loadLanguageCheck(req));
+  const { targetLocales } = readLocales(req);
+  const targetByLocale = {};
+  for (const each of targetLocales) {
+    targetByLocale[each] = await read(each);
+  }
+  const review = reviewEntity(config, source, targetByLocale, targetLocales, hashOf(config, source, req), (each) => rows.find((row2) => row2.locale === each), req, await loadLanguageCheck(req))[locale];
   return {
     ...review,
     entity,

package/dist/shared/{chunk-g3rrecgk.js → chunk-k3q5eq41.js}

@@ -1,13 +1,15 @@
 import {
   loadWrongLanguageCheck,
-  samePlaceholders,
   plainText,
+  buildCrossLocaleTexts,
+  crossLocaleMatch,
   traverseFields,
-  TRANSLATE_WORKFLOW_SLUG2,
   collectTranslatableFields,
+  samePlaceholders,
+  TRANSLATE_WORKFLOW_SLUG2,
   entityKey,
   sourceHash
-} from "./chunk-8hqdxnxy.js";
+} from "./chunk-m5jdmn2w.js";
 import {
   TRANSLATION_STATUS_SLUG2
 } from "./chunk-31qgv1zk.js";
@@ -102,6 +104,35 @@ var preview = (value) => {
   return JSON.stringify(flat.length > 60 ? `${flat.slice(0, 57)}…` : flat);
 };
 var localeCodes = (req) => (req.payload.config.localization ? req.payload.config.localization.locales : []).map((each) => typeof each === "string" ? each : each.code);
+var buildCrossLocaleTextsFor = async ({
+  config,
+  dataFrom,
+  req,
+  args
+}) => {
+  const others = localeCodes(req).filter((each) => each !== args.locale && each !== args.localeFrom);
+  const fieldsPerLocale = [];
+  for (const locale of others) {
+    const { doc } = await findEntityWithConfig({
+      collectionSlug: args.collectionSlug,
+      globalSlug: args.globalSlug,
+      id: args.id,
+      locale,
+      overrideAccess: args.overrideAccess,
+      req
+    });
+    fieldsPerLocale.push({
+      locale,
+      fields: collectTranslatableFields({
+        config,
+        dataFrom,
+        dataTarget: doc,
+        options: req.payload.config.custom?.translator?._options
+      })
+    });
+  }
+  return buildCrossLocaleTexts(fieldsPerLocale);
+};
 var translateOperation2 = async (args) => {
   const req = "req" in args ? args.req : {
     payload: args.payload
@@ -136,8 +167,10 @@ var translateOperation2 = async (args) => {
     });
     translatedData = doc;
   }
-  const wrongLanguageCheck = args.retranslateIdentical && req.payload.config.custom?.translator?.languageDetection !== false ? await loadWrongLanguageCheck(localeCodes(req)) : null;
-  const isWrongLanguage = wrongLanguageCheck ? (target) => Boolean(wrongLanguageCheck(plainText(target), args.locale)) : undefined;
+  const detectionOn = args.retranslateIdentical && req.payload.config.custom?.translator?.languageDetection !== false;
+  const wrongLanguageCheck = detectionOn ? await loadWrongLanguageCheck(localeCodes(req)) : null;
+  const crossLocale = detectionOn ? await buildCrossLocaleTextsFor({ config, dataFrom, req, args }) : undefined;
+  const isWrongLanguage = wrongLanguageCheck || crossLocale ? (target, path) => Boolean(wrongLanguageCheck?.(plainText(target), args.locale)) || (path !== undefined && crossLocale !== undefined ? crossLocaleMatch(crossLocale, path, args.locale, plainText(target)) !== undefined : false) : undefined;
   traverseFields({
     dataFrom,
     emptyOnly: args.emptyOnly,

package/dist/shared/{chunk-8hqdxnxy.js → chunk-m5jdmn2w.js}

@@ -20,9 +20,10 @@ var looksLikeList = (text) => {
   const lengths = lines.map((line) => line.length).sort((a, b) => a - b);
   return lengths[Math.floor(lengths.length / 2)] < MIN_LENGTH;
 };
-var detector;
+var eldModule;
 var loadWrongLanguageCheck = (locales) => {
-  detector ??= import("eld/small").then(({ eld }) => {
+  eldModule ??= import("eld/small");
+  return eldModule.then(({ eld }) => {
     const languages = [...new Set(locales.map(base))];
     eld.setLanguageSubset(languages);
     return (text, expectedLocale) => {
@@ -41,13 +42,8 @@ var loadWrongLanguageCheck = (locales) => {
       return lead >= margin ? result.language : null;
     };
   }).catch(() => null);
-  return detector;
 };
 
-// src/utils/placeholders.ts
-var placeholdersOf = (value) => (value.match(/\{\s*[\w.]+\s*(?:,[^{}]*)?\}/g) ?? []).map((each) => each.replace(/\s+/g, "")).sort();
-var samePlaceholders = (source, translated) => placeholdersOf(source).join("|") === placeholdersOf(translated).join("|");
-
 // src/utils/plainText.ts
 var plainText = (value) => {
   if (typeof value === "string")
@@ -67,6 +63,34 @@ var plainText = (value) => {
   return "";
 };
 
+// src/utils/crossLocale.ts
+var normalize = (text) => text.replace(/\s+/g, " ").trim();
+var buildCrossLocaleTexts = (fieldsPerLocale) => {
+  const texts = new Map;
+  for (const { locale, fields } of fieldsPerLocale) {
+    for (const field of fields) {
+      const value = normalize(plainText(field.target));
+      if (!value || value === normalize(plainText(field.source)))
+        continue;
+      const byLocale = texts.get(field.path) ?? new Map;
+      byLocale.set(locale, value);
+      texts.set(field.path, byLocale);
+    }
+  }
+  return texts;
+};
+var crossLocaleMatch = (texts, path, locale, text) => {
+  const value = normalize(text);
+  if (!value)
+    return;
+  for (const [other, otherValue] of texts.get(path) ?? []) {
+    if (other === locale || otherValue !== value || CLOSE_PAIRS.has(`${locale}|${other}`))
+      continue;
+    return other;
+  }
+  return;
+};
+
 // src/translate/traverseFields.ts
 import ObjectID from "bson-objectid";
 import { tabHasName } from "payload/shared";
@@ -112,10 +136,10 @@ var isOpaqueText = (value) => {
 };
 
 // src/utils/looksUntranslated.ts
-var normalize = (text) => text.replace(/\s+/g, " ").trim();
+var normalize2 = (text) => text.replace(/\s+/g, " ").trim();
 var looksUntranslated = (source, target) => {
-  const sourceText = normalize(plainText(source));
-  return sourceText.length > 3 && /\s/.test(sourceText) && !isOpaqueText(sourceText) && sourceText === normalize(plainText(target));
+  const sourceText = normalize2(plainText(source));
+  return sourceText.length > 3 && /\s/.test(sourceText) && !isOpaqueText(sourceText) && sourceText === normalize2(plainText(target));
 };
 
 // src/utils/sanitizeSlug.ts
@@ -182,7 +206,7 @@ var traverseFields = (args) => {
   const { additionalTraverseRichText } = _options ?? {};
   const siblingDataFrom = args.siblingDataFrom ?? dataFrom;
   const siblingDataTranslated = args.siblingDataTranslated ?? translatedData;
-  const keepsTarget = (source, target) => Boolean(emptyOnly) && hasText(target) && !(retranslateIdentical && (looksUntranslated(source, target) || Boolean(isWrongLanguage?.(target))));
+  const keepsTarget = (source, target, path) => Boolean(emptyOnly) && hasText(target) && !(retranslateIdentical && (looksUntranslated(source, target) || Boolean(isWrongLanguage?.(target, path))));
   const recurse = (overrides) => traverseFields({ ...args, siblingDataFrom, siblingDataTranslated, ...overrides });
   for (const field of fields) {
     switch (field.type) {
@@ -307,7 +331,7 @@ var traverseFields = (args) => {
               onField?.({ path: keyPath, type: "json", source: value, target: previous });
               if (!value.trim())
                 continue;
-              if (keepsTarget(value, previous))
+              if (keepsTarget(value, previous, keyPath))
                 continue;
               target[key] = value;
               if (isOpaqueText(value))
@@ -347,7 +371,7 @@ var traverseFields = (args) => {
         if (typeof value !== "string" || !value.trim())
           break;
         const hasCurrent = typeof current === "string" && current.trim().length > 0;
-        if (isSlug ? hasCurrent : keepsTarget(value, current))
+        if (isSlug ? hasCurrent : keepsTarget(value, current, fieldPath))
           break;
         if (isOpaqueText(value)) {
           siblingDataTranslated[field.name] = value;
@@ -389,7 +413,7 @@ var traverseFields = (args) => {
           }
           break;
         }
-        if (keepsTarget(richTextDataFrom, current))
+        if (keepsTarget(richTextDataFrom, current, richTextPath))
           break;
         const isSlate = Array.isArray(richTextDataFrom);
         const isLexical = typeof richTextDataFrom === "object" && "root" in richTextDataFrom;
@@ -435,6 +459,10 @@ var collectTranslatableFields = ({ config, dataFrom, dataTarget, options }) => {
   return fields;
 };
 
+// src/utils/placeholders.ts
+var placeholdersOf = (value) => (value.match(/\{\s*[\w.]+\s*(?:,[^{}]*)?\}/g) ?? []).map((each) => each.replace(/\s+/g, "")).sort();
+var samePlaceholders = (source, translated) => placeholdersOf(source).join("|") === placeholdersOf(translated).join("|");
+
 // src/review/entityKey.ts
 var entityKey = ({ collectionSlug, globalSlug, id }) => globalSlug ? `global:${globalSlug}` : `${collectionSlug}:${id}`;
 
@@ -442,4 +470,4 @@ var entityKey = ({ collectionSlug, globalSlug, id }) => globalSlug ? `global:${g
 import { createHash } from "node:crypto";
 var sourceHash = (fields) => createHash("sha1").update(JSON.stringify(fields.map(({ path, source }) => [path, source]))).digest("hex");
 
-export { loadWrongLanguageCheck, samePlaceholders, plainText, looksUntranslated, traverseFields, TRANSLATE_TASK_SLUG2, TRANSLATE_WORKFLOW_SLUG2, collectTranslatableFields, entityKey, sourceHash };
+export { loadWrongLanguageCheck, plainText, buildCrossLocaleTexts, crossLocaleMatch, isOpaqueText, looksUntranslated, traverseFields, collectTranslatableFields, samePlaceholders, TRANSLATE_TASK_SLUG2, TRANSLATE_WORKFLOW_SLUG2, entityKey, sourceHash };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@justanarthur/payload-plugin-translator",
   "description": "Translator plugin for Payload CMS — automatic localization via Google, OpenAI, LibreTranslate, or custom resolvers.",
-  "version": "3.3.4",
+  "version": "3.4.0",
   "type": "module",
   "private": false,
   "files": [