wuchale 0.16.2 → 0.16.4

package/dist/adapter-vanilla/index.js

@@ -15,9 +15,9 @@ const defaultArgs = {
     generateLoadID: defaultGenerateLoadID,
     writeFiles: {},
     runtime: {
-        useReactive: () => ({
-            init: false,
-            use: false
+        useReactive: ({ nested }) => ({
+            init: nested ? null : false,
+            use: nested ? null : false,
         }),
         plain: {
             importName: 'default',

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

@@ -61,8 +61,8 @@ export declare class Transformer {
     visitVariableDeclaration: (node: Estree.VariableDeclaration) => Message[];
     visitExportNamedDeclaration: (node: Estree.ExportNamedDeclaration) => Message[];
     visitExportDefaultDeclaration: (node: Estree.ExportNamedDeclaration) => Message[];
-    getRealBodyStart: (nodes: (Estree.Statement | Estree.ModuleDeclaration)[]) => number;
-    visitFunctionBody: (node: Estree.BlockStatement | Estree.Expression, name: string | null) => Message[];
+    getRealBodyStart: (nodes: (Estree.Statement | Estree.ModuleDeclaration)[]) => number | undefined;
+    visitFunctionBody: (node: Estree.BlockStatement | Estree.Expression, name: string | null, end?: number) => Message[];
     visitFunctionDeclaration: (node: Estree.FunctionDeclaration) => Message[];
     visitArrowFunctionExpression: (node: Estree.ArrowFunctionExpression) => Message[];
     visitFunctionExpression: (node: Estree.FunctionExpression) => Message[];

package/dist/adapter-vanilla/transformer.js

@@ -276,9 +276,8 @@ export class Transformer {
                 continue;
             }
             msgs.push(...this.visit(dec.id));
-            // store the name of the function after =
             if (atTopLevelDefn) {
-                if (dec.init.type === 'ArrowFunctionExpression') {
+                if (dec.init.type === 'ArrowFunctionExpression' || dec.init.type === 'FunctionExpression') {
                     this.declaring = 'function';
                 }
                 else {
@@ -309,18 +308,37 @@ export class Transformer {
             }
             return node.start;
         }
-        return nodes[0].start;
+        return nodes[0]?.start;
     };
-    visitFunctionBody = (node, name) => {
+    visitFunctionBody = (node, name, end) => {
         const prevFuncDef = this.currentFuncDef;
         const prevFuncNested = this.currentFuncNested;
-        const isBlock = node.type === 'BlockStatement';
-        this.currentFuncDef = isBlock ? name : prevFuncDef;
-        this.currentFuncNested = isBlock && name != null && prevFuncDef != null;
+        this.currentFuncDef = name;
+        this.currentFuncNested = name != null && prevFuncDef != null;
         const msgs = this.visit(node);
-        if (msgs.length > 0 && isBlock) {
+        if (msgs.length > 0) {
             const initRuntime = this.initRuntime(this.filename, this.currentFuncDef, prevFuncDef, this.additionalState);
-            initRuntime && this.mstr.prependLeft(this.getRealBodyStart(node.body), initRuntime);
+            if (initRuntime) {
+                if (node.type === 'BlockStatement') {
+                    this.mstr.prependLeft(this.getRealBodyStart(node.body) ?? node.start, initRuntime);
+                }
+                else {
+                    // get real start if surrounded by parens
+                    let start = node.start - 1;
+                    for (; start > 0; start--) {
+                        const char = this.content[start];
+                        if (char === '(') {
+                            break;
+                        }
+                        if (!/\s/.test(char)) {
+                            start = node.start;
+                            break;
+                        }
+                    }
+                    this.mstr.prependLeft(start, `{${initRuntime}return `);
+                    this.mstr.appendRight(end ?? node.end, '\n}');
+                }
+            }
         }
         this.currentFuncNested = prevFuncNested;
         this.currentFuncDef = prevFuncDef;
@@ -333,7 +351,7 @@ export class Transformer {
         this.declaring = declaring;
         return msgs;
     };
-    visitArrowFunctionExpression = (node) => this.visitFunctionBody(node.body, '');
+    visitArrowFunctionExpression = (node) => this.visitFunctionBody(node.body, '', node.end);
     visitFunctionExpression = (node) => this.visitFunctionBody(node.body, '');
     visitBlockStatement = (node) => node.body.map(this.visit).flat();
     visitReturnStatement = (node) => node.argument ? this.visit(node.argument) : [];
@@ -353,7 +371,7 @@ export class Transformer {
             if (body.type === 'MethodDefinition') {
                 msgs.push(...this.visit(body.key));
                 const methodName = this.content.slice(body.key.start, body.key.end);
-                msgs.push(...this.visitFunctionBody(body.value, `${node.id.name}.${methodName}`));
+                msgs.push(...this.visitFunctionBody(body.value.body, `${node.id.name}.${methodName}`));
             }
             else if (body.type === 'StaticBlock') {
                 const currentFuncDef = this.currentFuncDef;
@@ -461,6 +479,6 @@ export class Transformer {
         const [ast, comments] = parseScript(this.content);
         this.comments = comments;
         this.mstr = new MagicString(this.content);
-        return this.finalize(this.visit(ast), this.getRealBodyStart(ast.body));
+        return this.finalize(this.visit(ast), this.getRealBodyStart(ast.body) ?? 0);
     };
 }

package/dist/adapters.js

@@ -1,7 +1,19 @@
+const ignoreElements = ['style', 'path', 'code', 'pre'];
+const ignoreAttribs = [['form', 'method']];
 export function defaultHeuristic(msgStr, details) {
     if (msgStr.search(/\p{L}/u) === -1) {
         return false;
     }
+    if (details.element && ignoreElements.includes(details.element)) {
+        return false;
+    }
+    if (details.scope === 'attribute') {
+        for (const [element, attrib] of ignoreAttribs) {
+            if (details.element === element && details.attribute === attrib) {
+                return false;
+            }
+        }
+    }
     if (details.scope === 'markup') {
         return true;
     }
@@ -16,7 +28,7 @@ export function defaultHeuristic(msgStr, details) {
     if (details.declaring === 'expression' && !details.funcName) {
         return false;
     }
-    return !details.call?.startsWith('console.');
+    return !details.call?.startsWith('console.') && details.call !== 'fetch';
 }
 // only allow inside function definitions for script scope
 export const defaultHeuristicFuncOnly = (msgStr, details) => {

package/package.json

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