@wuchale/jsx 0.9.6 → 0.10.0

package/dist/index.d.ts

@@ -4,11 +4,11 @@ export declare function createJsxHeuristic(opts: CreateHeuristicOpts): Heuristic
 export declare const jsxDefaultHeuristic: HeuristicFunc;
 type LoadersAvailable = 'default' | 'react' | 'solidjs';
 export type JSXArgs = AdapterArgs<LoadersAvailable> & {
-    variant?: JSXLib;
+    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/index.js

@@ -20,14 +20,14 @@ export function createJsxHeuristic(opts) {
 }
 export const jsxDefaultHeuristic = createJsxHeuristic(defaultHeuristicOpts);
 const defaultRuntime = {
-    useReactive: ({ funcName, nested }) => {
+    initReactive: ({ funcName, nested }) => {
         const inTopLevel = funcName == null;
         const insideReactive = !inTopLevel && !nested && ((funcName.startsWith('use') && funcName.length > 3) || /[A-Z]/.test(funcName[0]));
-        return {
-            init: inTopLevel ? null : insideReactive,
-            use: insideReactive
-        };
+        return inTopLevel ? null : insideReactive;
     },
+    useReactive: ({ funcName, nested }) => funcName != null
+        && !nested
+        && ((funcName.startsWith('use') && funcName.length > 3) || /[A-Z]/.test(funcName[0])),
     reactive: {
         wrapInit: expr => expr,
         wrapUse: expr => expr,
@@ -39,13 +39,8 @@ const defaultRuntime = {
 };
 const defaultRuntimeSolid = {
     ...defaultRuntime,
-    useReactive: ({ funcName }) => {
-        const inTopLevel = funcName == null;
-        return {
-            init: inTopLevel ? true : null, // init only in top level
-            use: true, // always use reactive
-        };
-    },
+    initReactive: ({ funcName }) => funcName == null ? true : null, // init only in top level
+    useReactive: true, // always reactive, because solidjs doesn't have a problem with it
     reactive: {
         wrapInit: expr => `() => ${expr}`,
         wrapUse: expr => `${expr}()`

package/dist/runtime.d.ts

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

package/dist/runtime.jsx

@@ -6,15 +6,14 @@ export function selectFragment({ n, x, t, a }, i) {
         if (!n || i > 0) {
             return a[x];
         }
+        return;
+    }
+    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

@@ -81,13 +81,19 @@ export class JSXTransformer extends Transformer {
             this.mstr.appendRight(lastChildEnd, end);
         },
     });
-    visitChildrenJ = (node) => this.mixedVisitor.visit({
-        children: node.children,
-        commentDirectives: this.commentDirectives,
-        inCompoundText: this.inCompoundText,
-        scope: 'markup',
-        element: this.currentElement,
-    });
+    visitChildrenJ = (node) => {
+        const prevInsideProg = this.heuristciDetails.insideProgram;
+        this.heuristciDetails.insideProgram = false;
+        const msg = this.mixedVisitor.visit({
+            children: node.children,
+            commentDirectives: this.commentDirectives,
+            inCompoundText: this.inCompoundText,
+            scope: 'markup',
+            element: this.currentElement,
+        });
+        this.heuristciDetails.insideProgram = prevInsideProg; // restore
+        return msg;
+    };
     visitNameJSXNamespacedName = (node) => {
         return `${this.visitName(node.namespace)}:${this.visitName(node.name)}`;
     };
@@ -218,7 +224,7 @@ export class JSXTransformer extends Transformer {
     };
     transformJx = (lib) => {
         // jsx vs type casting is not ambiguous in all files except .ts files
-        const [ast, comments] = (this.filename.endsWith('.ts') ? parseScript : parseScriptJSX)(this.content);
+        const [ast, comments] = (this.heuristciDetails.file.endsWith('.ts') ? parseScript : parseScriptJSX)(this.content);
         this.comments = comments;
         this.mstr = new MagicString(this.content);
         this.mixedVisitor = this.initMixedVisitor();
@@ -228,7 +234,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(),
         ].join('\n');
         const bodyStart = this.getRealBodyStart(ast.body);
         return this.finalize(msgs, bodyStart, header);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/jsx",
-    "version": "0.9.6",
+    "version": "0.10.0",
     "description": "Protobuf-like i18n from plain code: JSX adapter",
     "scripts": {
         "dev": "tsc --watch",
@@ -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.7",
+        "@sveltejs/acorn-typescript": "^1.0.8",
         "acorn": "^8.15.0",
-        "wuchale": "^0.18.6"
+        "magic-string": "^0.30.21",
+        "wuchale": "^0.19.0"
     },
     "devDependencies": {
         "@types/estree-jsx": "^1.0.5",

package/src/loaders/react.js

@@ -21,9 +21,10 @@ const collection = {
 registerLoaders(key, loadCatalog, loadIDs, collection)
 
 export const getRuntimeRx = (/** @type {string} */ loadID) => {
-    const [runtime, setRuntime] = useState(getRuntime(loadID))
+    // function to useState because runtime is a function too
+    const [runtime, setRuntime] = useState(() => getRuntime(loadID))
     useEffect(() => {
-        const cb = (/** @type {import('wuchale/runtime').Runtime} */ runtime) => setRuntime(runtime)
+        const cb = (/** @type {import('wuchale/runtime').Runtime} */ runtime) => setRuntime(() => runtime)
         callbacks[loadID] ??= new Set()
         callbacks[loadID].add(cb)
         return () => callbacks[loadID].delete(cb)

package/src/loaders/solidjs.js

@@ -9,6 +9,6 @@ const [store, setStore] = createStore({})
 // two exports. can be the same because solid-js can use them anywhere unlike react
 export const getRuntimeRx = registerLoaders(key, loadCatalog, loadIDs, {
     get: loadID => store[loadID],
-    set: setStore,
+    set: (loadID, runtime) => setStore(loadID, () => runtime),
 })
 export const getRuntime = getRuntimeRx