next-intl 4.6.1 → 4.7.0

package/dist/cjs/development/{JSONCodec-L1_VeQBi.cjs → JSONCodec-CusgMbzf.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var plugin = require('./plugin-DDtWCyPI.cjs');
+var plugin = require('./plugin-B0KIcFlc.cjs');
 var ExtractorCodec = require('./ExtractorCodec-D9Tw618d.cjs');
 require('fs/promises');
 require('path');

package/dist/cjs/development/{POCodec-Be_UL6jy.cjs → POCodec-Bns8JvnL.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var POParser = require('po-parser');
-var plugin = require('./plugin-DDtWCyPI.cjs');
+var plugin = require('./plugin-B0KIcFlc.cjs');
 var ExtractorCodec = require('./ExtractorCodec-D9Tw618d.cjs');
 require('fs/promises');
 require('path');

package/dist/cjs/development/{plugin-DDtWCyPI.cjs → plugin-B0KIcFlc.cjs}

@@ -122,11 +122,11 @@ export default messages;`;
 
 const formats = {
   json: {
-    codec: () => Promise.resolve().then(function () { return require('./JSONCodec-L1_VeQBi.cjs'); }),
+    codec: () => Promise.resolve().then(function () { return require('./JSONCodec-CusgMbzf.cjs'); }),
     extension: '.json'
   },
   po: {
-    codec: () => Promise.resolve().then(function () { return require('./POCodec-Be_UL6jy.cjs'); }),
+    codec: () => Promise.resolve().then(function () { return require('./POCodec-Bns8JvnL.cjs'); }),
     extension: '.po'
   }
 };
@@ -352,18 +352,24 @@ function setNestedProperty(obj, keyPath, value) {
 }
 function getSortedMessages(messages) {
   return messages.toSorted((messageA, messageB) => {
-    const pathA = messageA.references?.[0]?.path ?? '';
-    const pathB = messageB.references?.[0]?.path ?? '';
-    if (pathA === pathB) {
-      return localeCompare(messageA.id, messageB.id);
-    } else {
-      return localeCompare(pathA, pathB);
-    }
+    const refA = messageA.references?.[0];
+    const refB = messageB.references?.[0];
+
+    // No references: preserve original (extraction) order
+    if (!refA || !refB) return 0;
+
+    // Sort by path, then line. Same path+line: preserve original order
+    return compareReferences(refA, refB);
   });
 }
 function localeCompare(a, b) {
   return a.localeCompare(b, 'en');
 }
+function compareReferences(refA, refB) {
+  const pathCompare = localeCompare(refA.path, refB.path);
+  if (pathCompare !== 0) return pathCompare;
+  return (refA.line ?? 0) - (refB.line ?? 0);
+}
 function getDefaultProjectRoot() {
   return process.cwd();
 }
@@ -777,6 +783,7 @@ class CatalogManager {
       // ENOENT -> treat as no messages
     }
     const prevFileMessages = this.messagesByFile.get(absoluteFilePath);
+    const relativeFilePath = path__default.default.relative(this.projectRoot, absoluteFilePath);
 
     // Init with all previous ones
     const idsToRemove = Array.from(prevFileMessages?.keys() ?? []);
@@ -788,13 +795,12 @@ class CatalogManager {
 
       // Merge with previous message if it exists
       if (prevMessage) {
-        const validated = prevMessage.references ?? [];
         message = {
-          ...message,
-          references: this.mergeReferences(validated, {
-            path: path__default.default.relative(this.projectRoot, absoluteFilePath)
-          })
+          ...message
         };
+        if (message.references) {
+          message.references = this.mergeReferences(prevMessage.references ?? [], relativeFilePath, message.references);
+        }
 
         // Merge other properties like description, or unknown
         // attributes like flags that are opaque to us
@@ -811,7 +817,6 @@ class CatalogManager {
       const index = idsToRemove.indexOf(message.id);
       if (index !== -1) idsToRemove.splice(index, 1);
     }
-    const relativeFilePath = path__default.default.relative(this.projectRoot, absoluteFilePath);
 
     // Clean up removed messages from `messagesById`
     idsToRemove.forEach(id => {
@@ -837,13 +842,11 @@ class CatalogManager {
     const changed = this.haveMessagesChangedForFile(prevFileMessages, fileMessages);
     return changed;
   }
-  mergeReferences(existing, current) {
-    const dedup = new Map();
-    for (const ref of existing) {
-      dedup.set(ref.path, ref);
-    }
-    dedup.set(current.path, current);
-    return Array.from(dedup.values()).sort((a, b) => localeCompare(a.path, b.path));
+  mergeReferences(existing, currentFilePath, currentFileRefs) {
+    // Keep refs from other files, replace all refs from the current file
+    const otherFileRefs = existing.filter(ref => ref.path !== currentFilePath);
+    const merged = [...otherFileRefs, ...currentFileRefs];
+    return merged.sort(compareReferences);
   }
   haveMessagesChangedForFile(beforeMessages, afterMessages) {
     // If one exists and the other doesn't, there's a change
@@ -981,7 +984,7 @@ class LRUCache {
   }
 }
 
-const require$1 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('plugin-DDtWCyPI.cjs', document.baseURI).href)));
+const require$1 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('plugin-B0KIcFlc.cjs', document.baseURI).href)));
 class MessageExtractor {
   compileCache = (() => new LRUCache(750))();
   constructor(opts) {
@@ -1082,9 +1085,25 @@ function initExtractionCompiler(pluginConfig) {
   if (!experimental?.extract) {
     return;
   }
+
+  // Avoid rollup's `replace` plugin to compile this away
+  const isDevelopment = process.env['NODE_ENV'.trim()] === 'development';
+
+  // Avoid running for:
+  // - info
+  // - start
+  // - typegen
+  //
+  // Doesn't consult Next.js config anyway:
+  // - telemetry
+  // - lint
+  //
+  // What remains are:
+  // - dev (NODE_ENV=development)
+  // - build (NODE_ENV=production)
+  const shouldRun = isDevelopment || process.argv.includes('build');
+  if (!shouldRun) return;
   runOnce(() => {
-    // Avoid rollup's `replace` plugin to compile this away
-    const isDevelopment = process.env['NODE_ENV'.trim()] === 'development';
     const extractorConfig = {
       srcPath: experimental.srcPath,
       sourceLocale: experimental.extract.sourceLocale,
@@ -1117,7 +1136,7 @@ function initExtractionCompiler(pluginConfig) {
 
 function getCurrentVersion() {
   try {
-    const require$1 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('plugin-DDtWCyPI.cjs', document.baseURI).href)));
+    const require$1 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('plugin-B0KIcFlc.cjs', document.baseURI).href)));
     const pkg = require$1('next/package.json');
     return pkg.version;
   } catch (error) {

package/dist/cjs/development/plugin.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var plugin = require('./plugin-DDtWCyPI.cjs');
+var plugin = require('./plugin-B0KIcFlc.cjs');
 require('fs/promises');
 require('path');
 require('@parcel/watcher');

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

@@ -3,7 +3,7 @@ import path from 'path';
 import { resolveCodec, getFormatExtension } from '../format/index.js';
 import SourceFileScanner from '../source/SourceFileScanner.js';
 import SourceFileWatcher from '../source/SourceFileWatcher.js';
-import { getDefaultProjectRoot, localeCompare } from '../utils.js';
+import { getDefaultProjectRoot, compareReferences } from '../utils.js';
 import CatalogLocales from './CatalogLocales.js';
 import CatalogPersister from './CatalogPersister.js';
 import SaveScheduler from './SaveScheduler.js';
@@ -195,6 +195,7 @@ class CatalogManager {
       // ENOENT -> treat as no messages
     }
     const prevFileMessages = this.messagesByFile.get(absoluteFilePath);
+    const relativeFilePath = path.relative(this.projectRoot, absoluteFilePath);
 
     // Init with all previous ones
     const idsToRemove = Array.from(prevFileMessages?.keys() ?? []);
@@ -206,13 +207,12 @@ class CatalogManager {
 
       // Merge with previous message if it exists
       if (prevMessage) {
-        const validated = prevMessage.references ?? [];
         message = {
-          ...message,
-          references: this.mergeReferences(validated, {
-            path: path.relative(this.projectRoot, absoluteFilePath)
-          })
+          ...message
         };
+        if (message.references) {
+          message.references = this.mergeReferences(prevMessage.references ?? [], relativeFilePath, message.references);
+        }
 
         // Merge other properties like description, or unknown
         // attributes like flags that are opaque to us
@@ -229,7 +229,6 @@ class CatalogManager {
       const index = idsToRemove.indexOf(message.id);
       if (index !== -1) idsToRemove.splice(index, 1);
     }
-    const relativeFilePath = path.relative(this.projectRoot, absoluteFilePath);
 
     // Clean up removed messages from `messagesById`
     idsToRemove.forEach(id => {
@@ -255,13 +254,11 @@ class CatalogManager {
     const changed = this.haveMessagesChangedForFile(prevFileMessages, fileMessages);
     return changed;
   }
-  mergeReferences(existing, current) {
-    const dedup = new Map();
-    for (const ref of existing) {
-      dedup.set(ref.path, ref);
-    }
-    dedup.set(current.path, current);
-    return Array.from(dedup.values()).sort((a, b) => localeCompare(a.path, b.path));
+  mergeReferences(existing, currentFilePath, currentFileRefs) {
+    // Keep refs from other files, replace all refs from the current file
+    const otherFileRefs = existing.filter(ref => ref.path !== currentFilePath);
+    const merged = [...otherFileRefs, ...currentFileRefs];
+    return merged.sort(compareReferences);
   }
   haveMessagesChangedForFile(beforeMessages, afterMessages) {
     // If one exists and the other doesn't, there's a change

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

@@ -13,20 +13,26 @@ function setNestedProperty(obj, keyPath, value) {
 }
 function getSortedMessages(messages) {
   return messages.toSorted((messageA, messageB) => {
-    const pathA = messageA.references?.[0]?.path ?? '';
-    const pathB = messageB.references?.[0]?.path ?? '';
-    if (pathA === pathB) {
-      return localeCompare(messageA.id, messageB.id);
-    } else {
-      return localeCompare(pathA, pathB);
-    }
+    const refA = messageA.references?.[0];
+    const refB = messageB.references?.[0];
+
+    // No references: preserve original (extraction) order
+    if (!refA || !refB) return 0;
+
+    // Sort by path, then line. Same path+line: preserve original order
+    return compareReferences(refA, refB);
   });
 }
 function localeCompare(a, b) {
   return a.localeCompare(b, 'en');
 }
+function compareReferences(refA, refB) {
+  const pathCompare = localeCompare(refA.path, refB.path);
+  if (pathCompare !== 0) return pathCompare;
+  return (refA.line ?? 0) - (refB.line ?? 0);
+}
 function getDefaultProjectRoot() {
   return process.cwd();
 }
 
-export { getDefaultProjectRoot, getSortedMessages, localeCompare, setNestedProperty };
+export { compareReferences, getDefaultProjectRoot, getSortedMessages, localeCompare, setNestedProperty };

package/dist/esm/development/plugin/extractor/initExtractionCompiler.js

@@ -9,9 +9,25 @@ function initExtractionCompiler(pluginConfig) {
   if (!experimental?.extract) {
     return;
   }
+
+  // Avoid rollup's `replace` plugin to compile this away
+  const isDevelopment = process.env['NODE_ENV'.trim()] === 'development';
+
+  // Avoid running for:
+  // - info
+  // - start
+  // - typegen
+  //
+  // Doesn't consult Next.js config anyway:
+  // - telemetry
+  // - lint
+  //
+  // What remains are:
+  // - dev (NODE_ENV=development)
+  // - build (NODE_ENV=production)
+  const shouldRun = isDevelopment || process.argv.includes('build');
+  if (!shouldRun) return;
   runOnce(() => {
-    // Avoid rollup's `replace` plugin to compile this away
-    const isDevelopment = process.env['NODE_ENV'.trim()] === 'development';
     const extractorConfig = {
       srcPath: experimental.srcPath,
       sourceLocale: experimental.extract.sourceLocale,

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

@@ -1 +1 @@
-import e from"fs/promises";import s from"path";import{resolveCodec as t,getFormatExtension as a}from"../format/index.js";import o from"../source/SourceFileScanner.js";import i from"../source/SourceFileWatcher.js";import{getDefaultProjectRoot as r,localeCompare as c}from"../utils.js";import l from"./CatalogLocales.js";import n from"./CatalogPersister.js";import h from"./SaveScheduler.js";class g{messagesByFile=(()=>new Map)();messagesById=(()=>new Map)();translationsByTargetLocale=(()=>new Map)();lastWriteByLocale=(()=>new Map)();constructor(e,s){this.config=e,this.saveScheduler=new h(50),this.projectRoot=s.projectRoot??r(),this.isDevelopment=s.isDevelopment??!1,this.extractor=s.extractor,this.isDevelopment&&(this.sourceWatcher=new i(this.getSrcPaths(),this.handleFileEvents.bind(this)),this.sourceWatcher.start())}async getCodec(){return this.codec||(this.codec=await t(this.config.messages.format,this.projectRoot)),this.codec}async getPersister(){return this.persister||(this.persister=new n({messagesPath:this.config.messages.path,codec:await this.getCodec(),extension:a(this.config.messages.format)})),this.persister}getCatalogLocales(){if(this.catalogLocales)return this.catalogLocales;{const e=s.join(this.projectRoot,this.config.messages.path);return this.catalogLocales=new l({messagesDir:e,sourceLocale:this.config.sourceLocale,extension:a(this.config.messages.format),locales:this.config.messages.locales}),this.catalogLocales}}async getTargetLocales(){return 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(){const e=await this.loadSourceMessages();if(this.loadCatalogsPromise=this.loadTargetMessages(),await this.loadCatalogsPromise,this.scanCompletePromise=(async()=>{const s=await o.getSourceFiles(this.getSrcPaths());await Promise.all(Array.from(s).map((async e=>this.processFile(e)))),this.mergeSourceDiskMetadata(e)})(),await this.scanCompletePromise,this.isDevelopment){this.getCatalogLocales().subscribeLocalesChange(this.onLocalesChange)}}async loadSourceMessages(){const e=await this.loadLocaleMessages(this.config.sourceLocale),s=new Map;for(const t of e)s.set(t.id,t);return s}async loadLocaleMessages(e){const s=await this.getPersister(),t=await s.read(e),a=await s.getLastModified(e);return this.lastWriteByLocale.set(e,a),t}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);if(s)for(const t of Object.keys(e))["id","message","description","references"].includes(t)||(s[t]=e[t])}else{const t=this.translationsByTargetLocale.get(e),a=t&&t.size>0;if(s.length>0){const t=new Map;for(const e of s)t.set(e.id,e);this.translationsByTargetLocale.set(e,t)}else if(a);else{const s=new Map;this.translationsByTargetLocale.set(e,s)}}}mergeSourceDiskMetadata(e){for(const[s,t]of e){const e=this.messagesById.get(s);if(e)for(const s of Object.keys(t))null==e[s]&&(e[s]=t[s])}}async processFile(t){let a=[];try{const s=await e.readFile(t,"utf8");let o;try{o=await this.extractor.extract(t,s)}catch{return!1}a=o.messages}catch(e){if("ENOENT"!==e.code)throw e}const o=this.messagesByFile.get(t),i=Array.from(o?.keys()??[]),r=new Map;for(let e of a){const a=this.messagesById.get(e.id);if(a){const o=a.references??[];e={...e,references:this.mergeReferences(o,{path:s.relative(this.projectRoot,t)})};for(const s of Object.keys(a))null==e[s]&&(e[s]=a[s])}this.messagesById.set(e.id,e),r.set(e.id,e);const o=i.indexOf(e.id);-1!==o&&i.splice(o,1)}const c=s.relative(this.projectRoot,t);i.forEach((e=>{const s=this.messagesById.get(e);if(!s)return;const t=s.references?.some((e=>e.path!==c));t?s.references=s.references?.filter((e=>e.path!==c)):this.messagesById.delete(e)})),a.length>0?this.messagesByFile.set(t,r):this.messagesByFile.delete(t);return this.haveMessagesChangedForFile(o,r)}mergeReferences(e,s){const t=new Map;for(const s of e)t.set(s.path,s);return t.set(s.path,s),Array.from(t.values()).sort(((e,s)=>c(e.path,s.path)))}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(c,{locale:e,sourceMessagesById:this.messagesById});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)};async handleFileEvents(e){this.loadCatalogsPromise&&await this.loadCatalogsPromise,this.scanCompletePromise&&await this.scanCompletePromise;let s=!1;const t=await this.sourceWatcher.expandDirectoryDeleteEvents(e,Array.from(this.messagesByFile.keys()));for(const e of t){const t=await this.processFile(e.path);s||=t}s&&await this.save()}[Symbol.dispose](){this.sourceWatcher?.stop(),this.sourceWatcher=void 0,this.saveScheduler[Symbol.dispose](),this.catalogLocales&&this.isDevelopment&&this.catalogLocales.unsubscribeLocalesChange(this.onLocalesChange)}}export{g as default};
+import e from"fs/promises";import s from"path";import{resolveCodec as t,getFormatExtension as a}from"../format/index.js";import o from"../source/SourceFileScanner.js";import i from"../source/SourceFileWatcher.js";import{getDefaultProjectRoot as r,compareReferences as c}from"../utils.js";import l from"./CatalogLocales.js";import n from"./CatalogPersister.js";import h from"./SaveScheduler.js";class g{messagesByFile=(()=>new Map)();messagesById=(()=>new Map)();translationsByTargetLocale=(()=>new Map)();lastWriteByLocale=(()=>new Map)();constructor(e,s){this.config=e,this.saveScheduler=new h(50),this.projectRoot=s.projectRoot??r(),this.isDevelopment=s.isDevelopment??!1,this.extractor=s.extractor,this.isDevelopment&&(this.sourceWatcher=new i(this.getSrcPaths(),this.handleFileEvents.bind(this)),this.sourceWatcher.start())}async getCodec(){return this.codec||(this.codec=await t(this.config.messages.format,this.projectRoot)),this.codec}async getPersister(){return this.persister||(this.persister=new n({messagesPath:this.config.messages.path,codec:await this.getCodec(),extension:a(this.config.messages.format)})),this.persister}getCatalogLocales(){if(this.catalogLocales)return this.catalogLocales;{const e=s.join(this.projectRoot,this.config.messages.path);return this.catalogLocales=new l({messagesDir:e,sourceLocale:this.config.sourceLocale,extension:a(this.config.messages.format),locales:this.config.messages.locales}),this.catalogLocales}}async getTargetLocales(){return 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(){const e=await this.loadSourceMessages();if(this.loadCatalogsPromise=this.loadTargetMessages(),await this.loadCatalogsPromise,this.scanCompletePromise=(async()=>{const s=await o.getSourceFiles(this.getSrcPaths());await Promise.all(Array.from(s).map((async e=>this.processFile(e)))),this.mergeSourceDiskMetadata(e)})(),await this.scanCompletePromise,this.isDevelopment){this.getCatalogLocales().subscribeLocalesChange(this.onLocalesChange)}}async loadSourceMessages(){const e=await this.loadLocaleMessages(this.config.sourceLocale),s=new Map;for(const t of e)s.set(t.id,t);return s}async loadLocaleMessages(e){const s=await this.getPersister(),t=await s.read(e),a=await s.getLastModified(e);return this.lastWriteByLocale.set(e,a),t}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);if(s)for(const t of Object.keys(e))["id","message","description","references"].includes(t)||(s[t]=e[t])}else{const t=this.translationsByTargetLocale.get(e),a=t&&t.size>0;if(s.length>0){const t=new Map;for(const e of s)t.set(e.id,e);this.translationsByTargetLocale.set(e,t)}else if(a);else{const s=new Map;this.translationsByTargetLocale.set(e,s)}}}mergeSourceDiskMetadata(e){for(const[s,t]of e){const e=this.messagesById.get(s);if(e)for(const s of Object.keys(t))null==e[s]&&(e[s]=t[s])}}async processFile(t){let a=[];try{const s=await e.readFile(t,"utf8");let o;try{o=await this.extractor.extract(t,s)}catch{return!1}a=o.messages}catch(e){if("ENOENT"!==e.code)throw e}const o=this.messagesByFile.get(t),i=s.relative(this.projectRoot,t),r=Array.from(o?.keys()??[]),c=new Map;for(let e of a){const s=this.messagesById.get(e.id);if(s){e={...e},e.references&&(e.references=this.mergeReferences(s.references??[],i,e.references));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)}r.forEach((e=>{const s=this.messagesById.get(e);if(!s)return;const t=s.references?.some((e=>e.path!==i));t?s.references=s.references?.filter((e=>e.path!==i)):this.messagesById.delete(e)})),a.length>0?this.messagesByFile.set(t,c):this.messagesByFile.delete(t);return this.haveMessagesChangedForFile(o,c)}mergeReferences(e,s,t){return[...e.filter((e=>e.path!==s)),...t].sort(c)}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(c,{locale:e,sourceMessagesById:this.messagesById});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)};async handleFileEvents(e){this.loadCatalogsPromise&&await this.loadCatalogsPromise,this.scanCompletePromise&&await this.scanCompletePromise;let s=!1;const t=await this.sourceWatcher.expandDirectoryDeleteEvents(e,Array.from(this.messagesByFile.keys()));for(const e of t){const t=await this.processFile(e.path);s||=t}s&&await this.save()}[Symbol.dispose](){this.sourceWatcher?.stop(),this.sourceWatcher=void 0,this.saveScheduler[Symbol.dispose](),this.catalogLocales&&this.isDevelopment&&this.catalogLocales.unsubscribeLocalesChange(this.onLocalesChange)}}export{g as default};

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

@@ -1 +1 @@
-function e(e,t,n){const r=t.split(".");let o=e;for(let e=0;e<r.length-1;e++){const t=r[e];t in o&&"object"==typeof o[t]&&null!==o[t]||(o[t]={}),o=o[t]}o[r[r.length-1]]=n}function t(e){return e.toSorted(((e,t)=>{const r=e.references?.[0]?.path??"",o=t.references?.[0]?.path??"";return r===o?n(e.id,t.id):n(r,o)}))}function n(e,t){return e.localeCompare(t,"en")}function r(){return process.cwd()}export{r as getDefaultProjectRoot,t as getSortedMessages,n as localeCompare,e as setNestedProperty};
+function n(n,e,t){const r=e.split(".");let o=n;for(let n=0;n<r.length-1;n++){const e=r[n];e in o&&"object"==typeof o[e]&&null!==o[e]||(o[e]={}),o=o[e]}o[r[r.length-1]]=t}function e(n){return n.toSorted(((n,e)=>{const t=n.references?.[0],o=e.references?.[0];return t&&o?r(t,o):0}))}function t(n,e){return n.localeCompare(e,"en")}function r(n,e){const r=t(n.path,e.path);return 0!==r?r:(n.line??0)-(e.line??0)}function o(){return process.cwd()}export{r as compareReferences,o as getDefaultProjectRoot,e as getSortedMessages,t as localeCompare,n as setNestedProperty};

package/dist/esm/production/plugin/extractor/initExtractionCompiler.js

@@ -1 +1 @@
-import e from"../../extractor/ExtractionCompiler.js";import{once as o}from"../utils.js";let s;const t=o("_NEXT_INTL_EXTRACT");function r(o){const r=o.experimental;r?.extract&&t((()=>{const o="development"===process.env["NODE_ENV".trim()],t={srcPath:r.srcPath,sourceLocale:r.extract.sourceLocale,messages:r.messages};function c(){s&&(s[Symbol.dispose](),s=void 0)}s=new e(t,{isDevelopment:o,projectRoot:process.cwd()}),s.extractAll(),process.on("exit",c),process.on("SIGINT",c),process.on("SIGTERM",c)}))}export{r as default};
+import e from"../../extractor/ExtractionCompiler.js";import{once as o}from"../utils.js";let s;const t=o("_NEXT_INTL_EXTRACT");function r(o){const r=o.experimental;if(!r?.extract)return;const c="development"===process.env["NODE_ENV".trim()];(c||process.argv.includes("build"))&&t((()=>{const o={srcPath:r.srcPath,sourceLocale:r.extract.sourceLocale,messages:r.messages};function t(){s&&(s[Symbol.dispose](),s=void 0)}s=new e(o,{isDevelopment:c,projectRoot:process.cwd()}),s.extractAll(),process.on("exit",t),process.on("SIGINT",t),process.on("SIGTERM",t)}))}export{r as default};

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

@@ -1,12 +1,14 @@
 import type { MessagesFormat } from './format/types.js';
 export type Locale = string;
+export type ExtractorMessageReference = {
+    path: string;
+    line?: number;
+};
 export type ExtractorMessage = {
     id: string;
     message: string;
     description?: string;
-    references?: Array<{
-        path: string;
-    }>;
+    references?: Array<ExtractorMessageReference>;
     /** Allows for additional properties like .po flags to be read and later written. */
     [key: string]: unknown;
 };

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

@@ -1,5 +1,6 @@
-import type { ExtractorMessage } from './types.js';
+import type { ExtractorMessage, ExtractorMessageReference } from './types.js';
 export declare function setNestedProperty(obj: Record<string, any>, keyPath: string, value: any): void;
 export declare function getSortedMessages(messages: Array<ExtractorMessage>): Array<ExtractorMessage>;
 export declare function localeCompare(a: string, b: string): number;
+export declare function compareReferences(refA: ExtractorMessageReference, refB: ExtractorMessageReference): number;
 export declare function getDefaultProjectRoot(): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-intl",
-  "version": "4.6.1",
+  "version": "4.7.0",
   "sideEffects": false,
   "author": "Jan Amann <jan@amann.work>",
   "funding": [
@@ -128,9 +128,9 @@
     "@parcel/watcher": "^2.4.1",
     "@swc/core": "^1.15.2",
     "negotiator": "^1.0.0",
-    "next-intl-swc-plugin-extractor": "^4.6.1",
-    "po-parser": "^2.0.0",
-    "use-intl": "^4.6.1"
+    "next-intl-swc-plugin-extractor": "^4.7.0",
+    "po-parser": "^2.1.1",
+    "use-intl": "^4.7.0"
   },
   "peerDependencies": {
     "next": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
@@ -142,5 +142,5 @@
       "optional": true
     }
   },
-  "gitHead": "dd3a0472fd142439527f7c8b80e9af0135af211b"
+  "gitHead": "f7da9b11eb59dcc83525500ff9af14110ea9bea9"
 }