wuchale 0.15.5 → 0.15.7

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

@@ -4,7 +4,7 @@ export declare const varNames: {
     hmrUpdate: string;
     rtWrap: string;
 };
-export declare function runtimeVars(wrapFunc: (expr: string) => string): {
+export declare function runtimeVars(wrapFunc: (expr: string) => string, base?: string): {
     rtTrans: string;
     rtTPlural: string;
     rtPlural: string;

package/dist/adapter-utils/index.js

@@ -5,13 +5,13 @@ export const varNames = {
     hmrUpdate: '_w_hmrUpdate_',
     rtWrap: '_w_to_rt_',
 };
-export function runtimeVars(wrapFunc) {
+export function runtimeVars(wrapFunc, base = varNames.rt) {
     return {
-        rtTrans: `${wrapFunc(varNames.rt)}.t`,
-        rtTPlural: `${wrapFunc(varNames.rt)}.tp`,
-        rtPlural: `${wrapFunc(varNames.rt)}._.p`,
-        rtCtx: `${wrapFunc(varNames.rt)}.cx`,
-        rtTransCtx: `${wrapFunc(varNames.rt)}.tx`,
+        rtTrans: `${wrapFunc(base)}.t`,
+        rtTPlural: `${wrapFunc(base)}.tp`,
+        rtPlural: `${wrapFunc(base)}._.p`,
+        rtCtx: `${wrapFunc(base)}.cx`,
+        rtTransCtx: `${wrapFunc(base)}.tx`,
         /** for when nesting, used in adapters with elements */
         nestCtx: '_w_ctx_',
     };

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

@@ -6,7 +6,7 @@ import { type RuntimeVars } from "../adapter-utils/index.js";
 export declare const scriptParseOptions: Estree.Options;
 export declare function scriptParseOptionsWithComments(): [Estree.Options, Estree.Comment[][]];
 export declare function parseScript(content: string): [Estree.Program, Estree.Comment[][]];
-declare function initRuntimeStmt(rtConf: RuntimeConf, expr: CatalogExpr): (file: string, funcName: string, parentFunc: string, additional: object) => string;
+type InitRuntimeFunc = (file: string, funcName: string, parentFunc: string, additional: object) => string;
 export declare class Transformer {
     index: IndexTracker;
     heuristic: HeuristicFunc;
@@ -15,7 +15,8 @@ export declare class Transformer {
     filename: string;
     mstr: MagicString;
     pluralFunc: string;
-    initRuntime: ReturnType<typeof initRuntimeStmt>;
+    initRuntime: InitRuntimeFunc;
+    currentRtVar: string;
     vars: () => RuntimeVars;
     commentDirectives: CommentDirectives;
     insideProgram: boolean;
@@ -26,7 +27,7 @@ export declare class Transformer {
     currentTopLevelCall: string;
     /** for subclasses. right now for svelte, if in <script module> */
     additionalState: object;
-    constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, pluralsFunc: string, catalogExpr: CatalogExpr, rtConf: RuntimeConf);
+    constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, pluralsFunc: string, catalogExpr: CatalogExpr, rtConf: RuntimeConf, rtBaseVars?: string[]);
     checkHeuristicBool: HeuristicFunc<HeuristicDetailsBase>;
     checkHeuristic: (msgStr: string, detailsBase: HeuristicDetailsBase) => [boolean, Message];
     visitLiteral: (node: Estree.Literal & {
@@ -34,6 +35,7 @@ export declare class Transformer {
         end: number;
     }) => Message[];
     visitArrayExpression: (node: Estree.ArrayExpression) => Message[];
+    visitSequenceExpression: (node: Estree.SequenceExpression) => Message[];
     visitObjectExpression: (node: Estree.ObjectExpression) => Message[];
     visitObjectPattern: (node: Estree.ObjectPattern) => Message[];
     visitRestElement: (node: Estree.RestElement) => Message[];

package/dist/adapter-vanilla/transformer.js

@@ -39,18 +39,6 @@ export function parseScript(content) {
     const [opts, comments] = scriptParseOptionsWithComments();
     return [ScriptParser.parse(content, opts), comments];
 }
-function initRuntimeStmt(rtConf, expr) {
-    return (file, funcName, parentFunc, additional) => {
-        const useReactive = rtConf.useReactive({ funcName, nested: parentFunc != null, file, additional });
-        if (useReactive.init == null) {
-            return;
-        }
-        const wrapInit = useReactive.init ? rtConf.reactive.wrapInit : rtConf.plain.wrapInit;
-        const catalogExpr = useReactive.init ? expr.reactive : expr.plain;
-        const runtimeExpr = `${varNames.rtWrap}(${catalogExpr})`;
-        return `\nconst ${varNames.rt} = ${wrapInit(runtimeExpr)}\n`;
-    };
-}
 export class Transformer {
     index;
     heuristic;
@@ -61,6 +49,7 @@ export class Transformer {
     mstr;
     pluralFunc;
     initRuntime;
+    currentRtVar;
     vars;
     // state
     commentDirectives = {};
@@ -72,21 +61,27 @@ export class Transformer {
     currentTopLevelCall;
     /** for subclasses. right now for svelte, if in <script module> */
     additionalState = {};
-    constructor(content, filename, index, heuristic, pluralsFunc, catalogExpr, rtConf) {
+    constructor(content, filename, index, heuristic, pluralsFunc, catalogExpr, rtConf, rtBaseVars = [varNames.rt]) {
         this.index = index;
         this.heuristic = heuristic;
         this.pluralFunc = pluralsFunc;
         this.content = content;
         this.filename = filename;
-        this.initRuntime = initRuntimeStmt(rtConf, catalogExpr);
         const topLevelUseReactive = rtConf.useReactive({
             funcName: null,
             nested: false,
             file: filename,
             additional: this.additionalState,
         });
-        const reactiveVars = rtConf.reactive?.wrapUse && runtimeVars(rtConf.reactive.wrapUse);
-        const plainVars = rtConf.plain?.wrapUse && runtimeVars(rtConf.plain.wrapUse);
+        const vars = {};
+        // to enable the use of different runtime vars for different places, right now for svelte <script module>s
+        for (const baseVar of rtBaseVars) {
+            vars[baseVar] = {
+                reactive: rtConf.reactive?.wrapUse && runtimeVars(rtConf.reactive.wrapUse, baseVar),
+                plain: rtConf.plain?.wrapUse && runtimeVars(rtConf.plain.wrapUse, baseVar),
+            };
+        }
+        this.currentRtVar = rtBaseVars[0];
         this.vars = () => {
             const useReactive = rtConf.useReactive({
                 funcName: this.currentFuncDef,
@@ -94,7 +89,18 @@ export class Transformer {
                 file: filename,
                 additional: this.additionalState,
             }) ?? topLevelUseReactive;
-            return useReactive.use ? reactiveVars : plainVars;
+            const currentVars = vars[this.currentRtVar];
+            return useReactive.use ? currentVars.reactive : currentVars.plain;
+        };
+        this.initRuntime = (file, funcName, parentFunc, additional) => {
+            const useReactive = rtConf.useReactive({ funcName, nested: parentFunc != null, file, additional });
+            if (useReactive.init == null) {
+                return;
+            }
+            const wrapInit = useReactive.init ? rtConf.reactive.wrapInit : rtConf.plain.wrapInit;
+            const expr = useReactive.init ? catalogExpr.reactive : catalogExpr.plain;
+            const runtimeExpr = `${varNames.rtWrap}(${expr})`;
+            return `\nconst ${this.currentRtVar} = ${wrapInit(runtimeExpr)}\n`;
         };
     }
     checkHeuristicBool = (msgStr, detailsBase) => {
@@ -140,6 +146,7 @@ export class Transformer {
         return [msgInfo];
     };
     visitArrayExpression = (node) => node.elements.map(this.visit).flat();
+    visitSequenceExpression = (node) => node.expressions.map(this.visit).flat();
     visitObjectExpression = (node) => node.properties.map(this.visit).flat();
     visitObjectPattern = (node) => node.properties.map(this.visit).flat();
     visitRestElement = (node) => this.visit(node.argument);

package/dist/cli/extract.js

@@ -16,7 +16,9 @@ export async function extractAdap(handler, sharedState, files, locales, clean, l
     if (clean) {
         for (const loc of locales) {
             for (const item of Object.values(handler.sharedState.poFilesByLoc[loc].catalog)) {
-                item.references = [];
+                // unreference all files that belong to this adapter
+                // don't touch other adapters' files
+                item.references = item.references.filter(ref => !handler.fileMatches(ref));
             }
         }
     }

package/package.json

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