next-intl 4.5.5 → 4.5.7

package/dist/esm/development/extractor/catalog/CatalogManager.js

@@ -3,6 +3,7 @@ import path from 'path';
 import MessageExtractor from '../extractor/MessageExtractor.js';
 import formatters from '../formatters/index.js';
 import SourceFileScanner from '../source/SourceFileScanner.js';
+import { localeCompare } from '../utils.js';
 import CatalogLocales from './CatalogLocales.js';
 import CatalogPersister from './CatalogPersister.js';
 import SaveScheduler from './SaveScheduler.js';
@@ -24,6 +25,9 @@ class CatalogManager {
 
   // Cached instances
 
+  // Resolves when all catalogs are loaded
+  // (but doesn't indicate that project scan is done)
+
   constructor(config, opts = {}) {
     this.config = config;
     this.saveScheduler = new SaveScheduler(50);
@@ -74,24 +78,41 @@ class CatalogManager {
   getSrcPaths() {
     return (Array.isArray(this.config.srcPath) ? this.config.srcPath : [this.config.srcPath]).map(srcPath => path.join(this.projectRoot, srcPath));
   }
-  getFileMessages(absoluteFilePath) {
-    return this.messagesByFile.get(absoluteFilePath);
-  }
   async loadMessages() {
-    await this.loadSourceMessages();
-    await this.loadTargetMessages();
+    this.loadCatalogsPromise = Promise.all([this.loadSourceMessages(), this.loadTargetMessages()]);
+
+    // Ensure catalogs are loaded before scanning source files.
+    // Otherwise, `loadSourceMessages` might overwrite extracted
+    // messages if it finishes after source file extraction.
+    await this.loadCatalogsPromise;
     if (this.isDevelopment) {
       const catalogLocales = await this.getCatalogLocales();
       catalogLocales.subscribeLocalesChange(this.onLocalesChange);
     }
+    const sourceFiles = await SourceFileScanner.getSourceFiles(this.getSrcPaths());
+    await Promise.all(sourceFiles.map(async filePath => this.extractFileMessages(filePath, await fs.readFile(filePath, 'utf8'))));
   }
   async loadSourceMessages() {
     // First hydrate from source locale file to potentially init metadata
-    await this.loadLocaleMessages(this.config.sourceLocale);
-
-    // Then extract from all source files
-    const sourceFiles = await SourceFileScanner.getSourceFiles(this.getSrcPaths());
-    await Promise.all(sourceFiles.map(async filePath => this.extractFileMessages(filePath, await fs.readFile(filePath, 'utf8'))));
+    const messages = await this.loadLocaleMessages(this.config.sourceLocale);
+    const messagesById = new Map();
+    const messagesByFile = new Map();
+    for (const message of messages) {
+      messagesById.set(message.id, message);
+      if (message.references) {
+        for (const ref of message.references) {
+          const absoluteFilePath = path.join(this.projectRoot, ref.path);
+          let fileMessages = messagesByFile.get(absoluteFilePath);
+          if (!fileMessages) {
+            fileMessages = new Map();
+            messagesByFile.set(absoluteFilePath, fileMessages);
+          }
+          fileMessages.set(message.id, message);
+        }
+      }
+    }
+    this.messagesById = messagesById;
+    this.messagesByFile = messagesByFile;
   }
   async loadLocaleMessages(locale) {
     const persister = await this.getPersister();
@@ -106,14 +127,34 @@ class CatalogManager {
   }
   async loadTargetMessages() {
     const targetLocales = await this.getTargetLocales();
-    await Promise.all(targetLocales.map(async locale => {
-      this.translationsByTargetLocale.set(locale, new Map());
-      const messages = await this.loadLocaleMessages(locale);
-      for (const message of messages) {
-        const translations = this.translationsByTargetLocale.get(locale);
-        translations.set(message.id, message.message);
+    await Promise.all(targetLocales.map(locale => this.reloadLocaleCatalog(locale)));
+  }
+  async reloadLocaleCatalog(locale) {
+    const diskMessages = await this.loadLocaleMessages(locale);
+    if (locale === this.config.sourceLocale) {
+      // For source: Merge additional properties like flags
+      for (const diskMessage of diskMessages) {
+        const prev = this.messagesById.get(diskMessage.id);
+        if (prev) {
+          // Unknown properties (like flags): disk wins
+          // Known properties: existing (from extraction) wins
+          this.messagesById.set(diskMessage.id, {
+            ...diskMessage,
+            id: prev.id,
+            message: prev.message,
+            description: prev.description,
+            references: prev.references
+          });
+        }
       }
-    }));
+    } else {
+      // For target: disk wins completely
+      const translations = new Map();
+      for (const message of diskMessages) {
+        translations.set(message.id, message);
+      }
+      this.translationsByTargetLocale.set(locale, translations);
+    }
   }
   async extractFileMessages(absoluteFilePath, source) {
     const result = await this.messageExtractor.processFileContent(absoluteFilePath, source);
@@ -138,18 +179,18 @@ class CatalogManager {
             references.push(ref);
           }
         });
-        references.sort((referenceA, referenceB) => referenceA.path.localeCompare(referenceB.path));
+        references.sort((referenceA, referenceB) => localeCompare(referenceA.path, referenceB.path));
         message = {
           ...message,
           references
         };
 
-        // Description: In case we have conflicting descriptions, the new one wins.
-        if (prevMessage.description && !message.description) {
-          message = {
-            ...message,
-            description: prevMessage.description
-          };
+        // Merge other properties like description, or unknown
+        // attributes like flags that are opaque to us
+        for (const key of Object.keys(prevMessage)) {
+          if (message[key] == null) {
+            message[key] = prevMessage[key];
+          }
         }
       }
       this.messagesById.set(message.id, message);
@@ -179,13 +220,13 @@ class CatalogManager {
     } else {
       this.messagesByFile.delete(absoluteFilePath);
     }
-    const changed = this.haveMessagesChanged(prevFileMessages, fileMessages);
+    const changed = this.haveMessagesChangedForFile(prevFileMessages, fileMessages);
     return {
       ...result,
       changed
     };
   }
-  haveMessagesChanged(beforeMessages, afterMessages) {
+  haveMessagesChangedForFile(beforeMessages, afterMessages) {
     // If one exists and the other doesn't, there's a change
     if (!beforeMessages) {
       return afterMessages.size > 0;
@@ -206,56 +247,43 @@ class CatalogManager {
     return false;
   }
   areMessagesEqual(msg1, msg2) {
-    return msg1.id === msg2.id && msg1.message === msg2.message && msg1.description === msg2.description && this.areReferencesEqual(msg1.references, msg2.references);
-  }
-  areReferencesEqual(refs1, refs2) {
-    // Both undefined or both empty
-    if (!refs1 && !refs2) return true;
-    if (!refs1 || !refs2) return false;
-    if (refs1.length !== refs2.length) return false;
-
-    // Compare each reference
-    for (let i = 0; i < refs1.length; i++) {
-      if (refs1[i].path !== refs2[i].path) {
-        return false;
-      }
-    }
-    return true;
+    // Note: We intentionally don't compare references here.
+    // References are aggregated metadata from multiple files and comparing
+    // them would cause false positives due to parallel extraction order.
+    return msg1.id === msg2.id && msg1.message === msg2.message && msg1.description === msg2.description;
   }
   async save() {
     return this.saveScheduler.schedule(() => this.saveImpl());
   }
   async saveImpl() {
-    const messages = Array.from(this.messagesById.values());
-    const persister = await this.getPersister();
-    await persister.write(this.config.sourceLocale, messages);
-    for (const locale of await this.getTargetLocales()) {
-      await this.saveLocale(locale);
-    }
-    return messages.length;
+    await this.saveLocale(this.config.sourceLocale);
+    const targetLocales = await this.getTargetLocales();
+    await Promise.all(targetLocales.map(locale => this.saveLocale(locale)));
   }
   async saveLocale(locale) {
+    await this.loadCatalogsPromise;
     const messages = Array.from(this.messagesById.values());
     const persister = await this.getPersister();
+    const isSourceLocale = locale === this.config.sourceLocale;
 
-    // Check if file was modified externally
+    // Check if file was modified externally (poll-at-save is cheaper than
+    // watchers here since stat() is fast and avoids continuous overhead)
     const lastWriteTime = this.lastWriteByLocale.get(locale);
     const currentFileTime = await persister.getLastModified(locale);
-
-    // If file was modified externally, read and merge
     if (currentFileTime && lastWriteTime && currentFileTime > lastWriteTime) {
-      const diskMessages = await persister.read(locale);
-      const translations = this.translationsByTargetLocale.get(locale);
-      for (const diskMessage of diskMessages) {
-        // Disk wins: preserve manual edits
-        translations.set(diskMessage.id, diskMessage.message);
-      }
+      await this.reloadLocaleCatalog(locale);
     }
-    const translations = this.translationsByTargetLocale.get(locale);
-    const localeMessages = messages.map(message => ({
-      ...message,
-      message: translations.get(message.id) || ''
-    }));
+    const prevMessages = isSourceLocale ? this.messagesById : this.translationsByTargetLocale.get(locale);
+    const localeMessages = messages.map(message => {
+      const prev = prevMessages?.get(message.id);
+      return {
+        ...prev,
+        id: message.id,
+        description: message.description,
+        references: message.references,
+        message: isSourceLocale ? message.message : prev?.message ?? ''
+      };
+    });
     await persister.write(locale, localeMessages);
 
     // Update timestamps
@@ -263,13 +291,9 @@ class CatalogManager {
     this.lastWriteByLocale.set(locale, newTime);
   }
   onLocalesChange = async params => {
+    // Chain to existing promise
+    this.loadCatalogsPromise = Promise.all([this.loadCatalogsPromise, ...params.added.map(locale => this.reloadLocaleCatalog(locale))]);
     for (const locale of params.added) {
-      const translations = new Map();
-      this.translationsByTargetLocale.set(locale, translations);
-      const messages = await this.loadLocaleMessages(locale);
-      for (const message of messages) {
-        translations.set(message.id, message.message);
-      }
       await this.saveLocale(locale);
     }
     for (const locale of params.removed) {

package/dist/esm/development/extractor/formatters/JSONFormatter.js

@@ -1,4 +1,4 @@
-import { setNestedProperty } from '../utils/ObjectUtils.js';
+import { setNestedProperty } from '../utils.js';
 import Formatter from './Formatter.js';
 import { getSortedMessages } from './utils.js';
 

package/dist/esm/development/extractor/formatters/POFormatter.js

@@ -1,5 +1,5 @@
 import POParser from 'po-parser';
-import { setNestedProperty } from '../utils/ObjectUtils.js';
+import { setNestedProperty } from '../utils.js';
 import Formatter from './Formatter.js';
 import { getSortedMessages } from './utils.js';
 

package/dist/esm/development/extractor/formatters/utils.js

@@ -1,11 +1,13 @@
+import { localeCompare } from '../utils.js';
+
 function getSortedMessages(messages) {
   return messages.toSorted((messageA, messageB) => {
     const pathA = messageA.references?.[0]?.path ?? '';
     const pathB = messageB.references?.[0]?.path ?? '';
     if (pathA === pathB) {
-      return messageA.id.localeCompare(messageB.id);
+      return localeCompare(messageA.id, messageB.id);
     } else {
-      return pathA.localeCompare(pathB);
+      return localeCompare(pathA, pathB);
     }
   });
 }

package/dist/esm/development/extractor/{utils/ObjectUtils.js → utils.js}

@@ -10,5 +10,8 @@ function setNestedProperty(obj, keyPath, value) {
   }
   current[keys[keys.length - 1]] = value;
 }
+function localeCompare(a, b) {
+  return a.localeCompare(b, 'en');
+}
 
-export { setNestedProperty };
+export { localeCompare, setNestedProperty };

package/dist/esm/development/middleware/syncCookie.js

@@ -6,14 +6,21 @@ function syncCookie(request, response, locale, routing, domain) {
     name,
     ...rest
   } = routing.localeCookie;
-  const acceptLanguageLocale = getAcceptLanguageLocale(request.headers, domain?.locales || routing.locales, routing.defaultLocale);
   const hasLocaleCookie = request.cookies.has(name);
   const hasOutdatedCookie = hasLocaleCookie && request.cookies.get(name)?.value !== locale;
-  if (hasLocaleCookie ? hasOutdatedCookie : acceptLanguageLocale !== locale) {
+  if (hasOutdatedCookie) {
     response.cookies.set(name, locale, {
       path: request.nextUrl.basePath || undefined,
       ...rest
     });
+  } else if (!hasLocaleCookie) {
+    const acceptLanguageLocale = getAcceptLanguageLocale(request.headers, domain?.locales || routing.locales, routing.defaultLocale);
+    if (acceptLanguageLocale !== locale) {
+      response.cookies.set(name, locale, {
+        path: request.nextUrl.basePath || undefined,
+        ...rest
+      });
+    }
   }
 }
 

package/dist/esm/production/extractor/catalog/CatalogManager.js

@@ -1 +1 @@
-import e from"fs/promises";import s from"path";import t from"../extractor/MessageExtractor.js";import a from"../formatters/index.js";import o from"../source/SourceFileScanner.js";import r from"./CatalogLocales.js";import i from"./CatalogPersister.js";import c from"./SaveScheduler.js";class n{messagesByFile=(()=>new Map)();messagesById=(()=>new Map)();translationsByTargetLocale=(()=>new Map)();lastWriteByLocale=(()=>new Map)();constructor(e,s={}){this.config=e,this.saveScheduler=new c(50),this.projectRoot=s.projectRoot||process.cwd(),this.isDevelopment=s.isDevelopment??!1,this.messageExtractor=new t({isDevelopment:this.isDevelopment,projectRoot:this.projectRoot,sourceMap:s.sourceMap})}async getFormatter(){if(this.formatter)return this.formatter;{const e=(await a[this.config.messages.format]()).default;return this.formatter=new e,this.formatter}}async getPersister(){return this.persister||(this.persister=new i(this.config.messages.path,await this.getFormatter())),this.persister}async getCatalogLocales(){if(this.catalogLocales)return this.catalogLocales;{const e=s.join(this.projectRoot,this.config.messages.path),t=await this.getFormatter();return this.catalogLocales=new r({messagesDir:e,sourceLocale:this.config.sourceLocale,extension:t.EXTENSION,locales:this.config.messages.locales}),this.catalogLocales}}async getTargetLocales(){return(await this.getCatalogLocales()).getTargetLocales()}getSrcPaths(){return(Array.isArray(this.config.srcPath)?this.config.srcPath:[this.config.srcPath]).map((e=>s.join(this.projectRoot,e)))}getFileMessages(e){return this.messagesByFile.get(e)}async loadMessages(){if(await this.loadSourceMessages(),await this.loadTargetMessages(),this.isDevelopment){(await this.getCatalogLocales()).subscribeLocalesChange(this.onLocalesChange)}}async loadSourceMessages(){await this.loadLocaleMessages(this.config.sourceLocale);const s=await o.getSourceFiles(this.getSrcPaths());await Promise.all(s.map((async s=>this.extractFileMessages(s,await e.readFile(s,"utf8")))))}async loadLocaleMessages(e){const s=await this.getPersister();try{const t=await s.read(e),a=await s.getLastModified(e);return this.lastWriteByLocale.set(e,a),t}catch{return[]}}async loadTargetMessages(){const e=await this.getTargetLocales();await Promise.all(e.map((async e=>{this.translationsByTargetLocale.set(e,new Map);const s=await this.loadLocaleMessages(e);for(const t of s){this.translationsByTargetLocale.get(e).set(t.id,t.message)}})))}async extractFileMessages(e,t){const a=await this.messageExtractor.processFileContent(e,t),o=this.messagesByFile.get(e),r=Array.from(o?.keys()??[]),i=new Map;for(let e of a.messages){const s=this.messagesById.get(e.id);if(s){const t=[...s.references??[]];e.references.forEach((e=>{t.some((s=>s.path===e.path))||t.push(e)})),t.sort(((e,s)=>e.path.localeCompare(s.path))),e={...e,references:t},s.description&&!e.description&&(e={...e,description:s.description})}this.messagesById.set(e.id,e),i.set(e.id,e);const t=r.indexOf(e.id);-1!==t&&r.splice(t,1)}const c=s.relative(this.projectRoot,e);r.filter((e=>{const s=this.messagesById.get(e);return!s?.references?.some((e=>e.path!==c))})).forEach((e=>{this.messagesById.delete(e)}));a.messages.length>0?this.messagesByFile.set(e,i):this.messagesByFile.delete(e);const n=this.haveMessagesChanged(o,i);return{...a,changed:n}}haveMessagesChanged(e,s){if(!e)return s.size>0;if(e.size!==s.size)return!0;for(const[t,a]of e){const e=s.get(t);if(!e||!this.areMessagesEqual(a,e))return!0}return!1}areMessagesEqual(e,s){return e.id===s.id&&e.message===s.message&&e.description===s.description&&this.areReferencesEqual(e.references,s.references)}areReferencesEqual(e,s){if(!e&&!s)return!0;if(!e||!s)return!1;if(e.length!==s.length)return!1;for(let t=0;t<e.length;t++)if(e[t].path!==s[t].path)return!1;return!0}async save(){return this.saveScheduler.schedule((()=>this.saveImpl()))}async saveImpl(){const e=Array.from(this.messagesById.values()),s=await this.getPersister();await s.write(this.config.sourceLocale,e);for(const e of await this.getTargetLocales())await this.saveLocale(e);return e.length}async saveLocale(e){const s=Array.from(this.messagesById.values()),t=await this.getPersister(),a=this.lastWriteByLocale.get(e),o=await t.getLastModified(e);if(o&&a&&o>a){const s=await t.read(e),a=this.translationsByTargetLocale.get(e);for(const e of s)a.set(e.id,e.message)}const r=this.translationsByTargetLocale.get(e),i=s.map((e=>({...e,message:r.get(e.id)||""})));await t.write(e,i);const c=await t.getLastModified(e);this.lastWriteByLocale.set(e,c)}onLocalesChange=async e=>{for(const s of e.added){const e=new Map;this.translationsByTargetLocale.set(s,e);const t=await this.loadLocaleMessages(s);for(const s of t)e.set(s.id,s.message);await this.saveLocale(s)}for(const s of e.removed)this.translationsByTargetLocale.delete(s),this.lastWriteByLocale.delete(s)};destroy(){this.saveScheduler.destroy(),this.catalogLocales&&this.isDevelopment&&this.catalogLocales.unsubscribeLocalesChange(this.onLocalesChange)}}export{n as default};
+import e from"fs/promises";import s from"path";import t from"../extractor/MessageExtractor.js";import a from"../formatters/index.js";import o from"../source/SourceFileScanner.js";import{localeCompare as i}from"../utils.js";import r from"./CatalogLocales.js";import c from"./CatalogPersister.js";import l from"./SaveScheduler.js";class n{messagesByFile=(()=>new Map)();messagesById=(()=>new Map)();translationsByTargetLocale=(()=>new Map)();lastWriteByLocale=(()=>new Map)();constructor(e,s={}){this.config=e,this.saveScheduler=new l(50),this.projectRoot=s.projectRoot||process.cwd(),this.isDevelopment=s.isDevelopment??!1,this.messageExtractor=new t({isDevelopment:this.isDevelopment,projectRoot:this.projectRoot,sourceMap:s.sourceMap})}async getFormatter(){if(this.formatter)return this.formatter;{const e=(await a[this.config.messages.format]()).default;return this.formatter=new e,this.formatter}}async getPersister(){return this.persister||(this.persister=new c(this.config.messages.path,await this.getFormatter())),this.persister}async getCatalogLocales(){if(this.catalogLocales)return this.catalogLocales;{const e=s.join(this.projectRoot,this.config.messages.path),t=await this.getFormatter();return this.catalogLocales=new r({messagesDir:e,sourceLocale:this.config.sourceLocale,extension:t.EXTENSION,locales:this.config.messages.locales}),this.catalogLocales}}async getTargetLocales(){return(await this.getCatalogLocales()).getTargetLocales()}getSrcPaths(){return(Array.isArray(this.config.srcPath)?this.config.srcPath:[this.config.srcPath]).map((e=>s.join(this.projectRoot,e)))}async loadMessages(){if(this.loadCatalogsPromise=Promise.all([this.loadSourceMessages(),this.loadTargetMessages()]),await this.loadCatalogsPromise,this.isDevelopment){(await this.getCatalogLocales()).subscribeLocalesChange(this.onLocalesChange)}const s=await o.getSourceFiles(this.getSrcPaths());await Promise.all(s.map((async s=>this.extractFileMessages(s,await e.readFile(s,"utf8")))))}async loadSourceMessages(){const e=await this.loadLocaleMessages(this.config.sourceLocale),t=new Map,a=new Map;for(const o of e)if(t.set(o.id,o),o.references)for(const e of o.references){const t=s.join(this.projectRoot,e.path);let i=a.get(t);i||(i=new Map,a.set(t,i)),i.set(o.id,o)}this.messagesById=t,this.messagesByFile=a}async loadLocaleMessages(e){const s=await this.getPersister();try{const t=await s.read(e),a=await s.getLastModified(e);return this.lastWriteByLocale.set(e,a),t}catch{return[]}}async loadTargetMessages(){const e=await this.getTargetLocales();await Promise.all(e.map((e=>this.reloadLocaleCatalog(e))))}async reloadLocaleCatalog(e){const s=await this.loadLocaleMessages(e);if(e===this.config.sourceLocale)for(const e of s){const s=this.messagesById.get(e.id);s&&this.messagesById.set(e.id,{...e,id:s.id,message:s.message,description:s.description,references:s.references})}else{const t=new Map;for(const e of s)t.set(e.id,e);this.translationsByTargetLocale.set(e,t)}}async extractFileMessages(e,t){const a=await this.messageExtractor.processFileContent(e,t),o=this.messagesByFile.get(e),r=Array.from(o?.keys()??[]),c=new Map;for(let e of a.messages){const s=this.messagesById.get(e.id);if(s){const t=[...s.references??[]];e.references.forEach((e=>{t.some((s=>s.path===e.path))||t.push(e)})),t.sort(((e,s)=>i(e.path,s.path))),e={...e,references:t};for(const t of Object.keys(s))null==e[t]&&(e[t]=s[t])}this.messagesById.set(e.id,e),c.set(e.id,e);const t=r.indexOf(e.id);-1!==t&&r.splice(t,1)}const l=s.relative(this.projectRoot,e);r.filter((e=>{const s=this.messagesById.get(e);return!s?.references?.some((e=>e.path!==l))})).forEach((e=>{this.messagesById.delete(e)}));a.messages.length>0?this.messagesByFile.set(e,c):this.messagesByFile.delete(e);const n=this.haveMessagesChangedForFile(o,c);return{...a,changed:n}}haveMessagesChangedForFile(e,s){if(!e)return s.size>0;if(e.size!==s.size)return!0;for(const[t,a]of e){const e=s.get(t);if(!e||!this.areMessagesEqual(a,e))return!0}return!1}areMessagesEqual(e,s){return e.id===s.id&&e.message===s.message&&e.description===s.description}async save(){return this.saveScheduler.schedule((()=>this.saveImpl()))}async saveImpl(){await this.saveLocale(this.config.sourceLocale);const e=await this.getTargetLocales();await Promise.all(e.map((e=>this.saveLocale(e))))}async saveLocale(e){await this.loadCatalogsPromise;const s=Array.from(this.messagesById.values()),t=await this.getPersister(),a=e===this.config.sourceLocale,o=this.lastWriteByLocale.get(e),i=await t.getLastModified(e);i&&o&&i>o&&await this.reloadLocaleCatalog(e);const r=a?this.messagesById:this.translationsByTargetLocale.get(e),c=s.map((e=>{const s=r?.get(e.id);return{...s,id:e.id,description:e.description,references:e.references,message:a?e.message:s?.message??""}}));await t.write(e,c);const l=await t.getLastModified(e);this.lastWriteByLocale.set(e,l)}onLocalesChange=async e=>{this.loadCatalogsPromise=Promise.all([this.loadCatalogsPromise,...e.added.map((e=>this.reloadLocaleCatalog(e)))]);for(const s of e.added)await this.saveLocale(s);for(const s of e.removed)this.translationsByTargetLocale.delete(s),this.lastWriteByLocale.delete(s)};destroy(){this.saveScheduler.destroy(),this.catalogLocales&&this.isDevelopment&&this.catalogLocales.unsubscribeLocalesChange(this.onLocalesChange)}}export{n as default};

package/dist/esm/production/extractor/formatters/JSONFormatter.js

@@ -1 +1 @@
-import{setNestedProperty as s}from"../utils/ObjectUtils.js";import t from"./Formatter.js";import{getSortedMessages as e}from"./utils.js";class r extends t{static NAMESPACE_SEPARATOR=".";EXTENSION=".json";parse(s){const t=JSON.parse(s),e=[];return this.traverseMessages(t,((s,t)=>{e.push({id:t,message:s})})),e}serialize(t){const r={};for(const o of e(t))s(r,o.id,o.message);return JSON.stringify(r,null,2)}toJSONString(s){return s}traverseMessages(s,t,e=""){for(const o of Object.keys(s)){const i=e?e+r.NAMESPACE_SEPARATOR+o:o,a=s[o];"string"==typeof a?t(a,i):"object"==typeof a&&this.traverseMessages(a,t,i)}}}export{r as default};
+import{setNestedProperty as s}from"../utils.js";import e from"./Formatter.js";import{getSortedMessages as t}from"./utils.js";class r extends e{static NAMESPACE_SEPARATOR=".";EXTENSION=".json";parse(s){const e=JSON.parse(s),t=[];return this.traverseMessages(e,((s,e)=>{t.push({id:e,message:s})})),t}serialize(e){const r={};for(const o of t(e))s(r,o.id,o.message);return JSON.stringify(r,null,2)}toJSONString(s){return s}traverseMessages(s,e,t=""){for(const o of Object.keys(s)){const a=t?t+r.NAMESPACE_SEPARATOR+o:o,i=s[o];"string"==typeof i?e(i,a):"object"==typeof i&&this.traverseMessages(i,e,a)}}}export{r as default};

package/dist/esm/production/extractor/formatters/POFormatter.js

@@ -1 +1 @@
-import t from"po-parser";import{setNestedProperty as e}from"../utils/ObjectUtils.js";import a from"./Formatter.js";import{getSortedMessages as s}from"./utils.js";class r extends a{static DEFAULT_METADATA={"Content-Type":"text/plain; charset=utf-8","Content-Transfer-Encoding":"8bit","X-Generator":"next-intl","X-Crowdin-SourceKey":"msgstr"};EXTENSION=".po";metadataByLocale=(()=>new Map)();parse(e,a){const s=t.parse(e);return s.meta&&this.metadataByLocale.set(a.locale,s.meta),s.messages||[]}serialize(e,a){const o={Language:a.locale,...r.DEFAULT_METADATA,...this.metadataByLocale.get(a.locale)};return t.serialize({meta:o,messages:s(e)})}toJSONString(t,a){const s=this.parse(t,a),r={};for(const t of s)e(r,t.id,t.message);return JSON.stringify(r,null,2)}}export{r as default};
+import t from"po-parser";import{setNestedProperty as e}from"../utils.js";import a from"./Formatter.js";import{getSortedMessages as s}from"./utils.js";class r extends a{static DEFAULT_METADATA={"Content-Type":"text/plain; charset=utf-8","Content-Transfer-Encoding":"8bit","X-Generator":"next-intl","X-Crowdin-SourceKey":"msgstr"};EXTENSION=".po";metadataByLocale=(()=>new Map)();parse(e,a){const s=t.parse(e);return s.meta&&this.metadataByLocale.set(a.locale,s.meta),s.messages||[]}serialize(e,a){const o={Language:a.locale,...r.DEFAULT_METADATA,...this.metadataByLocale.get(a.locale)};return t.serialize({meta:o,messages:s(e)})}toJSONString(t,a){const s=this.parse(t,a),r={};for(const t of s)e(r,t.id,t.message);return JSON.stringify(r,null,2)}}export{r as default};

package/dist/esm/production/extractor/formatters/utils.js

@@ -1 +1 @@
-function e(e){return e.toSorted(((e,r)=>{const o=e.references?.[0]?.path??"",t=r.references?.[0]?.path??"";return o===t?e.id.localeCompare(r.id):o.localeCompare(t)}))}export{e as getSortedMessages};
+import{localeCompare as e}from"../utils.js";function r(r){return r.toSorted(((r,t)=>{const n=r.references?.[0]?.path??"",o=t.references?.[0]?.path??"";return n===o?e(r.id,t.id):e(n,o)}))}export{r as getSortedMessages};

package/dist/esm/production/extractor/utils.js

@@ -0,0 +1 @@
+function t(t,n,e){const o=n.split(".");let l=t;for(let t=0;t<o.length-1;t++){const n=o[t];n in l&&"object"==typeof l[n]&&null!==l[n]||(l[n]={}),l=l[n]}l[o[o.length-1]]=e}function n(t,n){return t.localeCompare(n,"en")}export{n as localeCompare,t as setNestedProperty};

package/dist/esm/production/middleware/syncCookie.js

@@ -1 +1 @@
-import{getAcceptLanguageLocale as e}from"./resolveLocale.js";function o(o,a,l,s,t){if(!s.localeCookie)return;const{name:c,...i}=s.localeCookie,r=e(o.headers,t?.locales||s.locales,s.defaultLocale),n=o.cookies.has(c),f=n&&o.cookies.get(c)?.value!==l;(n?f:r!==l)&&a.cookies.set(c,l,{path:o.nextUrl.basePath||void 0,...i})}export{o as default};
+import{getAcceptLanguageLocale as e}from"./resolveLocale.js";function o(o,a,l,s,t){if(!s.localeCookie)return;const{name:i,...c}=s.localeCookie,r=o.cookies.has(i);if(r&&o.cookies.get(i)?.value!==l)a.cookies.set(i,l,{path:o.nextUrl.basePath||void 0,...c});else if(!r){e(o.headers,t?.locales||s.locales,s.defaultLocale)!==l&&a.cookies.set(i,l,{path:o.nextUrl.basePath||void 0,...c})}}export{o as default};

package/dist/types/extractor/catalog/CatalogManager.d.ts

@@ -16,6 +16,7 @@ export default class CatalogManager {
     private formatter?;
     private catalogLocales?;
     private messageExtractor;
+    loadCatalogsPromise?: Promise<unknown>;
     constructor(config: ExtractorConfig, opts?: {
         projectRoot?: string;
         isDevelopment?: boolean;
@@ -26,21 +27,20 @@ export default class CatalogManager {
     private getCatalogLocales;
     private getTargetLocales;
     getSrcPaths(): Array<string>;
-    getFileMessages(absoluteFilePath: string): Map<string, ExtractedMessage> | undefined;
     loadMessages(): Promise<void>;
     private loadSourceMessages;
     private loadLocaleMessages;
     private loadTargetMessages;
+    private reloadLocaleCatalog;
     extractFileMessages(absoluteFilePath: string, source: string): Promise<{
         messages: Array<ExtractedMessage>;
         code: string;
         changed: boolean;
         map?: string;
     }>;
-    private haveMessagesChanged;
+    private haveMessagesChangedForFile;
     private areMessagesEqual;
-    private areReferencesEqual;
-    save(): Promise<number>;
+    save(): Promise<void>;
     private saveImpl;
     private saveLocale;
     private onLocalesChange;

package/dist/types/extractor/types.d.ts

@@ -7,6 +7,8 @@ export type ExtractedMessage = {
     references?: Array<{
         path: string;
     }>;
+    /** Allows for additional properties like .po flags to be read and later written. */
+    [key: string]: unknown;
 };
 export type MessagesConfig = {
     path: string;

package/dist/types/extractor/{utils/ObjectUtils.d.ts → utils.d.ts}

@@ -1 +1,2 @@
 export declare function setNestedProperty(obj: Record<string, any>, keyPath: string, value: any): void;
+export declare function localeCompare(a: string, b: string): number;

package/dist/types/navigation/react-client/createNavigation.d.ts

@@ -3,9 +3,9 @@ import type { RoutingConfigLocalizedNavigation, RoutingConfigSharedNavigation }
 import type { DomainsConfig, LocalePrefixMode, Locales, Pathnames } from '../../routing/types.js';
 export default function createNavigation<const AppLocales extends Locales, const AppLocalePrefixMode extends LocalePrefixMode = 'always', const AppPathnames extends Pathnames<AppLocales> = never, const AppDomains extends DomainsConfig<AppLocales> = never>(routing?: [AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>): {
     Link: import("react").ForwardRefExoticComponent<Omit<{
+        id?: string | undefined | undefined;
         target?: import("react").HTMLAttributeAnchorTarget | undefined;
         replace?: boolean | undefined;
-        id?: string | undefined | undefined;
         slot?: string | undefined | undefined;
         style?: import("react").CSSProperties | undefined;
         title?: string | undefined | undefined;

package/dist/types/navigation/react-server/createNavigation.d.ts

@@ -4,9 +4,9 @@ export default function createNavigation<const AppLocales extends Locales, const
     usePathname: () => never;
     useRouter: () => never;
     Link: import("react").ForwardRefExoticComponent<Omit<{
+        id?: string | undefined | undefined;
         target?: import("react").HTMLAttributeAnchorTarget | undefined;
         replace?: boolean | undefined;
-        id?: string | undefined | undefined;
         slot?: string | undefined | undefined;
         style?: import("react").CSSProperties | undefined;
         title?: string | undefined | undefined;

package/dist/types/navigation/shared/createSharedNavigationFns.d.ts

@@ -22,9 +22,9 @@ export default function createSharedNavigationFns<const AppLocales extends Local
         alternateLinks: NonNullable<boolean | undefined>;
     };
     Link: import("react").ForwardRefExoticComponent<Omit<{
+        id?: string | undefined | undefined;
         target?: import("react").HTMLAttributeAnchorTarget | undefined;
         replace?: boolean | undefined;
-        id?: string | undefined | undefined;
         slot?: string | undefined | undefined;
         style?: import("react").CSSProperties | undefined;
         title?: string | undefined | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-intl",
-  "version": "4.5.5",
+  "version": "4.5.7",
   "sideEffects": false,
   "author": "Jan Amann <jan@amann.work>",
   "funding": [
@@ -127,9 +127,9 @@
     "@formatjs/intl-localematcher": "^0.5.4",
     "@swc/core": "^1.15.2",
     "negotiator": "^1.0.0",
-    "next-intl-swc-plugin-extractor": "^4.5.5",
-    "po-parser": "^0.1.2",
-    "use-intl": "^4.5.5"
+    "next-intl-swc-plugin-extractor": "^4.5.7",
+    "po-parser": "^1.0.2",
+    "use-intl": "^4.5.7"
   },
   "peerDependencies": {
     "next": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
@@ -141,5 +141,5 @@
       "optional": true
     }
   },
-  "gitHead": "c353c598c7d489fffca3a1afd545c21fdf5fef93"
+  "gitHead": "2ccc147b68227b32ea451935718c3eb5e73d6e2f"
 }

package/dist/esm/production/extractor/utils/ObjectUtils.js

@@ -1 +0,0 @@
-function t(t,n,e){const l=n.split(".");let o=t;for(let t=0;t<l.length-1;t++){const n=l[t];n in o&&"object"==typeof o[n]&&null!==o[n]||(o[n]={}),o=o[n]}o[l[l.length-1]]=e}export{t as setNestedProperty};