next-intl 4.5.2 → 4.5.4

package/README.md

@@ -1,4 +1,4 @@
-<h1 align="center">
+<p align="center">
   <br>
   <a href="https://next-intl.dev">
     <picture>
@@ -9,9 +9,9 @@
   </a>
   <br>
   <br>
-</h1>
+</p>
 
-> Internationalization (i18n) for Next.js
+Internationalization for Next.js.
 
 ## Features
 

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

@@ -22,7 +22,7 @@ class ExtractionCompiler {
       // don't need to await the persistence
       void this.manager.save();
     }
-    return result.source;
+    return result;
   }
   async performInitialScan() {
     // We can't rely on all files being compiled (e.g. due to persistent

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

@@ -31,7 +31,8 @@ class CatalogManager {
     this.isDevelopment = opts.isDevelopment ?? false;
     this.messageExtractor = new MessageExtractor({
       isDevelopment: this.isDevelopment,
-      projectRoot: this.projectRoot
+      projectRoot: this.projectRoot,
+      sourceMap: opts.sourceMap
     });
   }
   async getFormatter() {

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

@@ -11,11 +11,12 @@ function extractionLoader(source) {
   if (!compiler) {
     compiler = new ExtractionCompiler(options, {
       // Avoid rollup's `replace` plugin to compile this away
-      isDevelopment: process.env['NODE_ENV'.trim()] === 'development'
+      isDevelopment: process.env['NODE_ENV'.trim()] === 'development',
+      sourceMap: this.sourceMap
     });
   }
   compiler.compile(this.resourcePath, source).then(result => {
-    callback(null, result);
+    callback(null, result.code, result.map);
   }).catch(callback);
 }
 

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

@@ -1,16 +1,15 @@
+import { createRequire } from 'module';
 import path from 'path';
-import { parse, print } from '@swc/core';
-import { warn } from '../../plugin/utils.js';
-import ASTScope from './ASTScope.js';
-import KeyGenerator from './KeyGenerator.js';
+import { transform } from '@swc/core';
 import LRUCache from './LRUCache.js';
 
+const require = createRequire(import.meta.url);
 class MessageExtractor {
-  static NAMESPACE_SEPARATOR = '.';
   compileCache = (() => new LRUCache(750))();
   constructor(opts) {
     this.isDevelopment = opts.isDevelopment;
     this.projectRoot = opts.projectRoot;
+    this.sourceMap = opts.sourceMap ?? false;
   }
   async processFileContent(absoluteFilePath, source) {
     const cacheKey = source;
@@ -23,379 +22,42 @@ class MessageExtractor {
     if (!source.includes('useExtracted') && !source.includes('getExtracted')) {
       return {
         messages: [],
-        source
+        code: source
       };
     }
-    const ast = await parse(source, {
-      syntax: 'typescript',
-      tsx: true,
-      target: 'es2022',
-      decorators: true
-    });
-    const relativeFilePath = path.relative(this.projectRoot, absoluteFilePath);
-    const processResult = await this.processAST(ast, relativeFilePath);
-    const finalResult = processResult.source ? processResult : {
-      ...processResult,
-      source
-    };
-    this.compileCache.set(cacheKey, finalResult);
-    return finalResult;
-  }
-  async processAST(ast, filePath) {
-    const results = [];
-    let hookLocalName = null;
-    let hookType = null;
-    const isDevelopment = this.isDevelopment;
-    const scopeStack = [new ASTScope()];
-    function currentScope() {
-      return scopeStack[scopeStack.length - 1];
-    }
-    function createUndefinedArgument() {
-      return {
-        expression: {
-          type: 'Identifier',
-          value: 'undefined',
-          optional: false,
-          ctxt: 1,
-          span: {
-            start: 0,
-            end: 0,
-            ctxt: 0
-          }
-        }
-      };
-    }
-    function extractStaticString(value) {
-      if (value.type === 'StringLiteral') {
-        return value.value;
-      } else if (value.type === 'TemplateLiteral') {
-        const templateLiteral = value;
-        // Only handle simple template literals without expressions
-        if (templateLiteral.expressions.length === 0 && templateLiteral.quasis.length === 1) {
-          return templateLiteral.quasis[0].cooked || templateLiteral.quasis[0].raw;
+    const filePath = path.relative(this.projectRoot, absoluteFilePath);
+    const result = await transform(source, {
+      jsc: {
+        target: 'esnext',
+        parser: {
+          syntax: 'typescript',
+          tsx: true,
+          decorators: true
+        },
+        experimental: {
+          disableBuiltinTransformsForInternalTesting: true,
+          disableAllLints: true,
+          plugins: [[require.resolve('next-intl-swc-plugin-extractor'), {
+            isDevelopment: this.isDevelopment,
+            filePath
+          }]]
         }
-      }
-      return null;
-    }
-    function visit(node) {
-      if (typeof node !== 'object') return;
-      switch (node.type) {
-        case 'ImportDeclaration':
-          {
-            const decl = node;
-            if (decl.source.value === 'next-intl') {
-              for (const spec of decl.specifiers) {
-                if (spec.type === 'ImportSpecifier') {
-                  const importedName = spec.imported?.value;
-                  const localName = spec.local.value;
-                  if (importedName === 'useExtracted' || localName === 'useExtracted') {
-                    hookLocalName = localName;
-                    hookType = 'useTranslations';
-
-                    // Transform import to useTranslations
-                    spec.imported = undefined;
-                    spec.local.value = 'useTranslations';
-                  }
-                }
-              }
-            } else if (decl.source.value === 'next-intl/server') {
-              for (const spec of decl.specifiers) {
-                if (spec.type === 'ImportSpecifier') {
-                  const importedName = spec.imported?.value;
-                  const localName = spec.local.value;
-                  if (importedName === 'getExtracted' || localName === 'getExtracted') {
-                    hookLocalName = localName;
-                    hookType = 'getTranslations';
-
-                    // Transform import to getTranslations
-                    spec.imported = undefined;
-                    spec.local.value = 'getTranslations';
-                  }
-                }
-              }
-            }
-            break;
-          }
-        case 'VariableDeclarator':
-          {
-            const decl = node;
-            let callExpr = null;
-
-            // Handle direct CallExpression: const t = useExtracted();
-            if (decl.init?.type === 'CallExpression' && decl.init.callee.type === 'Identifier' && decl.init.callee.value === hookLocalName) {
-              callExpr = decl.init;
-            }
-            // Handle AwaitExpression: const t = await getExtracted();
-            else if (decl.init?.type === 'AwaitExpression' && decl.init.argument.type === 'CallExpression' && decl.init.argument.callee.type === 'Identifier' && decl.init.argument.callee.value === hookLocalName) {
-              callExpr = decl.init.argument;
-            }
-            if (callExpr && decl.id.type === 'Identifier') {
-              // Extract namespace from first argument if present
-              let namespace;
-              if (callExpr.arguments.length > 0) {
-                const firstArg = callExpr.arguments[0].expression;
-                if (firstArg.type === 'StringLiteral') {
-                  namespace = firstArg.value;
-                } else if (firstArg.type === 'ObjectExpression') {
-                  const objectExpression = firstArg;
-                  for (const prop of objectExpression.properties) {
-                    if (prop.type === 'KeyValueProperty') {
-                      const key = prop.key;
-                      if (key.type === 'Identifier' && key.value === 'namespace') {
-                        const staticNamespace = extractStaticString(prop.value);
-                        if (staticNamespace != null) {
-                          namespace = staticNamespace;
-                        }
-                        break;
-                      }
-                    }
-                  }
-                }
-              }
-              currentScope().define(decl.id.value, 'translator', namespace);
-
-              // Transform the call based on the hook type
-              if (hookType) {
-                callExpr.callee.value = hookType;
-              }
-            }
-            break;
-          }
-        case 'CallExpression':
-          {
-            const call = node;
-            let isTranslatorCall = false;
-            let namespace;
-
-            // Handle Identifier case: t("message")
-            if (call.callee.type === 'Identifier') {
-              const name = call.callee.value;
-              const resolved = currentScope().lookup(name);
-              isTranslatorCall = resolved?.kind === 'translator';
-              namespace = resolved?.namespace;
-            }
-
-            // Handle MemberExpression case: t.rich, t.markup, or t.has
-            else if (call.callee.type === 'MemberExpression') {
-              const memberExpr = call.callee;
-              if (memberExpr.object.type === 'Identifier' && memberExpr.property.type === 'Identifier') {
-                const objectName = memberExpr.object.value;
-                const propertyName = memberExpr.property.value;
-                const resolved = currentScope().lookup(objectName);
-                isTranslatorCall = resolved?.kind === 'translator' && (propertyName === 'rich' || propertyName === 'markup' || propertyName === 'has');
-                namespace = resolved?.namespace;
-              }
-            }
-            if (isTranslatorCall) {
-              const arg0 = call.arguments[0]?.expression;
-              let messageText = null;
-              let explicitId = null;
-              let description = null;
-              let valuesNode = null;
-              let formatsNode = null;
-              function warnDynamicExpression(expressionNode) {
-                const hasSpan = 'span' in expressionNode && expressionNode.span && typeof expressionNode.span === 'object' && 'start' in expressionNode.span;
-                const location = hasSpan ? path.basename(filePath) : undefined;
-                warn((location ? `${location}: ` : '') + 'Cannot extract message from dynamic expression, messages need to be statically analyzable. If you need to provide runtime values, pass them as a separate argument.');
-              }
-
-              // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-              if (arg0) {
-                // Handle object syntax: t({id: 'key', message: 'text'})
-                if (arg0.type === 'ObjectExpression') {
-                  const objectExpression = arg0;
-
-                  // Look for id, message, values, and formats properties
-                  for (const prop of objectExpression.properties) {
-                    if (prop.type === 'KeyValueProperty') {
-                      const key = prop.key;
-                      if (key.type === 'Identifier' && key.value === 'id') {
-                        const staticId = extractStaticString(prop.value);
-                        if (staticId !== null) {
-                          explicitId = staticId;
-                        }
-                      } else if (key.type === 'Identifier' && key.value === 'message') {
-                        const staticMessage = extractStaticString(prop.value);
-                        if (staticMessage != null) {
-                          messageText = staticMessage;
-                        } else {
-                          warnDynamicExpression(prop.value);
-                        }
-                      } else if (key.type === 'Identifier' && key.value === 'description') {
-                        const staticDescription = extractStaticString(prop.value);
-                        if (staticDescription != null) {
-                          description = staticDescription;
-                        } else {
-                          warnDynamicExpression(prop.value);
-                        }
-                      } else if (key.type === 'Identifier' && key.value === 'values') {
-                        valuesNode = prop.value;
-                      } else if (key.type === 'Identifier' && key.value === 'formats') {
-                        formatsNode = prop.value;
-                      }
-                    }
-                  }
-                }
-
-                // Handle string syntax: t('text') or t(`text`)
-                else {
-                  const staticString = extractStaticString(arg0);
-                  if (staticString != null) {
-                    messageText = staticString;
-                  } else {
-                    // Dynamic expression (Identifier, CallExpression, BinaryExpression, etc.)
-                    warnDynamicExpression(arg0);
-                  }
-                }
-              }
-              if (messageText) {
-                const callKey = explicitId || KeyGenerator.generate(messageText);
-                const fullKey = namespace ? [namespace, callKey].join(MessageExtractor.NAMESPACE_SEPARATOR) : callKey;
-                const message = {
-                  id: fullKey,
-                  message: messageText,
-                  references: [{
-                    path: filePath
-                  }]
-                };
-                if (description) {
-                  message.description = description;
-                }
-                results.push(message);
-
-                // Transform the argument based on type
-                if (arg0.type === 'StringLiteral') {
-                  arg0.value = callKey;
-                  arg0.raw = undefined;
-                } else if (arg0.type === 'TemplateLiteral') {
-                  // Replace template literal with string literal
-                  Object.assign(arg0, {
-                    type: 'StringLiteral',
-                    value: callKey,
-                    raw: undefined
-                  });
-                } else if (arg0.type === 'ObjectExpression') {
-                  // Transform object expression to individual parameters
-                  // Replace the object with the key as first argument
-                  Object.assign(arg0, {
-                    type: 'StringLiteral',
-                    value: callKey,
-                    raw: undefined
-                  });
-
-                  // Add values as second argument if present
-                  if (valuesNode) {
-                    if (call.arguments.length < 2) {
-                      call.arguments.push({
-                        // @ts-expect-error -- Node type compatible with Expression
-                        expression: valuesNode
-                      });
-                    } else {
-                      // @ts-expect-error -- Node type compatible with Expression
-                      call.arguments[1].expression = valuesNode;
-                    }
-                  }
-
-                  // Add formats as third argument if present
-                  if (formatsNode) {
-                    // Ensure we have a second argument (values or undefined)
-                    while (call.arguments.length < 2) {
-                      call.arguments.push(createUndefinedArgument());
-                    }
-                    if (call.arguments.length < 3) {
-                      // Append argument
-                      call.arguments.push({
-                        // @ts-expect-error -- Node type compatible with Expression
-                        expression: formatsNode
-                      });
-                    } else {
-                      // Replace argument
-                      // @ts-expect-error -- Node type compatible with Expression
-                      call.arguments[2].expression = formatsNode;
-                    }
-                  }
-                }
-
-                // Check if this is a t.has call (which doesn't need fallback)
-                const isHasCall = call.callee.type === 'MemberExpression' && call.callee.property.type === 'Identifier' && call.callee.property.value === 'has';
-
-                // Add fallback message as fourth parameter in development mode (except for t.has)
-                if (isDevelopment && !isHasCall) {
-                  // Ensure we have at least 3 arguments
-                  while (call.arguments.length < 3) {
-                    call.arguments.push(createUndefinedArgument());
-                  }
-
-                  // Add fallback message
-                  call.arguments.push({
-                    expression: {
-                      type: 'StringLiteral',
-                      value: messageText,
-                      raw: JSON.stringify(messageText),
-                      // @ts-expect-error -- Seems required
-                      ctxt: 1,
-                      span: {
-                        start: 0,
-                        end: 0,
-                        ctxt: 0
-                      }
-                    }
-                  });
-                }
-              }
-            }
-            break;
-          }
-        case 'FunctionDeclaration':
-        case 'FunctionExpression':
-        case 'ArrowFunctionExpression':
-        case 'BlockStatement':
-          {
-            scopeStack.push(new ASTScope(currentScope()));
-            for (const key of Object.keys(node)) {
-              const child = node[key];
-              if (Array.isArray(child)) {
-                child.forEach(item => {
-                  if (item && typeof item === 'object') {
-                    if ('expression' in item && typeof item.expression === 'object' && 'type' in item.expression) {
-                      visit(item.expression);
-                    } else if ('type' in item) {
-                      visit(item);
-                    }
-                  }
-                });
-              } else if (child && typeof child === 'object' && 'type' in child) {
-                visit(child);
-              }
-            }
-            scopeStack.pop();
-            return;
-          }
-      }
+      },
+      sourceMaps: this.sourceMap,
+      sourceFileName: filePath,
+      filename: filePath
+    });
 
-      // Generic recursion
-      for (const key of Object.keys(node)) {
-        const child = node[key];
-        if (Array.isArray(child)) {
-          child.forEach(item => {
-            if (item && typeof item === 'object') {
-              if ('expression' in item && item.expression && typeof item.expression === 'object' && 'type' in item.expression) {
-                visit(item.expression);
-              } else if ('type' in item) {
-                visit(item);
-              }
-            }
-          });
-        } else if (child && typeof child === 'object' && 'type' in child) {
-          visit(child);
-        }
-      }
-    }
-    visit(ast);
-    return {
-      messages: results,
-      source: (await print(ast)).code
+    // TODO: Improve the typing of @swc/core
+    const output = result.output;
+    const messages = JSON.parse(JSON.parse(output).results);
+    const extractionResult = {
+      code: result.code,
+      map: result.map,
+      messages
     };
+    this.compileCache.set(cacheKey, extractionResult);
+    return extractionResult;
   }
 }
 

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

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

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

@@ -1,11 +1,11 @@
 function getSortedMessages(messages) {
-  return messages.toSorted((a, b) => {
-    const aPath = a.references?.[0]?.path ?? a.message;
-    const bPath = b.references?.[0]?.path ?? b.message;
-    if (aPath === bPath) {
-      return a.message.localeCompare(b.message);
+  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);
     } else {
-      return aPath.localeCompare(bPath);
+      return pathA.localeCompare(pathB);
     }
   });
 }

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

@@ -1 +1 @@
-import a from"./catalog/CatalogManager.js";class i{isDevelopment=!1;constructor(i,e={}){this.manager=new a(i,e),this.isDevelopment=e.isDevelopment??!1,this.initialScanPromise=this.performInitialScan()}async compile(a,i){this.initialScanPromise&&(await this.initialScanPromise,this.initialScanPromise=void 0);const e=await this.manager.extractFileMessages(a,i);return this.isDevelopment&&e.changed&&this.manager.save(),e.source}async performInitialScan(){await this.manager.loadMessages(),await this.manager.save()}async extract(){await this.initialScanPromise}[Symbol.dispose](){this.manager.destroy()}}export{i as default};
+import a from"./catalog/CatalogManager.js";class i{isDevelopment=!1;constructor(i,t={}){this.manager=new a(i,t),this.isDevelopment=t.isDevelopment??!1,this.initialScanPromise=this.performInitialScan()}async compile(a,i){this.initialScanPromise&&(await this.initialScanPromise,this.initialScanPromise=void 0);const t=await this.manager.extractFileMessages(a,i);return this.isDevelopment&&t.changed&&this.manager.save(),t}async performInitialScan(){await this.manager.loadMessages(),await this.manager.save()}async extract(){await this.initialScanPromise}[Symbol.dispose](){this.manager.destroy()}}export{i as default};

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})}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 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};

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

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

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

