next-intl 4.6.0 → 4.7.0

package/dist/esm/development/extractor/source/SourceFileWatcher.js

@@ -1,5 +1,8 @@
+import fs from 'fs/promises';
+import path from 'path';
 import { subscribe } from '@parcel/watcher';
 import SourceFileFilter from './SourceFileFilter.js';
+import SourceFileScanner from './SourceFileScanner.js';
 
 class SourceFileWatcher {
   subscriptions = [];
@@ -8,17 +11,19 @@ class SourceFileWatcher {
     this.onChange = onChange;
   }
   async start() {
-    if (this.subscriptions.length > 0) return;
+    if (this.subscriptions.length > 0) {
+      return;
+    }
     const ignore = SourceFileFilter.IGNORED_DIRECTORIES.map(dir => `**/${dir}/**`);
     for (const root of this.roots) {
-      const sub = await subscribe(root, (err, events) => {
+      const sub = await subscribe(root, async (err, events) => {
         if (err) {
           console.error(err);
           return;
         }
-        const filteredEvents = events.filter(event => SourceFileFilter.isSourceFile(event.path));
-        if (filteredEvents.length > 0) {
-          void this.onChange(filteredEvents);
+        const filtered = await this.normalizeEvents(events);
+        if (filtered.length > 0) {
+          void this.onChange(filtered);
         }
       }, {
         ignore
@@ -26,6 +31,95 @@ class SourceFileWatcher {
       this.subscriptions.push(sub);
     }
   }
+  async normalizeEvents(events) {
+    const directoryCreatePaths = [];
+    const otherEvents = [];
+
+    // We need to expand directory creates because during rename operations,
+    // @parcel/watcher emits a directory create event but may not emit individual
+    // file events for the moved files
+    await Promise.all(events.map(async event => {
+      if (event.type === 'create') {
+        try {
+          const stats = await fs.stat(event.path);
+          if (stats.isDirectory()) {
+            directoryCreatePaths.push(event.path);
+            return;
+          }
+        } catch {
+          // Path doesn't exist or is inaccessible, treat as file
+        }
+      }
+      otherEvents.push(event);
+    }));
+
+    // Expand directory create events to find source files inside
+    let expandedCreateEvents = [];
+    if (directoryCreatePaths.length > 0) {
+      try {
+        const sourceFiles = await SourceFileScanner.getSourceFiles(directoryCreatePaths);
+        expandedCreateEvents = Array.from(sourceFiles).map(filePath => ({
+          type: 'create',
+          path: filePath
+        }));
+      } catch {
+        // Directories might have been deleted or are inaccessible
+      }
+    }
+
+    // Combine original events with expanded directory creates.
+    // Deduplicate by path to avoid processing the same file twice
+    // in case @parcel/watcher also emitted individual file events.
+    const allEvents = [...otherEvents, ...expandedCreateEvents];
+    const seenPaths = new Set();
+    const deduplicated = [];
+    for (const event of allEvents) {
+      const key = `${event.type}:${event.path}`;
+      if (!seenPaths.has(key)) {
+        seenPaths.add(key);
+        deduplicated.push(event);
+      }
+    }
+    return deduplicated.filter(event => {
+      // Keep all delete events (might be deleted directories that no longer exist)
+      if (event.type === 'delete') {
+        return true;
+      }
+      // Keep source files
+      return SourceFileFilter.isSourceFile(event.path);
+    });
+  }
+  async expandDirectoryDeleteEvents(events, prevKnownFiles) {
+    const expanded = [];
+    for (const event of events) {
+      if (event.type === 'delete' && !SourceFileFilter.isSourceFile(event.path)) {
+        const dirPath = path.resolve(event.path);
+        const filesInDirectory = [];
+        for (const filePath of prevKnownFiles) {
+          if (SourceFileFilter.isWithinPath(filePath, dirPath)) {
+            filesInDirectory.push(filePath);
+          }
+        }
+
+        // If we found files within this path, it was a directory
+        if (filesInDirectory.length > 0) {
+          for (const filePath of filesInDirectory) {
+            expanded.push({
+              type: 'delete',
+              path: filePath
+            });
+          }
+        } else {
+          // Not a directory or no files in it, pass through as-is
+          expanded.push(event);
+        }
+      } else {
+        // Pass through as-is
+        expanded.push(event);
+      }
+    }
+    return expanded;
+  }
   async stop() {
     await Promise.all(this.subscriptions.map(sub => sub.unsubscribe()));
     this.subscriptions = [];

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/createNextIntlPlugin.js

@@ -1,3 +1,4 @@
+import initExtractionCompiler from './extractor/initExtractionCompiler.js';
 import getNextConfig from './getNextConfig.js';
 import { warn } from './utils.js';
 import createMessagesDeclaration from './declaration/createMessagesDeclaration.js';
@@ -10,6 +11,7 @@ function initPlugin(pluginConfig, nextConfig) {
   if (messagesPathOrPaths) {
     createMessagesDeclaration(typeof messagesPathOrPaths === 'string' ? [messagesPathOrPaths] : messagesPathOrPaths);
   }
+  initExtractionCompiler(pluginConfig);
   return getNextConfig(pluginConfig, nextConfig);
 }
 function createNextIntlPlugin(i18nPathOrConfig = {}) {

package/dist/esm/development/plugin/declaration/createMessagesDeclaration.js

@@ -1,15 +1,9 @@
 import fs from 'fs';
 import path from 'path';
-import { throwError } from '../utils.js';
+import { once, throwError } from '../utils.js';
 import watchFile from '../watchFile.js';
 
-function runOnce(fn) {
-  if (process.env._NEXT_INTL_COMPILE_MESSAGES === '1') {
-    return;
-  }
-  process.env._NEXT_INTL_COMPILE_MESSAGES = '1';
-  fn();
-}
+const runOnce = once('_NEXT_INTL_COMPILE_MESSAGES');
 function createMessagesDeclaration(messagesPaths) {
   // Instead of running _only_ in certain cases, it's
   // safer to _avoid_ running for certain known cases.
@@ -29,9 +23,6 @@ function createMessagesDeclaration(messagesPaths) {
   if (shouldBailOut) {
     return;
   }
-
-  // Next.js can call the Next.js config multiple
-  // times - ensure we only run once.
   runOnce(() => {
     for (const messagesPath of messagesPaths) {
       const fullPath = path.resolve(messagesPath);

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

@@ -0,0 +1,61 @@
+import ExtractionCompiler from '../../extractor/ExtractionCompiler.js';
+import { once } from '../utils.js';
+
+// Single compiler instance, initialized once per process
+let compiler;
+const runOnce = once('_NEXT_INTL_EXTRACT');
+function initExtractionCompiler(pluginConfig) {
+  const experimental = pluginConfig.experimental;
+  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(() => {
+    const extractorConfig = {
+      srcPath: experimental.srcPath,
+      sourceLocale: experimental.extract.sourceLocale,
+      messages: experimental.messages
+    };
+    compiler = new ExtractionCompiler(extractorConfig, {
+      isDevelopment,
+      projectRoot: process.cwd()
+    });
+
+    // Fire-and-forget: Start extraction, don't block config return.
+    // In dev mode, this also starts the file watcher.
+    // In prod, ideally we would wait until the extraction is complete,
+    // but we can't `await` anywhere (at least for Turbopack).
+    // The result is ok though, as if we encounter untranslated messages,
+    // we'll simply add empty messages to the catalog. So for actually
+    // running the app, there is no difference.
+    compiler.extractAll();
+    function cleanup() {
+      if (compiler) {
+        compiler[Symbol.dispose]();
+        compiler = undefined;
+      }
+    }
+    process.on('exit', cleanup);
+    process.on('SIGINT', cleanup);
+    process.on('SIGTERM', cleanup);
+  });
+}
+
+export { initExtractionCompiler as default };

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

@@ -8,4 +8,19 @@ function warn(message) {
   console.warn(formatMessage(message));
 }
 
-export { throwError, warn };
+/**
+ * Returns a function that runs the provided callback only once per process.
+ * Next.js can call the config multiple times - this ensures we only run once.
+ * Uses an environment variable to track execution across config loads.
+ */
+function once(namespace) {
+  return function runOnce(fn) {
+    if (process.env[namespace] === '1') {
+      return;
+    }
+    process.env[namespace] = '1';
+    fn();
+  };
+}
+
+export { once, throwError, warn };

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

@@ -1 +1 @@
-import s from"./catalog/CatalogManager.js";import t from"./extractor/MessageExtractor.js";class o{constructor(o,a={}){const e=a.extractor??new t(a);this.manager=new s(o,{...a,extractor:e}),this[Symbol.dispose]=this[Symbol.dispose].bind(this),this.installExitHandlers()}async extractAll(){await this.manager.loadMessages(),await this.manager.save()}[Symbol.dispose](){this.uninstallExitHandlers(),this.manager.destroy()}installExitHandlers(){const s=this[Symbol.dispose];process.on("exit",s),process.on("SIGINT",s),process.on("SIGTERM",s)}uninstallExitHandlers(){const s=this[Symbol.dispose];process.off("exit",s),process.off("SIGINT",s),process.off("SIGTERM",s)}}export{o as default};
+import s from"./catalog/CatalogManager.js";import t from"./extractor/MessageExtractor.js";class o{constructor(o,a={}){const e=a.extractor??new t(a);this.manager=new s(o,{...a,extractor:e}),this[Symbol.dispose]=this[Symbol.dispose].bind(this),this.installExitHandlers()}async extractAll(){await this.manager.loadMessages(),await this.manager.save()}[Symbol.dispose](){this.uninstallExitHandlers(),this.manager[Symbol.dispose]()}installExitHandlers(){const s=this[Symbol.dispose];process.on("exit",s),process.on("SIGINT",s),process.on("SIGTERM",s)}uninstallExitHandlers(){const s=this[Symbol.dispose];process.off("exit",s),process.off("SIGINT",s),process.off("SIGTERM",s)}}export{o as default};

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();this.loadCatalogsPromise=this.loadTargetMessages(),await this.loadCatalogsPromise;const s=await o.getSourceFiles(this.getSrcPaths());if(await Promise.all(Array.from(s).map((async e=>this.processFile(e)))),this.mergeSourceDiskMetadata(e),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=new Map;for(const e of s)t.set(e.id,e);this.translationsByTargetLocale.set(e,t)}}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");a=(await this.extractor.extract(t,s)).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;let s=!1;for(const t of e){const e=await this.processFile(t.path);s||=e}s&&await this.save()}destroy(){this.sourceWatcher?.stop(),this.sourceWatcher=void 0,this.saveScheduler.destroy(),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/catalog/SaveScheduler.js

@@ -1 +1 @@
-class e{isSaving=!1;pendingResolvers=[];constructor(e=50){this.delayMs=e}async schedule(e){return new Promise(((s,i)=>{this.pendingResolvers.push({resolve:s,reject:i}),this.nextSaveTask=e,this.isSaving||this.saveTimeout?this.saveTimeout&&this.scheduleSave():this.executeSave()}))}scheduleSave(){this.saveTimeout&&clearTimeout(this.saveTimeout),this.saveTimeout=setTimeout((()=>{this.saveTimeout=void 0,this.executeSave()}),this.delayMs)}async executeSave(){if(this.isSaving)return;const e=this.nextSaveTask;if(!e)return;const s=this.pendingResolvers;this.pendingResolvers=[],this.nextSaveTask=void 0,this.isSaving=!0;try{const i=await e();s.forEach((({resolve:e})=>e(i)))}catch(e){s.forEach((({reject:s})=>s(e)))}finally{this.isSaving=!1,this.pendingResolvers.length>0&&this.scheduleSave()}}destroy(){this.saveTimeout&&(clearTimeout(this.saveTimeout),this.saveTimeout=void 0),this.pendingResolvers=[],this.nextSaveTask=void 0,this.isSaving=!1}}export{e as default};
+class e{isSaving=!1;pendingResolvers=[];constructor(e=50){this.delayMs=e}async schedule(e){return new Promise(((s,i)=>{this.pendingResolvers.push({resolve:s,reject:i}),this.nextSaveTask=e,this.isSaving||this.saveTimeout?this.saveTimeout&&this.scheduleSave():this.executeSave()}))}scheduleSave(){this.saveTimeout&&clearTimeout(this.saveTimeout),this.saveTimeout=setTimeout((()=>{this.saveTimeout=void 0,this.executeSave()}),this.delayMs)}async executeSave(){if(this.isSaving)return;const e=this.nextSaveTask;if(!e)return;const s=this.pendingResolvers;this.pendingResolvers=[],this.nextSaveTask=void 0,this.isSaving=!0;try{const i=await e();s.forEach((({resolve:e})=>e(i)))}catch(e){s.forEach((({reject:s})=>s(e)))}finally{this.isSaving=!1,this.pendingResolvers.length>0&&this.scheduleSave()}}[Symbol.dispose](){this.saveTimeout&&(clearTimeout(this.saveTimeout),this.saveTimeout=void 0),this.pendingResolvers=[],this.nextSaveTask=void 0,this.isSaving=!1}}export{e as default};

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

@@ -1 +1 @@
-import t from"./ExtractionCompiler.js";import e from"./extractor/MessageExtractor.js";let o,r,s;function c(c){const a=this.getOptions(),i=this.async(),n=this.rootContext,p="development"===process.env["NODE_ENV".trim()];r||(r=new e({isDevelopment:p,projectRoot:n,sourceMap:this.sourceMap})),o||(o=new t(a,{isDevelopment:p,projectRoot:n,sourceMap:this.sourceMap,extractor:r})),s||(s=o.extractAll()),r.extract(this.resourcePath,c).then((async t=>{p||await s,i(null,t.code,t.map)})).catch(i)}export{c as default};
+import t from"./extractor/MessageExtractor.js";let e;function o(o){const r=this.async(),s=this.rootContext,c="development"===process.env["NODE_ENV".trim()];e||(e=new t({isDevelopment:c,projectRoot:s,sourceMap:this.sourceMap})),e.extract(this.resourcePath,o).then((t=>{r(null,t.code,t.map)})).catch(r)}export{o as default};

package/dist/esm/production/extractor/source/SourceFileWatcher.js

@@ -1 +1 @@
-import{subscribe as s}from"@parcel/watcher";import t from"./SourceFileFilter.js";class o{subscriptions=[];constructor(s,t){this.roots=s,this.onChange=t}async start(){if(this.subscriptions.length>0)return;const o=t.IGNORED_DIRECTORIES.map((s=>`**/${s}/**`));for(const i of this.roots){const r=await s(i,((s,o)=>{if(s)return void console.error(s);const i=o.filter((s=>t.isSourceFile(s.path)));i.length>0&&this.onChange(i)}),{ignore:o});this.subscriptions.push(r)}}async stop(){await Promise.all(this.subscriptions.map((s=>s.unsubscribe()))),this.subscriptions=[]}[Symbol.dispose](){this.stop()}}export{o as default};
+import t from"fs/promises";import s from"path";import{subscribe as e}from"@parcel/watcher";import o from"./SourceFileFilter.js";import r from"./SourceFileScanner.js";class i{subscriptions=[];constructor(t,s){this.roots=t,this.onChange=s}async start(){if(this.subscriptions.length>0)return;const t=o.IGNORED_DIRECTORIES.map((t=>`**/${t}/**`));for(const s of this.roots){const o=await e(s,(async(t,s)=>{if(t)return void console.error(t);const e=await this.normalizeEvents(s);e.length>0&&this.onChange(e)}),{ignore:t});this.subscriptions.push(o)}}async normalizeEvents(s){const e=[],i=[];await Promise.all(s.map((async s=>{if("create"===s.type)try{if((await t.stat(s.path)).isDirectory())return void e.push(s.path)}catch{}i.push(s)})));let a=[];if(e.length>0)try{const t=await r.getSourceFiles(e);a=Array.from(t).map((t=>({type:"create",path:t})))}catch{}const n=[...i,...a],c=new Set,p=[];for(const t of n){const s=`${t.type}:${t.path}`;c.has(s)||(c.add(s),p.push(t))}return p.filter((t=>"delete"===t.type||o.isSourceFile(t.path)))}async expandDirectoryDeleteEvents(t,e){const r=[];for(const i of t)if("delete"!==i.type||o.isSourceFile(i.path))r.push(i);else{const t=s.resolve(i.path),a=[];for(const s of e)o.isWithinPath(s,t)&&a.push(s);if(a.length>0)for(const t of a)r.push({type:"delete",path:t});else r.push(i)}return r}async stop(){await Promise.all(this.subscriptions.map((t=>t.unsubscribe()))),this.subscriptions=[]}[Symbol.dispose](){this.stop()}}export{i 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/createNextIntlPlugin.js

@@ -1 +1 @@
-import e from"./getNextConfig.js";import{warn as t}from"./utils.js";import r from"./declaration/createMessagesDeclaration.js";function o(o={}){const n="string"==typeof o?{requestConfig:o}:o;return function(o){return function(o,n){null!=n?.i18n&&t("An `i18n` property was found in your Next.js config. This likely causes conflicts and should therefore be removed if you use the App Router.\n\nIf you're in progress of migrating from the Pages Router, you can refer to this example: https://next-intl.dev/examples#app-router-migration\n");const i=o.experimental?.createMessagesDeclaration;return i&&r("string"==typeof i?[i]:i),e(o,n)}(n,o)}}export{o as default};
+import e from"./extractor/initExtractionCompiler.js";import t from"./getNextConfig.js";import{warn as r}from"./utils.js";import o from"./declaration/createMessagesDeclaration.js";function n(n={}){const i="string"==typeof n?{requestConfig:n}:n;return function(n){return function(n,i){null!=i?.i18n&&r("An `i18n` property was found in your Next.js config. This likely causes conflicts and should therefore be removed if you use the App Router.\n\nIf you're in progress of migrating from the Pages Router, you can refer to this example: https://next-intl.dev/examples#app-router-migration\n");const s=n.experimental?.createMessagesDeclaration;return s&&o("string"==typeof s?[s]:s),e(n),t(n,i)}(i,n)}}export{n as default};

package/dist/esm/production/plugin/declaration/createMessagesDeclaration.js

@@ -1 +1 @@
-import e from"fs";import s from"path";import{throwError as t}from"../utils.js";import o from"../watchFile.js";function n(o){var n;["info","start"].some((e=>process.argv.includes(e)))||(n=()=>{for(const n of o){const o=s.resolve(n);e.existsSync(o)||t(`\`createMessagesDeclaration\` points to a non-existent file: ${o}`),o.endsWith(".json")||t(`\`createMessagesDeclaration\` needs to point to a JSON file. Received: ${o}`);const c=process.env["NODE_ENV".trim()];i(n),"development"===c&&r(n)}},"1"!==process.env._NEXT_INTL_COMPILE_MESSAGES&&(process.env._NEXT_INTL_COMPILE_MESSAGES="1",n()))}function r(e){const s=o(e,(()=>{i(e,!0)}));process.on("exit",(()=>{s.close()}))}function i(s,t=!1){const o=s.replace(/\.json$/,".d.json.ts");function n(e){return`// This file is auto-generated by next-intl, do not edit directly.\n// See: https://next-intl.dev/docs/workflows/typescript#messages-arguments\n\ndeclare const messages: ${e.trim()};\nexport default messages;`}if(t)return e.promises.readFile(s,"utf-8").then((s=>e.promises.writeFile(o,n(s))));const r=e.readFileSync(s,"utf-8");e.writeFileSync(o,n(r))}export{n as default};
+import e from"fs";import t from"path";import{once as s,throwError as o}from"../utils.js";import n from"../watchFile.js";const i=s("_NEXT_INTL_COMPILE_MESSAGES");function r(s){["info","start"].some((e=>process.argv.includes(e)))||i((()=>{for(const n of s){const s=t.resolve(n);e.existsSync(s)||o(`\`createMessagesDeclaration\` points to a non-existent file: ${s}`),s.endsWith(".json")||o(`\`createMessagesDeclaration\` needs to point to a JSON file. Received: ${s}`);const i=process.env["NODE_ENV".trim()];a(n),"development"===i&&c(n)}}))}function c(e){const t=n(e,(()=>{a(e,!0)}));process.on("exit",(()=>{t.close()}))}function a(t,s=!1){const o=t.replace(/\.json$/,".d.json.ts");function n(e){return`// This file is auto-generated by next-intl, do not edit directly.\n// See: https://next-intl.dev/docs/workflows/typescript#messages-arguments\n\ndeclare const messages: ${e.trim()};\nexport default messages;`}if(s)return e.promises.readFile(t,"utf-8").then((t=>e.promises.writeFile(o,n(t))));const i=e.readFileSync(t,"utf-8");e.writeFileSync(o,n(i))}export{r as default};

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

@@ -0,0 +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;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/esm/production/plugin/utils.js

@@ -1 +1 @@
-function n(n){return`\n[next-intl] ${n}\n`}function o(o){throw new Error(n(o))}function r(o){console.warn(n(o))}export{o as throwError,r as warn};
+function n(n){return`\n[next-intl] ${n}\n`}function o(o){throw new Error(n(o))}function r(o){console.warn(n(o))}function t(n){return function(o){"1"!==process.env[n]&&(process.env[n]="1",o())}}export{t as once,o as throwError,r as warn};

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

@@ -1,6 +1,6 @@
 import type MessageExtractor from '../extractor/MessageExtractor.js';
 import type { ExtractorConfig } from '../types.js';
-export default class CatalogManager {
+export default class CatalogManager implements Disposable {
     private config;
     /**
      * The source of truth for which messages are used.
@@ -27,7 +27,8 @@ export default class CatalogManager {
     private catalogLocales?;
     private extractor;
     private sourceWatcher?;
-    loadCatalogsPromise?: Promise<unknown>;
+    private loadCatalogsPromise?;
+    private scanCompletePromise?;
     constructor(config: ExtractorConfig, opts: {
         projectRoot?: string;
         isDevelopment?: boolean;
@@ -38,14 +39,14 @@ export default class CatalogManager {
     private getPersister;
     private getCatalogLocales;
     private getTargetLocales;
-    getSrcPaths(): Array<string>;
+    private getSrcPaths;
     loadMessages(): Promise<void>;
     private loadSourceMessages;
     private loadLocaleMessages;
     private loadTargetMessages;
     private reloadLocaleCatalog;
     private mergeSourceDiskMetadata;
-    processFile(absoluteFilePath: string): Promise<boolean>;
+    private processFile;
     private mergeReferences;
     private haveMessagesChangedForFile;
     private areMessagesEqual;
@@ -54,5 +55,5 @@ export default class CatalogManager {
     private saveLocale;
     private onLocalesChange;
     private handleFileEvents;
-    destroy(): void;
+    [Symbol.dispose](): void;
 }

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

@@ -3,7 +3,7 @@ type SaveTask<T> = () => Promise<T>;
  * De-duplicates excessive save invocations,
  * while keeping a single one instant.
  */
-export default class SaveScheduler<Value> {
+export default class SaveScheduler<Value> implements Disposable {
     private saveTimeout?;
     private isSaving;
     private delayMs;
@@ -13,6 +13,6 @@ export default class SaveScheduler<Value> {
     schedule(saveTask: SaveTask<Value>): Promise<Value>;
     private scheduleSave;
     private executeSave;
-    destroy(): void;
+    [Symbol.dispose](): void;
 }
 export {};

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

@@ -4,5 +4,5 @@ export default class SourceFileFilter {
     static isSourceFile(filePath: string): boolean;
     static shouldEnterDirectory(dirPath: string, srcPaths: Array<string>): boolean;
     private static isIgnoredDirectoryExplicitlyIncluded;
-    private static isWithinPath;
+    static isWithinPath(targetPath: string, basePath: string): boolean;
 }

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

@@ -1,11 +1,14 @@
 import { type Event } from '@parcel/watcher';
 type OnChange = (events: Array<Event>) => Promise<void>;
+export type SourceFileWatcherEvent = Event;
 export default class SourceFileWatcher implements Disposable {
     private subscriptions;
     private roots;
     private onChange;
     constructor(roots: Array<string>, onChange: OnChange);
     start(): Promise<void>;
+    private normalizeEvents;
+    expandDirectoryDeleteEvents(events: Array<Event>, prevKnownFiles: Array<string>): Promise<Array<Event>>;
     stop(): Promise<void>;
     [Symbol.dispose](): void;
 }

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/dist/types/plugin/extractor/initExtractionCompiler.d.ts

@@ -0,0 +1,2 @@
+import type { PluginConfig } from '../types.js';
+export default function initExtractionCompiler(pluginConfig: PluginConfig): void;

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

@@ -1,2 +1,8 @@
 export declare function throwError(message: string): never;
 export declare function warn(message: string): void;
+/**
+ * Returns a function that runs the provided callback only once per process.
+ * Next.js can call the config multiple times - this ensures we only run once.
+ * Uses an environment variable to track execution across config loads.
+ */
+export declare function once(namespace: string): (fn: () => void) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-intl",
-  "version": "4.6.0",
+  "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.0",
-    "po-parser": "^2.0.0",
-    "use-intl": "^4.6.0"
+    "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": "70a047daa5cb235fdcadcf6ebf1daed32ad30c85"
+  "gitHead": "f7da9b11eb59dcc83525500ff9af14110ea9bea9"
 }

package/dist/cjs/development/ExtractorCodec-DZKNn0Zq.cjs

@@ -1,37 +0,0 @@
-'use strict';
-
-// Essentialls lodash/set, but we avoid this dependency
-function setNestedProperty(obj, keyPath, value) {
-  const keys = keyPath.split('.');
-  let current = obj;
-  for (let i = 0; i < keys.length - 1; i++) {
-    const key = keys[i];
-    if (!(key in current) || typeof current[key] !== 'object' || current[key] === null) {
-      current[key] = {};
-    }
-    current = current[key];
-  }
-  current[keys[keys.length - 1]] = 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);
-    }
-  });
-}
-function localeCompare(a, b) {
-  return a.localeCompare(b, 'en');
-}
-
-function defineCodec(factory) {
-  return factory;
-}
-
-exports.defineCodec = defineCodec;
-exports.getSortedMessages = getSortedMessages;
-exports.setNestedProperty = setNestedProperty;

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

@@ -1,12 +0,0 @@
-type VarInfo = {
-    kind: string;
-    namespace?: string;
-};
-export default class ASTScope {
-    parent?: ASTScope;
-    vars: Map<string, VarInfo>;
-    constructor(parent?: ASTScope);
-    define(name: string, kind: string, namespace?: string): void;
-    lookup(name: string): VarInfo | undefined;
-}
-export {};