@wuchale/jsx 0.6.2 → 0.7.0

package/dist/index.js

@@ -1,8 +1,8 @@
 import { defaultGenerateLoadID, defaultHeuristic, deepMergeObjects } from 'wuchale';
 import { adapter as vanillaAdapter } from 'wuchale/adapter-vanilla';
 import { JSXTransformer } from "./transformer.js";
-import { getDependencies } from 'wuchale/adapter-utils';
-const ignoreElements = ['style', 'path'];
+import { getDependencies, loaderPathResolver } from 'wuchale/adapter-utils';
+const ignoreElements = ['style', 'path', 'code', 'pre'];
 const jsxHeuristic = (msgStr, details) => {
     if (!defaultHeuristic(msgStr, details)) {
         return false;
@@ -65,6 +65,7 @@ const defaultArgs = {
     runtime: defaultRuntime,
     variant: 'default',
 };
+const resolveLoaderPath = loaderPathResolver(import.meta.url, '../src/loaders', 'js');
 export const adapter = (args = defaultArgs) => {
     let { heuristic, pluralsFunc, variant, runtime, ...rest } = deepMergeObjects(args, defaultArgs);
     if (variant === 'solidjs' && args.runtime == null) {
@@ -93,7 +94,7 @@ export const adapter = (args = defaultArgs) => {
             if (rest.bundleLoad) {
                 loader += '.bundle';
             }
-            return new URL(`../src/loaders/${loader}.js`, import.meta.url).pathname;
+            return resolveLoaderPath(loader);
         },
         runtime,
         ...rest,

package/dist/transformer.d.ts

@@ -2,8 +2,8 @@ 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, CommentDirectives, RuntimeConf, CatalogExpr } from 'wuchale';
-import { MixedVisitor } from "wuchale/adapter-utils";
+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[][]];
 type MixedNodesTypes = JX.JSXElement | JX.JSXFragment | JX.JSXText | JX.JSXExpressionContainer | JX.JSXSpreadChild;
 export type JSXLib = 'default' | 'solidjs';
@@ -12,7 +12,7 @@ export declare class JSXTransformer extends Transformer {
     inCompoundText: boolean;
     commentDirectivesStack: CommentDirectives[];
     lastVisitIsComment: boolean;
-    currentElementI: 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

@@ -4,7 +4,7 @@ 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 } from "wuchale/adapter-utils";
+import { nonWhitespaceText, MixedVisitor, processCommentDirectives } from "wuchale/adapter-utils";
 const JsxParser = Parser.extend(tsPlugin(), jsx());
 export function parseScript(content) {
     const [opts, comments] = scriptParseOptionsWithComments();
@@ -18,7 +18,7 @@ export class JSXTransformer extends Transformer {
     inCompoundText = false;
     commentDirectivesStack = [];
     lastVisitIsComment = false;
-    currentElementI = 0;
+    currentJsxKey = 0;
     mixedVisitor;
     constructor(content, filename, index, heuristic, pluralsFunc, catalogExpr, rtConf) {
         super(content, filename, index, heuristic, pluralsFunc, catalogExpr, rtConf);
@@ -110,7 +110,8 @@ export class JSXTransformer extends Transformer {
         if (this.inCompoundText) {
             this.mstr.appendLeft(
             // @ts-expect-error
-            node.openingElement.name.end, ` key="_${this.currentElementI}"`);
+            node.openingElement.name.end, ` key="_${this.currentJsxKey}"`);
+            this.currentJsxKey++;
         }
         this.currentElement = currentElement;
         return msgs;
@@ -182,12 +183,12 @@ export class JSXTransformer extends Transformer {
         if (!commentContents) {
             return [];
         }
-        const directives = this.processCommentDirectives(commentContents);
+        this.commentDirectives = processCommentDirectives(commentContents, this.commentDirectives);
         if (this.lastVisitIsComment) {
-            this.commentDirectivesStack[this.commentDirectivesStack.length - 1] = directives;
+            this.commentDirectivesStack[this.commentDirectivesStack.length - 1] = this.commentDirectives;
         }
         else {
-            this.commentDirectivesStack.push(directives);
+            this.commentDirectivesStack.push(this.commentDirectives);
         }
         this.lastVisitIsComment = true;
         return [];
@@ -205,6 +206,9 @@ export class JSXTransformer extends Transformer {
             this.commentDirectives = this.commentDirectivesStack.pop();
             this.lastVisitIsComment = false;
         }
+        if (this.commentDirectives.ignoreFile) {
+            return [];
+        }
         if (this.commentDirectives.forceInclude !== false) {
             msgs = this.visit(node);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/jsx",
-    "version": "0.6.2",
+    "version": "0.7.0",
     "description": "Protobuf-like i18n from plain code: JSX adapter",
     "scripts": {
         "dev": "tsc --watch",
@@ -72,7 +72,7 @@
         "@sveltejs/acorn-typescript": "^1.0.5",
         "acorn": "^8.15.0",
         "acorn-jsx": "^5.3.2",
-        "wuchale": "^0.15.4"
+        "wuchale": "^0.16.0"
     },
     "devDependencies": {
         "@types/estree-jsx": "^1.0.5",