wuchale 0.8.2 → 0.9.0

package/README.md

@@ -1,328 +1,19 @@
-# `wuchale` core
+# 📜`wuchale`🪶
 
 [![npm version](https://img.shields.io/npm/v/wuchale)](https://www.npmjs.com/package/wuchale) ![License](https://img.shields.io/github/license/K1DV5/wuchale)
 
-A non-invasive compile-time internationalization (i18n) toolkit.
-Inspired by Lingui, built from scratch with performance, clarity, and
-simplicity in mind.
-
-> 🎯 **Smart translations, tiny runtime, full HMR.** Extract strings at build
-> time, generate optimized translation catalogs, support live translations
-> (even with Gemini AI), and ship minimal code to production.
-
-## Why `wuchale`?
-
-Traditional i18n solutions require you to wrap every translatable string with
-function calls or components. `wuchale` doesn't.
-
-```typescript
-// Traditional i18n
-const t = i18n('Hello')
-
-// With wuchale
-const t = 'Hello'
-```
-
-Write your code naturally. No imports, no wrappers, no annotations.
-`wuchale` handles everything at compile time.
-
-Try the live example in your browser, no setup required:
-
-- Vanilla TS: [![Vanilla TS example on StackBlitz](https://img.shields.io/badge/StackBlitz-Demo-blue?logo=stackblitz)](https://stackblitz.com/github/K1DV5/wuchale/tree/main/examples/vanilla)
-
-## ✨ Key Features
+**`wuchale`** is a non-invasive, normal code based compile-time internationalization (i18n) toolkit.
 
+- **🔤 No extra syntax!** - your normal code is enough
+- **📦 Tiny catalogs to bundle** - Text catalogs are just arrays, no keys necessary
 - **🔧 Zero-effort integration** - Add i18n to existing projects without rewriting code
 - **🚀 Compile-time optimization** - All transformations happen during build, minimal runtime overhead
-- **🔄 Full, granular HMR support** - Live updates during development, including auto-translation
-- **📦 Tiny footprint** - Only 2 additional dependencies (`wuchale` + `pofile`), no bloated `node_modules`
+- **🔄 Full, granular HMR support** - Live updates during development, including AI auto-translation
+- **📦 Tiny footprint** - Only 2 or 3 additional dependencies (`wuchale` + `pofile`), no bloated `node_modules`
 - **🎯 Smart extraction** - Uses AST analysis: handles nested markup, conditionals, loops, and complex interpolations
 - **🌍 Standard .po files** - Compatible with existing translation tools and workflows
 - **🤖 Optional AI translation** - Gemini integration for automatic translations during development
 
-## 📦 Available adapters
-
-To use `wuchale` you need the main `vite` plugin (this package) and an adapter
-for your project type. The following adapters are currently available:
-
-- JavaScript/TypeScript (vanilla adapter): included in this package.
-- Svelte: [here](https://www.npmjs.com/package/@wuchale/svelte)
-
-## 🚀 Quick Start
-
-We will use the vanilla adapter as an example.
-
-### 1. Install
-
-```bash
-npm install wuchale
-```
-
-### 2. Configure Vite
-
-```javascript
-// vite.config.js
-import { wuchale } from 'wuchale'
-
-export default {
-    plugins: [
-        wuchale(),
-    ]
-}
-```
-
-### 3. Create Configuration
-
-Create `wuchale.config.js` in your project root:
-
-```javascript
-// @ts-check
-import { adapter as vanillaAdapter } from "wuchale/adapter-vanilla"
-import { defineConfig } from "wuchale/config"
-
-export default defineConfig({
-    locales: {
-        // English included by default
-        es: { name: 'Spanish' },
-        fr: { name: 'French' }
-    },
-    adapters: {
-        main: vanillaAdapter(),
-    }
-})
-```
-
-### 4. Create the locales directory
-
-```bash
-mkdir src/locales
-```
-
-### 5. Add CLI Scripts
-
-```jsonc
-// package.json
-{
-  "scripts": {
-    "extract": "wuchale",
-    "clean": "wuchale --clean"
-  }
-}
-```
-
-### 6. Use in Your App!
-
-```javascript
-// src/index.js
-
-import { runWithCatalog } from 'wuchale/runtime-server'
-
-const catalogs = {
-    en: await import(`./locales/en.js`),
-    es: await import(`./locales/es.js`),
-    fr: await import(`./locales/fr.js`),
-}
-
-// adapted from an express.js example
-// only to show how to use runWithCatalog
-app.get('/', (req, res) => {
-    runWithCatalog(catalogs.es, () => res.send('Hello')) // will return Hola
-})
-```
-
-### 7. Start Coding!
-
-Write your code naturally. `wuchale` will extract and compile translations automatically:
-
-```javascript
-function eventHandler(event) {
-    event.target.value = 'Hello!'
-}
-```
-
-## 📖 How It Works
-
-[See main README](https://github.com/K1DV5/wuchale)
-
-## AI Translation
-
-Enable Gemini translations by setting `GEMINI_API_KEY`:
-
-```bash
-GEMINI_API_KEY=your-key npm run dev
-```
-
-## 📁 File Structure
-
-```
-src/
-├── locales/
-│   ├── en.po  # Source catalog (commit this)
-│   ├── en.js  # Compiled data module (gitignore)
-│   ├── es.po  # Translation catalog (commit this)
-│   └── es.js  # Compiled data module (gitignore)
-└── index.js   # Your code
-```
-
-## 🧠 Behavior Explanation (vanilla adapter)
-
-### What Gets Extracted?
-
-This is decided by the heuristic function which you can customize. A sensible
-default heuristic function is provided out of the box. Here's how it works:
-
-- If the text contains no letters used in any natural language (e.g., just numbers or symbols), it is ignored.
-- If it's in a top-level expression (not inside an assignment or a function definition) it is ignored.
-- If the value is inside `console.*()` call, it is ignored.
-- If the first character is a lowercase English letter (`[a-z]`) or is any non-letter, it is ignored.
-- Otherwise, it is extracted.
-
-Examples:
-
-```javascript
-
-const message = 'This is extracted'
-const lowercase = 'not extracted'
-
-// Force extraction with comment
-const forced = /* @wc-include */ 'force extracted'
-
-function foo() {
-    const extracted = 'Hello!'
-}
-```
-
-If you need more control, you can supply your own heuristic function in the
-configuration. Custom heuristics can return `undefined` or `null` to fall back
-to the default. For convenience, the default heuristic is exported by the
-package.
-
-> 💡 You can override extraction with comment directives:
-> - `@wc-ignore` — skips extraction
-> - `@wc-include` — forces extraction  
-> These always take precedence.
-
-### Pluralization
-
-Define your function
-```javascript
-// in e.g. src/utils.js
-export function plural(num, candidates, rule = n => n === 1 ? 0 : 1) {
-    const index = rule(num)
-    return candidates[index].replace('#', num)
-}
-```
-
-Use it
-
-```javascript
-import {plural} from '/src/utils.js'
-
-function eventHandler(e) {
-    let itemCount = 5
-    e.target.value = plural(itemCount, ['One item', '# items'])
-}
-```
-
-### Context
-
-Disambiguate identical texts:
-
-```typescript
-// @wc-context: navigation
-const msg = 'Home'
-
-// @wc-context: building
-const bldg = 'Home'
-```
-### Useful Usage Pattern
-
-A common scenario is needing to prevent string extraction inside functions, but
-you may not want to modify the global heuristic or litter your code with
-comment directives. A cleaner approach is to extract constants to the top
-level, which are ignored by default:
-
-```js
-const keys = {
-  Escape: 'Escape',
-  ArrowUp: 'ArrowUp',
-  // ...
-};
-
-function eventHandler(event) {
-  if (event.key === keys.Escape) {
-    // ...
-  }
-}
-```
-
-## 🛠️ Configuration Reference
-
-### Main plugin
-
-```javascript
-export default {
-    // Source language code
-    sourceLocale: 'en',
-    
-    // Available locales with plural rules
-    locales: {
-        en: {
-            name: 'English',
-            // the number of plurals in the language
-            nPlurals: 2,
-            // The expression to use to decide which candidate to choose when using your plural() function
-            // The number should be used as 'n' because this will be the body of an arrow function with n as an argument.
-            pluralRule: 'n == 1 ? 0 : 1'
-        }
-    },
-    
-    // Adapters are the project type specific bindings for wuchale. For the vanilla adapter configuration, look below.
-    // You can repeat the same adapter with different keys and catalog configurations
-    // to break the translations into smaller parts
-    adapters: {
-        // key: AdapterConf
-    }
-    
-    // Enable HMR updates during development. You can disable this to avoid the small overhead
-    // of live translation updates and work solely with the source language.
-    // HMR is highly optimized -- it updates only the affected components,
-    // preserving application state and avoiding full reloads.
-    hmr: true,
-    
-    // Gemini API key (or 'env' to use GEMINI_API_KEY)
-    // if it's 'env', and GEMINI_API_KEY is not set, it is disabled
-    // set it to null to disable it entirely
-    geminiAPIKey: 'env'
-}
-```
-
-### Basic Adapter
-
-```javascript
-
-import { adapter as vanillaAdapter } from "wuchale/adapter-vanilla"
+## 📚 Documentation
 
-const vanillaAdapterConf = vanillaAdapter({
-    // Where to store translation files. {locale} will be replaced with the respective locale.
-    catalog: './src/locales/{locale}',
-    
-    // Files to scan for translations and transform
-    files: ['src/**/*.{js,ts}'],
-    
-    // Custom extraction logic
-    // signature should be: (text: string, details: object) => boolean | undefined
-    // details has the following properties:
-        // scope: "markup" | "attribute" | "script",
-        // topLevel?: "variable" | "function" | "expression",
-        // topLevelCall?: string,
-        // call?: string,
-        // element?: string,
-        // attribute?: string,
-        // file?: string,
-    heuristic: defaultHeuristic,
-    
-    // Your plural function name
-    pluralFunc: 'plural',
-})
-```
+See the full guide at: [wuchale.dev](https://wuchale.dev/).

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

@@ -1,9 +1,9 @@
 import MagicString from "magic-string";
 import type Estree from 'estree';
-import { NestText } from './adapter.js';
-import type { AdapterFunc, CommentDirectives, HeuristicDetailsBase, HeuristicFunc, IndexTracker, ProxyModuleFunc, ScriptTopLevel, TransformOutput } from "./adapter.js";
+import { NestText } from './adapters.js';
+import type { AdapterArgs, Adapter, CommentDirectives, HeuristicDetailsBase, HeuristicFunc, IndexTracker, ScriptDeclType, TransformOutput } from "./adapters.js";
 export declare function parseScript(content: string): import("acorn").Program;
-export declare const runtimeConst = "wuchaleRuntime";
+export declare const runtimeConst = "_w_runtime_";
 export declare class Transformer {
     index: IndexTracker;
     heuristic: HeuristicFunc;
@@ -11,16 +11,17 @@ export declare class Transformer {
     filename: string;
     mstr: MagicString;
     pluralFunc: string;
-    key: string;
+    initInsideFuncLoadID: string | null;
     rtFunc: string;
     rtFuncPlural: string;
     rtPluralsRule: string;
     commentDirectives: CommentDirectives;
     insideProgram: boolean;
-    topLevel: ScriptTopLevel;
+    declaring: ScriptDeclType;
+    insideFuncDef: boolean;
     currentCall: string;
     currentTopLevelCall: string;
-    constructor(key: string, content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, pluralsFunc: string);
+    constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, pluralsFunc: string, initInsideFuncLoadID?: string);
     checkHeuristic: (text: string, detailsBase: HeuristicDetailsBase) => [boolean, NestText];
     visitLiteral: (node: Estree.Literal & {
         start: number;
@@ -48,8 +49,10 @@ export declare class Transformer {
     visitVariableDeclaration: (node: Estree.VariableDeclaration) => NestText[];
     visitExportNamedDeclaration: (node: Estree.ExportNamedDeclaration) => NestText[];
     visitExportDefaultDeclaration: (node: Estree.ExportNamedDeclaration) => NestText[];
+    visitFunctionBody: (node: Estree.BlockStatement | Estree.Expression) => NestText[];
     visitFunctionDeclaration: (node: Estree.FunctionDeclaration) => NestText[];
     visitArrowFunctionExpression: (node: Estree.ArrowFunctionExpression) => NestText[];
+    visitFunctionExpression: (node: Estree.FunctionExpression) => NestText[];
     visitBlockStatement: (node: Estree.BlockStatement) => NestText[];
     visitReturnStatement: (node: Estree.ReturnStatement) => NestText[];
     visitIfStatement: (node: Estree.IfStatement) => NestText[];
@@ -58,8 +61,12 @@ export declare class Transformer {
     processCommentDirectives: (data: string) => CommentDirectives;
     visit: (node: Estree.BaseNode) => NestText[];
     finalize: (txts: NestText[]) => TransformOutput;
-    transform: () => TransformOutput;
+    transform: (loaderPath: string, loadID: string) => TransformOutput;
 }
-export declare const proxyModuleHotUpdate: (virtModEvent: string, targetVar?: string) => string;
-export declare const proxyModuleDefault: ProxyModuleFunc;
-export declare const adapter: AdapterFunc;
+export declare const proxyModuleHotUpdate: (loadID: string | null, eventSend: string, eventReceive: string, targetVar?: string) => string;
+type VanillaAdapArgs = AdapterArgs & {
+    initInsideFunc?: boolean;
+};
+export declare const adapter: (args?: VanillaAdapArgs) => Adapter;
+export {};
+//# sourceMappingURL=adapter-vanilla.d.ts.map

package/dist/src/adapter-vanilla.d.ts.map

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

package/dist/src/adapter-vanilla.js

@@ -2,7 +2,7 @@
 import MagicString from "magic-string";
 import { Parser } from 'acorn';
 import { tsPlugin } from '@sveltejs/acorn-typescript';
-import { defaultHeuristicFuncOnly, NestText } from './adapter.js';
+import { defaultGenerateLoadID, defaultHeuristicFuncOnly, NestText } from './adapters.js';
 import { deepMergeObjects } from "./config.js";
 const scriptParseOptions = {
     sourceType: 'module',
@@ -13,7 +13,8 @@ const ScriptParser = Parser.extend(tsPlugin());
 export function parseScript(content) {
     return ScriptParser.parse(content, scriptParseOptions);
 }
-export const runtimeConst = 'wuchaleRuntime';
+export const runtimeConst = '_w_runtime_';
+const rtFuncInit = '_w_load_';
 export class Transformer {
     index;
     heuristic;
@@ -21,24 +22,25 @@ export class Transformer {
     filename;
     mstr;
     pluralFunc;
+    initInsideFuncLoadID;
     // for runtime
-    key;
     rtFunc = `${runtimeConst}.t`;
     rtFuncPlural = `${runtimeConst}.tp`;
     rtPluralsRule = `${runtimeConst}.plr`;
     // state
     commentDirectives = {};
     insideProgram = false;
-    topLevel = null;
+    declaring = null;
+    insideFuncDef = false;
     currentCall;
     currentTopLevelCall;
-    constructor(key, content, filename, index, heuristic, pluralsFunc) {
-        this.key = key;
+    constructor(content, filename, index, heuristic, pluralsFunc, initInsideFuncLoadID) {
         this.index = index;
         this.heuristic = heuristic;
         this.pluralFunc = pluralsFunc;
         this.content = content;
         this.filename = filename;
+        this.initInsideFuncLoadID = initInsideFuncLoadID;
     }
     checkHeuristic = (text, detailsBase) => {
         if (!text) {
@@ -50,7 +52,8 @@ export class Transformer {
             const details = {
                 file: this.filename,
                 call: this.currentCall,
-                topLevel: this.topLevel,
+                topLevel: this.declaring,
+                insideFuncDef: this.insideFuncDef,
                 topLevelCall: this.currentTopLevelCall,
                 ...detailsBase,
             };
@@ -195,7 +198,7 @@ export class Transformer {
     };
     visitVariableDeclaration = (node) => {
         const txts = [];
-        let atTopLevelDefn = this.insideProgram && !this.topLevel;
+        let atTopLevelDefn = this.insideProgram && !this.declaring;
         for (const dec of node.declarations) {
             if (!dec.init) {
                 continue;
@@ -203,10 +206,10 @@ export class Transformer {
             // store the name of the function after =
             if (atTopLevelDefn) {
                 if (dec.init.type === 'ArrowFunctionExpression') {
-                    this.topLevel = 'function';
+                    this.declaring = 'function';
                 }
                 else {
-                    this.topLevel = 'variable';
+                    this.declaring = 'variable';
                     if (dec.init.type === 'CallExpression') {
                         this.currentTopLevelCall = this.getCalleeName(dec.init.callee);
                     }
@@ -220,22 +223,32 @@ export class Transformer {
         }
         if (atTopLevelDefn) {
             this.currentTopLevelCall = null; // reset
-            this.topLevel = null;
+            this.declaring = null;
         }
         return txts;
     };
     visitExportNamedDeclaration = (node) => node.declaration ? this.visit(node.declaration) : [];
     visitExportDefaultDeclaration = this.visitExportNamedDeclaration;
+    visitFunctionBody = (node) => {
+        const insideFuncDef = this.insideFuncDef;
+        this.insideFuncDef = true;
+        const txts = this.visit(node);
+        if (this.initInsideFuncLoadID && node.type === 'BlockStatement') {
+            // @ts-expect-error
+            this.mstr.prependLeft(node.start + 1, `const ${runtimeConst} = ${rtFuncInit}('${this.initInsideFuncLoadID}')\n`);
+        }
+        this.insideFuncDef = insideFuncDef;
+        return txts;
+    };
     visitFunctionDeclaration = (node) => {
-        const topLevelDef = this.topLevel;
-        this.topLevel = 'function';
-        const txts = this.visit(node.body);
-        if (!topLevelDef) {
-            this.topLevel = null;
-        }
+        const declaring = this.declaring;
+        this.declaring = 'function';
+        const txts = this.visitFunctionBody(node.body);
+        this.declaring = declaring;
         return txts;
     };
-    visitArrowFunctionExpression = (node) => this.visit(node.body);
+    visitArrowFunctionExpression = (node) => this.visitFunctionBody(node.body);
+    visitFunctionExpression = (node) => this.visitFunctionBody(node.body);
     visitBlockStatement = (node) => {
         const txts = [];
         for (const statement of node.body) {
@@ -355,59 +368,61 @@ export class Transformer {
             map: this.mstr.generateMap(),
         };
     };
-    transform = () => {
+    transform = (loaderPath, loadID) => {
         const ast = parseScript(this.content);
         this.mstr = new MagicString(this.content);
         const txts = this.visit(ast);
         if (txts.length) {
-            const collectionFunc = '_wre_';
             const importModule = `
-                import { ${collectionFunc} } from "wuchale/runtime"
-                const ${runtimeConst} = ${collectionFunc}("${this.key}")
+                import ${rtFuncInit} from "${loaderPath}"
+                const ${runtimeConst} = ${rtFuncInit}('${loadID}')
             `;
             this.mstr.appendRight(0, importModule);
         }
         return this.finalize(txts);
     };
 }
-export const proxyModuleHotUpdate = (virtModEvent, targetVar = 'data') => `
+export const proxyModuleHotUpdate = (loadID, eventSend, eventReceive, targetVar = 'data') => `
     if (import.meta.hot) {
-        import.meta.hot.on('${virtModEvent}', newData => {
+        import.meta.hot.on('${eventSend}', newData => {
             for (let i = 0; i < newData.length; i++) {
                 if (JSON.stringify(data[i]) !== JSON.stringify(newData[i])) {
                     ${targetVar}[i] = newData[i]
                 }
             }
         })
-        import.meta.hot.send('${virtModEvent}')
+        import.meta.hot.send('${eventReceive}'${loadID == null ? '' : `, {loadID: '${loadID}'}`})
     }
 `;
-export const proxyModuleDefault = virtModEvent => `export {key, default, pluralsRule} from '${virtModEvent}'`;
-const proxyModuleDev = (virtModEvent) => `
-    import data, {key, pluralsRule} from '${virtModEvent}'
-    ${proxyModuleHotUpdate(virtModEvent)}
-    export {key, pluralsRule}
-    export default data
+const dataModuleDev = ({ loadID: loadID, eventSend, eventReceive, compiled, plural }) => `
+    export const plural = ${plural}
+    export const data = ${compiled}
+    ${proxyModuleHotUpdate(loadID, eventSend, eventReceive)}
 `;
 const defaultArgs = {
     files: ['src/**/*.{js,ts}'],
     catalog: './src/locales/{locale}',
     pluralsFunc: 'plural',
     heuristic: defaultHeuristicFuncOnly,
+    generateLoadID: defaultGenerateLoadID,
+    granularLoad: false,
+    writeFiles: {},
+    initInsideFunc: false,
 };
 export const adapter = (args = defaultArgs) => {
-    const { heuristic, pluralsFunc, files, catalog } = deepMergeObjects(args, defaultArgs);
+    const { heuristic, pluralsFunc, files, catalog, granularLoad, generateLoadID: generateID, writeFiles, initInsideFunc, } = deepMergeObjects(args, defaultArgs);
     return {
-        transform: (content, filename, index, key) => {
-            return new Transformer(key, content, filename, index, heuristic, pluralsFunc).transform();
+        transform: ({ content, filename, index, loaderPath, loadID }) => {
+            return new Transformer(content, filename, index, heuristic, pluralsFunc, initInsideFunc ? loadID : null).transform(loaderPath, loadID);
         },
         files,
         catalog,
-        compiledExt: '.js',
-        proxyModule: {
-            dev: proxyModuleDev,
-            default: proxyModuleDefault,
-        }
+        granularLoad,
+        generateLoadID: generateID,
+        loaderExts: ['.js', '.ts'],
+        dataModuleDev,
+        writeFiles,
+        defaultLoaderPath: () => new URL('../../src/loader.default.js', import.meta.url).pathname,
     };
 };
 //# sourceMappingURL=adapter-vanilla.js.map