@nkzw/eslint-plugin-fbtee 0.1.4 → 0.2.0

package/README.md

@@ -200,7 +200,7 @@ The open-source version of `fbt`, however, became unmaintained, difficult to set
 - **Easier Setup:** fbtee works with modern tools like Vite.
 - **Statically Typed:** The fbtee compiler ensures correct usage of fbtee, libary TypeScript types are provided, and an eslint plugin helps fix common mistakes.
 - **Improved React Compatibility:** Removed React-specific hacks and added support for implicit React fragments (`<>`).
-- **Enhanced Features:** Fixed and exported `intlList`, which was not functional in the original `fbt`.
+- **Enhanced Features:** Fixed and exported `inltList` as a new `<fbt:list>` construt, which was not functional in the original `fbt`.
 - **Modernized Codebase:** Rewritten using TypeScript, ES modules (ESM), eslint, and modern JavaScript standards. Removed cruft and legacy code.
 - **Updated Tooling:** Uses modern tools like pnpm, Vite, and esbuild for faster and more efficient development of **fbtee**.
 

package/lib/index.cjs

@@ -18,18 +18,18 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.tsx
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   configs: () => configs,
   meta: () => meta,
   rules: () => rules
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // package.json
 var package_default = {
   name: "@nkzw/eslint-plugin-fbtee",
-  version: "0.1.4",
+  version: "0.2.0",
   description: "",
   keywords: [],
   repository: {
@@ -47,10 +47,10 @@ var package_default = {
     build: "tsup src/index.tsx -d lib --target=node22 --format=esm,cjs --clean --no-splitting --dts"
   },
   dependencies: {
-    "@typescript-eslint/utils": "^8.18.0"
+    "@typescript-eslint/utils": "^8.18.2"
   },
   devDependencies: {
-    "@typescript-eslint/rule-tester": "^8.18.0"
+    "@typescript-eslint/rule-tester": "^8.18.2"
   }
 };
 
@@ -121,6 +121,16 @@ function resolveNodeValue(node) {
   if (node.type === "JSXExpressionContainer") {
     return resolveNodeValue(node.expression);
   }
+  if (node.type === "ConditionalExpression") {
+    const consequent = resolveNodeValue(node.consequent);
+    const alternate = resolveNodeValue(node.alternate);
+    return consequent || alternate || null;
+  }
+  if (node.type === "LogicalExpression") {
+    const left = resolveNodeValue(node.left);
+    const right = resolveNodeValue(node.right);
+    return left || right || null;
+  }
   return null;
 }
 function getPropName(prop) {

package/lib/index.js

@@ -1,7 +1,7 @@
 // package.json
 var package_default = {
   name: "@nkzw/eslint-plugin-fbtee",
-  version: "0.1.4",
+  version: "0.2.0",
   description: "",
   keywords: [],
   repository: {
@@ -19,10 +19,10 @@ var package_default = {
     build: "tsup src/index.tsx -d lib --target=node22 --format=esm,cjs --clean --no-splitting --dts"
   },
   dependencies: {
-    "@typescript-eslint/utils": "^8.18.0"
+    "@typescript-eslint/utils": "^8.18.2"
   },
   devDependencies: {
-    "@typescript-eslint/rule-tester": "^8.18.0"
+    "@typescript-eslint/rule-tester": "^8.18.2"
   }
 };
 
@@ -93,6 +93,16 @@ function resolveNodeValue(node) {
   if (node.type === "JSXExpressionContainer") {
     return resolveNodeValue(node.expression);
   }
+  if (node.type === "ConditionalExpression") {
+    const consequent = resolveNodeValue(node.consequent);
+    const alternate = resolveNodeValue(node.alternate);
+    return consequent || alternate || null;
+  }
+  if (node.type === "LogicalExpression") {
+    const left = resolveNodeValue(node.left);
+    const right = resolveNodeValue(node.right);
+    return left || right || null;
+  }
   return null;
 }
 function getPropName(prop) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nkzw/eslint-plugin-fbtee",
-  "version": "0.1.4",
+  "version": "0.2.0",
   "description": "",
   "keywords": [],
   "repository": {
@@ -15,10 +15,10 @@
     "require": "./lib/index.cjs"
   },
   "dependencies": {
-    "@typescript-eslint/utils": "^8.18.0"
+    "@typescript-eslint/utils": "^8.18.2"
   },
   "devDependencies": {
-    "@typescript-eslint/rule-tester": "^8.18.0"
+    "@typescript-eslint/rule-tester": "^8.18.2"
   },
   "scripts": {
     "build": "tsup src/index.tsx -d lib --target=node22 --format=esm,cjs --clean --no-splitting --dts"

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

@@ -72,7 +72,48 @@ ruleTester.run('no-untranslated-strings', rule, {
     },
     {
       code: `
-        <>Hello world</>
+        <>Hello world</>;
+       `,
+      errors: [
+        {
+          messageId: 'unwrappedString',
+        },
+      ],
+    },
+    {
+      code: `
+        <span>{foo ? 'bar' : 'baz'}</span>;
+       `,
+      errors: [
+        {
+          messageId: 'unwrappedString',
+        },
+      ],
+    },
+    {
+      code: `
+        <span>{foo ?? 'bar'}</span>;
+       `,
+      errors: [
+        {
+          messageId: 'unwrappedString',
+        },
+      ],
+    },
+    {
+      code: `
+        <span>{foo || 'bar'}</span>;
+       `,
+      errors: [
+        {
+          messageId: 'unwrappedString',
+        },
+      ],
+    },
+    {
+      code: `
+        const foo = true;
+        <span>{foo && 'bar'}</span>;
        `,
       errors: [
         {
@@ -219,5 +260,20 @@ ruleTester.run('no-untranslated-strings', rule, {
        foo.bar('Baz')
        `,
     },
+    {
+      code: `
+       const foo = isGreeting ? 'Hello' : 'Goodbye'
+       `,
+    },
+    {
+      code: `
+       const foo = helloGreeting ?? 'goodbye'
+       `,
+    },
+    {
+      code: `
+       const foo = helloGreeting || 'goodbye'
+       `,
+    },
   ],
 });

package/src/utils.tsx

@@ -105,6 +105,20 @@ export function resolveNodeValue(
     return resolveNodeValue(node.expression);
   }
 
+  if (node.type === 'ConditionalExpression') {
+    const consequent = resolveNodeValue(node.consequent);
+    const alternate = resolveNodeValue(node.alternate);
+
+    return consequent || alternate || null;
+  }
+
+  if (node.type === 'LogicalExpression') {
+    const left = resolveNodeValue(node.left);
+    const right = resolveNodeValue(node.right);
+
+    return left || right || null;
+  }
+
   return null;
 }