@wuchale/jsx 0.7.1 → 0.7.3

package/dist/transformer.d.ts

@@ -12,7 +12,7 @@ export declare class JSXTransformer extends Transformer {
     inCompoundText: boolean;
     commentDirectivesStack: CommentDirectives[];
     lastVisitIsComment: boolean;
-    currentJsxKey: number;
+    currentJsxKey?: number;
     mixedVisitor: MixedVisitor<MixedNodesTypes>;
     constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, pluralsFunc: string, catalogExpr: CatalogExpr, rtConf: RuntimeConf);
     initMixedVisitor: () => MixedVisitor<MixedNodesTypes>;

package/dist/transformer.js

@@ -2,10 +2,9 @@ import MagicString from 'magic-string';
 import { Parser } from 'acorn';
 import { Message } from 'wuchale';
 import { tsPlugin } from '@sveltejs/acorn-typescript';
-import jsx from 'acorn-jsx';
 import { Transformer, scriptParseOptionsWithComments } from 'wuchale/adapter-vanilla';
 import { nonWhitespaceText, MixedVisitor, processCommentDirectives } from "wuchale/adapter-utils";
-const JsxParser = Parser.extend(tsPlugin(), jsx());
+const JsxParser = Parser.extend(tsPlugin({ jsx: true }));
 export function parseScript(content) {
     const [opts, comments] = scriptParseOptionsWithComments();
     return [JsxParser.parse(content, opts), comments];
@@ -18,7 +17,7 @@ export class JSXTransformer extends Transformer {
     inCompoundText = false;
     commentDirectivesStack = [];
     lastVisitIsComment = false;
-    currentJsxKey = 0;
+    currentJsxKey;
     mixedVisitor;
     constructor(content, filename, index, heuristic, pluralsFunc, catalogExpr, rtConf) {
         super(content, filename, index, heuristic, pluralsFunc, catalogExpr, rtConf);
@@ -107,11 +106,14 @@ export class JSXTransformer extends Transformer {
         for (const attr of node.openingElement.attributes) {
             msgs.push(...this.visitJx(attr));
         }
-        if (this.inCompoundText) {
-            this.mstr.appendLeft(
-            // @ts-expect-error
-            node.openingElement.name.end, ` key="_${this.currentJsxKey}"`);
-            this.currentJsxKey++;
+        if (this.inCompoundText && this.currentJsxKey != null) {
+            const key = node.openingElement.attributes.find(attr => attr.type === 'JSXAttribute' && attr.name.name === 'key');
+            if (!key) {
+                this.mstr.appendLeft(
+                // @ts-expect-error
+                node.openingElement.name.end, ` key="_${this.currentJsxKey}"`);
+                this.currentJsxKey++;
+            }
         }
         this.currentElement = currentElement;
         return msgs;
@@ -220,6 +222,9 @@ export class JSXTransformer extends Transformer {
         this.comments = comments;
         this.mstr = new MagicString(this.content);
         this.mixedVisitor = this.initMixedVisitor();
+        if (lib === 'default') {
+            this.currentJsxKey = 0;
+        }
         const msgs = this.visitJx(ast);
         const header = [
             `import ${rtComponent} from "@wuchale/jsx/runtime${lib === 'solidjs' ? '.solid' : ''}.jsx"`,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/jsx",
-    "version": "0.7.1",
+    "version": "0.7.3",
     "description": "Protobuf-like i18n from plain code: JSX adapter",
     "scripts": {
         "dev": "tsc --watch",
@@ -71,8 +71,7 @@
     "dependencies": {
         "@sveltejs/acorn-typescript": "^1.0.5",
         "acorn": "^8.15.0",
-        "acorn-jsx": "^5.3.2",
-        "wuchale": "^0.16.4"
+        "wuchale": "^0.16.5"
     },
     "devDependencies": {
         "@types/estree-jsx": "^1.0.5",