@babelize/engine 0.1.3 → 0.2.1

package/dist/modules/format-injection/index.js

@@ -41,7 +41,19 @@ const inject_formats_1 = require("./inject-formats");
 const ast_helpers_1 = require("../../utils/ast-helpers");
 const file_utils_1 = require("../../utils/file-utils");
 const types_1 = require("../../runtime/types");
+const StrategyFactory_1 = require("../../injection/StrategyFactory");
 const generator_1 = require("@babel/generator");
+/** The local name of `import X from 'i18next'` in a file, if it has one. */
+function i18nextDefaultImport(ast) {
+    for (const node of ast.program.body) {
+        if (!t.isImportDeclaration(node) || node.source.value !== 'i18next')
+            continue;
+        const def = node.specifiers.find((s) => t.isImportDefaultSpecifier(s));
+        if (def)
+            return def.local.name;
+    }
+    return null;
+}
 /**
  * Run format injection for all format strings.
  *
@@ -66,13 +78,20 @@ async function injectFormats(workspace, formatStrings, formatConfig, dryRun = fa
         }
         stringsByFile.get(fileKey).push(s);
     }
-    // Build locale expression based on framework
-    const localeExpr = (0, inject_formats_1.buildLocaleExpression)(workspace.framework || 'unknown');
+    // The locale the formatted values follow. react-i18next (React, React
+    // Native, Next.js with react-i18next): the app's current language,
+    // `i18next.language` — React Native has no navigator.language, and on the
+    // web it ignored the language the user picked. Before init it is undefined,
+    // which Intl reads as the device default. Elsewhere the browser's language:
+    // next-intl's useLocale() and vue-i18n's composable only work in components.
+    const deps = { ...workspace.packageJson?.dependencies, ...workspace.packageJson?.devDependencies };
+    const followsI18next = StrategyFactory_1.StrategyFactory.getStrategy(workspace.framework || 'unknown', deps).id === 'react-i18next';
+    const browserLocaleExpr = (0, inject_formats_1.buildLocaleExpression)('browser');
     // Find all source files
     const sourceFiles = [];
     for (const sourceDir of workspace.sourceDirs) {
         const dirPath = path.join(workspace.path, sourceDir);
-        const files = await (0, file_utils_1.findFiles)(dirPath, types_1.SUPPORTED_EXTENSIONS, types_1.EXCLUDED_PATTERNS);
+        const files = await (0, file_utils_1.findFiles)(dirPath, types_1.SUPPORTED_EXTENSIONS, (0, types_1.workspaceExcludes)(workspace));
         sourceFiles.push(...files);
     }
     // Build a lookup of format strings by (relative file path, line)
@@ -93,11 +112,17 @@ async function injectFormats(workspace, formatStrings, formatConfig, dryRun = fa
         try {
             const originalContent = await (0, file_utils_1.readFile)(filePath);
             const isTypeScript = filePath.endsWith('.ts') || filePath.endsWith('.tsx');
-            const ast = (0, ast_helpers_1.parseCode)(originalContent, { isTypeScript });
+            const ast = (0, ast_helpers_1.parseCode)(originalContent, { isTypeScript, preserveFormat: true });
             const injections = [];
             const lineLookup = formatStringLookup.get(relativePath);
             if (!lineLookup)
                 continue;
+            const existingI18next = followsI18next ? i18nextDefaultImport(ast) : null;
+            // A name nothing else in the file binds (`import * as i18next from 'i18next'`, a local `i18next`).
+            const i18nextName = existingI18next ?? ((0, ast_helpers_1.bindsTopLevel)(ast, 'i18next') ? 'i18nextInstance' : 'i18next');
+            const fileLocaleExpr = followsI18next
+                ? t.memberExpression(t.identifier(i18nextName), t.identifier('language'))
+                : browserLocaleExpr;
             // Walk AST and replace matching string literals with Intl.* expressions
             (0, ast_helpers_1.traverse)(ast, {
                 StringLiteral(strPath) {
@@ -111,7 +136,7 @@ async function injectFormats(workspace, formatStrings, formatConfig, dryRun = fa
                     // Verify the text matches exactly (avoid false positives from partial matches)
                     if (node.value !== formatStr.text)
                         return;
-                    const astExpr = (0, inject_formats_1.buildFormatAstExpression)(formatStr.detectedFormat, formatConfig, localeExpr);
+                    const astExpr = (0, inject_formats_1.buildFormatAstExpression)(formatStr.detectedFormat, formatConfig, t.cloneNode(fileLocaleExpr));
                     if (!astExpr) {
                         skippedFiles.push({
                             file: relativePath,
@@ -144,7 +169,7 @@ async function injectFormats(workspace, formatStrings, formatConfig, dryRun = fa
                     const text = node.value.trim();
                     if (!text)
                         return;
-                    const astExpr = (0, inject_formats_1.buildFormatAstExpression)(formatStr.detectedFormat, formatConfig, localeExpr);
+                    const astExpr = (0, inject_formats_1.buildFormatAstExpression)(formatStr.detectedFormat, formatConfig, t.cloneNode(fileLocaleExpr));
                     if (!astExpr) {
                         skippedFiles.push({
                             file: relativePath,
@@ -170,6 +195,10 @@ async function injectFormats(workspace, formatStrings, formatConfig, dryRun = fa
             });
             if (injections.length === 0)
                 continue;
+            const importAdded = followsI18next && !existingI18next;
+            if (importAdded) {
+                ast.program.body.unshift(t.importDeclaration([t.importDefaultSpecifier(t.identifier(i18nextName))], t.stringLiteral('i18next')));
+            }
             const modifiedContent = (0, ast_helpers_1.generateCode)(ast, originalContent);
             if (!dryRun) {
                 await (0, file_utils_1.writeFile)(filePath, modifiedContent);
@@ -179,7 +208,7 @@ async function injectFormats(workspace, formatStrings, formatConfig, dryRun = fa
                 originalContent,
                 modifiedContent,
                 injections,
-                importAdded: false,
+                importAdded,
                 hookAdded: false,
             });
             totalInjections += injections.length;
@@ -196,7 +225,7 @@ async function injectFormats(workspace, formatStrings, formatConfig, dryRun = fa
     const htmlExtensions = ['.html', '.htm'];
     for (const sourceDir of workspace.sourceDirs) {
         const dirPath = path.join(workspace.path, sourceDir);
-        const files = await (0, file_utils_1.findFiles)(dirPath, htmlExtensions, types_1.EXCLUDED_PATTERNS);
+        const files = await (0, file_utils_1.findFiles)(dirPath, htmlExtensions, (0, types_1.workspaceExcludes)(workspace));
         for (const filePath of files) {
             const relativePath = (0, file_utils_1.getRelativePath)(workspace.path, filePath);
             const fileStrings = stringsByFile.get(relativePath);
@@ -213,7 +242,7 @@ async function injectFormats(workspace, formatStrings, formatConfig, dryRun = fa
                     const regex = new RegExp(escaped, 'g');
                     if (!regex.test(content))
                         continue;
-                    const astExpr = (0, inject_formats_1.buildFormatAstExpression)(formatStr.detectedFormat, formatConfig, localeExpr);
+                    const astExpr = (0, inject_formats_1.buildFormatAstExpression)(formatStr.detectedFormat, formatConfig, browserLocaleExpr);
                     if (!astExpr)
                         continue;
                     const replacementCode = (0, generator_1.generate)(astExpr).code;

package/dist/modules/format-injection/inject-formats.d.ts

@@ -26,6 +26,7 @@ export declare function buildFormatInjection(extracted: ExtractedString, formatC
  */
 export declare function buildFormatAstExpression(format: DetectedFormat, formatConfig: FormatLocaleConfig, localeExpr: t.Expression): t.Expression | null;
 /**
- * Build a locale expression based on the detected framework.
+ * Build a locale expression for an i18n library (an injection strategy id:
+ * 'react-i18next', 'next-intl'); anything else gets the browser's language.
  */
