@wuchale/jsx 0.4.0 → 0.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -14
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +20 -18
- package/dist/index.js.map +1 -1
- package/dist/runtime.d.ts +11 -0
- package/dist/runtime.jsx +23 -0
- package/dist/runtime.jsx.map +1 -0
- package/dist/runtime.solid.d.ts +4 -0
- package/dist/runtime.solid.jsx +8 -0
- package/dist/runtime.solid.jsx.map +1 -0
- package/dist/transformer.d.ts +14 -13
- package/dist/transformer.d.ts.map +1 -1
- package/dist/transformer.js +31 -31
- package/dist/transformer.js.map +1 -1
- package/package.json +3 -3
- package/src/loaders/react.bundle.js +25 -0
- package/src/loaders/react.js +10 -6
- package/src/loaders/solidjs.bundle.js +14 -0
package/README.md
CHANGED
|
@@ -4,17 +4,11 @@
|
|
|
4
4
|
|
|
5
5
|
An adapter to integrate `wuchale` in JSX projects.
|
|
6
6
|
|
|
7
|
-
**`wuchale`** is a
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
-
|
|
12
|
-
-
|
|
13
|
-
-
|
|
14
|
-
-
|
|
15
|
-
- **🎯 Smart extraction** - Uses AST analysis: handles nested markup, conditionals, loops, and complex interpolations
|
|
16
|
-
- **🌍 Standard .po files** - Compatible with existing translation tools and workflows
|
|
17
|
-
|
|
18
|
-
## 📚 Documentation
|
|
19
|
-
|
|
20
|
-
See the full guide at: [wuchale.dev/adapter/jsx](https://wuchale.dev/adapters/jsx).
|
|
7
|
+
**`wuchale`** is a compile-time internationalization (i18n) toolkit that
|
|
8
|
+
requires zero code changes. Write your components naturally, and `wuchale`
|
|
9
|
+
automatically extracts and replaces translatable strings at build time.
|
|
10
|
+
|
|
11
|
+
- Main documentation: [wuchale.dev](https://wuchale.dev)
|
|
12
|
+
- Setup instructions: [Getting started](https://wuchale.dev/intro/start/)
|
|
13
|
+
- Adapter docs: [JSX](https://wuchale.dev/adapters/jsx)
|
|
14
|
+
- Repository: [wuchalejs/wuchale](https://github.com/wuchalejs/wuchale)
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { Adapter, AdapterArgs } from 'wuchale';
|
|
2
|
+
import { type JSXLib } from "./transformer.js";
|
|
2
3
|
type JSXArgs = AdapterArgs & {
|
|
3
|
-
variant?:
|
|
4
|
+
variant?: JSXLib;
|
|
4
5
|
};
|
|
5
6
|
export declare const adapter: (args?: JSXArgs) => Adapter;
|
|
6
7
|
export {};
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAER,OAAO,EACP,WAAW,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAER,OAAO,EACP,WAAW,EAEd,MAAM,SAAS,CAAA;AAChB,OAAO,EAAkB,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAqB9D,KAAK,OAAO,GAAG,WAAW,GAAG;IACzB,OAAO,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAcD,eAAO,MAAM,OAAO,GAAI,OAAM,OAAqB,KAAG,OA0CrD,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { defaultGenerateLoadID, defaultHeuristic, deepMergeObjects } from 'wuchale';
|
|
2
|
-
import { adapter as vanillaAdapter } from 'wuchale/adapter-vanilla';
|
|
2
|
+
import { adapter as vanillaAdapter, initRuntimeStmt } from 'wuchale/adapter-vanilla';
|
|
3
3
|
import { JSXTransformer } from "./transformer.js";
|
|
4
|
+
import { getDependencies } from 'wuchale/adapter-utils';
|
|
4
5
|
const ignoreElements = ['style', 'path'];
|
|
5
|
-
const jsxHeuristic = (
|
|
6
|
-
if (!defaultHeuristic(
|
|
6
|
+
const jsxHeuristic = (msgStr, details) => {
|
|
7
|
+
if (!defaultHeuristic(msgStr, details)) {
|
|
7
8
|
return false;
|
|
8
9
|
}
|
|
9
10
|
if (ignoreElements.includes(details.element)) {
|
|
@@ -26,36 +27,37 @@ const defaultArgs = {
|
|
|
26
27
|
bundleLoad: false,
|
|
27
28
|
generateLoadID: defaultGenerateLoadID,
|
|
28
29
|
writeFiles: {},
|
|
29
|
-
importName: '_w_load_',
|
|
30
|
-
runtime: {
|
|
31
|
-
initInScope: ({ funcName }) => funcName != null,
|
|
32
|
-
wrapInit: init => init,
|
|
33
|
-
wrapExpr: expr => expr,
|
|
34
|
-
},
|
|
35
30
|
variant: 'default',
|
|
36
31
|
};
|
|
37
32
|
export const adapter = (args = defaultArgs) => {
|
|
38
|
-
const { heuristic, pluralsFunc,
|
|
33
|
+
const { heuristic, pluralsFunc, variant, ...rest } = deepMergeObjects(args, defaultArgs);
|
|
39
34
|
return {
|
|
40
|
-
transform: ({ content, filename, index, header }) =>
|
|
35
|
+
transform: ({ content, filename, index, header }) => {
|
|
36
|
+
return new JSXTransformer(content, filename, index, heuristic, pluralsFunc, initRuntimeStmt(header.expr)).transformJx(header.head, variant);
|
|
37
|
+
},
|
|
41
38
|
loaderExts: ['.js', '.ts'],
|
|
42
|
-
defaultLoaders:
|
|
39
|
+
defaultLoaders: async () => {
|
|
40
|
+
const deps = await getDependencies();
|
|
43
41
|
const loaders = ['default'];
|
|
44
|
-
if (
|
|
42
|
+
if (deps.has('react') || deps.has('preact')) {
|
|
45
43
|
loaders.unshift('react');
|
|
46
44
|
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
45
|
+
if (deps.has('solid-js')) {
|
|
46
|
+
loaders.unshift('solidjs');
|
|
47
|
+
}
|
|
50
48
|
return loaders;
|
|
51
49
|
},
|
|
52
50
|
defaultLoaderPath: (loader) => {
|
|
53
51
|
if (loader === 'default') {
|
|
54
|
-
return vanillaAdapter().defaultLoaderPath('vite');
|
|
52
|
+
return vanillaAdapter({ bundleLoad: rest.bundleLoad }).defaultLoaderPath('vite');
|
|
53
|
+
}
|
|
54
|
+
if (rest.bundleLoad) {
|
|
55
|
+
loader += '.bundle';
|
|
55
56
|
}
|
|
56
57
|
return new URL(`../src/loaders/${loader}.js`, import.meta.url).pathname;
|
|
57
58
|
},
|
|
58
|
-
...rest
|
|
59
|
+
...rest,
|
|
60
|
+
docsUrl: 'https://wuchale.dev/adapters/jsx'
|
|
59
61
|
};
|
|
60
62
|
};
|
|
61
63
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AACnF,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { Composite, Mixed } from 'wuchale';
|
|
2
|
+
export type WuchaleComponentProps = {
|
|
3
|
+
nest?: boolean;
|
|
4
|
+
ctx: Composite;
|
|
5
|
+
tags: Function;
|
|
6
|
+
args: any[];
|
|
7
|
+
};
|
|
8
|
+
export declare function selectFragment({ nest, ctx, tags, args }: WuchaleComponentProps, i: number): string | Mixed | Composite;
|
|
9
|
+
declare const _default: (props: WuchaleComponentProps) => (string | Composite | Mixed)[];
|
|
10
|
+
export default _default;
|
|
11
|
+
//# sourceMappingURL=runtime.d.ts.map
|
package/dist/runtime.jsx
ADDED
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
export function selectFragment({ nest, ctx, tags, args }, i) {
|
|
2
|
+
if (typeof ctx === 'string') {
|
|
3
|
+
return ctx;
|
|
4
|
+
}
|
|
5
|
+
if (typeof ctx === 'number') {
|
|
6
|
+
if (!nest || i > 0) {
|
|
7
|
+
return args[ctx];
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
else {
|
|
11
|
+
const tag = tags[ctx[0]];
|
|
12
|
+
if (tag == null) {
|
|
13
|
+
return 'i18n-404:tag';
|
|
14
|
+
}
|
|
15
|
+
else {
|
|
16
|
+
return tag(ctx);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
export default (props) => {
|
|
21
|
+
return props.ctx.map((fragment, i) => selectFragment({ ...props, ctx: fragment }, i));
|
|
22
|
+
};
|
|
23
|
+
//# sourceMappingURL=runtime.jsx.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtime.jsx","sourceRoot":"","sources":["../src/runtime.tsx"],"names":[],"mappings":"AASA,MAAM,UAAU,cAAc,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAwB,EAAE,CAAS;IACpF,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,GAAG,CAAA;IACd,CAAC;IAAC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;QACpB,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAW,CAAC,CAAA;QAClC,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;YACd,OAAO,cAAc,CAAA;QACzB,CAAC;aAAM,CAAC;YACJ,OAAO,GAAG,CAAC,GAAG,CAAC,CAAA;QACnB,CAAC;IACL,CAAC;AACL,CAAC;AAED,eAAe,CAAC,KAA4B,EAAE,EAAE;IAC5C,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,EAAC,GAAG,KAAK,EAAE,GAAG,EAAE,QAAqB,EAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AACpG,CAAC,CAAA"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { selectFragment } from './runtime.jsx';
|
|
2
|
+
import { For } from 'solid-js';
|
|
3
|
+
export default (props) => {
|
|
4
|
+
return <For each={props.ctx}>
|
|
5
|
+
{(fragment, i) => <>{selectFragment({ ...props, ctx: fragment }, i())}</>}
|
|
6
|
+
</For>;
|
|
7
|
+
};
|
|
8
|
+
//# sourceMappingURL=runtime.solid.jsx.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtime.solid.jsx","sourceRoot":"","sources":["../src/runtime.solid.tsx"],"names":[],"mappings":"AACA,OAAO,EAA8B,cAAc,EAAE,MAAM,eAAe,CAAA;AAC1E,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAE9B,eAAe,CAAC,KAA4B,EAAE,EAAE;IAC5C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CACxB;QAAA,CAAC,CAAC,QAAmB,EAAE,CAAe,EAAE,EAAE,CAAC,EAAE,CAAC,cAAc,CAAC,EAAC,GAAG,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,CACpG;IAAA,EAAE,GAAG,CAAC,CAAA;AACV,CAAC,CAAA"}
|
package/dist/transformer.d.ts
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { type Program } from "acorn";
|
|
2
|
-
import {
|
|
2
|
+
import { Message } from 'wuchale';
|
|
3
3
|
import type * as JX from 'estree-jsx';
|
|
4
4
|
import { Transformer } from 'wuchale/adapter-vanilla';
|
|
5
|
-
import type { IndexTracker, HeuristicFunc, TransformOutput, CommentDirectives
|
|
5
|
+
import type { IndexTracker, HeuristicFunc, TransformOutput, CommentDirectives } from 'wuchale';
|
|
6
6
|
import { MixedVisitor } from "wuchale/adapter-utils";
|
|
7
7
|
export declare function parseScript(content: string): [Program, JX.Comment[][]];
|
|
8
8
|
type MixedNodesTypes = JX.JSXElement | JX.JSXFragment | JX.JSXText | JX.JSXExpressionContainer | JX.JSXSpreadChild;
|
|
9
|
+
export type JSXLib = 'default' | 'solidjs';
|
|
9
10
|
export declare class JSXTransformer extends Transformer {
|
|
10
11
|
currentElement?: string;
|
|
11
12
|
inCompoundText: boolean;
|
|
@@ -13,23 +14,23 @@ export declare class JSXTransformer extends Transformer {
|
|
|
13
14
|
lastVisitIsComment: boolean;
|
|
14
15
|
currentElementI: number;
|
|
15
16
|
mixedVisitor: MixedVisitor<MixedNodesTypes>;
|
|
16
|
-
constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, pluralsFunc: string,
|
|
17
|
+
constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, pluralsFunc: string, initRuntime: string);
|
|
17
18
|
initMixedVisitor: () => MixedVisitor<MixedNodesTypes>;
|
|
18
|
-
visitChildrenJ: (node: JX.JSXElement | JX.JSXFragment) =>
|
|
19
|
+
visitChildrenJ: (node: JX.JSXElement | JX.JSXFragment) => Message[];
|
|
19
20
|
visitNameJSXNamespacedName: (node: JX.JSXNamespacedName) => string;
|
|
20
21
|
visitNameJSXMemberExpression: (node: JX.JSXMemberExpression) => string;
|
|
21
22
|
visitNameJSXIdentifier: (node: JX.JSXIdentifier) => string;
|
|
22
23
|
visitName: (node: JX.JSXIdentifier | JX.JSXMemberExpression | JX.JSXNamespacedName) => string;
|
|
23
|
-
visitJSXElement: (node: JX.JSXElement) =>
|
|
24
|
-
visitJSXText: (node: JX.JSXText) =>
|
|
25
|
-
visitJSXFragment: (node: JX.JSXFragment) =>
|
|
24
|
+
visitJSXElement: (node: JX.JSXElement) => Message[];
|
|
25
|
+
visitJSXText: (node: JX.JSXText) => Message[];
|
|
26
|
+
visitJSXFragment: (node: JX.JSXFragment) => Message[];
|
|
26
27
|
getMarkupCommentBody: (node: JX.JSXEmptyExpression) => string;
|
|
27
|
-
visitJSXExpressionContainer: (node: JX.JSXExpressionContainer) =>
|
|
28
|
-
visitJSXAttribute: (node: JX.JSXAttribute) =>
|
|
29
|
-
visitJSXSpreadAttribute: (node: JX.JSXSpreadAttribute) =>
|
|
30
|
-
visitJSXEmptyExpression: (node: JX.JSXEmptyExpression) =>
|
|
31
|
-
visitJx: (node: JX.Node | JX.JSXSpreadChild | Program) =>
|
|
32
|
-
transformJx: (
|
|
28
|
+
visitJSXExpressionContainer: (node: JX.JSXExpressionContainer) => Message[];
|
|
29
|
+
visitJSXAttribute: (node: JX.JSXAttribute) => Message[];
|
|
30
|
+
visitJSXSpreadAttribute: (node: JX.JSXSpreadAttribute) => Message[];
|
|
31
|
+
visitJSXEmptyExpression: (node: JX.JSXEmptyExpression) => Message[];
|
|
32
|
+
visitJx: (node: JX.Node | JX.JSXSpreadChild | Program) => Message[];
|
|
33
|
+
transformJx: (headerHead: string, lib: JSXLib) => TransformOutput;
|
|
33
34
|
}
|
|
34
35
|
export {};
|
|
35
36
|
//# sourceMappingURL=transformer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformer.d.ts","sourceRoot":"","sources":["../src/transformer.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,KAAK,OAAO,EAAE,MAAM,OAAO,CAAA;AAC5C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"transformer.d.ts","sourceRoot":"","sources":["../src/transformer.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,KAAK,OAAO,EAAE,MAAM,OAAO,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEjC,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,EAAE,WAAW,EAAkC,MAAM,yBAAyB,CAAA;AACrF,OAAO,KAAK,EACR,YAAY,EACZ,aAAa,EACb,eAAe,EACf,iBAAiB,EACpB,MAAM,SAAS,CAAA;AAChB,OAAO,EAAqB,YAAY,EAAe,MAAM,uBAAuB,CAAA;AAIpF,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAGtE;AAKD,KAAK,eAAe,GAAG,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,WAAW,GAAG,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC,sBAAsB,GAAG,EAAE,CAAC,cAAc,CAAA;AAElH,MAAM,MAAM,MAAM,GAAG,SAAS,GAAG,SAAS,CAAA;AAE1C,qBAAa,cAAe,SAAQ,WAAW;IAG3C,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,cAAc,EAAE,OAAO,CAAQ;IAC/B,sBAAsB,EAAE,iBAAiB,EAAE,CAAK;IAChD,kBAAkB,EAAE,OAAO,CAAQ;IACnC,eAAe,SAAI;IAEnB,YAAY,EAAE,YAAY,CAAC,eAAe,CAAC,CAAA;gBAE/B,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAItI,gBAAgB,sCAoDd;IAEF,cAAc,GAAI,MAAM,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,WAAW,KAAG,OAAO,EAAE,CAIhE;IAEF,0BAA0B,GAAI,MAAM,EAAE,CAAC,iBAAiB,KAAG,MAAM,CAEhE;IAED,4BAA4B,GAAI,MAAM,EAAE,CAAC,mBAAmB,KAAG,MAAM,CAEpE;IAED,sBAAsB,GAAI,MAAM,EAAE,CAAC,aAAa,KAAG,MAAM,CAAa;IAEtE,SAAS,GAAI,MAAM,EAAE,CAAC,aAAa,GAAG,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,iBAAiB,KAAG,MAAM,CAE3F;IAED,eAAe,GAAI,MAAM,EAAE,CAAC,UAAU,KAAG,OAAO,EAAE,CAgBjD;IAED,YAAY,GAAI,MAAM,EAAE,CAAC,OAAO,KAAG,OAAO,EAAE,CAiB3C;IAED,gBAAgB,GAAI,MAAM,EAAE,CAAC,WAAW,KAAG,OAAO,EAAE,CAA6B;IAEjF,oBAAoB,GAAI,MAAM,EAAE,CAAC,kBAAkB,KAAG,MAAM,CAO3D;IAED,2BAA2B,GAAI,MAAM,EAAE,CAAC,sBAAsB,KAAG,OAAO,EAAE,CAEzE;IAED,iBAAiB,GAAI,MAAM,EAAE,CAAC,YAAY,KAAG,OAAO,EAAE,CA8BrD;IAED,uBAAuB,GAAI,MAAM,EAAE,CAAC,kBAAkB,KAAG,OAAO,EAAE,CAA6B;IAE/F,uBAAuB,GAAI,MAAM,EAAE,CAAC,kBAAkB,KAAG,OAAO,EAAE,CAajE;IAED,OAAO,GAAI,MAAM,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,cAAc,GAAG,OAAO,KAAG,OAAO,EAAE,CAkBjE;IAED,WAAW,GAAI,YAAY,MAAM,EAAE,KAAK,MAAM,KAAG,eAAe,CAiB/D;CACJ"}
|
package/dist/transformer.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import MagicString from "magic-string";
|
|
2
2
|
import { Parser } from "acorn";
|
|
3
|
-
import {
|
|
3
|
+
import { Message } from 'wuchale';
|
|
4
4
|
import { tsPlugin } from '@sveltejs/acorn-typescript';
|
|
5
5
|
import jsx from 'acorn-jsx';
|
|
6
6
|
import { Transformer, scriptParseOptionsWithComments } from 'wuchale/adapter-vanilla';
|
|
7
|
-
import { nonWhitespaceText, MixedVisitor } from "wuchale/adapter-utils";
|
|
7
|
+
import { nonWhitespaceText, MixedVisitor, runtimeVars } from "wuchale/adapter-utils";
|
|
8
8
|
const JsxParser = Parser.extend(tsPlugin(), jsx());
|
|
9
9
|
export function parseScript(content) {
|
|
10
10
|
const [opts, comments] = scriptParseOptionsWithComments();
|
|
@@ -20,12 +20,11 @@ export class JSXTransformer extends Transformer {
|
|
|
20
20
|
lastVisitIsComment = false;
|
|
21
21
|
currentElementI = 0;
|
|
22
22
|
mixedVisitor;
|
|
23
|
-
constructor(content, filename, index, heuristic, pluralsFunc,
|
|
24
|
-
super(content, filename, index, heuristic, pluralsFunc,
|
|
23
|
+
constructor(content, filename, index, heuristic, pluralsFunc, initRuntime) {
|
|
24
|
+
super(content, filename, index, heuristic, pluralsFunc, initRuntime);
|
|
25
25
|
}
|
|
26
26
|
initMixedVisitor = () => new MixedVisitor({
|
|
27
27
|
mstr: this.mstr,
|
|
28
|
-
vars: this.vars,
|
|
29
28
|
getRange: node => ({
|
|
30
29
|
// @ts-expect-error
|
|
31
30
|
start: node.start,
|
|
@@ -49,9 +48,9 @@ export class JSXTransformer extends Transformer {
|
|
|
49
48
|
return childTxts;
|
|
50
49
|
},
|
|
51
50
|
visitExpressionTag: this.visitJSXExpressionContainer,
|
|
52
|
-
checkHeuristic:
|
|
51
|
+
checkHeuristic: msgStr => this.checkHeuristic(msgStr, { scope: 'markup', element: this.currentElement })[0],
|
|
53
52
|
index: this.index,
|
|
54
|
-
wrapNested: (
|
|
53
|
+
wrapNested: (msgInfo, hasExprs, nestedRanges, lastChildEnd) => {
|
|
55
54
|
for (const [i, [childStart, _, haveCtx]] of nestedRanges.entries()) {
|
|
56
55
|
let toAppend;
|
|
57
56
|
if (i === 0) {
|
|
@@ -60,15 +59,15 @@ export class JSXTransformer extends Transformer {
|
|
|
60
59
|
else {
|
|
61
60
|
toAppend = ', ';
|
|
62
61
|
}
|
|
63
|
-
this.mstr.appendRight(childStart, `${toAppend}${haveCtx ?
|
|
62
|
+
this.mstr.appendRight(childStart, `${toAppend}${haveCtx ? runtimeVars.nestCtx : '()'} => `);
|
|
64
63
|
}
|
|
65
64
|
let begin = `]} ctx=`;
|
|
66
65
|
if (this.inCompoundText) {
|
|
67
|
-
begin += `{${
|
|
66
|
+
begin += `{${runtimeVars.nestCtx}} nest`;
|
|
68
67
|
}
|
|
69
68
|
else {
|
|
70
|
-
const index = this.index.get(
|
|
71
|
-
begin += `{${
|
|
69
|
+
const index = this.index.get(msgInfo.toKey());
|
|
70
|
+
begin += `{${runtimeVars.rtCtx}(${index})}`;
|
|
72
71
|
}
|
|
73
72
|
let end = ' />';
|
|
74
73
|
if (hasExprs) {
|
|
@@ -97,9 +96,9 @@ export class JSXTransformer extends Transformer {
|
|
|
97
96
|
visitJSXElement = (node) => {
|
|
98
97
|
const currentElement = this.currentElement;
|
|
99
98
|
this.currentElement = this.visitName(node.openingElement.name);
|
|
100
|
-
const
|
|
99
|
+
const msgs = this.visitChildrenJ(node);
|
|
101
100
|
for (const attr of node.openingElement.attributes) {
|
|
102
|
-
|
|
101
|
+
msgs.push(...this.visitJx(attr));
|
|
103
102
|
}
|
|
104
103
|
if (this.inCompoundText) {
|
|
105
104
|
this.mstr.appendLeft(
|
|
@@ -107,11 +106,11 @@ export class JSXTransformer extends Transformer {
|
|
|
107
106
|
node.openingElement.name.end, ` key="_${this.currentElementI}"`);
|
|
108
107
|
}
|
|
109
108
|
this.currentElement = currentElement;
|
|
110
|
-
return
|
|
109
|
+
return msgs;
|
|
111
110
|
};
|
|
112
111
|
visitJSXText = (node) => {
|
|
113
112
|
const [startWh, trimmed, endWh] = nonWhitespaceText(node.value);
|
|
114
|
-
const [pass,
|
|
113
|
+
const [pass, msgInfo] = this.checkHeuristic(trimmed, {
|
|
115
114
|
scope: 'markup',
|
|
116
115
|
element: this.currentElement,
|
|
117
116
|
});
|
|
@@ -122,8 +121,8 @@ export class JSXTransformer extends Transformer {
|
|
|
122
121
|
// @ts-expect-error
|
|
123
122
|
node.start + startWh,
|
|
124
123
|
// @ts-expect-error
|
|
125
|
-
node.end - endWh, `{${
|
|
126
|
-
return [
|
|
124
|
+
node.end - endWh, `{${runtimeVars.rtTrans}(${this.index.get(msgInfo.toKey())})}`);
|
|
125
|
+
return [msgInfo];
|
|
127
126
|
};
|
|
128
127
|
visitJSXFragment = (node) => this.visitChildrenJ(node);
|
|
129
128
|
getMarkupCommentBody = (node) => {
|
|
@@ -152,7 +151,7 @@ export class JSXTransformer extends Transformer {
|
|
|
152
151
|
else {
|
|
153
152
|
name = node.name.name.name;
|
|
154
153
|
}
|
|
155
|
-
const [pass,
|
|
154
|
+
const [pass, msgInfo] = this.checkHeuristic(node.value.value, {
|
|
156
155
|
scope: 'attribute',
|
|
157
156
|
element: this.currentElement,
|
|
158
157
|
attribute: name,
|
|
@@ -164,8 +163,8 @@ export class JSXTransformer extends Transformer {
|
|
|
164
163
|
// @ts-expect-error
|
|
165
164
|
value.start,
|
|
166
165
|
// @ts-expect-error
|
|
167
|
-
value.end, `{${
|
|
168
|
-
return [
|
|
166
|
+
value.end, `{${runtimeVars.rtTrans}(${this.index.get(msgInfo.toKey())})}`);
|
|
167
|
+
return [msgInfo];
|
|
169
168
|
};
|
|
170
169
|
visitJSXSpreadAttribute = (node) => this.visit(node.argument);
|
|
171
170
|
visitJSXEmptyExpression = (node) => {
|
|
@@ -190,34 +189,35 @@ export class JSXTransformer extends Transformer {
|
|
|
190
189
|
if (node.type === 'JSXExpressionContainer' && node.expression.type === 'JSXEmptyExpression') { // markup comment
|
|
191
190
|
return this.visitJSXEmptyExpression(node.expression);
|
|
192
191
|
}
|
|
193
|
-
let
|
|
192
|
+
let msgs = [];
|
|
194
193
|
const commentDirectivesPrev = this.commentDirectives;
|
|
195
194
|
if (this.lastVisitIsComment) {
|
|
196
195
|
this.commentDirectives = this.commentDirectivesStack.pop();
|
|
197
196
|
this.lastVisitIsComment = false;
|
|
198
197
|
}
|
|
199
198
|
if (this.commentDirectives.forceInclude !== false) {
|
|
200
|
-
|
|
199
|
+
msgs = this.visit(node);
|
|
201
200
|
}
|
|
202
201
|
this.commentDirectives = commentDirectivesPrev;
|
|
203
|
-
return
|
|
202
|
+
return msgs;
|
|
204
203
|
};
|
|
205
|
-
transformJx = (
|
|
204
|
+
transformJx = (headerHead, lib) => {
|
|
206
205
|
const [ast, comments] = parseScript(this.content);
|
|
207
206
|
this.comments = comments;
|
|
208
207
|
this.mstr = new MagicString(this.content);
|
|
209
208
|
this.mixedVisitor = this.initMixedVisitor();
|
|
210
|
-
const
|
|
211
|
-
if (!
|
|
212
|
-
return this.finalize(
|
|
209
|
+
const msgs = this.visitJx(ast);
|
|
210
|
+
if (!msgs.length) {
|
|
211
|
+
return this.finalize(msgs, 0);
|
|
213
212
|
}
|
|
213
|
+
let devInit = '';
|
|
214
214
|
const headerFin = [
|
|
215
|
-
`import ${rtComponent} from "@wuchale/jsx/runtime${
|
|
216
|
-
|
|
217
|
-
|
|
215
|
+
`import ${rtComponent} from "@wuchale/jsx/runtime${lib === 'solidjs' ? '.solid' : ''}.jsx"`,
|
|
216
|
+
headerHead,
|
|
217
|
+
devInit,
|
|
218
218
|
].join('\n');
|
|
219
219
|
this.mstr.appendRight(0, headerFin + '\n');
|
|
220
|
-
return this.finalize(
|
|
220
|
+
return this.finalize(msgs, 0);
|
|
221
221
|
};
|
|
222
222
|
}
|
|
223
223
|
//# sourceMappingURL=transformer.js.map
|
package/dist/transformer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformer.js","sourceRoot":"","sources":["../src/transformer.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,MAAM,EAAgB,MAAM,OAAO,CAAA;AAC5C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"transformer.js","sourceRoot":"","sources":["../src/transformer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@wuchale/jsx",
|
|
3
|
-
"version": "0.
|
|
4
|
-
"description": "Protobuf-like i18n from
|
|
3
|
+
"version": "0.5.0",
|
|
4
|
+
"description": "Protobuf-like i18n from plain code: JSX adapter",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"dev": "tsc --watch",
|
|
7
7
|
"build": "tsc",
|
|
@@ -72,7 +72,7 @@
|
|
|
72
72
|
"@sveltejs/acorn-typescript": "^1.0.5",
|
|
73
73
|
"acorn": "^8.15.0",
|
|
74
74
|
"acorn-jsx": "^5.3.2",
|
|
75
|
-
"wuchale": "^0.
|
|
75
|
+
"wuchale": "^0.14.0"
|
|
76
76
|
},
|
|
77
77
|
"devDependencies": {
|
|
78
78
|
"@types/estree-jsx": "^1.0.5",
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
// This is just the default loader.
|
|
2
|
+
// You can customize it however you want, it will not be overwritten once it exists and is not empty.
|
|
3
|
+
|
|
4
|
+
/// <reference types="wuchale/virtual" />
|
|
5
|
+
|
|
6
|
+
import { useState, useEffect } from 'react'
|
|
7
|
+
|
|
8
|
+
const callbacks = new Set()
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* @param {string} locale
|
|
12
|
+
*/
|
|
13
|
+
export function setLocale(locale) {
|
|
14
|
+
for (const callback of callbacks) {
|
|
15
|
+
callback(locale)
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
export default (/** @type {{[locale: string]: import('wuchale/runtime').CatalogModule }} */ catalogs) => {
|
|
20
|
+
const [locale, setLocale] = useState('en')
|
|
21
|
+
useEffect(() => {
|
|
22
|
+
callbacks.add((/** @type {string} */ locale) => setLocale(locale))
|
|
23
|
+
})
|
|
24
|
+
return catalogs[locale]
|
|
25
|
+
}
|
package/src/loaders/react.js
CHANGED
|
@@ -5,24 +5,28 @@
|
|
|
5
5
|
|
|
6
6
|
import { loadCatalog, loadIDs, key } from 'virtual:wuchale/proxy' // or proxy/sync
|
|
7
7
|
import { registerLoaders } from 'wuchale/load-utils'
|
|
8
|
-
import { Runtime } from 'wuchale/runtime'
|
|
9
8
|
import { useState, useEffect } from 'react'
|
|
10
9
|
|
|
11
10
|
const callbacks = {}
|
|
11
|
+
const store = {}
|
|
12
12
|
|
|
13
13
|
const collection = {
|
|
14
|
-
get:
|
|
15
|
-
set: (loadID, catalog) => {
|
|
14
|
+
get: loadID => store[loadID],
|
|
15
|
+
set: (/** @type {string} */ loadID, /** @type {import('wuchale/runtime').CatalogModule} */ catalog) => {
|
|
16
|
+
store[loadID] = catalog // for when useEffect hasn't run yet
|
|
16
17
|
callbacks[loadID]?.(catalog)
|
|
17
18
|
}
|
|
18
19
|
}
|
|
19
20
|
|
|
20
21
|
registerLoaders(key, loadCatalog, loadIDs, collection)
|
|
21
22
|
|
|
23
|
+
/**
|
|
24
|
+
* @param { string } loadID
|
|
25
|
+
*/
|
|
22
26
|
export default loadID => {
|
|
23
|
-
const [
|
|
27
|
+
const [catalog, setCatalog] = useState(collection.get(loadID))
|
|
24
28
|
useEffect(() => {
|
|
25
|
-
callbacks[loadID] = catalog =>
|
|
29
|
+
callbacks[loadID] = (/** @type {import('wuchale/runtime').CatalogModule} */ catalog) => setCatalog(catalog)
|
|
26
30
|
})
|
|
27
|
-
return
|
|
31
|
+
return catalog
|
|
28
32
|
}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
// This is just the default loader.
|
|
2
|
+
// You can customize it however you want, it will not be overwritten once it exists and is not empty.
|
|
3
|
+
// The content is this way because you have enabled bundleLoad in the config.
|
|
4
|
+
|
|
5
|
+
import { createSignal } from "solid-js"
|
|
6
|
+
|
|
7
|
+
const [locale, setLocale] = createSignal('en')
|
|
8
|
+
|
|
9
|
+
export { setLocale }
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* @param {{ [locale: string]: import('wuchale/runtime').CatalogModule }} catalogs
|
|
13
|
+
*/
|
|
14
|
+
export default catalogs => catalogs[locale()]
|