@wuchale/jsx 0.10.2 → 0.11.0

package/dist/index.js

@@ -1,4 +1,4 @@
-import { createHeuristic, deepMergeObjects, defaultGenerateLoadID, defaultHeuristicOpts } from 'wuchale';
+import { createHeuristic, deepMergeObjects, defaultGenerateLoadID, defaultHeuristicOpts, pofile } from 'wuchale';
 import { loaderPathResolver } from 'wuchale/adapter-utils';
 import { getDefaultLoaderPath as getDefaultLoaderPathVanilla, pluralPattern } from 'wuchale/adapter-vanilla';
 import { JSXTransformer } from './transformer.js';
@@ -48,7 +48,7 @@ const defaultRuntimeSolid = {
 };
 export const defaultArgs = {
     files: { include: 'src/**/*.{js,ts,jsx,tsx}', ignore: '**/*.d.ts' },
-    localesDir: './src/locales',
+    storage: pofile(),
     patterns: [pluralPattern],
     heuristic: jsxDefaultHeuristic,
     granularLoad: false,

package/dist/transformer.js

@@ -1,6 +1,7 @@
 import { tsPlugin } from '@sveltejs/acorn-typescript';
 import { Parser } from 'acorn';
 import MagicString from 'magic-string';
+import { getKey } from 'wuchale';
 import { MixedVisitor, nonWhitespaceText } from 'wuchale/adapter-utils';
 import { parseScript, scriptParseOptionsWithComments, Transformer } from 'wuchale/adapter-vanilla';
 const JsxParser = Parser.extend(tsPlugin({ jsx: true }));
@@ -67,7 +68,7 @@ export class JSXTransformer extends Transformer {
                 begin += `{${this.vars().nestCtx}} n`;
             }
             else {
-                const index = this.index.get(msgInfo.toKey());
+                const index = this.index.get(getKey(msgInfo.msgStr, msgInfo.context));
                 begin += `{${this.vars().rtCtx}(${index})}`;
             }
             let end = ' />';
@@ -128,7 +129,7 @@ export class JSXTransformer extends Transformer {
         if (!pass) {
             return [];
         }
-        this.mstr.update(node.start + startWh, node.end - endWh, `{${this.vars().rtTrans}(${this.index.get(msgInfo.toKey())})}`);
+        this.mstr.update(node.start + startWh, node.end - endWh, `{${this.vars().rtTrans}(${this.index.get(getKey(msgInfo.msgStr, msgInfo.context))})}`);
         return [msgInfo];
     };
     visitJSXFragment = (node) => this.visitChildrenJ(node);
@@ -177,7 +178,7 @@ export class JSXTransformer extends Transformer {
         if (!pass) {
             return [];
         }
-        this.mstr.update(value.start, value.end, `{${this.vars().rtTrans}(${this.index.get(msgInfo.toKey())})}`);
+        this.mstr.update(value.start, value.end, `{${this.literalRepl(msgInfo)}}`);
         return [msgInfo];
     };
     visitJSXSpreadAttribute = (node) => this.visit(node.argument);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/jsx",
-    "version": "0.10.2",
+    "version": "0.11.0",
     "description": "Protobuf-like i18n from plain code: JSX adapter",
     "scripts": {
         "dev": "tsc --watch",
@@ -59,9 +59,9 @@
     "license": "MIT",
     "dependencies": {
         "@sveltejs/acorn-typescript": "^1.0.9",
-        "acorn": "^8.15.0",
+        "acorn": "^8.16.0",
         "magic-string": "^0.30.21",
-        "wuchale": "^0.20.0"
+        "wuchale": "^0.21.0"
     },
     "devDependencies": {
         "@types/estree-jsx": "^1.0.5",

package/src/loaders/react.bundle.js

@@ -5,13 +5,13 @@ import { locales } from '${DATA}'
 let locale = locales[0]
 
 const callbacks = new Set([
-    (/** @type {string} */ loc) => {
+    (/** @type {import('${DATA}').Locale} */ loc) => {
         locale = loc
     },
 ])
 
 /**
- * @param {string} locale
+ * @param {import('${DATA}').Locale} locale
  */
 export function setLocale(locale) {
     for (const callback of callbacks) {