wuchale 0.21.0 → 0.21.2

package/dist/adapter-vanilla/transformer.d.ts

@@ -49,13 +49,15 @@ export declare class Transformer<RTCtxT = {}> {
     visitAwaitExpression: (node: Estree.AwaitExpression) => Message[];
     visitAssignmentExpression: (node: Estree.BinaryExpression) => Message[];
     visitAssignmentPattern: (node: Estree.AssignmentPattern) => Message[];
-    visitExpressionStatement: (node: Estree.ExpressionStatement) => Message[];
     visitForOfStatement: (node: Estree.ForOfStatement) => Message[];
     visitForInStatement: (node: Estree.ForInStatement) => Message[];
     visitForStatement: (node: Estree.ForStatement) => Message[];
     getMemberChainName: (node: Estree.MemberExpression) => string;
     getCalleeName: (callee: Estree.Expression | Estree.Super) => string;
+    getActualExpression(expr?: Estree.Expression | Estree.TSAsExpression | Estree.TSTypeAssertion): Estree.Expression | null;
+    withUpdateTLDetails(visit: (atTopLevel: boolean) => Message[]): Message[];
     defaultVisitVariableDeclarator: (node: Estree.VariableDeclarator) => Message[];
+    visitExpressionStatement: (node: Estree.ExpressionStatement) => Message[];
     visitVariableDeclarator: (node: Estree.VariableDeclarator) => Message[];
     visitVariableDeclaration: (node: Estree.VariableDeclaration) => Message[];
     visitExportNamedDeclaration: (node: Estree.ExportNamedDeclaration) => Message[];
@@ -76,12 +78,8 @@ export declare class Transformer<RTCtxT = {}> {
     visitTaggedTemplateExpression: (node: Estree.TaggedTemplateExpression) => Message[];
     visitSwitchStatement: (node: Estree.SwitchStatement) => Message[];
     visitTryStatement: (node: Estree.TryStatement) => Message[];
-    visitTSAsExpression: (node: {
-        expression: Estree.AnyNode;
-    }) => Message[];
-    visitTSTypeAssertion: (node: {
-        expression: Estree.AnyNode;
-    }) => Message[];
+    visitTSAsExpression: (node: Estree.TSAsExpression) => Message[];
+    visitTSTypeAssertion: (node: Estree.TSTypeAssertion) => Message[];
     visitProgram: (node: Estree.Program) => Message[];
     visitWithCommentDirectives: (node: Estree.AnyNode, func: Function) => any;
     visit: (node: Estree.AnyNode) => Message[];

package/dist/adapter-vanilla/transformer.js

@@ -116,13 +116,10 @@ export class Transformer {
             return `\nconst ${this.currentRtVar} = ${wrapInit(expr)}\n`;
         };
     }
-    fullHeuristicDetails = (detailsBase) => {
-        const details = { ...this.heuristciDetails, ...detailsBase };
-        if (details.declaring == null && details.insideProgram) {
-            details.declaring = 'expression';
-        }
-        return details;
-    };
+    fullHeuristicDetails = (detailsBase) => ({
+        ...this.heuristciDetails,
+        ...detailsBase,
+    });
     getHeuristicMessageType = (msg) => {
         const msgStr = msg.msgStr.join('\n');
         if (!msgStr) {
@@ -334,7 +331,6 @@ export class Transformer {
         ...this.visit(node.left),
         ...this.visit(node.right),
     ];
-    visitExpressionStatement = (node) => this.visit(node.expression);
     visitForOfStatement = (node) => [
         ...this.visit(node.left),
         ...this.visit(node.right),
@@ -390,29 +386,52 @@ export class Transformer {
         }
         return `[${callee.type}]`;
     };
-    defaultVisitVariableDeclarator = (node) => {
+    getActualExpression(expr) {
+        if (!expr) {
+            return null;
+        }
+        if (expr.type === 'TSAsExpression' || expr.type === 'TSTypeAssertion') {
+            return expr.expression;
+        }
+        return expr;
+    }
+    withUpdateTLDetails(visit) {
         const atTopLevelDefn = this.heuristciDetails.insideProgram && !this.heuristciDetails.declaring;
+        const msgs = visit(atTopLevelDefn);
+        if (atTopLevelDefn) {
+            this.heuristciDetails.topLevelCall = undefined; // reset
+            this.heuristciDetails.declaring = undefined;
+        }
+        return msgs;
+    }
+    defaultVisitVariableDeclarator = (node) => this.withUpdateTLDetails(topLevel => {
         if (!node.init) {
             return [];
         }
-        if (atTopLevelDefn) {
-            if (node.init.type === 'ArrowFunctionExpression' || node.init.type === 'FunctionExpression') {
+        if (topLevel) {
+            const init = this.getActualExpression(node.init);
+            if (init?.type === 'ArrowFunctionExpression' || init?.type === 'FunctionExpression') {
                 this.heuristciDetails.declaring = 'function';
             }
             else {
                 this.heuristciDetails.declaring = 'variable';
-                if (node.init.type === 'CallExpression') {
-                    this.heuristciDetails.topLevelCall = this.getCalleeName(node.init.callee);
+                if (init?.type === 'CallExpression') {
+                    this.heuristciDetails.topLevelCall = this.getCalleeName(init.callee);
                 }
             }
         }
-        const msgs = [...this.visit(node.id), ...this.visit(node.init)];
-        if (atTopLevelDefn) {
-            this.heuristciDetails.topLevelCall = undefined; // reset
-            this.heuristciDetails.declaring = undefined;
+        return [...this.visit(node.id), ...this.visit(node.init)];
+    });
+    visitExpressionStatement = (node) => this.withUpdateTLDetails(topLevel => {
+        const expr = this.getActualExpression(node.expression);
+        if (topLevel) {
+            this.heuristciDetails.declaring = 'expression';
+            if (expr.type === 'CallExpression') {
+                this.heuristciDetails.topLevelCall = this.getCalleeName(expr.callee);
+            }
         }
-        return msgs;
-    };
+        return this.visit(expr);
+    });
     // for e.g. svelte to surrounded with $derived
     visitVariableDeclarator = this.defaultVisitVariableDeclarator;
     visitVariableDeclaration = (node) => node.declarations.flatMap(this.visitVariableDeclarator);

package/dist/adapters.js

@@ -71,7 +71,7 @@ export function createHeuristic(opts) {
         if (msg.details.scope === 'attribute') {
             return 'message';
         }
-        if (msg.details.declaring === 'expression' && !msg.details.funcName) {
+        if (msg.details.declaring === 'expression' && msg.details.funcName == null) {
             return false;
         }
         if (!msg.details.call ||

package/dist/ai/index.js

@@ -65,7 +65,7 @@ export default class AIQueue {
     #requestName = (id, targetLocales) => `${color.cyan(this.ai.name)}: ${this.sourceLocale}..[${targetLocales.join(',')}] [${id}]`;
     translate = async (batch, attempt = 0) => {
         const logStart = this.#requestName(batch.id, batch.targetLocales);
-        let translated;
+        let translated = [];
         try {
             const translatedstr = await this.ai.translate(JSON.stringify(batch.messages.map(item => ({
                 id: item.id,
@@ -73,6 +73,12 @@ export default class AIQueue {
                 references: item.references,
             }))), instruct(this.sourceLocale, batch.targetLocales));
             translated = JSON.parse(translatedstr);
+            if (Array.isArray(translated)) {
+                translated = translated.slice(0, batch.messages.length); // may return more
+            }
+            else {
+                translated = [];
+            }
         }
         catch (err) {
             this.log.error(`${logStart}: ${color.red(`error: ${err}`)}`);
@@ -84,7 +90,7 @@ export default class AIQueue {
             const sourceComp = item.id.map(i => compileTranslation(i, ''));
             for (const loc of batch.targetLocales) {
                 const translation = outItem[loc];
-                if (translation.length !== item.id.length) {
+                if (translation?.length !== item.id.length) {
                     unTranslated.push(item);
                     break;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "wuchale",
-    "version": "0.21.0",
+    "version": "0.21.2",
     "description": "Protobuf-like i18n from plain code",
     "scripts": {
         "dev": "tsc --watch",