@wuchale/jsx 0.6.1 → 0.6.3

package/dist/index.js

@@ -1,7 +1,7 @@
 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';
+import { getDependencies, loaderPathResolver } from 'wuchale/adapter-utils';
 const ignoreElements = ['style', 'path'];
 const jsxHeuristic = (msgStr, details) => {
     if (!defaultHeuristic(msgStr, details)) {
@@ -65,14 +65,15 @@ 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) {
         runtime = defaultRuntimeSolid;
     }
     return {
-        transform: ({ content, filename, index, header }) => {
-            return new JSXTransformer(content, filename, index, heuristic, pluralsFunc, header.expr, runtime).transformJx(header.head, variant);
+        transform: ({ content, filename, index, expr }) => {
+            return new JSXTransformer(content, filename, index, heuristic, pluralsFunc, expr, runtime).transformJx(variant);
         },
         loaderExts: ['.js', '.ts'],
         defaultLoaders: async () => {
@@ -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/runtime.d.ts

@@ -1,10 +1,10 @@
 import type { Composite, Mixed } from 'wuchale';
 export type WuchaleComponentProps = {
-    nest?: boolean;
-    ctx: Composite;
-    tags: Function;
-    args: any[];
+    n?: boolean;
+    x: Composite;
+    t: Function;
+    a: any[];
 };
-export declare function selectFragment({ nest, ctx, tags, args }: WuchaleComponentProps, i: number): string | Mixed | Composite;
+export declare function selectFragment({ n, x, t, a }: WuchaleComponentProps, i: number): string | Mixed | Composite;
 declare const _default: (props: WuchaleComponentProps) => (string | Composite | Mixed)[];
 export default _default;

package/dist/runtime.jsx

@@ -1,22 +1,22 @@
-export function selectFragment({ nest, ctx, tags, args }, i) {
-    if (typeof ctx === 'string') {
-        return ctx;
+export function selectFragment({ n, x, t, a }, i) {
+    if (typeof x === 'string') {
+        return x;
     }
-    if (typeof ctx === 'number') {
-        if (!nest || i > 0) {
-            return args[ctx];
+    if (typeof x === 'number') {
+        if (!n || i > 0) {
+            return a[x];
         }
     }
     else {
-        const tag = tags[ctx[0]];
+        const tag = t[x[0]];
         if (tag == null) {
             return 'i18n-404:tag';
         }
         else {
-            return tag(ctx);
+            return tag(x);
         }
     }
 }
 export default (props) => {
-    return props.ctx.map((fragment, i) => selectFragment({ ...props, ctx: fragment }, i));
+    return props.x.map((fragment, i) => selectFragment({ ...props, x: fragment }, i));
 };

package/dist/runtime.solid.jsx

@@ -1,7 +1,7 @@
 import { selectFragment } from './runtime.jsx';
 import { For } from 'solid-js';
 export default (props) => {
-    return <For each={props.ctx}>
-        {(fragment, i) => <>{selectFragment({ ...props, ctx: fragment }, i())}</>}
+    return <For each={props.x}>
+        {(fragment, i) => <>{selectFragment({ ...props, x: fragment }, i())}</>}
     </For>;
 };

package/dist/transformer.d.ts

@@ -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>;
@@ -30,6 +30,6 @@ export declare class JSXTransformer extends Transformer {
     visitJSXSpreadAttribute: (node: JX.JSXSpreadAttribute) => Message[];
     visitJSXEmptyExpression: (node: JX.JSXEmptyExpression) => Message[];
     visitJx: (node: JX.Node | JX.JSXSpreadChild | Estree.Program) => Message[];
-    transformJx: (headerHead: string, lib: JSXLib) => TransformOutput;
+    transformJx: (lib: JSXLib) => TransformOutput;
 }
 export {};

package/dist/transformer.js

@@ -11,14 +11,14 @@ export function parseScript(content) {
     return [JsxParser.parse(content, opts), comments];
 }
 const nodesWithChildren = ['JSXElement'];
-const rtComponent = 'WuchaleTrans';
+const rtComponent = 'W_tx_';
 export class JSXTransformer extends Transformer {
     // state
     currentElement;
     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);
@@ -52,19 +52,23 @@ export class JSXTransformer extends Transformer {
         checkHeuristic: this.checkHeuristicBool,
         index: this.index,
         wrapNested: (msgInfo, hasExprs, nestedRanges, lastChildEnd) => {
-            for (const [i, [childStart, _, haveCtx]] of nestedRanges.entries()) {
-                let toAppend;
-                if (i === 0) {
-                    toAppend = `<${rtComponent} tags={[`;
+            let begin = `<${rtComponent}`;
+            if (nestedRanges.length > 0) {
+                for (const [i, [childStart, _, haveCtx]] of nestedRanges.entries()) {
+                    let toAppend;
+                    if (i === 0) {
+                        toAppend = `${begin} t={[`;
+                    }
+                    else {
+                        toAppend = ', ';
+                    }
+                    this.mstr.appendRight(childStart, `${toAppend}${haveCtx ? this.vars().nestCtx : '()'} => `);
                 }
-                else {
-                    toAppend = ', ';
-                }
-                this.mstr.appendRight(childStart, `${toAppend}${haveCtx ? this.vars().nestCtx : '()'} => `);
+                begin = `]}`;
             }
-            let begin = `]} ctx=`;
+            begin += ' x=';
             if (this.inCompoundText) {
-                begin += `{${this.vars().nestCtx}} nest`;
+                begin += `{${this.vars().nestCtx}} n`;
             }
             else {
                 const index = this.index.get(msgInfo.toKey());
@@ -72,7 +76,7 @@ export class JSXTransformer extends Transformer {
             }
             let end = ' />';
             if (hasExprs) {
-                begin += ' args={[';
+                begin += ' a={[';
                 end = ']}' + end;
             }
             this.mstr.appendLeft(lastChildEnd, begin);
@@ -106,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;
@@ -207,22 +212,17 @@ export class JSXTransformer extends Transformer {
         this.commentDirectives = commentDirectivesPrev;
         return msgs;
     };
-    transformJx = (headerHead, lib) => {
+    transformJx = (lib) => {
         const [ast, comments] = parseScript(this.content);
         this.comments = comments;
         this.mstr = new MagicString(this.content);
         this.mixedVisitor = this.initMixedVisitor();
         const msgs = this.visitJx(ast);
-        if (!msgs.length) {
-            return this.finalize(msgs, 0);
-        }
-        const headerFin = [
+        const header = [
             `import ${rtComponent} from "@wuchale/jsx/runtime${lib === 'solidjs' ? '.solid' : ''}.jsx"`,
-            headerHead,
             this.initRuntime(this.filename, null, null, {}),
         ].join('\n');
         const bodyStart = this.getRealBodyStart(ast.body);
-        this.mstr.appendRight(bodyStart, headerFin + '\n');
-        return this.finalize(msgs, bodyStart);
+        return this.finalize(msgs, bodyStart, header);
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/jsx",
-    "version": "0.6.1",
+    "version": "0.6.3",
     "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.1"
+        "wuchale": "^0.15.8"
     },
     "devDependencies": {
         "@types/estree-jsx": "^1.0.5",