Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: split js / jsx macro #86

Merged
merged 1 commit into from
Apr 5, 2024
Merged

feature: split js / jsx macro #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ impl<'a> Fold for LinguiMacroFolder {
n.retain(|m| {
if let ModuleItem::ModuleDecl(ModuleDecl::Import(imp)) = m {
// drop macro imports
if &imp.src.value == "@lingui/macro" {
if &imp.src.value == "@lingui/macro" || &imp.src.value == "@lingui/core/macro" || &imp.src.value == "@lingui/react/macro" {
self.has_lingui_macro_imports = true;
self.ctx.register_macro_import(imp);
insert_index = index;
Expand Down
17 changes: 9 additions & 8 deletions src/tests/imports.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ use crate::{to};
to!(
should_not_add_extra_imports,
r#"
import { t, Plural } from "@lingui/macro";
import { t } from "@lingui/core/macro";
import { Plural } from "@lingui/react/macro";
import { i18n } from "@lingui/core";
import { Trans } from "@lingui/react";

Expand Down Expand Up @@ -32,7 +33,7 @@ to!(
to!(
jsx_should_process_only_elements_imported_from_macro,
r#"
import { Plural } from "@lingui/macro";
import { Plural } from "@lingui/react/macro";
import { Select } from "./my-select-cmp";

;<Plural
Expand Down Expand Up @@ -62,7 +63,7 @@ to!(
jsx_should_process_only_elements_imported_from_macro2,
r#"
import { Trans } from "@lingui/react";
import { Plural } from "@lingui/macro";
import { Plural } from "@lingui/react/macro";

;<Plural
value={count}
Expand All @@ -88,7 +89,7 @@ to!(
to!(
js_should_process_only_elements_imported_from_macro,
r#"
import { plural } from "@lingui/macro";
import { plural } from "@lingui/core/macro";
import { t } from "./custom-t";

t`Don't touch me!`
Expand All @@ -114,7 +115,7 @@ to!(
to!(
js_should_process_only_elements_imported_from_macro2,
r#"
import { t } from "@lingui/macro";
import { t } from "@lingui/core/macro";
import { plural } from "./custom-plural";

t`Hello World!`;
Expand All @@ -138,7 +139,7 @@ to!(
to!(
js_should_support_renamed_imports,
r#"
import { t as i18nT, plural as i18nPlural } from "@lingui/macro";
import { t as i18nT, plural as i18nPlural } from "@lingui/core/macro";

i18nT`Hello World!`;
i18nPlural(value, {one: "...", other: "..."});
Expand All @@ -162,7 +163,7 @@ to!(
to!(
jsx_should_support_renamed_imports,
r#"
import { Trans as I18nTrans, Plural as I18nPlural } from "@lingui/macro";
import { Trans as I18nTrans, Plural as I18nPlural } from "@lingui/react/macro";

;<I18nPlural
value={count}
Expand All @@ -188,7 +189,7 @@ to!(
should_add_imports_after_directive_prologues,
r#"
"use client";
import {t} from "@lingui/macro"
import { t } from "@lingui/core/macro"
import foo from "bar"
t`Text`
"#,
Expand Down
14 changes: 7 additions & 7 deletions src/tests/js_icu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::{to};
to!(
js_icu_macro,
r#"
import { plural, select, selectOrdinal } from "@lingui/macro";
import { plural, select, selectOrdinal } from "@lingui/core/macro";
const messagePlural = plural(count, {
one: '# Book',
other: '# Books'
Expand Down Expand Up @@ -49,7 +49,7 @@ to!(
to!(
js_icu_diffrent_object_literal_syntax,
r#"
import { plural } from "@lingui/macro";
import { plural } from "@lingui/core/macro";

const messagePlural = plural(count, {
one: '# Book',
Expand All @@ -73,7 +73,7 @@ to!(
to!(
js_choices_may_contain_expressions,
r#"
import { plural, select, selectOrdinal } from "@lingui/macro";
import { plural, select, selectOrdinal } from "@lingui/core/macro";
const messagePlural = plural(count, {
one: foo.bar,
other: variable
Expand Down Expand Up @@ -112,7 +112,7 @@ const messageSelect = i18n._({
to!(
js_should_not_touch_non_lungui_fns,
r#"
import { plural } from "@lingui/macro";
import { plural } from "@lingui/core/macro";
const messagePlural = customName(count, {
one: '# Book',
other: '# Books'
Expand All @@ -129,7 +129,7 @@ to!(
to!(
js_plural_with_placeholders,
r#"
import { plural } from "@lingui/macro";
import { plural } from "@lingui/core/macro";

const message = plural(count, {
one: `${name} has # friend`,
Expand All @@ -152,7 +152,7 @@ to!(
to!(
js_dedup_values_in_icu,
r#"
import { plural } from "@lingui/macro";
import { plural } from "@lingui/core/macro";

const message = plural(count, {
one: `${name} has ${count} friend`,
Expand Down Expand Up @@ -200,7 +200,7 @@ to!(
to!(
js_icu_nested_in_choices,
r#"
import { plural } from "@lingui/macro"
import { plural } from "@lingui/core/macro"
const message = plural(numBooks, {
one: plural(numArticles, {
one: `1 book and 1 article`,
Expand Down
47 changes: 33 additions & 14 deletions src/tests/js_t.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ to!(
js_should_not_touch_not_related_tagget_tpls,
// input
r#"
import { t } from "@lingui/macro";
import { t } from "@lingui/core/macro";

b`Refresh inbox`;
b(i18n)`Refresh inbox`;
Expand All @@ -29,11 +29,30 @@ to!(
);

to!(
js_substitution_in_tpl_literal,
js_should_work_with_legacy_import,
// input
r#"
import { t } from "@lingui/macro";

t`Refresh inbox`;
"#,
// output after transform
r#"
import { i18n } from "@lingui/core";
i18n._({
id: "EsCV2T",
message: "Refresh inbox"
});

"#
);

to!(
js_substitution_in_tpl_literal,
// input
r#"
import { t } from "@lingui/core/macro";

t`Refresh inbox`
t`Refresh ${foo} inbox ${bar}`
t`Refresh ${foo.bar} inbox ${bar}`
Expand Down Expand Up @@ -76,7 +95,7 @@ to!(
js_dedup_values_in_tpl_literal,
// input
r#"
import { t } from "@lingui/macro";
import { t } from "@lingui/core/macro";
t`Refresh ${foo} inbox ${foo}`
"#,
// output after transform
Expand All @@ -97,7 +116,7 @@ to!(
js_custom_i18n_passed,
// input
r#"
import { t } from "@lingui/macro";
import { t } from "@lingui/core/macro";
import { custom_i18n } from "./i18n";

t(custom_i18n)`Refresh inbox`
Expand Down Expand Up @@ -149,7 +168,7 @@ to!(
to!(
js_newlines_are_preserved,
r#"
import { t } from '@lingui/macro';
import { t } from '@lingui/core/macro';
t`Multiline
string`;
"#,
Expand All @@ -165,7 +184,7 @@ to!(
to!(
js_continuation_character,
r#"
import { t } from '@lingui/macro';
import { t } from '@lingui/core/macro';
t`Multiline\
string`;
"#,
Expand All @@ -180,7 +199,7 @@ to!(
to!(
unicode_characters_interpreted,
r#"
import { t } from '@lingui/macro';
import { t } from '@lingui/core/macro';
t`Message \u0020`;
t`Bienvenue\xA0!`
"#,
Expand All @@ -199,7 +218,7 @@ to!(
to!(
js_support_message_descriptor_in_t_fn,
r#"
import { t } from '@lingui/macro'
import { t } from '@lingui/core/macro'
const msg = t({ message: `Hello ${name}`, id: 'msgId', comment: 'description for translators' })
"#,
r#"
Expand All @@ -217,7 +236,7 @@ to!(
to!(
js_t_fn_wrapped_in_call_expr,
r#"
import { t } from '@lingui/macro'
import { t } from '@lingui/core/macro'
const msg = message.error(t({message: "dasd"}))
"#,
r#"
Expand All @@ -237,7 +256,7 @@ to!(
production,
js_should_kept_only_essential_props,
r#"
import { t } from '@lingui/macro'
import { t } from '@lingui/core/macro'
const msg1 = t`Message`
const msg2 = t({
message: `Hello ${name}`,
Expand All @@ -264,7 +283,7 @@ to!(
to!(
js_support_template_strings_in_t_macro_message_with_custom_i18n_instance,
r#"
import { t } from '@lingui/macro'
import { t } from '@lingui/core/macro'
import { i18n_custom } from './lingui'
const msg = t(i18n_custom)({ message: `Hello ${name}` })
"#,
Expand All @@ -283,7 +302,7 @@ to!(
to!(
support_id_and_comment_in_t_macro_as_call_expression,
r#"
import { t, plural } from '@lingui/macro'
import { t, plural } from '@lingui/core/macro'
const msg = t({ id: 'msgId', comment: 'description for translators', message: plural(val, { one: '...', other: '...' }) })
"#,
r#"
Expand All @@ -301,7 +320,7 @@ to!(
to!(
support_id_in_template_literal,
r#"
import { t } from '@lingui/macro'
import { t } from '@lingui/core/macro'
const msg = t({ id: `msgId` })
"#,
r#"
Expand All @@ -316,7 +335,7 @@ to!(
to!(
should_generate_diffrent_id_when_context_provided,
r#"
import { t } from '@lingui/macro'
import { t } from '@lingui/core/macro'
t({ message: 'Ola' })
t({ message: 'Ola', context: "My Context"})
t({ message: 'Ola', context: `My Context`})
Expand Down
Loading