@@ -1 +1 @@
-import e from"path";import{parse as t,print as s}from"@swc/core";import{warn as n}from"../../plugin/utils.js";import i from"./ASTScope.js";import r from"./KeyGenerator.js";import a from"./LRUCache.js";class o{static NAMESPACE_SEPARATOR=".";compileCache=(()=>new a(750))();constructor(e){this.isDevelopment=e.isDevelopment,this.projectRoot=e.projectRoot}async processFileContent(s,n){const i=n,r=this.compileCache.get(i);if(r)return r;if(!n.includes("useExtracted")&&!n.includes("getExtracted"))return{messages:[],source:n};const a=await t(n,{syntax:"typescript",tsx:!0,target:"es2022",decorators:!0}),o=e.relative(this.projectRoot,s),l=await this.processAST(a,o),p=l.source?l:{...l,source:n};return this.compileCache.set(i,p),p}async processAST(t,a){const l=[];let p=null,c=null;const u=this.isDevelopment,f=[new i];function y(){return f[f.length-1]}function m(e){if("StringLiteral"===e.type)return e.value;if("TemplateLiteral"===e.type){const t=e;if(0===t.expressions.length&&1===t.quasis.length)return t.quasis[0].cooked||t.quasis[0].raw}return null}return function t(s){if("object"==typeof s){switch(s.type){case"ImportDeclaration":{const d=s;if("next-intl"===d.source.value){for(const v of d.specifiers)if("ImportSpecifier"===v.type){const g=v.imported?.value,x=v.local.value;"useExtracted"!==g&&"useExtracted"!==x||(p=x,c="useTranslations",v.imported=void 0,v.local.value="useTranslations")}}else if("next-intl/server"===d.source.value)for(const h of d.specifiers)if("ImportSpecifier"===h.type){const b=h.imported?.value,j=h.local.value;"getExtracted"!==b&&"getExtracted"!==j||(p=j,c="getTranslations",h.imported=void 0,h.local.value="getTranslations")}break}case"VariableDeclarator":{const E=s;let I=null;if("CallExpression"===E.init?.type&&"Identifier"===E.init.callee.type&&E.init.callee.value===p?I=E.init:"AwaitExpression"===E.init?.type&&"CallExpression"===E.init.argument.type&&"Identifier"===E.init.argument.callee.type&&E.init.argument.callee.value===p&&(I=E.init.argument),I&&"Identifier"===E.id.type){let S;if(I.arguments.length>0){const A=I.arguments[0].expression;if("StringLiteral"===A.type)S=A.value;else if("ObjectExpression"===A.type){const k=A;for(const w of k.properties)if("KeyValueProperty"===w.type){const C=w.key;if("Identifier"===C.type&&"namespace"===C.value){const T=m(w.value);null!=T&&(S=T);break}}}}y().define(E.id.value,"translator",S),c&&(I.callee.value=c)}break}case"CallExpression":{const O=s;let L,R=!1;if("Identifier"===O.callee.type){const D=O.callee.value,P=y().lookup(D);R="translator"===P?.kind,L=P?.namespace}else if("MemberExpression"===O.callee.type){const F=O.callee;if("Identifier"===F.object.type&&"Identifier"===F.property.type){const M=F.object.value,q=F.property.value,K=y().lookup(M);R="translator"===K?.kind&&("rich"===q||"markup"===q||"has"===q),L=K?.namespace}}if(R){const N=O.arguments[0]?.expression;let V=null,_=null,z=null,B=null,G=null;function J(t){const s="span"in t&&t.span&&"object"==typeof t.span&&"start"in t.span?e.basename(a):void 0;n((s?`${s}: `:"")+"Cannot extract message from dynamic expression, messages need to be statically analyzable. If you need to provide runtime values, pass them as a separate argument.")}if(N)if("ObjectExpression"===N.type){const U=N;for(const $ of U.properties)if("KeyValueProperty"===$.type){const H=$.key;if("Identifier"===H.type&&"id"===H.value){const Q=m($.value);null!==Q&&(_=Q)}else if("Identifier"===H.type&&"message"===H.value){const W=m($.value);null!=W?V=W:J($.value)}else if("Identifier"===H.type&&"description"===H.value){const X=m($.value);null!=X?z=X:J($.value)}else"Identifier"===H.type&&"values"===H.value?B=$.value:"Identifier"===H.type&&"formats"===H.value&&(G=$.value)}}else{const Y=m(N);null!=Y?V=Y:J(N)}if(V){const Z=_||r.generate(V),ee={id:L?[L,Z].join(o.NAMESPACE_SEPARATOR):Z,message:V,references:[{path:a}]};if(z&&(ee.description=z),l.push(ee),"StringLiteral"===N.type)N.value=Z,N.raw=void 0;else if("TemplateLiteral"===N.type)Object.assign(N,{type:"StringLiteral",value:Z,raw:void 0});else if("ObjectExpression"===N.type&&(Object.assign(N,{type:"StringLiteral",value:Z,raw:void 0}),B&&(O.arguments.length<2?O.arguments.push({expression:B}):O.arguments[1].expression=B),G)){for(;O.arguments.length<2;)O.arguments.push({expression:{type:"Identifier",value:"undefined",optional:!1,ctxt:1,span:{start:0,end:0,ctxt:0}}});O.arguments.length<3?O.arguments.push({expression:G}):O.arguments[2].expression=G}const te="MemberExpression"===O.callee.type&&"Identifier"===O.callee.property.type&&"has"===O.callee.property.value;if(u&&!te){for(;O.arguments.length<3;)O.arguments.push({expression:{type:"Identifier",value:"undefined",optional:!1,ctxt:1,span:{start:0,end:0,ctxt:0}}});O.arguments.push({expression:{type:"StringLiteral",value:V,raw:JSON.stringify(V),ctxt:1,span:{start:0,end:0,ctxt:0}}})}}}break}case"FunctionDeclaration":case"FunctionExpression":case"ArrowFunctionExpression":case"BlockStatement":f.push(new i(y()));for(const se of Object.keys(s)){const ne=s[se];Array.isArray(ne)?ne.forEach((e=>{e&&"object"==typeof e&&("expression"in e&&"object"==typeof e.expression&&"type"in e.expression?t(e.expression):"type"in e&&t(e))})):ne&&"object"==typeof ne&&"type"in ne&&t(ne)}return void f.pop()}for(const ie of Object.keys(s)){const re=s[ie];Array.isArray(re)?re.forEach((e=>{e&&"object"==typeof e&&("expression"in e&&e.expression&&"object"==typeof e.expression&&"type"in e.expression?t(e.expression):"type"in e&&t(e))})):re&&"object"==typeof re&&"type"in re&&t(re)}}}(t),{messages:l,source:(await s(t)).code}}}export{o as default};
+import{createRequire as e}from"module";import t from"path";import{transform as s}from"@swc/core";import o from"./LRUCache.js";const r=e(import.meta.url);class i{compileCache=(()=>new o(750))();constructor(e){this.isDevelopment=e.isDevelopment,this.projectRoot=e.projectRoot,this.sourceMap=e.sourceMap??!1}async processFileContent(e,o){const i=o,a=this.compileCache.get(i);if(a)return a;if(!o.includes("useExtracted")&&!o.includes("getExtracted"))return{messages:[],code:o};const c=t.relative(this.projectRoot,e),p=await s(o,{jsc:{target:"esnext",parser:{syntax:"typescript",tsx:!0,decorators:!0},experimental:{disableBuiltinTransformsForInternalTesting:!0,disableAllLints:!0,plugins:[[r.resolve("next-intl-swc-plugin-extractor"),{isDevelopment:this.isDevelopment,filePath:c}]]}},sourceMaps:this.sourceMap,sourceFileName:c,filename:c}),n=p.output,l=JSON.parse(JSON.parse(n).results),m={code:p.code,map:p.map,messages:l};return this.compileCache.set(i,m),m}}export{i as default};

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

