refactor(macro)!: remove arg macro (#1581)

lingui · Apr 5, 2023 · defda77 · defda77
1 parent e4c0002
commit defda77
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 39 deletions.
diff --git a/packages/macro/src/macroJs.ts b/packages/macro/src/macroJs.ts
@@ -367,13 +367,6 @@ export default class MacroJs {
   }
 
   tokenizeExpression(node: Node | Expression): ArgToken {
-    if (this.isArg(node) && this.types.isCallExpression(node)) {
-      return {
-        type: "arg",
-        name: (node.arguments[0] as StringLiteral).value,
-        value: undefined,
-      }
-    }
     return {
       type: "arg",
       name: this.expressionToArgument(node as Expression),
@@ -477,13 +470,6 @@ export default class MacroJs {
     )
   }
 
-  isArg(node: Node) {
-    return (
-      this.types.isCallExpression(node) &&
-      this.isLinguiIdentifier(node.callee, "arg")
-    )
-  }
-
   isI18nMethod(node: Node) {
     return (
       this.types.isTaggedTemplateExpression(node) &&

diff --git a/packages/macro/test/index.ts b/packages/macro/test/index.ts
@@ -31,7 +31,6 @@ export type TestCase = {
 }
 
 const testCases: Record<string, TestCase[]> = {
-  "js-arg": require("./js-arg").default,
   "js-t": require("./js-t").default,
   "js-plural": require("./js-plural").default,
   "js-select": require("./js-select").default,

diff --git a/packages/macro/test/js-arg.ts b/packages/macro/test/js-arg.ts
diff --git a/packages/macro/test/js-defineMessage.ts b/packages/macro/test/js-defineMessage.ts
@@ -44,13 +44,16 @@ const cases: TestCase[] = [
         import { defineMessage, plural, arg } from '@lingui/macro';
         const message = defineMessage({
           comment: "Description",
-          message: plural(arg("value"), { one: "book", other: "books" })
+          message: plural(value, { one: "book", other: "books" })
         })
     `,
     expected: `
         const message =
           /*i18n*/
           {
+            values: {
+              value: value,
+            },
             message: "{value, plural, one {book} other {books}}",
             id: "SlmyxX",
             comment: "Description",