@wuchale/jsx 0.9.5 → 0.9.7

package/dist/index.d.ts

@@ -3,12 +3,12 @@ import { type JSXLib } from "./transformer.js";
 export declare function createJsxHeuristic(opts: CreateHeuristicOpts): HeuristicFunc;
 export declare const jsxDefaultHeuristic: HeuristicFunc;
 type LoadersAvailable = 'default' | 'react' | 'solidjs';
-type JSXArgs = AdapterArgs<LoadersAvailable> & {
-    variant?: JSXLib;
+export type JSXArgs = AdapterArgs<LoadersAvailable> & {
+    variant: JSXLib;
 };
 export declare function getDefaultLoaderPath(loader: LoaderChoice<LoadersAvailable>, bundle: boolean): string | {
     client: string;
     server: string;
-};
-export declare const adapter: (args?: JSXArgs) => Adapter;
+} | null;
+export declare const adapter: (args?: Partial<JSXArgs>) => Adapter;
 export {};

package/dist/runtime.jsx

@@ -6,15 +6,14 @@ export function selectFragment({ n, x, t, a }, i) {
         if (!n || i > 0) {
             return a[x];
         }
+        return `i18n-400:${x}`;
+    }
+    const tag = t[x[0]];
+    if (tag == null) {
+        return 'i18n-404:tag';
     }
     else {
-        const tag = t[x[0]];
-        if (tag == null) {
-            return 'i18n-404:tag';
-        }
-        else {
-            return tag(x);
-        }
+        return tag(x);
     }
 }
 export default (props) => {

package/dist/transformer.js

@@ -26,14 +26,11 @@ export class JSXTransformer extends Transformer {
         mstr: this.mstr,
         vars: this.vars,
         getRange: node => ({
-            // @ts-expect-error
             start: node.start,
-            // @ts-expect-error
             end: node.end
         }),
         isComment: node => node.type === 'JSXExpressionContainer'
             && node.expression.type === 'JSXEmptyExpression'
-            // @ts-expect-error
             && node.expression.end > node.expression.start,
         isText: node => node.type === 'JSXText',
         leaveInPlace: () => false,
@@ -111,9 +108,7 @@ export class JSXTransformer extends Transformer {
         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.mstr.appendLeft(node.openingElement.name.end, ` key="_${this.currentJsxKey}"`);
                 this.currentJsxKey++;
             }
         }
@@ -129,16 +124,11 @@ export class JSXTransformer extends Transformer {
         if (!pass) {
             return [];
         }
-        this.mstr.update(
-        // @ts-expect-error
-        node.start + startWh, 
-        // @ts-expect-error
-        node.end - endWh, `{${this.vars().rtTrans}(${this.index.get(msgInfo.toKey())})}`);
+        this.mstr.update(node.start + startWh, node.end - endWh, `{${this.vars().rtTrans}(${this.index.get(msgInfo.toKey())})}`);
         return [msgInfo];
     };
     visitJSXFragment = (node) => this.visitChildrenJ(node);
     getMarkupCommentBody = (node) => {
-        // @ts-expect-error
         const comment = this.content.slice(node.start, node.end).trim();
         if (!comment) {
             return '';
@@ -185,11 +175,7 @@ export class JSXTransformer extends Transformer {
         if (!pass) {
             return [];
         }
-        this.mstr.update(
-        // @ts-expect-error
-        value.start, 
-        // @ts-expect-error
-        value.end, `{${this.vars().rtTrans}(${this.index.get(msgInfo.toKey())})}`);
+        this.mstr.update(value.start, value.end, `{${this.vars().rtTrans}(${this.index.get(msgInfo.toKey())})}`);
         return [msgInfo];
     };
     visitJSXSpreadAttribute = (node) => this.visit(node.argument);
@@ -242,7 +228,7 @@ export class JSXTransformer extends Transformer {
         const msgs = this.visitJx(ast);
         const header = [
             `import ${rtComponent} from "@wuchale/jsx/runtime${lib === 'solidjs' ? '.solid' : ''}.jsx"`,
-            this.initRuntime(this.filename, null, null, {}),
+            this.initRuntime(this.filename),
         ].join('\n');
         const bodyStart = this.getRealBodyStart(ast.body);
         return this.finalize(msgs, bodyStart, header);

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@wuchale/jsx",
-    "version": "0.9.5",
+    "version": "0.9.7",
     "description": "Protobuf-like i18n from plain code: JSX adapter",
     "scripts": {
         "dev": "tsc --watch",
         "build": "tsc",
-        "test": "node tests"
+        "test": "node tests/index.ts"
     },
     "keywords": [
         "i18n",
@@ -14,7 +14,8 @@
         "gettext",
         "jsx",
         "react",
-        "nextjs",
+        "preact",
+        "solidjs",
         "vite",
         "po",
         "react-i18n",
@@ -56,22 +57,11 @@
     "bugs": "https://github.com/wuchalejs/wuchale/issues",
     "author": "K1DV5",
     "license": "MIT",
-    "peerDependencies": {
-        "react": "^19.1.1",
-        "solid-js": "^1.9.9"
-    },
-    "peerDependenciesMeta": {
-        "solid-js": {
-            "optional": true
-        },
-        "react": {
-            "optional": true
-        }
-    },
     "dependencies": {
-        "@sveltejs/acorn-typescript": "^1.0.6",
+        "@sveltejs/acorn-typescript": "^1.0.8",
         "acorn": "^8.15.0",
-        "wuchale": "^0.18.5"
+        "magic-string": "^0.30.21",
+        "wuchale": "^0.18.8"
     },
     "devDependencies": {
         "@types/estree-jsx": "^1.0.5",