-export declare function buildLocaleExpression(framework: string): t.Expression;
+export declare function buildLocaleExpression(library: string): t.Expression;

package/dist/modules/format-injection/inject-formats.js

@@ -194,10 +194,11 @@ function buildNumberAstExpression(format, localeExpr) {
     return t.callExpression(t.memberExpression(nfNew, t.identifier('format')), [t.numericLiteral(numericValue)]);
 }
 /**
- * Build a locale expression based on the detected framework.
+ * Build a locale expression for an i18n library (an injection strategy id:
+ * 'react-i18next', 'next-intl'); anything else gets the browser's language.
  */
-function buildLocaleExpression(framework) {
-    switch (framework) {
+function buildLocaleExpression(library) {
+    switch (library) {
         case 'react-i18next':
             return t.memberExpression(t.identifier('i18n'), t.identifier('language'));
         case 'next-intl':

package/dist/modules/injection/inject.d.ts

@@ -14,7 +14,20 @@ positions?: Map<string, Set<number>>): Promise<InjectionResult>;
  */
 export declare function injectIntoFile(content: string, filePath: string, keyMapping: Map<string, string>, confidenceThreshold: number, framework: string, existingDeps?: Record<string, string>, forceTypeScript?: boolean, 
 /** extractionId → source offsets of the nodes extraction selected (see ExtractedString.offsets). */
-positions?: Map<string, Set<number>>): FileInjection;
+positions?: Map<string, Set<number>>, options?: {
+    /**
+     * Import path (relative to this file) of the i18n config's module-level `t`.
+     * Set when Babelize owns the react-i18next config: strings outside any
+     * component the hook can go in use it. Unset, they are left as they are.
+     */
+    moduleTranslator?: string;
+    /**
+     * Messages with placeholders are formatted at runtime (ICU): template
+     * literals and `+` concatenations become `t(key, { name })`. Off, they
+     * are left as they are.
+     */
+    placeholders?: boolean;
+}): FileInjection;
 /**
  * Inject translations into a Vue SFC file.
  * Uses @vue/compiler-sfc to parse, vue/template-scan to find translatable