@nkzw/eslint-plugin-fbtee 0.1.2 → 0.1.3

package/lib/index.cjs

@@ -29,7 +29,7 @@ module.exports = __toCommonJS(src_exports);
 // package.json
 var package_default = {
   name: "@nkzw/eslint-plugin-fbtee",
-  version: "0.1.2",
+  version: "0.1.3",
   description: "",
   keywords: [],
   repository: {
@@ -191,6 +191,11 @@ function validateChildren(node, nodesToReport) {
       }
     }
     if (child.type === "JSXElement" || child.type === "JSXFragment") {
+      const childName = elementType(child);
+      if (/^[A-Z]/.test(childName) || childName.startsWith("fbt:")) {
+        hasTextContent = true;
+        continue;
+      }
       hasTextContent ||= validateChildren(child, nodesToReport);
     }
     if (hasTextContent) {

package/lib/index.js

@@ -1,7 +1,7 @@
 // package.json
 var package_default = {
   name: "@nkzw/eslint-plugin-fbtee",
-  version: "0.1.2",
+  version: "0.1.3",
   description: "",
   keywords: [],
   repository: {
@@ -163,6 +163,11 @@ function validateChildren(node, nodesToReport) {
       }
     }
     if (child.type === "JSXElement" || child.type === "JSXFragment") {
+      const childName = elementType(child);
+      if (/^[A-Z]/.test(childName) || childName.startsWith("fbt:")) {
+        hasTextContent = true;
+        continue;
+      }
       hasTextContent ||= validateChildren(child, nodesToReport);
     }
     if (hasTextContent) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nkzw/eslint-plugin-fbtee",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "",
   "keywords": [],
   "repository": {

package/src/__tests__/no-empty-strings-test.tsx

@@ -13,6 +13,7 @@ const ruleTester = new RuleTester({
 
 ruleTester.run('no-empty-strings', rule, {
   invalid: [
+    // <fbt>
     {
       code: `
         <fbt desc="Greeting"></fbt>;
@@ -96,6 +97,8 @@ ruleTester.run('no-empty-strings', rule, {
         },
       ],
     },
+
+    // fbt()
     {
       code: `
         fbt('', 'Greeting');
@@ -140,6 +143,8 @@ ruleTester.run('no-empty-strings', rule, {
         },
       ],
     },
+
+    // fbs()
     {
       code: `
         fbs('', 'Greeting');
@@ -153,6 +158,7 @@ ruleTester.run('no-empty-strings', rule, {
     },
   ],
   valid: [
+    // <fbt>
     {
       code: `
         <fbt desc="Greeting">Hello world</fbt>;
@@ -175,44 +181,79 @@ ruleTester.run('no-empty-strings', rule, {
     },
     {
       code: `
-        fbt('Hello world', 'Greeting');
+        <fbt desc="Greeting">
+          <span>Non-empty child</span>
+        </fbt>;
       `,
     },
     {
       code: `
-        const text = 'Hello';
-        fbt(text, 'Greeting');
+        <fbt desc="Greeting">
+          <span>Non-empty child with empty sibling</span>
+          <span></span>
+        </fbt>;
       `,
     },
     {
       code: `
         <fbt desc="Greeting">
-          <span>Non-empty child</span>
+          <>Hello</>
         </fbt>;
       `,
     },
     {
       code: `
         <fbt desc="Greeting">
-          <span>Non-empty child with empty sibling</span>
-          <span></span>
+          Apple{' '}Banana
         </fbt>;
       `,
     },
     {
       code: `
-        <fbt desc="Greeting">
-          <>Hello</>
+        <fbt desc="buy prompt">
+          Buy a new
+          <fbt:enum 
+            enum-range={{
+              CAR: 'car',
+              HOUSE: 'house',
+              BOAT: 'boat',
+              HOUSEBOAT: 'houseboat',
+            }} 
+            value={enumVal} 
+          />!
         </fbt>;
       `,
     },
     {
       code: `
-        <fbt desc="Greeting">
-          Apple{' '}Banana
+        <fbt desc="welcome message">
+          Hello
+          <fbt:param name="name" value="Steve" />
+        </fbt>;
+      `,
+    },
+    {
+      code: `
+        <fbt desc="greeting">
+          <Component />
         </fbt>;
       `,
     },
+
+    // fbt()
+    {
+      code: `
+        fbt('Hello world', 'Greeting');
+      `,
+    },
+    {
+      code: `
+        const text = 'Hello';
+        fbt(text, 'Greeting');
+      `,
+    },
+
+    // other
     {
       code: `
         name.replaceAll(' ', '-');

package/src/rules/no-empty-strings.tsx

@@ -94,6 +94,13 @@ function validateChildren(
     }
 
     if (child.type === 'JSXElement' || child.type === 'JSXFragment') {
+      const childName = elementType(child);
+
+      if (/^[A-Z]/.test(childName) || childName.startsWith('fbt:')) {
+        hasTextContent = true;
+        continue;
+      }
+
       hasTextContent ||= validateChildren(child, nodesToReport);
     }