TeaSpeak
/
TeaWeb
1
0
Fork 0
Code Issues 1 Pull Requests Activity

Adding the VariadicTranslatable to the tr generator

canary
WolverinDEV 2020-08-01 15:04:33 +02:00
parent f9fa5bb2bf
commit 366389a287
4 changed files with 76 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shared/js/ui/react-elements/i18n/index.tsx
View File

@ -31,7 +31,7 @@ export class Translatable extends React.Component<{ children: string, __cacheKey
} }
} }
export const VariadicTranslatable = (props: { text: string, children?: React.ReactElement[] | React.ReactElement }) => { export const VariadicTranslatable = (props: { text: string, __cacheKey?: string, children?: React.ReactElement[] | React.ReactElement }) => {
const args = Array.isArray(props.children) ? props.children : [props.children]; const args = Array.isArray(props.children) ? props.children : [props.children];
const argsUseCount = [...new Array(args.length)].map(() => 0); const argsUseCount = [...new Array(args.length)].map(() => 0);

2
tools/trgen/generator.ts
View File

@ -5,5 +5,5 @@ export interface TranslationEntry {
message: string; message: string;
type: "call" | "jsx-translatable" | "js-template"; type: "call" | "jsx-translatable" | "jsx-variadic-translatable" | "js-template";
} }

3
tools/trgen/test/test_03.tsx
View File

@ -1,7 +1,8 @@
import {Translatable} from "../../../shared/js/ui/react-elements/i18n"; import {Translatable, VariadicTranslatable} from "../../../shared/js/ui/react-elements/i18n";
import * as React from "react"; import * as React from "react";
function test() { function test() {
const element_0 = <Translatable>Hello World</Translatable>; const element_0 = <Translatable>Hello World</Translatable>;
const element_1 = <Translatable>{"Hello World"}</Translatable>; const element_1 = <Translatable>{"Hello World"}</Translatable>;
const element_2 = <VariadicTranslatable text={"XXX"}><>XXX</></VariadicTranslatable>;
} }

125
tools/trgen/ts_generator.ts
View File

@ -69,28 +69,29 @@ function _generate(config: Configuration, node: ts.Node, result: TranslationEntr
if(tag.kind !== SyntaxKind.Identifier) if(tag.kind !== SyntaxKind.Identifier)
break call_analize; break call_analize;
if(tag.escapedText !== "Translatable") if(tag.escapedText === "Translatable") {
break call_analize; if(element.children.length !== 1) {
report(element, "Invalid child count: " + element.children.length);
break call_analize;
}
const text = element.children[0] as ts.JsxText;
if(text.kind != SyntaxKind.JsxText) {
report(element, "Invalid child type " + SyntaxKind[text.kind]);
break call_analize;
}
const { line, character } = node.getSourceFile().getLineAndCharacterOfPosition(node.getStart());
result.push({
filename: node.getSourceFile().fileName,
line: line,
character: character,
message: text.text,
type: "jsx-translatable"
});
} else if(tag.escapedText === "VariadicTranslatable") {
if(element.children.length !== 1) {
report(element, "Invalid child count: " + element.children.length);
break call_analize;
} }
const text = element.children[0] as ts.JsxText;
if(text.kind != SyntaxKind.JsxText) {
report(element, "Invalid child type " + SyntaxKind[text.kind]);
break call_analize;
}
const { line, character } = node.getSourceFile().getLineAndCharacterOfPosition(node.getStart());
result.push({
filename: node.getSourceFile().fileName,
line: line,
character: character,
message: text.text,
type: "jsx-translatable"
});
} }
node.forEachChild(n => _generate(config, n, result)); node.forEachChild(n => _generate(config, n, result));
@ -276,6 +277,21 @@ export function transform(config: Configuration, context: ts.TransformationConte
return result; return result;
} }
const generate_jsx_cache_key = (cache: VolatileTransformConfig, config: Configuration, element: ts.JsxElement) => ts.updateJsxElement(
element,
ts.updateJsxOpeningElement(
element.openingElement,
element.openingElement.tagName,
element.openingElement.typeArguments,
ts.updateJsxAttributes(element.openingElement.attributes, [
...element.openingElement.attributes.properties,
ts.createJsxAttribute(ts.createIdentifier("__cacheKey"), ts.createStringLiteral(cache.tsx_name_generator(config)))
])
),
element.children,
element.closingElement
);
export function replace_processor(config: Configuration, cache: VolatileTransformConfig, node: ts.Node, source_file: ts.SourceFile) : ts.Node { export function replace_processor(config: Configuration, cache: VolatileTransformConfig, node: ts.Node, source_file: ts.SourceFile) : ts.Node {
if(config.verbose) if(config.verbose)
console.log("Process %s", SyntaxKind[node.kind]); console.log("Process %s", SyntaxKind[node.kind]);
@ -331,20 +347,19 @@ export function replace_processor(config: Configuration, cache: VolatileTransfor
if(tag.kind !== SyntaxKind.Identifier) if(tag.kind !== SyntaxKind.Identifier)
return node; return node;
/* TODO: VariadicTranslatable */ const properties = {} as any;
element.openingElement.attributes.properties.forEach((e: ts.JsxAttribute) => {
if(e.kind !== SyntaxKind.JsxAttribute)
throw new Error(source_location(e) + ": Invalid jsx attribute kind " + SyntaxKind[e.kind]);
if(e.name.kind !== SyntaxKind.Identifier)
throw new Error(source_location(e) + ": Key isn't an identifier");
properties[e.name.escapedText as string] = e.initializer;
});
if(tag.escapedText === "Translatable") { if(tag.escapedText === "Translatable") {
const properties = {} as any;
element.openingElement.attributes.properties.forEach((e: ts.JsxAttribute) => {
if(e.kind !== SyntaxKind.JsxAttribute)
throw new Error(source_location(e) + ": Invalid jsx attribute kind " + SyntaxKind[e.kind]);
if(e.name.kind !== SyntaxKind.Identifier)
throw new Error(source_location(e) + ": Key isn't an identifier");
properties[e.name.escapedText as string] = e.initializer;
});
if('trIgnore' in properties && properties.trIgnore.kind === SyntaxKind.JsxExpression) { if('trIgnore' in properties && properties.trIgnore.kind === SyntaxKind.JsxExpression) {
const ignoreAttribute = properties.trIgnore as ts.JsxExpression; const ignoreAttribute = properties.trIgnore as ts.JsxExpression;
if(ignoreAttribute.expression.kind === SyntaxKind.TrueKeyword) if(ignoreAttribute.expression.kind === SyntaxKind.TrueKeyword)
@ -369,26 +384,30 @@ export function replace_processor(config: Configuration, cache: VolatileTransfor
type: "jsx-translatable" type: "jsx-translatable"
}); });
/* return generate_jsx_cache_key(cache, config, element);
console.error( ts.updateJsxAttributes(element.openingElement.attributes, [ } else if(tag.escapedText === "VariadicTranslatable") {
...element.openingElement.attributes.properties, if(!('text' in properties))
ts.createJsxAttribute(ts.createIdentifier("__cacheKey"), ts.createStringLiteral(cache.tsx_name_generator(config))) throw new Error(source_location(element) + ": Missing text to translate");
]));
*/ const textAttribute = properties["text"] as ts.JsxExpression;
return ts.updateJsxElement( if(textAttribute.kind !== SyntaxKind.JsxExpression)
element, throw new Error(source_location(element) + ": Text attribute has an invalid type. Expected JsxExpression but received " + SyntaxKind[textAttribute.kind]);
ts.updateJsxOpeningElement(
element.openingElement, if(textAttribute.expression.kind !== SyntaxKind.StringLiteral)
element.openingElement.tagName, throw new Error(source_location(element) + ": Text attribute value isn't a string literal. Expected StringLiteral but received " + SyntaxKind[textAttribute.expression.kind]);
element.openingElement.typeArguments,
ts.updateJsxAttributes(element.openingElement.attributes, [ const literal = textAttribute.expression as ts.StringLiteral;
...element.openingElement.attributes.properties,
ts.createJsxAttribute(ts.createIdentifier("__cacheKey"), ts.createStringLiteral(cache.tsx_name_generator(config))) let { line, character } = source_file.getLineAndCharacterOfPosition(node.getStart());
]) cache.translations.push({
), message: literal.text,
element.children, line: line,
element.closingElement character: character,
); filename: (source_file || {fileName: "unknown"}).fileName,
type: "jsx-variadic-translatable"
});
return generate_jsx_cache_key(cache, config, element);
} }
} }