wuchale 0.3.2 → 0.4.0

package/README.md

@@ -102,7 +102,7 @@ then set it up in your main component. Assuming `/src/App.svelte`:
 
 ```svelte
 <script>
-    import {setTranslations} from 'wuchale/runtime.svelte'
+    import {setTranslations} from 'wuchale/runtime.svelte.js'
 
     let locale = $state('en')
 
@@ -292,9 +292,9 @@ This includes all JS/TS code that is:
 The rule for this is that all strings and template strings that start with
 capital letters are extracted. Additionally, if they are used inside the
 `<script>` tags and in their own files (third case above), there is the
-additional restriction that they must be inside a `$derived` variable
-declaration. This is to make the behavior less magic and being more explicit.
-Example:
+additional restriction that they must be inside a `$derived` or `$derived.by`
+variable declaration. This is to make the behavior less magic and being more
+explicit. Example:
 
 ```svelte
 <script>

package/dist/index.d.ts

@@ -0,0 +1,2 @@
+import plugin from "./preprocess/index.js";
+export declare const wuchale: typeof plugin;

package/dist/index.js

@@ -0,0 +1,3 @@
+import plugin from "./preprocess/index.js";
+export const wuchale = plugin;
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,uBAAuB,CAAA;AAE1C,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAA"}

package/dist/preprocess/compile.d.ts

@@ -0,0 +1,4 @@
+type CompiledNestedFragment = (string | number | CompiledNestedFragment)[];
+export type CompiledFragment = string | number | CompiledNestedFragment;
+export default function compileTranslation(text: string, fallback: CompiledFragment): CompiledFragment;
+export {};

package/dist/preprocess/compile.js

@@ -0,0 +1,50 @@
+// $$ cd .. && npm run test
+import { parse } from "svelte/compiler";
+function walkCompileNodes(node) {
+    if (node.type === 'Text') {
+        return [node.data];
+    }
+    if (node.type === 'Literal') {
+        if (typeof node.value === 'number') {
+            return [node.value];
+        }
+        return [];
+    }
+    if (node.type === 'ExpressionTag') {
+        return walkCompileNodes(node.expression);
+    }
+    if (node.type === 'Component') {
+        return [[
+                Number(node.name.slice(1)),
+                ...walkCompileNodes(node.fragment),
+            ]];
+    }
+    if (node.type === 'Fragment') {
+        const parts = [];
+        for (const child of node.nodes) {
+            parts.push(...walkCompileNodes(child));
+        }
+        return parts;
+    }
+    console.error('Unexpected node type', node);
+    return [];
+}
+export default function compileTranslation(text, fallback) {
+    if (!text) {
+        return fallback;
+    }
+    if (!text.includes('<') && !text.includes('{')) {
+        return text;
+    }
+    // <0></0> to <X0></X0> to please svelte parser
+    text = text.replace(/(<|(<\/))(\d+)/g, '$1X$3');
+    try {
+        const ast = parse(text, { modern: true });
+        return walkCompileNodes(ast.fragment);
+    }
+    catch (err) {
+        console.error(err);
+        return fallback;
+    }
+}
+//# sourceMappingURL=compile.js.map

package/dist/preprocess/compile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../src/preprocess/compile.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAE3B,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAOvC,SAAS,gBAAgB,CAAC,IAAgG;IACtH,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACvB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACtB,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC1B,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YACjC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACvB,CAAC;QACD,OAAO,EAAE,CAAA;IACb,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QAChC,OAAO,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAC5C,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAC5B,OAAO,CAAC;gBACJ,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC1B,GAAG,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC;aACrC,CAAC,CAAA;IACN,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,EAAE,CAAA;QAChB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC7B,KAAK,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAA;QAC1C,CAAC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IACD,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,IAAI,CAAC,CAAA;IAC3C,OAAO,EAAE,CAAA;AACb,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,IAAY,EAAE,QAA0B;IAC/E,IAAI,CAAC,IAAI,EAAE,CAAC;QACR,OAAO,QAAQ,CAAA;IACnB,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7C,OAAO,IAAI,CAAA;IACf,CAAC;IACD,+CAA+C;IAC/C,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAA;IAC/C,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QACzC,OAAO,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACzC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAClB,OAAO,QAAQ,CAAA;IACnB,CAAC;AACL,CAAC"}

