wuchale 0.18.3 → 0.18.5

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

@@ -3,7 +3,7 @@ import { Transformer } from "./transformer.js";
 export { Transformer };
 export { parseScript, scriptParseOptions, scriptParseOptionsWithComments } from './transformer.js';
 export declare const pluralPattern: CodePattern;
-type LoadersAvailable = 'bundle' | 'server' | 'vite';
+type LoadersAvailable = 'server' | 'vite';
 export declare function getDefaultLoaderPath(loader: LoaderChoice<LoadersAvailable>, bundle: boolean): string | {
     client: string;
     server: string;

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

@@ -79,6 +79,12 @@ export declare class Transformer {
     visitTemplateLiteralQuasis: (node: Estree.TemplateLiteral, msgTyp: MessageType) => [number, Message[]];
     visitTemplateLiteral: (node: Estree.TemplateLiteral, heurDetails?: HeuristicDetailsBase | boolean) => Message[];
     visitTaggedTemplateExpression: (node: Estree.TaggedTemplateExpression) => Message[];
+    visitTSAsExpression: (node: {
+        expression: Estree.AnyNode;
+    }) => Message[];
+    visitTSTypeAssertion: (node: {
+        expression: Estree.AnyNode;
+    }) => Message[];
     visitProgram: (node: Estree.Program) => Message[];
     visitWithCommentDirectives: (node: Estree.AnyNode, func: Function) => any;
     visit: (node: Estree.AnyNode) => Message[];

package/dist/adapter-vanilla/transformer.js

@@ -580,6 +580,8 @@ export class Transformer {
         this.currentCall = prevCall;
         return msgs;
     };
+    visitTSAsExpression = (node) => this.visit(node.expression);
+    visitTSTypeAssertion = (node) => this.visit(node.expression);
     visitProgram = (node) => {
         this.insideProgram = true;
         const msgs = this.visitStatementsNSaveRealBodyStart(node.body);

package/dist/adapters.d.ts

@@ -123,6 +123,8 @@ export type Adapter = AdapterPassThruOpts & {
     loaderExts: string[];
     /** default loaders to copy, `null` means custom */
     defaultLoaderPath: LoaderPath | string | null;
+    /** names to import from loaders, should avoid collision with code variables */
+    getRuntimeVars?: Partial<CatalogExpr>;
 };
 export type CodePattern = {
     name: string;

package/dist/handler.js

@@ -23,13 +23,9 @@ export const urlPatternFlag = 'url-pattern';
 const urlExtractedFlag = 'url-extracted';
 const loaderImportGetRuntime = 'getRuntime';
 const loaderImportGetRuntimeRx = 'getRuntimeRx';
-const getFuncPlain = '_w_load_';
-const getFuncReactive = getFuncPlain + 'rx_';
+const getFuncPlainDefault = '_w_load_';
+const getFuncReactiveDefault = getFuncPlainDefault + 'rx_';
 const bundleCatalogsVarName = '_w_catalogs_';
-const bundledCatalogExpr = {
-    plain: `${getFuncPlain}(${bundleCatalogsVarName})`,
-    reactive: `${getFuncReactive}(${bundleCatalogsVarName})`,
-};
 const objKeyLocale = (locale) => locale.includes('-') ? `'${locale}'` : locale;
 export async function loadPOFile(filename) {
     return new Promise((res, rej) => {
@@ -664,13 +660,14 @@ export class AdapterHandler {
             ['MIME-Version', '1.0'],
             ['Content-Type', 'text/plain; charset=utf-8'],
             ['Content-Transfer-Encoding', '8bit'],
-            ['PO-Revision-Date', new Date().toISOString()],
         ];
         for (const [key, val] of updateHeaders) {
             fullHead[key] = val;
         }
+        const now = new Date().toISOString();
         const defaultHeaders = [
-            ['POT-Creation-Date', new Date().toISOString()],
+            ['POT-Creation-Date', now],
+            ['PO-Revision-Date', now],
         ];
         for (const [key, val] of defaultHeaders) {
             if (!fullHead[key]) {
@@ -697,15 +694,20 @@ export class AdapterHandler {
             }
         `;
     };
+    #getRuntimeVars = () => ({
+        plain: this.#adapter.getRuntimeVars?.plain ?? getFuncPlainDefault,
+        reactive: this.#adapter.getRuntimeVars?.reactive ?? getFuncReactiveDefault,
+    });
     #prepareHeader = (filename, loadID, hmrData, forServer) => {
         let head = [];
-        let getFuncImportPlain = getFuncPlain;
-        let getFuncImportReactive = getFuncReactive;
+        const getRuntimeVars = this.#getRuntimeVars();
+        let getRuntimePlain = getRuntimeVars.plain;
+        let getRuntimeReactive = getRuntimeVars.reactive;
         if (hmrData != null) {
             head.push(`const ${varNames.hmrUpdate} = ${JSON.stringify(hmrData)}`);
-            getFuncImportPlain += 'hmr_';
-            getFuncImportReactive += 'hmr_';
-            head.push(this.#hmrUpdateFunc(getFuncPlain, getFuncImportPlain), this.#hmrUpdateFunc(getFuncReactive, getFuncImportReactive));
+            getRuntimePlain += 'hmr_';
+            getRuntimeReactive += 'hmr_';
+            head.push(this.#hmrUpdateFunc(getRuntimeVars.plain, getRuntimePlain), this.#hmrUpdateFunc(getRuntimeVars.reactive, getRuntimeReactive));
         }
         let loaderRelTo = filename;
         if (this.#adapter.outDir) {
@@ -713,8 +715,8 @@ export class AdapterHandler {
         }
         const loaderPath = this.#getImportPath(forServer ? this.loaderPath.server : this.loaderPath.client, loaderRelTo);
         const importsFuncs = [
-            `${loaderImportGetRuntime} as ${getFuncImportPlain}`,
-            `${loaderImportGetRuntimeRx} as ${getFuncImportReactive}`,
+            `${loaderImportGetRuntime} as ${getRuntimePlain}`,
+            `${loaderImportGetRuntimeRx} as ${getRuntimeReactive}`,
         ];
         head = [
             `import {${importsFuncs.join(', ')}} from "${loaderPath}"`,
@@ -738,12 +740,16 @@ export class AdapterHandler {
         ].join('\n');
     };
     #prepareRuntimeExpr = (loadID) => {
+        const importLoaderVars = this.#getRuntimeVars();
         if (this.#adapter.bundleLoad) {
-            return bundledCatalogExpr;
+            return {
+                plain: `${importLoaderVars.plain}(${bundleCatalogsVarName})`,
+                reactive: `${importLoaderVars.reactive}(${bundleCatalogsVarName})`,
+            };
         }
         return {
-            plain: `${getFuncPlain}('${loadID}')`,
-            reactive: `${getFuncReactive}('${loadID}')`,
+            plain: `${importLoaderVars.plain}('${loadID}')`,
+            reactive: `${importLoaderVars.reactive}('${loadID}')`,
         };
     };
     handleMessages = async (loc, msgs, filename) => {

package/package.json

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