@planningcenter/tapestry-migration-cli 2.4.0-rc.4 → 2.4.0-rc.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/tapestry-migration-cli",
-  "version": "2.4.0-rc.4",
+  "version": "2.4.0-rc.5",
   "description": "CLI tool for Tapestry migrations",
   "type": "module",
   "main": "dist/index.js",
@@ -51,5 +51,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "aa40507b01cc6ea8c044aac697970f5bcc93fda2"
+  "gitHead": "f90b3a7efefc3e67294eb7f0bf44376bae282949"
 }

package/src/components/link/transforms/targetBlankToExternal.test.ts

@@ -132,6 +132,20 @@ export default function Test() {
       expect(result).toContain('href="/page3"') // Should remain unchanged
     })
 
+    it("should handle target={'_blank'} format", () => {
+      const input = `
+import { Link } from "@planningcenter/tapestry-react"
+
+export default function Test() {
+  return <Link href="/external" target={'_blank'}>External Link</Link>
+}
+      `.trim()
+
+      const result = applyTransform(input)
+      expect(result).toContain("external")
+      expect(result).not.toContain("target={'_blank'}")
+    })
+
     it("should handle dynamic target values", () => {
       const input = `
 import { Link } from "@planningcenter/tapestry-react"

package/src/components/shared/conditions/hasAttributeValue.test.ts

@@ -32,7 +32,28 @@ describe("hasAttributeValue", () => {
     expect(condition(element)).toBe(false)
   })
 
-  it("should return false for expression values", () => {
+  it("should return true for expression with string literal", () => {
+    const condition = hasAttributeValue("target", "_blank")
+    const element = createJSXElement(" target={'_blank'}")
+
+    expect(condition(element)).toBe(true)
+  })
+
+  it("should return true for expression with double quotes", () => {
+    const condition = hasAttributeValue("target", "_blank")
+    const element = createJSXElement(' target={"_blank"}')
+
+    expect(condition(element)).toBe(true)
+  })
+
+  it("should return false for expression with different value", () => {
+    const condition = hasAttributeValue("target", "_blank")
+    const element = createJSXElement(" target={'_self'}")
+
+    expect(condition(element)).toBe(false)
+  })
+
+  it("should return false for complex expression values", () => {
     const condition = hasAttributeValue("onClick", "handleClick")
     const element = createJSXElement(" onClick={handleClick}")
 

package/src/components/shared/conditions/hasAttributeValue.ts

@@ -4,6 +4,7 @@ import { TransformCondition } from "../types"
 
 /**
  * Helper function to create a condition that checks for an attribute with a specific value
+ * Handles both string literals and expressions with string literals
  */
 export function hasAttributeValue(
   attributeName: string,
@@ -11,13 +12,30 @@ export function hasAttributeValue(
 ): TransformCondition {
   return (element: JSXElement) => {
     const attributes = element.openingElement.attributes || []
-    return attributes.some(
-      (attr) =>
+    return attributes.some((attr) => {
+      const hasAttribute =
         attr.type === "JSXAttribute" &&
         attr.name?.type === "JSXIdentifier" &&
-        attr.name.name === attributeName &&
-        attr.value?.type === "StringLiteral" &&
-        attr.value.value === value
-    )
+        attr.name.name === attributeName
+
+      if (!hasAttribute) {
+        return false
+      }
+
+      // Handle string literal: attribute="value"
+      if (attr.value?.type === "StringLiteral") {
+        return attr.value.value === value
+      }
+
+      // Handle expression: attribute={"value"} or attribute={'value'}
+      if (attr.value?.type === "JSXExpressionContainer") {
+        const { expression } = attr.value
+        if (expression.type === "StringLiteral") {
+          return expression.value === value
+        }
+      }
+
+      return false
+    })
   }
 }