@@ -1 +1 @@
-import{setNestedProperty as t}from"../utils/ObjectUtils.js";import e from"../utils/POParser.js";import s from"./Formatter.js";import{getSortedMessages as a}from"./utils.js";class r extends s{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(t,s){const a=e.parse(t);return a.meta&&this.metadataByLocale.set(s.locale,a.meta),a.messages||[]}serialize(t,s){const o={Language:s.locale,...r.DEFAULT_METADATA,...this.metadataByLocale.get(s.locale)};return e.serialize({meta:o,messages:a(t)})}toJSONString(e,s){const a=this.parse(e,s),r={};for(const e of a)t(r,e.id,e.message);return JSON.stringify(r,null,2)}}export{r as default};
+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};

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

@@ -1 +1 @@
-function e(e){return e.toSorted(((e,r)=>{const s=e.references?.[0]?.path??e.message,a=r.references?.[0]?.path??r.message;return s===a?e.message.localeCompare(r.message):s.localeCompare(a)}))}export{e as getSortedMessages};
+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};

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

@@ -6,8 +6,14 @@ export default class ExtractionCompiler implements Disposable {
     constructor(config: ExtractorConfig, opts?: {
         isDevelopment?: boolean;
         projectRoot?: string;
+        sourceMap?: boolean;
     });
-    compile(resourcePath: string, source: string): Promise<string>;
+    compile(resourcePath: string, source: string): Promise<{
+        messages: Array<import("./types.js").ExtractedMessage>;
+        code: string;
+        changed: boolean;
+        map?: string;
+    }>;
     private performInitialScan;
     extract(): Promise<void>;
     [Symbol.dispose](): void;

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

@@ -19,6 +19,7 @@ export default class CatalogManager {
     constructor(config: ExtractorConfig, opts?: {
         projectRoot?: string;
         isDevelopment?: boolean;
+        sourceMap?: boolean;
     });
     private getFormatter;
     private getPersister;
@@ -32,8 +33,9 @@ export default class CatalogManager {
     private loadTargetMessages;
     extractFileMessages(absoluteFilePath: string, source: string): Promise<{
         messages: Array<ExtractedMessage>;
-        source: string;
+        code: string;
         changed: boolean;
+        map?: string;
     }>;
     private haveMessagesChanged;
     private areMessagesEqual;

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

@@ -0,0 +1 @@
+export {};

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

@@ -3,18 +3,19 @@ type StrictExtractedMessage = ExtractedMessage & {
     references: NonNullable<ExtractedMessage['references']>;
 };
 export default class MessageExtractor {
-    private static readonly NAMESPACE_SEPARATOR;
     private isDevelopment;
     private projectRoot;
+    private sourceMap;
     private compileCache;
     constructor(opts: {
         isDevelopment: boolean;
         projectRoot: string;
+        sourceMap?: boolean;
     });
     processFileContent(absoluteFilePath: string, source: string): Promise<{
         messages: Array<StrictExtractedMessage>;
-        source: string;
+        code: string;
+        map?: string;
     }>;
-    private processAST;
 }
 export {};

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

@@ -4,19 +4,17 @@ import type { DomainsConfig, LocalePrefixMode, Locales, Pathnames } from '../../
 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<{
         target?: import("react").HTMLAttributeAnchorTarget | undefined;
-        type?: string | undefined | undefined;
-        id?: string | undefined | undefined;
-        prefix?: string | undefined | undefined;
-        property?: string | undefined | undefined;
-        children?: import("react").ReactNode;
-        key?: import("react").Key | null | undefined;
         replace?: boolean | undefined;
+        id?: string | undefined | undefined;
         slot?: string | undefined | undefined;
         style?: import("react").CSSProperties | undefined;
         title?: string | undefined | undefined;
         locale?: Locale | undefined;
         onError?: import("react").ReactEventHandler<HTMLAnchorElement> | undefined;
+        children?: import("react").ReactNode;
         ref?: import("react").Ref<HTMLAnchorElement> | undefined;
+        prefix?: string | undefined | undefined;
+        key?: import("react").Key | null | undefined;
         as?: (string | import("url").UrlObject) | undefined;
         scroll?: boolean | undefined;
         shallow?: boolean | undefined;
@@ -33,6 +31,7 @@ export default function createNavigation<const AppLocales extends Locales, const
         hrefLang?: string | undefined | undefined;
         media?: string | undefined | undefined;
         ping?: string | undefined | undefined;
+        type?: string | undefined | undefined;
         referrerPolicy?: import("react").HTMLAttributeReferrerPolicy | undefined;
         defaultChecked?: boolean | undefined | undefined;
         defaultValue?: string | number | readonly string[] | undefined;
@@ -59,6 +58,7 @@ export default function createNavigation<const AppLocales extends Locales, const
         content?: string | undefined | undefined;
         datatype?: string | undefined | undefined;
         inlist?: any;
+        property?: string | undefined | undefined;
         rel?: string | undefined | undefined;
         resource?: string | undefined | undefined;
         rev?: string | undefined | undefined;

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

@@ -5,19 +5,17 @@ export default function createNavigation<const AppLocales extends Locales, const
     useRouter: () => never;
     Link: import("react").ForwardRefExoticComponent<Omit<{
         target?: import("react").HTMLAttributeAnchorTarget | undefined;
-        type?: string | undefined | undefined;
-        id?: string | undefined | undefined;
-        prefix?: string | undefined | undefined;
-        property?: string | undefined | undefined;
-        children?: import("react").ReactNode;
-        key?: import("react").Key | null | undefined;
         replace?: boolean | undefined;
+        id?: string | undefined | undefined;
         slot?: string | undefined | undefined;
         style?: import("react").CSSProperties | undefined;
         title?: string | undefined | undefined;
         locale?: import("use-intl").Locale | undefined;
         onError?: import("react").ReactEventHandler<HTMLAnchorElement> | undefined;
+        children?: import("react").ReactNode;
         ref?: import("react").Ref<HTMLAnchorElement> | undefined;
+        prefix?: string | undefined | undefined;
+        key?: import("react").Key | null | undefined;
         as?: (string | import("url").UrlObject) | undefined;
         scroll?: boolean | undefined;
         shallow?: boolean | undefined;
@@ -34,6 +32,7 @@ export default function createNavigation<const AppLocales extends Locales, const
         hrefLang?: string | undefined | undefined;
         media?: string | undefined | undefined;
         ping?: string | undefined | undefined;
+        type?: string | undefined | undefined;
         referrerPolicy?: import("react").HTMLAttributeReferrerPolicy | undefined;
         defaultChecked?: boolean | undefined | undefined;
         defaultValue?: string | number | readonly string[] | undefined;
@@ -60,6 +59,7 @@ export default function createNavigation<const AppLocales extends Locales, const
         content?: string | undefined | undefined;
         datatype?: string | undefined | undefined;
         inlist?: any;
+        property?: string | undefined | undefined;
         rel?: string | undefined | undefined;
         resource?: string | undefined | undefined;
         rev?: string | undefined | undefined;

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

@@ -23,19 +23,17 @@ export default function createSharedNavigationFns<const AppLocales extends Local
     };
     Link: import("react").ForwardRefExoticComponent<Omit<{
         target?: import("react").HTMLAttributeAnchorTarget | undefined;
-        type?: string | undefined | undefined;
-        id?: string | undefined | undefined;
-        prefix?: string | undefined | undefined;
-        property?: string | undefined | undefined;
-        children?: import("react").ReactNode;
-        key?: import("react").Key | null | undefined;
         replace?: boolean | undefined;
+        id?: string | undefined | undefined;
         slot?: string | undefined | undefined;
         style?: import("react").CSSProperties | undefined;
         title?: string | undefined | undefined;
         locale?: Locale | undefined;
         onError?: import("react").ReactEventHandler<HTMLAnchorElement> | undefined;
+        children?: import("react").ReactNode;
         ref?: import("react").Ref<HTMLAnchorElement> | undefined;
+        prefix?: string | undefined | undefined;
+        key?: import("react").Key | null | undefined;
         as?: (string | import("url").UrlObject) | undefined;
         scroll?: boolean | undefined;
         shallow?: boolean | undefined;
@@ -52,6 +50,7 @@ export default function createSharedNavigationFns<const AppLocales extends Local
         hrefLang?: string | undefined | undefined;
         media?: string | undefined | undefined;
         ping?: string | undefined | undefined;
+        type?: string | undefined | undefined;
         referrerPolicy?: import("react").HTMLAttributeReferrerPolicy | undefined;
         defaultChecked?: boolean | undefined | undefined;
         defaultValue?: string | number | readonly string[] | undefined;
@@ -78,6 +77,7 @@ export default function createSharedNavigationFns<const AppLocales extends Local
         content?: string | undefined | undefined;
         datatype?: string | undefined | undefined;
         inlist?: any;
+        property?: string | undefined | undefined;
         rel?: string | undefined | undefined;
         resource?: string | undefined | undefined;
         rev?: string | undefined | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-intl",
-  "version": "4.5.2",
+  "version": "4.5.4",
   "sideEffects": false,
   "author": "Jan Amann <jan@amann.work>",
   "funding": [
@@ -125,9 +125,11 @@
   ],
   "dependencies": {
     "@formatjs/intl-localematcher": "^0.5.4",
-    "@swc/core": "^1.13.19",
+    "@swc/core": "^1.15.2",
     "negotiator": "^1.0.0",
-    "use-intl": "^4.5.2"
+    "next-intl-swc-plugin-extractor": "^4.5.4",
+    "po-parser": "^0.1.2",
+    "use-intl": "^4.5.4"
   },
   "peerDependencies": {
     "next": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
@@ -139,5 +141,5 @@
       "optional": true
     }
   },
-  "gitHead": "56b7de6ac710a633e7880a295b6750b502f24edd"
+  "gitHead": "32b170cc341cc847d4a6f4ae353c53d941f626f2"
 }

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

@@ -1,18 +0,0 @@
-class ASTScope {
-  vars = (() => new Map())();
-  constructor(parent) {
-    this.parent = parent;
-  }
-  define(name, kind, namespace) {
-    this.vars.set(name, {
-      kind,
-      namespace
-    });
-  }
-  lookup(name) {
-    if (this.vars.has(name)) return this.vars.get(name);
-    return this.parent?.lookup(name);
-  }
-}
-
-export { ASTScope as default };

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

@@ -1,11 +0,0 @@
-import crypto from 'crypto';
-
-class KeyGenerator {
-  static generate(message) {
-    const hash = crypto.createHash('sha512').update(message).digest();
-    const base64 = hash.toString('base64');
-    return base64.slice(0, 6);
-  }
-}
-
-export { KeyGenerator as default };

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

@@ -1,222 +0,0 @@
-class POParser {
-  static KEYWORDS = (() => ({
-    MSGID: 'msgid',
-    MSGSTR: 'msgstr',
-    MSGCTXT: 'msgctxt',
-    MSGID_PLURAL: 'msgid_plural'
-  }))();
-  static COMMENTS = (() => ({
-    REFERENCE: '#:',
-    EXTRACTED: '#.',
-    TRANSLATOR: '#',
-    FLAG: '#,',
-    PREVIOUS: '#|'
-  }))();
-  static NAMESPACE_SEPARATOR = '.';
-  static QUOTE = '"';
-  static NEWLINE = '\\n';
-  static FILE_COLUMN_SEPARATOR = ':';
-  static META_SEPARATOR = ':';
-  static parse(content) {
-    const lines = POParser.splitLines(content);
-    const messages = [];
-    const meta = {};
-    let state = 'entry';
-    let entry;
-    for (let i = 0; i < lines.length; i++) {
-      const line = lines[i].trim();
-
-      // An empty line indicates the end of an entry
-      if (!line) {
-        if (state === 'entry' && entry) {
-          messages.push(POParser.finishEntry(entry));
-          entry = undefined;
-        }
-        state = 'entry';
-        continue;
-      }
-      if (state === 'meta') {
-        if (line.startsWith(POParser.QUOTE)) {
-          const metaLine = POParser.extractQuotedString(line, state);
-          const cleaned = metaLine.endsWith(POParser.NEWLINE) ? metaLine.slice(0, -2) : metaLine;
-          const separatorIndex = cleaned.indexOf(POParser.META_SEPARATOR);
-          if (separatorIndex > 0) {
-            const key = cleaned.substring(0, separatorIndex).trim();
-            const value = cleaned.substring(separatorIndex + 1).trim();
-            meta[key] = value;
-          }
-        } else {
-          POParser.throwWithLine('Encountered unexpected non-quoted metadata line', line);
-        }
-      } else {
-        // Unsupported comment types
-        if (POParser.lineStartsWithPrefix(line, POParser.COMMENTS.TRANSLATOR)) {
-          POParser.throwWithLine('Translator comments (#) are not supported, use inline descriptions instead', line);
-        }
-        if (POParser.lineStartsWithPrefix(line, POParser.COMMENTS.FLAG)) {
-          POParser.throwWithLine('Flag comments (#,) are not supported', line);
-        }
-        if (POParser.lineStartsWithPrefix(line, POParser.COMMENTS.PREVIOUS)) {
-          POParser.throwWithLine('Previous string key comments (#|) are not supported', line);
-        }
-
-        // Reference comments
-        if (POParser.lineStartsWithPrefix(line, POParser.COMMENTS.REFERENCE)) {
-          entry = POParser.ensureEntry(entry);
-          // Only use the path part, ignore line and column numbers
-          const path = line.substring(POParser.COMMENTS.REFERENCE.length).trim().split(POParser.FILE_COLUMN_SEPARATOR).at(0);
-          entry.references ??= [];
-          entry.references.push({
-            path
-          });
-          continue;
-        }
-
-        // Extracted comments
-        if (POParser.lineStartsWithPrefix(line, POParser.COMMENTS.EXTRACTED)) {
-          entry = POParser.ensureEntry(entry);
-          entry.description = line.substring(POParser.COMMENTS.EXTRACTED.length).trim();
-          continue;
-        }
-
-        // Check for unsupported features
-        if (POParser.lineStartsWithPrefix(line, POParser.KEYWORDS.MSGID_PLURAL)) {
-          POParser.throwWithLine('Plural forms (msgid_plural) are not supported, use ICU pluralization instead', line);
-        }
-
-        // msgctxt
-        if (POParser.lineStartsWithPrefix(line, POParser.KEYWORDS.MSGCTXT)) {
-          entry = POParser.ensureEntry(entry);
-          entry.msgctxt = POParser.extractQuotedString(line.substring(POParser.KEYWORDS.MSGCTXT.length + 1), state);
-          continue;
-        }
-
-        // msgid
-        if (POParser.lineStartsWithPrefix(line, POParser.KEYWORDS.MSGID)) {
-          entry = POParser.ensureEntry(entry);
-          entry.msgid = POParser.extractQuotedString(line.substring(POParser.KEYWORDS.MSGID.length + 1), state);
-          if (POParser.isMetaEntry(entry, messages)) {
-            state = 'meta';
-            entry = undefined;
-          }
-          continue;
-        }
-
-        // msgstr
-        if (POParser.lineStartsWithPrefix(line, POParser.KEYWORDS.MSGSTR)) {
-          entry = POParser.ensureEntry(entry);
-          entry.msgstr = POParser.extractQuotedString(line.substring(POParser.KEYWORDS.MSGSTR.length + 1), state);
-          if (POParser.isMetaEntry(entry, messages)) {
-            state = 'meta';
-            entry = undefined;
-          }
-          continue;
-        }
-
-        // Multi-line strings are not supported in entry mode
-        if (line.startsWith(POParser.QUOTE)) {
-          POParser.throwWithLine('Multi-line strings are not supported, use single-line strings instead', line);
-        }
-      }
-    }
-
-    // Finish any remaining entry
-    if (state === 'entry' && entry) {
-      messages.push(POParser.finishEntry(entry));
-    }
-    return {
-      meta: Object.keys(meta).length > 0 ? meta : undefined,
-      messages: messages.length > 0 ? messages : undefined
-    };
-  }
-  static isMetaEntry(entry, messages) {
-    return messages.length === 0 && entry.msgid === '' && entry.msgstr === '';
-  }
-  static serialize(catalog) {
-    const lines = [];
-
-    // Metadata
-    if (catalog.meta) {
-      lines.push(`${POParser.KEYWORDS.MSGID} ${POParser.QUOTE}${POParser.QUOTE}`);
-      lines.push(`${POParser.KEYWORDS.MSGSTR} ${POParser.QUOTE}${POParser.QUOTE}`);
-      for (const [key, value] of Object.entries(catalog.meta)) {
-        lines.push(`${POParser.QUOTE}${key}${POParser.META_SEPARATOR} ${value}${POParser.NEWLINE}${POParser.QUOTE}`);
-      }
-      lines.push('');
-    }
-
-    // Messages
-    if (catalog.messages) {
-      for (const message of catalog.messages) {
-        if (message.description) {
-          lines.push(`${POParser.COMMENTS.EXTRACTED} ${message.description}`);
-        }
-        if (message.references && message.references.length > 0) {
-          for (const ref of message.references) {
-            lines.push(`${POParser.COMMENTS.REFERENCE} ${ref.path}`);
-          }
-        }
-        let msgctxt;
-        let msgid;
-        const lastDotIndex = message.id.lastIndexOf(POParser.NAMESPACE_SEPARATOR);
-        if (lastDotIndex > 0) {
-          msgctxt = message.id.substring(0, lastDotIndex);
-          msgid = message.id.substring(lastDotIndex + 1);
-        } else {
-          msgid = message.id;
-        }
-        if (msgctxt) {
-          lines.push(`${POParser.KEYWORDS.MSGCTXT} ${POParser.QUOTE}${msgctxt}${POParser.QUOTE}`);
-        }
-        lines.push(`${POParser.KEYWORDS.MSGID} ${POParser.QUOTE}${msgid}${POParser.QUOTE}`);
-        lines.push(`${POParser.KEYWORDS.MSGSTR} ${POParser.QUOTE}${message.message}${POParser.QUOTE}`);
-        lines.push('');
-      }
-    }
-    return lines.join('\n');
-  }
-  static lineStartsWithPrefix(line, prefix) {
-    return line.startsWith(prefix + ' ');
-  }
-  static throwWithLine(message, line) {
-    throw new Error(`${message}:\n> ${line}`);
-  }
-  static splitLines(content) {
-    // Avoid overhead for Unix newlines only
-    if (content.includes('\r')) {
-      content = content.replace(/\r\n/g, '\n');
-    }
-    return content.split('\n');
-  }
-  static ensureEntry(entry) {
-    return entry || {};
-  }
-  static finishEntry(entry) {
-    if (entry.msgid == null || entry.msgstr == null) {
-      throw new Error('Incomplete message entry: both msgid and msgstr are required');
-    }
-    let fullId = entry.msgid;
-    if (entry.msgctxt) {
-      fullId = entry.msgctxt + POParser.NAMESPACE_SEPARATOR + entry.msgid;
-    }
-    return {
-      id: fullId,
-      message: entry.msgstr,
-      description: entry.description,
-      references: entry.references
-    };
-  }
-  static extractQuotedString(line, state) {
-    const trimmed = line.trim();
-    const endIndex = trimmed.indexOf(POParser.QUOTE, POParser.QUOTE.length);
-    if (endIndex === -1) {
-      if (state === 'meta') {
-        return trimmed.substring(POParser.QUOTE.length);
-      }
-      POParser.throwWithLine('Incomplete quoted string', line);
-    }
-    return trimmed.substring(POParser.QUOTE.length, endIndex);
-  }
-}
-
-export { POParser as default };

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

@@ -1 +0,0 @@
-class s{vars=(()=>new Map)();constructor(s){this.parent=s}define(s,t,a){this.vars.set(s,{kind:t,namespace:a})}lookup(s){return this.vars.has(s)?this.vars.get(s):this.parent?.lookup(s)}}export{s as default};

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

@@ -1 +0,0 @@
-import t from"crypto";class e{static generate(e){return t.createHash("sha512").update(e).digest().toString("base64").slice(0,6)}}export{e as default};

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

@@ -1 +0,0 @@
-class t{static KEYWORDS={MSGID:"msgid",MSGSTR:"msgstr",MSGCTXT:"msgctxt",MSGID_PLURAL:"msgid_plural"};static COMMENTS={REFERENCE:"#:",EXTRACTED:"#.",TRANSLATOR:"#",FLAG:"#,",PREVIOUS:"#|"};static NAMESPACE_SEPARATOR=".";static QUOTE='"';static NEWLINE="\\n";static FILE_COLUMN_SEPARATOR=":";static META_SEPARATOR=":";static parse(e){const s=t.splitLines(e),i=[],r={};let n,E="entry";for(let e=0;e<s.length;e++){const a=s[e].trim();if(a)if("meta"===E)if(a.startsWith(t.QUOTE)){const e=t.extractQuotedString(a,E),s=e.endsWith(t.NEWLINE)?e.slice(0,-2):e,i=s.indexOf(t.META_SEPARATOR);if(i>0){const t=s.substring(0,i).trim(),e=s.substring(i+1).trim();r[t]=e}}else t.throwWithLine("Encountered unexpected non-quoted metadata line",a);else{if(t.lineStartsWithPrefix(a,t.COMMENTS.TRANSLATOR)&&t.throwWithLine("Translator comments (#) are not supported, use inline descriptions instead",a),t.lineStartsWithPrefix(a,t.COMMENTS.FLAG)&&t.throwWithLine("Flag comments (#,) are not supported",a),t.lineStartsWithPrefix(a,t.COMMENTS.PREVIOUS)&&t.throwWithLine("Previous string key comments (#|) are not supported",a),t.lineStartsWithPrefix(a,t.COMMENTS.REFERENCE)){n=t.ensureEntry(n);const e=a.substring(t.COMMENTS.REFERENCE.length).trim().split(t.FILE_COLUMN_SEPARATOR).at(0);n.references??=[],n.references.push({path:e});continue}if(t.lineStartsWithPrefix(a,t.COMMENTS.EXTRACTED)){n=t.ensureEntry(n),n.description=a.substring(t.COMMENTS.EXTRACTED.length).trim();continue}if(t.lineStartsWithPrefix(a,t.KEYWORDS.MSGID_PLURAL)&&t.throwWithLine("Plural forms (msgid_plural) are not supported, use ICU pluralization instead",a),t.lineStartsWithPrefix(a,t.KEYWORDS.MSGCTXT)){n=t.ensureEntry(n),n.msgctxt=t.extractQuotedString(a.substring(t.KEYWORDS.MSGCTXT.length+1),E);continue}if(t.lineStartsWithPrefix(a,t.KEYWORDS.MSGID)){n=t.ensureEntry(n),n.msgid=t.extractQuotedString(a.substring(t.KEYWORDS.MSGID.length+1),E),t.isMetaEntry(n,i)&&(E="meta",n=void 0);continue}if(t.lineStartsWithPrefix(a,t.KEYWORDS.MSGSTR)){n=t.ensureEntry(n),n.msgstr=t.extractQuotedString(a.substring(t.KEYWORDS.MSGSTR.length+1),E),t.isMetaEntry(n,i)&&(E="meta",n=void 0);continue}a.startsWith(t.QUOTE)&&t.throwWithLine("Multi-line strings are not supported, use single-line strings instead",a)}else"entry"===E&&n&&(i.push(t.finishEntry(n)),n=void 0),E="entry"}return"entry"===E&&n&&i.push(t.finishEntry(n)),{meta:Object.keys(r).length>0?r:void 0,messages:i.length>0?i:void 0}}static isMetaEntry(t,e){return 0===e.length&&""===t.msgid&&""===t.msgstr}static serialize(e){const s=[];if(e.meta){s.push(`${t.KEYWORDS.MSGID} ${t.QUOTE}${t.QUOTE}`),s.push(`${t.KEYWORDS.MSGSTR} ${t.QUOTE}${t.QUOTE}`);for(const[i,r]of Object.entries(e.meta))s.push(`${t.QUOTE}${i}${t.META_SEPARATOR} ${r}${t.NEWLINE}${t.QUOTE}`);s.push("")}if(e.messages)for(const i of e.messages){if(i.description&&s.push(`${t.COMMENTS.EXTRACTED} ${i.description}`),i.references&&i.references.length>0)for(const e of i.references)s.push(`${t.COMMENTS.REFERENCE} ${e.path}`);let e,r;const n=i.id.lastIndexOf(t.NAMESPACE_SEPARATOR);n>0?(e=i.id.substring(0,n),r=i.id.substring(n+1)):r=i.id,e&&s.push(`${t.KEYWORDS.MSGCTXT} ${t.QUOTE}${e}${t.QUOTE}`),s.push(`${t.KEYWORDS.MSGID} ${t.QUOTE}${r}${t.QUOTE}`),s.push(`${t.KEYWORDS.MSGSTR} ${t.QUOTE}${i.message}${t.QUOTE}`),s.push("")}return s.join("\n")}static lineStartsWithPrefix(t,e){return t.startsWith(e+" ")}static throwWithLine(t,e){throw new Error(`${t}:\n> ${e}`)}static splitLines(t){return t.includes("\r")&&(t=t.replace(/\r\n/g,"\n")),t.split("\n")}static ensureEntry(t){return t||{}}static finishEntry(e){if(null==e.msgid||null==e.msgstr)throw new Error("Incomplete message entry: both msgid and msgstr are required");let s=e.msgid;return e.msgctxt&&(s=e.msgctxt+t.NAMESPACE_SEPARATOR+e.msgid),{id:s,message:e.msgstr,description:e.description,references:e.references}}static extractQuotedString(e,s){const i=e.trim(),r=i.indexOf(t.QUOTE,t.QUOTE.length);if(-1===r){if("meta"===s)return i.substring(t.QUOTE.length);t.throwWithLine("Incomplete quoted string",e)}return i.substring(t.QUOTE.length,r)}}export{t as default};

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

@@ -1,24 +0,0 @@
-import type { ExtractedMessage } from '../types.js';
-type Catalog = {
-    meta?: Record<string, string>;
-    messages?: Array<ExtractedMessage>;
-};
-export default class POParser {
-    private static readonly KEYWORDS;
-    private static readonly COMMENTS;
-    private static readonly NAMESPACE_SEPARATOR;
-    private static readonly QUOTE;
-    private static readonly NEWLINE;
-    private static readonly FILE_COLUMN_SEPARATOR;
-    private static readonly META_SEPARATOR;
-    static parse(content: string): Catalog;
-    private static isMetaEntry;
-    static serialize(catalog: Catalog): string;
-    private static lineStartsWithPrefix;
-    private static throwWithLine;
-    private static splitLines;
-    private static ensureEntry;
-    private static finishEntry;
-    private static extractQuotedString;
-}
-export {};