@wuchale/jsx 0.7.2 → 0.7.4

package/dist/transformer.d.ts

@@ -4,7 +4,7 @@ import type * as Estree from 'acorn';
 import { Transformer } from 'wuchale/adapter-vanilla';
 import type { IndexTracker, HeuristicFunc, TransformOutput, RuntimeConf, CatalogExpr } from 'wuchale';
 import { MixedVisitor, type CommentDirectives } from "wuchale/adapter-utils";
-export declare function parseScript(content: string): [Estree.Program, Estree.Comment[][]];
+export declare function parseScriptJSX(content: string): [Estree.Program, Estree.Comment[][]];
 type MixedNodesTypes = JX.JSXElement | JX.JSXFragment | JX.JSXText | JX.JSXExpressionContainer | JX.JSXSpreadChild;
 export type JSXLib = 'default' | 'solidjs';
 export declare class JSXTransformer extends Transformer {

package/dist/transformer.js

@@ -2,11 +2,10 @@ 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 { Transformer, scriptParseOptionsWithComments, parseScript } from 'wuchale/adapter-vanilla';
 import { nonWhitespaceText, MixedVisitor, processCommentDirectives } from "wuchale/adapter-utils";
-const JsxParser = Parser.extend(tsPlugin(), jsx());
-export function parseScript(content) {
+const JsxParser = Parser.extend(tsPlugin({ jsx: true }));
+export function parseScriptJSX(content) {
     const [opts, comments] = scriptParseOptionsWithComments();
     return [JsxParser.parse(content, opts), comments];
 }
@@ -219,7 +218,8 @@ export class JSXTransformer extends Transformer {
         return msgs;
     };
     transformJx = (lib) => {
-        const [ast, comments] = parseScript(this.content);
+        // jsx vs type casting is not ambiguous in all files except .ts files
+        const [ast, comments] = (this.filename.endsWith('.ts') ? parseScript : parseScriptJSX)(this.content);
         this.comments = comments;
         this.mstr = new MagicString(this.content);
         this.mixedVisitor = this.initMixedVisitor();

package/package.json

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