package/dist/preprocess/gemini.d.ts

@@ -0,0 +1,4 @@
+import PO from 'pofile';
+export type ItemType = InstanceType<typeof PO.Item>;
+declare function setupGemini(sourceLocale: string, targetLocale: string, apiKey: string | null): (fragments: ItemType[]) => Promise<void>;
+export default setupGemini;

package/{preprocess → dist/preprocess}/gemini.js

@@ -1,23 +1,17 @@
 // $$ cd .. && npm run test
 // $$ node %f
-
-import PO from 'pofile'
-
-const baseURL = 'https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key='
-const h = {'Content-Type': 'application/json'}
-
-/**
- * @param {import('pofile').Item[]} fragments
- * @param {string} sourceLocale
- * @param {string} targetLocale
- */
+import PO from 'pofile';
+const baseURL = 'https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key=';
+const h = { 'Content-Type': 'application/json' };
+function codeStandard(locale) {
+    return `ISO 639-${locale.length === 2 ? 1 : 3}`;
+}
 function prepareData(fragments, sourceLocale, targetLocale) {
     const instruction = `
         You will be given the contents of a gettext .po file for a web app.
         Translate each of the items from the source to the target language.
-        You have to find out the languages using their ISO 639-1 codes.
-        The source language is: ${sourceLocale}.
-        The target language is: ${targetLocale}.
+        The source language ${codeStandard(sourceLocale)} code is: ${sourceLocale}.
+        The target language ${codeStandard(targetLocale)} code is: ${targetLocale}.
         You can read all of the information for the items including contexts,
         comments and references to get the appropriate context about each item.
         Provide the translated fragments in the in the same order, preserving
@@ -27,40 +21,35 @@ function prepareData(fragments, sourceLocale, targetLocale) {
             - <0>something</0>: means something enclosed in some tags, like HTML tags
             - <0/>: means a self closing tag, like in HTML
         In all of the examples, 0 is an example for any integer.
-    `
-    const po = new PO()
-    po.items = fragments
+    `;
+    const po = new PO();
+    po.items = fragments;
     return {
         system_instruction: {
             parts: [{ text: instruction }]
         },
-        contents: [{parts: [{text: po.toString()}]}]
-    }
+        contents: [{ parts: [{ text: po.toString() }] }]
+    };
 }
-
-/**
- * @param {string} targetLocale
- * @param {string | undefined} apiKey
- */
-function setupGemini(sourceLocale = 'en', targetLocale, apiKey) {
+function setupGemini(sourceLocale, targetLocale, apiKey) {
     if (apiKey === 'env') {
-        apiKey = process.env.GEMINI_API_KEY
+        apiKey = process.env.GEMINI_API_KEY;
     }
     if (!apiKey) {
-        return
+        return;
     }
-    const url = `${baseURL}${apiKey}`
-    return async (/** @type {import('pofile').Item[]} */ fragments) => {
-        const data = prepareData(fragments, sourceLocale, targetLocale)
-        const res = await fetch(url, {method: 'POST', headers: h, body: JSON.stringify(data)})
-        const json = await res.json()
-        const resText = json.candidates[0].content.parts[0].text
+    const url = `${baseURL}${apiKey}`;
+    return async (fragments) => {
+        const data = prepareData(fragments, sourceLocale, targetLocale);
+        const res = await fetch(url, { method: 'POST', headers: h, body: JSON.stringify(data) });
+        const json = await res.json();
+        const resText = json.candidates[0]?.content.parts[0].text;
         for (const [i, item] of PO.parse(resText).items.entries()) {
             if (item.msgstr[0]) {
-                fragments[i].msgstr = item.msgstr
+                fragments[i].msgstr = item.msgstr;
             }
         }
-    }
+    };
 }
-
-export default setupGemini
+export default setupGemini;
+//# sourceMappingURL=gemini.js.map

package/dist/preprocess/gemini.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../src/preprocess/gemini.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,aAAa;AAEb,OAAO,EAAE,MAAM,QAAQ,CAAA;AAEvB,MAAM,OAAO,GAAG,+FAA+F,CAAA;AAC/G,MAAM,CAAC,GAAG,EAAC,cAAc,EAAE,kBAAkB,EAAC,CAAA;AAE9C,SAAS,YAAY,CAAC,MAAc;IAChC,OAAO,WAAW,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AACnD,CAAC;AAID,SAAS,WAAW,CAAC,SAAqB,EAAE,YAAoB,EAAE,YAAoB;IAClF,MAAM,WAAW,GAAG;;;8BAGM,YAAY,CAAC,YAAY,CAAC,aAAa,YAAY;8BACnD,YAAY,CAAC,YAAY,CAAC,aAAa,YAAY;;;;;;;;;;KAU5E,CAAA;IACD,MAAM,EAAE,GAAG,IAAI,EAAE,EAAE,CAAA;IACnB,EAAE,CAAC,KAAK,GAAG,SAAS,CAAA;IACpB,OAAO;QACH,kBAAkB,EAAE;YAChB,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;SACjC;QACD,QAAQ,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,EAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAC,CAAC,EAAC,CAAC;KAC/C,CAAA;AACL,CAAC;AAUD,SAAS,WAAW,CAAC,YAAoB,EAAE,YAAoB,EAAE,MAAqB;IAClF,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;QACnB,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAA;IACvC,CAAC;IACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAM;IACV,CAAC;IACD,MAAM,GAAG,GAAG,GAAG,OAAO,GAAG,MAAM,EAAE,CAAA;IACjC,OAAO,KAAK,EAAE,SAAqB,EAAE,EAAE;QACnC,MAAM,IAAI,GAAG,WAAW,CAAC,SAAS,EAAE,YAAY,EAAE,YAAY,CAAC,CAAA;QAC/D,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAC,CAAC,CAAA;QACtF,MAAM,IAAI,GAAc,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;QACxC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QACzD,KAAK,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YACxD,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjB,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;YACrC,CAAC;QACL,CAAC;IACL,CAAC,CAAA;AACL,CAAC;AAED,eAAe,WAAW,CAAA"}

package/dist/preprocess/index.d.ts

@@ -0,0 +1,50 @@
+import { defaultHeuristic } from "./prep.js";
+import { type AST } from "svelte/compiler";
+import { type CompiledFragment } from "./compile.js";
+import type { Program } from 'estree';
+export declare const defaultOptions: {
+    sourceLocale: string;
+    otherLocales: string[];
+    localesDir: string;
+    heuristic: typeof defaultHeuristic;
+    geminiAPIKey: string;
+};
+export default function wuchale(options?: {
+    sourceLocale: string;
+    otherLocales: string[];
+    localesDir: string;
+    heuristic: typeof defaultHeuristic;
+    geminiAPIKey: string;
+}): Promise<{
+    name: string;
+    configResolved(config: {
+        env: {
+            PROD: boolean;
+        };
+        root: string;
+    }): Promise<void>;
+    transform: {
+        order: string;
+        handler: (code: string, id: string) => Promise<{
+            code?: undefined;
+            map?: undefined;
+        } | {
+            code: string;
+            map: import("magic-string").SourceMap;
+        }>;
+    };
+    buildEnd(): Promise<void>;
+    setupTesting(): {
+        translations: {};
+        compiled: {
+            [locale: string]: CompiledFragment[];
+        };
+        preprocess: (content: string, ast: AST.Root | Program, filename: string) => Promise<{
+            code?: undefined;
+            map?: undefined;
+        } | {
+            code: string;
+            map: import("magic-string").SourceMap;
+        }>;
+    };
+}>;

package/{preprocess → dist/preprocess}/index.js

@@ -1,248 +1,222 @@
-import Preprocess, { defaultHeuristic, IndexTracker, NestText } from "./prep.js"
-import { parse } from "svelte/compiler"
-import {writeFile} from 'node:fs/promises'
-import compileTranslation from "./compile.js"
-import setupGemini from "./gemini.js"
-import PO from "pofile"
-import { normalize, relative } from "node:path"
-
+import Preprocess, { defaultHeuristic, IndexTracker, NestText } from "./prep.js";
+import { parse } from "svelte/compiler";
+import { writeFile } from 'node:fs/promises';
+import compileTranslation, {} from "./compile.js";
+import setupGemini, {} from "./gemini.js";
+import PO from "pofile";
+import { normalize, relative } from "node:path";
 export const defaultOptions = {
     sourceLocale: 'en',
     otherLocales: ['am'],
     localesDir: './src/locales',
     heuristic: defaultHeuristic,
     geminiAPIKey: 'env',
-}
-
-/**
- * @param {string} filename
- */
+};
 async function loadPONoFail(filename) {
     return new Promise((res) => {
         PO.load(filename, (err, po) => {
-            const translations = {}
-            let total = 0
-            let obsolete = 0
-            let untranslated = 0
+            const translations = {};
+            let total = 0;
+            let obsolete = 0;
+            let untranslated = 0;
             if (!err) {
                 for (const item of po.items) {
-                    total++
+                    total++;
                     if (item.obsolete) {
-                        obsolete++
-                        continue
+                        obsolete++;
+                        continue;
                     }
                     if (!item.msgstr[0]) {
-                        untranslated++
+                        untranslated++;
                     }
-                    const nTxt = new NestText(item.msgid, null, item.msgctxt)
-                    translations[nTxt.toKey()] = item
+                    const nTxt = new NestText(item.msgid, null, item.msgctxt);
+                    translations[nTxt.toKey()] = item;
                 }
             }
-            res({translations, total, obsolete, untranslated})
-        })
-    })
+            res({ translations, total, obsolete, untranslated });
+        });
+    });
 }
-
-/**
- * @param {{ [s: string]: any; } | ArrayLike<any>} translations
- * @param {string} filename
- */
 async function savePO(translations, filename) {
-    const po = new PO()
+    const po = new PO();
     for (const item of Object.values(translations)) {
-        po.items.push(item)
+        po.items.push(item);
     }
     return new Promise((res, rej) => {
         po.save(filename, err => {
             if (err) {
-                rej(err)
-            } else {
-                res()
+                rej(err);
+            }
+            else {
+                res(null);
             }
-        })
-    })
+        });
+    });
 }
-
 function mergeOptionsWithDefault(options = defaultOptions) {
     for (const key of Object.keys(defaultOptions)) {
         if (key in options) {
-            continue
+            continue;
         }
-        options[key] = defaultOptions[key]
+        options[key] = defaultOptions[key];
     }
 }
-
 export default async function wuchale(options = defaultOptions) {
-    mergeOptionsWithDefault(options)
-    const locales = [options.sourceLocale, ...options.otherLocales]
-    const translations = {}
-    const compiledFname = {}
-    const translationsFname = {}
+    mergeOptionsWithDefault(options);
+    const locales = [options.sourceLocale, ...options.otherLocales];
+    const translations = {};
+    const compiledFname = {};
+    const translationsFname = {};
     for (const loc of locales) {
-        compiledFname[loc] = `${options.localesDir}/${loc}.json`
-        translationsFname[loc] = `${options.localesDir}/${loc}.po`
+        compiledFname[loc] = `${options.localesDir}/${loc}.json`;
+        translationsFname[loc] = `${options.localesDir}/${loc}.po`;
     }
-
-    let forProduction = false
-    let projectRoot = ''
-
-    let sourceTranslations = {}
-    let indexTracker = new IndexTracker({})
-
-    const compiled = {}
-
+    let forProduction = false;
+    let projectRoot = '';
+    let sourceTranslations = {};
+    let indexTracker = new IndexTracker({});
+    const compiled = {};
     async function loadFilesAndSetup() {
         for (const loc of locales) {
-            const {translations: trans, total, obsolete, untranslated} = await loadPONoFail(translationsFname[loc])
-            translations[loc] = trans
-            console.info(`i18n stats (${loc}): total: ${total}, obsolete: ${obsolete}, untranslated: ${untranslated}`)
+            const { translations: trans, total, obsolete, untranslated } = await loadPONoFail(translationsFname[loc]);
+            translations[loc] = trans;
+            console.info(`i18n stats (${loc}): total: ${total}, obsolete: ${obsolete}, untranslated: ${untranslated}`);
         }
-        sourceTranslations = translations[options.sourceLocale]
-        indexTracker = new IndexTracker(sourceTranslations)
+        sourceTranslations = translations[options.sourceLocale];
+        indexTracker = new IndexTracker(sourceTranslations);
         // startup compile
         for (const loc of locales) {
-            compiled[loc] = []
+            compiled[loc] = [];
             for (const key in translations[loc]) {
-                const poItem = translations[loc][key]
+                const poItem = translations[loc][key];
                 if (forProduction) {
-                    poItem.references = []
+                    poItem.references = [];
                 }
-                const index = indexTracker.get(key)
-                compiled[loc][index] = compileTranslation(poItem.msgstr[0], compiled[options.sourceLocale][index])
+                const index = indexTracker.get(key);
+                compiled[loc][index] = compileTranslation(poItem.msgstr[0], compiled[options.sourceLocale][index]);
             }
-            await writeFile(compiledFname[loc], JSON.stringify(compiled[loc], null, 2))
+            await writeFile(compiledFname[loc], JSON.stringify(compiled[loc], null, 2));
         }
     }
-
-    /**
-     * @param {string} content
-     * @param {import('estree').Program | import("svelte/compiler").AST.Root} ast
-     * @param {string} filename
-     */
     async function preprocess(content, ast, filename) {
-        const prep = new Preprocess(indexTracker, options.heuristic)
-        const txts = prep.process(content, ast)
+        const prep = new Preprocess(indexTracker, options.heuristic);
+        const txts = prep.process(content, ast);
         if (!txts.length) {
-            return {}
+            return {};
         }
         for (const loc of locales) {
-            const newTxts = []
+            const newTxts = [];
             for (const nTxt of txts) {
-                let key = nTxt.toKey()
-                let translated = translations[loc][key]
+                let key = nTxt.toKey();
+                let translated = translations[loc][key];
                 if (translated == null) {
-                    translated = new PO.Item()
-                    translated.msgid = nTxt.toString()
-                    translations[loc][key] = translated
+                    translated = new PO.Item();
+                    translated.msgid = nTxt.toString();
+                    translations[loc][key] = translated;
                 }
                 if (nTxt.context) {
-                    translated.msgctxt = nTxt.context
+                    translated.msgctxt = nTxt.context;
                 }
                 if (!translated.references.includes(filename)) {
-                    translated.references.push(filename)
+                    translated.references.push(filename);
                 }
                 if (loc === options.sourceLocale) {
-                    const txt = nTxt.toString()
+                    const txt = nTxt.toString();
                     if (translated.msgstr[0] !== txt) {
-                        translated.msgstr = [txt]
-                        newTxts.push(translated)
+                        translated.msgstr = [txt];
+                        newTxts.push(translated);
                     }
-                } else if (!translated.msgstr[0]) {
-                    newTxts.push(translated)
+                }
+                else if (!translated.msgstr[0]) {
+                    newTxts.push(translated);
                 }
             }
             if (loc !== options.sourceLocale && newTxts.length) {
-                const geminiT = setupGemini(options.sourceLocale, loc, options.geminiAPIKey)
+                const geminiT = setupGemini(options.sourceLocale, loc, options.geminiAPIKey);
                 if (geminiT) {
-                    console.info('Gemini translate', newTxts.length, 'items...')
-                    await geminiT(newTxts) // will update because it's by reference
+                    console.info('Gemini translate', newTxts.length, 'items...');
+                    await geminiT(newTxts); // will update because it's by reference
                 }
             }
             for (const nTxt of txts) {
-                const key = nTxt.toKey()
-                const index = indexTracker.get(key)
-                compiled[loc][index] = compileTranslation(translations[loc][key].msgstr[0], compiled[options.sourceLocale][index])
+                const key = nTxt.toKey();
+                const index = indexTracker.get(key);
+                compiled[loc][index] = compileTranslation(translations[loc][key].msgstr[0], compiled[options.sourceLocale][index]);
             }
             for (const [i, c] of compiled[loc].entries()) {
                 if (c == null) {
-                    compiled[loc][i] = 0 // reduce json size for jumped indices, instead of null
+                    compiled[loc][i] = 0; // reduce json size for jumped indices, instead of null
                 }
             }
             if (!newTxts.length) {
-                continue
+                continue;
             }
         }
         return {
             code: prep.mstr.toString(),
             map: prep.mstr.generateMap(),
-        }
+        };
     }
-
     return {
         name: 'wuchale',
-        /**
-         * @param {{ env: { PROD: boolean; }, root: string; }} config
-         */
         async configResolved(config) {
-            forProduction = config.env.PROD
-            projectRoot = config.root
-            await loadFilesAndSetup()
+            forProduction = config.env.PROD;
+            projectRoot = config.root;
+            await loadFilesAndSetup();
         },
         transform: {
             order: 'pre',
-            /**
-             * @param {string} code
-             * @param {string} id
-            */
-            handler: async function(code, id) {
+            handler: async function (code, id) {
                 if (!id.startsWith(projectRoot) || id.startsWith(normalize(projectRoot + '/node_modules'))) {
-                    return
+                    return;
                 }
-                const isModule = id.endsWith('.svelte.js') || id.endsWith('.svelte.ts')
+                const isModule = id.endsWith('.svelte.js') || id.endsWith('.svelte.ts');
                 if (!id.endsWith('.svelte') && !isModule) {
-                    return
+                    return;
                 }
-                let ast
+                let ast;
                 if (isModule) {
-                    ast = this.parse(code)
-                } else {
-                    ast = parse(code, {modern: true})
+                    ast = this.parse(code);
                 }
-                const filename = relative(projectRoot, id)
-                const processed = await preprocess(code, ast, filename)
+                else {
+                    ast = parse(code, { modern: true });
+                }
+                const filename = relative(projectRoot, id);
+                const processed = await preprocess(code, ast, filename);
                 if (processed.code) {
                     for (const loc of locales) {
-                        await savePO(translations[loc], translationsFname[loc])
-                        await writeFile(compiledFname[loc], JSON.stringify(compiled[loc]))
+                        await savePO(translations[loc], translationsFname[loc]);
+                        await writeFile(compiledFname[loc], JSON.stringify(compiled[loc]));
                     }
                 }
-                return processed
+                return processed;
             }
         },
         async buildEnd() {
             if (!forProduction) {
                 // just being pragmatic
-                return
+                return;
             }
             for (const loc of locales) {
                 for (const key in translations[loc]) {
-                    const poItem = translations[loc][key]
-                    poItem.obsolete = poItem.references.length === 0
+                    const poItem = translations[loc][key];
+                    poItem.obsolete = poItem.references.length === 0;
                 }
-                await savePO(translations[loc], translationsFname[loc])
+                await savePO(translations[loc], translationsFname[loc]);
             }
         },
         setupTesting() {
             for (const loc of locales) {
-                translations[loc] = {}
-                compiled[loc] = []
+                translations[loc] = {};
+                compiled[loc] = [];
             }
-            sourceTranslations = translations[options.sourceLocale]
+            sourceTranslations = translations[options.sourceLocale];
             return {
                 translations,
                 compiled,
                 preprocess,
-            }
+            };
         }
-    }
+    };
 }
+//# sourceMappingURL=index.js.map

package/dist/preprocess/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/preprocess/index.ts"],"names":[],"mappings":"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"}