wuchale 0.15.2 → 0.15.4

package/dist/adapter-utils/mixed-visitor.js

@@ -141,10 +141,10 @@ export class MixedVisitor {
         else {
             return msgs;
         }
-        if (childrenNestedRanges.length) {
+        if (props.scope === 'markup' && iArg > 0 || childrenNestedRanges.length > 0) {
             this.wrapNested(msgInfo, iArg > 0, childrenNestedRanges, lastChildEnd);
         }
-        else if (hasTextChild) {
+        else {
             // no need for component use
             let begin = '{';
             let end = ')}';

package/dist/adapter-vanilla/index.js

@@ -30,7 +30,7 @@ const resolveLoaderPath = (name) => new URL(`../../src/adapter-vanilla/loaders/$
 export const adapter = (args = defaultArgs) => {
     const { heuristic, pluralsFunc, runtime, ...rest } = deepMergeObjects(args, defaultArgs);
     return {
-        transform: ({ content, filename, index, header }) => new Transformer(content, filename, index, heuristic, pluralsFunc, header.expr, runtime).transform(header.head),
+        transform: ({ content, filename, index, expr }) => new Transformer(content, filename, index, heuristic, pluralsFunc, expr, runtime).transform(),
         loaderExts: ['.js', '.ts'],
         defaultLoaders: async () => {
             if (rest.bundleLoad) {

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

@@ -71,7 +71,7 @@ export declare class Transformer {
     visitProgram: (node: Estree.Program) => Message[];
     processCommentDirectives: (data: string) => CommentDirectives;
     visit: (node: Estree.AnyNode) => Message[];
-    finalize: (msgs: Message[], hmrHeaderIndex: number) => TransformOutput;
-    transform: (headerHead: string) => TransformOutput;
+    finalize: (msgs: Message[], hmrHeaderIndex: number, additionalHeader?: string) => TransformOutput;
+    transform: () => TransformOutput;
 }
 export {};

package/dist/adapter-vanilla/transformer.js

@@ -427,29 +427,20 @@ export class Transformer {
         this.commentDirectives = commentDirectives; // restore
         return msgs;
     };
-    finalize = (msgs, hmrHeaderIndex) => ({
+    finalize = (msgs, hmrHeaderIndex, additionalHeader = '') => ({
         msgs,
-        output: hmrData => {
-            if (msgs.length === 0) {
-                return {};
-            }
-            if (hmrData) {
-                this.mstr.prependRight(hmrHeaderIndex, `\nconst ${varNames.hmrUpdate} = ${JSON.stringify(hmrData)}\n`);
-            }
+        output: header => {
+            this.mstr.prependRight(hmrHeaderIndex, `\n${header}\n${additionalHeader}\n`);
             return {
                 code: this.mstr.toString(),
                 map: this.mstr.generateMap(),
             };
         }
     });
-    transform = (headerHead) => {
+    transform = () => {
         const [ast, comments] = parseScript(this.content);
         this.comments = comments;
         this.mstr = new MagicString(this.content);
-        const msgs = this.visit(ast);
-        if (msgs.length) {
-            this.mstr.appendRight(this.getRealBodyStart(ast.body), headerHead + '\n');
-        }
-        return this.finalize(msgs, 0);
+        return this.finalize(this.visit(ast), this.getRealBodyStart(ast.body));
     };
 }

package/dist/adapters.d.ts

@@ -44,19 +44,18 @@ export type CatalogExpr = {
 };
 export type TransformHeader = {
     head: string;
-    expr: CatalogExpr;
 };
 type TransformCtx = {
     content: string;
     filename: string;
     index: IndexTracker;
-    header: TransformHeader;
+    expr: CatalogExpr;
 };
 export type HMRData = {
     version: number;
     data: Record<string, [number, CompiledElement][]>;
 };
-export type TransformOutputFunc = (hmrData: HMRData | null) => {
+export type TransformOutputFunc = (header: string) => {
     code?: string;
     map?: any;
 };
@@ -64,7 +63,7 @@ export type TransformOutput = {
     output: TransformOutputFunc;
     msgs: Message[];
 };
-export type TransformFunc = (ctx: TransformCtx) => TransformOutput;
+export type TransformFunc = (expr: TransformCtx) => TransformOutput;
 export type WrapFunc = (expr: string) => string;
 export type UseReactiveFunc = (details: {
     funcName?: string;

package/dist/handler.d.ts

@@ -38,6 +38,10 @@ type GranularState = {
 type LoaderPathEmpty = {
     [K in keyof LoaderPath]: boolean;
 };
+type TransformOutputCode = {
+    code?: string;
+    map?: any;
+};
 export declare class AdapterHandler {
     #private;
     key: string;
@@ -73,9 +77,6 @@ export declare class AdapterHandler {
         ignore: string[];
     }];
     savePoAndCompile: (loc: string) => Promise<void>;
-    transform: (content: string, filename: string, hmrVersion?: number, ssr?: boolean) => Promise<{
-        code?: string;
-        map?: any;
-    }>;
+    transform: (content: string, filename: string, hmrVersion?: number, ssr?: boolean) => Promise<TransformOutputCode>;
 }
 export {};

package/dist/handler.js

@@ -15,6 +15,13 @@ const defaultPluralRule = {
     nplurals: 2,
     plural: 'n == 1 ? 0 : 1',
 };
+const getFuncPlain = '_w_load_';
+const getFuncReactive = getFuncPlain + 'rx_';
+const catalogsVarName = '_w_catalogs_';
+const bundledCatalogExpr = {
+    plain: `${getFuncPlain}(${catalogsVarName})`,
+    reactive: `${getFuncReactive}(${catalogsVarName})`,
+};
 const objKeyLocale = (locale) => locale.includes('-') ? `'${locale}'` : locale;
 export async function loadPOFile(filename) {
     return new Promise((res, rej) => {
@@ -467,7 +474,7 @@ export class AdapterHandler {
             }
         `;
     };
-    #prepareHeader = (filename, loadID, hasHmr, ssr) => {
+    #prepareHeader = (filename, loadID, hmrData, ssr) => {
         let loaderRelTo = filename;
         if (this.#adapter.writeFiles.transformed) {
             loaderRelTo = resolve(this.outDir + '/' + filename);
@@ -478,36 +485,29 @@ export class AdapterHandler {
         }
         const importsFuncs = [];
         const runtimeConf = this.#adapter.runtime;
-        let getFuncPlain = '_w_load_';
-        let getFuncReactive = getFuncPlain + 'rx_';
         let head = [];
-        if (hasHmr) {
-            const getFuncPlainHmr = getFuncPlain;
-            const getFuncReactiveHmr = getFuncReactive;
-            getFuncPlain += 'hmr_';
-            getFuncReactive += 'hmr_';
+        let getFuncImportPlain = getFuncPlain;
+        let getFuncImportReactive = getFuncReactive;
+        if (hmrData != null) {
+            head.push(`const ${varNames.hmrUpdate} = ${JSON.stringify(hmrData)}`);
+            getFuncImportPlain += 'hmr_';
+            getFuncImportReactive += 'hmr_';
             if (runtimeConf.plain?.importName) {
-                head.push(this.#hmrUpdateFunc(getFuncPlainHmr, getFuncPlain));
+                head.push(this.#hmrUpdateFunc(getFuncPlain, getFuncImportPlain));
             }
             if (runtimeConf.reactive?.importName) {
-                head.push(this.#hmrUpdateFunc(getFuncReactiveHmr, getFuncReactive));
+                head.push(this.#hmrUpdateFunc(getFuncReactive, getFuncImportReactive));
             }
         }
-        this.#putImportSpec(runtimeConf.plain?.importName, getFuncPlain, importsFuncs);
-        this.#putImportSpec(runtimeConf.reactive?.importName, getFuncReactive, importsFuncs);
+        this.#putImportSpec(runtimeConf.plain?.importName, getFuncImportPlain, importsFuncs);
+        this.#putImportSpec(runtimeConf.reactive?.importName, getFuncImportReactive, importsFuncs);
         head = [
             `import ${varNames.rtWrap} from 'wuchale/runtime'`,
             `import ${importsFuncs.join(',')} from "${loaderPath}"`,
             ...head,
         ];
         if (!this.#adapter.bundleLoad) {
-            return {
-                head: head.join('\n'),
-                expr: {
-                    plain: `${getFuncPlain}('${loadID}')`,
-                    reactive: `${getFuncReactive}('${loadID}')`,
-                }
-            };
+            return head.join('\n');
         }
         const imports = [];
         const objElms = [];
@@ -516,17 +516,19 @@ export class AdapterHandler {
             imports.push(`import * as ${locKW} from '${this.virtModEvent(loc, loadID)}'`);
             objElms.push(`${objKeyLocale(loc)}: ${locKW}`);
         }
-        const catalogsVarName = '_w_catalogs_';
+        return [
+            ...imports,
+            ...head,
+            `const ${catalogsVarName} = {${objElms.join(',')}}`
+        ].join('\n');
+    };
+    #prepareRuntimeExpr = (loadID) => {
+        if (this.#adapter.bundleLoad) {
+            return bundledCatalogExpr;
+        }
         return {
-            head: [
-                ...imports,
-                ...head,
-                `const ${catalogsVarName} = {${objElms.join(',')}}`
-            ].join('\n'),
-            expr: {
-                plain: `${getFuncPlain}(${catalogsVarName})`,
-                reactive: `${getFuncReactive}(${catalogsVarName})`,
-            }
+            plain: `${getFuncPlain}('${loadID}')`,
+            reactive: `${getFuncReactive}('${loadID}')`,
         };
     };
     transform = async (content, filename, hmrVersion = -1, ssr = false) => {
@@ -543,7 +545,7 @@ export class AdapterHandler {
             content,
             filename,
             index: indexTracker,
-            header: this.#prepareHeader(filename, loadID, hmrVersion >= 0, ssr),
+            expr: this.#prepareRuntimeExpr(loadID),
         });
         const hmrKeys = {};
         for (const loc of this.#locales) {
@@ -632,21 +634,21 @@ export class AdapterHandler {
             this.#log.log(`Gemini translate ${color.cyan(untranslated.length)} items to ${color.cyan(getLanguageName(loc))} ${opType}`);
             await this.#geminiQueue[loc].running;
         }
-        let hmrData = null;
-        if (hmrVersion >= 0) {
-            hmrData = { version: hmrVersion, data: {} };
-            for (const loc of this.#locales) {
-                hmrData.data[loc] = hmrKeys[loc]?.map(key => {
-                    const index = indexTracker.get(key);
-                    return [index, compiled[loc].items[index]];
-                });
+        let output = {};
+        if (msgs.length) {
+            let hmrData = null;
+            if (hmrVersion >= 0) {
+                hmrData = { version: hmrVersion, data: {} };
+                for (const loc of this.#locales) {
+                    hmrData.data[loc] = hmrKeys[loc]?.map(key => {
+                        const index = indexTracker.get(key);
+                        return [index, compiled[loc].items[index]];
+                    });
+                }
             }
+            output = result.output(this.#prepareHeader(filename, loadID, hmrData, ssr));
         }
-        const output = result.output(hmrData);
         await this.writeTransformed(filename, output.code ?? content);
-        if (!msgs.length) {
-            return {};
-        }
         return output;
     };
 }

package/package.json

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