@wuchale/jsx 0.7.3 → 0.8.0

package/dist/index.js

@@ -1,15 +1,15 @@
 import { defaultGenerateLoadID, defaultHeuristic, deepMergeObjects } from 'wuchale';
-import { adapter as vanillaAdapter } from 'wuchale/adapter-vanilla';
+import { pluralPattern, adapter as vanillaAdapter } from 'wuchale/adapter-vanilla';
 import { JSXTransformer } from "./transformer.js";
 import { getDependencies, loaderPathResolver } from 'wuchale/adapter-utils';
-const jsxHeuristic = (msgStr, details) => {
-    if (!defaultHeuristic(msgStr, details)) {
+const jsxHeuristic = msg => {
+    if (!defaultHeuristic(msg)) {
         return false;
     }
-    if (details.scope !== 'script') {
+    if (msg.details.scope !== 'script') {
         return true;
     }
-    if (details.declaring === 'variable') {
+    if (msg.details.declaring === 'variable') {
         return false;
     }
     return true;
@@ -52,7 +52,7 @@ const defaultRuntimeSolid = {
 const defaultArgs = {
     files: { include: 'src/**/*.{js,ts,jsx,tsx}', ignore: '**/*.d.ts' },
     catalog: './src/locales/{locale}',
-    pluralsFunc: 'plural',
+    patterns: [pluralPattern],
     heuristic: jsxHeuristic,
     granularLoad: false,
     bundleLoad: false,
@@ -63,13 +63,13 @@ const defaultArgs = {
 };
 const resolveLoaderPath = loaderPathResolver(import.meta.url, '../src/loaders', 'js');
 export const adapter = (args = defaultArgs) => {
-    let { heuristic, pluralsFunc, variant, runtime, ...rest } = deepMergeObjects(args, defaultArgs);
+    let { heuristic, patterns, variant, runtime, ...rest } = deepMergeObjects(args, defaultArgs);
     if (variant === 'solidjs' && args.runtime == null) {
         runtime = defaultRuntimeSolid;
     }
     return {
         transform: ({ content, filename, index, expr }) => {
-            return new JSXTransformer(content, filename, index, heuristic, pluralsFunc, expr, runtime).transformJx(variant);
+            return new JSXTransformer(content, filename, index, heuristic, patterns, expr, runtime).transformJx(variant);
         },
         loaderExts: ['.js', '.ts'],
         defaultLoaders: async () => {

package/dist/transformer.d.ts

@@ -2,9 +2,9 @@ import { Message } from 'wuchale';
 import type * as JX from 'estree-jsx';
 import type * as Estree from 'acorn';
 import { Transformer } from 'wuchale/adapter-vanilla';
-import type { IndexTracker, HeuristicFunc, TransformOutput, RuntimeConf, CatalogExpr } from 'wuchale';
+import type { IndexTracker, HeuristicFunc, TransformOutput, RuntimeConf, CatalogExpr, CodePattern } 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 {
@@ -14,7 +14,7 @@ export declare class JSXTransformer extends Transformer {
     lastVisitIsComment: boolean;
     currentJsxKey?: number;
     mixedVisitor: MixedVisitor<MixedNodesTypes>;
-    constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, pluralsFunc: string, catalogExpr: CatalogExpr, rtConf: RuntimeConf);
+    constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, patterns: CodePattern[], catalogExpr: CatalogExpr, rtConf: RuntimeConf);
     initMixedVisitor: () => MixedVisitor<MixedNodesTypes>;
     visitChildrenJ: (node: JX.JSXElement | JX.JSXFragment) => Message[];
     visitNameJSXNamespacedName: (node: JX.JSXNamespacedName) => string;

package/dist/transformer.js

@@ -2,10 +2,10 @@ import MagicString from 'magic-string';
 import { Parser } from 'acorn';
 import { Message } from 'wuchale';
 import { tsPlugin } from '@sveltejs/acorn-typescript';
-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: true }));
-export function parseScript(content) {
+export function parseScriptJSX(content) {
     const [opts, comments] = scriptParseOptionsWithComments();
     return [JsxParser.parse(content, opts), comments];
 }
@@ -19,8 +19,8 @@ export class JSXTransformer extends Transformer {
     lastVisitIsComment = false;
     currentJsxKey;
     mixedVisitor;
-    constructor(content, filename, index, heuristic, pluralsFunc, catalogExpr, rtConf) {
-        super(content, filename, index, heuristic, pluralsFunc, catalogExpr, rtConf);
+    constructor(content, filename, index, heuristic, patterns, catalogExpr, rtConf) {
+        super(content, filename, index, heuristic, patterns, catalogExpr, rtConf);
     }
     initMixedVisitor = () => new MixedVisitor({
         mstr: this.mstr,
@@ -48,6 +48,7 @@ export class JSXTransformer extends Transformer {
             return childTxts;
         },
         visitExpressionTag: this.visitJSXExpressionContainer,
+        fullHeuristicDetails: this.fullHeuristicDetails,
         checkHeuristic: this.checkHeuristicBool,
         index: this.index,
         wrapNested: (msgInfo, hasExprs, nestedRanges, lastChildEnd) => {
@@ -218,7 +219,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.3",
+    "version": "0.8.0",
     "description": "Protobuf-like i18n from plain code: JSX adapter",
     "scripts": {
         "dev": "tsc --watch",
@@ -69,9 +69,9 @@
         }
     },
     "dependencies": {
-        "@sveltejs/acorn-typescript": "^1.0.5",
+        "@sveltejs/acorn-typescript": "^1.0.6",
         "acorn": "^8.15.0",
-        "wuchale": "^0.16.5"
+        "wuchale": "^0.17.0"
     },
     "devDependencies": {
         "@types/estree-jsx": "^1.0.5",