wuchale 0.19.1 → 0.19.2

package/dist/adapter-vanilla/index.js

@@ -22,8 +22,8 @@ const defaultArgs = {
         initReactive: ({ nested }) => (nested ? null : false),
         useReactive: false,
         plain: {
-            wrapInit: (expr) => expr,
-            wrapUse: (expr) => expr,
+            wrapInit: expr => expr,
+            wrapUse: expr => expr,
         },
     },
 };

package/dist/adapter-vanilla/transformer.js

@@ -8,6 +8,11 @@ export const scriptParseOptions = {
     sourceType: 'module',
     ecmaVersion: 'latest',
     locations: true,
+    // relaxed because checking correctness is not the focus here
+    allowReturnOutsideFunction: true,
+    allowAwaitOutsideFunction: true,
+    allowSuperOutsideMethod: true,
+    allowImportExportEverywhere: true,
 };
 const ScriptParser = Parser.extend(tsPlugin());
 export function scriptParseOptionsWithComments() {
@@ -17,7 +22,7 @@ export function scriptParseOptionsWithComments() {
         {
             ...scriptParseOptions,
             // parse comments for when they are not part of the AST
-            onToken: (token) => {
+            onToken: token => {
                 if (accumulateComments.length) {
                     comments[token.start] = accumulateComments;
                 }
@@ -158,7 +163,7 @@ export class Transformer {
         this.mstr.update(start, end, `${this.vars().rtTrans}(${this.index.get(msgInfo.toKey())})`);
         return [msgInfo];
     };
-    visitArrayExpression = (node) => node.elements.flatMap((elm) => (elm ? this.visit(elm) : []));
+    visitArrayExpression = (node) => node.elements.flatMap(elm => (elm ? this.visit(elm) : []));
     visitSequenceExpression = (node) => node.expressions.flatMap(this.visit);
     visitObjectExpression = (node) => node.properties.flatMap(this.visit);
     visitObjectPattern = (node) => node.properties.flatMap(this.visit);
@@ -194,7 +199,7 @@ export class Transformer {
             return this.defaultVisitCallExpression(node);
         }
         const calleeName = node.callee.name;
-        const pattern = this.patterns.find((p) => p.name === calleeName);
+        const pattern = this.patterns.find(p => p.name === calleeName);
         if (!pattern) {
             return this.defaultVisitCallExpression(node);
         }
@@ -410,7 +415,7 @@ export class Transformer {
             if (this.mstr.toString() !== currentContent ||
                 (bod.type === 'IfStatement' &&
                     bod.consequent.type === 'BlockStatement' &&
-                    bod.consequent.body.some((n) => n.type === 'ReturnStatement'))) {
+                    bod.consequent.body.some(n => n.type === 'ReturnStatement'))) {
                 bodyStart = bod.start;
             }
         }
@@ -591,7 +596,7 @@ export class Transformer {
         this.heuristciDetails.call = prevCall;
         return msgs;
     };
-    visitSwitchStatement = (node) => node.cases.flatMap((c) => c.consequent.map(this.visit)).flat();
+    visitSwitchStatement = (node) => node.cases.flatMap(c => c.consequent.map(this.visit)).flat();
     visitTryStatement = (node) => {
         const msgs = this.visit(node.block);
         if (node.handler) {
@@ -642,7 +647,7 @@ export class Transformer {
     });
     finalize = (msgs, hmrHeaderIndex, additionalHeader = '') => ({
         msgs,
-        output: (header) => {
+        output: header => {
             this.mstr.prependRight(hmrHeaderIndex, `\n${header}\n${additionalHeader}\n`);
             return {
                 code: this.mstr.toString(),

package/dist/adapters.js

@@ -11,11 +11,11 @@ export class Message {
             this.msgStr = [msgStr];
         }
         else {
-            this.msgStr = msgStr.filter((str) => str != null);
+            this.msgStr = msgStr.filter(str => str != null);
         }
-        this.msgStr = this.msgStr.map((msg) => msg
+        this.msgStr = this.msgStr.map(msg => msg
             .split('\n')
-            .map((line) => line.trim())
+            .map(line => line.trim())
             .join('\n'));
         this.details = heuristicDetails;
         this.context = context;
@@ -30,7 +30,7 @@ export const defaultHeuristicOpts = {
     urlCalls: [],
 };
 export function createHeuristic(opts) {
-    return (msg) => {
+    return msg => {
         if (msg.details.element && opts.ignoreElements.includes(msg.details.element)) {
             return false;
         }
@@ -89,7 +89,7 @@ export function createHeuristic(opts) {
 /** Default heuristic */
 export const defaultHeuristic = createHeuristic(defaultHeuristicOpts);
 /** Default heuristic which ignores messages outside functions in the `script` scope */
-export const defaultHeuristicFuncOnly = (msg) => {
+export const defaultHeuristicFuncOnly = msg => {
     if (defaultHeuristic(msg) && (msg.details.scope !== 'script' || msg.details.funcName != null)) {
         return 'message';
     }

package/dist/cli/extract.js

@@ -30,7 +30,7 @@ export async function extract(config, clean, watch, sync) {
     }
     // watch
     logger.info('Watching for changes');
-    const handlersWithExtr = handlers.map((h) => [h.fileMatches, extractor(h, logger)]);
+    const handlersWithExtr = handlers.map(h => [h.fileMatches, extractor(h, logger)]);
     watchFS('.', { ignoreInitial: true }).on('all', async (event, filename) => {
         if (!['add', 'change'].includes(event)) {
             return;

package/dist/cli/status.js

@@ -17,7 +17,7 @@ async function statPO(filename) {
 }
 export async function status(config, locales) {
     // console.log because if the user invokes this command, they want full info regardless of config
-    console.log(`Locales: ${locales.map((l) => color.cyan(`${l} (${getLanguageName(l)})`)).join(', ')}`);
+    console.log(`Locales: ${locales.map(l => color.cyan(`${l} (${getLanguageName(l)})`)).join(', ')}`);
     for (const [key, adapter] of Object.entries(config.adapters)) {
         const handler = new AdapterHandler(adapter, key, config, 'cli', process.cwd(), new Logger(config.logLevel));
         const loaderPath = await handler.getLoaderPath();

package/dist/compile.js

@@ -2,7 +2,7 @@ const OPEN = Symbol();
 const CLOSE = Symbol();
 const SELF_CLOSE = Symbol();
 const PLACEHOLDER = Symbol();
-const digitRange = ['0', '9'].map((d) => d.charCodeAt(0));
+const digitRange = ['0', '9'].map(d => d.charCodeAt(0));
 function extractSpecial(msgStr, start) {
     const inPlaceHolder = msgStr[start] === '{';
     const inTag = msgStr[start] === '<';

package/dist/config.js

@@ -1,7 +1,7 @@
 import { resolve } from 'node:path';
 import { defaultGemini } from './ai/gemini.js';
 export const defaultConfig = {
-    locales: [],
+    locales: ['en'],
     adapters: {},
     hmr: true,
     ai: defaultGemini,
@@ -31,7 +31,7 @@ export function deepMergeObjects(source, target) {
     deepAssign(source, full);
     return full;
 }
-export const defaultConfigNames = ['js', 'mjs', 'ts', 'mts'].map((ext) => `wuchale.config.${ext}`);
+export const defaultConfigNames = ['js', 'mjs', 'ts', 'mts'].map(ext => `wuchale.config.${ext}`);
 const displayName = new Intl.DisplayNames(['en'], { type: 'language' });
 export const getLanguageName = (code) => displayName.of(code) ?? code;
 export function checkValidLocale(locale) {

package/dist/handler.js

@@ -74,7 +74,7 @@ async function saveCatalogToPO(catalog, filename, headers = {}) {
         po.items.push(item);
     }
     return new Promise((res, rej) => {
-        po.save(filename, (err) => {
+        po.save(filename, err => {
             if (err) {
                 rej(err);
             }
@@ -311,7 +311,7 @@ export class AdapterHandler {
         if (typeof compiledTranslatedPatt === 'string') {
             return compiledTranslatedPatt;
         }
-        const urlTokens = compiledTranslatedPatt.map((part) => {
+        const urlTokens = compiledTranslatedPatt.map(part => {
             if (typeof part === 'number') {
                 return keys[part];
             }
@@ -324,12 +324,12 @@ export class AdapterHandler {
         if (!patterns) {
             return;
         }
-        const manifest = patterns.map((patt) => {
+        const manifest = patterns.map(patt => {
             const catalogPattKey = this.#urlPatternKeys.get(patt);
             const { keys } = pathToRegexp(patt);
             return [
                 patt,
-                this.#config.locales.map((loc) => {
+                this.#config.locales.map(loc => {
                     let pattern = patt;
                     const item = this.sharedState.poFilesByLoc.get(loc).catalog.get(catalogPattKey);
                     if (item) {
@@ -423,13 +423,13 @@ export class AdapterHandler {
                 }
                 return new Message(locPattern, undefined, context);
             });
-            const urlPatternCatKeys = urlPatternMsgs.map((msg) => msg.toKey());
+            const urlPatternCatKeys = urlPatternMsgs.map(msg => msg.toKey());
             for (const [key, item] of catalog.entries()) {
                 if (!item.flags[urlPatternFlag]) {
                     continue;
                 }
                 if (!urlPatternCatKeys.includes(key)) {
-                    item.references = item.references.filter((r) => r !== this.key);
+                    item.references = item.references.filter(r => r !== this.key);
                     if (item.references.length === 0) {
                         item.obsolete = true;
                     }
@@ -603,7 +603,7 @@ export class AdapterHandler {
                 continue;
             }
             // compile only if it came from a file under this adapter
-            if (!poItem.references.some((f) => this.fileMatches(f))) {
+            if (!poItem.references.some(f => this.fileMatches(f))) {
                 continue;
             }
             const index = this.sharedState.indexTracker.get(key);
@@ -834,7 +834,7 @@ export class AdapterHandler {
             if (msgInfo.context) {
                 poItem.msgctxt = msgInfo.context;
             }
-            const newComments = msgInfo.comments.map((c) => c.replace(/\s+/g, ' ').trim());
+            const newComments = msgInfo.comments.map(c => c.replace(/\s+/g, ' ').trim());
             let iStartComm;
             if (key in previousReferences) {
                 const prevRef = previousReferences.get(key);
@@ -950,7 +950,7 @@ export class AdapterHandler {
                 hmrData = { version: hmrVersion, data: {} };
                 for (const loc of this.#config.locales) {
                     hmrData.data[loc] =
-                        hmrKeys.get(loc)?.map((key) => {
+                        hmrKeys.get(loc)?.map(key => {
                             const index = indexTracker.get(key);
                             return [index, compiled.get(loc).items[index]];
                         }) ?? [];
@@ -981,18 +981,18 @@ export class AdapterHandler {
                 for (const item of items) {
                     // unreference all references that belong to this adapter
                     if (item.flags[urlPatternFlag]) {
-                        item.references = item.references.filter((ref) => ref !== this.key);
+                        item.references = item.references.filter(ref => ref !== this.key);
                     }
                     else {
                         // don't touch other adapters' files. related extracted comments handled by handler
-                        item.references = item.references.filter((ref) => {
+                        item.references = item.references.filter(ref => {
                             if (this.fileMatches(ref)) {
                                 return false;
                             }
                             if (this.sharedState.ownerKey !== this.key) {
                                 return true;
                             }
-                            return this.sharedState.otherFileMatches.some((match) => match(ref));
+                            return this.sharedState.otherFileMatches.some(match => match(ref));
                         });
                     }
                 }

package/dist/load-utils/index.js

@@ -1,7 +1,7 @@
 import toRuntime, {} from '../runtime.js';
 export function defaultCollection(store) {
     return {
-        get: (loadID) => store[loadID],
+        get: loadID => store[loadID],
         set: (loadID, rt) => {
             store[loadID] = rt;
         },
@@ -17,13 +17,13 @@ const emptyRuntime = toRuntime();
 export function registerLoaders(key, load, loadIDs, collection) {
     states[key] = {
         load,
-        catalogs: Object.fromEntries(loadIDs.map((id) => [id])),
+        catalogs: Object.fromEntries(loadIDs.map(id => [id])),
         collection: collection ?? defaultCollection({}),
     };
     for (const id of loadIDs) {
         states[key].collection.set(id, emptyRuntime);
     }
-    return (loadID) => states[key].collection.get(loadID);
+    return loadID => states[key].collection.get(loadID);
 }
 /* Sets the most recently loaded locale as the current one */
 export function commitLocale(locale) {

package/dist/load-utils/pure.js

@@ -1,7 +1,7 @@
 /** No-side effect way to load catalogs. Can be used for multiple file IDs. */
 export async function loadCatalogs(locale, loadIDs, loadCatalog) {
     const data = {};
-    const promises = loadIDs.map((id) => loadCatalog(id, locale));
+    const promises = loadIDs.map(id => loadCatalog(id, locale));
     // merge into one object
     for (const [i, loaded] of (await Promise.all(promises)).entries()) {
         data[loadIDs[i]] = loaded;

package/dist/runtime.js

@@ -49,7 +49,7 @@ export default function toRuntime(mod = { [catalogVarName]: [] }, locale) {
     /** for tagged template strings */
     rt.t = (tag, id, args) => {
         const ctx = getCompositeContext(id);
-        return tag(ctx.filter((m) => typeof m === 'string'), ...ctx.filter((m) => typeof m === 'number').map((a) => args?.[a]));
+        return tag(ctx.filter(m => typeof m === 'string'), ...ctx.filter(m => typeof m === 'number').map(a => args?.[a]));
     };
     /** get translation for plural */
     rt.p = (id) => catalog[id] ?? [];

package/package.json

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

package/src/adapter-vanilla/loaders/bundle.js

@@ -13,5 +13,5 @@ export function setLocale(newLocale) {
 /**
  * @param {{ [locale: string]: import("wuchale/runtime").CatalogModule }} catalogs
  */
-export const getRuntime = (catalogs) => toRuntime(catalogs[locale], locale)
+export const getRuntime = catalogs => toRuntime(catalogs[locale], locale)
 export const getRuntimeRx = getRuntime